From 6c8797d0547a155b4018c2a7da5729a91f29642a Mon Sep 17 00:00:00 2001 From: Ewoud Date: Mon, 4 Mar 2024 23:19:42 +0100 Subject: [PATCH] unsigned post / fix --- src/App/LedModEffects.h | 2 +- src/Sys/SysModUI.h | 6 +++--- src/SysModule.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/App/LedModEffects.h b/src/App/LedModEffects.h index a779c5f0..b03af82b 100644 --- a/src/App/LedModEffects.h +++ b/src/App/LedModEffects.h @@ -248,7 +248,7 @@ class LedModEffects:public SysModule { default: return false; }}); - ui->initText(tableVar, "fxSize", nullptr, 32, true, [this](JsonObject var, stackUnsigned8 rowNr, stackUnsigned8 funType) { switch (funType) { //varFun + ui->initText(tableVar, "fxSize", nullptr, 32, true, [this](JsonObject var, unsigned8 rowNr, unsigned8 funType) { switch (funType) { //varFun case f_ValueFun: { // for (std::vector::iterator leds=fixture.ledsList.begin(); leds!=fixture.ledsList.end(); ++leds) { stackUnsigned8 rowNr = 0; diff --git a/src/Sys/SysModUI.h b/src/Sys/SysModUI.h index 9b6ff484..91ce5081 100644 --- a/src/Sys/SysModUI.h +++ b/src/Sys/SysModUI.h @@ -216,13 +216,13 @@ class SysModUI:public SysModule { JsonObject initVar(JsonObject parent, const char * id, const char * type, bool readOnly = true, VarFun varFun = nullptr); - unsigned8 callVarFun(const char * varID, unsigned8 rowNr = UINT8_MAX, unsigned8 funType = f_ChangeFun) { + bool callVarFun(const char * varID, unsigned8 rowNr = UINT8_MAX, unsigned8 funType = f_ChangeFun) { JsonObject var = mdl->findVar(varID); return callVarFun(var, rowNr, funType); } - unsigned8 callVarFun(JsonObject var, unsigned8 rowNr = UINT8_MAX, unsigned8 funType = f_ValueFun) { - stackUnsigned8 result = false; + bool callVarFun(JsonObject var, unsigned8 rowNr = UINT8_MAX, unsigned8 funType = f_ValueFun) { + bool result = false; if (!var["fun"].isNull()) {//isNull needed here! size_t funNr = var["fun"]; diff --git a/src/SysModule.h b/src/SysModule.h index 92e818b4..bb44a865 100644 --- a/src/SysModule.h +++ b/src/SysModule.h @@ -22,7 +22,7 @@ #define unsigned32 unsigned #define forUnsigned8 unsigned #define forUnsigned16 unsigned -#define stackUnsigned8 unsigned +#define stackUnsigned8 uint8_t //unsigned causes some effects to run faulty. tbd to find out #define stackUnsigned16 unsigned #define stackUnsigned32 unsigned