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