From 6d7127cf1c79c6f83618fc4b37d0d42833f1efd1 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 16 May 2017 11:11:05 +0200 Subject: [PATCH] messages translated, readded changing extruder from menu --- Firmware/language_all.cpp | 143 +++++++++++++++++++++++++------------- Firmware/language_cz.h | 3 +- Firmware/language_en.h | 16 ++--- Firmware/language_es.h | 14 ++++ Firmware/language_it.h | 14 +++- Firmware/language_pl.h | 12 ++++ Firmware/ultralcd.cpp | 8 +-- 7 files changed, 146 insertions(+), 64 deletions(-) diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp index 87b536fe1..117c81fac 100644 --- a/Firmware/language_all.cpp +++ b/Firmware/language_all.cpp @@ -1284,13 +1284,17 @@ const char * const MSG_LOADING_FILAMENT_LANG_TABLE[LANG_NUM] PROGMEM = { const char MSG_LOAD_ALL_EN[] PROGMEM = "Load all"; const char MSG_LOAD_ALL_CZ[] PROGMEM = "Zavest vse"; +const char MSG_LOAD_ALL_IT[] PROGMEM = "Caricare tutti"; +const char MSG_LOAD_ALL_ES[] PROGMEM = "Intr. todos fil."; +const char MSG_LOAD_ALL_PL[] PROGMEM = "Zalad. wszystkie"; +const char MSG_LOAD_ALL_DE[] PROGMEM = "Alle laden"; const char * const MSG_LOAD_ALL_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_LOAD_ALL_EN, MSG_LOAD_ALL_CZ, - MSG_LOAD_ALL_EN, - MSG_LOAD_ALL_EN, - MSG_LOAD_ALL_EN, - MSG_LOAD_ALL_EN + MSG_LOAD_ALL_IT, + MSG_LOAD_ALL_ES, + MSG_LOAD_ALL_PL, + MSG_LOAD_ALL_DE }; const char MSG_LOAD_EPROM_EN[] PROGMEM = "Load memory"; @@ -1315,46 +1319,62 @@ const char * const MSG_LOAD_FILAMENT_LANG_TABLE[LANG_NUM] PROGMEM = { const char MSG_LOAD_FILAMENT_1_EN[] PROGMEM = "Load filament 1"; const char MSG_LOAD_FILAMENT_1_CZ[] PROGMEM = "Zavest filament 1"; +const char MSG_LOAD_FILAMENT_1_IT[] PROGMEM = "Caricare fil. 1"; +const char MSG_LOAD_FILAMENT_1_ES[] PROGMEM = "Introducir fil. 1"; +const char MSG_LOAD_FILAMENT_1_PL[] PROGMEM = "Zaladowac fil. 1"; +const char MSG_LOAD_FILAMENT_1_DE[] PROGMEM = "Filament 1 laden"; const char * const MSG_LOAD_FILAMENT_1_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_LOAD_FILAMENT_1_EN, MSG_LOAD_FILAMENT_1_CZ, - MSG_LOAD_FILAMENT_1_EN, - MSG_LOAD_FILAMENT_1_EN, - MSG_LOAD_FILAMENT_1_EN, - MSG_LOAD_FILAMENT_1_EN + MSG_LOAD_FILAMENT_1_IT, + MSG_LOAD_FILAMENT_1_ES, + MSG_LOAD_FILAMENT_1_PL, + MSG_LOAD_FILAMENT_1_DE }; const char MSG_LOAD_FILAMENT_2_EN[] PROGMEM = "Load filament 2"; const char MSG_LOAD_FILAMENT_2_CZ[] PROGMEM = "Zavest filament 2"; +const char MSG_LOAD_FILAMENT_2_IT[] PROGMEM = "Caricare fil. 2"; +const char MSG_LOAD_FILAMENT_2_ES[] PROGMEM = "Introducir fil. 2"; +const char MSG_LOAD_FILAMENT_2_PL[] PROGMEM = "Zaladowac fil. 2"; +const char MSG_LOAD_FILAMENT_2_DE[] PROGMEM = "Filament 2 laden"; const char * const MSG_LOAD_FILAMENT_2_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_LOAD_FILAMENT_2_EN, MSG_LOAD_FILAMENT_2_CZ, - MSG_LOAD_FILAMENT_2_EN, - MSG_LOAD_FILAMENT_2_EN, - MSG_LOAD_FILAMENT_2_EN, - MSG_LOAD_FILAMENT_2_EN + MSG_LOAD_FILAMENT_2_IT, + MSG_LOAD_FILAMENT_2_ES, + MSG_LOAD_FILAMENT_2_PL, + MSG_LOAD_FILAMENT_2_DE }; const char MSG_LOAD_FILAMENT_3_EN[] PROGMEM = "Load filament 3"; const char MSG_LOAD_FILAMENT_3_CZ[] PROGMEM = "Zavest filament 3"; +const char MSG_LOAD_FILAMENT_3_IT[] PROGMEM = "Caricare fil. 3"; +const char MSG_LOAD_FILAMENT_3_ES[] PROGMEM = "Introducir fil. 3"; +const char MSG_LOAD_FILAMENT_3_PL[] PROGMEM = "Zaladowac fil. 3"; +const char MSG_LOAD_FILAMENT_3_DE[] PROGMEM = "Filament 3 laden"; const char * const MSG_LOAD_FILAMENT_3_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_LOAD_FILAMENT_3_EN, MSG_LOAD_FILAMENT_3_CZ, - MSG_LOAD_FILAMENT_3_EN, - MSG_LOAD_FILAMENT_3_EN, - MSG_LOAD_FILAMENT_3_EN, - MSG_LOAD_FILAMENT_3_EN + MSG_LOAD_FILAMENT_3_IT, + MSG_LOAD_FILAMENT_3_ES, + MSG_LOAD_FILAMENT_3_PL, + MSG_LOAD_FILAMENT_3_DE }; const char MSG_LOAD_FILAMENT_4_EN[] PROGMEM = "Load filament 4"; const char MSG_LOAD_FILAMENT_4_CZ[] PROGMEM = "Zavest filament 4"; +const char MSG_LOAD_FILAMENT_4_IT[] PROGMEM = "Caricare fil. 4"; +const char MSG_LOAD_FILAMENT_4_ES[] PROGMEM = "Introducir fil. 4"; +const char MSG_LOAD_FILAMENT_4_PL[] PROGMEM = "Zaladowac fil. 4"; +const char MSG_LOAD_FILAMENT_4_DE[] PROGMEM = "Filament 4 laden"; const char * const MSG_LOAD_FILAMENT_4_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_LOAD_FILAMENT_4_EN, MSG_LOAD_FILAMENT_4_CZ, - MSG_LOAD_FILAMENT_4_EN, - MSG_LOAD_FILAMENT_4_EN, - MSG_LOAD_FILAMENT_4_EN, - MSG_LOAD_FILAMENT_4_EN + MSG_LOAD_FILAMENT_4_IT, + MSG_LOAD_FILAMENT_4_ES, + MSG_LOAD_FILAMENT_4_PL, + MSG_LOAD_FILAMENT_4_DE }; const char MSG_LOOSE_PULLEY_EN[] PROGMEM = "Loose pulley"; @@ -1362,7 +1382,7 @@ const char MSG_LOOSE_PULLEY_CZ[] PROGMEM = "Uvolnena remenicka"; const char MSG_LOOSE_PULLEY_IT[] PROGMEM = "Puleggia lenta"; const char MSG_LOOSE_PULLEY_ES[] PROGMEM = "Polea suelta"; const char MSG_LOOSE_PULLEY_PL[] PROGMEM = "Kolo pasowe"; -const char MSG_LOOSE_PULLEY_DE[] PROGMEM = "Lose Riemenschei."; +const char MSG_LOOSE_PULLEY_DE[] PROGMEM = "Lose Riemenscheibe"; const char * const MSG_LOOSE_PULLEY_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_LOOSE_PULLEY_EN, MSG_LOOSE_PULLEY_CZ, @@ -1693,7 +1713,7 @@ const char MSG_NOT_LOADED_CZ[] PROGMEM = "Filament nezaveden"; const char MSG_NOT_LOADED_IT[] PROGMEM = "Fil. non caricato"; const char MSG_NOT_LOADED_ES[] PROGMEM = "Fil. no introducido"; const char MSG_NOT_LOADED_PL[] PROGMEM = "Brak filamentu"; -const char MSG_NOT_LOADED_DE[] PROGMEM = "Filam. nicht geladen"; +const char MSG_NOT_LOADED_DE[] PROGMEM = "Fil. nicht geladen"; const char * const MSG_NOT_LOADED_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_NOT_LOADED_EN, MSG_NOT_LOADED_CZ, @@ -1951,15 +1971,18 @@ const char * const MSG_PREHEAT_NOZZLE_LANG_TABLE[LANG_NUM] PROGMEM = { }; const char MSG_PREPARE_FILAMENT_EN[] PROGMEM = "Prepare new filament"; +const char MSG_PREPARE_FILAMENT_CZ[] PROGMEM = "Pripravte filament"; +const char MSG_PREPARE_FILAMENT_IT[] PROGMEM = "Preparare filamento"; const char MSG_PREPARE_FILAMENT_ES[] PROGMEM = "Preparar filamento"; const char MSG_PREPARE_FILAMENT_PL[] PROGMEM = "Przygotuj filament"; +const char MSG_PREPARE_FILAMENT_DE[] PROGMEM = "Filam. bereithalten"; const char * const MSG_PREPARE_FILAMENT_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_PREPARE_FILAMENT_EN, - MSG_PREPARE_FILAMENT_EN, - MSG_PREPARE_FILAMENT_EN, + MSG_PREPARE_FILAMENT_CZ, + MSG_PREPARE_FILAMENT_IT, MSG_PREPARE_FILAMENT_ES, MSG_PREPARE_FILAMENT_PL, - MSG_PREPARE_FILAMENT_EN + MSG_PREPARE_FILAMENT_DE }; const char MSG_PRESS_EN[] PROGMEM = "and press the knob"; @@ -2123,7 +2146,7 @@ const char MSG_RESUMING_PRINT_CZ[] PROGMEM = "Obnovovani tisku"; const char MSG_RESUMING_PRINT_IT[] PROGMEM = "Stampa in ripresa"; const char MSG_RESUMING_PRINT_ES[] PROGMEM = "Reanudar impresion"; const char MSG_RESUMING_PRINT_PL[] PROGMEM = "Wznawianie druku"; -const char MSG_RESUMING_PRINT_DE[] PROGMEM = "Druck weitergehen"; +const char MSG_RESUMING_PRINT_DE[] PROGMEM = "Druck fortsetzen"; const char * const MSG_RESUMING_PRINT_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_RESUMING_PRINT_EN, MSG_RESUMING_PRINT_CZ, @@ -2637,7 +2660,7 @@ const char MSG_SET_TEMPERATURE_CZ[] PROGMEM = "Nastavte teplotu:"; const char MSG_SET_TEMPERATURE_IT[] PROGMEM = "Imposta temperatura"; const char MSG_SET_TEMPERATURE_ES[] PROGMEM = "Establecer temp.:"; const char MSG_SET_TEMPERATURE_PL[] PROGMEM = "Ustawic temperature"; -const char MSG_SET_TEMPERATURE_DE[] PROGMEM = "Temp. einsetzen"; +const char MSG_SET_TEMPERATURE_DE[] PROGMEM = "Temp. einstellen:"; const char * const MSG_SET_TEMPERATURE_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_SET_TEMPERATURE_EN, MSG_SET_TEMPERATURE_CZ, @@ -2919,7 +2942,7 @@ const char MSG_TEMP_CALIBRATION_DONE_CZ[] PROGMEM = "Teplotni kalibrace dokoncen const char MSG_TEMP_CALIBRATION_DONE_IT[] PROGMEM = "Taratura temperatura terminata. Fare click per continuare."; const char MSG_TEMP_CALIBRATION_DONE_ES[] PROGMEM = "Calibracon temperatura terminada. Presionar para continuar."; const char MSG_TEMP_CALIBRATION_DONE_PL[] PROGMEM = "Cieplna kalibracja zakonczona. Kontynuuj przyciskiem"; -const char MSG_TEMP_CALIBRATION_DONE_DE[] PROGMEM = "Temp. Kalibrierung fertig. Klicken um weiter zu gehen."; +const char MSG_TEMP_CALIBRATION_DONE_DE[] PROGMEM = "Temp.Kalibrierung fertig. Klicken um fortzusetzen."; const char * const MSG_TEMP_CALIBRATION_DONE_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_TEMP_CALIBRATION_DONE_EN, MSG_TEMP_CALIBRATION_DONE_CZ, @@ -2934,7 +2957,7 @@ const char MSG_TEMP_CALIBRATION_OFF_CZ[] PROGMEM = "Tepl. kal. [OFF]"; const char MSG_TEMP_CALIBRATION_OFF_IT[] PROGMEM = "Cal. temp. [OFF]"; const char MSG_TEMP_CALIBRATION_OFF_ES[] PROGMEM = "Cal. temp. [OFF]"; const char MSG_TEMP_CALIBRATION_OFF_PL[] PROGMEM = "Ciepl. kal. [OFF]"; -const char MSG_TEMP_CALIBRATION_OFF_DE[] PROGMEM = "Temp. Kal. [OFF]"; +const char MSG_TEMP_CALIBRATION_OFF_DE[] PROGMEM = "Temp. Kal. [AUS]"; const char * const MSG_TEMP_CALIBRATION_OFF_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_TEMP_CALIBRATION_OFF_EN, MSG_TEMP_CALIBRATION_OFF_CZ, @@ -2949,7 +2972,7 @@ const char MSG_TEMP_CALIBRATION_ON_CZ[] PROGMEM = "Tepl. kal. [ON]"; const char MSG_TEMP_CALIBRATION_ON_IT[] PROGMEM = "Cal. temp. [ON]"; const char MSG_TEMP_CALIBRATION_ON_ES[] PROGMEM = "Cal. temp. [ON]"; const char MSG_TEMP_CALIBRATION_ON_PL[] PROGMEM = "Ciepl. kal. [ON]"; -const char MSG_TEMP_CALIBRATION_ON_DE[] PROGMEM = "Temp. Kal. [ON]"; +const char MSG_TEMP_CALIBRATION_ON_DE[] PROGMEM = "Temp. Kal. [EIN]"; const char * const MSG_TEMP_CALIBRATION_ON_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_TEMP_CALIBRATION_ON_EN, MSG_TEMP_CALIBRATION_ON_CZ, @@ -3018,13 +3041,17 @@ const char * const MSG_UNLOADING_FILAMENT_LANG_TABLE[LANG_NUM] PROGMEM = { const char MSG_UNLOAD_ALL_EN[] PROGMEM = "Unload all"; const char MSG_UNLOAD_ALL_CZ[] PROGMEM = "Vyjmout vse"; +const char MSG_UNLOAD_ALL_IT[] PROGMEM = "Rilasciare tutti"; +const char MSG_UNLOAD_ALL_ES[] PROGMEM = "Soltar todos fil."; +const char MSG_UNLOAD_ALL_PL[] PROGMEM = "Wyjac wszystkie"; +const char MSG_UNLOAD_ALL_DE[] PROGMEM = "Alles entladen"; const char * const MSG_UNLOAD_ALL_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_UNLOAD_ALL_EN, MSG_UNLOAD_ALL_CZ, - MSG_UNLOAD_ALL_EN, - MSG_UNLOAD_ALL_EN, - MSG_UNLOAD_ALL_EN, - MSG_UNLOAD_ALL_EN + MSG_UNLOAD_ALL_IT, + MSG_UNLOAD_ALL_ES, + MSG_UNLOAD_ALL_PL, + MSG_UNLOAD_ALL_DE }; const char MSG_UNLOAD_FILAMENT_EN[] PROGMEM = "Unload filament"; @@ -3044,46 +3071,62 @@ const char * const MSG_UNLOAD_FILAMENT_LANG_TABLE[LANG_NUM] PROGMEM = { const char MSG_UNLOAD_FILAMENT_1_EN[] PROGMEM = "Unload filament 1"; const char MSG_UNLOAD_FILAMENT_1_CZ[] PROGMEM = "Vyjmout filam. 1"; +const char MSG_UNLOAD_FILAMENT_1_IT[] PROGMEM = "Rilasciare fil. 1"; +const char MSG_UNLOAD_FILAMENT_1_ES[] PROGMEM = "Soltar fil. 1"; +const char MSG_UNLOAD_FILAMENT_1_PL[] PROGMEM = "Wyjac filament 1"; +const char MSG_UNLOAD_FILAMENT_1_DE[] PROGMEM = "Filam. 1 entladen"; const char * const MSG_UNLOAD_FILAMENT_1_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_UNLOAD_FILAMENT_1_EN, MSG_UNLOAD_FILAMENT_1_CZ, - MSG_UNLOAD_FILAMENT_1_EN, - MSG_UNLOAD_FILAMENT_1_EN, - MSG_UNLOAD_FILAMENT_1_EN, - MSG_UNLOAD_FILAMENT_1_EN + MSG_UNLOAD_FILAMENT_1_IT, + MSG_UNLOAD_FILAMENT_1_ES, + MSG_UNLOAD_FILAMENT_1_PL, + MSG_UNLOAD_FILAMENT_1_DE }; const char MSG_UNLOAD_FILAMENT_2_EN[] PROGMEM = "Unload filament 2"; const char MSG_UNLOAD_FILAMENT_2_CZ[] PROGMEM = "Vyjmout filam. 2"; +const char MSG_UNLOAD_FILAMENT_2_IT[] PROGMEM = "Rilasciare fil. 1"; +const char MSG_UNLOAD_FILAMENT_2_ES[] PROGMEM = "Soltar fil. 2"; +const char MSG_UNLOAD_FILAMENT_2_PL[] PROGMEM = "Wyjac filament 2"; +const char MSG_UNLOAD_FILAMENT_2_DE[] PROGMEM = "Filam. 2 entladen"; const char * const MSG_UNLOAD_FILAMENT_2_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_UNLOAD_FILAMENT_2_EN, MSG_UNLOAD_FILAMENT_2_CZ, - MSG_UNLOAD_FILAMENT_2_EN, - MSG_UNLOAD_FILAMENT_2_EN, - MSG_UNLOAD_FILAMENT_2_EN, - MSG_UNLOAD_FILAMENT_2_EN + MSG_UNLOAD_FILAMENT_2_IT, + MSG_UNLOAD_FILAMENT_2_ES, + MSG_UNLOAD_FILAMENT_2_PL, + MSG_UNLOAD_FILAMENT_2_DE }; const char MSG_UNLOAD_FILAMENT_3_EN[] PROGMEM = "Unload filament 3"; const char MSG_UNLOAD_FILAMENT_3_CZ[] PROGMEM = "Vyjmout filam. 3"; +const char MSG_UNLOAD_FILAMENT_3_IT[] PROGMEM = "Rilasciare fil. 1"; +const char MSG_UNLOAD_FILAMENT_3_ES[] PROGMEM = "Soltar fil. 3"; +const char MSG_UNLOAD_FILAMENT_3_PL[] PROGMEM = "Wyjac filament 3"; +const char MSG_UNLOAD_FILAMENT_3_DE[] PROGMEM = "Filam. 3 entladen"; const char * const MSG_UNLOAD_FILAMENT_3_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_UNLOAD_FILAMENT_3_EN, MSG_UNLOAD_FILAMENT_3_CZ, - MSG_UNLOAD_FILAMENT_3_EN, - MSG_UNLOAD_FILAMENT_3_EN, - MSG_UNLOAD_FILAMENT_3_EN, - MSG_UNLOAD_FILAMENT_3_EN + MSG_UNLOAD_FILAMENT_3_IT, + MSG_UNLOAD_FILAMENT_3_ES, + MSG_UNLOAD_FILAMENT_3_PL, + MSG_UNLOAD_FILAMENT_3_DE }; const char MSG_UNLOAD_FILAMENT_4_EN[] PROGMEM = "Unload filament 4"; const char MSG_UNLOAD_FILAMENT_4_CZ[] PROGMEM = "Vyjmout filam. 4"; +const char MSG_UNLOAD_FILAMENT_4_IT[] PROGMEM = "Rilasciare fil. 1"; +const char MSG_UNLOAD_FILAMENT_4_ES[] PROGMEM = "Soltar fil. 4"; +const char MSG_UNLOAD_FILAMENT_4_PL[] PROGMEM = "Wyjac filament 4"; +const char MSG_UNLOAD_FILAMENT_4_DE[] PROGMEM = "Filam. 4 entladen"; const char * const MSG_UNLOAD_FILAMENT_4_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_UNLOAD_FILAMENT_4_EN, MSG_UNLOAD_FILAMENT_4_CZ, - MSG_UNLOAD_FILAMENT_4_EN, - MSG_UNLOAD_FILAMENT_4_EN, - MSG_UNLOAD_FILAMENT_4_EN, - MSG_UNLOAD_FILAMENT_4_EN + MSG_UNLOAD_FILAMENT_4_IT, + MSG_UNLOAD_FILAMENT_4_ES, + MSG_UNLOAD_FILAMENT_4_PL, + MSG_UNLOAD_FILAMENT_4_DE }; const char MSG_USB_PRINTING_EN[] PROGMEM = "USB printing "; diff --git a/Firmware/language_cz.h b/Firmware/language_cz.h index db694a14f..896d3f1bb 100644 --- a/Firmware/language_cz.h +++ b/Firmware/language_cz.h @@ -291,4 +291,5 @@ #define MSG_TEMP_CALIBRATION "Tepl. kal. " #define MSG_TEMP_CALIBRATION_DONE "Teplotni kalibrace dokoncena. Pokracujte stiskem tlacitka." #define MSG_TEMP_CALIBRATION_ON "Tepl. kal. [ON]" -#define MSG_TEMP_CALIBRATION_OFF "Tepl. kal. [OFF]" \ No newline at end of file +#define MSG_TEMP_CALIBRATION_OFF "Tepl. kal. [OFF]" +#define MSG_PREPARE_FILAMENT "Pripravte filament" \ No newline at end of file diff --git a/Firmware/language_en.h b/Firmware/language_en.h index ea8940d58..a41a8698f 100644 --- a/Firmware/language_en.h +++ b/Firmware/language_en.h @@ -173,9 +173,9 @@ #define MSG_SELFTEST_ENDSTOPS "Endstops" #define MSG_SELFTEST_MOTOR "Motor" #define MSG_SELFTEST_ENDSTOP "Endstop" -#define MSG_SELFTEST_ENDSTOP_NOTHIT "Endstop not hit" +#define(length=20,lines=1) MSG_SELFTEST_ENDSTOP_NOTHIT "Endstop not hit" #define MSG_SELFTEST_OK "Self test OK" -#define MSG_LOOSE_PULLEY "Loose pulley" +#define(length=20,lines=1) MSG_LOOSE_PULLEY "Loose pulley" #define(length=20) MSG_SELFTEST_FAN "Fan test"; #define(length=20) MSG_SELFTEST_COOLING_FAN "Front print fan?"; @@ -203,7 +203,7 @@ #define MSG_HOMEYZ_PROGRESS "Calibrating Z" #define MSG_HOMEYZ_DONE "Calibration done" -#define MSG_SHOW_END_STOPS "Show end stops" +#define(length=17,lines=1) MSG_SHOW_END_STOPS "Show end stops" #define MSG_CALIBRATE_BED "Calibrate XYZ" #define MSG_CALIBRATE_BED_RESET "Reset XYZ calibr." @@ -261,14 +261,14 @@ #define(length=20, lines=8) MSG_CLEAN_NOZZLE_E "E calibration finished. Please clean the nozzle. Click when done." #define(length=20, lines=3) MSG_WAITING_TEMP "Waiting for nozzle and bed cooling" #define(length=20, lines=2) MSG_FILAMENT_CLEAN "Is color clear?" -#define(lenght=20) MSG_UNLOADING_FILAMENT "Unloading filament" +#define(lenght=18, lines=1) MSG_UNLOADING_FILAMENT "Unloading filament" #define(length=20, lines=8) MSG_PAPER "Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately." #define MSG_BED_CORRECTION_MENU "Bed level correct" -#define MSG_BED_CORRECTION_LEFT "Left side um" -#define MSG_BED_CORRECTION_RIGHT "Right side um" -#define MSG_BED_CORRECTION_FRONT "Front side um" -#define MSG_BED_CORRECTION_REAR "Rear side um" +#define(length=14,lines=1) MSG_BED_CORRECTION_LEFT "Left side [um]" +#define(length=14,lines=1) MSG_BED_CORRECTION_RIGHT "Right side[um]" +#define(length=14,lines=1) MSG_BED_CORRECTION_FRONT "Front side[um]" +#define(length=14,lines=1) MSG_BED_CORRECTION_REAR "Rear side [um]" #define MSG_BED_CORRECTION_RESET "Reset" #define MSG_MESH_BED_LEVELING "Mesh Bed Leveling" diff --git a/Firmware/language_es.h b/Firmware/language_es.h index 6601b240e..b3e929e4a 100644 --- a/Firmware/language_es.h +++ b/Firmware/language_es.h @@ -272,4 +272,18 @@ #define MSG_TEMP_CALIBRATION_ON "Cal. temp. [ON]" #define MSG_TEMP_CALIBRATION_OFF "Cal. temp. [OFF]" +#define MSG_PREPARE_FILAMENT "Preparar filamento" + + + +#define MSG_LOAD_ALL "Intr. todos fil." +#define MSG_LOAD_FILAMENT_1 "Introducir fil. 1" +#define MSG_LOAD_FILAMENT_2 "Introducir fil. 2" +#define MSG_LOAD_FILAMENT_3 "Introducir fil. 3" +#define MSG_LOAD_FILAMENT_4 "Introducir fil. 4" +#define MSG_UNLOAD_FILAMENT_1 "Soltar fil. 1" +#define MSG_UNLOAD_FILAMENT_2 "Soltar fil. 2" +#define MSG_UNLOAD_FILAMENT_3 "Soltar fil. 3" +#define MSG_UNLOAD_FILAMENT_4 "Soltar fil. 4" +#define MSG_UNLOAD_ALL "Soltar todos fil." #define MSG_PREPARE_FILAMENT "Preparar filamento" \ No newline at end of file diff --git a/Firmware/language_it.h b/Firmware/language_it.h index 1075d9a7d..25e72a149 100644 --- a/Firmware/language_it.h +++ b/Firmware/language_it.h @@ -265,4 +265,16 @@ #define MSG_TEMP_CALIBRATION "Cal. temp. " #define MSG_TEMP_CALIBRATION_DONE "Taratura temperatura terminata. Fare click per continuare." #define MSG_TEMP_CALIBRATION_ON "Cal. temp. [ON]" -#define MSG_TEMP_CALIBRATION_OFF "Cal. temp. [OFF]" \ No newline at end of file +#define MSG_TEMP_CALIBRATION_OFF "Cal. temp. [OFF]" + +#define MSG_LOAD_ALL "Caricare tutti" +#define MSG_LOAD_FILAMENT_1 "Caricare fil. 1" +#define MSG_LOAD_FILAMENT_2 "Caricare fil. 2" +#define MSG_LOAD_FILAMENT_3 "Caricare fil. 3" +#define MSG_LOAD_FILAMENT_4 "Caricare fil. 4" +#define MSG_UNLOAD_FILAMENT_1 "Rilasciare fil. 1" +#define MSG_UNLOAD_FILAMENT_2 "Rilasciare fil. 1" +#define MSG_UNLOAD_FILAMENT_3 "Rilasciare fil. 1" +#define MSG_UNLOAD_FILAMENT_4 "Rilasciare fil. 1" +#define MSG_UNLOAD_ALL "Rilasciare tutti" +#define MSG_PREPARE_FILAMENT "Preparare filamento" diff --git a/Firmware/language_pl.h b/Firmware/language_pl.h index 0a51b571e..3207ce0c9 100644 --- a/Firmware/language_pl.h +++ b/Firmware/language_pl.h @@ -277,4 +277,16 @@ #define MSG_TEMP_CALIBRATION_DONE "Cieplna kalibracja zakonczona. Kontynuuj przyciskiem" #define MSG_TEMP_CALIBRATION_ON "Ciepl. kal. [ON]" #define MSG_TEMP_CALIBRATION_OFF "Ciepl. kal. [OFF]" +#define MSG_PREPARE_FILAMENT "Przygotuj filament" + +#define MSG_LOAD_ALL "Zalad. wszystkie" +#define MSG_LOAD_FILAMENT_1 "Zaladowac fil. 1" +#define MSG_LOAD_FILAMENT_2 "Zaladowac fil. 2" +#define MSG_LOAD_FILAMENT_3 "Zaladowac fil. 3" +#define MSG_LOAD_FILAMENT_4 "Zaladowac fil. 4" +#define MSG_UNLOAD_FILAMENT_1 "Wyjac filament 1" +#define MSG_UNLOAD_FILAMENT_2 "Wyjac filament 2" +#define MSG_UNLOAD_FILAMENT_3 "Wyjac filament 3" +#define MSG_UNLOAD_FILAMENT_4 "Wyjac filament 4" +#define MSG_UNLOAD_ALL "Wyjac wszystkie" #define MSG_PREPARE_FILAMENT "Przygotuj filament" \ No newline at end of file diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 20f19ce9f..b28ef83b1 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -520,7 +520,7 @@ void lcd_commands() char cmd1[25]; if (lcd_commands_type == LCD_COMMAND_LONG_PAUSE) { - if(lcd_commands_step == 0) { + if(lcd_commands_step == 0) { card.pauseSDPrint(); lcd_setstatuspgm(MSG_FINISHING_MOVEMENTS); lcdDrawUpdate = 3; @@ -3301,7 +3301,7 @@ static void fil_unload_menu() END_MENU(); } -/*static void change_extr_menu(){ +static void change_extr_menu(){ START_MENU(); MENU_ITEM(back, MSG_MAIN, lcd_main_menu); MENU_ITEM(function, PSTR("Extruder 1"), extr_change_0); @@ -3310,7 +3310,7 @@ static void fil_unload_menu() MENU_ITEM(function, PSTR("Extruder 4"), extr_change_3); END_MENU(); -}*/ +} #endif @@ -3578,7 +3578,7 @@ static void lcd_main_menu() #ifdef SNMM MENU_ITEM(submenu, MSG_LOAD_FILAMENT, fil_load_menu); MENU_ITEM(submenu, MSG_UNLOAD_FILAMENT, fil_unload_menu); - //MENU_ITEM(submenu, MSG_CHANGE_EXTR, change_extr_menu); + MENU_ITEM(submenu, MSG_CHANGE_EXTR, change_extr_menu); #endif MENU_ITEM(submenu, MSG_SETTINGS, lcd_settings_menu); if(!isPrintPaused) MENU_ITEM(submenu, MSG_MENU_CALIBRATION, lcd_calibration_menu);