Make everything avalible from the rest interface, and add support for persisting values

Author: Bjarne Loft

src/EasyMqtt.cpp

@@ -119,19 +119,19 @@ EasyMqtt::EasyMqtt() : Entry("easyMqtt") {
     return deviceId;
   };
   get("$system")["mem"]["heap"] << []() {
-    return String(ESP.getFreeHeap());
+    return ESP.getFreeHeap();
   };
   get("$system")["uptime"] << []() {
-    return String(millis() / 1000);
+    return millis() / 1000;
   };
   get("$system")["wifi"]["rssi"] << []() {
-    return String(WiFi.RSSI());
+    return WiFi.RSSI();
   };
   get("$system")["wifi"]["quality"] << []() {
     int quality = (WiFi.RSSI()+100)*1.6667;
     if(quality < 0) quality = 0;
     if(quality > 100) quality = 100;
-    return String(quality);
+    return quality;
   };
   get("$system")["wifi"]["ssid"] << []() {
     return WiFi.SSID();
@@ -146,7 +146,7 @@ EasyMqtt::EasyMqtt() : Entry("easyMqtt") {
   get("$system")["time"].setInterval(900); // every 15 min
   get("$system")["time"] << [this]() {
     ntp().update();
-    return String(ntp().getTime());
+    return ntp().getTime();
   };
 
   get("$system")["restart"] >> [this](String value) {

src/Entry.cpp

@@ -1,4 +1,5 @@
 #include "Entry.h"
+#include <FS.h>
 
 std::function<void(Entry*, String)> Entry::getPublishFunction() {
   if(publishFunction == NULL && parent) {
@@ -154,6 +155,17 @@ void Entry::setInterval(int interval, int force) {
   forceUpdate = force;
 }
 
+void Entry::setPersist(bool persist) {
+  this->persist = persist;
+  if(persist) {
+    File f = SPIFFS.open(getTopic(), "r");
+    if (f) {
+      setValue(f.readStringUntil('\n').c_str(), true);
+      f.close();
+    }
+  }
+}
+
 int Entry::getForce() {
   if(forceUpdate < 0) {
     return parent->getForce();
@@ -174,6 +186,12 @@ bool Entry::setValue(const char *value, bool force) {
     lastValue = (char*)malloc(strlen(value)+1);
     strcpy(lastValue, value);
     publish(value);
+
+    if(persist) {
+      File f = SPIFFS.open(getTopic(), "w");
+      f.println(value);
+      f.close();
+    } 
     return true;
   }
   return false;

src/Entry.h

@@ -16,6 +16,7 @@ class Entry {
     int forceUpdate = -1;
     unsigned long lastUpdate = 0;
     char* lastValue = NULL;
+    bool persist = false;
 
     Entry* parent = NULL;
     Entry* next = NULL;
@@ -57,6 +58,8 @@ class Entry {
     void setInterval(int interval);
     void setInterval(int interval, int force);
 
+    void setPersist(bool persist);
+
     int getForce();
 
     /**

src/WebPortal.cpp

@@ -27,9 +27,7 @@ void WebPortal::setup(Entry *mqttEntry, Config *config, NTPClient *ntpClient) {
   webServer->on("/", std::bind(&WebPortal::handleRoot, this));
   webServer->on("/save", std::bind(&WebPortal::handleSaveConfig, this));
   mqtt->each([&](Entry* entry) {
-    if(entry->isIn() || entry->isOut()) {
-      webServer->on(getRestPath(entry).c_str(), std::bind(&WebPortal::handleRest, this));
-    }
+    webServer->on(getRestPath(entry).c_str(), std::bind(&WebPortal::handleRest, this));
   });
   webServer->onNotFound(std::bind(&WebPortal::handleNotFound, this));
   webServer->begin();
@@ -133,7 +131,7 @@ void WebPortal::sendRestApi(Entry* entry) {
 void WebPortal::handleRest() {
   if(!auth()) return;
   Entry* entry = &mqtt->get(webServer->uri().substring(6).c_str());
-  if(webServer->method() == HTTP_GET && entry->isIn()) {
+  if(webServer->method() == HTTP_GET) {
     webServer->send(200, "application/json", "{\"value\":\"" + String(entry->getValue()) + "\",\"updated\":\"" + time(entry->getLastUpdate()) + "\"}");
   } else if(webServer->method() == HTTP_POST && entry->isOut()) {
     entry->update(webServer->arg("plain"));