Browse Source

Move strings in ultralcd.cpp into language.h.

Mark Hanford 11 years ago
parent
commit
bdd0211aeb
2 changed files with 154 additions and 16 deletions
  1. 139
    1
      Marlin/language.h
  2. 15
    15
      Marlin/ultralcd.cpp

+ 139
- 1
Marlin/language.h View File

70
 	#define MSG_EXTRUDE "Extrude"
70
 	#define MSG_EXTRUDE "Extrude"
71
 	#define MSG_RETRACT "Retract"
71
 	#define MSG_RETRACT "Retract"
72
 	#define MSG_MOVE_AXIS "Move Axis"
72
 	#define MSG_MOVE_AXIS "Move Axis"
73
+	#define MSG_MOVE_X "Move X"
74
+	#define MSG_MOVE_Y "Move Y"
75
+	#define MSG_MOVE_Z "Move Z"
76
+	#define MSG_MOVE_E "Extruder"
77
+	#define MSG_MOVE_01MM "Move 0.1mm"
78
+	#define MSG_MOVE_1MM "Move 1mm"
79
+	#define MSG_MOVE_10MM "Move 10mm"
73
 	#define MSG_SPEED "Speed"
80
 	#define MSG_SPEED "Speed"
74
 	#define MSG_NOZZLE "Nozzle"
81
 	#define MSG_NOZZLE "Nozzle"
75
 	#define MSG_NOZZLE1 "Nozzle2"
82
 	#define MSG_NOZZLE1 "Nozzle2"
139
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
146
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
140
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
147
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
141
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
148
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
149
+	#define MSG_BABYSTEP_X "Babystep X"
150
+	#define MSG_BABYSTEP_Y "Babystep Y"
151
+	#define MSG_BABYSTEP_Z "Babystep Z"
152
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
153
+	#define MSG_CONTRAST "Contrast"
154
+
142
 // Serial Console Messages
155
 // Serial Console Messages
143
 
156
 
144
 	#define MSG_Enqueing "enqueing \""
157
 	#define MSG_Enqueing "enqueing \""
210
 	#define MSG_ENDSTOPS_HIT "endstops hit: "
223
 	#define MSG_ENDSTOPS_HIT "endstops hit: "
211
 	#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
224
 	#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
212
 	#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented"
225
 	#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented"
226
+	#define MSG_BABYSTEPPING_X "Babystepping X"
227
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
228
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
213
 
229
 
214
 #endif
230
 #endif
215
 
231
 
235
 	#define MSG_EXTRUDE "Ekstruzja"
251
 	#define MSG_EXTRUDE "Ekstruzja"
236
 	#define MSG_RETRACT "Cofanie"
252
 	#define MSG_RETRACT "Cofanie"
237
 	#define MSG_MOVE_AXIS "Ruch osi"
253
 	#define MSG_MOVE_AXIS "Ruch osi"
254
+	#define MSG_MOVE_X "Move X"
255
+	#define MSG_MOVE_Y "Move Y"
256
+	#define MSG_MOVE_Z "Move Z"
257
+	#define MSG_MOVE_E "Extruder"
258
+	#define MSG_MOVE_01MM "Move 0.1mm"
259
+	#define MSG_MOVE_1MM "Move 1mm"
260
+	#define MSG_MOVE_10MM "Move 10mm"
238
 	#define MSG_SPEED "Predkosc"
261
 	#define MSG_SPEED "Predkosc"
239
 	#define MSG_NOZZLE "Dysza"
262
 	#define MSG_NOZZLE "Dysza"
240
 	#define MSG_NOZZLE1 "Dysza2"
263
 	#define MSG_NOZZLE1 "Dysza2"
307
     #define MSG_ZPROBE_OUT "Probkuj Z poza lozem"
330
     #define MSG_ZPROBE_OUT "Probkuj Z poza lozem"
308
     #define MSG_POSITION_UNKNOWN "Domuj X/Y przed Z"
331
     #define MSG_POSITION_UNKNOWN "Domuj X/Y przed Z"
309
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
332
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
333
+	#define MSG_BABYSTEP_X "Babystep X"
334
+	#define MSG_BABYSTEP_Y "Babystep Y"
335
+	#define MSG_BABYSTEP_Z "Babystep Z"
336
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
337
+	#define MSG_CONTRAST "Contrast"
310
 
338
 
311
 // Serial Console Messages
339
 // Serial Console Messages
312
 
340
 
379
 	#define MSG_ENDSTOPS_HIT "Wylacznik krancowy zostal wyzwolony na pozycji: "
407
 	#define MSG_ENDSTOPS_HIT "Wylacznik krancowy zostal wyzwolony na pozycji: "
380
 	#define MSG_ERR_COLD_EXTRUDE_STOP " uniemozliwiono zimna ekstruzje"
408
 	#define MSG_ERR_COLD_EXTRUDE_STOP " uniemozliwiono zimna ekstruzje"
381
 	#define MSG_ERR_LONG_EXTRUDE_STOP " uniemozliwiono zbyt dluga ekstruzje"
409
 	#define MSG_ERR_LONG_EXTRUDE_STOP " uniemozliwiono zbyt dluga ekstruzje"
410
+	#define MSG_BABYSTEPPING_X "Babystepping X"
411
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
412
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
382
 
413
 
383
 #endif
414
 #endif
384
 
415
 
405
 	#define MSG_PREHEAT_PLA "Prechauffage PLA"
436
 	#define MSG_PREHEAT_PLA "Prechauffage PLA"
406
 	#define MSG_PREHEAT_ABS "Prechauffage ABS"
437
 	#define MSG_PREHEAT_ABS "Prechauffage ABS"
407
 	#define MSG_MOVE_AXIS "Deplacer un axe"
438
 	#define MSG_MOVE_AXIS "Deplacer un axe"
439
+	#define MSG_MOVE_X "Move X"
440
+	#define MSG_MOVE_Y "Move Y"
441
+	#define MSG_MOVE_Z "Move Z"
442
+	#define MSG_MOVE_E "Extruder"
443
+	#define MSG_MOVE_01MM "Move 0.1mm"
444
+	#define MSG_MOVE_1MM "Move 1mm"
445
+	#define MSG_MOVE_10MM "Move 10mm"
408
 	#define MSG_SPEED " Vitesse"
446
 	#define MSG_SPEED " Vitesse"
409
 	#define MSG_NOZZLE "Buse"
447
 	#define MSG_NOZZLE "Buse"
410
 	#define MSG_NOZZLE1 "Buse2"
448
 	#define MSG_NOZZLE1 "Buse2"
475
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
513
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
476
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
514
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
477
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
515
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
516
+	#define MSG_BABYSTEP_X "Babystep X"
517
+	#define MSG_BABYSTEP_Y "Babystep Y"
518
+	#define MSG_BABYSTEP_Z "Babystep Z"
519
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
520
+	#define MSG_CONTRAST "Contrast"
478
 
521
 
479
 // Serial Console Messages
522
 // Serial Console Messages
480
 
523
 
547
 	#define MSG_ENDSTOPS_HIT "Fin de course atteint: "
590
 	#define MSG_ENDSTOPS_HIT "Fin de course atteint: "
548
 	#define MSG_ERR_COLD_EXTRUDE_STOP " Extrusion a froid evitee"
591
 	#define MSG_ERR_COLD_EXTRUDE_STOP " Extrusion a froid evitee"
549
 	#define MSG_ERR_LONG_EXTRUDE_STOP " Extrusion longue evitee"
592
 	#define MSG_ERR_LONG_EXTRUDE_STOP " Extrusion longue evitee"
593
+	#define MSG_BABYSTEPPING_X "Babystepping X"
594
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
595
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
550
 	
596
 	
551
 #endif
597
 #endif
552
 
598
 
574
 	#define MSG_EXTRUDE          "Extrude"
620
 	#define MSG_EXTRUDE          "Extrude"
575
 	#define MSG_RETRACT          "Retract"
621
 	#define MSG_RETRACT          "Retract"
576
 	#define MSG_MOVE_AXIS        "Achsen bewegen"
622
 	#define MSG_MOVE_AXIS        "Achsen bewegen"
623
+	#define MSG_MOVE_X           "X bewegen"
624
+	#define MSG_MOVE_Y           "Y bewegen"
625
+	#define MSG_MOVE_Z           "Z bewegen"
626
+	#define MSG_MOVE_E           "Extruder"
627
+	#define MSG_MOVE_01MM        "0.1mm bewegen"
628
+	#define MSG_MOVE_1MM         "1mm bewegen"
629
+	#define MSG_MOVE_10MM        "10mm bewegen"
577
 	#define MSG_SPEED            "Geschw"
630
 	#define MSG_SPEED            "Geschw"
578
 	#define MSG_NOZZLE           "Düse"
631
 	#define MSG_NOZZLE           "Düse"
579
 	#define MSG_NOZZLE1          "Düse2"
632
 	#define MSG_NOZZLE1          "Düse2"
646
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
699
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
647
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
700
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
648
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
701
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
702
+	#define MSG_BABYSTEP_X "Babystep X"
703
+	#define MSG_BABYSTEP_Y "Babystep Y"
704
+	#define MSG_BABYSTEP_Z "Babystep Z"
705
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
706
+	#define MSG_CONTRAST "Contrast"
649
 	
707
 	
650
 // Serial Console Messages
708
 // Serial Console Messages
651
 
709
 
718
 	#define MSG_ENDSTOPS_HIT "endstops hit: "
776
 	#define MSG_ENDSTOPS_HIT "endstops hit: "
719
 	#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
777
 	#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
720
 	#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented"
778
 	#define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented"
779
+	#define MSG_BABYSTEPPING_X "Babystepping X"
780
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
781
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
721
 
782
 
722
 #endif
783
 #endif
723
 
784
 
743
 	#define MSG_EXTRUDE "Extruir"
804
 	#define MSG_EXTRUDE "Extruir"
744
 	#define MSG_RETRACT "Retraer"
805
 	#define MSG_RETRACT "Retraer"
745
 	#define MSG_MOVE_AXIS "Mover Ejes"
806
 	#define MSG_MOVE_AXIS "Mover Ejes"
807
+	#define MSG_MOVE_X "Move X"
808
+	#define MSG_MOVE_Y "Move Y"
809
+	#define MSG_MOVE_Z "Move Z"
810
+	#define MSG_MOVE_E "Extruder"
811
+	#define MSG_MOVE_01MM "Move 0.1mm"
812
+	#define MSG_MOVE_1MM "Move 1mm"
813
+	#define MSG_MOVE_10MM "Move 10mm"
746
 	#define MSG_SPEED "Velocidad"
814
 	#define MSG_SPEED "Velocidad"
747
 	#define MSG_NOZZLE "Nozzle"
815
 	#define MSG_NOZZLE "Nozzle"
748
 	#define MSG_NOZZLE1 "Nozzle2"
816
 	#define MSG_NOZZLE1 "Nozzle2"
821
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
889
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
822
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
890
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
823
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
891
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
892
+	#define MSG_BABYSTEP_X "Babystep X"
893
+	#define MSG_BABYSTEP_Y "Babystep Y"
894
+	#define MSG_BABYSTEP_Z "Babystep Z"
895
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
896
+	#define MSG_CONTRAST "Contrast"
824
 
897
 
825
 // Serial Console Messages
898
 // Serial Console Messages
826
 
899
 
892
 	#define MSG_ENDSTOPS_HIT "Se ha tocado el fin de carril: "
965
 	#define MSG_ENDSTOPS_HIT "Se ha tocado el fin de carril: "
893
 	#define MSG_ERR_COLD_EXTRUDE_STOP " extrusion fria evitada"
966
 	#define MSG_ERR_COLD_EXTRUDE_STOP " extrusion fria evitada"
894
 	#define MSG_ERR_LONG_EXTRUDE_STOP " extrusion demasiado larga evitada"
967
 	#define MSG_ERR_LONG_EXTRUDE_STOP " extrusion demasiado larga evitada"
968
+	#define MSG_BABYSTEPPING_X "Babystepping X"
969
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
970
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
895
 
971
 
896
 #endif
972
 #endif
897
 
973
 
916
 	#define MSG_EXTRUDE							" Экструзия          "
992
 	#define MSG_EXTRUDE							" Экструзия          "
917
 	#define MSG_RETRACT							" Откат"
993
 	#define MSG_RETRACT							" Откат"
918
 	#define MSG_MOVE_AXIS						" Движение по осям  \x7E"
994
 	#define MSG_MOVE_AXIS						" Движение по осям  \x7E"
995
+	#define MSG_MOVE_X                          "Move X"
996
+	#define MSG_MOVE_Y                          "Move Y"
997
+	#define MSG_MOVE_Z                          "Move Z"
998
+	#define MSG_MOVE_E                          "Extruder"
999
+	#define MSG_MOVE_01MM                       "Move 0.1mm"
1000
+	#define MSG_MOVE_1MM                        "Move 1mm"
1001
+	#define MSG_MOVE_10MM                       "Move 10mm"
919
 	#define MSG_SPEED							" Скорость:"
1002
 	#define MSG_SPEED							" Скорость:"
920
 	#define MSG_NOZZLE							" \002 Фильера:"
1003
 	#define MSG_NOZZLE							" \002 Фильера:"
921
 	#define MSG_NOZZLE1							" \002 Фильера2:"
1004
 	#define MSG_NOZZLE1							" \002 Фильера2:"
986
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
1069
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
987
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1070
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
988
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1071
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1072
+	#define MSG_BABYSTEP_X "Babystep X"
1073
+	#define MSG_BABYSTEP_Y "Babystep Y"
1074
+	#define MSG_BABYSTEP_Z "Babystep Z"
1075
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
1076
+	#define MSG_CONTRAST "Contrast"
989
 
1077
 
990
 // Serial Console Messages
1078
 // Serial Console Messages
991
 
1079
 
1056
 	#define MSG_ENDSTOPS_HIT					"концевик сработал: "
1144
 	#define MSG_ENDSTOPS_HIT					"концевик сработал: "
1057
 	#define MSG_ERR_COLD_EXTRUDE_STOP			" защита холодной экструзии"
1145
 	#define MSG_ERR_COLD_EXTRUDE_STOP			" защита холодной экструзии"
1058
 	#define MSG_ERR_LONG_EXTRUDE_STOP			" защита превышения длинны экструзии"
1146
 	#define MSG_ERR_LONG_EXTRUDE_STOP			" защита превышения длинны экструзии"
1147
+	#define MSG_BABYSTEPPING_X "Babystepping X"
1148
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
1149
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
1059
 
1150
 
1060
 #endif
1151
 #endif
1061
 
1152
 
1081
 	#define MSG_EXTRUDE              "Estrudi"
1172
 	#define MSG_EXTRUDE              "Estrudi"
1082
 	#define MSG_RETRACT              "Ritrai"
1173
 	#define MSG_RETRACT              "Ritrai"
1083
 	#define MSG_MOVE_AXIS            "Muovi Asse"
1174
 	#define MSG_MOVE_AXIS            "Muovi Asse"
1175
+	#define MSG_MOVE_X               "Move X"
1176
+	#define MSG_MOVE_Y               "Move Y"
1177
+	#define MSG_MOVE_Z               "Move Z"
1178
+	#define MSG_MOVE_E               "Extruder"
1179
+	#define MSG_MOVE_01MM            "Move 0.1mm"
1180
+	#define MSG_MOVE_1MM             "Move 1mm"
1181
+	#define MSG_MOVE_10MM            "Move 10mm"
1084
 	#define MSG_SPEED                "Velcità"
1182
 	#define MSG_SPEED                "Velcità"
1085
 	#define MSG_NOZZLE               "Ugello"
1183
 	#define MSG_NOZZLE               "Ugello"
1086
 	#define MSG_NOZZLE1              "Ugello2"
1184
 	#define MSG_NOZZLE1              "Ugello2"
1151
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
1249
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
1152
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1250
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1153
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1251
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1252
+	#define MSG_BABYSTEP_X "Babystep X"
1253
+	#define MSG_BABYSTEP_Y "Babystep Y"
1254
+	#define MSG_BABYSTEP_Z "Babystep Z"
1255
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
1256
+	#define MSG_CONTRAST "Contrast"
1154
 
1257
 
1155
 	// Serial Console Messages
1258
 	// Serial Console Messages
1156
 
1259
 
1223
 	#define MSG_ENDSTOPS_HIT         "Raggiunto il fondo carrello: "
1326
 	#define MSG_ENDSTOPS_HIT         "Raggiunto il fondo carrello: "
1224
 	#define MSG_ERR_COLD_EXTRUDE_STOP " prevenuta estrusione fredda"
1327
 	#define MSG_ERR_COLD_EXTRUDE_STOP " prevenuta estrusione fredda"
1225
 	#define MSG_ERR_LONG_EXTRUDE_STOP " prevenuta estrusione troppo lunga"
1328
 	#define MSG_ERR_LONG_EXTRUDE_STOP " prevenuta estrusione troppo lunga"
1329
+	#define MSG_BABYSTEPPING_X "Babystepping X"
1330
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
1331
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
1226
 
1332
 
1227
 #endif
1333
 #endif
1228
 
1334
 
1250
 	#define MSG_PREHEAT_PLA " pre-aquecer PLA"
1356
 	#define MSG_PREHEAT_PLA " pre-aquecer PLA"
1251
 	#define MSG_PREHEAT_ABS " pre-aquecer ABS"
1357
 	#define MSG_PREHEAT_ABS " pre-aquecer ABS"
1252
 	#define MSG_MOVE_AXIS " Mover eixo      \x7E"
1358
 	#define MSG_MOVE_AXIS " Mover eixo      \x7E"
1359
+	#define MSG_MOVE_X "Move X"
1360
+	#define MSG_MOVE_Y "Move Y"
1361
+	#define MSG_MOVE_Z "Move Z"
1362
+	#define MSG_MOVE_E "Extruder"
1363
+	#define MSG_MOVE_01MM "Move 0.1mm"
1364
+	#define MSG_MOVE_1MM "Move 1mm"
1365
+	#define MSG_MOVE_10MM "Move 10mm"
1253
 	#define MSG_SPEED " Velocidade:"
1366
 	#define MSG_SPEED " Velocidade:"
1254
 	#define MSG_NOZZLE " \002Nozzle:"
1367
 	#define MSG_NOZZLE " \002Nozzle:"
1255
 	#define MSG_NOZZLE1 " \002Nozzle2:"
1368
 	#define MSG_NOZZLE1 " \002Nozzle2:"
1325
     #define MSG_ZPROBE_OUT "Sonda fora da mesa"
1438
     #define MSG_ZPROBE_OUT "Sonda fora da mesa"
1326
     #define MSG_POSITION_UNKNOWN "Home X/Y antes de Z"
1439
     #define MSG_POSITION_UNKNOWN "Home X/Y antes de Z"
1327
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1440
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1441
+	#define MSG_BABYSTEP_X "Babystep X"
1442
+	#define MSG_BABYSTEP_Y "Babystep Y"
1443
+	#define MSG_BABYSTEP_Z "Babystep Z"
1444
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
1445
+	#define MSG_CONTRAST "Contrast"
1328
 
1446
 
1329
 // Serial Console Messages
1447
 // Serial Console Messages
1330
 
1448
 
1397
 	#define MSG_ENDSTOPS_HIT "O ponto final foi tocado: "
1515
 	#define MSG_ENDSTOPS_HIT "O ponto final foi tocado: "
1398
 	#define MSG_ERR_COLD_EXTRUDE_STOP " Extrusao a frio evitada"
1516
 	#define MSG_ERR_COLD_EXTRUDE_STOP " Extrusao a frio evitada"
1399
 	#define MSG_ERR_LONG_EXTRUDE_STOP " Extrusao muito larga evitada"
1517
 	#define MSG_ERR_LONG_EXTRUDE_STOP " Extrusao muito larga evitada"
1400
-
1518
+	#define MSG_BABYSTEPPING_X "Babystepping X"
1519
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
1520
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
1401
 
1521
 
1402
 #endif
1522
 #endif
1403
 
1523
 
1426
 	#define MSG_EXTRUDE "Pursota"
1546
 	#define MSG_EXTRUDE "Pursota"
1427
 	#define MSG_RETRACT "Veda takaisin"
1547
 	#define MSG_RETRACT "Veda takaisin"
1428
 	#define MSG_MOVE_AXIS "Liikuta akseleita"
1548
 	#define MSG_MOVE_AXIS "Liikuta akseleita"
1549
+	#define MSG_MOVE_X "Move X"
1550
+	#define MSG_MOVE_Y "Move Y"
1551
+	#define MSG_MOVE_Z "Move Z"
1552
+	#define MSG_MOVE_E "Extruder"
1553
+	#define MSG_MOVE_01MM "Move 0.1mm"
1554
+	#define MSG_MOVE_1MM "Move 1mm"
1555
+	#define MSG_MOVE_10MM "Move 10mm"
1429
 	#define MSG_SPEED "Nopeus"
1556
 	#define MSG_SPEED "Nopeus"
1430
 	#define MSG_NOZZLE "Suutin"
1557
 	#define MSG_NOZZLE "Suutin"
1431
 	#define MSG_NOZZLE1 "Suutin2"
1558
 	#define MSG_NOZZLE1 "Suutin2"
1495
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
1622
     #define MSG_ZPROBE_OUT "ZProbe Outside Bed"
1496
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1623
     #define MSG_POSITION_UNKNOWN "Home X/Y before Z"
1497
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1624
     #define MSG_ZPROBE_ZOFFSET "Z Offset"
1625
+	#define MSG_BABYSTEP_X "Babystep X"
1626
+	#define MSG_BABYSTEP_Y "Babystep Y"
1627
+	#define MSG_BABYSTEP_Z "Babystep Z"
1628
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
1629
+	#define MSG_CONTRAST "Contrast"
1498
 
1630
 
1499
 // Serial Console Messages
1631
 // Serial Console Messages
1500
 
1632
 
1567
 	#define MSG_ENDSTOPS_HIT "paatyrajat aktivoitu: "
1699
 	#define MSG_ENDSTOPS_HIT "paatyrajat aktivoitu: "
1568
 	#define MSG_ERR_COLD_EXTRUDE_STOP " kylmana pursotus estetty"
1700
 	#define MSG_ERR_COLD_EXTRUDE_STOP " kylmana pursotus estetty"
1569
 	#define MSG_ERR_LONG_EXTRUDE_STOP " liian pitka pursotus estetty"
1701
 	#define MSG_ERR_LONG_EXTRUDE_STOP " liian pitka pursotus estetty"
1702
+	#define MSG_BABYSTEPPING_X "Babystepping X"
1703
+	#define MSG_BABYSTEPPING_Y "Babystepping Y"
1704
+	#define MSG_BABYSTEPPING_Z "Babystepping Z"
1705
+	#define MSG_ENDSTOP_ABORT "Endstop abort"
1706
+	#define MSG_CONTRAST "Contrast"
1570
 
1707
 
1571
 #endif
1708
 #endif
1709
+
1572
 #endif // ifndef LANGUAGE_H
1710
 #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