From 144ff531a4916c3960531f75f5277d99bde70139 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Mon, 17 Jan 2022 11:34:37 +0100 Subject: [PATCH] Removed macros; added ledstrip flag --- main/newsettings.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/main/newsettings.h b/main/newsettings.h index 6514d5a..4f67385 100644 --- a/main/newsettings.h +++ b/main/newsettings.h @@ -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 webserver_disable_lock{FLAG(FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET, false),DoReset,{}, "f_no_web_lock" }; - ConfigWrapper gschissene_diode {FLAG(FEATURE_GSCHISSENE_DIODE, false), DoReset, {}, "f_gschissDiode" }; + ConfigWrapper ledstrip {false, DoReset, {}, "f_ledstrip" }; + ConfigWrapper webserver_disable_lock{false, DoReset, {}, "f_no_web_lock" }; + ConfigWrapper 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