CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save space by not defining unused filament change message lines

Browse Source
This commit is contained in:
Scott Lahteine 2016-12-06 22:52:25 -06:00
parent 29bc83ead8
commit 1705099c3e
1 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Marlin/language_en.h
View File

@ -559,61 +559,38 @@
#ifndef MSG_FILAMENT_CHANGE_OPTION_RESUME #ifndef MSG_FILAMENT_CHANGE_OPTION_RESUME
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Resume print" #define MSG_FILAMENT_CHANGE_OPTION_RESUME "Resume print"
#endif #endif
//
// Filament Change screens show up to 3 lines on a 4-line display
// ...or up to 2 lines on a 3-line display
//
#if LCD_HEIGHT >= 4 #if LCD_HEIGHT >= 4
#ifndef MSG_FILAMENT_CHANGE_INIT_1 #ifndef MSG_FILAMENT_CHANGE_INIT_1
#define MSG_FILAMENT_CHANGE_INIT_1 "Wait for start" #define MSG_FILAMENT_CHANGE_INIT_1 "Wait for start"
#endif
#ifndef MSG_FILAMENT_CHANGE_INIT_2
#define MSG_FILAMENT_CHANGE_INIT_2 "of the filament" #define MSG_FILAMENT_CHANGE_INIT_2 "of the filament"
#endif
#ifndef MSG_FILAMENT_CHANGE_INIT_3
#define MSG_FILAMENT_CHANGE_INIT_3 "change" #define MSG_FILAMENT_CHANGE_INIT_3 "change"
#endif #endif
#ifndef MSG_FILAMENT_CHANGE_UNLOAD_1 #ifndef MSG_FILAMENT_CHANGE_UNLOAD_1
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Wait for" #define MSG_FILAMENT_CHANGE_UNLOAD_1 "Wait for"
#endif
#ifndef MSG_FILAMENT_CHANGE_UNLOAD_2
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "filament unload" #define MSG_FILAMENT_CHANGE_UNLOAD_2 "filament unload"
#endif #endif
#ifndef MSG_FILAMENT_CHANGE_UNLOAD_3
#define MSG_FILAMENT_CHANGE_UNLOAD_3 ""
#endif
#ifndef MSG_FILAMENT_CHANGE_INSERT_1 #ifndef MSG_FILAMENT_CHANGE_INSERT_1
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert filament" #define MSG_FILAMENT_CHANGE_INSERT_1 "Insert filament"
#endif
#ifndef MSG_FILAMENT_CHANGE_INSERT_2
#define MSG_FILAMENT_CHANGE_INSERT_2 "and press button" #define MSG_FILAMENT_CHANGE_INSERT_2 "and press button"
#endif
#ifndef MSG_FILAMENT_CHANGE_INSERT_3
#define MSG_FILAMENT_CHANGE_INSERT_3 "to continue..." #define MSG_FILAMENT_CHANGE_INSERT_3 "to continue..."
#endif #endif
#ifndef MSG_FILAMENT_CHANGE_LOAD_1 #ifndef MSG_FILAMENT_CHANGE_LOAD_1
#define MSG_FILAMENT_CHANGE_LOAD_1 "Wait for" #define MSG_FILAMENT_CHANGE_LOAD_1 "Wait for"
#endif
#ifndef MSG_FILAMENT_CHANGE_LOAD_2
#define MSG_FILAMENT_CHANGE_LOAD_2 "filament load" #define MSG_FILAMENT_CHANGE_LOAD_2 "filament load"
#endif #endif
#ifndef MSG_FILAMENT_CHANGE_LOAD_3
#define MSG_FILAMENT_CHANGE_LOAD_3 ""
#endif
#ifndef MSG_FILAMENT_CHANGE_EXTRUDE_1 #ifndef MSG_FILAMENT_CHANGE_EXTRUDE_1
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Wait for" #define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Wait for"
#endif
#ifndef MSG_FILAMENT_CHANGE_EXTRUDE_2
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "filament extrude" #define MSG_FILAMENT_CHANGE_EXTRUDE_2 "filament extrude"
#endif #endif
#ifndef MSG_FILAMENT_CHANGE_EXTRUDE_3
#define MSG_FILAMENT_CHANGE_EXTRUDE_3 ""
#endif
#ifndef MSG_FILAMENT_CHANGE_RESUME_1 #ifndef MSG_FILAMENT_CHANGE_RESUME_1
#define MSG_FILAMENT_CHANGE_RESUME_1 "Wait for print" #define MSG_FILAMENT_CHANGE_RESUME_1 "Wait for print"
#endif
#ifndef MSG_FILAMENT_CHANGE_RESUME_2
#define MSG_FILAMENT_CHANGE_RESUME_2 "to resume" #define MSG_FILAMENT_CHANGE_RESUME_2 "to resume"
#endif #endif
#ifndef MSG_FILAMENT_CHANGE_RESUME_3
#define MSG_FILAMENT_CHANGE_RESUME_3 ""
#endif
#else // LCD_HEIGHT < 4 #else // LCD_HEIGHT < 4
#ifndef MSG_FILAMENT_CHANGE_INIT_1 #ifndef MSG_FILAMENT_CHANGE_INIT_1
#define MSG_FILAMENT_CHANGE_INIT_1 "Please wait..." #define MSG_FILAMENT_CHANGE_INIT_1 "Please wait..."