From ad78ff308214af451a17f065624d86328a2f9377 Mon Sep 17 00:00:00 2001 From: Thomas Barnekov Date: Wed, 5 Oct 2022 21:59:30 +0200 Subject: [PATCH 01/11] Fix implicit cast and non-const char pointer warnings --- src/AmsToMqttBridge.ino | 2 +- src/mqtt/HomeAssistantStatic.h | 12 ++++++------ src/web/AmsWebServer.cpp | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino index 20ee5ee5..23e7b52b 100644 --- a/src/AmsToMqttBridge.ino +++ b/src/AmsToMqttBridge.ino @@ -1122,7 +1122,7 @@ void WiFi_connect() { void mqttMessageReceived(String &topic, String &payload) { debugI("Received message for topic %s", topic.c_str() ); if(meterConfig.source == METER_SOURCE_MQTT) { - DataParserContext ctx = {payload.length()/2}; + DataParserContext ctx = {static_cast(payload.length()/2)}; fromHex(hanBuffer, payload, ctx.length); uint16_t pos = unwrapData(hanBuffer, ctx); // TODO: Run through DLMS/DMSR parser and apply AmsData diff --git a/src/mqtt/HomeAssistantStatic.h b/src/mqtt/HomeAssistantStatic.h index 7428959a..4aa2b286 100644 --- a/src/mqtt/HomeAssistantStatic.h +++ b/src/mqtt/HomeAssistantStatic.h @@ -4,12 +4,12 @@ #include "Arduino.h" struct HomeAssistantSensor { - char* name; - char* topic; - char* path; - char* uom; - char* devcl; - char* stacl; + const char* name; + const char* topic; + const char* path; + const char* uom; + const char* devcl; + const char* stacl; }; diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp index fa510cbc..4e3e1688 100644 --- a/src/web/AmsWebServer.cpp +++ b/src/web/AmsWebServer.cpp @@ -1007,7 +1007,7 @@ void AmsWebServer::handleSetup() { server.sendHeader("Location", String("/"), true); server.send (302, MIME_PLAIN, ""); } else { - SystemConfig sys { server.arg("board").toInt() }; + SystemConfig sys { static_cast(server.arg("board").toInt()) }; DebugConfig debugConfig; config->getDebugConfig(debugConfig); @@ -1277,11 +1277,11 @@ void AmsWebServer::handleSave() { if(server.hasArg("dc") && server.arg("dc") == "true") { printD("Received Domoticz config"); DomoticzConfig domo { - server.arg("elidx").toInt(), - server.arg("vl1idx").toInt(), - server.arg("vl2idx").toInt(), - server.arg("vl3idx").toInt(), - server.arg("cl1idx").toInt() + static_cast(server.arg("elidx").toInt()), + static_cast(server.arg("vl1idx").toInt()), + static_cast(server.arg("vl2idx").toInt()), + static_cast(server.arg("vl3idx").toInt()), + static_cast(server.arg("cl1idx").toInt()) }; config->setDomoticzConfig(domo); } @@ -1358,8 +1358,8 @@ void AmsWebServer::handleSave() { NtpConfig ntp { server.hasArg("n") && server.arg("n") == "true", server.hasArg("nd") && server.arg("nd") == "true", - server.arg("o").toInt() / 10, - server.arg("so").toInt() / 10 + static_cast(server.arg("o").toInt() / 10), + static_cast(server.arg("so").toInt() / 10) }; strcpy(ntp.server, server.arg("ns").c_str()); config->setNtpConfig(ntp); From 7cd52d5689cda98b1ec57c91a775d94eae7301cf Mon Sep 17 00:00:00 2001 From: Thomas Barnekov Date: Wed, 5 Oct 2022 23:53:40 +0200 Subject: [PATCH 02/11] Add individual power reading for all phases (include in HA) --- src/AmsData.cpp | 30 +++++++++++++++++++++++++ src/AmsData.h | 10 +++++++++ src/IEC6205675.cpp | 32 +++++++++++++++++++++++++++ src/IEC6205675.h | 6 +++++ src/mqtt/HomeAssistantMqttHandler.cpp | 6 +++++ src/mqtt/HomeAssistantStatic.h | 12 +++++++++- src/mqtt/JsonMqttHandler.cpp | 6 +++++ src/mqtt/RawMqttHandler.cpp | 18 +++++++++++++++ web/ha3.json | 6 +++++ web/json4.json | 6 +++++ 10 files changed, 131 insertions(+), 1 deletion(-) diff --git a/src/AmsData.cpp b/src/AmsData.cpp index f3db56e8..e6d536bf 100644 --- a/src/AmsData.cpp +++ b/src/AmsData.cpp @@ -45,6 +45,12 @@ void AmsData::apply(AmsData& other) { this->l1PowerFactor = other.getL1PowerFactor(); this->l2PowerFactor = other.getL2PowerFactor(); this->l3PowerFactor = other.getL3PowerFactor(); + this->l1activeImportPower = other.getL1ActiveImportPower(); + this->l2activeImportPower = other.getL2ActiveImportPower(); + this->l3activeImportPower = other.getL3ActiveImportPower(); + this->l1activeExportPower = other.getL1ActiveExportPower(); + this->l2activeExportPower = other.getL2ActiveExportPower(); + this->l3activeExportPower = other.getL3ActiveExportPower(); case 3: this->meterTimestamp = other.getMeterTimestamp(); this->activeImportCounter = other.getActiveImportCounter(); @@ -161,6 +167,30 @@ float AmsData::getL3PowerFactor() { return this->l3PowerFactor; } +float AmsData::getL1ActiveImportPower() { + return this->l1activeImportPower; +} + +float AmsData::getL2ActiveImportPower() { + return this->l2activeImportPower; +} + +float AmsData::getL3ActiveImportPower() { + return this->l3activeImportPower; +} + +float AmsData::getL1ActiveExportPower() { + return this->l1activeExportPower; +} + +float AmsData::getL2ActiveExportPower() { + return this->l2activeExportPower; +} + +float AmsData::getL3ActiveExportPower() { + return this->l3activeExportPower; +} + double AmsData::getActiveImportCounter() { return this->activeImportCounter; } diff --git a/src/AmsData.h b/src/AmsData.h index 21d29827..9445472a 100644 --- a/src/AmsData.h +++ b/src/AmsData.h @@ -54,6 +54,14 @@ public: float getL2PowerFactor(); float getL3PowerFactor(); + float getL1ActiveImportPower(); + float getL2ActiveImportPower(); + float getL3ActiveImportPower(); + + float getL1ActiveExportPower(); + float getL2ActiveExportPower(); + float getL3ActiveExportPower(); + double getActiveImportCounter(); double getReactiveImportCounter(); double getActiveExportCounter(); @@ -71,6 +79,8 @@ protected: time_t meterTimestamp = 0; uint16_t activeImportPower = 0, reactiveImportPower = 0, activeExportPower = 0, reactiveExportPower = 0; float l1voltage = 0, l2voltage = 0, l3voltage = 0, l1current = 0, l2current = 0, l3current = 0; + float l1activeImportPower = 0, l2activeImportPower = 0, l3activeImportPower = 0; + float l1activeExportPower = 0, l2activeExportPower = 0, l3activeExportPower = 0; float powerFactor = 0, l1PowerFactor = 0, l2PowerFactor = 0, l3PowerFactor = 0; double activeImportCounter = 0, reactiveImportCounter = 0, activeExportCounter = 0, reactiveExportCounter = 0; bool threePhase = false, twoPhase = false, counterEstimated = false; diff --git a/src/IEC6205675.cpp b/src/IEC6205675.cpp index 8ebe54f8..10ebda8f 100644 --- a/src/IEC6205675.cpp +++ b/src/IEC6205675.cpp @@ -296,6 +296,38 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo l3PowerFactor = val; } + val = getNumber(AMS_OBIS_ACTIVE_IMPORT_L1, sizeof(AMS_OBIS_ACTIVE_IMPORT_L1), ((char *) (d))); + if (val != NOVALUE) { + listType = 4; + l1activeImportPower = val; + } + val = getNumber(AMS_OBIS_ACTIVE_IMPORT_L2, sizeof(AMS_OBIS_ACTIVE_IMPORT_L2), ((char *) (d))); + if (val != NOVALUE) { + listType = 4; + l2activeImportPower = val; + } + val = getNumber(AMS_OBIS_ACTIVE_IMPORT_L3, sizeof(AMS_OBIS_ACTIVE_IMPORT_L3), ((char *) (d))); + if (val != NOVALUE) { + listType = 4; + l3activeImportPower = val; + } + + val = getNumber(AMS_OBIS_ACTIVE_EXPORT_L1, sizeof(AMS_OBIS_ACTIVE_EXPORT_L1), ((char *) (d))); + if (val != NOVALUE) { + listType = 4; + l1activeExportPower = val; + } + val = getNumber(AMS_OBIS_ACTIVE_EXPORT_L2, sizeof(AMS_OBIS_ACTIVE_EXPORT_L2), ((char *) (d))); + if (val != NOVALUE) { + listType = 4; + l2activeExportPower = val; + } + val = getNumber(AMS_OBIS_ACTIVE_EXPORT_L3, sizeof(AMS_OBIS_ACTIVE_EXPORT_L3), ((char *) (d))); + if (val != NOVALUE) { + listType = 4; + l3activeExportPower = val; + } + if(meterType == AmsTypeKamstrup) { if(listType >= 3) { activeImportCounter *= 10; diff --git a/src/IEC6205675.h b/src/IEC6205675.h index 3fb3df29..75cf0134 100644 --- a/src/IEC6205675.h +++ b/src/IEC6205675.h @@ -49,6 +49,12 @@ private: uint8_t AMS_OBIS_POWER_FACTOR_L1[4] = { 33, 7, 0, 255 }; uint8_t AMS_OBIS_POWER_FACTOR_L2[4] = { 53, 7, 0, 255 }; uint8_t AMS_OBIS_POWER_FACTOR_L3[4] = { 73, 7, 0, 255 }; + uint8_t AMS_OBIS_ACTIVE_IMPORT_L1[4] = { 21, 7, 0, 255 }; + uint8_t AMS_OBIS_ACTIVE_IMPORT_L2[4] = { 41, 7, 0, 255 }; + uint8_t AMS_OBIS_ACTIVE_IMPORT_L3[4] = { 61, 7, 0, 255 }; + uint8_t AMS_OBIS_ACTIVE_EXPORT_L1[4] = { 22, 7, 0, 255 }; + uint8_t AMS_OBIS_ACTIVE_EXPORT_L2[4] = { 42, 7, 0, 255 }; + uint8_t AMS_OBIS_ACTIVE_EXPORT_L3[4] = { 62, 7, 0, 255 }; }; #endif diff --git a/src/mqtt/HomeAssistantMqttHandler.cpp b/src/mqtt/HomeAssistantMqttHandler.cpp index 64d7f6d8..6794946b 100644 --- a/src/mqtt/HomeAssistantMqttHandler.cpp +++ b/src/mqtt/HomeAssistantMqttHandler.cpp @@ -40,8 +40,14 @@ bool HomeAssistantMqttHandler::publish(AmsData* data, AmsData* previousState, En data->getMeterId().c_str(), meterModel.c_str(), data->getActiveImportPower(), + data->getL1ActiveImportPower(), + data->getL2ActiveImportPower(), + data->getL3ActiveImportPower(), data->getReactiveImportPower(), data->getActiveExportPower(), + data->getL1ActiveExportPower(), + data->getL2ActiveExportPower(), + data->getL3ActiveExportPower(), data->getReactiveExportPower(), data->getL1Current(), data->getL2Current(), diff --git a/src/mqtt/HomeAssistantStatic.h b/src/mqtt/HomeAssistantStatic.h index 4aa2b286..8f781d6f 100644 --- a/src/mqtt/HomeAssistantStatic.h +++ b/src/mqtt/HomeAssistantStatic.h @@ -13,14 +13,20 @@ struct HomeAssistantSensor { }; -const uint8_t HA_SENSOR_COUNT PROGMEM = 50; +const uint8_t HA_SENSOR_COUNT PROGMEM = 60; HomeAssistantSensor HA_SENSORS[HA_SENSOR_COUNT] PROGMEM = { {"Status", "/state", "rssi", "dBm", "signal_strength", "\"measurement\""}, {"Supply volt", "/state", "vcc", "V", "voltage", "\"measurement\""}, {"Temperature", "/state", "temp", "C", "temperature", "\"measurement\""}, {"Active import", "/power", "P", "W", "power", "\"measurement\""}, + {"L1 active import", "/power", "P1", "W", "power", "\"measurement\""}, + {"L2 active import", "/power", "P2", "W", "power", "\"measurement\""}, + {"L3 active import", "/power", "P3", "W", "power", "\"measurement\""}, {"Reactive import", "/power", "Q", "VAr", "reactive_power", "\"measurement\""}, {"Active export", "/power", "PO", "W", "power", "\"measurement\""}, + {"L1 active export", "/power", "PO1", "W", "power", "\"measurement\""}, + {"L2 active export", "/power", "PO2", "W", "power", "\"measurement\""}, + {"L3 active export", "/power", "PO3", "W", "power", "\"measurement\""}, {"Reactive export", "/power", "QO", "VAr", "reactive_power", "\"measurement\""}, {"L1 current", "/power", "I1", "A", "current", "\"measurement\""}, {"L2 current", "/power", "I2", "A", "current", "\"measurement\""}, @@ -32,6 +38,10 @@ HomeAssistantSensor HA_SENSORS[HA_SENSOR_COUNT] PROGMEM = { {"Accumulated active export", "/energy", "tPO", "kWh", "energy", "\"total_increasing\""}, {"Accumulated reactive import","/energy", "tQI", "kVArh","energy", "\"total_increasing\""}, {"Accumulated reactive export","/energy", "tQO", "kVArh","energy", "\"total_increasing\""}, + {"Power factor", "/power", "PF", "", "power_factor", "\"measurement\""}, + {"L1 power factor", "/power", "PF1", "", "power_factor", "\"measurement\""}, + {"L2 power factor", "/power", "PF2", "", "power_factor", "\"measurement\""}, + {"L3 power factor", "/power", "PF3", "", "power_factor", "\"measurement\""}, {"Price current hour", "/prices", "prices['0']", "", "monetary", ""}, {"Price next hour", "/prices", "prices['1']", "", "monetary", ""}, {"Price in two hour", "/prices", "prices['2']", "", "monetary", ""}, diff --git a/src/mqtt/JsonMqttHandler.cpp b/src/mqtt/JsonMqttHandler.cpp index 6329b389..1b406c93 100644 --- a/src/mqtt/JsonMqttHandler.cpp +++ b/src/mqtt/JsonMqttHandler.cpp @@ -111,8 +111,14 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou data->getMeterId().c_str(), meterModel.c_str(), data->getActiveImportPower(), + data->getL1ActiveImportPower(), + data->getL2ActiveImportPower(), + data->getL3ActiveImportPower(), data->getReactiveImportPower(), data->getActiveExportPower(), + data->getL1ActiveExportPower(), + data->getL2ActiveExportPower(), + data->getL3ActiveExportPower(), data->getReactiveExportPower(), data->getL1Current(), data->getL2Current(), diff --git a/src/mqtt/RawMqttHandler.cpp b/src/mqtt/RawMqttHandler.cpp index c6763ed3..f2b681b4 100644 --- a/src/mqtt/RawMqttHandler.cpp +++ b/src/mqtt/RawMqttHandler.cpp @@ -11,6 +11,24 @@ bool RawMqttHandler::publish(AmsData* data, AmsData* meterState, EnergyAccountin } switch(data->getListType()) { case 4: + if(full || meterState->getL1ActiveImportPower() != data->getL1ActiveImportPower()) { + mqtt->publish(topic + "/meter/import/l1", String(data->getL1ActiveImportPower(), 2)); + } + if(full || meterState->getL2ActiveImportPower() != data->getL2ActiveImportPower()) { + mqtt->publish(topic + "/meter/import/l2", String(data->getL2ActiveImportPower(), 2)); + } + if(full || meterState->getL3ActiveImportPower() != data->getL3ActiveImportPower()) { + mqtt->publish(topic + "/meter/import/l3", String(data->getL3ActiveImportPower(), 2)); + } + if(full || meterState->getL1ActiveExportPower() != data->getL1ActiveExportPower()) { + mqtt->publish(topic + "/meter/export/l1", String(data->getL1ActiveExportPower(), 2)); + } + if(full || meterState->getL2ActiveExportPower() != data->getL2ActiveExportPower()) { + mqtt->publish(topic + "/meter/export/l2", String(data->getL2ActiveExportPower(), 2)); + } + if(full || meterState->getL3ActiveExportPower() != data->getL3ActiveExportPower()) { + mqtt->publish(topic + "/meter/export/l3", String(data->getL3ActiveExportPower(), 2)); + } if(full || meterState->getPowerFactor() != data->getPowerFactor()) { mqtt->publish(topic + "/meter/powerfactor", String(data->getPowerFactor(), 2)); } diff --git a/web/ha3.json b/web/ha3.json index 41fad56b..faee4724 100644 --- a/web/ha3.json +++ b/web/ha3.json @@ -3,8 +3,14 @@ "id" : "%s", "type" : "%s", "P" : %d, + "P1" : %.2f, + "P2" : %.2f, + "P3" : %.2f, "Q" : %d, "PO" : %d, + "PO1" : %.2f, + "PO2" : %.2f, + "PO3" : %.2f, "QO" : %d, "I1" : %.2f, "I2" : %.2f, diff --git a/web/json4.json b/web/json4.json index 701c06f4..cb61fb90 100644 --- a/web/json4.json +++ b/web/json4.json @@ -11,8 +11,14 @@ "id" : "%s", "type" : "%s", "P" : %d, + "P1" : %.2f, + "P2" : %.2f, + "P3" : %.2f, "Q" : %d, "PO" : %d, + "PO1" : %.2f, + "PO2" : %.2f, + "PO3" : %.2f, "QO" : %d, "I1" : %.2f, "I2" : %.2f, From 5e03e3d3c2124d60cf36e34793889b5a791e2a77 Mon Sep 17 00:00:00 2001 From: Thomas Barnekov Date: Fri, 7 Oct 2022 13:40:29 +0200 Subject: [PATCH 03/11] Move per-phase power consumption and power factor values to new ha4.json --- src/mqtt/HomeAssistantMqttHandler.cpp | 20 +++++++++++++++++++- web/ha3.json | 12 +----------- web/ha4.json | 25 +++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 web/ha4.json diff --git a/src/mqtt/HomeAssistantMqttHandler.cpp b/src/mqtt/HomeAssistantMqttHandler.cpp index 18057c2b..969db87c 100644 --- a/src/mqtt/HomeAssistantMqttHandler.cpp +++ b/src/mqtt/HomeAssistantMqttHandler.cpp @@ -6,6 +6,7 @@ #include "web/root/ha1_json.h" #include "web/root/ha2_json.h" #include "web/root/ha3_json.h" +#include "web/root/ha4_json.h" #include "web/root/jsonsys_json.h" #include "web/root/jsonprices_json.h" #include "web/root/hadiscover_json.h" @@ -34,8 +35,25 @@ bool HomeAssistantMqttHandler::publish(AmsData* data, AmsData* previousState, En data->getActiveImportPower() ); mqtt->publish(topic + "/power", json); - } else if(data->getListType() >= 2) { // publish power counts and volts/amps + } else if(data->getListType() <= 3) { // publish power counts and volts/amps snprintf_P(json, BufferSize, HA3_JSON, + data->getListId().c_str(), + data->getMeterId().c_str(), + meterModel.c_str(), + data->getActiveImportPower(), + data->getReactiveImportPower(), + data->getActiveExportPower(), + data->getReactiveExportPower(), + data->getL1Current(), + data->getL2Current(), + data->getL3Current(), + data->getL1Voltage(), + data->getL2Voltage(), + data->getL3Voltage() + ); + mqtt->publish(topic + "/power", json); + } else if(data->getListType() == 4) { // publish power counts and volts/amps/phase power and PF + snprintf_P(json, BufferSize, HA4_JSON, data->getListId().c_str(), data->getMeterId().c_str(), meterModel.c_str(), diff --git a/web/ha3.json b/web/ha3.json index faee4724..8fa16c93 100644 --- a/web/ha3.json +++ b/web/ha3.json @@ -3,23 +3,13 @@ "id" : "%s", "type" : "%s", "P" : %d, - "P1" : %.2f, - "P2" : %.2f, - "P3" : %.2f, "Q" : %d, "PO" : %d, - "PO1" : %.2f, - "PO2" : %.2f, - "PO3" : %.2f, "QO" : %d, "I1" : %.2f, "I2" : %.2f, "I3" : %.2f, "U1" : %.2f, "U2" : %.2f, - "U3" : %.2f, - "PF" : %.2f, - "PF1" : %.2f, - "PF2" : %.2f, - "PF3" : %.2f + "U3" : %.2f } diff --git a/web/ha4.json b/web/ha4.json new file mode 100644 index 00000000..faee4724 --- /dev/null +++ b/web/ha4.json @@ -0,0 +1,25 @@ +{ + "lv" : "%s", + "id" : "%s", + "type" : "%s", + "P" : %d, + "P1" : %.2f, + "P2" : %.2f, + "P3" : %.2f, + "Q" : %d, + "PO" : %d, + "PO1" : %.2f, + "PO2" : %.2f, + "PO3" : %.2f, + "QO" : %d, + "I1" : %.2f, + "I2" : %.2f, + "I3" : %.2f, + "U1" : %.2f, + "U2" : %.2f, + "U3" : %.2f, + "PF" : %.2f, + "PF1" : %.2f, + "PF2" : %.2f, + "PF3" : %.2f +} From 39a4761415fb16d02532028fc83ec060268dc6d5 Mon Sep 17 00:00:00 2001 From: Thomas Barnekov Date: Mon, 10 Oct 2022 16:59:39 +0200 Subject: [PATCH 04/11] Add DOCTYPE to html to fix quirks mode --- web/head.html | 1 + 1 file changed, 1 insertion(+) diff --git a/web/head.html b/web/head.html index 343c3c8f..6e34c7aa 100644 --- a/web/head.html +++ b/web/head.html @@ -1,3 +1,4 @@ + From ce3a47a7e6e0a6b896b2ce99a2b198725c8802b8 Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Wed, 12 Oct 2022 19:25:48 +0200 Subject: [PATCH 05/11] Fixed error blinks and improved WiFi reconnect --- src/AmsToMqttBridge.h | 2 +- src/AmsToMqttBridge.ino | 45 +++++++++++++++++++++++++++-------------- src/HwTools.cpp | 4 ++-- 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/src/AmsToMqttBridge.h b/src/AmsToMqttBridge.h index aa2e148a..477fbba2 100644 --- a/src/AmsToMqttBridge.h +++ b/src/AmsToMqttBridge.h @@ -1,7 +1,7 @@ #ifndef _AMSTOMQTTBRIDGE_H #define _AMSTOMQTTBRIDGE_H -#define WIFI_CONNECTION_TIMEOUT 30000; +#define WIFI_CONNECTION_TIMEOUT 30000 #define INVALID_BUTTON_PIN 0xFFFFFFFF diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino index e4f50fbe..92a527d1 100644 --- a/src/AmsToMqttBridge.ino +++ b/src/AmsToMqttBridge.ino @@ -436,6 +436,10 @@ void loop() { } } + if(now > 10000 && now - lastErrorBlink > 3000) { + errorBlink(); + } + // Only do normal stuff if we're not booted as AP if (WiFi.getMode() != WIFI_AP) { if (WiFi.status() != WL_CONNECTED) { @@ -506,10 +510,6 @@ void loop() { MDNS.update(); #endif - if(now > 10000 && now - lastErrorBlink > 3000) { - errorBlink(); - } - if (mqttEnabled || config.isMqttChanged()) { if(mqtt == NULL || !mqtt->connected() || config.isMqttChanged()) { MQTT_connect(); @@ -725,22 +725,25 @@ void errorBlink() { if(lastError == 3) lastError = 0; lastErrorBlink = millis(); - for(;lastError < 3;lastError++) { - switch(lastError) { + while(lastError < 3) { + switch(lastError++) { case 0: if(lastErrorBlink - meterState.getLastUpdateMillis() > 30000) { + debugW("No HAN data received last 30s, single blink"); hw.ledBlink(LED_RED, 1); // If no message received from AMS in 30 sec, blink once return; } break; case 1: if(mqttEnabled && mqtt != NULL && mqtt->lastError() != 0) { + debugW("MQTT connection not available, double blink"); hw.ledBlink(LED_RED, 2); // If MQTT error, blink twice return; } break; case 2: if(WiFi.getMode() != WIFI_AP && WiFi.status() != WL_CONNECTED) { + debugW("WiFi not connected, tripe blink"); hw.ledBlink(LED_RED, 3); // If WiFi not connected, blink three times return; } @@ -985,17 +988,29 @@ void debugPrint(byte *buffer, int start, int length) { Debug.println(""); } -unsigned long wifiTimeout = WIFI_CONNECTION_TIMEOUT; unsigned long lastWifiRetry = -WIFI_CONNECTION_TIMEOUT; void WiFi_connect() { - if(millis() - lastWifiRetry < wifiTimeout) { - delay(50); - return; - } - lastWifiRetry = millis(); - if (WiFi.status() != WL_CONNECTED) { + if(WiFi.status() == WL_DISCONNECTED) { + if(millis() - lastWifiRetry < WIFI_CONNECTION_TIMEOUT) { + return; + } + } if(WiFi.getMode() != WIFI_OFF) { + switch(WiFi.status()) { + case WL_NO_SSID_AVAIL: + debugE("WiFi error, no SSID available"); + break; + case WL_CONNECT_FAILED: + debugE("WiFi error, connection failed"); + break; + case WL_CONNECTION_LOST: + debugE("WiFi error, connection lost"); + break; + case WL_WRONG_PASSWORD: + debugE("WiFi error, wrong password"); + break; + } if(wifiReconnectCount > 3) { ESP.restart(); return; @@ -1029,11 +1044,11 @@ void WiFi_connect() { WiFi.softAPdisconnect(true); WiFi.enableAP(false); WiFi.mode(WIFI_OFF); + WiFi.forceSleepBegin(); yield(); - wifiTimeout = 5000; return; } - wifiTimeout = WIFI_CONNECTION_TIMEOUT; + lastWifiRetry = millis(); WiFiConfig wifi; if(!config.getWiFiConfig(wifi) || strlen(wifi.ssid) == 0) { diff --git a/src/HwTools.cpp b/src/HwTools.cpp index 007c06a4..7683621b 100644 --- a/src/HwTools.cpp +++ b/src/HwTools.cpp @@ -373,8 +373,8 @@ bool HwTools::ledBlink(uint8_t color, uint8_t blink) { if(!ledOn(color)) return false; delay(50); ledOff(color); - if(i != blink) - delay(50); + if(i != blink-1) + delay(200); } return true; } From a64f960cc7cba3fcf22db69f1f7261d2c0001b75 Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Wed, 12 Oct 2022 19:30:00 +0200 Subject: [PATCH 06/11] Added Pow-U+ profile --- src/web/AmsWebServer.cpp | 10 ++++++++++ web/setup.html | 1 + 2 files changed, 11 insertions(+) diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp index fa510cbc..e7e6047d 100644 --- a/src/web/AmsWebServer.cpp +++ b/src/web/AmsWebServer.cpp @@ -1077,6 +1077,16 @@ void AmsWebServer::handleSetup() { gpioConfig->vccResistorGnd = 22; gpioConfig->vccResistorVcc = 33; break; + case 7: // Pow-U+ + gpioConfig->hanPin = 16; + gpioConfig->apPin = 0; + gpioConfig->ledPinRed = 13; + gpioConfig->ledPinGreen = 14; + gpioConfig->ledRgbInverted = true; + gpioConfig->vccPin = 10; + gpioConfig->vccResistorGnd = 22; + gpioConfig->vccResistorVcc = 33; + break; case 101: // D1 gpioConfig->hanPin = 5; gpioConfig->apPin = 4; diff --git a/web/setup.html b/web/setup.html index 65846332..87d047f9 100644 --- a/web/setup.html +++ b/web/setup.html @@ -26,6 +26,7 @@ +
GPIO settings
@@ -8,18 +8,18 @@
HAN
- + ${h}
LED
- +
@@ -27,12 +27,12 @@
RGB
- - - + + +
@@ -40,31 +40,31 @@
AP button
- +
Temperature
- +
Analog temp
- +
Vcc
- +
GND resistor
- +
@@ -73,7 +73,7 @@
Vcc resistor
- +
@@ -82,19 +82,19 @@
Multiplier
- +
Offset
- +
Boot limit
- +
From 6d81b0a8566a33552744a45d5048a2ac25853447 Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Thu, 13 Oct 2022 20:24:56 +0200 Subject: [PATCH 10/11] Fixed all build warnings --- src/AmsToMqttBridge.ino | 21 +++++++++++---------- src/EnergyAccounting.cpp | 2 +- src/IEC6205675.cpp | 10 +++++++--- src/Uptime.cpp | 3 +++ src/Uptime.h | 2 -- src/entsoe/EntsoeA44Parser.cpp | 6 +++++- src/entsoe/EntsoeA44Parser.h | 1 + src/entsoe/EntsoeApi.cpp | 4 ++-- src/mqtt/AmsMqttHandler.h | 1 + src/mqtt/HomeAssistantMqttHandler.cpp | 16 ++++++++-------- src/mqtt/JsonMqttHandler.cpp | 11 ++++++----- src/mqtt/RawMqttHandler.cpp | 8 ++++---- src/web/AmsWebServer.cpp | 12 ++++++------ web/data.json | 6 +++--- web/ha2.json | 2 +- web/json1.json | 4 ++-- web/json2.json | 4 ++-- web/json3.json | 6 +++--- web/json4.json | 6 +++--- 19 files changed, 69 insertions(+), 56 deletions(-) diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino index 9956cde0..5d988fac 100644 --- a/src/AmsToMqttBridge.ino +++ b/src/AmsToMqttBridge.ino @@ -119,7 +119,6 @@ DLMSParser *dlmsParser = NULL; DSMRParser *dsmrParser = NULL; void setup() { - WiFiConfig wifi; Serial.begin(115200); if(!config.getGpioConfig(gpioConfig)) { @@ -246,7 +245,6 @@ void setup() { } Debug.setSerialEnabled(true); - DebugConfig debug; delay(1); float vcc = hw.getVcc(); @@ -591,7 +589,7 @@ void loop() { if(mqtt != NULL && mqttHandler != NULL && WiFi.getMode() != WIFI_AP && WiFi.status() == WL_CONNECTED && mqtt->connected() && !topic.isEmpty()) { mqttHandler->publishTemperatures(&config, &hw); } - debugD("Used %d ms to update temperature", millis()-start); + debugD("Used %ld ms to update temperature", millis()-start); } if(now - lastSysupdate > 10000) { if(mqtt != NULL && mqttHandler != NULL && WiFi.getMode() != WIFI_AP && WiFi.status() == WL_CONNECTED && mqtt->connected() && !topic.isEmpty()) { @@ -1017,6 +1015,9 @@ void WiFi_connect() { debugE("WiFi error, wrong password"); break; #endif + default: + debugE("WiFi error, %d", WiFi.status()); + break; } if(wifiReconnectCount > 3) { ESP.restart(); @@ -1145,16 +1146,16 @@ void WiFi_connect() { void mqttMessageReceived(String &topic, String &payload) { debugI("Received message for topic %s", topic.c_str() ); - if(meterConfig.source == METER_SOURCE_MQTT) { - DataParserContext ctx = {static_cast(payload.length()/2)}; - fromHex(hanBuffer, payload, ctx.length); - uint16_t pos = unwrapData(hanBuffer, ctx); + //if(meterConfig.source == METER_SOURCE_MQTT) { + //DataParserContext ctx = {static_cast(payload.length()/2)}; + //fromHex(hanBuffer, payload, ctx.length); + //uint16_t pos = unwrapData(hanBuffer, ctx); // TODO: Run through DLMS/DMSR parser and apply AmsData - } + //} } int16_t unwrapData(uint8_t *buf, DataParserContext &context) { - int16_t ret; + int16_t ret = 0; bool doRet = false; uint16_t end = BUF_SIZE_HAN; uint8_t tag = (*buf); @@ -1399,7 +1400,7 @@ void MQTT_connect() { #if defined(ESP8266) if(mqttSecureClient) { time_t epoch = time(nullptr); - debugD("Setting NTP time %i for secure MQTT connection", epoch); + debugD("Setting NTP time %lld for secure MQTT connection", epoch); mqttSecureClient->setX509Time(epoch); } #endif diff --git a/src/EnergyAccounting.cpp b/src/EnergyAccounting.cpp index d31441fb..87a0d252 100644 --- a/src/EnergyAccounting.cpp +++ b/src/EnergyAccounting.cpp @@ -57,7 +57,7 @@ bool EnergyAccounting::update(AmsData* amsData) { for(uint8_t i = 0; i < 5; i++) { debugger->printf("(EnergyAccounting) Peak hour from day %d: %d\n", data.peaks[i].day, data.peaks[i].value*10); } - debugger->printf("(EnergyAccounting) Loaded cost yesterday: %d, this month: %d, last month: %d\n", data.costYesterday / 10.0, data.costThisMonth, data.costLastMonth); + debugger->printf("(EnergyAccounting) Loaded cost yesterday: %.2f, this month: %d, last month: %d\n", data.costYesterday / 10.0, data.costThisMonth, data.costLastMonth); } init = true; } diff --git a/src/IEC6205675.cpp b/src/IEC6205675.cpp index 10ebda8f..8a4ccab6 100644 --- a/src/IEC6205675.cpp +++ b/src/IEC6205675.cpp @@ -368,12 +368,16 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo if(mid != NULL) { switch(mid->base.type) { case CosemTypeString: - memcpy(&meterId, mid->str.data, mid->str.length); + memcpy(str, mid->oct.data, mid->oct.length); + str[mid->oct.length] = 0x00; + meterId = String(str); meterId[mid->str.length] = 0; break; case CosemTypeOctetString: - memcpy(&meterId, mid->oct.data, mid->oct.length); - meterId[mid->oct.length] = 0; + memcpy(str, mid->str.data, mid->str.length); + str[mid->str.length] = 0x00; + meterId = String(str); + meterId[mid->str.length] = 0; break; } } diff --git a/src/Uptime.cpp b/src/Uptime.cpp index d3f739fd..65b5bd1d 100644 --- a/src/Uptime.cpp +++ b/src/Uptime.cpp @@ -1,5 +1,8 @@ #include "Uptime.h" +uint32_t _uptime_last_value = 0; +uint32_t _uptime_rollovers = 0; + uint64_t millis64() { uint32_t new_low32 = millis(); if (new_low32 < _uptime_last_value) _uptime_rollovers++; diff --git a/src/Uptime.h b/src/Uptime.h index 9b1a14a9..aeea9732 100644 --- a/src/Uptime.h +++ b/src/Uptime.h @@ -3,8 +3,6 @@ #include "Arduino.h" -static uint32_t _uptime_last_value = 0; -static uint32_t _uptime_rollovers = 0; uint64_t millis64(); #endif diff --git a/src/entsoe/EntsoeA44Parser.cpp b/src/entsoe/EntsoeA44Parser.cpp index 1d7fa9b2..9dc41de6 100644 --- a/src/entsoe/EntsoeA44Parser.cpp +++ b/src/entsoe/EntsoeA44Parser.cpp @@ -5,6 +5,10 @@ EntsoeA44Parser::EntsoeA44Parser() { for(int i = 0; i < 24; i++) points[i] = ENTSOE_NO_VALUE; } +EntsoeA44Parser::~EntsoeA44Parser() { + +} + char* EntsoeA44Parser::getCurrency() { return currency; } @@ -35,7 +39,7 @@ void EntsoeA44Parser::flush() { } size_t EntsoeA44Parser::write(const uint8_t *buffer, size_t size) { - for(int i = 0; i < size; i++) { + for(size_t i = 0; i < size; i++) { write(buffer[i]); } return size; diff --git a/src/entsoe/EntsoeA44Parser.h b/src/entsoe/EntsoeA44Parser.h index 4d860214..2f538d10 100644 --- a/src/entsoe/EntsoeA44Parser.h +++ b/src/entsoe/EntsoeA44Parser.h @@ -14,6 +14,7 @@ class EntsoeA44Parser: public Stream { public: EntsoeA44Parser(); + virtual ~EntsoeA44Parser(); char* getCurrency(); char* getMeasurementUnit(); diff --git a/src/entsoe/EntsoeApi.cpp b/src/entsoe/EntsoeApi.cpp index 886e7201..922220a2 100644 --- a/src/entsoe/EntsoeApi.cpp +++ b/src/entsoe/EntsoeApi.cpp @@ -106,11 +106,11 @@ bool EntsoeApi::loop() { if(midnightMillis == 0) { uint32_t curDayMillis = (((((tm.Hour * 60) + tm.Minute) * 60) + tm.Second) * 1000); midnightMillis = now + (SECS_PER_DAY * 1000) - curDayMillis; - if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Setting midnight millis %lu\n", midnightMillis); + if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Setting midnight millis %llu\n", midnightMillis); currentDay = tm.Day; return false; } else if(now > midnightMillis && currentDay != tm.Day) { - if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Rotating price objects at %lu\n", t); + if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Rotating price objects at %lld\n", t); if(today != NULL) delete today; if(tomorrow != NULL) { today = tomorrow; diff --git a/src/mqtt/AmsMqttHandler.h b/src/mqtt/AmsMqttHandler.h index 4ec71634..109c2a8d 100644 --- a/src/mqtt/AmsMqttHandler.h +++ b/src/mqtt/AmsMqttHandler.h @@ -15,6 +15,7 @@ public: this->mqtt = mqtt; this->json = buf; }; + virtual ~AmsMqttHandler() {}; virtual bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea); virtual bool publishTemperatures(AmsConfiguration*, HwTools*); diff --git a/src/mqtt/HomeAssistantMqttHandler.cpp b/src/mqtt/HomeAssistantMqttHandler.cpp index 969db87c..7880c254 100644 --- a/src/mqtt/HomeAssistantMqttHandler.cpp +++ b/src/mqtt/HomeAssistantMqttHandler.cpp @@ -141,7 +141,7 @@ bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) { time_t now = time(nullptr); - float min1hr, min3hr, min6hr; + float min1hr = 0.0, min3hr = 0.0, min6hr = 0.0; int8_t min1hrIdx = -1, min3hrIdx = -1, min6hrIdx = -1; float min = INT16_MAX, max = INT16_MIN; float values[24]; @@ -191,7 +191,7 @@ bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) { } - char ts1hr[21]; + char ts1hr[24]; if(min1hrIdx > -1) { time_t ts = now + (SECS_PER_HOUR * min1hrIdx); //Serial.printf("1hr: %d %lu\n", min1hrIdx, ts); @@ -199,7 +199,7 @@ bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) { breakTime(ts, tm); sprintf(ts1hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour); } - char ts3hr[21]; + char ts3hr[24]; if(min3hrIdx > -1) { time_t ts = now + (SECS_PER_HOUR * min3hrIdx); //Serial.printf("3hr: %d %lu\n", min3hrIdx, ts); @@ -207,7 +207,7 @@ bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) { breakTime(ts, tm); sprintf(ts3hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour); } - char ts6hr[21]; + char ts6hr[24]; if(min6hrIdx > -1) { time_t ts = now + (SECS_PER_HOUR * min6hrIdx); //Serial.printf("6hr: %d %lu\n", min6hrIdx, ts); @@ -287,13 +287,13 @@ bool HomeAssistantMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, Energ peaks++; } snprintf_P(json, BufferSize, HADISCOVER_JSON, - FPSTR(sensor.name), - topic.c_str(), FPSTR(sensor.topic), + sensor.name, + topic.c_str(), sensor.topic, haUID.c_str(), uid.c_str(), haUID.c_str(), uid.c_str(), uom.c_str(), - FPSTR(sensor.path), - FPSTR(sensor.devcl), + sensor.path, + sensor.devcl, haUID.c_str(), haName.c_str(), haModel.c_str(), diff --git a/src/mqtt/JsonMqttHandler.cpp b/src/mqtt/JsonMqttHandler.cpp index 1b406c93..9448b762 100644 --- a/src/mqtt/JsonMqttHandler.cpp +++ b/src/mqtt/JsonMqttHandler.cpp @@ -149,8 +149,9 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou bool JsonMqttHandler::publishTemperatures(AmsConfiguration* config, HwTools* hw) { int count = hw->getTempSensorCount(); - if(count < 2) + if(count < 2) { return false; + } snprintf(json, 24, "{\"temperatures\":{"); @@ -179,7 +180,7 @@ bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) { time_t now = time(nullptr); - float min1hr, min3hr, min6hr; + float min1hr = 0.0, min3hr = 0.0, min6hr = 0.0; int8_t min1hrIdx = -1, min3hrIdx = -1, min6hrIdx = -1; float min = INT16_MAX, max = INT16_MIN; float values[24]; @@ -229,7 +230,7 @@ bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) { } - char ts1hr[21]; + char ts1hr[24]; if(min1hrIdx > -1) { time_t ts = now + (SECS_PER_HOUR * min1hrIdx); //Serial.printf("1hr: %d %lu\n", min1hrIdx, ts); @@ -237,7 +238,7 @@ bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) { breakTime(ts, tm); sprintf(ts1hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour); } - char ts3hr[21]; + char ts3hr[24]; if(min3hrIdx > -1) { time_t ts = now + (SECS_PER_HOUR * min3hrIdx); //Serial.printf("3hr: %d %lu\n", min3hrIdx, ts); @@ -245,7 +246,7 @@ bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) { breakTime(ts, tm); sprintf(ts3hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour); } - char ts6hr[21]; + char ts6hr[24]; if(min6hrIdx > -1) { time_t ts = now + (SECS_PER_HOUR * min6hrIdx); //Serial.printf("6hr: %d %lu\n", min6hrIdx, ts); diff --git a/src/mqtt/RawMqttHandler.cpp b/src/mqtt/RawMqttHandler.cpp index f2b681b4..19e6db44 100644 --- a/src/mqtt/RawMqttHandler.cpp +++ b/src/mqtt/RawMqttHandler.cpp @@ -124,7 +124,7 @@ bool RawMqttHandler::publishPrices(EntsoeApi* eapi) { time_t now = time(nullptr); - float min1hr, min3hr, min6hr; + float min1hr = 0.0, min3hr = 0.0, min6hr = 0.0; int8_t min1hrIdx = -1, min3hrIdx = -1, min6hrIdx = -1; float min = INT16_MAX, max = INT16_MIN; float values[34]; @@ -175,7 +175,7 @@ bool RawMqttHandler::publishPrices(EntsoeApi* eapi) { } - char ts1hr[21]; + char ts1hr[24]; if(min1hrIdx > -1) { time_t ts = now + (SECS_PER_HOUR * min1hrIdx); //Serial.printf("1hr: %d %lu\n", min1hrIdx, ts); @@ -183,7 +183,7 @@ bool RawMqttHandler::publishPrices(EntsoeApi* eapi) { breakTime(ts, tm); sprintf(ts1hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour); } - char ts3hr[21]; + char ts3hr[24]; if(min3hrIdx > -1) { time_t ts = now + (SECS_PER_HOUR * min3hrIdx); //Serial.printf("3hr: %d %lu\n", min3hrIdx, ts); @@ -191,7 +191,7 @@ bool RawMqttHandler::publishPrices(EntsoeApi* eapi) { breakTime(ts, tm); sprintf(ts3hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour); } - char ts6hr[21]; + char ts6hr[24]; if(min6hrIdx > -1) { time_t ts = now + (SECS_PER_HOUR * min6hrIdx); //Serial.printf("6hr: %d %lu\n", min6hrIdx, ts); diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp index 0c7e44ce..20611d36 100644 --- a/src/web/AmsWebServer.cpp +++ b/src/web/AmsWebServer.cpp @@ -1599,21 +1599,21 @@ HTTPUpload& AmsWebServer::uploadFile(const char* path) { } file = LittleFS.open(path, "w"); if(debugger->isActive(RemoteDebug::DEBUG)) { - debugger->printf("handleFileUpload Open file and write: %lu\n", upload.currentSize); + debugger->printf("handleFileUpload Open file and write: %u\n", upload.currentSize); } size_t written = file.write(upload.buf, upload.currentSize); if(debugger->isActive(RemoteDebug::DEBUG)) { - debugger->printf("handleFileUpload Written: %lu\n", written); + debugger->printf("handleFileUpload Written: %u\n", written); } } } else if(upload.status == UPLOAD_FILE_WRITE) { if(debugger->isActive(RemoteDebug::DEBUG)) { - debugger->printf("handleFileUpload Writing: %lu\n", upload.currentSize); + debugger->printf("handleFileUpload Writing: %u\n", upload.currentSize); } if(file) { size_t written = file.write(upload.buf, upload.currentSize); if(debugger->isActive(RemoteDebug::DEBUG)) { - debugger->printf("handleFileUpload Written: %lu\n", written); + debugger->printf("handleFileUpload Written: %u\n", written); } delay(1); if(written != upload.currentSize) { @@ -2332,7 +2332,7 @@ void AmsWebServer::configFileDownload() { ds->getHourImport(23) )); if(day.activeExport > 0) { - server.sendContent(buf, snprintf(buf, BufferSize, " %lu %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n", + server.sendContent(buf, snprintf(buf, BufferSize, " %u %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n", day.activeExport, ds->getHourExport(0), ds->getHourExport(1), @@ -2401,7 +2401,7 @@ void AmsWebServer::configFileDownload() { ds->getDayImport(31) )); if(month.activeExport > 0) { - server.sendContent(buf, snprintf_P(buf, BufferSize, " %lu %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n", + server.sendContent(buf, snprintf_P(buf, BufferSize, " %u %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n", month.activeExport, ds->getDayExport(1), ds->getDayExport(2), diff --git a/web/data.json b/web/data.json index 0581d6ac..a713055a 100644 --- a/web/data.json +++ b/web/data.json @@ -23,8 +23,8 @@ "v" : %.3f, "r" : %d, "t" : %.2f, - "u" : %lu, - "m" : %lu, + "u" : %u, + "m" : %u, "em" : %d, "hm" : %d, "wm" : %d, @@ -53,5 +53,5 @@ "p" : %.2f } }, - "c" : %lu + "c" : %u } \ No newline at end of file diff --git a/web/ha2.json b/web/ha2.json index 06ab3f26..53fe3841 100644 --- a/web/ha2.json +++ b/web/ha2.json @@ -3,5 +3,5 @@ "tPO" : %.2f, "tQI" : %.2f, "tQO" : %.2f, - "rtc" : %lu + "rtc" : %lld } diff --git a/web/json1.json b/web/json1.json index 70f74801..e38fb4b9 100644 --- a/web/json1.json +++ b/web/json1.json @@ -1,8 +1,8 @@ { "id" : "%s", "name" : "%s", - "up" : %lu, - "t" : %lu, + "up" : %u, + "t" : %lld, "vcc" : %.3f, "rssi": %d, "temp": %.2f, diff --git a/web/json2.json b/web/json2.json index b875ac11..44bde282 100644 --- a/web/json2.json +++ b/web/json2.json @@ -1,8 +1,8 @@ { "id" : "%s", "name" : "%s", - "up" : %lu, - "t" : %lu, + "up" : %u, + "t" : %lld, "vcc" : %.3f, "rssi": %d, "temp": %.2f, diff --git a/web/json3.json b/web/json3.json index 33d022ba..09961abe 100644 --- a/web/json3.json +++ b/web/json3.json @@ -1,8 +1,8 @@ { "id" : "%s", "name" : "%s", - "up" : %lu, - "t" : %lu, + "up" : %u, + "t" : %lld, "vcc" : %.3f, "rssi": %d, "temp": %.2f, @@ -24,7 +24,7 @@ "tPO" : %.3f, "tQI" : %.3f, "tQO" : %.3f, - "rtc" : %lu + "rtc" : %lld }, "realtime" : { "h" : %.2f, diff --git a/web/json4.json b/web/json4.json index cb61fb90..417c2eed 100644 --- a/web/json4.json +++ b/web/json4.json @@ -1,8 +1,8 @@ { "id" : "%s", "name" : "%s", - "up" : %lu, - "t" : %lu, + "up" : %u, + "t" : %lld, "vcc" : %.3f, "rssi": %d, "temp": %.2f, @@ -34,7 +34,7 @@ "tPO" : %.2f, "tQI" : %.2f, "tQO" : %.2f, - "rtc" : %lu + "rtc" : %lld }, "realtime" : { "h" : %.2f, From fa299198fc12a042d6e0a6c3ec4f5d6f809051e3 Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Thu, 13 Oct 2022 20:33:59 +0200 Subject: [PATCH 11/11] Fixed all build warnings --- src/AmsConfiguration.cpp | 2 +- src/LNG.cpp | 16 ++++++++-------- src/ams/DsmrParser.cpp | 1 - src/ams/GcmParser.cpp | 2 +- src/ams/HdlcParser.cpp | 2 -- src/ams/LlcParser.cpp | 1 - src/ams/MbusParser.cpp | 2 -- src/entsoe/DnbCurrParser.cpp | 2 +- 8 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/AmsConfiguration.cpp b/src/AmsConfiguration.cpp index 3f391e99..450c7c06 100644 --- a/src/AmsConfiguration.cpp +++ b/src/AmsConfiguration.cpp @@ -743,7 +743,7 @@ bool AmsConfiguration::relocateConfig86() { } bool AmsConfiguration::relocateConfig87() { - MeterConfig87 meter87; + MeterConfig87 meter87 = {0,0,0,0,0,0,0}; MeterConfig meter; EEPROM.begin(EEPROM_SIZE); EEPROM.get(CONFIG_METER_START_87, meter87); diff --git a/src/LNG.cpp b/src/LNG.cpp index b5c9817b..f3ec7cd5 100644 --- a/src/LNG.cpp +++ b/src/LNG.cpp @@ -25,38 +25,38 @@ LNG::LNG(const char* payload, uint8_t useMeterType, MeterConfig* meterConfig, Da if(descriptor->obis[3] == 7) { if(descriptor->obis[4] == 0) { o170 = ntohl(item->dlu.data); - if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %d (dlu)", ntohl(item->dlu.data)); + if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu (dlu)", ntohl(item->dlu.data)); } } else if(descriptor->obis[3] == 8) { if(descriptor->obis[4] == 0) { activeImportCounter = ntohl(item->dlu.data) / 1000.0; listType = listType >= 3 ? listType : 3; - if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %d (dlu)", ntohl(item->dlu.data)); + if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu (dlu)", ntohl(item->dlu.data)); } else if(descriptor->obis[4] == 1) { o181 = ntohl(item->dlu.data); - if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %d (dlu)", ntohl(item->dlu.data)); + if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu (dlu)", ntohl(item->dlu.data)); } else if(descriptor->obis[4] == 2) { o182 = ntohl(item->dlu.data); - if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %d (dlu)", ntohl(item->dlu.data)); + if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu (dlu)", ntohl(item->dlu.data)); } } } else if(descriptor->obis[2] == 2) { if(descriptor->obis[3] == 7) { if(descriptor->obis[4] == 0) { o270 = ntohl(item->dlu.data); - if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %d (dlu)", ntohl(item->dlu.data)); + if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu (dlu)", ntohl(item->dlu.data)); } } else if(descriptor->obis[3] == 8) { if(descriptor->obis[4] == 0) { activeExportCounter = ntohl(item->dlu.data) / 1000.0; listType = listType >= 3 ? listType : 3; - if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %d (dlu)", ntohl(item->dlu.data)); + if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu (dlu)", ntohl(item->dlu.data)); } else if(descriptor->obis[4] == 1) { o281 = ntohl(item->dlu.data); - if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %d (dlu)", ntohl(item->dlu.data)); + if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu (dlu)", ntohl(item->dlu.data)); } else if(descriptor->obis[4] == 2) { o282 = ntohl(item->dlu.data); - if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %d (dlu)", ntohl(item->dlu.data)); + if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu (dlu)", ntohl(item->dlu.data)); } } } else if(descriptor->obis[2] == 96) { diff --git a/src/ams/DsmrParser.cpp b/src/ams/DsmrParser.cpp index 8ef8ef98..e6b006b1 100644 --- a/src/ams/DsmrParser.cpp +++ b/src/ams/DsmrParser.cpp @@ -4,7 +4,6 @@ int8_t DSMRParser::parse(uint8_t *buf, DataParserContext &ctx, bool verified) { uint16_t crcPos = 0; bool reachedEnd = verified; uint8_t lastByte = 0x00; - int c = 0; for(int pos = 0; pos < ctx.length; pos++) { uint8_t b = *(buf+pos); if(pos == 0 && b != '/') return DATA_PARSE_BOUNDRY_FLAG_MISSING; diff --git a/src/ams/GcmParser.cpp b/src/ams/GcmParser.cpp index 5ac92bfc..5f9e2bd5 100644 --- a/src/ams/GcmParser.cpp +++ b/src/ams/GcmParser.cpp @@ -27,7 +27,7 @@ int8_t GCMParser::parse(uint8_t *d, DataParserContext &ctx) { memcpy(ctx.system_title, ptr, systemTitleLength); memcpy(initialization_vector, ctx.system_title, systemTitleLength); - int len; + int len = 0; int headersize = 2 + systemTitleLength; ptr += systemTitleLength; if(((*ptr) & 0xFF) == 0x81) { diff --git a/src/ams/HdlcParser.cpp b/src/ams/HdlcParser.cpp index a82fd4bc..68a65ae1 100644 --- a/src/ams/HdlcParser.cpp +++ b/src/ams/HdlcParser.cpp @@ -5,8 +5,6 @@ int8_t HDLCParser::parse(uint8_t *d, DataParserContext &ctx) { int len; - uint8_t flag = *d; - uint8_t* ptr; if(ctx.length < 3) return DATA_PARSE_INCOMPLETE; diff --git a/src/ams/LlcParser.cpp b/src/ams/LlcParser.cpp index 3f348844..c6d41a56 100644 --- a/src/ams/LlcParser.cpp +++ b/src/ams/LlcParser.cpp @@ -1,7 +1,6 @@ #include "LlcParser.h" int8_t LLCParser::parse(uint8_t *buf, DataParserContext &ctx) { - LLCHeader* llc = (LLCHeader*) buf; ctx.length -= 3; return 3; } \ No newline at end of file diff --git a/src/ams/MbusParser.cpp b/src/ams/MbusParser.cpp index 731ffcaf..4a090da9 100644 --- a/src/ams/MbusParser.cpp +++ b/src/ams/MbusParser.cpp @@ -5,8 +5,6 @@ int8_t MBUSParser::parse(uint8_t *d, DataParserContext &ctx) { int headersize = 3; int footersize = 1; - uint8_t flag = *d; - uint8_t* ptr; // https://m-bus.com/documentation-wired/06-application-layer diff --git a/src/entsoe/DnbCurrParser.cpp b/src/entsoe/DnbCurrParser.cpp index c85dfb44..4c576ef1 100644 --- a/src/entsoe/DnbCurrParser.cpp +++ b/src/entsoe/DnbCurrParser.cpp @@ -22,7 +22,7 @@ void DnbCurrParser::flush() { } size_t DnbCurrParser::write(const uint8_t *buffer, size_t size) { - for(int i = 0; i < size; i++) { + for(size_t i = 0; i < size; i++) { write(buffer[i]); } return size;