|
@@ -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
|