From cec61c350d732291431d2f860f822b6579d347f4 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 15 Aug 2016 19:00:45 -0700 Subject: [PATCH] Set language display charset in language.h --- Marlin/language.h | 7 +++++++ Marlin/language_en.h | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Marlin/language.h b/Marlin/language.h index 496fed5c9..08b716685 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -25,6 +25,8 @@ #include "MarlinConfig.h" +//#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays + // Fallback if no language is set. DON'T CHANGE #ifndef LCD_LANGUAGE #define LCD_LANGUAGE en @@ -239,6 +241,11 @@ #define INCLUDE_LANGUAGE LANGUAGE_INCL(LCD_LANGUAGE) #include INCLUDE_LANGUAGE + +#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) + #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays. +#endif + #include "language_en.h" #endif //__LANGUAGE_H diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 4c2e8bc84..560c44ba6 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -30,11 +30,6 @@ #ifndef LANGUAGE_EN_H #define LANGUAGE_EN_H -//#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays -#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) - #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays. -#endif - #ifndef WELCOME_MSG #define WELCOME_MSG MACHINE_NAME " ready." #endif