fixed fs persistence

Author: raomin

lib/framework/FSPersistence.h

@@ -61,6 +61,8 @@ class FSPersistence {
     // serialize the data to the file
     serializeJson(jsonDocument, settingsFile);
     settingsFile.close();
+    Serial.println("Config file written:");
+    serializeJsonPretty(jsonDocument,Serial);
     return true;
   }
 

lib/framework/StatefulService.h

@@ -76,6 +76,7 @@ class StatefulService {
     StateUpdateResult result = stateUpdater(_state);
     endTransaction();
     if (result == StateUpdateResult::CHANGED) {
+      Serial.println("State has changed, calling updatehandlers");
       callUpdateHandlers(originId);
     }
     return result;
@@ -91,10 +92,11 @@ class StatefulService {
   StateUpdateResult update(JsonObject& jsonObject, JsonStateUpdater<T> stateUpdater, const String& originId) {
     beginTransaction();
     StateUpdateResult result = stateUpdater(jsonObject, _state);
-    endTransaction();
     if (result == StateUpdateResult::CHANGED) {
+      Serial.println("State has changed, calling updatehandlers");
       callUpdateHandlers(originId);
     }
+    endTransaction();
     return result;
   }
 
@@ -117,8 +119,11 @@ class StatefulService {
     endTransaction();
   }
 
+
+
   void callUpdateHandlers(const String& originId) {
     for (const StateUpdateHandlerInfo_t& updateHandler : _updateHandlers) {
+      Serial.printf("calling handler from: %s\n",originId.c_str());
       updateHandler._cb(originId);
     }
   }

src/SensorSettingsService.cpp

@@ -1,6 +1,7 @@
 #include <SensorSettingsService.h>
 
 constexpr  const char*  SensorConfig::driverList[];
+StaticJsonDocument<1024> SensorConfig::jsonState;
 
 SensorSettingsService::SensorSettingsService(AsyncWebServer* server, FS* fs,
                                      SecurityManager* securityManager) :
@@ -22,44 +23,9 @@ SensorSettingsService::SensorSettingsService(AsyncWebServer* server, FS* fs,
 
   // configure settings service update handler to update LED state
   addUpdateHandler([&](const String& originId) { onConfigUpdated(); }, false);
-}
-
-
-void SensorConfig::read(SensorConfig& settings, JsonObject& root){
-      Serial.println("In read with root as");
-      serializeJsonPretty(root,Serial);
-      
-      File configFile = LITTLEFS.open(SENSOR_SETTINGS_FILE,"r");
-      if (configFile) {
-        DynamicJsonDocument jsonDocument = DynamicJsonDocument(4096);
-        DeserializationError error = deserializeJson(jsonDocument, configFile);
-        if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>()) {
-          root.set(jsonDocument.as<JsonObject>());
-          Serial.println("Got conf from file in read:");
-          serializeJsonPretty(jsonDocument,Serial);
-
-          configFile.close();
-          return;
-        }
-        configFile.close();
-      }
-      else{
-        Serial.println("error could not find settings file");
-      }
 
+}
 
-      root.remove("drivers");
-      JsonArray driverJList = root.createNestedArray("drivers");
-      for (const char* driver : driverList) {
-        if (driver == NULL)
-          continue;
-        StaticJsonDocument<200> doc;
-        deserializeJson(doc, driver);
-        driverJList.add(doc);
-      }
-      Serial.println("root is now:");
-      serializeJsonPretty(root,Serial);
-  }
 
 
 void SensorSettingsService::begin() {
@@ -69,5 +35,6 @@ void SensorSettingsService::begin() {
 
 void SensorSettingsService::onConfigUpdated() {
 //   digitalWrite(LED_PIN, _state.ledOn ? LED_ON : LED_OFF);
+Serial.println("Writing conf.");
 }
 

src/SensorSettingsService.h

@@ -25,6 +25,8 @@ class SensorConfig {
 
   CSensor* sensorList[5];
 
+  static StaticJsonDocument<1024> jsonState;
+
   // Add all sensors here
   static constexpr  const char*  driverList[] = {
       BMP180Sensor::description,
@@ -35,7 +37,6 @@ class SensorConfig {
       AnalogInSensor::description
   };
 
-  static void read(SensorConfig& settings, JsonObject& root);
 
   static CSensor* getSensor(JsonObject& sensorConf) {
     Serial.println("Adding sensor with conf");
@@ -66,6 +67,8 @@ class SensorConfig {
 
   // Received updated settings from file/UI and update JsonObject
   static StateUpdateResult update(JsonObject& root, SensorConfig& settings) {
+    root.remove("drivers");
+    jsonState.set(root);
     for (size_t i = 0; i < (sizeof(sensorList) / sizeof(CSensor*)); i++) {
       if (settings.sensorList[i] != NULL) {
         settings.sensorList[i]->end();
@@ -74,21 +77,44 @@ class SensorConfig {
         settings.sensorList[i] = NULL;
       }
     }
+    Serial.println("jsonstate is now:");
+    serializeJsonPretty(jsonState,Serial);
     int i = 0;
     Serial.println("Adding sensors from json conf:");
     JsonArray jsensors = root.getMember("sensors");
-    serializeJsonPretty(jsensors,Serial);
-
     if (jsensors.size() > 0) {
       for (JsonObject jsensor : jsensors) {
         settings.sensorList[i] = getSensor(jsensor);
         i++;
       }
     }
-    
+
+    Serial.println("RETURNING CHANGED");
     return StateUpdateResult::CHANGED;
 
   }
+
+
+  static void read(SensorConfig& settings, JsonObject& root){
+      Serial.println("In read with root as");
+      serializeJsonPretty(root,Serial);
+      
+      root.set(jsonState.as<JsonObject>());
+
+      JsonArray driverJList = root.createNestedArray("drivers");
+      for (const char* driver : driverList) {
+        if (driver == NULL)
+          continue;
+        StaticJsonDocument<200> doc;
+        deserializeJson(doc, driver);
+        driverJList.add(doc);
+      }
+      Serial.println("root is now:");
+      serializeJsonPretty(root,Serial);
+  }
+
+  FSPersistence<SensorConfig>* _fsPersistence;
+
 };
 
 class SensorSettingsService : public StatefulService<SensorConfig> {