From cec61c350d732291431d2f860f822b6579d347f4 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Mon, 15 Aug 2016 19:00:45 -0700 Subject: [PATCH 1/2] 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 496fed5c966..08b71668506 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 4c2e8bc8428..560c44ba6ae 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 From aa30550b2130751dfb6e04a0cb6cb6b7312c8f96 Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Mon, 15 Aug 2016 19:06:04 -0700 Subject: [PATCH 2/2] Keep SIMULATE_ROMFONT only language.h --- Marlin/language.h | 3 ++- Marlin/language_an.h | 2 -- Marlin/language_bg.h | 2 -- Marlin/language_ca.h | 2 -- Marlin/language_cz.h | 2 -- Marlin/language_da.h | 2 -- Marlin/language_de.h | 2 -- Marlin/language_el-gr.h | 3 --- Marlin/language_el.h | 3 --- Marlin/language_es.h | 2 -- Marlin/language_eu.h | 2 -- Marlin/language_fi.h | 2 -- Marlin/language_fr.h | 2 -- Marlin/language_gl.h | 2 -- Marlin/language_hr.h | 3 --- Marlin/language_it.h | 2 -- Marlin/language_kana_utf8.h | 2 -- Marlin/language_nl.h | 2 -- Marlin/language_pl.h | 2 -- Marlin/language_pt-br.h | 2 -- Marlin/language_pt-br_utf8.h | 2 -- Marlin/language_pt.h | 2 -- Marlin/language_pt_utf8.h | 2 -- Marlin/language_ru.h | 2 -- Marlin/language_test.h | 2 -- 25 files changed, 2 insertions(+), 52 deletions(-) diff --git a/Marlin/language.h b/Marlin/language.h index 08b71668506..002e95778c9 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -25,7 +25,8 @@ #include "MarlinConfig.h" -//#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays +// 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 #ifndef LCD_LANGUAGE diff --git a/Marlin/language_an.h b/Marlin/language_an.h index afc6a072fa3..9184d332f92 100644 --- a/Marlin/language_an.h +++ b/Marlin/language_an.h @@ -30,8 +30,6 @@ #ifndef 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 WELCOME_MSG MACHINE_NAME " parada." diff --git a/Marlin/language_bg.h b/Marlin/language_bg.h index 8c8b641e8a5..5d5d3222c73 100644 --- a/Marlin/language_bg.h +++ b/Marlin/language_bg.h @@ -31,8 +31,6 @@ #define LANGUAGE_BG_H #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 WELCOME_MSG MACHINE_NAME " Готов." diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h index f20580e925c..efa296f9b3b 100644 --- a/Marlin/language_ca.h +++ b/Marlin/language_ca.h @@ -31,8 +31,6 @@ #define LANGUAGE_CA_H #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 WELCOME_MSG MACHINE_NAME " preparada." diff --git a/Marlin/language_cz.h b/Marlin/language_cz.h index 9753a0c0041..89158e7e490 100644 --- a/Marlin/language_cz.h +++ b/Marlin/language_cz.h @@ -34,8 +34,6 @@ #ifndef 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 WELCOME_MSG MACHINE_NAME " pripraven." diff --git a/Marlin/language_da.h b/Marlin/language_da.h index 3af5d8f4992..b4cf853ad2f 100644 --- a/Marlin/language_da.h +++ b/Marlin/language_da.h @@ -31,8 +31,6 @@ #define LANGUAGE_DA_H #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 WELCOME_MSG MACHINE_NAME " er klar" diff --git a/Marlin/language_de.h b/Marlin/language_de.h index ed7836882f7..5ea50630ed5 100644 --- a/Marlin/language_de.h +++ b/Marlin/language_de.h @@ -31,8 +31,6 @@ #define LANGUAGE_DE_H #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 WELCOME_MSG MACHINE_NAME " bereit" diff --git a/Marlin/language_el-gr.h b/Marlin/language_el-gr.h index 04b3aa8e393..1c184966907 100644 --- a/Marlin/language_el-gr.h +++ b/Marlin/language_el-gr.h @@ -30,9 +30,6 @@ #ifndef 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 DISPLAY_CHARSET_ISO10646_GREEK diff --git a/Marlin/language_el.h b/Marlin/language_el.h index 0bcaffd3ecb..4242969797b 100644 --- a/Marlin/language_el.h +++ b/Marlin/language_el.h @@ -30,9 +30,6 @@ #ifndef 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 DISPLAY_CHARSET_ISO10646_GREEK diff --git a/Marlin/language_es.h b/Marlin/language_es.h index 16ad3e891f3..c1a2a12b742 100644 --- a/Marlin/language_es.h +++ b/Marlin/language_es.h @@ -30,8 +30,6 @@ #ifndef 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 WELCOME_MSG MACHINE_NAME " lista." diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h index ce7e7bd0417..64c3fb32aea 100644 --- a/Marlin/language_eu.h +++ b/Marlin/language_eu.h @@ -30,8 +30,6 @@ #ifndef 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 WELCOME_MSG MACHINE_NAME " prest." diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h index 90c62760d74..461bb413ca6 100644 --- a/Marlin/language_fi.h +++ b/Marlin/language_fi.h @@ -31,8 +31,6 @@ #define LANGUAGE_FI_H #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 WELCOME_MSG MACHINE_NAME " valmis." diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h index a2b7b3fe18d..eff8d32923a 100644 --- a/Marlin/language_fr.h +++ b/Marlin/language_fr.h @@ -30,8 +30,6 @@ #ifndef 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 WELCOME_MSG MACHINE_NAME " prete." diff --git a/Marlin/language_gl.h b/Marlin/language_gl.h index e28d193fcb8..5f1b591e9c9 100644 --- a/Marlin/language_gl.h +++ b/Marlin/language_gl.h @@ -31,8 +31,6 @@ #define LANGUAGE_GL_H #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 WELCOME_MSG MACHINE_NAME " lista." diff --git a/Marlin/language_hr.h b/Marlin/language_hr.h index e8a3c1154a6..ebfaeb2fbd8 100644 --- a/Marlin/language_hr.h +++ b/Marlin/language_hr.h @@ -30,9 +30,6 @@ #ifndef 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 WELCOME_MSG MACHINE_NAME " spreman." diff --git a/Marlin/language_it.h b/Marlin/language_it.h index ee2e6f19540..4121d59bdf3 100644 --- a/Marlin/language_it.h +++ b/Marlin/language_it.h @@ -30,8 +30,6 @@ #ifndef 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 WELCOME_MSG MACHINE_NAME " pronto." diff --git a/Marlin/language_kana_utf8.h b/Marlin/language_kana_utf8.h index 6dfec2ed209..b48399527f7 100644 --- a/Marlin/language_kana_utf8.h +++ b/Marlin/language_kana_utf8.h @@ -32,8 +32,6 @@ #define LANGUAGE_KANA_UTF_H #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 // This just to show the potential benefit of unicode. diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h index 842a64d562b..82f0a69b8b0 100644 --- a/Marlin/language_nl.h +++ b/Marlin/language_nl.h @@ -30,8 +30,6 @@ #ifndef 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 WELCOME_MSG MACHINE_NAME " gereed." diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h index fd6ebd56bfe..efde140b921 100644 --- a/Marlin/language_pl.h +++ b/Marlin/language_pl.h @@ -30,8 +30,6 @@ #ifndef 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 WELCOME_MSG MACHINE_NAME " gotowy." diff --git a/Marlin/language_pt-br.h b/Marlin/language_pt-br.h index 49bec2cdea8..1db6ae6a1b9 100644 --- a/Marlin/language_pt-br.h +++ b/Marlin/language_pt-br.h @@ -30,8 +30,6 @@ #ifndef 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 WELCOME_MSG MACHINE_NAME " pronto." diff --git a/Marlin/language_pt-br_utf8.h b/Marlin/language_pt-br_utf8.h index bc8e5e256c6..43e5d549b92 100644 --- a/Marlin/language_pt-br_utf8.h +++ b/Marlin/language_pt-br_utf8.h @@ -30,8 +30,6 @@ #ifndef 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 WELCOME_MSG MACHINE_NAME " pronto." diff --git a/Marlin/language_pt.h b/Marlin/language_pt.h index b64c042e1e6..5996dd12afd 100644 --- a/Marlin/language_pt.h +++ b/Marlin/language_pt.h @@ -30,8 +30,6 @@ #ifndef 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 WELCOME_MSG MACHINE_NAME " pronto." diff --git a/Marlin/language_pt_utf8.h b/Marlin/language_pt_utf8.h index 0146ff9b0ea..ec56a86cceb 100644 --- a/Marlin/language_pt_utf8.h +++ b/Marlin/language_pt_utf8.h @@ -30,8 +30,6 @@ #ifndef 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 WELCOME_MSG MACHINE_NAME " pronto." diff --git a/Marlin/language_ru.h b/Marlin/language_ru.h index e3e63cb434d..e953b0b5276 100644 --- a/Marlin/language_ru.h +++ b/Marlin/language_ru.h @@ -31,8 +31,6 @@ #define LANGUAGE_RU_H #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 WELCOME_MSG MACHINE_NAME " Готов." diff --git a/Marlin/language_test.h b/Marlin/language_test.h index 99fa712a715..25b9c09474b 100644 --- a/Marlin/language_test.h +++ b/Marlin/language_test.h @@ -51,8 +51,6 @@ //#define MAPPER_E382E383 // For Katakana //#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. //#define DISPLAY_CHARSET_ISO10646_1