|
@@ -477,7 +477,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
477
|
477
|
#if ENABLED(MIN_SOFTWARE_ENDSTOPS) && DISABLED(MIN_SOFTWARE_ENDSTOP_Z)
|
478
|
478
|
#if IS_KINEMATIC
|
479
|
479
|
#error "MIN_SOFTWARE_ENDSTOPS on DELTA/SCARA also requires MIN_SOFTWARE_ENDSTOP_Z."
|
480
|
|
- #elif DISABLED(MIN_SOFTWARE_ENDSTOP_X, MIN_SOFTWARE_ENDSTOP_Y)
|
|
480
|
+ #elif NONE(MIN_SOFTWARE_ENDSTOP_X, MIN_SOFTWARE_ENDSTOP_Y)
|
481
|
481
|
#error "MIN_SOFTWARE_ENDSTOPS requires at least one of the MIN_SOFTWARE_ENDSTOP_[XYZ] options."
|
482
|
482
|
#endif
|
483
|
483
|
#endif
|
|
@@ -485,7 +485,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
485
|
485
|
#if ENABLED(MAX_SOFTWARE_ENDSTOPS) && DISABLED(MAX_SOFTWARE_ENDSTOP_Z)
|
486
|
486
|
#if IS_KINEMATIC
|
487
|
487
|
#error "MAX_SOFTWARE_ENDSTOPS on DELTA/SCARA also requires MAX_SOFTWARE_ENDSTOP_Z."
|
488
|
|
- #elif DISABLED(MAX_SOFTWARE_ENDSTOP_X, MAX_SOFTWARE_ENDSTOP_Y)
|
|
488
|
+ #elif NONE(MAX_SOFTWARE_ENDSTOP_X, MAX_SOFTWARE_ENDSTOP_Y)
|
489
|
489
|
#error "MAX_SOFTWARE_ENDSTOPS requires at least one of the MAX_SOFTWARE_ENDSTOP_[XYZ] options."
|
490
|
490
|
#endif
|
491
|
491
|
#endif
|
|
@@ -534,7 +534,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
534
|
534
|
* Progress Bar
|
535
|
535
|
*/
|
536
|
536
|
#if ENABLED(LCD_PROGRESS_BAR)
|
537
|
|
- #if DISABLED(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
|
537
|
+ #if NONE(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
538
|
538
|
#error "LCD_PROGRESS_BAR requires SDSUPPORT or LCD_SET_PROGRESS_MANUALLY."
|
539
|
539
|
#elif !HAS_CHARACTER_LCD
|
540
|
540
|
#error "LCD_PROGRESS_BAR requires a character LCD."
|
|
@@ -646,7 +646,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
646
|
646
|
#error "FILAMENT_RUNOUT_SENSOR with NUM_RUNOUT_SENSORS > 4 requires FIL_RUNOUT5_PIN."
|
647
|
647
|
#elif NUM_RUNOUT_SENSORS > 5 && !PIN_EXISTS(FIL_RUNOUT6)
|
648
|
648
|
#error "FILAMENT_RUNOUT_SENSOR with NUM_RUNOUT_SENSORS > 5 requires FIL_RUNOUT6_PIN."
|
649
|
|
- #elif DISABLED(SDSUPPORT, PRINTJOB_TIMER_AUTOSTART)
|
|
649
|
+ #elif NONE(SDSUPPORT, PRINTJOB_TIMER_AUTOSTART)
|
650
|
650
|
#error "FILAMENT_RUNOUT_SENSOR requires SDSUPPORT or PRINTJOB_TIMER_AUTOSTART."
|
651
|
651
|
#elif FILAMENT_RUNOUT_DISTANCE_MM < 0
|
652
|
652
|
#error "FILAMENT_RUNOUT_DISTANCE_MM must be greater than or equal to zero."
|
|
@@ -663,7 +663,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
663
|
663
|
#error "ADVANCED_PAUSE_FEATURE currently requires an LCD controller or EMERGENCY_PARSER."
|
664
|
664
|
#elif ENABLED(EXTRUDER_RUNOUT_PREVENT)
|
665
|
665
|
#error "EXTRUDER_RUNOUT_PREVENT is incompatible with ADVANCED_PAUSE_FEATURE."
|
666
|
|
- #elif ENABLED(PARK_HEAD_ON_PAUSE) && DISABLED(SDSUPPORT, NEWPANEL, EMERGENCY_PARSER)
|
|
666
|
+ #elif ENABLED(PARK_HEAD_ON_PAUSE) && NONE(SDSUPPORT, NEWPANEL, EMERGENCY_PARSER)
|
667
|
667
|
#error "PARK_HEAD_ON_PAUSE requires SDSUPPORT, EMERGENCY_PARSER, or an LCD controller."
|
668
|
668
|
#elif ENABLED(HOME_BEFORE_FILAMENT_CHANGE) && DISABLED(PAUSE_PARK_NO_STEPPER_TIMEOUT)
|
669
|
669
|
#error "HOME_BEFORE_FILAMENT_CHANGE requires PAUSE_PARK_NO_STEPPER_TIMEOUT."
|
|
@@ -983,7 +983,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
983
|
983
|
* Delta requirements
|
984
|
984
|
*/
|
985
|
985
|
#if ENABLED(DELTA)
|
986
|
|
- #if DISABLED(USE_XMAX_PLUG, USE_YMAX_PLUG, USE_ZMAX_PLUG)
|
|
986
|
+ #if NONE(USE_XMAX_PLUG, USE_YMAX_PLUG, USE_ZMAX_PLUG)
|
987
|
987
|
#error "You probably want to use Max Endstops for DELTA!"
|
988
|
988
|
#elif ENABLED(ENABLE_LEVELING_FADE_HEIGHT) && DISABLED(AUTO_BED_LEVELING_BILINEAR) && !UBL_SEGMENTED
|
989
|
989
|
#error "ENABLE_LEVELING_FADE_HEIGHT on DELTA requires AUTO_BED_LEVELING_BILINEAR or AUTO_BED_LEVELING_UBL."
|
|
@@ -1326,7 +1326,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
1326
|
1326
|
/**
|
1327
|
1327
|
* ULTIPANEL encoder
|
1328
|
1328
|
*/
|
1329
|
|
-#if ENABLED(ULTIPANEL) && DISABLED(NEWPANEL, SR_LCD_2W_NL) && !defined(SHIFT_CLK)
|
|
1329
|
+#if ENABLED(ULTIPANEL) && NONE(NEWPANEL, SR_LCD_2W_NL) && !defined(SHIFT_CLK)
|
1330
|
1330
|
#error "ULTIPANEL requires some kind of encoder."
|
1331
|
1331
|
#endif
|
1332
|
1332
|
|
|
@@ -1338,7 +1338,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
1338
|
1338
|
* SAV_3DGLCD display options
|
1339
|
1339
|
*/
|
1340
|
1340
|
#if ENABLED(SAV_3DGLCD)
|
1341
|
|
- #if DISABLED(U8GLIB_SSD1306, U8GLIB_SH1106)
|
|
1341
|
+ #if NONE(U8GLIB_SSD1306, U8GLIB_SH1106)
|
1342
|
1342
|
#error "Enable a SAV_3DGLCD display type: U8GLIB_SSD1306 or U8GLIB_SH1106."
|
1343
|
1343
|
#elif BOTH(U8GLIB_SSD1306, U8GLIB_SH1106)
|
1344
|
1344
|
#error "Only enable one SAV_3DGLCD display type: U8GLIB_SSD1306 or U8GLIB_SH1106."
|
|
@@ -1875,7 +1875,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
1875
|
1875
|
+ ENABLED(FYSETC_MINI_12864_1_2) \
|
1876
|
1876
|
+ ENABLED(FYSETC_MINI_12864_2_0) \
|
1877
|
1877
|
+ ENABLED(FYSETC_MINI_12864_2_1) \
|
1878
|
|
- + (ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(CARTESIO_UI, ZONESTAR_LCD)) \
|
|
1878
|
+ + (ENABLED(REPRAPWORLD_KEYPAD) && NONE(CARTESIO_UI, ZONESTAR_LCD)) \
|
1879
|
1879
|
+ ENABLED(RIGIDBOT_PANEL) \
|
1880
|
1880
|
+ ENABLED(RA_CONTROL_PANEL) \
|
1881
|
1881
|
+ ENABLED(LCD_SAINSMART_I2C_1602) \
|
|
@@ -1883,7 +1883,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
1883
|
1883
|
+ ENABLED(LCM1602) \
|
1884
|
1884
|
+ ENABLED(LCD_I2C_PANELOLU2) \
|
1885
|
1885
|
+ ENABLED(LCD_I2C_VIKI) \
|
1886
|
|
- + (ENABLED(U8GLIB_SSD1306) && DISABLED(OLED_PANEL_TINYBOY2, MKS_12864OLED_SSD1306)) \
|
|
1886
|
+ + (ENABLED(U8GLIB_SSD1306) && NONE(OLED_PANEL_TINYBOY2, MKS_12864OLED_SSD1306)) \
|
1887
|
1887
|
+ ENABLED(SAV_3DLCD) \
|
1888
|
1888
|
+ ENABLED(BQ_LCD_SMART_CONTROLLER) \
|
1889
|
1889
|
+ ENABLED(SAV_3DGLCD) \
|
|
@@ -1892,7 +1892,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
1892
|
1892
|
+ ENABLED(ULTI_CONTROLLER) \
|
1893
|
1893
|
+ ENABLED(MALYAN_LCD) \
|
1894
|
1894
|
+ ENABLED(DGUS_LCD) \
|
1895
|
|
- + (ENABLED(EXTENSIBLE_UI) && DISABLED(MALYAN_LCD, DGUS_LCD))
|
|
1895
|
+ + (ENABLED(EXTENSIBLE_UI) && NONE(MALYAN_LCD, DGUS_LCD))
|
1896
|
1896
|
#error "Please select no more than one LCD controller option."
|
1897
|
1897
|
#endif
|
1898
|
1898
|
|