From d601355d40f7cca1f54440252c69ef37f6298dc1 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 30 Mar 2021 19:01:24 +0200 Subject: [PATCH] Define #MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5, #MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 --- Firmware/util.cpp | 4 ++-- lang/lang_en.txt | 4 ++-- lang/lang_en_cz.txt | 4 ++-- lang/lang_en_de.txt | 4 ++-- lang/lang_en_es.txt | 2 +- lang/lang_en_fr.txt | 4 ++-- lang/lang_en_it.txt | 4 ++-- lang/lang_en_nl.txt | 4 ++-- lang/lang_en_pl.txt | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Firmware/util.cpp b/Firmware/util.cpp index 33c434f3..3dd53ea8 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -479,13 +479,13 @@ switch(oCheckVersion) { case ClCheckVersion::_Warn: // lcd_show_fullscreen_message_and_wait_P(_i("Printer FW version differs from the G-code. Continue?")); -lcd_display_message_fullscreen_P(_i("G-code sliced for a newer firmware. Continue?"));////c=20 r=5 +lcd_display_message_fullscreen_P(_i("G-code sliced for a newer firmware. Continue?"));////MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5 lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT); //???custom_message_type=CUSTOM_MSG_TYPE_STATUS; // display / status-line recovery lcd_update_enable(true); // display / status-line recovery break; case ClCheckVersion::_Strict: - lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a newer firmware. Please update the firmware. Print cancelled."));////c=20 r=8 + lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a newer firmware. Please update the firmware. Print cancelled."));////MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 lcd_print_stop(); break; case ClCheckVersion::_None: diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 67be2d88..79646f70 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1045,10 +1045,10 @@ #MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." -# c=20 r=5 +#MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5 "G-code sliced for a newer firmware. Continue?" -# c=20 r=8 +#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." # c=20 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index a6009363..72e3d52e 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1394,11 +1394,11 @@ "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-code je pripraven pro jiny typ tiskarny. Prosim preslicujte model znovu. Tisk zrusen." -# c=20 r=5 +#MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5 "G-code sliced for a newer firmware. Continue?" "G-code je pripraven pro novejsi firmware. Pokracovat?" -# c=20 r=8 +#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." "G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 570a4d78..c6a7fb08 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1394,11 +1394,11 @@ "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-Code ist fuer einen anderen Drucker geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." -# c=20 r=5 +#MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5 "G-code sliced for a newer firmware. Continue?" "G-Code ist fuer eine neuere Firmware geslict. Fortfahren?" -# c=20 r=8 +#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." "G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 596eb876..d1f599ad 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1394,7 +1394,7 @@ "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "Codigo G laminado para una impresora diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." -# c=20 r=5 +#MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5 "G-code sliced for a newer firmware. Continue?" "Codigo G laminado para nuevo firmware. ?Continuar?" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 0083b312..98a5c6bf 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1394,11 +1394,11 @@ "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "Le G-code a ete prepare pour une autre version de l'imprimante. Veuillez decouper le modele a nouveau. L'impression a ete annulee." -# c=20 r=5 +#MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5 "G-code sliced for a newer firmware. Continue?" "Le G-code a ete prepare pour une version plus recente du firmware. Continuer?" -# c=20 r=8 +#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." "Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 7930c09f..6fa1fee1 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1394,11 +1394,11 @@ "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-code processato per una stampante diversa. Per favore esegui nuovamente lo slice del modello. Stampa annullata." -# c=20 r=5 +#MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5 "G-code sliced for a newer firmware. Continue?" "G-code processato per un firmware piu recente. Continuare?" -# c=20 r=8 +#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." "G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata." diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt index 0ef3d2d8..c7ba8734 100644 --- a/lang/lang_en_nl.txt +++ b/lang/lang_en_nl.txt @@ -1394,11 +1394,11 @@ "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-Code is voor een ander printertype geslict. Slice het model opniew alsjeblieft. Druk geannuleerd." -# c=20 r=5 +#MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5 "G-code sliced for a newer firmware. Continue?" "G-Code is voor een nieuwere firmware geslict. Doorgaan?" -# c=20 r=8 +#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." "G-Code is voor een nieuwere firmware geslict. Update de firmware alsjeblieft. Druk geannuleerd." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index fab0ab6a..b9bef2b8 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1394,11 +1394,11 @@ "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-code pociety dla drukarki innego typu. Potnij model ponownie. Druk anulowany." -# c=20 r=5 +#MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5 "G-code sliced for a newer firmware. Continue?" "G-code pociety dla nowszego firmware. Kontynuowac?" -# c=20 r=8 +#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." "G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany."