adjust

MarlinFirmware · Mar 9, 2023 · 8092cf1 · 8092cf1
1 parent 1be5564
commit 8092cf1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -1387,16 +1387,11 @@
 
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
- *
- * The Z_SERVO_MEASURE_ANGLE is only useful if your servo needs to
- * move to a "free" position to allow measuring.
- * With Z_SERVO_INTERMEDIATE_STOW you can have the probe stowed
- * between different points of a G29.
  */
 //#define Z_PROBE_SERVO_NR 0          // Defaults to SERVO 0 connector.
 //#define Z_SERVO_ANGLES { 70, 0 }    // Z Servo Deploy and Stow angles
-//#define Z_SERVO_MEASURE_ANGLE 45    // Z Servo Angle after deploy (to allow measuring)
-//#define Z_SERVO_INTERMEDIATE_STOW   // Stow the probe between points
+//#define Z_SERVO_MEASURE_ANGLE 45    // Use if the servo must move to a "free" position for measuring after deploy.
+//#define Z_SERVO_INTERMEDIATE_STOW   // Stow the probe between points.
 
 /**
  * The BLTouch probe uses a Hall effect sensor and emulates a servo.

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -491,7 +491,7 @@ G29_TYPE GcodeSuite::G29() {
     if (!no_action) set_bed_leveling_enabled(false);
 
     // Deploy certain probes before starting probing
-    #if EITHER(BLTOUCH, Z_SERVO_INTERMEDIATE_STOW)
+    #if ENABLED(BLTOUCH) || BOTH(HAS_Z_SERVO_PROBE, Z_SERVO_INTERMEDIATE_STOW)
       do_z_clearance(Z_CLEARANCE_DEPLOY_PROBE);
     #elif HAS_BED_PROBE
       if (probe.deploy()) { // (returns true on deploy failure)

diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
@@ -587,12 +587,13 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
   #if BOTH(HAS_TEMP_HOTEND, WAIT_FOR_HOTEND)
     thermalManager.wait_for_hotend_heating(active_extruder);
   #endif
+
   #if ENABLED(BLTOUCH)
     if (!bltouch.high_speed_mode && bltouch.deploy())
       return true; // Deploy in LOW SPEED MODE on every probe action
   #endif
 
-  #if ENABLED(Z_SERVO_INTERMEDIATE_STOW) || defined(Z_SERVO_MEASURE_ANGLE)
+  #if HAS_Z_SERVO_PROBE && (ENABLED(Z_SERVO_INTERMEDIATE_STOW) || defined(Z_SERVO_MEASURE_ANGLE))
     probe_specific_action(true);  //  Always re-deploy in this case
   #endif
 
@@ -645,7 +646,7 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
       return true; // Stow in LOW SPEED MODE on every trigger
   #endif
 
-  #if ENABLED(Z_SERVO_INTERMEDIATE_STOW)
+  #if BOTH(HAS_Z_SERVO_PROBE, Z_SERVO_INTERMEDIATE_STOW)
     probe_specific_action(false);  //  Always stow
   #endif