浏览代码

statistics for stop print changed

PavelSindler 8 年之前
父节点
当前提交
d9fc29273e
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      Firmware/ultralcd.cpp
  2. 1 1
      Firmware/ultralcd_implementation_hitachi_HD44780.h

+ 1 - 1
Firmware/ultralcd.cpp

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

+ 1 - 1
Firmware/ultralcd_implementation_hitachi_HD44780.h

@@ -792,7 +792,7 @@ static void lcd_implementation_status_screen()
     lcd.print(LCD_STR_CLOCK[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(':');
         lcd.print(itostr2(time%60));