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

Do not hang during startup

Browse Source 
In ultralcd_init() do not use lcd_setstatuspgm() to initialize the
welcome message.

The internal call to lcd_finishstatus() requires the serial to be
already available. Split the function into lcd_padstatus() to pre-pad
the string and save some space.
This commit is contained in:
Yuri D'Elia 2022-09-21 16:02:38 +02:00
parent 7bd9e5e06e
commit bb0489cba6
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Firmware/ultralcd.cpp
View File

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