Ver código fonte

Move MSG_x_LINE to multi_language.h

Scott Lahteine 5 anos atrás
pai
commit
fad9235cd8

+ 4
- 0
Marlin/src/core/multi_language.h Ver arquivo

@@ -77,3 +77,7 @@ typedef const char Language_Str[];
77 77
 #define GET_TEXT_F(MSG) (const __FlashStringHelper*)GET_TEXT(MSG)
78 78
 
79 79
 #define MSG_CONCAT(A,B) pgm_p_pair_t(GET_TEXT(A),GET_TEXT(B))
80
+
81
+#define MSG_1_LINE(A)     A "\0"   "\0"
82
+#define MSG_2_LINE(A,B)   A "\0" B "\0"
83
+#define MSG_3_LINE(A,B,C) A "\0" B "\0" C

+ 0
- 4
Marlin/src/lcd/language/language_en.h Ver arquivo

@@ -557,10 +557,6 @@ namespace Language_en {
557 557
   PROGMEM Language_Str MSG_SNAKE                           = _UxGT("Sn4k3");
558 558
   PROGMEM Language_Str MSG_MAZE                            = _UxGT("Maze");
559 559
 
560
-  #define MSG_1_LINE(A)     A "\0"   "\0"
561
-  #define MSG_2_LINE(A,B)   A "\0" B "\0"
562
-  #define MSG_3_LINE(A,B,C) A "\0" B "\0" C
563
-
564 560
   //
565 561
   // Filament Change screens show up to 3 lines on a 4-line display
566 562
   //                        ...or up to 2 lines on a 3-line display

+ 0
- 4
Marlin/src/lcd/language/language_pl.h Ver arquivo

@@ -523,10 +523,6 @@ namespace Language_pl {
523 523
   PROGMEM Language_Str MSG_SNAKE                           = _UxGT("Sn4k3");
524 524
   PROGMEM Language_Str MSG_MAZE                            = _UxGT("Maze");
525 525
 
526
-  #define MSG_1_LINE(A)     A "\0"   "\0"
527
-  #define MSG_2_LINE(A,B)   A "\0" B "\0"
528
-  #define MSG_3_LINE(A,B,C) A "\0" B "\0" C
529
-
530 526
   //
531 527
   // Filament Change screens show up to 3 lines on a 4-line display
532 528
   //                        ...or up to 2 lines on a 3-line display

+ 0
- 4
Marlin/src/lcd/language/language_tr.h Ver arquivo

@@ -549,10 +549,6 @@ namespace Language_tr {
549 549
   PROGMEM Language_Str MSG_SNAKE                           = _UxGT("Sn4k3");
550 550
   PROGMEM Language_Str MSG_MAZE                            = _UxGT("Maze");
551 551
 
552
-  #define MSG_1_LINE(A)     A "\0"   "\0"
553
-  #define MSG_2_LINE(A,B)   A "\0" B "\0"
554
-  #define MSG_3_LINE(A,B,C) A "\0" B "\0" C
555
-
556 552
   //
557 553
   // Filament Değişim ekranları 4 satırlı ekranda 3 satıra kadar gösterilir
558 554
   //                        ...veya 3 satırlı ekranda 2 satıra kadar

+ 0
- 4
Marlin/src/lcd/language/language_zh_TW.h Ver arquivo

@@ -546,10 +546,6 @@ namespace Language_zh_TW {
546 546
   PROGMEM Language_Str MSG_SNAKE                           = _UxGT("Sn4k3");
547 547
   PROGMEM Language_Str MSG_MAZE                            = _UxGT("Maze");
548 548
 
549
-  #define MSG_1_LINE(A)     A "\0"   "\0"
550
-  #define MSG_2_LINE(A,B)   A "\0" B "\0"
551
-  #define MSG_3_LINE(A,B,C) A "\0" B "\0" C
552
-
553 549
   //
554 550
   // Filament Change screens show up to 3 lines on a 4-line display
555 551
   //                        ...or up to 2 lines on a 3-line display

+ 4
- 2
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h Ver arquivo

@@ -26,8 +26,10 @@
26 26
 //
27 27
 // EEPROM
28 28
 //
29
-#define FLASH_EEPROM_EMULATION
30
-//#define SDCARD_EEPROM_EMULATION
29
+#if NONE(FLASH_EEPROM_EMULATION, SDCARD_EEPROM_EMULATION)
30
+  #define FLASH_EEPROM_EMULATION
31
+  //#define SDCARD_EEPROM_EMULATION
32
+#endif
31 33
 
32 34
 /**
33 35
  * Trinamic Stallguard pins

Carregando…
Cancelar
Salvar