Browse Source

Shorter strings for smaller LCDs

Scott Lahteine 8 years ago
parent
commit
a06c5165a7
1 changed files with 77 additions and 56 deletions
  1. 77
    56
      Marlin/language_en.h

+ 77
- 56
Marlin/language_en.h View File

@@ -566,53 +566,8 @@
566 566
 #ifndef MSG_FILAMENT_CHANGE_HEADER
567 567
   #define MSG_FILAMENT_CHANGE_HEADER          "CHANGE FILAMENT"
568 568
 #endif
569
-#ifndef MSG_FILAMENT_CHANGE_INIT_1
570
-  #define MSG_FILAMENT_CHANGE_INIT_1          "Wait for start"
571
-#endif
572
-#ifndef MSG_FILAMENT_CHANGE_INIT_2
573
-  #define MSG_FILAMENT_CHANGE_INIT_2          "of the filament"
574
-#endif
575
-#ifndef MSG_FILAMENT_CHANGE_INIT_3
576
-  #define MSG_FILAMENT_CHANGE_INIT_3          "change"
577
-#endif
578
-#ifndef MSG_FILAMENT_CHANGE_UNLOAD_1
579
-  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Wait for"
580
-#endif
581
-#ifndef MSG_FILAMENT_CHANGE_UNLOAD_2
582
-  #define MSG_FILAMENT_CHANGE_UNLOAD_2        "filament unload"
583
-#endif
584
-#ifndef MSG_FILAMENT_CHANGE_UNLOAD_3
585
-  #define MSG_FILAMENT_CHANGE_UNLOAD_3        ""
586
-#endif
587
-#ifndef MSG_FILAMENT_CHANGE_INSERT_1
588
-  #define MSG_FILAMENT_CHANGE_INSERT_1        "Insert filament"
589
-#endif
590
-#ifndef MSG_FILAMENT_CHANGE_INSERT_2
591
-  #define MSG_FILAMENT_CHANGE_INSERT_2        "and press button"
592
-#endif
593
-#ifndef MSG_FILAMENT_CHANGE_INSERT_3
594
-  #define MSG_FILAMENT_CHANGE_INSERT_3        "to continue..."
595
-#endif
596
-#ifndef MSG_FILAMENT_CHANGE_LOAD_1
597
-  #define MSG_FILAMENT_CHANGE_LOAD_1          "Wait for"
598
-#endif
599
-#ifndef MSG_FILAMENT_CHANGE_LOAD_2
600
-  #define MSG_FILAMENT_CHANGE_LOAD_2          "filament load"
601
-#endif
602
-#ifndef MSG_FILAMENT_CHANGE_LOAD_3
603
-  #define MSG_FILAMENT_CHANGE_LOAD_3          ""
604
-#endif
605
-#ifndef MSG_FILAMENT_CHANGE_EXTRUDE_1
606
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Wait for"
607
-#endif
608
-#ifndef MSG_FILAMENT_CHANGE_EXTRUDE_2
609
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "filament extrude"
610
-#endif
611
-#ifndef MSG_FILAMENT_CHANGE_EXTRUDE_3
612
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_3       ""
613
-#endif
614 569
 #ifndef MSG_FILAMENT_CHANGE_OPTION_HEADER
615
-  #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "WHAT NEXT?"
570
+  #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "CHANGE OPTIONS:"
616 571
 #endif
617 572
 #ifndef MSG_FILAMENT_CHANGE_OPTION_EXTRUDE
618 573
   #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Extrude more"
@@ -620,14 +575,80 @@
620 575
 #ifndef MSG_FILAMENT_CHANGE_OPTION_RESUME
621 576
   #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Resume print"
622 577
 #endif
623
-#ifndef MSG_FILAMENT_CHANGE_RESUME_1
624
-  #define MSG_FILAMENT_CHANGE_RESUME_1        "Wait for print"
625
-#endif
626
-#ifndef MSG_FILAMENT_CHANGE_RESUME_2
627
-  #define MSG_FILAMENT_CHANGE_RESUME_2        "to resume"
628
-#endif
629
-#ifndef MSG_FILAMENT_CHANGE_RESUME_3
630
-  #define MSG_FILAMENT_CHANGE_RESUME_3        ""
631
-#endif
632
- 
578
+#if LCD_HEIGHT >= 4
579
+  #ifndef MSG_FILAMENT_CHANGE_INIT_1
580
+    #define MSG_FILAMENT_CHANGE_INIT_1          "Wait for start"
581
+  #endif
582
+  #ifndef MSG_FILAMENT_CHANGE_INIT_2
583
+    #define MSG_FILAMENT_CHANGE_INIT_2          "of the filament"
584
+  #endif
585
+  #ifndef MSG_FILAMENT_CHANGE_INIT_3
586
+    #define MSG_FILAMENT_CHANGE_INIT_3          "change"
587
+  #endif
588
+  #ifndef MSG_FILAMENT_CHANGE_UNLOAD_1
589
+    #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Wait for"
590
+  #endif
591
+  #ifndef MSG_FILAMENT_CHANGE_UNLOAD_2
592
+    #define MSG_FILAMENT_CHANGE_UNLOAD_2        "filament unload"
593
+  #endif
594
+  #ifndef MSG_FILAMENT_CHANGE_UNLOAD_3
595
+    #define MSG_FILAMENT_CHANGE_UNLOAD_3        ""
596
+  #endif
597
+  #ifndef MSG_FILAMENT_CHANGE_INSERT_1
598
+    #define MSG_FILAMENT_CHANGE_INSERT_1        "Insert filament"
599
+  #endif
600
+  #ifndef MSG_FILAMENT_CHANGE_INSERT_2
601
+    #define MSG_FILAMENT_CHANGE_INSERT_2        "and press button"
602
+  #endif
603
+  #ifndef MSG_FILAMENT_CHANGE_INSERT_3
604
+    #define MSG_FILAMENT_CHANGE_INSERT_3        "to continue..."
605
+  #endif
606
+  #ifndef MSG_FILAMENT_CHANGE_LOAD_1
607
+    #define MSG_FILAMENT_CHANGE_LOAD_1          "Wait for"
608
+  #endif
609
+  #ifndef MSG_FILAMENT_CHANGE_LOAD_2
610
+    #define MSG_FILAMENT_CHANGE_LOAD_2          "filament load"
611
+  #endif
612
+  #ifndef MSG_FILAMENT_CHANGE_LOAD_3
613
+    #define MSG_FILAMENT_CHANGE_LOAD_3          ""
614
+  #endif
615
+  #ifndef MSG_FILAMENT_CHANGE_EXTRUDE_1
616
+    #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Wait for"
617
+  #endif
618
+  #ifndef MSG_FILAMENT_CHANGE_EXTRUDE_2
619
+    #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "filament extrude"
620
+  #endif
621
+  #ifndef MSG_FILAMENT_CHANGE_EXTRUDE_3
622
+    #define MSG_FILAMENT_CHANGE_EXTRUDE_3       ""
623
+  #endif
624
+  #ifndef MSG_FILAMENT_CHANGE_RESUME_1
625
+    #define MSG_FILAMENT_CHANGE_RESUME_1        "Wait for print"
626
+  #endif
627
+  #ifndef MSG_FILAMENT_CHANGE_RESUME_2
628
+    #define MSG_FILAMENT_CHANGE_RESUME_2        "to resume"
629
+  #endif
630
+  #ifndef MSG_FILAMENT_CHANGE_RESUME_3
631
+    #define MSG_FILAMENT_CHANGE_RESUME_3        ""
632
+  #endif
633
+#else // LCD_HEIGHT < 4
634
+  #ifndef MSG_FILAMENT_CHANGE_INIT_1
635
+    #define MSG_FILAMENT_CHANGE_INIT_1          "Please wait..."
636
+  #endif
637
+  #ifndef MSG_FILAMENT_CHANGE_UNLOAD_1
638
+    #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Ejecting..."
639
+  #endif
640
+  #ifndef MSG_FILAMENT_CHANGE_INSERT_1
641
+    #define MSG_FILAMENT_CHANGE_INSERT_1        "Insert and Click"
642
+  #endif
643
+  #ifndef MSG_FILAMENT_CHANGE_LOAD_1
644
+    #define MSG_FILAMENT_CHANGE_LOAD_1          "Loading..."
645
+  #endif
646
+  #ifndef MSG_FILAMENT_CHANGE_EXTRUDE_1
647
+    #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Extruding..."
648
+  #endif
649
+  #ifndef MSG_FILAMENT_CHANGE_RESUME_1
650
+    #define MSG_FILAMENT_CHANGE_RESUME_1        "Resuming..."
651
+  #endif
652
+#endif // LCD_HEIGHT < 4
653
+
633 654
 #endif // LANGUAGE_EN_H

Loading…
Cancel
Save