SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Z Endstop Servo => Z Probe Servo

Browse source
This commit is contained in:
Scott Lahteine 2018-04-01 23:54:12 -05:00
parent e3bbd70664
commit adcb87f0db
73 changed files with 103 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -99,7 +99,7 @@ script:
# ...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES # ...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES
# #
- restore_configs - 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_set NUM_SERVOS 1
- opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT - 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 - opt_enable_adv NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET
@ -376,7 +376,7 @@ script:
# Test a Servo Probe # Test a Servo Probe
# #
- restore_configs - 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 - opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS
- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM} - build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
# #

2
Marlin/Configuration.h
View file

@ -667,7 +667,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/Marlin.cpp
View file

@ -754,7 +754,7 @@ void setup() {
servo_init(); servo_init();
#endif #endif
#if HAS_Z_SERVO_ENDSTOP #if HAS_Z_SERVO_PROBE
servo_probe_init(); servo_probe_init();
#endif #endif

2
Marlin/src/config/default/Configuration.h
View file

@ -667,7 +667,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
View file

@ -687,7 +687,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
View file

@ -667,7 +667,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Anet/A6/Configuration.h
View file

@ -715,7 +715,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Anet/A8/Configuration.h
View file

@ -674,7 +674,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
View file

@ -667,7 +667,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
View file

@ -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. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
View file

@ -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. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/BQ/Hephestos/Configuration.h
View file

@ -655,7 +655,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
View file

@ -668,7 +668,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/BQ/WITBOX/Configuration.h
View file

@ -655,7 +655,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Cartesio/Configuration.h
View file

@ -666,7 +666,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Creality/CR-10/Configuration.h
View file

@ -677,7 +677,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Creality/CR-10S/Configuration.h
View file

@ -667,7 +667,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
View file

@ -686,7 +686,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Creality/Ender-2/Configuration.h
View file

@ -671,7 +671,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Creality/Ender-4/Configuration.h
View file

@ -677,7 +677,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Felix/Configuration.h
View file

@ -649,7 +649,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Felix/DUAL/Configuration.h
View file

@ -649,7 +649,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
View file

@ -673,7 +673,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 #define Z_SERVO_ANGLES {40,85} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
View file

@ -682,7 +682,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
View file

@ -667,7 +667,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {10,90} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
View file

@ -683,7 +683,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
View file

@ -682,7 +682,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
View file

@ -671,7 +671,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/JGAurora/A5/Configuration.h
View file

@ -679,7 +679,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/MakerParts/Configuration.h
View file

@ -687,7 +687,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Malyan/M150/Configuration.h
View file

@ -687,7 +687,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Malyan/M200/Configuration.h
View file

@ -666,7 +666,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
View file

@ -671,7 +671,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
View file

@ -671,7 +671,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Mks/Sbase/Configuration.h
View file

@ -667,7 +667,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
View file

@ -667,7 +667,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/RigidBot/Configuration.h
View file

@ -665,7 +665,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/SCARA/Configuration.h
View file

@ -678,7 +678,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/STM32F10/Configuration.h
View file

@ -670,7 +670,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Sanguinololu/Configuration.h
View file

@ -698,7 +698,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/TheBorg/Configuration.h
View file

@ -667,7 +667,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/TinyBoy2/Configuration.h
View file

@ -718,7 +718,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Tronxy/X1/Configuration.h
View file

@ -667,7 +667,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Tronxy/X5S/Configuration.h
View file

@ -667,7 +667,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Tronxy/XY100/Configuration.h
View file

@ -678,7 +678,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
View file

@ -667,7 +667,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Velleman/K8200/Configuration.h
View file

@ -696,7 +696,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Velleman/K8400/Configuration.h
View file

@ -667,7 +667,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
View file

@ -667,7 +667,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
View file

@ -677,7 +677,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/adafruit/ST7565/Configuration.h
View file

@ -667,7 +667,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
View file

@ -747,7 +747,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
View file

@ -747,7 +747,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
View file

@ -747,7 +747,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
View file

@ -752,7 +752,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/delta/generic/Configuration.h
View file

@ -737,7 +737,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/delta/kossel_mini/Configuration.h
View file

@ -737,7 +737,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/delta/kossel_pro/Configuration.h
View file

@ -730,7 +730,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/delta/kossel_xl/Configuration.h
View file

@ -749,7 +749,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
View file

@ -680,7 +680,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/makibox/Configuration.h
View file

@ -670,7 +670,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/stm32f103ret6/Configuration.h
View file

@ -669,7 +669,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/tvrrug/Round2/Configuration.h
View file

@ -662,7 +662,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/config/examples/wt150/Configuration.h
View file

@ -672,7 +672,7 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * 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 //#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles
/** /**

2
Marlin/src/core/utility.cpp
View file

@ -283,7 +283,7 @@ void safe_delay(millis_t ms) {
SERIAL_ECHOLNPGM("FIX_MOUNTED_PROBE"); SERIAL_ECHOLNPGM("FIX_MOUNTED_PROBE");
#elif ENABLED(BLTOUCH) #elif ENABLED(BLTOUCH)
SERIAL_ECHOLNPGM("BLTOUCH"); SERIAL_ECHOLNPGM("BLTOUCH");
#elif HAS_Z_SERVO_ENDSTOP #elif HAS_Z_SERVO_PROBE
SERIAL_ECHOLNPGM("SERVO PROBE"); SERIAL_ECHOLNPGM("SERVO PROBE");
#elif ENABLED(Z_PROBE_SLED) #elif ENABLED(Z_PROBE_SLED)
SERIAL_ECHOLNPGM("Z_PROBE_SLED"); SERIAL_ECHOLNPGM("Z_PROBE_SLED");

10
Marlin/src/gcode/config/M43.cpp
View file

@ -29,7 +29,7 @@
#include "../../pins/pinsDebug.h" #include "../../pins/pinsDebug.h"
#include "../../module/endstops.h" #include "../../module/endstops.h"
#if HAS_Z_SERVO_ENDSTOP #if HAS_Z_SERVO_PROBE
#include "../../module/probe.h" #include "../../module/probe.h"
#include "../../module/servo.h" #include "../../module/servo.h"
#endif #endif
@ -92,14 +92,14 @@ inline void servo_probe_test() {
SERIAL_ERROR_START(); SERIAL_ERROR_START();
SERIAL_ERRORLNPGM("SERVO not setup"); SERIAL_ERRORLNPGM("SERVO not setup");
#elif !HAS_Z_SERVO_ENDSTOP #elif !HAS_Z_SERVO_PROBE
SERIAL_ERROR_START(); 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_PROTOCOLLNPGM("Servo probe test");
SERIAL_PROTOCOLLNPAIR(". using index: ", probe_index); SERIAL_PROTOCOLLNPAIR(". using index: ", probe_index);

10
Marlin/src/inc/Conditionals_LCD.h
View file

@ -458,11 +458,11 @@
* and uses "special" angles for its state. * and uses "special" angles for its state.
*/ */
#if ENABLED(BLTOUCH) #if ENABLED(BLTOUCH)
#ifndef Z_ENDSTOP_SERVO_NR #ifndef Z_PROBE_SERVO_NR
#define Z_ENDSTOP_SERVO_NR 0 #define Z_PROBE_SERVO_NR 0
#endif #endif
#ifndef NUM_SERVOS #ifndef NUM_SERVOS
#define NUM_SERVOS (Z_ENDSTOP_SERVO_NR + 1) #define NUM_SERVOS (Z_PROBE_SERVO_NR + 1)
#endif #endif
#undef DEACTIVATE_SERVOS_AFTER_MOVE #undef DEACTIVATE_SERVOS_AFTER_MOVE
#if NUM_SERVOS == 1 #if NUM_SERVOS == 1
@ -497,12 +497,12 @@
/** /**
* Set a flag for a servo probe * 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 * 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 * Clear probe pin settings when no probe is selected

4
Marlin/src/inc/Conditionals_post.h
View file

@ -901,8 +901,8 @@
*/ */
#if HAS_SERVOS #if HAS_SERVOS
#ifndef Z_ENDSTOP_SERVO_NR #ifndef Z_PROBE_SERVO_NR
#define Z_ENDSTOP_SERVO_NR -1 #define Z_PROBE_SERVO_NR -1
#endif #endif
#endif #endif

16
Marlin/src/inc/SanityCheck.h
View file

@ -95,6 +95,8 @@
#error "SERVO_ENDSTOP_ANGLES is deprecated. Use Z_SERVO_ANGLES instead." #error "SERVO_ENDSTOP_ANGLES is deprecated. Use Z_SERVO_ANGLES instead."
#elif defined(X_ENDSTOP_SERVO_NR) || defined(Y_ENDSTOP_SERVO_NR) #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." #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) #elif defined(DEFAULT_XYJERK)
#error "DEFAULT_XYJERK is deprecated. Use DEFAULT_XJERK and DEFAULT_YJERK instead." #error "DEFAULT_XYJERK is deprecated. Use DEFAULT_XJERK and DEFAULT_YJERK instead."
#elif defined(XY_TRAVEL_SPEED) #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 * 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) #if ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE) && !HAS_Z_SERVO_PROBE && !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." #error "Z_PROBE_SERVO_NR, switching nozzle, or switching extruder is required for DEACTIVATE_SERVOS_AFTER_MOVE."
#endif #endif
/** /**
@ -697,7 +699,7 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
#if 1 < 0 \ #if 1 < 0 \
+ ENABLED(PROBE_MANUALLY) \ + ENABLED(PROBE_MANUALLY) \
+ ENABLED(FIX_MOUNTED_PROBE) \ + ENABLED(FIX_MOUNTED_PROBE) \
+ (HAS_Z_SERVO_ENDSTOP && DISABLED(BLTOUCH)) \ + (HAS_Z_SERVO_PROBE && DISABLED(BLTOUCH)) \
+ ENABLED(BLTOUCH) \ + ENABLED(BLTOUCH) \
+ ENABLED(SOLENOID_PROBE) \ + ENABLED(SOLENOID_PROBE) \
+ ENABLED(Z_PROBE_ALLEN_KEY) \ + 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 * NUM_SERVOS is required for a Z servo probe
*/ */
#if HAS_Z_SERVO_ENDSTOP #if HAS_Z_SERVO_PROBE
#ifndef NUM_SERVOS #ifndef NUM_SERVOS
#error "You must set NUM_SERVOS for a Z servo probe (Z_ENDSTOP_SERVO_NR)." #error "You must set NUM_SERVOS for a Z servo probe (Z_PROBE_SERVO_NR)."
#elif Z_ENDSTOP_SERVO_NR >= NUM_SERVOS #elif Z_PROBE_SERVO_NR >= NUM_SERVOS
#error "Z_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS." #error "Z_PROBE_SERVO_NR must be smaller than NUM_SERVOS."
#endif #endif
#endif #endif

12
Marlin/src/lcd/ultralcd.cpp
View file

@ -893,10 +893,10 @@ void kill_screen(const char* lcd_msg) {
// ^ Main // ^ Main
// //
MENU_BACK(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_RESET, PSTR("M280 P" STRINGIFY(Z_PROBE_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_SELFTEST, PSTR("M280 P" STRINGIFY(Z_PROBE_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_DEPLOY, PSTR("M280 P" STRINGIFY(Z_PROBE_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_STOW, PSTR("M280 P" STRINGIFY(Z_PROBE_SERVO_NR) " S" STRINGIFY(BLTOUCH_STOW)));
END_MENU(); END_MENU();
} }
@ -2686,9 +2686,9 @@ void kill_screen(const char* lcd_msg) {
// BLTouch Self-Test and Reset // BLTouch Self-Test and Reset
// //
#if ENABLED(BLTOUCH) #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()) 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 #endif
// //

12
Marlin/src/module/probe.cpp
View file

@ -52,7 +52,7 @@
float zprobe_zoffset; // Initialized by settings.load() float zprobe_zoffset; // Initialized by settings.load()
#if HAS_Z_SERVO_ENDSTOP #if HAS_Z_SERVO_PROBE
#include "../module/servo.h" #include "../module/servo.h"
const int z_servo_angle[2] = Z_SERVO_ANGLES; const int z_servo_angle[2] = Z_SERVO_ANGLES;
#endif #endif
@ -299,7 +299,7 @@ float zprobe_zoffset; // Initialized by settings.load()
#if ENABLED(BLTOUCH) #if ENABLED(BLTOUCH)
void bltouch_command(const int angle) { 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); safe_delay(BLTOUCH_DELAY);
} }
@ -433,9 +433,9 @@ bool set_probe_deployed(const bool deploy) {
dock_sled(!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) #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; return measured_z;
} }
#if HAS_Z_SERVO_ENDSTOP #if HAS_Z_SERVO_PROBE
void servo_probe_init() { void servo_probe_init() {
/** /**
@ -715,6 +715,6 @@ float probe_pt(const float &rx, const float &ry, const ProbePtRaise raise_after/
STOW_Z_SERVO(); STOW_Z_SERVO();
} }
#endif // HAS_Z_SERVO_ENDSTOP #endif // HAS_Z_SERVO_PROBE
#endif // HAS_BED_PROBE #endif // HAS_BED_PROBE

2
Marlin/src/module/probe.h
View file

@ -48,7 +48,7 @@
#define STOW_PROBE() #define STOW_PROBE()
#endif #endif
#if HAS_Z_SERVO_ENDSTOP #if HAS_Z_SERVO_PROBE
extern const int z_servo_angle[2]; extern const int z_servo_angle[2];
void servo_probe_init(); void servo_probe_init();
#endif #endif

6
Marlin/src/module/servo.h
View file

@ -36,9 +36,9 @@ extern void servo_init();
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfig.h"
#if HAS_Z_SERVO_ENDSTOP #if HAS_Z_SERVO_PROBE
#define DEPLOY_Z_SERVO() MOVE_SERVO(Z_ENDSTOP_SERVO_NR, z_servo_angle[0]) #define DEPLOY_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, z_servo_angle[0])
#define STOW_Z_SERVO() MOVE_SERVO(Z_ENDSTOP_SERVO_NR, z_servo_angle[1]) #define STOW_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, z_servo_angle[1])
#endif #endif
#endif // _SERVO_H_ #endif // _SERVO_H_