CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move MSG_x_LINE to multi_language.h

Browse Source
This commit is contained in:
Scott Lahteine 2020-04-05 18:24:50 -05:00
parent 07b3f38269
commit fad9235cd8
6 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/core/multi_language.h
View File

@ -77,3 +77,7 @@ typedef const char Language_Str[];
#define GET_TEXT_F(MSG) (const __FlashStringHelper*)GET_TEXT(MSG) #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_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

4
Marlin/src/lcd/language/language_en.h
View File

@ -557,10 +557,6 @@ namespace Language_en {
PROGMEM Language_Str MSG_SNAKE = _UxGT("Sn4k3"); PROGMEM Language_Str MSG_SNAKE = _UxGT("Sn4k3");
PROGMEM Language_Str MSG_MAZE = _UxGT("Maze"); 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 // Filament Change screens show up to 3 lines on a 4-line display
// ...or up to 2 lines on a 3-line display // ...or up to 2 lines on a 3-line display

4
Marlin/src/lcd/language/language_pl.h
View File

@ -523,10 +523,6 @@ namespace Language_pl {
PROGMEM Language_Str MSG_SNAKE = _UxGT("Sn4k3"); PROGMEM Language_Str MSG_SNAKE = _UxGT("Sn4k3");
PROGMEM Language_Str MSG_MAZE = _UxGT("Maze"); 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 // Filament Change screens show up to 3 lines on a 4-line display
// ...or up to 2 lines on a 3-line display // ...or up to 2 lines on a 3-line display

4
Marlin/src/lcd/language/language_tr.h
View File

@ -549,10 +549,6 @@ namespace Language_tr {
PROGMEM Language_Str MSG_SNAKE = _UxGT("Sn4k3"); PROGMEM Language_Str MSG_SNAKE = _UxGT("Sn4k3");
PROGMEM Language_Str MSG_MAZE = _UxGT("Maze"); 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 // Filament Değişim ekranları 4 satırlı ekranda 3 satıra kadar gösterilir
// ...veya 3 satırlı ekranda 2 satıra kadar // ...veya 3 satırlı ekranda 2 satıra kadar

4
Marlin/src/lcd/language/language_zh_TW.h
View File

@ -546,10 +546,6 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_SNAKE = _UxGT("Sn4k3"); PROGMEM Language_Str MSG_SNAKE = _UxGT("Sn4k3");
PROGMEM Language_Str MSG_MAZE = _UxGT("Maze"); 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 // Filament Change screens show up to 3 lines on a 4-line display
// ...or up to 2 lines on a 3-line display // ...or up to 2 lines on a 3-line display

6
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
View File

@ -26,8 +26,10 @@
// //
// EEPROM // EEPROM
// //
#define FLASH_EEPROM_EMULATION #if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
//#define SDCARD_EEPROM_EMULATION #define FLASH_EEPROM_EMULATION
//#define SDCARD_EEPROM_EMULATION
#endif
/** /**
* Trinamic Stallguard pins * Trinamic Stallguard pins