|
@@ -120,11 +120,11 @@ void probe_offset_wizard_menu() {
|
120
|
120
|
}
|
121
|
121
|
|
122
|
122
|
void prepare_for_probe_offset_wizard() {
|
123
|
|
- if (ui.wait_for_move) return;
|
124
|
|
-
|
125
|
123
|
#if defined(PROBE_OFFSET_WIZARD_XY_POS) || !HOMING_Z_WITH_PROBE
|
126
|
124
|
if (ui.should_draw()) MenuItem_static::draw(1, GET_TEXT(MSG_PROBE_WIZARD_PROBING));
|
127
|
125
|
|
|
126
|
+ if (ui.wait_for_move) return;
|
|
127
|
+
|
128
|
128
|
#ifndef PROBE_OFFSET_WIZARD_XY_POS
|
129
|
129
|
#define PROBE_OFFSET_WIZARD_XY_POS XY_CENTER
|
130
|
130
|
#endif
|
|
@@ -133,13 +133,16 @@ void prepare_for_probe_offset_wizard() {
|
133
|
133
|
|
134
|
134
|
// Probe for Z reference
|
135
|
135
|
ui.wait_for_move = true;
|
136
|
|
- z_offset_ref = probe.probe_at_point(wizard_pos, PROBE_PT_STOW, 0, true);
|
|
136
|
+ z_offset_ref = probe.probe_at_point(wizard_pos, PROBE_PT_RAISE, 0, true);
|
137
|
137
|
ui.wait_for_move = false;
|
138
|
138
|
|
|
139
|
+ // Stow the probe, as the last call to probe.probe_at_point(...) left
|
|
140
|
+ // the probe deployed if it was successful.
|
|
141
|
+ probe.stow();
|
|
142
|
+ #else
|
|
143
|
+ if (ui.wait_for_move) return;
|
139
|
144
|
#endif
|
140
|
145
|
|
141
|
|
- SET_SOFT_ENDSTOP_LOOSE(true); // Disable soft endstops for free Z movement
|
142
|
|
-
|
143
|
146
|
// Move Nozzle to Probing/Homing Position
|
144
|
147
|
ui.wait_for_move = true;
|
145
|
148
|
current_position += probe.offset_xy;
|
|
@@ -147,6 +150,8 @@ void prepare_for_probe_offset_wizard() {
|
147
|
150
|
ui.synchronize(GET_TEXT(MSG_PROBE_WIZARD_MOVING));
|
148
|
151
|
ui.wait_for_move = false;
|
149
|
152
|
|
|
153
|
+ SET_SOFT_ENDSTOP_LOOSE(true); // Disable soft endstops for free Z movement
|
|
154
|
+
|
150
|
155
|
// Go to Calibration Menu
|
151
|
156
|
ui.goto_screen(probe_offset_wizard_menu);
|
152
|
157
|
ui.defer_status_screen();
|