bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Make DISPLAY_CHARSET_HD44780 a single setting

Browse Source
This commit is contained in:
Scott Lahteine
2016-04-26 22:25:50 -07:00
parent a5d00f755b
commit 259794c0be
23 changed files with 461 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/language.h
View File

@ -27,6 +27,10 @@
#define GENERATE_LANGUAGE_INCLUDE(M) STRINGIFY_(language_##M.h)
// For character-based LCD controllers (DISPLAY_CHARSET_HD44780)
#define JAPANESE 1
#define WESTERN 2
#define CYRILLIC 3
// NOTE: IF YOU CHANGE LANGUAGE FILES OR MERGE A FILE WITH CHANGES
//
@ -232,10 +236,6 @@
// LCD Menu Messages
#if DISABLED(DISPLAY_CHARSET_HD44780_JAPAN) && DISABLED(DISPLAY_CHARSET_HD44780_WESTERN) && DISABLED(DISPLAY_CHARSET_HD44780_CYRILLIC)
#define DISPLAY_CHARSET_HD44780_JAPAN
#endif
#include LANGUAGE_INCLUDE
#include "language_en.h"