Removed unused macros

6 years ago · 41839746a2
21 changed files with 9 additions and 28 deletions
--- 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

--- 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.")
--- 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

--- 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

--- 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("ÄäÖöÜüß²³")
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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.")
--- 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

--- 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
--- 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.")
--- 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

--- 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

--- 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

--- 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
--- 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

--- 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