Add config support

Author: bloft

src/ConfigEntry.h

@@ -0,0 +1,58 @@
+#ifndef ConfigEntry_h
+#define ConfigEntry_h
+
+#include "FS.h" // for SPIFFS
+#include "MqttEntry.h"
+
+class ConfigEntry : public MqttEntry {
+  public:
+    ConfigEntry(PubSubClient& mqttClient, MqttEntry& parent) : MqttEntry("config", mqttClient, parent) {
+      SPIFFS.begin();
+      load();
+    }
+
+    String getString(String key, String defaultValue) {
+      key.replace(".", "/");
+      return get(key).getValue();
+    }
+
+  protected:
+    String getKey(MqttEntry* entry) {
+      String key = entry->getTopic();
+      key.replace(getTopic(), "");
+      key.replace("/", ".");
+      return key;
+    }
+
+    String toString(MqttEntry* entry) {
+      return getKey(entry) + "=" + entry->getValue();
+    }
+    
+  private:
+    void load() {
+      File f = SPIFFS.open("/config.cfg", "r");
+      if (f) {
+        while(f.available()) {
+          String line = f.readStringUntil('\n');
+          int pos = line.indexOf("=");
+          String key = line.substring(0, pos);
+          String value = line.substring(pos+1);
+          key.replace(".", "/");
+          get(key).setValue(value);
+        }
+        f.close();
+      }
+    }
+
+    void store() {
+      File f = SPIFFS.open("/config.cfg", "w");
+      if (f) {
+        each([&](MqttEntry* entry) {
+          f.println(toString(entry).c_str());
+        });
+        f.close();
+      }
+    }
+};
+
+#endif

src/EasyMqtt.h

@@ -5,13 +5,16 @@
 #include <PubSubClient.h>
 #include "MqttEntry.h"
 #include "WebPortal.h"
+#include "ConfigEntry.h"
 
 class EasyMqtt : public MqttEntry {
   private:
     WiFiClient wifiClient;
     PubSubClient mqttClient;
     WebPortal webPortal;
 
+    ConfigEntry* config;
+
     String deviceId = "deviceId";
     const char* mqtt_username = "N/A";
     const char* mqtt_password = "N/A";
@@ -40,6 +43,9 @@ class EasyMqtt : public MqttEntry {
     EasyMqtt() : MqttEntry("easyMqtt", mqttClient) {
       deviceId = String(ESP.getChipId());
 
+      config = new ConfigEntry(mqttClient, *this);
+      addChild(config);
+
       get("system").setInterval(30);
       get("system")["mem"]["heap"] << []() {
         return String(ESP.getFreeHeap());
@@ -55,6 +61,10 @@ class EasyMqtt : public MqttEntry {
       };
     }
 
+    ConfigEntry* getConfig() {
+      return config;
+    }
+
     void debug(String msg) {
       #ifdef DEBUG
       Serial.println(msg);

src/MqttConfigEntry.h

@@ -11,8 +11,9 @@ class MqttEntry {
     std::function<String()> inFunction = NULL;
 
     char* name = "N/A";
-    int interval = -1;
     int force = 0;
+    int interval = -1;
+    int forceUpdate = -1;
     unsigned long lastUpdate = 0; // Last read of data
     String lastValue = "";
 
@@ -29,17 +30,29 @@ class MqttEntry {
 
   protected:
     MqttEntry(const char* name, PubSubClient& mqttClient, MqttEntry& parent) {
-      MqttEntry::parent = &parent;
+      setParent(parent);
       client = &mqttClient;
-      interval = -1;
       setName(name);
     }
 
     MqttEntry(const char* name, PubSubClient& mqttClient) {
-      client = &mqttClient;
       interval = 5;
+      forceUpdate = 10;
+      client = &mqttClient;
       setName(name);
     }
+
+    void setParent(MqttEntry& parent) {
+      MqttEntry::parent = &parent;
+    }
+
+    MqttEntry* addChild(MqttEntry* child) {
+      child->setParent(*this);
+      MqttEntry * oldChild = children;
+      children = child;
+      children->next = oldChild;
+      return child;
+    }
 
   public:
     void callback(const char* topic, uint8_t* payload, unsigned int length) {
@@ -61,15 +74,13 @@ class MqttEntry {
       if (isIn()) {
         unsigned long time = millis();
         if (time >= (lastUpdate + (getInterval() * 1000))) {
+          force++;
           lastUpdate = time;
           String value = inFunction();
           if (value != "") {
-            if(value != lastValue || force >= 10) {
-              publish(value);
-              lastValue = value;
+            if (value != lastValue || force > getForce()) {
+              setValue(value);
               force = 0;
-            } else {
-              force++;
             }
           }
         }
@@ -113,13 +124,29 @@ class MqttEntry {
       MqttEntry::interval = interval;
     }
 
+    int getForce() {
+      if(forceUpdate < 0) {
+        return parent->getForce();
+      }
+      return forceUpdate;
+    }
+
+    void setForce(int force) {
+      forceUpdate = force;
+    }
+
     /**
      * Get last value
      */
     String getValue() {
       return lastValue;
     }
 
+    void setValue(String value) {
+      lastValue = value;
+      publish(value);
+    }
+
     /**
      * 
      */
@@ -169,10 +196,7 @@ class MqttEntry {
         }
         child = child->next;
       }
-      MqttEntry * oldChild = children;
-      children = new MqttEntry(name, *client, *this);
-      children->next = oldChild;
-      return *children;
+      return *addChild(new MqttEntry(name, *client, *this));
     }
 
     /**