CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweaks

Browse Source
This commit is contained in:
Scott Lahteine 2017-05-21 12:51:58 -05:00
parent ba5910ab6c
commit 76af9ac7c5
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/ultralcd_impl_DOGM.h
View File

@ -635,7 +635,9 @@ static void lcd_implementation_status_screen() {
#if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT) #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 if (PENDING(millis(), previous_lcd_status_ms + 5000UL)) { //Display both Status message line and Filament display on the last line
const char *str = 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); uint8_t i = LCD_WIDTH;
char c;
while (i-- && (c = *str++)) lcd_print(c);
} }
else { else {
lcd_printPGM(PSTR(LCD_STR_FILAM_DIA)); lcd_printPGM(PSTR(LCD_STR_FILAM_DIA));
@ -648,7 +650,9 @@ static void lcd_implementation_status_screen() {
} }
#else #else
const char *str = 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); uint8_t i = LCD_WIDTH;
char c;
while (i-- && (c = *str++)) lcd_print(c);
#endif #endif
} }
} }

8
Marlin/ultralcd_impl_HD44780.h
View File

@ -386,10 +386,10 @@ void lcd_printPGM(const char *str) {
} }
void lcd_print(const char* const str) { void lcd_print(const char* const str) {
for (uint8_t i = 0; char c = str[i]; ++i) charset_mapper(c); for (uint8_t i = 0; const char c = str[i]; ++i) charset_mapper(c);
} }
void lcd_print(char c) { charset_mapper(c); } void lcd_print(const char c) { charset_mapper(c); }
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)
@ -796,7 +796,9 @@ static void lcd_implementation_status_screen() {
#endif // FILAMENT_LCD_DISPLAY && SDSUPPORT #endif // FILAMENT_LCD_DISPLAY && SDSUPPORT
const char *str = 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); uint8_t i = LCD_WIDTH;
char c;
while (i-- && (c = *str++)) lcd_print(c);
} }
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL)