Browse Source

Move MSG_MARLIN

Scott Lahteine 5 years ago
parent
commit
ffcbba4447

+ 1
- 1
Marlin/src/MarlinCore.cpp View File

@@ -912,7 +912,7 @@ void setup() {
912 912
   if (mcu & 32) SERIAL_ECHOLNPGM(MSG_SOFTWARE_RESET);
913 913
   HAL_clear_reset_source();
914 914
 
915
-  SERIAL_ECHOPGM(MSG_MARLIN);
915
+  serialprintPGM(GET_TEXT(MSG_MARLIN));
916 916
   SERIAL_CHAR(' ');
917 917
   SERIAL_ECHOLNPGM(SHORT_BUILD_VERSION);
918 918
   SERIAL_EOL();

+ 1
- 8
Marlin/src/core/language.h View File

@@ -135,14 +135,7 @@
135 135
 
136 136
 #endif
137 137
 
138
-// Common LCD messages
139
-
140
-  /* nothing here yet */
141
-
142
-// Common serial messages
143
-#define MSG_MARLIN "Marlin"
144
-
145
-// Serial Console Messages (do not translate those!)
138
+// Common Serial Console Messages (do not translate those!)
146 139
 
147 140
 #define MSG_ENQUEUEING                      "enqueueing \""
148 141
 #define MSG_POWERUP                         "PowerUp"

+ 1
- 0
Marlin/src/lcd/language/language_en.h View File

@@ -40,6 +40,7 @@ namespace Language_en {
40 40
   PROGMEM Language_Str LANGUAGE                            = _UxGT("English");
41 41
 
42 42
   PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT(" Ready.");
43
+  PROGMEM Language_Str MSG_MARLIN                          = _UxGT("Marlin");
43 44
   PROGMEM Language_Str MSG_YES                             = _UxGT("YES");
44 45
   PROGMEM Language_Str MSG_NO                              = _UxGT("NO");
45 46
   PROGMEM Language_Str MSG_BACK                            = _UxGT("Back");

+ 1
- 1
Marlin/src/lcd/menu/menu_info.cpp View File

@@ -265,7 +265,7 @@ void menu_info_board() {
265 265
   void menu_info_printer() {
266 266
     if (ui.use_click()) return ui.go_back();
267 267
     START_SCREEN();
268
-    STATIC_ITEM_P(PSTR(MSG_MARLIN), SS_CENTER|SS_INVERT);       // Marlin
268
+    STATIC_ITEM(MSG_MARLIN, SS_CENTER|SS_INVERT);               // Marlin
269 269
     STATIC_ITEM_P(PSTR(SHORT_BUILD_VERSION));                   // x.x.x-Branch
270 270
     STATIC_ITEM_P(PSTR(STRING_DISTRIBUTION_DATE));              // YYYY-MM-DD HH:MM
271 271
     STATIC_ITEM_P(PSTR(MACHINE_NAME));                          // My3DPrinter

Loading…
Cancel
Save