From d9fc29273eb1e279baa1767ded4bafadb6a339bd Mon Sep 17 00:00:00 2001
From: PavelSindler <sindlerpa@gmail.com>
Date: Tue, 4 Apr 2017 13:41:20 +0200
Subject: [PATCH] statistics for stop print changed
---
Firmware/ultralcd.cpp | 2 +-
Firmware/ultralcd_implementation_hitachi_HD44780.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 152890b8..74605127 100644
--- a/Firmware/ultralcd.cpp
+++ b/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;
}
diff --git a/Firmware/ultralcd_implementation_hitachi_HD44780.h b/Firmware/ultralcd_implementation_hitachi_HD44780.h
index c59cf447..2cee3d9c 100644
--- a/Firmware/ultralcd_implementation_hitachi_HD44780.h
+++ b/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));