Fix configuration

bloft · bloft · commit 610f6baa4803 · 2017-10-27T14:23:51.000+02:00
diff --git a/html/template.html b/html/template.html
@@ -21,7 +21,7 @@
     setInterval(function() {
       $("[data-ajaxurl]").each(function(index) {
         var ele = $(this);
-        $.ajax(ele.data("ajaxurl")).complete(function (data, textStatus, jqXHR) {
+        $.ajax(ele.data("ajaxurl")).success(function (data) {
           ele.html(data);
         });
       });
@@ -218,7 +218,7 @@ <h3>{title}</h3><hr/>
 									<div class="form-group">
                     <label for="{key}" class="col-sm-2 control-label">{key}</label>
     								<div class="col-sm-8">
-                      <input type="{type}" class="form-control" id="{key}" placeholder="" value="{value}">
+                      <input type="{type}" class="form-control" name="{key}" placeholder="" value="{value}">
     								</div>
 								  </div>
 <!-- split:config_entry -->
diff --git a/src/ConfigEntry.h b/src/ConfigEntry.h
@@ -22,7 +22,7 @@ class ConfigEntry : public MqttEntry {
         return value;
       }
     }
-    
+
     int getInt(String key, int defaultValue) {
       return getString(key, String(defaultValue)).toInt();
     }
@@ -33,6 +33,7 @@ class ConfigEntry : public MqttEntry {
 
     void reset() {
       SPIFFS.remove("/config.cfg");
+	// ToDo: Remove all entries
     }
 
   protected:
@@ -44,6 +45,7 @@ class ConfigEntry : public MqttEntry {
 
   private:
     void load() {
+	Serial.println("Load config");
       File f = SPIFFS.open("/config.cfg", "r");
       if (f) {
         while(f.available()) {
@@ -52,6 +54,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);
         }
         f.close();
       }
diff --git a/src/EasyMqtt.h b/src/EasyMqtt.h
@@ -26,19 +26,28 @@ class EasyMqtt : public MqttEntry {
       if(WiFi.status() == WL_DISCONNECTED) {
         debug("Connecting to wifi: " + config().getString("wifi.ssid", ""));
         WiFi.mode(WIFI_STA);
-        WiFi.begin(config().getString("wifi.ssid", "").c_str(), config().getString("wifi.password", "").c_str());
+
+	String sSsid = config().getString("wifi.ssid", "");
+	char ssid[sSsid.length() + 1];
+	strcpy(ssid, sSsid.c_str());
+
+	String sPass = config().getString("wifi.password", "");
+	char pass[sPass.length() + 1];
+	strcpy(pass, sPass.c_str());
+
+        WiFi.begin(ssid, pass);
 
         #ifdef DEBUG
         WiFi.printDiag(Serial);
         #endif
 
         int timer = 0;
-        while ((WiFi.status() == WL_DISCONNECTED) && timer < 50) {
+        while ((WiFi.status() == WL_DISCONNECTED) && timer < 60) {
           debug("Wifi Status", String(WiFi.status()));
           delay(500);
           timer++;
         }
-        if(timer < 50 && WiFi.status() == WL_CONNECTED) {
+        if(timer < 60 && WiFi.status() == WL_CONNECTED) {
           debug("WiFi connected");
           debug("IP address", WiFi.localIP().toString());
         } else {
@@ -54,17 +63,31 @@ class EasyMqtt : public MqttEntry {
 
     void connectMqtt() {
       if (!mqttClient.connected() && mqttDelay < millis()) {
-        debug("Configure MQTT");
+        debug("Connecting to 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().getString("mqtt.host", "").c_str(), config().getInt("mqtt.port", 1883));
+		
+	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);
         
-        debug("Connecting to MQTT");
-        if (mqttClient.connect(deviceId.c_str(), config().getString("mqtt.username", "").c_str(), config().getString("mqtt.password", "").c_str())) {
+        if (mqttClient.connect(deviceId.c_str(), user, pass)) {
           debug("Connected to MQTT");
     
           setPublishFunction([&](MqttEntry* entry, String message){
@@ -82,7 +105,7 @@ class EasyMqtt : public MqttEntry {
         } else {
           debug("Connection to MQTT failed, rc", String(mqttClient.state()));
 
-          mqttDelay = millis() + 1000;
+          mqttDelay = millis() + 5000;
         }
       }
     }
@@ -102,6 +125,9 @@ class EasyMqtt : public MqttEntry {
 
   public:
     EasyMqtt() : MqttEntry("easyMqtt", mqttClient) {
+        #ifdef DEBUG
+	Serial.begin(115200);
+        #endif
       deviceId = String(ESP.getChipId());
 
       debug("test");
diff --git a/src/MqttEntry.h b/src/MqttEntry.h
@@ -209,7 +209,6 @@ class MqttEntry {
      * Create or get the sub topic with the name {name}
      */
     MqttEntry & get(String name) {
-      name.replace('.', '/');
       int pos = name.indexOf('/');
       if(pos < 0) {
         return operator[](name.c_str());
diff --git a/src/WebPortal.h b/src/WebPortal.h
@@ -106,7 +106,7 @@ class WebPortal {
     mqtt->each([&](MqttEntry* entry) {
       if(entry->isOut() || entry->isIn()) {
         page += FPSTR(HTML_API_DOC);
-        page.replace("{path}", getName(entry));
+        page.replace("{path}", getRestPath(entry));
       }
     });
     page += FPSTR(HTML_MAIN6);
@@ -117,20 +117,24 @@ class WebPortal {
   }
 
   void handleSaveConfig() {
+    Serial.println("Save");
     mqtt->get("config").each([&](MqttEntry* entry) {
         String name = getName(entry);
-        name = name.substring(7);
+        name = name.substring(8);
         name.replace("/", ".");
         // webServer->hasArg(name.c_str());
         entry->setValue(webServer->arg(name.c_str()));
+    	Serial.print(name);
+	Serial.print(" = ");
+    	Serial.println(webServer->arg(name.c_str()));
     });
     webServer->sendHeader("Location", String("/"), true);
     webServer->send(302, "text/plain", "");
     ESP.restart();
   }
 
   void handleRest() {
-    MqttEntry* entry = &mqtt->get(webServer->uri().substring(5));
+    MqttEntry* entry = &mqtt->get(webServer->uri().substring(6));
     if(webServer->method() == HTTP_GET && entry->isIn()) {
       webServer->send(200, "text/plain", entry->getValue());
     } else if(webServer->method() == HTTP_POST && entry->isOut()) {
diff --git a/src/html.h b/src/html.h
@@ -1,15 +1,15 @@
 #ifndef html_h
 #define html_h
 
-const char HTML_MAIN1[] PROGMEM = "<!DOCTYPE html><html lang=\"en\"><head><meta charset=\"utf-8\"><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><title>Device Info - {device_id}</title><link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css\" integrity=\"sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u\" crossorigin=\"anonymous\"><link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css\" integrity=\"sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp\" crossorigin=\"anonymous\"></head><body><script type=\"application/javascript\">function sendValue(input) {$.ajax({url: input.dataset.url, method: \"POST\", data: $(input).closest(\"form\").find(\"input\").val()}).complete(function (data, textStatus, jqXHR) {alert(textStatus);});}setInterval(function() {$(\"[data-ajaxurl]\").each(function(index) {var ele = $(this);$.ajax(ele.data(\"ajaxurl\")).complete(function (data, textStatus, jqXHR) {ele.html(data);});});}, 1000);</script><div class=\"container\"><h1>Device Info - {device_id}</h1><ul class=\"nav nav-tabs\" role=\"tablist\"><li role=\"presentation\" class=\"active\"><a href=\"#devices\" aria-controls=\"devices\" role=\"tab\" data-toggle=\"tab\"><span class=\"glyphicon glyphicon-dashboard\" aria-hidden=\"true\"></span> Devices</a></li><li role=\"presentation\"><a href=\"#input\" aria-controls=\"input\" role=\"tab\" data-toggle=\"tab\"><span class=\"glyphicon glyphicon-pencil\" aria-hidden=\"true\"></span> Input</a></li><li role=\"presentation\"><a href=\"#config\" aria-controls=\"config\" role=\"tab\" data-toggle=\"tab\"><span class=\"glyphicon glyphicon-cog\" aria-hidden=\"true\"></span> Config</a></li><li role=\"presentation\"><a href=\"#about\" aria-controls=\"about\" role=\"tab\" data-toggle=\"tab\"><span class=\"glyphicon glyphicon-book\" aria-hidden=\"true\"></span> About</a></li></ul><div class=\"tab-content\" style=\"border-style: solid; border-color: #ddd; border-width: 0px 1px 1px 1px\"><div role=\"tabpanel\" class=\"tab-pane active\" id=\"devices\"><br /><div class=\"container-fluid\"><div class=\"row\">";
+const char HTML_MAIN1[] PROGMEM = "<!DOCTYPE html><html lang=\"en\"><head><meta charset=\"utf-8\"><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><title>Device Info - {device_id}</title><link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css\" integrity=\"sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u\" crossorigin=\"anonymous\"><link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css\" integrity=\"sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp\" crossorigin=\"anonymous\"></head><body><script type=\"application/javascript\">function sendValue(input) {$.ajax({url: input.dataset.url, method: \"POST\", data: $(input).closest(\"form\").find(\"input\").val()}).complete(function (data, textStatus, jqXHR) {alert(textStatus);});}setInterval(function() {$(\"[data-ajaxurl]\").each(function(index) {var ele = $(this);$.ajax(ele.data(\"ajaxurl\")).success(function (data) {ele.html(data);});});}, 1000);</script><div class=\"container\"><h1>Device Info - {device_id}</h1><ul class=\"nav nav-tabs\" role=\"tablist\"><li role=\"presentation\" class=\"active\"><a href=\"#devices\" aria-controls=\"devices\" role=\"tab\" data-toggle=\"tab\"><span class=\"glyphicon glyphicon-dashboard\" aria-hidden=\"true\"></span> Devices</a></li><li role=\"presentation\"><a href=\"#input\" aria-controls=\"input\" role=\"tab\" data-toggle=\"tab\"><span class=\"glyphicon glyphicon-pencil\" aria-hidden=\"true\"></span> Input</a></li><li role=\"presentation\"><a href=\"#config\" aria-controls=\"config\" role=\"tab\" data-toggle=\"tab\"><span class=\"glyphicon glyphicon-cog\" aria-hidden=\"true\"></span> Config</a></li><li role=\"presentation\"><a href=\"#about\" aria-controls=\"about\" role=\"tab\" data-toggle=\"tab\"><span class=\"glyphicon glyphicon-book\" aria-hidden=\"true\"></span> About</a></li></ul><div class=\"tab-content\" style=\"border-style: solid; border-color: #ddd; border-width: 0px 1px 1px 1px\"><div role=\"tabpanel\" class=\"tab-pane active\" id=\"devices\"><br /><div class=\"container-fluid\"><div class=\"row\">";
 const char HTML_SENSOR[] PROGMEM = "<div class=\"col-md-4\"><div class=\"panel panel-info\"><div class=\"panel-heading\"><strong>{name}</strong></div><div class=\"panel-body\" data-ajaxurl=\"{path}\" style=\"font-size: 24px;\">{value}</div></div></div>";
 const char HTML_VALUE_ON[] PROGMEM = "<span class=\"label label-success\">{value}</span>";
 const char HTML_VALUE_OFF[] PROGMEM = "<span class=\"label label-danger\">{value}</span>";
 const char HTML_MAIN2[] PROGMEM = "</div></div></div><div role=\"tabpanel\" class=\"tab-pane\" id=\"input\"><br /><div class=\"container-fluid\"><div class=\"row\">";
 const char HTML_INPUT[] PROGMEM = "<div class=\"col-md-4\"><div class=\"panel panel-success\"><div class=\"panel-heading\"><strong>{name}</strong></div><div class=\"panel-body\" style=\"font-size: 24px;\"><form><div class=\"input-group\"><input type=\"text\" class=\"form-control\" placeholder=\"value\"><span class=\"input-group-btn\"><button class=\"btn btn-default\" type=\"button\" data-url=\"{name}\" onclick=\"sendValue(this);\">Send</button></span></div></form></div></div></div>";
 const char HTML_MAIN3[] PROGMEM = "</div></div></div><div role=\"tabpanel\" class=\"tab-pane\" id=\"config\"><div class=\"container-fluid\"><div class=\"row\"><div class=\"col-md-12\"><form class=\"form-horizontal\" action=\"/save\" method=\"POST\">";
 const char HTML_CONFIG_HEADER[] PROGMEM = "<br /><h3>{title}</h3><hr/>";
-const char HTML_CONFIG_ENTRY[] PROGMEM = "<div class=\"form-group\"><label for=\"{key}\" class=\"col-sm-2 control-label\">{key}</label><div class=\"col-sm-8\"><input type=\"{type}\" class=\"form-control\" id=\"{key}\" placeholder=\"\" value=\"{value}\"></div></div>";
+const char HTML_CONFIG_ENTRY[] PROGMEM = "<div class=\"form-group\"><label for=\"{key}\" class=\"col-sm-2 control-label\">{key}</label><div class=\"col-sm-8\"><input type=\"{type}\" class=\"form-control\" name=\"{key}\" placeholder=\"\" value=\"{value}\"></div></div>";
 const char HTML_MAIN4[] PROGMEM = "<hr/><div class=\"form-group\"><div class=\"col-sm-offset-9 col-sm-2\"><button type=\"submit\" class=\"btn btn-default\">Save</button></div></div></form></div></div></div></div><div role=\"tabpanel\" class=\"tab-pane\" id=\"about\"><br /><div class=\"container-fluid\"><div class=\"row\"><div class=\"col-md-12\"><h1>About</h1><p>Device is using EasyMqtt version 0.0.1</p><dl class=\"dl-horizontal\"><dt>Device Id</dt><dd>{device_id}</dd><dt>Topic</dt><dd>{topic}</dd></dl><hr /><h3>MQTT API:</h3><ul class=\"list-group\">";
 const char HTML_MAIN5[] PROGMEM = "</ul><hr /><h3>Rest API:</h3><ul class=\"list-group\">";
 const char HTML_API_DOC[] PROGMEM = "<li class=\"list-group-item\">{path}</li>";

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class ConfigEntry : public MqttEntry {`
`22`	`22`	`return value;`
`23`	`23`	`}`
`24`	`24`	`}`
`25`		`-`
	`25`	`+`
`26`	`26`	`int getInt(String key, int defaultValue) {`
`27`	`27`	`return getString(key, String(defaultValue)).toInt();`
`28`	`28`	`}`
`@@ -33,6 +33,7 @@ class ConfigEntry : public MqttEntry {`
`33`	`33`
`34`	`34`	`void reset() {`
`35`	`35`	`SPIFFS.remove("/config.cfg");`
	`36`	`+ // ToDo: Remove all entries`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`protected:`
`@@ -44,6 +45,7 @@ class ConfigEntry : public MqttEntry {`
`44`	`45`
`45`	`46`	`private:`
`46`	`47`	`void load() {`
	`48`	`+ Serial.println("Load config");`
`47`	`49`	`File f = SPIFFS.open("/config.cfg", "r");`
`48`	`50`	`if (f) {`
`49`	`51`	`while(f.available()) {`
`@@ -52,6 +54,10 @@ class ConfigEntry : public MqttEntry {`
`52`	`54`	`String key = line.substring(0, pos);`
`53`	`55`	`String value = line.substring(pos+1, line.length()-1);`
`54`	`56`	`set(key, value);`
	`57`	`+ Serial.print(" ");`
	`58`	`+ Serial.print(key);`
	`59`	`+ Serial.print(" = ");`
	`60`	`+ Serial.println(value);`
`55`	`61`	`}`
`56`	`62`	`f.close();`
`57`	`63`	`}`