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

Merge pull request #4201 from thinkyhead/rc_info_fit

Browse source 
Shorter labels for Print Stats info
This commit is contained in:
Scott Lahteine 2016-07-03 17:47:00 -07:00 committed by GitHub
parent a8f5c2bf96 ef8980bfa0
commit f841038313
2 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Marlin/language_en.h
View file

@ -544,14 +544,27 @@
#ifndef MSG_INFO_PROTOCOL #ifndef MSG_INFO_PROTOCOL
#define MSG_INFO_PROTOCOL "Protocol" #define MSG_INFO_PROTOCOL "Protocol"
#endif #endif
#ifndef MSG_INFO_TOTAL_PRINTS
#define MSG_INFO_TOTAL_PRINTS "Total Prints" #if LCD_WIDTH > 19
#endif #ifndef MSG_INFO_PRINT_COUNT
#ifndef MSG_INFO_FINISHED_PRINTS #define MSG_INFO_PRINT_COUNT "Print Count "
#define MSG_INFO_FINISHED_PRINTS "Finished Prints" #endif
#endif #ifndef MSG_INFO_FINISHED_PRINTS
#ifndef MSG_INFO_PRINT_TIME #define MSG_INFO_FINISHED_PRINTS "Finished "
#define MSG_INFO_PRINT_TIME "Total Print Time" #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 #endif
#ifndef MSG_INFO_MIN_TEMP #ifndef MSG_INFO_MIN_TEMP
#define MSG_INFO_MIN_TEMP "Min Temp" #define MSG_INFO_MIN_TEMP "Min Temp"

6
Marlin/ultralcd.cpp
View file

@ -1950,9 +1950,9 @@ static void lcd_status_screen() {
if (LCD_CLICKED) lcd_goto_previous_menu(true); if (LCD_CLICKED) lcd_goto_previous_menu(true);
START_SCREEN(); START_SCREEN();
STATIC_ITEM(MSG_INFO_TOTAL_PRINTS ": ", itostr3left(stats.totalPrints)); // Total Prints: 999 STATIC_ITEM(MSG_INFO_PRINT_COUNT ": ", itostr3left(stats.totalPrints)); // Print Count : 999
STATIC_ITEM(MSG_INFO_FINISHED_PRINTS ": ", itostr3left(stats.finishedPrints)); // Finished Prints: 666 STATIC_ITEM(MSG_INFO_FINISHED_PRINTS ": ", itostr3left(stats.finishedPrints)); // Finished : 666
STATIC_ITEM(MSG_INFO_PRINT_TIME ": ", printTime); // Total Print Time: 123456 STATIC_ITEM(MSG_INFO_PRINT_TIME ": ", printTime); // Total Time : 12:34
END_SCREEN(); END_SCREEN();
} }
#endif // PRINTCOUNTER #endif // PRINTCOUNTER