set/getValue bugfix

ewowi · Jan 24, 2024 · dedb982 · dedb982
1 parent 9ef0c67
commit dedb982
Show file tree

Hide file tree

Showing 2 changed files with 212 additions and 129 deletions.
diff --git a/src/Sys/SysModModel.h b/src/Sys/SysModModel.h
@@ -109,12 +109,12 @@ class SysModModel:public SysModule {
   JsonObject setValue(const char * id, Type value, uint8_t rowNr = UINT8_MAX) {
     JsonObject var = findVar(id);
     if (!var.isNull()) {
-      setValue(var, value, rowNr);
+      return setValue(var, value, rowNr);
     }
     else {
       USER_PRINTF("setValue Var %s not found\n", id);
+      return JsonObject();
     }
-    return var;
   }
 
   template <typename Type>
@@ -174,10 +174,10 @@ class SysModModel:public SysModule {
   JsonVariant getValue(const char * id, uint8_t rowNr = UINT8_MAX) {
     JsonObject var = findVar(id);
     if (!var.isNull()) {
-      getValue(var, rowNr);
+      return getValue(var, rowNr);
     }
     else {
-      // USER_PRINTF("getValue: Var %s does not exist!!\n", id);
+      USER_PRINTF("getValue: Var %s does not exist!!\n", id);
       return JsonVariant();
     }
   }
@@ -188,6 +188,7 @@ class SysModModel:public SysModule {
         return valueArray[rowNr];
       else {
         USER_PRINTF("perror getValue no array or rownr wrong %s %d\n", var["value"].as<String>().c_str(), rowNr);
+        return JsonVariant();
       }
     }
     else