From 76af9ac7c568187da21ae204bc987bc80d5f9452 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 21 May 2017 12:51:58 -0500 Subject: [PATCH] tweaks --- Marlin/ultralcd_impl_DOGM.h | 8 ++++++-- Marlin/ultralcd_impl_HD44780.h | 8 +++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h index f37c7b18bc..b4ee92c5f1 100644 --- a/Marlin/ultralcd_impl_DOGM.h +++ b/Marlin/ultralcd_impl_DOGM.h @@ -635,7 +635,9 @@ 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 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 { lcd_printPGM(PSTR(LCD_STR_FILAM_DIA)); @@ -648,7 +650,9 @@ static void lcd_implementation_status_screen() { } #else 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 } } diff --git a/Marlin/ultralcd_impl_HD44780.h b/Marlin/ultralcd_impl_HD44780.h index eef964e8d6..cbad9698e2 100644 --- a/Marlin/ultralcd_impl_HD44780.h +++ b/Marlin/ultralcd_impl_HD44780.h @@ -386,10 +386,10 @@ void lcd_printPGM(const char *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) @@ -796,7 +796,9 @@ static void lcd_implementation_status_screen() { #endif // FILAMENT_LCD_DISPLAY && SDSUPPORT 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)