Browse Source

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

Katelyn Schiesser 4 years ago
parent
commit
a21d4c06ae
No account linked to committer's email address
1 changed files with 9 additions and 2 deletions
  1. 9
    2
      Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp

+ 9
- 2
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp View File

892
       const xyz_pos_t ppos = {
892
       const xyz_pos_t ppos = {
893
         mesh_index_to_xpos(lpos.x),
893
         mesh_index_to_xpos(lpos.x),
894
         mesh_index_to_ypos(lpos.y),
894
         mesh_index_to_ypos(lpos.y),
895
-        Z_CLEARANCE_BETWEEN_PROBES
895
+        z_clearance
896
       };
896
       };
897
 
897
 
898
       if (!position_is_reachable(ppos)) break; // SHOULD NOT OCCUR (find_closest_mesh_point only returns reachable points)
898
       if (!position_is_reachable(ppos)) break; // SHOULD NOT OCCUR (find_closest_mesh_point only returns reachable points)
907
 
907
 
908
       if (do_ubl_mesh_map) display_map(g29_map_type);  // show user where we're probing
908
       if (do_ubl_mesh_map) display_map(g29_map_type);  // show user where we're probing
909
 
909
 
910
-      serialprintPGM(parser.seen('B') ? GET_TEXT(MSG_UBL_BC_INSERT) : GET_TEXT(MSG_UBL_BC_INSERT2));
910
+      if (parser.seen('B')) {
911
+        serialprintPGM(GET_TEXT(MSG_UBL_BC_INSERT));
912
+        LCD_MESSAGEPGM(MSG_UBL_BC_INSERT);
913
+      }
914
+      else {
915
+        serialprintPGM(GET_TEXT(MSG_UBL_BC_INSERT2));
916
+        LCD_MESSAGEPGM(MSG_UBL_BC_INSERT2);
917
+      }
911
 
918
 
912
       const float z_step = 0.01f;                         // existing behavior: 0.01mm per click, occasionally step
919
       const float z_step = 0.01f;                         // existing behavior: 0.01mm per click, occasionally step
913
       //const float z_step = planner.steps_to_mm[Z_AXIS]; // approx one step each click
920
       //const float z_step = planner.steps_to_mm[Z_AXIS]; // approx one step each click

Loading…
Cancel
Save