Change lastValue to be a c string

Author: Bjarne Loft

src/Entry.cpp

@@ -96,7 +96,7 @@ void Entry::update() {
       String value = inFunction();
       if (value != "") {
         if (value != getValue() || force > getForce()) {
-          setValue(value);
+          setValue(value.c_str());
           force = 0;
         }
       }
@@ -162,28 +162,26 @@ int Entry::getForce() {
   return forceUpdate;
 }
 
-String Entry::getValue() {
+char *Entry::getValue() {
   return lastValue;
 }
 
-void Entry::getCValue(char * destination) {
-  strcpy(destination, lastValue.c_str());
-}
-
-void Entry::setValue(String value) {
+void Entry::setValue(const char *value) {
   lastUpdate = millis();
-  lastValue = value;
+  free(lastValue);
+  lastValue = (char*)malloc(strlen(value)+1);
+  strcpy(lastValue, value);
   publish(value);
 }
 
 long Entry::getLastUpdate() {
   return lastUpdate;
 }
 
-void Entry::publish(String message) {
+void Entry::publish(const char *message) {
   auto function = getPublishFunction();
   if(function) {
-    function(this, message);
+    function(this, String(message));
   }
 }
 

src/Entry.h

@@ -15,7 +15,7 @@ class Entry {
     int interval = -1;
     int forceUpdate = -1;
     unsigned long lastUpdate = 0;
-    String lastValue = "";
+    char* lastValue = "";
 
     Entry* parent = NULL;
     Entry* next = NULL;
@@ -62,9 +62,8 @@ class Entry {
     /**
      * Get last value
      */
-    String getValue();
-    void getCValue(char * destination);
-    void setValue(String value);
+    char *getValue();
+    void setValue(const char *value);
 
     /**
      * 
@@ -74,7 +73,7 @@ class Entry {
     /**
      * Publish value to mqtt
      */
-    void publish(String message);
+    void publish(const char *message);
 
     /**
      * Iterate over each child, including sub children

src/WebPortal.cpp

@@ -68,7 +68,7 @@ void WebPortal::handleRoot() {
   });
 
   String page = FPSTR(HTML_MAIN5);
-  page.replace("{device_id}", mqtt->get("$system")["deviceId"].getValue());
+  page.replace("{device_id}", String(mqtt->get("$system")["deviceId"].getValue()));
   page.replace("{topic}", mqtt->getTopic());
   webServer->sendContent(page);
 
@@ -134,7 +134,7 @@ void WebPortal::handleRest() {
   if(!auth()) return;
   Entry* entry = &mqtt->get(webServer->uri().substring(6).c_str());
   if(webServer->method() == HTTP_GET && entry->isIn()) {
-    webServer->send(200, "application/json", "{\"value\":\"" + entry->getValue() + "\",\"updated\":\"" + time(entry->getLastUpdate()) + "\"}");
+    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"));
     webServer->send(200, "text/plain", webServer->uri() + " Update");