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

Moved FEATURE_ESPNOW into config-system

Browse Source
This commit is contained in:
CommanderRedYT
2022-02-13 02:12:29 +01:00
parent fb0bed29bf
commit d29514a167
22 changed files with 13 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config_allfeatures.cmake
View File

@ -43,7 +43,6 @@ set(BOBBYCAR_BUILDFLAGS
# -DFEATURE_GAMETRAK # -DFEATURE_GAMETRAK
-DFEATURE_POWERSUPPLY -DFEATURE_POWERSUPPLY
-DFEATURE_LEDBACKLIGHT -DFEATURE_LEDBACKLIGHT
-DFEATURE_ESPNOW
-DLEDBACKLIGHT_INVERTED -DLEDBACKLIGHT_INVERTED
-DLEDSTRIP_WRONG_DIRECTION -DLEDSTRIP_WRONG_DIRECTION

1
config_comred.cmake
View File

@ -43,7 +43,6 @@ set(BOBBYCAR_BUILDFLAGS
# -DFEATURE_GAMETRAK # -DFEATURE_GAMETRAK
# -DFEATURE_POWERSUPPLY # -DFEATURE_POWERSUPPLY
-DFEATURE_LEDBACKLIGHT -DFEATURE_LEDBACKLIGHT
-DFEATURE_ESPNOW
-DLEDBACKLIGHT_INVERTED -DLEDBACKLIGHT_INVERTED
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION

1
config_feedc0de.cmake
View File

@ -43,7 +43,6 @@ set(BOBBYCAR_BUILDFLAGS
# -DFEATURE_GAMETRAK # -DFEATURE_GAMETRAK
-DFEATURE_POWERSUPPLY -DFEATURE_POWERSUPPLY
-DFEATURE_LEDBACKLIGHT -DFEATURE_LEDBACKLIGHT
# -DFEATURE_ESPNOW
-DLEDBACKLIGHT_INVERTED -DLEDBACKLIGHT_INVERTED
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION

1
config_greyhash.cmake
View File

@ -43,7 +43,6 @@ set(BOBBYCAR_BUILDFLAGS
# -DFEATURE_GAMETRAK # -DFEATURE_GAMETRAK
# -DFEATURE_POWERSUPPLY # -DFEATURE_POWERSUPPLY
-DFEATURE_LEDBACKLIGHT -DFEATURE_LEDBACKLIGHT
-DFEATURE_ESPNOW
-DLEDBACKLIGHT_INVERTED -DLEDBACKLIGHT_INVERTED
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION

1
config_mick.cmake
View File

@ -43,7 +43,6 @@ set(BOBBYCAR_BUILDFLAGS
# -DFEATURE_GAMETRAK # -DFEATURE_GAMETRAK
-DFEATURE_POWERSUPPLY -DFEATURE_POWERSUPPLY
-DFEATURE_LEDBACKLIGHT -DFEATURE_LEDBACKLIGHT
-DFEATURE_ESPNOW
-DLEDBACKLIGHT_INVERTED -DLEDBACKLIGHT_INVERTED
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION

1
config_nofeatures.cmake
View File

@ -43,7 +43,6 @@ set(BOBBYCAR_BUILDFLAGS
# -DFEATURE_GAMETRAK # -DFEATURE_GAMETRAK
# -DFEATURE_POWERSUPPLY # -DFEATURE_POWERSUPPLY
# -DFEATURE_LEDBACKLIGHT # -DFEATURE_LEDBACKLIGHT
# -DFEATURE_ESPNOW
# -DLEDBACKLIGHT_INVERTED # -DLEDBACKLIGHT_INVERTED
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION

1
config_peter.cmake
View File

@ -43,7 +43,6 @@ set(BOBBYCAR_BUILDFLAGS
# -DFEATURE_GAMETRAK # -DFEATURE_GAMETRAK
-DFEATURE_POWERSUPPLY -DFEATURE_POWERSUPPLY
-DFEATURE_LEDBACKLIGHT -DFEATURE_LEDBACKLIGHT
-DFEATURE_ESPNOW
-DLEDBACKLIGHT_INVERTED -DLEDBACKLIGHT_INVERTED
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION

1
config_seatbot.cmake
View File

@ -43,7 +43,6 @@ set(BOBBYCAR_BUILDFLAGS
# -DFEATURE_GAMETRAK # -DFEATURE_GAMETRAK
# -DFEATURE_POWERSUPPLY # -DFEATURE_POWERSUPPLY
-DFEATURE_LEDBACKLIGHT -DFEATURE_LEDBACKLIGHT
-DFEATURE_ESPNOW
-DLEDBACKLIGHT_INVERTED -DLEDBACKLIGHT_INVERTED
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION

2
main/accessors/settingsaccessors.h
View File

@ -212,11 +212,9 @@ struct HandbremsAutomaticAccessor : public NewSettingsAccessor<bool> { ConfigWra
struct HandbremsVisualizeAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.handbremse.visualize; } }; struct HandbremsVisualizeAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.handbremse.visualize; } };
// ESP Now // ESP Now
#ifdef FEATURE_ESPNOW
struct ESPNowSyncTimeEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.espnow.syncTime; } }; struct ESPNowSyncTimeEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.espnow.syncTime; } };
struct ESPNowSyncTimeWithOthersEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.espnow.syncTimeWithOthers; } }; struct ESPNowSyncTimeWithOthersEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.espnow.syncTimeWithOthers; } };
struct ESPNowSyncBlinkEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.espnow.syncBlink; } }; struct ESPNowSyncBlinkEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.espnow.syncBlink; } };
#endif
// Button Mapping accessors // Button Mapping accessors
struct ButtonLeftAccessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingLeft; } }; struct ButtonLeftAccessor : public NewSettingsAccessor<uint8_t> { ConfigWrapper<uint8_t> &getConfig() const override { return configs.dpadMappingLeft; } };

13
main/bobbyquickactions.cpp
View File

@ -1,9 +1,7 @@
#include "bobbyquickactions.h" #include "bobbyquickactions.h"
// local includes // local includes
#ifdef FEATURE_ESPNOW
#include "espnowfunctions.h" #include "espnowfunctions.h"
#endif
#include "newsettings.h" #include "newsettings.h"
#include "wifi_bobbycar.h" #include "wifi_bobbycar.h"
@ -30,10 +28,7 @@ void handle_bobby_quickaction(espgui::Button button)
return; return;
} }
if (config) switch (config->value) {
{
switch(config->value)
{
case BobbyQuickActions::BLINK_LEFT: case BobbyQuickActions::BLINK_LEFT:
blink_left(); blink_left();
break; break;
@ -51,13 +46,14 @@ void handle_bobby_quickaction(espgui::Button button)
break; break;
default: default:
return; return;
}
} }
} }
void open_garage() void open_garage()
{ {
#ifdef FEATURE_ESPNOW if (!configs.feature.esp_now.value)
return;
if (!espnow::espnow_init_allowed()) if (!espnow::espnow_init_allowed())
return; return;
for (const auto &config : configs.wireless_door_configs) for (const auto &config : configs.wireless_door_configs)
@ -68,7 +64,6 @@ void open_garage()
continue; continue;
} }
} }
#endif
} }
void action_wifi_scan() void action_wifi_scan()

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

@ -1,6 +1,5 @@
#include "espnowmenu.h" #include "espnowmenu.h"
#ifdef FEATURE_ESPNOW
// 3rdparty lib includes // 3rdparty lib includes
#include "actions/dummyaction.h" #include "actions/dummyaction.h"
#include "actions/switchscreenaction.h" #include "actions/switchscreenaction.h"
@ -75,4 +74,3 @@ void EspNowMenu::back()
{ {
espgui::switchScreen<SettingsMenu>(); espgui::switchScreen<SettingsMenu>();
} }
#endif

4
main/displays/menus/espnowmenu.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#ifdef FEATURE_ESPNOW
// local includes // local includes
#include "displays/bobbymenudisplay.h" #include "displays/bobbymenudisplay.h"
@ -14,5 +12,3 @@ public:
void back() override; void back() override;
}; };
#endif

3
main/displays/menus/espnowsettingsmenu.cpp
View File

@ -1,7 +1,5 @@
#include "espnowsettingsmenu.h" #include "espnowsettingsmenu.h"
#ifdef FEATURE_ESPNOW
// 3rdparty lib includes // 3rdparty lib includes
#include "actions/dummyaction.h" #include "actions/dummyaction.h"
#include "actions/switchscreenaction.h" #include "actions/switchscreenaction.h"
@ -46,4 +44,3 @@ void EspNowSettingsMenu::back()
{ {
espgui::switchScreen<EspNowMenu>(); espgui::switchScreen<EspNowMenu>();
} }
#endif

4
main/displays/menus/espnowsettingsmenu.h
View File

@ -1,7 +1,5 @@
#pragma once #pragma once
#ifdef FEATURE_ESPNOW
// local includes // local includes
#include "displays/bobbymenudisplay.h" #include "displays/bobbymenudisplay.h"
@ -14,5 +12,3 @@ public:
void back() override; void back() override;
}; };
#endif

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

@ -1,4 +1,3 @@
#ifdef FEATURE_ESPNOW
#include "garagenmenu.h" #include "garagenmenu.h"
// 3rd party libs // 3rd party libs
@ -66,4 +65,3 @@ void SendEspNowMessageAction::triggered()
} }
} }
} // namespace } // namespace
#endif

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

@ -1,6 +1,5 @@
#pragma once #pragma once
#ifdef FEATURE_ESPNOW
// local includes // local includes
#include "displays/bobbymenudisplay.h" #include "displays/bobbymenudisplay.h"
@ -13,4 +12,3 @@ public:
void back() override; void back() override;
}; };
#endif

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

@ -21,9 +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"
#ifdef FEATURE_ESPNOW
#include "displays/menus/garagenmenu.h" #include "displays/menus/garagenmenu.h"
#endif
#include "displays/menus/otamenu.h" #include "displays/menus/otamenu.h"
#include "displays/poweroffdisplay.h" #include "displays/poweroffdisplay.h"
#include "displays/menus/statisticsmenu.h" #include "displays/menus/statisticsmenu.h"
@ -96,12 +94,10 @@ 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>>>();
#ifdef FEATURE_ESPNOW if (configs.feature.garage.value && configs.feature.esp_now.value)
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
if (configs.feature.ota.value) if (configs.feature.ota.value)
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>>>(); }
if (SHOWITEM) { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GRAPHS>, SwitchScreenAction<GraphsMenu>, StaticMenuItemIcon<&bobbyicons::graph>>>(); } if (SHOWITEM) { constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_GRAPHS>, SwitchScreenAction<GraphsMenu>, StaticMenuItemIcon<&bobbyicons::graph>>>(); }

13
main/displays/menus/settingsmenu.cpp
View File

@ -84,20 +84,19 @@ SettingsMenu::SettingsMenu()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_LIMITSSETTINGS>, SwitchScreenAction<LimitsSettingsMenu>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_LIMITSSETTINGS>, SwitchScreenAction<LimitsSettingsMenu>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_NETWORKSETTINGS>, SwitchScreenAction<NetworkSettingsMenu>, StaticMenuItemIcon<&bobbyicons::wifi>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_NETWORKSETTINGS>, SwitchScreenAction<NetworkSettingsMenu>, StaticMenuItemIcon<&bobbyicons::wifi>>>();
#ifdef FEATURE_ESPNOW if (configs.feature.esp_now.value)
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ESPNOW>, SwitchScreenAction<EspNowMenu>, StaticMenuItemIcon<&bobbyicons::wifi>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ESPNOW>, SwitchScreenAction<EspNowMenu>, StaticMenuItemIcon<&bobbyicons::wifi>>>();
#endif
#ifdef FEATURE_BLUETOOTH #ifdef FEATURE_BLUETOOTH
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BLUETOOTHSETTINGS>, SwitchScreenAction<BluetoothSettingsMenu>, StaticMenuItemIcon<&bobbyicons::bluetooth>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BLUETOOTHSETTINGS>, SwitchScreenAction<BluetoothSettingsMenu>, StaticMenuItemIcon<&bobbyicons::bluetooth>>>();
#endif #endif
if (configs.feature.ble.value) if (configs.feature.ble.value)
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BLESETTINGS>, SwitchScreenAction<BleSettingsMenu>, StaticMenuItemIcon<&bobbyicons::bluetooth>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BLESETTINGS>, SwitchScreenAction<BleSettingsMenu>, StaticMenuItemIcon<&bobbyicons::bluetooth>>>();
if (configs.feature.cloud.value) if (configs.feature.cloud.value)
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CLOUDSETTINGS>, SwitchScreenAction<CloudSettingsMenu>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CLOUDSETTINGS>, SwitchScreenAction<CloudSettingsMenu>>>();
if (configs.feature.udpcloud.value) if (configs.feature.udpcloud.value)
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_UDPCLOUDSETTINGS>, SwitchScreenAction<UdpCloudSettingsMenu>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_UDPCLOUDSETTINGS>, SwitchScreenAction<UdpCloudSettingsMenu>>>();
if (configs.feature.ota.value) if (configs.feature.ota.value)
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_SELECTBUILDSERVERMENU>, SwitchScreenAction<SelectBuildServerMenu>, StaticMenuItemIcon<&bobbyicons::update>>>(); 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_TIME>, SwitchScreenAction<TimeSettingsMenu>, StaticMenuItemIcon<&bobbyicons::time>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MODESSETTINGS>, SwitchScreenAction<ModesSettingsMenu>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_MODESSETTINGS>, SwitchScreenAction<ModesSettingsMenu>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CONTROLLERHARDWARESETTINGS>, SwitchScreenAction<ControllerHardwareSettingsMenu>, StaticMenuItemIcon<&bobbyicons::hardware>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_CONTROLLERHARDWARESETTINGS>, SwitchScreenAction<ControllerHardwareSettingsMenu>, StaticMenuItemIcon<&bobbyicons::hardware>>>();

2
main/espnowfunctions.cpp
View File

@ -1,4 +1,3 @@
#ifdef FEATURE_ESPNOW
#include "espnowfunctions.h" #include "espnowfunctions.h"
#include <espchrono.h> #include <espchrono.h>
@ -309,4 +308,3 @@ esp_err_t send_espnow_message(std::string_view message)
} }
} // namespace espnow } // namespace espnow
#endif

3
main/espnowfunctions.h
View File

@ -1,5 +1,4 @@
#pragma once #pragma once
#ifdef FEATURE_ESPNOW
#include <cstdint> #include <cstdint>
#include <deque> #include <deque>
#include <string> #include <string>
@ -29,4 +28,4 @@ void handle();
void onRecvTs(uint64_t millis, bool isFromBobbycar = false); void onRecvTs(uint64_t millis, bool isFromBobbycar = false);
esp_err_t send_espnow_message(std::string_view message); esp_err_t send_espnow_message(std::string_view message);
} // namespace espnow } // namespace espnow
#endif

1
main/newsettings.h
View File

@ -332,6 +332,7 @@ public:
ConfigWrapper<bool> ota {false, DoReset, {}, "f_ota" }; ConfigWrapper<bool> ota {false, DoReset, {}, "f_ota" };
ConfigWrapper<bool> webserver {true, DoReset, {}, "featureWebserv" }; ConfigWrapper<bool> webserver {true, DoReset, {}, "featureWebserv" };
ConfigWrapper<bool> gschissene_diode {false, DoReset, {}, "featurDiodeHin" }; ConfigWrapper<bool> gschissene_diode {false, DoReset, {}, "featurDiodeHin" };
ConfigWrapper<bool> esp_now {false, DoReset, {}, "featureEspNow" };
} feature; } feature;
struct { struct {

4
main/taskmanager.cpp
View File

@ -49,9 +49,7 @@
#include "ble_bobby.h" #include "ble_bobby.h"
#include "webserver.h" #include "webserver.h"
#include "ledstrip.h" #include "ledstrip.h"
#ifdef FEATURE_ESPNOW
#include "espnowfunctions.h" #include "espnowfunctions.h"
#endif
#include "cloud.h" #include "cloud.h"
#include "udpcloud.h" #include "udpcloud.h"
#include "modes.h" #include "modes.h"
@ -108,9 +106,7 @@ BobbySchedulerTask schedulerTasksArr[] {
BobbySchedulerTask { "ble", initBle, handleBle, 100ms }, BobbySchedulerTask { "ble", initBle, handleBle, 100ms },
BobbySchedulerTask { "webserver", initWebserver, handleWebserver, 100ms }, BobbySchedulerTask { "webserver", initWebserver, handleWebserver, 100ms },
BobbySchedulerTask { "ledstrip", initLedStrip, updateLedStrip, 30ms }, BobbySchedulerTask { "ledstrip", initLedStrip, updateLedStrip, 30ms },
#ifdef FEATURE_ESPNOW
BobbySchedulerTask { "espnow", espnow::initESPNow, espnow::handle, 100ms }, BobbySchedulerTask { "espnow", espnow::initESPNow, espnow::handle, 100ms },
#endif
BobbySchedulerTask { "cloud", initCloud, updateCloud, 50ms }, BobbySchedulerTask { "cloud", initCloud, updateCloud, 50ms },
BobbySchedulerTask { "udpcloud", udpCloudInit, udpCloudUpdate, 50ms }, BobbySchedulerTask { "udpcloud", udpCloudInit, udpCloudUpdate, 50ms },
BobbySchedulerTask { "drivingmode", initDrivingMode, updateDrivingMode, 20ms }, BobbySchedulerTask { "drivingmode", initDrivingMode, updateDrivingMode, 20ms },