Skip to content
Snippets Groups Projects
Commit ca4b36de authored by Scott Lahteine's avatar Scott Lahteine
Browse files

Merge pull request #1578 from thinkyhead/require_lcd_style 

Make sure a ROM is selected for ULTRA_LCD
parents 254970c9 9eed8c8c
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 3 additions and 2 deletions
Marlin/language.h
+ 3
− 2
View file @ ca4b36de
...@@ -226,8 +226,7 @@ ...@@ -226,8 +226,7 @@
#define STR_h3 "3" #define STR_h3 "3"
#define STR_Deg "\271" #define STR_Deg "\271"
#define STR_THERMOMETER "\002" #define STR_THERMOMETER "\002"
#endif #elif defined(DISPLAY_CHARSET_HD44780_WESTERN) // HD44780 ROM Code: A02 (Western)
#ifdef DISPLAY_CHARSET_HD44780_WESTERN // HD44780 ROM Code: A02 (Western)
#define STR_Ae "\216" #define STR_Ae "\216"
#define STR_ae "\204" #define STR_ae "\204"
#define STR_Oe "\211" #define STR_Oe "\211"
...@@ -239,6 +238,8 @@ ...@@ -239,6 +238,8 @@
#define STR_h3 "\263" #define STR_h3 "\263"
#define STR_Deg "\337" #define STR_Deg "\337"
#define STR_THERMOMETER "\002" #define STR_THERMOMETER "\002"
#elif defined(ULTRA_LCD)
#error You must enable either DISPLAY_CHARSET_HD44780_JAPAN or DISPLAY_CHARSET_HD44780_WESTERN for your LCD controller.
#endif #endif
#endif #endif
/* /*
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment