diff --git a/Arduino Code/Arduino Libraries/HanConfigAp/src/HanConfigAp.cpp b/Arduino Code/Arduino Libraries/HanConfigAp/src/HanConfigAp.cpp index def4e8e0..06a6c0fc 100644 --- a/Arduino Code/Arduino Libraries/HanConfigAp/src/HanConfigAp.cpp +++ b/Arduino Code/Arduino Libraries/HanConfigAp/src/HanConfigAp.cpp @@ -100,11 +100,8 @@ void HanConfigAp::handleRoot() { server.sendHeader("Pragma", "no-cache"); 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"); - server.sendContent(html); - server.sendContent(""); // (End 1/2) Sending a zero length chunk to terminate session - server.client().stop(); // (End 2/2) Stop is needed because we sent no content length + server.send(200, "text/html", html); } diff --git a/Arduino Code/Arduino Libraries/HanToJson/src/HanToJson.cpp b/Arduino Code/Arduino Libraries/HanToJson/src/HanToJson.cpp index f5369609..1202bf79 100644 --- a/Arduino Code/Arduino Libraries/HanToJson/src/HanToJson.cpp +++ b/Arduino Code/Arduino Libraries/HanToJson/src/HanToJson.cpp @@ -8,25 +8,25 @@ static void hanToJsonKaifa3phase(int listSize, JsonObject& data, HanReader& hanR { if (listSize >= (int)Kaifa::List3PhaseShort) { - data["lv"] = hanReader.getString( (int)Kaifa_List3Phase::ListVersionIdentifier); - data["id"] = hanReader.getString( (int)Kaifa_List3Phase::MeterID); - data["type"] = hanReader.getString( (int)Kaifa_List3Phase::MeterType); - data["P"] = hanReader.getInt( (int)Kaifa_List3Phase::ActiveImportPower); - data["Q"] = hanReader.getInt( (int)Kaifa_List3Phase::ReactiveImportPower); - data["I1"] = hanReader.getInt( (int)Kaifa_List3Phase::CurrentL1); - data["I2"] = hanReader.getInt( (int)Kaifa_List3Phase::CurrentL2); - data["I3"] = hanReader.getInt( (int)Kaifa_List3Phase::CurrentL3); - data["U1"] = hanReader.getInt( (int)Kaifa_List3Phase::VoltageL1); - data["U2"] = hanReader.getInt( (int)Kaifa_List3Phase::VoltageL2); - data["U3"] = hanReader.getInt( (int)Kaifa_List3Phase::VoltageL3); + data["lv"] = hanReader.getString( (int)Kaifa_List3Phase::ListVersionIdentifier); + data["id"] = hanReader.getString( (int)Kaifa_List3Phase::MeterID); + data["type"] = hanReader.getString( (int)Kaifa_List3Phase::MeterType); + data["P"] = hanReader.getInt( (int)Kaifa_List3Phase::ActiveImportPower); + data["Q"] = hanReader.getInt( (int)Kaifa_List3Phase::ReactiveImportPower); + data["I1"] = ((double) hanReader.getInt((int)Kaifa_List3Phase::CurrentL1)) / 1000; + data["I2"] = ((double) hanReader.getInt((int)Kaifa_List3Phase::CurrentL2)) / 1000; + data["I3"] = ((double) hanReader.getInt((int)Kaifa_List3Phase::CurrentL3)) / 1000; + data["U1"] = ((double) hanReader.getInt((int)Kaifa_List3Phase::VoltageL1)) / 10; + data["U2"] = ((double) hanReader.getInt((int)Kaifa_List3Phase::VoltageL2)) / 10; + data["U3"] = ((double) hanReader.getInt((int)Kaifa_List3Phase::VoltageL3)) / 10; } if (listSize >= (int)Kaifa::List3PhaseLong) { - data["tPI"] = hanReader.getInt( (int)Kaifa_List3Phase::CumulativeActiveImportEnergy); - data["tPO"] = hanReader.getInt( (int)Kaifa_List3Phase::CumulativeActiveExportEnergy); - data["tQI"] = hanReader.getInt( (int)Kaifa_List3Phase::CumulativeReactiveImportEnergy); - data["tQO"] = hanReader.getInt( (int)Kaifa_List3Phase::CumulativeReactiveExportEnergy); + data["tPI"] = hanReader.getInt( (int)Kaifa_List3Phase::CumulativeActiveImportEnergy); + data["tPO"] = hanReader.getInt( (int)Kaifa_List3Phase::CumulativeActiveExportEnergy); + data["tQI"] = hanReader.getInt( (int)Kaifa_List3Phase::CumulativeReactiveImportEnergy); + data["tQO"] = hanReader.getInt( (int)Kaifa_List3Phase::CumulativeReactiveExportEnergy); } } @@ -34,21 +34,21 @@ static void hanToJsonKaifa1phase(int listSize, JsonObject& data, HanReader& hanR { if (listSize >= (int)Kaifa::List1PhaseShort) { - data["lv"] = hanReader.getString( (int)Kaifa_List1Phase::ListVersionIdentifier); - data["id"] = hanReader.getString( (int)Kaifa_List1Phase::MeterID); - data["type"] = hanReader.getString( (int)Kaifa_List1Phase::MeterType); - data["P"] = hanReader.getInt( (int)Kaifa_List1Phase::ActiveImportPower); - data["Q"] = hanReader.getInt( (int)Kaifa_List1Phase::ReactiveImportPower); - data["I1"] = hanReader.getInt( (int)Kaifa_List1Phase::CurrentL1); - data["U1"] = hanReader.getInt( (int)Kaifa_List1Phase::VoltageL1); + data["lv"] = hanReader.getString( (int)Kaifa_List1Phase::ListVersionIdentifier); + data["id"] = hanReader.getString( (int)Kaifa_List1Phase::MeterID); + data["type"] = hanReader.getString( (int)Kaifa_List1Phase::MeterType); + data["P"] = hanReader.getInt( (int)Kaifa_List1Phase::ActiveImportPower); + data["Q"] = hanReader.getInt( (int)Kaifa_List1Phase::ReactiveImportPower); + data["I1"] = ((double) hanReader.getInt((int)Kaifa_List1Phase::CurrentL1)) / 1000; + data["U1"] = ((double) hanReader.getInt((int)Kaifa_List1Phase::VoltageL1)) / 10; } if (listSize >= (int)Kaifa::List1PhaseLong) { - data["tPI"] = hanReader.getInt( (int)Kaifa_List1Phase::CumulativeActiveImportEnergy); - data["tPO"] = hanReader.getInt( (int)Kaifa_List1Phase::CumulativeActiveExportEnergy); - data["tQI"] = hanReader.getInt( (int)Kaifa_List1Phase::CumulativeReactiveImportEnergy); - data["tQO"] = hanReader.getInt( (int)Kaifa_List1Phase::CumulativeReactiveExportEnergy); + data["tPI"] = hanReader.getInt( (int)Kaifa_List1Phase::CumulativeActiveImportEnergy); + data["tPO"] = hanReader.getInt( (int)Kaifa_List1Phase::CumulativeActiveExportEnergy); + data["tQI"] = hanReader.getInt( (int)Kaifa_List1Phase::CumulativeReactiveImportEnergy); + data["tQO"] = hanReader.getInt( (int)Kaifa_List1Phase::CumulativeReactiveExportEnergy); } } @@ -151,25 +151,25 @@ static void hanToJsonKamstrup3phase(int listSize, JsonObject& data, HanReader& h { if (listSize >= (int)Kamstrup::List3PhaseShort) { - data["lv"] = hanReader.getString( (int)Kamstrup_List3Phase::ListVersionIdentifier); - data["id"] = hanReader.getString( (int)Kamstrup_List3Phase::MeterID); - data["type"] = hanReader.getString( (int)Kamstrup_List3Phase::MeterType); - data["P"] = hanReader.getInt( (int)Kamstrup_List3Phase::ActiveImportPower); - data["Q"] = hanReader.getInt( (int)Kamstrup_List3Phase::ReactiveImportPower); - data["I1"] = hanReader.getInt( (int)Kamstrup_List3Phase::CurrentL1); - data["I2"] = hanReader.getInt( (int)Kamstrup_List3Phase::CurrentL2); - data["I3"] = hanReader.getInt( (int)Kamstrup_List3Phase::CurrentL3); - data["U1"] = hanReader.getInt( (int)Kamstrup_List3Phase::VoltageL1); - data["U2"] = hanReader.getInt( (int)Kamstrup_List3Phase::VoltageL2); - data["U3"] = hanReader.getInt( (int)Kamstrup_List3Phase::VoltageL3); + data["lv"] = hanReader.getString( (int)Kamstrup_List3Phase::ListVersionIdentifier); + data["id"] = hanReader.getString( (int)Kamstrup_List3Phase::MeterID); + data["type"] = hanReader.getString( (int)Kamstrup_List3Phase::MeterType); + data["P"] = hanReader.getInt( (int)Kamstrup_List3Phase::ActiveImportPower); + data["Q"] = hanReader.getInt( (int)Kamstrup_List3Phase::ReactiveImportPower); + data["I1"] = ((double) hanReader.getInt((int)Kamstrup_List3Phase::CurrentL1)) / 100; + data["I2"] = ((double) hanReader.getInt((int)Kamstrup_List3Phase::CurrentL2)) / 100; + data["I3"] = ((double) hanReader.getInt((int)Kamstrup_List3Phase::CurrentL3)) / 100; + data["U1"] = hanReader.getInt( (int)Kamstrup_List3Phase::VoltageL1); + data["U2"] = hanReader.getInt( (int)Kamstrup_List3Phase::VoltageL2); + data["U3"] = hanReader.getInt( (int)Kamstrup_List3Phase::VoltageL3); } if (listSize >= (int)Kamstrup::List3PhaseLong) { - data["tPI"] = hanReader.getInt( (int)Kamstrup_List3Phase::CumulativeActiveImportEnergy); - data["tPO"] = hanReader.getInt( (int)Kamstrup_List3Phase::CumulativeActiveExportEnergy); - data["tQI"] = hanReader.getInt( (int)Kamstrup_List3Phase::CumulativeReactiveImportEnergy); - data["tQO"] = hanReader.getInt( (int)Kamstrup_List3Phase::CumulativeReactiveExportEnergy); + data["tPI"] = hanReader.getInt( (int)Kamstrup_List3Phase::CumulativeActiveImportEnergy); + data["tPO"] = hanReader.getInt( (int)Kamstrup_List3Phase::CumulativeActiveExportEnergy); + data["tQI"] = hanReader.getInt( (int)Kamstrup_List3Phase::CumulativeReactiveImportEnergy); + data["tQO"] = hanReader.getInt( (int)Kamstrup_List3Phase::CumulativeReactiveExportEnergy); } } @@ -177,21 +177,21 @@ static void hanToJsonKamstrup1phase(int listSize, JsonObject& data, HanReader& h { if (listSize >= (int)Kamstrup::List1PhaseShort) { - data["lv"] = hanReader.getString( (int)Kamstrup_List1Phase::ListVersionIdentifier); - data["id"] = hanReader.getString( (int)Kamstrup_List1Phase::MeterID); - data["type"] = hanReader.getString( (int)Kamstrup_List1Phase::MeterType); - data["P"] = hanReader.getInt( (int)Kamstrup_List1Phase::ActiveImportPower); - data["Q"] = hanReader.getInt( (int)Kamstrup_List1Phase::ReactiveImportPower); - data["I1"] = hanReader.getInt( (int)Kamstrup_List1Phase::CurrentL1); - data["U1"] = hanReader.getInt( (int)Kamstrup_List1Phase::VoltageL1); + data["lv"] = hanReader.getString( (int)Kamstrup_List1Phase::ListVersionIdentifier); + data["id"] = hanReader.getString( (int)Kamstrup_List1Phase::MeterID); + data["type"] = hanReader.getString( (int)Kamstrup_List1Phase::MeterType); + data["P"] = hanReader.getInt( (int)Kamstrup_List1Phase::ActiveImportPower); + data["Q"] = hanReader.getInt( (int)Kamstrup_List1Phase::ReactiveImportPower); + data["I1"] = ((double) hanReader.getInt((int)Kamstrup_List1Phase::CurrentL1)) / 100; + data["U1"] = hanReader.getInt( (int)Kamstrup_List1Phase::VoltageL1); } if (listSize >= (int)Kamstrup::List1PhaseLong) { - data["tPI"] = hanReader.getInt( (int)Kamstrup_List1Phase::CumulativeActiveImportEnergy); - data["tPO"] = hanReader.getInt( (int)Kamstrup_List1Phase::CumulativeActiveExportEnergy); - data["tQI"] = hanReader.getInt( (int)Kamstrup_List1Phase::CumulativeReactiveImportEnergy); - data["tQO"] = hanReader.getInt( (int)Kamstrup_List1Phase::CumulativeReactiveExportEnergy); + data["tPI"] = hanReader.getInt( (int)Kamstrup_List1Phase::CumulativeActiveImportEnergy); + data["tPO"] = hanReader.getInt( (int)Kamstrup_List1Phase::CumulativeActiveExportEnergy); + data["tQI"] = hanReader.getInt( (int)Kamstrup_List1Phase::CumulativeReactiveImportEnergy); + data["tQO"] = hanReader.getInt( (int)Kamstrup_List1Phase::CumulativeReactiveExportEnergy); } }