diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index 5c25f3ea03b21c2713ac813d3c8482eebb062939..1cc05df3629adf77b29e6a8f151bb17bd0fa64ef 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -30,7 +30,6 @@ #ifndef LANGUAGE_BG_H #define LANGUAGE_BG_H -#define MAPPER_D0D1 // For Cyrillic #define DISPLAY_CHARSET_ISO10646_5 #define CHARSIZE 2 diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index b13c791408159588b7ea071a320a5377e63782a1..d1f50f2d852dee056bff90ba259865b8566442e8 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -30,8 +30,6 @@ #ifndef LANGUAGE_CA_H #define LANGUAGE_CA_H -#define MAPPER_C2C3 // because of "ó" -#define DISPLAY_CHARSET_ISO10646_1 #define CHARSIZE 2 #define WELCOME_MSG MACHINE_NAME _UxGT(" preparada.") diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 51eb2d14c3ec53b730c8ca370055f3faf06f27f8..466baaf07eb491e49232e9c90711dbc159c87a47 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -35,7 +35,6 @@ #ifndef LANGUAGE_CZ_UTF_H #define LANGUAGE_CZ_UTF_H -#define MAPPER_C3C4C5_CZ #define DISPLAY_CHARSET_ISO10646_CZ #define CHARSIZE 2 diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h index 8d443e161ae092cce31c76a9b38bd9cac18d235c..cd030dfa2b41dd25cc6cf75ec68455242f6472b2 100644 --- a/Marlin/src/lcd/language/language_da.h +++ b/Marlin/src/lcd/language/language_da.h @@ -30,7 +30,6 @@ #ifndef LANGUAGE_DA_H #define LANGUAGE_DA_H -#define MAPPER_C2C3 #define DISPLAY_CHARSET_ISO10646_1 #define CHARSIZE 2 diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 8660bf969967c0f65dc70b155f7ce58bd108dd4b..6ec4e49a567ce40904ecb5d97f090665062a659e 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -30,8 +30,6 @@ #ifndef LANGUAGE_DE_H #define LANGUAGE_DE_H -#define MAPPER_C2C3 -#define DISPLAY_CHARSET_ISO10646_1 #define CHARSIZE 2 #define THIS_LANGUAGES_SPECIAL_SYMBOLS _UxGT("ÄäÖöÜüß²³") diff --git a/Marlin/src/lcd/language/language_el-gr.h b/Marlin/src/lcd/language/language_el-gr.h index ad2895cfdb121eb41fe3f366ecf97c68ac9f635c..b59d284a3260d99013abbb390799e7e0f6a67715 100644 --- a/Marlin/src/lcd/language/language_el-gr.h +++ b/Marlin/src/lcd/language/language_el-gr.h @@ -30,7 +30,6 @@ #ifndef LANGUAGE_EL_GR_H #define LANGUAGE_EL_GR_H -#define MAPPER_CECF #define DISPLAY_CHARSET_ISO10646_GREEK #define CHARSIZE 2 diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h index 5211fbe576cbfd168fc73670742bfbdac6bb8472..6f5b112c179b09b909805f5a91d943a244847943 100644 --- a/Marlin/src/lcd/language/language_el.h +++ b/Marlin/src/lcd/language/language_el.h @@ -30,7 +30,6 @@ #ifndef LANGUAGE_EL_H #define LANGUAGE_EL_H -#define MAPPER_CECF #define DISPLAY_CHARSET_ISO10646_GREEK #define CHARSIZE 2 diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index 0fcdaa8f10b2301e915bdaf3795a89d4f7a3323c..2e4873467fa290401aacc15aa5a1299467b657c3 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -30,7 +30,6 @@ #ifndef LANGUAGE_ES_UTF_H #define LANGUAGE_ES_UTF_H -#define MAPPER_C2C3 #define DISPLAY_CHARSET_ISO10646_1 #define CHARSIZE 2 diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h index aa5013f949494568fa65800605f837d768750935..a400651dd521c3c59d13a2b5d4e9964625b109ab 100644 --- a/Marlin/src/lcd/language/language_fi.h +++ b/Marlin/src/lcd/language/language_fi.h @@ -30,7 +30,6 @@ #ifndef LANGUAGE_FI_H #define LANGUAGE_FI_H -#define MAPPER_C2C3 #define DISPLAY_CHARSET_ISO10646_1 #define CHARSIZE 2 diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index dbc4e24daf4c039947c80674470e044aca7474bb..2a0a8ce8bbf7a0ab8899b18e368311a23aa5eb04 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -30,7 +30,6 @@ #ifndef LANGUAGE_FR_UTF_H #define LANGUAGE_FR_UTF_H -#define MAPPER_C2C3 #define DISPLAY_CHARSET_ISO10646_1 #define CHARSIZE 2 diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index 87ae72e7d8fae93193ae81308d655fd55fa7de22..4a7986983e0513ce66c1d68bd65fadaa9f5f7972 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -30,7 +30,6 @@ #ifndef LANGUAGE_GL_H #define LANGUAGE_GL_H -#define MAPPER_C2C3 #define DISPLAY_CHARSET_ISO10646_1 #define NOT_EXTENDED_ISO10646_1_5X7 diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 9f1874c1be6557a010e958dc84786f0114cc6e43..2e9a87b5094bb26bd6f0b8fb5bc0282200c7cb2b 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -30,7 +30,6 @@ #ifndef LANGUAGE_IT_H #define LANGUAGE_IT_H -#define MAPPER_C2C3 #define DISPLAY_CHARSET_ISO10646_1 #define WELCOME_MSG MACHINE_NAME _UxGT(" pronto.") diff --git a/Marlin/src/lcd/language/language_jp-kana.h b/Marlin/src/lcd/language/language_jp-kana.h index 448fe9595890f39f5145acb7ad836c3a72652437..77e17c4f38a8c44f6e6de9a5b8375e5bd306adcf 100644 --- a/Marlin/src/lcd/language/language_jp-kana.h +++ b/Marlin/src/lcd/language/language_jp-kana.h @@ -32,7 +32,6 @@ #ifndef LANGUAGE_KANA_UTF_H #define LANGUAGE_KANA_UTF_H -#define MAPPER_E382E383 #define DISPLAY_CHARSET_ISO10646_KANA #define CHARSIZE 3 diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index d0bba38b800d1aa5a15145ad37571b754dad5b4c..378123c88347e8d14ad0d33f910d37570a12322a 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -27,7 +27,6 @@ #ifndef LANGUAGE_PL_DOGM_H #define LANGUAGE_PL_DOGM_H -#define MAPPER_C3C4C5_PL #define DISPLAY_CHARSET_ISO10646_PL #define CHARSIZE 2 diff --git a/Marlin/src/lcd/language/language_pt-br.h b/Marlin/src/lcd/language/language_pt-br.h index ac7aeb659d301bcbbb996da40b28dd75a6e6f704..cb5bfb30143a395c3b1547bf2c23bbe060a5da4b 100644 --- a/Marlin/src/lcd/language/language_pt-br.h +++ b/Marlin/src/lcd/language/language_pt-br.h @@ -31,8 +31,9 @@ #ifndef LANGUAGE_PT_BR_UTF_H #define LANGUAGE_PT_BR_UTF_H -#define MAPPER_C2C3 -#define DISPLAY_CHARSET_ISO10646_1 +// Put characters here that should be displayed with M117 +//_UxGT("áãàçÉéêíóõ") + #define CHARSIZE 2 #define WELCOME_MSG MACHINE_NAME _UxGT(" pronto.") diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index 5933bcba77aed2a9bd7905d37557ba4eaf0a10eb..40b3d81b5d6d815ad767f94dabd6e73a02718a59 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -31,7 +31,6 @@ #ifndef LANGUAGE_PT_UTF_H #define LANGUAGE_PT_UTF_H -#define MAPPER_C2C3 #define DISPLAY_CHARSET_ISO10646_1 #define CHARSIZE 2 diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index cdb0380f5bea2bad28ae724d18c7c8274837ed7c..45126c13cb80d331aaee3b226ce7106d669eb816 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -30,7 +30,6 @@ #ifndef LANGUAGE_RU_H #define LANGUAGE_RU_H -#define MAPPER_D0D1 // For Cyrillic #define DISPLAY_CHARSET_ISO10646_5 #define CHARSIZE 2 diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index e8c3f8c5edbaaa03194007ce485e1dd98e16df90..5fb677e4f1f7eb30450d4a272780dd03b9ed34ea 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -34,7 +34,12 @@ #ifndef LANGUAGE_SK_UTF_H #define LANGUAGE_SK_UTF_H -#define MAPPER_C3C4C5_SK +// Put characters here that should be displayed with M117 +//_UxGT("aäAÄaáAÁeéEÉiíIÍlĺLĹ") +//_UxGT("oóOÓoôOÔrŕRŔuúUÚyýYÝ") +//_UxGT("cčCČdďDĎlľLĽnňNŇsšSŠ") +//_UxGT("tťTŤzžZŽ") + #define DISPLAY_CHARSET_ISO10646_SK #define CHARSIZE 2 diff --git a/Marlin/src/lcd/language/language_test.h b/Marlin/src/lcd/language/language_test.h index 6bd6ca1693b49a901b7e84bbe2a160d569210346..32805f11a3fc8aefa7afe2f1cb49bc641eda5801 100644 --- a/Marlin/src/lcd/language/language_test.h +++ b/Marlin/src/lcd/language/language_test.h @@ -46,11 +46,6 @@ // Kanji (an other Japanese symbol set) uses far more than two codepages. So currently I don't see a chance to map the Unicodes. Its not // impossible to have a close to direct mapping but will need giant conversion tables and fonts (we don't want to have in a embedded system). -//#define MAPPER_C2C3 // For most European languages when language file is in utf8 -//#define MAPPER_D0D1 // For Cyrillic -//#define MAPPER_E382E383 // For Katakana -//#define MAPPER_NON // For direct ascii codes. Fall back mapper - if no other is defined. - // Select the better font for full graphic displays. //#define DISPLAY_CHARSET_ISO10646_1 diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index 8dda8ff574fc701795a741df6df45b70cc7edac4..839cc63088c51817ceb1f5a184119219d33a7311 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -30,7 +30,6 @@ #ifndef LANGUAGE_TR_H #define LANGUAGE_TR_H -#define MAPPER_C2C3_TR #define DISPLAY_CHARSET_ISO10646_TR #define CHARSIZE 2 diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index ea316187fa76810c3c7f515a209d9160535e8e18..1a353493fd9885b41e07c2e7ec1963fe82780112 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -30,7 +30,6 @@ #ifndef LANGUAGE_UK_H #define LANGUAGE_UK_H -#define MAPPER_D0D1 // For Cyrillic #define DISPLAY_CHARSET_ISO10646_5 #define CHARSIZE 2