From c44e683941bf35d7413613ab31fea4a739bf1400 Mon Sep 17 00:00:00 2001
From: CommanderRedYT <ccommanderred@gmail.com>
Date: Mon, 17 Jan 2022 15:41:47 +0100
Subject: [PATCH] Moved FEATURE_GARAGE into config-system

---
 config_allfeatures.cmake            | 1 -
 config_comred.cmake                 | 1 -
 config_feedc0de.cmake               | 1 -
 config_mick.cmake                   | 1 -
 config_nofeatures.cmake             | 1 -
 config_peter.cmake                  | 1 -
 main/displays/menus/garagenmenu.cpp | 2 +-
 main/displays/menus/garagenmenu.h   | 3 +--
 main/displays/menus/mainmenu.cpp    | 9 ++++++---
 main/newsettings.h                  | 7 +++++--
 10 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/config_allfeatures.cmake b/config_allfeatures.cmake
index 5a5cf5f..4ade2bd 100644
--- a/config_allfeatures.cmake
+++ b/config_allfeatures.cmake
@@ -70,7 +70,6 @@ set(BOBBYCAR_BUILDFLAGS
   -DFEATURE_LEDBACKLIGHT
   -DPINS_LEDBACKLIGHT=23
   -DLEDBACKLIGHT_INVERTED
-  -DFEATURE_GARAGE
   -DFEATURE_NTP
   -DFEATURE_WIRELESS_CONFIG
   -DPINS_LEDSTRIP=33
diff --git a/config_comred.cmake b/config_comred.cmake
index ce73ec6..b5c8d3c 100644
--- a/config_comred.cmake
+++ b/config_comred.cmake
@@ -63,7 +63,6 @@ set(BOBBYCAR_BUILDFLAGS
   -DFEATURE_LEDBACKLIGHT
   -DPINS_LEDBACKLIGHT=23
   -DLEDBACKLIGHT_INVERTED
-  -DFEATURE_GARAGE
 #  -DFEATURE_NTP
   -DFEATURE_WIRELESS_CONFIG
   -DPINS_LEDSTRIP=33
diff --git a/config_feedc0de.cmake b/config_feedc0de.cmake
index e72362d..bc51916 100644
--- a/config_feedc0de.cmake
+++ b/config_feedc0de.cmake
@@ -61,7 +61,6 @@ set(BOBBYCAR_BUILDFLAGS
   -DFEATURE_LEDBACKLIGHT
   -DPINS_LEDBACKLIGHT=23
   -DLEDBACKLIGHT_INVERTED
-#  -DFEATURE_GARAGE
   -DFEATURE_NTP
   -DFEATURE_WIRELESS_CONFIG
   -DPINS_LEDSTRIP=26
diff --git a/config_mick.cmake b/config_mick.cmake
index 390893a..6d47f97 100644
--- a/config_mick.cmake
+++ b/config_mick.cmake
@@ -61,7 +61,6 @@ set(BOBBYCAR_BUILDFLAGS
   -DFEATURE_LEDBACKLIGHT
   -DPINS_LEDBACKLIGHT=23
   -DLEDBACKLIGHT_INVERTED
-#  -DFEATURE_GARAGE
 #  -DFEATURE_NTP
   -DFEATURE_WIRELESS_CONFIG
   -DPINS_LEDSTRIP=33
diff --git a/config_nofeatures.cmake b/config_nofeatures.cmake
index e079176..3b76089 100644
--- a/config_nofeatures.cmake
+++ b/config_nofeatures.cmake
@@ -70,7 +70,6 @@ set(BOBBYCAR_BUILDFLAGS
 #  -DFEATURE_LEDBACKLIGHT
 #  -DPINS_LEDBACKLIGHT=23
 #  -DLEDBACKLIGHT_INVERTED
-#  -DFEATURE_GARAGE
 #  -DFEATURE_NTP
 #  -DFEATURE_WIRELESS_CONFIG
    -DPINS_LEDSTRIP=33
diff --git a/config_peter.cmake b/config_peter.cmake
index d7fa295..86ddd65 100644
--- a/config_peter.cmake
+++ b/config_peter.cmake
@@ -61,7 +61,6 @@ set(BOBBYCAR_BUILDFLAGS
   -DFEATURE_LEDBACKLIGHT
   -DPINS_LEDBACKLIGHT=23
   -DLEDBACKLIGHT_INVERTED
-  -DFEATURE_GARAGE
 #  -DFEATURE_NTP
   -DFEATURE_WIRELESS_CONFIG
   -DPINS_LEDSTRIP=33
diff --git a/main/displays/menus/garagenmenu.cpp b/main/displays/menus/garagenmenu.cpp
index df5baae..8ffa502 100644
--- a/main/displays/menus/garagenmenu.cpp
+++ b/main/displays/menus/garagenmenu.cpp
@@ -1,4 +1,4 @@
-#if defined(FEATURE_GARAGE) && defined (FEATURE_ESPNOW)
+#ifdef FEATURE_ESPNOW
 #include "garagenmenu.h"
 
 // 3rd party libs
diff --git a/main/displays/menus/garagenmenu.h b/main/displays/menus/garagenmenu.h
index dfad599..708d236 100644
--- a/main/displays/menus/garagenmenu.h
+++ b/main/displays/menus/garagenmenu.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#if defined(FEATURE_GARAGE) && defined (FEATURE_ESPNOW)
-
+#ifdef FEATURE_ESPNOW
 // local includes
 #include "displays/bobbymenudisplay.h"
 
diff --git a/main/displays/menus/mainmenu.cpp b/main/displays/menus/mainmenu.cpp
index 917599b..546df67 100644
--- a/main/displays/menus/mainmenu.cpp
+++ b/main/displays/menus/mainmenu.cpp
@@ -21,7 +21,7 @@
 #include "displays/menus/demosmenu.h"
 #include "displays/menus/greenpassmenu.h"
 #include "displays/lockscreen.h"
-#if defined(FEATURE_GARAGE) && defined (FEATURE_ESPNOW)
+#ifdef FEATURE_ESPNOW
 #include "displays/menus/garagenmenu.h"
 #endif
 #include "displays/menus/otamenu.h"
@@ -98,8 +98,11 @@ MainMenu::MainMenu()
     if (SHOWITEM)   { 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 defined(FEATURE_GARAGE) && defined (FEATURE_ESPNOW)
-    if (SHOWITEM)   { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GARAGE>,       SwitchScreenAction<GarageMenu>>>(); }
+#ifdef FEATURE_ESPNOW
+    if (configs.feature.garage.value)
+    {
+        if (SHOWITEM)   { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GARAGE>,       SwitchScreenAction<GarageMenu>>>(); }
+    }
 #endif
 #ifdef FEATURE_OTA
     if (SHOWITEM)   { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_UPDATE>,       SwitchScreenAction<OtaMenu>, StaticMenuItemIcon<&bobbyicons::update>>>(); }
diff --git a/main/newsettings.h b/main/newsettings.h
index efb369e..c2bef0e 100644
--- a/main/newsettings.h
+++ b/main/newsettings.h
@@ -297,6 +297,7 @@ public:
     struct {
         ConfigWrapper<bool> ledstrip              {false,                                  DoReset,   {},                         "f_ledstrip"          };
         ConfigWrapper<bool> webserver_disable_lock{false,                                  DoReset,   {},                         "f_no_web_lock"       };
+        ConfigWrapper<bool> garage                {false,                                  DoReset,   {},                         "f_garage"            };
         ConfigWrapper<bool> gschissene_diode      {false,                                  DoReset,   {},                         "f_gschissDiode"      };
     } feature;
 
@@ -580,12 +581,14 @@ public:
     \
     x(feature.gschissene_diode) \
     x(feature.ledstrip) \
-    x(feature.webserver_disable_lock)
+    x(feature.webserver_disable_lock) \
+    x(feature.garage)
     //x(bleSettings.bleEnabled)
 
 #define FEATURES(x) \
     x(feature.ledstrip) \
-    x(feature.webserver_disable_lock)
+    x(feature.webserver_disable_lock) \
+    x(feature.garage)
 
     template<typename T>
     void callForEveryConfig(T &&callback)