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

MarlinUI multi-language support (#20725)

Browse Source
This commit is contained in:
Scott Lahteine
2021-01-20 18:52:06 -06:00
committed by GitHub
parent 00bc094914
commit 68abaeab19
16 changed files with 202 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Marlin/src/module/settings.cpp
View File

@ -36,7 +36,7 @@
*/
// Change EEPROM version if the structure changes
#define EEPROM_VERSION "V82"
#define EEPROM_VERSION "V83"
#define EEPROM_OFFSET 100
// Check the integrity of data offsets.
@ -457,6 +457,11 @@ typedef struct SettingsDataStruct {
#if ENABLED(SOUND_MENU_ITEM)
bool buzzer_enabled;
#endif
#if HAS_MULTI_LANGUAGE
uint8_t ui_language; // M414 S
#endif
} SettingsData;
//static_assert(sizeof(SettingsData) <= MARLIN_EEPROM_SIZE, "EEPROM too small to contain SettingsData!");
@ -1382,6 +1387,13 @@ void MarlinSettings::postprocess() {
EEPROM_WRITE(ui.buzzer_enabled);
#endif
//
// Selected LCD language
//
#if HAS_MULTI_LANGUAGE
EEPROM_WRITE(ui.language);
#endif
//
// Report final CRC and Data Size
//
@ -2261,6 +2273,18 @@ void MarlinSettings::postprocess() {
EEPROM_READ(ui.buzzer_enabled);
#endif
//
// Selected LCD language
//
#if HAS_MULTI_LANGUAGE
{
uint8_t ui_language;
EEPROM_READ(ui_language);
if (ui_language >= NUM_LANGUAGES) ui_language = 0;
ui.set_language(ui_language);
}
#endif
//
// Validate Final Size and CRC
//
@ -3846,6 +3870,11 @@ void MarlinSettings::reset() {
CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); M553_report();
CONFIG_ECHO_START(); SERIAL_ECHO_SP(2); M554_report();
#endif
#if HAS_MULTI_LANGUAGE
CONFIG_ECHO_HEADING("UI Language:");
SERIAL_ECHO_MSG(" M414 S", int(ui.language));
#endif
}
#endif // !DISABLE_M503