From 894608f8a31d756cb33a4bf8396110b3a31d0c24 Mon Sep 17 00:00:00 2001
From: Wilfried Chauveau <Wilfried Chauveau>
Date: Mon, 24 Jul 2017 21:15:03 +0200
Subject: [PATCH] Manual Bed Leveling: Goto previous Z height at each probe
point
---
Marlin/Marlin_main.cpp | 6 +++---
Marlin/ultralcd.cpp | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 82cea9819e..b885043596 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -3998,10 +3998,10 @@ void home_all_axes() { gcode_G28(true); }
inline void _manual_goto_xy(const float &x, const float &y) {
const float old_feedrate_mm_s = feedrate_mm_s;
-
#if MANUAL_PROBE_HEIGHT > 0
+ const float prev_z = current_position[Z_AXIS];
feedrate_mm_s = homing_feedrate(Z_AXIS);
- current_position[Z_AXIS] = LOGICAL_Z_POSITION(Z_MIN_POS) + MANUAL_PROBE_HEIGHT;
+ current_position[Z_AXIS] = LOGICAL_Z_POSITION(MANUAL_PROBE_HEIGHT);
line_to_current_position();
#endif
@@ -4012,7 +4012,7 @@ void home_all_axes() { gcode_G28(true); }
#if MANUAL_PROBE_HEIGHT > 0
feedrate_mm_s = homing_feedrate(Z_AXIS);
- current_position[Z_AXIS] = LOGICAL_Z_POSITION(Z_MIN_POS); // just slightly over the bed
+ current_position[Z_AXIS] = prev_z; // move back to the previous Z.
line_to_current_position();
#endif
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index aaa78fe3b7..18424a0269 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -1586,13 +1586,14 @@ void kill_screen(const char* lcd_msg) {
// Utility to go to the next mesh point
inline void _manual_probe_goto_xy(float x, float y) {
#if MANUAL_PROBE_HEIGHT > 0
+ const float prev_z = current_position[Z_AXIS];
line_to_z(LOGICAL_Z_POSITION(Z_MIN_POS) + MANUAL_PROBE_HEIGHT);
#endif
current_position[X_AXIS] = LOGICAL_X_POSITION(x);
current_position[Y_AXIS] = LOGICAL_Y_POSITION(y);
planner.buffer_line_kinematic(current_position, MMM_TO_MMS(XY_PROBE_SPEED), active_extruder);
#if MANUAL_PROBE_HEIGHT > 0
- line_to_z(LOGICAL_Z_POSITION(Z_MIN_POS));
+ line_to_z(prev_z);
#endif
lcd_synchronize();
}
--
GitLab