zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🔧 Sanity-check DEFAULT_EJERK with LIN_ADVANCE

Browse source 
See #20649
This commit is contained in:
Scott Lahteine 2021-08-07 16:06:51 -05:00
parent d49a26bcc6
commit eba0ae4ee1
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Marlin/src/inc/SanityCheck.h
View file

@ -1206,6 +1206,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
); );
#if ENABLED(S_CURVE_ACCELERATION) && DISABLED(EXPERIMENTAL_SCURVE) #if ENABLED(S_CURVE_ACCELERATION) && DISABLED(EXPERIMENTAL_SCURVE)
#error "LIN_ADVANCE and S_CURVE_ACCELERATION may not play well together! Enable EXPERIMENTAL_SCURVE to continue." #error "LIN_ADVANCE and S_CURVE_ACCELERATION may not play well together! Enable EXPERIMENTAL_SCURVE to continue."
#elif ENABLED(DIRECT_STEPPING)
#error "DIRECT_STEPPING is incompatible with LIN_ADVANCE. Enable in external planner if possible."
#elif !HAS_JUNCTION_DEVIATION && defined(DEFAULT_EJERK)
static_assert(DEFAULT_EJERK >= 10, "It is strongly recommended to set DEFAULT_EJERK >= 10 when using LIN_ADVANCE.");
#endif #endif
#endif #endif
@ -3576,13 +3580,6 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
#error "SAVED_POSITIONS must be an integer from 0 to 256." #error "SAVED_POSITIONS must be an integer from 0 to 256."
#endif #endif
/**
* Stepper Chunk support
*/
#if BOTH(DIRECT_STEPPING, LIN_ADVANCE)
#error "DIRECT_STEPPING is incompatible with LIN_ADVANCE. Enable in external planner if possible."
#endif
/** /**
* Touch Screen Calibration * Touch Screen Calibration
*/ */

3
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
View file

@ -126,11 +126,10 @@
#endif #endif
#endif #endif
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card #define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(LCD) && ENABLED(SKR_USE_LCD_SD_CARD_PINS_FOR_CS) #if SD_CONNECTION_IS(LCD) && ENABLED(SKR_USE_LCD_SD_CARD_PINS_FOR_CS)
#error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_PINS_FOR_CS." #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_SD_CARD_PINS_FOR_CS."
#endif #endif
#if SD_CONNECTION_IS(LCD) #if SD_CONNECTION_IS(LCD)