From 5b537c2928a1ded8ab4f25bba8cb76642422deea Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Sun, 27 Jan 2019 10:15:51 +0100 Subject: [PATCH] Build on linux and send proper html ending from web server --- Code/Arduino/AmsToMqttBridge/accesspoint.cpp | 1 + Code/Arduino/HanReader/library.properties | 4 ++++ Code/Arduino/HanReader/src/Crc16.h | 2 +- Code/Arduino/HanReader/src/DlmsReader.h | 2 +- Code/Arduino/HanReader/src/HanReader.h | 2 +- Code/ESPDebugger/Crc16.h | 2 +- Code/ESPDebugger/DlmsReader.h | 2 +- Code/ESPDebugger/HanReader.h | 2 +- Code/ESPDebugger/KaifaHan.h | 2 +- 9 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Code/Arduino/AmsToMqttBridge/accesspoint.cpp b/Code/Arduino/AmsToMqttBridge/accesspoint.cpp index e04d9ff0..711f02aa 100644 --- a/Code/Arduino/AmsToMqttBridge/accesspoint.cpp +++ b/Code/Arduino/AmsToMqttBridge/accesspoint.cpp @@ -97,6 +97,7 @@ void accesspoint::handleRoot() { 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"); server.sendContent(html); + server.sendContent(""); server.client().stop(); // Stop is needed because we sent no content length } diff --git a/Code/Arduino/HanReader/library.properties b/Code/Arduino/HanReader/library.properties index e69de29b..d545dbb4 100644 --- a/Code/Arduino/HanReader/library.properties +++ b/Code/Arduino/HanReader/library.properties @@ -0,0 +1,4 @@ +name=HanReader +version=1.0.0 +author=Fred +maintainer=Unknown diff --git a/Code/Arduino/HanReader/src/Crc16.h b/Code/Arduino/HanReader/src/Crc16.h index 406c0af2..ffbf9f97 100644 --- a/Code/Arduino/HanReader/src/Crc16.h +++ b/Code/Arduino/HanReader/src/Crc16.h @@ -2,7 +2,7 @@ #define _CRC16_h #if defined(ARDUINO) && ARDUINO >= 100 - #include "arduino.h" + #include "Arduino.h" #else #include "WProgram.h" #endif diff --git a/Code/Arduino/HanReader/src/DlmsReader.h b/Code/Arduino/HanReader/src/DlmsReader.h index 56733492..ffc8691b 100644 --- a/Code/Arduino/HanReader/src/DlmsReader.h +++ b/Code/Arduino/HanReader/src/DlmsReader.h @@ -4,7 +4,7 @@ #include "Crc16.h" #if defined(ARDUINO) && ARDUINO >= 100 - #include "arduino.h" + #include "Arduino.h" #else #include "WProgram.h" #endif diff --git a/Code/Arduino/HanReader/src/HanReader.h b/Code/Arduino/HanReader/src/HanReader.h index 7818ff0b..3ef0cf5b 100644 --- a/Code/Arduino/HanReader/src/HanReader.h +++ b/Code/Arduino/HanReader/src/HanReader.h @@ -2,7 +2,7 @@ #define _HANREADER_h #if defined(ARDUINO) && ARDUINO >= 100 - #include "arduino.h" + #include "Arduino.h" #else #include "WProgram.h" #endif diff --git a/Code/ESPDebugger/Crc16.h b/Code/ESPDebugger/Crc16.h index 406c0af2..ffbf9f97 100644 --- a/Code/ESPDebugger/Crc16.h +++ b/Code/ESPDebugger/Crc16.h @@ -2,7 +2,7 @@ #define _CRC16_h #if defined(ARDUINO) && ARDUINO >= 100 - #include "arduino.h" + #include "Arduino.h" #else #include "WProgram.h" #endif diff --git a/Code/ESPDebugger/DlmsReader.h b/Code/ESPDebugger/DlmsReader.h index c457602c..2bd354a2 100644 --- a/Code/ESPDebugger/DlmsReader.h +++ b/Code/ESPDebugger/DlmsReader.h @@ -4,7 +4,7 @@ #include "Crc16.h" #if defined(ARDUINO) && ARDUINO >= 100 - #include "arduino.h" + #include "Arduino.h" #else #include "WProgram.h" #endif diff --git a/Code/ESPDebugger/HanReader.h b/Code/ESPDebugger/HanReader.h index aeb47b90..86d7e256 100644 --- a/Code/ESPDebugger/HanReader.h +++ b/Code/ESPDebugger/HanReader.h @@ -2,7 +2,7 @@ #define _HANREADER_h #if defined(ARDUINO) && ARDUINO >= 100 - #include "arduino.h" + #include "Arduino.h" #else #include "WProgram.h" #endif diff --git a/Code/ESPDebugger/KaifaHan.h b/Code/ESPDebugger/KaifaHan.h index 02720959..558388ba 100644 --- a/Code/ESPDebugger/KaifaHan.h +++ b/Code/ESPDebugger/KaifaHan.h @@ -2,7 +2,7 @@ #define _KAIFAHAN_h #if defined(ARDUINO) && ARDUINO >= 100 - #include "arduino.h" + #include "Arduino.h" #else #include "WProgram.h" #endif