Skip to content

Commit abffbbe

Browse files
committed
🔧 Sanity-check DEFAULT_EJERK with LIN_ADVANCE
See #20649
1 parent f4ab0a0 commit abffbbe

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

Marlin/src/inc/SanityCheck.h

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,6 +1210,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
12101210
);
12111211
#if ENABLED(S_CURVE_ACCELERATION) && DISABLED(EXPERIMENTAL_SCURVE)
12121212
#error "LIN_ADVANCE and S_CURVE_ACCELERATION may not play well together! Enable EXPERIMENTAL_SCURVE to continue."
1213+
#elif ENABLED(DIRECT_STEPPING)
1214+
#error "DIRECT_STEPPING is incompatible with LIN_ADVANCE. Enable in external planner if possible."
1215+
#elif DISABLED(HAS_JUNCTION_DEVIATION) && defined(DEFAULT_EJERK)
1216+
static_assert(DEFAULT_EJERK >= 10, "It is strongly recommended to set DEFAULT_EJERK >= 10 when using LIN_ADVANCE.");
12131217
#endif
12141218
#endif
12151219

@@ -3600,13 +3604,6 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
36003604
#error "SAVED_POSITIONS must be an integer from 0 to 256."
36013605
#endif
36023606

3603-
/**
3604-
* Stepper Chunk support
3605-
*/
3606-
#if BOTH(DIRECT_STEPPING, LIN_ADVANCE)
3607-
#error "DIRECT_STEPPING is incompatible with LIN_ADVANCE. Enable in external planner if possible."
3608-
#endif
3609-
36103607
/**
36113608
* Touch Screen Calibration
36123609
*/

Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,10 @@
126126
#endif
127127
#endif
128128

129-
130129
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
131130

132131
#if SD_CONNECTION_IS(LCD) && ENABLED(SKR_USE_LCD_SD_CARD_PINS_FOR_CS)
133-
#error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_PINS_FOR_CS."
132+
#error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_SD_CARD_PINS_FOR_CS."
134133
#endif
135134

136135
#if SD_CONNECTION_IS(LCD)

0 commit comments

Comments
 (0)