feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved FEATURE_GARAGE into config-system

Browse Source
This commit is contained in:
CommanderRedYT
2022-01-17 15:41:47 +01:00
parent fa4aeac27d
commit c44e683941
10 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config_allfeatures.cmake
View File

@@ -70,7 +70,6 @@ set(BOBBYCAR_BUILDFLAGS
-DFEATURE_LEDBACKLIGHT -DFEATURE_LEDBACKLIGHT
-DPINS_LEDBACKLIGHT=23 -DPINS_LEDBACKLIGHT=23
-DLEDBACKLIGHT_INVERTED -DLEDBACKLIGHT_INVERTED
-DFEATURE_GARAGE
-DFEATURE_NTP -DFEATURE_NTP
-DFEATURE_WIRELESS_CONFIG -DFEATURE_WIRELESS_CONFIG
-DPINS_LEDSTRIP=33 -DPINS_LEDSTRIP=33

1
config_comred.cmake
View File

@@ -63,7 +63,6 @@ set(BOBBYCAR_BUILDFLAGS
-DFEATURE_LEDBACKLIGHT -DFEATURE_LEDBACKLIGHT
-DPINS_LEDBACKLIGHT=23 -DPINS_LEDBACKLIGHT=23
-DLEDBACKLIGHT_INVERTED -DLEDBACKLIGHT_INVERTED
-DFEATURE_GARAGE
# -DFEATURE_NTP # -DFEATURE_NTP
-DFEATURE_WIRELESS_CONFIG -DFEATURE_WIRELESS_CONFIG
-DPINS_LEDSTRIP=33 -DPINS_LEDSTRIP=33

1
config_feedc0de.cmake
View File

@@ -61,7 +61,6 @@ set(BOBBYCAR_BUILDFLAGS
-DFEATURE_LEDBACKLIGHT -DFEATURE_LEDBACKLIGHT
-DPINS_LEDBACKLIGHT=23 -DPINS_LEDBACKLIGHT=23
-DLEDBACKLIGHT_INVERTED -DLEDBACKLIGHT_INVERTED
# -DFEATURE_GARAGE
-DFEATURE_NTP -DFEATURE_NTP
-DFEATURE_WIRELESS_CONFIG -DFEATURE_WIRELESS_CONFIG
-DPINS_LEDSTRIP=26 -DPINS_LEDSTRIP=26

1
config_mick.cmake
View File

@@ -61,7 +61,6 @@ set(BOBBYCAR_BUILDFLAGS
-DFEATURE_LEDBACKLIGHT -DFEATURE_LEDBACKLIGHT
-DPINS_LEDBACKLIGHT=23 -DPINS_LEDBACKLIGHT=23
-DLEDBACKLIGHT_INVERTED -DLEDBACKLIGHT_INVERTED
# -DFEATURE_GARAGE
# -DFEATURE_NTP # -DFEATURE_NTP
-DFEATURE_WIRELESS_CONFIG -DFEATURE_WIRELESS_CONFIG
-DPINS_LEDSTRIP=33 -DPINS_LEDSTRIP=33

1
config_nofeatures.cmake
View File

@@ -70,7 +70,6 @@ set(BOBBYCAR_BUILDFLAGS
# -DFEATURE_LEDBACKLIGHT # -DFEATURE_LEDBACKLIGHT
# -DPINS_LEDBACKLIGHT=23 # -DPINS_LEDBACKLIGHT=23
# -DLEDBACKLIGHT_INVERTED # -DLEDBACKLIGHT_INVERTED
# -DFEATURE_GARAGE
# -DFEATURE_NTP # -DFEATURE_NTP
# -DFEATURE_WIRELESS_CONFIG # -DFEATURE_WIRELESS_CONFIG
-DPINS_LEDSTRIP=33 -DPINS_LEDSTRIP=33

1
config_peter.cmake
View File

@@ -61,7 +61,6 @@ set(BOBBYCAR_BUILDFLAGS
-DFEATURE_LEDBACKLIGHT -DFEATURE_LEDBACKLIGHT
-DPINS_LEDBACKLIGHT=23 -DPINS_LEDBACKLIGHT=23
-DLEDBACKLIGHT_INVERTED -DLEDBACKLIGHT_INVERTED
-DFEATURE_GARAGE
# -DFEATURE_NTP # -DFEATURE_NTP
-DFEATURE_WIRELESS_CONFIG -DFEATURE_WIRELESS_CONFIG
-DPINS_LEDSTRIP=33 -DPINS_LEDSTRIP=33

2
main/displays/menus/garagenmenu.cpp
View File

@@ -1,4 +1,4 @@
#if defined(FEATURE_GARAGE) && defined (FEATURE_ESPNOW) #ifdef FEATURE_ESPNOW
#include "garagenmenu.h" #include "garagenmenu.h"
// 3rd party libs // 3rd party libs

3
main/displays/menus/garagenmenu.h
View File

@@ -1,7 +1,6 @@
#pragma once #pragma once
#if defined(FEATURE_GARAGE) && defined (FEATURE_ESPNOW) #ifdef FEATURE_ESPNOW
// local includes // local includes
#include "displays/bobbymenudisplay.h" #include "displays/bobbymenudisplay.h"

7
main/displays/menus/mainmenu.cpp
View File

@@ -21,7 +21,7 @@
#include "displays/menus/demosmenu.h" #include "displays/menus/demosmenu.h"
#include "displays/menus/greenpassmenu.h" #include "displays/menus/greenpassmenu.h"
#include "displays/lockscreen.h" #include "displays/lockscreen.h"
#if defined(FEATURE_GARAGE) && defined (FEATURE_ESPNOW) #ifdef FEATURE_ESPNOW
#include "displays/menus/garagenmenu.h" #include "displays/menus/garagenmenu.h"
#endif #endif
#include "displays/menus/otamenu.h" #include "displays/menus/otamenu.h"
@@ -98,8 +98,11 @@ MainMenu::MainMenu()
if (SHOWITEM) { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SETTINGS>, SwitchScreenAction<SettingsMenu>, StaticMenuItemIcon<&bobbyicons::settings>>>(); } 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_GREENPASS>, SwitchScreenAction<GreenPassMenu>, StaticMenuItemIcon<&bobbyicons::greenpass>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_LOCKVEHICLE>, SwitchScreenAction<Lockscreen>, StaticMenuItemIcon<&bobbyicons::lock>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_LOCKVEHICLE>, SwitchScreenAction<Lockscreen>, StaticMenuItemIcon<&bobbyicons::lock>>>();
#if defined(FEATURE_GARAGE) && defined (FEATURE_ESPNOW) #ifdef FEATURE_ESPNOW
if (configs.feature.garage.value)
{
if (SHOWITEM) { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GARAGE>, SwitchScreenAction<GarageMenu>>>(); } if (SHOWITEM) { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GARAGE>, SwitchScreenAction<GarageMenu>>>(); }
}
#endif #endif
#ifdef FEATURE_OTA #ifdef FEATURE_OTA
if (SHOWITEM) { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_UPDATE>, SwitchScreenAction<OtaMenu>, StaticMenuItemIcon<&bobbyicons::update>>>(); } if (SHOWITEM) { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_UPDATE>, SwitchScreenAction<OtaMenu>, StaticMenuItemIcon<&bobbyicons::update>>>(); }

7
main/newsettings.h
View File

@@ -297,6 +297,7 @@ public:
struct { struct {
ConfigWrapper<bool> ledstrip {false, DoReset, {}, "f_ledstrip" }; ConfigWrapper<bool> ledstrip {false, DoReset, {}, "f_ledstrip" };
ConfigWrapper<bool> webserver_disable_lock{false, DoReset, {}, "f_no_web_lock" }; 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" }; ConfigWrapper<bool> gschissene_diode {false, DoReset, {}, "f_gschissDiode" };
} feature; } feature;
@@ -580,12 +581,14 @@ public:
\ \
x(feature.gschissene_diode) \ x(feature.gschissene_diode) \
x(feature.ledstrip) \ x(feature.ledstrip) \
x(feature.webserver_disable_lock) x(feature.webserver_disable_lock) \
x(feature.garage)
//x(bleSettings.bleEnabled) //x(bleSettings.bleEnabled)
#define FEATURES(x) \ #define FEATURES(x) \
x(feature.ledstrip) \ x(feature.ledstrip) \
x(feature.webserver_disable_lock) x(feature.webserver_disable_lock) \
x(feature.garage)
template<typename T> template<typename T>
void callForEveryConfig(T &&callback) void callForEveryConfig(T &&callback)