bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Combine some conditions

Browse Source
This commit is contained in:
Scott Lahteine 2020-05-11 23:25:39 -05:00
parent c2d66a5df0
commit 798dc68847
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/inc/Conditionals_LCD.h
View File

@ -570,7 +570,7 @@
#if defined(Z_PROBE_SERVO_NR) && Z_PROBE_SERVO_NR >= 0 #if defined(Z_PROBE_SERVO_NR) && Z_PROBE_SERVO_NR >= 0
#define HAS_Z_SERVO_PROBE 1 #define HAS_Z_SERVO_PROBE 1
#endif #endif
#if HAS_Z_SERVO_PROBE || EITHER(SWITCHING_EXTRUDER, SWITCHING_NOZZLE) #if ANY(HAS_Z_SERVO_PROBE, SWITCHING_EXTRUDER, SWITCHING_NOZZLE)
#define HAS_SERVO_ANGLES 1 #define HAS_SERVO_ANGLES 1
#endif #endif
#if !HAS_SERVO_ANGLES #if !HAS_SERVO_ANGLES
@ -584,7 +584,7 @@
#define HAS_BED_PROBE 1 #define HAS_BED_PROBE 1
#endif #endif
#if HAS_BED_PROBE || EITHER(PROBE_MANUALLY, MESH_BED_LEVELING) #if ANY(HAS_BED_PROBE, PROBE_MANUALLY, MESH_BED_LEVELING)
#define PROBE_SELECTED 1 #define PROBE_SELECTED 1
#endif #endif
@ -682,7 +682,7 @@
#endif #endif
// This flag indicates some kind of jerk storage is needed // This flag indicates some kind of jerk storage is needed
#if ENABLED(CLASSIC_JERK) || IS_KINEMATIC #if EITHER(CLASSIC_JERK, IS_KINEMATIC)
#define HAS_CLASSIC_JERK 1 #define HAS_CLASSIC_JERK 1
#endif #endif

8
Marlin/src/inc/Conditionals_post.h
View File

@ -1784,7 +1784,7 @@
#define HAS_AUTO_CHAMBER_FAN 1 #define HAS_AUTO_CHAMBER_FAN 1
#endif #endif
#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 #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)
#define HAS_AUTO_FAN 1 #define HAS_AUTO_FAN 1
#endif #endif
#define _FANOVERLAP(A,B) (A##_AUTO_FAN_PIN == E##B##_AUTO_FAN_PIN) #define _FANOVERLAP(A,B) (A##_AUTO_FAN_PIN == E##B##_AUTO_FAN_PIN)
@ -1892,13 +1892,13 @@
#define HAS_MOTOR_CURRENT_PWM 1 #define HAS_MOTOR_CURRENT_PWM 1
#endif #endif
#if HAS_Z_MS_PINS || HAS_Z2_MS_PINS || HAS_Z3_MS_PINS || HAS_Z4_MS_PINS #if ANY(HAS_Z_MS_PINS, HAS_Z2_MS_PINS, HAS_Z3_MS_PINS, HAS_Z4_MS_PINS)
#define HAS_SOME_Z_MS_PINS 1 #define HAS_SOME_Z_MS_PINS 1
#endif #endif
#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 #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)
#define HAS_SOME_E_MS_PINS 1 #define HAS_SOME_E_MS_PINS 1
#endif #endif
#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 #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)
#define HAS_MICROSTEPS 1 #define HAS_MICROSTEPS 1
#endif #endif