josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PFW-1358 Adjust positions of button choices

This commit is contained in:
Guðni Már Gilbert 2022-10-01 08:49:27 +00:00
parent 06427087c0
commit 9046fb3d44
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/mmu2_reporting.cpp
View File

@ -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);

4
Firmware/ultralcd.cpp
View File

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