From 83855925464bd02acd4ccfb8a0a4df977c10ecb7 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Sun, 22 Nov 2020 01:51:57 -0800 Subject: [PATCH 1/2] Remove UBL moves to Z0 --- Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp index e8524da36886..79264e0ee954 100644 --- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp +++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp @@ -949,7 +949,7 @@ g29_repetition_cnt = 1; // do exactly one mesh location. Otherwise use what the parser decided. #if ENABLED(UBL_MESH_EDIT_MOVES_Z) - const float h_offset = parser.seenval('H') ? parser.value_linear_units() : 0; + const float h_offset = parser.seenval('H') ? parser.value_linear_units() : MANUAL_PROBE_START_Z; if (!WITHIN(h_offset, 0, 10)) { SERIAL_ECHOLNPGM("Offset out of bounds. (0 to 10mm)\n"); return; @@ -970,8 +970,6 @@ do_blocking_move_to_xy_z(pos, Z_CLEARANCE_BETWEEN_PROBES); // Move to the given XY with probe clearance - TERN_(UBL_MESH_EDIT_MOVES_Z, do_blocking_move_to_z(h_offset)); // Move Z to the given 'H' offset - MeshFlags done_flags{0}; const xy_int8_t &lpos = location.pos; do { @@ -991,8 +989,6 @@ do_blocking_move_to(raw); // Move the nozzle to the edit point with probe clearance - TERN_(UBL_MESH_EDIT_MOVES_Z, do_blocking_move_to_z(h_offset)); // Move Z to the given 'H' offset before editing - KEEPALIVE_STATE(PAUSED_FOR_USER); if (do_ubl_mesh_map) display_map(g29_map_type); // Display the current point From 5df9378ea8046654b63cca992a58488e7233528c Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Sun, 22 Nov 2020 01:56:13 -0800 Subject: [PATCH 2/2] Revert one --- Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp index 79264e0ee954..94bec99194b7 100644 --- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp +++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp @@ -989,6 +989,8 @@ do_blocking_move_to(raw); // Move the nozzle to the edit point with probe clearance + TERN_(UBL_MESH_EDIT_MOVES_Z, do_blocking_move_to_z(h_offset)); // Move Z to the given 'H' offset before editing + KEEPALIVE_STATE(PAUSED_FOR_USER); if (do_ubl_mesh_map) display_map(g29_map_type); // Display the current point