Skip to content

Commit

Permalink
unsigned post / fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ewowi committed Mar 4, 2024
1 parent 176b9e8 commit 6c8797d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/App/LedModEffects.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<Leds *>::iterator leds=fixture.ledsList.begin(); leds!=fixture.ledsList.end(); ++leds) {
stackUnsigned8 rowNr = 0;
Expand Down
6 changes: 3 additions & 3 deletions src/Sys/SysModUI.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
2 changes: 1 addition & 1 deletion src/SysModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 6c8797d

Please sign in to comment.