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

PFW-1358 Fix and optimise button choice positions

This commit is contained in:
Guðni Már Gilbert 2022-10-01 09:35:42 +00:00
parent 9046fb3d44
commit 7264391c5f
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Firmware/mmu2_reporting.cpp
View File

@ -76,7 +76,7 @@ static void ReportErrorHookStaticRender(uint8_t ei) {
ReportErrorHookSensorLineRender(); ReportErrorHookSensorLineRender();
// Render the choices // 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() extern void ReportErrorHookSensorLineRender()
@ -164,15 +164,12 @@ static uint8_t ReportErrorHookMonitor(uint8_t ei) {
// //
lcd_set_cursor(0, 3); lcd_set_cursor(0, 3);
lcd_print(current_selection == LCD_LEFT_BUTTON_CHOICE ? '>': ' '); 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) if (two_choices == false)
{ {
lcd_set_cursor(9, 3);
lcd_print(current_selection == LCD_MIDDLE_BUTTON_CHOICE ? '>': ' ');
lcd_set_cursor(18, 3); lcd_set_cursor(18, 3);
lcd_print(current_selection == LCD_RIGHT_BUTTON_CHOICE ? '>': ' '); 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 // Consume rotation event and make feedback sound
enc_dif = lcd_encoder_diff; enc_dif = lcd_encoder_diff;

10
Firmware/ultralcd.cpp
View File

@ -3172,18 +3172,14 @@ void lcd_show_choices_prompt_P(uint8_t selected, const char *first_choice, const
lcd_set_cursor(0, 3); lcd_set_cursor(0, 3);
lcd_print(selected == LCD_LEFT_BUTTON_CHOICE ? '>': ' '); lcd_print(selected == LCD_LEFT_BUTTON_CHOICE ? '>': ' ');
lcd_puts_P(first_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) 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_set_cursor(18, 3);
lcd_print(selected == LCD_RIGHT_BUTTON_CHOICE ? '>': ' '); lcd_print(selected == LCD_RIGHT_BUTTON_CHOICE ? '>': ' ');
lcd_puts_P(third_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);
} }
} }