From 149e9b733eeee780e52def843df0c2a53f81acf1 Mon Sep 17 00:00:00 2001
From: Marcio Teixeira <marcio@alephobjects.com>
Date: Wed, 25 Sep 2019 00:25:21 -0600
Subject: [PATCH] Simplified ExtUI language selection (#15359)
---
Marlin/Configuration_adv.h | 8 +-
Marlin/src/lcd/dogm/ultralcd_DOGM.h | 6 +-
.../unicode/western_char_set_bitmap_31.h | 1 -
.../lib/lulzbot/language/language.cpp | 40 +---
.../lib/lulzbot/language/language.h | 87 ++++++--
.../lib/lulzbot/language/language_de.h | 6 +-
.../lib/lulzbot/language/language_en.h | 189 +-----------------
.../lib/lulzbot/language/language_fr.h | 6 +-
.../lib/lulzbot/screens/boot_screen.cpp | 2 +-
.../lib/lulzbot/screens/language_menu.cpp | 22 +-
.../lib/lulzbot/screens/screens.cpp | 2 +-
.../lib/lulzbot/screens/screens.h | 4 +-
.../UHS_host/UHS_BULK_STORAGE/UHS_SCSI.h | 1 -
.../lib-uhs3/UHS_host/UHS_USB_IDs.h | 2 -
.../lib-uhs3/UHS_host/UHS_macros.h | 1 -
.../lib-uhs3/UHS_host/UHS_printf_HELPER.h | 1 -
config/default/Configuration_adv.h | 8 +-
.../3DFabXYZ/Migbot/Configuration_adv.h | 8 +-
.../ADIMLab/Gantry v1/Configuration_adv.h | 8 +-
.../ADIMLab/Gantry v2/Configuration_adv.h | 8 +-
.../AlephObjects/TAZ4/Configuration_adv.h | 8 +-
.../Alfawise/U20-bltouch/Configuration_adv.h | 8 +-
.../examples/Alfawise/U20/Configuration_adv.h | 8 +-
.../AliExpress/UM2pExt/Configuration_adv.h | 8 +-
config/examples/Anet/A2/Configuration_adv.h | 8 +-
.../examples/Anet/A2plus/Configuration_adv.h | 8 +-
config/examples/Anet/A6/Configuration_adv.h | 8 +-
config/examples/Anet/A8/Configuration_adv.h | 8 +-
.../examples/Anet/A8plus/Configuration_adv.h | 8 +-
config/examples/Anet/E16/Configuration_adv.h | 8 +-
.../examples/AnyCubic/i3/Configuration_adv.h | 8 +-
config/examples/ArmEd/Configuration_adv.h | 8 +-
.../BIBO/TouchX/cyclops/Configuration_adv.h | 8 +-
.../BIBO/TouchX/default/Configuration_adv.h | 8 +-
.../examples/BQ/Hephestos/Configuration_adv.h | 8 +-
.../BQ/Hephestos_2/Configuration_adv.h | 8 +-
config/examples/BQ/WITBOX/Configuration_adv.h | 8 +-
config/examples/Cartesio/Configuration_adv.h | 8 +-
.../Creality/CR-10/Configuration_adv.h | 8 +-
.../Creality/CR-10S/Configuration_adv.h | 8 +-
.../Creality/CR-10_5S/Configuration_adv.h | 8 +-
.../Creality/CR-10mini/Configuration_adv.h | 8 +-
.../Creality/CR-20 Pro/Configuration_adv.h | 8 +-
.../Creality/CR-20/Configuration_adv.h | 8 +-
.../Creality/CR-8/Configuration_adv.h | 8 +-
.../Creality/Ender-2/Configuration_adv.h | 8 +-
.../Creality/Ender-3/Configuration_adv.h | 8 +-
.../Creality/Ender-4/Configuration_adv.h | 8 +-
.../Creality/Ender-5/Configuration_adv.h | 8 +-
.../Dagoma/Disco Ultimate/Configuration_adv.h | 8 +-
.../Sidewinder X1/Configuration_adv.h | 8 +-
.../examples/Einstart-S/Configuration_adv.h | 8 +-
.../FYSETC/AIO_II/Configuration_adv.h | 8 +-
.../Cheetah 1.2/BLTouch/Configuration_adv.h | 8 +-
.../Cheetah 1.2/base/Configuration_adv.h | 8 +-
.../Cheetah/BLTouch/Configuration_adv.h | 8 +-
.../FYSETC/Cheetah/base/Configuration_adv.h | 8 +-
.../examples/FYSETC/F6_13/Configuration_adv.h | 8 +-
config/examples/Felix/Configuration_adv.h | 8 +-
.../FlashForge/CreatorPro/Configuration_adv.h | 8 +-
.../FolgerTech/i3-2020/Configuration_adv.h | 8 +-
.../Formbot/Raptor/Configuration_adv.h | 8 +-
.../Formbot/T_Rex_2+/Configuration_adv.h | 8 +-
.../Formbot/T_Rex_3/Configuration_adv.h | 8 +-
.../examples/Geeetech/A10/Configuration_adv.h | 8 +-
.../Geeetech/A10M/Configuration_adv.h | 8 +-
.../Geeetech/A20M/Configuration_adv.h | 8 +-
.../Geeetech/MeCreator2/Configuration_adv.h | 8 +-
.../Prusa i3 Pro C/Configuration_adv.h | 8 +-
.../Prusa i3 Pro W/Configuration_adv.h | 8 +-
.../Infitary/i3-M508/Configuration_adv.h | 8 +-
.../examples/JGAurora/A1/Configuration_adv.h | 8 +-
.../examples/JGAurora/A5/Configuration_adv.h | 8 +-
.../examples/JGAurora/A5S/Configuration_adv.h | 8 +-
.../examples/MakerParts/Configuration_adv.h | 8 +-
.../examples/Malyan/M150/Configuration_adv.h | 8 +-
.../examples/Malyan/M200/Configuration_adv.h | 8 +-
.../Micromake/C1/enhanced/Configuration_adv.h | 8 +-
config/examples/Mks/Robin/Configuration_adv.h | 8 +-
config/examples/Mks/Sbase/Configuration_adv.h | 8 +-
.../RapideLite/RL200/Configuration_adv.h | 8 +-
config/examples/RigidBot/Configuration_adv.h | 8 +-
config/examples/SCARA/Configuration_adv.h | 8 +-
.../Black_STM32F407VET6/Configuration_adv.h | 8 +-
.../examples/Sanguinololu/Configuration_adv.h | 8 +-
.../Tevo/Michelangelo/Configuration_adv.h | 8 +-
.../Tevo/Tarantula Pro/Configuration_adv.h | 8 +-
.../Tornado/V1 (MKS Base)/Configuration_adv.h | 8 +-
.../V2 (MKS GEN-L)/Configuration_adv.h | 8 +-
config/examples/TheBorg/Configuration_adv.h | 8 +-
config/examples/TinyBoy2/Configuration_adv.h | 8 +-
.../examples/Tronxy/X3A/Configuration_adv.h | 8 +-
.../Tronxy/X5S-2E/Configuration_adv.h | 8 +-
.../UltiMachine/Archim1/Configuration_adv.h | 8 +-
.../UltiMachine/Archim2/Configuration_adv.h | 8 +-
.../examples/VORONDesign/Configuration_adv.h | 8 +-
.../Velleman/K8200/Configuration_adv.h | 8 +-
.../Velleman/K8400/Configuration_adv.h | 8 +-
.../WASP/PowerWASP/Configuration_adv.h | 8 +-
.../Wanhao/Duplicator 6/Configuration_adv.h | 8 +-
.../Duplicator i3 Mini/Configuration_adv.h | 8 +-
.../delta/Anycubic/Kossel/Configuration_adv.h | 8 +-
.../Dreammaker/Overlord/Configuration_adv.h | 8 +-
.../Overlord_Pro/Configuration_adv.h | 8 +-
.../FLSUN/auto_calibrate/Configuration_adv.h | 8 +-
.../delta/FLSUN/kossel/Configuration_adv.h | 8 +-
.../FLSUN/kossel_mini/Configuration_adv.h | 8 +-
.../Geeetech/Rostock 301/Configuration_adv.h | 8 +-
.../delta/MKS/SBASE/Configuration_adv.h | 8 +-
.../Tevo Little Monster/Configuration_adv.h | 8 +-
.../delta/generic/Configuration_adv.h | 8 +-
.../delta/kossel_mini/Configuration_adv.h | 8 +-
.../delta/kossel_xl/Configuration_adv.h | 8 +-
.../gCreate/gMax1.5+/Configuration_adv.h | 8 +-
config/examples/makibox/Configuration_adv.h | 8 +-
.../tvrrug/Round2/Configuration_adv.h | 8 +-
config/examples/wt150/Configuration_adv.h | 8 +-
117 files changed, 709 insertions(+), 477 deletions(-)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index b6ba665fcf..f88905b845 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/Marlin/src/lcd/dogm/ultralcd_DOGM.h b/Marlin/src/lcd/dogm/ultralcd_DOGM.h
index 71e4c39611..4ccbcbe8b2 100644
--- a/Marlin/src/lcd/dogm/ultralcd_DOGM.h
+++ b/Marlin/src/lcd/dogm/ultralcd_DOGM.h
@@ -145,11 +145,11 @@
#define LCD_PIXEL_HEIGHT 64
#endif
-// LCD_FULL_PIXEL_WIDTH =
-// LCD_PIXEL_OFFSET_X + (LCD_PIXEL_WIDTH * 2) + LCD_PIXEL_OFFSET_X
+// LCD_FULL_PIXEL_WIDTH =
+// LCD_PIXEL_OFFSET_X + (LCD_PIXEL_WIDTH * 2) + LCD_PIXEL_OFFSET_X
#if ENABLED(FSMC_GRAPHICAL_TFT)
#define LCD_FULL_PIXEL_WIDTH 320
- #define LCD_PIXEL_OFFSET_X 32
+ #define LCD_PIXEL_OFFSET_X 32
#define LCD_FULL_PIXEL_HEIGHT 240
#define LCD_PIXEL_OFFSET_Y 32
#endif
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h b/Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
index 2c1b8291b8..64a14121d9 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/ftdi_eve_lib/extended/unicode/western_char_set_bitmap_31.h
@@ -1313,4 +1313,3 @@ const unsigned char font[] PROGMEM = {
0xff, 0x00, 0x34, 0x00
#endif // TOUCH_UI_UTF8_SYMBOLS
};
-
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language.cpp
index 73c0a69cf6..5d33fc850f 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language.cpp
@@ -1,10 +1,9 @@
-/*****************
+/****************
* language.cpp *
- *****************/
+ ****************/
/****************************************************************************
- * Written By Mark Pelletier 2017 - Aleph Objects, Inc. *
- * Written By Marcio Teixeira 2018 - Aleph Objects, Inc. *
+ * Written By Marcio Teixeira 2019 - Aleph Objects, Inc. *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -20,36 +19,9 @@
* location: <http://www.gnu.org/licenses/>. *
****************************************************************************/
-#include "../compat.h"
-#if ENABLED(LULZBOT_TOUCH_UI) && defined(TOUCH_UI_LANGUAGE_MENU)
+#include "../../../../../Marlin.h"
- #include "language_de.h"
- #include "language_en.h"
- #include "language_fr.h"
+#include "language.h"
- PROGMEM Language_List languages = {
- &Language_de::strings,
- &Language_en::strings,
- &Language_fr::strings
- };
-
- uint8_t get_language_count() {
- return sizeof(languages)/sizeof(languages[0]);
- }
-
- static uint8_t lang = 0;
-
- void set_language(uint8_t l) {
- lang = l;
- };
-
- const char *get_text(uint8_t lang, String_Indices index) {
- const Language_Strings* strings = (const Language_Strings*) pgm_read_ptr(&languages[lang]);
- return (const char *)pgm_read_ptr(&(*strings)[int(index)]);
- };
-
- const char *get_text(String_Indices index) {
- return get_text(lang, index);
- };
-#endif
+uint8_t lang = 0;
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language.h b/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language.h
index 52aae25022..a8a700864b 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language.h
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language.h
@@ -18,29 +18,72 @@
* To view a copy of the GNU General Public License, go to the following *
* location: <http://www.gnu.org/licenses/>. *
****************************************************************************/
-
#pragma once
-enum class String_Indices { LANGUAGE_STRINGS, COUNT };
-
typedef const char Language_Str[];
-typedef const char* const Language_Strings[int(String_Indices::COUNT)];
-typedef const Language_Strings* const Language_List[];
-
-#ifndef TOUCH_UI_LANGUAGE_MENU
- // Default mode, support only one language.
- #define __GET_TEXTF(MSG,LANG) Language_##LANG::MSG
- #define _GET_TEXTF(MSG,LANG) __GET_TEXTF(MSG,LANG)
- #define GET_TEXTF(MSG) reinterpret_cast<const __FlashStringHelper *>(_GET_TEXTF(MSG,LCD_LANGUAGE))
- #define GET_TEXT(MSG) _GET_TEXTF(MSG,LCD_LANGUAGE)
- #define MAKE_LANGUAGE_STRINGS()
+
+// Count how many languages are defined.
+
+#if defined(LCD_LANGUAGE_5)
+ #define NUM_LANGUAGES 5
+#elif defined(LCD_LANGUAGE_4)
+ #define NUM_LANGUAGES 4
+#elif defined(LCD_LANGUAGE_3)
+ #define NUM_LANGUAGES 3
+#elif defined(LCD_LANGUAGE_2)
+ #define NUM_LANGUAGES 2
#else
- // Support multiple languages at run-time.
- uint8_t get_language_count();
- void set_language(uint8_t index);
- const char *get_text(String_Indices index);
- const char *get_text(uint8_t lang, String_Indices index);
- #define GET_TEXT(MSG) get_text(String_Indices::MSG)
- #define GET_TEXTF(MSG) reinterpret_cast<const __FlashStringHelper *>(get_text(String_Indices::MSG))
- #define MAKE_LANGUAGE_STRINGS() PROGMEM Language_Strings strings = { LANGUAGE_STRINGS }
-#endif
\ No newline at end of file
+ #define NUM_LANGUAGES 1
+#endif
+
+// Set undefined languages equal to the last and
+// let the compiler optimize out the duplicates
+
+#ifndef LCD_LANGUAGE_1
+ #define LCD_LANGUAGE_1 LCD_LANGUAGE
+#endif
+
+#ifndef LCD_LANGUAGE_2
+ #define LCD_LANGUAGE_2 LCD_LANGUAGE_1
+#endif
+
+#ifndef LCD_LANGUAGE_3
+ #define LCD_LANGUAGE_3 LCD_LANGUAGE_2
+#endif
+
+#ifndef LCD_LANGUAGE_4
+ #define LCD_LANGUAGE_4 LCD_LANGUAGE_3
+#endif
+
+#ifndef LCD_LANGUAGE_5
+ #define LCD_LANGUAGE_5 LCD_LANGUAGE_4
+#endif
+
+// Indirection required to paste together the namespace name
+
+#define _GET_LANG(LANG) Language_##LANG
+#define GET_LANG(LANG) _GET_LANG(LANG)
+
+#if NUM_LANGUAGES > 1
+ extern uint8_t lang;
+ // The compiler does a good job of "flattening" out this
+ // if statement when there are fewer than five languages.
+ #define GET_TEXT(MSG) ( \
+ lang == 0 ? GET_LANG(LCD_LANGUAGE_1)::MSG : \
+ lang == 1 ? GET_LANG(LCD_LANGUAGE_2)::MSG : \
+ lang == 2 ? GET_LANG(LCD_LANGUAGE_3)::MSG : \
+ lang == 3 ? GET_LANG(LCD_LANGUAGE_4)::MSG : \
+ GET_LANG(LCD_LANGUAGE_5)::MSG \
+ )
+#else
+ #define GET_TEXT(MSG) GET_LANG(LCD_LANGUAGE_1)::MSG
+#endif
+#define GET_TEXTF(MSG) reinterpret_cast<const __FlashStringHelper *>(GET_TEXT(MSG))
+
+#define GET_LANGUAGE_NAME(N) GET_LANG(LCD_LANGUAGE_##N)::LANGUAGE
+
+// All the language tables go here
+
+#include "language_en.h"
+#include "language_de.h"
+#include "language_fr.h"
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_de.h b/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_de.h
index e34b588cec..3c26bfb3d8 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_de.h
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_de.h
@@ -21,10 +21,8 @@
#pragma once
-#include "language_en.h"
-
namespace Language_de {
- using namespace Language_en;
+ using namespace Language_en; // Inherit undefined strings from English
PROGMEM Language_Str LANGUAGE = u8"Deutsche";
@@ -79,6 +77,4 @@ namespace Language_de {
PROGMEM Language_Str PRINTER_HALTED = u8"DRUCKER GESTOPPT";
PROGMEM Language_Str PLEASE_RESET = u8"Bitte neustarten";
-
- MAKE_LANGUAGE_STRINGS();
}; // namespace Language_de
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_en.h b/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_en.h
index 4182277cbb..02a284607e 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_en.h
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_en.h
@@ -21,192 +21,7 @@
#pragma once
-// The list LANGUAGE_STRINGS should define all the strings used in the default
-// language (Language_en). Translations do *not* need to re-define this.
-
-#define LANGUAGE_STRINGS \
- LANGUAGE, \
- YES, \
- NO, \
- BACK, \
- COLOR_TOUCH_PANEL, \
- ABOUT_ALEPH_OBJECTS, OKAY, \
- FIRMWARE_FOR_TOOLHEAD, \
- AUTO_HOME, \
- CLEAN_NOZZLE, \
- CHANGE_FILAMENT, \
- ADVANCED_SETTINGS, \
- PRINTER_STATISTICS, \
- ABOUT_PRINTER, \
- MOTORS_OFF, \
- ZPROBE_ZOFFSET, \
- STEPS_PER_MM, \
- HOME_SENSE, \
- TOOL_OFFSETS, \
- MOTOR_CURRENT, \
- FILAMENT, \
- ENDSTOPS, \
- X_MAX, \
- X_MIN, \
- Y_MAX, \
- Y_MIN, \
- Z_MAX, \
- Z_MIN, \
- Z_PROBE, \
- RUNOUT_1, \
- RUNOUT_2, \
- SOFT_ENDSTOPS, \
- DISPLAY_MENU, \
- INTERFACE_SETTINGS, \
- RESTORE_DEFAULTS, \
- VELOCITY, \
- VMAX_X, \
- VMAX_Y, \
- VMAX_Z, \
- VMAX_E1, \
- VMAX_E2, \
- VMAX_E3, \
- VMAX_E4, \
- ACCELERATION, \
- ACCEL_PRINTING, \
- ACCEL_TRAVEL, \
- ACCEL_RETRACT, \
- AMAX_X, \
- AMAX_Y, \
- AMAX_Z, \
- AMAX_E1, \
- AMAX_E2, \
- AMAX_E3, \
- AMAX_E4, \
- JERK, \
- JUNCTION_DEVIATION, \
- BACKLASH, \
- MEASURE_AUTOMATICALLY, \
- H_OFFSET, \
- V_OFFSET, \
- TOUCH_SCREEN, \
- CALIBRATE, \
- HOME, \
- UNITS_MILLIAMP, \
- UNITS_MM, \
- UNITS_MM_S, \
- UNITS_MM_S2, \
- UNITS_STEP_MM, \
- UNITS_PERCENT, \
- UNITS_C, \
- TEMP_IDLE, \
- MATERIAL_PLA, \
- MATERIAL_ABS, \
- MATERIAL_HIGH_TEMP, \
- AXIS_X, \
- AXIS_Y, \
- AXIS_Z, \
- AXIS_E, \
- AXIS_E1, \
- AXIS_E2, \
- AXIS_E3, \
- AXIS_E4, \
- AXIS_ALL, \
- HOTEND, \
- HOTEND1, \
- HOTEND2, \
- HOTEND3, \
- HOTEND4, \
- BED, \
- SMOOTHING, \
- CORRECTION, \
- PRINTING, \
- SET_MAXIMUM, \
- RUNOUT_SENSOR, \
- DETECTION_THRESHOLD, \
- DISTANCE, \
- TEMPERATURE, \
- COOLDOWN, \
- FAN_SPEED, \
- PRINT_SPEED, \
- SPEED, \
- MOVE_AXIS, \
- LINEAR_ADVANCE, \
- LINEAR_ADVANCE_K, \
- LINEAR_ADVANCE_K1, \
- LINEAR_ADVANCE_K2, \
- LINEAR_ADVANCE_K3, \
- LINEAR_ADVANCE_K4, \
- NUDGE_NOZZLE, \
- ADJUST_BOTH_NOZZLES, \
- SHOW_OFFSETS, \
- INCREMENT, \
- ERASE_FLASH_WARNING, \
- ERASING, \
- ERASED, \
- CALIBRATION_WARNING, \
- ABORT_WARNING, \
- EXTRUDER_SELECTION, \
- CURRENT_TEMPERATURE, \
- REMOVAL_TEMPERATURE, \
- HEATING, \
- CAUTION, \
- HOT, \
- UNLOAD_FILAMENT, \
- LOAD_FILAMENT, \
- MOMENTARY, \
- CONTINUOUS, \
- PLEASE_WAIT, \
- PRINT_MENU, \
- FINE_MOTION, \
- MEDIA, \
- ENABLE_MEDIA, \
- INSERT_MEDIA, \
- MENU, \
- LCD_BRIGHTNESS, \
- SOUND_VOLUME, \
- SCREEN_LOCK, \
- BOOT_SCREEN, \
- INTERFACE_SOUNDS, \
- EEPROM_RESTORED, \
- EEPROM_RESET, \
- EEPROM_SAVED, \
- EEPROM_SAVE_PROMPT, \
- EEPROM_RESET_WARNING, \
- OPEN_DIR, \
- PRINT_FILE, \
- PRINT_STARTING, \
- PRINT_FINISHED, \
- PRINT_ERROR, \
- PASSCODE_REJECTED, \
- PASSCODE_ACCEPTED, \
- PASSCODE_SELECT, \
- PASSCODE_REQUEST, \
- PRINTER_HALTED, \
- PLEASE_RESET, \
- CLICK_SOUNDS, \
- INFO_PRINT_COUNT, \
- INFO_COMPLETED_PRINTS, \
- INFO_PRINT_TIME, \
- INFO_PRINT_LONGEST, \
- INFO_PRINT_FILAMENT, \
- RESUME_PRINT, \
- PAUSE_PRINT, \
- STOP_PRINT, \
- TOUCH_CALIBRATION_START, \
- TOUCH_CALIBRATION_PROMPT \
- LULZBOT_BIOPRINTER_STRINGS
-
-#ifndef LULZBOT_USE_BIOPRINTER_UI
- #define LULZBOT_BIOPRINTER_STRINGS
-#else
- #define LULZBOT_BIOPRINTER_STRINGS ,\
- MAIN_MENU, \
- RELEASE_XY_AXIS, \
- LOAD_SYRINGE, \
- BED_TEMPERATURE, \
- LOADING_WARNING, \
- HOMING_WARNING
-#endif
-
-#include "language.h" // This must be included after LANGUAGE_STRINGS
-
-// The string table for this language.
+#include "language.h"
namespace Language_en {
PROGMEM Language_Str LANGUAGE = u8"English";
@@ -413,6 +228,4 @@ namespace Language_en {
PROGMEM Language_Str LOADING_WARNING = u8"About to home to loading position. Ensure the top and the bed of the printer are clear.\n\nContinue?";
PROGMEM Language_Str HOMING_WARNING = u8"About to re-home plunger and auto-level. Remove syringe prior to proceeding.\n\nContinue?";
#endif
-
- MAKE_LANGUAGE_STRINGS();
}; // namespace Language_en
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_fr.h b/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_fr.h
index 73319c5ea8..d740fc643b 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_fr.h
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_fr.h
@@ -21,10 +21,8 @@
#pragma once
-#include "language_en.h"
-
namespace Language_fr {
- using namespace Language_en;
+ using namespace Language_en; // Inherit undefined strings from English
PROGMEM Language_Str LANGUAGE = u8"Français";
@@ -85,6 +83,4 @@ namespace Language_fr {
PROGMEM Language_Str PRINTER_HALTED = u8"IMPR. STOPPÉE";
PROGMEM Language_Str PLEASE_RESET = u8"Redémarrer SVP";
-
- MAKE_LANGUAGE_STRINGS();
}; // namespace Language_fr
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/boot_screen.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/boot_screen.cpp
index c5af7ad553..32c43d654a 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/boot_screen.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/boot_screen.cpp
@@ -83,7 +83,7 @@ void BootScreen::onIdle() {
current_screen.forget();
PUSH_SCREEN(StatusScreen);
PUSH_SCREEN(BioConfirmHomeE);
- #elif defined(TOUCH_UI_LANGUAGE_MENU)
+ #elif NUM_LANGUAGES > 1
StatusScreen::setStatusMessage(F(WELCOME_MSG));
GOTO_SCREEN(LanguageMenu);
#else
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/language_menu.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/language_menu.cpp
index cea354b713..d077ae19fe 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/language_menu.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/language_menu.cpp
@@ -21,8 +21,9 @@
****************************************************************************/
#include "../config.h"
+#include "../language/language.h"
-#if ENABLED(LULZBOT_TOUCH_UI) && defined(TOUCH_UI_LANGUAGE_MENU)
+#if ENABLED(LULZBOT_TOUCH_UI) && NUM_LANGUAGES > 1
#include "screens.h"
@@ -39,14 +40,23 @@ void LanguageMenu::onRedraw(draw_mode_t) {
#define GRID_ROWS 8
#define GRID_COLS 1
- for (uint8_t i = 0; i < get_language_count(); i++)
- cmd.tag(1 + i).button(BTN_POS(1,i + 1), BTN_SIZE(1,1), get_text(i, String_Indices::LANGUAGE));
+ cmd.tag(1).button(BTN_POS(1,1), BTN_SIZE(1,1), GET_LANGUAGE_NAME(1));
+ cmd.tag(2).button(BTN_POS(1,2), BTN_SIZE(1,1), GET_LANGUAGE_NAME(2));
+ #if NUM_LANGUAGES > 2
+ cmd.tag(3).button(BTN_POS(1,3), BTN_SIZE(1,1), GET_LANGUAGE_NAME(3));
+ #if NUM_LANGUAGES > 3
+ cmd.tag(4).button(BTN_POS(1,4), BTN_SIZE(1,1), GET_LANGUAGE_NAME(4));
+ #if NUM_LANGUAGES > 5
+ cmd.tag(5).button(BTN_POS(1,5), BTN_SIZE(1,1), GET_LANGUAGE_NAME(5));
+ #endif
+ #endif
+ #endif
}
bool LanguageMenu::onTouchEnd(uint8_t tag) {
- const uint8_t lang = tag - 1;
- if (tag != 0) {
- set_language(lang);
+
+ if (tag > 0 && tag <= NUM_LANGUAGES) {
+ lang = tag - 1;
GOTO_SCREEN(StatusScreen);
return true;
}
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.cpp b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.cpp
index eb8644d5cc..59d4069d6c 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.cpp
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.cpp
@@ -31,7 +31,7 @@ screen_data_t screen_data;
SCREEN_TABLE {
DECL_SCREEN(BootScreen),
- #if ENABLED(TOUCH_UI_LANGUAGE_MENU)
+ #if NUM_LANGUAGES > 1
DECL_SCREEN(LanguageMenu),
#endif
DECL_SCREEN(TouchCalibrationScreen),
diff --git a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.h b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.h
index c9850c0d81..20a1809014 100644
--- a/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.h
+++ b/Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.h
@@ -23,7 +23,7 @@
#pragma once
#include "../ftdi_eve_lib/ftdi_eve_lib.h"
-#include "../language/languages.h"
+#include "../language/language.h"
#include "../theme/theme.h"
#include "string_format.h"
@@ -723,7 +723,7 @@ class MediaPlayerScreen : public BaseScreen, public UncachedScreen {
static void playStream(void *obj, media_streamer_func_t*);
};
-#if ENABLED(TOUCH_UI_LANGUAGE_MENU)
+#if NUM_LANGUAGES > 1
class LanguageMenu : public BaseScreen, public UncachedScreen {
public:
static void onRedraw(draw_mode_t);
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_SCSI.h b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_SCSI.h
index 3655d8183f..9ebefab5d1 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_SCSI.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_SCSI.h
@@ -325,4 +325,3 @@ struct SCSI_Request_Sense_Response {
} __attribute__((packed));
#endif /* UHS_SCSI_H */
-
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_USB_IDs.h b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_USB_IDs.h
index 1a88d38e9b..417c9f6e69 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_USB_IDs.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_USB_IDs.h
@@ -2991,5 +2991,3 @@
#define UHS_VID_FNK_TECH 0xffeeU // FNK Tech
#endif
-
-
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_macros.h b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_macros.h
index 34eaed646b..9c94e4d0ee 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_macros.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_macros.h
@@ -390,4 +390,3 @@ e-mail : support@circuitsathome.com
#define NOTUSED(...) __VA_ARGS__ __attribute__((unused))
#endif
#endif /* MACROS_H */
-
diff --git a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_printf_HELPER.h b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_printf_HELPER.h
index 5f8b59a991..87f156db5c 100644
--- a/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_printf_HELPER.h
+++ b/Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_printf_HELPER.h
@@ -198,4 +198,3 @@ void UHS_AVR_printf_HELPER_init() {
#define UHS_printf_HELPER_init() (void(0))
#endif
#endif /* UHS_PRINTF_HELPER_H */
-
diff --git a/config/default/Configuration_adv.h b/config/default/Configuration_adv.h
index b6ba665fcf..f88905b845 100644
--- a/config/default/Configuration_adv.h
+++ b/config/default/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/3DFabXYZ/Migbot/Configuration_adv.h b/config/examples/3DFabXYZ/Migbot/Configuration_adv.h
index 6017b0812d..56eb0d9830 100644
--- a/config/examples/3DFabXYZ/Migbot/Configuration_adv.h
+++ b/config/examples/3DFabXYZ/Migbot/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/ADIMLab/Gantry v1/Configuration_adv.h b/config/examples/ADIMLab/Gantry v1/Configuration_adv.h
index b2969a1c64..d453961a8d 100644
--- a/config/examples/ADIMLab/Gantry v1/Configuration_adv.h
+++ b/config/examples/ADIMLab/Gantry v1/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/ADIMLab/Gantry v2/Configuration_adv.h b/config/examples/ADIMLab/Gantry v2/Configuration_adv.h
index 40d87dc6d4..9e6cb3d524 100644
--- a/config/examples/ADIMLab/Gantry v2/Configuration_adv.h
+++ b/config/examples/ADIMLab/Gantry v2/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/config/examples/AlephObjects/TAZ4/Configuration_adv.h
index b19429787d..8ae981d468 100644
--- a/config/examples/AlephObjects/TAZ4/Configuration_adv.h
+++ b/config/examples/AlephObjects/TAZ4/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Alfawise/U20-bltouch/Configuration_adv.h b/config/examples/Alfawise/U20-bltouch/Configuration_adv.h
index 9f80e2a76f..d28445a30c 100644
--- a/config/examples/Alfawise/U20-bltouch/Configuration_adv.h
+++ b/config/examples/Alfawise/U20-bltouch/Configuration_adv.h
@@ -1235,8 +1235,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Alfawise/U20/Configuration_adv.h b/config/examples/Alfawise/U20/Configuration_adv.h
index 33b2fb83a6..ef31a7f862 100644
--- a/config/examples/Alfawise/U20/Configuration_adv.h
+++ b/config/examples/Alfawise/U20/Configuration_adv.h
@@ -1234,8 +1234,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/AliExpress/UM2pExt/Configuration_adv.h b/config/examples/AliExpress/UM2pExt/Configuration_adv.h
index 03b3dc96e5..dca5535e17 100644
--- a/config/examples/AliExpress/UM2pExt/Configuration_adv.h
+++ b/config/examples/AliExpress/UM2pExt/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Anet/A2/Configuration_adv.h b/config/examples/Anet/A2/Configuration_adv.h
index f7f298ff1a..fc0b42d648 100644
--- a/config/examples/Anet/A2/Configuration_adv.h
+++ b/config/examples/Anet/A2/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Anet/A2plus/Configuration_adv.h b/config/examples/Anet/A2plus/Configuration_adv.h
index f7f298ff1a..fc0b42d648 100644
--- a/config/examples/Anet/A2plus/Configuration_adv.h
+++ b/config/examples/Anet/A2plus/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Anet/A6/Configuration_adv.h b/config/examples/Anet/A6/Configuration_adv.h
index e1b3ffa8c4..0642c97f53 100644
--- a/config/examples/Anet/A6/Configuration_adv.h
+++ b/config/examples/Anet/A6/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Anet/A8/Configuration_adv.h b/config/examples/Anet/A8/Configuration_adv.h
index 05f68e2073..42400778e5 100644
--- a/config/examples/Anet/A8/Configuration_adv.h
+++ b/config/examples/Anet/A8/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Anet/A8plus/Configuration_adv.h b/config/examples/Anet/A8plus/Configuration_adv.h
index ee5bb397e3..7fda36633c 100644
--- a/config/examples/Anet/A8plus/Configuration_adv.h
+++ b/config/examples/Anet/A8plus/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Anet/E16/Configuration_adv.h b/config/examples/Anet/E16/Configuration_adv.h
index 6c7b312ca2..41fbc2c7f2 100644
--- a/config/examples/Anet/E16/Configuration_adv.h
+++ b/config/examples/Anet/E16/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/AnyCubic/i3/Configuration_adv.h b/config/examples/AnyCubic/i3/Configuration_adv.h
index 4d764120c6..10f0eff521 100644
--- a/config/examples/AnyCubic/i3/Configuration_adv.h
+++ b/config/examples/AnyCubic/i3/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/ArmEd/Configuration_adv.h b/config/examples/ArmEd/Configuration_adv.h
index a62a09285f..6d2fd42cf2 100644
--- a/config/examples/ArmEd/Configuration_adv.h
+++ b/config/examples/ArmEd/Configuration_adv.h
@@ -1235,8 +1235,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h b/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
index 98a6fdb30c..07fec7d7ce 100644
--- a/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
+++ b/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/BIBO/TouchX/default/Configuration_adv.h b/config/examples/BIBO/TouchX/default/Configuration_adv.h
index bb54c2e13e..e6f7076165 100644
--- a/config/examples/BIBO/TouchX/default/Configuration_adv.h
+++ b/config/examples/BIBO/TouchX/default/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/BQ/Hephestos/Configuration_adv.h b/config/examples/BQ/Hephestos/Configuration_adv.h
index 6558554f20..748e906a7e 100644
--- a/config/examples/BQ/Hephestos/Configuration_adv.h
+++ b/config/examples/BQ/Hephestos/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/BQ/Hephestos_2/Configuration_adv.h b/config/examples/BQ/Hephestos_2/Configuration_adv.h
index fb99ce17a8..b62620c31f 100644
--- a/config/examples/BQ/Hephestos_2/Configuration_adv.h
+++ b/config/examples/BQ/Hephestos_2/Configuration_adv.h
@@ -1239,8 +1239,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/BQ/WITBOX/Configuration_adv.h b/config/examples/BQ/WITBOX/Configuration_adv.h
index 6558554f20..748e906a7e 100644
--- a/config/examples/BQ/WITBOX/Configuration_adv.h
+++ b/config/examples/BQ/WITBOX/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Cartesio/Configuration_adv.h b/config/examples/Cartesio/Configuration_adv.h
index c5bf68b552..adbbc928c0 100644
--- a/config/examples/Cartesio/Configuration_adv.h
+++ b/config/examples/Cartesio/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Creality/CR-10/Configuration_adv.h b/config/examples/Creality/CR-10/Configuration_adv.h
index a6d3c85995..e685fca8e4 100644
--- a/config/examples/Creality/CR-10/Configuration_adv.h
+++ b/config/examples/Creality/CR-10/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Creality/CR-10S/Configuration_adv.h b/config/examples/Creality/CR-10S/Configuration_adv.h
index 5a9ac98776..e1e8e30e10 100644
--- a/config/examples/Creality/CR-10S/Configuration_adv.h
+++ b/config/examples/Creality/CR-10S/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Creality/CR-10_5S/Configuration_adv.h b/config/examples/Creality/CR-10_5S/Configuration_adv.h
index 1948de05b3..d41e51c828 100644
--- a/config/examples/Creality/CR-10_5S/Configuration_adv.h
+++ b/config/examples/Creality/CR-10_5S/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Creality/CR-10mini/Configuration_adv.h b/config/examples/Creality/CR-10mini/Configuration_adv.h
index 74bf861e06..b48f9f2646 100644
--- a/config/examples/Creality/CR-10mini/Configuration_adv.h
+++ b/config/examples/Creality/CR-10mini/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Creality/CR-20 Pro/Configuration_adv.h b/config/examples/Creality/CR-20 Pro/Configuration_adv.h
index 1ba51c508b..8e0e1fd51d 100644
--- a/config/examples/Creality/CR-20 Pro/Configuration_adv.h
+++ b/config/examples/Creality/CR-20 Pro/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Creality/CR-20/Configuration_adv.h b/config/examples/Creality/CR-20/Configuration_adv.h
index 3cf51e8221..0fba39dfdf 100644
--- a/config/examples/Creality/CR-20/Configuration_adv.h
+++ b/config/examples/Creality/CR-20/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Creality/CR-8/Configuration_adv.h b/config/examples/Creality/CR-8/Configuration_adv.h
index 5f6dbc149d..77e3fd2192 100644
--- a/config/examples/Creality/CR-8/Configuration_adv.h
+++ b/config/examples/Creality/CR-8/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Creality/Ender-2/Configuration_adv.h b/config/examples/Creality/Ender-2/Configuration_adv.h
index 785c161d56..36acbb208e 100644
--- a/config/examples/Creality/Ender-2/Configuration_adv.h
+++ b/config/examples/Creality/Ender-2/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Creality/Ender-3/Configuration_adv.h b/config/examples/Creality/Ender-3/Configuration_adv.h
index ce293ef3fc..f5285a4d54 100644
--- a/config/examples/Creality/Ender-3/Configuration_adv.h
+++ b/config/examples/Creality/Ender-3/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Creality/Ender-4/Configuration_adv.h b/config/examples/Creality/Ender-4/Configuration_adv.h
index 3791dc9082..4ef5f324fb 100644
--- a/config/examples/Creality/Ender-4/Configuration_adv.h
+++ b/config/examples/Creality/Ender-4/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Creality/Ender-5/Configuration_adv.h b/config/examples/Creality/Ender-5/Configuration_adv.h
index 71d233421c..3ca99e82b2 100644
--- a/config/examples/Creality/Ender-5/Configuration_adv.h
+++ b/config/examples/Creality/Ender-5/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h b/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h
index 4f057bf800..5023cbd95c 100644
--- a/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h
+++ b/config/examples/Dagoma/Disco Ultimate/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h b/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h
index c6bd2bbcf0..3f54c1538f 100755
--- a/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h
+++ b/config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Einstart-S/Configuration_adv.h b/config/examples/Einstart-S/Configuration_adv.h
index 1705be759d..7385eb849b 100644
--- a/config/examples/Einstart-S/Configuration_adv.h
+++ b/config/examples/Einstart-S/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/FYSETC/AIO_II/Configuration_adv.h b/config/examples/FYSETC/AIO_II/Configuration_adv.h
index 5199d97e4f..651346faf8 100644
--- a/config/examples/FYSETC/AIO_II/Configuration_adv.h
+++ b/config/examples/FYSETC/AIO_II/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h b/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h
index fbe0fb9966..f0cda65025 100644
--- a/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h
+++ b/config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h b/config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h
index fbe0fb9966..f0cda65025 100644
--- a/config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h
+++ b/config/examples/FYSETC/Cheetah 1.2/base/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h b/config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h
index fbe0fb9966..f0cda65025 100644
--- a/config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h
+++ b/config/examples/FYSETC/Cheetah/BLTouch/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/FYSETC/Cheetah/base/Configuration_adv.h b/config/examples/FYSETC/Cheetah/base/Configuration_adv.h
index fbe0fb9966..f0cda65025 100644
--- a/config/examples/FYSETC/Cheetah/base/Configuration_adv.h
+++ b/config/examples/FYSETC/Cheetah/base/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/FYSETC/F6_13/Configuration_adv.h b/config/examples/FYSETC/F6_13/Configuration_adv.h
index 2790ca7522..6018ab30ca 100644
--- a/config/examples/FYSETC/F6_13/Configuration_adv.h
+++ b/config/examples/FYSETC/F6_13/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Felix/Configuration_adv.h b/config/examples/Felix/Configuration_adv.h
index 50e396f456..76416e5014 100644
--- a/config/examples/Felix/Configuration_adv.h
+++ b/config/examples/Felix/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/FlashForge/CreatorPro/Configuration_adv.h b/config/examples/FlashForge/CreatorPro/Configuration_adv.h
index d9365a3f20..ac0657c29f 100644
--- a/config/examples/FlashForge/CreatorPro/Configuration_adv.h
+++ b/config/examples/FlashForge/CreatorPro/Configuration_adv.h
@@ -1230,8 +1230,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/FolgerTech/i3-2020/Configuration_adv.h b/config/examples/FolgerTech/i3-2020/Configuration_adv.h
index 473de3b841..f4200d25a3 100644
--- a/config/examples/FolgerTech/i3-2020/Configuration_adv.h
+++ b/config/examples/FolgerTech/i3-2020/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Formbot/Raptor/Configuration_adv.h b/config/examples/Formbot/Raptor/Configuration_adv.h
index e3b1bd44bf..102595c3ff 100644
--- a/config/examples/Formbot/Raptor/Configuration_adv.h
+++ b/config/examples/Formbot/Raptor/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Formbot/T_Rex_2+/Configuration_adv.h b/config/examples/Formbot/T_Rex_2+/Configuration_adv.h
index ca93a1217c..4a056163af 100644
--- a/config/examples/Formbot/T_Rex_2+/Configuration_adv.h
+++ b/config/examples/Formbot/T_Rex_2+/Configuration_adv.h
@@ -1235,8 +1235,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Formbot/T_Rex_3/Configuration_adv.h b/config/examples/Formbot/T_Rex_3/Configuration_adv.h
index 4e9195ab74..fcad7bf651 100644
--- a/config/examples/Formbot/T_Rex_3/Configuration_adv.h
+++ b/config/examples/Formbot/T_Rex_3/Configuration_adv.h
@@ -1235,8 +1235,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Geeetech/A10/Configuration_adv.h b/config/examples/Geeetech/A10/Configuration_adv.h
index b9acae4234..899c563566 100644
--- a/config/examples/Geeetech/A10/Configuration_adv.h
+++ b/config/examples/Geeetech/A10/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Geeetech/A10M/Configuration_adv.h b/config/examples/Geeetech/A10M/Configuration_adv.h
index 8e3c660634..3cc32f29bc 100644
--- a/config/examples/Geeetech/A10M/Configuration_adv.h
+++ b/config/examples/Geeetech/A10M/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Geeetech/A20M/Configuration_adv.h b/config/examples/Geeetech/A20M/Configuration_adv.h
index 246b9d75fd..884950a9fe 100644
--- a/config/examples/Geeetech/A20M/Configuration_adv.h
+++ b/config/examples/Geeetech/A20M/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Geeetech/MeCreator2/Configuration_adv.h b/config/examples/Geeetech/MeCreator2/Configuration_adv.h
index 5fef4961cd..2a342b4023 100644
--- a/config/examples/Geeetech/MeCreator2/Configuration_adv.h
+++ b/config/examples/Geeetech/MeCreator2/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h b/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
index b9acae4234..899c563566 100644
--- a/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
+++ b/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h b/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
index b9acae4234..899c563566 100644
--- a/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
+++ b/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Infitary/i3-M508/Configuration_adv.h b/config/examples/Infitary/i3-M508/Configuration_adv.h
index 54e325ee2d..48f2f7907b 100644
--- a/config/examples/Infitary/i3-M508/Configuration_adv.h
+++ b/config/examples/Infitary/i3-M508/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/JGAurora/A1/Configuration_adv.h b/config/examples/JGAurora/A1/Configuration_adv.h
index ad93921412..5619fcfc3d 100644
--- a/config/examples/JGAurora/A1/Configuration_adv.h
+++ b/config/examples/JGAurora/A1/Configuration_adv.h
@@ -1236,8 +1236,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/JGAurora/A5/Configuration_adv.h b/config/examples/JGAurora/A5/Configuration_adv.h
index f0b1c2e8c6..de72595609 100644
--- a/config/examples/JGAurora/A5/Configuration_adv.h
+++ b/config/examples/JGAurora/A5/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/JGAurora/A5S/Configuration_adv.h b/config/examples/JGAurora/A5S/Configuration_adv.h
index ad93921412..5619fcfc3d 100644
--- a/config/examples/JGAurora/A5S/Configuration_adv.h
+++ b/config/examples/JGAurora/A5S/Configuration_adv.h
@@ -1236,8 +1236,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/MakerParts/Configuration_adv.h b/config/examples/MakerParts/Configuration_adv.h
index 7a10c49771..53f5435b64 100644
--- a/config/examples/MakerParts/Configuration_adv.h
+++ b/config/examples/MakerParts/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Malyan/M150/Configuration_adv.h b/config/examples/Malyan/M150/Configuration_adv.h
index 182ed8c787..401a36c5da 100644
--- a/config/examples/Malyan/M150/Configuration_adv.h
+++ b/config/examples/Malyan/M150/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Malyan/M200/Configuration_adv.h b/config/examples/Malyan/M200/Configuration_adv.h
index 16412629c0..a529b26167 100644
--- a/config/examples/Malyan/M200/Configuration_adv.h
+++ b/config/examples/Malyan/M200/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Micromake/C1/enhanced/Configuration_adv.h b/config/examples/Micromake/C1/enhanced/Configuration_adv.h
index 9dc742bff9..a3157c6626 100644
--- a/config/examples/Micromake/C1/enhanced/Configuration_adv.h
+++ b/config/examples/Micromake/C1/enhanced/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Mks/Robin/Configuration_adv.h b/config/examples/Mks/Robin/Configuration_adv.h
index ec45f38eed..ad622a09c9 100644
--- a/config/examples/Mks/Robin/Configuration_adv.h
+++ b/config/examples/Mks/Robin/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Mks/Sbase/Configuration_adv.h b/config/examples/Mks/Sbase/Configuration_adv.h
index 847e2fe584..765623e6f4 100644
--- a/config/examples/Mks/Sbase/Configuration_adv.h
+++ b/config/examples/Mks/Sbase/Configuration_adv.h
@@ -1232,8 +1232,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/RapideLite/RL200/Configuration_adv.h b/config/examples/RapideLite/RL200/Configuration_adv.h
index cc48e77f63..a757dffd84 100644
--- a/config/examples/RapideLite/RL200/Configuration_adv.h
+++ b/config/examples/RapideLite/RL200/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/RigidBot/Configuration_adv.h b/config/examples/RigidBot/Configuration_adv.h
index 0cd4a3fb54..e95dcbcf0e 100644
--- a/config/examples/RigidBot/Configuration_adv.h
+++ b/config/examples/RigidBot/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/SCARA/Configuration_adv.h b/config/examples/SCARA/Configuration_adv.h
index a866976f6d..1727b6dbca 100644
--- a/config/examples/SCARA/Configuration_adv.h
+++ b/config/examples/SCARA/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h b/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h
index 80f9d06ddf..67017c5f54 100644
--- a/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h
+++ b/config/examples/STM32/Black_STM32F407VET6/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Sanguinololu/Configuration_adv.h b/config/examples/Sanguinololu/Configuration_adv.h
index ff0a71beec..db4d97b8cc 100644
--- a/config/examples/Sanguinololu/Configuration_adv.h
+++ b/config/examples/Sanguinololu/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Tevo/Michelangelo/Configuration_adv.h b/config/examples/Tevo/Michelangelo/Configuration_adv.h
index 451e06e58a..a1e6c52816 100644
--- a/config/examples/Tevo/Michelangelo/Configuration_adv.h
+++ b/config/examples/Tevo/Michelangelo/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Tevo/Tarantula Pro/Configuration_adv.h b/config/examples/Tevo/Tarantula Pro/Configuration_adv.h
index 33a9f5e066..f23a9d00c5 100755
--- a/config/examples/Tevo/Tarantula Pro/Configuration_adv.h
+++ b/config/examples/Tevo/Tarantula Pro/Configuration_adv.h
@@ -1227,8 +1227,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h b/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h
index 68748ce057..09d5656861 100755
--- a/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h
+++ b/config/examples/Tevo/Tornado/V1 (MKS Base)/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h b/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h
index 68748ce057..09d5656861 100755
--- a/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h
+++ b/config/examples/Tevo/Tornado/V2 (MKS GEN-L)/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/TheBorg/Configuration_adv.h b/config/examples/TheBorg/Configuration_adv.h
index 1a33623749..de9c92d1ee 100644
--- a/config/examples/TheBorg/Configuration_adv.h
+++ b/config/examples/TheBorg/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/TinyBoy2/Configuration_adv.h b/config/examples/TinyBoy2/Configuration_adv.h
index 8a8bd404a2..a101054d32 100644
--- a/config/examples/TinyBoy2/Configuration_adv.h
+++ b/config/examples/TinyBoy2/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Tronxy/X3A/Configuration_adv.h b/config/examples/Tronxy/X3A/Configuration_adv.h
index 700700347b..e2a8296e85 100644
--- a/config/examples/Tronxy/X3A/Configuration_adv.h
+++ b/config/examples/Tronxy/X3A/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Tronxy/X5S-2E/Configuration_adv.h b/config/examples/Tronxy/X5S-2E/Configuration_adv.h
index 454a2fc16a..1f1e28fd65 100644
--- a/config/examples/Tronxy/X5S-2E/Configuration_adv.h
+++ b/config/examples/Tronxy/X5S-2E/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/UltiMachine/Archim1/Configuration_adv.h b/config/examples/UltiMachine/Archim1/Configuration_adv.h
index a270d01c23..d940e242bd 100644
--- a/config/examples/UltiMachine/Archim1/Configuration_adv.h
+++ b/config/examples/UltiMachine/Archim1/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/UltiMachine/Archim2/Configuration_adv.h b/config/examples/UltiMachine/Archim2/Configuration_adv.h
index 9a2eabb2f3..9ec2526cd3 100644
--- a/config/examples/UltiMachine/Archim2/Configuration_adv.h
+++ b/config/examples/UltiMachine/Archim2/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/VORONDesign/Configuration_adv.h b/config/examples/VORONDesign/Configuration_adv.h
index 110edf17bc..81b4e6d5ae 100644
--- a/config/examples/VORONDesign/Configuration_adv.h
+++ b/config/examples/VORONDesign/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Velleman/K8200/Configuration_adv.h b/config/examples/Velleman/K8200/Configuration_adv.h
index 9531281ce4..353fd75a94 100644
--- a/config/examples/Velleman/K8200/Configuration_adv.h
+++ b/config/examples/Velleman/K8200/Configuration_adv.h
@@ -1244,8 +1244,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Velleman/K8400/Configuration_adv.h b/config/examples/Velleman/K8400/Configuration_adv.h
index 91d9fea2a2..78a6d040a3 100644
--- a/config/examples/Velleman/K8400/Configuration_adv.h
+++ b/config/examples/Velleman/K8400/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/WASP/PowerWASP/Configuration_adv.h b/config/examples/WASP/PowerWASP/Configuration_adv.h
index e31c3f2b63..729314ec00 100644
--- a/config/examples/WASP/PowerWASP/Configuration_adv.h
+++ b/config/examples/WASP/PowerWASP/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Wanhao/Duplicator 6/Configuration_adv.h b/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
index 44d9be6f00..f9d1bc3e21 100644
--- a/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
+++ b/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
@@ -1233,8 +1233,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/Wanhao/Duplicator i3 Mini/Configuration_adv.h b/config/examples/Wanhao/Duplicator i3 Mini/Configuration_adv.h
index b268634972..e89a50b5c0 100644
--- a/config/examples/Wanhao/Duplicator i3 Mini/Configuration_adv.h
+++ b/config/examples/Wanhao/Duplicator i3 Mini/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/delta/Anycubic/Kossel/Configuration_adv.h b/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
index 7a74e42b53..9db9ce2237 100644
--- a/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
+++ b/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
@@ -1233,8 +1233,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/delta/Dreammaker/Overlord/Configuration_adv.h b/config/examples/delta/Dreammaker/Overlord/Configuration_adv.h
index cba2978e7a..cc24bdee11 100644
--- a/config/examples/delta/Dreammaker/Overlord/Configuration_adv.h
+++ b/config/examples/delta/Dreammaker/Overlord/Configuration_adv.h
@@ -1233,8 +1233,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/delta/Dreammaker/Overlord_Pro/Configuration_adv.h b/config/examples/delta/Dreammaker/Overlord_Pro/Configuration_adv.h
index cba2978e7a..cc24bdee11 100644
--- a/config/examples/delta/Dreammaker/Overlord_Pro/Configuration_adv.h
+++ b/config/examples/delta/Dreammaker/Overlord_Pro/Configuration_adv.h
@@ -1233,8 +1233,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h b/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
index deac5af280..3bb34aaa85 100644
--- a/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
+++ b/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
@@ -1233,8 +1233,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/delta/FLSUN/kossel/Configuration_adv.h b/config/examples/delta/FLSUN/kossel/Configuration_adv.h
index deac5af280..3bb34aaa85 100644
--- a/config/examples/delta/FLSUN/kossel/Configuration_adv.h
+++ b/config/examples/delta/FLSUN/kossel/Configuration_adv.h
@@ -1233,8 +1233,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h b/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
index d7a9362bf8..39a055740a 100644
--- a/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
+++ b/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
@@ -1233,8 +1233,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h b/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h
index d71d27738a..7407dbd767 100644
--- a/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h
+++ b/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h
@@ -1233,8 +1233,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/delta/MKS/SBASE/Configuration_adv.h b/config/examples/delta/MKS/SBASE/Configuration_adv.h
index ca8eeca02f..57573a12b1 100644
--- a/config/examples/delta/MKS/SBASE/Configuration_adv.h
+++ b/config/examples/delta/MKS/SBASE/Configuration_adv.h
@@ -1233,8 +1233,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/delta/Tevo Little Monster/Configuration_adv.h b/config/examples/delta/Tevo Little Monster/Configuration_adv.h
index 05638c27e2..75a21310fd 100644
--- a/config/examples/delta/Tevo Little Monster/Configuration_adv.h
+++ b/config/examples/delta/Tevo Little Monster/Configuration_adv.h
@@ -1233,8 +1233,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/delta/generic/Configuration_adv.h b/config/examples/delta/generic/Configuration_adv.h
index d7a9362bf8..39a055740a 100644
--- a/config/examples/delta/generic/Configuration_adv.h
+++ b/config/examples/delta/generic/Configuration_adv.h
@@ -1233,8 +1233,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/delta/kossel_mini/Configuration_adv.h b/config/examples/delta/kossel_mini/Configuration_adv.h
index d7a9362bf8..39a055740a 100644
--- a/config/examples/delta/kossel_mini/Configuration_adv.h
+++ b/config/examples/delta/kossel_mini/Configuration_adv.h
@@ -1233,8 +1233,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/delta/kossel_xl/Configuration_adv.h b/config/examples/delta/kossel_xl/Configuration_adv.h
index 3d93a583f3..2224b926b8 100644
--- a/config/examples/delta/kossel_xl/Configuration_adv.h
+++ b/config/examples/delta/kossel_xl/Configuration_adv.h
@@ -1233,8 +1233,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/gCreate/gMax1.5+/Configuration_adv.h b/config/examples/gCreate/gMax1.5+/Configuration_adv.h
index a9206c8d75..b6e090be3c 100644
--- a/config/examples/gCreate/gMax1.5+/Configuration_adv.h
+++ b/config/examples/gCreate/gMax1.5+/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/makibox/Configuration_adv.h b/config/examples/makibox/Configuration_adv.h
index 08158a0bd5..03d60eceaf 100644
--- a/config/examples/makibox/Configuration_adv.h
+++ b/config/examples/makibox/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/tvrrug/Round2/Configuration_adv.h b/config/examples/tvrrug/Round2/Configuration_adv.h
index 4cc7885dda..b28eb258c0 100644
--- a/config/examples/tvrrug/Round2/Configuration_adv.h
+++ b/config/examples/tvrrug/Round2/Configuration_adv.h
@@ -1231,8 +1231,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
diff --git a/config/examples/wt150/Configuration_adv.h b/config/examples/wt150/Configuration_adv.h
index 46e62d1c2f..633ca09d85 100644
--- a/config/examples/wt150/Configuration_adv.h
+++ b/config/examples/wt150/Configuration_adv.h
@@ -1232,8 +1232,12 @@
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
- // Runtime language selection (otherwise LCD_LANGUAGE)
- //#define TOUCH_UI_LANGUAGE_MENU
+ // Allow language selection from menu at run-time (otherwise use LCD_LANGUAGE)
+ //#define LCD_LANGUAGE_1 en
+ //#define LCD_LANGUAGE_2 fr
+ //#define LCD_LANGUAGE_3 de
+ //#define LCD_LANGUAGE_4 es
+ //#define LCD_LANGUAGE_5 it
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
--
GitLab