CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework LCD implementation to use timestamp_t

Browse Source
This commit is contained in:
João Brázio 2016-07-23 01:42:48 +01:00
parent b4aad85c9a
commit 86d9311495
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/ultralcd_impl_DOGM.h
View File

@ -58,6 +58,8 @@
#include "ultralcd_st7920_u8glib_rrd.h" #include "ultralcd_st7920_u8glib_rrd.h"
#include "Configuration.h" #include "Configuration.h"
#include "timestamp_t.h"
#if DISABLED(MAPPER_C2C3) && DISABLED(MAPPER_NON) && ENABLED(USE_BIG_EDIT_FONT) #if DISABLED(MAPPER_C2C3) && DISABLED(MAPPER_NON) && ENABLED(USE_BIG_EDIT_FONT)
#undef USE_BIG_EDIT_FONT #undef USE_BIG_EDIT_FONT
#endif #endif
@ -387,12 +389,12 @@ static void lcd_implementation_status_screen() {
} }
u8g.setPrintPos(80,48); u8g.setPrintPos(80,48);
millis_t time = print_job_timer.duration() / 60;
if (time != 0) { char buffer[10];
lcd_print(itostr2(time/60)); timestamp_t time(print_job_timer.duration());
lcd_print(':'); time.toString(buffer, true);
lcd_print(itostr2(time%60)); if (time.timestamp != 0) lcd_print(buffer);
} else lcd_printPGM(PSTR("--:--"));
#endif #endif
// Extruders // Extruders

16
Marlin/ultralcd_impl_HD44780.h
View File

@ -27,6 +27,8 @@
* Implementation of the LCD display routines for a Hitachi HD44780 display. These are common LCD character displays. * Implementation of the LCD display routines for a Hitachi HD44780 display. These are common LCD character displays.
**/ **/
#include "timestamp_t.h"
extern volatile uint8_t buttons; //an extended version of the last checked buttons in a bit array. extern volatile uint8_t buttons; //an extended version of the last checked buttons in a bit array.
//////////////////////////////////// ////////////////////////////////////
@ -760,15 +762,11 @@ static void lcd_implementation_status_screen() {
lcd.setCursor(LCD_WIDTH - 6, 2); lcd.setCursor(LCD_WIDTH - 6, 2);
lcd.print(LCD_STR_CLOCK[0]); lcd.print(LCD_STR_CLOCK[0]);
uint16_t time = print_job_timer.duration() / 60; char buffer[10];
if (time != 0) { timestamp_t time(print_job_timer.duration());
lcd.print(itostr2(time / 60)); time.toString(buffer, true);
lcd.print(':'); if (time.timestamp != 0) lcd_print(buffer);
lcd.print(itostr2(time % 60)); else lcd_printPGM(PSTR("--:--"));
}
else {
lcd_printPGM(PSTR("--:--"));
}
#endif // LCD_HEIGHT > 3 #endif // LCD_HEIGHT > 3