diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 3c75cec8308e15df7d8da8f352683eda3d377282..69a9fbabebaab251baa267581894ff2e1e7a39c2 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 3c75cec8308e15df7d8da8f352683eda3d377282..69a9fbabebaab251baa267581894ff2e1e7a39c2 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 d80eeacc4db863ff11f6f13e1b7428f5dd44190c..5aee80de6dd62bdab300db8c132fc4839ed524b0 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 cae8a956532c6e5d9b79aee0a606e637135ec2d7..2126c8d762dabd8fcb5efd23ddcc05decf46e74c 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 ac4b314dd93273595978283d3dae0c616c26b3c9..b6e4517a4eeefa1509fb5073154581d1e20c4323 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 f074ffcb73cbdbcb2342cfaa5441fc2db553df9d..a07715960f59e8c3b2638ce1af5cb60fe0517aa5 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 7b242191cb600abc4671655421a123c33a84c977..4a7828fc9c3ec09755d39fc55877402d3c97b6e7 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 96bf06b880ab17b51faf409704e327da78c14a81..fbf041fba9f5fc9446cfd20b5aed33aa7d393f40 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 9bba047071a16fca72379a522a07b375afc3723a..cd1a37942fb498aba711674964de598e385d615f 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 bfae31892310d44949d011f2a4c7a79a97bc02f2..fa2a43a979c1f3adb9aa3f2fce5e3f96339854a2 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 0555de83669c5842da5b16a59eda3d1dd1218134..34ed06b6590c7e1f9d923fd7c365fd5fdb9eb460 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 8e080fa2259ed881b0d00ab25fceb8f514f25492..da9b84605e938a6497817803feada2dd778c2946 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 2456cdaedca5c0d8a4a97e77028a9e1ac3081eae..0a38aeb8edc6f687a7383dc43273640c906db02c 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 8107d07a6de325720d8c67e2ff8850fd57e297e3..93de75d989782b9abf4f8ee6291c457bf7318fe9 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 d5b8d7197091416948ae5779d65a6db38bc7acf9..112c03410bff4b1e856be777df4dff33209313b3 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 744149b3cdd6d3f66a117f6eecf2d97a967ef462..4cb4ed14ff5eb903c4b4368cc04a23e0b732a23a 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 6c5bf263b379707d3304770d6da1c02a66d8b0dc..607b2fb710659cd24e47118f23a95267af7702f8 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 f4205889bfcf92ffd46a837eec7838a31b7fb0b5..3509c4ef339a0bb771df7a714868714345611e47 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 c5f9ad1ff90207558d2b4d7e46dbf2b09fa35fa2..de29ed5ed6e5b133cf3db90b1e008ff861fb4f9e 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 539e7416c554f33aac716c04b2f92ff781ee6a07..95552b799ecaeb3d345275ecb15f46ac4420f330 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 343821f5e45c3b635463708147bdb0931beb9b9b..610286c8d2750e2ad973173b764bfd2b81a4507d 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 7d3203a1231b6e6bc2ed1bd3dfb545bbc1b30c9d..aedc7791acb5d24beefd7a1cb4aab4d3ad77a086 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 9201f120707cc9f4e610b6dd95f7b95fdcbc81d6..6305196f2043d5120b50c3bacde6602b8b7d79fc 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 f27a79283a21d9a564d4602e320a17badffbd6dd..836c90aeb732d4d5ee07fa6e199d6a2aa5ccc201 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 a103b89020f7c47f441f735dd597dc1da34622cb..95bf0b2cac3862515bf64b2297b85b72f44093b4 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 7a328d64388fcd8af0490e1eab29a07975a9e0f5..0613503e932b96801e1b2575d232a7a790ea4833 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 7a9eab625165d165281d469e977a3f63206cabd4..25f78eeb43fde801611de4d8cd674582411f55a2 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 d76f21a558d97183dea450135df7ad259e605450..e286d6fb8b1888125ad9a0edc6860159af49217f 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 3fea05f533a05c666f7881ff8d709c25ada8a5ba..f4569a30bf28146af9113ae8465b4c95f4f23b90 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 d80622187c562bd7d1cc74e8de01cc80aa9c1a87..e6426ac1a4d0699996cae39c73723101290f447f 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 0dc5e6ffb42730981cfc422a33e98053cde4ade0..b369f532f0a6572a54cd4276af1f7256869e74f8 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 8e94144f32c18710e2970a6edaf8c5b8ebfe0f2d..216e364acea7b67ac391911d4731e2f1d3855cb4 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 b3a6d7fbfcb35c2198d80cf8b1e02f4386e45e2f..884c32d392435c4e5d4be3079a2bd129bcd8743d 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 75464b256aed63d64b987530ee71f06e3e992b1b..ea66f1453be6b2d0939106a065b19b3e29dd1071 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 be758200f5a82d2c16d7a8b124ff529623e03b4c..4f415c0f7bc49f348914868d010c52dc1e2364ee 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 21c563aca7462eb30bec82d05fc6768cf54f53a7..1454982ea72c600c35120232a45bd7f5e957f3c4 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 e0274af93655dca4cd6d03eece4345ac806dd318..f8173fd6058f8b0df726de097c53e5703cb99ba0 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 7a92219108de91056f6ea8015e6a3e6eaaf77f44..4b05d5805b5aaa6f062adbac6637df2dfd2f0953 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 1bbe362271806c9f99e3fd438a7c75788e621ee7..f6639f556e01844571f5d73131f888eb3770761b 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 34f8dd0105f6bfdcde9a65961bc6a11380157ef7..2c0c865490e45b942f42878aa9fff687af4f3803 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 fc2e5347664d926c162026279f35f4922ca71b70..a17b718cdbef81c09be048e10e1346728a3f354c 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 64ade7e894c5288104d6e733873ea505c6603313..399bd97d288f6e0df38a67aa07ffb12c99ae72de 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 6e300242477afff5f1731e9425d0a1d3d56de6cb..51aad4974fe569001d3e994b8fe3c95d448a8bf3 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 d589ea9b9652cbf899a9ce5220970f4edbfd31b2..ed2dfc18e03a1022a26a3537274e4ef0f3d24ed6 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 b47cd148a36835933fc314208801f3cebae8bf6d..c009282d329a27030a8b2a4ffdb938e89c8b04d6 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 cec57a34b78b2758ce9c20c5443e5499263f53d5..deab5aafd494ce04d844c09cc3a9824924013eda 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 bf5d3d5fd091b800a6c4c52f261b84e5291b064b..add74ac0d53329530ff88aeb353ecefed3370ce9 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 f8d7f7232f20c0141cf983e678e8516b8246dc4f..ed77a670dd5399b4cf56a51fe90e8345d42a2f39 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 c3abf9090d7229c74d2ab407ac19f502f79b30dd..9065b18d1fd9869f8c4bf38c282a49f5847ca1f8 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 6073566a93c64934d029f043d1f1565bdfd19cad..c2d8a7f1393001ecda301b1ed25886d7f235cdfb 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 ac75523091ff9586bd587d24ec7ca707516f0847..546284f984ece2497d512d5013864b678fa2bafa 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 aee8ebe297f20a6e668b42511adc140a70ca9a1f..d40992d21f2bd7fb75bbf5b0a5f35b78ae3041db 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 33f71f6d3eae6e41280873da84ba3e1b2ac9d7e8..24bebb7f2eb442d4069e67f6a67f8296e1f1009f 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 5b81ac7d1d9c8c42e2738c7f00ce4bed4d1736ee..f9f39425e658a763d9df27c51b84288a2f7eaa8d 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 9d153ffad4fe3db4e57c5ae58a4724033488c4c8..f651cb2ef171b420a58c6b23d1b8285bb5ade84b 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 03241a40cb71be7d1140cd3cbecdbff208ff7671..c9e2e1adde28faf42745b7e9ff77a77cd6864b7c 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 aa4ccadae262843af5c1be190671d7a62bee3783..63583913fda5d98395c04ddb34392545b1804a21 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 d10e4b6ca27bee5b062c4247c2be27efee7de7b3..fbc29c46a751bf43b7e660ef806e939af3d212d8 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 3755f9be6bb0b615eead9d1dda1d97ba159893f2..0b5a76cec78a6523ea893c04ffc2e2a61473bce3 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 634c122f9befd1816bc36a806d2132a7ea88f5b7..c7275b322602ed173ef41bb2e88186a904890ed9 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 9acd73970c8b61227be1cfb69cd49c7ed2034277..9fe7566f412b95f3f0c5c168baed34cbd2b98b16 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 befadcb0d7f3d113c8a8eed1e10aa806b6762dd2..dc9935b8039b36e67af92fb289af2a46a78f3d85 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 38726e699885c5015c96d13534df5e3fdcab0adb..585ab81fddf47b74012a5f3984b179c6fa8a41ec 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 6521fe6e2b2ae20137fc56b41a2ad7d1f2a85719..16db506beeafac8da6a87742d0e3836569e69c0d 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 643a078a08a5f2df340749c9e58c6146155d09fe..52d4ebd3b4230b22eef2eb74d5bc99b2552a7490 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 d5d9fe4dc50ff19f0643549232680ce44d0afbe1..5fe0409e72d6bdc3dd87d7e98f65fd5201210fe6 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 c41f4dc1ba8ea069a3c82fbdaa6d99408b3c4bc4..4d69279fadcd23b65ab66e463a3421edae319f42 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 919f0eb5cf167219f196ad1cabe9c038d08ba5d3..6e584e2b59fdbd2f061c2bb6a7b1e3ba28694da3 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 d6123a75deada8c4d104df1ec3892ef068b18302..f042c7890dcc68b9f9b52fdbfc9b4551ccd917e9 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 c3349727920866410d6541b5eac58bee5bb35c9d..4d61833c082d5c163e7fe1dc59963983d44b630c 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 176c1da98f76f37b021b1c701e151d25335f537a..fe6469e3758a97794170603c8dbaf97679a4f764 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 5266f7ac024eb3ab52eade0b9814e94c8b75e3cb..094ab1e4ee4fb1d0d0d031392176824bab67b61e 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 49fb96b574ae01365e505eeb4572c66b826d8d44..6a0bbd45da48bc469d689e2bb4d94fdde5369fcc 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 c2830ad1e75d8593480a035ba8469aff468fb38f..880b08a345e15e0a146fa0d4aa6ce28e65dda18f 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 e748c5b8d3e4d739fdba412e83952f31df5cf977..1b977a2f2f818868abac2c350a12f476ff6877cb 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 29330de2307cadbcc3706beb77c55e0285d41ed1..87f4b3b2052df7e247b29a3f0d02642d43b50d04 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 014dd6a4a6c5089d49dd3f3e6b6861dac9306d9b..1d7c484593cf251bf39f4e9b6461f4521b71fa17 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