Use 'H' value for UBL G29 z-clearance (MarlinFirmware#21114)

vyacheslav-shubin · Mar 10, 2021 · 974a430 · 974a430
1 parent 34ac9fc
commit 974a430
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -892,7 +892,7 @@ void unified_bed_leveling::shift_mesh_height() {
       const xyz_pos_t ppos = {
         mesh_index_to_xpos(lpos.x),
         mesh_index_to_ypos(lpos.y),
-        Z_CLEARANCE_BETWEEN_PROBES
+        z_clearance
       };
 
       if (!position_is_reachable(ppos)) break; // SHOULD NOT OCCUR (find_closest_mesh_point only returns reachable points)
@@ -907,7 +907,14 @@ void unified_bed_leveling::shift_mesh_height() {
 
       if (do_ubl_mesh_map) display_map(g29_map_type);  // show user where we're probing
 
-      serialprintPGM(parser.seen('B') ? GET_TEXT(MSG_UBL_BC_INSERT) : GET_TEXT(MSG_UBL_BC_INSERT2));
+      if (parser.seen('B')) {
+        serialprintPGM(GET_TEXT(MSG_UBL_BC_INSERT));
+        LCD_MESSAGEPGM(MSG_UBL_BC_INSERT);
+      }
+      else {
+        serialprintPGM(GET_TEXT(MSG_UBL_BC_INSERT2));
+        LCD_MESSAGEPGM(MSG_UBL_BC_INSERT2);
+      }
 
       const float z_step = 0.01f;                         // existing behavior: 0.01mm per click, occasionally step
       //const float z_step = planner.steps_to_mm[Z_AXIS]; // approx one step each click