disable later

MarlinFirmware · Dec 4, 2024 · 7f754c2 · 7f754c2
1 parent 91f510f
commit 7f754c2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -297,16 +297,16 @@ G29_parameters_t unified_bed_leveling::param;
 
 void unified_bed_leveling::G29() {
 
-  #if ENABLED(FT_MOTION) && ANY(BIQU_MICROPROBE_V1, BIQU_MICROPROBE_V2)
-    FTMotionDisableUntilExit FT_Disabler; // Disable Fixed-Time Motion for probing
-  #endif
-
   bool probe_deployed = false;
   if (G29_parse_parameters()) return; // Abort on parameter error
 
   const uint8_t p_val = parser.byteval('P');
   const bool may_move = p_val == 1 || p_val == 2 || p_val == 4 || parser.seen_test('J');
 
+  #if ENABLED(FT_MOTION) && ANY(BIQU_MICROPROBE_V1, BIQU_MICROPROBE_V2)
+    FTMotionDisableUntilExit FT_Disabler; // Disable Fixed-Time Motion for probing
+  #endif
+
   // Check for commands that require the printer to be homed
   if (may_move) {
     planner.synchronize();

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -234,10 +234,6 @@ class G29_State {
  */
 G29_TYPE GcodeSuite::G29() {
 
-  #if ENABLED(FT_MOTION) && ANY(BIQU_MICROPROBE_V1, BIQU_MICROPROBE_V2)
-    FTMotionDisableUntilExit FT_Disabler; // Disable Fixed-Time Motion for probing
-  #endif
-
   DEBUG_SECTION(log_G29, "G29", DEBUGGING(LEVELING));
 
   // Leveling state is persistent when done manually with multiple G29 commands
@@ -288,6 +284,10 @@ G29_TYPE GcodeSuite::G29() {
   // Set and report "probing" state to host
   TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_PROBE, false));
 
+  #if DISABLED(PROBE_MANUALLY) && ENABLED(FT_MOTION) && ANY(BIQU_MICROPROBE_V1, BIQU_MICROPROBE_V2)
+    FTMotionDisableUntilExit FT_Disabler; // Disable Fixed-Time Motion for probing
+  #endif
+
   /**
    * On the initial G29 fetch command parameters.
    */

diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
@@ -227,11 +227,6 @@
  *  Z   Home to the Z endstop
  */
 void GcodeSuite::G28() {
-
-  #if ENABLED(FT_MOTION) && ANY(BIQU_MICROPROBE_V1, BIQU_MICROPROBE_V2)
-    FTMotionDisableUntilExit FT_Disabler; // Disable Fixed-Time Motion for homing
-  #endif
-
   DEBUG_SECTION(log_G28, "G28", DEBUGGING(LEVELING));
   if (DEBUGGING(LEVELING)) log_machine_info();
 
@@ -298,6 +293,10 @@ void GcodeSuite::G28() {
       motion_state_t saved_motion_state = begin_slow_homing();
     #endif
 
+    #if ENABLED(FT_MOTION) && ANY(BIQU_MICROPROBE_V1, BIQU_MICROPROBE_V2)
+      FTMotionDisableUntilExit FT_Disabler; // Disable Fixed-Time Motion for homing
+    #endif
+
     // Always home with tool 0 active
     #if HAS_MULTI_HOTEND
       #if DISABLED(DELTA) || ENABLED(DELTA_HOME_TO_SAFE_ZONE)

diff --git a/Marlin/src/gcode/probe/G30.cpp b/Marlin/src/gcode/probe/G30.cpp
@@ -54,10 +54,6 @@
  */
 void GcodeSuite::G30() {
 
-  #if ENABLED(FT_MOTION) && ANY(BIQU_MICROPROBE_V1, BIQU_MICROPROBE_V2)
-    FTMotionDisableUntilExit FT_Disabler; // Disable Fixed-Time Motion for probing
-  #endif
-
   xy_pos_t probepos = current_position;
 
   const bool seenX = parser.seenval('X');
@@ -84,6 +80,10 @@ void GcodeSuite::G30() {
     // Use 'C' to set Probe Temperature Compensation ON/OFF (on by default)
     TERN_(HAS_PTC, ptc.set_enabled(parser.boolval('C', true)));
 
+    #if ENABLED(FT_MOTION) && ANY(BIQU_MICROPROBE_V1, BIQU_MICROPROBE_V2)
+      FTMotionDisableUntilExit FT_Disabler; // Disable Fixed-Time Motion for probing
+    #endif
+
     // Probe the bed, optionally raise, and return the measured height
     const float measured_z = probe.probe_at_point(probepos, raise_after);