@ -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 ( ) ;