Merge cahnges

Author: bloft

src/ConfigEntry.h

@@ -14,15 +14,19 @@ class ConfigEntry : public MqttEntry {
       });
     }
 
-    String getString(String key, String defaultValue) {
-      String value = get(key).getValue();
+    const char* getCString(String key, const char* defaultValue) {
+      const char * value = get(key).getCValue();
       if(value == NULL) {
         return defaultValue;
       } else {
         return value;
       }
     }
 
+    String getString(String key, String defaultValue) {
+      return String(getCString(key, defaultValue.c_str()));
+    }
+
     int getInt(String key, int defaultValue) {
       return getString(key, String(defaultValue)).toInt();
     }
@@ -45,7 +49,7 @@ class ConfigEntry : public MqttEntry {
 
   private:
     void load() {
-	Serial.println("Load config");
+      Serial.println("Load config");
       File f = SPIFFS.open("/config.cfg", "r");
       if (f) {
         while(f.available()) {
@@ -54,10 +58,10 @@ class ConfigEntry : public MqttEntry {
           String key = line.substring(0, pos);
           String value = line.substring(pos+1, line.length()-1);
           set(key, value);
-		Serial.print(" ");
-		Serial.print(key);
-		Serial.print(" = ");
-		Serial.println(value);
+          Serial.print(" ");
+          Serial.print(key);
+          Serial.print(" = ");
+          Serial.println(value);
         }
         f.close();
       }

src/EasyMqtt.h

@@ -27,18 +27,7 @@ class EasyMqtt : public MqttEntry {
         debug("Connecting to wifi: " + config().getString("wifi.ssid", ""));
         WiFi.mode(WIFI_STA);
 
-	String sSsid = config().getString("wifi.ssid", "");
-	char ssid[sSsid.length() + 1];
-	strcpy(ssid, sSsid.c_str());
-        
-        String name = config().getString("device.name", deviceId);
-        //WiFi.hostname("WebPool"); // Set the name of the device
-
-	String sPass = config().getString("wifi.password", "");
-	char pass[sPass.length() + 1];
-	strcpy(pass, sPass.c_str());
-
-        WiFi.begin(ssid, pass);
+        WiFi.begin(config().getCString("wifi.ssid", ""), config().getCString("wifi.password", ""));
 
         #ifdef DEBUG
         WiFi.printDiag(Serial);
@@ -56,7 +45,7 @@ class EasyMqtt : public MqttEntry {
         } else {
           debug("WiFi connection timeout - Setup AP");
           WiFi.mode(WIFI_AP);
-          WiFi.softAP(config().getString("wifi.ap", "EasyMqtt").c_str(), "123456");
+          WiFi.softAP(config().getCString("wifi.ap", "EasyMqtt"), "123456");
           debug("IP address", WiFi.softAPIP().toString());
         }
         debug("devideId", deviceId);
@@ -74,23 +63,9 @@ class EasyMqtt : public MqttEntry {
           });
         });
 
-	String sHost = config().getString("mqtt.host", "");
-	char host[sHost.length() + 1];
-	strcpy(host, sHost.c_str());
-	
-	int port = config().getInt("mqtt.port", 1883);
-	
-	String sUser = config().getString("mqtt.username", "");
-	char user[sUser.length() + 1];
-	strcpy(user, sUser.c_str());
-	
-	String sPass = config().getString("mqtt.password", "");
-	char pass[sPass.length() + 1];
-	strcpy(pass, sPass.c_str());
-	
-        mqttClient.setServer(host, port);
+        mqttClient.setServer(config().getCString("mqtt.host", ""), config().getInt("mqtt.port", 1883));
 
-        if (mqttClient.connect(deviceId.c_str(), user, pass)) {
+        if (mqttClient.connect(deviceId.c_str(), config().getCString("mqtt.username", ""), config().getCString("mqtt.password", ""))) {
           debug("Connected to MQTT");
 
           setPublishFunction([&](MqttEntry* entry, String message){
@@ -178,6 +153,19 @@ class EasyMqtt : public MqttEntry {
       return *configEntry;
     }
 
+    void debug(String msg) {
+      #ifdef DEBUG
+      Serial.println(msg);
+      #endif
+      if(mqttClient.connected()) {
+        get("system/debug").publish(msg);
+      }
+    }
+
+    void debug(String key, String value) {
+      debug(key + " = " + value);
+    }
+
     String getDeviceId() {
       return deviceId;
     }

src/MqttEntry.h

@@ -17,7 +17,7 @@ class MqttEntry {
     int forceUpdate = -1;
     bool internal = false;
     unsigned long lastUpdate = 0;
-    String lastValue = "";
+    const char *lastValue = "";
 
     PubSubClient* client = NULL;
 
@@ -81,7 +81,7 @@ class MqttEntry {
         for (int i = 0; i < length; i++) {
           _payload += (char)payload[i];
         }
-        if(!isIn() || _payload != lastValue) {
+        if(!isIn() || _payload != getValue()) {
           update(_payload);
         }
       }
@@ -98,7 +98,7 @@ class MqttEntry {
           lastUpdate = time;
           String value = inFunction();
           if (value != "") {
-            if (value != lastValue || force > getForce()) {
+            if (value != getValue() || force > getForce()) {
               setValue(value);
               force = 0;
             }
@@ -167,12 +167,20 @@ class MqttEntry {
      * Get last value
      */
     String getValue() {
+      return String(lastValue);
+    }
+
+    const char* getCValue() {
       return lastValue;
     }
 
     void setValue(String value) {
       lastUpdate = millis();
-      lastValue = value;
+
+      // free(str);
+      // lastValue = (char *) malloc(value.length());
+      // strcpy(lastValue, value.c_str());
+      lastValue = value.c_str();
       publish(value);
     }
 

src/WebPortal.h

@@ -6,6 +6,8 @@
 #include "MqttEntry.h"
 #include "html.h"
 
+// http://usemodj.com/2016/08/25/esp8266-arducam-5mp-ov5642-camera-wifi-video-streaming/
+
 class WebPortal {
   private:
     std::unique_ptr<ESP8266WebServer> webServer;
@@ -145,6 +147,14 @@ class WebPortal {
     }
   }
 
+  void handleDebug() {
+    WiFiClient client = webServer->client();
+    webServer->sendContent("HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\n");
+    while(client.connected()) {
+        client.write("this is a test\n");
+    }
+  }
+
   void handleNotFound() {
     webServer->sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
     webServer->sendHeader("Pragma", "no-cache");