Fix WiFi, still problem with MQTT

Author: bloft

src/ConfigEntry.h

@@ -24,14 +24,8 @@ class ConfigEntry : public MqttEntry {
       }
     }
 
-    char* getCString(String key, String defaultValue) {
-      String value = getString(key, defaultValue);
-      char cValue[value.length() + 1];
-      memset(cValue, 0, value.length() + 1);
-      for(int i=0; i < value.length(); i++) {
-        cValue[i] = value.charAt(i);
-      }
-      return cValue;
+    const char* getCString(String key, String defaultValue) {
+      return getString(key, defaultValue).c_str();
     }
 
     int getInt(String key, int defaultValue) {
@@ -55,10 +49,6 @@ class ConfigEntry : public MqttEntry {
       return key;
     }
 
-    String toString(MqttEntry* entry) {
-      return getKey(entry) + "=" + entry->getValue();
-    }
-    
   private:
     void load() {
       File f = SPIFFS.open("/config.cfg", "r");
@@ -67,7 +57,7 @@ class ConfigEntry : public MqttEntry {
           String line = f.readStringUntil('\n');
           int pos = line.indexOf("=");
           String key = line.substring(0, pos);
-          String value = line.substring(pos+1);
+          String value = line.substring(pos+1, line.length()-1);
           set(key, value);
         }
         f.close();
@@ -79,7 +69,9 @@ class ConfigEntry : public MqttEntry {
       if (f) {
         each([&](MqttEntry* entry) {
           if(entry->getTopic() != getTopic()) {
-            f.println(toString(entry).c_str());
+            f.print(getKey(entry));
+            f.print("=");
+            f.println(entry->getValue());
           }
         });
         f.close();

src/EasyMqtt.h

@@ -22,42 +22,47 @@ class EasyMqtt : public MqttEntry {
        Handle connections to mqtt
     */
     void connect() {
-      if(WiFi.status() != WL_CONNECTED) {
+      if(WiFi.status() == WL_DISCONNECTED) {
         debug("Connecting to wifi: " + config().getString("wifi.ssid", ""));
         WiFi.mode(WIFI_STA);
-        WiFi.begin(config().getCString("wifi.ssid", ""), config().getCString("wifi.password", ""));
+        WiFi.begin(config().getString("wifi.ssid", "").c_str(), config().getString("wifi.password", "").c_str());
+
+        #ifdef DEBUG
+        WiFi.printDiag(Serial);
+        #endif
 
         int timer = 0;
-        while ((WiFi.status() != WL_CONNECTED) && timer < 10) {
+        while ((WiFi.status() == WL_DISCONNECTED) && timer < 50) {
+          Serial.println(WiFi.status());
           delay(500);
           timer++;
           // ToDo: handle timeout, and create AP
         }
-        if(timer < 10) {
+        if(timer < 50 && WiFi.status() == WL_CONNECTED) {
           debug("WiFi connected");
+          debug("IP address", WiFi.localIP().toString());
         } else {
           debug("WiFi connection timeout - Setup AP");
-          // ToDo: create AP
           WiFi.mode(WIFI_AP);
-          WiFi.softAP(config().getCString("wifi.ap", "EasyMqtt"), "123456");
+          WiFi.softAP(config().getString("wifi.ap", "EasyMqtt").c_str(), "123456");
+          debug("IP address", WiFi.softAPIP().toString());
         }
-        debug("IP address", WiFi.localIP().toString());
         debug("devideId", deviceId);
         webPortal.setup(*this);
       }
       if(mqttClient.state() == MQTT_DISCONNECTED) {
-        // Setup MQTT
+        debug("Configure MQTT");
         mqttClient.setClient(wifiClient);
         mqttClient.setCallback([&](const char* topic, uint8_t* payload, unsigned int length) {
           each([=](MqttEntry* entry){
             entry->callback(topic, payload, length);
           });
         });
-        mqttClient.setServer(config().getCString("mqtt.host", ""), config().getInt("mqtt.port", 1883));
+        mqttClient.setServer(config().getString("mqtt.host", "").c_str(), config().getInt("mqtt.port", 1883));
       }
       if (!mqttClient.connected()) {
         debug("Connecting to MQTT");
-        if (mqttClient.connect(deviceId.c_str(), config().getCString("mqtt.username", ""), config().getCString("mqtt.password", ""))) {
+        if (mqttClient.connect(deviceId.c_str(), config().getString("mqtt.username", "").c_str(), config().getString("mqtt.password", "").c_str())) {
           debug("Connected to MQTT");
 
           setPublishFunction([&](MqttEntry* entry, String message){

src/WebPortal.h

@@ -84,7 +84,7 @@ class WebPortal {
       } else {
         page.replace("{type}", "text");
       }
-      page.replace("{name}", name);
+      page.replace("{key}", name);
       page.replace("{value}", entry->getValue());
     });