From fad9235cd80f2acdf1c0658d9633857fad94edea Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 5 Apr 2020 18:24:50 -0500
Subject: [PATCH] Move MSG_x_LINE to multi_language.h
---
Marlin/src/core/multi_language.h | 4 ++++
Marlin/src/lcd/language/language_en.h | 4 ----
Marlin/src/lcd/language/language_pl.h | 4 ----
Marlin/src/lcd/language/language_tr.h | 4 ----
Marlin/src/lcd/language/language_zh_TW.h | 4 ----
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 6 ++++--
6 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/Marlin/src/core/multi_language.h b/Marlin/src/core/multi_language.h
index 98020b1e8d..ce8ce94fdc 100644
--- a/Marlin/src/core/multi_language.h
+++ b/Marlin/src/core/multi_language.h
@@ -77,3 +77,7 @@ typedef const char Language_Str[];
#define GET_TEXT_F(MSG) (const __FlashStringHelper*)GET_TEXT(MSG)
#define MSG_CONCAT(A,B) pgm_p_pair_t(GET_TEXT(A),GET_TEXT(B))
+
+#define MSG_1_LINE(A) A "\0" "\0"
+#define MSG_2_LINE(A,B) A "\0" B "\0"
+#define MSG_3_LINE(A,B,C) A "\0" B "\0" C
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 0aea571caa..2037d0c928 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -557,10 +557,6 @@ namespace Language_en {
PROGMEM Language_Str MSG_SNAKE = _UxGT("Sn4k3");
PROGMEM Language_Str MSG_MAZE = _UxGT("Maze");
- #define MSG_1_LINE(A) A "\0" "\0"
- #define MSG_2_LINE(A,B) A "\0" B "\0"
- #define MSG_3_LINE(A,B,C) A "\0" B "\0" C
-
//
// Filament Change screens show up to 3 lines on a 4-line display
// ...or up to 2 lines on a 3-line display
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
index 113c58629f..9fefeb6ee0 100644
--- a/Marlin/src/lcd/language/language_pl.h
+++ b/Marlin/src/lcd/language/language_pl.h
@@ -523,10 +523,6 @@ namespace Language_pl {
PROGMEM Language_Str MSG_SNAKE = _UxGT("Sn4k3");
PROGMEM Language_Str MSG_MAZE = _UxGT("Maze");
- #define MSG_1_LINE(A) A "\0" "\0"
- #define MSG_2_LINE(A,B) A "\0" B "\0"
- #define MSG_3_LINE(A,B,C) A "\0" B "\0" C
-
//
// Filament Change screens show up to 3 lines on a 4-line display
// ...or up to 2 lines on a 3-line display
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
index 096fef254c..515f4d0037 100644
--- a/Marlin/src/lcd/language/language_tr.h
+++ b/Marlin/src/lcd/language/language_tr.h
@@ -549,10 +549,6 @@ namespace Language_tr {
PROGMEM Language_Str MSG_SNAKE = _UxGT("Sn4k3");
PROGMEM Language_Str MSG_MAZE = _UxGT("Maze");
- #define MSG_1_LINE(A) A "\0" "\0"
- #define MSG_2_LINE(A,B) A "\0" B "\0"
- #define MSG_3_LINE(A,B,C) A "\0" B "\0" C
-
//
// Filament Değişim ekranları 4 satırlı ekranda 3 satıra kadar gösterilir
// ...veya 3 satırlı ekranda 2 satıra kadar
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index 06b19440f2..053a90d586 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -546,10 +546,6 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_SNAKE = _UxGT("Sn4k3");
PROGMEM Language_Str MSG_MAZE = _UxGT("Maze");
- #define MSG_1_LINE(A) A "\0" "\0"
- #define MSG_2_LINE(A,B) A "\0" B "\0"
- #define MSG_3_LINE(A,B,C) A "\0" B "\0" C
-
//
// Filament Change screens show up to 3 lines on a 4-line display
// ...or up to 2 lines on a 3-line display
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index 1d1ad60f24..c4226001e6 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -26,8 +26,10 @@
//
// EEPROM
//
-#define FLASH_EEPROM_EMULATION
-//#define SDCARD_EEPROM_EMULATION
+#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
+ #define FLASH_EEPROM_EMULATION
+ //#define SDCARD_EEPROM_EMULATION
+#endif
/**
* Trinamic Stallguard pins
--
GitLab