From 37273d9fca5661fcef28c94482ee182726cac7a0 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 17:19:38 +0100 Subject: [PATCH 01/29] Lang - 'Auto Deplete' changed to 'SpoolJoin' --- Firmware/ultralcd.cpp | 6 +++--- lang/lang_en.txt | 6 +++--- lang/lang_en_cz.txt | 12 ++++++------ lang/lang_en_de.txt | 12 ++++++------ lang/lang_en_es.txt | 12 ++++++------ lang/lang_en_fr.txt | 12 ++++++------ lang/lang_en_it.txt | 12 ++++++------ lang/lang_en_pl.txt | 12 ++++++------ 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 90ab90b8..a64f572a 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4700,15 +4700,15 @@ static bool settingsAutoDeplete() { if (!fsensor_enabled) { - if (menu_item_text_P(_i("Auto deplete[N/A]"))) return true; + if (menu_item_text_P(_i("SpoolJoin [N/A]"))) return true; } else if (lcd_autoDeplete) { - if (menu_item_function_P(_i("Auto deplete [on]"), auto_deplete_switch)) return true; + if (menu_item_function_P(_i("SpoolJoin [on]"), auto_deplete_switch)) return true; } else { - if (menu_item_function_P(_i("Auto deplete[off]"), auto_deplete_switch)) return true; + if (menu_item_function_P(_i("SpoolJoin [off]"), auto_deplete_switch)) return true; } } return false; diff --git a/lang/lang_en.txt b/lang/lang_en.txt index f2abe378..3ce6eecf 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -44,13 +44,13 @@ "Are left and right Z~carriages all up?" #MSG_AUTO_DEPLETE_ON c=17 r=1 -"Auto deplete [on]" +"SpoolJoin [on]" # -"Auto deplete[N/A]" +"SpoolJoin [N/A]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -"Auto deplete[off]" +"SpoolJoin [off]" #MSG_AUTO_HOME c=0 r=0 "Auto home" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 43b95bfc..0a32f35f 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -59,16 +59,16 @@ "Dojely oba Z voziky k~hornimu dorazu?" #MSG_AUTO_DEPLETE_ON c=17 r=1 -"Auto deplete [on]" -"Spoj Civky [zap]" +"SpoolJoin [on]" +"SpoolJoin [zap]" # -"Auto deplete[N/A]" -"Spoj Civky [N/A]" +"SpoolJoin [N/A]" +"SpoolJoin [N/A]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -"Auto deplete[off]" -"Spoj Civky [vyp]" +"SpoolJoin [off]" +"SpoolJoin [vyp]" #MSG_AUTO_HOME c=0 r=0 "Auto home" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 5c5de386..abffd0be 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -59,16 +59,16 @@ "Sind linke+rechte Z- Schlitten ganz oben?" #MSG_AUTO_DEPLETE_ON c=17 r=1 -"Auto deplete [on]" -"Restemodus [an]" +"SpoolJoin [on]" +"SpoolJoin [an]" # -"Auto deplete[N/A]" -"Restemodus [N/V]" +"SpoolJoin [N/A]" +"SpoolJoin [N/V]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -"Auto deplete[off]" -"Restemodus [aus]" +"SpoolJoin [off]" +"SpoolJoin [aus]" #MSG_AUTO_HOME c=0 r=0 "Auto home" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 26e7a388..342f449d 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -59,16 +59,16 @@ "Carros Z izq./der. estan arriba maximo?" #MSG_AUTO_DEPLETE_ON c=17 r=1 -"Auto deplete [on]" -"Auto despleg.[on]" +"SpoolJoin [on]" +"SpoolJoin [on]" # -"Auto deplete[N/A]" -"Auto despleg[N/A]" +"SpoolJoin [N/A]" +"SpoolJoin [N/A]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -"Auto deplete[off]" -"Auto despleg[off]" +"SpoolJoin [off]" +"SpoolJoin [off]" #MSG_AUTO_HOME c=0 r=0 "Auto home" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index bc58ea2a..33d6f16f 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -59,16 +59,16 @@ "Chariots Z gauche et droite tout en haut?" #MSG_AUTO_DEPLETE_ON c=17 r=1 -"Auto deplete [on]" -"Purge auto [on]" +"SpoolJoin [on]" +"SpoolJoin [on]" # -"Auto deplete[N/A]" -"Vidage auto [N/A]" +"SpoolJoin [N/A]" +"SpoolJoin [N/A]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -"Auto deplete[off]" -"Purge auto [off]" +"SpoolJoin [off]" +"SpoolJoin [off]" #MSG_AUTO_HOME c=0 r=0 "Auto home" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index a2b9e7a2..6de5f4a7 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -59,16 +59,16 @@ "I carrelli Z sin/des sono altezza max?" #MSG_AUTO_DEPLETE_ON c=17 r=1 -"Auto deplete [on]" -"Auto svuotam [on]" +"SpoolJoin [on]" +"SpoolJoin [on]" # -"Auto deplete[N/A]" -"Auto svuotam[N/A]" +"SpoolJoin [N/A]" +"SpoolJoin [N/A]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -"Auto deplete[off]" -"Auto svuotam[off]" +"SpoolJoin [off]" +"SpoolJoin [off]" #MSG_AUTO_HOME c=0 r=0 "Auto home" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 1bf24141..90bf6e7a 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -59,16 +59,16 @@ "Obydwa konce osi dojechaly do gornych ogranicznikow?" #MSG_AUTO_DEPLETE_ON c=17 r=1 -"Auto deplete [on]" -"Dok. resztek [wl]" +"SpoolJoin [on]" +"SpoolJoin [wl]" # -"Auto deplete[N/A]" -"Dok. resztek [nd]" +"SpoolJoin [N/A]" +"SpoolJoin [nd]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -"Auto deplete[off]" -"Dok. resztek[wyl]" +"SpoolJoin [off]" +"SpoolJoin [wyl]" #MSG_AUTO_HOME c=0 r=0 "Auto home" From 46499bd3164340def45092bd2eadfb41f49726bd Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 17:23:35 +0100 Subject: [PATCH 02/29] Lang - fr - changed translation for "Load to nozzle" and "Eject filament" --- lang/lang_en_fr.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 33d6f16f..043d7ad6 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -244,7 +244,7 @@ #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" -"Ejecter filament" +"Ejecter le fil" #MSG_EJECT_FILAMENT1 c=17 r=1 "Eject filament 1" @@ -664,7 +664,7 @@ # "Load to nozzle" -"Charger dans buse" +"Charger le fil" #MSG_M109_INVALID_EXTRUDER c=0 r=0 "M109 Invalid extruder " From 099fe216b6e18cac04dc3b13b9b811731584cafb Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 17:26:01 +0100 Subject: [PATCH 03/29] Lang - text "KILLED. " removed from dictionaries --- Firmware/Marlin_main.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 502e72bd..676c36d5 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7554,7 +7554,7 @@ void kill(const char *full_screen_message, unsigned char id) SERIAL_ERRORLNRPGM(full_screen_message); lcd_display_message_fullscreen_P(full_screen_message); } else { - LCD_ALERTMESSAGERPGM(_i("KILLED. "));////MSG_KILLED c=0 r=0 + LCD_ALERTMESSAGERPGM(_n("KILLED. "));////MSG_KILLED c=0 r=0 } // FMC small patch to update the LCD before ending diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 3ce6eecf..f040ff3f 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -460,9 +460,6 @@ # "Last print" -#MSG_KILLED c=0 r=0 -"KILLED. " - #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 "Left hotend fan?" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 0a32f35f..8f335f15 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -614,10 +614,6 @@ "Last print" "\x00" -#MSG_KILLED c=0 r=0 -"KILLED. " -"ZRUSENO." - #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 "Left hotend fan?" "Levy vent na trysce?" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index abffd0be..3639702d 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -614,10 +614,6 @@ "Last print" "\x00" -#MSG_KILLED c=0 r=0 -"KILLED. " -"ABGEBROCHEN. " - #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 "Left hotend fan?" "Linker Luefter?" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 342f449d..11e8c36b 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -614,10 +614,6 @@ "Last print" "\x00" -#MSG_KILLED c=0 r=0 -"KILLED. " -"PARADA DE EMERGENCIA" - #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 "Left hotend fan?" "Vent. izquierdo?" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 043d7ad6..4af3d573 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -614,10 +614,6 @@ "Last print" "Derniere impress." -#MSG_KILLED c=0 r=0 -"KILLED. " -"TUE." - #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 "Left hotend fan?" "Ventilo tete gauche?" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 6de5f4a7..a1773c0f 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -614,10 +614,6 @@ "Last print" "\x00" -#MSG_KILLED c=0 r=0 -"KILLED. " -"IN TILT." - #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 "Left hotend fan?" "Vent SX hotend?" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 90bf6e7a..6b369b9f 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -614,10 +614,6 @@ "Last print" "\x00" -#MSG_KILLED c=0 r=0 -"KILLED. " -"PRZERWANE." - #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 "Left hotend fan?" "Lewy went hotendu?" From 0ceeba38cbc9f5677ee193d222171aea48467694 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 17:32:53 +0100 Subject: [PATCH 04/29] Lang - text "Copy selected language from XFLASH?" shorted to "Copy selected language?" --- Firmware/ultralcd.cpp | 2 +- lang/lang_en.txt | 2 +- lang/lang_en_cz.txt | 4 ++-- lang/lang_en_de.txt | 4 ++-- lang/lang_en_es.txt | 4 ++-- lang/lang_en_fr.txt | 4 ++-- lang/lang_en_it.txt | 4 ++-- lang/lang_en_pl.txt | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a64f572a..8e50ead5 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4106,7 +4106,7 @@ void menu_setlang(unsigned char lang) { if (!lang_select(lang)) { - if (lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Copy selected language from XFLASH?"), false, true)) + if (lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Copy selected language?"), false, true)) lang_boot_update_start(lang); lcd_update_enable(true); lcd_clear(); diff --git a/lang/lang_en.txt b/lang/lang_en.txt index f040ff3f..76f9beed 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -143,7 +143,7 @@ "Cooldown" # -"Copy selected language from XFLASH?" +"Copy selected language?" #MSG_CRASHDETECT_ON c=0 r=0 "Crash det. [on]" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 8f335f15..4109675e 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -191,8 +191,8 @@ "Zchladit" # -"Copy selected language from XFLASH?" -"Kopirovat vybrany jazyk do XFLASH?" +"Copy selected language?" +"Kopirovat vybrany jazyk?" #MSG_CRASHDETECT_ON c=0 r=0 "Crash det. [on]" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 3639702d..8ef8326a 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -191,8 +191,8 @@ "Abkuehlen" # -"Copy selected language from XFLASH?" -"Gewaehlte Sprache vom Xflash kopieren?" +"Copy selected language?" +"Gewaehlte Sprache kopieren?" #MSG_CRASHDETECT_ON c=0 r=0 "Crash det. [on]" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 11e8c36b..e892e372 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -191,8 +191,8 @@ "Enfriar" # -"Copy selected language from XFLASH?" -"Copiar idioma seleccionado desde XFLASH?" +"Copy selected language?" +"Copiar idioma seleccionado?" #MSG_CRASHDETECT_ON c=0 r=0 "Crash det. [on]" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 4af3d573..aabad467 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -191,8 +191,8 @@ "Refroidissement" # -"Copy selected language from XFLASH?" -"Copier la langue selectionne depuis la XFLASH ?" +"Copy selected language?" +"Copier la langue selectionne?" #MSG_CRASHDETECT_ON c=0 r=0 "Crash det. [on]" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index a1773c0f..273a5f45 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -191,8 +191,8 @@ "Raffredda" # -"Copy selected language from XFLASH?" -"Copiare la lingua selezionata da XFLASH?" +"Copy selected language?" +"Copiare la lingua selezionata?" #MSG_CRASHDETECT_ON c=0 r=0 "Crash det. [on]" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 6b369b9f..1cdd390f 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -191,8 +191,8 @@ "Chlodzenie" # -"Copy selected language from XFLASH?" -"Skopiowac wybrany jezyk z XFLASH?" +"Copy selected language?" +"Skopiowac wybrany jezyk?" #MSG_CRASHDETECT_ON c=0 r=0 "Crash det. [on]" From 46fba4817301b06a03d1a5a1862a733878486235 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 17:38:52 +0100 Subject: [PATCH 05/29] Lang - text "enqueing \"" removed from dictionary --- Firmware/cmdqueue.cpp | 4 ++-- Firmware/messages.c | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 9 files changed, 3 insertions(+), 30 deletions(-) diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 6bb7e42f..72472d91 100644 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -286,7 +286,7 @@ void enquecommand(const char *cmd, bool from_progmem) else strcpy(cmdbuffer + bufindw + CMDHDRSIZE, cmd); SERIAL_ECHO_START; - SERIAL_ECHORPGM(_T(MSG_Enqueing)); + SERIAL_ECHORPGM(MSG_Enqueing); SERIAL_ECHO(cmdbuffer + bufindw + CMDHDRSIZE); SERIAL_ECHOLNPGM("\""); bufindw += len + (CMDHDRSIZE + 1); @@ -298,7 +298,7 @@ void enquecommand(const char *cmd, bool from_progmem) #endif /* CMDBUFFER_DEBUG */ } else { SERIAL_ERROR_START; - SERIAL_ECHORPGM(_T(MSG_Enqueing)); + SERIAL_ECHORPGM(MSG_Enqueing); if (from_progmem) SERIAL_PROTOCOLRPGM(cmd); else diff --git a/Firmware/messages.c b/Firmware/messages.c index 1be1dc49..66b90f1f 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -28,7 +28,6 @@ const char MSG_CRASHDETECT_ON[] PROGMEM_I1 = ISTR("Crash det. [on]"); ////c=0 const char MSG_ENDSTOP_HIT[] PROGMEM_I1 = ISTR("TRIGGERED"); ////c=0 r=0 const char MSG_ENDSTOP_OPEN[] PROGMEM_I1 = ISTR("open"); ////c=0 r=0 const char MSG_ENDSTOPS_HIT[] PROGMEM_I1 = ISTR("endstops hit: "); ////c=0 r=0 -const char MSG_Enqueing[] PROGMEM_I1 = ISTR("enqueing \""); ////c=0 r=0 const char MSG_ERR_STOPPED[] PROGMEM_I1 = ISTR("Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"); ////c=0 r=0 const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////c=0 r=0 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 @@ -122,3 +121,4 @@ const char MSG_Z_MIN[] PROGMEM_N1 = "z_min: "; ////c=0 r=0 const char MSG_ZPROBE_OUT[] PROGMEM_N1 = "Z probe out. bed"; ////c=0 r=0 const char MSG_ZPROBE_ZOFFSET[] PROGMEM_N1 = "Z Offset"; ////c=0 r=0 const char MSG_TMC_OVERTEMP[] PROGMEM_N1 = "TMC DRIVER OVERTEMP"; ////c=0 r=0 +const char MSG_Enqueing[] PROGMEM_N1 = "enqueing \""; ////c=0 r=0 diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 76f9beed..4859e1cb 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -217,9 +217,6 @@ #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" -#MSG_Enqueing c=0 r=0 -"enqueing \x22" - #MSG_STACK_ERROR c=20 r=4 "Error - static memory has been overwritten" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 4109675e..7ee261ad 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -290,10 +290,6 @@ "Endstops" "Konc. spinace" -#MSG_Enqueing c=0 r=0 -"enqueing \x22" -"\x00" - #MSG_STACK_ERROR c=20 r=4 "Error - static memory has been overwritten" "Chyba - Doslo k prepisu staticke pameti!" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 8ef8326a..53e4db5b 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -290,10 +290,6 @@ "Endstops" "Endschalter" -#MSG_Enqueing c=0 r=0 -"enqueing \x22" -"\x00" - #MSG_STACK_ERROR c=20 r=4 "Error - static memory has been overwritten" "Fehler - statischer Speicher wurde ueberschrieben" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index e892e372..537527be 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -290,10 +290,6 @@ "Endstops" "\x00" -#MSG_Enqueing c=0 r=0 -"enqueing \x22" -"\x00" - #MSG_STACK_ERROR c=20 r=4 "Error - static memory has been overwritten" "Error - se ha sobre-escrito la memoria estatica" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index aabad467..988d588f 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -290,10 +290,6 @@ "Endstops" "Butees" -#MSG_Enqueing c=0 r=0 -"enqueing \x22" -"\x00" - #MSG_STACK_ERROR c=20 r=4 "Error - static memory has been overwritten" "Erreur - la memoire statique a ete ecrasee" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 273a5f45..4c799d7b 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -290,10 +290,6 @@ "Endstops" "Finecorsa" -#MSG_Enqueing c=0 r=0 -"enqueing \x22" -"\x00" - #MSG_STACK_ERROR c=20 r=4 "Error - static memory has been overwritten" "Errore - la memoria statica e stata sovrascritta" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 1cdd390f..5bf2e7bc 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -290,10 +290,6 @@ "Endstops" "Krancowki" -#MSG_Enqueing c=0 r=0 -"enqueing \x22" -"\x00" - #MSG_STACK_ERROR c=20 r=4 "Error - static memory has been overwritten" "Blad - pamiec statyczna zostala nadpisana" From 104353c0c52b7945c0e45925d1b1e88db68eb683 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 17:43:11 +0100 Subject: [PATCH 06/29] Lang - text " PlannerBufferBytes: " removed from dictionary --- Firmware/Marlin_main.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 676c36d5..2458f71a 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1180,7 +1180,7 @@ void setup() SERIAL_ECHO_START; SERIAL_ECHORPGM(_i(" Free Memory: "));////MSG_FREE_MEMORY c=0 r=0 SERIAL_ECHO(freeMemory()); - SERIAL_ECHORPGM(_i(" PlannerBufferBytes: "));////MSG_PLANNER_BUFFER_BYTES c=0 r=0 + SERIAL_ECHORPGM(_n(" PlannerBufferBytes: "));////MSG_PLANNER_BUFFER_BYTES c=0 r=0 SERIAL_ECHOLN((int)sizeof(block_t)*BLOCK_BUFFER_SIZE); //lcd_update_enable(false); // why do we need this?? - andre // loads data from EEPROM if available else uses defaults (and resets step acceleration rate) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 4859e1cb..00c18b20 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1,6 +1,3 @@ -#MSG_PLANNER_BUFFER_BYTES c=0 r=0 -" PlannerBufferBytes: " - #MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 " cold extrusion prevented" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 7ee261ad..3045d439 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1,7 +1,3 @@ -#MSG_PLANNER_BUFFER_BYTES c=0 r=0 -" PlannerBufferBytes: " -" PlannerBufferBytes: " - #MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 " cold extrusion prevented" "zabraneno extruzi za studena" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 53e4db5b..643c97a3 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1,7 +1,3 @@ -#MSG_PLANNER_BUFFER_BYTES c=0 r=0 -" PlannerBufferBytes: " -" PlannerPufferBytes: " - #MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 " cold extrusion prevented" " stopp, Extruder kalt!" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 537527be..0a260a01 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1,7 +1,3 @@ -#MSG_PLANNER_BUFFER_BYTES c=0 r=0 -" PlannerBufferBytes: " -" PlannerBufferBytes: " - #MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 " cold extrusion prevented" "extrusion en frio prevenida" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 988d588f..e9190ce3 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1,7 +1,3 @@ -#MSG_PLANNER_BUFFER_BYTES c=0 r=0 -" PlannerBufferBytes: " -" PlannerBufferBytes : " - #MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 " cold extrusion prevented" "extrusion a froid evitee" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 4c799d7b..1018936a 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1,7 +1,3 @@ -#MSG_PLANNER_BUFFER_BYTES c=0 r=0 -" PlannerBufferBytes: " -" PlannerBufferBytes: " - #MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 " cold extrusion prevented" "evitata estrusione fredda" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 5bf2e7bc..79541288 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1,7 +1,3 @@ -#MSG_PLANNER_BUFFER_BYTES c=0 r=0 -" PlannerBufferBytes: " -" PlannerBufferBytes: " - #MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 " cold extrusion prevented" " nie dopuszczono do zimnej ekstruzji" From 283e33dd695ff71faeebbd3276aca91f1e4c7aee Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 17:44:53 +0100 Subject: [PATCH 07/29] Lang - text " cold extrusion prevented" removed from dictionary --- Firmware/planner.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index c465c938..fead3ffc 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -758,7 +758,7 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate de_float = 0; #endif SERIAL_ECHO_START; - SERIAL_ECHOLNRPGM(_i(" cold extrusion prevented"));////MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 + SERIAL_ECHOLNRPGM(_n(" cold extrusion prevented"));////MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 } #ifdef PREVENT_LENGTHY_EXTRUDE diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 00c18b20..0cbc2213 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1,6 +1,3 @@ -#MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 -" cold extrusion prevented" - #MSG_FREE_MEMORY c=0 r=0 " Free Memory: " diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 3045d439..607a579f 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1,7 +1,3 @@ -#MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 -" cold extrusion prevented" -"zabraneno extruzi za studena" - #MSG_FREE_MEMORY c=0 r=0 " Free Memory: " "Volna pamet: " diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 643c97a3..a54f15f7 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1,7 +1,3 @@ -#MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 -" cold extrusion prevented" -" stopp, Extruder kalt!" - #MSG_FREE_MEMORY c=0 r=0 " Free Memory: " " Freier Speicher: " diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 0a260a01..dcf2565b 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1,7 +1,3 @@ -#MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 -" cold extrusion prevented" -"extrusion en frio prevenida" - #MSG_FREE_MEMORY c=0 r=0 " Free Memory: " "Memoria Libre: " diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index e9190ce3..e1f25284 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1,7 +1,3 @@ -#MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 -" cold extrusion prevented" -"extrusion a froid evitee" - #MSG_FREE_MEMORY c=0 r=0 " Free Memory: " "Memoire libre :" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 1018936a..b3b1fce9 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1,7 +1,3 @@ -#MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 -" cold extrusion prevented" -"evitata estrusione fredda" - #MSG_FREE_MEMORY c=0 r=0 " Free Memory: " "Memoria Libera: " diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 79541288..01fb6839 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1,7 +1,3 @@ -#MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 -" cold extrusion prevented" -" nie dopuszczono do zimnej ekstruzji" - #MSG_FREE_MEMORY c=0 r=0 " Free Memory: " " Wolna pamiec:" From a1f03e9531a48a8865dc69038781e1b0eef2ab12 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 17:46:44 +0100 Subject: [PATCH 08/29] Lang - text " Free Memory: " removed from dictionary --- Firmware/Marlin_main.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2458f71a..b3af465a 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1178,7 +1178,7 @@ void setup() #endif SERIAL_ECHO_START; - SERIAL_ECHORPGM(_i(" Free Memory: "));////MSG_FREE_MEMORY c=0 r=0 + SERIAL_ECHORPGM(_n(" Free Memory: "));////MSG_FREE_MEMORY c=0 r=0 SERIAL_ECHO(freeMemory()); SERIAL_ECHORPGM(_n(" PlannerBufferBytes: "));////MSG_PLANNER_BUFFER_BYTES c=0 r=0 SERIAL_ECHOLN((int)sizeof(block_t)*BLOCK_BUFFER_SIZE); diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 0cbc2213..b046a734 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1,6 +1,3 @@ -#MSG_FREE_MEMORY c=0 r=0 -" Free Memory: " - #MSG_CONFIGURATION_VER c=0 r=0 " Last Updated: " diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 607a579f..fd2bdd5c 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1,7 +1,3 @@ -#MSG_FREE_MEMORY c=0 r=0 -" Free Memory: " -"Volna pamet: " - #MSG_CONFIGURATION_VER c=0 r=0 " Last Updated: " "Naposledy aktualizovano:" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index a54f15f7..c56d2224 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1,7 +1,3 @@ -#MSG_FREE_MEMORY c=0 r=0 -" Free Memory: " -" Freier Speicher: " - #MSG_CONFIGURATION_VER c=0 r=0 " Last Updated: " " Letztes Update: " diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index dcf2565b..56da675c 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1,7 +1,3 @@ -#MSG_FREE_MEMORY c=0 r=0 -" Free Memory: " -"Memoria Libre: " - #MSG_CONFIGURATION_VER c=0 r=0 " Last Updated: " "Ultima actualizacion: " diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index e1f25284..a747dea5 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1,7 +1,3 @@ -#MSG_FREE_MEMORY c=0 r=0 -" Free Memory: " -"Memoire libre :" - #MSG_CONFIGURATION_VER c=0 r=0 " Last Updated: " "Derniere MAJ :" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index b3b1fce9..b2da230d 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1,7 +1,3 @@ -#MSG_FREE_MEMORY c=0 r=0 -" Free Memory: " -"Memoria Libera: " - #MSG_CONFIGURATION_VER c=0 r=0 " Last Updated: " "Ultimo aggiornamento: " diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 01fb6839..c2e428af 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1,7 +1,3 @@ -#MSG_FREE_MEMORY c=0 r=0 -" Free Memory: " -" Wolna pamiec:" - #MSG_CONFIGURATION_VER c=0 r=0 " Last Updated: " " Ostatnia aktualizacja: " From 60e567b66062ca7ada2fe34d82bdc4d61378d001 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 17:48:12 +0100 Subject: [PATCH 09/29] Lang - text " Last Updated: " removed from dictionary --- Firmware/Marlin_main.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b3af465a..ed11ab7a 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1168,7 +1168,7 @@ void setup() #ifdef STRING_VERSION_CONFIG_H #ifdef STRING_CONFIG_H_AUTHOR SERIAL_ECHO_START; - SERIAL_ECHORPGM(_i(" Last Updated: "));////MSG_CONFIGURATION_VER c=0 r=0 + SERIAL_ECHORPGM(_n(" Last Updated: "));////MSG_CONFIGURATION_VER c=0 r=0 SERIAL_ECHOPGM(STRING_VERSION_CONFIG_H); SERIAL_ECHORPGM(_n(" | Author: "));////MSG_AUTHOR c=0 r=0 SERIAL_ECHOLNPGM(STRING_CONFIG_H_AUTHOR); diff --git a/lang/lang_en.txt b/lang/lang_en.txt index b046a734..df7b2f0d 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1,6 +1,3 @@ -#MSG_CONFIGURATION_VER c=0 r=0 -" Last Updated: " - #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 " of 4" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index fd2bdd5c..cbd04e47 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1,7 +1,3 @@ -#MSG_CONFIGURATION_VER c=0 r=0 -" Last Updated: " -"Naposledy aktualizovano:" - #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 " of 4" " z 4" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index c56d2224..10cd4273 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1,7 +1,3 @@ -#MSG_CONFIGURATION_VER c=0 r=0 -" Last Updated: " -" Letztes Update: " - #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 " of 4" " von 4" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 56da675c..270e51cd 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1,7 +1,3 @@ -#MSG_CONFIGURATION_VER c=0 r=0 -" Last Updated: " -"Ultima actualizacion: " - #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 " of 4" " de 4" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index a747dea5..c88eb27b 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1,7 +1,3 @@ -#MSG_CONFIGURATION_VER c=0 r=0 -" Last Updated: " -"Derniere MAJ :" - #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 " of 4" "de 4" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index b2da230d..0fd91e16 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1,7 +1,3 @@ -#MSG_CONFIGURATION_VER c=0 r=0 -" Last Updated: " -"Ultimo aggiornamento: " - #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 " of 4" " su 4" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index c2e428af..5c622b96 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1,7 +1,3 @@ -#MSG_CONFIGURATION_VER c=0 r=0 -" Last Updated: " -" Ostatnia aktualizacja: " - #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 " of 4" " z 4" From 0baa6412fc2b5e5a967fb3f81ccc25869a03e78a Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 17:49:28 +0100 Subject: [PATCH 10/29] Lang - text "Cannot enter subdir: " removed from dictionary --- Firmware/cardreader.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index eac738c8..989e20c7 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -659,7 +659,7 @@ void CardReader::chdir(const char * relpath) if(!newfile.open(*parent,relpath, O_READ)) { SERIAL_ECHO_START; - SERIAL_ECHORPGM(_i("Cannot enter subdir: "));////MSG_SD_CANT_ENTER_SUBDIR c=0 r=0 + SERIAL_ECHORPGM(_n("Cannot enter subdir: "));////MSG_SD_CANT_ENTER_SUBDIR c=0 r=0 SERIAL_ECHOLN(relpath); } else diff --git a/lang/lang_en.txt b/lang/lang_en.txt index df7b2f0d..5301625f 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -115,9 +115,6 @@ # "Cancel" -#MSG_SD_CANT_ENTER_SUBDIR c=0 r=0 -"Cannot enter subdir: " - #MSG_SD_INSERTED c=0 r=0 "Card inserted" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index cbd04e47..b69463b1 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -154,10 +154,6 @@ "Cancel" "Zrusit" -#MSG_SD_CANT_ENTER_SUBDIR c=0 r=0 -"Cannot enter subdir: " -"Nelze otevrit slozku:" - #MSG_SD_INSERTED c=0 r=0 "Card inserted" "Karta vlozena" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 10cd4273..3c34bcc7 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -154,10 +154,6 @@ "Cancel" "Abbruch" -#MSG_SD_CANT_ENTER_SUBDIR c=0 r=0 -"Cannot enter subdir: " -"Kann Unterverzeichnis nicht oeffnen: " - #MSG_SD_INSERTED c=0 r=0 "Card inserted" "SD Karte eingesetzt" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 270e51cd..41cc4062 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -154,10 +154,6 @@ "Cancel" "Cancelar" -#MSG_SD_CANT_ENTER_SUBDIR c=0 r=0 -"Cannot enter subdir: " -"Sin acceso subdir: " - #MSG_SD_INSERTED c=0 r=0 "Card inserted" "Tarjeta insertada" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index c88eb27b..cd48666c 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -154,10 +154,6 @@ "Cancel" "Annuler" -#MSG_SD_CANT_ENTER_SUBDIR c=0 r=0 -"Cannot enter subdir: " -"Impossible d'entrer dans le repertoire :" - #MSG_SD_INSERTED c=0 r=0 "Card inserted" "Carte inseree" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 0fd91e16..dc514674 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -154,10 +154,6 @@ "Cancel" "Annulla" -#MSG_SD_CANT_ENTER_SUBDIR c=0 r=0 -"Cannot enter subdir: " -"Impossibile accedere alla sottocartella: " - #MSG_SD_INSERTED c=0 r=0 "Card inserted" "SD inserita" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 5c622b96..a594abc9 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -154,10 +154,6 @@ "Cancel" "Anuluj" -#MSG_SD_CANT_ENTER_SUBDIR c=0 r=0 -"Cannot enter subdir: " -"Brak dostepu do subdir: " - #MSG_SD_INSERTED c=0 r=0 "Card inserted" "Karta wlozona" From 9f86a334c6302246198dffe9b95550b460f2868f Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 17:53:51 +0100 Subject: [PATCH 11/29] Lang - text "endstops hit: " removed from dictionary --- Firmware/messages.c | 2 +- Firmware/messages.h | 4 ++-- Firmware/stepper.cpp | 8 ++++---- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 10 files changed, 7 insertions(+), 34 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 66b90f1f..d62a962a 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -27,7 +27,6 @@ const char MSG_CRASHDETECT_OFF[] PROGMEM_I1 = ISTR("Crash det. [off]"); ////c=0 const char MSG_CRASHDETECT_ON[] PROGMEM_I1 = ISTR("Crash det. [on]"); ////c=0 r=0 const char MSG_ENDSTOP_HIT[] PROGMEM_I1 = ISTR("TRIGGERED"); ////c=0 r=0 const char MSG_ENDSTOP_OPEN[] PROGMEM_I1 = ISTR("open"); ////c=0 r=0 -const char MSG_ENDSTOPS_HIT[] PROGMEM_I1 = ISTR("endstops hit: "); ////c=0 r=0 const char MSG_ERR_STOPPED[] PROGMEM_I1 = ISTR("Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"); ////c=0 r=0 const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////c=0 r=0 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 @@ -122,3 +121,4 @@ const char MSG_ZPROBE_OUT[] PROGMEM_N1 = "Z probe out. bed"; ////c=0 r=0 const char MSG_ZPROBE_ZOFFSET[] PROGMEM_N1 = "Z Offset"; ////c=0 r=0 const char MSG_TMC_OVERTEMP[] PROGMEM_N1 = "TMC DRIVER OVERTEMP"; ////c=0 r=0 const char MSG_Enqueing[] PROGMEM_N1 = "enqueing \""; ////c=0 r=0 +const char MSG_ENDSTOPS_HIT[] PROGMEM_N1 = "endstops hit: "; ////c=0 r=0 diff --git a/Firmware/messages.h b/Firmware/messages.h index 3b8ca18b..ff1f2a5b 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -28,8 +28,6 @@ extern const char MSG_CRASHDETECT_OFF[]; extern const char MSG_CRASHDETECT_ON[]; extern const char MSG_ENDSTOP_HIT[]; extern const char MSG_ENDSTOP_OPEN[]; -extern const char MSG_ENDSTOPS_HIT[]; -extern const char MSG_Enqueing[]; extern const char MSG_ERR_STOPPED[]; extern const char MSG_ERROR[]; extern const char MSG_EXTRUDER[]; @@ -123,6 +121,8 @@ extern const char MSG_Z_MIN[]; extern const char MSG_ZPROBE_OUT[]; extern const char MSG_ZPROBE_ZOFFSET[]; extern const char MSG_TMC_OVERTEMP[]; +extern const char MSG_Enqueing[]; +extern const char MSG_ENDSTOPS_HIT[]; #if defined(__cplusplus) } diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index cba50f77..589a7b07 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -228,18 +228,18 @@ void checkHitEndstops() { if( endstop_x_hit || endstop_y_hit || endstop_z_hit) { SERIAL_ECHO_START; - SERIAL_ECHORPGM(_T(MSG_ENDSTOPS_HIT)); + SERIAL_ECHORPGM(MSG_ENDSTOPS_HIT); if(endstop_x_hit) { SERIAL_ECHOPAIR(" X:",(float)endstops_trigsteps[X_AXIS]/cs.axis_steps_per_unit[X_AXIS]); -// LCD_MESSAGERPGM(CAT2(_T(MSG_ENDSTOPS_HIT), PSTR("X"))); +// LCD_MESSAGERPGM(CAT2((MSG_ENDSTOPS_HIT), PSTR("X"))); } if(endstop_y_hit) { SERIAL_ECHOPAIR(" Y:",(float)endstops_trigsteps[Y_AXIS]/cs.axis_steps_per_unit[Y_AXIS]); -// LCD_MESSAGERPGM(CAT2(_T(MSG_ENDSTOPS_HIT), PSTR("Y"))); +// LCD_MESSAGERPGM(CAT2((MSG_ENDSTOPS_HIT), PSTR("Y"))); } if(endstop_z_hit) { SERIAL_ECHOPAIR(" Z:",(float)endstops_trigsteps[Z_AXIS]/cs.axis_steps_per_unit[Z_AXIS]); -// LCD_MESSAGERPGM(CAT2(_T(MSG_ENDSTOPS_HIT),PSTR("Z"))); +// LCD_MESSAGERPGM(CAT2((MSG_ENDSTOPS_HIT),PSTR("Z"))); } SERIAL_ECHOLN(""); endstop_x_hit=false; diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 5301625f..a0ff1ef5 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -196,9 +196,6 @@ #MSG_SELFTEST_ENDSTOP c=0 r=0 "Endstop" -#MSG_ENDSTOPS_HIT c=0 r=0 -"endstops hit: " - #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index b69463b1..bd4e551e 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -262,10 +262,6 @@ "Endstop" "Koncovy spinac" -#MSG_ENDSTOPS_HIT c=0 r=0 -"endstops hit: " -"konc. spinace aktivovany: " - #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" "Konc. spinace" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 3c34bcc7..859a89b6 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -262,10 +262,6 @@ "Endstop" "Endanschlag" -#MSG_ENDSTOPS_HIT c=0 r=0 -"endstops hit: " -"Endanschlag erreicht: " - #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" "Endschalter" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 41cc4062..f7aede00 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -262,10 +262,6 @@ "Endstop" "\x00" -#MSG_ENDSTOPS_HIT c=0 r=0 -"endstops hit: " -"endstops golpean: " - #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" "\x00" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index cd48666c..895b6bfd 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -262,10 +262,6 @@ "Endstop" "Butee" -#MSG_ENDSTOPS_HIT c=0 r=0 -"endstops hit: " -"butees atteintes :" - #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" "Butees" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index dc514674..ade5148a 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -262,10 +262,6 @@ "Endstop" "Finecorsa" -#MSG_ENDSTOPS_HIT c=0 r=0 -"endstops hit: " -"finecorsa colpito: " - #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" "Finecorsa" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index a594abc9..39ce8bbc 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -262,10 +262,6 @@ "Endstop" "Krancowka" -#MSG_ENDSTOPS_HIT c=0 r=0 -"endstops hit: " -"krancowki aktywowane:" - #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" "Krancowki" From 9c964277ac45222b92f5723047aa5f69ceb7676f Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 17:57:52 +0100 Subject: [PATCH 12/29] Lang - text "error writing to file" removed from dictionary --- Firmware/cardreader.cpp | 4 ++-- Firmware/messages.c | 2 +- Firmware/messages.h | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 10 files changed, 4 insertions(+), 31 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 989e20c7..e9857894 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -532,7 +532,7 @@ void CardReader::write_command(char *buf) if (file.writeError) { SERIAL_ERROR_START; - SERIAL_ERRORLNRPGM(_T(MSG_SD_ERR_WRITE_TO_FILE)); + SERIAL_ERRORLNRPGM(MSG_SD_ERR_WRITE_TO_FILE); } } @@ -544,7 +544,7 @@ void CardReader::write_command_no_newline(char *buf) if (file.writeError) { SERIAL_ERROR_START; - SERIAL_ERRORLNRPGM(_T(MSG_SD_ERR_WRITE_TO_FILE)); + SERIAL_ERRORLNRPGM(MSG_SD_ERR_WRITE_TO_FILE); MYSERIAL.println("An error while writing to the SD Card."); } } diff --git a/Firmware/messages.c b/Firmware/messages.c index d62a962a..a71ce867 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -73,7 +73,6 @@ const char MSG_RECOVER_PRINT[] PROGMEM_I1 = ISTR("Blackout occurred. Recover pri const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\xF8" "Refresh"); ////c=0 r=0 const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); ////c=0 r=0 const char MSG_REMOVE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please remove steel sheet from heatbed."); ////c=20 r=4 -const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_I1 = ISTR("error writing to file"); ////c=0 r=0 const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_I1 = ISTR("open failed, File: "); ////c=0 r=0 const char MSG_SELFTEST_COOLING_FAN[] PROGMEM_I1 = ISTR("Front print fan?"); ////c=20 r=0 const char MSG_SELFTEST_EXTRUDER_FAN[] PROGMEM_I1 = ISTR("Left hotend fan?"); ////c=20 r=0 @@ -122,3 +121,4 @@ const char MSG_ZPROBE_ZOFFSET[] PROGMEM_N1 = "Z Offset"; ////c=0 r=0 const char MSG_TMC_OVERTEMP[] PROGMEM_N1 = "TMC DRIVER OVERTEMP"; ////c=0 r=0 const char MSG_Enqueing[] PROGMEM_N1 = "enqueing \""; ////c=0 r=0 const char MSG_ENDSTOPS_HIT[] PROGMEM_N1 = "endstops hit: "; ////c=0 r=0 +const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_N1 = "error writing to file"; ////c=0 r=0 diff --git a/Firmware/messages.h b/Firmware/messages.h index ff1f2a5b..195ebef7 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -74,7 +74,6 @@ extern const char MSG_RECOVER_PRINT[]; extern const char MSG_REFRESH[]; extern const char MSG_REMOVE_STEEL_SHEET[]; extern const char MSG_RESUMING_PRINT[]; -extern const char MSG_SD_ERR_WRITE_TO_FILE[]; extern const char MSG_SD_OPEN_FILE_FAIL[]; extern const char MSG_SD_WORKDIR_FAIL[]; extern const char MSG_SELFTEST_COOLING_FAN[]; @@ -123,6 +122,7 @@ extern const char MSG_ZPROBE_ZOFFSET[]; extern const char MSG_TMC_OVERTEMP[]; extern const char MSG_Enqueing[]; extern const char MSG_ENDSTOPS_HIT[]; +extern const char MSG_SD_ERR_WRITE_TO_FILE[]; #if defined(__cplusplus) } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index a0ff1ef5..a9199db2 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -202,9 +202,6 @@ #MSG_STACK_ERROR c=20 r=4 "Error - static memory has been overwritten" -#MSG_SD_ERR_WRITE_TO_FILE c=0 r=0 -"error writing to file" - #MSG_FSENS_NOT_RESPONDING c=20 r=4 "ERROR: Filament sensor is not responding, please check connection." diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index bd4e551e..86c73033 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -270,10 +270,6 @@ "Error - static memory has been overwritten" "Chyba - Doslo k prepisu staticke pameti!" -#MSG_SD_ERR_WRITE_TO_FILE c=0 r=0 -"error writing to file" -"chyba zapisu do souboru" - #MSG_FSENS_NOT_RESPONDING c=20 r=4 "ERROR: Filament sensor is not responding, please check connection." "CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 859a89b6..49dcfabc 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -270,10 +270,6 @@ "Error - static memory has been overwritten" "Fehler - statischer Speicher wurde ueberschrieben" -#MSG_SD_ERR_WRITE_TO_FILE c=0 r=0 -"error writing to file" -"Fehler beim Schreiben in Datei" - #MSG_FSENS_NOT_RESPONDING c=20 r=4 "ERROR: Filament sensor is not responding, please check connection." "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index f7aede00..bd9aa77d 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -270,10 +270,6 @@ "Error - static memory has been overwritten" "Error - se ha sobre-escrito la memoria estatica" -#MSG_SD_ERR_WRITE_TO_FILE c=0 r=0 -"error writing to file" -"error al escribir arch." - #MSG_FSENS_NOT_RESPONDING c=20 r=4 "ERROR: Filament sensor is not responding, please check connection." "ERROR: El sensor de filamento no responde, por favor comprueba la conexion." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 895b6bfd..8856be59 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -270,10 +270,6 @@ "Error - static memory has been overwritten" "Erreur - la memoire statique a ete ecrasee" -#MSG_SD_ERR_WRITE_TO_FILE c=0 r=0 -"error writing to file" -"erreur d'ecriture du fichier" - #MSG_FSENS_NOT_RESPONDING c=20 r=4 "ERROR: Filament sensor is not responding, please check connection." "ERREUR : Le capteur de filament ne repond pas, verifiez la connexion." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index ade5148a..e6009547 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -270,10 +270,6 @@ "Error - static memory has been overwritten" "Errore - la memoria statica e stata sovrascritta" -#MSG_SD_ERR_WRITE_TO_FILE c=0 r=0 -"error writing to file" -"errore scrittura sul file" - #MSG_FSENS_NOT_RESPONDING c=20 r=4 "ERROR: Filament sensor is not responding, please check connection." "ERRORE: il sensore filam. non risponde,Controllare conness." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 39ce8bbc..a40e2b52 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -270,10 +270,6 @@ "Error - static memory has been overwritten" "Blad - pamiec statyczna zostala nadpisana" -#MSG_SD_ERR_WRITE_TO_FILE c=0 r=0 -"error writing to file" -"blad zapisywania pliku" - #MSG_FSENS_NOT_RESPONDING c=20 r=4 "ERROR: Filament sensor is not responding, please check connection." "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." From fdf9734161d35b091397d486394a427fb2be84aa Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 17:59:43 +0100 Subject: [PATCH 13/29] Lang - text "checksum mismatch, Last Line: " removed from dictionary --- Firmware/cmdqueue.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 72472d91..1699505e 100644 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -441,7 +441,7 @@ void get_command() checksum = checksum^(*p++); if (int(strtol(strchr_pointer+1, NULL, 10)) != int(checksum)) { SERIAL_ERROR_START; - SERIAL_ERRORRPGM(_i("checksum mismatch, Last Line: "));////MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 + SERIAL_ERRORRPGM(_n("checksum mismatch, Last Line: "));////MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 SERIAL_ERRORLN(gcode_LastN); FlushSerialRequestResend(); serial_count = 0; diff --git a/lang/lang_en.txt b/lang/lang_en.txt index a9199db2..6ca5842f 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -370,9 +370,6 @@ #MSG_SELFTEST_CHECK_Z c=20 r=0 "Checking Z axis " -#MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 -"checksum mismatch, Last Line: " - #MSG_CHOOSE_EXTRUDER c=20 r=1 "Choose extruder:" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 86c73033..f3e396b8 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -494,10 +494,6 @@ "Checking Z axis " "Kontrola osy Z" -#MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 -"checksum mismatch, Last Line: " -"neplatny kontrolni soucet, posl. radek:" - #MSG_CHOOSE_EXTRUDER c=20 r=1 "Choose extruder:" "Vyberte extruder:" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 49dcfabc..b95c65be 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -494,10 +494,6 @@ "Checking Z axis " "Pruefe Z Achse " -#MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 -"checksum mismatch, Last Line: " -"Pruefsummenfehler, Letzte Zeile: " - #MSG_CHOOSE_EXTRUDER c=20 r=1 "Choose extruder:" "Extruder waehlen:" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index bd9aa77d..1fb914fd 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -494,10 +494,6 @@ "Checking Z axis " "Control sensor Z" -#MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 -"checksum mismatch, Last Line: " -"inconcluencia checksum, Ult. Linea: " - #MSG_CHOOSE_EXTRUDER c=20 r=1 "Choose extruder:" "Elegir extrusor:" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 8856be59..6a68b718 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -494,10 +494,6 @@ "Checking Z axis " "Verification axe Z" -#MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 -"checksum mismatch, Last Line: " -"dissemblance du checksum, Derniere Ligne :" - #MSG_CHOOSE_EXTRUDER c=20 r=1 "Choose extruder:" "Choisir extrudeur :" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index e6009547..13af94d9 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -494,10 +494,6 @@ "Checking Z axis " "Verifica asse Z" -#MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 -"checksum mismatch, Last Line: " -"mancata corrispondenza di checksum, ultima riga:" - #MSG_CHOOSE_EXTRUDER c=20 r=1 "Choose extruder:" "Seleziona estrusore:" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index a40e2b52..c859c4b4 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -494,10 +494,6 @@ "Checking Z axis " "Kontrola osi Z" -#MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 -"checksum mismatch, Last Line: " -"suma kontrolna niezgodna, ostatnia linia:" - #MSG_CHOOSE_EXTRUDER c=20 r=1 "Choose extruder:" "Wybierz ekstruder:" From fd3cd9b55146eaf87b3185aa0b4581d9a3a50758 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:06:10 +0100 Subject: [PATCH 14/29] Lang - texts "Mxxx Invalid extruder " removed from dictionary --- Firmware/Marlin_main.cpp | 12 ++++++------ lang/lang_en.txt | 18 ------------------ lang/lang_en_cz.txt | 24 ------------------------ lang/lang_en_de.txt | 24 ------------------------ lang/lang_en_es.txt | 24 ------------------------ lang/lang_en_fr.txt | 24 ------------------------ lang/lang_en_it.txt | 24 ------------------------ lang/lang_en_pl.txt | 24 ------------------------ 8 files changed, 6 insertions(+), 168 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ed11ab7a..a1ac0710 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5855,7 +5855,7 @@ Sigma_Exit: extruder = code_value(); if(extruder >= EXTRUDERS) { SERIAL_ECHO_START; - SERIAL_ECHO(_i("M200 Invalid extruder "));////MSG_M200_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHO(_n("M200 Invalid extruder "));////MSG_M200_INVALID_EXTRUDER c=0 r=0 break; } } @@ -7677,19 +7677,19 @@ bool setTargetedHotend(int code, uint8_t &extruder) SERIAL_ECHO_START; switch(code){ case 104: - SERIAL_ECHORPGM(_i("M104 Invalid extruder "));////MSG_M104_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHORPGM(_n("M104 Invalid extruder "));////MSG_M104_INVALID_EXTRUDER c=0 r=0 break; case 105: - SERIAL_ECHO(_i("M105 Invalid extruder "));////MSG_M105_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHO(_n("M105 Invalid extruder "));////MSG_M105_INVALID_EXTRUDER c=0 r=0 break; case 109: - SERIAL_ECHO(_i("M109 Invalid extruder "));////MSG_M109_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHO(_n("M109 Invalid extruder "));////MSG_M109_INVALID_EXTRUDER c=0 r=0 break; case 218: - SERIAL_ECHO(_i("M218 Invalid extruder "));////MSG_M218_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHO(_n("M218 Invalid extruder "));////MSG_M218_INVALID_EXTRUDER c=0 r=0 break; case 221: - SERIAL_ECHO(_i("M221 Invalid extruder "));////MSG_M221_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHO(_n("M221 Invalid extruder "));////MSG_M221_INVALID_EXTRUDER c=0 r=0 break; } SERIAL_PROTOCOLLN((int)extruder); diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 6ca5842f..d2da35d1 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -460,30 +460,12 @@ #MSG_LOOSE_PULLEY c=20 r=1 "Loose pulley" -#MSG_M104_INVALID_EXTRUDER c=0 r=0 -"M104 Invalid extruder " - -#MSG_M105_INVALID_EXTRUDER c=0 r=0 -"M105 Invalid extruder " - # "Load to nozzle" -#MSG_M109_INVALID_EXTRUDER c=0 r=0 -"M109 Invalid extruder " - #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." -#MSG_M200_INVALID_EXTRUDER c=0 r=0 -"M200 Invalid extruder " - -#MSG_M218_INVALID_EXTRUDER c=0 r=0 -"M218 Invalid extruder " - -#MSG_M221_INVALID_EXTRUDER c=0 r=0 -"M221 Invalid extruder " - #MSG_MAIN c=0 r=0 "Main" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index f3e396b8..9b10080d 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -614,38 +614,14 @@ "Loose pulley" "Uvolnena remenicka" -#MSG_M104_INVALID_EXTRUDER c=0 r=0 -"M104 Invalid extruder " -"M104 Neplatny extruder " - -#MSG_M105_INVALID_EXTRUDER c=0 r=0 -"M105 Invalid extruder " -"M105 Neplatny extruder " - # "Load to nozzle" "Zavest do trysky" -#MSG_M109_INVALID_EXTRUDER c=0 r=0 -"M109 Invalid extruder " -"M109 Neplatny extruder " - #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." "M117 Kal. prvni vrstvy" -#MSG_M200_INVALID_EXTRUDER c=0 r=0 -"M200 Invalid extruder " -"M200 Neplatny extruder " - -#MSG_M218_INVALID_EXTRUDER c=0 r=0 -"M218 Invalid extruder " -"M218 Neplatny extruder " - -#MSG_M221_INVALID_EXTRUDER c=0 r=0 -"M221 Invalid extruder " -"M221 Neplatny extruder " - #MSG_MAIN c=0 r=0 "Main" "Hlavni nabidka" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index b95c65be..061f3aa2 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -614,38 +614,14 @@ "Loose pulley" "Lose Riemenscheibe" -#MSG_M104_INVALID_EXTRUDER c=0 r=0 -"M104 Invalid extruder " -"M104 Falscher Extruder " - -#MSG_M105_INVALID_EXTRUDER c=0 r=0 -"M105 Invalid extruder " -"M105 Falscher Extruder " - # "Load to nozzle" "In Druckduese laden" -#MSG_M109_INVALID_EXTRUDER c=0 r=0 -"M109 Invalid extruder " -"M109 Falscher Extruder " - #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." "M117 Erste-Schicht Kal." -#MSG_M200_INVALID_EXTRUDER c=0 r=0 -"M200 Invalid extruder " -"M200 Falscher Extruder " - -#MSG_M218_INVALID_EXTRUDER c=0 r=0 -"M218 Invalid extruder " -"M218 Falscher Extruder " - -#MSG_M221_INVALID_EXTRUDER c=0 r=0 -"M221 Invalid extruder " -"M221 Falscher Extruder " - #MSG_MAIN c=0 r=0 "Main" "Hauptmenue" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 1fb914fd..68135b93 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -614,38 +614,14 @@ "Loose pulley" "Polea suelta" -#MSG_M104_INVALID_EXTRUDER c=0 r=0 -"M104 Invalid extruder " -"M104 Extrusor invalido" - -#MSG_M105_INVALID_EXTRUDER c=0 r=0 -"M105 Invalid extruder " -"M105 Extrusor invalido" - # "Load to nozzle" "Cargar a la boquilla" -#MSG_M109_INVALID_EXTRUDER c=0 r=0 -"M109 Invalid extruder " -"M109 Extrusor invalido" - #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." "M117 Cal. primera cap." -#MSG_M200_INVALID_EXTRUDER c=0 r=0 -"M200 Invalid extruder " -"M200 Extrusor invalido" - -#MSG_M218_INVALID_EXTRUDER c=0 r=0 -"M218 Invalid extruder " -"M218 Extrusor invalido" - -#MSG_M221_INVALID_EXTRUDER c=0 r=0 -"M221 Invalid extruder " -"M221 Extrusor invalido" - #MSG_MAIN c=0 r=0 "Main" "Menu principal" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 6a68b718..bb822e78 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -614,38 +614,14 @@ "Loose pulley" "Poulie lache" -#MSG_M104_INVALID_EXTRUDER c=0 r=0 -"M104 Invalid extruder " -"M104 extrudeur invalide" - -#MSG_M105_INVALID_EXTRUDER c=0 r=0 -"M105 Invalid extruder " -"M105 extrudeur invalide" - # "Load to nozzle" "Charger le fil" -#MSG_M109_INVALID_EXTRUDER c=0 r=0 -"M109 Invalid extruder " -"M109 extrudeur invalide" - #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." "M117 Cal. 1ere couche" -#MSG_M200_INVALID_EXTRUDER c=0 r=0 -"M200 Invalid extruder " -"M200 extrudeur invalide" - -#MSG_M218_INVALID_EXTRUDER c=0 r=0 -"M218 Invalid extruder " -"M218 extrudeur invalide" - -#MSG_M221_INVALID_EXTRUDER c=0 r=0 -"M221 Invalid extruder " -"M221 extrudeur invalide" - #MSG_MAIN c=0 r=0 "Main" "Principal" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 13af94d9..60ccdf1f 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -614,38 +614,14 @@ "Loose pulley" "Puleggia lenta" -#MSG_M104_INVALID_EXTRUDER c=0 r=0 -"M104 Invalid extruder " -"M104 Estrusore non valido" - -#MSG_M105_INVALID_EXTRUDER c=0 r=0 -"M105 Invalid extruder " -"M105 Estrusore non valido" - # "Load to nozzle" "Carica ugello" -#MSG_M109_INVALID_EXTRUDER c=0 r=0 -"M109 Invalid extruder " -"M109 Estrusore non valido" - #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." "M117 Calibrazione primo layer." -#MSG_M200_INVALID_EXTRUDER c=0 r=0 -"M200 Invalid extruder " -"M200 Estrusore non valido" - -#MSG_M218_INVALID_EXTRUDER c=0 r=0 -"M218 Invalid extruder " -"M218 Estrusore non valido" - -#MSG_M221_INVALID_EXTRUDER c=0 r=0 -"M221 Invalid extruder " -"M221 Estrusore non valido" - #MSG_MAIN c=0 r=0 "Main" "Menu principale" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index c859c4b4..393370bb 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -614,38 +614,14 @@ "Loose pulley" "Luzne kolo pasowe" -#MSG_M104_INVALID_EXTRUDER c=0 r=0 -"M104 Invalid extruder " -"M104 Nieprawidlowy ekstruder" - -#MSG_M105_INVALID_EXTRUDER c=0 r=0 -"M105 Invalid extruder " -"M105 Nieprawidlowy ekstruder" - # "Load to nozzle" "Zaladuj do dyszy" -#MSG_M109_INVALID_EXTRUDER c=0 r=0 -"M109 Invalid extruder " -"M109 Nieprawidlowy ekstruder" - #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." "M117 Kal. 1. warstwy" -#MSG_M200_INVALID_EXTRUDER c=0 r=0 -"M200 Invalid extruder " -"M200 Nieprawidlowy ekstruder" - -#MSG_M218_INVALID_EXTRUDER c=0 r=0 -"M218 Invalid extruder " -"M218 Nieprawidlowy ekstruder" - -#MSG_M221_INVALID_EXTRUDER c=0 r=0 -"M221 Invalid extruder " -"M221 Nieprawidlowy ekstruder" - #MSG_MAIN c=0 r=0 "Main" "Menu glowne" From 1568b94e875ec5674cf6c22f021ee392a63eea0b Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:09:07 +0100 Subject: [PATCH 15/29] Lang - text "No Checksum with line number, Last Line: " removed from dictionary --- Firmware/cmdqueue.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 1699505e..d32926a4 100644 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -453,7 +453,7 @@ void get_command() else { SERIAL_ERROR_START; - SERIAL_ERRORRPGM(_i("No Checksum with line number, Last Line: "));////MSG_ERR_NO_CHECKSUM c=0 r=0 + SERIAL_ERRORRPGM(_n("No Checksum with line number, Last Line: "));////MSG_ERR_NO_CHECKSUM c=0 r=0 SERIAL_ERRORLN(gcode_LastN); FlushSerialRequestResend(); serial_count = 0; diff --git a/lang/lang_en.txt b/lang/lang_en.txt index d2da35d1..61f006b5 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -523,9 +523,6 @@ #MSG_MOVE_Z c=0 r=0 "Move Z" -#MSG_ERR_NO_CHECKSUM c=0 r=0 -"No Checksum with line number, Last Line: " - #MSG_NO_MOVE c=0 r=0 "No move." diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 9b10080d..06bf55b9 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -698,10 +698,6 @@ "Move Z" "Posunout Z" -#MSG_ERR_NO_CHECKSUM c=0 r=0 -"No Checksum with line number, Last Line: " -"Zadny kontrolni soucet s cislem radku, Posl. radek:" - #MSG_NO_MOVE c=0 r=0 "No move." "Bez pohybu." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 061f3aa2..cef6c25c 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -698,10 +698,6 @@ "Move Z" "Bewege Z" -#MSG_ERR_NO_CHECKSUM c=0 r=0 -"No Checksum with line number, Last Line: " -"Keine Pruefsumme mit Zeilennummer, Letzte Zeile: " - #MSG_NO_MOVE c=0 r=0 "No move." "Keine Bewegung." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 68135b93..6eadb62b 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -698,10 +698,6 @@ "Move Z" "Mover Z" -#MSG_ERR_NO_CHECKSUM c=0 r=0 -"No Checksum with line number, Last Line: " -"Sin Checksum con linea numero, Ult. Linea: " - #MSG_NO_MOVE c=0 r=0 "No move." "Sin movimiento" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index bb822e78..7f5a4e2e 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -698,10 +698,6 @@ "Move Z" "Deplacer Z" -#MSG_ERR_NO_CHECKSUM c=0 r=0 -"No Checksum with line number, Last Line: " -"Pas de checksum avec numero de ligne, Derniere ligne :" - #MSG_NO_MOVE c=0 r=0 "No move." "Pas de mouvement." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 60ccdf1f..3079f3ea 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -698,10 +698,6 @@ "Move Z" "Muovi Z" -#MSG_ERR_NO_CHECKSUM c=0 r=0 -"No Checksum with line number, Last Line: " -"Nessun checksum con numero di riga, ultima riga:" - #MSG_NO_MOVE c=0 r=0 "No move." "Nessun movimento." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 393370bb..76877551 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -698,10 +698,6 @@ "Move Z" "Ruch osi Z" -#MSG_ERR_NO_CHECKSUM c=0 r=0 -"No Checksum with line number, Last Line: " -"Brak sumy kontrolnej z numerem linii, ostatnia linia:" - #MSG_NO_MOVE c=0 r=0 "No move." "Brak ruchu." From 72d47eaeba319325761feeb35d4a31137ff5e1f2 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:12:19 +0100 Subject: [PATCH 16/29] Lang - text "ok" removed from dictionary --- Firmware/Marlin_main.cpp | 18 +++++++++--------- Firmware/messages.c | 2 +- Firmware/messages.h | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 10 files changed, 11 insertions(+), 38 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a1ac0710..c70ed4ca 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -627,7 +627,7 @@ void crashdet_cancel() lcd_print_stop(); }else if(saved_printing_type == PRINTING_TYPE_USB){ SERIAL_ECHOLNPGM("// action:cancel"); //for Octoprint: works the same as clicking "Abort" button in Octoprint GUI - SERIAL_PROTOCOLLNRPGM(_T(MSG_OK)); + SERIAL_PROTOCOLLNRPGM(MSG_OK); } } @@ -1744,7 +1744,7 @@ void loop() if(card.logging) process_commands(); else - SERIAL_PROTOCOLLNRPGM(_T(MSG_OK)); + SERIAL_PROTOCOLLNRPGM(MSG_OK); } else { card.closefile(); SERIAL_PROTOCOLLNRPGM(MSG_FILE_SAVED); @@ -6188,7 +6188,7 @@ Sigma_Exit: } } else if (servo_index >= 0) { - SERIAL_PROTOCOL(_T(MSG_OK)); + SERIAL_PROTOCOL(MSG_OK); SERIAL_PROTOCOL(" Servo "); SERIAL_PROTOCOL(servo_index); SERIAL_PROTOCOL(": "); @@ -6233,7 +6233,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) #endif updatePID(); - SERIAL_PROTOCOLRPGM(_T(MSG_OK)); + SERIAL_PROTOCOLRPGM(MSG_OK); SERIAL_PROTOCOL(" p:"); SERIAL_PROTOCOL(cs.Kp); SERIAL_PROTOCOL(" i:"); @@ -6257,7 +6257,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) if(code_seen('D')) cs.bedKd = scalePID_d(code_value()); updatePID(); - SERIAL_PROTOCOLRPGM(_T(MSG_OK)); + SERIAL_PROTOCOLRPGM(MSG_OK); SERIAL_PROTOCOL(" p:"); SERIAL_PROTOCOL(cs.bedKp); SERIAL_PROTOCOL(" i:"); @@ -6389,7 +6389,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) { cs.zprobe_zoffset = -value; // compare w/ line 278 of ConfigurationStore.cpp SERIAL_ECHO_START; - SERIAL_ECHOLNRPGM(CAT4(MSG_ZPROBE_ZOFFSET, " ", _T(MSG_OK),PSTR(""))); + SERIAL_ECHOLNRPGM(CAT4(MSG_ZPROBE_ZOFFSET, " ", MSG_OK,PSTR(""))); SERIAL_PROTOCOLLN(""); } else @@ -6543,7 +6543,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) manage_inactivity(); lcd_update(0); } - LCD_MESSAGERPGM(_T(MSG_OK)); + LCD_MESSAGERPGM(MSG_OK); break; } @@ -7079,7 +7079,7 @@ void FlushSerialRequestResend() { //char cmdbuffer[bufindr][100]="Resend:"; MYSERIAL.flush(); - printf_P(_N("%S: %ld\n%S\n"), _i("Resend"), gcode_LastN + 1, _T(MSG_OK)); + printf_P(_N("%S: %ld\n%S\n"), _i("Resend"), gcode_LastN + 1, MSG_OK); } // Confirm the execution of a command, if sent from a serial line. @@ -7088,7 +7088,7 @@ void ClearToSend() { previous_millis_cmd = millis(); if ((CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB) || (CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR)) - SERIAL_PROTOCOLLNRPGM(_T(MSG_OK)); + SERIAL_PROTOCOLLNRPGM(MSG_OK); } #if MOTHERBOARD == BOARD_RAMBO_MINI_1_0 || MOTHERBOARD == BOARD_RAMBO_MINI_1_3 diff --git a/Firmware/messages.c b/Firmware/messages.c index a71ce867..045d4482 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -60,7 +60,6 @@ const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9"); const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); ////c=0 r=0 const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////c=0 r=0 const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////c=0 r=0 -const char MSG_OK[] PROGMEM_I1 = ISTR("ok"); ////c=0 r=0 const char MSG_PAPER[] PROGMEM_I1 = ISTR("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."); ////c=20 r=8 const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=4 const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20 r=0 @@ -122,3 +121,4 @@ const char MSG_TMC_OVERTEMP[] PROGMEM_N1 = "TMC DRIVER OVERTEMP"; ////c=0 r=0 const char MSG_Enqueing[] PROGMEM_N1 = "enqueing \""; ////c=0 r=0 const char MSG_ENDSTOPS_HIT[] PROGMEM_N1 = "endstops hit: "; ////c=0 r=0 const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_N1 = "error writing to file"; ////c=0 r=0 +const char MSG_OK[] PROGMEM_N1 = "ok"; ////c=0 r=0 diff --git a/Firmware/messages.h b/Firmware/messages.h index 195ebef7..a834a0ce 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -61,7 +61,6 @@ extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[]; extern const char MSG_MENU_CALIBRATION[]; extern const char MSG_NO[]; extern const char MSG_NOZZLE[]; -extern const char MSG_OK[]; extern const char MSG_PAPER[]; extern const char MSG_PLACE_STEEL_SHEET[]; extern const char MSG_PLEASE_WAIT[]; @@ -123,6 +122,7 @@ extern const char MSG_TMC_OVERTEMP[]; extern const char MSG_Enqueing[]; extern const char MSG_ENDSTOPS_HIT[]; extern const char MSG_SD_ERR_WRITE_TO_FILE[]; +extern const char MSG_OK[]; #if defined(__cplusplus) } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 61f006b5..3f0ecf96 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -553,9 +553,6 @@ #MSG_NOZZLE c=0 r=0 "Nozzle" -#MSG_OK c=0 r=0 -"ok" - #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 "Old settings found. Default PID, Esteps etc. will be set." diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 06bf55b9..93a70dbd 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -738,10 +738,6 @@ "Nozzle" "Tryska" -#MSG_OK c=0 r=0 -"ok" -"\x00" - #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 "Old settings found. Default PID, Esteps etc. will be set." "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index cef6c25c..97110fee 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -738,10 +738,6 @@ "Nozzle" "Duese" -#MSG_OK c=0 r=0 -"ok" -"\x00" - #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 "Old settings found. Default PID, Esteps etc. will be set." "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 6eadb62b..2291f243 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -738,10 +738,6 @@ "Nozzle" "Boquilla" -#MSG_OK c=0 r=0 -"ok" -"\x00" - #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 "Old settings found. Default PID, Esteps etc. will be set." "Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 7f5a4e2e..609b910f 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -738,10 +738,6 @@ "Nozzle" "Buse" -#MSG_OK c=0 r=0 -"ok" -"\x00" - #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 "Old settings found. Default PID, Esteps etc. will be set." "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront pris." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 3079f3ea..8c54d55a 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -738,10 +738,6 @@ "Nozzle" "Ugello" -#MSG_OK c=0 r=0 -"ok" -"\x00" - #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 "Old settings found. Default PID, Esteps etc. will be set." "Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 76877551..c83a69c7 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -738,10 +738,6 @@ "Nozzle" "Dysza" -#MSG_OK c=0 r=0 -"ok" -"\x00" - #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 "Old settings found. Default PID, Esteps etc. will be set." "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp." From f4bbce41424bffcdb4d9674ec83e7f5dcaeb4b87 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:15:22 +0100 Subject: [PATCH 17/29] Lang - text "open failed, File: " removed from dictionary --- Firmware/cardreader.cpp | 6 +++--- Firmware/messages.c | 2 +- Firmware/messages.h | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 10 files changed, 5 insertions(+), 32 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index e9857894..2476dc15 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -330,7 +330,7 @@ void CardReader::diveSubfolder (const char *fileName, SdFile& dir) SERIAL_ECHOLN(subdirname); if (!dir.open(curDir, subdirname, O_READ)) { - SERIAL_PROTOCOLRPGM(_T(MSG_SD_OPEN_FILE_FAIL)); + SERIAL_PROTOCOLRPGM(MSG_SD_OPEN_FILE_FAIL); SERIAL_PROTOCOL(subdirname); SERIAL_PROTOCOLLNPGM("."); return; @@ -431,7 +431,7 @@ void CardReader::openFile(const char* name,bool read, bool replace_current/*=tru } else { - SERIAL_PROTOCOLRPGM(_T(MSG_SD_OPEN_FILE_FAIL)); + SERIAL_PROTOCOLRPGM(MSG_SD_OPEN_FILE_FAIL); SERIAL_PROTOCOL(fname); SERIAL_PROTOCOLLNPGM("."); } @@ -440,7 +440,7 @@ void CardReader::openFile(const char* name,bool read, bool replace_current/*=tru { //write if (!file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) { - SERIAL_PROTOCOLRPGM(_T(MSG_SD_OPEN_FILE_FAIL)); + SERIAL_PROTOCOLRPGM(MSG_SD_OPEN_FILE_FAIL); SERIAL_PROTOCOL(fname); SERIAL_PROTOCOLLNPGM("."); } diff --git a/Firmware/messages.c b/Firmware/messages.c index 045d4482..cf64aa7d 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -72,7 +72,6 @@ const char MSG_RECOVER_PRINT[] PROGMEM_I1 = ISTR("Blackout occurred. Recover pri const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\xF8" "Refresh"); ////c=0 r=0 const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); ////c=0 r=0 const char MSG_REMOVE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please remove steel sheet from heatbed."); ////c=20 r=4 -const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_I1 = ISTR("open failed, File: "); ////c=0 r=0 const char MSG_SELFTEST_COOLING_FAN[] PROGMEM_I1 = ISTR("Front print fan?"); ////c=20 r=0 const char MSG_SELFTEST_EXTRUDER_FAN[] PROGMEM_I1 = ISTR("Left hotend fan?"); ////c=20 r=0 const char MSG_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("Selftest failed "); ////c=20 r=0 @@ -122,3 +121,4 @@ const char MSG_Enqueing[] PROGMEM_N1 = "enqueing \""; ////c=0 r=0 const char MSG_ENDSTOPS_HIT[] PROGMEM_N1 = "endstops hit: "; ////c=0 r=0 const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_N1 = "error writing to file"; ////c=0 r=0 const char MSG_OK[] PROGMEM_N1 = "ok"; ////c=0 r=0 +const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_N1 = "open failed, File: "; ////c=0 r=0 diff --git a/Firmware/messages.h b/Firmware/messages.h index a834a0ce..3f28d031 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -73,7 +73,6 @@ extern const char MSG_RECOVER_PRINT[]; extern const char MSG_REFRESH[]; extern const char MSG_REMOVE_STEEL_SHEET[]; extern const char MSG_RESUMING_PRINT[]; -extern const char MSG_SD_OPEN_FILE_FAIL[]; extern const char MSG_SD_WORKDIR_FAIL[]; extern const char MSG_SELFTEST_COOLING_FAN[]; extern const char MSG_SELFTEST_EXTRUDER_FAN[]; @@ -123,6 +122,7 @@ extern const char MSG_Enqueing[]; extern const char MSG_ENDSTOPS_HIT[]; extern const char MSG_SD_ERR_WRITE_TO_FILE[]; extern const char MSG_OK[]; +extern const char MSG_SD_OPEN_FILE_FAIL[]; #if defined(__cplusplus) } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 3f0ecf96..2b4c337a 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -556,9 +556,6 @@ #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 "Old settings found. Default PID, Esteps etc. will be set." -#MSG_SD_OPEN_FILE_FAIL c=0 r=0 -"open failed, File: " - #MSG_ENDSTOP_OPEN c=0 r=0 "open" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 93a70dbd..00191fb1 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -742,10 +742,6 @@ "Old settings found. Default PID, Esteps etc. will be set." "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." -#MSG_SD_OPEN_FILE_FAIL c=0 r=0 -"open failed, File: " -"nelze otevrit, Soubor: " - #MSG_ENDSTOP_OPEN c=0 r=0 "open" "otevrit" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 97110fee..23835399 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -742,10 +742,6 @@ "Old settings found. Default PID, Esteps etc. will be set." "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt." -#MSG_SD_OPEN_FILE_FAIL c=0 r=0 -"open failed, File: " -"Fehler beim Oeffnen der Datei: " - #MSG_ENDSTOP_OPEN c=0 r=0 "open" "offen" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 2291f243..6ed96ff9 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -742,10 +742,6 @@ "Old settings found. Default PID, Esteps etc. will be set." "Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc" -#MSG_SD_OPEN_FILE_FAIL c=0 r=0 -"open failed, File: " -"error apertura, Arch.: " - #MSG_ENDSTOP_OPEN c=0 r=0 "open" "abrir" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 609b910f..aae16a9d 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -742,10 +742,6 @@ "Old settings found. Default PID, Esteps etc. will be set." "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront pris." -#MSG_SD_OPEN_FILE_FAIL c=0 r=0 -"open failed, File: " -"Echec ouverture, Fichier :" - #MSG_ENDSTOP_OPEN c=0 r=0 "open" "ouvrir" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 8c54d55a..3d213703 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -742,10 +742,6 @@ "Old settings found. Default PID, Esteps etc. will be set." "Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati" -#MSG_SD_OPEN_FILE_FAIL c=0 r=0 -"open failed, File: " -"apertura fallita, File: " - #MSG_ENDSTOP_OPEN c=0 r=0 "open" "apri" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index c83a69c7..6bf9aeda 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -742,10 +742,6 @@ "Old settings found. Default PID, Esteps etc. will be set." "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp." -#MSG_SD_OPEN_FILE_FAIL c=0 r=0 -"open failed, File: " -"niepowodzenie otwarcia, Plik:" - #MSG_ENDSTOP_OPEN c=0 r=0 "open" "otworz" From 1cbb261707b8f59f9bea069c0589bb441c65fb79 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:18:25 +0100 Subject: [PATCH 18/29] Lang - text "open" removed from dictionary --- Firmware/Marlin_main.cpp | 12 ++++++------ Firmware/messages.c | 2 +- Firmware/messages.h | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 10 files changed, 8 insertions(+), 35 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c70ed4ca..fcc99e11 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5781,7 +5781,7 @@ Sigma_Exit: if(READ(X_MIN_PIN)^X_MIN_ENDSTOP_INVERTING){ SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); }else{ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } SERIAL_PROTOCOLLN(""); #endif @@ -5790,7 +5790,7 @@ Sigma_Exit: if(READ(X_MAX_PIN)^X_MAX_ENDSTOP_INVERTING){ SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); }else{ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } SERIAL_PROTOCOLLN(""); #endif @@ -5799,7 +5799,7 @@ Sigma_Exit: if(READ(Y_MIN_PIN)^Y_MIN_ENDSTOP_INVERTING){ SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); }else{ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } SERIAL_PROTOCOLLN(""); #endif @@ -5808,7 +5808,7 @@ Sigma_Exit: if(READ(Y_MAX_PIN)^Y_MAX_ENDSTOP_INVERTING){ SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); }else{ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } SERIAL_PROTOCOLLN(""); #endif @@ -5817,7 +5817,7 @@ Sigma_Exit: if(READ(Z_MIN_PIN)^Z_MIN_ENDSTOP_INVERTING){ SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); }else{ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } SERIAL_PROTOCOLLN(""); #endif @@ -5826,7 +5826,7 @@ Sigma_Exit: if(READ(Z_MAX_PIN)^Z_MAX_ENDSTOP_INVERTING){ SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); }else{ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } SERIAL_PROTOCOLLN(""); #endif diff --git a/Firmware/messages.c b/Firmware/messages.c index cf64aa7d..275afc9b 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -26,7 +26,6 @@ const char MSG_CRASHDETECT_NA[] PROGMEM_I1 = ISTR("Crash det. [N/A]"); ////c=0 const char MSG_CRASHDETECT_OFF[] PROGMEM_I1 = ISTR("Crash det. [off]"); ////c=0 r=0 const char MSG_CRASHDETECT_ON[] PROGMEM_I1 = ISTR("Crash det. [on]"); ////c=0 r=0 const char MSG_ENDSTOP_HIT[] PROGMEM_I1 = ISTR("TRIGGERED"); ////c=0 r=0 -const char MSG_ENDSTOP_OPEN[] PROGMEM_I1 = ISTR("open"); ////c=0 r=0 const char MSG_ERR_STOPPED[] PROGMEM_I1 = ISTR("Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"); ////c=0 r=0 const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////c=0 r=0 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 @@ -122,3 +121,4 @@ const char MSG_ENDSTOPS_HIT[] PROGMEM_N1 = "endstops hit: "; ////c=0 r=0 const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_N1 = "error writing to file"; ////c=0 r=0 const char MSG_OK[] PROGMEM_N1 = "ok"; ////c=0 r=0 const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_N1 = "open failed, File: "; ////c=0 r=0 +const char MSG_ENDSTOP_OPEN[] PROGMEM_N1 = "open"; ////c=0 r=0 diff --git a/Firmware/messages.h b/Firmware/messages.h index 3f28d031..202693b8 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -27,7 +27,6 @@ extern const char MSG_CRASHDETECT_NA[]; extern const char MSG_CRASHDETECT_OFF[]; extern const char MSG_CRASHDETECT_ON[]; extern const char MSG_ENDSTOP_HIT[]; -extern const char MSG_ENDSTOP_OPEN[]; extern const char MSG_ERR_STOPPED[]; extern const char MSG_ERROR[]; extern const char MSG_EXTRUDER[]; @@ -123,6 +122,7 @@ extern const char MSG_ENDSTOPS_HIT[]; extern const char MSG_SD_ERR_WRITE_TO_FILE[]; extern const char MSG_OK[]; extern const char MSG_SD_OPEN_FILE_FAIL[]; +extern const char MSG_ENDSTOP_OPEN[]; #if defined(__cplusplus) } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 2b4c337a..c7186ea7 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -556,9 +556,6 @@ #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 "Old settings found. Default PID, Esteps etc. will be set." -#MSG_ENDSTOP_OPEN c=0 r=0 -"open" - # "Now remove the test print from steel sheet." diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 00191fb1..e242b070 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -742,10 +742,6 @@ "Old settings found. Default PID, Esteps etc. will be set." "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." -#MSG_ENDSTOP_OPEN c=0 r=0 -"open" -"otevrit" - # "Now remove the test print from steel sheet." "Nyni odstrante testovaci vytisk z tiskoveho platu." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 23835399..c34f4f0b 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -742,10 +742,6 @@ "Old settings found. Default PID, Esteps etc. will be set." "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt." -#MSG_ENDSTOP_OPEN c=0 r=0 -"open" -"offen" - # "Now remove the test print from steel sheet." "Testdruck jetzt von Stahlblech entfernen." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 6ed96ff9..ce6598be 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -742,10 +742,6 @@ "Old settings found. Default PID, Esteps etc. will be set." "Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc" -#MSG_ENDSTOP_OPEN c=0 r=0 -"open" -"abrir" - # "Now remove the test print from steel sheet." "Ahora retira la prueba de la lamina de acero." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index aae16a9d..6f70d9b9 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -742,10 +742,6 @@ "Old settings found. Default PID, Esteps etc. will be set." "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront pris." -#MSG_ENDSTOP_OPEN c=0 r=0 -"open" -"ouvrir" - # "Now remove the test print from steel sheet." "Retirez maintenant l'impression de test de la feuille d'acier." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 3d213703..cb647d0a 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -742,10 +742,6 @@ "Old settings found. Default PID, Esteps etc. will be set." "Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati" -#MSG_ENDSTOP_OPEN c=0 r=0 -"open" -"apri" - # "Now remove the test print from steel sheet." "Ora rimuovete la stampa di prova dalla piastra in acciaio." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 6bf9aeda..1e489d20 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -742,10 +742,6 @@ "Old settings found. Default PID, Esteps etc. will be set." "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp." -#MSG_ENDSTOP_OPEN c=0 r=0 -"open" -"otworz" - # "Now remove the test print from steel sheet." "Teraz zdejmij wydruk testowy ze stolu." From f0e3021d33b8c941501a53b659bf23a6668abaec Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:20:24 +0100 Subject: [PATCH 19/29] Lang - text "openRoot failed" removed from dictionary --- Firmware/cardreader.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 2476dc15..20a94a5d 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -193,7 +193,7 @@ void CardReader::initsd() else if (!root.openRoot(&volume)) { SERIAL_ERROR_START; - SERIAL_ERRORLNRPGM(_i("openRoot failed"));////MSG_SD_OPENROOT_FAIL c=0 r=0 + SERIAL_ERRORLNRPGM(_n("openRoot failed"));////MSG_SD_OPENROOT_FAIL c=0 r=0 } else { diff --git a/lang/lang_en.txt b/lang/lang_en.txt index c7186ea7..c4234aff 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -562,9 +562,6 @@ # "Nozzle FAN" -#MSG_SD_OPENROOT_FAIL c=0 r=0 -"openRoot failed" - #MSG_PAUSE_PRINT c=0 r=0 "Pause print" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index e242b070..40f28ecf 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -750,10 +750,6 @@ "Nozzle FAN" "\x00" -#MSG_SD_OPENROOT_FAIL c=0 r=0 -"openRoot failed" -"openRoot selhal" - #MSG_PAUSE_PRINT c=0 r=0 "Pause print" "Pozastavit tisk" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index c34f4f0b..e3c0ed57 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -750,10 +750,6 @@ "Nozzle FAN" "\x00" -#MSG_SD_OPENROOT_FAIL c=0 r=0 -"openRoot failed" -"Zugriff auf Hauptverzeichnis misslungen" - #MSG_PAUSE_PRINT c=0 r=0 "Pause print" "Druck pausieren" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index ce6598be..168dbb84 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -750,10 +750,6 @@ "Nozzle FAN" "\x00" -#MSG_SD_OPENROOT_FAIL c=0 r=0 -"openRoot failed" -"fallo openRoot " - #MSG_PAUSE_PRINT c=0 r=0 "Pause print" "Pausar impresion" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 6f70d9b9..df6b586a 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -750,10 +750,6 @@ "Nozzle FAN" "Vent buse" -#MSG_SD_OPENROOT_FAIL c=0 r=0 -"openRoot failed" -"Echec openRoot" - #MSG_PAUSE_PRINT c=0 r=0 "Pause print" "Pause de l'impres" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index cb647d0a..8585b63e 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -750,10 +750,6 @@ "Nozzle FAN" "\x00" -#MSG_SD_OPENROOT_FAIL c=0 r=0 -"openRoot failed" -"openRoot fallito" - #MSG_PAUSE_PRINT c=0 r=0 "Pause print" "Metti in pausa" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 1e489d20..94f658cb 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -750,10 +750,6 @@ "Nozzle FAN" "\x00" -#MSG_SD_OPENROOT_FAIL c=0 r=0 -"openRoot failed" -"niepowodzenie openRoot " - #MSG_PAUSE_PRINT c=0 r=0 "Pause print" "Wstrzymanie wydruku" From 0fceade481b3804dfdf5d808e0a8a2e330b96375 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:24:21 +0100 Subject: [PATCH 20/29] Lang - text "PowerUp" removed from dictionary --- Firmware/Marlin_main.cpp | 4 ++-- Firmware/messages.c | 2 +- Firmware/messages.h | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 10 files changed, 4 insertions(+), 31 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index fcc99e11..1d433574 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1150,12 +1150,12 @@ void setup() // Check startup - does nothing if bootloader sets MCUSR to 0 byte mcu = MCUSR; -/* if (mcu & 1) SERIAL_ECHOLNRPGM(_T(MSG_POWERUP)); +/* if (mcu & 1) SERIAL_ECHOLNRPGM(MSG_POWERUP); if (mcu & 2) SERIAL_ECHOLNRPGM(MSG_EXTERNAL_RESET); if (mcu & 4) SERIAL_ECHOLNRPGM(MSG_BROWNOUT_RESET); if (mcu & 8) SERIAL_ECHOLNRPGM(MSG_WATCHDOG_RESET); if (mcu & 32) SERIAL_ECHOLNRPGM(MSG_SOFTWARE_RESET);*/ - if (mcu & 1) puts_P(_T(MSG_POWERUP)); + if (mcu & 1) puts_P(MSG_POWERUP); if (mcu & 2) puts_P(MSG_EXTERNAL_RESET); if (mcu & 4) puts_P(MSG_BROWNOUT_RESET); if (mcu & 8) puts_P(MSG_WATCHDOG_RESET); diff --git a/Firmware/messages.c b/Firmware/messages.c index 275afc9b..74af5ad6 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -62,7 +62,6 @@ const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////c=0 r=0 const char MSG_PAPER[] PROGMEM_I1 = ISTR("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."); ////c=20 r=8 const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=4 const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20 r=0 -const char MSG_POWERUP[] PROGMEM_I1 = ISTR("PowerUp"); ////c=0 r=0 const char MSG_PREHEAT_NOZZLE[] PROGMEM_I1 = ISTR("Preheat the nozzle!"); ////c=20 r=0 const char MSG_PRESS_TO_UNLOAD[] PROGMEM_I1 = ISTR("Please press the knob to unload filament"); ////c=20 r=4 const char MSG_PRINT_ABORTED[] PROGMEM_I1 = ISTR("Print aborted"); ////c=20 r=0 @@ -122,3 +121,4 @@ const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_N1 = "error writing to file"; //// const char MSG_OK[] PROGMEM_N1 = "ok"; ////c=0 r=0 const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_N1 = "open failed, File: "; ////c=0 r=0 const char MSG_ENDSTOP_OPEN[] PROGMEM_N1 = "open"; ////c=0 r=0 +const char MSG_POWERUP[] PROGMEM_N1 = "PowerUp"; ////c=0 r=0 diff --git a/Firmware/messages.h b/Firmware/messages.h index 202693b8..d41be999 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -63,7 +63,6 @@ extern const char MSG_NOZZLE[]; extern const char MSG_PAPER[]; extern const char MSG_PLACE_STEEL_SHEET[]; extern const char MSG_PLEASE_WAIT[]; -extern const char MSG_POWERUP[]; extern const char MSG_PREHEAT_NOZZLE[]; extern const char MSG_PRESS_TO_UNLOAD[]; extern const char MSG_PRINT_ABORTED[]; @@ -123,6 +122,7 @@ extern const char MSG_SD_ERR_WRITE_TO_FILE[]; extern const char MSG_OK[]; extern const char MSG_SD_OPEN_FILE_FAIL[]; extern const char MSG_ENDSTOP_OPEN[]; +extern const char MSG_POWERUP[]; #if defined(__cplusplus) } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index c4234aff..d9af4a38 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -628,9 +628,6 @@ #MSG_PLEASE_WAIT c=20 r=0 "Please wait" -#MSG_POWERUP c=0 r=0 -"PowerUp" - # "Please remove shipping helpers first." diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 40f28ecf..178b3cdb 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -838,10 +838,6 @@ "Please wait" "Prosim cekejte" -#MSG_POWERUP c=0 r=0 -"PowerUp" -"Zapnuti" - # "Please remove shipping helpers first." "Nejprve prosim sundejte transportni soucastky." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index e3c0ed57..79e363e7 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -838,10 +838,6 @@ "Please wait" "Bitte warten" -#MSG_POWERUP c=0 r=0 -"PowerUp" -"Einschalten" - # "Please remove shipping helpers first." "Bitte zuerst Transportsicherungen entfernen." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 168dbb84..4f16f310 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -838,10 +838,6 @@ "Please wait" "Por Favor Espere" -#MSG_POWERUP c=0 r=0 -"PowerUp" -"Encendido" - # "Please remove shipping helpers first." "Por favor retira los soportes de envio primero." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index df6b586a..d03f3b4f 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -838,10 +838,6 @@ "Please wait" "Merci de patienter" -#MSG_POWERUP c=0 r=0 -"PowerUp" -"Demarrage" - # "Please remove shipping helpers first." "Veuillez retirer d'abord les protections d'envoi." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 8585b63e..b0bc70cc 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -838,10 +838,6 @@ "Please wait" "Attendere" -#MSG_POWERUP c=0 r=0 -"PowerUp" -"Accendi" - # "Please remove shipping helpers first." "Per favore rimuovete i materiali da spedizione" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 94f658cb..fd7da831 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -838,10 +838,6 @@ "Please wait" "Prosze czekac" -#MSG_POWERUP c=0 r=0 -"PowerUp" -"Uruchamianie" - # "Please remove shipping helpers first." "Najpierw usun zabezpieczenia transportowe" From 123725edd1b0b4b6eecd369def2a502ad007a41b Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:30:53 +0100 Subject: [PATCH 21/29] Lang - duplicate text "Some problem encountered, Z-levelling enforced ..." removed --- Firmware/Marlin_main.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 1d433574..d225596b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4516,7 +4516,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) Sound_MakeSound(e_SOUND_TYPE_StandardAlert); bool bState; do { // repeat until Z-leveling o.k. - lcd_display_message_fullscreen_P(_i("Some problem encountered, Z-levelling enforced ...")); + lcd_display_message_fullscreen_P(_i("Some problem encountered, Z-leveling enforced ...")); #ifdef TMC2130 lcd_wait_for_click_delay(MSG_BED_LEVELING_FAILED_TIMEOUT); calibrate_z_auto(); // Z-leveling (X-assembly stay up!!!) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index d9af4a38..213d11c4 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -814,9 +814,6 @@ # "Some problem encountered, Z-leveling enforced ..." -# -"Some problem encountered, Z-levelling enforced ..." - #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 178b3cdb..06b2de2c 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1086,10 +1086,6 @@ "Some problem encountered, Z-leveling enforced ..." "Vyskytl se problem, srovnavam osu Z ..." -# -"Some problem encountered, Z-levelling enforced ..." -"\x00" - #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" "Zvuk [jednou]" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 79e363e7..203ed4a9 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1086,10 +1086,6 @@ "Some problem encountered, Z-leveling enforced ..." "Fehler aufgetreten, Z-Kalibrierung erforderlich..." -# -"Some problem encountered, Z-levelling enforced ..." -"\x00" - #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" "Sound [einmal]" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 4f16f310..4ca7f6cc 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1086,10 +1086,6 @@ "Some problem encountered, Z-leveling enforced ..." "Problema encontrado, nivelacion Z forzosa ..." -# -"Some problem encountered, Z-levelling enforced ..." -"\x00" - #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" "Sonido [una vez]" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index d03f3b4f..8118182c 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1086,10 +1086,6 @@ "Some problem encountered, Z-leveling enforced ..." "Problemes rencontres, nivellement de l'axe Z applique..." -# -"Some problem encountered, Z-levelling enforced ..." -"\x00" - #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" "Son [une fois]" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index b0bc70cc..f4560e06 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1086,10 +1086,6 @@ "Some problem encountered, Z-leveling enforced ..." "Sono stati rilevati problemi, avviato livellamento Z ..." -# -"Some problem encountered, Z-levelling enforced ..." -"\x00" - #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" "Suono [singolo]" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index fd7da831..c893b5e3 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1086,10 +1086,6 @@ "Some problem encountered, Z-leveling enforced ..." "Wykryto problem, wymuszono poziomowanie osi Z ..." -# -"Some problem encountered, Z-levelling enforced ..." -"\x00" - #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" "Dzwiek [1-raz]" From 123bef636ac0d171f89c6b055ec174715c19b15b Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:33:15 +0100 Subject: [PATCH 22/29] Lang - text "Printer halted. kill() called!" removed from dictionary --- Firmware/Marlin_main.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d225596b..0bb7f921 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7549,7 +7549,7 @@ void kill(const char *full_screen_message, unsigned char id) pinMode(PS_ON_PIN,INPUT); #endif SERIAL_ERROR_START; - SERIAL_ERRORLNRPGM(_i("Printer halted. kill() called!"));////MSG_ERR_KILLED c=0 r=0 + SERIAL_ERRORLNRPGM(_n("Printer halted. kill() called!"));////MSG_ERR_KILLED c=0 r=0 if (full_screen_message != NULL) { SERIAL_ERRORLNRPGM(full_screen_message); lcd_display_message_fullscreen_P(full_screen_message); diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 213d11c4..e95ad0f9 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -661,9 +661,6 @@ #MSG_PRINT_PAUSED c=20 r=1 "Print paused" -#MSG_ERR_KILLED c=0 r=0 -"Printer halted. kill() called!" - # "Press the knob to resume nozzle temperature." diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 06b2de2c..1d6d535b 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -882,10 +882,6 @@ "Print paused" "Tisk pozastaven" -#MSG_ERR_KILLED c=0 r=0 -"Printer halted. kill() called!" -"Tiskarna zastavena. Volano kill()!" - # "Press the knob to resume nozzle temperature." "Pro pokracovani nahrivani trysky stisknete tlacitko." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 203ed4a9..287e2dd5 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -882,10 +882,6 @@ "Print paused" "Druck pausiert" -#MSG_ERR_KILLED c=0 r=0 -"Printer halted. kill() called!" -"Printer gestoppt. kill() aufgerufen!" - # "Press the knob to resume nozzle temperature." "Druecken Sie den Knopf um die Duesentemperatur wiederherzustellen" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 4ca7f6cc..da32227b 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -882,10 +882,6 @@ "Print paused" "Impresion en pausa" -#MSG_ERR_KILLED c=0 r=0 -"Printer halted. kill() called!" -"Impresora detenida. kill() activado!" - # "Press the knob to resume nozzle temperature." "Presiona el dial para continuar con la temperatura de la boquilla." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 8118182c..73512edd 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -882,10 +882,6 @@ "Print paused" "Impression en pause" -#MSG_ERR_KILLED c=0 r=0 -"Printer halted. kill() called!" -"Imprimante stoppee. kill() appelee !" - # "Press the knob to resume nozzle temperature." "Appuyez sur le bouton pour poursuivre la mise en temperature de la buse." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index f4560e06..5973e08e 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -882,10 +882,6 @@ "Print paused" "Stampa in pausa" -#MSG_ERR_KILLED c=0 r=0 -"Printer halted. kill() called!" -"Stampante ferma. kill () chiamato!" - # "Press the knob to resume nozzle temperature." "Premete la manopola per recuperare la temperatura dell'ugello." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index c893b5e3..6b3c0443 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -882,10 +882,6 @@ "Print paused" "Druk wstrzymany" -#MSG_ERR_KILLED c=0 r=0 -"Printer halted. kill() called!" -"Drukarka zatrzymana. Wywolano komende kill()!" - # "Press the knob to resume nozzle temperature." "Wcisnij pokretlo aby wznowic podgrzewanie dyszy." From 7426efac9b6d6e3410ee92ce6f7ab6d2d576cd4e Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:36:38 +0100 Subject: [PATCH 23/29] Lang - text "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" removed from dictionary --- Firmware/Marlin_main.cpp | 2 +- Firmware/cmdqueue.cpp | 2 +- Firmware/messages.c | 2 +- Firmware/messages.h | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 11 files changed, 4 insertions(+), 31 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 0bb7f921..a5b657d4 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7582,7 +7582,7 @@ void Stop() Stopped = true; Stopped_gcode_LastN = gcode_LastN; // Save last g_code for restart SERIAL_ERROR_START; - SERIAL_ERRORLNRPGM(_T(MSG_ERR_STOPPED)); + SERIAL_ERRORLNRPGM(MSG_ERR_STOPPED); LCD_MESSAGERPGM(_T(MSG_STOPPED)); } } diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index d32926a4..a78d9f12 100644 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -484,7 +484,7 @@ void get_command() if (Stopped == true) { int gcode = strtol(strchr_pointer+1, NULL, 10); if (gcode >= 0 && gcode <= 3) { - SERIAL_ERRORLNRPGM(_T(MSG_ERR_STOPPED)); + SERIAL_ERRORLNRPGM(MSG_ERR_STOPPED); LCD_MESSAGERPGM(_T(MSG_STOPPED)); } } diff --git a/Firmware/messages.c b/Firmware/messages.c index 74af5ad6..f8a10342 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -26,7 +26,6 @@ const char MSG_CRASHDETECT_NA[] PROGMEM_I1 = ISTR("Crash det. [N/A]"); ////c=0 const char MSG_CRASHDETECT_OFF[] PROGMEM_I1 = ISTR("Crash det. [off]"); ////c=0 r=0 const char MSG_CRASHDETECT_ON[] PROGMEM_I1 = ISTR("Crash det. [on]"); ////c=0 r=0 const char MSG_ENDSTOP_HIT[] PROGMEM_I1 = ISTR("TRIGGERED"); ////c=0 r=0 -const char MSG_ERR_STOPPED[] PROGMEM_I1 = ISTR("Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"); ////c=0 r=0 const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////c=0 r=0 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1 @@ -122,3 +121,4 @@ const char MSG_OK[] PROGMEM_N1 = "ok"; ////c=0 r=0 const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_N1 = "open failed, File: "; ////c=0 r=0 const char MSG_ENDSTOP_OPEN[] PROGMEM_N1 = "open"; ////c=0 r=0 const char MSG_POWERUP[] PROGMEM_N1 = "PowerUp"; ////c=0 r=0 +const char MSG_ERR_STOPPED[] PROGMEM_N1 = "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"; ////c=0 r=0 diff --git a/Firmware/messages.h b/Firmware/messages.h index d41be999..d910d485 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -27,7 +27,6 @@ extern const char MSG_CRASHDETECT_NA[]; extern const char MSG_CRASHDETECT_OFF[]; extern const char MSG_CRASHDETECT_ON[]; extern const char MSG_ENDSTOP_HIT[]; -extern const char MSG_ERR_STOPPED[]; extern const char MSG_ERROR[]; extern const char MSG_EXTRUDER[]; extern const char MSG_FILAMENT[]; @@ -123,6 +122,7 @@ extern const char MSG_OK[]; extern const char MSG_SD_OPEN_FILE_FAIL[]; extern const char MSG_ENDSTOP_OPEN[]; extern const char MSG_POWERUP[]; +extern const char MSG_ERR_STOPPED[]; #if defined(__cplusplus) } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index e95ad0f9..dd298e27 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -670,9 +670,6 @@ # "Print FAN" -#MSG_ERR_STOPPED c=0 r=0 -"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" - #WELCOME_MSG c=20 r=0 "Prusa i3 MK2.5 ready." diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 1d6d535b..836f6c6f 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -894,10 +894,6 @@ "Print FAN" "\x00" -#MSG_ERR_STOPPED c=0 r=0 -"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" -"Tisk zastaven kvuli chybam. Opravte chybu a pouzijte M999 pro restart. (Teplota resetovana, nastavte ji po restartu)" - #WELCOME_MSG c=20 r=0 "Prusa i3 MK2.5 ready." "Prusa i3 MK2.5 ok." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 287e2dd5..14b4b55f 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -894,10 +894,6 @@ "Print FAN" "\x00" -#MSG_ERR_STOPPED c=0 r=0 -"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" -"Drucker aufgrund von Fehlern gestoppt. Fehler beheben und mit M999 neu starten. (Temperatur wird zurueckgesetzt. Nach dem Neustart neu einstellen!)" - #WELCOME_MSG c=20 r=0 "Prusa i3 MK2.5 ready." "Prusa i3 MK2.5 bereit." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index da32227b..68fb8044 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -894,10 +894,6 @@ "Print FAN" "\x00" -#MSG_ERR_STOPPED c=0 r=0 -"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" -"Impresora parada debido a errores. Arregle el error y use M999 para reinicio. (Temperatura se resetea. Ajustar despues de reinicio)" - #WELCOME_MSG c=20 r=0 "Prusa i3 MK2.5 ready." "Preparado para Prusa i3 MK2.5." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 73512edd..c3f4102e 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -894,10 +894,6 @@ "Print FAN" "Vent extru" -#MSG_ERR_STOPPED c=0 r=0 -"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" -"Imprimante arretee a cause d'erreurs. Corrigez l'erreur et utilisez M999 pour redemarrer. (La temperature est reinitilisee. Parametrez la apres le redemarrage)" - #WELCOME_MSG c=20 r=0 "Prusa i3 MK2.5 ready." "Prusa i3 MK2.5 prete." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 5973e08e..528b1f75 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -894,10 +894,6 @@ "Print FAN" "\x00" -#MSG_ERR_STOPPED c=0 r=0 -"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" -"La stampante si e fermata a causa di errori. Correggete l'errore e usate M999 per riavviare. (La temperatura viene resettate. Impostatela dopo il riavvio)" - #WELCOME_MSG c=20 r=0 "Prusa i3 MK2.5 ready." "\x00" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 6b3c0443..5a10f951 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -894,10 +894,6 @@ "Print FAN" "\x00" -#MSG_ERR_STOPPED c=0 r=0 -"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" -"Drukarka zatrzymana z powodu bledow. Usun problem i uzyj M999 aby zrestartowac. (Temperatura jest zresetowana, ustaw ja po restarcie)" - #WELCOME_MSG c=20 r=0 "Prusa i3 MK2.5 ready." "Prusa i3 MK2.5 gotowa" From 72c78106419efbb721174f21b3f8b5e91d829774 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:38:20 +0100 Subject: [PATCH 24/29] Lang - text "Resend" removed from dictionary --- Firmware/Marlin_main.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a5b657d4..f10626b0 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7079,7 +7079,7 @@ void FlushSerialRequestResend() { //char cmdbuffer[bufindr][100]="Resend:"; MYSERIAL.flush(); - printf_P(_N("%S: %ld\n%S\n"), _i("Resend"), gcode_LastN + 1, MSG_OK); + printf_P(_N("%S: %ld\n%S\n"), _n("Resend"), gcode_LastN + 1, MSG_OK); } // Confirm the execution of a command, if sent from a serial line. diff --git a/lang/lang_en.txt b/lang/lang_en.txt index dd298e27..e0456587 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -709,9 +709,6 @@ #MSG_SECOND_SERIAL_ON c=17 r=1 "RPi port [on]" -# -"Resend" - #MSG_SECOND_SERIAL_OFF c=17 r=1 "RPi port [off]" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 836f6c6f..d121e2e0 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -946,10 +946,6 @@ "RPi port [on]" "RPi port [zap]" -# -"Resend" -"Poslat znovu" - #MSG_SECOND_SERIAL_OFF c=17 r=1 "RPi port [off]" "RPi port [vyp]" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 14b4b55f..2ef3a398 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -946,10 +946,6 @@ "RPi port [on]" "RPi Port [an]" -# -"Resend" -"Wiederholen" - #MSG_SECOND_SERIAL_OFF c=17 r=1 "RPi port [off]" "RPi Port [aus]" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 68fb8044..09f41d0b 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -946,10 +946,6 @@ "RPi port [on]" "Puerto RPi [act]" -# -"Resend" -"Reenviar: " - #MSG_SECOND_SERIAL_OFF c=17 r=1 "RPi port [off]" "Puerto RPi [ina]" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index c3f4102e..79eae3a6 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -946,10 +946,6 @@ "RPi port [on]" "Port RPi [on]" -# -"Resend" -"Renvoyer" - #MSG_SECOND_SERIAL_OFF c=17 r=1 "RPi port [off]" "Port RPi [off]" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 528b1f75..f249102d 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -946,10 +946,6 @@ "RPi port [on]" "Porta RPi [on]" -# -"Resend" -"Ripeti" - #MSG_SECOND_SERIAL_OFF c=17 r=1 "RPi port [off]" "Porta RPi [off]" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 5a10f951..6894a25f 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -946,10 +946,6 @@ "RPi port [on]" "Port RPi [wl]" -# -"Resend" -"Wyslij ponownie" - #MSG_SECOND_SERIAL_OFF c=17 r=1 "RPi port [off]" "Port RPi [wyl]" From 3384dd84872f0d93699616143e2dd1ead02d6777 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:39:35 +0100 Subject: [PATCH 25/29] Lang - text "SD card ok" removed from dictionary --- Firmware/cardreader.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 20a94a5d..b9096849 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -199,7 +199,7 @@ void CardReader::initsd() { cardOK = true; SERIAL_ECHO_START; - SERIAL_ECHOLNRPGM(_i("SD card ok"));////MSG_SD_CARD_OK c=0 r=0 + SERIAL_ECHOLNRPGM(_n("SD card ok"));////MSG_SD_CARD_OK c=0 r=0 } workDir=root; curDir=&root; diff --git a/lang/lang_en.txt b/lang/lang_en.txt index e0456587..45ea848c 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -721,9 +721,6 @@ #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 "SD card [flshAir]" -#MSG_SD_CARD_OK c=0 r=0 -"SD card ok" - # "Right" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index d121e2e0..ea288e45 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -962,10 +962,6 @@ "SD card [flshAir]" "SD card [FlshAir]" -#MSG_SD_CARD_OK c=0 r=0 -"SD card ok" -"SD karta ok" - # "Right" "Vpravo" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 2ef3a398..9efde0f6 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -962,10 +962,6 @@ "SD card [flshAir]" "SD Karte[flshAir]" -#MSG_SD_CARD_OK c=0 r=0 -"SD card ok" -"SD Karte ok" - # "Right" "Rechts" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 09f41d0b..bc917a0b 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -962,10 +962,6 @@ "SD card [flshAir]" "Tarj. SD[FlshAir]" -#MSG_SD_CARD_OK c=0 r=0 -"SD card ok" -"Tarj. SD ok" - # "Right" "Derecha" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 79eae3a6..7267ffb5 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -962,10 +962,6 @@ "SD card [flshAir]" "Carte SD[flshAir]" -#MSG_SD_CARD_OK c=0 r=0 -"SD card ok" -"Carte SD ok" - # "Right" "Droite" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index f249102d..d2aa788d 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -962,10 +962,6 @@ "SD card [flshAir]" "Mem. SD [flshAir]" -#MSG_SD_CARD_OK c=0 r=0 -"SD card ok" -"Memoria SD ok" - # "Right" "Destra" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 6894a25f..d35578de 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -962,10 +962,6 @@ "SD card [flshAir]" "Karta SD[FlshAir]" -#MSG_SD_CARD_OK c=0 r=0 -"SD card ok" -"Karta SD OK" - # "Right" "Prawa" From ddf898cb416e8d0cc0cb39cd2e5a2bedb2463683 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:41:00 +0100 Subject: [PATCH 26/29] Lang - text "SD init fail" removed from dictionary --- Firmware/cardreader.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index b9096849..4a146dd4 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -183,7 +183,7 @@ void CardReader::initsd() { //if (!card.init(SPI_HALF_SPEED,SDSS)) SERIAL_ECHO_START; - SERIAL_ECHOLNRPGM(_i("SD init fail"));////MSG_SD_INIT_FAIL c=0 r=0 + SERIAL_ECHOLNRPGM(_n("SD init fail"));////MSG_SD_INIT_FAIL c=0 r=0 } else if (!volume.init(&card)) { diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 45ea848c..29013f40 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -724,9 +724,6 @@ # "Right" -#MSG_SD_INIT_FAIL c=0 r=0 -"SD init fail" - #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 "Searching bed calibration point" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index ea288e45..6982adf6 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -966,10 +966,6 @@ "Right" "Vpravo" -#MSG_SD_INIT_FAIL c=0 r=0 -"SD init fail" -"Selhala inicializace SD" - #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 "Searching bed calibration point" "Hledam kalibracni bod podlozky" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 9efde0f6..307de091 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -966,10 +966,6 @@ "Right" "Rechts" -#MSG_SD_INIT_FAIL c=0 r=0 -"SD init fail" -"SD Init fehlerhaft" - #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 "Searching bed calibration point" "Suche Bett Kalibrierpunkt" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index bc917a0b..ae4148e1 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -966,10 +966,6 @@ "Right" "Derecha" -#MSG_SD_INIT_FAIL c=0 r=0 -"SD init fail" -"Error init SD" - #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 "Searching bed calibration point" "Buscando punto de calibracion base" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 7267ffb5..a98f6d9f 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -966,10 +966,6 @@ "Right" "Droite" -#MSG_SD_INIT_FAIL c=0 r=0 -"SD init fail" -"Echec init SD" - #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 "Searching bed calibration point" "Recherche du point de calibration du lit" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index d2aa788d..9a0c68ae 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -966,10 +966,6 @@ "Right" "Destra" -#MSG_SD_INIT_FAIL c=0 r=0 -"SD init fail" -"Inizializzazione Memoria SD Fallita" - #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 "Searching bed calibration point" "Ricerca dei punti di calibrazione del piano" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index d35578de..07f6d7e1 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -966,10 +966,6 @@ "Right" "Prawa" -#MSG_SD_INIT_FAIL c=0 r=0 -"SD init fail" -"Inicjalizacja karty SD nieudana" - #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 "Searching bed calibration point" "Szukam punktu kalibracyjnego na stole" From e9131542ca8edd1b59a0f8fc662e569fd977bd3d Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:43:21 +0100 Subject: [PATCH 27/29] Lang - text "Sleep..." removed from dictionary --- Firmware/Marlin_main.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f10626b0..e87eb911 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3749,7 +3749,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) codenum = 0; if(code_seen('P')) codenum = code_value(); // milliseconds to wait if(code_seen('S')) codenum = code_value() * 1000; // seconds to wait - if(codenum != 0) LCD_MESSAGERPGM(_i("Sleep..."));////MSG_DWELL c=0 r=0 + if(codenum != 0) LCD_MESSAGERPGM(_n("Sleep..."));////MSG_DWELL c=0 r=0 st_synchronize(); codenum += millis(); // keep track of when we started waiting previous_millis_cmd = millis(); diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 29013f40..d05b9a7e 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -766,9 +766,6 @@ # "Show pinda state" -#MSG_DWELL c=0 r=0 -"Sleep..." - #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 6982adf6..d38ffb8e 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1022,10 +1022,6 @@ "Show pinda state" "Zobrazit stav PINDA" -#MSG_DWELL c=0 r=0 -"Sleep..." -"Spankovy rezim..." - #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 307de091..6c3d95f7 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1022,10 +1022,6 @@ "Show pinda state" "Pinda-Status anzeigen" -#MSG_DWELL c=0 r=0 -"Sleep..." -"Schlafzustand..." - #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index ae4148e1..dc28f3a3 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1022,10 +1022,6 @@ "Show pinda state" "Mostrar estado pinda" -#MSG_DWELL c=0 r=0 -"Sleep..." -"En reposo..." - #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. " diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index a98f6d9f..42f7d13c 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1022,10 +1022,6 @@ "Show pinda state" "Etat de la PINDA" -#MSG_DWELL c=0 r=0 -"Sleep..." -"Repos..." - #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 9a0c68ae..56c1e86f 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1022,10 +1022,6 @@ "Show pinda state" "Mostra stato pinda" -#MSG_DWELL c=0 r=0 -"Sleep..." -"Sospensione..." - #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Alcuni file non saranno ordinati. Il numero massimo di file in una cartella e 100 perche siano ordinati." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 07f6d7e1..252960a1 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1022,10 +1022,6 @@ "Show pinda state" "Stan sondy P.I.N.D.A." -#MSG_DWELL c=0 r=0 -"Sleep..." -"Czuwanie..." - #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100." From 42f2a6141624e065fa6be81c88c5d1e05d5f4292 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:46:02 +0100 Subject: [PATCH 28/29] Lang - text "TRIGGERED" removed from dictionary --- Firmware/Marlin_main.cpp | 12 ++++++------ Firmware/messages.c | 2 +- Firmware/messages.h | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 10 files changed, 8 insertions(+), 35 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index e87eb911..7358fdbc 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5779,7 +5779,7 @@ Sigma_Exit: #if defined(X_MIN_PIN) && X_MIN_PIN > -1 SERIAL_PROTOCOLRPGM(_n("x_min: "));////MSG_X_MIN c=0 r=0 if(READ(X_MIN_PIN)^X_MIN_ENDSTOP_INVERTING){ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } @@ -5788,7 +5788,7 @@ Sigma_Exit: #if defined(X_MAX_PIN) && X_MAX_PIN > -1 SERIAL_PROTOCOLRPGM(_n("x_max: "));////MSG_X_MAX c=0 r=0 if(READ(X_MAX_PIN)^X_MAX_ENDSTOP_INVERTING){ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } @@ -5797,7 +5797,7 @@ Sigma_Exit: #if defined(Y_MIN_PIN) && Y_MIN_PIN > -1 SERIAL_PROTOCOLRPGM(_n("y_min: "));////MSG_Y_MIN c=0 r=0 if(READ(Y_MIN_PIN)^Y_MIN_ENDSTOP_INVERTING){ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } @@ -5806,7 +5806,7 @@ Sigma_Exit: #if defined(Y_MAX_PIN) && Y_MAX_PIN > -1 SERIAL_PROTOCOLRPGM(_n("y_max: "));////MSG_Y_MAX c=0 r=0 if(READ(Y_MAX_PIN)^Y_MAX_ENDSTOP_INVERTING){ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } @@ -5815,7 +5815,7 @@ Sigma_Exit: #if defined(Z_MIN_PIN) && Z_MIN_PIN > -1 SERIAL_PROTOCOLRPGM(MSG_Z_MIN); if(READ(Z_MIN_PIN)^Z_MIN_ENDSTOP_INVERTING){ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } @@ -5824,7 +5824,7 @@ Sigma_Exit: #if defined(Z_MAX_PIN) && Z_MAX_PIN > -1 SERIAL_PROTOCOLRPGM(MSG_Z_MAX); if(READ(Z_MAX_PIN)^Z_MAX_ENDSTOP_INVERTING){ - SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT)); + SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } diff --git a/Firmware/messages.c b/Firmware/messages.c index f8a10342..4cac4f2d 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -25,7 +25,6 @@ const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r const char MSG_CRASHDETECT_NA[] PROGMEM_I1 = ISTR("Crash det. [N/A]"); ////c=0 r=0 const char MSG_CRASHDETECT_OFF[] PROGMEM_I1 = ISTR("Crash det. [off]"); ////c=0 r=0 const char MSG_CRASHDETECT_ON[] PROGMEM_I1 = ISTR("Crash det. [on]"); ////c=0 r=0 -const char MSG_ENDSTOP_HIT[] PROGMEM_I1 = ISTR("TRIGGERED"); ////c=0 r=0 const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////c=0 r=0 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1 @@ -122,3 +121,4 @@ const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_N1 = "open failed, File: "; ////c=0 r const char MSG_ENDSTOP_OPEN[] PROGMEM_N1 = "open"; ////c=0 r=0 const char MSG_POWERUP[] PROGMEM_N1 = "PowerUp"; ////c=0 r=0 const char MSG_ERR_STOPPED[] PROGMEM_N1 = "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"; ////c=0 r=0 +const char MSG_ENDSTOP_HIT[] PROGMEM_N1 = "TRIGGERED"; ////c=0 r=0 diff --git a/Firmware/messages.h b/Firmware/messages.h index d910d485..ce6ecdd7 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -26,7 +26,6 @@ extern const char MSG_CRASH_DETECTED[]; extern const char MSG_CRASHDETECT_NA[]; extern const char MSG_CRASHDETECT_OFF[]; extern const char MSG_CRASHDETECT_ON[]; -extern const char MSG_ENDSTOP_HIT[]; extern const char MSG_ERROR[]; extern const char MSG_EXTRUDER[]; extern const char MSG_FILAMENT[]; @@ -123,6 +122,7 @@ extern const char MSG_SD_OPEN_FILE_FAIL[]; extern const char MSG_ENDSTOP_OPEN[]; extern const char MSG_POWERUP[]; extern const char MSG_ERR_STOPPED[]; +extern const char MSG_ENDSTOP_HIT[]; #if defined(__cplusplus) } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index d05b9a7e..1a95cc71 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -859,9 +859,6 @@ # "Total print time" -#MSG_ENDSTOP_HIT c=0 r=0 -"TRIGGERED" - #MSG_TUNE c=0 r=0 "Tune" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index d38ffb8e..12334326 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1146,10 +1146,6 @@ "Total print time" "Celkovy cas tisku" -#MSG_ENDSTOP_HIT c=0 r=0 -"TRIGGERED" -"AKTIVNI" - #MSG_TUNE c=0 r=0 "Tune" "Ladit" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 6c3d95f7..f5d77702 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1146,10 +1146,6 @@ "Total print time" "Gesamte Druckzeit" -#MSG_ENDSTOP_HIT c=0 r=0 -"TRIGGERED" -"AUSGELOEST" - #MSG_TUNE c=0 r=0 "Tune" "Feineinstellung" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index dc28f3a3..cc309600 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1146,10 +1146,6 @@ "Total print time" "Tiempo total :" -#MSG_ENDSTOP_HIT c=0 r=0 -"TRIGGERED" -"ACTIVADO" - #MSG_TUNE c=0 r=0 "Tune" "Ajustar" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 42f7d13c..626e1813 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1146,10 +1146,6 @@ "Total print time" "Temps total" -#MSG_ENDSTOP_HIT c=0 r=0 -"TRIGGERED" -"ACTIVE" - #MSG_TUNE c=0 r=0 "Tune" "Regler" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 56c1e86f..c0981a42 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1146,10 +1146,6 @@ "Total print time" "Tempo di stampa totale" -#MSG_ENDSTOP_HIT c=0 r=0 -"TRIGGERED" -"ATTIVATO" - #MSG_TUNE c=0 r=0 "Tune" "Regola" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 252960a1..0a8b9670 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1146,10 +1146,6 @@ "Total print time" "Calkowity czas druku" -#MSG_ENDSTOP_HIT c=0 r=0 -"TRIGGERED" -"AKTYWOWANO" - #MSG_TUNE c=0 r=0 "Tune" "Strojenie" From e229f3343ebf1afcf6eba33eaa1fefadfeaaae20 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:48:22 +0100 Subject: [PATCH 29/29] Lang - text "volume.init failed" removed from dictionary --- Firmware/cardreader.cpp | 2 +- lang/lang_en.txt | 3 --- lang/lang_en_cz.txt | 4 ---- lang/lang_en_de.txt | 4 ---- lang/lang_en_es.txt | 4 ---- lang/lang_en_fr.txt | 4 ---- lang/lang_en_it.txt | 4 ---- lang/lang_en_pl.txt | 4 ---- 8 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 4a146dd4..9cac6488 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -188,7 +188,7 @@ void CardReader::initsd() else if (!volume.init(&card)) { SERIAL_ERROR_START; - SERIAL_ERRORLNRPGM(_i("volume.init failed"));////MSG_SD_VOL_INIT_FAIL c=0 r=0 + SERIAL_ERRORLNRPGM(_n("volume.init failed"));////MSG_SD_VOL_INIT_FAIL c=0 r=0 } else if (!root.openRoot(&volume)) { diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 1a95cc71..a46ee836 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -889,9 +889,6 @@ # "unknown" -#MSG_SD_VOL_INIT_FAIL c=0 r=0 -"volume.init failed" - #MSG_USERWAIT c=0 r=0 "Wait for user..." diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 12334326..91116906 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1186,10 +1186,6 @@ "unknown" "\x00" -#MSG_SD_VOL_INIT_FAIL c=0 r=0 -"volume.init failed" -"volume.init selhalo" - #MSG_USERWAIT c=0 r=0 "Wait for user..." "Ceka se na uzivatele..." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index f5d77702..b7276063 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1186,10 +1186,6 @@ "unknown" "\x00" -#MSG_SD_VOL_INIT_FAIL c=0 r=0 -"volume.init failed" -"Dateisystem Init fehlerhaft" - #MSG_USERWAIT c=0 r=0 "Wait for user..." "Warte auf Benutzer.." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index cc309600..9f7b12d3 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1186,10 +1186,6 @@ "unknown" "\x00" -#MSG_SD_VOL_INIT_FAIL c=0 r=0 -"volume.init failed" -"fallo volume.init" - #MSG_USERWAIT c=0 r=0 "Wait for user..." "Esperando ordenes" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 626e1813..5a4eef38 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1186,10 +1186,6 @@ "unknown" "\x00" -#MSG_SD_VOL_INIT_FAIL c=0 r=0 -"volume.init failed" -"Echec volume.init" - #MSG_USERWAIT c=0 r=0 "Wait for user..." "Attente utilisateur..." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index c0981a42..fa84b372 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1186,10 +1186,6 @@ "unknown" "\x00" -#MSG_SD_VOL_INIT_FAIL c=0 r=0 -"volume.init failed" -"volume.init fallito" - #MSG_USERWAIT c=0 r=0 "Wait for user..." "Attendendo utente..." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 0a8b9670..ce7bfed7 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1186,10 +1186,6 @@ "unknown" "\x00" -#MSG_SD_VOL_INIT_FAIL c=0 r=0 -"volume.init failed" -"niepowodzenie volume.init " - #MSG_USERWAIT c=0 r=0 "Wait for user..." "Czekam na uzytkownika..."