0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #4574 from thinkyhead/rc_graphical_days

Browse source 
Include days in Graphical LCD print timer
This commit is contained in:
Scott Lahteine 2016-08-08 23:53:31 -07:00 committed by GitHub
parent f4ac8c15e3 880cdb553b
commit bd8ea21abe
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Marlin/duration_t.h
View file

@ -141,14 +141,16 @@ struct duration_t {
* @param buffer The array pointed to must be able to accommodate 10 bytes * @param buffer The array pointed to must be able to accommodate 10 bytes
* *
* Output examples: * Output examples:
* 1234567890 (strlen) * 123456789 (strlen)
* 1193046:59 * 99:59
* 11d 12:33
*/ */
void toDigital(char *buffer) const { void toDigital(char *buffer, bool with_days=false) const {
int h = this->hour(), int m = this->minute() % 60;
m = this->minute() % 60; if (with_days)
sprintf_P(buffer, PSTR("%id %02i:%02i"), this->day(), this->hour() % 24, m);
sprintf_P(buffer, PSTR("%02i:%02i"), h, m); else
sprintf_P(buffer, PSTR("%02i:%02i"), this->hour(), m);
} }
}; };

7
Marlin/ultralcd_impl_DOGM.h
View file

@ -382,11 +382,12 @@ static void lcd_implementation_status_screen() {
u8g.drawBox(55, 50, (unsigned int)(71 * card.percentDone() * 0.01), 2 - (TALL_FONT_CORRECTION)); u8g.drawBox(55, 50, (unsigned int)(71 * card.percentDone() * 0.01), 2 - (TALL_FONT_CORRECTION));
} }
u8g.setPrintPos(80,48);
char buffer[10]; char buffer[10];
duration_t elapsed = print_job_timer.duration(); duration_t elapsed = print_job_timer.duration();
elapsed.toDigital(buffer); bool has_days = (elapsed.value > 60*60*24);
elapsed.toDigital(buffer, has_days);
u8g.setPrintPos(has_days ? 71 : 80, 48);
lcd_print(buffer); lcd_print(buffer);
#endif #endif