|
@ -222,9 +222,11 @@ static void createChar_P(const char c, const byte * const ptr) { |
|
|
lcd.createChar(c, temp); |
|
|
lcd.createChar(c, temp); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
#define CHARSET_MENU 0 |
|
|
enum HD44780CharSet : char { |
|
|
#define CHARSET_INFO 1 |
|
|
CHARSET_MENU, |
|
|
#define CHARSET_BOOT 2 |
|
|
CHARSET_INFO, |
|
|
|
|
|
CHARSET_BOOT |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
static void lcd_set_custom_characters( |
|
|
static void lcd_set_custom_characters( |
|
|
#if ENABLED(LCD_PROGRESS_BAR) || ENABLED(SHOW_BOOTSCREEN) |
|
|
#if ENABLED(LCD_PROGRESS_BAR) || ENABLED(SHOW_BOOTSCREEN) |
|
@ -399,16 +401,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) { |
|
@ -416,7 +408,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); |
|
@ -441,7 +432,7 @@ static void lcd_set_custom_characters( |
|
|
#endif |
|
|
#endif |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
static void lcd_implementation_init( |
|
|
static void lcd_implementation_init( |
|
|