Skip to content

Shorter labels for Print Stats info #4201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 1 commit into from
Jul 4, 2016
Merged

Shorter labels for Print Stats info #4201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions Marlin/language_en.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions Marlin/ultralcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down