0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Set language display charset in language.h

Browse source
This commit is contained in:
Scott Lahteine 2016-08-15 19:00:45 -07:00
parent 132322e4d9
commit cec61c350d
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Marlin/language.h
View file

@ -25,6 +25,8 @@
#include "MarlinConfig.h" #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 // Fallback if no language is set. DON'T CHANGE
#ifndef LCD_LANGUAGE #ifndef LCD_LANGUAGE
#define LCD_LANGUAGE en #define LCD_LANGUAGE en
@ -239,6 +241,11 @@
#define INCLUDE_LANGUAGE LANGUAGE_INCL(LCD_LANGUAGE) #define INCLUDE_LANGUAGE LANGUAGE_INCL(LCD_LANGUAGE)
#include INCLUDE_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" #include "language_en.h"
#endif //__LANGUAGE_H #endif //__LANGUAGE_H

5
Marlin/language_en.h
View file

@ -30,11 +30,6 @@
#ifndef LANGUAGE_EN_H #ifndef LANGUAGE_EN_H
#define 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 #ifndef WELCOME_MSG
#define WELCOME_MSG MACHINE_NAME " ready." #define WELCOME_MSG MACHINE_NAME " ready."
#endif #endif