josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

G80: preserve lcd status and message when aborting 

Restore the old status just before returning, so that the subsequent G80
can restore the first (initial) message correctly.
This commit is contained in:
Yuri D'Elia 2021-04-06 00:31:56 +02:00
parent 5923276a86
commit a5530593fa
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Firmware/Marlin_main.cpp
View File

@ -3037,7 +3037,11 @@ static void gcode_G80()
// Wait until the move is finished. // Wait until the move is finished.
st_synchronize(); st_synchronize();
if (waiting_inside_plan_buffer_line_print_aborted) if (waiting_inside_plan_buffer_line_print_aborted)
{
custom_message_type = custom_message_type_old;
custom_message_state = custom_message_state_old;
return; return;
}
uint8_t mesh_point = 0; //index number of calibration point uint8_t mesh_point = 0; //index number of calibration point
int Z_LIFT_FEEDRATE = homing_feedrate[Z_AXIS] / 40; int Z_LIFT_FEEDRATE = homing_feedrate[Z_AXIS] / 40;
@ -3108,7 +3112,11 @@ static void gcode_G80()
plan_buffer_line_curposXYZE(XY_AXIS_FEEDRATE); plan_buffer_line_curposXYZE(XY_AXIS_FEEDRATE);
st_synchronize(); st_synchronize();
if (waiting_inside_plan_buffer_line_print_aborted) if (waiting_inside_plan_buffer_line_print_aborted)
{
custom_message_type = custom_message_type_old;
custom_message_state = custom_message_state_old;
return; return;
}
// Go down until endstop is hit // Go down until endstop is hit
const float Z_CALIBRATION_THRESHOLD = 1.f; const float Z_CALIBRATION_THRESHOLD = 1.f;
@ -3206,7 +3214,9 @@ static void gcode_G80()
enable_z_endstop(bState); enable_z_endstop(bState);
} while (st_get_position_mm(Z_AXIS) > MESH_HOME_Z_SEARCH); // i.e. Z-leveling not o.k. } while (st_get_position_mm(Z_AXIS) > MESH_HOME_Z_SEARCH); // i.e. Z-leveling not o.k.
// plan_set_z_position(MESH_HOME_Z_SEARCH); // is not necessary ('do-while' loop always ends at the expected Z-position) // plan_set_z_position(MESH_HOME_Z_SEARCH); // is not necessary ('do-while' loop always ends at the expected Z-position)
custom_message_type=CustomMsg::Status; // display / status-line recovery
custom_message_type = custom_message_type_old;
custom_message_state = custom_message_state_old;
lcd_update_enable(true); // display / status-line recovery lcd_update_enable(true); // display / status-line recovery
gcode_G28(true, true, true); // X & Y & Z-homing (must be after individual Z-homing (problem with spool-holder)!) gcode_G28(true, true, true); // X & Y & Z-homing (must be after individual Z-homing (problem with spool-holder)!)
repeatcommand_front(); // re-run (i.e. of "G80") repeatcommand_front(); // re-run (i.e. of "G80")