From 3b987dfcec653bfa8c79412d44cc70fd07941bd2 Mon Sep 17 00:00:00 2001 From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com> Date: Mon, 16 Mar 2020 00:23:24 +0100 Subject: [PATCH] Fix G34 Z lower, extra "BLTOUCH" debug line (#17175) --- Marlin/src/core/utility.cpp | 1 - Marlin/src/gcode/calibrate/G34_M422.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp index 19247ff69..5e159af58 100644 --- a/Marlin/src/core/utility.cpp +++ b/Marlin/src/core/utility.cpp @@ -67,7 +67,6 @@ void safe_delay(millis_t ms) { TERN(PROBE_MANUALLY, "PROBE_MANUALLY", "") TERN(NOZZLE_AS_PROBE, "NOZZLE_AS_PROBE", "") TERN(FIX_MOUNTED_PROBE, "FIX_MOUNTED_PROBE", "") - TERN(BLTOUCH, "BLTOUCH", "") TERN(HAS_Z_SERVO_PROBE, TERN(BLTOUCH, "BLTOUCH", "SERVO PROBE"), "") TERN(TOUCH_MI_PROBE, "TOUCH_MI_PROBE", "") TERN(Z_PROBE_SLED, "Z_PROBE_SLED", "") diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp index 672f40737..d1b828d07 100644 --- a/Marlin/src/gcode/calibrate/G34_M422.cpp +++ b/Marlin/src/gcode/calibrate/G34_M422.cpp @@ -203,7 +203,7 @@ void GcodeSuite::G34() { const uint8_t iprobe = (iteration & 1) ? NUM_Z_STEPPER_DRIVERS - 1 - i : i; // Safe clearance even on an incline - if (iteration == 0 || i > 0) do_blocking_move_to_z(z_probe); + if ((iteration == 0 || i > 0) && z_probe > current_position.z) do_blocking_move_to_z(z_probe); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR_P(PSTR("Probing X"), z_stepper_align.xy[iprobe].x, SP_Y_STR, z_stepper_align.xy[iprobe].y);