From 7426efac9b6d6e3410ee92ce6f7ab6d2d576cd4e Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 18:36:38 +0100 Subject: [PATCH] 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"