Browse Source

Fix G34 Z lower, extra "BLTOUCH" debug line (#17175)

Giuliano Zaro 4 years ago
parent
commit
3b987dfcec
No account linked to committer's email address
2 changed files with 1 additions and 2 deletions
  1. 0
    1
      Marlin/src/core/utility.cpp
  2. 1
    1
      Marlin/src/gcode/calibrate/G34_M422.cpp

+ 0
- 1
Marlin/src/core/utility.cpp View File

67
       TERN(PROBE_MANUALLY, "PROBE_MANUALLY", "")
67
       TERN(PROBE_MANUALLY, "PROBE_MANUALLY", "")
68
       TERN(NOZZLE_AS_PROBE, "NOZZLE_AS_PROBE", "")
68
       TERN(NOZZLE_AS_PROBE, "NOZZLE_AS_PROBE", "")
69
       TERN(FIX_MOUNTED_PROBE, "FIX_MOUNTED_PROBE", "")
69
       TERN(FIX_MOUNTED_PROBE, "FIX_MOUNTED_PROBE", "")
70
-      TERN(BLTOUCH, "BLTOUCH", "")
71
       TERN(HAS_Z_SERVO_PROBE, TERN(BLTOUCH, "BLTOUCH", "SERVO PROBE"), "")
70
       TERN(HAS_Z_SERVO_PROBE, TERN(BLTOUCH, "BLTOUCH", "SERVO PROBE"), "")
72
       TERN(TOUCH_MI_PROBE, "TOUCH_MI_PROBE", "")
71
       TERN(TOUCH_MI_PROBE, "TOUCH_MI_PROBE", "")
73
       TERN(Z_PROBE_SLED, "Z_PROBE_SLED", "")
72
       TERN(Z_PROBE_SLED, "Z_PROBE_SLED", "")

+ 1
- 1
Marlin/src/gcode/calibrate/G34_M422.cpp View File

203
         const uint8_t iprobe = (iteration & 1) ? NUM_Z_STEPPER_DRIVERS - 1 - i : i;
203
         const uint8_t iprobe = (iteration & 1) ? NUM_Z_STEPPER_DRIVERS - 1 - i : i;
204
 
204
 
205
         // Safe clearance even on an incline
205
         // Safe clearance even on an incline
206
-        if (iteration == 0 || i > 0) do_blocking_move_to_z(z_probe);
206
+        if ((iteration == 0 || i > 0) && z_probe > current_position.z) do_blocking_move_to_z(z_probe);
207
 
207
 
208
         if (DEBUGGING(LEVELING))
208
         if (DEBUGGING(LEVELING))
209
           DEBUG_ECHOLNPAIR_P(PSTR("Probing X"), z_stepper_align.xy[iprobe].x, SP_Y_STR, z_stepper_align.xy[iprobe].y);
209
           DEBUG_ECHOLNPAIR_P(PSTR("Probing X"), z_stepper_align.xy[iprobe].x, SP_Y_STR, z_stepper_align.xy[iprobe].y);

Loading…
Cancel
Save