General option PAUSE_BEFORE_DEPLOY_STOW (#11905)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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
+  // unless PAUSE_BEFORE_DEPLOY_STOW is enabled
-  #if ENABLED(FIX_MOUNTED_PROBE) && DISABLED(MANUAL_DEPLOY_STOW)
+  #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

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