From 217e0efd20292f5cab81af4f381af214a8bf06e2 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 24 Sep 2018 00:43:43 -0400 Subject: [PATCH] General option PAUSE_BEFORE_DEPLOY_STOW (#11905) --- Marlin/Configuration.h | 6 +-- Marlin/src/config/default/Configuration.h | 6 +-- .../AlephObjects/TAZ4/Configuration.h | 6 +-- .../AliExpress/CL-260/Configuration.h | 6 +-- .../config/examples/Anet/A2/Configuration.h | 6 +-- .../examples/Anet/A2plus/Configuration.h | 6 +-- .../config/examples/Anet/A6/Configuration.h | 6 +-- .../config/examples/Anet/A8/Configuration.h | 6 +-- .../examples/Azteeg/X5GT/Configuration.h | 6 +-- .../BIBO/TouchX/cyclops/Configuration.h | 6 +-- .../BIBO/TouchX/default/Configuration.h | 6 +-- .../examples/BQ/Hephestos/Configuration.h | 6 +-- .../examples/BQ/Hephestos_2/Configuration.h | 6 +-- .../config/examples/BQ/WITBOX/Configuration.h | 6 +-- .../config/examples/Cartesio/Configuration.h | 6 +-- .../examples/Creality/CR-10/Configuration.h | 6 +-- .../examples/Creality/CR-10S/Configuration.h | 6 +-- .../Creality/CR-10mini/Configuration.h | 6 +-- .../examples/Creality/CR-8/Configuration.h | 6 +-- .../examples/Creality/Ender-2/Configuration.h | 6 +-- .../examples/Creality/Ender-3/Configuration.h | 6 +-- .../examples/Creality/Ender-4/Configuration.h | 6 +-- .../examples/Einstart-S/Configuration.h | 6 +-- .../src/config/examples/Felix/Configuration.h | 6 +-- .../examples/Felix/DUAL/Configuration.h | 6 +-- .../FolgerTech/i3-2020/Configuration.h | 6 +-- .../examples/Formbot/T-Rex_2+/Configuration.h | 6 +-- .../examples/Formbot/T_Rex_3/Configuration.h | 6 +-- .../examples/Geeetech/GT2560/Configuration.h | 6 +-- .../Geeetech/I3_Pro_X-GT2560/Configuration.h | 6 +-- .../Prusa i3 Pro B/bltouch/Configuration.h | 6 +-- .../Prusa i3 Pro B/noprobe/Configuration.h | 6 +-- .../Geeetech/Prusa i3 Pro C/Configuration.h | 6 +-- .../Geeetech/Prusa i3 Pro W/Configuration.h | 6 +-- .../examples/Infitary/i3-M508/Configuration.h | 6 +-- .../examples/JGAurora/A5/Configuration.h | 6 +-- .../examples/MakerParts/Configuration.h | 6 +-- .../examples/Malyan/M150/Configuration.h | 6 +-- .../examples/Malyan/M200/Configuration.h | 6 +-- .../Micromake/C1/basic/Configuration.h | 6 +-- .../Micromake/C1/enhanced/Configuration.h | 6 +-- .../config/examples/Mks/Sbase/Configuration.h | 6 +-- .../examples/RepRapPro/Huxley/Configuration.h | 6 +-- .../RepRapWorld/Megatronics/Configuration.h | 6 +-- .../config/examples/RigidBot/Configuration.h | 6 +-- .../src/config/examples/SCARA/Configuration.h | 6 +-- .../config/examples/STM32F10/Configuration.h | 6 +-- .../config/examples/STM32F4/Configuration.h | 6 +-- .../examples/Sanguinololu/Configuration.h | 6 +-- .../config/examples/TheBorg/Configuration.h | 6 +-- .../config/examples/TinyBoy2/Configuration.h | 6 +-- .../config/examples/Tronxy/X1/Configuration.h | 6 +-- .../examples/Tronxy/X3A/Configuration.h | 6 +-- .../examples/Tronxy/X5S/Configuration.h | 6 +-- .../examples/Tronxy/XY100/Configuration.h | 6 +-- .../UltiMachine/Archim2/Configuration.h | 6 +-- .../examples/Velleman/K8200/Configuration.h | 6 +-- .../examples/Velleman/K8400/Configuration.h | 6 +-- .../Velleman/K8400/Dual-head/Configuration.h | 6 +-- .../Wanhao/Duplicator 6/Configuration.h | 6 +-- .../examples/adafruit/ST7565/Configuration.h | 6 +-- .../delta/Anycubic/Kossel/Configuration.h | 6 +-- .../FLSUN/auto_calibrate/Configuration.h | 6 +-- .../delta/FLSUN/kossel/Configuration.h | 6 +-- .../delta/FLSUN/kossel_mini/Configuration.h | 6 +-- .../delta/Hatchbox_Alpha/Configuration.h | 6 +-- .../examples/delta/generic/Configuration.h | 6 +-- .../delta/kossel_mini/Configuration.h | 6 +-- .../examples/delta/kossel_pro/Configuration.h | 6 +-- .../examples/delta/kossel_xl/Configuration.h | 6 +-- .../examples/gCreate/gMax1.5+/Configuration.h | 6 +-- .../config/examples/makibox/Configuration.h | 6 +-- .../examples/stm32f103ret6/Configuration.h | 6 +-- .../examples/tvrrug/Round2/Configuration.h | 6 +-- .../src/config/examples/wt150/Configuration.h | 6 +-- Marlin/src/module/probe.cpp | 40 +++++++++---------- buildroot/share/tests/megaatmega2560_tests | 2 +- 77 files changed, 246 insertions(+), 246 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 3c75cec83..69a9fbabe 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -753,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/default/Configuration.h b/Marlin/src/config/default/Configuration.h index 3c75cec83..69a9fbabe 100644 --- a/Marlin/src/config/default/Configuration.h +++ b/Marlin/src/config/default/Configuration.h @@ -753,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h index d80eeacc4..5aee80de6 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h @@ -773,9 +773,6 @@ * (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. @@ -870,6 +867,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h index cae8a9565..2126c8d76 100644 --- a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h +++ b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h @@ -753,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Anet/A2/Configuration.h b/Marlin/src/config/examples/Anet/A2/Configuration.h index ac4b314dd..b6e4517a4 100644 --- a/Marlin/src/config/examples/Anet/A2/Configuration.h +++ b/Marlin/src/config/examples/Anet/A2/Configuration.h @@ -736,9 +736,6 @@ * (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. @@ -833,6 +830,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration.h b/Marlin/src/config/examples/Anet/A2plus/Configuration.h index f074ffcb7..a07715960 100644 --- a/Marlin/src/config/examples/Anet/A2plus/Configuration.h +++ b/Marlin/src/config/examples/Anet/A2plus/Configuration.h @@ -736,9 +736,6 @@ * (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. @@ -833,6 +830,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Anet/A6/Configuration.h b/Marlin/src/config/examples/Anet/A6/Configuration.h index 7b242191c..4a7828fc9 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration.h @@ -801,9 +801,6 @@ * (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. @@ -927,6 +924,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Anet/A8/Configuration.h b/Marlin/src/config/examples/Anet/A8/Configuration.h index 96bf06b88..fbf041fba 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration.h @@ -760,9 +760,6 @@ * (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. @@ -857,6 +854,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h index 9bba04707..cd1a37942 100644 --- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h +++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h @@ -753,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h index bfae31892..fa2a43a97 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h @@ -725,9 +725,6 @@ * (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. @@ -822,6 +819,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h index 0555de836..34ed06b65 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h @@ -725,9 +725,6 @@ * (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. @@ -822,6 +819,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h index 8e080fa22..da9b84605 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h @@ -741,9 +741,6 @@ * (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. @@ -838,6 +835,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h index 2456cdaed..0a38aeb8e 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h @@ -754,9 +754,6 @@ * (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. @@ -851,6 +848,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h index 8107d07a6..93de75d98 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h @@ -741,9 +741,6 @@ * (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. @@ -838,6 +835,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Cartesio/Configuration.h b/Marlin/src/config/examples/Cartesio/Configuration.h index d5b8d7197..112c03410 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration.h +++ b/Marlin/src/config/examples/Cartesio/Configuration.h @@ -752,9 +752,6 @@ * (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. @@ -849,6 +846,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration.h b/Marlin/src/config/examples/Creality/CR-10/Configuration.h index 744149b3c..4cb4ed14f 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration.h @@ -763,9 +763,6 @@ * (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. @@ -860,6 +857,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h index 6c5bf263b..607b2fb71 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h @@ -757,9 +757,6 @@ * (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. @@ -854,6 +851,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h index f4205889b..3509c4ef3 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h @@ -772,9 +772,6 @@ * (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. @@ -869,6 +866,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration.h b/Marlin/src/config/examples/Creality/CR-8/Configuration.h index c5f9ad1ff..de29ed5ed 100644 --- a/Marlin/src/config/examples/Creality/CR-8/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-8/Configuration.h @@ -763,9 +763,6 @@ * (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. @@ -860,6 +857,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h index 539e7416c..95552b799 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h @@ -757,9 +757,6 @@ * (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. @@ -854,6 +851,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h index 343821f5e..610286c8d 100644 --- a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h @@ -757,9 +757,6 @@ * (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. @@ -854,6 +851,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h index 7d3203a12..aedc7791a 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h @@ -763,9 +763,6 @@ * (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. @@ -860,6 +857,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Einstart-S/Configuration.h b/Marlin/src/config/examples/Einstart-S/Configuration.h index 9201f1207..6305196f2 100644 --- a/Marlin/src/config/examples/Einstart-S/Configuration.h +++ b/Marlin/src/config/examples/Einstart-S/Configuration.h @@ -764,9 +764,6 @@ * (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. @@ -860,6 +857,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Felix/Configuration.h b/Marlin/src/config/examples/Felix/Configuration.h index f27a79283..836c90aeb 100644 --- a/Marlin/src/config/examples/Felix/Configuration.h +++ b/Marlin/src/config/examples/Felix/Configuration.h @@ -735,9 +735,6 @@ * (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. @@ -832,6 +829,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Felix/DUAL/Configuration.h b/Marlin/src/config/examples/Felix/DUAL/Configuration.h index a103b8902..95bf0b2ca 100644 --- a/Marlin/src/config/examples/Felix/DUAL/Configuration.h +++ b/Marlin/src/config/examples/Felix/DUAL/Configuration.h @@ -735,9 +735,6 @@ * (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. @@ -832,6 +829,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h index 7a328d643..0613503e9 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h @@ -759,9 +759,6 @@ * (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. @@ -856,6 +853,9 @@ // Enable the M48 repeatability test to test probe accuracy #define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical 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 7a9eab625..25f78eeb4 100644 --- a/Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration.h +++ b/Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration.h @@ -777,9 +777,6 @@ * (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. @@ -874,6 +871,9 @@ // Enable the M48 repeatability test to test probe accuracy #define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical 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 d76f21a55..e286d6fb8 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h @@ -788,9 +788,6 @@ * (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. @@ -885,6 +882,9 @@ // Enable the M48 repeatability test to test probe accuracy #define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h index 3fea05f53..f4569a30b 100644 --- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h @@ -768,9 +768,6 @@ * (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. @@ -865,6 +862,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical 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 d80622187..e6426ac1a 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,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical 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 0dc5e6ffb..b369f532f 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,9 +769,6 @@ * (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. @@ -866,6 +863,9 @@ // Enable the M48 repeatability test to test probe accuracy #define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical 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 8e94144f3..216e364ac 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,9 +768,6 @@ * (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. @@ -865,6 +862,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical 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 b3a6d7fbf..884c32d39 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,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical 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 75464b256..ea66f1453 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,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h index be758200f..4f415c0f7 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h @@ -757,9 +757,6 @@ * (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. @@ -854,6 +851,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration.h b/Marlin/src/config/examples/JGAurora/A5/Configuration.h index 21c563aca..1454982ea 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration.h @@ -765,9 +765,6 @@ * (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. @@ -862,6 +859,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/MakerParts/Configuration.h b/Marlin/src/config/examples/MakerParts/Configuration.h index e0274af93..f8173fd60 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration.h +++ b/Marlin/src/config/examples/MakerParts/Configuration.h @@ -773,9 +773,6 @@ * (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. @@ -870,6 +867,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration.h b/Marlin/src/config/examples/Malyan/M150/Configuration.h index 7a9221910..4b05d5805 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration.h @@ -745,9 +745,6 @@ * (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. @@ -846,6 +843,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration.h b/Marlin/src/config/examples/Malyan/M200/Configuration.h index 1bbe36227..f6639f556 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration.h @@ -752,9 +752,6 @@ * (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. @@ -849,6 +846,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h index 34f8dd010..2c0c86549 100644 --- a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h @@ -757,9 +757,6 @@ * (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. @@ -854,6 +851,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h index fc2e53476..a17b718cd 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h @@ -757,9 +757,6 @@ * (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. @@ -854,6 +851,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration.h b/Marlin/src/config/examples/Mks/Sbase/Configuration.h index 64ade7e89..399bd97d2 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration.h @@ -753,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h index 6e3002424..51aad4974 100644 --- a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h +++ b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h @@ -793,9 +793,6 @@ 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. @@ -890,6 +887,9 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h index d589ea9b9..ed2dfc18e 100644 --- a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h @@ -753,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/RigidBot/Configuration.h b/Marlin/src/config/examples/RigidBot/Configuration.h index b47cd148a..c009282d3 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration.h +++ b/Marlin/src/config/examples/RigidBot/Configuration.h @@ -751,9 +751,6 @@ * (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. @@ -848,6 +845,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/SCARA/Configuration.h b/Marlin/src/config/examples/SCARA/Configuration.h index cec57a34b..deab5aafd 100644 --- a/Marlin/src/config/examples/SCARA/Configuration.h +++ b/Marlin/src/config/examples/SCARA/Configuration.h @@ -766,9 +766,6 @@ * (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. @@ -863,6 +860,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/STM32F10/Configuration.h b/Marlin/src/config/examples/STM32F10/Configuration.h index bf5d3d5fd..add74ac0d 100644 --- a/Marlin/src/config/examples/STM32F10/Configuration.h +++ b/Marlin/src/config/examples/STM32F10/Configuration.h @@ -755,9 +755,6 @@ * (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. @@ -852,6 +849,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/STM32F4/Configuration.h b/Marlin/src/config/examples/STM32F4/Configuration.h index f8d7f7232..ed77a670d 100644 --- a/Marlin/src/config/examples/STM32F4/Configuration.h +++ b/Marlin/src/config/examples/STM32F4/Configuration.h @@ -753,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration.h b/Marlin/src/config/examples/Sanguinololu/Configuration.h index c3abf9090..9065b18d1 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration.h @@ -784,9 +784,6 @@ * (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. @@ -881,6 +878,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/TheBorg/Configuration.h b/Marlin/src/config/examples/TheBorg/Configuration.h index 6073566a9..c2d8a7f13 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration.h +++ b/Marlin/src/config/examples/TheBorg/Configuration.h @@ -753,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration.h b/Marlin/src/config/examples/TinyBoy2/Configuration.h index ac7552309..546284f98 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration.h @@ -804,9 +804,6 @@ * (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. @@ -901,6 +898,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Tronxy/X1/Configuration.h b/Marlin/src/config/examples/Tronxy/X1/Configuration.h index aee8ebe29..d40992d21 100644 --- a/Marlin/src/config/examples/Tronxy/X1/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X1/Configuration.h @@ -753,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h index 33f71f6d3..24bebb7f2 100644 --- a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h @@ -753,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h index 5b81ac7d1..f9f39425e 100644 --- a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h @@ -753,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h index 9d153ffad..f651cb2ef 100644 --- a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h @@ -764,9 +764,6 @@ * (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. @@ -861,6 +858,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h index 03241a40c..c9e2e1add 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h @@ -753,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration.h b/Marlin/src/config/examples/Velleman/K8200/Configuration.h index aa4ccadae..63583913f 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration.h @@ -782,9 +782,6 @@ * (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. @@ -879,6 +876,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Configuration.h index d10e4b6ca..fbc29c46a 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration.h @@ -753,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical 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 3755f9be6..0b5a76cec 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h @@ -753,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h index 634c122f9..c7275b322 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h @@ -763,9 +763,6 @@ * (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. @@ -860,6 +857,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h index 9acd73970..9fe7566f4 100644 --- a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h +++ b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h @@ -753,9 +753,6 @@ * (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. @@ -850,6 +847,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h index befadcb0d..dc9935b80 100644 --- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h @@ -875,9 +875,6 @@ */ #if ANYCUBIC_PROBE_VERSION > 0 #define FIX_MOUNTED_PROBE -#if ENABLED(FIX_MOUNTED_PROBE) - #define MANUAL_DEPLOY_STOW -#endif #endif /** @@ -1025,6 +1022,9 @@ #define Z_MIN_PROBE_REPEATABILITY_TEST #endif +// Before deploy/stow pause for user confirmation +#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical 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 38726e699..585ab81fd 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h @@ -835,9 +835,6 @@ * (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. @@ -978,6 +975,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h index 6521fe6e2..16db506be 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h @@ -835,9 +835,6 @@ * (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. @@ -977,6 +974,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical 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 643a078a0..52d4ebd3b 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h @@ -835,9 +835,6 @@ * (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. @@ -977,6 +974,9 @@ // Enable the M48 repeatability test to test probe accuracy #define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h index d5d9fe4dc..5fe0409e7 100644 --- a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h +++ b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h @@ -840,9 +840,6 @@ * (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. @@ -980,6 +977,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/delta/generic/Configuration.h b/Marlin/src/config/examples/delta/generic/Configuration.h index c41f4dc1b..4d69279fa 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration.h +++ b/Marlin/src/config/examples/delta/generic/Configuration.h @@ -825,9 +825,6 @@ * (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. @@ -965,6 +962,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h index 919f0eb5c..6e584e2b5 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h @@ -825,9 +825,6 @@ * (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. @@ -967,6 +964,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h index d6123a75d..f042c7890 100644 --- a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h @@ -818,9 +818,6 @@ * (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. @@ -968,6 +965,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h index c33497279..4d61833c0 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h @@ -828,9 +828,6 @@ * (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. @@ -968,6 +965,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h index 176c1da98..fe6469e37 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h @@ -766,9 +766,6 @@ * (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. @@ -863,6 +860,9 @@ // Enable the M48 repeatability test to test probe accuracy #define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/makibox/Configuration.h b/Marlin/src/config/examples/makibox/Configuration.h index 5266f7ac0..094ab1e4e 100644 --- a/Marlin/src/config/examples/makibox/Configuration.h +++ b/Marlin/src/config/examples/makibox/Configuration.h @@ -756,9 +756,6 @@ * (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. @@ -853,6 +850,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/stm32f103ret6/Configuration.h b/Marlin/src/config/examples/stm32f103ret6/Configuration.h index 49fb96b57..6a0bbd45d 100644 --- a/Marlin/src/config/examples/stm32f103ret6/Configuration.h +++ b/Marlin/src/config/examples/stm32f103ret6/Configuration.h @@ -755,9 +755,6 @@ * (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. @@ -852,6 +849,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h index c2830ad1e..880b08a34 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h @@ -748,9 +748,6 @@ * (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. @@ -845,6 +842,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/config/examples/wt150/Configuration.h b/Marlin/src/config/examples/wt150/Configuration.h index e748c5b8d..1b977a2f2 100644 --- a/Marlin/src/config/examples/wt150/Configuration.h +++ b/Marlin/src/config/examples/wt150/Configuration.h @@ -758,9 +758,6 @@ * (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. @@ -855,6 +852,9 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + /** * Enable one or more of the following if probing seems unreliable. * Heaters and/or fans can be disabled during probing to minimize electrical diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index 29330de23..87f4b3b20 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -379,8 +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 - // unless MANUAL_DEPLOY_STOW is enabled - #if ENABLED(FIX_MOUNTED_PROBE) && DISABLED(MANUAL_DEPLOY_STOW) + // unless PAUSE_BEFORE_DEPLOY_STOW is enabled + #if ENABLED(FIX_MOUNTED_PROBE) && DISABLED(PAUSE_BEFORE_DEPLOY_STOW) const bool deploy_stow_condition = deploy; #else constexpr bool deploy_stow_condition = true; @@ -425,6 +425,24 @@ bool set_probe_deployed(const bool deploy) { // otherwise an Allen-Key probe can't be stowed. #endif + #if ENABLED(PAUSE_BEFORE_DEPLOY_STOW) + + BUZZ(100, 659); + BUZZ(100, 698); + + 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 // PAUSE_BEFORE_DEPLOY_STOW + #if ENABLED(SOLENOID_PROBE) #if HAS_SOLENOID_1 @@ -443,24 +461,6 @@ 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); - - BUZZ(100, 659); - BUZZ(100, 698); - - 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 014dd6a4a..1d7c48459 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 MANUAL_DEPLOY_STOW USE_ZMIN_PLUG EEPROM_SETTINGS EEPROM_CHITCHAT ULTIMAKERCONTROLLER +opt_enable AUTO_BED_LEVELING_BILINEAR FIX_MOUNTED_PROBE PAUSE_BEFORE_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