Browse Source

Probe Offset Wizard followupBack to PROBE_PT_RAISE/separate STOW, make "PROBING" msg appear (#20439)

* Go back to always use PROBE_PT_RAISE with a discrete stow. This ensures a raise above the bed, while stowing prior to exiting the wizard.
* Fix issue preventing text while moving to X/Y position
Co-authored-by: FanDjango <FanDjango@users.noreply.github.com>
FanDjango 4 years ago
parent
commit
1a9644cef9
No account linked to committer's email address
1 changed files with 10 additions and 5 deletions
  1. 10
    5
      Marlin/src/lcd/menu/menu_probe_offset.cpp

+ 10
- 5
Marlin/src/lcd/menu/menu_probe_offset.cpp View File

120
 }
120
 }
121
 
121
 
122
 void prepare_for_probe_offset_wizard() {
122
 void prepare_for_probe_offset_wizard() {
123
-  if (ui.wait_for_move) return;
124
-
125
   #if defined(PROBE_OFFSET_WIZARD_XY_POS) || !HOMING_Z_WITH_PROBE
123
   #if defined(PROBE_OFFSET_WIZARD_XY_POS) || !HOMING_Z_WITH_PROBE
126
     if (ui.should_draw()) MenuItem_static::draw(1, GET_TEXT(MSG_PROBE_WIZARD_PROBING));
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
     #ifndef PROBE_OFFSET_WIZARD_XY_POS
128
     #ifndef PROBE_OFFSET_WIZARD_XY_POS
129
       #define PROBE_OFFSET_WIZARD_XY_POS XY_CENTER
129
       #define PROBE_OFFSET_WIZARD_XY_POS XY_CENTER
130
     #endif
130
     #endif
133
 
133
 
134
     // Probe for Z reference
134
     // Probe for Z reference
135
     ui.wait_for_move = true;
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
     ui.wait_for_move = false;
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
   #endif
144
   #endif
140
 
145
 
141
-  SET_SOFT_ENDSTOP_LOOSE(true); // Disable soft endstops for free Z movement
142
-
143
   // Move Nozzle to Probing/Homing Position
146
   // Move Nozzle to Probing/Homing Position
144
   ui.wait_for_move = true;
147
   ui.wait_for_move = true;
145
   current_position += probe.offset_xy;
148
   current_position += probe.offset_xy;
147
   ui.synchronize(GET_TEXT(MSG_PROBE_WIZARD_MOVING));
150
   ui.synchronize(GET_TEXT(MSG_PROBE_WIZARD_MOVING));
148
   ui.wait_for_move = false;
151
   ui.wait_for_move = false;
149
 
152
 
153
+  SET_SOFT_ENDSTOP_LOOSE(true); // Disable soft endstops for free Z movement
154
+
150
   // Go to Calibration Menu
155
   // Go to Calibration Menu
151
   ui.goto_screen(probe_offset_wizard_menu);
156
   ui.goto_screen(probe_offset_wizard_menu);
152
   ui.defer_status_screen();
157
   ui.defer_status_screen();

Loading…
Cancel
Save