From 7cf95ba65b2267d69aff98e824fde5c14b0d3289 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 11 Apr 2019 18:38:52 +0200 Subject: [PATCH 1/2] show correctly print times > 99h --- .../ultralcd_implementation_hitachi_HD44780.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Firmware/ultralcd_implementation_hitachi_HD44780.h b/Firmware/ultralcd_implementation_hitachi_HD44780.h index 43c120720..e6a78c044 100644 --- a/Firmware/ultralcd_implementation_hitachi_HD44780.h +++ b/Firmware/ultralcd_implementation_hitachi_HD44780.h @@ -715,15 +715,24 @@ static inline void lcd_print_time() { else if(starttime != 0){ print_t = millis() / 60000 - starttime / 60000; } - lcd.print(LCD_STR_CLOCK[0]); + uint16_t print_hours = print_t / 60; + uint8_t print_minutes = print_t % 60; if((PRINTER_ACTIVE) && ((print_time_remaining_normal != PRINT_TIME_REMAINING_INIT)||(starttime != 0))) { - lcd.print(itostr2(print_t/60)); + if (print_hours > 99) { + if (print_hours > 999) print_hours = 999; + lcd.print(itostr3(print_hours)); + } + else { + lcd.print(LCD_STR_CLOCK[0]); + lcd.print(itostr2(print_hours)); + } lcd.print(':'); - lcd.print(itostr2(print_t%60)); + lcd.print(itostr2(print_minutes)); (print_time_remaining_normal != PRINT_TIME_REMAINING_INIT) ? lcd.print('R') : lcd.print(' '); (feedmultiply == 100) ? lcd.print(' ') : lcd.print('?'); }else{ + lcd.print(LCD_STR_CLOCK[0]); lcd_printPGM(PSTR("--:-- ")); } } From 7418cb3cbbeaacd35099aaf8b74ab8fb31a66749 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 11 Apr 2019 18:40:28 +0200 Subject: [PATCH 2/2] whitespace --- Firmware/ultralcd_implementation_hitachi_HD44780.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd_implementation_hitachi_HD44780.h b/Firmware/ultralcd_implementation_hitachi_HD44780.h index e6a78c044..10e0e14c0 100644 --- a/Firmware/ultralcd_implementation_hitachi_HD44780.h +++ b/Firmware/ultralcd_implementation_hitachi_HD44780.h @@ -733,7 +733,7 @@ static inline void lcd_print_time() { (feedmultiply == 100) ? lcd.print(' ') : lcd.print('?'); }else{ lcd.print(LCD_STR_CLOCK[0]); - lcd_printPGM(PSTR("--:-- ")); + lcd_printPGM(PSTR("--:-- ")); } }