Improved on automatic clearing of graph

Speedup build

.gitignore

@@ -7,7 +7,7 @@
 .vscode
 .pio
 platformio-user.ini
-/lib/AmsConfiguration/include/version.h
+/lib/FirmwareVersion/src/generated_version.h
 /src/web/root
 /src/AmsToMqttBridge.ino.cpp
 /test

lib/AmsConfiguration/src/AmsConfiguration.cpp

@@ -580,6 +580,7 @@ void AmsConfiguration::clearEntsoe(EntsoeConfig& config) {
 	strcpy(config.currency, "");
 	config.multiplier = 1000;
 	config.enabled = false;
+	config.fixedPrice = 0;
 }
 
 bool AmsConfiguration::isEntsoeChanged() {

lib/AmsDataStorage/src/AmsDataStorage.cpp

@@ -2,7 +2,7 @@
 #include <lwip/apps/sntp.h>
 #include "LittleFS.h"
 #include "AmsStorage.h"
-#include "version.h"
+#include "FirmwareVersion.h"
 
 AmsDataStorage::AmsDataStorage(RemoteDebug* debugger) {
     day.version = 5;
@@ -28,20 +28,20 @@ bool AmsDataStorage::update(AmsData* data) {
         if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(AmsDataStorage) Timezone is missing\n"));
         return false;
     }
-    if(now < BUILD_EPOCH) {
-        if(data->getMeterTimestamp() > BUILD_EPOCH) {
+    if(now < FirmwareVersion::BuildEpoch) {
+        if(data->getMeterTimestamp() > FirmwareVersion::BuildEpoch) {
             now = data->getMeterTimestamp();
             if(debugger->isActive(RemoteDebug::DEBUG)) {
                 debugger->printf_P(PSTR("(AmsDataStorage) Using meter timestamp, which is: %lu\n"), (int32_t) now);
             }
-        } else if(data->getPackageTimestamp() > BUILD_EPOCH) {
+        } else if(data->getPackageTimestamp() > FirmwareVersion::BuildEpoch) {
             now = data->getPackageTimestamp();
             if(debugger->isActive(RemoteDebug::DEBUG)) {
                 debugger->printf_P(PSTR("(AmsDataStorage) Using package timestamp, which is: %lu\n"), (int32_t) now);
             }
         }
     }
-    if(now < BUILD_EPOCH) {
+    if(now < FirmwareVersion::BuildEpoch) {
         if(debugger->isActive(RemoteDebug::VERBOSE)) {
             debugger->printf_P(PSTR("(AmsDataStorage) Invalid time: %lu\n"), (int32_t) now);
         }
@@ -66,13 +66,35 @@ bool AmsDataStorage::update(AmsData* data) {
         day.activeExport = exportCounter;
         day.lastMeterReadTime = now;
         return true;
+    } else if(day.activeImport == 0 || now - day.lastMeterReadTime > 86400) {
+        day.activeImport = importCounter;
+        day.activeExport = exportCounter;
+        day.lastMeterReadTime = now;
+        if(debugger->isActive(RemoteDebug::WARNING)) {
+            debugger->printf_P(PSTR("(AmsDataStorage) Too long since last day update, clearing data\n"));
+        }
+        for(int i = 0; i<24; i++) {
+            setHourImport(i, 0);
+            setHourExport(i, 0);
+        }
     } else {
         if(debugger->isActive(RemoteDebug::DEBUG)) {
             debugger->printf_P(PSTR("(AmsDataStorage) Last day update: %lu\n"), (int32_t) day.lastMeterReadTime);
         }
         tmElements_t last;
         breakTime(day.lastMeterReadTime, last);
-        for(int i = last.Hour; i < utc.Hour; i++) {
+        uint8_t endHour = utc.Hour;
+        if(last.Hour > utc.Hour){
+            for(int i = 0; i < utc.Hour; i++) {
+                if(debugger->isActive(RemoteDebug::VERBOSE)) {
+                    debugger->printf_P(PSTR("(AmsDataStorage) Clearing hour: %d\n"), i);
+                }
+                setHourImport(i, 0);
+                setHourExport(i, 0);
+            }
+            endHour = 24;
+        }
+        for(int i = last.Hour; i < endHour; i++) {
             if(debugger->isActive(RemoteDebug::VERBOSE)) {
                 debugger->printf_P(PSTR("(AmsDataStorage) Clearing hour: %d\n"), i);
             }
@@ -89,13 +111,35 @@ bool AmsDataStorage::update(AmsData* data) {
         month.activeImport = importCounter;
         month.activeExport = exportCounter;
         month.lastMeterReadTime = now;
+    } else if(month.activeImport == 0 || now - month.lastMeterReadTime > 2682000) {
+        month.activeImport = importCounter;
+        month.activeExport = exportCounter;
+        month.lastMeterReadTime = now;
+        if(debugger->isActive(RemoteDebug::WARNING)) {
+            debugger->printf_P(PSTR("(AmsDataStorage) Too long since last month update, clearing data\n"));
+        }
+        for(int i = 1; i<=31; i++) {
+            setDayImport(i, 0);
+            setDayExport(i, 0);
+        }
     } else {
         if(debugger->isActive(RemoteDebug::DEBUG)) {
             debugger->printf_P(PSTR("(AmsDataStorage) Last month update: %lu\n"), (int32_t) month.lastMeterReadTime);
         }
         tmElements_t last;
         breakTime(tz->toLocal(month.lastMeterReadTime), last);
-        for(int i = last.Day; i < ltz.Day; i++) {
+        uint8_t endDay = ltz.Day;
+        if(last.Day > ltz.Day) {
+            for(int i = 1; i < ltz.Day; i++) {
+                if(debugger->isActive(RemoteDebug::VERBOSE)) {
+                    debugger->printf_P(PSTR("(AmsDataStorage) Clearing day: %d\n"), i);
+                }
+                setDayImport(i, 0);
+                setDayExport(i, 0);
+            }
+            endDay = 31;
+        }
+        for(int i = last.Day; i < endDay; i++) {
             if(debugger->isActive(RemoteDebug::VERBOSE)) {
                 debugger->printf_P(PSTR("(AmsDataStorage) Clearing day: %d\n"), i);
             }
@@ -119,17 +163,6 @@ bool AmsDataStorage::update(AmsData* data) {
             day.lastMeterReadTime = now;
             setHourImport(utcYesterday.Hour, 0);
             setHourExport(utcYesterday.Hour, 0);
-        } else if(day.activeImport == 0 || now - day.lastMeterReadTime > 86400) {
-            day.activeImport = importCounter;
-            day.activeExport = exportCounter;
-            day.lastMeterReadTime = now;
-            if(debugger->isActive(RemoteDebug::WARNING)) {
-                debugger->printf_P(PSTR("(AmsDataStorage) Too long since last day update, clearing data\n"));
-            }
-            for(int i = 0; i<24; i++) {
-                setHourImport(i, 0);
-                setHourExport(i, 0);
-            }
         } else if(now - day.lastMeterReadTime < 4000) {
             uint32_t imp = importCounter - day.activeImport;
             uint32_t exp = exportCounter - day.activeExport;
@@ -186,17 +219,6 @@ bool AmsDataStorage::update(AmsData* data) {
             month.lastMeterReadTime = now;
             setDayImport(ltzYesterDay.Day, 0);
             setDayExport(ltzYesterDay.Day, 0);
-        } else if(month.activeImport == 0 || now - month.lastMeterReadTime > 2678400) {
-            month.activeImport = importCounter;
-            month.activeExport = exportCounter;
-            month.lastMeterReadTime = now;
-            if(debugger->isActive(RemoteDebug::WARNING)) {
-                debugger->printf_P(PSTR("(AmsDataStorage) Too long since last month update, clearing data\n"));
-            }
-            for(int i = 1; i<=31; i++) {
-                setDayImport(i, 0);
-                setDayExport(i, 0);
-            }
         } else if(now - month.lastMeterReadTime < 90100 && now - month.lastMeterReadTime > 82700) { // DST days are 23h (82800s) and 25h (90000)
             int32_t imp = importCounter - month.activeImport;
             int32_t exp = exportCounter - month.activeExport;
@@ -551,7 +573,7 @@ bool AmsDataStorage::isHappy() {
 
 bool AmsDataStorage::isDayHappy() {
     time_t now = time(nullptr);
-    if(now < BUILD_EPOCH) return false;
+    if(now < FirmwareVersion::BuildEpoch) return false;
     tmElements_t tm, last;
 
     if(now < day.lastMeterReadTime) {
@@ -579,7 +601,7 @@ bool AmsDataStorage::isMonthHappy() {
     }
 
     time_t now = time(nullptr);
-    if(now < BUILD_EPOCH) return false;
+    if(now < FirmwareVersion::BuildEpoch) return false;
     tmElements_t tm, last;
     
     if(now < month.lastMeterReadTime) {
@@ -589,10 +611,15 @@ bool AmsDataStorage::isMonthHappy() {
 
     breakTime(tz->toLocal(now), tm);
     breakTime(tz->toLocal(month.lastMeterReadTime), last);
-    if(tm.Day > last.Day) {
+    if(tm.Day != last.Day) {
         if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(AmsDataStorage) Month data day of last timestamp %d > %d\n"), tm.Day, last.Day);
         return false;
     }
 
+    if(now-month.lastMeterReadTime > 90100) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Month %lu - %lu > 3600\n", (int32_t) now, (int32_t) month.lastMeterReadTime);
+        return false;
+    }
+
     return true;
 }

lib/EnergyAccounting/include/EnergyAccounting.h

@@ -81,7 +81,7 @@ public:
     EnergyAccountingData getData();
     void setData(EnergyAccountingData&);
 
-    void setFixedPrice(float price);
+    void setFixedPrice(float price, String currency);
     float getPriceForHour(uint8_t h);
 
 private:
@@ -97,6 +97,7 @@ private:
     float produce = 0, incomeHour = 0, incomeDay = 0;
     EnergyAccountingData data = { 0, 0, 0, 0, 0, 0 };
     float fixedPrice = 0;
+    String currency = "";
 
     void calcDayCost();
     bool updateMax(uint16_t val, uint8_t day);

lib/EnergyAccounting/src/EnergyAccounting.cpp

@@ -1,7 +1,7 @@
 #include "EnergyAccounting.h"
 #include "LittleFS.h"
 #include "AmsStorage.h"
-#include "version.h"
+#include "FirmwareVersion.h"
 
 EnergyAccounting::EnergyAccounting(RemoteDebug* debugger) {
     data.version = 1;
@@ -33,7 +33,7 @@ bool EnergyAccounting::isInitialized() {
 bool EnergyAccounting::update(AmsData* amsData) {
     if(config == NULL) return false;
     time_t now = time(nullptr);
-    if(now < BUILD_EPOCH) return false;
+    if(now < FirmwareVersion::BuildEpoch) return false;
     if(tz == NULL) {
         if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(EnergyAccounting) Timezone is missing\n"));
         return false;
@@ -132,7 +132,7 @@ bool EnergyAccounting::update(AmsData* amsData) {
         use += kwhi;
         if(price != ENTSOE_NO_VALUE) {
             float cost = price * kwhi;
-            if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(EnergyAccounting)  and %.4f %s\n"), cost / 100.0, eapi->getCurrency());
+            if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(EnergyAccounting)  and %.4f %s\n"), cost / 100.0, currency.c_str());
             costHour += cost;
             costDay += cost;
         }
@@ -142,7 +142,7 @@ bool EnergyAccounting::update(AmsData* amsData) {
         produce += kwhe;
         if(price != ENTSOE_NO_VALUE) {
             float income = price * kwhe;
-            if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(EnergyAccounting)  and %.4f %s\n"), income / 100.0, eapi->getCurrency());
+            if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(EnergyAccounting)  and %.4f %s\n"), income / 100.0, currency.c_str());
             incomeHour += income;
             incomeDay += income;
         }
@@ -188,7 +188,7 @@ float EnergyAccounting::getUseThisHour() {
 float EnergyAccounting::getUseToday() {
     float ret = 0.0;
     time_t now = time(nullptr);
-    if(now < BUILD_EPOCH) return 0.0;
+    if(now < FirmwareVersion::BuildEpoch) return 0.0;
     if(tz == NULL) return 0.0;
     tmElements_t utc, local;
     breakTime(tz->toLocal(now), local);
@@ -201,7 +201,7 @@ float EnergyAccounting::getUseToday() {
 
 float EnergyAccounting::getUseThisMonth() {
     time_t now = time(nullptr);
-    if(now < BUILD_EPOCH) return 0.0;
+    if(now < FirmwareVersion::BuildEpoch) return 0.0;
     float ret = 0;
     for(uint8_t i = 0; i < currentDay; i++) {
         ret += ds->getDayImport(i) / 1000.0;
@@ -216,7 +216,7 @@ float EnergyAccounting::getProducedThisHour() {
 float EnergyAccounting::getProducedToday() {
     float ret = 0.0;
     time_t now = time(nullptr);
-    if(now < BUILD_EPOCH) return 0.0;
+    if(now < FirmwareVersion::BuildEpoch) return 0.0;
     tmElements_t utc, local;
     breakTime(tz->toLocal(now), local);
     for(uint8_t i = 0; i < currentHour; i++) {
@@ -228,7 +228,7 @@ float EnergyAccounting::getProducedToday() {
 
 float EnergyAccounting::getProducedThisMonth() {
     time_t now = time(nullptr);
-    if(now < BUILD_EPOCH) return 0.0;
+    if(now < FirmwareVersion::BuildEpoch) return 0.0;
     float ret = 0;
     for(uint8_t i = 0; i < currentDay; i++) {
         ret += ds->getDayExport(i) / 1000.0;
@@ -499,8 +499,9 @@ bool EnergyAccounting::updateMax(uint16_t val, uint8_t day) {
     return false;
 }
 
-void EnergyAccounting::setFixedPrice(float price) {
+void EnergyAccounting::setFixedPrice(float price, String currency) {
     this->fixedPrice = price;
+    this->currency = currency;
 }
 
 float EnergyAccounting::getPriceForHour(uint8_t h) {

lib/EntsoePriceApi/src/EntsoeApi.cpp

@@ -3,7 +3,7 @@
 #include "Uptime.h"
 #include "TimeLib.h"
 #include "DnbCurrParser.h"
-#include "version.h"
+#include "FirmwareVersion.h"
 
 #include "GcmParser.h"
 
@@ -37,7 +37,7 @@ void EntsoeApi::setup(EntsoeConfig& config) {
     http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
     http.setReuse(false);
     http.setTimeout(60000);
-    http.setUserAgent("ams2mqtt/" + String(VERSION));
+    http.setUserAgent("ams2mqtt/" + String(FirmwareVersion::VersionString));
     http.useHTTP10(true);
 
     #if defined(AMS2MQTT_PRICE_KEY)
@@ -135,7 +135,7 @@ bool EntsoeApi::loop() {
     if(now < 10000) return false; // Grace period
 
     time_t t = time(nullptr);
-    if(t < BUILD_EPOCH) return false;
+    if(t < FirmwareVersion::BuildEpoch) return false;
 
     #ifndef AMS2MQTT_PRICE_KEY
     if(strlen(getToken()) == 0) {

lib/FirmwareVersion/include/FirmwareVersion.h

@@ -0,0 +1,12 @@
+#ifndef _FIRMWARE_VERSION_h
+#define _FIRMWARE_VERSION_h
+
+
+class FirmwareVersion {
+public:
+	static long BuildEpoch;
+	static const char* VersionString;
+};
+
+#endif
+

lib/FirmwareVersion/src/FirmwareVersion.cpp

@@ -0,0 +1,5 @@
+#include "FirmwareVersion.h"
+#include "generated_version.h"
+
+long FirmwareVersion::BuildEpoch = BUILD_EPOCH;
+const char* FirmwareVersion::VersionString = VERSION_STRING;

lib/HomeAssistantMqttHandler/include/HomeAssistantStatic.h

@@ -3,7 +3,7 @@
 
 #include "Arduino.h"
 
-typedef struct HomeAssistantSensor {
+struct HomeAssistantSensor {
     const char* name;
     const char* topic;
     const char* path;
@@ -15,75 +15,75 @@ typedef struct HomeAssistantSensor {
 
 const uint8_t List1SensorCount PROGMEM = 1;
 const HomeAssistantSensor List1Sensors[List1SensorCount] PROGMEM = {
-    {"Active import",              "/power",   "P",                 "W",    "power",           "\"measurement\""}
+    {"Active import",              "/power",   "P",                 "W",    "power",           "measurement"}
 };
 
 const uint8_t List2SensorCount PROGMEM = 8;
 const HomeAssistantSensor List2Sensors[List2SensorCount] PROGMEM = {
-    {"Reactive import",            "/power",   "Q",                 "var",  "reactive_power",  "\"measurement\""},
-    {"Reactive export",            "/power",   "QO",                "var",  "reactive_power",  "\"measurement\""},
-    {"L1 current",                 "/power",   "I1",                "A",    "current",         "\"measurement\""},
-    {"L2 current",                 "/power",   "I2",                "A",    "current",         "\"measurement\""},
-    {"L3 current",                 "/power",   "I3",                "A",    "current",         "\"measurement\""},
-    {"L1 voltage",                 "/power",   "U1",                "V",    "voltage",         "\"measurement\""},
-    {"L2 voltage",                 "/power",   "U2",                "V",    "voltage",         "\"measurement\""},
-    {"L3 voltage",                 "/power",   "U3",                "V",    "voltage",         "\"measurement\""}
+    {"Reactive import",            "/power",   "Q",                 "var",  "reactive_power",  "measurement"},
+    {"Reactive export",            "/power",   "QO",                "var",  "reactive_power",  "measurement"},
+    {"L1 current",                 "/power",   "I1",                "A",    "current",         "measurement"},
+    {"L2 current",                 "/power",   "I2",                "A",    "current",         "measurement"},
+    {"L3 current",                 "/power",   "I3",                "A",    "current",         "measurement"},
+    {"L1 voltage",                 "/power",   "U1",                "V",    "voltage",         "measurement"},
+    {"L2 voltage",                 "/power",   "U2",                "V",    "voltage",         "measurement"},
+    {"L3 voltage",                 "/power",   "U3",                "V",    "voltage",         "measurement"}
 };
 
 const uint8_t List2ExportSensorCount PROGMEM = 1;
 const HomeAssistantSensor List2ExportSensors[List2ExportSensorCount] PROGMEM = {
-    {"Active export",              "/power",   "PO",                "W",    "power",           "\"measurement\""}
+    {"Active export",              "/power",   "PO",                "W",    "power",           "measurement"}
 };
 
 const uint8_t List3SensorCount PROGMEM = 3;
 const HomeAssistantSensor List3Sensors[List3SensorCount] PROGMEM = {
-    {"Accumulated active import",  "/energy",  "tPI",               "kWh",  "energy",          "\"total_increasing\""},
-    {"Accumulated reactive import","/energy",  "tQI",               "",     "energy",          "\"total_increasing\""},
-    {"Accumulated reactive export","/energy",  "tQO",               "",     "energy",          "\"total_increasing\""}
+    {"Accumulated active import",  "/energy",  "tPI",               "kWh",  "energy",          "total_increasing"},
+    {"Accumulated reactive import","/energy",  "tQI",               "kvarh","",                "total_increasing"},
+    {"Accumulated reactive export","/energy",  "tQO",               "kvarh","",                "total_increasing"}
 };
 
 const uint8_t List3ExportSensorCount PROGMEM = 1;
 const HomeAssistantSensor List3ExportSensors[List3ExportSensorCount] PROGMEM = {
-    {"Accumulated active export",  "/energy",  "tPO",               "kWh",  "energy",          "\"total_increasing\""}
+    {"Accumulated active export",  "/energy",  "tPO",               "kWh",  "energy",          "total_increasing"}
 };
 
 const uint8_t List4SensorCount PROGMEM = 7;
 const HomeAssistantSensor List4Sensors[List4SensorCount] PROGMEM = {
-    {"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\""},
-    {"L1 active import",           "/power",   "P1",                "W",    "power",           "\"measurement\""},
-    {"L2 active import",           "/power",   "P2",                "W",    "power",           "\"measurement\""},
-    {"L3 active import",           "/power",   "P3",                "W",    "power",           "\"measurement\""}
+    {"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"},
+    {"L1 active import",           "/power",   "P1",                "W",    "power",           "measurement"},
+    {"L2 active import",           "/power",   "P2",                "W",    "power",           "measurement"},
+    {"L3 active import",           "/power",   "P3",                "W",    "power",           "measurement"}
 };
 
 const uint8_t List4ExportSensorCount PROGMEM = 3;
 const HomeAssistantSensor List4ExportSensors[List4ExportSensorCount] PROGMEM = {
-    {"L1 active export",           "/power",   "PO1",               "W",    "power",           "\"measurement\""},
-    {"L2 active export",           "/power",   "PO2",               "W",    "power",           "\"measurement\""},
-    {"L3 active export",           "/power",   "PO3",               "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"}
 };
 
 const uint8_t RealtimeSensorCount PROGMEM = 8;
 const HomeAssistantSensor RealtimeSensors[RealtimeSensorCount] PROGMEM = {
-    {"Month max",                  "/realtime","max",               "kWh",  "energy",          "\"total_increasing\""},
-    {"Tariff threshold",           "/realtime","threshold",         "kWh",  "energy",          "\"total_increasing\""},
-    {"Current hour used",          "/realtime","hour.use",          "kWh",  "energy",          "\"total_increasing\""},
+    {"Month max",                  "/realtime","max",               "kWh",  "energy",          "total_increasing"},
+    {"Tariff threshold",           "/realtime","threshold",         "kWh",  "energy",          "total_increasing"},
+    {"Current hour used",          "/realtime","hour.use",          "kWh",  "energy",          "total_increasing"},
     {"Current hour cost",          "/realtime","hour.cost",         "",     "monetary",        ""},
-    {"Current day used",           "/realtime","day.use",           "kWh",  "energy",          "\"total_increasing\""},
+    {"Current day used",           "/realtime","day.use",           "kWh",  "energy",          "total_increasing"},
     {"Current day cost",           "/realtime","day.cost",          "",     "monetary",        ""},
-    {"Current month used",         "/realtime","month.use",         "kWh",  "energy",          "\"total_increasing\""},
+    {"Current month used",         "/realtime","month.use",         "kWh",  "energy",          "total_increasing"},
     {"Current month cost",         "/realtime","month.cost",        "",     "monetary",        ""}
 };
 
 const uint8_t RealtimeExportSensorCount PROGMEM = 6;
 const HomeAssistantSensor RealtimeExportSensors[RealtimeExportSensorCount] PROGMEM = {
-    {"Current hour produced",      "/realtime","hour.produced",     "kWh",  "energy",          "\"total_increasing\""},
+    {"Current hour produced",      "/realtime","hour.produced",     "kWh",  "energy",          "total_increasing"},
     {"Current hour income",        "/realtime","hour.income",       "",     "monetary",        ""},
-    {"Current day produced",       "/realtime","day.produced",      "kWh",  "energy",          "\"total_increasing\""},
+    {"Current day produced",       "/realtime","day.produced",      "kWh",  "energy",          "total_increasing"},
     {"Current day income",         "/realtime","day.income",        "",     "monetary",        ""},
-    {"Current month produced",     "/realtime","month.produced",    "kWh",  "energy",          "\"total_increasing\""},
+    {"Current month produced",     "/realtime","month.produced",    "kWh",  "energy",          "total_increasing"},
     {"Current month income",       "/realtime","month.income",      "",     "monetary",        ""}
 };
 
@@ -102,11 +102,11 @@ const HomeAssistantSensor PriceSensor PROGMEM = {"Price in %02d %s", "/prices",
 
 const uint8_t SystemSensorCount PROGMEM = 2;
 const HomeAssistantSensor SystemSensors[SystemSensorCount] PROGMEM = {
-    {"Status",                     "/state",   "rssi",              "dBm",  "signal_strength", "\"measurement\""},
-    {"Supply volt",                "/state",   "vcc",               "V",    "voltage",         "\"measurement\""}
+    {"Status",                     "/state",   "rssi",              "dBm",  "signal_strength", "measurement"},
+    {"Supply volt",                "/state",   "vcc",               "V",    "voltage",         "measurement"}
 };
 
-const HomeAssistantSensor TemperatureSensor PROGMEM = {"Temperature sensor %s", "/temperatures", "temperatures['%s']", "°C", "temperature", "\"measurement\""};
+const HomeAssistantSensor TemperatureSensor PROGMEM = {"Temperature sensor %s", "/temperatures", "temperatures['%s']", "°C", "temperature", "measurement"};
 
 
 #endif

lib/HomeAssistantMqttHandler/json/hadiscover.json

@@ -5,7 +5,6 @@
     "obj_id" : "%s_%s",
     "unit_of_meas" : "%s",
     "val_tpl" : "{{ value_json.%s | is_defined }}",
-    "dev_cla" : "%s",
     "dev" : {
       "ids" : [ "%s" ],
       "name" : "%s",
@@ -13,5 +12,5 @@
       "sw" : "%s",
       "mf" : "%s",
       "cu" : "%s"
-    }%s %s
+    }%s%s%s%s%s%s
 }

lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp

@@ -1,7 +1,7 @@
 #include "HomeAssistantMqttHandler.h"
 #include "hexutils.h"
 #include "Uptime.h"
-#include "version.h"
+#include "FirmwareVersion.h"
 #include "json/ha1_json.h"
 #include "json/ha2_json.h"
 #include "json/ha3_json.h"
@@ -329,7 +329,7 @@ bool HomeAssistantMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, Energ
         hw->getVcc(),
         hw->getWifiRssi(),
         hw->getTemperature(),
-        VERSION
+        FirmwareVersion::VersionString
     );
     bool ret = mqtt->publish(topic + "/state", json);
     loop();
@@ -350,15 +350,18 @@ void HomeAssistantMqttHandler::publishSensor(const HomeAssistantSensor& sensor)
         deviceUid.c_str(), uid.c_str(),
         sensor.uom,
         sensor.path,
-        sensor.devcl,
         deviceUid.c_str(),
         deviceName.c_str(),
         deviceModel.c_str(),
-        VERSION,
+        FirmwareVersion::VersionString,
         manufacturer.c_str(),
         deviceUrl.c_str(),
-        strlen_P(sensor.stacl) > 0 ? ", \"stat_cla\" :" : "",
-        strlen_P(sensor.stacl) > 0 ? (char *) FPSTR(sensor.stacl) : ""
+        strlen_P(sensor.devcl) > 0 ? ",\"dev_cla\":\"" : "",
+        strlen_P(sensor.devcl) > 0 ? (char *) FPSTR(sensor.devcl) : "",
+        strlen_P(sensor.devcl) > 0 ? "\"" : "",
+        strlen_P(sensor.stacl) > 0 ? ",\"stat_cla\":\"" : "",
+        strlen_P(sensor.stacl) > 0 ? (char *) FPSTR(sensor.stacl) : "",
+        strlen_P(sensor.stacl) > 0 ? "\"" : ""
     );
     mqtt->publish(discoveryTopic + deviceUid + "_" + uid.c_str() + "/config", json, true, 0);
     loop();

lib/JsonMqttHandler/src/JsonMqttHandler.cpp

@@ -1,5 +1,5 @@
 #include "JsonMqttHandler.h"
-#include "version.h"
+#include "FirmwareVersion.h"
 #include "hexutils.h"
 #include "Uptime.h"
 #include "json/json1_json.h"
@@ -341,7 +341,7 @@ bool JsonMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounti
         hw->getVcc(),
         hw->getWifiRssi(),
         hw->getTemperature(),
-        VERSION
+        FirmwareVersion::VersionString
     );
     bool ret = mqtt->publish(topic, json);
     loop();

lib/SvelteUi/app/package-lock.json

@@ -2714,9 +2714,9 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
-      "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz",
+      "integrity": "sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==",
       "dev": true,
       "engines": {
         "node": ">= 14"
@@ -4411,9 +4411,9 @@
       "dev": true
     },
     "yaml": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
-      "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz",
+      "integrity": "sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==",
       "dev": true
     }
   }

lib/SvelteUi/app/src/lib/AmpPlot.svelte

@@ -14,7 +14,8 @@
 
     function point(v) {
         return {
-            label: fmtnum(v) +'A', 
+            label: fmtnum(v) + 'A',
+            title: v.toFixed(1) + ' A',
             value: isNaN(v) ? 0 : v, 
             color: ampcol(v ? (v)/(max)*100 : 0) 
         };

lib/SvelteUi/app/src/lib/BarChart.svelte

@@ -61,6 +61,7 @@
 
         <g class='bars'>
             {#each config.points as point, i}
+                <g>
                 {#if point.value !== undefined}
                     <rect
                         x="{xScale(i) + 2}"
@@ -79,9 +80,15 @@
                             text-anchor="{barWidth < 25 ? 'left' : 'middle'}"
                             fill="{yScale(point.value) > yScale(0)-labelOffset ? point.color : 'white'}"
                             transform="rotate({barWidth < 25 ? 90 : 0}, {xScale(i) + (barWidth/2)}, {yScale(point.value) > yScale(0)-labelOffset ? yScale(point.value) - labelOffset : yScale(point.value)+9})"
+                            
                         >{point.label}</text>
+                        {#if point.title}
+                        <title>{point.title}</title>
+                        {/if}
                     {/if}
                 {/if}
+                </g>
+                <g>
                 {#if point.value2 > 0.0001}
                     <rect
                         x="{xScale(i) + 2}"
@@ -100,8 +107,12 @@
                             fill="{yScale(-point.value2) < yScale(0)+12 ? point.color : 'white'}"
                             transform="rotate({barWidth < 25 ? 90 : 0}, {xScale(i) + (barWidth/2)}, {yScale(point.value2 - config.y.min) > yScale(0)-12 ? yScale(point.value2 - config.y.min) - 12 : yScale(point.value2 - config.y.min)+9})"
                         >{point.label2}</text>
+                        {#if point.title2}
+                        <title>{point.title2}</title>
+                        {/if}
                     {/if}
                 {/if}
+                </g>
             {/each}
         </g>
     </svg>

lib/SvelteUi/app/src/lib/DayPlot.svelte

@@ -26,8 +26,10 @@
             });
             points.push({
                 label: imp.toFixed(1), 
+                title: imp.toFixed(2) + ' kWh',
                 value: imp*10, 
                 label2: exp.toFixed(1), 
+                title2: exp.toFixed(2) + ' kWh',
                 value2: exp*10,
                 color: '#7c3aed' 
             });
@@ -46,8 +48,10 @@
             });
             points.push({
                 label: imp.toFixed(1), 
+                title: imp.toFixed(2) + ' kWh',
                 value: imp*10, 
                 label2: exp.toFixed(1), 
+                title2: exp.toFixed(2) + ' kWh',
                 value2: exp*10,
                 color: '#7c3aed' 
             });

lib/SvelteUi/app/src/lib/Helpers.js

@@ -116,7 +116,7 @@ export function hanError(err) {
         case -51: return "Authentication failed";
         case -52: return "Decryption failed";
         case -53: return "Encryption key invalid";
-        case 90: return "No HAN data received last 30s";
+        case 90: return "No HAN data received for at least 30s";
         case 91: return "Serial break";
         case 92: return "Serial buffer full";
         case 93: return "Serial FIFO overflow";

lib/SvelteUi/app/src/lib/MonthPlot.svelte

@@ -27,9 +27,11 @@
                 label: zeropad(i)
             });
             points.push({
-                label: imp.toFixed(0), 
+                label: imp.toFixed(imp < 10 ? 1 : 0), 
+                title: imp.toFixed(2) + ' kWh',
                 value: imp, 
-                label2: exp.toFixed(0), 
+                label2: exp.toFixed(exp < 10 ? 1 : 0), 
+                title2: exp.toFixed(2) + ' kWh',
                 value2: exp,
                 color: '#7c3aed' 
             });
@@ -46,9 +48,11 @@
                 label: zeropad(i)
             });
             points.push({
-                label: imp.toFixed(0), 
+                label: imp.toFixed(imp < 10 ? 1 : 0), 
+                title: imp.toFixed(2) + ' kWh', 
                 value: imp, 
-                label2: exp.toFixed(0), 
+                label2: exp.toFixed(exp < 10 ? 1 : 0), 
+                title2: exp.toFixed(2) + ' kWh', 
                 value2: exp,
                 color: '#7c3aed' 
             });

lib/SvelteUi/app/src/lib/PricePlot.svelte

@@ -26,8 +26,10 @@
             });
             points.push({
                 label: val > 0 ? val.toFixed(d) : '', 
+                title: val > 0 ? val.toFixed(2) + ' ' + json.currency : '',
                 value: val > 0 ? Math.abs(val*100) : 0, 
                 label2: val < 0 ? val.toFixed(d) : '', 
+                title2: val < 0 ? val.toFixed(2) + ' ' + json.currency : '',
                 value2: val < 0 ? Math.abs(val*100) : 0, 
                 color: '#7c3aed' 
             });

lib/SvelteUi/app/src/lib/StatusPage.svelte

@@ -164,7 +164,7 @@
             <div class="my-2 flex">
                 Latest version: 
                 <a href={nextVersion.html_url} class="ml-2 text-blue-600 hover:text-blue-800" target='_blank' rel="noreferrer">{nextVersion.tag_name}</a>
-                {#if (sysinfo.security == 0 || data.a) && sysinfo.fwconsent === 1 && nextVersion && nextVersion.tag_name}
+                {#if (sysinfo.security == 0 || data.a) && sysinfo.fwconsent === 1 && nextVersion && nextVersion.tag_name != sysinfo.version}
                 <div class="flex-none ml-2 text-green-500" title="Install this version">
                     <button on:click={askUpgrade}><DownloadIcon/></button>
                 </div>

lib/SvelteUi/app/src/lib/TemperaturePlot.svelte

@@ -22,7 +22,7 @@
                     label: name.slice(-4)
                 });
                 points.push({
-                    label: val.toFixed(1), 
+                    label: val.toFixed(1),
                     value: val, 
                     color: '#7c3aed' 
                 });

lib/SvelteUi/app/src/lib/VoltPlot.svelte

@@ -12,6 +12,7 @@
     function point(v) {
         return {
             label: fmtnum(v) + 'V', 
+            title: v.toFixed(1) + ' V',
             value: isNaN(v) ? 0 : v, 
             color: voltcol(v ? v : 0) 
         };

lib/SvelteUi/app/vite.config.js

@@ -17,18 +17,18 @@ export default defineConfig({
   plugins: [svelte()],
   server: {
     proxy: {
-      "/data.json": "http://192.168.233.244",
-      "/energyprice.json": "http://192.168.233.244",
-      "/dayplot.json": "http://192.168.233.244",
-      "/monthplot.json": "http://192.168.233.244",
-      "/temperature.json": "http://192.168.233.244",
-      "/sysinfo.json": "http://192.168.233.244",
-      "/configuration.json": "http://192.168.233.244",
-      "/tariff.json": "http://192.168.233.244",
-      "/save": "http://192.168.233.244",
-      "/reboot": "http://192.168.233.244",
-      "/configfile": "http://192.168.233.244",
-      "/upgrade": "http://192.168.233.244"
+      "/data.json": "http://192.168.233.235",
+      "/energyprice.json": "http://192.168.233.235",
+      "/dayplot.json": "http://192.168.233.235",
+      "/monthplot.json": "http://192.168.233.235",
+      "/temperature.json": "http://192.168.233.235",
+      "/sysinfo.json": "http://192.168.233.235",
+      "/configuration.json": "http://192.168.233.235",
+      "/tariff.json": "http://192.168.233.235",
+      "/save": "http://192.168.233.235",
+      "/reboot": "http://192.168.233.235",
+      "/configfile": "http://192.168.233.235",
+      "/upgrade": "http://192.168.233.235"
     }
   }
 })

lib/SvelteUi/src/AmsWebServer.cpp

@@ -1,5 +1,6 @@
 #include "AmsWebServer.h"
 #include "AmsWebHeaders.h"
+#include "FirmwareVersion.h"
 #include "base64.h"
 #include "hexutils.h"
 
@@ -31,8 +32,6 @@
 #include "html/conf_ui_json.h"
 #include "html/firmware_html.h"
 
-#include "version.h"
-
 #if defined(ESP32)
 #include <esp_task_wdt.h>
 #include <esp_wifi.h>
@@ -64,9 +63,9 @@ void AmsWebServer::setup(AmsConfiguration* config, GpioConfig* gpioConfig, Meter
 	this->ea = ea;
 
 	server.on(F("/"), HTTP_GET, std::bind(&AmsWebServer::indexHtml, this));
-	snprintf_P(buf, 32, PSTR("/index-%s.js"), VERSION);
+	snprintf_P(buf, 32, PSTR("/index-%s.js"), FirmwareVersion::VersionString);
 	server.on(buf, HTTP_GET, std::bind(&AmsWebServer::indexJs, this));
-	snprintf_P(buf, 32, PSTR("/index-%s.css"), VERSION);
+	snprintf_P(buf, 32, PSTR("/index-%s.css"), FirmwareVersion::VersionString);
 	server.on(buf, HTTP_GET, std::bind(&AmsWebServer::indexCss, this));
 
 	server.on(F("/configuration"), HTTP_GET, std::bind(&AmsWebServer::indexHtml, this));
@@ -263,7 +262,7 @@ void AmsWebServer::sysinfoJson() {
 		meterId.replace(F("\\"), F("\\\\"));
 
 	int size = snprintf_P(buf, BufferSize, SYSINFO_JSON,
-		VERSION,
+		FirmwareVersion::VersionString,
 		#if defined(CONFIG_IDF_TARGET_ESP32S2)
 		"esp32s2",
 		#elif defined(CONFIG_IDF_TARGET_ESP32C3)
@@ -770,7 +769,6 @@ void AmsWebServer::indexJs() {
 		return;
 
 	server.sendHeader(HEADER_CACHE_CONTROL, CACHE_1MO);
-	server.setContentLength(INDEX_JS_LEN);
 	server.send_P(200, MIME_JS, INDEX_JS);
 }
 
@@ -824,7 +822,7 @@ void AmsWebServer::configurationJson() {
 
 	server.setContentLength(CONTENT_LENGTH_UNKNOWN);
 	server.send_P(200, MIME_JSON, PSTR("{\"version\":\""));
-	server.sendContent_P(VERSION);
+	server.sendContent_P(FirmwareVersion::VersionString);
 	server.sendContent_P(PSTR("\","));
 	snprintf_P(buf, BufferSize, CONF_GENERAL_JSON,
 		ntpConfig.timezone,
@@ -1536,7 +1534,7 @@ void AmsWebServer::upgrade() {
 }
 
 void AmsWebServer::upgradeFromUrl(String url, String nextVersion) {
-	config->setUpgradeInformation(0xFF, 0xFF, VERSION, nextVersion.c_str());
+	config->setUpgradeInformation(0xFF, 0xFF, FirmwareVersion::VersionString, nextVersion.c_str());
 
 	WiFiClient client;
 	#if defined(ESP8266)
@@ -1555,10 +1553,10 @@ void AmsWebServer::upgradeFromUrl(String url, String nextVersion) {
 
 	#if defined(ESP8266)
 		ESP8266HTTPUpdate httpUpdate = ESP8266HTTPUpdate(60000);
-		String currentVersion = VERSION;
+		String currentVersion = FirmwareVersion::VersionString;
 	#elif defined(ESP32)
 		HTTPUpdate httpUpdate = HTTPUpdate(60000);
-		String currentVersion = String(VERSION) + "-" + chipType;
+		String currentVersion = String(FirmwareVersion::VersionString) + "-" + chipType;
 	#endif
 
 	httpUpdate.rebootOnUpdate(false);
@@ -1566,7 +1564,7 @@ void AmsWebServer::upgradeFromUrl(String url, String nextVersion) {
 	HTTPUpdateResult ret = httpUpdate.update(client, url, currentVersion);
 	int lastError = httpUpdate.getLastError();
 
-	config->setUpgradeInformation(ret, ret == HTTP_UPDATE_OK ? 0 : lastError, VERSION, nextVersion.c_str());
+	config->setUpgradeInformation(ret, ret == HTTP_UPDATE_OK ? 0 : lastError, FirmwareVersion::VersionString, nextVersion.c_str());
 	switch(ret) {
 		case HTTP_UPDATE_FAILED:
 			debugger->printf_P(PSTR("Update failed\n"));
@@ -1604,7 +1602,7 @@ void AmsWebServer::firmwarePost() {
 	if(rebootForUpgrade) {
 		server.send(200);
 	} else {
-		config->setUpgradeInformation(0xFF, 0xFF, VERSION, "");
+		config->setUpgradeInformation(0xFF, 0xFF, FirmwareVersion::VersionString, "");
 		if(server.hasArg(F("url"))) {
 			String url = server.arg(F("url"));
 			if(!url.isEmpty() && (url.startsWith(F("http://")) || url.startsWith(F("https://")))) {
@@ -1891,7 +1889,7 @@ void AmsWebServer::configFileDownload() {
 	server.setContentLength(CONTENT_LENGTH_UNKNOWN);
 
 	server.send_P(200, MIME_PLAIN, PSTR("amsconfig\n"));
-	server.sendContent(buf, snprintf_P(buf, BufferSize, PSTR("version %s\n"), VERSION));
+	server.sendContent(buf, snprintf_P(buf, BufferSize, PSTR("version %s\n"), FirmwareVersion::VersionString));
 	server.sendContent(buf, snprintf_P(buf, BufferSize, PSTR("boardType %d\n"), sys.boardType));
 	
 	if(includeWifi) {
@@ -2019,6 +2017,7 @@ void AmsWebServer::configFileDownload() {
 		server.sendContent(buf, snprintf_P(buf, BufferSize, PSTR("entsoeArea %s\n"), entsoe.area));
 		server.sendContent(buf, snprintf_P(buf, BufferSize, PSTR("entsoeCurrency %s\n"), entsoe.currency));
 		server.sendContent(buf, snprintf_P(buf, BufferSize, PSTR("entsoeMultiplier %.3f\n"), entsoe.multiplier / 1000.0));
+		server.sendContent(buf, snprintf_P(buf, BufferSize, PSTR("entsoeFixedPrice %.3f\n"), entsoe.fixedPrice / 1000.0));
 	}
 
 	if(includeThresholds) {

platformio.ini

@@ -2,7 +2,7 @@
 extra_configs = platformio-user.ini
 
 [common]
-lib_deps = EEPROM, LittleFS, DNSServer, https://github.com/256dpi/arduino-mqtt.git, OneWireNg@0.10.0, DallasTemperature@3.9.1, EspSoftwareSerial@6.14.1, https://github.com/gskjold/RemoteDebug.git, Time@1.6.1, Timezone@1.2.4, AmsConfiguration, AmsData, AmsDataStorage, HwTools, Uptime, AmsDecoder, EntsoePriceApi, EnergyAccounting, RawMqttHandler, JsonMqttHandler, DomoticzMqttHandler, HomeAssistantMqttHandler, SvelteUi
+lib_deps = EEPROM, LittleFS, DNSServer, https://github.com/256dpi/arduino-mqtt.git, OneWireNg@0.10.0, DallasTemperature@3.9.1, EspSoftwareSerial@6.14.1, https://github.com/gskjold/RemoteDebug.git, Time@1.6.1, Timezone@1.2.4, FirmwareVersion, AmsConfiguration, AmsData, AmsDataStorage, HwTools, Uptime, AmsDecoder, EntsoePriceApi, EnergyAccounting, RawMqttHandler, JsonMqttHandler, DomoticzMqttHandler, HomeAssistantMqttHandler, SvelteUi
 lib_ignore = OneWire
 extra_scripts =
     pre:scripts/addversion.py
@@ -32,7 +32,7 @@ lib_ignore = ${common.lib_ignore}
 extra_scripts = ${common.extra_scripts}
 
 [env:esp32]
-platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.02.00/platform-espressif32.zip
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.04.02/platform-espressif32.zip
 framework = arduino
 board = esp32dev
 board_build.f_cpu = 160000000L
@@ -47,7 +47,7 @@ extra_scripts = ${common.extra_scripts}
 # https://github.com/Jason2866/esp32-arduino-lib-builder
 
 [env:esp32s2]
-platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.02.00/platform-espressif32.zip
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.04.02/platform-espressif32.zip
 framework = arduino
 board = esp32-s2-saola-1
 board_build.mcu = esp32s2
@@ -63,7 +63,7 @@ lib_ignore = ${common.lib_ignore}
 extra_scripts = ${common.extra_scripts}
 
 [env:esp32solo]
-platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.02.00/platform-espressif32.zip
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.04.02/platform-espressif32.zip
 framework = arduino
 board = esp32-solo1
 board_build.f_cpu = 160000000L
@@ -75,7 +75,7 @@ lib_ignore = ${common.lib_ignore}
 extra_scripts = ${common.extra_scripts}
 
 [env:esp32c3]
-platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.02.00/platform-espressif32.zip
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.04.02/platform-espressif32.zip
 framework = arduino
 board = esp32-c3-devkitm-1
 board_build.mcu = esp32c3

scripts/addversion.py

@@ -2,7 +2,7 @@ import os
 import subprocess
 from time import time
 
-FILENAME_VERSION_H = 'lib/AmsConfiguration/include/version.h'
+FILENAME_VERSION_H = 'lib/FirmwareVersion/src/generated_version.h'
 version = os.environ.get('GITHUB_TAG')
 if version == None:
     try:
@@ -15,9 +15,7 @@ if version == None:
       version = "SNAPSHOT"
 
 hf = """
-#ifndef VERSION
-  #define VERSION "{}"
-#endif
+#define VERSION_STRING "{}"
 #define BUILD_EPOCH {}
 """.format(version, round(time()))
 with open(FILENAME_VERSION_H, 'w+') as f:

scripts/esp32/flash.sh

@@ -29,7 +29,7 @@ fi
 
 if [ "$1" = "flash" ];then
     $esptool --chip esp32 --port $2 --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect \
-    0x1000 bootloader_dio_40m.bin \
+    0x1000 bootloader.bin \
     0x8000 partitions.bin \
     0xe000 boot_app0.bin \
     0x10000 firmware.bin

scripts/esp32/mkzip.sh

@@ -8,7 +8,6 @@ if [ ! -d $build_dir ];then
     exit 1
 fi
 
-cp ~/.platformio/packages/framework-arduinoespressif32/tools/sdk/$env/bin/bootloader_dio_40m.bin $build_dir
 cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin $build_dir
 chmod +x scripts/$env/flash.sh
 zip -j $env.zip $build_dir/*.bin scripts/$env/flash.sh

scripts/esp32c3/flash.sh

@@ -29,7 +29,7 @@ fi
 
 if [ "$1" = "flash" ];then
     $esptool --chip esp32c3 --port $2 --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect \
-    0x1000 bootloader_qio_80m.bin \
+    0x0000 bootloader.bin \
     0x8000 partitions.bin \
     0xe000 boot_app0.bin \
     0x10000 firmware.bin

scripts/esp32c3/mkzip.sh

@@ -8,7 +8,6 @@ if [ ! -d $build_dir ];then
     exit 1
 fi
 
-cp ~/.platformio/packages/framework-arduinoespressif32/tools/sdk/$env/bin/bootloader_qio_80m.bin $build_dir
 cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin $build_dir
 chmod +x scripts/$env/flash.sh
 zip -j $env.zip $build_dir/*.bin scripts/$env/flash.sh

scripts/esp32s2/flash.sh

@@ -29,7 +29,7 @@ fi
 
 if [ "$1" = "flash" ];then
     $esptool --chip esp32s2 --port $2 --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect \
-    0x1000 bootloader_qio_40m.bin \
+    0x1000 bootloader.bin \
     0x8000 partitions.bin \
     0xe000 boot_app0.bin \
     0x10000 firmware.bin

scripts/esp32s2/mkzip.sh

@@ -8,7 +8,6 @@ if [ ! -d $build_dir ];then
     exit 1
 fi
 
-cp ~/.platformio/packages/framework-arduinoespressif32/tools/sdk/$env/bin/bootloader_qio_40m.bin $build_dir
 cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin $build_dir
 chmod +x scripts/$env/flash.sh
 zip -j $env.zip $build_dir/*.bin scripts/$env/flash.sh

scripts/esp32solo/flash.sh

@@ -29,7 +29,7 @@ fi
 
 if [ "$1" = "flash" ];then
     $esptool --chip esp32 --port $2 --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect \
-    0x1000 bootloader_dio_40m.bin \
+    0x1000 bootloader.bin \
     0x8000 partitions.bin \
     0xe000 boot_app0.bin \
     0x10000 firmware.bin

scripts/esp32solo/mkzip.sh

@@ -8,7 +8,6 @@ if [ ! -d $build_dir ];then
     exit 1
 fi
 
-cp ~/.platformio/packages/framework-arduinoespressif32/tools/sdk/$env/bin/bootloader_dio_40m.bin $build_dir
 cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin $build_dir
 chmod +x scripts/$env/flash.sh
 zip -j $env.zip $build_dir/*.bin scripts/$env/flash.sh

src/AmsToMqttBridge.cpp

@@ -23,6 +23,8 @@
  * to Norwegian meters, but may also support data from electricity providers in other countries. 
  */
 
+#include <Arduino.h>
+
 #if defined(ESP8266)
 ADC_MODE(ADC_VCC);
 #endif
@@ -36,8 +38,7 @@ ADC_MODE(ADC_VCC);
 #include <driver/uart.h>
 #endif
 
-#include "version.h"
-
+#include "FirmwareVersion.h"
 #include "AmsToMqttBridge.h"
 #include "AmsStorage.h"
 #include "AmsDataStorage.h"
@@ -96,7 +97,7 @@ RemoteDebug Debug;
 
 EntsoeApi* eapi = NULL;
 
-Timezone* tz;
+Timezone* tz = NULL;
 
 AmsWebServer ws(commonBuffer, &Debug, &hw);
 
@@ -133,6 +134,30 @@ LLCParser *llcParser = NULL;
 DLMSParser *dlmsParser = NULL;
 DSMRParser *dsmrParser = NULL;
 
+
+void configFileParse();
+void swapWifiMode();
+void WiFi_connect();
+void WiFi_post_connect();
+void MQTT_connect();
+void handleNtpChange();
+void handleDataSuccess(AmsData* data);
+void handleTemperature(unsigned long now);
+void handleSystem(unsigned long now);
+void handleAutodetect(unsigned long now);
+void handleButton(unsigned long now);
+void handlePriceApi(unsigned long now);
+void handleClear(unsigned long now);
+void handleEnergyAccountingChanged();
+bool readHanPort();
+void setupHanPort(GpioConfig& gpioConfig, uint32_t baud, uint8_t parityOrdinal, bool invert);
+void rxerr(int err);
+int16_t unwrapData(uint8_t *buf, DataParserContext &context);
+void errorBlink();
+void printHanReadError(int pos);
+void debugPrint(byte *buffer, int start, int length);
+
+
 void setup() {
 	Serial.begin(115200);
 
@@ -186,7 +211,7 @@ void setup() {
 		ws.setEntsoeApi(eapi);
 	}
 	ws.setPriceSettings(entsoe.area, entsoe.currency);
-	ea.setFixedPrice(entsoe.fixedPrice / 1000.0);
+	ea.setFixedPrice(entsoe.fixedPrice / 1000.0, entsoe.currency);
 	bool shared = false;
 	config.getMeterConfig(meterConfig);
 	Serial.flush();
@@ -309,7 +334,7 @@ void setup() {
 					}
 					flashed = Update.end(true);
 				}
-				config.setUpgradeInformation(flashed ? 2 : 0, 0xFF, VERSION, "");
+				config.setUpgradeInformation(flashed ? 2 : 0, 0xFF, FirmwareVersion::VersionString, "");
 				firmwareFile.close();
 			} else {
 				debugW_P(PSTR("AP button pressed, skipping firmware update and deleting firmware file."));
@@ -341,9 +366,6 @@ void setup() {
 		NtpConfig ntp;
 		if(config.getNtpConfig(ntp)) {
 			tz = resolveTimezone(ntp.timezone);
-			configTime(tz->toLocal(0), tz->toLocal(JULY1970)-JULY1970, ntp.enable ? strlen(ntp.server) > 0 ? ntp.server : (char*) F("pool.ntp.org") : (char*) F("")); // Add NTP server by default if none is configured
-			sntp_servermode_dhcp(ntp.enable && ntp.dhcp ? 1 : 0);
-			ntpEnabled = ntp.enable;
 			ws.setTimezone(tz);
 			ds.setTimezone(tz);
 			ea.setTimezone(tz);
@@ -386,6 +408,7 @@ bool wifiConnected = false;
 unsigned long lastTemperatureRead = 0;
 unsigned long lastSysupdate = 0;
 unsigned long lastErrorBlink = 0; 
+unsigned long lastDataStoreUpdate = 0;
 int lastError = 0;
 
 bool meterAutodetect = false;
@@ -523,6 +546,9 @@ void loop() {
 				debugW_P(PSTR("Used %dms to read HAN port (false)"), millis()-start);
 			}
 		}
+		if(now > lastDataStoreUpdate && now - lastDataStoreUpdate > 3600000 && !ds.isHappy()) {
+			handleClear(now);
+		}
 	} catch(const std::exception& e) {
 		debugE_P(PSTR("Exception in readHanPort (%s)"), e.what());
 		meterState.setLastError(METER_ERROR_EXCEPTION);
@@ -553,6 +579,17 @@ void loop() {
 	}
 }
 
+void handleClear(unsigned long now) {
+	tmElements_t tm;
+	breakTime(time(nullptr), tm);
+	if(tm.Minute == 0) {
+		AmsData nullData;
+		debugI_P(PSTR("Clearing data that have not been updated"));
+		ds.update(&nullData);
+		lastDataStoreUpdate = now;
+	}
+}
+
 void handleEnergyAccountingChanged() {
 	EnergyAccountingConfig *eac = ea.getConfig();
 	config.getEnergyAccountingConfig(*eac);
@@ -560,12 +597,21 @@ void handleEnergyAccountingChanged() {
 	config.ackEnergyAccountingChange();
 }
 
+char ntpServerName[64] = "";
+
 void handleNtpChange() {
 	NtpConfig ntp;
 	if(config.getNtpConfig(ntp)) {
 		tz = resolveTimezone(ntp.timezone);
-		configTime(tz->toLocal(0), tz->toLocal(JULY1970)-JULY1970, ntp.enable ? strlen(ntp.server) > 0 ? ntp.server : (char*) F("pool.ntp.org") : (char*) F("")); // Add NTP server by default if none is configured
-		sntp_servermode_dhcp(ntp.enable && ntp.dhcp ? 1 : 0);
+		if(ntp.enable && strlen(ntp.server) > 0) {
+			strcpy(ntpServerName, ntp.server);
+		} else if(ntp.enable) {
+			strcpy(ntpServerName, "pool.ntp.org");
+		} else {
+			memset(ntpServerName, 0, 64);
+		}
+		configTime(tz->toLocal(0), tz->toLocal(JULY1970)-JULY1970, ntpServerName, "", "");
+		sntp_servermode_dhcp(ntp.enable && ntp.dhcp ? 1 : 0); // Not implemented on ESP32?
 		ntpEnabled = ntp.enable;
 
 		ws.setTimezone(tz);
@@ -649,7 +695,7 @@ void handlePriceApi(unsigned long now) {
 		}
 		ws.setPriceSettings(entsoe.area, entsoe.currency);
 		config.ackEntsoeChange();
-		ea.setFixedPrice(entsoe.fixedPrice / 1000.0);
+		ea.setFixedPrice(entsoe.fixedPrice / 1000.0, entsoe.currency);
 	}
 }
 
@@ -704,8 +750,8 @@ void rxerr(int err) {
 	if(err == 0) return;
 	switch(err) {
 		case 1:
-			debugE_P(PSTR("Serial break error"));
-			break;
+			debugD_P(PSTR("Serial break"));
+			return;
 		case 2:
 			debugE_P(PSTR("Serial buffer overflow"));
 			rxBufferErrors++;
@@ -720,10 +766,10 @@ void rxerr(int err) {
 			debugE_P(PSTR("Serial FIFO overflow"));
 			break;
 		case 4:
-			debugE_P(PSTR("Serial frame error"));
+			debugW_P(PSTR("Serial frame error"));
 			break;
 		case 5:
-			debugE_P(PSTR("Serial parity error"));
+			debugW_P(PSTR("Serial parity error"));
 			break;
 	}
 	meterState.setLastError(90+err);
@@ -1087,7 +1133,7 @@ bool readHanPort() {
 			data = new IEC6205675(payload, meterState.getMeterType(), &meterConfig, ctx);
 		}
 	} else if(ctx.type == DATA_TAG_DSMR) {
-		data = new IEC6205621(payload);
+		data = new IEC6205621(payload, tz);
 	}
 	len = 0;
 
@@ -1120,15 +1166,15 @@ void handleDataSuccess(AmsData* data) {
 	}
 
 	time_t now = time(nullptr);
-	if(now < BUILD_EPOCH && data->getListType() >= 3) {
-		if(data->getMeterTimestamp() > BUILD_EPOCH) {
+	if(now < FirmwareVersion::BuildEpoch && data->getListType() >= 3) {
+		if(data->getMeterTimestamp() > FirmwareVersion::BuildEpoch) {
 			debugI_P(PSTR("Using timestamp from meter"));
 			now = data->getMeterTimestamp();
-		} else if(data->getPackageTimestamp() > BUILD_EPOCH) {
+		} else if(data->getPackageTimestamp() > FirmwareVersion::BuildEpoch) {
 			debugI_P(PSTR("Using timestamp from meter (DLMS)"));
 			now = data->getPackageTimestamp();
 		}
-		if(now > BUILD_EPOCH) {
+		if(now > FirmwareVersion::BuildEpoch) {
 			timeval tv { now, 0};
 			settimeofday(&tv, nullptr);
 		}
@@ -1137,20 +1183,21 @@ void handleDataSuccess(AmsData* data) {
 	meterState.apply(*data);
 
 	bool saveData = false;
-	if(!ds.isHappy() && now > BUILD_EPOCH) {
+	if(!ds.isDayHappy() && now > FirmwareVersion::BuildEpoch) {
 		debugD_P(PSTR("Its time to update data storage"));
 		tmElements_t tm;
 		breakTime(now, tm);
 		if(tm.Minute == 0) {
 			debugV_P(PSTR(" using actual data"));
 			saveData = ds.update(data);
-		} else if(meterState.getListType() >= 3) {
+		} else if(tm.Minute == 1 && meterState.getListType() >= 3) {
 			debugV_P(PSTR(" using estimated data"));
 			saveData = ds.update(&meterState);
 		}
 		if(saveData) {
 			debugI_P(PSTR("Saving data"));
 			ds.save();
+			lastDataStoreUpdate = millis();
 		}
 	}
 
@@ -1613,7 +1660,7 @@ void MQTT_connect() {
 
 	time_t epoch = time(nullptr);
 	if(mqttConfig.ssl) {
-		if(epoch < BUILD_EPOCH) {
+		if(epoch < FirmwareVersion::BuildEpoch) {
 			debugI_P(PSTR("NTP not ready for MQTT SSL"));
 			return;
 		}
@@ -1961,6 +2008,9 @@ void configFileParse() {
 		} else if(strncmp_P(buf, PSTR("entsoeMultiplier "), 17) == 0) {
 			if(!lEntsoe) { config.getEntsoeConfig(entsoe); lEntsoe = true; };
 			entsoe.multiplier = String(buf+17).toFloat() * 1000;
+		} else if(strncmp_P(buf, PSTR("entsoeFixedPrice "), 17) == 0) {
+			if(!lEntsoe) { config.getEntsoeConfig(entsoe); lEntsoe = true; };
+			entsoe.fixedPrice = String(buf+17).toFloat() * 1000;
 		} else if(strncmp_P(buf, PSTR("thresholds "), 11) == 0) {
 			if(!lEac) { config.getEnergyAccountingConfig(eac); lEac = true; };
 			int i = 0;

src/IEC6205621.cpp

@@ -1,6 +1,6 @@
 #include "IEC6205621.h"
 
-IEC6205621::IEC6205621(const char* p) {
+IEC6205621::IEC6205621(const char* p, Timezone* tz) {
 	if(strlen(p) < 16)
 		return;
 
@@ -58,7 +58,8 @@ IEC6205621::IEC6205621(const char* p) {
 		tm.Hour = timestamp.substring(6,8).toInt();
 		tm.Minute = timestamp.substring(8,10).toInt();
 		tm.Second = timestamp.substring(10,12).toInt();
-		meterTimestamp = makeTime(tm); // TODO: Adjust for time zone
+		meterTimestamp = makeTime(tm);
+		if(tz != NULL) meterTimestamp = tz->toUTC(meterTimestamp);
 	}
 
 	activeImportPower = (uint16_t) (extractDouble(payload, F("1.7.0")));

src/IEC6205621.h

@@ -3,10 +3,11 @@
 
 #include "Arduino.h"
 #include "AmsData.h"
+#include "Timezone.h"
 
 class IEC6205621 : public AmsData {
 public:
-    IEC6205621(const char* payload);
+    IEC6205621(const char* payload, Timezone* tz);
 
 private:
     String extract(String payload, String obis);

src/IEC6205675.cpp

@@ -168,8 +168,10 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo
             }
         }
 
-        if(meterType == AmsTypeKamstrup || meterType == AmsTypeAidon) {
-            this->packageTimestamp = this->packageTimestamp > 0 ? tz.toUTC(this->packageTimestamp) : 0;
+        if(this->packageTimestamp > 0) {
+            if(meterType == AmsTypeAidon || meterType == AmsTypeKamstrup) {
+                this->packageTimestamp = this->packageTimestamp - 3600;
+            }
         }
 
         uint8_t str_len = 0;
@@ -270,10 +272,8 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo
         if(meterTs != NULL) {
             AmsOctetTimestamp* amst = (AmsOctetTimestamp*) meterTs;
             time_t ts = decodeCosemDateTime(amst->dt);
-            if(meterType == AmsTypeAidon) {
+            if(meterType == AmsTypeAidon || meterType == AmsTypeKamstrup) {
                 meterTimestamp = ts - 3600;
-            } else if(meterType == AmsTypeKamstrup) {
-                meterTimestamp = tz.toUTC(ts);
             } else {
                 meterTimestamp = ts;
             }
@@ -376,19 +376,6 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo
                         break;
                 }
             }
-        } else if(meterType == AmsTypeKaifa) {
-            if(l1current != 0)
-                l1current /= 1000;
-            if(l2current != 0)
-                l2current /= 1000;
-            if(l3current != 0)
-                l3current /= 1000;
-            if(l1voltage != 0)
-                l1voltage /= 10;
-            if(l2voltage != 0)
-                l2voltage /= 10;
-            if(l3voltage != 0)
-                l3voltage /= 10;
         }
 
         lastUpdateMillis = millis();

src/version.h

@@ -1,5 +0,0 @@
-
-#ifndef VERSION
-  #define VERSION "538de5e"
-#endif
-#define BUILD_EPOCH 1668532199