Merge pull request #9986 from Bob-the-Kuhn/20x4-garbled-char-1.1.x

[1.1.x] Always Completely Initialize Character LCD (Garbled Custom Characters)
This commit is contained in:
Bob-the-Kuhn
2018-03-07 17:57:41 -06:00
committed by GitHub

View File

@@ -394,16 +394,6 @@ static void lcd_set_custom_characters(
#endif // SDSUPPORT #endif // SDSUPPORT
#if ENABLED(SHOW_BOOTSCREEN) || ENABLED(LCD_PROGRESS_BAR)
static uint8_t char_mode = CHARSET_MENU;
#define CHAR_COND (screen_charset != char_mode)
#else
#define CHAR_COND true
#endif
if (CHAR_COND) {
#if ENABLED(SHOW_BOOTSCREEN) || ENABLED(LCD_PROGRESS_BAR)
char_mode = screen_charset;
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)
// Set boot screen corner characters // Set boot screen corner characters
if (screen_charset == CHARSET_BOOT) { if (screen_charset == CHARSET_BOOT) {
@@ -411,7 +401,6 @@ static void lcd_set_custom_characters(
createChar_P(i, corner[i]); createChar_P(i, corner[i]);
} }
else else
#endif
#endif #endif
{ // Info Screen uses 5 special characters { // Info Screen uses 5 special characters
createChar_P(LCD_BEDTEMP_CHAR, bedTemp); createChar_P(LCD_BEDTEMP_CHAR, bedTemp);
@@ -436,7 +425,6 @@ static void lcd_set_custom_characters(
#endif #endif
} }
} }
}
} }
static void lcd_implementation_init( static void lcd_implementation_init(