bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix ExtUI compile errors (#17544)

Browse Source 
Fixes #16628
This commit is contained in:
Marcio T 2020-04-15 22:17:01 -06:00 committed by GitHub
parent 808f632997
commit 791873b10d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@ typedef const char Language_Str[];
#endif #endif
#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 GET_LANGUAGE_NAME(INDEX) GET_LANG(LCD_LANGUAGE_##INDEX)::LANGUAGE
#define MSG_1_LINE(A) A "\0" "\0" #define MSG_1_LINE(A) A "\0" "\0"
#define MSG_2_LINE(A,B) A "\0" B "\0" #define MSG_2_LINE(A,B) A "\0" B "\0"

8
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
View File

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

2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
View File

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