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

Fix timeout making UI freeze

This commit is contained in:
Alex Voinea 2022-12-22 15:44:42 +01:00 committed by DRracer
parent 92cf8da45e
commit 96707aadcb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Firmware/ultralcd.cpp
View File

@ -3212,7 +3212,8 @@ uint8_t lcd_show_multiscreen_message_with_choices_and_wait_P(
for (uint8_t i = 0; i < 100; ++i) { for (uint8_t i = 0; i < 100; ++i) {
delay_keep_alive(50); delay_keep_alive(50);
if (allow_timeouting && _millis() - previous_millis_cmd > LCD_TIMEOUT_TO_STATUS) { if (allow_timeouting && _millis() - previous_millis_cmd > LCD_TIMEOUT_TO_STATUS) {
return LCD_BUTTON_TIMEOUT; current_selection = LCD_BUTTON_TIMEOUT;
goto exit;
} }
manage_heater(); manage_heater();
manage_inactivity(true); manage_inactivity(true);
@ -3247,10 +3248,7 @@ uint8_t lcd_show_multiscreen_message_with_choices_and_wait_P(
if (lcd_clicked()) { if (lcd_clicked()) {
Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); Sound_MakeSound(e_SOUND_TYPE_ButtonEcho);
if (msg_next == NULL) { if (msg_next == NULL) {
KEEPALIVE_STATE(IN_HANDLER); goto exit;
lcd_set_custom_characters();
lcd_update_enable(true);
return current_selection;
} else } else
break; break;
} }
@ -3265,6 +3263,11 @@ uint8_t lcd_show_multiscreen_message_with_choices_and_wait_P(
lcd_show_choices_prompt_P(current_selection, first_choice, second_choice, second_col, third_choice); lcd_show_choices_prompt_P(current_selection, first_choice, second_choice, second_col, third_choice);
} }
} }
exit:
KEEPALIVE_STATE(IN_HANDLER);
lcd_set_custom_characters();
lcd_update_enable(true);
return current_selection;
} }
//! @brief Display and wait for a Yes/No choice using the last line of the LCD //! @brief Display and wait for a Yes/No choice using the last line of the LCD