3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Multiline lcd_show_fullscreen_message_and_wait_P() function.

Browse source
This commit is contained in:
bubnikv 2016-07-25 15:52:27 +02:00
parent 403d71d902
commit 018c1b1fad
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Firmware/ultralcd.cpp
View file

@ -1412,16 +1412,25 @@ const char* lcd_display_message_fullscreen_P(const char *msg)
void lcd_show_fullscreen_message_and_wait_P(const char *msg) void lcd_show_fullscreen_message_and_wait_P(const char *msg)
{ {
lcd_display_message_fullscreen_P(msg); const char *msg_next = lcd_display_message_fullscreen_P(msg);
bool multi_screen = msg_next != NULL;
// Until confirmed by a button click. // Until confirmed by a button click.
for (;;) { for (;;) {
delay_keep_alive(50); // Wait for 5 seconds before displaying the next text.
if (lcd_clicked()) { for (uint8_t i = 0; i < 100; ++ i) {
while (lcd_clicked()) ; delay_keep_alive(50);
delay(10); if (lcd_clicked()) {
while (lcd_clicked()) ; while (lcd_clicked()) ;
break; delay(10);
while (lcd_clicked()) ;
return;
}
}
if (multi_screen) {
if (msg_next == NULL)
msg_next = msg;
msg_next = lcd_display_message_fullscreen_P(msg_next);
} }
} }
} }