From a4cdffdd69112424a3d678713cc8ac4c38ad8bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20Brandst=C3=A4tter-M=C3=BCller?= Date: Sun, 23 Sep 2018 18:50:03 +0200 Subject: [PATCH] Support for manually deployed fixed probes (#11899) --- Marlin/Configuration.h | 3 +++ Marlin/src/config/default/Configuration.h | 3 +++ .../AlephObjects/TAZ4/Configuration.h | 3 +++ .../AliExpress/CL-260/Configuration.h | 3 +++ .../config/examples/Anet/A2/Configuration.h | 3 +++ .../examples/Anet/A2plus/Configuration.h | 3 +++ .../config/examples/Anet/A6/Configuration.h | 3 +++ .../config/examples/Anet/A8/Configuration.h | 3 +++ .../examples/Azteeg/X5GT/Configuration.h | 3 +++ .../BIBO/TouchX/cyclops/Configuration.h | 3 +++ .../BIBO/TouchX/default/Configuration.h | 3 +++ .../examples/BQ/Hephestos/Configuration.h | 3 +++ .../examples/BQ/Hephestos_2/Configuration.h | 3 +++ .../config/examples/BQ/WITBOX/Configuration.h | 3 +++ .../config/examples/Cartesio/Configuration.h | 3 +++ .../examples/Creality/CR-10/Configuration.h | 3 +++ .../examples/Creality/CR-10S/Configuration.h | 3 +++ .../Creality/CR-10mini/Configuration.h | 3 +++ .../examples/Creality/CR-8/Configuration.h | 3 +++ .../examples/Creality/Ender-2/Configuration.h | 3 +++ .../examples/Creality/Ender-3/Configuration.h | 3 +++ .../examples/Creality/Ender-4/Configuration.h | 3 +++ .../examples/Einstart-S/Configuration.h | 3 +++ .../src/config/examples/Felix/Configuration.h | 3 +++ .../examples/Felix/DUAL/Configuration.h | 3 +++ .../FolgerTech/i3-2020/Configuration.h | 3 +++ .../examples/Formbot/T-Rex_2+/Configuration.h | 3 +++ .../examples/Formbot/T_Rex_3/Configuration.h | 3 +++ .../examples/Geeetech/GT2560/Configuration.h | 3 +++ .../Geeetech/I3_Pro_X-GT2560/Configuration.h | 3 +++ .../Prusa i3 Pro B/bltouch/Configuration.h | 3 +++ .../Prusa i3 Pro B/noprobe/Configuration.h | 3 +++ .../Geeetech/Prusa i3 Pro C/Configuration.h | 3 +++ .../Geeetech/Prusa i3 Pro W/Configuration.h | 3 +++ .../examples/Infitary/i3-M508/Configuration.h | 3 +++ .../examples/JGAurora/A5/Configuration.h | 3 +++ .../examples/MakerParts/Configuration.h | 3 +++ .../examples/Malyan/M150/Configuration.h | 3 +++ .../examples/Malyan/M200/Configuration.h | 3 +++ .../Micromake/C1/basic/Configuration.h | 3 +++ .../Micromake/C1/enhanced/Configuration.h | 3 +++ .../config/examples/Mks/Sbase/Configuration.h | 3 +++ .../examples/RepRapPro/Huxley/Configuration.h | 3 +++ .../RepRapWorld/Megatronics/Configuration.h | 3 +++ .../config/examples/RigidBot/Configuration.h | 3 +++ .../src/config/examples/SCARA/Configuration.h | 3 +++ .../config/examples/STM32F10/Configuration.h | 3 +++ .../config/examples/STM32F4/Configuration.h | 3 +++ .../examples/Sanguinololu/Configuration.h | 3 +++ .../config/examples/TheBorg/Configuration.h | 3 +++ .../config/examples/TinyBoy2/Configuration.h | 3 +++ .../config/examples/Tronxy/X1/Configuration.h | 3 +++ .../examples/Tronxy/X3A/Configuration.h | 3 +++ .../examples/Tronxy/X5S/Configuration.h | 3 +++ .../examples/Tronxy/XY100/Configuration.h | 3 +++ .../UltiMachine/Archim2/Configuration.h | 3 +++ .../examples/Velleman/K8200/Configuration.h | 3 +++ .../examples/Velleman/K8400/Configuration.h | 3 +++ .../Velleman/K8400/Dual-head/Configuration.h | 3 +++ .../Wanhao/Duplicator 6/Configuration.h | 3 +++ .../examples/adafruit/ST7565/Configuration.h | 3 +++ .../delta/Anycubic/Kossel/Configuration.h | 23 +++++++++++------ .../FLSUN/auto_calibrate/Configuration.h | 3 +++ .../delta/FLSUN/kossel/Configuration.h | 3 +++ .../delta/FLSUN/kossel_mini/Configuration.h | 3 +++ .../delta/Hatchbox_Alpha/Configuration.h | 3 +++ .../examples/delta/generic/Configuration.h | 3 +++ .../delta/kossel_mini/Configuration.h | 3 +++ .../examples/delta/kossel_pro/Configuration.h | 3 +++ .../examples/delta/kossel_xl/Configuration.h | 3 +++ .../examples/gCreate/gMax1.5+/Configuration.h | 3 +++ .../config/examples/makibox/Configuration.h | 3 +++ .../examples/stm32f103ret6/Configuration.h | 3 +++ .../examples/tvrrug/Round2/Configuration.h | 3 +++ .../src/config/examples/wt150/Configuration.h | 3 +++ Marlin/src/lcd/language/language_de.h | 2 ++ Marlin/src/lcd/language/language_en.h | 6 +++++ Marlin/src/module/probe.cpp | 25 ++++++++++++++++++- buildroot/share/tests/megaatmega2560_tests | 2 +- 79 files changed, 270 insertions(+), 10 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index af2f096c4..a1bbbfcb4 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 af2f096c4..a1bbbfcb4 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 ba21a972f..5a15e5908 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 f33af0715..082fbc108 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 21bce3af7..63b6f67f2 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 739198667..6fdb59d8d 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 faba60a49..3318c8376 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 9927f2913..9a1cdc5bc 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 4704b667c..66d679a23 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 ecc7f2f6c..7fabddff4 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 bc4277b2e..6646df581 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 638857e3e..d7c6be805 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 88834d245..9f6704e3c 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 510e36f2b..e07f06399 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 637d077e7..a0a429fe9 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 b2904b23a..2bc0c6db0 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 78fec6cb2..d24145184 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 1db389926..9949d8331 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 9b80e5042..8f4486a23 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 ea6b200b4..4be9a3d39 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 ceea98295..0a1934c76 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 2911be3bd..106209a5f 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 ea5d8ad80..f08922b0f 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 7ce734d2f..0be179963 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 70ba627aa..ab86a7a2b 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 51985ebfc..541eec0cd 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 5d24c42e0..4df745f43 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 ab335eb7b..fd08ffb14 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 4c6062140..89ffbbac5 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 3510f8e63..616c033e8 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 2bf7defcf..d18dee940 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 82a9300b7..42b38a95e 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 b7939f0d5..1614eadba 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 d66b4d9f9..56da7b4fc 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 affa292e6..ac98f9d1d 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 b6faa33d1..db408b30e 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 d8794de79..867da642e 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 03204f205..02f5ae041 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 58758c8e5..1e407e9ab 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 5e72a3f32..f03c90f1e 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 4891ff942..4d6dea22c 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 211858d1c..2a18893d0 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 8905de294..caa10e511 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 11b157751..2abb3afdc 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 5198fbf0c..8c4824530 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 b62c76727..9776b9a8a 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 c8e9dba70..ec6e44620 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 b465ffbb4..edb65465d 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 8f393e336..ec6e59230 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 5c398454b..4c318e594 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 242ed7dca..0e97820d9 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 5523705e9..c8d30a29d 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 ce5548f98..e902d288d 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 c19cf9087..cbd5ebc58 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 ca95bb423..705bdd90d 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 760a6a4ce..e5a5e69aa 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 3e8b3c324..ca3ce5fb3 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 7f1fbc59d..cb44eadb1 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 00b748725..8c0a7ddb0 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 908dc67dc..40d16901a 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 25c8404f1..4323a3e42 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 359f50ae3..1ac25e723 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 8199d3d1c..1f8d149a4 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 0807de59b..41a729987 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 286bdb1a5..5e7b54d0a 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 e13482c99..3bba948f4 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 13545a262..38beaf648 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 e3a9ae3ef..d55eabcc7 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 8d06fbe26..926dcb1dd 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 4b730f0dc..cbab083ea 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 1ef9e26aa..0ed4fe3c8 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 c01e380fc..1bab0b4ba 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 a1a6c56a7..cf400964c 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 a7572abac..ed16fd6dc 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 754a694f4..fe879e29f 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 54c955ae9..3f8ad05fc 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 536b28b02..687d4cc44 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 c4d4bc22d..43357d621 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 d4857670d..014dd6a4a 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