Browse Source

Fix ExtUI compile errors (#17544)

Fixes #16628
Marcio T 5 years ago
parent
commit
791873b10d
No account linked to committer's email address

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

76
 #endif
76
 #endif
77
 #define GET_TEXT_F(MSG) (const __FlashStringHelper*)GET_TEXT(MSG)
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
 #define MSG_1_LINE(A)     A "\0"   "\0"
81
 #define MSG_1_LINE(A)     A "\0"   "\0"
82
 #define MSG_2_LINE(A,B)   A "\0" B "\0"
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 View File

55
   #define _INSET_POS(x,y,w,h) x + w/10, y, w - w/5, h
55
   #define _INSET_POS(x,y,w,h) x + w/10, y, w - w/5, h
56
   #define INSET_POS(pos) _INSET_POS(pos)
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
   #ifdef TOOLHEAD_NAME
64
   #ifdef TOOLHEAD_NAME
63
     // If MSG_ABOUT_TOUCH_PANEL_2 has %s, substitute in the toolhead name.
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 View File

136
         #if DISABLED(CLASSIC_JERK)
136
         #if DISABLED(CLASSIC_JERK)
137
           MSG_JUNCTION_DEVIATION
137
           MSG_JUNCTION_DEVIATION
138
         #else
138
         #else
139
-          JERK_POS
139
+          MSG_JERK
140
         #endif
140
         #endif
141
        ))
141
        ))
142
       .enabled(
142
       .enabled(

Loading…
Cancel
Save