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

Merge pull request #1882 from MRprusa3d/PFW-843 

"stop" immediately after "pause" patch
This commit is contained in:
DRracer 2019-06-04 12:45:16 +02:00 committed by GitHub
parent fe1de33406 348642c5fc
commit 44b8938490
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/ultralcd.cpp
View File

@ -572,11 +572,8 @@ void lcd_commands()
lcd_setstatuspgm(MSG_PRINT_PAUSED);
isPrintPaused = true;
long_pause();
if (lcd_commands_type == LCD_COMMAND_LONG_PAUSE) // !!! because "lcd_commands_type" can be changed during/inside "long_pause()"
{
lcd_commands_type = 0;
lcd_commands_step = 0;
}
lcd_commands_type = 0;
lcd_commands_step = 0;
}
}
@ -4938,6 +4935,7 @@ void lcd_print_stop() {
save_statistics(total_filament_used, t);
lcd_return_to_status();
lcd_ignore_click(true);
lcd_commands_step = 0;
lcd_commands_type = LCD_COMMAND_STOP_PRINT;
if (farm_mode) prusa_statistics(7);
// Turn off the print fan