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] 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 {