Merge branch 'master' into MHP30

2021-04-30 21:19:31 +10:00
parent 6cdb67e675 1a0b542ae6
commit 27aecd2436
57 changed files with 3447 additions and 767 deletions
--- a/source/Core/Src/gui.cpp
+++ b/source/Core/Src/gui.cpp
@@ -147,6 +147,7 @@ const menuitem rootSettingsMenu[]{
    {0, settings_enterPowerSavingMenu, settings_displayPowerSavingMenu}, /*Sleep Options Menu*/
    {0, settings_enterUIMenu, settings_displayUIMenu},                   /*UI Menu*/
    {0, settings_enterAdvancedMenu, settings_displayAdvancedMenu},       /*Advanced Menu*/
+    {0, settings_setLanguageSwitch, settings_displayLanguageSwitch},     /*Language Switch*/
    {0, nullptr, nullptr}                                                // end of menu marker. DO NOT REMOVE
 };