From 06427087c08778488a307dc206d2f2369617f442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 1 Oct 2022 08:47:39 +0000 Subject: [PATCH 1/8] PFW-1358 Change "More" button to single character --- Firmware/mmu2/errors_list.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index 322bf0356..2588c57ad 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -284,7 +284,7 @@ static const char MSG_BTN_RESTART_MMU[] PROGMEM_I1 = ISTR("Reset MMU"); ////MSG_ static const char MSG_BTN_UNLOAD[] PROGMEM_I1 = ISTR("Unload"); ////MSG_BTN_UNLOAD c=6 static const char MSG_BTN_STOP[] PROGMEM_I1 = ISTR("Stop"); ////MSG_BTN_STOP c=5 static const char MSG_BTN_DISABLE_MMU[] PROGMEM_I1 = ISTR("Disable"); ////MSG_BTN_DISABLE_MMU c=9 -static const char MSG_BTN_MORE[] PROGMEM_I1 = ISTR("More\x06"); ////MSG_BTN_MORE c=5 +static const char MSG_BTN_MORE[] PROGMEM_I1 = ISTR("\x06"); ////MSG_BTN_MORE c=5 // Used to parse the buttons from Btns(). static const char * const btnOperation[] PROGMEM = { From 9046fb3d443bce4dfaeb6c7614cb7d2e1237af57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 1 Oct 2022 08:49:27 +0000 Subject: [PATCH 2/8] PFW-1358 Adjust positions of button choices --- Firmware/mmu2_reporting.cpp | 8 ++++---- Firmware/ultralcd.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index d63bb681e..1620c4804 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -52,7 +52,7 @@ static void ReportErrorHookStaticRender(uint8_t ei) { //! |MMU FW update needed| <- title/header of the error: max 20 characters //! |prusa3d.com/ERR04504| <- URL 20 characters //! |FI:1 FS:1 5>3 t201°| <- status line, t is thermometer symbol - //! |>Retry >Done >MoreW | <- buttons + //! |>Retry >Done >W| <- buttons bool two_choices = false; // Read and determine what operations should be shown on the menu @@ -76,7 +76,7 @@ static void ReportErrorHookStaticRender(uint8_t ei) { ReportErrorHookSensorLineRender(); // Render the choices - lcd_show_choices_prompt_P(two_choices ? LCD_LEFT_BUTTON_CHOICE : LCD_MIDDLE_BUTTON_CHOICE, _T(PrusaErrorButtonTitle(button_op_middle)), _T(two_choices ? PrusaErrorButtonMore() : PrusaErrorButtonTitle(button_op_right)), two_choices ? 10 : 7, two_choices ? nullptr : _T(PrusaErrorButtonMore())); + lcd_show_choices_prompt_P(two_choices ? LCD_LEFT_BUTTON_CHOICE : LCD_MIDDLE_BUTTON_CHOICE, _T(PrusaErrorButtonTitle(button_op_middle)), _T(two_choices ? PrusaErrorButtonMore() : PrusaErrorButtonTitle(button_op_right)), 10, two_choices ? nullptr : _T(PrusaErrorButtonMore())); } extern void ReportErrorHookSensorLineRender() @@ -166,9 +166,9 @@ static uint8_t ReportErrorHookMonitor(uint8_t ei) { lcd_print(current_selection == LCD_LEFT_BUTTON_CHOICE ? '>': ' '); if (two_choices == false) { - lcd_set_cursor(7, 3); + lcd_set_cursor(9, 3); lcd_print(current_selection == LCD_MIDDLE_BUTTON_CHOICE ? '>': ' '); - lcd_set_cursor(13, 3); + lcd_set_cursor(18, 3); lcd_print(current_selection == LCD_RIGHT_BUTTON_CHOICE ? '>': ' '); } else { lcd_set_cursor(10, 3); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 439bc21c3..7b6fa4c77 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3174,10 +3174,10 @@ void lcd_show_choices_prompt_P(uint8_t selected, const char *first_choice, const lcd_puts_P(first_choice); if (third_choice) { - lcd_set_cursor(7, 3); + lcd_set_cursor(9, 3); lcd_print(selected == LCD_MIDDLE_BUTTON_CHOICE ? '>': ' '); lcd_puts_P(second_choice); - lcd_set_cursor(13, 3); + lcd_set_cursor(18, 3); lcd_print(selected == LCD_RIGHT_BUTTON_CHOICE ? '>': ' '); lcd_puts_P(third_choice); } else { From 7264391c5fee7049e20f00d7e58c7699323df77c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 1 Oct 2022 09:35:42 +0000 Subject: [PATCH 3/8] PFW-1358 Fix and optimise button choice positions --- Firmware/mmu2_reporting.cpp | 9 +++------ Firmware/ultralcd.cpp | 10 +++------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 1620c4804..41e21c988 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -76,7 +76,7 @@ static void ReportErrorHookStaticRender(uint8_t ei) { ReportErrorHookSensorLineRender(); // Render the choices - lcd_show_choices_prompt_P(two_choices ? LCD_LEFT_BUTTON_CHOICE : LCD_MIDDLE_BUTTON_CHOICE, _T(PrusaErrorButtonTitle(button_op_middle)), _T(two_choices ? PrusaErrorButtonMore() : PrusaErrorButtonTitle(button_op_right)), 10, two_choices ? nullptr : _T(PrusaErrorButtonMore())); + lcd_show_choices_prompt_P(two_choices ? LCD_LEFT_BUTTON_CHOICE : LCD_MIDDLE_BUTTON_CHOICE, _T(PrusaErrorButtonTitle(button_op_middle)), _T(two_choices ? PrusaErrorButtonMore() : PrusaErrorButtonTitle(button_op_right)), 9, two_choices ? nullptr : _T(PrusaErrorButtonMore())); } extern void ReportErrorHookSensorLineRender() @@ -164,15 +164,12 @@ static uint8_t ReportErrorHookMonitor(uint8_t ei) { // lcd_set_cursor(0, 3); lcd_print(current_selection == LCD_LEFT_BUTTON_CHOICE ? '>': ' '); + lcd_set_cursor(9, 3); + lcd_print(current_selection == LCD_MIDDLE_BUTTON_CHOICE ? '>': ' '); if (two_choices == false) { - lcd_set_cursor(9, 3); - lcd_print(current_selection == LCD_MIDDLE_BUTTON_CHOICE ? '>': ' '); lcd_set_cursor(18, 3); lcd_print(current_selection == LCD_RIGHT_BUTTON_CHOICE ? '>': ' '); - } else { - lcd_set_cursor(10, 3); - lcd_print(current_selection == LCD_MIDDLE_BUTTON_CHOICE ? '>': ' '); } // Consume rotation event and make feedback sound enc_dif = lcd_encoder_diff; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 7b6fa4c77..c21b99989 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3172,18 +3172,14 @@ void lcd_show_choices_prompt_P(uint8_t selected, const char *first_choice, const lcd_set_cursor(0, 3); lcd_print(selected == LCD_LEFT_BUTTON_CHOICE ? '>': ' '); lcd_puts_P(first_choice); + lcd_set_cursor(second_col, 3); + lcd_print(selected == LCD_MIDDLE_BUTTON_CHOICE ? '>': ' '); + lcd_puts_P(second_choice); if (third_choice) { - lcd_set_cursor(9, 3); - lcd_print(selected == LCD_MIDDLE_BUTTON_CHOICE ? '>': ' '); - lcd_puts_P(second_choice); lcd_set_cursor(18, 3); lcd_print(selected == LCD_RIGHT_BUTTON_CHOICE ? '>': ' '); lcd_puts_P(third_choice); - } else { - lcd_set_cursor(second_col, 3); - lcd_print(selected == LCD_MIDDLE_BUTTON_CHOICE ? '>': ' '); - lcd_puts_P(second_choice); } } From 8f0de44d846323bb14da06c60e11c8a7c6b3f6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 1 Oct 2022 14:20:46 +0000 Subject: [PATCH 4/8] PFW-1358 Move 'More' button to the corner of the screen Make 'More' button position consistent with 3-button screen. --- Firmware/mmu2_reporting.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 41e21c988..e6715cb23 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -74,9 +74,9 @@ static void ReportErrorHookStaticRender(uint8_t ei) { lcd_printf_P(PSTR("%.20S\nprusa3d.com/ERR04%hu"), _T(PrusaErrorTitle(ei)), PrusaErrorCode(ei) ); ReportErrorHookSensorLineRender(); - + // Render the choices - lcd_show_choices_prompt_P(two_choices ? LCD_LEFT_BUTTON_CHOICE : LCD_MIDDLE_BUTTON_CHOICE, _T(PrusaErrorButtonTitle(button_op_middle)), _T(two_choices ? PrusaErrorButtonMore() : PrusaErrorButtonTitle(button_op_right)), 9, two_choices ? nullptr : _T(PrusaErrorButtonMore())); + lcd_show_choices_prompt_P(two_choices ? LCD_LEFT_BUTTON_CHOICE : LCD_MIDDLE_BUTTON_CHOICE, _T(PrusaErrorButtonTitle(button_op_middle)), _T(two_choices ? PrusaErrorButtonMore() : PrusaErrorButtonTitle(button_op_right)), two_choices ? 18 : 9, two_choices ? nullptr : _T(PrusaErrorButtonMore())); } extern void ReportErrorHookSensorLineRender() @@ -164,12 +164,16 @@ static uint8_t ReportErrorHookMonitor(uint8_t ei) { // lcd_set_cursor(0, 3); lcd_print(current_selection == LCD_LEFT_BUTTON_CHOICE ? '>': ' '); - lcd_set_cursor(9, 3); - lcd_print(current_selection == LCD_MIDDLE_BUTTON_CHOICE ? '>': ' '); if (two_choices == false) { + lcd_set_cursor(9, 3); + lcd_print(current_selection == LCD_MIDDLE_BUTTON_CHOICE ? '>': ' '); lcd_set_cursor(18, 3); lcd_print(current_selection == LCD_RIGHT_BUTTON_CHOICE ? '>': ' '); + } else { + // More button for two button screen + lcd_set_cursor(18, 3); + lcd_print(current_selection == LCD_MIDDLE_BUTTON_CHOICE ? '>': ' '); } // Consume rotation event and make feedback sound enc_dif = lcd_encoder_diff; From ee6c1e77ca406b83f7f2c15cfccaf6433792b6dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 8 Oct 2022 09:24:21 +0000 Subject: [PATCH 5/8] PFW-1358 Remove MSG_BTN_MORE from po files --- lang/po/Firmware.pot | 6 ------ lang/po/Firmware_cs.po | 6 ------ lang/po/Firmware_da.po | 6 ------ lang/po/Firmware_de.po | 6 ------ lang/po/Firmware_es.po | 6 ------ lang/po/Firmware_fr.po | 6 ------ lang/po/Firmware_hr.po | 6 ------ lang/po/Firmware_hu.po | 6 ------ lang/po/Firmware_it.po | 6 ------ lang/po/Firmware_lb.po | 6 ------ lang/po/Firmware_lt.po | 6 ------ lang/po/Firmware_nl.po | 6 ------ lang/po/Firmware_no.po | 6 ------ lang/po/Firmware_pl.po | 6 ------ lang/po/Firmware_ro.po | 6 ------ lang/po/Firmware_sk.po | 6 ------ lang/po/Firmware_sl.po | 6 ------ lang/po/Firmware_sv.po | 6 ------ 18 files changed, 108 deletions(-) diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 7226c13b0..948810775 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -1176,12 +1176,6 @@ msgstr "" msgid "More details online." msgstr "" -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 04e175c8f..67fd547ea 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -1210,12 +1210,6 @@ msgstr "" msgid "More details online." msgstr "" -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_da.po b/lang/po/Firmware_da.po index 3c1a18afb..6b5b3cb29 100644 --- a/lang/po/Firmware_da.po +++ b/lang/po/Firmware_da.po @@ -1185,12 +1185,6 @@ msgstr "" msgid "More details online." msgstr "" -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index ccc4de8ef..60173b85a 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -1240,12 +1240,6 @@ msgstr "Modell" msgid "More details online." msgstr "Weiter Details online." -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "Mehr⏬" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index d4e3de31a..f8a28da5e 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -1212,12 +1212,6 @@ msgstr "Modelo" msgid "More details online." msgstr "" -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index bf937572d..1b65d2565 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -1219,12 +1219,6 @@ msgstr "Modele" msgid "More details online." msgstr "" -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 5359db4c2..cb7cd9e63 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -1210,12 +1210,6 @@ msgstr "" msgid "More details online." msgstr "" -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 997907511..c3775a192 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -1214,12 +1214,6 @@ msgstr "Modell" msgid "More details online." msgstr "" -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index b0924c0e5..c11377486 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -1213,12 +1213,6 @@ msgstr "Modello" msgid "More details online." msgstr "" -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_lb.po b/lang/po/Firmware_lb.po index 60568e415..a75503321 100644 --- a/lang/po/Firmware_lb.po +++ b/lang/po/Firmware_lb.po @@ -1185,12 +1185,6 @@ msgstr "" msgid "More details online." msgstr "" -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_lt.po b/lang/po/Firmware_lt.po index 57b708899..1311892a6 100644 --- a/lang/po/Firmware_lt.po +++ b/lang/po/Firmware_lt.po @@ -1185,12 +1185,6 @@ msgstr "" msgid "More details online." msgstr "" -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 2746f6cea..d14df8474 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -1232,12 +1232,6 @@ msgstr "Model" msgid "More details online." msgstr "Meer details online." -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "Meer⏬" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 70a61db16..5be599d26 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -1207,12 +1207,6 @@ msgstr "Modell" msgid "More details online." msgstr "" -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 252dc2cc7..e2f7905fd 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -1211,12 +1211,6 @@ msgstr "" msgid "More details online." msgstr "" -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index afd0d3400..60f4874fd 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -1227,12 +1227,6 @@ msgstr "Model" msgid "More details online." msgstr "Mai multe detalii online" -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "More⏬" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 18dff3916..ed7108e05 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -1226,12 +1226,6 @@ msgstr "Model" msgid "More details online." msgstr "Viac podrobnosti online." -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "Viac⏬" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_sl.po b/lang/po/Firmware_sl.po index 56386235f..3fa07f640 100644 --- a/lang/po/Firmware_sl.po +++ b/lang/po/Firmware_sl.po @@ -1185,12 +1185,6 @@ msgstr "" msgid "More details online." msgstr "" -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 31a33ed62..3925f2f4f 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -1214,12 +1214,6 @@ msgstr "Modell" msgid "More details online." msgstr "" -#. MSG_BTN_MORE c=5 -#: ../../Firmware/mmu2/errors_list.h:287 -#: ../../Firmware/mmu2_error_converter.cpp:153 -msgid "More⏬" -msgstr "" - #. MSG_SELFTEST_MOTOR c=18 #: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6981 #: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:7008 From 00ccdcd46774282a0594bd7650bd8349b14bde1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 8 Oct 2022 09:25:06 +0000 Subject: [PATCH 6/8] PFW-1358 change MSG_BTN_MORE from I1 to N1 --- Firmware/mmu2/errors_list.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index 2588c57ad..5d237f7a4 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -284,7 +284,7 @@ static const char MSG_BTN_RESTART_MMU[] PROGMEM_I1 = ISTR("Reset MMU"); ////MSG_ static const char MSG_BTN_UNLOAD[] PROGMEM_I1 = ISTR("Unload"); ////MSG_BTN_UNLOAD c=6 static const char MSG_BTN_STOP[] PROGMEM_I1 = ISTR("Stop"); ////MSG_BTN_STOP c=5 static const char MSG_BTN_DISABLE_MMU[] PROGMEM_I1 = ISTR("Disable"); ////MSG_BTN_DISABLE_MMU c=9 -static const char MSG_BTN_MORE[] PROGMEM_I1 = ISTR("\x06"); ////MSG_BTN_MORE c=5 +static const char MSG_BTN_MORE[] PROGMEM_N1 = ISTR("\x06"); ////MSG_BTN_MORE c=5 // Used to parse the buttons from Btns(). static const char * const btnOperation[] PROGMEM = { From d483531606210f9d2acbd1636698d400a4dd9676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 8 Oct 2022 09:40:43 +0000 Subject: [PATCH 7/8] PFW-1358 update c values --- Firmware/mmu2/errors_list.h | 15 ++++++++------- lang/po/Firmware.pot | 8 ++++---- lang/po/Firmware_cs.po | 8 ++++---- lang/po/Firmware_da.po | 8 ++++---- lang/po/Firmware_de.po | 8 ++++---- lang/po/Firmware_es.po | 8 ++++---- lang/po/Firmware_fr.po | 8 ++++---- lang/po/Firmware_hr.po | 8 ++++---- lang/po/Firmware_hu.po | 8 ++++---- lang/po/Firmware_it.po | 8 ++++---- lang/po/Firmware_lb.po | 8 ++++---- lang/po/Firmware_lt.po | 8 ++++---- lang/po/Firmware_nl.po | 8 ++++---- lang/po/Firmware_no.po | 8 ++++---- lang/po/Firmware_pl.po | 8 ++++---- lang/po/Firmware_ro.po | 8 ++++---- lang/po/Firmware_sk.po | 8 ++++---- lang/po/Firmware_sl.po | 8 ++++---- lang/po/Firmware_sv.po | 8 ++++---- 19 files changed, 80 insertions(+), 79 deletions(-) diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index 5d237f7a4..e68afc6ad 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -273,18 +273,19 @@ static const char * const errorDescs[] PROGMEM = { // we have max 3 buttons/operations to select from // one of them is "More" to show the explanation text normally hidden in the next screens. +// It is displayed with W (Double down arrow, special character from CGRAM) // 01234567890123456789 -// >bttxt >bttxt>MoreW -// Therefore at least some of the buttons, which can occur on the screen together, need to be 5-chars long max @@TODO. +// >bttxt >bttxt >W +// Therefore at least some of the buttons, which can occur on the screen together, can only be 8-chars long max @@TODO. // Beware - we only have space for 2 buttons on the LCD while the MMU has 3 buttons // -> the left button on the MMU is not used/rendered on the LCD (it is also almost unused on the MMU side) -static const char MSG_BTN_RETRY[] PROGMEM_I1 = ISTR("Retry"); ////MSG_BTN_RETRY c=5 -static const char MSG_BTN_CONTINUE[] PROGMEM_I1 = ISTR("Done"); ////MSG_BTN_CONTINUE c=5 +static const char MSG_BTN_RETRY[] PROGMEM_I1 = ISTR("Retry"); ////MSG_BTN_RETRY c=8 +static const char MSG_BTN_CONTINUE[] PROGMEM_I1 = ISTR("Done"); ////MSG_BTN_CONTINUE c=8 static const char MSG_BTN_RESTART_MMU[] PROGMEM_I1 = ISTR("Reset MMU"); ////MSG_BTN_RESTART_MMU c=9 -static const char MSG_BTN_UNLOAD[] PROGMEM_I1 = ISTR("Unload"); ////MSG_BTN_UNLOAD c=6 -static const char MSG_BTN_STOP[] PROGMEM_I1 = ISTR("Stop"); ////MSG_BTN_STOP c=5 +static const char MSG_BTN_UNLOAD[] PROGMEM_I1 = ISTR("Unload"); ////MSG_BTN_UNLOAD c=8 +static const char MSG_BTN_STOP[] PROGMEM_I1 = ISTR("Stop"); ////MSG_BTN_STOP c=8 static const char MSG_BTN_DISABLE_MMU[] PROGMEM_I1 = ISTR("Disable"); ////MSG_BTN_DISABLE_MMU c=9 -static const char MSG_BTN_MORE[] PROGMEM_N1 = ISTR("\x06"); ////MSG_BTN_MORE c=5 +static const char MSG_BTN_MORE[] PROGMEM_N1 = ISTR("\x06"); ////MSG_BTN_MORE c=8 // Used to parse the buttons from Btns(). static const char * const btnOperation[] PROGMEM = { diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 948810775..0bedf7c5f 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -434,7 +434,7 @@ msgid "" "heatbed?" msgstr "" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "" @@ -1707,7 +1707,7 @@ msgstr "" msgid "Retract from FINDA" msgstr "" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "" @@ -1963,7 +1963,7 @@ msgstr "" msgid "Steel sheets" msgstr "" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "" @@ -2134,7 +2134,7 @@ msgid "" " is free. Check FINDA connection." msgstr "" -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 67fd547ea..c15f591c0 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -455,7 +455,7 @@ msgid "" msgstr "" "Chcete opakovat posledni krok a pozmenit vzdalenost mezi tryskou a podlozkou?" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "" @@ -1755,7 +1755,7 @@ msgstr "Obnoveni tisku" msgid "Retract from FINDA" msgstr "" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "" @@ -2019,7 +2019,7 @@ msgstr "Tichy" msgid "Steel sheets" msgstr "Tiskove platy" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "" @@ -2194,7 +2194,7 @@ msgid "" "is free. Check FINDA connection." msgstr "" -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "" diff --git a/lang/po/Firmware_da.po b/lang/po/Firmware_da.po index 6b5b3cb29..e89dc77a6 100644 --- a/lang/po/Firmware_da.po +++ b/lang/po/Firmware_da.po @@ -442,7 +442,7 @@ msgid "" "heatbed?" msgstr "" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "" @@ -1716,7 +1716,7 @@ msgstr "" msgid "Retract from FINDA" msgstr "" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "" @@ -1972,7 +1972,7 @@ msgstr "" msgid "Steel sheets" msgstr "" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "" @@ -2143,7 +2143,7 @@ msgid "" "is free. Check FINDA connection." msgstr "" -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 60173b85a..380b9f2dc 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -459,7 +459,7 @@ msgstr "" "Möchten Sie den letzten Schritt wiederholen, um den Abstand zwischen Düse " "und Druckbett neu einzustellen?" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "Klar" @@ -1795,7 +1795,7 @@ msgstr "Druck fortgesetzt" msgid "Retract from FINDA" msgstr "Einziehen von FINDA" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "Wdh." @@ -2061,7 +2061,7 @@ msgstr "Leise" msgid "Steel sheets" msgstr "Stahlbleche" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "Stop" @@ -2246,7 +2246,7 @@ msgstr "" "Unerwarteter FINDA-Wert. Stellen Sie sicher, dass sich kein Filament unter " "FINDA befindet und der Selektor frei ist. Prüfen Sie die FINDA-Verbindung." -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "Entla." diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index f8a28da5e..8d02eded6 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -455,7 +455,7 @@ msgid "" msgstr "" "Quieres repetir el ultimo paso para reajustar la distancia boquilla-base?" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "" @@ -1767,7 +1767,7 @@ msgstr "Continuan. impresion" msgid "Retract from FINDA" msgstr "" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "" @@ -2038,7 +2038,7 @@ msgstr "Sigilo" msgid "Steel sheets" msgstr "Lamina de acero" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "" @@ -2214,7 +2214,7 @@ msgid "" "is free. Check FINDA connection." msgstr "" -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 1b65d2565..c5c090c13 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -458,7 +458,7 @@ msgstr "" "Voulez-vous refaire l'etape pour reajuster la hauteur entre la buse et le " "plateau chauffant?" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "" @@ -1770,7 +1770,7 @@ msgstr "Reprise de l'impr." msgid "Retract from FINDA" msgstr "" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "" @@ -2039,7 +2039,7 @@ msgstr "Furtif" msgid "Steel sheets" msgstr "Plaques en acier" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "" @@ -2215,7 +2215,7 @@ msgid "" "is free. Check FINDA connection." msgstr "" -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index cb7cd9e63..db607e455 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -453,7 +453,7 @@ msgstr "" "Zelite li ponoviti zadnji korak za ponovno podesavanje udaljenosti izmedu " "mlaznice i grijace podloge?" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "" @@ -1756,7 +1756,7 @@ msgstr "Nastavak printa" msgid "Retract from FINDA" msgstr "" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "" @@ -2026,7 +2026,7 @@ msgstr "Tiho" msgid "Steel sheets" msgstr "Celicna ploca" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "" @@ -2201,7 +2201,7 @@ msgid "" "is free. Check FINDA connection." msgstr "" -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index c3775a192..dd4b01606 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -456,7 +456,7 @@ msgstr "" "Meg szeretned ismetelni az utolso lepest, hogy finomhangold a fuvoka es az " "asztal kozotti tavolsagot?" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "" @@ -1763,7 +1763,7 @@ msgstr "Nyomtatas folytatasa" msgid "Retract from FINDA" msgstr "" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "" @@ -2030,7 +2030,7 @@ msgstr "Halk" msgid "Steel sheets" msgstr "Acellapok" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "" @@ -2206,7 +2206,7 @@ msgid "" "is free. Check FINDA connection." msgstr "" -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index c11377486..5ea8d3c11 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -456,7 +456,7 @@ msgstr "" "Desideri ripetere l'ultimo passaggio per migliorare la distanza fra ugello e " "piatto?" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "" @@ -1761,7 +1761,7 @@ msgstr "Riprendi stampa" msgid "Retract from FINDA" msgstr "" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "" @@ -2030,7 +2030,7 @@ msgstr "Silenz." msgid "Steel sheets" msgstr "Piani d'acciaio" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "" @@ -2206,7 +2206,7 @@ msgid "" "is free. Check FINDA connection." msgstr "" -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "" diff --git a/lang/po/Firmware_lb.po b/lang/po/Firmware_lb.po index a75503321..88b4c1946 100644 --- a/lang/po/Firmware_lb.po +++ b/lang/po/Firmware_lb.po @@ -442,7 +442,7 @@ msgid "" "heatbed?" msgstr "" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "" @@ -1716,7 +1716,7 @@ msgstr "" msgid "Retract from FINDA" msgstr "" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "" @@ -1972,7 +1972,7 @@ msgstr "" msgid "Steel sheets" msgstr "" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "" @@ -2143,7 +2143,7 @@ msgid "" "is free. Check FINDA connection." msgstr "" -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "" diff --git a/lang/po/Firmware_lt.po b/lang/po/Firmware_lt.po index 1311892a6..81dcca9c2 100644 --- a/lang/po/Firmware_lt.po +++ b/lang/po/Firmware_lt.po @@ -442,7 +442,7 @@ msgid "" "heatbed?" msgstr "" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "" @@ -1716,7 +1716,7 @@ msgstr "" msgid "Retract from FINDA" msgstr "" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "" @@ -1972,7 +1972,7 @@ msgstr "" msgid "Steel sheets" msgstr "" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "" @@ -2143,7 +2143,7 @@ msgid "" "is free. Check FINDA connection." msgstr "" -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index d14df8474..85f6bb3bd 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -459,7 +459,7 @@ msgstr "" "Wilt u de laatste stap herhalen om de afstand tussen de tuit en de bed " "opnieuw in te stellen?" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "Klaar" @@ -1784,7 +1784,7 @@ msgstr "Hervatten print" msgid "Retract from FINDA" msgstr "Intrekken van FINDA" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "Retry" @@ -2056,7 +2056,7 @@ msgstr "Stil" msgid "Steel sheets" msgstr "Staalplaten" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "Stop" @@ -2238,7 +2238,7 @@ msgstr "" "Onverwachte FINDA-aflezing. Zorg ervoor dat er geen filament onder FINDA zit" " en dat de selecteur vrij is. Controleer de FINDA-verbinding." -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "Ontla." diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 5be599d26..5807689fd 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -456,7 +456,7 @@ msgstr "" "Vil du repetere det siste trinnet for å omjustere avstanden mellom dysen og " "platen?" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "" @@ -1749,7 +1749,7 @@ msgstr "Gjenopptar print" msgid "Retract from FINDA" msgstr "" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "" @@ -2012,7 +2012,7 @@ msgstr "Stille" msgid "Steel sheets" msgstr "Stål plate" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "" @@ -2188,7 +2188,7 @@ msgid "" "is free. Check FINDA connection." msgstr "" -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index e2f7905fd..44c378c17 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -456,7 +456,7 @@ msgstr "" "Chcesz powtorzyc ostatni krok i ponownie ustawic odleglosc miedzy dysza a " "stolikiem?" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "" @@ -1756,7 +1756,7 @@ msgstr "Wznawianie druku" msgid "Retract from FINDA" msgstr "" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "" @@ -2025,7 +2025,7 @@ msgstr "Cichy" msgid "Steel sheets" msgstr "Plyty stalowe" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "" @@ -2201,7 +2201,7 @@ msgid "" "is free. Check FINDA connection." msgstr "" -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 60f4874fd..8ab26784c 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -457,7 +457,7 @@ msgstr "" "Vreti sa repetati ultimul pas pentru a reajusta distanta dintre varf si " "suprafata de print?" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "Gata" @@ -1775,7 +1775,7 @@ msgstr "Reluare print..." msgid "Retract from FINDA" msgstr "Retract de la FINDA" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "Retry" @@ -2044,7 +2044,7 @@ msgstr "Silent." msgid "Steel sheets" msgstr "Suprafete print" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "Stop" @@ -2224,7 +2224,7 @@ msgstr "" "Citire FINDA neasteptata.Asig. ca nu este Fil. sub FINDA si SELECTOR" "Verifica conexiune FINDA" -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "Unload" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index ed7108e05..ed55bba6c 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -456,7 +456,7 @@ msgstr "" "Chcete opakovat posledny krok a pozmenit vzdialenost medzi tryskou a " "podlozkou?" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "Hotov" @@ -1776,7 +1776,7 @@ msgstr "Obnovenie tlace" msgid "Retract from FINDA" msgstr "Vybrat z FINDA" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "Znova" @@ -2040,7 +2040,7 @@ msgstr "Tichy" msgid "Steel sheets" msgstr "Platne" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "Zast." @@ -2222,7 +2222,7 @@ msgstr "" "Neocakavane nacitanie FINDA. Skontrolujte, ze filament nie je pod FINDA a " "selektor je volny. Skontrolujte pripojenie FINDA." -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "Vysuv" diff --git a/lang/po/Firmware_sl.po b/lang/po/Firmware_sl.po index 3fa07f640..6f03c114c 100644 --- a/lang/po/Firmware_sl.po +++ b/lang/po/Firmware_sl.po @@ -442,7 +442,7 @@ msgid "" "heatbed?" msgstr "" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "" @@ -1716,7 +1716,7 @@ msgstr "" msgid "Retract from FINDA" msgstr "" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "" @@ -1972,7 +1972,7 @@ msgstr "" msgid "Steel sheets" msgstr "" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "" @@ -2143,7 +2143,7 @@ msgid "" "is free. Check FINDA connection." msgstr "" -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 3925f2f4f..1a2a3c002 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -456,7 +456,7 @@ msgstr "" "Vill du upprepa det sista steget för att justera avståndet mellan munstycket " "och värmebädden?" -#. MSG_BTN_CONTINUE c=5 +#. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:282 ../../Firmware/mmu2/errors_list.h:292 msgid "Done" msgstr "" @@ -1764,7 +1764,7 @@ msgstr "Återupptar utskrift" msgid "Retract from FINDA" msgstr "" -#. MSG_BTN_RETRY c=5 +#. MSG_BTN_RETRY c=8 #: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:291 msgid "Retry" msgstr "" @@ -2030,7 +2030,7 @@ msgstr "Tyst" msgid "Steel sheets" msgstr "Metallskivor" -#. MSG_BTN_STOP c=5 +#. MSG_BTN_STOP c=8 #: ../../Firmware/mmu2/errors_list.h:285 ../../Firmware/mmu2/errors_list.h:295 msgid "Stop" msgstr "" @@ -2205,7 +2205,7 @@ msgid "" "is free. Check FINDA connection." msgstr "" -#. MSG_BTN_UNLOAD c=6 +#. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:294 msgid "Unload" msgstr "" From 213f0e8c7189c2a4f2321f03b4a93d6288e27c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Mon, 10 Oct 2022 17:48:56 +0000 Subject: [PATCH 8/8] PFW-1358 Update second_col description Value is no longer hardcoded --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c21b99989..b5705e7fe 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3165,7 +3165,7 @@ uint8_t lcd_show_multiscreen_message_yes_no_and_wait_P(const char *msg, bool all //! @param selected Show first choice as selected if true, the second otherwise //! @param first_choice text caption of first possible choice //! @param second_choice text caption of second possible choice -//! @param second_col column on LCD where second choice is rendered. If third choice is set, this value is hardcoded to 7 +//! @param second_col column on LCD where second choice is rendered. //! @param third_choice text caption of third, optional, choice. void lcd_show_choices_prompt_P(uint8_t selected, const char *first_choice, const char *second_choice, uint8_t second_col, const char *third_choice) {