Browse Source

Merge pull request #761 from Cylindric3D/localisation

Move strings in ultralcd.cpp into language.h.
nothinman 11 years ago
parent
commit
1a6d21bb60
2 changed files with 169 additions and 16 deletions
  1. 154
    1
      Marlin/language.h
  2. 15
    15
      Marlin/ultralcd.cpp

+ 154
- 1
Marlin/language.h View File

71
 	#define MSG_EXTRUDE "Extrude"
71
 	#define MSG_EXTRUDE "Extrude"
72
 	#define MSG_RETRACT "Retract"
72
 	#define MSG_RETRACT "Retract"
73
 	#define MSG_MOVE_AXIS "Move Axis"
73
 	#define MSG_MOVE_AXIS "Move Axis"
74
+	#define MSG_MOVE_X "Move X"
75
+	#define MSG_MOVE_Y "Move Y"
76
+	#define MSG_MOVE_Z "Move Z"
77
+	#define MSG_MOVE_E "Extruder"
78
+	#define MSG_MOVE_01MM "Move 0.1mm"
79
+	#define MSG_MOVE_1MM "Move 1mm"
80
+	#define MSG_MOVE_10MM "Move 10mm"
74
 	#define MSG_SPEED "Speed"
81
 	#define MSG_SPEED "Speed"
75
 	#define MSG_NOZZLE "Nozzle"
82
 	#define MSG_NOZZLE "Nozzle"
76
 	#define MSG_NOZZLE1 "Nozzle2"
83
 	#define MSG_NOZZLE1 "Nozzle2"
140
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
147
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
141
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
148
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
142
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
149
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
150
+	#define MSG_BABYSTEP_X "Babystep X"
151
+	#define MSG_BABYSTEP_Y "Babystep Y"
152
+	#define MSG_BABYSTEP_Z "Babystep Z"
153
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
154
+	#define MSG_CONTRAST "Contrast"
155
+
143
 // Serial Console Messages
156
 // Serial Console Messages
144
 
157
 
145
 	#define MSG_Enqueing "enqueing \""
158
 	#define MSG_Enqueing "enqueing \""
211
 	#define MSG_ENDSTOPS_HIT "endstops hit: "
224
 	#define MSG_ENDSTOPS_HIT "endstops hit: "
212
 	#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
225
 	#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
213
 	#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented"
226
 	#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented"
227
+	#define MSG_BABYSTEPPING_X "Babystepping X"
228
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
229
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
214
 
230
 
215
 #endif
231
 #endif
216
 
232
 
236
 	#define MSG_EXTRUDE "Ekstruzja"
252
 	#define MSG_EXTRUDE "Ekstruzja"
237
 	#define MSG_RETRACT "Cofanie"
253
 	#define MSG_RETRACT "Cofanie"
238
 	#define MSG_MOVE_AXIS "Ruch osi"
254
 	#define MSG_MOVE_AXIS "Ruch osi"
255
+	#define MSG_MOVE_X "Move X"
256
+	#define MSG_MOVE_Y "Move Y"
257
+	#define MSG_MOVE_Z "Move Z"
258
+	#define MSG_MOVE_E "Extruder"
259
+	#define MSG_MOVE_01MM "Move 0.1mm"
260
+	#define MSG_MOVE_1MM "Move 1mm"
261
+	#define MSG_MOVE_10MM "Move 10mm"
239
 	#define MSG_SPEED "Predkosc"
262
 	#define MSG_SPEED "Predkosc"
240
 	#define MSG_NOZZLE "Dysza"
263
 	#define MSG_NOZZLE "Dysza"
241
 	#define MSG_NOZZLE1 "Dysza2"
264
 	#define MSG_NOZZLE1 "Dysza2"
308
     #define MSG_ZPROBE_OUT "Probkuj Z poza lozem"
331
     #define MSG_ZPROBE_OUT "Probkuj Z poza lozem"
309
     #define MSG_POSITION_UNKNOWN "Domuj X/Y przed Z"
332
     #define MSG_POSITION_UNKNOWN "Domuj X/Y przed Z"
310
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
333
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
334
+	#define MSG_BABYSTEP_X "Babystep X"
335
+	#define MSG_BABYSTEP_Y "Babystep Y"
336
+	#define MSG_BABYSTEP_Z "Babystep Z"
337
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
338
+	#define MSG_CONTRAST "Contrast"
311
 
339
 
312
 // Serial Console Messages
340
 // Serial Console Messages
313
 
341
 
380
 	#define MSG_ENDSTOPS_HIT "Wylacznik krancowy zostal wyzwolony na pozycji: "
408
 	#define MSG_ENDSTOPS_HIT "Wylacznik krancowy zostal wyzwolony na pozycji: "
381
 	#define MSG_ERR_COLD_EXTRUDE_STOP " uniemozliwiono zimna ekstruzje"
409
 	#define MSG_ERR_COLD_EXTRUDE_STOP " uniemozliwiono zimna ekstruzje"
382
 	#define MSG_ERR_LONG_EXTRUDE_STOP " uniemozliwiono zbyt dluga ekstruzje"
410
 	#define MSG_ERR_LONG_EXTRUDE_STOP " uniemozliwiono zbyt dluga ekstruzje"
411
+	#define MSG_BABYSTEPPING_X "Babystepping X"
412
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
413
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
383
 
414
 
384
 #endif
415
 #endif
385
 
416
 
406
 	#define MSG_PREHEAT_PLA "Prechauffage PLA"
437
 	#define MSG_PREHEAT_PLA "Prechauffage PLA"
407
 	#define MSG_PREHEAT_ABS "Prechauffage ABS"
438
 	#define MSG_PREHEAT_ABS "Prechauffage ABS"
408
 	#define MSG_MOVE_AXIS "Deplacer un axe"
439
 	#define MSG_MOVE_AXIS "Deplacer un axe"
440
+	#define MSG_MOVE_X "Move X"
441
+	#define MSG_MOVE_Y "Move Y"
442
+	#define MSG_MOVE_Z "Move Z"
443
+	#define MSG_MOVE_E "Extruder"
444
+	#define MSG_MOVE_01MM "Move 0.1mm"
445
+	#define MSG_MOVE_1MM "Move 1mm"
446
+	#define MSG_MOVE_10MM "Move 10mm"
409
 	#define MSG_SPEED " Vitesse"
447
 	#define MSG_SPEED " Vitesse"
410
 	#define MSG_NOZZLE "Buse"
448
 	#define MSG_NOZZLE "Buse"
411
 	#define MSG_NOZZLE1 "Buse2"
449
 	#define MSG_NOZZLE1 "Buse2"
476
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
514
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
477
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
515
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
478
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
516
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
517
+	#define MSG_BABYSTEP_X "Babystep X"
518
+	#define MSG_BABYSTEP_Y "Babystep Y"
519
+	#define MSG_BABYSTEP_Z "Babystep Z"
520
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
521
+	#define MSG_CONTRAST "Contrast"
479
 
522
 
480
 // Serial Console Messages
523
 // Serial Console Messages
481
 
524
 
548
 	#define MSG_ENDSTOPS_HIT "Fin de course atteint: "
591
 	#define MSG_ENDSTOPS_HIT "Fin de course atteint: "
549
 	#define MSG_ERR_COLD_EXTRUDE_STOP " Extrusion a froid evitee"
592
 	#define MSG_ERR_COLD_EXTRUDE_STOP " Extrusion a froid evitee"
550
 	#define MSG_ERR_LONG_EXTRUDE_STOP " Extrusion longue evitee"
593
 	#define MSG_ERR_LONG_EXTRUDE_STOP " Extrusion longue evitee"
594
+	#define MSG_BABYSTEPPING_X "Babystepping X"
595
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
596
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
551
 	
597
 	
552
 #endif
598
 #endif
553
 
599
 
575
 	#define MSG_EXTRUDE          "Extrude"
621
 	#define MSG_EXTRUDE          "Extrude"
576
 	#define MSG_RETRACT          "Retract"
622
 	#define MSG_RETRACT          "Retract"
577
 	#define MSG_MOVE_AXIS        "Achsen bewegen"
623
 	#define MSG_MOVE_AXIS        "Achsen bewegen"
624
+	#define MSG_MOVE_X           "X bewegen"
625
+	#define MSG_MOVE_Y           "Y bewegen"
626
+	#define MSG_MOVE_Z           "Z bewegen"
627
+	#define MSG_MOVE_E           "Extruder"
628
+	#define MSG_MOVE_01MM        "0.1mm bewegen"
629
+	#define MSG_MOVE_1MM         "1mm bewegen"
630
+	#define MSG_MOVE_10MM        "10mm bewegen"
578
 	#define MSG_SPEED            "Geschw"
631
 	#define MSG_SPEED            "Geschw"
579
 	#define MSG_NOZZLE           "Düse"
632
 	#define MSG_NOZZLE           "Düse"
580
 	#define MSG_NOZZLE1          "Düse2"
633
 	#define MSG_NOZZLE1          "Düse2"
647
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
700
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
648
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
701
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
649
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
702
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
703
+	#define MSG_BABYSTEP_X "Babystep X"
704
+	#define MSG_BABYSTEP_Y "Babystep Y"
705
+	#define MSG_BABYSTEP_Z "Babystep Z"
706
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
707
+	#define MSG_CONTRAST "Contrast"
650
 	
708
 	
651
 // Serial Console Messages
709
 // Serial Console Messages
652
 
710
 
719
 	#define MSG_ENDSTOPS_HIT "endstops hit: "
777
 	#define MSG_ENDSTOPS_HIT "endstops hit: "
720
 	#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
778
 	#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
721
 	#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented"
779
 	#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented"
780
+	#define MSG_BABYSTEPPING_X "Babystepping X"
781
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
782
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
722
 
783
 
723
 #endif
784
 #endif
724
 
785
 
744
 	#define MSG_EXTRUDE "Extruir"
805
 	#define MSG_EXTRUDE "Extruir"
745
 	#define MSG_RETRACT "Retraer"
806
 	#define MSG_RETRACT "Retraer"
746
 	#define MSG_MOVE_AXIS "Mover Ejes"
807
 	#define MSG_MOVE_AXIS "Mover Ejes"
808
+	#define MSG_MOVE_X "Move X"
809
+	#define MSG_MOVE_Y "Move Y"
810
+	#define MSG_MOVE_Z "Move Z"
811
+	#define MSG_MOVE_E "Extruder"
812
+	#define MSG_MOVE_01MM "Move 0.1mm"
813
+	#define MSG_MOVE_1MM "Move 1mm"
814
+	#define MSG_MOVE_10MM "Move 10mm"
747
 	#define MSG_SPEED "Velocidad"
815
 	#define MSG_SPEED "Velocidad"
748
 	#define MSG_NOZZLE "Nozzle"
816
 	#define MSG_NOZZLE "Nozzle"
749
 	#define MSG_NOZZLE1 "Nozzle2"
817
 	#define MSG_NOZZLE1 "Nozzle2"
822
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
890
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
823
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
891
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
824
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
892
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
893
+	#define MSG_BABYSTEP_X "Babystep X"
894
+	#define MSG_BABYSTEP_Y "Babystep Y"
895
+	#define MSG_BABYSTEP_Z "Babystep Z"
896
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
897
+	#define MSG_CONTRAST "Contrast"
825
 
898
 
826
 // Serial Console Messages
899
 // Serial Console Messages
827
 
900
 
893
 	#define MSG_ENDSTOPS_HIT "Se ha tocado el fin de carril: "
966
 	#define MSG_ENDSTOPS_HIT "Se ha tocado el fin de carril: "
894
 	#define MSG_ERR_COLD_EXTRUDE_STOP " extrusion fria evitada"
967
 	#define MSG_ERR_COLD_EXTRUDE_STOP " extrusion fria evitada"
895
 	#define MSG_ERR_LONG_EXTRUDE_STOP " extrusion demasiado larga evitada"
968
 	#define MSG_ERR_LONG_EXTRUDE_STOP " extrusion demasiado larga evitada"
969
+	#define MSG_BABYSTEPPING_X "Babystepping X"
970
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
971
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
896
 
972
 
897
 #endif
973
 #endif
898
 
974
 
917
 	#define MSG_EXTRUDE							" Экструзия          "
993
 	#define MSG_EXTRUDE							" Экструзия          "
918
 	#define MSG_RETRACT							" Откат"
994
 	#define MSG_RETRACT							" Откат"
919
 	#define MSG_MOVE_AXIS						" Движение по осям  \x7E"
995
 	#define MSG_MOVE_AXIS						" Движение по осям  \x7E"
996
+	#define MSG_MOVE_X                          "Move X"
997
+	#define MSG_MOVE_Y                          "Move Y"
998
+	#define MSG_MOVE_Z                          "Move Z"
999
+	#define MSG_MOVE_E                          "Extruder"
1000
+	#define MSG_MOVE_01MM                       "Move 0.1mm"
1001
+	#define MSG_MOVE_1MM                        "Move 1mm"
1002
+	#define MSG_MOVE_10MM                       "Move 10mm"
920
 	#define MSG_SPEED							" Скорость:"
1003
 	#define MSG_SPEED							" Скорость:"
921
 	#define MSG_NOZZLE							" \002 Фильера:"
1004
 	#define MSG_NOZZLE							" \002 Фильера:"
922
 	#define MSG_NOZZLE1							" \002 Фильера2:"
1005
 	#define MSG_NOZZLE1							" \002 Фильера2:"
987
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
1070
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
988
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1071
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
989
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1072
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1073
+	#define MSG_BABYSTEP_X "Babystep X"
1074
+	#define MSG_BABYSTEP_Y "Babystep Y"
1075
+	#define MSG_BABYSTEP_Z "Babystep Z"
1076
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
1077
+	#define MSG_CONTRAST "Contrast"
990
 
1078
 
991
 // Serial Console Messages
1079
 // Serial Console Messages
992
 
1080
 
1057
 	#define MSG_ENDSTOPS_HIT					"концевик сработал: "
1145
 	#define MSG_ENDSTOPS_HIT					"концевик сработал: "
1058
 	#define MSG_ERR_COLD_EXTRUDE_STOP			" защита холодной экструзии"
1146
 	#define MSG_ERR_COLD_EXTRUDE_STOP			" защита холодной экструзии"
1059
 	#define MSG_ERR_LONG_EXTRUDE_STOP			" защита превышения длинны экструзии"
1147
 	#define MSG_ERR_LONG_EXTRUDE_STOP			" защита превышения длинны экструзии"
1148
+	#define MSG_BABYSTEPPING_X "Babystepping X"
1149
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
1150
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
1060
 
1151
 
1061
 #endif
1152
 #endif
1062
 
1153
 
1082
 	#define MSG_EXTRUDE              "Estrudi"
1173
 	#define MSG_EXTRUDE              "Estrudi"
1083
 	#define MSG_RETRACT              "Ritrai"
1174
 	#define MSG_RETRACT              "Ritrai"
1084
 	#define MSG_MOVE_AXIS            "Muovi Asse"
1175
 	#define MSG_MOVE_AXIS            "Muovi Asse"
1176
+	#define MSG_MOVE_X               "Move X"
1177
+	#define MSG_MOVE_Y               "Move Y"
1178
+	#define MSG_MOVE_Z               "Move Z"
1179
+	#define MSG_MOVE_E               "Extruder"
1180
+	#define MSG_MOVE_01MM            "Move 0.1mm"
1181
+	#define MSG_MOVE_1MM             "Move 1mm"
1182
+	#define MSG_MOVE_10MM            "Move 10mm"
1085
 	#define MSG_SPEED                "Velcità"
1183
 	#define MSG_SPEED                "Velcità"
1086
 	#define MSG_NOZZLE               "Ugello"
1184
 	#define MSG_NOZZLE               "Ugello"
1087
 	#define MSG_NOZZLE1              "Ugello2"
1185
 	#define MSG_NOZZLE1              "Ugello2"
1152
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
1250
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
1153
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1251
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1154
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1252
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1253
+	#define MSG_BABYSTEP_X "Babystep X"
1254
+	#define MSG_BABYSTEP_Y "Babystep Y"
1255
+	#define MSG_BABYSTEP_Z "Babystep Z"
1256
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
1257
+	#define MSG_CONTRAST "Contrast"
1155
 
1258
 
1156
 	// Serial Console Messages
1259
 	// Serial Console Messages
1157
 
1260
 
1224
 	#define MSG_ENDSTOPS_HIT         "Raggiunto il fondo carrello: "
1327
 	#define MSG_ENDSTOPS_HIT         "Raggiunto il fondo carrello: "
1225
 	#define MSG_ERR_COLD_EXTRUDE_STOP " prevenuta estrusione fredda"
1328
 	#define MSG_ERR_COLD_EXTRUDE_STOP " prevenuta estrusione fredda"
1226
 	#define MSG_ERR_LONG_EXTRUDE_STOP " prevenuta estrusione troppo lunga"
1329
 	#define MSG_ERR_LONG_EXTRUDE_STOP " prevenuta estrusione troppo lunga"
1330
+	#define MSG_BABYSTEPPING_X "Babystepping X"
1331
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
1332
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
1227
 
1333
 
1228
 #endif
1334
 #endif
1229
 
1335
 
1251
 	#define MSG_PREHEAT_PLA " pre-aquecer PLA"
1357
 	#define MSG_PREHEAT_PLA " pre-aquecer PLA"
1252
 	#define MSG_PREHEAT_ABS " pre-aquecer ABS"
1358
 	#define MSG_PREHEAT_ABS " pre-aquecer ABS"
1253
 	#define MSG_MOVE_AXIS " Mover eixo      \x7E"
1359
 	#define MSG_MOVE_AXIS " Mover eixo      \x7E"
1360
+	#define MSG_MOVE_X "Move X"
1361
+	#define MSG_MOVE_Y "Move Y"
1362
+	#define MSG_MOVE_Z "Move Z"
1363
+	#define MSG_MOVE_E "Extruder"
1364
+	#define MSG_MOVE_01MM "Move 0.1mm"
1365
+	#define MSG_MOVE_1MM "Move 1mm"
1366
+	#define MSG_MOVE_10MM "Move 10mm"
1254
 	#define MSG_SPEED " Velocidade:"
1367
 	#define MSG_SPEED " Velocidade:"
1255
 	#define MSG_NOZZLE " \002Nozzle:"
1368
 	#define MSG_NOZZLE " \002Nozzle:"
1256
 	#define MSG_NOZZLE1 " \002Nozzle2:"
1369
 	#define MSG_NOZZLE1 " \002Nozzle2:"
1326
     #define MSG_ZPROBE_OUT "Sonda fora da mesa"
1439
     #define MSG_ZPROBE_OUT "Sonda fora da mesa"
1327
     #define MSG_POSITION_UNKNOWN "Home X/Y antes de Z"
1440
     #define MSG_POSITION_UNKNOWN "Home X/Y antes de Z"
1328
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1441
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1442
+	#define MSG_BABYSTEP_X "Babystep X"
1443
+	#define MSG_BABYSTEP_Y "Babystep Y"
1444
+	#define MSG_BABYSTEP_Z "Babystep Z"
1445
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
1446
+	#define MSG_CONTRAST "Contrast"
1329
 
1447
 
1330
 // Serial Console Messages
1448
 // Serial Console Messages
1331
 
1449
 
1398
 	#define MSG_ENDSTOPS_HIT "O ponto final foi tocado: "
1516
 	#define MSG_ENDSTOPS_HIT "O ponto final foi tocado: "
1399
 	#define MSG_ERR_COLD_EXTRUDE_STOP " Extrusao a frio evitada"
1517
 	#define MSG_ERR_COLD_EXTRUDE_STOP " Extrusao a frio evitada"
1400
 	#define MSG_ERR_LONG_EXTRUDE_STOP " Extrusao muito larga evitada"
1518
 	#define MSG_ERR_LONG_EXTRUDE_STOP " Extrusao muito larga evitada"
1401
-
1519
+	#define MSG_BABYSTEPPING_X "Babystepping X"
1520
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
1521
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
1402
 
1522
 
1403
 #endif
1523
 #endif
1404
 
1524
 
1427
 	#define MSG_EXTRUDE "Pursota"
1547
 	#define MSG_EXTRUDE "Pursota"
1428
 	#define MSG_RETRACT "Veda takaisin"
1548
 	#define MSG_RETRACT "Veda takaisin"
1429
 	#define MSG_MOVE_AXIS "Liikuta akseleita"
1549
 	#define MSG_MOVE_AXIS "Liikuta akseleita"
1550
+	#define MSG_MOVE_X "Move X"
1551
+	#define MSG_MOVE_Y "Move Y"
1552
+	#define MSG_MOVE_Z "Move Z"
1553
+	#define MSG_MOVE_E "Extruder"
1554
+	#define MSG_MOVE_01MM "Move 0.1mm"
1555
+	#define MSG_MOVE_1MM "Move 1mm"
1556
+	#define MSG_MOVE_10MM "Move 10mm"
1430
 	#define MSG_SPEED "Nopeus"
1557
 	#define MSG_SPEED "Nopeus"
1431
 	#define MSG_NOZZLE "Suutin"
1558
 	#define MSG_NOZZLE "Suutin"
1432
 	#define MSG_NOZZLE1 "Suutin2"
1559
 	#define MSG_NOZZLE1 "Suutin2"
1496
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
1623
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
1497
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1624
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1498
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1625
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1626
+	#define MSG_BABYSTEP_X "Babystep X"
1627
+	#define MSG_BABYSTEP_Y "Babystep Y"
1628
+	#define MSG_BABYSTEP_Z "Babystep Z"
1629
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
1630
+	#define MSG_CONTRAST "Contrast"
1499
 
1631
 
1500
 // Serial Console Messages
1632
 // Serial Console Messages
1501
 
1633
 
1568
 	#define MSG_ENDSTOPS_HIT "paatyrajat aktivoitu: "
1700
 	#define MSG_ENDSTOPS_HIT "paatyrajat aktivoitu: "
1569
 	#define MSG_ERR_COLD_EXTRUDE_STOP " kylmana pursotus estetty"
1701
 	#define MSG_ERR_COLD_EXTRUDE_STOP " kylmana pursotus estetty"
1570
 	#define MSG_ERR_LONG_EXTRUDE_STOP " liian pitka pursotus estetty"
1702
 	#define MSG_ERR_LONG_EXTRUDE_STOP " liian pitka pursotus estetty"
1703
+	#define MSG_BABYSTEPPING_X "Babystepping X"
1704
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
1705
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
1706
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
1707
+	#define MSG_CONTRAST "Contrast"
1571
 
1708
 
1572
 #endif
1709
 #endif
1573
 
1710
 
1592
 	#define MSG_EXTRUDE "Extruir"
1729
 	#define MSG_EXTRUDE "Extruir"
1593
 	#define MSG_RETRACT "Retraer"
1730
 	#define MSG_RETRACT "Retraer"
1594
 	#define MSG_MOVE_AXIS "Mover Eixes"
1731
 	#define MSG_MOVE_AXIS "Mover Eixes"
1732
+	#define MSG_MOVE_X "Move X"
1733
+	#define MSG_MOVE_Y "Move Y"
1734
+	#define MSG_MOVE_Z "Move Z"
1735
+	#define MSG_MOVE_E "Extruder"
1736
+	#define MSG_MOVE_01MM "Move 0.1mm"
1737
+	#define MSG_MOVE_1MM "Move 1mm"
1738
+	#define MSG_MOVE_10MM "Move 10mm"
1595
 	#define MSG_SPEED "Velocidat"
1739
 	#define MSG_SPEED "Velocidat"
1596
 	#define MSG_NOZZLE "Nozzle"
1740
 	#define MSG_NOZZLE "Nozzle"
1597
 	#define MSG_NOZZLE1 "Nozzle2"
1741
 	#define MSG_NOZZLE1 "Nozzle2"
1670
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
1814
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
1671
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1815
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1672
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1816
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1817
+	#define MSG_BABYSTEP_X "Babystep X"
1818
+	#define MSG_BABYSTEP_Y "Babystep Y"
1819
+	#define MSG_BABYSTEP_Z "Babystep Z"
1820
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
1821
+	#define MSG_CONTRAST "Contrast"
1673
 
1822
 
1674
 // Serial Console Messages
1823
 // Serial Console Messages
1675
 
1824
 
1741
 	#define MSG_ENDSTOPS_HIT "S'ha tocau a fin de carril: "
1890
 	#define MSG_ENDSTOPS_HIT "S'ha tocau a fin de carril: "
1742
 	#define MSG_ERR_COLD_EXTRUDE_STOP " extrusion fria privada"
1891
 	#define MSG_ERR_COLD_EXTRUDE_STOP " extrusion fria privada"
1743
 	#define MSG_ERR_LONG_EXTRUDE_STOP " extrusion masiau larga privada"
1892
 	#define MSG_ERR_LONG_EXTRUDE_STOP " extrusion masiau larga privada"
1893
+	#define MSG_BABYSTEPPING_X "Babystepping X"
1894
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
1895
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
1744
 
1896
 
1745
 #endif
1897
 #endif
1898
+
1746
 #endif // ifndef LANGUAGE_H
1899
 #endif // ifndef LANGUAGE_H

+ 15
- 15
Marlin/ultralcd.cpp View File

344
     }
344
     }
345
     if (lcdDrawUpdate)
345
     if (lcdDrawUpdate)
346
     {
346
     {
347
-        lcd_implementation_drawedit(PSTR("Babystepping X"),"");
347
+        lcd_implementation_drawedit(PSTR(MSG_BABYSTEPPING_X),"");
348
     }
348
     }
349
     if (LCD_CLICKED)
349
     if (LCD_CLICKED)
350
     {
350
     {
364
     }
364
     }
365
     if (lcdDrawUpdate)
365
     if (lcdDrawUpdate)
366
     {
366
     {
367
-        lcd_implementation_drawedit(PSTR("Babystepping Y"),"");
367
+        lcd_implementation_drawedit(PSTR(MSG_BABYSTEPPING_Y),"");
368
     }
368
     }
369
     if (LCD_CLICKED)
369
     if (LCD_CLICKED)
370
     {
370
     {
384
     }
384
     }
385
     if (lcdDrawUpdate)
385
     if (lcdDrawUpdate)
386
     {
386
     {
387
-        lcd_implementation_drawedit(PSTR("Babystepping Z"),"");
387
+        lcd_implementation_drawedit(PSTR(MSG_BABYSTEPPING_Z),"");
388
     }
388
     }
389
     if (LCD_CLICKED)
389
     if (LCD_CLICKED)
390
     {
390
     {
415
 
415
 
416
 #ifdef BABYSTEPPING
416
 #ifdef BABYSTEPPING
417
     #ifdef BABYSTEP_XY
417
     #ifdef BABYSTEP_XY
418
-      MENU_ITEM(submenu, "Babystep X", lcd_babystep_x);
419
-      MENU_ITEM(submenu, "Babystep Y", lcd_babystep_y);
418
+      MENU_ITEM(submenu, MSG_BABYSTEP_X, lcd_babystep_x);
419
+      MENU_ITEM(submenu, MSG_BABYSTEP_Y, lcd_babystep_y);
420
     #endif //BABYSTEP_XY
420
     #endif //BABYSTEP_XY
421
-    MENU_ITEM(submenu, "Babystep Z", lcd_babystep_z);
421
+    MENU_ITEM(submenu, MSG_BABYSTEP_Z, lcd_babystep_z);
422
 #endif
422
 #endif
423
 #ifdef FILAMENTCHANGEENABLE
423
 #ifdef FILAMENTCHANGEENABLE
424
      MENU_ITEM(gcode, MSG_FILAMENTCHANGE, PSTR("M600"));
424
      MENU_ITEM(gcode, MSG_FILAMENTCHANGE, PSTR("M600"));
573
 {
573
 {
574
     START_MENU();
574
     START_MENU();
575
     MENU_ITEM(back, MSG_MOVE_AXIS, lcd_move_menu);
575
     MENU_ITEM(back, MSG_MOVE_AXIS, lcd_move_menu);
576
-    MENU_ITEM(submenu, "Move X", lcd_move_x);
577
-    MENU_ITEM(submenu, "Move Y", lcd_move_y);
576
+    MENU_ITEM(submenu, MSG_MOVE_X, lcd_move_x);
577
+    MENU_ITEM(submenu, MSG_MOVE_Y, lcd_move_y);
578
     if (move_menu_scale < 10.0)
578
     if (move_menu_scale < 10.0)
579
     {
579
     {
580
-        MENU_ITEM(submenu, "Move Z", lcd_move_z);
581
-        MENU_ITEM(submenu, "Extruder", lcd_move_e);
580
+        MENU_ITEM(submenu, MSG_MOVE_Z, lcd_move_z);
581
+        MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_e);
582
     }
582
     }
583
     END_MENU();
583
     END_MENU();
584
 }
584
 }
603
 {
603
 {
604
     START_MENU();
604
     START_MENU();
605
     MENU_ITEM(back, MSG_PREPARE, lcd_prepare_menu);
605
     MENU_ITEM(back, MSG_PREPARE, lcd_prepare_menu);
606
-    MENU_ITEM(submenu, "Move 10mm", lcd_move_menu_10mm);
607
-    MENU_ITEM(submenu, "Move 1mm", lcd_move_menu_1mm);
608
-    MENU_ITEM(submenu, "Move 0.1mm", lcd_move_menu_01mm);
606
+    MENU_ITEM(submenu, MSG_MOVE_10MM, lcd_move_menu_10mm);
607
+    MENU_ITEM(submenu, MSG_MOVE_1MM, lcd_move_menu_1mm);
608
+    MENU_ITEM(submenu, MSG_MOVE_01MM, lcd_move_menu_01mm);
609
     //TODO:X,Y,Z,E
609
     //TODO:X,Y,Z,E
610
     END_MENU();
610
     END_MENU();
611
 }
611
 }
727
     MENU_ITEM_EDIT(float51, MSG_ZSTEPS, &axis_steps_per_unit[Z_AXIS], 5, 9999);
727
     MENU_ITEM_EDIT(float51, MSG_ZSTEPS, &axis_steps_per_unit[Z_AXIS], 5, 9999);
728
     MENU_ITEM_EDIT(float51, MSG_ESTEPS, &axis_steps_per_unit[E_AXIS], 5, 9999);
728
     MENU_ITEM_EDIT(float51, MSG_ESTEPS, &axis_steps_per_unit[E_AXIS], 5, 9999);
729
 #ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
729
 #ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
730
-    MENU_ITEM_EDIT(bool, "Endstop abort", &abort_on_endstop_hit);
730
+    MENU_ITEM_EDIT(bool, MSG_ENDSTOP_ABORT, &abort_on_endstop_hit);
731
 #endif
731
 #endif
732
     END_MENU();
732
     END_MENU();
733
 }
733
 }
746
     }
746
     }
747
     if (lcdDrawUpdate)
747
     if (lcdDrawUpdate)
748
     {
748
     {
749
-        lcd_implementation_drawedit(PSTR("Contrast"), itostr2(lcd_contrast));
749
+        lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr2(lcd_contrast));
750
     }
750
     }
751
     if (LCD_CLICKED)
751
     if (LCD_CLICKED)
752
     {
752
     {

Loading…
Cancel
Save