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

Merge pull request #246 from PavelSindler/calibration_wizard_menu_fix 

multiscreen yes/no dialog updated
This commit is contained in:
PavelSindler 2017-10-22 23:58:21 +02:00 committed by GitHub
parent 9121e071da 2c63ed5d43
commit 6baea1b169
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/ultralcd.cpp
View File

@ -2504,8 +2504,11 @@ int8_t lcd_show_multiscreen_message_yes_no_and_wait_P(const char *msg, bool allo
while (lcd_clicked()); while (lcd_clicked());
delay(10); delay(10);
while (lcd_clicked()); while (lcd_clicked());
KEEPALIVE_STATE(IN_HANDLER); if (msg_next == NULL) {
if(msg_next == NULL) return yes; KEEPALIVE_STATE(IN_HANDLER);
lcd_set_custom_characters();
return yes;
}
else break; else break;
} }
} }
@ -3284,6 +3287,7 @@ void lcd_wizard() {
lcd_wizard(0); lcd_wizard(0);
} }
else { else {
lcd_return_to_status();
lcd_update_enable(true); lcd_update_enable(true);
lcd_update(2); lcd_update(2);
} }