Преглед изворни кода

🔧 Sanity-check DEFAULT_EJERK with LIN_ADVANCE

See #20649
Scott Lahteine пре 3 година
родитељ
комит
22ae09ace4
2 измењених фајлова са 5 додато и 9 уклоњено
  1. 4
    7
      Marlin/src/inc/SanityCheck.h
  2. 1
    2
      Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h

+ 4
- 7
Marlin/src/inc/SanityCheck.h Прегледај датотеку

1210
   );
1210
   );
1211
   #if ENABLED(S_CURVE_ACCELERATION) && DISABLED(EXPERIMENTAL_SCURVE)
1211
   #if ENABLED(S_CURVE_ACCELERATION) && DISABLED(EXPERIMENTAL_SCURVE)
1212
     #error "LIN_ADVANCE and S_CURVE_ACCELERATION may not play well together! Enable EXPERIMENTAL_SCURVE to continue."
1212
     #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 !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.");
1213
   #endif
1217
   #endif
1214
 #endif
1218
 #endif
1215
 
1219
 
3601
 #endif
3605
 #endif
3602
 
3606
 
3603
 /**
3607
 /**
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
-
3610
-/**
3611
  * Touch Screen Calibration
3608
  * Touch Screen Calibration
3612
  */
3609
  */
3613
 #if ENABLED(TFT_TOUCH_DEVICE_XPT2046) && DISABLED(TOUCH_SCREEN_CALIBRATION) \
3610
 #if ENABLED(TFT_TOUCH_DEVICE_XPT2046) && DISABLED(TOUCH_SCREEN_CALIBRATION) \

+ 1
- 2
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h Прегледај датотеку

126
   #endif
126
   #endif
127
 #endif
127
 #endif
128
 
128
 
129
-
130
 #define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
129
 #define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
131
 
130
 
132
 #if SD_CONNECTION_IS(LCD) && ENABLED(SKR_USE_LCD_SD_CARD_PINS_FOR_CS)
131
 #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."
134
 #endif
133
 #endif
135
 
134
 
136
 #if SD_CONNECTION_IS(LCD)
135
 #if SD_CONNECTION_IS(LCD)

Loading…
Откажи
Сачувај