From ef8980bfa03ee06aa725391c98b4a5af45dfede1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 3 Jul 2016 15:56:19 -0700 Subject: [PATCH] Shorter labels for Print Stats info --- Marlin/language_en.h | 29 +++++++++++++++++++++-------- Marlin/ultralcd.cpp | 6 +++--- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Marlin/language_en.h b/Marlin/language_en.h index aa9a52dfb6..f69ef9ca3b 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -544,14 +544,27 @@ #ifndef MSG_INFO_PROTOCOL #define MSG_INFO_PROTOCOL "Protocol" #endif -#ifndef MSG_INFO_TOTAL_PRINTS - #define MSG_INFO_TOTAL_PRINTS "Total Prints" -#endif -#ifndef MSG_INFO_FINISHED_PRINTS - #define MSG_INFO_FINISHED_PRINTS "Finished Prints" -#endif -#ifndef MSG_INFO_PRINT_TIME - #define MSG_INFO_PRINT_TIME "Total Print Time" + +#if LCD_WIDTH > 19 + #ifndef MSG_INFO_PRINT_COUNT + #define MSG_INFO_PRINT_COUNT "Print Count " + #endif + #ifndef MSG_INFO_FINISHED_PRINTS + #define MSG_INFO_FINISHED_PRINTS "Finished " + #endif + #ifndef MSG_INFO_PRINT_TIME + #define MSG_INFO_PRINT_TIME "Total Time " + #endif +#else + #ifndef MSG_INFO_PRINT_COUNT + #define MSG_INFO_PRINT_COUNT "Prints " + #endif + #ifndef MSG_INFO_FINISHED_PRINTS + #define MSG_INFO_FINISHED_PRINTS "Finished " + #endif + #ifndef MSG_INFO_PRINT_TIME + #define MSG_INFO_PRINT_TIME "Duration " + #endif #endif #ifndef MSG_INFO_MIN_TEMP #define MSG_INFO_MIN_TEMP "Min Temp" diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index da1a2a5e71..304174330d 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1950,9 +1950,9 @@ static void lcd_status_screen() { if (LCD_CLICKED) lcd_goto_previous_menu(true); START_SCREEN(); - STATIC_ITEM(MSG_INFO_TOTAL_PRINTS ": ", itostr3left(stats.totalPrints)); // Total Prints: 999 - STATIC_ITEM(MSG_INFO_FINISHED_PRINTS ": ", itostr3left(stats.finishedPrints)); // Finished Prints: 666 - STATIC_ITEM(MSG_INFO_PRINT_TIME ": ", printTime); // Total Print Time: 123456 + STATIC_ITEM(MSG_INFO_PRINT_COUNT ": ", itostr3left(stats.totalPrints)); // Print Count : 999 + STATIC_ITEM(MSG_INFO_FINISHED_PRINTS ": ", itostr3left(stats.finishedPrints)); // Finished : 666 + STATIC_ITEM(MSG_INFO_PRINT_TIME ": ", printTime); // Total Time : 12:34 END_SCREEN(); } #endif // PRINTCOUNTER