diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index af2f096c474e..f319274dab59 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/default/Configuration.h b/Marlin/src/config/default/Configuration.h index af2f096c474e..f319274dab59 100644 --- a/Marlin/src/config/default/Configuration.h +++ b/Marlin/src/config/default/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h index ba21a972f18d..6f9382de767a 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h @@ -773,6 +773,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ #define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h index f33af0715cb2..43e13668402d 100644 --- a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h +++ b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Anet/A2/Configuration.h b/Marlin/src/config/examples/Anet/A2/Configuration.h index 21bce3af7c7a..1176fd9f944c 100644 --- a/Marlin/src/config/examples/Anet/A2/Configuration.h +++ b/Marlin/src/config/examples/Anet/A2/Configuration.h @@ -736,6 +736,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration.h b/Marlin/src/config/examples/Anet/A2plus/Configuration.h index 739198667e71..fd2ed40e48b8 100644 --- a/Marlin/src/config/examples/Anet/A2plus/Configuration.h +++ b/Marlin/src/config/examples/Anet/A2plus/Configuration.h @@ -736,6 +736,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Anet/A6/Configuration.h b/Marlin/src/config/examples/Anet/A6/Configuration.h index faba60a49f11..3040dab34b7e 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration.h @@ -801,6 +801,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Anet/A8/Configuration.h b/Marlin/src/config/examples/Anet/A8/Configuration.h index 9927f291342f..ea3c8f7b8564 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration.h @@ -760,6 +760,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h index 4704b667cc1f..646881f058e6 100644 --- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h +++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h index ecc7f2f6cdfc..b75b5384acba 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h @@ -725,6 +725,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h index bc4277b2e7b5..1fb948b2ee18 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h @@ -725,6 +725,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h index 638857e3e786..a63c4604866a 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h @@ -741,6 +741,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h index 88834d24548d..8a6fc330e793 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h @@ -754,6 +754,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ #define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h index 510e36f2b655..577a709f81b4 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h @@ -741,6 +741,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Cartesio/Configuration.h b/Marlin/src/config/examples/Cartesio/Configuration.h index 637d077e7577..bed6b115ba4f 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration.h +++ b/Marlin/src/config/examples/Cartesio/Configuration.h @@ -752,6 +752,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration.h b/Marlin/src/config/examples/Creality/CR-10/Configuration.h index b2904b23acc0..6504bbc151f2 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration.h @@ -763,6 +763,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h index 78fec6cb2c89..9178b735dcb8 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h @@ -757,6 +757,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h index 1db389926701..ec1ac9636625 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h @@ -772,6 +772,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration.h b/Marlin/src/config/examples/Creality/CR-8/Configuration.h index 9b80e5042ca2..8350935a5809 100644 --- a/Marlin/src/config/examples/Creality/CR-8/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-8/Configuration.h @@ -763,6 +763,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h index ea6b200b43f3..cd2f612451a5 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h @@ -757,6 +757,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h index ceea982953ad..77d0b39bae48 100644 --- a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h @@ -757,6 +757,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h index 2911be3bd139..36d0025c821a 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h @@ -763,6 +763,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Einstart-S/Configuration.h b/Marlin/src/config/examples/Einstart-S/Configuration.h index ea5d8ad80036..826e4d14fd91 100644 --- a/Marlin/src/config/examples/Einstart-S/Configuration.h +++ b/Marlin/src/config/examples/Einstart-S/Configuration.h @@ -764,6 +764,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Felix/Configuration.h b/Marlin/src/config/examples/Felix/Configuration.h index 7ce734d2f0d8..f90373e48e59 100644 --- a/Marlin/src/config/examples/Felix/Configuration.h +++ b/Marlin/src/config/examples/Felix/Configuration.h @@ -735,6 +735,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Felix/DUAL/Configuration.h b/Marlin/src/config/examples/Felix/DUAL/Configuration.h index 70ba627aa55c..6f65e3b41987 100644 --- a/Marlin/src/config/examples/Felix/DUAL/Configuration.h +++ b/Marlin/src/config/examples/Felix/DUAL/Configuration.h @@ -735,6 +735,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h index 51985ebfc008..d33f0c30d124 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h @@ -759,6 +759,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration.h b/Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration.h index 5d24c42e069c..9e1e4df1cc92 100644 --- a/Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration.h +++ b/Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration.h @@ -777,6 +777,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h index ab335eb7b1a3..d860bbb96889 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h @@ -788,6 +788,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h index 4c6062140ac1..37d26ec92658 100644 --- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h @@ -768,6 +768,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. 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 3510f8e63112..5eec78dce553 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 @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. 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 2bf7defcf85e..17664352160a 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 @@ -769,6 +769,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. 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 82a9300b7208..d4b45d4a86bd 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 @@ -768,6 +768,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h index b7939f0d544a..6a09083db677 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h index d66b4d9f95f6..93b5ab3cd395 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h index affa292e63cc..a9562239741d 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h @@ -757,6 +757,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration.h b/Marlin/src/config/examples/JGAurora/A5/Configuration.h index b6faa33d1f90..d2a4cbf3fca8 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration.h @@ -765,6 +765,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/MakerParts/Configuration.h b/Marlin/src/config/examples/MakerParts/Configuration.h index d8794de79564..19b4d587542c 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration.h +++ b/Marlin/src/config/examples/MakerParts/Configuration.h @@ -773,6 +773,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration.h b/Marlin/src/config/examples/Malyan/M150/Configuration.h index 03204f2054d0..2a4ebc75e0a7 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration.h @@ -745,6 +745,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration.h b/Marlin/src/config/examples/Malyan/M200/Configuration.h index 58758c8e5ab2..9dc37877cfab 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration.h @@ -752,6 +752,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h index 5e72a3f32fe8..cfc0915bf80a 100644 --- a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h @@ -757,6 +757,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h index 4891ff94254a..e17d0fb6ca0c 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h @@ -757,6 +757,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ #define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration.h b/Marlin/src/config/examples/Mks/Sbase/Configuration.h index 211858d1c108..5511740bc9a5 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h index 8905de294b42..975e7bd59a4e 100644 --- a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h +++ b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h @@ -793,6 +793,9 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h index 11b157751b06..ef69bb02ff94 100644 --- a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/RigidBot/Configuration.h b/Marlin/src/config/examples/RigidBot/Configuration.h index 5198fbf0c080..97c3b4c49f2d 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration.h +++ b/Marlin/src/config/examples/RigidBot/Configuration.h @@ -751,6 +751,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/SCARA/Configuration.h b/Marlin/src/config/examples/SCARA/Configuration.h index b62c767273ad..fbb83c47f539 100644 --- a/Marlin/src/config/examples/SCARA/Configuration.h +++ b/Marlin/src/config/examples/SCARA/Configuration.h @@ -766,6 +766,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/STM32F10/Configuration.h b/Marlin/src/config/examples/STM32F10/Configuration.h index c8e9dba7047e..a37d5e2294ec 100644 --- a/Marlin/src/config/examples/STM32F10/Configuration.h +++ b/Marlin/src/config/examples/STM32F10/Configuration.h @@ -755,6 +755,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/STM32F4/Configuration.h b/Marlin/src/config/examples/STM32F4/Configuration.h index b465ffbb428d..19e68d592fd2 100644 --- a/Marlin/src/config/examples/STM32F4/Configuration.h +++ b/Marlin/src/config/examples/STM32F4/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration.h b/Marlin/src/config/examples/Sanguinololu/Configuration.h index 8f393e3369b7..fc65026c7ec5 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration.h @@ -784,6 +784,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/TheBorg/Configuration.h b/Marlin/src/config/examples/TheBorg/Configuration.h index 5c398454b471..9a26d780e242 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration.h +++ b/Marlin/src/config/examples/TheBorg/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ #define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration.h b/Marlin/src/config/examples/TinyBoy2/Configuration.h index 242ed7dca9a2..4b43dbbc064f 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration.h @@ -804,6 +804,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Tronxy/X1/Configuration.h b/Marlin/src/config/examples/Tronxy/X1/Configuration.h index 5523705e9bc7..c644bac1c6c7 100644 --- a/Marlin/src/config/examples/Tronxy/X1/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X1/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h index ce5548f981a2..84d8f9f1fcda 100644 --- a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ #define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h index c19cf908703f..d537e2bb711c 100644 --- a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h index ca95bb42319d..ae657c33bb30 100644 --- a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h @@ -764,6 +764,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h index 760a6a4ced19..6281904ca896 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration.h b/Marlin/src/config/examples/Velleman/K8200/Configuration.h index 3e8b3c324ea9..7302cf7aea2e 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration.h @@ -782,6 +782,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Configuration.h index 7f1fbc59d827..9300ef04983d 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. 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 00b7487256f6..d8ed9bed864f 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h index 908dc67dc2b8..6528423a5662 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h @@ -763,6 +763,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h index 25c8404f1037..3032148ac757 100644 --- a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h +++ b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h @@ -753,6 +753,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h index 359f50ae313d..1ac25e7232b4 100644 --- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h @@ -672,7 +672,11 @@ #define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. -#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the probe. +#if ANYCUBIC_PROBE_VERSION == 1 + #define Z_MIN_PROBE_ENDSTOP_INVERTING false // V1 Probe is NC +#elif ANYCUBIC_PROBE_VERSION == 2 + #define Z_MIN_PROBE_ENDSTOP_INVERTING true // V2 Probe is NO +#endif /** * Stepper Drivers @@ -871,6 +875,9 @@ */ #if ANYCUBIC_PROBE_VERSION > 0 #define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif #endif /** @@ -934,12 +941,12 @@ #define X_PROBE_OFFSET_FROM_EXTRUDER 0 // X offset: -left +right [of the nozzle] #define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle] -#if ANYCUBIC_PROBE_VERSION == 0 - #define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle] +#if ANYCUBIC_PROBE_VERSION == 2 + #define Z_PROBE_OFFSET_FROM_EXTRUDER -16.8 // Z offset: -below +above [the nozzle] #elif ANYCUBIC_PROBE_VERSION == 1 #define Z_PROBE_OFFSET_FROM_EXTRUDER -19.0 // Z offset: -below +above [the nozzle] #else - #define Z_PROBE_OFFSET_FROM_EXTRUDER -16.8 // Z offset: -below +above [the nozzle] + #define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle] #endif // Certain types of probes need to stay away from edges @@ -1020,10 +1027,10 @@ * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow -#define Z_CLEARANCE_BETWEEN_PROBES 25 // Z Clearance between probe points -#define Z_CLEARANCE_MULTI_PROBE 25 // Z Clearance between multiple probes -#define Z_AFTER_PROBING 30 // Z position after probing is done +#define Z_CLEARANCE_DEPLOY_PROBE 30 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points +#define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes +#define Z_AFTER_PROBING 5 // Z position after probing is done #define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping 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 8199d3d1c190..98704d3923a0 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h @@ -835,6 +835,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ #define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h index 0807de59be6f..27fca523dac2 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h @@ -835,6 +835,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ #define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. 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 286bdb1a5e39..a53710978a01 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h @@ -835,6 +835,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ #define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h index e13482c9985c..59e7f9f401a2 100644 --- a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h +++ b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h @@ -840,6 +840,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ #define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/delta/generic/Configuration.h b/Marlin/src/config/examples/delta/generic/Configuration.h index 13545a262a2c..a9bed8e5f660 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration.h +++ b/Marlin/src/config/examples/delta/generic/Configuration.h @@ -825,6 +825,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h index e3a9ae3ef39f..c78b2de01f40 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h @@ -825,6 +825,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h index 8d06fbe266c0..f15f6bdd4f59 100644 --- a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h @@ -818,6 +818,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h index 4b730f0dcc0a..5e39f065f0f1 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h @@ -828,6 +828,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ #define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h index 1ef9e26aa910..657057195264 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h @@ -766,6 +766,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/makibox/Configuration.h b/Marlin/src/config/examples/makibox/Configuration.h index c01e380fca14..01d6035cbcd8 100644 --- a/Marlin/src/config/examples/makibox/Configuration.h +++ b/Marlin/src/config/examples/makibox/Configuration.h @@ -756,6 +756,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/stm32f103ret6/Configuration.h b/Marlin/src/config/examples/stm32f103ret6/Configuration.h index a1a6c56a7c20..9115d2f9d1eb 100644 --- a/Marlin/src/config/examples/stm32f103ret6/Configuration.h +++ b/Marlin/src/config/examples/stm32f103ret6/Configuration.h @@ -755,6 +755,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h index a7572abac9f1..a188c73003d4 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h @@ -748,6 +748,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/config/examples/wt150/Configuration.h b/Marlin/src/config/examples/wt150/Configuration.h index 754a694f4d85..ef3ebbd81d01 100644 --- a/Marlin/src/config/examples/wt150/Configuration.h +++ b/Marlin/src/config/examples/wt150/Configuration.h @@ -758,6 +758,9 @@ * (e.g., an inductive probe or a nozzle-based probe-switch.) */ //#define FIX_MOUNTED_PROBE +#if ENABLED(FIX_MOUNTED_PROBE) + #define MANUAL_DEPLOY_STOW +#endif /** * Z Servo Probe, such as an endstop switch on a rotating arm. diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 54c955ae9592..3f8ad05fc8f5 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -198,6 +198,8 @@ #define MSG_BLTOUCH_RESET _UxGT("BLTouch Reset") #define MSG_BLTOUCH_DEPLOY _UxGT("BLTouch ausfahren") #define MSG_BLTOUCH_STOW _UxGT("BLTouch einfahren") +#define MSG_MANUAL_DEPLOY _UxGT("Z-Sensor anbringen") +#define MSG_MANUAL_STOW _UxGT("Z-Sensor entfernen") #define MSG_HOME _UxGT("Vorher") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST #define MSG_FIRST _UxGT("homen") #define MSG_ZPROBE_ZOFFSET _UxGT("Z Versatz") diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 536b28b027ea..687d4cc44dcb 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -810,6 +810,12 @@ #ifndef MSG_BLTOUCH_STOW #define MSG_BLTOUCH_STOW _UxGT("Stow BLTouch") #endif +#ifndef MSG_MANUAL_DEPLOY + #define MSG_MANUAL_DEPLOY _UxGT("Deploy Z-Probe") +#endif +#ifndef MSG_MANUAL_STOW + #define MSG_MANUAL_STOW _UxGT("Stow Z-Probe") +#endif #ifndef MSG_HOME #define MSG_HOME _UxGT("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST #endif diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index c4d4bc22d4ff..43357d621d16 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -28,6 +28,8 @@ #if HAS_BED_PROBE +#include "../libs/buzzer.h" + #include "probe.h" #include "motion.h" #include "temperature.h" @@ -377,7 +379,8 @@ bool set_probe_deployed(const bool deploy) { // Make room for probe to deploy (or stow) // Fix-mounted probe should only raise for deploy - #if ENABLED(FIX_MOUNTED_PROBE) + // unless MANUAL_DEPLOY_STOW is enabled + #if ENABLED(FIX_MOUNTED_PROBE) && DISABLED(MANUAL_DEPLOY_STOW) const bool deploy_stow_condition = deploy; #else constexpr bool deploy_stow_condition = true; @@ -440,6 +443,26 @@ bool set_probe_deployed(const bool deploy) { deploy ? run_deploy_moves_script() : run_stow_moves_script(); + #elif ENABLED(MANUAL_DEPLOY_STOW) + + do_probe_raise(Z_CLEARANCE_DEPLOY_PROBE); + + #if PIN_EXISTS(BEEPER) || ENABLED(LCD_USE_I2C_BUZZER) + BUZZ(100, 659); + BUZZ(100, 698); + #endif + + const char * const ds_str = deploy ? PSTR(MSG_MANUAL_DEPLOY) : PSTR(MSG_MANUAL_STOW); + lcd_setalertstatusPGM(ds_str); + serialprintPGM(ds_str); + SERIAL_EOL(); + + KEEPALIVE_STATE(PAUSED_FOR_USER); + wait_for_user = true; + while (wait_for_user) idle(); + lcd_reset_status(); + KEEPALIVE_STATE(IN_HANDLER); + #endif #ifdef _TRIGGERED_WHEN_STOWED_TEST diff --git a/buildroot/share/tests/megaatmega2560_tests b/buildroot/share/tests/megaatmega2560_tests index d4857670d5f1..014dd6a4a6c5 100755 --- a/buildroot/share/tests/megaatmega2560_tests +++ b/buildroot/share/tests/megaatmega2560_tests @@ -291,7 +291,7 @@ exec_test $1 $2 "Delta Config (FLSUN AC because it's complex)" # SCARA with TMC2130 # use_example_configs SCARA -opt_enable AUTO_BED_LEVELING_BILINEAR FIX_MOUNTED_PROBE USE_ZMIN_PLUG EEPROM_SETTINGS EEPROM_CHITCHAT ULTIMAKERCONTROLLER +opt_enable AUTO_BED_LEVELING_BILINEAR FIX_MOUNTED_PROBE MANUAL_DEPLOY_STOW USE_ZMIN_PLUG EEPROM_SETTINGS EEPROM_CHITCHAT ULTIMAKERCONTROLLER opt_set X_DRIVER_TYPE TMC2130 opt_set Y_DRIVER_TYPE TMC2130 opt_set Z_DRIVER_TYPE TMC2130