From f627c8d993b8293a0e6b7fbd1b6d7408b16b21ee Mon Sep 17 00:00:00 2001
From: CommanderRedYT <ccommanderred@gmail.com>
Date: Mon, 21 Feb 2022 20:41:39 +0100
Subject: [PATCH] Added more canbus fixes (crashes)

---
 ignore.tar.gz.gpg                    | Bin 1670 -> 1672 bytes
 main/displays/menus/mainmenu.cpp     |  22 +++++++++++-----------
 main/displays/menus/settingsmenu.cpp |   9 ++++++---
 main/displays/statusdisplay.cpp      |   4 ++++
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/ignore.tar.gz.gpg b/ignore.tar.gz.gpg
index 08577d51e41fcc5cb880a87ec2029c5848711300..5ff0ab4beb31700594cf5ceb056a66008cc54cd2 100644
GIT binary patch
literal 1672
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
Aa{vGU

literal 1670
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
D<Sai-

diff --git a/main/displays/menus/mainmenu.cpp b/main/displays/menus/mainmenu.cpp
index 5ce8eff..e511c20 100644
--- a/main/displays/menus/mainmenu.cpp
+++ b/main/displays/menus/mainmenu.cpp
@@ -90,25 +90,25 @@ MainMenu::MainMenu()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STATISTICSMENU>, SwitchScreenAction<StatisticsMenu>, StaticMenuItemIcon<&bobbyicons::statistics>>>();
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SELECTMODE>,   SwitchScreenAction<SelectModeMenu>, StaticMenuItemIcon<&bobbyicons::modes>>>();
     if (SHOWITEM)   { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MODESETTINGS>, ModeSettingsAction>>(); }
-    if (SHOWITEM)   { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY>,      SwitchScreenAction<BatteryMenu>, StaticMenuItemIcon<&bobbyicons::battery>>>(); }
-    if (SHOWITEM)   { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SETTINGS>,     SwitchScreenAction<SettingsMenu>, StaticMenuItemIcon<&bobbyicons::settings>>>(); }
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BATTERY>,      SwitchScreenAction<BatteryMenu>, StaticMenuItemIcon<&bobbyicons::battery>>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SETTINGS>,     SwitchScreenAction<SettingsMenu>, StaticMenuItemIcon<&bobbyicons::settings>>>();
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GREENPASS>,    SwitchScreenAction<GreenPassMenu>, StaticMenuItemIcon<&bobbyicons::greenpass>>>();
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_LOCKVEHICLE>,  SwitchScreenAction<Lockscreen>, StaticMenuItemIcon<&bobbyicons::lock>>>();
     if (configs.feature.garage.isEnabled.value && configs.feature.esp_now.isEnabled.value)
     {
-        if (SHOWITEM)   { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GARAGE>,       SwitchScreenAction<GarageMenu>>>(); }
+        constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GARAGE>,       SwitchScreenAction<GarageMenu>>>();
     }
     if (configs.feature.ota.isEnabled.value)
-        if (SHOWITEM)   { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_UPDATE>,       SwitchScreenAction<OtaMenu>, StaticMenuItemIcon<&bobbyicons::update>>>(); }
-    if (SHOWITEM)   { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GRAPHS>,       SwitchScreenAction<GraphsMenu>, StaticMenuItemIcon<&bobbyicons::graph>>>(); }
+        constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_UPDATE>,       SwitchScreenAction<OtaMenu>, StaticMenuItemIcon<&bobbyicons::update>>>();
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GRAPHS>,       SwitchScreenAction<GraphsMenu>, StaticMenuItemIcon<&bobbyicons::graph>>>();
 #if defined(FEATURE_CAN) && defined(FEATURE_POWERSUPPLY)
-    if (SHOWITEM)   { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_POWERSUPPLY>,  SwitchScreenAction<PowerSupplyDisplay>>>(); }
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_POWERSUPPLY>,  SwitchScreenAction<PowerSupplyDisplay>>>();
 #endif
 #ifdef FEATURE_MOSFETS
-    if (SHOWITEM)   { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MOSFETS>,      SwitchScreenAction<MosfetsMenu>>>(); }
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MOSFETS>,      SwitchScreenAction<MosfetsMenu>>>();
 #endif
 #if defined(FEATURE_BLUETOOTH) && defined(FEATURE_BMS)
-    if (SHOWITEM)   { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BMS>,          SwitchScreenAction<BmsMenu>, StaticMenuItemIcon<&bobbyicons::bms>>>(); }
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BMS>,          SwitchScreenAction<BmsMenu>, StaticMenuItemIcon<&bobbyicons::bms>>>();
 #endif
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DEMOS>,        SwitchScreenAction<DemosMenu>, StaticMenuItemIcon<&bobbyicons::demos>>>();
     if (SHOWITEM)   { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_PROFILES>,     SwitchScreenAction<ProfilesMenu>, StaticMenuItemIcon<&bobbyicons::presets>>>(); }
@@ -116,9 +116,9 @@ MainMenu::MainMenu()
     if (SHOWITEM)   { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DEBUG>,        SwitchScreenAction<DebugMenu>>>(); }
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_POWEROFF>,     SwitchScreenAction<PoweroffDisplay>, StaticMenuItemIcon<&bobbyicons::poweroff>>>();
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_REBOOT>,       RebootAction, StaticMenuItemIcon<&bobbyicons::reboot>>>();
-#ifdef MAINMENU_PLUGIN
-    GMEN1
-#endif
+//#ifdef MAINMENU_PLUGIN
+    // GMEN1
+//#endif
 }
 
 std::string MainMenu::text() const
diff --git a/main/displays/menus/settingsmenu.cpp b/main/displays/menus/settingsmenu.cpp
index 775a441..b742e87 100644
--- a/main/displays/menus/settingsmenu.cpp
+++ b/main/displays/menus/settingsmenu.cpp
@@ -98,9 +98,12 @@ SettingsMenu::SettingsMenu()
     if (configs.feature.ota.isEnabled.value)
         constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SELECTBUILDSERVERMENU>,     SwitchScreenAction<SelectBuildServerMenu>, StaticMenuItemIcon<&bobbyicons::update>>>();
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_TIME>,                          SwitchScreenAction<TimeSettingsMenu>, StaticMenuItemIcon<&bobbyicons::time>>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MODESSETTINGS>,                 SwitchScreenAction<ModesSettingsMenu>>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CONTROLLERHARDWARESETTINGS>,    SwitchScreenAction<ControllerHardwareSettingsMenu>, StaticMenuItemIcon<&bobbyicons::hardware>>>();
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BOARDCOMPUTERHARDWARESETTINGS>, SwitchScreenAction<BoardcomputerHardwareSettingsMenu>, StaticMenuItemIcon<&bobbyicons::hardware>>>();
+    if (!simplified)
+    {
+        constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MODESSETTINGS>, SwitchScreenAction<ModesSettingsMenu>>>();
+        constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CONTROLLERHARDWARESETTINGS>, SwitchScreenAction<ControllerHardwareSettingsMenu>, StaticMenuItemIcon<&bobbyicons::hardware>>>();
+        constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BOARDCOMPUTERHARDWARESETTINGS>, SwitchScreenAction<BoardcomputerHardwareSettingsMenu>, StaticMenuItemIcon<&bobbyicons::hardware>>>();
+    }
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_FEATUREFLAGS>,                  SwitchScreenAction<FeatureFlagsMenu>, StaticMenuItemIcon<&bobbyicons::demos>>>();
 //#if defined(FEATURE_BLUETOOTH) && defined(FEATURE_BMS)
 //    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_AUTOCONNECTBMS>,                BobbyCheckbox, AutoConnectBmsAccessor>>();
diff --git a/main/displays/statusdisplay.cpp b/main/displays/statusdisplay.cpp
index daa882e..7678aee 100644
--- a/main/displays/statusdisplay.cpp
+++ b/main/displays/statusdisplay.cpp
@@ -234,6 +234,8 @@ void StatusDisplay::buttonPressed(espgui::Button button)
         switchScreen<MainMenu>();
         break;
     case Button::Up:
+        if (simplified)
+            return;
 #ifdef FEATURE_BMS
         switchScreen<BmsDisplay>();
 #else
@@ -241,6 +243,8 @@ void StatusDisplay::buttonPressed(espgui::Button button)
 #endif
         break;
     case Button::Down:
+        if (simplified)
+            return;
         switchScreen<MetersDisplay>();
         break;
     default: