Minor cleanup of Conditionals.h

This commit is contained in:
Scott Lahteine 2015-07-30 20:47:22 -07:00 committed by Richard Wackerbarth
parent 1f63293624
commit 9334479aeb

View file

@ -513,7 +513,7 @@
#define HAS_BUZZER ((defined(BEEPER) && BEEPER >= 0) || defined(LCD_USE_I2C_BUZZER)) #define HAS_BUZZER ((defined(BEEPER) && BEEPER >= 0) || defined(LCD_USE_I2C_BUZZER))
#if defined( NUM_SERVOS ) && (NUM_SERVOS > 0) #if defined(NUM_SERVOS) && NUM_SERVOS > 0
#ifndef X_ENDSTOP_SERVO_NR #ifndef X_ENDSTOP_SERVO_NR
#define X_ENDSTOP_SERVO_NR -1 #define X_ENDSTOP_SERVO_NR -1
#endif #endif
@ -523,8 +523,7 @@
#ifndef Z_ENDSTOP_SERVO_NR #ifndef Z_ENDSTOP_SERVO_NR
#define Z_ENDSTOP_SERVO_NR -1 #define Z_ENDSTOP_SERVO_NR -1
#endif #endif
#if (X_ENDSTOP_SERVO_NR >= 0) || (Y_ENDSTOP_SERVO_NR >= 0) || (Z_ENDSTOP_SERVO_NR >= 0) #if X_ENDSTOP_SERVO_NR >= 0 || Y_ENDSTOP_SERVO_NR >= 0 || Z_ENDSTOP_SERVO_NR >= 0
#define SERVO_ENDSTOPS {X_ENDSTOP_SERVO_NR, Y_ENDSTOP_SERVO_NR, Z_ENDSTOP_SERVO_NR}
#define HAS_SERVO_ENDSTOPS true #define HAS_SERVO_ENDSTOPS true
#define SERVO_ENDSTOP_IDS { X_ENDSTOP_SERVO_NR, Y_ENDSTOP_SERVO_NR, Z_ENDSTOP_SERVO_NR } #define SERVO_ENDSTOP_IDS { X_ENDSTOP_SERVO_NR, Y_ENDSTOP_SERVO_NR, Z_ENDSTOP_SERVO_NR }
#endif #endif