Giuliano Zaro
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
1 additions and
2 deletions
-
Marlin/src/core/utility.cpp
-
Marlin/src/gcode/calibrate/G34_M422.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", "") |
|
|
|
|
|
|
|
@ -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); |
|
|
|
|
