misc. followup

MarlinFirmware · Feb 26, 2023 · 9a103de · 9a103de
1 parent 4ff4e4f
commit 9a103de
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -228,7 +228,7 @@ static void _lcd_level_bed_corners_get_next_position() {
   }
 
   bool _lcd_level_bed_corners_probe(bool verify=false) {
-    if (verify) line_to_z(BED_TRAMMING_Z_HOP); // do clearance if needed
+    if (verify) do_z_clearance(BED_TRAMMING_Z_HOP); // do clearance if needed
     TERN_(BLTOUCH, if (!bltouch.high_speed_mode) bltouch.deploy()); // Deploy in LOW SPEED MODE on every probe action
     do_blocking_move_to_z(last_z - BED_TRAMMING_PROBE_TOLERANCE, MMM_TO_MMS(Z_PROBE_FEEDRATE_SLOW)); // Move down to lower tolerance
     if (TEST(endstops.trigger_state(), Z_MIN_PROBE)) { // check if probe triggered
@@ -246,7 +246,7 @@ static void _lcd_level_bed_corners_get_next_position() {
 
       // Raise the probe after the last point to give clearance for stow
       if (TERN0(STOW_BETWEEN_PROBES, good_points == nr_edge_points - 1))
-        line_to_z(BED_TRAMMING_Z_HOP);
+        do_z_clearance(BED_TRAMMING_Z_HOP);
 
       return true; // probe triggered
     }
@@ -283,7 +283,7 @@ static void _lcd_level_bed_corners_get_next_position() {
       ui.refresh(LCDVIEW_REDRAW_NOW);
       _lcd_draw_probing();                                // update screen with # of good points
 
-      do_blocking_move_to_z(current_position.z + BED_TRAMMING_Z_HOP + TERN0(BLTOUCH, bltouch.z_extra_clearance())); // clearance
+      do_z_clearance(BED_TRAMMING_Z_HOP + TERN0(BLTOUCH, bltouch.z_extra_clearance())); // clearance
 
       _lcd_level_bed_corners_get_next_position();         // Select next corner coordinates
       corner_point -= probe.offset_xy;                    // Account for probe offsets
@@ -312,7 +312,7 @@ static void _lcd_level_bed_corners_get_next_position() {
     #if ENABLED(BLTOUCH)
       if (bltouch.high_speed_mode) {
         // In HIGH SPEED MODE do clearance and stow at the very end
-        do_blocking_move_to_z(current_position.z + BED_TRAMMING_Z_HOP);
+        do_z_clearance(BED_TRAMMING_Z_HOP);
         bltouch.stow();
       }
     #endif
@@ -324,13 +324,13 @@ static void _lcd_level_bed_corners_get_next_position() {
 #else // !BED_TRAMMING_USE_PROBE
 
   static void _lcd_goto_next_corner() {
-    line_to_z(BED_TRAMMING_Z_HOP);
+    do_z_clearance(BED_TRAMMING_Z_HOP);
 
     // Select next corner coordinates
     _lcd_level_bed_corners_get_next_position();
 
     do_blocking_move_to(corner_point, manual_feedrate_mm_s.x);
-    line_to_z(BED_TRAMMING_HEIGHT);
+    do_z_clearance(BED_TRAMMING_HEIGHT);
     if (++bed_corner >= available_points) bed_corner = 0;
   }
 
@@ -363,7 +363,7 @@ void _lcd_level_bed_corners_homing() {
           GET_TEXT_F(MSG_BUTTON_NEXT), GET_TEXT_F(MSG_BUTTON_DONE)
         , _lcd_goto_next_corner
         , []{
-            line_to_z(BED_TRAMMING_Z_HOP); // Raise Z off the bed when done
+            do_z_clearance(BED_TRAMMING_Z_HOP); // Raise Z off the bed when done
             TERN_(HAS_LEVELING, set_bed_leveling_enabled(menu_leveling_was_active));
             ui.goto_previous_screen_no_defer();
           }