Browse Source

!ENABLED => DISABLED

Scott Lahteine 5 years ago
parent
commit
acf5ae3083

+ 4
- 4
Marlin/src/inc/SanityCheck.h View File

@@ -505,9 +505,9 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
505 505
     #error "MESH_BED_LEVELING and BABYSTEP_ZPROBE_OFFSET is not a valid combination"
506 506
   #elif ENABLED(BABYSTEP_ZPROBE_OFFSET) && !HAS_BED_PROBE
507 507
     #error "BABYSTEP_ZPROBE_OFFSET requires a probe."
508
-  #elif ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) && !ENABLED(DOGLCD)
508
+  #elif ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) && DISABLED(DOGLCD)
509 509
     #error "BABYSTEP_ZPROBE_GFX_OVERLAY requires a Graphical LCD."
510
-  #elif ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) && !ENABLED(BABYSTEP_ZPROBE_OFFSET)
510
+  #elif ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) && DISABLED(BABYSTEP_ZPROBE_OFFSET)
511 511
     #error "BABYSTEP_ZPROBE_GFX_OVERLAY requires a BABYSTEP_ZPROBE_OFFSET."
512 512
   #endif
513 513
 #endif
@@ -1524,7 +1524,7 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
1524 1524
   // is necessary in order to reset the stallGuard indication between the initial movement of all three
1525 1525
   // towers to +Z and the individual homing of each tower. This restriction can be removed once a means of
1526 1526
   // clearing the stallGuard activated status is found.
1527
-  #if ENABLED(DELTA) && !ENABLED(STEALTHCHOP)
1527
+  #if ENABLED(DELTA) && DISABLED(STEALTHCHOP)
1528 1528
     #error "SENSORLESS_HOMING on DELTA currently requires STEALTHCHOP."
1529 1529
   #elif X_SENSORLESS && X_HOME_DIR == -1 && (DISABLED(X_MIN_ENDSTOP_INVERTING) || DISABLED(ENDSTOPPULLUP_XMIN))
1530 1530
     #error "SENSORLESS_HOMING requires X_MIN_ENDSTOP_INVERTING and ENDSTOPPULLUP_XMIN when homing to X_MIN."
@@ -1619,7 +1619,7 @@ static_assert(COUNT(sanity_arr_3) <= XYZE_N, "DEFAULT_MAX_ACCELERATION has too m
1619 1619
   #endif
1620 1620
 #endif
1621 1621
 
1622
-#if ENABLED(POWER_LOSS_RECOVERY) && !ENABLED(ULTIPANEL)
1622
+#if ENABLED(POWER_LOSS_RECOVERY) && DISABLED(ULTIPANEL)
1623 1623
   #error "POWER_LOSS_RECOVERY currently requires an LCD Controller."
1624 1624
 #endif
1625 1625
 

+ 2
- 2
Marlin/src/lcd/ultralcd.cpp View File

@@ -1515,7 +1515,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
1515 1515
     // Change filament
1516 1516
     //
1517 1517
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
1518
-      #if E_STEPPERS == 1 && !ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
1518
+      #if E_STEPPERS == 1 && DISABLED(FILAMENT_LOAD_UNLOAD_GCODES)
1519 1519
         if (thermalManager.targetHotEnoughToExtrude(active_extruder))
1520 1520
           MENU_ITEM(gcode, MSG_FILAMENTCHANGE, PSTR("M600 B0"));
1521 1521
         else
@@ -2744,7 +2744,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
2744 2744
     //
2745 2745
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
2746 2746
       if (!IS_SD_FILE_OPEN) {
2747
-        #if E_STEPPERS == 1 && !ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
2747
+        #if E_STEPPERS == 1 && DISABLED(FILAMENT_LOAD_UNLOAD_GCODES)
2748 2748
           if (thermalManager.targetHotEnoughToExtrude(active_extruder))
2749 2749
             MENU_ITEM(gcode, MSG_FILAMENTCHANGE, PSTR("M600 B0"));
2750 2750
           else

+ 2
- 2
Marlin/src/module/tool_change.cpp View File

@@ -37,7 +37,7 @@
37 37
   #include "../module/servo.h"
38 38
 #endif
39 39
 
40
-#if ENABLED(EXT_SOLENOID) && !ENABLED(PARKING_EXTRUDER)
40
+#if ENABLED(EXT_SOLENOID) && DISABLED(PARKING_EXTRUDER)
41 41
   #include "../feature/solenoid.h"
42 42
 #endif
43 43
 
@@ -478,7 +478,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
478 478
 
479 479
       planner.synchronize();
480 480
 
481
-      #if ENABLED(EXT_SOLENOID) && !ENABLED(PARKING_EXTRUDER)
481
+      #if ENABLED(EXT_SOLENOID) && DISABLED(PARKING_EXTRUDER)
482 482
         disable_all_solenoids();
483 483
         enable_solenoid_on_active_extruder();
484 484
       #endif

+ 1
- 1
Marlin/src/pins/pins_BIQU_BQ111_A4.h View File

@@ -115,7 +115,7 @@
115 115
   #define LCD_PINS_ENABLE     P0_18   // (MOSI) EXP1-3
116 116
   #define LCD_PINS_D4         P0_15   // (SCK)  EXP1-5
117 117
 
118
-  #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && !ENABLED(DOGLCD)
118
+  #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(DOGLCD)
119 119
     #error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU BQ111-A4"
120 120
   #endif
121 121
 

+ 1
- 1
Marlin/src/pins/pins_FORMBOT.h View File

@@ -146,7 +146,7 @@
146 146
 
147 147
 #define FAN_PIN             9
148 148
 
149
-#if !ENABLED(FILAMENT_RUNOUT_SENSOR)
149
+#if DISABLED(FILAMENT_RUNOUT_SENSOR)
150 150
   #define FAN1_PIN          4
151 151
 #endif
152 152
 

Loading…
Cancel
Save