From ffcbba4447c15d702c5aa37bc21ba3abea822cef Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 8 Feb 2020 22:25:24 -0600 Subject: [PATCH] Move MSG_MARLIN --- Marlin/src/MarlinCore.cpp | 2 +- Marlin/src/core/language.h | 9 +-------- Marlin/src/lcd/language/language_en.h | 1 + Marlin/src/lcd/menu/menu_info.cpp | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 08b9e8a162..f439fb73a8 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -912,7 +912,7 @@ void setup() { if (mcu & 32) SERIAL_ECHOLNPGM(MSG_SOFTWARE_RESET); HAL_clear_reset_source(); - SERIAL_ECHOPGM(MSG_MARLIN); + serialprintPGM(GET_TEXT(MSG_MARLIN)); SERIAL_CHAR(' '); SERIAL_ECHOLNPGM(SHORT_BUILD_VERSION); SERIAL_EOL(); diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h index a20a4eb270..47245fa890 100644 --- a/Marlin/src/core/language.h +++ b/Marlin/src/core/language.h @@ -135,14 +135,7 @@ #endif -// Common LCD messages - - /* nothing here yet */ - -// Common serial messages -#define MSG_MARLIN "Marlin" - -// Serial Console Messages (do not translate those!) +// Common Serial Console Messages (do not translate those!) #define MSG_ENQUEUEING "enqueueing \"" #define MSG_POWERUP "PowerUp" diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 22aee12592..4f4e32bd08 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -40,6 +40,7 @@ namespace Language_en { PROGMEM Language_Str LANGUAGE = _UxGT("English"); PROGMEM Language_Str WELCOME_MSG = MACHINE_NAME _UxGT(" Ready."); + PROGMEM Language_Str MSG_MARLIN = _UxGT("Marlin"); PROGMEM Language_Str MSG_YES = _UxGT("YES"); PROGMEM Language_Str MSG_NO = _UxGT("NO"); PROGMEM Language_Str MSG_BACK = _UxGT("Back"); diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp index cbe406a10e..284c3eb1a5 100644 --- a/Marlin/src/lcd/menu/menu_info.cpp +++ b/Marlin/src/lcd/menu/menu_info.cpp @@ -265,7 +265,7 @@ void menu_info_board() { void menu_info_printer() { if (ui.use_click()) return ui.go_back(); START_SCREEN(); - STATIC_ITEM_P(PSTR(MSG_MARLIN), SS_CENTER|SS_INVERT); // Marlin + STATIC_ITEM(MSG_MARLIN, SS_CENTER|SS_INVERT); // Marlin STATIC_ITEM_P(PSTR(SHORT_BUILD_VERSION)); // x.x.x-Branch STATIC_ITEM_P(PSTR(STRING_DISTRIBUTION_DATE)); // YYYY-MM-DD HH:MM STATIC_ITEM_P(PSTR(MACHINE_NAME)); // My3DPrinter