From adcb87f0db47672c28cfec9fda3354adac81fa99 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 1 Apr 2018 23:54:12 -0500
Subject: [PATCH] Z Endstop Servo => Z Probe Servo
---
.travis.yml | 4 ++--
Marlin/Configuration.h | 2 +-
Marlin/src/Marlin.cpp | 2 +-
Marlin/src/config/default/Configuration.h | 2 +-
.../examples/AlephObjects/TAZ4/Configuration.h | 2 +-
.../examples/AliExpress/CL-260/Configuration.h | 2 +-
.../src/config/examples/Anet/A6/Configuration.h | 2 +-
.../src/config/examples/Anet/A8/Configuration.h | 2 +-
.../config/examples/Azteeg/X5GT/Configuration.h | 2 +-
.../examples/BIBO/TouchX/cyclops/Configuration.h | 2 +-
.../examples/BIBO/TouchX/default/Configuration.h | 2 +-
.../config/examples/BQ/Hephestos/Configuration.h | 2 +-
.../examples/BQ/Hephestos_2/Configuration.h | 2 +-
.../config/examples/BQ/WITBOX/Configuration.h | 2 +-
.../src/config/examples/Cartesio/Configuration.h | 2 +-
.../examples/Creality/CR-10/Configuration.h | 2 +-
.../examples/Creality/CR-10S/Configuration.h | 2 +-
.../examples/Creality/CR-10mini/Configuration.h | 2 +-
.../examples/Creality/Ender-2/Configuration.h | 2 +-
.../examples/Creality/Ender-4/Configuration.h | 2 +-
Marlin/src/config/examples/Felix/Configuration.h | 2 +-
.../config/examples/Felix/DUAL/Configuration.h | 2 +-
.../examples/FolgerTech/i3-2020/Configuration.h | 2 +-
.../examples/Geeetech/GT2560/Configuration.h | 2 +-
.../Geeetech/I3_Pro_X-GT2560/Configuration.h | 2 +-
.../Prusa i3 Pro B/bltouch/Configuration.h | 2 +-
.../Prusa i3 Pro B/noprobe/Configuration.h | 2 +-
.../examples/Infitary/i3-M508/Configuration.h | 2 +-
.../config/examples/JGAurora/A5/Configuration.h | 2 +-
.../config/examples/MakerParts/Configuration.h | 2 +-
.../config/examples/Malyan/M150/Configuration.h | 2 +-
.../config/examples/Malyan/M200/Configuration.h | 2 +-
.../examples/Micromake/C1/basic/Configuration.h | 2 +-
.../Micromake/C1/enhanced/Configuration.h | 2 +-
.../config/examples/Mks/Sbase/Configuration.h | 2 +-
.../RepRapWorld/Megatronics/Configuration.h | 2 +-
.../src/config/examples/RigidBot/Configuration.h | 2 +-
Marlin/src/config/examples/SCARA/Configuration.h | 2 +-
.../src/config/examples/STM32F10/Configuration.h | 2 +-
.../config/examples/Sanguinololu/Configuration.h | 2 +-
.../src/config/examples/TheBorg/Configuration.h | 2 +-
.../src/config/examples/TinyBoy2/Configuration.h | 2 +-
.../config/examples/Tronxy/X1/Configuration.h | 2 +-
.../config/examples/Tronxy/X5S/Configuration.h | 2 +-
.../config/examples/Tronxy/XY100/Configuration.h | 2 +-
.../examples/UltiMachine/Archim2/Configuration.h | 2 +-
.../examples/Velleman/K8200/Configuration.h | 2 +-
.../examples/Velleman/K8400/Configuration.h | 2 +-
.../Velleman/K8400/Dual-head/Configuration.h | 2 +-
.../examples/Wanhao/Duplicator 6/Configuration.h | 2 +-
.../examples/adafruit/ST7565/Configuration.h | 2 +-
.../delta/FLSUN/auto_calibrate/Configuration.h | 2 +-
.../examples/delta/FLSUN/kossel/Configuration.h | 2 +-
.../delta/FLSUN/kossel_mini/Configuration.h | 2 +-
.../delta/Hatchbox_Alpha/Configuration.h | 2 +-
.../examples/delta/generic/Configuration.h | 2 +-
.../examples/delta/kossel_mini/Configuration.h | 2 +-
.../examples/delta/kossel_pro/Configuration.h | 2 +-
.../examples/delta/kossel_xl/Configuration.h | 2 +-
.../examples/gCreate/gMax1.5+/Configuration.h | 2 +-
.../src/config/examples/makibox/Configuration.h | 2 +-
.../examples/stm32f103ret6/Configuration.h | 2 +-
.../examples/tvrrug/Round2/Configuration.h | 2 +-
Marlin/src/config/examples/wt150/Configuration.h | 2 +-
Marlin/src/core/utility.cpp | 2 +-
Marlin/src/gcode/config/M43.cpp | 10 +++++-----
Marlin/src/inc/Conditionals_LCD.h | 10 +++++-----
Marlin/src/inc/Conditionals_post.h | 4 ++--
Marlin/src/inc/SanityCheck.h | 16 +++++++++-------
Marlin/src/lcd/ultralcd.cpp | 12 ++++++------
Marlin/src/module/probe.cpp | 12 ++++++------
Marlin/src/module/probe.h | 2 +-
Marlin/src/module/servo.h | 6 +++---
73 files changed, 103 insertions(+), 101 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ac6777fb45..d7df3d9392 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,7 +99,7 @@ script:
# ...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES
#
- restore_configs
- - opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
+ - opt_enable NUM_SERVOS Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
- opt_set NUM_SERVOS 1
- opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT
- opt_enable_adv NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET
@@ -376,7 +376,7 @@ script:
# Test a Servo Probe
#
- restore_configs
- - opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
+ - opt_enable NUM_SERVOS Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
- opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS
- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
#
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 2fce1f70b5..bf60efc9e2 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -667,7 +667,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp
index 03ff2bac5c..23b7079057 100644
--- a/Marlin/src/Marlin.cpp
+++ b/Marlin/src/Marlin.cpp
@@ -754,7 +754,7 @@ void setup() {
servo_init();
#endif
- #if HAS_Z_SERVO_ENDSTOP
+ #if HAS_Z_SERVO_PROBE
servo_probe_init();
#endif
diff --git a/Marlin/src/config/default/Configuration.h b/Marlin/src/config/default/Configuration.h
index 2fce1f70b5..bf60efc9e2 100644
--- a/Marlin/src/config/default/Configuration.h
+++ b/Marlin/src/config/default/Configuration.h
@@ -667,7 +667,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
index bfd10713c1..51de97c23e 100644
--- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
+++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
@@ -687,7 +687,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
index e156937478..9f7beee4c3 100644
--- a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
+++ b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
@@ -667,7 +667,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Anet/A6/Configuration.h b/Marlin/src/config/examples/Anet/A6/Configuration.h
index e1c5552ee1..bdb7896d93 100644
--- a/Marlin/src/config/examples/Anet/A6/Configuration.h
+++ b/Marlin/src/config/examples/Anet/A6/Configuration.h
@@ -715,7 +715,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Anet/A8/Configuration.h b/Marlin/src/config/examples/Anet/A8/Configuration.h
index babf9d1cc4..69c490244e 100644
--- a/Marlin/src/config/examples/Anet/A8/Configuration.h
+++ b/Marlin/src/config/examples/Anet/A8/Configuration.h
@@ -674,7 +674,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
index b6fed73370..9052301b61 100644
--- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
+++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
@@ -667,7 +667,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
index d476ab29f1..18c1be7997 100644
--- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
+++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
@@ -667,7 +667,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
index dbe98b7a5e..ca880aca55 100644
--- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
+++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
@@ -667,7 +667,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h
index 6f8161d083..ec425cf262 100644
--- a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h
+++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h
@@ -655,7 +655,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
index a26fd7111d..e5d33e2b6e 100644
--- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
+++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
@@ -668,7 +668,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h
index 971ebb7154..8c6fa1606f 100644
--- a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h
+++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h
@@ -655,7 +655,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Cartesio/Configuration.h b/Marlin/src/config/examples/Cartesio/Configuration.h
index 142a194df6..6cf816eef0 100644
--- a/Marlin/src/config/examples/Cartesio/Configuration.h
+++ b/Marlin/src/config/examples/Cartesio/Configuration.h
@@ -666,7 +666,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration.h b/Marlin/src/config/examples/Creality/CR-10/Configuration.h
index fca2c838ee..d15c2edf40 100755
--- a/Marlin/src/config/examples/Creality/CR-10/Configuration.h
+++ b/Marlin/src/config/examples/Creality/CR-10/Configuration.h
@@ -677,7 +677,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h
index 28a8ff5143..432af34faf 100644
--- a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h
+++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h
@@ -667,7 +667,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
index 3b490805f7..ffd220830d 100644
--- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
+++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
@@ -686,7 +686,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h
index 5bb4aa0d89..8d6640271e 100644
--- a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h
+++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h
@@ -671,7 +671,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h
index 9f9a7765ff..be8f464549 100644
--- a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h
+++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h
@@ -677,7 +677,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Felix/Configuration.h b/Marlin/src/config/examples/Felix/Configuration.h
index 8c20d1384a..8e8d529ad3 100644
--- a/Marlin/src/config/examples/Felix/Configuration.h
+++ b/Marlin/src/config/examples/Felix/Configuration.h
@@ -649,7 +649,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Felix/DUAL/Configuration.h b/Marlin/src/config/examples/Felix/DUAL/Configuration.h
index 623e9c5189..a2274ee221 100644
--- a/Marlin/src/config/examples/Felix/DUAL/Configuration.h
+++ b/Marlin/src/config/examples/Felix/DUAL/Configuration.h
@@ -649,7 +649,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
index e02e37ab70..2693644b2a 100644
--- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
+++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
@@ -673,7 +673,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
#define Z_SERVO_ANGLES {40,85} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
index b3bfebf793..118de9617a 100644
--- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
@@ -682,7 +682,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
index ec4e08e5ab..81e0c17db5 100644
--- a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
@@ -667,7 +667,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 1 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 1 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {10,90} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
index 888aec275b..78d4c18e93 100644
--- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
@@ -683,7 +683,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
index 3b1e718375..04b0955c04 100644
--- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
@@ -682,7 +682,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
index a812dc29d9..ce6571ccb2 100644
--- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
+++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
@@ -671,7 +671,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration.h b/Marlin/src/config/examples/JGAurora/A5/Configuration.h
index 0a62c72bb9..51c9412a77 100644
--- a/Marlin/src/config/examples/JGAurora/A5/Configuration.h
+++ b/Marlin/src/config/examples/JGAurora/A5/Configuration.h
@@ -679,7 +679,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/MakerParts/Configuration.h b/Marlin/src/config/examples/MakerParts/Configuration.h
index 978fb4398d..e4063e34e2 100644
--- a/Marlin/src/config/examples/MakerParts/Configuration.h
+++ b/Marlin/src/config/examples/MakerParts/Configuration.h
@@ -687,7 +687,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration.h b/Marlin/src/config/examples/Malyan/M150/Configuration.h
index 582963ad1a..c91e5b710f 100644
--- a/Marlin/src/config/examples/Malyan/M150/Configuration.h
+++ b/Marlin/src/config/examples/Malyan/M150/Configuration.h
@@ -687,7 +687,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration.h b/Marlin/src/config/examples/Malyan/M200/Configuration.h
index dee4d485f3..11484ce581 100644
--- a/Marlin/src/config/examples/Malyan/M200/Configuration.h
+++ b/Marlin/src/config/examples/Malyan/M200/Configuration.h
@@ -666,7 +666,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
index ccfa158fcb..d60065a725 100644
--- a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
+++ b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
@@ -671,7 +671,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
index e2a64cd6ec..94a50eaa30 100644
--- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
+++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
@@ -671,7 +671,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration.h b/Marlin/src/config/examples/Mks/Sbase/Configuration.h
index f0d40f7701..9abda1eabb 100644
--- a/Marlin/src/config/examples/Mks/Sbase/Configuration.h
+++ b/Marlin/src/config/examples/Mks/Sbase/Configuration.h
@@ -667,7 +667,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
index 62c1af9ef8..a5a660abad 100644
--- a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
@@ -667,7 +667,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/RigidBot/Configuration.h b/Marlin/src/config/examples/RigidBot/Configuration.h
index 92f5aff761..9b89005e1b 100644
--- a/Marlin/src/config/examples/RigidBot/Configuration.h
+++ b/Marlin/src/config/examples/RigidBot/Configuration.h
@@ -665,7 +665,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/SCARA/Configuration.h b/Marlin/src/config/examples/SCARA/Configuration.h
index 7968bb2a7f..bc335fa948 100644
--- a/Marlin/src/config/examples/SCARA/Configuration.h
+++ b/Marlin/src/config/examples/SCARA/Configuration.h
@@ -678,7 +678,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/STM32F10/Configuration.h b/Marlin/src/config/examples/STM32F10/Configuration.h
index 3cac56438c..185480a363 100644
--- a/Marlin/src/config/examples/STM32F10/Configuration.h
+++ b/Marlin/src/config/examples/STM32F10/Configuration.h
@@ -670,7 +670,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration.h b/Marlin/src/config/examples/Sanguinololu/Configuration.h
index a62c00da60..3b867baaae 100644
--- a/Marlin/src/config/examples/Sanguinololu/Configuration.h
+++ b/Marlin/src/config/examples/Sanguinololu/Configuration.h
@@ -698,7 +698,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/TheBorg/Configuration.h b/Marlin/src/config/examples/TheBorg/Configuration.h
index 5cd53aeb76..cad767649c 100644
--- a/Marlin/src/config/examples/TheBorg/Configuration.h
+++ b/Marlin/src/config/examples/TheBorg/Configuration.h
@@ -667,7 +667,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration.h b/Marlin/src/config/examples/TinyBoy2/Configuration.h
index 794e675cc1..368fb4fb7d 100644
--- a/Marlin/src/config/examples/TinyBoy2/Configuration.h
+++ b/Marlin/src/config/examples/TinyBoy2/Configuration.h
@@ -718,7 +718,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Tronxy/X1/Configuration.h b/Marlin/src/config/examples/Tronxy/X1/Configuration.h
index 39946f68ca..8c7456c7e7 100644
--- a/Marlin/src/config/examples/Tronxy/X1/Configuration.h
+++ b/Marlin/src/config/examples/Tronxy/X1/Configuration.h
@@ -667,7 +667,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h
index f3dba6f48b..15e92b7db4 100644
--- a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h
+++ b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h
@@ -667,7 +667,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h
index 8f6d0a668e..7f1c918c74 100644
--- a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h
+++ b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h
@@ -678,7 +678,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
index cb64c55e81..f03a2ea934 100644
--- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
+++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
@@ -667,7 +667,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration.h b/Marlin/src/config/examples/Velleman/K8200/Configuration.h
index 0a52c67f6e..86bd299c97 100644
--- a/Marlin/src/config/examples/Velleman/K8200/Configuration.h
+++ b/Marlin/src/config/examples/Velleman/K8200/Configuration.h
@@ -696,7 +696,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Configuration.h
index 0e5d5a81ad..65f3850160 100644
--- a/Marlin/src/config/examples/Velleman/K8400/Configuration.h
+++ b/Marlin/src/config/examples/Velleman/K8400/Configuration.h
@@ -667,7 +667,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
index e7966d1d88..f0773422b7 100644
--- a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
+++ b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
@@ -667,7 +667,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
index 3c70a8afab..b16aea9f64 100644
--- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
+++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
@@ -677,7 +677,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h
index 03f5291180..054e15fc4d 100644
--- a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h
+++ b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h
@@ -667,7 +667,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
index 7aa8d9375d..1509c98767 100644
--- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
@@ -747,7 +747,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
index 275f45ae17..019c92de15 100644
--- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
@@ -747,7 +747,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
index 0f10433ada..fa380b9fe0 100644
--- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
@@ -747,7 +747,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
index 0bade849d7..b9d6e8ee14 100644
--- a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
+++ b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
@@ -752,7 +752,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/delta/generic/Configuration.h b/Marlin/src/config/examples/delta/generic/Configuration.h
index a7537abd96..184058ad26 100644
--- a/Marlin/src/config/examples/delta/generic/Configuration.h
+++ b/Marlin/src/config/examples/delta/generic/Configuration.h
@@ -737,7 +737,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
index fc23c8ac3b..9acd43f0ad 100644
--- a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
@@ -737,7 +737,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
index a2f0c57e10..3496cf14a8 100644
--- a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
@@ -730,7 +730,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
index ed65400ee2..e36ab34bb0 100644
--- a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
@@ -749,7 +749,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
index 53121edae9..627f1fd379 100644
--- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
+++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
@@ -680,7 +680,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/makibox/Configuration.h b/Marlin/src/config/examples/makibox/Configuration.h
index 98c884ca1b..2a2f421dd7 100644
--- a/Marlin/src/config/examples/makibox/Configuration.h
+++ b/Marlin/src/config/examples/makibox/Configuration.h
@@ -670,7 +670,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/stm32f103ret6/Configuration.h b/Marlin/src/config/examples/stm32f103ret6/Configuration.h
index 3602985015..7e329e1dc4 100644
--- a/Marlin/src/config/examples/stm32f103ret6/Configuration.h
+++ b/Marlin/src/config/examples/stm32f103ret6/Configuration.h
@@ -669,7 +669,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h
index 667de02e4a..bedacdedf1 100644
--- a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h
+++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h
@@ -662,7 +662,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/config/examples/wt150/Configuration.h b/Marlin/src/config/examples/wt150/Configuration.h
index 459ffe965d..2ae253deb4 100644
--- a/Marlin/src/config/examples/wt150/Configuration.h
+++ b/Marlin/src/config/examples/wt150/Configuration.h
@@ -672,7 +672,7 @@
/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
*/
-//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector.
+//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/**
diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
index 3a566a16e7..d8873173ef 100644
--- a/Marlin/src/core/utility.cpp
+++ b/Marlin/src/core/utility.cpp
@@ -283,7 +283,7 @@ void safe_delay(millis_t ms) {
SERIAL_ECHOLNPGM("FIX_MOUNTED_PROBE");
#elif ENABLED(BLTOUCH)
SERIAL_ECHOLNPGM("BLTOUCH");
- #elif HAS_Z_SERVO_ENDSTOP
+ #elif HAS_Z_SERVO_PROBE
SERIAL_ECHOLNPGM("SERVO PROBE");
#elif ENABLED(Z_PROBE_SLED)
SERIAL_ECHOLNPGM("Z_PROBE_SLED");
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index 6247225738..c000468022 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -29,7 +29,7 @@
#include "../../pins/pinsDebug.h"
#include "../../module/endstops.h"
-#if HAS_Z_SERVO_ENDSTOP
+#if HAS_Z_SERVO_PROBE
#include "../../module/probe.h"
#include "../../module/servo.h"
#endif
@@ -92,14 +92,14 @@ inline void servo_probe_test() {
SERIAL_ERROR_START();
SERIAL_ERRORLNPGM("SERVO not setup");
- #elif !HAS_Z_SERVO_ENDSTOP
+ #elif !HAS_Z_SERVO_PROBE
SERIAL_ERROR_START();
- SERIAL_ERRORLNPGM("Z_ENDSTOP_SERVO_NR not setup");
+ SERIAL_ERRORLNPGM("Z_PROBE_SERVO_NR not setup");
- #else // HAS_Z_SERVO_ENDSTOP
+ #else // HAS_Z_SERVO_PROBE
- const uint8_t probe_index = parser.byteval('P', Z_ENDSTOP_SERVO_NR);
+ const uint8_t probe_index = parser.byteval('P', Z_PROBE_SERVO_NR);
SERIAL_PROTOCOLLNPGM("Servo probe test");
SERIAL_PROTOCOLLNPAIR(". using index: ", probe_index);
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index c49cbbec90..707be5fcfa 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -458,11 +458,11 @@
* and uses "special" angles for its state.
*/
#if ENABLED(BLTOUCH)
- #ifndef Z_ENDSTOP_SERVO_NR
- #define Z_ENDSTOP_SERVO_NR 0
+ #ifndef Z_PROBE_SERVO_NR
+ #define Z_PROBE_SERVO_NR 0
#endif
#ifndef NUM_SERVOS
- #define NUM_SERVOS (Z_ENDSTOP_SERVO_NR + 1)
+ #define NUM_SERVOS (Z_PROBE_SERVO_NR + 1)
#endif
#undef DEACTIVATE_SERVOS_AFTER_MOVE
#if NUM_SERVOS == 1
@@ -497,12 +497,12 @@
/**
* Set a flag for a servo probe
*/
-#define HAS_Z_SERVO_ENDSTOP (defined(Z_ENDSTOP_SERVO_NR) && Z_ENDSTOP_SERVO_NR >= 0)
+#define HAS_Z_SERVO_PROBE (defined(Z_PROBE_SERVO_NR) && Z_PROBE_SERVO_NR >= 0)
/**
* Set a flag for any enabled probe
*/
-#define PROBE_SELECTED (ENABLED(PROBE_MANUALLY) || ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED) || ENABLED(SOLENOID_PROBE))
+#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))
/**
* Clear probe pin settings when no probe is selected
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index c838690aef..e7c371fcbb 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -901,8 +901,8 @@
*/
#if HAS_SERVOS
- #ifndef Z_ENDSTOP_SERVO_NR
- #define Z_ENDSTOP_SERVO_NR -1
+ #ifndef Z_PROBE_SERVO_NR
+ #define Z_PROBE_SERVO_NR -1
#endif
#endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 1989b169af..a7b8a80dbb 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -95,6 +95,8 @@
#error "SERVO_ENDSTOP_ANGLES is deprecated. Use Z_SERVO_ANGLES instead."
#elif defined(X_ENDSTOP_SERVO_NR) || defined(Y_ENDSTOP_SERVO_NR)
#error "X_ENDSTOP_SERVO_NR and Y_ENDSTOP_SERVO_NR are deprecated and should be removed."
+#elif defined(Z_ENDSTOP_SERVO_NR)
+ #error "Z_ENDSTOP_SERVO_NR is now Z_PROBE_SERVO_NR. Please update your configuration."
#elif defined(DEFAULT_XYJERK)
#error "DEFAULT_XYJERK is deprecated. Use DEFAULT_XJERK and DEFAULT_YJERK instead."
#elif defined(XY_TRAVEL_SPEED)
@@ -630,8 +632,8 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
/**
* Servo deactivation depends on servo endstops, switching nozzle, or switching extruder
*/
-#if ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE) && !HAS_Z_SERVO_ENDSTOP && !defined(SWITCHING_NOZZLE_SERVO_NR) && !defined(SWITCHING_EXTRUDER_SERVO_NR)
- #error "Z_ENDSTOP_SERVO_NR, switching nozzle, or switching extruder is required for DEACTIVATE_SERVOS_AFTER_MOVE."
+#if ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE) && !HAS_Z_SERVO_PROBE && !defined(SWITCHING_NOZZLE_SERVO_NR) && !defined(SWITCHING_EXTRUDER_SERVO_NR)
+ #error "Z_PROBE_SERVO_NR, switching nozzle, or switching extruder is required for DEACTIVATE_SERVOS_AFTER_MOVE."
#endif
/**
@@ -697,7 +699,7 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
#if 1 < 0 \
+ ENABLED(PROBE_MANUALLY) \
+ ENABLED(FIX_MOUNTED_PROBE) \
- + (HAS_Z_SERVO_ENDSTOP && DISABLED(BLTOUCH)) \
+ + (HAS_Z_SERVO_PROBE && DISABLED(BLTOUCH)) \
+ ENABLED(BLTOUCH) \
+ ENABLED(SOLENOID_PROBE) \
+ ENABLED(Z_PROBE_ALLEN_KEY) \
@@ -728,11 +730,11 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
/**
* NUM_SERVOS is required for a Z servo probe
*/
- #if HAS_Z_SERVO_ENDSTOP
+ #if HAS_Z_SERVO_PROBE
#ifndef NUM_SERVOS
- #error "You must set NUM_SERVOS for a Z servo probe (Z_ENDSTOP_SERVO_NR)."
- #elif Z_ENDSTOP_SERVO_NR >= NUM_SERVOS
- #error "Z_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS."
+ #error "You must set NUM_SERVOS for a Z servo probe (Z_PROBE_SERVO_NR)."
+ #elif Z_PROBE_SERVO_NR >= NUM_SERVOS
+ #error "Z_PROBE_SERVO_NR must be smaller than NUM_SERVOS."
#endif
#endif
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 53febec5e1..03495ab76d 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -893,10 +893,10 @@ void kill_screen(const char* lcd_msg) {
// ^ Main
//
MENU_BACK(MSG_MAIN);
- MENU_ITEM(gcode, MSG_BLTOUCH_RESET, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_RESET)));
- MENU_ITEM(gcode, MSG_BLTOUCH_SELFTEST, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_SELFTEST)));
- MENU_ITEM(gcode, MSG_BLTOUCH_DEPLOY, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_DEPLOY)));
- MENU_ITEM(gcode, MSG_BLTOUCH_STOW, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_STOW)));
+ MENU_ITEM(gcode, MSG_BLTOUCH_RESET, PSTR("M280 P" STRINGIFY(Z_PROBE_SERVO_NR) " S" STRINGIFY(BLTOUCH_RESET)));
+ MENU_ITEM(gcode, MSG_BLTOUCH_SELFTEST, PSTR("M280 P" STRINGIFY(Z_PROBE_SERVO_NR) " S" STRINGIFY(BLTOUCH_SELFTEST)));
+ MENU_ITEM(gcode, MSG_BLTOUCH_DEPLOY, PSTR("M280 P" STRINGIFY(Z_PROBE_SERVO_NR) " S" STRINGIFY(BLTOUCH_DEPLOY)));
+ MENU_ITEM(gcode, MSG_BLTOUCH_STOW, PSTR("M280 P" STRINGIFY(Z_PROBE_SERVO_NR) " S" STRINGIFY(BLTOUCH_STOW)));
END_MENU();
}
@@ -2686,9 +2686,9 @@ void kill_screen(const char* lcd_msg) {
// BLTouch Self-Test and Reset
//
#if ENABLED(BLTOUCH)
- MENU_ITEM(gcode, MSG_BLTOUCH_SELFTEST, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_SELFTEST)));
+ MENU_ITEM(gcode, MSG_BLTOUCH_SELFTEST, PSTR("M280 P" STRINGIFY(Z_PROBE_SERVO_NR) " S" STRINGIFY(BLTOUCH_SELFTEST)));
if (!endstops.z_probe_enabled && TEST_BLTOUCH())
- MENU_ITEM(gcode, MSG_BLTOUCH_RESET, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_RESET)));
+ MENU_ITEM(gcode, MSG_BLTOUCH_RESET, PSTR("M280 P" STRINGIFY(Z_PROBE_SERVO_NR) " S" STRINGIFY(BLTOUCH_RESET)));
#endif
//
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 2f70a28667..9375ff247c 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -52,7 +52,7 @@
float zprobe_zoffset; // Initialized by settings.load()
-#if HAS_Z_SERVO_ENDSTOP
+#if HAS_Z_SERVO_PROBE
#include "../module/servo.h"
const int z_servo_angle[2] = Z_SERVO_ANGLES;
#endif
@@ -299,7 +299,7 @@ float zprobe_zoffset; // Initialized by settings.load()
#if ENABLED(BLTOUCH)
void bltouch_command(const int angle) {
- MOVE_SERVO(Z_ENDSTOP_SERVO_NR, angle); // Give the BL-Touch the command and wait
+ MOVE_SERVO(Z_PROBE_SERVO_NR, angle); // Give the BL-Touch the command and wait
safe_delay(BLTOUCH_DELAY);
}
@@ -433,9 +433,9 @@ bool set_probe_deployed(const bool deploy) {
dock_sled(!deploy);
- #elif HAS_Z_SERVO_ENDSTOP && DISABLED(BLTOUCH)
+ #elif HAS_Z_SERVO_PROBE && DISABLED(BLTOUCH)
- MOVE_SERVO(Z_ENDSTOP_SERVO_NR, z_servo_angle[deploy ? 0 : 1]);
+ MOVE_SERVO(Z_PROBE_SERVO_NR, z_servo_angle[deploy ? 0 : 1]);
#elif ENABLED(Z_PROBE_ALLEN_KEY)
@@ -700,7 +700,7 @@ float probe_pt(const float &rx, const float &ry, const ProbePtRaise raise_after/
return measured_z;
}
-#if HAS_Z_SERVO_ENDSTOP
+#if HAS_Z_SERVO_PROBE
void servo_probe_init() {
/**
@@ -715,6 +715,6 @@ float probe_pt(const float &rx, const float &ry, const ProbePtRaise raise_after/
STOW_Z_SERVO();
}
-#endif // HAS_Z_SERVO_ENDSTOP
+#endif // HAS_Z_SERVO_PROBE
#endif // HAS_BED_PROBE
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index 0a3892eca3..655fad8701 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -48,7 +48,7 @@
#define STOW_PROBE()
#endif
-#if HAS_Z_SERVO_ENDSTOP
+#if HAS_Z_SERVO_PROBE
extern const int z_servo_angle[2];
void servo_probe_init();
#endif
diff --git a/Marlin/src/module/servo.h b/Marlin/src/module/servo.h
index cb5080e2b0..77d3f6eb87 100644
--- a/Marlin/src/module/servo.h
+++ b/Marlin/src/module/servo.h
@@ -36,9 +36,9 @@ extern void servo_init();
#include "../inc/MarlinConfig.h"
-#if HAS_Z_SERVO_ENDSTOP
- #define DEPLOY_Z_SERVO() MOVE_SERVO(Z_ENDSTOP_SERVO_NR, z_servo_angle[0])
- #define STOW_Z_SERVO() MOVE_SERVO(Z_ENDSTOP_SERVO_NR, z_servo_angle[1])
+#if HAS_Z_SERVO_PROBE
+ #define DEPLOY_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, z_servo_angle[0])
+ #define STOW_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, z_servo_angle[1])
#endif
#endif // _SERVO_H_
--
GitLab