From 669ab0f7f71646dd53dcebdb03cdea5d28ba6009 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 30 Mar 2021 18:58:04 +0200 Subject: [PATCH] Define #MSG_GCODE_DIFF_CONTINUE c=20 r=4, #MSG_GCODE_DIFF_CANCELLED c=20 r=7 --- 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 | 4 ++-- 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, 18 insertions(+), 18 deletions(-) diff --git a/Firmware/util.cpp b/Firmware/util.cpp index 0baab628b..33c434f3a 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -512,13 +512,13 @@ switch(oCheckGcode) { case ClCheckGcode::_Warn: // lcd_show_fullscreen_message_and_wait_P(_i("Printer G-code level differs from the G-code. Continue?")); -lcd_display_message_fullscreen_P(_i("G-code sliced for a different level. Continue?"));////c=20 r=4 +lcd_display_message_fullscreen_P(_i("G-code sliced for a different level. Continue?"));////MSG_GCODE_DIFF_CONTINUE c=20 r=4 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 ClCheckGcode::_Strict: - lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different level. Please re-slice the model again. Print cancelled."));////c=20 r=7 + lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different level. Please re-slice the model again. Print cancelled."));////MSG_GCODE_DIFF_CANCELLED c=20 r=7 lcd_print_stop(); break; case ClCheckGcode::_None: diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 8edd4f6af..67be2d887 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1033,10 +1033,10 @@ #MSG_NOZZLE_DIAMETER c=10 "Nozzle d." -# c=20 r=4 +#MSG_GCODE_DIFF_CONTINUE c=20 r=4 "G-code sliced for a different level. Continue?" -# c=20 r=7 +#MSG_GCODE_DIFF_CANCELLED c=20 r=7 "G-code sliced for a different level. Please re-slice the model again. Print cancelled." #MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index ab6b31ca8..a60093638 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1378,11 +1378,11 @@ "Nozzle d." "Tryska" -# c=20 r=4 +#MSG_GCODE_DIFF_CONTINUE c=20 r=4 "G-code sliced for a different level. Continue?" "\x00" -# c=20 r=7 +#MSG_GCODE_DIFF_CANCELLED c=20 r=7 "G-code sliced for a different level. Please re-slice the model again. Print cancelled." "\x00" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 15a605df7..570a4d782 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1378,11 +1378,11 @@ "Nozzle d." "Duese D." -# c=20 r=4 +#MSG_GCODE_DIFF_CONTINUE c=20 r=4 "G-code sliced for a different level. Continue?" "G-Code ist fuer einen anderen Level geslict. Fortfahren?" -# c=20 r=7 +#MSG_GCODE_DIFF_CANCELLED c=20 r=7 "G-code sliced for a different level. Please re-slice the model again. Print cancelled." "G-Code ist fuer einen anderen Level geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 444adfda8..596eb8765 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1378,11 +1378,11 @@ "Nozzle d." "Diam. nozzl" -# c=20 r=4 +#MSG_GCODE_DIFF_CONTINUE c=20 r=4 "G-code sliced for a different level. Continue?" "Codigo G laminado para un nivel diferente. ?Continuar?" -# c=20 r=7 +#MSG_GCODE_DIFF_CANCELLED c=20 r=7 "G-code sliced for a different level. Please re-slice the model again. Print cancelled." "Codigo G laminado para un nivel diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 1f5701d5f..0083b3123 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1378,11 +1378,11 @@ "Nozzle d." "Diam. buse" -# c=20 r=4 +#MSG_GCODE_DIFF_CONTINUE c=20 r=4 "G-code sliced for a different level. Continue?" "Le G-code a ete prepare pour un niveau different. Continuer?" -# c=20 r=7 +#MSG_GCODE_DIFF_CANCELLED c=20 r=7 "G-code sliced for a different level. Please re-slice the model again. Print cancelled." "Le G-code a ete prepare pour un niveau different. Veuillez decouper le modele a nouveau. L'impression a ete annulee." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index cdeb5db69..7930c09f4 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1378,11 +1378,11 @@ "Nozzle d." "Diam.Ugello" -# c=20 r=4 +#MSG_GCODE_DIFF_CONTINUE c=20 r=4 "G-code sliced for a different level. Continue?" "G-code processato per un livello diverso. Continuare?" -# c=20 r=7 +#MSG_GCODE_DIFF_CANCELLED c=20 r=7 "G-code sliced for a different level. Please re-slice the model again. Print cancelled." "G-code processato per un livello diverso. Per favore esegui nuovamente lo slice del modello. Stampa annullata." diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt index af53f3af5..0ef3d2d8f 100644 --- a/lang/lang_en_nl.txt +++ b/lang/lang_en_nl.txt @@ -1378,11 +1378,11 @@ "Nozzle d." "Tuit d." -# c=20 r=4 +#MSG_GCODE_DIFF_CONTINUE c=20 r=4 "G-code sliced for a different level. Continue?" "G-Code is voor een ander niveau geslict. Doorgaan?" -# c=20 r=7 +#MSG_GCODE_DIFF_CANCELLED c=20 r=7 "G-code sliced for a different level. Please re-slice the model again. Print cancelled." "G-Code is voor een ander niveau geslict. Slice het model opniew alsjeblieft. Druk geannuleerd." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 40a3ca4ef..fab0ab6a5 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1378,11 +1378,11 @@ "Nozzle d." "Sr. dyszy" -# c=20 r=4 +#MSG_GCODE_DIFF_CONTINUE c=20 r=4 "G-code sliced for a different level. Continue?" "G-code pociety dla innej wersji. Kontynuowac?" -# c=20 r=7 +#MSG_GCODE_DIFF_CANCELLED c=20 r=7 "G-code sliced for a different level. Please re-slice the model again. Print cancelled." "G-code pociety na innym poziomie. Potnij model ponownie. Druk anulowany."