zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4634 from thinkyhead/rc_lang_disp_char

Browse source 
Set language display charset in language.h
This commit is contained in:
Scott Lahteine 2016-08-15 19:25:56 -07:00 committed by GitHub
parent 165d7abb1b aa30550b21
commit 7427290d3a
26 changed files with 8 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/language.h
View file

@ -25,6 +25,9 @@
#include "MarlinConfig.h" #include "MarlinConfig.h"
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
// 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 +242,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

2
Marlin/language_an.h
View file

@ -30,8 +30,6 @@
#ifndef LANGUAGE_AN_H #ifndef LANGUAGE_AN_H
#define LANGUAGE_AN_H #define LANGUAGE_AN_H
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " parada." #define WELCOME_MSG MACHINE_NAME " parada."

2
Marlin/language_bg.h
View file

@ -31,8 +31,6 @@
#define LANGUAGE_BG_H #define LANGUAGE_BG_H
#define MAPPER_D0D1 // For Cyrillic #define MAPPER_D0D1 // For Cyrillic
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_5 #define DISPLAY_CHARSET_ISO10646_5
#define WELCOME_MSG MACHINE_NAME " Готов." #define WELCOME_MSG MACHINE_NAME " Готов."

2
Marlin/language_ca.h
View file

@ -31,8 +31,6 @@
#define LANGUAGE_CA_H #define LANGUAGE_CA_H
#define MAPPER_C2C3 // because of "ó" #define MAPPER_C2C3 // because of "ó"
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " preparada." #define WELCOME_MSG MACHINE_NAME " preparada."

2
Marlin/language_cz.h
View file

@ -34,8 +34,6 @@
#ifndef LANGUAGE_CZ_H #ifndef LANGUAGE_CZ_H
#define LANGUAGE_CZ_H #define LANGUAGE_CZ_H
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " pripraven." #define WELCOME_MSG MACHINE_NAME " pripraven."

2
Marlin/language_da.h
View file

@ -31,8 +31,6 @@
#define LANGUAGE_DA_H #define LANGUAGE_DA_H
#define MAPPER_C2C3 #define MAPPER_C2C3
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " er klar" #define WELCOME_MSG MACHINE_NAME " er klar"

2
Marlin/language_de.h
View file

@ -31,8 +31,6 @@
#define LANGUAGE_DE_H #define LANGUAGE_DE_H
#define MAPPER_C2C3 #define MAPPER_C2C3
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " bereit" #define WELCOME_MSG MACHINE_NAME " bereit"

3
Marlin/language_el-gr.h
View file

@ -30,9 +30,6 @@
#ifndef LANGUAGE_EL_GR_H #ifndef LANGUAGE_EL_GR_H
#define LANGUAGE_EL_GR_H #define LANGUAGE_EL_GR_H
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
//#define MAPPER_CECF //#define MAPPER_CECF
//#define DISPLAY_CHARSET_ISO10646_GREEK //#define DISPLAY_CHARSET_ISO10646_GREEK

3
Marlin/language_el.h
View file

@ -30,9 +30,6 @@
#ifndef LANGUAGE_EL_H #ifndef LANGUAGE_EL_H
#define LANGUAGE_EL_H #define LANGUAGE_EL_H
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define MAPPER_CECF #define MAPPER_CECF
#define DISPLAY_CHARSET_ISO10646_GREEK #define DISPLAY_CHARSET_ISO10646_GREEK

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

2
Marlin/language_es.h
View file

@ -30,8 +30,6 @@
#ifndef LANGUAGE_ES_H #ifndef LANGUAGE_ES_H
#define LANGUAGE_ES_H #define LANGUAGE_ES_H
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " lista." #define WELCOME_MSG MACHINE_NAME " lista."

2
Marlin/language_eu.h
View file

@ -30,8 +30,6 @@
#ifndef LANGUAGE_EU_H #ifndef LANGUAGE_EU_H
#define LANGUAGE_EU_H #define LANGUAGE_EU_H
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " prest." #define WELCOME_MSG MACHINE_NAME " prest."

2
Marlin/language_fi.h
View file

@ -31,8 +31,6 @@
#define LANGUAGE_FI_H #define LANGUAGE_FI_H
#define MAPPER_C2C3 #define MAPPER_C2C3
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " valmis." #define WELCOME_MSG MACHINE_NAME " valmis."

2
Marlin/language_fr.h
View file

@ -30,8 +30,6 @@
#ifndef LANGUAGE_FR_H #ifndef LANGUAGE_FR_H
#define LANGUAGE_FR_H #define LANGUAGE_FR_H
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " prete." #define WELCOME_MSG MACHINE_NAME " prete."

2
Marlin/language_gl.h
View file

@ -31,8 +31,6 @@
#define LANGUAGE_GL_H #define LANGUAGE_GL_H
#define MAPPER_C2C3 #define MAPPER_C2C3
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " lista." #define WELCOME_MSG MACHINE_NAME " lista."

3
Marlin/language_hr.h
View file

@ -30,9 +30,6 @@
#ifndef LANGUAGE_HR_H #ifndef LANGUAGE_HR_H
#define LANGUAGE_HR_H #define LANGUAGE_HR_H
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays. #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
#define WELCOME_MSG MACHINE_NAME " spreman." #define WELCOME_MSG MACHINE_NAME " spreman."

2
Marlin/language_it.h
View file

@ -30,8 +30,6 @@
#ifndef LANGUAGE_IT_H #ifndef LANGUAGE_IT_H
#define LANGUAGE_IT_H #define LANGUAGE_IT_H
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " pronto." #define WELCOME_MSG MACHINE_NAME " pronto."

2
Marlin/language_kana_utf8.h
View file

@ -32,8 +32,6 @@
#define LANGUAGE_KANA_UTF_H #define LANGUAGE_KANA_UTF_H
#define MAPPER_E382E383 #define MAPPER_E382E383
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_KANA #define DISPLAY_CHARSET_ISO10646_KANA
// This just to show the potential benefit of unicode. // This just to show the potential benefit of unicode.

2
Marlin/language_nl.h
View file

@ -30,8 +30,6 @@
#ifndef LANGUAGE_NL_H #ifndef LANGUAGE_NL_H
#define LANGUAGE_NL_H #define LANGUAGE_NL_H
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " gereed." #define WELCOME_MSG MACHINE_NAME " gereed."

2
Marlin/language_pl.h
View file

@ -30,8 +30,6 @@
#ifndef LANGUAGE_PL_H #ifndef LANGUAGE_PL_H
#define LANGUAGE_PL_H #define LANGUAGE_PL_H
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " gotowy." #define WELCOME_MSG MACHINE_NAME " gotowy."

2
Marlin/language_pt-br.h
View file

@ -30,8 +30,6 @@
#ifndef LANGUAGE_PT_BR_H #ifndef LANGUAGE_PT_BR_H
#define LANGUAGE_PT_BR_H #define LANGUAGE_PT_BR_H
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " pronto." #define WELCOME_MSG MACHINE_NAME " pronto."

2
Marlin/language_pt-br_utf8.h
View file

@ -30,8 +30,6 @@
#ifndef LANGUAGE_PT_BR_UTF_H #ifndef LANGUAGE_PT_BR_UTF_H
#define LANGUAGE_PT_BR_UTF_H #define LANGUAGE_PT_BR_UTF_H
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " pronto." #define WELCOME_MSG MACHINE_NAME " pronto."

2
Marlin/language_pt.h
View file

@ -30,8 +30,6 @@
#ifndef LANGUAGE_PT_H #ifndef LANGUAGE_PT_H
#define LANGUAGE_PT_H #define LANGUAGE_PT_H
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " pronto." #define WELCOME_MSG MACHINE_NAME " pronto."

2
Marlin/language_pt_utf8.h
View file

@ -30,8 +30,6 @@
#ifndef LANGUAGE_PT_UTF_H #ifndef LANGUAGE_PT_UTF_H
#define LANGUAGE_PT_UTF_H #define LANGUAGE_PT_UTF_H
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_1 #define DISPLAY_CHARSET_ISO10646_1
#define WELCOME_MSG MACHINE_NAME " pronto." #define WELCOME_MSG MACHINE_NAME " pronto."

2
Marlin/language_ru.h
View file

@ -31,8 +31,6 @@
#define LANGUAGE_RU_H #define LANGUAGE_RU_H
#define MAPPER_D0D1 // For Cyrillic #define MAPPER_D0D1 // For Cyrillic
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
#define DISPLAY_CHARSET_ISO10646_5 #define DISPLAY_CHARSET_ISO10646_5
#define WELCOME_MSG MACHINE_NAME " Готов." #define WELCOME_MSG MACHINE_NAME " Готов."

2
Marlin/language_test.h
View file

@ -51,8 +51,6 @@
//#define MAPPER_E382E383 // For Katakana //#define MAPPER_E382E383 // For Katakana
//#define MAPPER_NON // For direct ascii codes. Fall back mapper - if no other is defined. //#define MAPPER_NON // For direct ascii codes. Fall back mapper - if no other is defined.
// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h
//#define SIMULATE_ROMFONT
// Select the better font for full graphic displays. // Select the better font for full graphic displays.
//#define DISPLAY_CHARSET_ISO10646_1 //#define DISPLAY_CHARSET_ISO10646_1