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

statistics for stop print changed

This commit is contained in:
PavelSindler 2017-04-04 13:41:20 +02:00
parent 7086764d35
commit d9fc29273e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/ultralcd.cpp
View File

@ -545,7 +545,7 @@ void lcd_commands()
enquecommand(cmd1); enquecommand(cmd1);
isPrintPaused = false; isPrintPaused = false;
card.startFileprint(); card.startFileprint();
starttime = pause_time; //starttime = pause_time;
lcd_commands_step = 0; lcd_commands_step = 0;
lcd_commands_type = 0; lcd_commands_type = 0;
} }

2
Firmware/ultralcd_implementation_hitachi_HD44780.h
View File

@ -792,7 +792,7 @@ static void lcd_implementation_status_screen()
lcd.print(LCD_STR_CLOCK[0]); lcd.print(LCD_STR_CLOCK[0]);
if(starttime != 0) if(starttime != 0)
{ {
uint16_t time = isPrintPaused ? pause_time/60000 : millis()/60000 - starttime/60000; //is print is paused, pause also print time uint16_t time = (isPrintPaused || (!heating_status))? pause_time/60000 : (millis() + pause_time - start_time)/60000; //is print is paused, pause also print time
lcd.print(itostr2(time/60)); lcd.print(itostr2(time/60));
lcd.print(':'); lcd.print(':');
lcd.print(itostr2(time%60)); lcd.print(itostr2(time%60));