bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #3403 from jbrazio/feature/stopwatch

Browse Source 
Print job timer rework
This commit is contained in:
Scott Lahteine
2016-04-07 19:18:03 -07:00
parent f834bcd43a 7c7e30f4cc
commit d7cbb2eec9
7 changed files with 257 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/ultralcd_implementation_hitachi_HD44780.h
View File

@@ -716,9 +716,9 @@ static void lcd_implementation_status_screen() {
lcd.setCursor(LCD_WIDTH - 6, 2);
lcd.print(LCD_STR_CLOCK[0]);
if (print_job_start_ms != 0) {
uint16_t time = (((print_job_stop_ms > print_job_start_ms)
? print_job_stop_ms : millis()) - print_job_start_ms) / 60000;
uint16_t time = print_job_timer.duration() / 60;
if (time != 0) {
lcd.print(itostr2(time / 60));
lcd.print(':');
lcd.print(itostr2(time % 60));