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

Do not allow to resume a print twice while waiting for the hotend

Browse Source 
Clear isPrintPaused just prior to restore_print_from_ram_and_continue.
This commit is contained in:
Yuri D'Elia 2019-12-15 22:22:44 +01:00
parent 6ab3b20ce1
commit 348bbbffb0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/ultralcd.cpp
View File

@ -6752,10 +6752,10 @@ void lcd_resume_print()
if (fan_error_selftest()) return; //abort if error persists if (fan_error_selftest()) return; //abort if error persists
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
refresh_cmd_timeout(); refresh_cmd_timeout();
isPrintPaused = false;
SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_RESUMED); //resume octoprint SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_RESUMED); //resume octoprint
} }
@ -6907,7 +6907,7 @@ static void lcd_main_menu()
{ {
MENU_ITEM_FUNCTION_P(_i("Pause print"), lcd_pause_print);////MSG_PAUSE_PRINT MENU_ITEM_FUNCTION_P(_i("Pause print"), lcd_pause_print);////MSG_PAUSE_PRINT
} }
else else if(isPrintPaused)
{ {
#ifdef FANCHECK #ifdef FANCHECK
if((fan_check_error == EFCE_FIXED) || (fan_check_error == EFCE_OK)) if((fan_check_error == EFCE_FIXED) || (fan_check_error == EFCE_OK))