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