From 99893d5066dc23d2b9e2b9dfc5ff9afb13cc5708 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 30 Mar 2021 18:11:22 +0200 Subject: [PATCH] Define #MSG_MMU_CONNECTED c=18 --- Firmware/mmu.cpp | 2 +- Firmware/ultralcd.cpp | 6 +++--- 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 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 0e34579a..75435ddf 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -718,7 +718,7 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move) //first three lines are used for printing multiscreen message; last line contains measured and target nozzle temperature if (screen == 0) { //screen 0 - lcd_display_message_fullscreen_P(_i("MMU needs user attention."));////c=20 r=3 + lcd_display_message_fullscreen_P(_i("MMU needs user attention."));////MSG_MMU_USER_ATTENTION c=20 r=3 screen++; } else { //screen 1 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 86d9fc4d..cf86fcd5 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1824,14 +1824,14 @@ static void lcd_preheat_menu() //! If MMU is connected //! //! @code{.unparsed} -//! | MMU2 connected | c=18 r=1 +//! | MMU2 connected | c=18 //! | FW: 1.0.6-7064523 | //! @endcode //! //! If MMU is not connected //! //! @code{.unparsed} -//! | MMU2 N/A | c=18 r=1 +//! | MMU2 N/A | c=18 //! @endcode //! //! If Flash Air is connected @@ -1936,7 +1936,7 @@ static void lcd_support_menu() MENU_ITEM_BACK_P(STR_SEPARATOR); if (mmu_enabled) { - MENU_ITEM_BACK_P(_i("MMU2 connected")); ////c=18 r=1 + MENU_ITEM_BACK_P(_i("MMU2 connected")); ////MSG_MMU_CONNECTED c=18 MENU_ITEM_BACK_P(PSTR(" FW:")); ////c=17 r=1 if (((menu_item - 1) == menu_line) && lcd_draw_update) { diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 7792e0aa..6e4cd8f5 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -475,7 +475,7 @@ #MSG_SILENT c=7 "Silent" -# c=20 r=3 +#MSG_MMU_USER_ATTENTION c=20 r=3 "MMU needs user attention." #MSG_MMU_POWER_FAILS c=15 @@ -490,7 +490,7 @@ #MSG_HIGH_POWER c=10 "High power" -# +#MSG_MMU_CONNECTED c=18 "MMU2 connected" #MSG_SELFTEST_MOTOR c=18 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 433d6de8..57281469 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -634,7 +634,7 @@ "Silent" "Tichy" -# c=20 r=3 +#MSG_MMU_USER_ATTENTION c=20 r=3 "MMU needs user attention." "MMU potrebuje zasah uzivatele." @@ -654,7 +654,7 @@ "High power" "Vys. vykon" -# +#MSG_MMU_CONNECTED c=18 "MMU2 connected" "MMU2 pripojeno" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 186b2522..9843c7d2 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -634,7 +634,7 @@ "Silent" "Leise" -# c=20 r=3 +#MSG_MMU_USER_ATTENTION c=20 r=3 "MMU needs user attention." "MMU erfordert Benutzereingriff." @@ -654,7 +654,7 @@ "High power" "Hohe leist" -# +#MSG_MMU_CONNECTED c=18 "MMU2 connected" "MMU2 verbunden" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index a0fac72c..6bdeb22f 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -634,7 +634,7 @@ "Silent" "Silencio" -# c=20 r=3 +#MSG_MMU_USER_ATTENTION c=20 r=3 "MMU needs user attention." "MMU necesita atencion del usuario." @@ -654,7 +654,7 @@ "High power" "Rend.pleno" -# +#MSG_MMU_CONNECTED c=18 "MMU2 connected" "MMU2 conectado" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 839fcf55..45edb811 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -634,7 +634,7 @@ "Silent" "Furtif" -# c=20 r=3 +#MSG_MMU_USER_ATTENTION c=20 r=3 "MMU needs user attention." "Le MMU necessite l'attention de l'utilisateur." @@ -654,7 +654,7 @@ "High power" "Haute puiss" -# +#MSG_MMU_CONNECTED c=18 "MMU2 connected" "MMU2 connecte" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index b1413af2..16554533 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -634,7 +634,7 @@ "Silent" "Silenzioso" -# c=20 r=3 +#MSG_MMU_USER_ATTENTION c=20 r=3 "MMU needs user attention." "Il MMU richiede attenzione dall'utente." @@ -654,7 +654,7 @@ "High power" "Forte" -# +#MSG_MMU_CONNECTED c=18 "MMU2 connected" "MMU2 connessa" diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt index 6d03e59f..16d0cdf5 100644 --- a/lang/lang_en_nl.txt +++ b/lang/lang_en_nl.txt @@ -634,7 +634,7 @@ "Silent" "Stil" -# c=20 r=3 +#MSG_MMU_USER_ATTENTION c=20 r=3 "MMU needs user attention." "MMU heeft gebruikersaandacht nodig." @@ -654,7 +654,7 @@ "High power" "Hoog verm." -# +#MSG_MMU_CONNECTED c=18 "MMU2 connected" "MMU2 verbonden" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 86c0baa5..8f29ee16 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -634,7 +634,7 @@ "Silent" "Cichy" -# c=20 r=3 +#MSG_MMU_USER_ATTENTION c=20 r=3 "MMU needs user attention." "MMU wymaga uwagi uzytkownika." @@ -654,7 +654,7 @@ "High power" "Wysoka wyd." -# +#MSG_MMU_CONNECTED c=18 "MMU2 connected" "MMU podlaczone"