Sfoglia il codice sorgente

Fix ExtUI compile errors (#17544)

Fixes #16628
Marcio T 5 anni fa
parent
commit
791873b10d
Nessun account collegato all'indirizzo email del committer

+ 1
- 1
Marlin/src/core/multi_language.h Vedi File

@@ -76,7 +76,7 @@ typedef const char Language_Str[];
76 76
 #endif
77 77
 #define GET_TEXT_F(MSG) (const __FlashStringHelper*)GET_TEXT(MSG)
78 78
 
79
-#define MSG_CONCAT(A,B) pgm_p_pair_t(GET_TEXT(A),GET_TEXT(B))
79
+#define GET_LANGUAGE_NAME(INDEX) GET_LANG(LCD_LANGUAGE_##INDEX)::LANGUAGE
80 80
 
81 81
 #define MSG_1_LINE(A)     A "\0"   "\0"
82 82
 #define MSG_2_LINE(A,B)   A "\0" B "\0"

+ 5
- 3
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp Vedi File

@@ -55,9 +55,11 @@ void AboutScreen::onRedraw(draw_mode_t) {
55 55
   #define _INSET_POS(x,y,w,h) x + w/10, y, w - w/5, h
56 56
   #define INSET_POS(pos) _INSET_POS(pos)
57 57
 
58
-  char about_str[
59
-    strlen_P(GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2)) +
60
-    strlen_P(TOOLHEAD_NAME) + 1
58
+  char about_str[1
59
+    + strlen_P(GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2))
60
+    #ifdef TOOLHEAD_NAME
61
+      + strlen_P(TOOLHEAD_NAME)
62
+    #endif
61 63
   ];
62 64
   #ifdef TOOLHEAD_NAME
63 65
     // If MSG_ABOUT_TOUCH_PANEL_2 has %s, substitute in the toolhead name.

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp Vedi File

@@ -136,7 +136,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
136 136
         #if DISABLED(CLASSIC_JERK)
137 137
           MSG_JUNCTION_DEVIATION
138 138
         #else
139
-          JERK_POS
139
+          MSG_JERK
140 140
         #endif
141 141
        ))
142 142
       .enabled(

Loading…
Annulla
Salva