Implement on checkbox and jsonhandler bugfix

ewowi · Feb 24, 2024 · 5df11be · 5df11be
1 parent 539e5ea
commit 5df11be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/App/AppModFixture.h b/src/App/AppModFixture.h
@@ -25,6 +25,9 @@ class AppModFixture:public SysModule {
       case f_UIFun:
         ui->setLabel(var, "On");
         return true;
+      case f_ChangeFun:
+        ui->callVarFun("bri", UINT8_MAX, f_ChangeFun); //set FastLed brightness
+        return true;
       default: return false;
     }});
     currentVar["stage"] = true;
@@ -37,7 +40,7 @@ class AppModFixture:public SysModule {
       case f_ChangeFun: {
         uint8_t bri = var["value"];
 
-        uint8_t result = linearToLogarithm(var, bri);
+        uint8_t result = mdl->getValue("on").as<bool>()?linearToLogarithm(var, bri):0;
 
         FastLED.setBrightness(result);
 

diff --git a/src/Sys/SysModWeb.cpp b/src/Sys/SysModWeb.cpp
@@ -532,12 +532,13 @@ void SysModWeb::jsonHandler(WebRequest *request, JsonVariant json) {
       USER_PRINT_Async("processJsonUrl response %s\n", resStr);
       request->send(200, "application/json", resStr);
 
-      web->sendResponseObject();
     }
     else
       // request->send(200, "text/plain", "OK");
       request->send(200, "application/json", F("{\"success\":true}"));
   }
+
+  web->sendResponseObject();
 }
 
 void SysModWeb::clientsToJson(JsonArray array, bool nameOnly, const char * filter) {