Browse Source

Combine some conditions

Scott Lahteine 5 years ago
parent
commit
798dc68847
2 changed files with 7 additions and 7 deletions
  1. 3
    3
      Marlin/src/inc/Conditionals_LCD.h
  2. 4
    4
      Marlin/src/inc/Conditionals_post.h

+ 3
- 3
Marlin/src/inc/Conditionals_LCD.h View File

@@ -570,7 +570,7 @@
570 570
 #if defined(Z_PROBE_SERVO_NR) && Z_PROBE_SERVO_NR >= 0
571 571
   #define HAS_Z_SERVO_PROBE 1
572 572
 #endif
573
-#if HAS_Z_SERVO_PROBE || EITHER(SWITCHING_EXTRUDER, SWITCHING_NOZZLE)
573
+#if ANY(HAS_Z_SERVO_PROBE, SWITCHING_EXTRUDER, SWITCHING_NOZZLE)
574 574
   #define HAS_SERVO_ANGLES 1
575 575
 #endif
576 576
 #if !HAS_SERVO_ANGLES
@@ -584,7 +584,7 @@
584 584
   #define HAS_BED_PROBE 1
585 585
 #endif
586 586
 
587
-#if HAS_BED_PROBE || EITHER(PROBE_MANUALLY, MESH_BED_LEVELING)
587
+#if ANY(HAS_BED_PROBE, PROBE_MANUALLY, MESH_BED_LEVELING)
588 588
   #define PROBE_SELECTED 1
589 589
 #endif
590 590
 
@@ -682,7 +682,7 @@
682 682
 #endif
683 683
 
684 684
 // This flag indicates some kind of jerk storage is needed
685
-#if ENABLED(CLASSIC_JERK) || IS_KINEMATIC
685
+#if EITHER(CLASSIC_JERK, IS_KINEMATIC)
686 686
   #define HAS_CLASSIC_JERK 1
687 687
 #endif
688 688
 

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

@@ -1784,7 +1784,7 @@
1784 1784
   #define HAS_AUTO_CHAMBER_FAN 1
1785 1785
 #endif
1786 1786
 
1787
-#if HAS_AUTO_FAN_0 || HAS_AUTO_FAN_1 || HAS_AUTO_FAN_2 || HAS_AUTO_FAN_3 || HAS_AUTO_FAN_4 || HAS_AUTO_FAN_5 || HAS_AUTO_FAN_6 || HAS_AUTO_FAN_7 || HAS_AUTO_CHAMBER_FAN
1787
+#if ANY(HAS_AUTO_FAN_0, HAS_AUTO_FAN_1, HAS_AUTO_FAN_2, HAS_AUTO_FAN_3, HAS_AUTO_FAN_4, HAS_AUTO_FAN_5, HAS_AUTO_FAN_6, HAS_AUTO_FAN_7, HAS_AUTO_CHAMBER_FAN)
1788 1788
   #define HAS_AUTO_FAN 1
1789 1789
 #endif
1790 1790
 #define _FANOVERLAP(A,B) (A##_AUTO_FAN_PIN == E##B##_AUTO_FAN_PIN)
@@ -1892,13 +1892,13 @@
1892 1892
   #define HAS_MOTOR_CURRENT_PWM 1
1893 1893
 #endif
1894 1894
 
1895
-#if HAS_Z_MS_PINS || HAS_Z2_MS_PINS || HAS_Z3_MS_PINS || HAS_Z4_MS_PINS
1895
+#if ANY(HAS_Z_MS_PINS, HAS_Z2_MS_PINS, HAS_Z3_MS_PINS, HAS_Z4_MS_PINS)
1896 1896
   #define HAS_SOME_Z_MS_PINS 1
1897 1897
 #endif
1898
-#if HAS_E0_MS_PINS || HAS_E1_MS_PINS || HAS_E2_MS_PINS || HAS_E3_MS_PINS || HAS_E4_MS_PINS || HAS_E5_MS_PINS || HAS_E6_MS_PINS || HAS_E7_MS_PINS
1898
+#if ANY(HAS_E0_MS_PINS, HAS_E1_MS_PINS, HAS_E2_MS_PINS, HAS_E3_MS_PINS, HAS_E4_MS_PINS, HAS_E5_MS_PINS, HAS_E6_MS_PINS, HAS_E7_MS_PINS)
1899 1899
   #define HAS_SOME_E_MS_PINS 1
1900 1900
 #endif
1901
-#if HAS_X_MS_PINS || HAS_X2_MS_PINS || HAS_Y_MS_PINS || HAS_Y2_MS_PINS || HAS_SOME_Z_MICROSTEPS || HAS_SOME_E_MS_PINS
1901
+#if ANY(HAS_X_MS_PINS, HAS_X2_MS_PINS, HAS_Y_MS_PINS, HAS_Y2_MS_PINS, HAS_SOME_Z_MICROSTEPS, HAS_SOME_E_MS_PINS)
1902 1902
   #define HAS_MICROSTEPS 1
1903 1903
 #endif
1904 1904
 

Loading…
Cancel
Save