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

Complete all pending moves before restoring a saved print

This commit is contained in:
Yuri D'Elia 2019-12-28 20:26:19 +01:00
parent f5d382f9f4
commit 57be14fca6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/mmu.cpp
View File

@ -1589,6 +1589,7 @@ void mmu_continue_loading(bool blocking)
if (blocking) if (blocking)
{ {
marlin_wait_for_click(); marlin_wait_for_click();
st_synchronize();
restore_print_from_ram_and_continue(0); restore_print_from_ram_and_continue(0);
state = Ls::Retry; state = Ls::Retry;
} }

7
Firmware/ultralcd.cpp
View File

@ -6764,12 +6764,13 @@ static bool fan_error_selftest()
void lcd_resume_print() void lcd_resume_print()
{ {
lcd_return_to_status(); lcd_return_to_status();
lcd_reset_alert_level();
lcd_setstatuspgm(_T(MSG_RESUMING_PRINT));
lcd_reset_alert_level(); //for fan speed error lcd_reset_alert_level(); //for fan speed error
if (fan_error_selftest()) return; //abort if error persists if (fan_error_selftest()) return; //abort if error persists
lcd_setstatuspgm(_T(MSG_FINISHING_MOVEMENTS));
st_synchronize();
lcd_setstatuspgm(_T(MSG_RESUMING_PRINT));
isPrintPaused = false; isPrintPaused = false;
restore_print_from_ram_and_continue(0.0); restore_print_from_ram_and_continue(0.0);
pause_time += (_millis() - start_pause_print); //accumulate time when print is paused for correct statistics calculation pause_time += (_millis() - start_pause_print); //accumulate time when print is paused for correct statistics calculation