Marcio T
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
7 additions and
5 deletions
-
Marlin/src/core/multi_language.h
-
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/about_screen.cpp
-
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/advanced_settings_menu.cpp
|
|
@ -76,7 +76,7 @@ typedef const char Language_Str[]; |
|
|
|
#endif |
|
|
|
#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_2_LINE(A,B) A "\0" B "\0" |
|
|
|
|
|
@ -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(pos) _INSET_POS(pos) |
|
|
|
|
|
|
|
char about_str[ |
|
|
|
strlen_P(GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2)) + |
|
|
|
strlen_P(TOOLHEAD_NAME) + 1 |
|
|
|
char about_str[1 |
|
|
|
+ strlen_P(GET_TEXT(MSG_ABOUT_TOUCH_PANEL_2)) |
|
|
|
#ifdef TOOLHEAD_NAME |
|
|
|
+ strlen_P(TOOLHEAD_NAME) |
|
|
|
#endif |
|
|
|
]; |
|
|
|
#ifdef TOOLHEAD_NAME |
|
|
|
// If MSG_ABOUT_TOUCH_PANEL_2 has %s, substitute in the toolhead name.
|
|
|
|
|
|
@ -136,7 +136,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) { |
|
|
|
#if DISABLED(CLASSIC_JERK) |
|
|
|
MSG_JUNCTION_DEVIATION |
|
|
|
#else |
|
|
|
JERK_POS |
|
|
|
MSG_JERK |
|
|
|
#endif |
|
|
|
)) |
|
|
|
.enabled( |
|
|
|