MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Constrain LCD status message rendering

Browse Source
This commit is contained in:
Scott Lahteine 2017-05-21 12:35:06 -05:00
parent a83f6db679
commit ba5910ab6c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/ultralcd_impl_DOGM.h
View File

@ -634,7 +634,8 @@ static void lcd_implementation_status_screen() {
#if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
if (PENDING(millis(), previous_lcd_status_ms + 5000UL)) { //Display both Status message line and Filament display on the last line
lcd_print(lcd_status_message);
const char *str = lcd_status_message;
for (uint8_t i = 0; char c = str[i] && i < LCD_WIDTH; ++i) lcd_print(c);
}
else {
lcd_printPGM(PSTR(LCD_STR_FILAM_DIA));
@ -646,7 +647,8 @@ static void lcd_implementation_status_screen() {
u8g.print('%');
}
#else
lcd_print(lcd_status_message);
const char *str = lcd_status_message;
for (uint8_t i = 0; char c = str[i] && i < LCD_WIDTH; ++i) lcd_print(c);
#endif
}
}

3
Marlin/ultralcd_impl_HD44780.h
View File

@ -795,7 +795,8 @@ static void lcd_implementation_status_screen() {
#endif // FILAMENT_LCD_DISPLAY && SDSUPPORT
lcd_print(lcd_status_message);
const char *str = lcd_status_message;
for (uint8_t i = 0; char c = str[i] && i < LCD_WIDTH; ++i) lcd_print(c);
}
#if ENABLED(ULTIPANEL)