From 0a07d808b467663aa5fa03de629e73ba577d6133 Mon Sep 17 00:00:00 2001 From: Ruben Andreassen Date: Tue, 10 Apr 2018 19:52:43 +0200 Subject: [PATCH 1/3] Added default mqtt port --- Code/Arduino/AmsToMqttBridge/accesspoint.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Code/Arduino/AmsToMqttBridge/accesspoint.cpp b/Code/Arduino/AmsToMqttBridge/accesspoint.cpp index d45e4475..e04d9ff0 100644 --- a/Code/Arduino/AmsToMqttBridge/accesspoint.cpp +++ b/Code/Arduino/AmsToMqttBridge/accesspoint.cpp @@ -95,7 +95,7 @@ void accesspoint::handleRoot() { server.sendHeader("Expires", "-1"); server.setContentLength(CONTENT_LENGTH_UNKNOWN); server.send(200, "text/html", ""); // Empty content inhibits Content-length header so we have to close the socket ourselves. - String html = String("\r\n\r\n\r\n\t\r\n\r\n\r\n\r\n\t
\r\n\r\n\t\t
\r\n\r\n\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t

WiFi

\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t
\r\n\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t

Meter Type

\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t
\r\n\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t

MQTT

\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t
\r\n\t\t
\r\n\t
\r\n\r\n\t\r\n\r\n"); + String html = String("\r\n\r\n\r\n\t\r\n\r\n\r\n\r\n\t
\r\n\r\n\t\t
\r\n\r\n\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t

WiFi

\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t
\r\n\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t

Meter Type

\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t
\r\n\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t

MQTT

\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t\t
\r\n\t\t\t\t\t\r\n\t\t\t\t
\r\n\t\t\t
\r\n\t\t
\r\n\t
\r\n\r\n\t\r\n\r\n"); server.sendContent(html); server.client().stop(); // Stop is needed because we sent no content length } From 33f3e0898ceccede022fa6aa12d9d2bbe41dec72 Mon Sep 17 00:00:00 2001 From: Ruben Andreassen Date: Tue, 10 Apr 2018 19:53:51 +0200 Subject: [PATCH 2/3] Switched Kamstrup and Aidon to match the HTML in accesspoint.cpp --- Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino b/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino index dbb48bb8..b07151eb 100644 --- a/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino +++ b/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino @@ -168,12 +168,12 @@ void readHanPort() case 1: // Kaifa readHanPort_Kaifa(listSize); break; - case 2: // Kamstrup - readHanPort_Kamstrup(listSize); - break; - case 3: // Aidon + case 2: // Aidon readHanPort_Aidon(listSize); break; + case 3: // Kamstrup + readHanPort_Kamstrup(listSize); + break; default: debugger->print("Meter type "); debugger->print(ap.config.meterType, HEX); From 1d1a0cfba223222dd39f1d1875f83626b6047d8a Mon Sep 17 00:00:00 2001 From: Ruben Andreassen Date: Tue, 10 Apr 2018 19:55:06 +0200 Subject: [PATCH 3/3] Added delay to make the ESP connect to the WiFi faster --- Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino b/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino index b07151eb..a22e93c1 100644 --- a/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino +++ b/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino @@ -114,6 +114,10 @@ void setupWiFi() // Connect to WiFi WiFi.begin(ap.config.ssid, ap.config.ssidPassword); + while (WiFi.status() != WL_CONNECTED) { + delay(500); + } + // Initialize WiFi and MQTT clients if (ap.config.isSecure()) client = new WiFiClientSecure();