Merge branch 'main' into upgrade/svelte

* Initial plan

* Fix month-dependent day dropdowns in PriceConfig.svelte

Co-authored-by: gskjold <4446828+gskjold@users.noreply.github.com>
Agent-Logs-Url: https://github.com/UtilitechAS/amsreader-firmware/sessions/cc7b8eba-e39b-461a-bd3b-7a560279afcc

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: gskjold <4446828+gskjold@users.noreply.github.com>
Co-authored-by: Gunnar Skjold <gunnar.skjold@gmail.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/pr-build-env.yml

@@ -0,0 +1,82 @@
+name: PR build with env
+
+on:
+  workflow_call:
+    inputs:
+      env:
+        description: 'The environment to build for'
+        required: true
+        type: string
+      is_esp32:
+        description: 'Whether the build is for ESP32 based firmware'
+        required: false
+        type: boolean
+        default: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code from repo
+        uses: actions/checkout@v4
+
+      - name: Cache Python dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('platformio.ini') }}
+
+      - name: Cache PlatformIO dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.pio/libdeps
+          key: ${{ runner.os }}-pio-${{ hashFiles('platformio.ini') }}
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.9
+
+      - name: Inject secrets into ini file
+        run: |
+          sed -i 's/NO_AMS2MQTT_PRICE_KEY/AMS2MQTT_PRICE_KEY="${{secrets.AMS2MQTT_PRICE_KEY}}"/g' platformio.ini
+          sed -i 's/NO_AMS2MQTT_PRICE_AUTHENTICATION/AMS2MQTT_PRICE_AUTHENTICATION="${{secrets.AMS2MQTT_PRICE_AUTHENTICATION}}"/g' platformio.ini
+          sed -i 's/NO_AMS2MQTT_SC_KEY/AMS2MQTT_SC_KEY=\\"${{secrets.AMS2MQTT_SC_KEY}}\\"/g' platformio.ini
+          sed -i 's/NO_ENERGY_SPEEDOMETER_USER/ENERGY_SPEEDOMETER_USER=\\"${{secrets.ENERGY_SPEEDOMETER_USER}}\\"/g' platformio.ini
+          sed -i 's/NO_ENERGY_SPEEDOMETER_PASS/ENERGY_SPEEDOMETER_PASS=\\"${{secrets.ENERGY_SPEEDOMETER_PASS}}\\"/g' platformio.ini
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -U platformio css_html_js_minify
+
+      - name: Set up node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '19.x'
+
+      - name: Build with node
+        run: |
+          cd lib/SvelteUi/app
+          npm ci
+          npm run build
+          cd -
+        env:
+          CI: false
+
+      - name: PlatformIO lib install
+        run: pio lib install
+
+      - name: Build firmware
+        run: pio run -e ${{ inputs.env }}
+
+      - name: Create zip file
+        run: /bin/sh scripts/${{ inputs.env }}/mkzip.sh
+
+      - name: Upload zip as artifact
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ inputs.env }}.zip
+          path: ${{ inputs.env }}.zip
+          archive: false
+          retention-days: 7

.github/workflows/pull-request.yml

@@ -0,0 +1,110 @@
+name: Pull Request build
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  build-esp32s2:
+    uses: ./.github/workflows/pr-build-env.yml
+    secrets: inherit
+    with:
+      env: esp32s2
+      is_esp32: true
+
+  build-esp32s3:
+    uses: ./.github/workflows/pr-build-env.yml
+    secrets: inherit
+    with:
+      env: esp32s3
+      is_esp32: true
+
+  build-esp32c3:
+    uses: ./.github/workflows/pr-build-env.yml
+    secrets: inherit
+    with:
+      env: esp32c3
+      is_esp32: true
+
+  build-esp32:
+    uses: ./.github/workflows/pr-build-env.yml
+    secrets: inherit
+    with:
+      env: esp32
+      is_esp32: true
+
+  build-esp32solo:
+    uses: ./.github/workflows/pr-build-env.yml
+    secrets: inherit
+    with:
+      env: esp32solo
+      is_esp32: true
+
+  build-esp8266:
+    uses: ./.github/workflows/pr-build-env.yml
+    secrets: inherit
+    with:
+      env: esp8266
+      is_esp32: false
+
+  comment:
+    needs:
+      - build-esp32s2
+      - build-esp32s3
+      - build-esp32c3
+      - build-esp32
+      - build-esp32solo
+      - build-esp8266
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Post PR comment with download links
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { owner, repo } = context.repo;
+            const prNumber = context.payload.pull_request.number;
+            const runId = context.runId;
+            const runUrl = `https://github.com/${owner}/${repo}/actions/runs/${runId}`;
+            
+            // Get the commit SHA (short version)
+            const sha = context.payload.pull_request.head.sha;
+            const shortSha = sha.substring(0, 7);
+
+            // Fetch the list of artifacts for this run via the API
+            const artifactsResp = await github.rest.actions.listWorkflowRunArtifacts({ owner, repo, run_id: runId });
+            const artifacts = artifactsResp.data.artifacts;
+
+            const envs = ['esp32s2', 'esp32s3', 'esp32c3', 'esp32', 'esp32solo', 'esp8266'];
+            const lines = envs.map(env => {
+              const artifact = artifacts.find(a => a.name === `${env}.zip`);
+              if (artifact) {
+                // The artifact download page URL - directly navigable in the browser
+                const artifactUrl = `${runUrl}#artifacts-${env}`;
+                return `- **${env}**: [Download ${env}.zip](https://github.com/${owner}/${repo}/actions/runs/${runId}/artifacts/${artifact.id})`;
+              }
+              return `- **${env}**: ⚠️ artifact not found`;
+            });
+
+            const body = [
+              '## 🔧 PR Build Artifacts',
+              '',
+              `**Version**: \`${shortSha}\``,
+              '',
+              'All environments built successfully. Download the zip files:',
+              '',
+              ...lines,
+              '',
+              `> Artifacts expire after 7 days. [View workflow run](${runUrl})`,
+            ].join('\n');
+
+            // Find and delete any previous bot comment to keep the PR clean
+            const comments = await github.rest.issues.listComments({ owner, repo, issue_number: prNumber });
+            for (const comment of comments.data) {
+              if (comment.user.type === 'Bot' && comment.body.includes('PR Build Artifacts')) {
+                await github.rest.issues.deleteComment({ owner, repo, comment_id: comment.id });
+              }
+            }
+
+            await github.rest.issues.createComment({ owner, repo, issue_number: prNumber, body });

.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/include/AmsConfiguration.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -381,6 +381,8 @@ public:
 	bool isZmartChargeConfigChanged();
 	void ackZmartChargeConfig();
 	
+	uint32_t getChipId();
+	void getUniqueName(char* buffer, size_t length);
 
 	void clear();
 

lib/AmsConfiguration/include/AmsStorage.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsConfiguration/include/Timezones.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsConfiguration/include/hexutils.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsConfiguration/src/AmsConfiguration.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -124,16 +124,12 @@ void AmsConfiguration::clearNetworkConfig(NetworkConfig& config) {
 	memset(config.ssid, 0, 32);
 	memset(config.psk, 0, 64);
 	clearNetworkConfigIp(config);
-
-	uint16_t chipId;
+	getUniqueName(config.hostname, 32);
 	#if defined(ESP32)
-		chipId = ( ESP.getEfuseMac() >> 32 ) % 0xFFFFFFFF;
 		config.power = 195;
 	#else
-		chipId = ESP.getChipId();
 		config.power = 205;
 	#endif
-	strcpy(config.hostname, (String("ams-") + String(chipId, HEX)).c_str());
 	config.mdns = true;
 	config.sleep = 0xFF;
 	config.use11b = 1;
@@ -591,7 +587,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 +595,7 @@ void AmsConfiguration::clearGpio(GpioConfig& config, bool all) {
 		config.vccResistorGnd = 0;
 		config.vccResistorVcc = 0;
 		config.ledBehaviour = LED_BEHAVIOUR_DEFAULT;
+		config.powersaving = 0;
 	}
 }
 
@@ -983,6 +979,23 @@ void AmsConfiguration::setUiLanguageChanged() {
 	uiLanguageChanged = true;
 }
 
+uint32_t AmsConfiguration::getChipId() {
+	uint32_t chipId;
+	#if defined(ESP32)
+		for(int i=0; i<17; i=i+8) {
+			chipId |= ((ESP.getEfuseMac() >> (40 - i)) & 0xff) << i;
+		}
+	#else
+		chipId = ESP.getChipId();
+	#endif
+	return chipId;
+}	
+
+void AmsConfiguration::getUniqueName(char* buffer, size_t length) {
+	uint32_t chipId = getChipId();
+	snprintf(buffer, length, "ams-%06x", chipId);
+}
+
 void AmsConfiguration::clear() {
 	EEPROM.begin(EEPROM_SIZE);
 

lib/AmsConfiguration/src/hexutils.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsData/include/AmsData.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -7,8 +7,7 @@
 #ifndef _AMSDATA_H
 #define _AMSDATA_H
 
-#include "Arduino.h"
-#include <Timezone.h>
+#include <WString.h>
 #include "OBIScodes.h"
 
 enum AmsType {
@@ -28,7 +27,7 @@ public:
     AmsData();
 
     void apply(AmsData& other);
-    void apply(const OBIS_code_t obis, double value);
+    void apply(const OBIS_code_t obis, double value, uint64_t millis64);
 
     uint64_t getLastUpdateMillis();
 

lib/AmsData/include/OBIScodes.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsData/src/AmsData.cpp

@@ -1,10 +1,11 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
 
 #include "AmsData.h"
+#include <algorithm>
 
 AmsData::AmsData() {}
 
@@ -17,7 +18,6 @@ void AmsData::apply(AmsData& other) {
                 uint32_t power = (activeImportPower + other.getActiveImportPower()) / 2;
                 float add = power * (((float) ms) / 3600000.0);
                 activeImportCounter += add / 1000.0;
-                //Serial.printf("%dW, %dms, %.6fkWh added\n", other.getActiveImportPower(), ms, add);
             }
 
             if(other.getListType() > 1) {
@@ -112,7 +112,7 @@ void AmsData::apply(AmsData& other) {
         this->activeExportPower = other.getActiveExportPower();
 }
 
-void AmsData::apply(OBIS_code_t obis, double value) {
+void AmsData::apply(OBIS_code_t obis, double value, uint64_t millis64) {
     if(obis.sensor == 0 && obis.gr == 0 && obis.tariff == 0) {
         meterType = value;
     }
@@ -127,138 +127,137 @@ void AmsData::apply(OBIS_code_t obis, double value) {
         }
     }
     if(obis.tariff != 0) {
-        Serial.println("Tariff not implemented");
         return;
     }
     if(obis.gr == 7) { // Instant values
         switch(obis.sensor) {
             case 1:
                 activeImportPower = value;
-                listType = max(listType, (uint8_t) 2);
+                listType = std::max(listType, (uint8_t) 2);
                 break;
             case 2:
                 activeExportPower = value;
-                listType = max(listType, (uint8_t) 2);
+                listType = std::max(listType, (uint8_t) 2);
                 break;
             case 3:
                 reactiveImportPower = value;
-                listType = max(listType, (uint8_t) 2);
+                listType = std::max(listType, (uint8_t) 2);
                 break;
             case 4:
                 reactiveExportPower = value;
-                listType = max(listType, (uint8_t) 2);
+                listType = std::max(listType, (uint8_t) 2);
                 break;
             case 13:
                 powerFactor = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
             case 21:
                 l1activeImportPower = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
             case 22:
                 l1activeExportPower = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
             case 31:
                 l1current = value;
-                listType = max(listType, (uint8_t) 2);
+                listType = std::max(listType, (uint8_t) 2);
                 break;
             case 32:
                 l1voltage = value;
-                listType = max(listType, (uint8_t) 2);
+                listType = std::max(listType, (uint8_t) 2);
                 break;
             case 33:
                 l1PowerFactor = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
             case 41:
                 l2activeImportPower = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
             case 42:
                 l2activeExportPower = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
             case 51:
                 l2current = value;
-                listType = max(listType, (uint8_t) 2);
+                listType = std::max(listType, (uint8_t) 2);
                 break;
             case 52:
                 l2voltage = value;
-                listType = max(listType, (uint8_t) 2);
+                listType = std::max(listType, (uint8_t) 2);
                 break;
             case 53:
                 l2PowerFactor = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
             case 61:
                 l3activeImportPower = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
             case 62:
                 l3activeExportPower = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
             case 71:
                 l3current = value;
-                listType = max(listType, (uint8_t) 2);
+                listType = std::max(listType, (uint8_t) 2);
                 break;
             case 72:
                 l3voltage = value;
-                listType = max(listType, (uint8_t) 2);
+                listType = std::max(listType, (uint8_t) 2);
                 break;
             case 73:
                 l3PowerFactor = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
         }
     } else if(obis.gr == 8) { // Accumulated values
         switch(obis.sensor) {
             case 1:
                 activeImportCounter = value;
-                listType = max(listType, (uint8_t) 3);
+                listType = std::max(listType, (uint8_t) 3);
                 break;
             case 2:
                 activeExportCounter = value;
-                listType = max(listType, (uint8_t) 3);
+                listType = std::max(listType, (uint8_t) 3);
                 break;
             case 3:
                 reactiveImportCounter = value;
-                listType = max(listType, (uint8_t) 3);
+                listType = std::max(listType, (uint8_t) 3);
                 break;
             case 4:
                 reactiveExportCounter = value;
-                listType = max(listType, (uint8_t) 3);
+                listType = std::max(listType, (uint8_t) 3);
                 break;
             case 21:
                 l1activeImportCounter = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
             case 22:
                 l1activeExportCounter = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
             case 41:
                 l2activeImportCounter = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
             case 42:
                 l2activeExportCounter = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
             case 61:
                 l3activeImportCounter = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
             case 62:
                 l3activeExportCounter = value;
-                listType = max(listType, (uint8_t) 4);
+                listType = std::max(listType, (uint8_t) 4);
                 break;
         }
     }
     if(listType > 0)
-        lastUpdateMillis = millis();
+        lastUpdateMillis = millis64;
 
     threePhase = l1voltage > 0 && l2voltage > 0 && l3voltage > 0;
     if(!threePhase)

lib/AmsDataStorage/include/AmsDataStorage.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDataStorage/src/AmsDataStorage.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -639,25 +639,22 @@ bool AmsDataStorage::isDayHappy(time_t now) {
         return false;
     }
 
-    if(now < FirmwareVersion::BuildEpoch) return false;
-
-    if(now < day.lastMeterReadTime) {
+    // If the timestamp is before the firware was built, there is something seriously wrong..
+    if(now < FirmwareVersion::BuildEpoch) {
         return false;
     }
-    // There are cases where the meter reports before the hour. The update method will then receive the meter timestamp as reference, thus there will not be 3600s between. 
-    // Leaving a 100s buffer for these cases
-    if(now-day.lastMeterReadTime > 3500) {
+
+    // If the timestamp is before the last time we updated, there is also something wrong..
+    if(now < day.lastMeterReadTime) {
         return false;
     }
 
     tmElements_t tm, last;
     breakTime(tz->toLocal(now), tm);
     breakTime(tz->toLocal(day.lastMeterReadTime), last);
-    if(tm.Hour != last.Hour) {
-        return false;
-    }
 
-    return true;
+    // If the timestamp is at the same day and hour as last update, we are happy
+    return tm.Day == last.Day && tm.Hour == last.Hour;
 }
 
 bool AmsDataStorage::isMonthHappy(time_t now) {

lib/AmsDecoder/include/Cosem.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/include/DataParser.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/include/DataParsers.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/include/DlmsParser.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/include/DsmrParser.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/include/GbtParser.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/include/GcmParser.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/include/HdlcParser.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/include/LlcParser.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/include/MbusParser.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/include/crc.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/include/ntohll.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/src/Cosem.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/src/DlmsParser.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/src/DsmrParser.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -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/GbtParser.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/src/GcmParser.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -96,7 +96,7 @@ int8_t GCMParser::parse(uint8_t *d, DataParserContext &ctx, bool hastag) {
         footersize += authkeylen;
         memcpy(additional_authenticated_data + 1, authentication_key, 16);
         memcpy(authentication_tag, ptr + len - footersize - 5, authkeylen);
-        for(uint8_t i; i < 16; i++) authenticate |= authentication_key[i] > 0;
+        for(uint8_t i = 0; i < 16; i++) authenticate |= authentication_key[i] > 0;
     }
 
     #if defined(ESP8266)

lib/AmsDecoder/src/HdlcParser.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -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/AmsDecoder/src/LlcParser.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/src/MbusParser.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/src/crc.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsDecoder/src/ntohll.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/AmsFirmwareUpdater/include/AmsFirmwareUpdater.h

@@ -1,3 +1,8 @@
+/**
+ * @copyright Utilitech AS 2023-2026
+ * License: Fair Source
+ * 
+ */
 #pragma once
 #include <stdint.h>
 #include <Print.h>
@@ -39,6 +44,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

@@ -1,3 +1,8 @@
+/**
+ * @copyright Utilitech AS 2023-2026
+ * License: Fair Source
+ * 
+ */
 #include "AmsFirmwareUpdater.h"
 #include "AmsStorage.h"
 #include "FirmwareVersion.h"
@@ -74,7 +79,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 +134,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/AmsJsonGenerator/include/AmsJsonGenerator.h

@@ -1,3 +1,8 @@
+/**
+ * @copyright Utilitech AS 2023-2026
+ * License: Fair Source
+ * 
+ */
 #pragma once
 
 #include "AmsDataStorage.h"

lib/AmsJsonGenerator/src/AmsJsonGenerator.cpp

@@ -1,3 +1,8 @@
+/**
+ * @copyright Utilitech AS 2023-2026
+ * License: Fair Source
+ * 
+ */
 #include "AmsJsonGenerator.h"
 
 void AmsJsonGenerator::generateDayPlotJson(AmsDataStorage* ds, char* buf, size_t bufSize) {

lib/AmsMqttHandler/include/AmsMqttHandler.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -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

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/CloudConnector/include/CloudConnector.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/CloudConnector/src/CloudConnector.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/ConnectionHandler/include/ConnectionHandler.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/ConnectionHandler/include/EthernetConnectionHandler.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/ConnectionHandler/include/WiFiAccessPointConnectionHandler.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/ConnectionHandler/include/WiFiClientConnectionHandler.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/ConnectionHandler/src/EthernetConnectionHandler.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/ConnectionHandler/src/WiFiAccessPointConnectionHandler.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/ConnectionHandler/src/WiFiClientConnectionHandler.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/DomoticzMqttHandler/include/DomoticzMqttHandler.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -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/DomoticzMqttHandler/src/DomoticzMqttHandler.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/EnergyAccounting/include/EnergyAccounting.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -7,8 +7,6 @@
 #ifndef _ENERGYACCOUNTING_H
 #define _ENERGYACCOUNTING_H
 
-#include "Arduino.h"
-#include "AmsData.h"
 #include "AmsDataStorage.h"
 #include "PriceService.h"
 
@@ -83,7 +81,7 @@ public:
     void setPriceService(PriceService *ps);
     void setTimezone(Timezone*);
     EnergyAccountingConfig* getConfig();
-    bool update(AmsData* amsData);
+    bool update(time_t now, uint64_t lastUpdatedMillis, uint8_t listType, uint32_t activeImportPower, uint32_t activeExportPower);
     bool load();
     bool save();
     bool isInitialized();

lib/EnergyAccounting/src/EnergyAccounting.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -54,9 +54,8 @@ bool EnergyAccounting::isInitialized() {
     return this->init;
 }
 
-bool EnergyAccounting::update(AmsData* amsData) {
+bool EnergyAccounting::update(time_t now, uint64_t lastUpdatedMillis, uint8_t listType, uint32_t activeImportPower, uint32_t activeExportPower) {
     if(config == NULL) return false;
-    time_t now = time(nullptr);
     if(now < FirmwareVersion::BuildEpoch) return false;
     if(tz == NULL) {
         return false;
@@ -90,7 +89,7 @@ bool EnergyAccounting::update(AmsData* amsData) {
         calcDayCost();
     }
 
-    if(local.Hour != realtimeData->currentHour && (amsData->getListType() >= 3 || local.Minute == 1)) {
+    if(local.Hour != realtimeData->currentHour && (listType >= 3 || local.Minute == 1)) {
         tmElements_t oneHrAgo, oneHrAgoLocal;
         breakTime(now-3600, oneHrAgo);
         uint16_t val = round(ds->getHourImport(oneHrAgo.Hour) / 10.0);
@@ -156,9 +155,9 @@ bool EnergyAccounting::update(AmsData* amsData) {
         }
     }
 
-    if(realtimeData->lastImportUpdateMillis < amsData->getLastUpdateMillis()) {
-        unsigned long ms = amsData->getLastUpdateMillis() - realtimeData->lastImportUpdateMillis;
-        float kwhi = (amsData->getActiveImportPower() * (((float) ms) / 3600000.0)) / 1000.0;
+    if(realtimeData->lastImportUpdateMillis < lastUpdatedMillis) {
+        unsigned long ms = lastUpdatedMillis - realtimeData->lastImportUpdateMillis;
+        float kwhi = (activeImportPower * (((float) ms) / 3600000.0)) / 1000.0;
         if(kwhi > 0) {
             realtimeData->use += kwhi;
             float importPrice = ps == NULL ? PRICE_NO_VALUE : ps->getCurrentPrice(PRICE_DIRECTION_IMPORT);
@@ -168,12 +167,12 @@ bool EnergyAccounting::update(AmsData* amsData) {
                 realtimeData->costDay += cost;
             }
         }
-        realtimeData->lastImportUpdateMillis = amsData->getLastUpdateMillis();
+        realtimeData->lastImportUpdateMillis = lastUpdatedMillis;
     }
 
-    if(amsData->getListType() > 1 && realtimeData->lastExportUpdateMillis < amsData->getLastUpdateMillis()) {
-        unsigned long ms = amsData->getLastUpdateMillis() - realtimeData->lastExportUpdateMillis;
-        float kwhe = (amsData->getActiveExportPower() * (((float) ms) / 3600000.0)) / 1000.0;
+    if(listType > 1 && realtimeData->lastExportUpdateMillis < lastUpdatedMillis) {
+        unsigned long ms = lastUpdatedMillis - realtimeData->lastExportUpdateMillis;
+        float kwhe = (activeExportPower * (((float) ms) / 3600000.0)) / 1000.0;
         if(kwhe > 0) {
             realtimeData->produce += kwhe;
             float exportPrice = ps == NULL ? PRICE_NO_VALUE : ps->getCurrentPrice(PRICE_DIRECTION_EXPORT);
@@ -183,7 +182,7 @@ bool EnergyAccounting::update(AmsData* amsData) {
                 realtimeData->incomeDay += income;
             }
         }
-        realtimeData->lastExportUpdateMillis = amsData->getLastUpdateMillis();
+        realtimeData->lastExportUpdateMillis = lastUpdatedMillis;
     }
 
     if(config != NULL) {
@@ -260,7 +259,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 +293,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/FirmwareVersion/include/FirmwareVersion.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/FirmwareVersion/src/FirmwareVersion.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -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/include/HomeAssistantStatic.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

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

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -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

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -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

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -664,7 +664,8 @@ bool HwTools::isVoltageOptimal(float range) {
             lastVccRead = now;
         }
 		if(vcc > 3.4 || vcc < 2.8) {
-			maxVcc = 0; // Voltage is outside the operating range, we have to assume voltage is OK
+            maxVcc = 0;
+			return true; // Voltage is outside the operating range, we have to assume voltage is OK
 		} else if(vcc > maxVcc) {
 			maxVcc = vcc;
 		} else {
@@ -677,4 +678,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

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -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

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -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/IEC6205621.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/MeterCommunicators/include/IEC6205675.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -11,6 +11,7 @@
 #include "AmsConfiguration.h"
 #include "DataParser.h"
 #include "Cosem.h"
+#include "Timezone.h"
 #if defined(AMS_REMOTE_DEBUG)
 #include "RemoteDebug.h"
 #endif

lib/MeterCommunicators/include/ImpulseAmsData.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/MeterCommunicators/include/KmpCommunicator.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2024
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/MeterCommunicators/include/KmpTalker.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: All rights reserved
  * 
  */

lib/MeterCommunicators/include/LNG.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/MeterCommunicators/include/LNG2.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/MeterCommunicators/include/MeterCommunicator.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/MeterCommunicators/include/PassiveMeterCommunicator.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/MeterCommunicators/include/PulseMeterCommunicator.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2024
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/MeterCommunicators/src/IEC6205621.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/MeterCommunicators/src/ImpulseAmsData.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/MeterCommunicators/src/KmpCommunicator.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -24,8 +24,6 @@ void KmpCommunicator::configure(MeterConfig& meterConfig) {
 }
 
 bool KmpCommunicator::loop() {
-	uint64_t now = millis64();
-
     bool ret = talker->loop();
     int lastError = getLastError();
     if(ret) {
@@ -58,35 +56,36 @@ AmsData* KmpCommunicator::getData(AmsData& meterState) {
     if(talker == NULL) return NULL;
     KmpDataHolder kmpData;
     talker->getData(kmpData);
+	uint64_t now = millis64();
     AmsData* data = new AmsData();
-    data->apply(OBIS_ACTIVE_IMPORT_COUNT, kmpData.activeImportCounter);
-    data->apply(OBIS_ACTIVE_EXPORT_COUNT, kmpData.activeExportCounter);
-    data->apply(OBIS_REACTIVE_IMPORT_COUNT, kmpData.reactiveImportCounter);
-    data->apply(OBIS_REACTIVE_EXPORT_COUNT, kmpData.reactiveExportCounter);
-    data->apply(OBIS_ACTIVE_IMPORT, kmpData.activeImportPower);
-    data->apply(OBIS_ACTIVE_EXPORT, kmpData.activeExportPower);
-    data->apply(OBIS_REACTIVE_IMPORT, kmpData.reactiveImportPower);
-    data->apply(OBIS_REACTIVE_EXPORT, kmpData.reactiveExportPower);
-    data->apply(OBIS_VOLTAGE_L1, kmpData.l1voltage);
-    data->apply(OBIS_VOLTAGE_L2, kmpData.l2voltage);
-    data->apply(OBIS_VOLTAGE_L3, kmpData.l3voltage);
-    data->apply(OBIS_CURRENT_L1, kmpData.l1current);
-    data->apply(OBIS_CURRENT_L2, kmpData.l2current);
-    data->apply(OBIS_CURRENT_L3, kmpData.l3current);
-    data->apply(OBIS_POWER_FACTOR_L1, kmpData.l1PowerFactor);
-    data->apply(OBIS_POWER_FACTOR_L2, kmpData.l2PowerFactor);
-    data->apply(OBIS_POWER_FACTOR_L3, kmpData.l3PowerFactor);
-    data->apply(OBIS_POWER_FACTOR, kmpData.powerFactor);
-    data->apply(OBIS_ACTIVE_IMPORT_L1, kmpData.l1activeImportPower);
-    data->apply(OBIS_ACTIVE_IMPORT_L2, kmpData.l2activeImportPower);
-    data->apply(OBIS_ACTIVE_IMPORT_L3, kmpData.l3activeImportPower);
-    data->apply(OBIS_ACTIVE_EXPORT_L1, kmpData.l1activeExportPower);
-    data->apply(OBIS_ACTIVE_EXPORT_L2, kmpData.l2activeExportPower);
-    data->apply(OBIS_ACTIVE_EXPORT_L3, kmpData.l3activeExportPower);
-    data->apply(OBIS_ACTIVE_IMPORT_COUNT_L1, kmpData.l1activeImportCounter);
-    data->apply(OBIS_ACTIVE_IMPORT_COUNT_L2, kmpData.l2activeImportCounter);
-    data->apply(OBIS_ACTIVE_IMPORT_COUNT_L3, kmpData.l3activeImportCounter);
-    data->apply(OBIS_METER_ID, kmpData.meterId);
-    data->apply(OBIS_NULL, AmsTypeKamstrup);
+    data->apply(OBIS_ACTIVE_IMPORT_COUNT, kmpData.activeImportCounter, now);
+    data->apply(OBIS_ACTIVE_EXPORT_COUNT, kmpData.activeExportCounter, now);
+    data->apply(OBIS_REACTIVE_IMPORT_COUNT, kmpData.reactiveImportCounter, now);
+    data->apply(OBIS_REACTIVE_EXPORT_COUNT, kmpData.reactiveExportCounter, now);
+    data->apply(OBIS_ACTIVE_IMPORT, kmpData.activeImportPower, now);
+    data->apply(OBIS_ACTIVE_EXPORT, kmpData.activeExportPower, now);
+    data->apply(OBIS_REACTIVE_IMPORT, kmpData.reactiveImportPower, now);
+    data->apply(OBIS_REACTIVE_EXPORT, kmpData.reactiveExportPower, now);
+    data->apply(OBIS_VOLTAGE_L1, kmpData.l1voltage, now);
+    data->apply(OBIS_VOLTAGE_L2, kmpData.l2voltage, now);
+    data->apply(OBIS_VOLTAGE_L3, kmpData.l3voltage, now);
+    data->apply(OBIS_CURRENT_L1, kmpData.l1current, now);
+    data->apply(OBIS_CURRENT_L2, kmpData.l2current, now);
+    data->apply(OBIS_CURRENT_L3, kmpData.l3current, now);
+    data->apply(OBIS_POWER_FACTOR_L1, kmpData.l1PowerFactor, now);
+    data->apply(OBIS_POWER_FACTOR_L2, kmpData.l2PowerFactor, now);
+    data->apply(OBIS_POWER_FACTOR_L3, kmpData.l3PowerFactor, now);
+    data->apply(OBIS_POWER_FACTOR, kmpData.powerFactor, now);
+    data->apply(OBIS_ACTIVE_IMPORT_L1, kmpData.l1activeImportPower, now);
+    data->apply(OBIS_ACTIVE_IMPORT_L2, kmpData.l2activeImportPower, now);
+    data->apply(OBIS_ACTIVE_IMPORT_L3, kmpData.l3activeImportPower, now);
+    data->apply(OBIS_ACTIVE_EXPORT_L1, kmpData.l1activeExportPower, now);
+    data->apply(OBIS_ACTIVE_EXPORT_L2, kmpData.l2activeExportPower, now);
+    data->apply(OBIS_ACTIVE_EXPORT_L3, kmpData.l3activeExportPower, now);
+    data->apply(OBIS_ACTIVE_IMPORT_COUNT_L1, kmpData.l1activeImportCounter, now);
+    data->apply(OBIS_ACTIVE_IMPORT_COUNT_L2, kmpData.l2activeImportCounter, now);
+    data->apply(OBIS_ACTIVE_IMPORT_COUNT_L3, kmpData.l3activeImportCounter, now);
+    data->apply(OBIS_METER_ID, kmpData.meterId, now);
+    data->apply(OBIS_NULL, AmsTypeKamstrup, now);
     return data;
 }

lib/MeterCommunicators/src/LNG.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/MeterCommunicators/src/LNG2.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/MeterCommunicators/src/PassiveMeterCommunicator.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -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/MeterCommunicators/src/PulseMeterCommunicator.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/PassthroughMqttHandler/include/PassthroughMqttHandler.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -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/PassthroughMqttHandler/src/PassthroughMqttHandler.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/PriceService/include/DnbCurrParser.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/PriceService/include/EntsoeA44Parser.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/PriceService/include/PriceService.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -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/include/PricesContainer.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/PriceService/src/DnbCurrParser.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/PriceService/src/EntsoeA44Parser.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */

lib/PriceService/src/PriceService.cpp

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -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
@@ -104,6 +102,8 @@ char* PriceService::getSource() {
         return this->today->getSource();
     } else if(tomorrow != NULL) {
         return this->tomorrow->getSource();
+    } else if(!this->config->enabled && this->priceConfig.capacity() != 0) {
+        return "FIX"; // Fixed price
     }
     return "";
 }
@@ -129,15 +129,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 +165,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 +172,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 +208,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 +237,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 +430,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 +478,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 +516,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 +549,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 +572,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 +585,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 +764,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/PriceService/src/PricesContainer.cpp

@@ -1,3 +1,8 @@
+/**
+ * @copyright Utilitech AS 2023-2026
+ * License: Fair Source
+ * 
+ */
 #include "PricesContainer.h"
 #include <cstring>
 

lib/RawMqttHandler/include/RawMqttHandler.h

@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
  * License: Fair Source
  * 
  */
@@ -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);
     };