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."