From bdd0211aeb336f8453155cbf2a0ce24819a7ec96 Mon Sep 17 00:00:00 2001 From: Mark Hanford Date: Tue, 11 Feb 2014 13:54:43 +0000 Subject: [PATCH 1/2] Move strings in ultralcd.cpp into language.h. --- Marlin/language.h | 140 +++++++++++++++++++++++++++++++++++++++++++- Marlin/ultralcd.cpp | 30 +++++----- 2 files changed, 154 insertions(+), 16 deletions(-) diff --git a/Marlin/language.h b/Marlin/language.h index 2ef725f9f..717b0d7b5 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -70,6 +70,13 @@ #define MSG_EXTRUDE "Extrude" #define MSG_RETRACT "Retract" #define MSG_MOVE_AXIS "Move Axis" + #define MSG_MOVE_X "Move X" + #define MSG_MOVE_Y "Move Y" + #define MSG_MOVE_Z "Move Z" + #define MSG_MOVE_E "Extruder" + #define MSG_MOVE_01MM "Move 0.1mm" + #define MSG_MOVE_1MM "Move 1mm" + #define MSG_MOVE_10MM "Move 10mm" #define MSG_SPEED "Speed" #define MSG_NOZZLE "Nozzle" #define MSG_NOZZLE1 "Nozzle2" @@ -139,6 +146,12 @@ #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" + #define MSG_BABYSTEP_X "Babystep X" + #define MSG_BABYSTEP_Y "Babystep Y" + #define MSG_BABYSTEP_Z "Babystep Z" + #define MSG_ENDSTOP_ABORT "Endstop abort" + #define MSG_CONTRAST "Contrast" + // Serial Console Messages #define MSG_Enqueing "enqueing \"" @@ -210,6 +223,9 @@ #define MSG_ENDSTOPS_HIT "endstops hit: " #define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented" #define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented" + #define MSG_BABYSTEPPING_X "Babystepping X" + #define MSG_BABYSTEPPING_Y "Babystepping Y" + #define MSG_BABYSTEPPING_Z "Babystepping Z" #endif @@ -235,6 +251,13 @@ #define MSG_EXTRUDE "Ekstruzja" #define MSG_RETRACT "Cofanie" #define MSG_MOVE_AXIS "Ruch osi" + #define MSG_MOVE_X "Move X" + #define MSG_MOVE_Y "Move Y" + #define MSG_MOVE_Z "Move Z" + #define MSG_MOVE_E "Extruder" + #define MSG_MOVE_01MM "Move 0.1mm" + #define MSG_MOVE_1MM "Move 1mm" + #define MSG_MOVE_10MM "Move 10mm" #define MSG_SPEED "Predkosc" #define MSG_NOZZLE "Dysza" #define MSG_NOZZLE1 "Dysza2" @@ -307,6 +330,11 @@ #define MSG_ZPROBE_OUT "Probkuj Z poza lozem" #define MSG_POSITION_UNKNOWN "Domuj X/Y przed Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" + #define MSG_BABYSTEP_X "Babystep X" + #define MSG_BABYSTEP_Y "Babystep Y" + #define MSG_BABYSTEP_Z "Babystep Z" + #define MSG_ENDSTOP_ABORT "Endstop abort" + #define MSG_CONTRAST "Contrast" // Serial Console Messages @@ -379,6 +407,9 @@ #define MSG_ENDSTOPS_HIT "Wylacznik krancowy zostal wyzwolony na pozycji: " #define MSG_ERR_COLD_EXTRUDE_STOP " uniemozliwiono zimna ekstruzje" #define MSG_ERR_LONG_EXTRUDE_STOP " uniemozliwiono zbyt dluga ekstruzje" + #define MSG_BABYSTEPPING_X "Babystepping X" + #define MSG_BABYSTEPPING_Y "Babystepping Y" + #define MSG_BABYSTEPPING_Z "Babystepping Z" #endif @@ -405,6 +436,13 @@ #define MSG_PREHEAT_PLA "Prechauffage PLA" #define MSG_PREHEAT_ABS "Prechauffage ABS" #define MSG_MOVE_AXIS "Deplacer un axe" + #define MSG_MOVE_X "Move X" + #define MSG_MOVE_Y "Move Y" + #define MSG_MOVE_Z "Move Z" + #define MSG_MOVE_E "Extruder" + #define MSG_MOVE_01MM "Move 0.1mm" + #define MSG_MOVE_1MM "Move 1mm" + #define MSG_MOVE_10MM "Move 10mm" #define MSG_SPEED " Vitesse" #define MSG_NOZZLE "Buse" #define MSG_NOZZLE1 "Buse2" @@ -475,6 +513,11 @@ #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" + #define MSG_BABYSTEP_X "Babystep X" + #define MSG_BABYSTEP_Y "Babystep Y" + #define MSG_BABYSTEP_Z "Babystep Z" + #define MSG_ENDSTOP_ABORT "Endstop abort" + #define MSG_CONTRAST "Contrast" // Serial Console Messages @@ -547,6 +590,9 @@ #define MSG_ENDSTOPS_HIT "Fin de course atteint: " #define MSG_ERR_COLD_EXTRUDE_STOP " Extrusion a froid evitee" #define MSG_ERR_LONG_EXTRUDE_STOP " Extrusion longue evitee" + #define MSG_BABYSTEPPING_X "Babystepping X" + #define MSG_BABYSTEPPING_Y "Babystepping Y" + #define MSG_BABYSTEPPING_Z "Babystepping Z" #endif @@ -574,6 +620,13 @@ #define MSG_EXTRUDE "Extrude" #define MSG_RETRACT "Retract" #define MSG_MOVE_AXIS "Achsen bewegen" + #define MSG_MOVE_X "X bewegen" + #define MSG_MOVE_Y "Y bewegen" + #define MSG_MOVE_Z "Z bewegen" + #define MSG_MOVE_E "Extruder" + #define MSG_MOVE_01MM "0.1mm bewegen" + #define MSG_MOVE_1MM "1mm bewegen" + #define MSG_MOVE_10MM "10mm bewegen" #define MSG_SPEED "Geschw" #define MSG_NOZZLE "Düse" #define MSG_NOZZLE1 "Düse2" @@ -646,6 +699,11 @@ #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" + #define MSG_BABYSTEP_X "Babystep X" + #define MSG_BABYSTEP_Y "Babystep Y" + #define MSG_BABYSTEP_Z "Babystep Z" + #define MSG_ENDSTOP_ABORT "Endstop abort" + #define MSG_CONTRAST "Contrast" // Serial Console Messages @@ -718,6 +776,9 @@ #define MSG_ENDSTOPS_HIT "endstops hit: " #define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented" #define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented" + #define MSG_BABYSTEPPING_X "Babystepping X" + #define MSG_BABYSTEPPING_Y "Babystepping Y" + #define MSG_BABYSTEPPING_Z "Babystepping Z" #endif @@ -743,6 +804,13 @@ #define MSG_EXTRUDE "Extruir" #define MSG_RETRACT "Retraer" #define MSG_MOVE_AXIS "Mover Ejes" + #define MSG_MOVE_X "Move X" + #define MSG_MOVE_Y "Move Y" + #define MSG_MOVE_Z "Move Z" + #define MSG_MOVE_E "Extruder" + #define MSG_MOVE_01MM "Move 0.1mm" + #define MSG_MOVE_1MM "Move 1mm" + #define MSG_MOVE_10MM "Move 10mm" #define MSG_SPEED "Velocidad" #define MSG_NOZZLE "Nozzle" #define MSG_NOZZLE1 "Nozzle2" @@ -821,6 +889,11 @@ #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" + #define MSG_BABYSTEP_X "Babystep X" + #define MSG_BABYSTEP_Y "Babystep Y" + #define MSG_BABYSTEP_Z "Babystep Z" + #define MSG_ENDSTOP_ABORT "Endstop abort" + #define MSG_CONTRAST "Contrast" // Serial Console Messages @@ -892,6 +965,9 @@ #define MSG_ENDSTOPS_HIT "Se ha tocado el fin de carril: " #define MSG_ERR_COLD_EXTRUDE_STOP " extrusion fria evitada" #define MSG_ERR_LONG_EXTRUDE_STOP " extrusion demasiado larga evitada" + #define MSG_BABYSTEPPING_X "Babystepping X" + #define MSG_BABYSTEPPING_Y "Babystepping Y" + #define MSG_BABYSTEPPING_Z "Babystepping Z" #endif @@ -916,6 +992,13 @@ #define MSG_EXTRUDE " Экструзия " #define MSG_RETRACT " Откат" #define MSG_MOVE_AXIS " Движение по осям \x7E" + #define MSG_MOVE_X "Move X" + #define MSG_MOVE_Y "Move Y" + #define MSG_MOVE_Z "Move Z" + #define MSG_MOVE_E "Extruder" + #define MSG_MOVE_01MM "Move 0.1mm" + #define MSG_MOVE_1MM "Move 1mm" + #define MSG_MOVE_10MM "Move 10mm" #define MSG_SPEED " Скорость:" #define MSG_NOZZLE " \002 Фильера:" #define MSG_NOZZLE1 " \002 Фильера2:" @@ -986,6 +1069,11 @@ #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" + #define MSG_BABYSTEP_X "Babystep X" + #define MSG_BABYSTEP_Y "Babystep Y" + #define MSG_BABYSTEP_Z "Babystep Z" + #define MSG_ENDSTOP_ABORT "Endstop abort" + #define MSG_CONTRAST "Contrast" // Serial Console Messages @@ -1056,6 +1144,9 @@ #define MSG_ENDSTOPS_HIT "концевик сработал: " #define MSG_ERR_COLD_EXTRUDE_STOP " защита холодной экструзии" #define MSG_ERR_LONG_EXTRUDE_STOP " защита превышения длинны экструзии" + #define MSG_BABYSTEPPING_X "Babystepping X" + #define MSG_BABYSTEPPING_Y "Babystepping Y" + #define MSG_BABYSTEPPING_Z "Babystepping Z" #endif @@ -1081,6 +1172,13 @@ #define MSG_EXTRUDE "Estrudi" #define MSG_RETRACT "Ritrai" #define MSG_MOVE_AXIS "Muovi Asse" + #define MSG_MOVE_X "Move X" + #define MSG_MOVE_Y "Move Y" + #define MSG_MOVE_Z "Move Z" + #define MSG_MOVE_E "Extruder" + #define MSG_MOVE_01MM "Move 0.1mm" + #define MSG_MOVE_1MM "Move 1mm" + #define MSG_MOVE_10MM "Move 10mm" #define MSG_SPEED "Velcità" #define MSG_NOZZLE "Ugello" #define MSG_NOZZLE1 "Ugello2" @@ -1151,6 +1249,11 @@ #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" + #define MSG_BABYSTEP_X "Babystep X" + #define MSG_BABYSTEP_Y "Babystep Y" + #define MSG_BABYSTEP_Z "Babystep Z" + #define MSG_ENDSTOP_ABORT "Endstop abort" + #define MSG_CONTRAST "Contrast" // Serial Console Messages @@ -1223,6 +1326,9 @@ #define MSG_ENDSTOPS_HIT "Raggiunto il fondo carrello: " #define MSG_ERR_COLD_EXTRUDE_STOP " prevenuta estrusione fredda" #define MSG_ERR_LONG_EXTRUDE_STOP " prevenuta estrusione troppo lunga" + #define MSG_BABYSTEPPING_X "Babystepping X" + #define MSG_BABYSTEPPING_Y "Babystepping Y" + #define MSG_BABYSTEPPING_Z "Babystepping Z" #endif @@ -1250,6 +1356,13 @@ #define MSG_PREHEAT_PLA " pre-aquecer PLA" #define MSG_PREHEAT_ABS " pre-aquecer ABS" #define MSG_MOVE_AXIS " Mover eixo \x7E" + #define MSG_MOVE_X "Move X" + #define MSG_MOVE_Y "Move Y" + #define MSG_MOVE_Z "Move Z" + #define MSG_MOVE_E "Extruder" + #define MSG_MOVE_01MM "Move 0.1mm" + #define MSG_MOVE_1MM "Move 1mm" + #define MSG_MOVE_10MM "Move 10mm" #define MSG_SPEED " Velocidade:" #define MSG_NOZZLE " \002Nozzle:" #define MSG_NOZZLE1 " \002Nozzle2:" @@ -1325,6 +1438,11 @@ #define MSG_ZPROBE_OUT "Sonda fora da mesa" #define MSG_POSITION_UNKNOWN "Home X/Y antes de Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" + #define MSG_BABYSTEP_X "Babystep X" + #define MSG_BABYSTEP_Y "Babystep Y" + #define MSG_BABYSTEP_Z "Babystep Z" + #define MSG_ENDSTOP_ABORT "Endstop abort" + #define MSG_CONTRAST "Contrast" // Serial Console Messages @@ -1397,7 +1515,9 @@ #define MSG_ENDSTOPS_HIT "O ponto final foi tocado: " #define MSG_ERR_COLD_EXTRUDE_STOP " Extrusao a frio evitada" #define MSG_ERR_LONG_EXTRUDE_STOP " Extrusao muito larga evitada" - + #define MSG_BABYSTEPPING_X "Babystepping X" + #define MSG_BABYSTEPPING_Y "Babystepping Y" + #define MSG_BABYSTEPPING_Z "Babystepping Z" #endif @@ -1426,6 +1546,13 @@ #define MSG_EXTRUDE "Pursota" #define MSG_RETRACT "Veda takaisin" #define MSG_MOVE_AXIS "Liikuta akseleita" + #define MSG_MOVE_X "Move X" + #define MSG_MOVE_Y "Move Y" + #define MSG_MOVE_Z "Move Z" + #define MSG_MOVE_E "Extruder" + #define MSG_MOVE_01MM "Move 0.1mm" + #define MSG_MOVE_1MM "Move 1mm" + #define MSG_MOVE_10MM "Move 10mm" #define MSG_SPEED "Nopeus" #define MSG_NOZZLE "Suutin" #define MSG_NOZZLE1 "Suutin2" @@ -1495,6 +1622,11 @@ #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" + #define MSG_BABYSTEP_X "Babystep X" + #define MSG_BABYSTEP_Y "Babystep Y" + #define MSG_BABYSTEP_Z "Babystep Z" + #define MSG_ENDSTOP_ABORT "Endstop abort" + #define MSG_CONTRAST "Contrast" // Serial Console Messages @@ -1567,6 +1699,12 @@ #define MSG_ENDSTOPS_HIT "paatyrajat aktivoitu: " #define MSG_ERR_COLD_EXTRUDE_STOP " kylmana pursotus estetty" #define MSG_ERR_LONG_EXTRUDE_STOP " liian pitka pursotus estetty" + #define MSG_BABYSTEPPING_X "Babystepping X" + #define MSG_BABYSTEPPING_Y "Babystepping Y" + #define MSG_BABYSTEPPING_Z "Babystepping Z" + #define MSG_ENDSTOP_ABORT "Endstop abort" + #define MSG_CONTRAST "Contrast" #endif + #endif // ifndef LANGUAGE_H diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 84a3ebf7f..269becf8e 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -344,7 +344,7 @@ static void lcd_babystep_x() } if (lcdDrawUpdate) { - lcd_implementation_drawedit(PSTR("Babystepping X"),""); + lcd_implementation_drawedit(PSTR(MSG_BABYSTEPPING_X),""); } if (LCD_CLICKED) { @@ -364,7 +364,7 @@ static void lcd_babystep_y() } if (lcdDrawUpdate) { - lcd_implementation_drawedit(PSTR("Babystepping Y"),""); + lcd_implementation_drawedit(PSTR(MSG_BABYSTEPPING_Y),""); } if (LCD_CLICKED) { @@ -384,7 +384,7 @@ static void lcd_babystep_z() } if (lcdDrawUpdate) { - lcd_implementation_drawedit(PSTR("Babystepping Z"),""); + lcd_implementation_drawedit(PSTR(MSG_BABYSTEPPING_Z),""); } if (LCD_CLICKED) { @@ -415,10 +415,10 @@ static void lcd_tune_menu() #ifdef BABYSTEPPING #ifdef BABYSTEP_XY - MENU_ITEM(submenu, "Babystep X", lcd_babystep_x); - MENU_ITEM(submenu, "Babystep Y", lcd_babystep_y); + MENU_ITEM(submenu, MSG_BABYSTEP_X, lcd_babystep_x); + MENU_ITEM(submenu, MSG_BABYSTEP_Y, lcd_babystep_y); #endif //BABYSTEP_XY - MENU_ITEM(submenu, "Babystep Z", lcd_babystep_z); + MENU_ITEM(submenu, MSG_BABYSTEP_Z, lcd_babystep_z); #endif #ifdef FILAMENTCHANGEENABLE MENU_ITEM(gcode, MSG_FILAMENTCHANGE, PSTR("M600")); @@ -573,12 +573,12 @@ static void lcd_move_menu_axis() { START_MENU(); MENU_ITEM(back, MSG_MOVE_AXIS, lcd_move_menu); - MENU_ITEM(submenu, "Move X", lcd_move_x); - MENU_ITEM(submenu, "Move Y", lcd_move_y); + MENU_ITEM(submenu, MSG_MOVE_X, lcd_move_x); + MENU_ITEM(submenu, MSG_MOVE_Y, lcd_move_y); if (move_menu_scale < 10.0) { - MENU_ITEM(submenu, "Move Z", lcd_move_z); - MENU_ITEM(submenu, "Extruder", lcd_move_e); + MENU_ITEM(submenu, MSG_MOVE_Z, lcd_move_z); + MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_e); } END_MENU(); } @@ -603,9 +603,9 @@ static void lcd_move_menu() { START_MENU(); MENU_ITEM(back, MSG_PREPARE, lcd_prepare_menu); - MENU_ITEM(submenu, "Move 10mm", lcd_move_menu_10mm); - MENU_ITEM(submenu, "Move 1mm", lcd_move_menu_1mm); - MENU_ITEM(submenu, "Move 0.1mm", lcd_move_menu_01mm); + MENU_ITEM(submenu, MSG_MOVE_10MM, lcd_move_menu_10mm); + MENU_ITEM(submenu, MSG_MOVE_1MM, lcd_move_menu_1mm); + MENU_ITEM(submenu, MSG_MOVE_01MM, lcd_move_menu_01mm); //TODO:X,Y,Z,E END_MENU(); } @@ -727,7 +727,7 @@ static void lcd_control_motion_menu() MENU_ITEM_EDIT(float51, MSG_ZSTEPS, &axis_steps_per_unit[Z_AXIS], 5, 9999); MENU_ITEM_EDIT(float51, MSG_ESTEPS, &axis_steps_per_unit[E_AXIS], 5, 9999); #ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED - MENU_ITEM_EDIT(bool, "Endstop abort", &abort_on_endstop_hit); + MENU_ITEM_EDIT(bool, MSG_ENDSTOP_ABORT, &abort_on_endstop_hit); #endif END_MENU(); } @@ -746,7 +746,7 @@ static void lcd_set_contrast() } if (lcdDrawUpdate) { - lcd_implementation_drawedit(PSTR("Contrast"), itostr2(lcd_contrast)); + lcd_implementation_drawedit(PSTR(MSG_CONTRAST), itostr2(lcd_contrast)); } if (LCD_CLICKED) { From 0778f5f028b3dc811b431702a5aba1aab11796e5 Mon Sep 17 00:00:00 2001 From: Mark Hanford Date: Tue, 11 Feb 2014 14:40:53 +0000 Subject: [PATCH 2/2] Add missing entries to the new Aragonian language. --- Marlin/language.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Marlin/language.h b/Marlin/language.h index 3136f6290..c5a3d5008 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -1729,6 +1729,13 @@ #define MSG_EXTRUDE "Extruir" #define MSG_RETRACT "Retraer" #define MSG_MOVE_AXIS "Mover Eixes" + #define MSG_MOVE_X "Move X" + #define MSG_MOVE_Y "Move Y" + #define MSG_MOVE_Z "Move Z" + #define MSG_MOVE_E "Extruder" + #define MSG_MOVE_01MM "Move 0.1mm" + #define MSG_MOVE_1MM "Move 1mm" + #define MSG_MOVE_10MM "Move 10mm" #define MSG_SPEED "Velocidat" #define MSG_NOZZLE "Nozzle" #define MSG_NOZZLE1 "Nozzle2" @@ -1807,6 +1814,11 @@ #define MSG_ZPROBE_OUT "ZProbe Outside Bed" #define MSG_POSITION_UNKNOWN "Home X/Y before Z" #define MSG_ZPROBE_ZOFFSET "Z Offset" + #define MSG_BABYSTEP_X "Babystep X" + #define MSG_BABYSTEP_Y "Babystep Y" + #define MSG_BABYSTEP_Z "Babystep Z" + #define MSG_ENDSTOP_ABORT "Endstop abort" + #define MSG_CONTRAST "Contrast" // Serial Console Messages @@ -1878,6 +1890,9 @@ #define MSG_ENDSTOPS_HIT "S'ha tocau a fin de carril: " #define MSG_ERR_COLD_EXTRUDE_STOP " extrusion fria privada" #define MSG_ERR_LONG_EXTRUDE_STOP " extrusion masiau larga privada" + #define MSG_BABYSTEPPING_X "Babystepping X" + #define MSG_BABYSTEPPING_Y "Babystepping Y" + #define MSG_BABYSTEPPING_Z "Babystepping Z" #endif