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

Merge pull request #3113 from jbrazio/bugfix/3061-stop-print-time-counter

Browse Source 
Stop print timer with M105/M109
This commit is contained in:
Scott Lahteine
2016-03-20 17:05:07 -07:00
parent ac4e461901 a645860431
commit 06332f20be
5 changed files with 79 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/dogm_lcd_implementation.h
View File

@@ -305,7 +305,8 @@ static void lcd_implementation_status_screen() {
u8g.setPrintPos(80,48);
if (print_job_start_ms != 0) {
uint16_t time = (millis() - print_job_start_ms) / 60000;
uint16_t time = (((print_job_stop_ms > print_job_start_ms)
? print_job_stop_ms : millis()) - print_job_start_ms) / 60000;
lcd_print(itostr2(time/60));
lcd_print(':');
lcd_print(itostr2(time%60));