Added UI readme

Bumps [rollup](https://github.com/rollup/rollup) from 3.29.5 to 3.30.0.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/v3.30.0/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v3.29.5...v3.30.0)

---
updated-dependencies:
- dependency-name: rollup
  dependency-version: 3.30.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/build.yml

@@ -51,7 +51,7 @@ jobs:
     - name: Set up node
       uses: actions/setup-node@v4
       with:
-        node-version: '19.x'
+        node-version: '22.x'
     - name: Build with node
       run: |
         cd lib/SvelteUi/app

.github/workflows/release-deploy-env.yml

@@ -73,7 +73,7 @@ jobs:
     - name: Set up node
       uses: actions/setup-node@v4
       with:
-        node-version: '19.x'
+        node-version: '22.x'
     - name: Build with node
       run: |
         cd lib/SvelteUi/app

frames/iskra_croatia.txt

@@ -0,0 +1,48 @@
+They actually use multiple frames, so this is a "fake" frame combining the two into one, but without checksum fields.
+
+7E 
+A0 BD 
+CF 02 23 03 00 00
+E6 E7 00 
+0F 00 03 46 3B 
+0C 07 E9 0C 13 05 17 37 28 00 FF C4 00
+
+02 21 
+09 08 39 32 30 32 39 36 39 31 
+09 04 17 37 28 00 
+09 05 07 E9 0C 13 05 
+06 00 6C 28 5A 
+06 00 4B 76 1A 
+06 00 20 B2 40 
+06 00 58 68 AA 
+06 00 57 A1 62 
+06 00 00 C7 48 
+06 00 17 EE D7 
+06 00 12 F5 5C 
+06 00 00 D9 6A 
+06 00 15 36 84 
+06 00 00 01 7E
+06 00 00 00 00 
+12 03 79 
+06 00 00 00 7F 
+06 00 00 00 BD 
+06 00 00 00 41 
+06 00 00 00 00 
+06 00 00 00 00 
+06 00 00 00 00 
+12 09 54 
+12 09 35 
+12 09 49 
+12 00 37 
+12 00 59 
+12 00 4D 
+06 00 00 43 62 
+01 01 
+  12 24 B8 
+01 01 
+  12 24 B8 
+01 01 
+  12 24 B8 
+03 01
+
+00 00 7E

lib/AmsConfiguration/src/AmsConfiguration.cpp

@@ -591,7 +591,6 @@ void AmsConfiguration::clearGpio(GpioConfig& config, bool all) {
 	config.tempAnalogSensorPin = 0xFF;
 	config.vccPin = 0xFF;
 	config.ledDisablePin = 0xFF;
-	config.powersaving = 0;
 
 	if(all) {
 		config.vccOffset = 0;
@@ -600,6 +599,7 @@ void AmsConfiguration::clearGpio(GpioConfig& config, bool all) {
 		config.vccResistorGnd = 0;
 		config.vccResistorVcc = 0;
 		config.ledBehaviour = LED_BEHAVIOUR_DEFAULT;
+		config.powersaving = 0;
 	}
 }
 

lib/AmsDecoder/src/DsmrParser.cpp

@@ -74,7 +74,7 @@ int8_t DSMRParser::parse(uint8_t *buf, DataParserContext &ctx, bool verified, Pr
         fromHex((uint8_t*) &crc, String((char*) buf+crcPos), 2);
         crc = ntohs(crc);
 
-        if(crc != crc_calc) {
+        if(crc > 0 && crc != crc_calc) {
             if(debugger != NULL) {
                 debugger->printf_P(PSTR("CRC incorrrect, %04X != %04X at position %lu\n"), crc, crc_calc, crcPos);
             }

lib/AmsDecoder/src/HdlcParser.cpp

@@ -32,7 +32,7 @@ int8_t HDLCParser::parse(uint8_t *d, DataParserContext &ctx) {
             return DATA_PARSE_BOUNDARY_FLAG_MISSING;
 
         // Verify FCS
-        if(ntohs(f->fcs) != crc16_x25(d + 1, len - sizeof *f - 1))
+        if(f->fcs > 0 && ntohs(f->fcs) != crc16_x25(d + 1, len - sizeof *f - 1))
             return DATA_PARSE_FOOTER_CHECKSUM_ERROR;
 
         // Skip destination address, LSB marks last byte
@@ -50,7 +50,7 @@ int8_t HDLCParser::parse(uint8_t *d, DataParserContext &ctx) {
         HDLC3CtrlHcs* t3 = (HDLC3CtrlHcs*) (ptr);
 
         // Verify HCS
-        if(ntohs(t3->hcs) != crc16_x25(d + 1, ptr-d))
+        if(t3->hcs > 0 && ntohs(t3->hcs) != crc16_x25(d + 1, ptr-d))
             return DATA_PARSE_HEADER_CHECKSUM_ERROR;
         ptr += 3;
 
@@ -69,7 +69,12 @@ int8_t HDLCParser::parse(uint8_t *d, DataParserContext &ctx) {
 
             if(buf == NULL) return DATA_PARSE_FAIL;
 
-            memcpy(buf + pos, ptr+3, ctx.length); // +3 to skip LLC
+            if((*ptr) == DATA_TAG_LLC) {
+                ptr += 3; // Skip LLC
+                ctx.length -= 3;
+            }
+
+            memcpy(buf + pos, ptr, ctx.length);
             pos += ctx.length;
 
             lastSequenceNumber++;
@@ -78,7 +83,12 @@ int8_t HDLCParser::parse(uint8_t *d, DataParserContext &ctx) {
             lastSequenceNumber = 0;
             if(buf == NULL) return DATA_PARSE_FAIL;
 
-            memcpy(buf + pos, ptr+3, ctx.length); // +3 to skip LLC
+            if((*ptr) == DATA_TAG_LLC) {
+                ptr += 3; // Skip LLC
+                ctx.length -= 3;
+            }
+
+            memcpy(buf + pos, ptr, ctx.length);
             pos += ctx.length;
 
             memcpy((uint8_t *) d, buf, pos);

lib/AmsFirmwareUpdater/include/AmsFirmwareUpdater.h

@@ -39,6 +39,8 @@
 #define AMS_UPDATE_ERR_SUCCESS_CONFIRMED 123
 
 #define UPDATE_BUF_SIZE 4096
+#define UPDATE_MAX_BLOCK_RETRY 25
+#define UPDATE_MAX_REBOOT_RETRY 12
 
 class AmsFirmwareUpdater {
 public:

lib/AmsFirmwareUpdater/src/AmsFirmwareUpdater.cpp

@@ -74,7 +74,7 @@ void AmsFirmwareUpdater::setUpgradeInformation(UpgradeInformation& upinfo) {
         #endif
         debugger->printf_P(PSTR("Resuming uprade to %s\n"), updateStatus.toVersion);
 
-        if(updateStatus.reboot_count++ < 8) {
+        if(updateStatus.reboot_count++ < UPDATE_MAX_REBOOT_RETRY) {
             updateStatus.errorCode = AMS_UPDATE_ERR_OK;
         } else {
             updateStatus.errorCode = AMS_UPDATE_ERR_REBOOT;
@@ -129,7 +129,7 @@ void AmsFirmwareUpdater::loop() {
             HTTPClient http;
             start = millis();
             if(!fetchFirmwareChunk(http)) {
-                if(updateStatus.retry_count++ == 3) {
+                if(updateStatus.retry_count++ > UPDATE_MAX_BLOCK_RETRY) {
                     updateStatus.errorCode = AMS_UPDATE_ERR_FETCH;
                     updateStatusChanged = true;
                 }

lib/AmsMqttHandler/include/AmsMqttHandler.h

@@ -25,7 +25,7 @@ public:
     #if defined(AMS_REMOTE_DEBUG)
     AmsMqttHandler(MqttConfig& mqttConfig, RemoteDebug* debugger, char* buf, AmsFirmwareUpdater* updater) {
     #else
-    AmsMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf) {
+    AmsMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, AmsFirmwareUpdater* updater) {
     #endif
         this->mqttConfig = mqttConfig;
     	this->mqttConfigChanged = true;

lib/AmsMqttHandler/src/AmsMqttHandler.cpp

@@ -102,10 +102,17 @@ bool AmsMqttHandler::connect() {
 		}
 		actualClient = mqttClient;
 	}
-	int clientTimeout = mqttConfig.timeout / 1000;
-	if(clientTimeout > 3) clientTimeout = 3; // 3000ms is default, see WiFiClient.cpp WIFI_CLIENT_DEF_CONN_TIMEOUT_MS
-	actualClient->setTimeout(clientTimeout);
-	// Why can't we set number of retries for write here? WiFiClient defaults to 10 (10*3s == 30s)
+
+	// This section helps with power saving on ESP32 devices by reducing timeouts
+	// The timeout is multiplied by 10 because WiFiClient is retrying 10 times internally
+	// Power drain for this timeout is too great when using the default 3s timeout
+	// On ESP8266 the timeout is used differently and the following code causes MQTT instability
+	#if defined(ESP32)
+		int clientTimeout = mqttConfig.timeout / 1000;
+		if(clientTimeout > 3) clientTimeout = 3; // 3000ms is default, see WiFiClient.cpp WIFI_CLIENT_DEF_CONN_TIMEOUT_MS
+		actualClient->setTimeout(clientTimeout);
+		// Why can't we set number of retries for write here? WiFiClient defaults to 10 (10*3s == 30s)
+	#endif
 
 	mqttConfigChanged = false;
 	mqtt.setTimeout(mqttConfig.timeout);

lib/DomoticzMqttHandler/include/DomoticzMqttHandler.h

@@ -17,7 +17,7 @@ public:
         this->config = config;
     };
     #else
-    DomoticzMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, DomoticzConfig config) : AmsMqttHandler(mqttConfig, debugger, buf) {
+    DomoticzMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, DomoticzConfig config, AmsFirmwareUpdater* updater) : AmsMqttHandler(mqttConfig, debugger, buf, updater) {
         this->config = config;
     };
     #endif

lib/EnergyAccounting/src/EnergyAccounting.cpp

@@ -260,7 +260,9 @@ float EnergyAccounting::getUseThisMonth() {
 }
 
 float EnergyAccounting::getUseLastMonth() {
-    return (data.lastMonthImport * pow(10, data.lastMonthAccuracy)) / 1000;
+    float ret = (data.lastMonthImport * pow(10, data.lastMonthAccuracy)) / 1000;
+    if(std::isnan(ret)) return 0.0;
+    return ret;
 }
 
 float EnergyAccounting::getProducedThisHour() {
@@ -292,7 +294,9 @@ float EnergyAccounting::getProducedThisMonth() {
 }
 
 float EnergyAccounting::getProducedLastMonth() {
-    return (data.lastMonthExport * pow(10, data.lastMonthAccuracy)) / 1000;
+    float ret = (data.lastMonthExport * pow(10, data.lastMonthAccuracy)) / 1000;
+    if(std::isnan(ret)) return 0.0;
+    return ret;
 }
 
 float EnergyAccounting::getCostThisHour() {

lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h

@@ -17,7 +17,7 @@ public:
     #if defined(AMS_REMOTE_DEBUG)
     HomeAssistantMqttHandler(MqttConfig& mqttConfig, RemoteDebug* debugger, char* buf, uint8_t boardType, HomeAssistantConfig config, HwTools* hw, AmsFirmwareUpdater* updater, char* hostname) : AmsMqttHandler(mqttConfig, debugger, buf, updater) {
     #else
-    HomeAssistantMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, uint8_t boardType, HomeAssistantConfig config, HwTools* hw) : AmsMqttHandler(mqttConfig, debugger, buf) {
+    HomeAssistantMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, uint8_t boardType, HomeAssistantConfig config, HwTools* hw, AmsFirmwareUpdater* updater, char* hostname) : AmsMqttHandler(mqttConfig, debugger, buf, updater) {
     #endif
         this->boardType = boardType;
         this->hw = hw;
@@ -79,6 +79,7 @@ private:
     void publishPriceSensors(PriceService* ps);
     void publishSystemSensors();
     void publishThresholdSensors();
+    void toJsonIsoTimestamp(time_t t, char* buf, size_t buflen);
 
     String boardTypeToString(uint8_t b) {
         switch(b) {

lib/HomeAssistantMqttHandler/json/ha1.json

@@ -1,4 +1,4 @@
 {
     "P" : %lu,
-    "t" : "%s"
+    "t" : %s
 }

lib/HomeAssistantMqttHandler/json/ha2.json

@@ -3,6 +3,6 @@
     "tPO" : %.3f,
     "tQI" : %.3f,
     "tQO" : %.3f,
-    "rtc" : "%s",
-    "t" : "%s"
+    "rtc" : %s,
+    "t" : %s
 }

lib/HomeAssistantMqttHandler/json/ha3.json

@@ -12,5 +12,5 @@
     "U1" : %.2f,
     "U2" : %.2f,
     "U3" : %.2f,
-    "t" : "%s"
+    "t" : %s
 }

lib/HomeAssistantMqttHandler/json/ha4.json

@@ -28,5 +28,5 @@
     "tPO1" : %.3f,
     "tPO2" : %.3f,
     "tPO3" : %.3f,
-    "t" : "%s"
+    "t" : %s
 }

lib/HomeAssistantMqttHandler/json/hadiscover.json

@@ -2,7 +2,7 @@
     "name" : "%s%s",
     "stat_t" : "%s%s",
     "uniq_id" : "%s_%s",
-    "obj_id" : "%s_%s",
+    "default_entity_id" : "sensor.%s_%s",
     "val_tpl" : "{{ value_json.%s | is_defined }}",
     "expire_after" : %d,
     "dev" : {

lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp

@@ -28,7 +28,8 @@ void HomeAssistantMqttHandler::setHomeAssistantConfig(HomeAssistantConfig config
         snprintf_P(json, 128, PSTR("[%s] "), config.discoveryNameTag);
         sensorNamePrefix = String(json);
     } else {
-        deviceName = F("AMS reader");
+        snprintf_P(json, 128, PSTR("AMS reader"));
+        deviceName = String(json);
         sensorNamePrefix = "";
     }
     deviceModel = boardTypeToString(boardType);
@@ -52,20 +53,18 @@ void HomeAssistantMqttHandler::setHomeAssistantConfig(HomeAssistantConfig config
         deviceUrl = String(json);
     }
 
-    if(strlen(config.discoveryPrefix) > 0) {
-        snprintf_P(json, 128, PSTR("%s/status"), config.discoveryPrefix);
-        statusTopic = String(json);
-
-        snprintf_P(json, 128, PSTR("%s/sensor"), config.discoveryPrefix);
-        sensorTopic = String(json);
-
-        snprintf_P(json, 128, PSTR("%s/update"), config.discoveryPrefix);
-        updateTopic = String(json);
-    } else {
-        statusTopic = F("homeassistant/status");
-        sensorTopic = F("homeassistant/sensor");
-        updateTopic = F("homeassistant/update");
+    if(strlen(config.discoveryPrefix) == 0) {
+        snprintf_P(config.discoveryPrefix, 64, PSTR("homeassistant"));
     }
+
+    snprintf_P(json, 128, PSTR("%s/status"), config.discoveryPrefix);
+    statusTopic = String(json);
+
+    snprintf_P(json, 128, PSTR("%s/sensor"), config.discoveryPrefix);
+    sensorTopic = String(json);
+
+    snprintf_P(json, 128, PSTR("%s/update"), config.discoveryPrefix);
+    updateTopic = String(json);
     strcpy(this->mqttConfig.subscribeTopic, statusTopic.c_str());
 }
 
@@ -134,12 +133,7 @@ bool HomeAssistantMqttHandler::publishList1(AmsData* data, EnergyAccounting* ea)
     publishList1Sensors();
 
 	char pt[24];
-    memset(pt, 0, 24);
-    if(data->getPackageTimestamp() > 0) {
-        tmElements_t tm;
-        breakTime(data->getPackageTimestamp(), tm);
-        sprintf_P(pt, PSTR("%04d-%02d-%02dT%02d:%02d:%02dZ"), tm.Year+1970, tm.Month, tm.Day, tm.Hour, tm.Minute, tm.Second);
-    }
+    toJsonIsoTimestamp(data->getPackageTimestamp(), pt, sizeof(pt));
 
     snprintf_P(json, BufferSize, HA1_JSON, data->getActiveImportPower(), pt);
     return mqtt.publish(pubTopic + "/power", json);
@@ -150,12 +144,7 @@ bool HomeAssistantMqttHandler::publishList2(AmsData* data, EnergyAccounting* ea)
     if(data->getActiveExportPower() > 0) publishList2ExportSensors();
 
 	char pt[24];
-    memset(pt, 0, 24);
-    if(data->getPackageTimestamp() > 0) {
-        tmElements_t tm;
-        breakTime(data->getPackageTimestamp(), tm);
-        sprintf_P(pt, PSTR("%04d-%02d-%02dT%02d:%02d:%02dZ"), tm.Year+1970, tm.Month, tm.Day, tm.Hour, tm.Minute, tm.Second);
-    }
+    toJsonIsoTimestamp(data->getPackageTimestamp(), pt, sizeof(pt));
 
     snprintf_P(json, BufferSize, HA3_JSON,
         data->getListId().c_str(),
@@ -181,20 +170,11 @@ bool HomeAssistantMqttHandler::publishList3(AmsData* data, EnergyAccounting* ea)
     if(data->getActiveExportCounter() > 0.0) publishList3ExportSensors();
 
 	char mt[24];
-    memset(mt, 0, 24);
-    if(data->getMeterTimestamp() > 0) {
-        tmElements_t tm;
-        breakTime(data->getMeterTimestamp(), tm);
-        sprintf_P(mt, PSTR("%04d-%02d-%02dT%02d:%02d:%02dZ"), tm.Year+1970, tm.Month, tm.Day, tm.Hour, tm.Minute, tm.Second);
-    }
+    toJsonIsoTimestamp(data->getMeterTimestamp(), mt, sizeof(mt));
 
 	char pt[24];
     memset(pt, 0, 24);
-    if(data->getPackageTimestamp() > 0) {
-        tmElements_t tm;
-        breakTime(data->getPackageTimestamp(), tm);
-        sprintf_P(pt, PSTR("%04d-%02d-%02dT%02d:%02d:%02dZ"), tm.Year+1970, tm.Month, tm.Day, tm.Hour, tm.Minute, tm.Second);
-    }
+    toJsonIsoTimestamp(data->getPackageTimestamp(), pt, sizeof(pt));
 
     snprintf_P(json, BufferSize, HA2_JSON,
         data->getActiveImportCounter(),
@@ -212,12 +192,7 @@ bool HomeAssistantMqttHandler::publishList4(AmsData* data, EnergyAccounting* ea)
     if(data->getL1ActiveExportPower() > 0 || data->getL2ActiveExportPower() > 0 || data->getL3ActiveExportPower() > 0) publishList4ExportSensors();
 
 	char pt[24];
-    memset(pt, 0, 24);
-    if(data->getPackageTimestamp() > 0) {
-        tmElements_t tm;
-        breakTime(data->getPackageTimestamp(), tm);
-        sprintf_P(pt, PSTR("%04d-%02d-%02dT%02d:%02d:%02dZ"), tm.Year+1970, tm.Month, tm.Day, tm.Hour, tm.Minute, tm.Second);
-    }
+    toJsonIsoTimestamp(data->getPackageTimestamp(), pt, sizeof(pt));
 
     snprintf_P(json, BufferSize, HA4_JSON,
         data->getListId().c_str(),
@@ -307,13 +282,8 @@ bool HomeAssistantMqttHandler::publishRealtime(AmsData* data, EnergyAccounting*
 
     time_t now = time(nullptr);
 	char pt[24];
-    memset(pt, 0, 24);
-    if(now > 0) {
-        tmElements_t tm;
-        breakTime(now, tm);
-        sprintf_P(pt, PSTR("%04d-%02d-%02dT%02d:%02d:%02dZ"), tm.Year+1970, tm.Month, tm.Day, tm.Hour, tm.Minute, tm.Second);
-    }
-    pos += snprintf_P(json+pos, BufferSize-pos, PSTR(",\"t\":\"%s\""), pt);
+    toJsonIsoTimestamp(now, pt, sizeof(pt));
+    pos += snprintf_P(json+pos, BufferSize-pos, PSTR(",\"t\":%s"), pt);
     
     json[pos++] = '}';
     json[pos] = '\0';
@@ -343,13 +313,8 @@ bool HomeAssistantMqttHandler::publishTemperatures(AmsConfiguration* config, HwT
 
     time_t now = time(nullptr);
 	char pt[24];
-    memset(pt, 0, 24);
-    if(now > 0) {
-        tmElements_t tm;
-        breakTime(now, tm);
-        sprintf_P(pt, PSTR("%04d-%02d-%02dT%02d:%02d:%02dZ"), tm.Year+1970, tm.Month, tm.Day, tm.Hour, tm.Minute, tm.Second);
-    }
-    pos += snprintf_P(json+pos, BufferSize-pos, PSTR(",\"t\":\"%s\""), pt);
+    toJsonIsoTimestamp(now, pt, sizeof(pt));
+    pos += snprintf_P(json+pos, BufferSize-pos, PSTR(",\"t\":%s"), pt);
 	pos += snprintf_P(json+pos, BufferSize-pos, PSTR("}"));
 
     bool ret = mqtt.publish(pubTopic + "/temperatures", json);
@@ -421,25 +386,34 @@ bool HomeAssistantMqttHandler::publishPrices(PriceService* ps) {
     memset(ts1hr, 0, 24);
 	if(min1hrIdx > -1) {
         time_t ts = now + (SECS_PER_HOUR * min1hrIdx);
-		tmElements_t tm;
+        tmElements_t tm;
         breakTime(ts, tm);
-		sprintf_P(ts1hr, PSTR("%04d-%02d-%02dT%02d:00:00Z"), tm.Year+1970, tm.Month, tm.Day, tm.Hour);
+        tm.Minute = 0;
+        tm.Second = 0;
+        ts = makeTime(tm);
+        toJsonIsoTimestamp(ts, ts1hr, sizeof(ts1hr));
 	}
 	char ts3hr[24];
     memset(ts3hr, 0, 24);
 	if(min3hrIdx > -1) {
         time_t ts = now + (SECS_PER_HOUR * min3hrIdx);
-		tmElements_t tm;
+        tmElements_t tm;
         breakTime(ts, tm);
-		sprintf_P(ts3hr, PSTR("%04d-%02d-%02dT%02d:00:00Z"), tm.Year+1970, tm.Month, tm.Day, tm.Hour);
+        tm.Minute = 0;
+        tm.Second = 0;
+        ts = makeTime(tm);
+        toJsonIsoTimestamp(ts, ts3hr, sizeof(ts3hr));
 	}
 	char ts6hr[24];
     memset(ts6hr, 0, 24);
 	if(min6hrIdx > -1) {
         time_t ts = now + (SECS_PER_HOUR * min6hrIdx);
-		tmElements_t tm;
+        tmElements_t tm;
         breakTime(ts, tm);
-		sprintf_P(ts6hr, PSTR("%04d-%02d-%02dT%02d:00:00Z"), tm.Year+1970, tm.Month, tm.Day, tm.Hour);
+        tm.Minute = 0;
+        tm.Second = 0;
+        ts = makeTime(tm);
+        toJsonIsoTimestamp(ts, ts6hr, sizeof(ts6hr));
 	}
 
     uint16_t pos = snprintf_P(json, BufferSize, PSTR("{\"id\":\"%s\",\"prices\":{\"import\":["), WiFi.macAddress().c_str());
@@ -468,7 +442,7 @@ bool HomeAssistantMqttHandler::publishPrices(PriceService* ps) {
     }
 
     pos--;
-    pos += snprintf_P(json+pos, BufferSize-pos, PSTR("],\"min\":%.4f,\"max\":%.4f,\"cheapest1hr\":\"%s\",\"cheapest3hr\":\"%s\",\"cheapest6hr\":\"%s\"}"),
+    pos += snprintf_P(json+pos, BufferSize-pos, PSTR("],\"min\":%.4f,\"max\":%.4f,\"cheapest1hr\":%s,\"cheapest3hr\":%s,\"cheapest6hr\":%s}"),
         min == INT16_MAX ? 0.0 : min,
         max == INT16_MIN ? 0.0 : max,
         ts1hr,
@@ -477,13 +451,8 @@ bool HomeAssistantMqttHandler::publishPrices(PriceService* ps) {
     );
     
     char pt[24];
-    memset(pt, 0, 24);
-    if(now > 0) {
-        tmElements_t tm;
-        breakTime(now, tm);
-        sprintf_P(pt, PSTR("%04d-%02d-%02dT%02d:%02d:%02dZ"), tm.Year+1970, tm.Month, tm.Day, tm.Hour, tm.Minute, tm.Second);
-    }
-    pos += snprintf_P(json+pos, BufferSize-pos, PSTR(",\"t\":\"%s\""), pt);
+    toJsonIsoTimestamp(now, pt, sizeof(pt));
+    pos += snprintf_P(json+pos, BufferSize-pos, PSTR(",\"t\":%s"), pt);
 
     json[pos++] = '}';
     json[pos] = '\0';
@@ -502,14 +471,9 @@ bool HomeAssistantMqttHandler::publishSystem(HwTools* hw, PriceService* ps, Ener
 
 	time_t now = time(nullptr);
 	char pt[24];
-    memset(pt, 0, 24);
-    if(now > 0) {
-        tmElements_t tm;
-        breakTime(now, tm);
-        sprintf_P(pt, PSTR("%04d-%02d-%02dT%02d:%02d:%02dZ"), tm.Year+1970, tm.Month, tm.Day, tm.Hour, tm.Minute, tm.Second);
-    }
+    toJsonIsoTimestamp(now, pt, sizeof(pt));
 
-    snprintf_P(json, BufferSize, PSTR("{\"id\":\"%s\",\"name\":\"%s\",\"up\":%d,\"vcc\":%.3f,\"rssi\":%d,\"temp\":%.2f,\"version\":\"%s\",\"t\":\"%s\"}"),
+    snprintf_P(json, BufferSize, PSTR("{\"id\":\"%s\",\"name\":\"%s\",\"up\":%d,\"vcc\":%.3f,\"rssi\":%d,\"temp\":%.2f,\"version\":\"%s\",\"t\":%s}"),
         WiFi.macAddress().c_str(),
         mqttConfig.clientId,
         (uint32_t) (millis64()/1000),
@@ -902,3 +866,14 @@ void HomeAssistantMqttHandler::onMessage(String &topic, String &payload) {
         }
     }
 }
+
+void HomeAssistantMqttHandler::toJsonIsoTimestamp(time_t t, char* buf, size_t buflen) {
+    memset(buf, 0, buflen);
+    if(t > 0) {
+        tmElements_t tm;
+        breakTime(t, tm);
+        snprintf_P(buf, buflen, PSTR("\"%04d-%02d-%02dT%02d:%02d:%02dZ\""), tm.Year+1970, tm.Month, tm.Day, tm.Hour, tm.Minute, tm.Second);
+    } else {
+        snprintf_P(buf, buflen, PSTR("null"));
+    }
+}

lib/HwTools/include/HwTools.h

@@ -45,6 +45,7 @@ public:
     bool applyBoardConfig(uint8_t boardType, GpioConfig& gpioConfig, MeterConfig& meterConfig, uint8_t hanPin);
     void setup(SystemConfig* sys, GpioConfig* gpio);
     float getVcc();
+    void setMaxVcc(float maxVcc);
     uint8_t getTempSensorCount();
     TempSensorData* getTempSensorData(uint8_t);
     bool updateTemperatures();
@@ -68,7 +69,7 @@ private:
     uint8_t vccPin, vccGnd_r, vccVcc_r;
     float vccOffset, vccMultiplier;
     float vcc = 3.3; // Last known Vcc
-    float maxVcc = 3.25; // Best to have this close to max as a start, in case Pow-U reboots and starts off with a low voltage, we dont want that to be perceived as max
+    float maxVcc = 3.28; // Best to have this close to max as a start, in case Pow-U reboots and starts off with a low voltage, we dont want that to be perceived as max
     unsigned long lastVccRead = 0;
 
     uint16_t analogRange = 1024;

lib/HwTools/src/HwTools.cpp

@@ -677,4 +677,8 @@ bool HwTools::isVoltageOptimal(float range) {
 
 uint8_t HwTools::getBoardType() {
     return boardType;
+}
+
+void HwTools::setMaxVcc(float vcc) {
+    this->maxVcc = min(3.3f, vcc);
 }

lib/JsonMqttHandler/include/JsonMqttHandler.h

@@ -42,5 +42,6 @@ private:
     bool publishList3(AmsData* data, EnergyAccounting* ea);
     bool publishList4(AmsData* data, EnergyAccounting* ea);
     String getMeterModel(AmsData* data);
+    void toJsonIsoTimestamp(time_t t, char* buf, size_t buflen);
 };
 #endif

lib/JsonMqttHandler/src/JsonMqttHandler.cpp

@@ -356,25 +356,34 @@ bool JsonMqttHandler::publishPrices(PriceService* ps) {
     memset(ts1hr, 0, 24);
 	if(min1hrIdx > -1) {
         time_t ts = now + (SECS_PER_HOUR * min1hrIdx);
-		tmElements_t tm;
+        tmElements_t tm;
         breakTime(ts, tm);
-		sprintf_P(ts1hr, PSTR("%04d-%02d-%02dT%02d:00:00Z"), tm.Year+1970, tm.Month, tm.Day, tm.Hour);
+        tm.Minute = 0;
+        tm.Second = 0;
+        ts = makeTime(tm);
+        toJsonIsoTimestamp(ts, ts1hr, sizeof(ts1hr));
 	}
 	char ts3hr[24];
     memset(ts3hr, 0, 24);
 	if(min3hrIdx > -1) {
         time_t ts = now + (SECS_PER_HOUR * min3hrIdx);
-		tmElements_t tm;
+        tmElements_t tm;
         breakTime(ts, tm);
-		sprintf_P(ts3hr, PSTR("%04d-%02d-%02dT%02d:00:00Z"), tm.Year+1970, tm.Month, tm.Day, tm.Hour);
+        tm.Minute = 0;
+        tm.Second = 0;
+        ts = makeTime(tm);
+        toJsonIsoTimestamp(ts, ts3hr, sizeof(ts3hr));
 	}
 	char ts6hr[24];
     memset(ts6hr, 0, 24);
 	if(min6hrIdx > -1) {
         time_t ts = now + (SECS_PER_HOUR * min6hrIdx);
-		tmElements_t tm;
+        tmElements_t tm;
         breakTime(ts, tm);
-		sprintf_P(ts6hr, PSTR("%04d-%02d-%02dT%02d:00:00Z"), tm.Year+1970, tm.Month, tm.Day, tm.Hour);
+        tm.Minute = 0;
+        tm.Second = 0;
+        ts = makeTime(tm);
+        toJsonIsoTimestamp(ts, ts6hr, sizeof(ts6hr));
 	}
 
     if(mqttConfig.payloadFormat == 6) {
@@ -388,7 +397,7 @@ bool JsonMqttHandler::publishPrices(PriceService* ps) {
             }
         }
 
-        pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"pr_min\":%.4f,\"pr_max\":%.4f,\"pr_cheapest1hr\":\"%s\",\"pr_cheapest3hr\":\"%s\",\"pr_cheapest6hr\":\"%s\"}"),
+        pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"pr_min\":%.4f,\"pr_max\":%.4f,\"pr_cheapest1hr\":%s,\"pr_cheapest3hr\":%s,\"pr_cheapest6hr\":%s}"),
             min == INT16_MAX ? 0.0 : min,
             max == INT16_MIN ? 0.0 : max,
             ts1hr,
@@ -422,7 +431,7 @@ bool JsonMqttHandler::publishPrices(PriceService* ps) {
         }
 
         pos--;
-        pos += snprintf_P(json+pos, BufferSize-pos, PSTR("],\"min\":%.4f,\"max\":%.4f,\"cheapest1hr\":\"%s\",\"cheapest3hr\":\"%s\",\"cheapest6hr\":\"%s\"}}"),
+        pos += snprintf_P(json+pos, BufferSize-pos, PSTR("],\"min\":%.4f,\"max\":%.4f,\"cheapest1hr\":%s,\"cheapest3hr\":%s,\"cheapest6hr\":%s}}"),
             min == INT16_MAX ? 0.0 : min,
             max == INT16_MIN ? 0.0 : max,
             ts1hr,
@@ -535,3 +544,14 @@ void JsonMqttHandler::onMessage(String &topic, String &payload) {
         }
     }
 }
+
+void JsonMqttHandler::toJsonIsoTimestamp(time_t t, char* buf, size_t buflen) {
+    memset(buf, 0, buflen);
+    if(t > 0) {
+        tmElements_t tm;
+        breakTime(t, tm);
+        snprintf_P(buf, buflen, PSTR("\"%04d-%02d-%02dT%02d:%02d:%02dZ\""), tm.Year+1970, tm.Month, tm.Day, tm.Hour, tm.Minute, tm.Second);
+    } else {
+        snprintf_P(buf, buflen, PSTR("null"));
+    }
+}

lib/MeterCommunicators/include/PassiveMeterCommunicator.h

@@ -36,6 +36,9 @@ public:
     bool isConfigChanged();
     void ackConfigChanged();
     void getCurrentConfig(MeterConfig& meterConfig);
+    void setTimezone(Timezone* tz) {
+        this->tz = tz;
+    };
 
     HardwareSerial* getHwSerial();
     void rxerr(int err);

lib/MeterCommunicators/src/IEC6205675.cpp

@@ -25,16 +25,206 @@ IEC6205675::IEC6205675(const char* d, Timezone* tz, uint8_t useMeterType, MeterC
     if(val == NOVALUE) {
         CosemData* data = getCosemDataAt(1, ((char *) (d)));
         
-        // Kaifa special case...
-        if(useMeterType == AmsTypeKaifa && data->base.type == CosemTypeDLongUnsigned) {
-            this->packageTimestamp = this->packageTimestamp > 0 ? tz->toUTC(this->packageTimestamp) : 0;
+        if(useMeterType == AmsTypeIskra) { // Iskra special case
+            meterType = AmsTypeIskra;
+            uint8_t idx = 0;
+            data = getCosemDataAt(idx, ((char *) (d)));
+            if(data->base.length == 0x21) {
+                idx = 4;
+
+                // 1.8.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                activeImportCounter = ntohl(data->dlu.data) / 1000.0;
+
+                // 1.8.1
+                // 1.8.2
+                idx += 2;
+                
+                // 2.8.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                activeExportCounter = ntohl(data->dlu.data) / 1000.0;
+
+                // 2.8.1
+                // 2.8.2
+                idx += 2;
+
+                // 5.8.0
+                // 6.8.0
+                // 7.8.0
+                // 8.8.0
+                idx += 4;
+
+                // 1.7.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                activeImportPower = ntohl(data->dlu.data);
+
+                // 2.7.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                activeExportPower = ntohl(data->dlu.data);
+
+                // 13.7.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                powerFactor= ntohl(data->dlu.data) / 1000.0;
+
+                // 21.7.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l1activeImportPower = ntohl(data->dlu.data);
+
+                // 41.7.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l2activeImportPower = ntohl(data->dlu.data);
+
+                // 61.7.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l3activeImportPower = ntohl(data->dlu.data);
+
+                // 22.7.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l1activeExportPower = ntohl(data->dlu.data);
+
+                // 42.7.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l2activeExportPower = ntohl(data->dlu.data);
+
+                // 62.7.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l3activeExportPower = ntohl(data->dlu.data);
+
+                // 32.7.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l1voltage = ntohs(data->lu.data) / 10.0;
+
+                // 52.7.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l2voltage = ntohs(data->lu.data) / 10.0;
+
+                // 72.7.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l3voltage = ntohs(data->lu.data) / 10.0;
+
+                // 31.7.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l1current = ntohs(data->lu.data) / 100.0;
+
+                // 51.7.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l2current = ntohs(data->lu.data) / 100.0;
+
+                // 71.7.0
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l3current = ntohs(data->lu.data) / 100.0;
+
+                listType = 4;
+                lastUpdateMillis = millis64();
+            } else if(data->base.length == 0x0F) {
+                idx = 1;
+
+                // 1.8.0 ?
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                activeImportCounter = ntohl(data->dlu.data) / 1000.0;
+
+                // 1.8.1 ?
+                // 1.8.2 ?
+                idx += 2;
+
+                // 2.8.0 ?
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                activeExportCounter = ntohl(data->dlu.data) / 1000.0;
+
+                // 2.8.1 ?
+                // 2.8.2 ?
+                idx += 2;
+
+                idx++; // Unknown empty octet string
+
+                CosemData* meterTs = getCosemDataAt(idx++, ((char *) (d)));
+                if(meterTs != NULL) {
+                    AmsOctetTimestamp* amst = (AmsOctetTimestamp*) meterTs;
+                    time_t ts = decodeCosemDateTime(amst->dt);
+                    meterTimestamp = ts;
+                }
+
+                // 2.7.0 ?
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                activeExportPower = ntohl(data->dlu.data);
+
+                // 1.7.0 ?
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                activeImportPower = ntohl(data->dlu.data);
+
+                // 31.7.0 ?
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l1current = ntohs(data->lu.data) / 100.0;
+
+                // 51.7.0 ?
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l2current = ntohs(data->lu.data) / 100.0;
+
+                // 71.7.0 ?
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l3current = ntohs(data->lu.data) / 100.0;
+
+                // 32.7.0 ?
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l1voltage = ntohs(data->lu.data) / 10.0;
+
+                // 72.7.0 ?
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                l3voltage = ntohs(data->lu.data) / 10.0;
+
+                // 52.7.0 missing?
+                l2voltage = sqrt(pow(l1voltage - l3voltage * cos(60 * (PI/180)), 2) + pow(l3voltage * sin(60 * (PI/180)),2));
+
+                listType = 3;
+                lastUpdateMillis = millis64();
+            } else {
+                idx = 5;
+
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                if(data != NULL) {
+                    activeImportCounter = ntohl(data->dlu.data) / 1000.0;
+                }
+    
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                if(data != NULL) {
+                    activeExportCounter = ntohl(data->dlu.data) / 1000.0;
+                }
+    
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                if(data != NULL) {
+                    reactiveImportCounter = ntohl(data->dlu.data) / 1000.0;
+                }
+    
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                if(data != NULL) {
+                    reactiveExportCounter = ntohl(data->dlu.data) / 1000.0;
+                }
+
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                if(data != NULL) {
+                    activeImportPower = ntohl(data->dlu.data);
+                }
+
+                data = getCosemDataAt(idx++, ((char *) (d)));
+                if(data != NULL) {
+                    activeExportPower = ntohl(data->dlu.data);
+                }
+
+                uint8_t str_len = 0;
+                str_len = getString(AMS_OBIS_UNKNOWN_1, sizeof(AMS_OBIS_UNKNOWN_1), ((char *) (d)), str);
+                if(str_len > 0) {
+                    meterId = String(str);
+                }
+
+                listType = 4;
+                lastUpdateMillis = millis64();
+            }
+        } else if(useMeterType == AmsTypeKaifa && data->base.type == CosemTypeDLongUnsigned) { // Kaifa special case
             listType = 1;
             meterType = AmsTypeKaifa;
             activeImportPower = ntohl(data->dlu.data);
             lastUpdateMillis = millis64();
-        } else if(data->base.type == CosemTypeOctetString) {
-            this->packageTimestamp = this->packageTimestamp > 0 ? tz->toUTC(this->packageTimestamp) : 0;
-
+        } else if(data->base.type == CosemTypeOctetString) { // Assuming first string is a list identifier
             memcpy(str, data->oct.data, data->oct.length);
             str[data->oct.length] = 0x00;
             String listId = String(str);
@@ -42,7 +232,7 @@ IEC6205675::IEC6205675(const char* d, Timezone* tz, uint8_t useMeterType, MeterC
                 this->listId = listId;
                 meterType = AmsTypeKaifa;
 
-                int idx = 0;
+                uint8_t idx = 0;
                 data = getCosemDataAt(idx, ((char *) (d)));
                 idx+=2;
                 if(data->base.length == 0x0D || data->base.length == 0x12) {
@@ -123,7 +313,7 @@ IEC6205675::IEC6205675(const char* d, Timezone* tz, uint8_t useMeterType, MeterC
                             if(data->oct.length == 0x0C) {
                                 AmsOctetTimestamp* amst = (AmsOctetTimestamp*) data;
                                 time_t ts = decodeCosemDateTime(amst->dt);
-                                meterTimestamp = tz->toUTC(ts);
+                                meterTimestamp = tz != NULL ? tz->toUTC(ts) : ts;
                             }
                         }
                     }
@@ -144,7 +334,7 @@ IEC6205675::IEC6205675(const char* d, Timezone* tz, uint8_t useMeterType, MeterC
                 this->listId = listId;
                 meterType = AmsTypeIskra;
 
-                int idx = 0;
+                uint8_t idx = 0;
                 data = getCosemDataAt(idx++, ((char *) (d)));
                 if(data->base.length == 0x12) {
                     apply(state);
@@ -559,49 +749,31 @@ IEC6205675::IEC6205675(const char* d, Timezone* tz, uint8_t useMeterType, MeterC
                     data = getCosemDataAt(idx++, ((char *) (d)));
                     activeExportCounter = ntohl(data->dlu.data) / 1000.0;
                 }
-            } else if(useMeterType == AmsTypeIskra && data->base.type == CosemTypeOctetString) { // Iskra special case
+            }
+        }
+        
+        if(meterType == AmsTypeUnknown && useMeterType == AmsTypeUnknown) {
+            debugger->println("AMS unknown meter type, trying to identify...");
+            CosemData* d1 = getCosemDataAt(1, ((char *) (d)));
+            CosemData* d2 = getCosemDataAt(2, ((char *) (d)));
+            CosemData* d3 = getCosemDataAt(3, ((char *) (d)));
+            CosemData* d7 = getCosemDataAt(7, ((char *) (d)));
+            CosemData* d8 = getCosemDataAt(8, ((char *) (d)));
+
+            if(d1->base.type == CosemTypeDLongUnsigned &&
+                d2->base.type == CosemTypeDLongUnsigned &&
+                d3->base.type == CosemTypeDLongUnsigned &&
+                d7->base.type == CosemTypeOctetString &&
+                d8->base.type == CosemTypeOctetString
+            ) {
                 meterType = AmsTypeIskra;
-                uint8_t idx = 5;
-
-                data = getCosemDataAt(idx++, ((char *) (d)));
-                if(data != NULL) {
-                    activeImportCounter = ntohl(data->dlu.data) / 1000.0;
-                }
-    
-                data = getCosemDataAt(idx++, ((char *) (d)));
-                if(data != NULL) {
-                    activeExportCounter = ntohl(data->dlu.data) / 1000.0;
-                }
-    
-                data = getCosemDataAt(idx++, ((char *) (d)));
-                if(data != NULL) {
-                    reactiveImportCounter = ntohl(data->dlu.data) / 1000.0;
-                }
-    
-                data = getCosemDataAt(idx++, ((char *) (d)));
-                if(data != NULL) {
-                    reactiveExportCounter = ntohl(data->dlu.data) / 1000.0;
-                }
-
-                data = getCosemDataAt(idx++, ((char *) (d)));
-                if(data != NULL) {
-                    activeImportPower = ntohl(data->dlu.data);
-                }
-
-                data = getCosemDataAt(idx++, ((char *) (d)));
-                if(data != NULL) {
-                    activeExportPower = ntohl(data->dlu.data);
-                }
-
-                uint8_t str_len = 0;
-                str_len = getString(AMS_OBIS_UNKNOWN_1, sizeof(AMS_OBIS_UNKNOWN_1), ((char *) (d)), str);
-                if(str_len > 0) {
-                    meterId = String(str);
-                }
-
-                listType = 3;
                 lastUpdateMillis = millis64();
-            } else if(useMeterType == AmsTypeUnknown) {
+                listType = 3;
+            } else if(d1->base.type == CosemTypeOctetString && d2->base.type == CosemTypeOctetString && d3->base.type == CosemTypeOctetString) {
+                meterType = AmsTypeIskra;
+                lastUpdateMillis = millis64();
+                listType = 3;
+            } else {
                 uint8_t str_len = 0;
                 str_len = getString(AMS_OBIS_UNKNOWN_1, sizeof(AMS_OBIS_UNKNOWN_1), ((char *) (d)), str);
                 if(str_len > 0) {
@@ -612,7 +784,7 @@ IEC6205675::IEC6205675(const char* d, Timezone* tz, uint8_t useMeterType, MeterC
                 }
             }
         }
-    } else {
+    } else { // OBIS code parsing
         listType = 1;
         activeImportPower = val;
 
@@ -1121,7 +1293,7 @@ time_t IEC6205675::adjustForKnownIssues(CosemDateTime dt, Timezone* tz, uint8_t
             // 21.09.24, the clock is now correct for Aidon
             // 23.10.25, the clock is now correct for Kamstrup
             ts -= 3600;
-        } else {
+        } else if(tz != NULL) {
             // Adjust from localtime to UTC
             ts = tz->toUTC(ts);
         }

lib/MeterCommunicators/src/PassiveMeterCommunicator.cpp

@@ -807,6 +807,7 @@ void PassiveMeterCommunicator::rxerr(int err) {
 			#endif
 			debugger->printf_P(PSTR("Serial buffer overflow\n"));
 			rxBufferErrors++;
+			#if defined(ESP32)
 			if(rxBufferErrors > 1 && meterConfig.bufferSize < 8) {
 				meterConfig.bufferSize += 2;
 				#if defined(AMS_REMOTE_DEBUG)
@@ -816,6 +817,7 @@ void PassiveMeterCommunicator::rxerr(int err) {
                 configChanged = true;
 				rxBufferErrors = 0;
 			}
+			#endif
 			break;
 		case 3:
 			#if defined(AMS_REMOTE_DEBUG)

lib/PassthroughMqttHandler/include/PassthroughMqttHandler.h

@@ -16,7 +16,7 @@ public:
         this->topic = String(mqttConfig.publishTopic);
     };
     #else
-    PassthroughMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf) : AmsMqttHandler(mqttConfig, debugger, buf) {
+    PassthroughMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, AmsFirmwareUpdater* updater) : AmsMqttHandler(mqttConfig, debugger, buf, updater) {
         this->topic = String(mqttConfig.publishTopic);
     };
     #endif

lib/PriceService/include/PriceService.h

@@ -124,9 +124,6 @@ private:
     Timezone* tz = NULL;
     Timezone* entsoeTz = NULL;
 
-    static const uint16_t BufferSize = 256;
-    char* buf;
-
     bool hub = false;
     uint8_t* key = NULL;
     uint8_t* auth = NULL;
@@ -139,7 +136,7 @@ private:
     bool retrieve(const char* url, Stream* doc);
     float getCurrencyMultiplier(const char* from, const char* to, time_t t);
     bool timeIsInPeriod(tmElements_t tm, PriceConfig pc);
-    float getFixedPrice(uint8_t direction, int8_t hour);
+    float getFixedPrice(uint8_t direction, int8_t point);
     float getEnergyPricePoint(uint8_t direction, uint8_t point);
 };
 #endif

lib/PriceService/src/PriceService.cpp

@@ -25,8 +25,6 @@ PriceService::PriceService(RemoteDebug* Debug) : priceConfig(std::vector<PriceCo
 #else
 PriceService::PriceService(Stream* Debug) : priceConfig(std::vector<PriceConfig>()) {
 #endif
-    this->buf = (char*) malloc(BufferSize);
-
     debugger = Debug;
 
     // Entso-E uses CET/CEST
@@ -129,15 +127,16 @@ bool PriceService::isExportPricesDifferentFromImport() {
 }
 
 float PriceService::getPricePoint(uint8_t direction, uint8_t point) {
-    float value = getFixedPrice(direction, point * getResolutionInMinutes() / 60);
+    float value = getFixedPrice(direction, point);
     if(value == PRICE_NO_VALUE) value = getEnergyPricePoint(direction, point);
     if(value == PRICE_NO_VALUE) return PRICE_NO_VALUE;
 
     tmElements_t tm;
     time_t ts = time(nullptr);
-    breakTime(tz->toLocal(ts), tm);
+    breakTime(entsoeTz->toLocal(ts), tm);
     tm.Hour = tm.Minute = tm.Second = 0;
-    breakTime(makeTime(tm) + (point * SECS_PER_MIN * getResolutionInMinutes()), tm);
+    ts = entsoeTz->toUTC(makeTime(tm)) + (point * SECS_PER_MIN * getResolutionInMinutes());
+    breakTime(tz->toLocal(ts), tm);
 
     for (uint8_t i = 0; i < priceConfig.size(); i++) {
         PriceConfig pc = priceConfig.at(i);
@@ -164,8 +163,6 @@ float PriceService::getPricePoint(uint8_t direction, uint8_t point) {
 
 float PriceService::getCurrentPrice(uint8_t direction) {
     time_t ts = time(nullptr);
-    tmElements_t tm;
-    breakTime(tz->toLocal(ts), tm);
     uint8_t pos = getCurrentPricePointIndex();
 
     return getPricePoint(direction, pos);
@@ -173,6 +170,7 @@ float PriceService::getCurrentPrice(uint8_t direction) {
 
 float PriceService::getEnergyPricePoint(uint8_t direction, uint8_t point) {
     uint8_t pos = point;
+    
     float multiplier = 1.0;
     uint8_t numberOfPointsToday = 24;
     if(today != NULL) {
@@ -208,10 +206,10 @@ float PriceService::getPriceForRelativeHour(uint8_t direction, int8_t hour) {
     time_t ts = time(nullptr);
     tmElements_t tm;
 
-    breakTime(tz->toLocal(ts), tm);
-    int8_t targetHour = tm.Hour + hour;
+    breakTime(entsoeTz->toLocal(ts), tm);
+    uint8_t targetHour = tm.Hour + hour;
     tm.Hour = tm.Minute = tm.Second = 0;
-    time_t startOfDay = tz->toUTC(makeTime(tm));
+    time_t startOfDay = entsoeTz->toUTC(makeTime(tm));
 
     if((ts + (hour * SECS_PER_HOUR)) < startOfDay) {
         return PRICE_NO_VALUE;
@@ -237,15 +235,15 @@ float PriceService::getPriceForRelativeHour(uint8_t direction, int8_t hour) {
     return valueSum / valueCount;
 }
 
-float PriceService::getFixedPrice(uint8_t direction, int8_t hour) {
+float PriceService::getFixedPrice(uint8_t direction, int8_t point) {
     time_t ts = time(nullptr);
 
     tmElements_t tm;
+    breakTime(entsoeTz->toLocal(ts), tm);
+    tm.Hour = tm.Minute = tm.Second = 0;
+    ts = entsoeTz->toUTC(makeTime(tm)) + (point * SECS_PER_MIN * getResolutionInMinutes());
     breakTime(tz->toLocal(ts), tm);
-    tm.Hour = hour;
-    tm.Minute = 0;
-    tm.Second = 0;
-    breakTime(makeTime(tm), tm);
+    tm.Minute = tm.Second = 0;
 
     float value = PRICE_NO_VALUE;
     for (uint8_t i = 0; i < priceConfig.size(); i++) {
@@ -430,11 +428,12 @@ float PriceService::getCurrencyMultiplier(const char* from, const char* to, time
         #endif
 
         float currencyMultiplier = 0;
-        snprintf_P(buf, BufferSize, PSTR("https://data.norges-bank.no/api/data/EXR/B.%s.NOK.SP?lastNObservations=1"), from);
+        char buf[80];
+        snprintf_P(buf, 80, PSTR("https://data.norges-bank.no/api/data/EXR/B.%s.NOK.SP?lastNObservations=1"), from);
         if(retrieve(buf, &p)) {
             currencyMultiplier = p.getValue();
             if(strncmp(to, "NOK", 3) != 0) {
-                snprintf_P(buf, BufferSize, PSTR("https://data.norges-bank.no/api/data/EXR/B.%s.NOK.SP?lastNObservations=1"), to);
+                snprintf_P(buf, 80, PSTR("https://data.norges-bank.no/api/data/EXR/B.%s.NOK.SP?lastNObservations=1"), to);
                 if(retrieve(buf, &p)) {
                     if(p.getValue() > 0.0) {
                         currencyMultiplier /= p.getValue();
@@ -477,7 +476,8 @@ PricesContainer* PriceService::fetchPrices(time_t t) {
         breakTime(e1, d1);
         breakTime(e2, d2);
 
-        snprintf_P(buf, BufferSize, PSTR("https://web-api.tp.entsoe.eu/api?securityToken=%s&documentType=A44&periodStart=%04d%02d%02d%02d%02d&periodEnd=%04d%02d%02d%02d%02d&in_Domain=%s&out_Domain=%s"), 
+        char buf[256];
+        snprintf_P(buf, 256, PSTR("https://web-api.tp.entsoe.eu/api?securityToken=%s&documentType=A44&periodStart=%04d%02d%02d%02d%02d&periodEnd=%04d%02d%02d%02d%02d&in_Domain=%s&out_Domain=%s"), 
         getToken(), 
         d1.Year+1970, d1.Month, d1.Day, d1.Hour, 00,
         d2.Year+1970, d2.Month, d2.Day, d2.Hour, 00,
@@ -514,8 +514,8 @@ PricesContainer* PriceService::fetchPrices(time_t t) {
         tmElements_t tm;
         breakTime(entsoeTz->toLocal(t), tm);
 
-        String data;
-        snprintf_P(buf, BufferSize, PSTR("http://hub.amsleser.no/hub/price/%s/%d/%d/%d/pt%dm?currency=%s"),
+        char buf[128];
+        snprintf_P(buf, 128, PSTR("http://hub.amsleser.no/hub/price/%s/%d/%d/%d/pt%dm?currency=%s"),
             config->area,
             tm.Year+1970,
             tm.Month,
@@ -547,13 +547,14 @@ PricesContainer* PriceService::fetchPrices(time_t t) {
             #endif
 
             if(status == HTTP_CODE_OK) {
-                data = http->getString();
-                http->end();
-                
-                uint8_t* content = (uint8_t*) (data.c_str());
+                uint8_t content[1024];
+
+                WiFiClient* stream = http->getStreamPtr(); 
 
                 DataParserContext ctx = {0,0,0,0};
-                ctx.length = data.length();
+                ctx.length = stream->readBytes(content, http->getSize());
+                http->end();
+
                 GCMParser gcm(key, auth);
                 int8_t gcmRet = gcm.parse(content, ctx);
                 if(gcmRet > 0) {
@@ -569,8 +570,11 @@ PricesContainer* PriceService::fetchPrices(time_t t) {
                     ret->setCurrency(header->currency);
                     int32_t* points = (int32_t*) &header[1];
 
-                    for(uint8_t i = 0; i < header->numberOfPoints; i++) {
-                        int32_t intval = ntohl(points[i]);
+                    int32_t intval;
+                    for(uint8_t i = 0; i < ret->getNumberOfPoints(); i++) {
+                        // To avoid alignment issues on ESP8266, we use memcpy
+                        memcpy(&intval, &points[i], sizeof(int32_t));
+                        intval = ntohl(intval); // Change byte order before converting to float, to support negative values
                         float value = intval / 10000.0;
                         #if defined(AMS_REMOTE_DEBUG)
                         if (debugger->isActive(RemoteDebug::VERBOSE))
@@ -579,8 +583,10 @@ PricesContainer* PriceService::fetchPrices(time_t t) {
                         ret->setPrice(i, value, PRICE_DIRECTION_IMPORT);
                     }
                     if(header->differentExportPrices) {
-                        for(uint8_t i = 0; i < header->numberOfPoints; i++) {
-                            int32_t intval = ntohl(points[i]);
+                        for(uint8_t i = 0; i < ret->getNumberOfPoints(); i++) {
+                            // To avoid alignment issues on ESP8266, we use memcpy
+                            memcpy(&intval, &points[ret->getNumberOfPoints()+i], sizeof(int32_t));
+                            intval = ntohl(intval); // Change byte order before converting to float, to support negative values
                             float value = intval / 10000.0;
                             #if defined(AMS_REMOTE_DEBUG)
                             if (debugger->isActive(RemoteDebug::VERBOSE))
@@ -756,6 +762,6 @@ bool PriceService::timeIsInPeriod(tmElements_t tm, PriceConfig pc) {
 uint8_t PriceService::getCurrentPricePointIndex() {
     time_t ts = time(nullptr);
     tmElements_t tm;
-    breakTime(tz->toLocal(ts), tm);
+    breakTime(entsoeTz->toLocal(ts), tm);
     return ((tm.Hour * 60) + tm.Minute) / getResolutionInMinutes();
 }

lib/RawMqttHandler/include/RawMqttHandler.h

@@ -17,7 +17,7 @@ public:
         topic = String(mqttConfig.publishTopic);
     };
     #else
-    RawMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf) : AmsMqttHandler(mqttConfig, debugger, buf) {
+    RawMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, AmsFirmwareUpdater* updater) : AmsMqttHandler(mqttConfig, debugger, buf, updater) {
         full = mqttConfig.payloadFormat == 2;
         topic = String(mqttConfig.publishTopic);
     };

lib/SvelteUi/app/README.md

@@ -0,0 +1,59 @@
+# SvelteUi App
+
+Web interface for AMS Reader firmware built with Svelte 5 and Vite 6.
+
+## Development Setup
+
+### Prerequisites
+- Node.js 20.x or 22.x LTS (required for Vite 6)
+- npm
+
+### Local Development Configuration
+
+To develop against your AMS reader device, you need to configure the proxy target:
+
+1. Copy the example config file:
+   ```bash
+   cp vite.config.local.example.js vite.config.local.js
+   ```
+
+2. Edit `vite.config.local.js` and update the IP address to match your device:
+   ```javascript
+   export default {
+     proxyTarget: "http://192.168.1.100"  // Your device's IP
+   }
+   ```
+
+3. The `vite.config.local.js` file is gitignored, so your personal settings won't be committed.
+
+### Running Development Server
+
+```bash
+npm install
+npm run dev
+```
+
+The dev server will proxy API requests to your configured device IP.
+
+### Building for Production
+
+```bash
+npm run build
+```
+
+The build output will be in the `dist/` directory.
+
+## Project Structure
+
+- `src/` - Application source code
+  - `routes/` - Page components using svelte-spa-router
+  - `lib/` - Shared components and utilities
+- `public/` - Static assets (favicon, etc.)
+- `dist/` - Build output (not committed to git)
+
+## Key Technologies
+
+- **Svelte 5.17.0** - UI framework
+- **Vite 6.0.7** - Build tool
+- **svelte-spa-router 4.0.1** - Hash-based routing
+- **Tailwind CSS** - Styling

lib/SvelteUi/app/dist/index.html

@@ -8,10 +8,9 @@
     <link rel="mask-icon" href="/favicon.svg" color="#000000">
     <title>AMS reader</title>
     <script type="module" crossorigin src="/index.js"></script>
-    <link rel="stylesheet" href="/index.css">
+    <link rel="stylesheet" crossorigin href="/index.css">
   </head>
   <body class="bg-gray-100 dark:bg-gray-900">
     <div id="app"></div>
-    
   </body>
 </html>

lib/SvelteUi/app/package.json

@@ -9,24 +9,19 @@
     "build": "vite build",
     "preview": "vite preview"
   },
-  "overrides": {
-  "svelte-navigator": {
-    "svelte": ">=4.x"
-  }
-},
   "devDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^2.1.0",
+    "@sveltejs/vite-plugin-svelte": "^5.0.2",
     "@tailwindcss/forms": "^0.5.3",
     "autoprefixer": "^10.4.14",
     "http-proxy-middleware": "^2.0.9",
     "postcss": "^8.4.31",
     "postcss-load-config": "^4.0.1",
-    "svelte": "^4.2.19",
-    "svelte-navigator": "^3.2.2",
-    "svelte-preprocess": "^5.0.3",
+    "svelte": "^5.17.0",
+    "svelte-spa-router": "^4.0.1",
+    "svelte-preprocess": "^6.0.3",
     "svelte-qrcode": "^1.0.0",
     "tailwindcss": "^3.3.1",
-    "vite": "^4.5.14"
+    "vite": "^6.0.7"
   },
   "dependencies": {
     "cssnano": "^5.1.15",

lib/SvelteUi/app/public/favicon.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52 52">
+   <title>Amsleser</title>
+   <g transform="translate(-29.5,-83)">
+      <circle r="4.8016944" cy="123.56455" cx="55.064552"
+         style="fill:none;stroke:#045c7c;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path d="m 41.298717,103.9049 a 24,24 0 0 1 27.531669,0"
+         style="fill:none;stroke:#045c7c;stroke-width:3.3;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path d="m 35.562952,95.713384 a 34,34 0 0 1 39.003199,-2e-6"
+         style="fill:none;stroke:#045c7c;stroke-width:3.3;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path d="m 47.034482,112.09642 a 14,14 0 0 1 16.06014,0"
+         style="fill:none;stroke:#045c7c;stroke-width:3.3;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle r="3" cy="105.99158" cx="38.181862"
+         style="fill:none;stroke:#045c7c;stroke-width:2.4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle r="3" cy="97.959579" cx="77.491386"
+         style="fill:none;stroke:#045c7c;stroke-width:2.4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+   </g>
+</svg>

lib/SvelteUi/app/src/App.svelte

@@ -1,49 +1,27 @@
 <script>
-  import { Router, Route, navigate } from "svelte-navigator";
-  import { getTariff, tariffStore, sysinfoStore, dataStore, importPricesStore, exportPricesStore, dayPlotStore, monthPlotStore, temperaturesStore, getSysinfo } from './lib/DataStores.js';
+  import Router from "svelte-spa-router";
+  import { push } from "svelte-spa-router";
+  import { getTariff, sysinfoStore, dataStore, getSysinfo } from './lib/DataStores.js';
   import { translationsStore, getTranslations } from "./lib/TranslationService.js";
-  import Favicon from './assets/favicon.svg'; // Need this for the build
   import Header from './lib/Header.svelte';
-  import Dashboard from './lib/Dashboard.svelte';
-  import ConfigurationPanel from './lib/ConfigurationPanel.svelte';
-  import StatusPage from './lib/StatusPage.svelte';
-  import VendorPanel from './lib/VendorPanel.svelte';
-  import SetupPanel from './lib/SetupPanel.svelte';
+  import DashboardRoute from './routes/DashboardRoute.svelte';
+  import ConfigurationRoute from './routes/ConfigurationRoute.svelte';
+  import StatusRoute from './routes/StatusRoute.svelte';
+  import PriceConfigRoute from './routes/PriceConfigRoute.svelte';
+  import MqttCaRoute from './routes/MqttCaRoute.svelte';
+  import MqttCertRoute from './routes/MqttCertRoute.svelte';
+  import MqttKeyRoute from './routes/MqttKeyRoute.svelte';
+  import ConsentRoute from './routes/ConsentRoute.svelte';
+  import SetupRoute from './routes/SetupRoute.svelte';
+  import VendorRoute from './routes/VendorRoute.svelte';
+  import EditDayRoute from './routes/EditDayRoute.svelte';
+  import EditMonthRoute from './routes/EditMonthRoute.svelte';
   import Mask from './lib/Mask.svelte';
-  import FileUploadComponent from "./lib/FileUploadComponent.svelte";
-  import ConsentComponent from "./lib/ConsentComponent.svelte";
-  import PriceConfig from "./lib/PriceConfig.svelte";
-  import DataEdit from "./lib/DataEdit.svelte";
   import { updateRealtime } from "./lib/RealtimeStore.js";
   
   let basepath = document.getElementsByTagName('base')[0].getAttribute("href");
   if(!basepath) basepath = "/";
 
-  let importPrices;
-  importPricesStore.subscribe(update => {
-      importPrices = update;
-  });
-
-  let exportPrices;
-  exportPricesStore.subscribe(update => {
-      exportPrices = update;
-  });
-
-  let dayPlot;
-  dayPlotStore.subscribe(update => {
-      dayPlot = update;
-  });
-
-  let monthPlot;
-  monthPlotStore.subscribe(update => {
-      monthPlot = update;
-  });
-
-  let temperatures;
-  temperaturesStore.subscribe(update => {
-      temperatures = update;
-  });
-
   let translations = {};
   translationsStore.subscribe(update => {
     translations = update;
@@ -56,11 +34,11 @@
   sysinfoStore.subscribe(update => {
     sysinfo = update;
     if(sysinfo.vndcfg === false) {
-      navigate(basepath + "vendor");
+      push("/vendor");
     } else if(sysinfo.usrcfg === false) {
-      navigate(basepath + "setup");
+      push("/setup");
     } else if(sysinfo.fwconsent === 0) {
-      navigate(basepath + "consent");
+      push("/consent");
     }
 
     if(sysinfo.ui.k === 1) {
@@ -94,53 +72,26 @@
     updateRealtime(update);
   });
 
-  let tariffData = {};
-  tariffStore.subscribe(update => {
-    tariffData = update;
-  });
   getTariff();
 </script>
 
 <div class="container mx-auto m-3">
-  <Router basepath={basepath}>
-    <Header data={data} basepath={basepath}/>
-    <Route path="/">
-      <Dashboard data={data} sysinfo={sysinfo} importPrices={importPrices} exportPrices={exportPrices} dayPlot={dayPlot} monthPlot={monthPlot} temperatures={temperatures} translations={translations} tariffData={tariffData}/>
-    </Route>
-    <Route path="/configuration">
-      <ConfigurationPanel sysinfo={sysinfo} basepath={basepath} data={data}/>
-    </Route>
-    <Route path="/priceconfig">
-      <PriceConfig basepath={basepath}/>
-    </Route>
-    <Route path="/status">
-      <StatusPage sysinfo={sysinfo} data={data}/>
-    </Route>
-    <Route path="/mqtt-ca">
-      <FileUploadComponent title="CA" action="/mqtt-ca"/>
-    </Route>
-    <Route path="/mqtt-cert">
-      <FileUploadComponent title="certificate" action="/mqtt-cert"/>
-    </Route>
-    <Route path="/mqtt-key">
-      <FileUploadComponent title="private key" action="/mqtt-key"/>
-    </Route>
-    <Route path="/consent">
-      <ConsentComponent sysinfo={sysinfo} basepath={basepath}/>
-    </Route>
-    <Route path="/setup">
-      <SetupPanel sysinfo={sysinfo}/>
-    </Route>
-    <Route path="/vendor">
-      <VendorPanel sysinfo={sysinfo} basepath={basepath}/>
-    </Route>
-    <Route path="/edit-day">
-      <DataEdit prefix="UTC Hour" data={dayPlot} url="/dayplot" basepath={basepath}/>
-    </Route>
-    <Route path="/edit-month">
-      <DataEdit prefix="Day" data={monthPlot} url="/monthplot" basepath={basepath}/>
-    </Route>
-  </Router>
+  <Header data={data} basepath={basepath}/>
+  
+  <Router routes={{
+    '/': DashboardRoute,
+    '/configuration': ConfigurationRoute,
+    '/priceconfig': PriceConfigRoute,
+    '/status': StatusRoute,
+    '/mqtt-ca': MqttCaRoute,
+    '/mqtt-cert': MqttCertRoute,
+    '/mqtt-key': MqttKeyRoute,
+    '/consent': ConsentRoute,
+    '/setup': SetupRoute,
+    '/vendor': VendorRoute,
+    '/edit-day': EditDayRoute,
+    '/edit-month': EditMonthRoute,
+  }} />
 
   {#if sysinfo.booting}
     {#if sysinfo.trying}

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

@@ -1,5 +1,4 @@
 <script>
-    import { Link } from "svelte-navigator";
 	import { tooltip } from './tooltip';
 
     export let config;
@@ -47,7 +46,7 @@
             {#if config.link}
                 <div class="text-xs text-right">
                     {#if config.link.route}
-                        <Link to={config.link.url}>{config.link.text}</Link>
+                        <a href={"#" + config.link.url}>{config.link.text}</a>
                     {:else}
                         <a href={config.link.url} target={config.link.target}>{config.link.text}</a>
                     {/if}
@@ -73,7 +72,7 @@
                 {#each config.x.ticks as point, i}
                     {#if !isNaN(xScale(i))}
                         <g class="tick" transform="translate({xScale(i)},{heightAvailable})">
-                            {#if barWidth > 20 || i%2 == 0}
+                            {#if barWidth > 20 || i%2 == 0 || !config.x.ticks[i-1].label}
                             <text x="{barWidth/2}" y="-4">{point.label}</text>
                             {/if}
                         </g>

lib/SvelteUi/app/src/lib/DataEdit.svelte

@@ -1,6 +1,6 @@
 <script>
     import { translationsStore } from './TranslationService';
-    import { navigate } from 'svelte-navigator';
+    import { push } from 'svelte-spa-router';
     import Mask from './Mask.svelte'
 
     export let prefix;
@@ -59,7 +59,7 @@
         let res = (await response.json())
 
         saving = false;
-        navigate(basepath);
+        push(basepath);
 	}
 </script>
 <form on:submit|preventDefault={handleSubmit} autocomplete="off">
@@ -70,7 +70,7 @@
                 {#each importElements as el}
                 <label class="flex w-60 m-1">
                     <span class="in-pre">{el.name}</span>
-                    <input name="{el.key}" bind:value={data[el.key]} type="number" step="0.01" class="in-txt w-full text-right"/>
+                    <input name="{el.key}" bind:value={data[el.key]} type="number" step="0.001" class="in-txt w-full text-right"/>
                     <span class="in-post">kWh</span>
                 </label>
                 {/each}
@@ -82,7 +82,7 @@
                 {#each exportElements as el}
                 <label class="flex w-60 m-1">
                     <span class="in-pre">{el.name}</span>
-                    <input name="{el.key}" bind:value={data[el.key]} type="number" step="0.01" class="in-txt w-full text-right"/>
+                    <input name="{el.key}" bind:value={data[el.key]} type="number" step="0.001" class="in-txt w-full text-right"/>
                     <span class="in-post">kWh</span>
                 </label>
                 {/each}

lib/SvelteUi/app/src/lib/Header.svelte

@@ -1,5 +1,4 @@
 <script>
-    import { Link } from "svelte-navigator";
     import { sysinfoStore } from './DataStores.js';
     import { upgrade, upgradeWarningText } from './UpgradeHelper';
     import { boardtype, isBusPowered, wiki, bcol } from './Helpers.js';
@@ -46,7 +45,7 @@
 <nav class="hdr">
       <div class="flex flex-wrap space-x-4 text-sm text-gray-300">
         <div class="flex text-lg text-gray-100 p-2">
-          <Link to="/">AMS reader <span>{sysinfo.version}</span></Link>
+          <a href={basepath}>AMS reader <span>{sysinfo.version}</span></a>
         </div>
         <div class="flex-none my-auto p-2 flex space-x-4">
           <div class="flex-none my-auto"><Uptime epoch={data.u}/></div>
@@ -79,10 +78,10 @@
           </div>
           {#if sysinfo.vndcfg && sysinfo.usrcfg}
           <div class="flex-none px-1 mt-1" title={translations.header?.config ?? ""}>
-            <Link to="/configuration"><GearIcon/></Link>
+            <a href="#/configuration"><GearIcon/></a>
           </div>
           <div class="flex-none px-1 mt-1" title={translations.header?.status ?? ""}>
-            <Link to="/status"><InfoIcon/></Link>
+            <a href="#/status"><InfoIcon/></a>
           </div>
           {/if}
           <div class="flex-none px-1 mt-1" title={translations.header?.doc ?? ""}>

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

@@ -130,7 +130,7 @@ export function uiVisibility(choice, state) {
 }
 
 export function wiki(page) {
-    let ret = "https://wiki.amsleser.no/";
+    let ret = "https://wiki.amsleser.no";
     if(page) {
         ret += "/en/firmware#" + page;
     }

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

@@ -5,6 +5,7 @@
 
     export let title;
     export let json;
+    export let sysinfo;
 
     let config = {};
     let max;
@@ -39,7 +40,8 @@
             let xTicks = [];
             let values = [];
             min = max = 0;
-            let i = Math.floor(((cur.getHours()*60) + cur.getMinutes()) / json?.resolution);
+            addHours(cur, sysinfo.clock_offset - ((24 + cur.getHours() - cur.getUTCHours())%24));
+            let i = json?.cursor ? json.cursor : 0;
             cur.setMinutes(Math.floor(cur.getMinutes()/json?.resolution)*json?.resolution,0,0);
             while(i < json?.prices?.length) {
                 val = json.prices[i];

lib/SvelteUi/app/src/lib/TariffPeakChart.svelte

@@ -41,22 +41,22 @@
             for(i = 0; i < tariffData.p.length; i++) {
                 let peak = tariffData.p[i];
 
-                let title = "";
+                let peakTitle = "";
                 let daylabel = "-";
                 if(peak.d > 0) {
                     daylabel = zeropad(peak.d) + ".";
-                    title = zeropad(peak.d) + "." + (translations.months ? translations.months?.[new Date().getMonth()] : zeropad(new Date().getMonth()+1));
+                    peakTitle = zeropad(peak.d) + "." + (translations.months ? translations.months?.[new Date().getMonth()] : zeropad(new Date().getMonth()+1));
                     if(tariffData.p.length < 4) {
-                        daylabel = title;
+                        daylabel = peakTitle;
                     }
                 }
                 if(!isNaN(peak.h))
-                    title = title + ' ' + zeropad(peak.h) + ':00';
-                title = title + ': ' + peak.v.toFixed(2) + ' kWh';
+                    peakTitle = peakTitle + ' ' + zeropad(peak.h) + ':00';
+                peakTitle = peakTitle + ': ' + peak.v.toFixed(2) + ' kWh';
                 points.push({
                     label: peak.v.toFixed(2), 
                     value: peak.v, 
-                    title: title,
+                    title: peakTitle,
                     color: dark ? '#5c2da5' : '#7c3aed'
                 });
                 xTicks.push({

lib/SvelteUi/app/src/main.js

@@ -1,7 +1,8 @@
 import "./app.postcss";
+import { mount } from "svelte";
 import App from "./App.svelte";
 
-const app = new App({
+const app = mount(App, {
   target: document.getElementById("app"),
 });
 

lib/SvelteUi/app/src/routes/ConfigurationRoute.svelte

@@ -1,21 +1,24 @@
 <script>
-    import { getConfiguration, configurationStore } from './ConfigurationStore'
-    import { sysinfoStore, networksStore } from './DataStores.js';
-    import fetchWithTimeout from './fetchWithTimeout';
-    import { translationsStore } from './TranslationService';
-    import { wiki, ipPattern, asciiPattern, asciiPatternExt, charAndNumPattern, hexPattern, numPattern, isBusPowered } from './Helpers.js';
-    import UartSelectOptions from './UartSelectOptions.svelte';
-    import Mask from './Mask.svelte'
-    import Badge from './Badge.svelte';
-    import CountrySelectOptions from './CountrySelectOptions.svelte';
-    import { Link, navigate } from 'svelte-navigator';
-    import SubnetOptions from './SubnetOptions.svelte';
+    import { getConfiguration, configurationStore } from '../lib/ConfigurationStore'
+    import { sysinfoStore, networksStore, dataStore } from '../lib/DataStores.js';
+    import fetchWithTimeout from '../lib/fetchWithTimeout';
+    import { translationsStore } from '../lib/TranslationService';
+    import { wiki, ipPattern, asciiPattern, asciiPatternExt, charAndNumPattern, hexPattern, numPattern, isBusPowered } from '../lib/Helpers.js';
+    import UartSelectOptions from '../lib/UartSelectOptions.svelte';
+    import Mask from '../lib/Mask.svelte'
+    import Badge from '../lib/Badge.svelte';
+    import CountrySelectOptions from '../lib/CountrySelectOptions.svelte';
+    import { push } from 'svelte-spa-router';
+    import SubnetOptions from '../lib/SubnetOptions.svelte';
     import QrCode from 'svelte-qrcode';
 
-    export let basepath = "/";
-    export let sysinfo = {};
-    export let data;
+    let basepath = "/";
+    let sysinfo = {};
+    let data;
   
+    sysinfoStore.subscribe(v => sysinfo = v);
+    dataStore.subscribe(v => data = v);
+
     let translations = {};
     translationsStore.subscribe(update => {
       translations = update;
@@ -150,7 +153,7 @@
         });
 
         saving = false;
-        navigate(basepath);
+        push(basepath);
 	}
 
     async function reboot() {
@@ -336,7 +339,7 @@
                 </div>
             </div>
             <div class="my-1">
-                <Link to="/priceconfig" class="text-blue-600 hover:text-blue-800">{translations.conf?.price?.conf ?? "Configure"}</Link>
+                <a href="#/priceconfig" class="text-blue-600 hover:text-blue-800">{translations.conf?.price?.conf ?? "Configure"}</a>
             </div>
             <div class="my-1">
                 <label><input type="checkbox" name="pe" value="true" bind:checked={configuration.p.e} class="rounded mb-1"/> {translations.conf?.price?.enabled ?? "Enabled"}</label>
@@ -603,28 +606,28 @@
             <div class="my-1 flex">
                 <span class="flex pr-2">
                     {#if configuration.q.s.c}
-                    <span class="bd-on"><Link to="/mqtt-ca">{translations.conf?.mqtt?.ca_ok ?? "CA OK"}</Link></span>
+                    <span class="bd-on"><a href="#/mqtt-ca">{translations.conf?.mqtt?.ca_ok ?? "CA OK"}</a></span>
                     <span class="bd-off"  on:click={askDeleteCa} on:keypress={askDeleteCa}>&#128465;</span>
                     {:else}
-                    <Link to="/mqtt-ca"><Badge color="blue" text={translations.conf?.mqtt?.btn_ca_upload ?? "Upload CA"} title={translations.conf?.mqtt?.title_ca ?? ""}/></Link>
+                    <a href="#/mqtt-ca"><Badge color="blue" text={translations.conf?.mqtt?.btn_ca_upload ?? "Upload CA"} title={translations.conf?.mqtt?.title_ca ?? ""}/></a>
                     {/if}
                 </span>
 
                 <span class="flex pr-2">
                     {#if configuration.q.s.r}
-                    <span class="bd-on"><Link to="/mqtt-cert">{translations.conf?.mqtt?.crt_ok ?? "Cert OK"}</Link></span>
+                    <span class="bd-on"><a href="#/mqtt-cert">{translations.conf?.mqtt?.crt_ok ?? "Cert OK"}</a></span>
                     <span class="bd-off" on:click={askDeleteCert} on:keypress={askDeleteCert}>&#128465;</span>
                     {:else}
-                    <Link to="/mqtt-cert"><Badge color="blue" text={translations.conf?.mqtt?.btn_crt_upload ?? "Upload cert"} title={translations.conf?.mqtt?.title_crt ?? ""}/></Link>
+                    <a href="#/mqtt-cert"><Badge color="blue" text={translations.conf?.mqtt?.btn_crt_upload ?? "Upload cert"} title={translations.conf?.mqtt?.title_crt ?? ""}/></a>
                     {/if}
                 </span>
 
                 <span class="flex pr-2">
                     {#if configuration.q.s.k}
-                    <span class="bd-on"><Link to="/mqtt-key">{translations.conf?.mqtt?.key_ok ?? "Key OK"}</Link></span>
+                    <span class="bd-on"><a href="#/mqtt-key">{translations.conf?.mqtt?.key_ok ?? "Key OK"}</a></span>
                     <span class="bd-off" on:click={askDeleteKey} on:keypress={askDeleteKey}>&#128465;</span>
                     {:else}
-                    <Link to="/mqtt-key"><Badge color="blue" text={translations.conf?.mqtt?.btn_key_upload ?? "Upload key"} title={translations.conf?.mqtt?.title_key ?? ""}/></Link>
+                    <a href="#/mqtt-key"><Badge color="blue" text={translations.conf?.mqtt?.btn_key_upload ?? "Upload key"} title={translations.conf?.mqtt?.title_key ?? ""}/></a>
                     {/if}
                 </span>
             </div>

lib/SvelteUi/app/src/routes/ConsentRoute.svelte

@@ -1,18 +1,19 @@
 <script>
-    import { sysinfoStore } from './DataStores.js';
-    import { translationsStore } from './TranslationService.js';
-    import Mask from './Mask.svelte'
-    import { navigate } from 'svelte-navigator';
-    import { wiki } from './Helpers';
+    import { sysinfoStore } from '../lib/DataStores.js';
+    import { translationsStore } from '../lib/TranslationService.js';
+    import Mask from '../lib/Mask.svelte'
+    import { push } from 'svelte-spa-router';
 
-    export let basepath = "/";
-    export let sysinfo = {};
+    let basepath = "/";
+    let sysinfo = {};
 
     let translations = {};
     translationsStore.subscribe(update => {
       translations = update;
     });
 
+    sysinfoStore.subscribe(v => sysinfo = v);
+
     let loadingOrSaving = false;
 
     async function handleSubmit(e) {
@@ -36,7 +37,7 @@
             s.booting = res.reboot;
             return s;
         });
-        navigate(basepath);
+        push(basepath);
     }
 </script>
 

lib/SvelteUi/app/src/routes/DashboardRoute.svelte

@@ -1,26 +1,38 @@
 <script>
-    import { ampcol, exportcol, metertype, uiVisibility, formatUnit, fmtnum, formatCurrency } from './Helpers.js';
-    import PowerGauge from './PowerGauge.svelte';
-    import VoltPlot from './VoltPlot.svelte';
-    import ReactiveData from './ReactiveData.svelte';
-    import AccountingData from './AccountingData.svelte';
-    import PricePlot from './PricePlot.svelte';
-    import DayPlot from './DayPlot.svelte';
-    import MonthPlot from './MonthPlot.svelte';
-    import TemperaturePlot from './TemperaturePlot.svelte';
-    import TariffPeakChart from './TariffPeakChart.svelte';
-    import RealtimePlot from './RealtimePlot.svelte';
-    import PerPhasePlot from './PerPhasePlot.svelte';
+    import { ampcol, exportcol, metertype, uiVisibility, formatUnit, fmtnum, formatCurrency } from '../lib/Helpers.js';
+    import PowerGauge from '../lib/PowerGauge.svelte';
+    import VoltPlot from '../lib/VoltPlot.svelte';
+    import ReactiveData from '../lib/ReactiveData.svelte';
+    import AccountingData from '../lib/AccountingData.svelte';
+    import PricePlot from '../lib/PricePlot.svelte';
+    import DayPlot from '../lib/DayPlot.svelte';
+    import MonthPlot from '../lib/MonthPlot.svelte';
+    import TemperaturePlot from '../lib/TemperaturePlot.svelte';
+    import TariffPeakChart from '../lib/TariffPeakChart.svelte';
+    import RealtimePlot from '../lib/RealtimePlot.svelte';
+    import PerPhasePlot from '../lib/PerPhasePlot.svelte';
+    import { dataStore, sysinfoStore, importPricesStore, exportPricesStore, dayPlotStore, monthPlotStore, temperaturesStore, tariffStore } from '../lib/DataStores.js';
+    import { translationsStore } from '../lib/TranslationService.js';
 
-    export let data = {}
-    export let sysinfo = {}
-    export let importPrices = {}
-    export let exportPrices = {}
-    export let dayPlot = {}
-    export let monthPlot = {}
-    export let temperatures = {};
-    export let translations = {};
-    export let tariffData = {};
+    let data = {}
+    let sysinfo = {}
+    let importPrices = {}
+    let exportPrices = {}
+    let dayPlot = {}
+    let monthPlot = {}
+    let temperatures = {};
+    let translations = {};
+    let tariffData = {};
+
+    dataStore.subscribe(v => data = v);
+    sysinfoStore.subscribe(v => sysinfo = v);
+    importPricesStore.subscribe(v => importPrices = v);
+    exportPricesStore.subscribe(v => exportPrices = v);
+    dayPlotStore.subscribe(v => dayPlot = v);
+    monthPlotStore.subscribe(v => monthPlot = v);
+    temperaturesStore.subscribe(v => temperatures = v);
+    translationsStore.subscribe(v => translations = v);
+    tariffStore.subscribe(v => tariffData = v);
 
     let it,et,threePhase, l1e, l2e, l3e;
     $: {
@@ -140,17 +152,17 @@
     {#if uiVisibility(sysinfo.ui.p, data.p && !Number.isNaN(data.p))}
         {#if importPrices?.importExportPriceDifferent && (data.om || data.e > 0)}
             <div class="cnt gwf">
-                <PricePlot title="{translations.dashboard?.price_import ?? "Price import"}" json={importPrices}/>
+                <PricePlot title="{translations.dashboard?.price_import ?? "Price import"}" json={importPrices} sysinfo={sysinfo}/>
             </div>
         {:else}
             <div class="cnt gwf">
-                <PricePlot title={translations.dashboard?.price ?? "Price"} json={importPrices}/>
+                <PricePlot title={translations.dashboard?.price ?? "Price"} json={importPrices} sysinfo={sysinfo}/>
             </div>
         {/if}
     {/if}
     {#if importPrices?.importExportPriceDifferent && (data.om || data.e > 0) && uiVisibility(sysinfo.ui.p, data.pe && !Number.isNaN(data.pe))}
         <div class="cnt gwf">
-            <PricePlot title={translations.dashboard?.price_export ?? "Price export"} json={exportPrices}/>
+            <PricePlot title={translations.dashboard?.price_export ?? "Price export"} json={exportPrices} sysinfo={sysinfo}/>
         </div>
     {/if}
     {#if uiVisibility(sysinfo.ui.d, dayPlot)}

lib/SvelteUi/app/src/routes/EditDayRoute.svelte

@@ -0,0 +1,11 @@
+<script>
+  import DataEdit from '../lib/DataEdit.svelte';
+  import { dayPlotStore } from '../lib/DataStores.js';
+
+  let basepath = "/";
+  let dayPlot;
+  
+  dayPlotStore.subscribe(v => dayPlot = v);
+</script>
+
+<DataEdit prefix="UTC Hour" data={dayPlot} url="/dayplot" {basepath} />

lib/SvelteUi/app/src/routes/EditMonthRoute.svelte

@@ -0,0 +1,11 @@
+<script>
+  import DataEdit from '../lib/DataEdit.svelte';
+  import { monthPlotStore } from '../lib/DataStores.js';
+
+  let basepath = "/";
+  let monthPlot;
+  
+  monthPlotStore.subscribe(v => monthPlot = v);
+</script>
+
+<DataEdit prefix="Day" data={monthPlot} url="/monthplot" {basepath} />

lib/SvelteUi/app/src/routes/MqttCaRoute.svelte

@@ -1,9 +1,6 @@
 <script>
-    import Mask from "./Mask.svelte";
-    import { translationsStore } from "./TranslationService";
-
-    export let action;
-    export let title;
+    import Mask from "../lib/Mask.svelte";
+    import { translationsStore } from "../lib/TranslationService";
 
     let translations = {};
     translationsStore.subscribe(update => {
@@ -15,12 +12,12 @@
 
 <div class="grid xl:grid-cols-4 lg:grid-cols-2 md:grid-cols-2">
     <div class="cnt">
-        <strong>{translations.upload?.title ?? "Upload"} {title}</strong>
+        <strong>{translations.upload?.title ?? "Upload"} CA</strong>
         <p class="mb-4">{translations.upload?.desc ?? ""}</p>
-        <form action="{action}" enctype="multipart/form-data" method="post" on:submit={() => uploading=true} autocomplete="off">
+        <form action="/mqtt-ca" enctype="multipart/form-data" method="post" on:submit={() => uploading=true} autocomplete="off">
             <input name="file" type="file">
             <div class="w-full text-right mt-4">
-                <button type="submit" class="btn-pri"><p class="mb-4">{translations.btn?.upload ?? "Upload"}</button>
+                <button type="submit" class="btn-pri">{translations.btn?.upload ?? "Upload"}</button>
             </div>
         </form>
     </div>

lib/SvelteUi/app/src/routes/MqttCertRoute.svelte

@@ -0,0 +1,25 @@
+<script>
+    import Mask from "../lib/Mask.svelte";
+    import { translationsStore } from "../lib/TranslationService";
+
+    let translations = {};
+    translationsStore.subscribe(update => {
+      translations = update;
+    });
+
+    let uploading = false;
+</script>
+
+<div class="grid xl:grid-cols-4 lg:grid-cols-2 md:grid-cols-2">
+    <div class="cnt">
+        <strong>{translations.upload?.title ?? "Upload"} certificate</strong>
+        <p class="mb-4">{translations.upload?.desc ?? ""}</p>
+        <form action="/mqtt-cert" enctype="multipart/form-data" method="post" on:submit={() => uploading=true} autocomplete="off">
+            <input name="file" type="file">
+            <div class="w-full text-right mt-4">
+                <button type="submit" class="btn-pri">{translations.btn?.upload ?? "Upload"}</button>
+            </div>
+        </form>
+    </div>
+</div>
+<Mask active={uploading} message={translations.upload?.mask ?? "Uploading"}/>

lib/SvelteUi/app/src/routes/MqttKeyRoute.svelte

@@ -0,0 +1,25 @@
+<script>
+    import Mask from "../lib/Mask.svelte";
+    import { translationsStore } from "../lib/TranslationService";
+
+    let translations = {};
+    translationsStore.subscribe(update => {
+      translations = update;
+    });
+
+    let uploading = false;
+</script>
+
+<div class="grid xl:grid-cols-4 lg:grid-cols-2 md:grid-cols-2">
+    <div class="cnt">
+        <strong>{translations.upload?.title ?? "Upload"} private key</strong>
+        <p class="mb-4">{translations.upload?.desc ?? ""}</p>
+        <form action="/mqtt-key" enctype="multipart/form-data" method="post" on:submit={() => uploading=true} autocomplete="off">
+            <input name="file" type="file">
+            <div class="w-full text-right mt-4">
+                <button type="submit" class="btn-pri">{translations.btn?.upload ?? "Upload"}</button>
+            </div>
+        </form>
+    </div>
+</div>
+<Mask active={uploading} message={translations.upload?.mask ?? "Uploading"}/>

lib/SvelteUi/app/src/routes/PriceConfigRoute.svelte

@@ -1,11 +1,9 @@
 <script>
-    import { priceConfigStore, getPriceConfig } from './ConfigurationStore'
-    import { translationsStore } from './TranslationService';
-    import { wiki, zeropad } from './Helpers.js';
-    import Mask from './Mask.svelte'
-    import {  navigate } from 'svelte-navigator';
-
-    export let basepath = "/";
+    import { priceConfigStore, getPriceConfig } from '../lib/ConfigurationStore'
+    import { translationsStore } from '../lib/TranslationService';
+    import { wiki, zeropad } from '../lib/Helpers.js';
+    import Mask from '../lib/Mask.svelte'
+    import { push } from 'svelte-spa-router';
 
     let translations = {};
     translationsStore.subscribe(update => {
@@ -53,7 +51,7 @@
         let res = (await response.json())
 
         saving = false;
-        navigate(basepath + "configuration");
+        push("/configuration");
 	}
 
     let toggleDay = function(arr, day) {

lib/SvelteUi/app/src/routes/SetupRoute.svelte

@@ -1,9 +1,9 @@
 <script>
-    import { sysinfoStore, networksStore } from './DataStores.js';
-    import { translationsStore } from './TranslationService.js';
-    import Mask from './Mask.svelte'
-    import SubnetOptions from './SubnetOptions.svelte';
-    import { scanForDevice, charAndNumPattern, asciiPatternExt, ipPattern } from './Helpers.js';
+    import { sysinfoStore, networksStore } from '../lib/DataStores.js';
+    import { translationsStore } from '../lib/TranslationService.js';
+    import Mask from '../lib/Mask.svelte'
+    import SubnetOptions from '../lib/SubnetOptions.svelte';
+    import { scanForDevice, charAndNumPattern, asciiPatternExt, ipPattern } from '../lib/Helpers.js';
 
     let translations = {};
     translationsStore.subscribe(update => {
@@ -16,7 +16,8 @@
         networks = update;
     });
 
-    export let sysinfo = {}
+    let sysinfo = {}
+    sysinfoStore.subscribe(v => sysinfo = v);
 
     let staticIp = false;
     let connectionMode = 1;

lib/SvelteUi/app/src/routes/StatusRoute.svelte

@@ -1,15 +1,70 @@
 <script>
-    import { metertype, boardtype, isBusPowered, getBaseChip, wiki } from './Helpers.js';
-    import { getSysinfo, sysinfoStore } from './DataStores.js';
-    import { upgrade, upgradeWarningText } from './UpgradeHelper';
-    import { translationsStore } from './TranslationService.js';
-    import { Link } from 'svelte-navigator';
-    import Clock from './Clock.svelte';
-    import Mask from './Mask.svelte';
-    import { scanForDevice } from './Helpers.js';
+    import { metertype, boardtype, isBusPowered, getBaseChip, wiki } from '../lib/Helpers.js';
+    import { getSysinfo, sysinfoStore, dataStore } from '../lib/DataStores.js';
+    import { upgrade, upgradeWarningText } from '../lib/UpgradeHelper';
+    import { translationsStore } from '../lib/TranslationService.js';
+    import Clock from '../lib/Clock.svelte';
+    import Mask from '../lib/Mask.svelte';
+    import { scanForDevice } from '../lib/Helpers.js';
   
-    export let data;
-    export let sysinfo;
+    let data;
+    let sysinfo;
+
+    dataStore.subscribe(v => data = v);
+    sysinfoStore.subscribe(v => sysinfo = v);
+
+    // Format IPv6 address to compact form (RFC 5952)
+    const formatIPv6 = (addr) => {
+        if (!addr) return addr;
+        
+        // Split into groups
+        const groups = addr.toLowerCase().split(':');
+        
+        // Remove leading zeros from each group
+        const normalized = groups.map(g => g.replace(/^0+/, '') || '0');
+        
+        // Find longest sequence of consecutive zeros
+        let maxStart = -1, maxLen = 0;
+        let currStart = -1, currLen = 0;
+        
+        for (let i = 0; i < normalized.length; i++) {
+            if (normalized[i] === '0') {
+                if (currStart === -1) currStart = i;
+                currLen++;
+            } else {
+                if (currLen > maxLen) {
+                    maxStart = currStart;
+                    maxLen = currLen;
+                }
+                currStart = -1;
+                currLen = 0;
+            }
+        }
+        
+        // Check final sequence
+        if (currLen > maxLen) {
+            maxStart = currStart;
+            maxLen = currLen;
+        }
+        
+        // Only compress if we have 2 or more consecutive zeros
+        if (maxLen > 1) {
+            const before = normalized.slice(0, maxStart);
+            const after = normalized.slice(maxStart + maxLen);
+            
+            if (before.length === 0 && after.length === 0) {
+                return '::';
+            } else if (before.length === 0) {
+                return '::' + after.join(':');
+            } else if (after.length === 0) {
+                return before.join(':') + '::';
+            } else {
+                return before.join(':') + '::' + after.join(':');
+            }
+        }
+        
+        return normalized.join(':');
+    };
 
     let cfgItems = [{
         name: 'WiFi',
@@ -72,11 +127,11 @@
     }
 
     let firmwareFileInput;
-    let firmwareFiles = [];
+    let firmwareFiles = null;
     let firmwareUploading = false;
 
     let configFileInput;
-    let configFiles = [];
+    let configFiles = null;
     let configUploading = false;
 
     getSysinfo();
@@ -118,7 +173,7 @@
     };
 
     $: {
-        if(configFiles.length == 1) {
+        if(configFiles && configFiles.length == 1) {
             let file = configFiles[0];
             let reader = new FileReader();
             let parseConfigFile = ( e ) => {
@@ -145,7 +200,7 @@
             {translations.status?.device?.chip ?? "Chip"}: {sysinfo.chip} {#if sysinfo.cpu}({sysinfo.cpu}MHz){/if}
         </div>
         <div class="my-2">
-            {translations.status?.device?.device ?? "Device"}: <Link to="/vendor">{boardtype(sysinfo.chip, sysinfo.board)}</Link>
+            {translations.status?.device?.device ?? "Device"}: <a href="#/vendor">{boardtype(sysinfo.chip, sysinfo.board)}</a>
         </div>
         <div class="my-2">
             {translations.status?.device?.mac ?? "MAC"}: {sysinfo.mac}
@@ -168,9 +223,9 @@
         {/if}
         {#if data?.a}
         <div class="my-2">
-            <Link to="/consent">
+            <a href="#/consent">
                 <span class="btn-pri-sm">{translations.status?.device?.btn_consents ?? "Consents"}</span>
-            </Link>
+            </a>
             <button on:click={askReboot} class="btn-yellow-sm float-right">{translations.btn?.reboot ?? "Reboot"}</button>
         </div>
         {/if}
@@ -207,11 +262,11 @@
         </div>
         {#if sysinfo.net.ipv6}
             <div class="my-2">
-                IPv6: <span style="font-size: 14px;">{sysinfo.net.ipv6.replace(/\b:?(?:0+:?){2,}/, '::')}</span>
+                IPv6: <span style="font-size: 14px;">{formatIPv6(sysinfo.net.ipv6)}</span>
             </div>
             <div class="my-2">
-                {#if sysinfo.net.dns1v6}DNSv6: <span style="font-size: 14px;">{sysinfo.net.dns1v6.replace(/\b:?(?:0+:?){2,}/, '::')}</span>{/if}
-                {#if sysinfo.net.dns2v6}DNSv6: <span style="font-size: 14px;">{sysinfo.net.dns2v6.replace(/\b:?(?:0+:?){2,}/, '::')}</span>{/if}
+                {#if sysinfo.net.dns1v6}DNSv6: <span style="font-size: 14px;">{formatIPv6(sysinfo.net.dns1v6)}</span>{/if}
+                {#if sysinfo.net.dns2v6}DNSv6: <span style="font-size: 14px;">{formatIPv6(sysinfo.net.dns2v6)}</span>{/if}
             </div>
         {/if}
     </div>
@@ -266,7 +321,7 @@
             <div class="my-2 flex">
                 <form action="firmware" enctype="multipart/form-data" method="post" on:submit={() => firmwareUploading=true} autocomplete="off">
                     <input style="display:none" name="file" type="file" accept=".bin" bind:this={firmwareFileInput} bind:files={firmwareFiles}>
-                    {#if firmwareFiles.length == 0}
+                    {#if !firmwareFiles || firmwareFiles.length == 0}
                     <button type="button" on:click={()=>{firmwareFileInput.click();}} class="btn-pri-sm float-right">{translations.status?.firmware?.btn_select_file ?? "Select file"}</button>
                     {:else}
                     {firmwareFiles[0].name}
@@ -286,13 +341,13 @@
                 {/each}
                 <label class="my-1 mx-3 col-span-2"><input type="checkbox" class="rounded" name="ic" value="true"/> {translations.status?.backup?.secrets ?? "Include secrets"}<br/><small>{translations.status?.backup?.secrets_desc ?? ""}</small></label>
             </div>
-            {#if configFiles.length == 0}
+            {#if !configFiles || configFiles.length == 0}
             <button type="submit" class="btn-pri-sm float-right">{translations.status?.backup?.btn_download ?? "Download"}</button>
             {/if}
         </form>
         <form on:submit|preventDefault={uploadConfigFile} autocomplete="off">
             <input style="display:none" name="file" type="file" accept=".cfg" bind:this={configFileInput} bind:files={configFiles}>
-            {#if configFiles.length == 0}
+            {#if !configFiles || configFiles.length == 0}
             <button type="button" on:click={()=>{configFileInput.click();}} class="btn-pri-sm">{translations.status?.backup?.btn_select_file ?? "Select file"}</button>
             {:else}
             {configFiles[0].name}

lib/SvelteUi/app/src/routes/VendorRoute.svelte

@@ -1,12 +1,11 @@
 <script>
-    import { sysinfoStore } from './DataStores.js';
-    import BoardTypeSelectOptions from './BoardTypeSelectOptions.svelte';
-    import UartSelectOptions from './UartSelectOptions.svelte';
-    import Mask from './Mask.svelte'
-    import { navigate } from 'svelte-navigator';
+    import { sysinfoStore } from '../lib/DataStores.js';
+    import BoardTypeSelectOptions from '../lib/BoardTypeSelectOptions.svelte';
+    import UartSelectOptions from '../lib/UartSelectOptions.svelte';
+    import Mask from '../lib/Mask.svelte'
+    import { push } from 'svelte-spa-router';
 
-    export let basepath = "/";
-    export let sysinfo = {};
+    let sysinfo = {};
 
     let loadingOrSaving = false;
     async function handleSubmit(e) {
@@ -32,7 +31,7 @@
 
             return s;
         });
-        navigate(basepath + (sysinfo.usrcfg ? "" : "setup"));
+        push(sysinfo.usrcfg ? "/" : "/setup");
 	}
 
     let cc = true;

lib/SvelteUi/app/translations.json

@@ -16,7 +16,8 @@
         "day" : "day",
         "days" : "days",
         "month" : "month",
-        "unknown" : "Unknown"
+        "unknown" : "Unknown",
+        "now" : "Now"
     },
     "btn" : {
         "reboot" : "Reboot",

lib/SvelteUi/app/vite.config.js

@@ -1,45 +1,62 @@
 import { defineConfig } from 'vite'
 import { svelte } from '@sveltejs/vite-plugin-svelte'
 
+// Try to import local config, fall back to default if not found
+let localConfig = { proxyTarget: "http://192.168.4.1" };
+try {
+  const imported = await import('./vite.config.local.js');
+  localConfig = imported.default;
+} catch (e) {
+  console.log('No vite.config.local.js found, using default proxy target:', localConfig.proxyTarget);
+  console.log('Copy vite.config.local.example.js to vite.config.local.js to customize');
+}
+
 // https://vitejs.dev/config/
 export default defineConfig({
   build: {
     outDir: 'dist',
     assetsDir: '.',
+    minify: 'esbuild',
+    target: 'es2020',
     rollupOptions: {
       output: {
         assetFileNames: '[name][extname]',
         chunkFileNames: '[name].js',
-        entryFileNames: '[name].js'
+        entryFileNames: '[name].js',
+        manualChunks: undefined
       }
     }
   },
-  plugins: [svelte()],
+  plugins: [svelte({
+    compilerOptions: {
+      dev: false
+    }
+  })],
   server: {
     proxy: {
-      "/data.json": "http://192.168.21.122",
-      "/energyprice.json": "http://192.168.21.122",
-      "/importprice.json": "http://192.168.21.122",
-      "/exportprice.json": "http://192.168.21.122",
-      "/dayplot.json": "http://192.168.21.122",
-      "/monthplot.json": "http://192.168.21.122",
-      "/temperature.json": "http://192.168.21.122",
-      "/sysinfo.json": "http://192.168.21.122",
-      "/configuration.json": "http://192.168.21.122",
-      "/tariff.json": "http://192.168.21.122",
-      "/realtime.json": "http://192.168.21.122",
-      "/priceconfig.json": "http://192.168.21.122",
-      "/translations.json": "http://192.168.21.122",
-      "/cloudkey.json": "http://192.168.21.122",
-      "/wifiscan.json": "http://192.168.21.122",
-      "/save": "http://192.168.21.122",
-      "/reboot": "http://192.168.21.122",
-      "/configfile": "http://192.168.21.122",
-      "/upgrade": "http://192.168.21.122",
-      "/mqtt-ca": "http://192.168.21.122",
-      "/mqtt-cert": "http://192.168.21.122",
-      "/mqtt-key": "http://192.168.21.122",
-      "/logo.svg": "http://192.168.21.122",
+      "/data.json": localConfig.proxyTarget,
+      "/energyprice.json": localConfig.proxyTarget,
+      "/importprice.json": localConfig.proxyTarget,
+      "/exportprice.json": localConfig.proxyTarget,
+      "/dayplot.json": localConfig.proxyTarget,
+      "/monthplot.json": localConfig.proxyTarget,
+      "/temperature.json": localConfig.proxyTarget,
+      "/sysinfo.json": localConfig.proxyTarget,
+      "/configuration.json": localConfig.proxyTarget,
+      "/tariff.json": localConfig.proxyTarget,
+      "/realtime.json": localConfig.proxyTarget,
+      "/priceconfig.json": localConfig.proxyTarget,
+      "/translations.json": localConfig.proxyTarget,
+      "/cloudkey.json": localConfig.proxyTarget,
+      "/wifiscan.json": localConfig.proxyTarget,
+      "/save": localConfig.proxyTarget,
+      "/reboot": localConfig.proxyTarget,
+      "/configfile": localConfig.proxyTarget,
+      "/upgrade": localConfig.proxyTarget,
+      "/mqtt-ca": localConfig.proxyTarget,
+      "/mqtt-cert": localConfig.proxyTarget,
+      "/mqtt-key": localConfig.proxyTarget,
+      "/logo.svg": localConfig.proxyTarget,
     }
   }
 })

lib/SvelteUi/app/vite.config.local.example.js

@@ -0,0 +1,7 @@
+// Copy this file to vite.config.local.js and update with your device's IP address
+// vite.config.local.js is ignored by git so your settings won't be committed
+
+export default {
+  // The IP address of your AMS reader device for local development
+  proxyTarget: "http://192.168.4.1"
+}

lib/SvelteUi/src/AmsWebServer.cpp

@@ -777,11 +777,12 @@ void AmsWebServer::priceJson(uint8_t direction) {
 		prices[i] = ps->getPricePoint(direction, i);
 	}
 
-	snprintf_P(buf, BufferSize, PSTR("{\"currency\":\"%s\",\"source\":\"%s\",\"resolution\":%d,\"direction\":\"%s\",\"importExportPriceDifferent\":%s,\"prices\":["),
+	snprintf_P(buf, BufferSize, PSTR("{\"currency\":\"%s\",\"source\":\"%s\",\"resolution\":%d,\"direction\":\"%s\",\"cursor\":%d,\"importExportPriceDifferent\":%s,\"prices\":["),
 		ps->getCurrency(),
 		ps->getSource(),
 		ps->getResolutionInMinutes(),
 		direction == PRICE_DIRECTION_IMPORT ? "import" : direction == PRICE_DIRECTION_EXPORT ? "export" : "both",
+		ps->getCurrentPricePointIndex(),
 		ps->isExportPricesDifferentFromImport() ? "true" : "false"
 	);
 
@@ -1388,10 +1389,10 @@ void AmsWebServer::handleSave() {
 			memset(meterConfig.authenticationKey, 0, 16);
 		}
 
-		meterConfig.wattageMultiplier = server.arg(F("mmw")).toFloat() * 1000;
-		meterConfig.voltageMultiplier = server.arg(F("mmv")).toFloat() * 1000;
-		meterConfig.amperageMultiplier = server.arg(F("mma")).toFloat() * 1000;
-		meterConfig.accumulatedMultiplier = server.arg(F("mmc")).toFloat() * 1000;
+		meterConfig.wattageMultiplier = server.arg(F("mmw")).toDouble() * 1000.0;
+		meterConfig.voltageMultiplier = server.arg(F("mmv")).toDouble() * 1000.0;
+		meterConfig.amperageMultiplier = server.arg(F("mma")).toDouble() * 1000.0;
+		meterConfig.accumulatedMultiplier = server.arg(F("mmc")).toDouble() * 1000.0;
 		config->setMeterConfig(meterConfig);
 	}
 
@@ -1407,7 +1408,7 @@ void AmsWebServer::handleSave() {
 				if(!psk.equals("***")) {
 					strcpy(network.psk, psk.c_str());
 				}
-				network.power = server.arg(F("ww")).toFloat() * 10;
+				network.power = server.arg(F("ww")).toDouble() * 10.0;
 				network.sleep = server.arg(F("wz")).toInt();
 				network.use11b = server.hasArg(F("wb")) && server.arg(F("wb")) == F("true");
 			}
@@ -1568,9 +1569,9 @@ void AmsWebServer::handleSave() {
 	}
 
 	if(server.hasArg(F("iv")) && server.arg(F("iv")) == F("true")) {
-		gpioConfig->vccOffset = server.hasArg(F("ivo")) && !server.arg(F("ivo")).isEmpty() ? server.arg(F("ivo")).toFloat() * 100 : 0;
-		gpioConfig->vccMultiplier = server.hasArg(F("ivm")) && !server.arg(F("ivm")).isEmpty() ? server.arg(F("ivm")).toFloat() * 1000 : 1000;
-		gpioConfig->vccBootLimit = server.hasArg(F("ivb")) && !server.arg(F("ivb")).isEmpty() ? server.arg(F("ivb")).toFloat() * 10 : 0;
+		gpioConfig->vccOffset = server.hasArg(F("ivo")) && !server.arg(F("ivo")).isEmpty() ? server.arg(F("ivo")).toDouble() * 100.0 : 0;
+		gpioConfig->vccMultiplier = server.hasArg(F("ivm")) && !server.arg(F("ivm")).isEmpty() ? server.arg(F("ivm")).toDouble() * 1000.0 : 1000;
+		gpioConfig->vccBootLimit = server.hasArg(F("ivb")) && !server.arg(F("ivb")).isEmpty() ? server.arg(F("ivb")).toDouble() * 10.0 : 0;
 		config->setGpioConfig(*gpioConfig);
 	}
 
@@ -1685,7 +1686,7 @@ void AmsWebServer::handleSave() {
 				snprintf_P(buf, BufferSize, PSTR("rd%d"), i);
 				pc.direction = server.arg(buf).toInt();
 				snprintf_P(buf, BufferSize, PSTR("rv%d"), i);
-				pc.value = server.arg(buf).toFloat() * 10000;
+				pc.value = server.arg(buf).toDouble() * 10000.0;
 				snprintf_P(buf, BufferSize, PSTR("rn%d"), i);
 				String name = server.arg(buf);
 				strcpy(pc.name, name.c_str());

platformio.ini

@@ -2,7 +2,7 @@
 extra_configs = platformio-user.ini
 
 [common]
-lib_deps = EEPROM, LittleFS, DNSServer, 256dpi/MQTT@2.5.2, OneWireNg@0.13.3, DallasTemperature@4.0.4, https://github.com/gskjold/RemoteDebug.git, PaulStoffregen/Time@1.6.1, JChristensen/Timezone@1.2.4, bblanchon/ArduinoJson@7.0.4, FirmwareVersion, AmsConfiguration, AmsData, AmsDataStorage, HwTools, Uptime, AmsDecoder, PriceService, EnergyAccounting, AmsFirmwareUpdater, AmsJsonGenerator, AmsMqttHandler, RawMqttHandler, JsonMqttHandler, DomoticzMqttHandler, HomeAssistantMqttHandler, PassthroughMqttHandler, RealtimePlot, ConnectionHandler, MeterCommunicators
+lib_deps = EEPROM, LittleFS, DNSServer, 256dpi/MQTT@2.5.2, OneWireNg@0.13.3, DallasTemperature@4.0.4, https://github.com/gskjold/RemoteDebug.git, PaulStoffregen/Time@1.6.1, JChristensen/Timezone@1.2.4, FirmwareVersion, AmsConfiguration, AmsData, AmsDataStorage, HwTools, Uptime, AmsDecoder, PriceService, EnergyAccounting, AmsFirmwareUpdater, AmsJsonGenerator, AmsMqttHandler, RawMqttHandler, JsonMqttHandler, DomoticzMqttHandler, HomeAssistantMqttHandler, PassthroughMqttHandler, RealtimePlot, ConnectionHandler, MeterCommunicators
 lib_ignore = OneWire
 extra_scripts =
     pre:scripts/addversion.py
@@ -19,7 +19,7 @@ build_flags =
     -fexceptions
 
 [esp32]
-lib_deps = WiFi, Ethernet, ESPmDNS, WiFiClientSecure, HTTPClient, FS, WebServer, ESP32 Async UDP, ESP32SSDP, mulmer89/ESPRandom@1.5.0, ${common.lib_deps}, CloudConnector, ZmartCharge, SvelteUi
+lib_deps = WiFi, Ethernet, ESPmDNS, WiFiClientSecure, HTTPClient, FS, WebServer, ESP32 Async UDP, ESP32SSDP, mulmer89/ESPRandom@1.5.0, ${common.lib_deps}, bblanchon/ArduinoJson@7.0.4, CloudConnector, ZmartCharge, SvelteUi
 
 [env:esp8266]
 platform = espressif8266@4.2.1

src/AmsToMqttBridge.cpp

@@ -190,10 +190,15 @@ CloudConnector *cloud = NULL;
 #if defined(ZMART_CHARGE)
 ZmartChargeCloudConnector *zcloud = NULL;
 #endif
+
+#define MAX_BOOT_CYCLES 6
+
 #if defined(ESP32)
 __NOINIT_ATTR EnergyAccountingRealtimeData rtd;
+RTC_DATA_ATTR uint8_t bootcount = 0;
 #else
 EnergyAccountingRealtimeData rtd;
+uint32_t bootcount = 0;
 #endif
 EnergyAccounting ea(&Debug, &rtd);
 
@@ -326,6 +331,31 @@ void rxerr(int err) {
 }
 #endif
 
+uint8_t incrementBootCycleCounter(bool deepSleep) {
+	#if defined(ESP8266)
+		if(deepSleep) {
+			if(ESP.rtcUserMemoryRead(0, &bootcount, sizeof(bootcount))) {
+				bootcount++;
+				ESP.rtcUserMemoryWrite(0, &bootcount, sizeof(bootcount));
+			}
+			return bootcount;
+		} else {
+			return ++bootcount;
+		}
+	#else
+		return ++bootcount;
+	#endif
+}
+void resetBootCycleCounter(bool deepSleep) {
+	#if defined(ESP8266)
+		bootcount = 0;
+		if(deepSleep) {
+			ESP.rtcUserMemoryWrite(0, &bootcount, sizeof(bootcount));
+		}
+	#else
+		bootcount = 0;
+	#endif
+}
 
 void setup() {
 	Serial.begin(115200);
@@ -348,6 +378,10 @@ void setup() {
 
 	delay(1);
 	hw.setup(&sysConfig, &gpioConfig);
+	hw.ledOff(LED_INTERNAL);
+	hw.ledOff(LED_RED);
+	hw.ledOff(LED_GREEN);
+	hw.ledOff(LED_BLUE);
 
 	if(gpioConfig.apPin >= 0) {
 		pinMode(gpioConfig.apPin, INPUT_PULLUP);
@@ -380,20 +414,6 @@ void setup() {
 		}
 	}
 
-	hw.ledBlink(LED_INTERNAL, 1);
-	hw.ledBlink(LED_RED, 1);
-	hw.ledBlink(LED_YELLOW, 1);
-	hw.ledBlink(LED_GREEN, 1);
-	hw.ledBlink(LED_BLUE, 1);
-
-	PriceServiceConfig price;
-	if(config.getPriceServiceConfig(price)) {
-		ps = new PriceService(&Debug);
-		ps->setup(price);
-		ws.setPriceService(ps);
-	}
-	ws.setPriceSettings(price.area, price.currency);
-	ea.setCurrency(price.currency);
 	bool shared = false;
 	Serial.flush();
 	Serial.end();
@@ -441,22 +461,51 @@ void setup() {
 	yield();
 	#endif
 
-	float vcc = hw.getVcc();
 
+	if(!hw.ledOn(LED_YELLOW)) {
+		hw.ledOn(LED_INTERNAL);
+	}
 	debugI_P(PSTR("AMS reader %s started"), FirmwareVersion::VersionString);
 	debugI_P(PSTR("Configuration version: %d, board type: %d"), config.getConfigVersion(), sysConfig.boardType);
+	float vcc = hw.getVcc();
 	debugI_P(PSTR("Voltage: %.2fV"), vcc);
 
-	float vccBootLimit = gpioConfig.vccBootLimit == 0 ? 0 : min(3.29, gpioConfig.vccBootLimit / 10.0); // Make sure it is never above 3.3v
-	if(vcc > 2.5 && vccBootLimit > 2.5 && vccBootLimit < 3.3 && (gpioConfig.apPin == 0xFF || digitalRead(gpioConfig.apPin) == HIGH)) { // Skip if user is holding AP button while booting (HIGH = button is released)
-		if (vcc < vccBootLimit) {
-			{
-				Debug.printf_P(PSTR("(setup) Voltage is too low (%.2f < %.2f), sleeping\n"), vcc, vccBootLimit);
+	bool deepSleep = true;
+	#if defined(ESP32)
+	float allowedDrift = bootcount * 0.01;
+	#else
+	float allowedDrift = gpioConfig.vccBootLimit == 0 ? 0.05 : 3.3 - min(3.29, gpioConfig.vccBootLimit / 10.0); // Make sure boot limit is never above 3.3v
+	deepSleep = gpioConfig.vccBootLimit > 0; // If a boot limit is set, we are assume the hardware has been configured for deep sleep (Hint: GPIO16)
+	#endif
+	while(!hw.isVoltageOptimal(allowedDrift)) {
+		uint8_t bootCycles = incrementBootCycleCounter(deepSleep);
+		debugW_P(PSTR("Voltage is outside optimal range (%.2fV)"), allowedDrift);
+		if(gpioConfig.apPin != 0xFF && digitalRead(gpioConfig.apPin) == LOW) {
+			debugW_P(PSTR("AP button is pressed, skipping voltage wait"));
+		} else if(bootCycles < MAX_BOOT_CYCLES) {
+			int secs = MAX_BOOT_CYCLES - bootCycles;
+			if(deepSleep) {
+				debugI_P(PSTR("Sleeping for %d seconds to allow capacitor charge (%d.cycle)"), secs, bootCycles);
 				Serial.flush();
+				ESP.deepSleep(secs * 1000000); // Deep sleep to allow output cap to charge up
+				return;
+			} else {
+				debugI_P(PSTR("Waiting (no sleep) for %d seconds to allow capacitor charge (%d.cycle)"), secs, bootCycles);
+				delay(secs * 1000); // Just delay to allow output cap to charge up
+				vcc = hw.getVcc();
+				debugI_P(PSTR("Voltage: %.2fV"), vcc);
 			}
-			ESP.deepSleep(10000000);    //Deep sleep to allow output cap to charge up
-		}  
+		} else {
+			debugE_P(PSTR("Voltage not reaching optimal level after multiple attempts, continuing boot"));
+			hw.setMaxVcc(vcc); // Since we had to sleep, set max Vcc to current level because this is probably the highest we will get
+			break;
+		}
 	}
+	#if defined(ESP8266)
+	resetBootCycleCounter(deepSleep);
+	#endif
+	hw.ledOff(LED_YELLOW);
+	hw.ledOff(LED_INTERNAL);
 
 	if(!hw.ledOn(LED_GREEN)) {
 		hw.ledOn(LED_INTERNAL);
@@ -472,6 +521,12 @@ void setup() {
 	hw.ledOff(LED_GREEN);
 	hw.ledOff(LED_INTERNAL);
 
+	hw.ledBlink(LED_INTERNAL, 1);
+	hw.ledBlink(LED_RED, 1);
+	hw.ledBlink(LED_YELLOW, 1);
+	hw.ledBlink(LED_GREEN, 1);
+	hw.ledBlink(LED_BLUE, 1);
+
 	WiFi.disconnect(true);
 	WiFi.softAPdisconnect(true);
 	WiFi.mode(WIFI_OFF);
@@ -537,6 +592,15 @@ void setup() {
 		toggleSetupMode();
 	}
 
+	PriceServiceConfig price;
+	if(config.getPriceServiceConfig(price)) {
+		ps = new PriceService(&Debug);
+		ps->setup(price);
+		ws.setPriceService(ps);
+	}
+	ws.setPriceSettings(price.area, price.currency);
+	ea.setCurrency(price.currency);
+
 	EnergyAccountingConfig *eac = new EnergyAccountingConfig();
 	if(!config.getEnergyAccountingConfig(*eac)) {
 		config.clearEnergyAccountingConfig(*eac);
@@ -633,7 +697,12 @@ void loop() {
 						handleEnergySpeedometer();
 					#endif
 				#endif
-				handlePriceService(now);
+
+				// In case of BUS powered meters, we need to be sure voltage is stable before fetching prices. But we refuse to wait forever, so max 30 seconds
+				if(now > 30000 || hw.isVoltageOptimal(0.01)) {
+					handlePriceService(now);
+				}
+
 				#if defined(AMS_CLOUD)
 					handleCloud();
 				#endif
@@ -655,7 +724,7 @@ void loop() {
 			}
 			
 			communicationTime += handleWebserver();
-			if(communicationTime > 10 && updater.getProgress() >= 0) {
+			if(communicationTime > 25 && updater.getProgress() >= 0) {
 				debugI_P(PSTR("Communication is active (%dms), forcing updater to wait"), communicationTime);
 			} else {
 				handleUpdater();
@@ -809,6 +878,9 @@ void handleNtp() {
 			ds.setTimezone(tz);
 			ea.setTimezone(tz);
 			ps->setTimezone(tz);
+			if(passiveMc != NULL) {
+				passiveMc->setTimezone(tz);
+			}
 		}
 	
 		config.ackNtpChange();
@@ -1041,7 +1113,13 @@ void handleMeterConfig() {
 			debugE_P(PSTR("Unknown meter source selected: %d"), meterConfig.source);
 		}
 		ws.setMeterConfig(meterConfig.distributionSystem, meterConfig.mainFuse, meterConfig.productionCapacity);
-		if(mc != NULL && Debug.isActive(RemoteDebug::DEBUG)) {
+		if(mc != NULL && 
+			#if defined(AMS_REMOTE_DEBUG)
+			Debug.isActive(RemoteDebug::DEBUG)
+			#else
+			false // Never send debug data 
+			#endif
+		) {
 			mc->setMqttHandlerForDebugging(mqttHandler);
 		}
 		config.ackMeterChanged();
@@ -1560,7 +1638,13 @@ void postConnect() {
 		if(!debug.telnet) {
 			Debug.stop();
 		}
-		if(mc != NULL && Debug.isActive(RemoteDebug::DEBUG)) {
+		if(mc != NULL && 
+			#if defined(AMS_REMOTE_DEBUG)
+			Debug.isActive(RemoteDebug::DEBUG)
+			#else
+			false // Never send debug data 
+			#endif
+		) {
 			mc->setMqttHandlerForDebugging(mqttHandler);
 		}
 	} else {
@@ -1692,7 +1776,13 @@ void MQTT_connect() {
 		}
 	}
 	ws.setMqttHandler(mqttHandler);
-	if(mc != NULL && Debug.isActive(RemoteDebug::DEBUG)) {
+	if(mc != NULL && 
+		#if defined(AMS_REMOTE_DEBUG)
+		Debug.isActive(RemoteDebug::DEBUG)
+		#else
+		false // Never send debug data 
+		#endif
+	) {
 		mc->setMqttHandlerForDebugging(mqttHandler);
 	}