Browse Source

Merge pull request #797 from Cylindric3D/update_menu_plan

Update menu plan
ErikZalm 10 years ago
parent
commit
465b654d24
3 changed files with 44 additions and 44 deletions
  1. BIN
      Marlin/LCD Menu Tree.pdf
  2. BIN
      Marlin/Menu Plans.xlsx
  3. 44
    44
      Marlin/language.h

BIN
Marlin/LCD Menu Tree.pdf View File


BIN
Marlin/Menu Plans.xlsx View File


+ 44
- 44
Marlin/language.h View File

@@ -41,7 +41,7 @@
41 41
 		#define MACHINE_NAME "Mendel"
42 42
 	#endif
43 43
 
44
-// Default firmware set to Mendel	
44
+// Default firmware set to Mendel
45 45
 	#define FIRMWARE_URL "https://github.com/ErikZalm/Marlin/"
46 46
 #endif
47 47
 
@@ -157,11 +157,11 @@
157 157
 	#define MSG_CONTROL_RETRACT_RECOVERF "UnRet  F"
158 158
 	#define MSG_AUTORETRACT "AutoRetr."
159 159
 	#define MSG_FILAMENTCHANGE "Change filament"
160
-	#define MSG_INIT_SDCARD "Init. SD card"	
160
+	#define MSG_INIT_SDCARD "Init. SD card"
161 161
 	#define MSG_CNG_SDCARD "Change SD card"
162
-    #define MSG_ZPROBE_OUT "Z probe out. bed"
163
-    #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
164
-    #define MSG_ZPROBE_ZOFFSET "Z Offset"
162
+	#define MSG_ZPROBE_OUT "Z probe out. bed"
163
+	#define MSG_POSITION_UNKNOWN "Home X/Y before Z"
164
+	#define MSG_ZPROBE_ZOFFSET "Z Offset"
165 165
 	#define MSG_BABYSTEP_X "Babystep X"
166 166
 	#define MSG_BABYSTEP_Y "Babystep Y"
167 167
 	#define MSG_BABYSTEP_Z "Babystep Z"
@@ -344,9 +344,9 @@
344 344
 	#define MSG_FILAMENTCHANGE "Zmien filament"
345 345
 	#define MSG_INIT_SDCARD "Inicjal. karty SD"
346 346
 	#define MSG_CNG_SDCARD "Zmiana karty SD"
347
-    #define MSG_ZPROBE_OUT "Sonda Z za lozem"
348
-    #define MSG_POSITION_UNKNOWN "Wroc w XY przed Z"
349
-    #define MSG_ZPROBE_ZOFFSET "Offset Z"
347
+	#define MSG_ZPROBE_OUT "Sonda Z za lozem"
348
+	#define MSG_POSITION_UNKNOWN "Wroc w XY przed Z"
349
+	#define MSG_ZPROBE_ZOFFSET "Offset Z"
350 350
 	#define MSG_BABYSTEP_X "Babystep X"
351 351
 	#define MSG_BABYSTEP_Y "Babystep Y"
352 352
 	#define MSG_BABYSTEP_Z "Babystep Z"
@@ -527,11 +527,11 @@
527 527
 	#define MSG_CONTROL_RETRACT_RECOVERF "UnRet F"
528 528
 	#define MSG_AUTORETRACT "Retract. Auto."
529 529
 	#define MSG_FILAMENTCHANGE "Changer filament"
530
-	#define MSG_INIT_SDCARD "Init. la carte SD"	
530
+	#define MSG_INIT_SDCARD "Init. la carte SD"
531 531
 	#define MSG_CNG_SDCARD "Changer de carte"
532
-    #define MSG_ZPROBE_OUT "Z sonde exte. lit"
533
-    #define MSG_POSITION_UNKNOWN "Rev. dans XY av.Z"
534
-    #define MSG_ZPROBE_ZOFFSET "Offset Z"
532
+	#define MSG_ZPROBE_OUT "Z sonde exte. lit"
533
+	#define MSG_POSITION_UNKNOWN "Rev. dans XY av.Z"
534
+	#define MSG_ZPROBE_ZOFFSET "Offset Z"
535 535
 	#define MSG_BABYSTEP_X "Babystep X"
536 536
 	#define MSG_BABYSTEP_Y "Babystep Y"
537 537
 	#define MSG_BABYSTEP_Z "Babystep Z"
@@ -612,7 +612,7 @@
612 612
 	#define MSG_BABYSTEPPING_Y "Babystepping Y"
613 613
 	#define MSG_BABYSTEPPING_Z "Babystepping Z"
614 614
 	#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Error in menu structure"
615
-	
615
+
616 616
 #endif
617 617
 
618 618
 
@@ -699,7 +699,7 @@
699 699
 	#define MSG_STOP_PRINT       "Druck stoppen"
700 700
 	#define MSG_CARD_MENU        "SDKarten Menü"
701 701
 	#define MSG_NO_CARD          "Keine SDKarte"
702
-	#define MSG_DWELL            "Warten..."		
702
+	#define MSG_DWELL            "Warten..."
703 703
 	#define MSG_USERWAIT         "Warte auf Nutzer"
704 704
 	#define MSG_RESUMING         "Druck fortsetzung"
705 705
 	#define MSG_NO_MOVE          "Kein Zug."
@@ -713,17 +713,17 @@
713 713
 	#define MSG_CONTROL_RETRACT_RECOVERF "UnRet  F"
714 714
 	#define MSG_AUTORETRACT      "AutoRetr."
715 715
 	#define MSG_FILAMENTCHANGE "Filament wechseln"
716
-	#define MSG_INIT_SDCARD "Init. SD-Card"	
716
+	#define MSG_INIT_SDCARD "Init. SD-Card"
717 717
 	#define MSG_CNG_SDCARD "Change SD-Card"
718
-    #define MSG_ZPROBE_OUT "Z probe out. bed"
719
-    #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
720
-    #define MSG_ZPROBE_ZOFFSET "Z Offset"
718
+	#define MSG_ZPROBE_OUT "Z probe out. bed"
719
+	#define MSG_POSITION_UNKNOWN "Home X/Y before Z"
720
+	#define MSG_ZPROBE_ZOFFSET "Z Offset"
721 721
 	#define MSG_BABYSTEP_X "Babystep X"
722 722
 	#define MSG_BABYSTEP_Y "Babystep Y"
723 723
 	#define MSG_BABYSTEP_Z "Babystep Z"
724 724
 	#define MSG_ENDSTOP_ABORT "Endstop abort"
725 725
 	#define MSG_CONTRAST "Contrast"
726
-	
726
+
727 727
 // Serial Console Messages
728 728
 
729 729
 	#define MSG_Enqueing "enqueing \""
@@ -906,9 +906,9 @@
906 906
 	#define MSG_CONTROL_ARROW "Control"
907 907
 	#define MSG_RETRACT_ARROW "Retraer"
908 908
 	#define MSG_STEPPER_RELEASED "Desacoplada."
909
-    #define MSG_ZPROBE_OUT "Z probe out. bed"
910
-    #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
911
-    #define MSG_ZPROBE_ZOFFSET "Z Offset"
909
+	#define MSG_ZPROBE_OUT "Z probe out. bed"
910
+	#define MSG_POSITION_UNKNOWN "Home X/Y before Z"
911
+	#define MSG_ZPROBE_ZOFFSET "Z Offset"
912 912
 	#define MSG_BABYSTEP_X "Babystep X"
913 913
 	#define MSG_BABYSTEP_Y "Babystep Y"
914 914
 	#define MSG_BABYSTEP_Z "Babystep Z"
@@ -1086,11 +1086,11 @@
1086 1086
 	#define MSG_CONTROL_RETRACT_RECOVERF		"Возврат  F:"
1087 1087
 	#define MSG_AUTORETRACT						"АвтоОткат:"
1088 1088
 	#define MSG_FILAMENTCHANGE 					"Change filament"
1089
-	#define MSG_INIT_SDCARD 					"Init. SD-Card"	
1089
+	#define MSG_INIT_SDCARD 					"Init. SD-Card"
1090 1090
 	#define MSG_CNG_SDCARD 						"Change SD-Card"
1091
-    #define MSG_ZPROBE_OUT 						"Z probe out. bed"
1092
-    #define MSG_POSITION_UNKNOWN 				"Home X/Y before Z"
1093
-    #define MSG_ZPROBE_ZOFFSET 					"Z Offset"
1091
+	#define MSG_ZPROBE_OUT 						"Z probe out. bed"
1092
+	#define MSG_POSITION_UNKNOWN 				"Home X/Y before Z"
1093
+	#define MSG_ZPROBE_ZOFFSET 					"Z Offset"
1094 1094
 	#define MSG_BABYSTEP_X 						"Babystep X"
1095 1095
 	#define MSG_BABYSTEP_Y 						"Babystep Y"
1096 1096
 	#define MSG_BABYSTEP_Z 						"Babystep Z"
@@ -1269,9 +1269,9 @@
1269 1269
 	#define MSG_FILAMENTCHANGE       "Cambia filamento"
1270 1270
 	#define MSG_INIT_SDCARD          "Iniz. SD-Card"
1271 1271
 	#define MSG_CNG_SDCARD           "Cambia SD-Card"
1272
-    #define MSG_ZPROBE_OUT "Z probe out. bed"
1273
-    #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1274
-    #define MSG_ZPROBE_ZOFFSET "Z Offset"
1272
+	#define MSG_ZPROBE_OUT "Z probe out. bed"
1273
+	#define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1274
+	#define MSG_ZPROBE_ZOFFSET "Z Offset"
1275 1275
 	#define MSG_BABYSTEP_X "Babystep X"
1276 1276
 	#define MSG_BABYSTEP_Y "Babystep Y"
1277 1277
 	#define MSG_BABYSTEP_Z "Babystep Z"
@@ -1456,11 +1456,11 @@
1456 1456
 	#define MSG_CONTROL_RETRACT_RECOVERF " DesRet  F:"
1457 1457
 	#define MSG_AUTORETRACT " AutoRetr.:"
1458 1458
 	#define MSG_FILAMENTCHANGE "Change filament"
1459
-	#define MSG_INIT_SDCARD "Init. SD-Card"	
1459
+	#define MSG_INIT_SDCARD "Init. SD-Card"
1460 1460
 	#define MSG_CNG_SDCARD "Change SD-Card"
1461
-    #define MSG_ZPROBE_OUT "Son. fora da mesa"
1462
-    #define MSG_POSITION_UNKNOWN "XY antes de Z"
1463
-    #define MSG_ZPROBE_ZOFFSET "Z Offset"
1461
+	#define MSG_ZPROBE_OUT "Son. fora da mesa"
1462
+	#define MSG_POSITION_UNKNOWN "XY antes de Z"
1463
+	#define MSG_ZPROBE_ZOFFSET "Z Offset"
1464 1464
 	#define MSG_BABYSTEP_X "Babystep X"
1465 1465
 	#define MSG_BABYSTEP_Y "Babystep Y"
1466 1466
 	#define MSG_BABYSTEP_Z "Babystep Z"
@@ -1640,11 +1640,11 @@
1640 1640
 	#define MSG_CONTROL_RETRACT_RECOVERF "UnRet  F"
1641 1641
 	#define MSG_AUTORETRACT "AutoVeto."
1642 1642
 	#define MSG_FILAMENTCHANGE "Change filament"
1643
-	#define MSG_INIT_SDCARD "Init. SD-Card"	
1643
+	#define MSG_INIT_SDCARD "Init. SD-Card"
1644 1644
 	#define MSG_CNG_SDCARD "Change SD-Card"
1645
-    #define MSG_ZPROBE_OUT "Z probe out. bed"
1646
-    #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1647
-    #define MSG_ZPROBE_ZOFFSET "Z Offset"
1645
+	#define MSG_ZPROBE_OUT "Z probe out. bed"
1646
+	#define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1647
+	#define MSG_ZPROBE_ZOFFSET "Z Offset"
1648 1648
 	#define MSG_BABYSTEP_X "Babystep X"
1649 1649
 	#define MSG_BABYSTEP_Y "Babystep Y"
1650 1650
 	#define MSG_BABYSTEP_Z "Babystep Z"
@@ -1834,9 +1834,9 @@
1834 1834
 	#define MSG_CONTROL_ARROW "Control"
1835 1835
 	#define MSG_RETRACT_ARROW "Retraer"
1836 1836
 	#define MSG_STEPPER_RELEASED "Desacoplada."
1837
-    #define MSG_ZPROBE_OUT "Z probe out. bed"
1838
-    #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1839
-    #define MSG_ZPROBE_ZOFFSET "Z Offset"
1837
+	#define MSG_ZPROBE_OUT "Z probe out. bed"
1838
+	#define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1839
+	#define MSG_ZPROBE_ZOFFSET "Z Offset"
1840 1840
 	#define MSG_BABYSTEP_X "Babystep X"
1841 1841
 	#define MSG_BABYSTEP_Y "Babystep Y"
1842 1842
 	#define MSG_BABYSTEP_Z "Babystep Z"
@@ -2013,11 +2013,11 @@
2013 2013
 	#define MSG_CONTROL_RETRACT_RECOVERF "UnRet  F"
2014 2014
 	#define MSG_AUTORETRACT "AutoRetr."
2015 2015
 	#define MSG_FILAMENTCHANGE "Verv. Filament"
2016
-	#define MSG_INIT_SDCARD "Init. SD kaart"	
2016
+	#define MSG_INIT_SDCARD "Init. SD kaart"
2017 2017
 	#define MSG_CNG_SDCARD "Verv. SD card"
2018
-    #define MSG_ZPROBE_OUT "Z probe uit. bed"
2019
-    #define MSG_POSITION_UNKNOWN "Home X/Y voor Z"
2020
-    #define MSG_ZPROBE_ZOFFSET "Z Offset"
2018
+	#define MSG_ZPROBE_OUT "Z probe uit. bed"
2019
+	#define MSG_POSITION_UNKNOWN "Home X/Y voor Z"
2020
+	#define MSG_ZPROBE_ZOFFSET "Z Offset"
2021 2021
 	#define MSG_BABYSTEP_X "Babystap X"
2022 2022
 	#define MSG_BABYSTEP_Y "Babystap Y"
2023 2023
 	#define MSG_BABYSTEP_Z "Babystap Z"

Loading…
Cancel
Save