From b4aad85c9ae3729711b55912ce2aeda8c59cad8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Sat, 23 Jul 2016 01:42:21 +0100 Subject: [PATCH] Rework stats menu to use timestamp_t --- Marlin/ultralcd.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 7264f7b404..cdb75b870f 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -31,6 +31,7 @@ #if ENABLED(PRINTCOUNTER) #include "printcounter.h" + #include "timestamp_t.h" #endif int preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1, @@ -1971,23 +1972,17 @@ void kill_screen(const char* lcd_msg) { static void lcd_info_stats_menu() { if (LCD_CLICKED) { lcd_goto_previous_menu(true); return; } - PrintCounter print_job_counter = PrintCounter(); - print_job_counter.loadStats(); - printStatistics stats = print_job_counter.getStats(); + printStatistics stats = print_job_timer.getStats(); + timestamp_t time(stats.printTime); - char timeString[14]; - sprintf_P(timeString, - 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) - ); + char buffer[21]; + time.toString(buffer); START_SCREEN(); // 12345678901234567890 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_PRINT_TIME ": ", false, false); // Total Time : - STATIC_ITEM(" ", false, false, timeString); // 12345d 12h 34m + STATIC_ITEM(" ", false, false, buffer); // 12345d 12h 34m END_SCREEN(); } #endif // PRINTCOUNTER