Fix config

Author: bloft

src/ConfigEntry.h

@@ -16,10 +16,14 @@ class ConfigEntry : public MqttEntry {
       return get(key).getValue();
     }
 
+    void reset() {
+      SPIFFS.remove("/config.cfg");
+    }
+
   protected:
     String getKey(MqttEntry* entry) {
       String key = entry->getTopic();
-      key.replace(getTopic(), "");
+      key.replace(getTopic() + "/", "");
       key.replace("/", ".");
       return key;
     }
@@ -45,12 +49,17 @@ class ConfigEntry : public MqttEntry {
     }
 
     void store() {
+      Serial.println("store");
       File f = SPIFFS.open("/config.cfg", "w");
       if (f) {
         each([&](MqttEntry* entry) {
-          f.println(toString(entry).c_str());
+          if(entry->getTopic() != getTopic()) {
+            f.println(toString(entry).c_str());
+          }
         });
         f.close();
+      } else {
+        Serial.println("Failed to store config");
       }
     }
 };

src/EasyMqtt.h

@@ -24,6 +24,7 @@ class EasyMqtt : public MqttEntry {
        Handle connections to mqtt
     */
     void mqttReconnect() {
+     // if(WiFi.status() != WL_CONNECTED) {
       while (!mqttClient.connected()) {
         if (mqttClient.connect(deviceId.c_str(), mqtt_username, mqtt_password)) {
           debug("Connected to MQTT");
@@ -41,12 +42,17 @@ class EasyMqtt : public MqttEntry {
 
   public:
     EasyMqtt() : MqttEntry("easyMqtt", mqttClient) {
+      Serial.begin(115200);
       deviceId = String(ESP.getChipId());
 
+      debug("test");
       config = new ConfigEntry(mqttClient, *this);
       addChild(config);
 
       get("system").setInterval(30);
+      get("system")["deviceId"] << [this]() {
+        return deviceId;
+      };
       get("system")["mem"]["heap"] << []() {
         return String(ESP.getFreeHeap());
       };
@@ -59,6 +65,11 @@ class EasyMqtt : public MqttEntry {
           ESP.restart();
         }
       };
+      get("system")["config"]["reset"] >> [this](String value) {
+        if(value == "reset") {
+          getConfig()->reset();
+        }
+      };
     }
 
     ConfigEntry* getConfig() {

src/MqttEntry.h

@@ -7,8 +7,9 @@
 
 class MqttEntry {
   private:
-    std::function<void(String payload)> outFunction = NULL;
+    std::function<void(String)> outFunction = NULL;
     std::function<String()> inFunction = NULL;
+    std::function<void(MqttEntry*, String)> publishFunction = NULL;
 
     char* name = "N/A";
     int force = 0;

src/WebPortal.h

@@ -81,7 +81,7 @@ class WebPortal {
       }
     });
     page += FPSTR(HTML_FOOTER2);
-    //page.replace("{device_id}", mqtt->getDeviceId());
+    page.replace("{device_id}", mqtt->get("system/deviceId").getValue());
     page.replace("{topic}", mqtt->getTopic());
     webServer->send(200, "text/html", page);
   }