Browse Source

Reorganize some conditionals

Scott Lahteine 6 years ago
parent
commit
f790b4bc0a
2 changed files with 15 additions and 28 deletions
  1. 10
    6
      Marlin/src/inc/Conditionals_LCD.h
  2. 5
    22
      Marlin/src/inc/Conditionals_post.h

+ 10
- 6
Marlin/src/inc/Conditionals_LCD.h View File

@@ -500,18 +500,22 @@
500 500
 #define HAS_Z_SERVO_PROBE (defined(Z_PROBE_SERVO_NR) && Z_PROBE_SERVO_NR >= 0)
501 501
 
502 502
 /**
503
- * Set a flag for any enabled probe
503
+ * Set flags for enabled probes
504 504
  */
505
-#define PROBE_SELECTED (ENABLED(PROBE_MANUALLY) || ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_PROBE || ENABLED(Z_PROBE_SLED) || ENABLED(SOLENOID_PROBE))
505
+#define HAS_BED_PROBE (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_PROBE || ENABLED(Z_PROBE_SLED) || ENABLED(SOLENOID_PROBE))
506
+#define PROBE_SELECTED (HAS_BED_PROBE || ENABLED(PROBE_MANUALLY))
506 507
 
507
-/**
508
- * Clear probe pin settings when no probe is selected
509
- */
510
-#if !PROBE_SELECTED || ENABLED(PROBE_MANUALLY)
508
+#if !HAS_BED_PROBE
509
+  // Clear probe pin settings when no probe is selected
511 510
   #undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
512 511
   #undef Z_MIN_PROBE_ENDSTOP
512
+#elif ENABLED(Z_PROBE_ALLEN_KEY)
513
+  // Extra test for Allen Key Probe
514
+  #define PROBE_IS_TRIGGERED_WHEN_STOWED_TEST
513 515
 #endif
514 516
 
517
+#define HOMING_Z_WITH_PROBE (HAS_BED_PROBE && Z_HOME_DIR < 0 && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN))
518
+
515 519
 #define HAS_SOFTWARE_ENDSTOPS (ENABLED(MIN_SOFTWARE_ENDSTOPS) || ENABLED(MAX_SOFTWARE_ENDSTOPS))
516 520
 #define HAS_RESUME_CONTINUE (ENABLED(NEWPANEL) || ENABLED(EMERGENCY_PARSER))
517 521
 #define HAS_COLOR_LEDS (ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(NEOPIXEL_LED))

+ 5
- 22
Marlin/src/inc/Conditionals_post.h View File

@@ -167,11 +167,6 @@
167 167
 #endif
168 168
 
169 169
 /**
170
- * Auto Bed Leveling and Z Probe Repeatability Test
171
- */
172
-#define HOMING_Z_WITH_PROBE (HAS_BED_PROBE && Z_HOME_DIR < 0 && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN))
173
-
174
-/**
175 170
  * Z Sled Probe requires Z_SAFE_HOMING
176 171
  */
177 172
 #if ENABLED(Z_PROBE_SLED)
@@ -814,11 +809,15 @@
814 809
 #define HAS_CONTROLLER_FAN (PIN_EXISTS(CONTROLLER_FAN))
815 810
 
816 811
 // Servos
817
-#define HAS_SERVOS (defined(NUM_SERVOS) && NUM_SERVOS > 0)
818 812
 #define HAS_SERVO_0 (PIN_EXISTS(SERVO0))
819 813
 #define HAS_SERVO_1 (PIN_EXISTS(SERVO1))
820 814
 #define HAS_SERVO_2 (PIN_EXISTS(SERVO2))
821 815
 #define HAS_SERVO_3 (PIN_EXISTS(SERVO3))
816
+#define HAS_SERVOS (defined(NUM_SERVOS) && NUM_SERVOS > 0)
817
+
818
+#if HAS_SERVOS && !defined(Z_PROBE_SERVO_NR)
819
+  #define Z_PROBE_SERVO_NR -1
820
+#endif
822 821
 
823 822
 // Sensors
824 823
 #define HAS_FILAMENT_WIDTH_SENSOR (PIN_EXISTS(FILWIDTH))
@@ -942,22 +941,6 @@
942 941
 #define HAS_FANMUX PIN_EXISTS(FANMUX0)
943 942
 
944 943
 /**
945
- * Servos and probes
946
- */
947
-
948
-#if HAS_SERVOS
949
-  #ifndef Z_PROBE_SERVO_NR
950
-    #define Z_PROBE_SERVO_NR -1
951
-  #endif
952
-#endif
953
-
954
-#define HAS_BED_PROBE (PROBE_SELECTED && DISABLED(PROBE_MANUALLY))
955
-
956
-#if ENABLED(Z_PROBE_ALLEN_KEY)
957
-  #define PROBE_IS_TRIGGERED_WHEN_STOWED_TEST
958
-#endif
959
-
960
-/**
961 944
  * Bed Probe dependencies
962 945
  */
963 946
 #if HAS_BED_PROBE

Loading…
Cancel
Save