From 15919a0f093980e66937c4fcb4c67ab2f5e52ada Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 31 Mar 2021 07:41:21 +0200 Subject: [PATCH] Define #MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5, #MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 --- 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 3dd53ea8..cf9b05b7 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -393,13 +393,13 @@ switch(oCheckMode) { case ClCheckMode::_Warn: // lcd_show_fullscreen_message_and_wait_P(_i("Printer nozzle diameter differs from the G-code. Continue?")); -lcd_display_message_fullscreen_P(_i("Printer nozzle diameter differs from the G-code. Continue?"));////c=20 r=5 +lcd_display_message_fullscreen_P(_i("Printer nozzle diameter differs from the G-code. Continue?"));////MSG_NOZZLE_DIFFERS_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 ClCheckMode::_Strict: - lcd_show_fullscreen_message_and_wait_P(_i("Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."));////c=20 r=9 + lcd_show_fullscreen_message_and_wait_P(_i("Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."));////MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 lcd_print_stop(); break; case ClCheckMode::_None: diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 3ac5c74d..3f689ccb 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1054,10 +1054,10 @@ #MSG_PREHEATING_TO_EJECT c=20 "Preheating to eject" -# c=20 r=5 +#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5 "Printer nozzle diameter differs from the G-code. Continue?" -# c=20 r=9 +#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." # c=20 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index e6648fe3..83aa5759 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1406,11 +1406,11 @@ "Preheating to eject" "Predehrev k vysunuti" -# c=20 r=5 +#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5 "Printer nozzle diameter differs from the G-code. Continue?" "Prumer trysky tiskarny se lisi od G-code. Pokracovat?" -# c=20 r=9 +#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." "Prumer trysky tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 615f37e7..6cc3f9ed 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1406,11 +1406,11 @@ "Preheating to eject" "Heizen zum Auswurf" -# c=20 r=5 +#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5 "Printer nozzle diameter differs from the G-code. Continue?" "Der Durchmesser der Druckerduese weicht vom G-Code ab. Fortfahren?" -# c=20 r=9 +#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." "Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 1555efcc..5a18a9c8 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1406,11 +1406,11 @@ "Preheating to eject" "Precalent. expulsar" -# c=20 r=5 +#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5 "Printer nozzle diameter differs from the G-code. Continue?" "Diametro nozzle impresora difiere de cod.G. ?Continuar?" -# c=20 r=9 +#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." "Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresion cancelada." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index ede8a71e..b4d98253 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1406,11 +1406,11 @@ "Preheating to eject" "Chauf. pour remonter" -# c=20 r=5 +#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5 "Printer nozzle diameter differs from the G-code. Continue?" "Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Continuer?" -# c=20 r=9 +#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." "Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index ea848fdc..7e7d68ec 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1406,11 +1406,11 @@ "Preheating to eject" "Preriscalda. espuls." -# c=20 r=5 +#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5 "Printer nozzle diameter differs from the G-code. Continue?" "Diametro ugello diverso da G-Code. Continuare?" -# c=20 r=9 +#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." "Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata." diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt index 6b65b3b7..43e98510 100644 --- a/lang/lang_en_nl.txt +++ b/lang/lang_en_nl.txt @@ -1406,11 +1406,11 @@ "Preheating to eject" "Opwarm.te uitwerpen" -# c=20 r=5 +#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5 "Printer nozzle diameter differs from the G-code. Continue?" "De diameter van de tuit van de printer verschilt van de G-code. Doorgaan?" -# c=20 r=9 +#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." "De diameter van de tuit van de printer verschilt van de G-code. Controleer de waarde in de instellingen. Afdrukken geannuleerd." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index cd2b5157..e5e517e6 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1406,11 +1406,11 @@ "Preheating to eject" "Nagrzew. wysuniecia" -# c=20 r=5 +#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5 "Printer nozzle diameter differs from the G-code. Continue?" "Srednica dyszy drukarki rozni sie od tej w G-code. Kontynuowac?" -# c=20 r=9 +#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." "Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany."