Browse Source

Set language display charset in language.h

Scott Lahteine 8 years ago
parent
commit
cec61c350d
2 changed files with 7 additions and 5 deletions
  1. 7
    0
      Marlin/language.h
  2. 0
    5
      Marlin/language_en.h

+ 7
- 0
Marlin/language.h View File

@@ -25,6 +25,8 @@
25 25
 
26 26
 #include "MarlinConfig.h"
27 27
 
28
+//#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays
29
+
28 30
 // Fallback if no language is set. DON'T CHANGE
29 31
 #ifndef LCD_LANGUAGE
30 32
   #define LCD_LANGUAGE en
@@ -239,6 +241,11 @@
239 241
 #define INCLUDE_LANGUAGE LANGUAGE_INCL(LCD_LANGUAGE)
240 242
 
241 243
 #include INCLUDE_LANGUAGE
244
+
245
+#if DISABLED(SIMULATE_ROMFONT) && DISABLED(DISPLAY_CHARSET_ISO10646_1) && DISABLED(DISPLAY_CHARSET_ISO10646_5) && DISABLED(DISPLAY_CHARSET_ISO10646_KANA) && DISABLED(DISPLAY_CHARSET_ISO10646_GREEK) && DISABLED(DISPLAY_CHARSET_ISO10646_CN)
246
+  #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
247
+#endif
248
+
242 249
 #include "language_en.h"
243 250
 
244 251
 #endif //__LANGUAGE_H

+ 0
- 5
Marlin/language_en.h View File

@@ -30,11 +30,6 @@
30 30
 #ifndef LANGUAGE_EN_H
31 31
 #define LANGUAGE_EN_H
32 32
 
33
-//#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays
34
-#if DISABLED(SIMULATE_ROMFONT) && DISABLED(DISPLAY_CHARSET_ISO10646_1) && DISABLED(DISPLAY_CHARSET_ISO10646_5) && DISABLED(DISPLAY_CHARSET_ISO10646_KANA) && DISABLED(DISPLAY_CHARSET_ISO10646_GREEK) && DISABLED(DISPLAY_CHARSET_ISO10646_CN)
35
-  #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
36
-#endif
37
-
38 33
 #ifndef WELCOME_MSG
39 34
   #define WELCOME_MSG                         MACHINE_NAME " ready."
40 35
 #endif

Loading…
Cancel
Save