Browse Source

Save space by not defining unused filament change message lines

Scott Lahteine 8 years ago
parent
commit
1705099c3e
1 changed files with 5 additions and 28 deletions
  1. 5
    28
      Marlin/language_en.h

+ 5
- 28
Marlin/language_en.h View File

559
 #ifndef MSG_FILAMENT_CHANGE_OPTION_RESUME
559
 #ifndef MSG_FILAMENT_CHANGE_OPTION_RESUME
560
   #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Resume print"
560
   #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Resume print"
561
 #endif
561
 #endif
562
+
563
+//
564
+// Filament Change screens show up to 3 lines on a 4-line display
565
+//                        ...or up to 2 lines on a 3-line display
566
+//
562
 #if LCD_HEIGHT >= 4
567
 #if LCD_HEIGHT >= 4
563
   #ifndef MSG_FILAMENT_CHANGE_INIT_1
568
   #ifndef MSG_FILAMENT_CHANGE_INIT_1
564
     #define MSG_FILAMENT_CHANGE_INIT_1          "Wait for start"
569
     #define MSG_FILAMENT_CHANGE_INIT_1          "Wait for start"
565
-  #endif
566
-  #ifndef MSG_FILAMENT_CHANGE_INIT_2
567
     #define MSG_FILAMENT_CHANGE_INIT_2          "of the filament"
570
     #define MSG_FILAMENT_CHANGE_INIT_2          "of the filament"
568
-  #endif
569
-  #ifndef MSG_FILAMENT_CHANGE_INIT_3
570
     #define MSG_FILAMENT_CHANGE_INIT_3          "change"
571
     #define MSG_FILAMENT_CHANGE_INIT_3          "change"
571
   #endif
572
   #endif
572
   #ifndef MSG_FILAMENT_CHANGE_UNLOAD_1
573
   #ifndef MSG_FILAMENT_CHANGE_UNLOAD_1
573
     #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Wait for"
574
     #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Wait for"
574
-  #endif
575
-  #ifndef MSG_FILAMENT_CHANGE_UNLOAD_2
576
     #define MSG_FILAMENT_CHANGE_UNLOAD_2        "filament unload"
575
     #define MSG_FILAMENT_CHANGE_UNLOAD_2        "filament unload"
577
   #endif
576
   #endif
578
-  #ifndef MSG_FILAMENT_CHANGE_UNLOAD_3
579
-    #define MSG_FILAMENT_CHANGE_UNLOAD_3        ""
580
-  #endif
581
   #ifndef MSG_FILAMENT_CHANGE_INSERT_1
577
   #ifndef MSG_FILAMENT_CHANGE_INSERT_1
582
     #define MSG_FILAMENT_CHANGE_INSERT_1        "Insert filament"
578
     #define MSG_FILAMENT_CHANGE_INSERT_1        "Insert filament"
583
-  #endif
584
-  #ifndef MSG_FILAMENT_CHANGE_INSERT_2
585
     #define MSG_FILAMENT_CHANGE_INSERT_2        "and press button"
579
     #define MSG_FILAMENT_CHANGE_INSERT_2        "and press button"
586
-  #endif
587
-  #ifndef MSG_FILAMENT_CHANGE_INSERT_3
588
     #define MSG_FILAMENT_CHANGE_INSERT_3        "to continue..."
580
     #define MSG_FILAMENT_CHANGE_INSERT_3        "to continue..."
589
   #endif
581
   #endif
590
   #ifndef MSG_FILAMENT_CHANGE_LOAD_1
582
   #ifndef MSG_FILAMENT_CHANGE_LOAD_1
591
     #define MSG_FILAMENT_CHANGE_LOAD_1          "Wait for"
583
     #define MSG_FILAMENT_CHANGE_LOAD_1          "Wait for"
592
-  #endif
593
-  #ifndef MSG_FILAMENT_CHANGE_LOAD_2
594
     #define MSG_FILAMENT_CHANGE_LOAD_2          "filament load"
584
     #define MSG_FILAMENT_CHANGE_LOAD_2          "filament load"
595
   #endif
585
   #endif
596
-  #ifndef MSG_FILAMENT_CHANGE_LOAD_3
597
-    #define MSG_FILAMENT_CHANGE_LOAD_3          ""
598
-  #endif
599
   #ifndef MSG_FILAMENT_CHANGE_EXTRUDE_1
586
   #ifndef MSG_FILAMENT_CHANGE_EXTRUDE_1
600
     #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Wait for"
587
     #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Wait for"
601
-  #endif
602
-  #ifndef MSG_FILAMENT_CHANGE_EXTRUDE_2
603
     #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "filament extrude"
588
     #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "filament extrude"
604
   #endif
589
   #endif
605
-  #ifndef MSG_FILAMENT_CHANGE_EXTRUDE_3
606
-    #define MSG_FILAMENT_CHANGE_EXTRUDE_3       ""
607
-  #endif
608
   #ifndef MSG_FILAMENT_CHANGE_RESUME_1
590
   #ifndef MSG_FILAMENT_CHANGE_RESUME_1
609
     #define MSG_FILAMENT_CHANGE_RESUME_1        "Wait for print"
591
     #define MSG_FILAMENT_CHANGE_RESUME_1        "Wait for print"
610
-  #endif
611
-  #ifndef MSG_FILAMENT_CHANGE_RESUME_2
612
     #define MSG_FILAMENT_CHANGE_RESUME_2        "to resume"
592
     #define MSG_FILAMENT_CHANGE_RESUME_2        "to resume"
613
   #endif
593
   #endif
614
-  #ifndef MSG_FILAMENT_CHANGE_RESUME_3
615
-    #define MSG_FILAMENT_CHANGE_RESUME_3        ""
616
-  #endif
617
 #else // LCD_HEIGHT < 4
594
 #else // LCD_HEIGHT < 4
618
   #ifndef MSG_FILAMENT_CHANGE_INIT_1
595
   #ifndef MSG_FILAMENT_CHANGE_INIT_1
619
     #define MSG_FILAMENT_CHANGE_INIT_1          "Please wait..."
596
     #define MSG_FILAMENT_CHANGE_INIT_1          "Please wait..."

Loading…
Cancel
Save