MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

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

Browse Source 
* 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>
This commit is contained in:
FanDjango 2020-12-13 02:18:33 +01:00 committed by Scott Lahteine
parent e9bde7e6fc
commit 430855fdca
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/src/lcd/menu/menu_probe_offset.cpp
View File

@ -120,11 +120,11 @@ void probe_offset_wizard_menu() {
} }
void prepare_for_probe_offset_wizard() { void prepare_for_probe_offset_wizard() {
if (ui.wait_for_move) return;
#if defined(PROBE_OFFSET_WIZARD_XY_POS) || !HOMING_Z_WITH_PROBE #if defined(PROBE_OFFSET_WIZARD_XY_POS) || !HOMING_Z_WITH_PROBE
if (ui.should_draw()) MenuItem_static::draw(1, GET_TEXT(MSG_PROBE_WIZARD_PROBING)); if (ui.should_draw()) MenuItem_static::draw(1, GET_TEXT(MSG_PROBE_WIZARD_PROBING));
if (ui.wait_for_move) return;
#ifndef PROBE_OFFSET_WIZARD_XY_POS #ifndef PROBE_OFFSET_WIZARD_XY_POS
#define PROBE_OFFSET_WIZARD_XY_POS XY_CENTER #define PROBE_OFFSET_WIZARD_XY_POS XY_CENTER
#endif #endif
@ -133,13 +133,16 @@ void prepare_for_probe_offset_wizard() {
// Probe for Z reference // Probe for Z reference
ui.wait_for_move = true; ui.wait_for_move = true;
z_offset_ref = probe.probe_at_point(wizard_pos, PROBE_PT_STOW, 0, true); z_offset_ref = probe.probe_at_point(wizard_pos, PROBE_PT_RAISE, 0, true);
ui.wait_for_move = false; ui.wait_for_move = false;
// Stow the probe, as the last call to probe.probe_at_point(...) left
// the probe deployed if it was successful.
probe.stow();
#else
if (ui.wait_for_move) return;
#endif #endif
SET_SOFT_ENDSTOP_LOOSE(true); // Disable soft endstops for free Z movement
// Move Nozzle to Probing/Homing Position // Move Nozzle to Probing/Homing Position
ui.wait_for_move = true; ui.wait_for_move = true;
current_position += probe.offset_xy; current_position += probe.offset_xy;
@ -147,6 +150,8 @@ void prepare_for_probe_offset_wizard() {
ui.synchronize(GET_TEXT(MSG_PROBE_WIZARD_MOVING)); ui.synchronize(GET_TEXT(MSG_PROBE_WIZARD_MOVING));
ui.wait_for_move = false; ui.wait_for_move = false;
SET_SOFT_ENDSTOP_LOOSE(true); // Disable soft endstops for free Z movement
// Go to Calibration Menu // Go to Calibration Menu
ui.goto_screen(probe_offset_wizard_menu); ui.goto_screen(probe_offset_wizard_menu);
ui.defer_status_screen(); ui.defer_status_screen();