|
@@ -42,6 +42,10 @@
|
42
|
42
|
float z_measured[G35_PROBE_COUNT] = { 0 };
|
43
|
43
|
static uint8_t tram_index = 0;
|
44
|
44
|
|
|
45
|
+#if HAS_LEVELING
|
|
46
|
+ #include "../../feature/bedlevel/bedlevel.h"
|
|
47
|
+#endif
|
|
48
|
+
|
45
|
49
|
static bool probe_single_point() {
|
46
|
50
|
do_blocking_move_to_z(TERN(BLTOUCH, Z_CLEARANCE_DEPLOY_PROBE, Z_CLEARANCE_BETWEEN_PROBES));
|
47
|
51
|
// Stow after each point with BLTouch "HIGH SPEED" mode for push-pin safety
|
|
@@ -60,7 +64,7 @@ static void _menu_single_probe(const uint8_t point) {
|
60
|
64
|
STATIC_ITEM(MSG_LEVEL_CORNERS, SS_LEFT);
|
61
|
65
|
STATIC_ITEM(MSG_LAST_VALUE_SP, SS_LEFT, ftostr42_52(z_measured[0] - z_measured[point])); // Print diff
|
62
|
66
|
ACTION_ITEM(MSG_UBL_BC_INSERT2, []{ if (probe_single_point()) ui.refresh(); });
|
63
|
|
- ACTION_ITEM(MSG_BUTTON_DONE, []{ ui.goto_previous_screen_no_defer(); }); // Back
|
|
67
|
+ ACTION_ITEM(MSG_BUTTON_DONE, []{ ui.goto_previous_screen(); }); // Back
|
64
|
68
|
END_MENU();
|
65
|
69
|
}
|
66
|
70
|
|
|
@@ -88,7 +92,8 @@ void goto_tramming_wizard() {
|
88
|
92
|
|
89
|
93
|
// Inject G28, wait for homing to complete,
|
90
|
94
|
set_all_unhomed();
|
91
|
|
- queue.inject_P(G28_STR);
|
|
95
|
+ queue.inject_P(TERN(G28_L0_ENSURES_LEVELING_OFF, PSTR("G28L0"), G28_STR));
|
|
96
|
+
|
92
|
97
|
ui.goto_screen([]{
|
93
|
98
|
_lcd_draw_homing();
|
94
|
99
|
if (all_axes_homed())
|