From 41839746a2749cd5bc8ce9a8d2a8e5592d5bece5 Mon Sep 17 00:00:00 2001
From: Yunhui Fu <yhfudev@gmail.com>
Date: Sat, 14 Apr 2018 19:40:06 -0400
Subject: [PATCH] Removed unused macros
---
Marlin/src/lcd/language/language_bg.h | 1 -
Marlin/src/lcd/language/language_ca.h | 2 --
Marlin/src/lcd/language/language_cz.h | 1 -
Marlin/src/lcd/language/language_da.h | 1 -
Marlin/src/lcd/language/language_de.h | 2 --
Marlin/src/lcd/language/language_el-gr.h | 1 -
Marlin/src/lcd/language/language_el.h | 1 -
Marlin/src/lcd/language/language_es.h | 1 -
Marlin/src/lcd/language/language_fi.h | 1 -
Marlin/src/lcd/language/language_fr.h | 1 -
Marlin/src/lcd/language/language_gl.h | 1 -
Marlin/src/lcd/language/language_it.h | 1 -
Marlin/src/lcd/language/language_jp-kana.h | 1 -
Marlin/src/lcd/language/language_pl.h | 1 -
Marlin/src/lcd/language/language_pt-br.h | 5 +++--
Marlin/src/lcd/language/language_pt.h | 1 -
Marlin/src/lcd/language/language_ru.h | 1 -
Marlin/src/lcd/language/language_sk.h | 7 ++++++-
Marlin/src/lcd/language/language_test.h | 5 -----
Marlin/src/lcd/language/language_tr.h | 1 -
Marlin/src/lcd/language/language_uk.h | 1 -
21 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h
index 5c25f3ea03..1cc05df362 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 b13c791408..d1f50f2d85 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 51eb2d14c3..466baaf07e 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 8d443e161a..cd030dfa2b 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 8660bf9699..6ec4e49a56 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 ad2895cfdb..b59d284a32 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 5211fbe576..6f5b112c17 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 0fcdaa8f10..2e4873467f 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 aa5013f949..a400651dd5 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 dbc4e24daf..2a0a8ce8bb 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 87ae72e7d8..4a7986983e 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 9f1874c1be..2e9a87b509 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 448fe95958..77e17c4f38 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 d0bba38b80..378123c883 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 ac7aeb659d..cb5bfb3014 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 5933bcba77..40b3d81b5d 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 cdb0380f5b..45126c13cb 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 e8c3f8c5ed..5fb677e4f1 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 6bd6ca1693..32805f11a3 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 8dda8ff574..839cc63088 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 ea316187fa..1a353493fd 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
--
GitLab