Merge pull request #3619 from wavexx/fixes_round2

Do not hang during startup
This commit is contained in:
Yuri D'Elia 2022-09-21 16:27:34 +02:00 committed by GitHub
commit d4aeddf90d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -7482,6 +7482,16 @@ void menu_action_sddirectory(const char* filename)
/** LCD API **/
static void lcd_padstatus() {
int len = strlen(lcd_status_message);
if (len > 0) {
while (len < LCD_WIDTH) {
lcd_status_message[len++] = ' ';
}
}
lcd_status_message[LCD_WIDTH] = '\0';
}
void ultralcd_init()
{
{
@ -7515,7 +7525,8 @@ void ultralcd_init()
lcd_encoder_diff = 0;
// Initialise status line
lcd_setstatuspgm(MSG_WELCOME);
strncpy_P(lcd_status_message, MSG_WELCOME, LCD_WIDTH);
lcd_padstatus();
}
void lcd_ignore_click(bool b)
@ -7526,15 +7537,8 @@ void lcd_ignore_click(bool b)
void lcd_finishstatus() {
SERIAL_PROTOCOLLNRPGM(MSG_LCD_STATUS_CHANGED);
int len = strlen(lcd_status_message);
if (len > 0) {
while (len < LCD_WIDTH) {
lcd_status_message[len++] = ' ';
}
}
lcd_status_message[LCD_WIDTH] = '\0';
lcd_padstatus();
lcd_draw_update = 2;
}
static bool lcd_message_check(uint8_t priority)