|
@ -31,6 +31,7 @@ |
|
|
|
|
|
|
|
|
#if ENABLED(PRINTCOUNTER) |
|
|
#if ENABLED(PRINTCOUNTER) |
|
|
#include "printcounter.h" |
|
|
#include "printcounter.h" |
|
|
|
|
|
#include "timestamp_t.h" |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
int preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1, |
|
|
int preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1, |
|
@ -1971,23 +1972,17 @@ void kill_screen(const char* lcd_msg) { |
|
|
static void lcd_info_stats_menu() { |
|
|
static void lcd_info_stats_menu() { |
|
|
if (LCD_CLICKED) { lcd_goto_previous_menu(true); return; } |
|
|
if (LCD_CLICKED) { lcd_goto_previous_menu(true); return; } |
|
|
|
|
|
|
|
|
PrintCounter print_job_counter = PrintCounter(); |
|
|
printStatistics stats = print_job_timer.getStats(); |
|
|
print_job_counter.loadStats(); |
|
|
timestamp_t time(stats.printTime); |
|
|
printStatistics stats = print_job_counter.getStats(); |
|
|
|
|
|
|
|
|
|
|
|
char timeString[14]; |
|
|
char buffer[21]; |
|
|
sprintf_P(timeString, |
|
|
time.toString(buffer); |
|
|
PSTR("%i" MSG_SHORT_DAY " %i" MSG_SHORT_HOUR " %i" MSG_SHORT_MINUTE), |
|
|
|
|
|
int(stats.printTime / 60 / 60 / 24), |
|
|
|
|
|
int((stats.printTime / 60 / 60) % 24), |
|
|
|
|
|
int((stats.printTime / 60) % 60) |
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
START_SCREEN(); // 12345678901234567890
|
|
|
START_SCREEN(); // 12345678901234567890
|
|
|
STATIC_ITEM(MSG_INFO_PRINT_COUNT ": ", false, false, itostr3left(stats.totalPrints)); // Print Count: 999
|
|
|
STATIC_ITEM(MSG_INFO_PRINT_COUNT ": ", false, false, itostr3left(stats.totalPrints)); // Print Count: 999
|
|
|
STATIC_ITEM(MSG_INFO_COMPLETED_PRINTS": ", false, false, itostr3left(stats.finishedPrints)); // Completed : 666
|
|
|
STATIC_ITEM(MSG_INFO_COMPLETED_PRINTS": ", false, false, itostr3left(stats.finishedPrints)); // Completed : 666
|
|
|
STATIC_ITEM(MSG_INFO_PRINT_TIME ": ", false, false); // Total Time :
|
|
|
STATIC_ITEM(MSG_INFO_PRINT_TIME ": ", false, false); // Total Time :
|
|
|
STATIC_ITEM(" ", false, false, timeString); // 12345d 12h 34m
|
|
|
STATIC_ITEM(" ", false, false, buffer); // 12345d 12h 34m
|
|
|
END_SCREEN(); |
|
|
END_SCREEN(); |
|
|
} |
|
|
} |
|
|
#endif // PRINTCOUNTER
|
|
|
#endif // PRINTCOUNTER
|
|
|