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

Removed macros; added ledstrip flag

Browse Source
This commit is contained in:
CommanderRedYT
2022-01-17 11:34:37 +01:00
parent bf42fe05f4
commit 144ff531a4
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
main/newsettings.h
View File

@ -28,11 +28,11 @@
#include "handbremse.h"
#include "bobbyquickactions.h"
#define STRINGIZE(x) (#x)
#define IS_MACRO_DEFINED_OR_ONE(y) (!*STRINGIZE(y) || '1'==*STRINGIZE(y))
//#define STRINGIZE(x) (#x)
//#define IS_MACRO_DEFINED_OR_ONE(y) (!*STRINGIZE(y) || '1'==*STRINGIZE(y))
#define FLAG(name, _default) \
IS_MACRO_DEFINED_OR_ONE(name) ? name : _default
//#define FLAG(name, _default) \
// IS_MACRO_DEFINED_OR_ONE(name) ? name : _default
using namespace espconfig;
@ -301,8 +301,9 @@ public:
} espnow;
struct {
ConfigWrapper<bool> webserver_disable_lock{FLAG(FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET, false),DoReset,{}, "f_no_web_lock" };
ConfigWrapper<bool> gschissene_diode {FLAG(FEATURE_GSCHISSENE_DIODE, false), DoReset, {}, "f_gschissDiode" };
ConfigWrapper<bool> ledstrip {false, DoReset, {}, "f_ledstrip" };
ConfigWrapper<bool> webserver_disable_lock{false, DoReset, {}, "f_no_web_lock" };
ConfigWrapper<bool> gschissene_diode {false, DoReset, {}, "f_gschissDiode" };
} feature;
struct {
@ -584,10 +585,12 @@ public:
x(espnow.syncBlink) \
\
x(feature.gschissene_diode) \
x(feature.webserver_disable_lock) \
x(feature.ledstrip) \
x(feature.webserver_disable_lock)
//x(bleSettings.bleEnabled)
#define FEATURES(x) \
x(feature.ledstrip) \
x(feature.webserver_disable_lock)
template<typename T>