Merge branch 'main' into upgrade/svelte

Fix day dropdowns in price config to respect selected month (#1168 )
* 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>
2026-05-19 12:19:42 +00:00 · 2026-04-09 12:14:56 +02:00 · 2026-04-09 12:10:28 +02:00 · 2026-04-09 11:41:58 +02:00 · 2026-04-09 09:51:27 +02:00 · 2026-04-09 09:48:02 +02:00
154 changed files with 4803 additions and 4207 deletions
--- a/.github/workflows/build.yml
+++ b/.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
--- a/.github/workflows/pr-build-env.yml
+++ b/.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
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -82,3 +82,4 @@ jobs:
      version: ${{ needs.prepare.outputs.version }}
      upload_url: ${{ needs.prepare.outputs.upload_url }}
      subfolder: /rc
+      is_esp32: false
--- a/.github/workflows/pull-request.yml
+++ b/.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 });
--- a/.github/workflows/release-deploy-env.yml
+++ b/.github/workflows/release-deploy-env.yml
@@ -20,6 +20,11 @@ on:
        required: false
        type: string
        default: ''
+      is_esp32:
+        description: 'Whether the build is for ESP32 based firmware'
+        required: false
+        type: boolean
+        default: true

 jobs:
  build-and-deploy:
@@ -68,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
@@ -79,11 +84,11 @@ jobs:
        CI: false

    - name: PlatformIO lib install
-      env:
-        GITHUB_TAG: v${{ inputs.version }}
      run: pio lib install

    - name: Build firmware
+      env:
+        GITHUB_TAG: v${{ inputs.version }}
      run: pio run -e ${{ inputs.env }}

    - name: Create zip file
@@ -119,10 +124,13 @@ jobs:
      run: aws s3 cp firmware.md5 s3://${{ secrets.AWS_S3_BUCKET }}/firmware${{ inputs.subfolder }}/ams2mqtt-${{ inputs.env }}-${{ inputs.version }}.md5

    - name: Upload bootloader to S3
+      if: ${{ inputs.is_esp32 }}
      run: aws s3 cp .pio/build/${{ inputs.env }}/bootloader.bin s3://${{ secrets.AWS_S3_BUCKET }}/firmware${{ inputs.subfolder }}/ams2mqtt-${{ inputs.env }}-${{ inputs.version }}-bootloader.bin
    
    - name: Upload partition table to S3
+      if: ${{ inputs.is_esp32 }}
      run: aws s3 cp .pio/build/${{ inputs.env }}/partitions.bin s3://${{ secrets.AWS_S3_BUCKET }}/firmware${{ inputs.subfolder }}/ams2mqtt-${{ inputs.env }}-${{ inputs.version }}-partitions.bin

    - name: Upload app0 to S3
+      if: ${{ inputs.is_esp32 }}
      run: aws s3 cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin s3://${{ secrets.AWS_S3_BUCKET }}/firmware${{ inputs.subfolder }}/ams2mqtt-${{ inputs.env }}-${{ inputs.version }}-app0.bin
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -76,3 +76,4 @@ jobs:
      env: esp8266
      version: ${{ needs.prepare.outputs.version }}
      upload_url: ${{ needs.prepare.outputs.upload_url }}
+      is_esp32: false
--- a/README.md
+++ b/README.md
@@ -1,12 +1,15 @@
 # AMS Reader
 This code is designed to decode data from electric smart meters installed in many countries in Europe these days. The data is presented in a graphical web interface and can also send the data to a MQTT broker which makes it suitable for home automation project. Originally it was only designed to work with Norwegian meters, but has since been adapter to read any IEC-62056-7-5 or IEC-62056-21 compliant meters.

-Later development have added Energy usage graph for both day and month, as well as future energy price. The code can run on any ESP8266 or ESP32 hardware which you can read more about in the [WiKi](https://github.com/UtilitechAS/amsreader-firmware/wiki). If you don't have the knowledge to set up a ESP device yourself, or you would like to support our work, please have a look at our shop at [amsleser.no](https://amsleser.no/).
+Later development have added Energy usage graph for both day and month, as well as future energy price. The code can run on any ESP8266 or ESP32 hardware which you can read more about in the [WiKi](https://github.com/UtilitechAS/amsreader-firmware/wiki). If you don't have the knowledge to set up a ESP device yourself, or you would like to support our work, please have a look at our shop at [amsleser.no](https://www.amsleser.no/).


 <img src="images/dashboard.png">

-Go to the [WiKi](https://github.com/UtilitechAS/amsreader-firmware/wiki) for information on how to get your own device! And find the latest prebuilt firmware file at the [release section](https://github.com/UtilitechAS/amsreader-firmware/releases).
+## Installing pre-built firmware
+If you have a device already running this firmware and you for some reason need to upgrade via USB port, you can use a [this web-based tool](https://www.amsleser.cloud/flasher)
+
+If you are using a development board and want to flash a pre-built firmware manually, get the necessary files from the [release](https://github.com/UtilitechAS/amsreader-firmware/releases) section and visit the [WiKi](https://github.com/UtilitechAS/amsreader-firmware/wiki) and have a look at the [Flashing](https://github.com/UtilitechAS/amsreader-firmware/wiki/flashinghttps://github.com/UtilitechAS/amsreader-firmware/wiki/flashing) section

 ## Building this project with PlatformIO
 To build this project, you need [PlatformIO](https://platformio.org/) installed.
--- a/doc/Norway/Norwegian_payload_breakdown.docx
+++ b/doc/Norway/Norwegian_payload_breakdown.docx
--- a/frames/iskra_croatia.txt
+++ b/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
--- a/images/dashboard.png
+++ b/images/dashboard.png
--- a/lib/AmsConfiguration/include/AmsConfiguration.h
+++ b/lib/AmsConfiguration/include/AmsConfiguration.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
@@ -50,6 +50,22 @@
 #define LED_BEHAVIOUR_ERROR_ONLY 3
 #define LED_BEHAVIOUR_OFF 9

+#define FIRMWARE_CHANNEL_STABLE 0
+#define FIRMWARE_CHANNEL_EARLY 1
+#define FIRMWARE_CHANNEL_RC 2
+#define FIRMWARE_CHANNEL_SNAPSHOT 3
+
+#define REBOOT_CAUSE_WEB_SYSINFO_JSON 1
+#define REBOOT_CAUSE_WEB_SAVE 2
+#define REBOOT_CAUSE_WEB_REBOOT 3
+#define REBOOT_CAUSE_WEB_FACTORY_RESET 4
+#define REBOOT_CAUSE_BTN_FACTORY_RESET 5
+#define REBOOT_CAUSE_REPARTITION 6
+#define REBOOT_CAUSE_CONFIG_FILE_UPDATE 7
+#define REBOOT_CAUSE_FIRMWARE_UPDATE 8
+#define REBOOT_CAUSE_MQTT_DISCONNECTED 9
+#define REBOOT_CAUSE_SMART_CONFIG 10
+
 struct ResetDataContainer {
 	uint8_t cause;
 	uint8_t last_cause;
@@ -63,7 +79,8 @@ struct SystemConfig {
 	uint8_t dataCollectionConsent; // 0 = unknown, 1 = accepted, 2 = declined
 	char country[3];
 	uint8_t energyspeedometer;
-}; // 8
+	uint8_t firmwareChannel;
+}; // 9

 struct NetworkConfig {
 	char ssid[32];
@@ -158,7 +175,8 @@ struct GpioConfig {
 	uint16_t vccResistorVcc;
 	uint8_t ledDisablePin;
 	uint8_t ledBehaviour;
-}; // 21
+	uint8_t powersaving;
+}; // 22

 struct GpioConfig103 {
 	uint8_t hanPin;
@@ -207,10 +225,12 @@ struct PriceServiceConfig {
 	char entsoeToken[37];
 	char area[17];
 	char currency[4];
-	uint32_t unused1;
-	bool enabled;
+	uint8_t resolutionInMinutes;
 	uint16_t unused2;
-}; // 64
+	uint16_t unused3;
+	bool enabled;
+	uint16_t unused6;
+};

 struct EnergyAccountingConfig {
 	uint16_t thresholds[10];
@@ -237,14 +257,14 @@ struct UiConfig {
 }; // 15

 struct UpgradeInformation {
-	char fromVersion[8];
-	char toVersion[8];
+	char fromVersion[16];
+	char toVersion[16];
    uint32_t size;
    uint16_t block_position;
    uint8_t retry_count;
    uint8_t reboot_count;
 	int8_t errorCode;
-}; // 25
+}; // 41+3

 struct CloudConfig {
 	bool enabled;
@@ -361,6 +381,8 @@ public:
 	bool isZmartChargeConfigChanged();
 	void ackZmartChargeConfig();
 	
+	uint32_t getChipId();
+	void getUniqueName(char* buffer, size_t length);

 	void clear();

--- a/lib/AmsConfiguration/include/AmsStorage.h
+++ b/lib/AmsConfiguration/include/AmsStorage.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsConfiguration/include/Timezones.h
+++ b/lib/AmsConfiguration/include/Timezones.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsConfiguration/include/hexutils.h
+++ b/lib/AmsConfiguration/include/hexutils.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsConfiguration/src/AmsConfiguration.cpp
+++ b/lib/AmsConfiguration/src/AmsConfiguration.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
@@ -15,6 +15,11 @@ bool AmsConfiguration::getSystemConfig(SystemConfig& config) {
 	uint8_t configVersion = EEPROM.read(EEPROM_CONFIG_ADDRESS);
 	EEPROM.get(CONFIG_SYSTEM_START, config);
 	EEPROM.end();
+
+	if(config.firmwareChannel > 3) {
+		config.firmwareChannel = 0;
+	}
+
 	if(configVersion == EEPROM_CHECK_SUM) {
 		return true;
 	} else {
@@ -27,6 +32,7 @@ bool AmsConfiguration::getSystemConfig(SystemConfig& config) {
 		}
 		config.userConfigured = false;
 		config.dataCollectionConsent = 0;
+		config.firmwareChannel = 0;
 		config.energyspeedometer = 0;
 		memset(config.country, 0, 3);
 		return false;
@@ -42,6 +48,9 @@ bool AmsConfiguration::setSystemConfig(SystemConfig& config) {
 		sysChanged |= config.dataCollectionConsent != existing.dataCollectionConsent;
 		sysChanged |= strcmp(config.country, existing.country) != 0;
 		sysChanged |= config.energyspeedometer != existing.energyspeedometer;
+		sysChanged |= config.firmwareChannel != existing.firmwareChannel;
+	} else {
+		sysChanged = true;
 	}
 	EEPROM.begin(EEPROM_SIZE);
 	stripNonAscii((uint8_t*) config.country, 2);
@@ -115,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;
@@ -508,6 +513,7 @@ bool AmsConfiguration::getGpioConfig(GpioConfig& config) {
 	if(configVersion == EEPROM_CHECK_SUM || configVersion == EEPROM_CLEARED_INDICATOR) {
 		EEPROM.get(CONFIG_GPIO_START, config);
 		EEPROM.end();
+		if(config.powersaving > 4) config.powersaving = 0;
 		return true;
 	} else {
 		clearGpio(config);
@@ -589,6 +595,7 @@ void AmsConfiguration::clearGpio(GpioConfig& config, bool all) {
 		config.vccResistorGnd = 0;
 		config.vccResistorVcc = 0;
 		config.ledBehaviour = LED_BEHAVIOUR_DEFAULT;
+		config.powersaving = 0;
 	}
 }

@@ -655,6 +662,9 @@ bool AmsConfiguration::getPriceServiceConfig(PriceServiceConfig& config) {
 			clearPriceServiceConfig(config);
 			return false;
 		}
+		if(config.resolutionInMinutes != 15 && config.resolutionInMinutes != 60) {
+			config.resolutionInMinutes = 60;
+		}
 		return true;
 	} else {
 		clearPriceServiceConfig(config);
@@ -669,6 +679,7 @@ bool AmsConfiguration::setPriceServiceConfig(PriceServiceConfig& config) {
 		priceChanged |= strcmp(config.area, existing.area) != 0;
 		priceChanged |= strcmp(config.currency, existing.currency) != 0;
 		priceChanged |= config.enabled != existing.enabled;
+		priceChanged |= config.resolutionInMinutes != existing.resolutionInMinutes;
 	} else {
 		priceChanged = true;
 	}
@@ -688,9 +699,8 @@ void AmsConfiguration::clearPriceServiceConfig(PriceServiceConfig& config) {
 	memset(config.entsoeToken, 0, 37);
 	memset(config.area, 0, 17);
 	memset(config.currency, 0, 4);
-	config.unused1 = 1000;
 	config.enabled = false;
-	config.unused2 = 0;
+	config.resolutionInMinutes = 60;
 }

 bool AmsConfiguration::isPriceServiceChanged() {
@@ -818,8 +828,8 @@ void AmsConfiguration::ackUiLanguageChange() {
 }

 bool AmsConfiguration::setUpgradeInformation(UpgradeInformation& upinfo) {
-	stripNonAscii((uint8_t*) upinfo.fromVersion, 8);
-	stripNonAscii((uint8_t*) upinfo.toVersion, 8);
+	stripNonAscii((uint8_t*) upinfo.fromVersion, 16);
+	stripNonAscii((uint8_t*) upinfo.toVersion, 16);

 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(CONFIG_UPGRADE_INFO_START, upinfo);
@@ -833,7 +843,7 @@ bool AmsConfiguration::getUpgradeInformation(UpgradeInformation& upinfo) {
 		EEPROM.begin(EEPROM_SIZE);
 		EEPROM.get(CONFIG_UPGRADE_INFO_START, upinfo);
 		EEPROM.end();
-		if(stripNonAscii((uint8_t*) upinfo.fromVersion, 8) || stripNonAscii((uint8_t*) upinfo.toVersion, 8)) {
+		if(stripNonAscii((uint8_t*) upinfo.fromVersion, 16) || stripNonAscii((uint8_t*) upinfo.toVersion, 16)) {
 			clearUpgradeInformation(upinfo);
 			return false;
 		}
@@ -845,8 +855,8 @@ bool AmsConfiguration::getUpgradeInformation(UpgradeInformation& upinfo) {
 }

 void AmsConfiguration::clearUpgradeInformation(UpgradeInformation& upinfo) {
-	memset(upinfo.fromVersion, 0, 8);
-	memset(upinfo.toVersion, 0, 8);
+	memset(upinfo.fromVersion, 0, 16);
+	memset(upinfo.toVersion, 0, 16);
 	upinfo.errorCode = 0;
 	upinfo.size = 0;
 	upinfo.block_position = 0;
@@ -969,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);

@@ -976,6 +1003,7 @@ void AmsConfiguration::clear() {
 	EEPROM.get(CONFIG_SYSTEM_START, sys);
 	sys.userConfigured = false;
 	sys.dataCollectionConsent = 0;
+	sys.firmwareChannel = 0;
 	sys.energyspeedometer = 0;
 	memset(sys.country, 0, 3);
 	EEPROM.put(CONFIG_SYSTEM_START, sys);
@@ -1138,7 +1166,8 @@ bool AmsConfiguration::relocateConfig103() {
 		gpio103.vccResistorGnd,
 		gpio103.vccResistorVcc,
 		gpio103.ledDisablePin,
-		gpio103.ledBehaviour
+		gpio103.ledBehaviour,
+		0
 	};

 	WebConfig web = {web103.security};
@@ -1310,6 +1339,7 @@ void AmsConfiguration::print(Print* debugger)
 		debugger->printf_P(PSTR("Vcc pin:              %i\r\n"), gpio.vccPin);
 		debugger->printf_P(PSTR("LED disable pin:      %i\r\n"), gpio.ledDisablePin);
 		debugger->printf_P(PSTR("LED behaviour:        %i\r\n"), gpio.ledBehaviour);
+		debugger->printf_P(PSTR("Power saving:         %i\r\n"), gpio.powersaving);
 		if(gpio.vccMultiplier > 0) {
 			debugger->printf_P(PSTR("Vcc multiplier:       %f\r\n"), gpio.vccMultiplier / 1000.0);
 		}
--- a/lib/AmsConfiguration/src/hexutils.cpp
+++ b/lib/AmsConfiguration/src/hexutils.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsData/include/AmsData.h
+++ b/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();

--- a/lib/AmsData/include/OBIScodes.h
+++ b/lib/AmsData/include/OBIScodes.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsData/src/AmsData.cpp
+++ b/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)
--- a/lib/AmsDataStorage/include/AmsDataStorage.h
+++ b/lib/AmsDataStorage/include/AmsDataStorage.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDataStorage/src/AmsDataStorage.cpp
+++ b/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) {
--- a/lib/AmsDecoder/include/Cosem.h
+++ b/lib/AmsDecoder/include/Cosem.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/include/DataParser.h
+++ b/lib/AmsDecoder/include/DataParser.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/include/DataParsers.h
+++ b/lib/AmsDecoder/include/DataParsers.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/include/DlmsParser.h
+++ b/lib/AmsDecoder/include/DlmsParser.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/include/DsmrParser.h
+++ b/lib/AmsDecoder/include/DsmrParser.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/include/GbtParser.h
+++ b/lib/AmsDecoder/include/GbtParser.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/include/GcmParser.h
+++ b/lib/AmsDecoder/include/GcmParser.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/include/HdlcParser.h
+++ b/lib/AmsDecoder/include/HdlcParser.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/include/LlcParser.h
+++ b/lib/AmsDecoder/include/LlcParser.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/include/MbusParser.h
+++ b/lib/AmsDecoder/include/MbusParser.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/include/crc.h
+++ b/lib/AmsDecoder/include/crc.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/include/ntohll.h
+++ b/lib/AmsDecoder/include/ntohll.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/src/Cosem.cpp
+++ b/lib/AmsDecoder/src/Cosem.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/src/DlmsParser.cpp
+++ b/lib/AmsDecoder/src/DlmsParser.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/src/DsmrParser.cpp
+++ b/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);
            }
--- a/lib/AmsDecoder/src/GbtParser.cpp
+++ b/lib/AmsDecoder/src/GbtParser.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/src/GcmParser.cpp
+++ b/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)
--- a/lib/AmsDecoder/src/HdlcParser.cpp
+++ b/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);
--- a/lib/AmsDecoder/src/LlcParser.cpp
+++ b/lib/AmsDecoder/src/LlcParser.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/src/MbusParser.cpp
+++ b/lib/AmsDecoder/src/MbusParser.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/src/crc.cpp
+++ b/lib/AmsDecoder/src/crc.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsDecoder/src/ntohll.cpp
+++ b/lib/AmsDecoder/src/ntohll.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/AmsFirmwareUpdater/include/AmsFirmwareUpdater.h
+++ b/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:
@@ -60,6 +67,13 @@ public:
    bool isUpgradeInformationChanged();
    void ackUpgradeInformationChanged();

+    void setFirmwareChannel(uint8_t channel) {
+        if(firmwareChannel != channel) {
+            firmwareChannel = channel;
+            lastVersionCheck = 0;
+        }
+    }
+
    bool startFirmwareUpload(uint32_t size, const char* version);
    bool addFirmwareUploadChunk(uint8_t* buf, size_t length);
    bool completeFirmwareUpload(uint32_t size);
@@ -95,10 +109,11 @@ private:
    String md5;

    uint32_t lastVersionCheck = 0;
-    uint8_t firmwareVariant;
+    uint8_t firmwareChannel;
    bool autoUpgrade;
-    char nextVersion[10];
+    char nextVersion[17];

+    void getChannelName(char * buffer);

    bool fetchNextVersion();
    bool fetchVersionDetails();
--- a/lib/AmsFirmwareUpdater/src/AmsFirmwareUpdater.cpp
+++ b/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"
@@ -22,7 +27,7 @@ this->debugger = debugger;
    this->hw = hw;
    this->meterState = meterState;
    memset(nextVersion, 0, sizeof(nextVersion));
-    firmwareVariant = 0;
+    firmwareChannel = 0;
    autoUpgrade = false;
 }

@@ -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;
                }
@@ -208,15 +213,33 @@ void AmsFirmwareUpdater::loop() {
    }
 }

+void AmsFirmwareUpdater::getChannelName(char * buffer) {
+    switch(firmwareChannel) {
+        case FIRMWARE_CHANNEL_EARLY:
+            strcpy(buffer, PSTR("early"));
+            break;
+        case FIRMWARE_CHANNEL_RC:
+            strcpy(buffer, PSTR("rc"));
+            break;
+        case FIRMWARE_CHANNEL_SNAPSHOT:
+            strcpy(buffer, PSTR("snapshot"));
+            break;  
+        default:
+            strcpy(buffer, PSTR("stable"));
+            break;
+    }
+}
+
 bool AmsFirmwareUpdater::fetchNextVersion() {
    HTTPClient http;
    const char * headerkeys[] = { "x-version" };
    http.collectHeaders(headerkeys, 1);

-    char firmwareVariant[10] = "stable";
+    char channel[10] = "";
+    getChannelName(channel);

    char url[128];
-    snprintf_P(url, 128, PSTR("http://hub.amsleser.no/hub/firmware/%s/%s/next"), chipType, firmwareVariant);
+    snprintf_P(url, 128, PSTR("http://hub.amsleser.no/hub/firmware/%s/%s/next"), chipType, channel);
    #if defined(ESP8266)
    WiFiClient client;
    client.setTimeout(5000);
@@ -263,10 +286,11 @@ bool AmsFirmwareUpdater::fetchVersionDetails() {
    const char * headerkeys[] = { "x-size" };
    http.collectHeaders(headerkeys, 1);

-    char firmwareVariant[10] = "stable";
+    char channel[10] = "";
+    getChannelName(channel);

    char url[128];
-    snprintf_P(url, 128, PSTR("http://hub.amsleser.no/hub/firmware/%s/%s/%s/details"), chipType, firmwareVariant, updateStatus.toVersion);
+    snprintf_P(url, 128, PSTR("http://hub.amsleser.no/hub/firmware/%s/%s/%s/details"), chipType, channel, updateStatus.toVersion);
    #if defined(ESP8266)
    WiFiClient client;
    client.setTimeout(5000);
@@ -319,10 +343,11 @@ bool AmsFirmwareUpdater::fetchFirmwareChunk(HTTPClient& http) {
    char range[24];
    snprintf_P(range, 24, PSTR("bytes=%lu-%lu"), start, end);

-    char firmwareVariant[10] = "stable";
+    char channel[10] = "";
+    getChannelName(channel);

    char url[128];
-    snprintf_P(url, 128, PSTR("http://hub.amsleser.no/hub/firmware/%s/%s/%s/chunk"), chipType, firmwareVariant, updateStatus.toVersion);
+    snprintf_P(url, 128, PSTR("http://hub.amsleser.no/hub/firmware/%s/%s/%s/chunk"), chipType, channel, updateStatus.toVersion);
    #if defined(ESP8266)
    WiFiClient client;
    client.setTimeout(5000);
--- a/lib/AmsJsonGenerator/include/AmsJsonGenerator.h
+++ b/lib/AmsJsonGenerator/include/AmsJsonGenerator.h
@@ -1,3 +1,8 @@
+/**
+ * @copyright Utilitech AS 2023-2026
+ * License: Fair Source
+ * 
+ */
 #pragma once

 #include "AmsDataStorage.h"
--- a/lib/AmsJsonGenerator/src/AmsJsonGenerator.cpp
+++ b/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) {
--- a/lib/AmsMqttHandler/include/AmsMqttHandler.h
+++ b/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;
@@ -43,10 +43,12 @@ public:
    void setConfig(MqttConfig& mqttConfig);

    bool connect();
+    bool defaultSubscribe();
    void disconnect();
    lwmqtt_err_t lastError();
    bool connected();
    bool loop();
+    bool isRebootSuggested();

    virtual uint8_t getFormat() { return 0; };

@@ -55,11 +57,16 @@ public:
    virtual bool publishTemperatures(AmsConfiguration*, HwTools*) { return false; };
    virtual bool publishPrices(PriceService* ps) { return false; };
    virtual bool publishSystem(HwTools*, PriceService*, EnergyAccounting*) { return false; };
-    virtual bool publishRaw(String data) { return false; };
+    virtual bool publishRaw(uint8_t* raw, size_t length) { return false; };
    virtual bool publishFirmware() { return false; };
    virtual void onMessage(String &topic, String &payload) {};

    virtual ~AmsMqttHandler() {
+        if(mqttSecureClient != NULL) {
+            mqttSecureClient->stop();
+            delete mqttSecureClient;
+        }
+
        if(mqttClient != NULL) {
            mqttClient->stop();
            delete mqttClient;
@@ -79,6 +86,7 @@ protected:
    bool caVerification = true;
    WiFiClient *mqttClient = NULL;
    WiFiClientSecure *mqttSecureClient = NULL;
+    boolean _connected = false;
    char* json;
    uint16_t BufferSize = 2048;
    uint64_t lastStateUpdate = 0;
@@ -88,6 +96,7 @@ protected:
    String subTopic;

    AmsFirmwareUpdater* updater = NULL;
+    bool rebootSuggested = false;
 };

 #endif
--- a/lib/AmsMqttHandler/src/AmsMqttHandler.cpp
+++ b/lib/AmsMqttHandler/src/AmsMqttHandler.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
@@ -103,6 +103,17 @@ bool AmsMqttHandler::connect() {
 		actualClient = mqttClient;
 	}

+	// 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);
 	mqtt.setKeepAlive(mqttConfig.keepalive);
@@ -125,8 +136,9 @@ bool AmsMqttHandler::connect() {
 		#endif
 		debugger->printf_P(PSTR("Successfully connected to MQTT\n"));
 		mqtt.onMessage(std::bind(&AmsMqttHandler::onMessage, this, std::placeholders::_1, std::placeholders::_2));
-		mqtt.publish(statusTopic, "online", true, 0);
+		_connected = mqtt.publish(statusTopic, "online", true, 0);
        mqtt.loop();
+		defaultSubscribe();
 		postConnect();
        return true;
 	} else {
@@ -146,13 +158,29 @@ bool AmsMqttHandler::connect() {
 	}
 }

+bool AmsMqttHandler::defaultSubscribe() {
+	bool ret = true;
+	if(!subTopic.isEmpty()) {
+        if(mqtt.subscribe(subTopic)) {
+            #if defined(AMS_REMOTE_DEBUG)
+            if (debugger->isActive(RemoteDebug::ERROR))
+            #endif
+            debugger->printf_P(PSTR("  Subscribed to [%s]\n"), subTopic.c_str());
+        } else {
+            #if defined(AMS_REMOTE_DEBUG)
+            if (debugger->isActive(RemoteDebug::ERROR))
+            #endif
+            debugger->printf_P(PSTR("  Unable to subscribe to [%s]\n"), subTopic.c_str());
+            ret = false;
+        }
+    }
+	return ret;
+}
+
 void AmsMqttHandler::disconnect() {
    mqtt.disconnect();
    mqtt.loop();
-	if(mqttSecureClient != NULL) {
-		delete mqttSecureClient;
-		mqttSecureClient = NULL;
-	}
+	_connected = false;
    delay(10);
    yield();
 }
@@ -162,12 +190,12 @@ lwmqtt_err_t AmsMqttHandler::lastError() {
 }

 bool AmsMqttHandler::connected() {
-	return mqtt.connected();
+	return _connected && mqtt.connected();
 }

 bool AmsMqttHandler::loop() {
 	uint64_t now = millis64();
-    bool ret = mqtt.connected() && mqtt.loop();
+    bool ret = connected() && mqtt.loop();
 	if(ret) {
 		lastSuccessfulLoop = now;
 	} else if(mqttConfig.rebootMinutes > 0) {
@@ -177,7 +205,7 @@ bool AmsMqttHandler::loop() {
 			if (debugger->isActive(RemoteDebug::WARNING))
 			#endif
 			debugger->printf_P(PSTR("MQTT connection lost for over %d minutes, rebooting device\n"), mqttConfig.rebootMinutes);
-			ESP.restart();
+			rebootSuggested = true;
 		}
 	}
 	delay(10); // Needed to preserve power. After adding this, the voltage is super smooth on a HAN powered device
@@ -188,4 +216,8 @@ bool AmsMqttHandler::loop() {
 		ESP.wdtFeed();
 	#endif
    return ret;
+}
+
+bool AmsMqttHandler::isRebootSuggested() {
+	return rebootSuggested;
 }
--- a/lib/CloudConnector/include/CloudConnector.h
+++ b/lib/CloudConnector/include/CloudConnector.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/CloudConnector/src/CloudConnector.cpp
+++ b/lib/CloudConnector/src/CloudConnector.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/ConnectionHandler/include/ConnectionHandler.h
+++ b/lib/ConnectionHandler/include/ConnectionHandler.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/ConnectionHandler/include/EthernetConnectionHandler.h
+++ b/lib/ConnectionHandler/include/EthernetConnectionHandler.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/ConnectionHandler/include/WiFiAccessPointConnectionHandler.h
+++ b/lib/ConnectionHandler/include/WiFiAccessPointConnectionHandler.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/ConnectionHandler/include/WiFiClientConnectionHandler.h
+++ b/lib/ConnectionHandler/include/WiFiClientConnectionHandler.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/ConnectionHandler/src/EthernetConnectionHandler.cpp
+++ b/lib/ConnectionHandler/src/EthernetConnectionHandler.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
@@ -114,6 +114,7 @@ bool EthernetConnectionHandler::connect(NetworkConfig config, SystemConfig sys)
                    debugger->printf_P(PSTR("Static IP configuration is invalid, not using\n"));
                }
            }
+            this->config = config;
        } else {
 			#if defined(AMS_REMOTE_DEBUG)
            if (debugger->isActive(RemoteDebug::ERROR))
@@ -147,6 +148,9 @@ void EthernetConnectionHandler::eventHandler(WiFiEvent_t event, WiFiEventInfo_t
            {
                debugger->printf_P(PSTR("Successfully connected to Ethernet!\n"));
            }
+			if(config.ipv6 && !ETH.enableIpV6()) {
+				debugger->printf_P(PSTR("Unable to enable IPv6\n"));
+			}
            break;
        case ARDUINO_EVENT_ETH_GOT_IP:
            #if defined(AMS_REMOTE_DEBUG)
--- a/lib/ConnectionHandler/src/WiFiAccessPointConnectionHandler.cpp
+++ b/lib/ConnectionHandler/src/WiFiAccessPointConnectionHandler.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/ConnectionHandler/src/WiFiClientConnectionHandler.cpp
+++ b/lib/ConnectionHandler/src/WiFiClientConnectionHandler.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/DomoticzMqttHandler/include/DomoticzMqttHandler.h
+++ b/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
@@ -25,7 +25,7 @@ public:
    bool publishTemperatures(AmsConfiguration*, HwTools*);
    bool publishPrices(PriceService*);
    bool publishSystem(HwTools* hw, PriceService* ps, EnergyAccounting* ea);
-    bool publishRaw(String data);
+    bool publishRaw(uint8_t* raw, size_t length);

    void onMessage(String &topic, String &payload);

--- a/lib/DomoticzMqttHandler/src/DomoticzMqttHandler.cpp
+++ b/lib/DomoticzMqttHandler/src/DomoticzMqttHandler.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
@@ -103,7 +103,7 @@ uint8_t DomoticzMqttHandler::getFormat() {
    return 3;
 }

-bool DomoticzMqttHandler::publishRaw(String data) {
+bool DomoticzMqttHandler::publishRaw(uint8_t* raw, size_t length) {
    return false;
 }

--- a/lib/EnergyAccounting/include/EnergyAccounting.h
+++ b/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"

@@ -26,9 +24,11 @@ struct EnergyAccountingPeak6 {
 struct EnergyAccountingData {
    uint8_t version;
    uint8_t month;
+    int32_t costToday;
    int32_t costYesterday;
    int32_t costThisMonth;
    int32_t costLastMonth;
+    int32_t incomeToday;
    int32_t incomeYesterday;
    int32_t incomeThisMonth;
    int32_t incomeLastMonth;
@@ -36,6 +36,7 @@ struct EnergyAccountingData {
    uint32_t lastMonthExport;
    uint8_t lastMonthAccuracy;
    EnergyAccountingPeak peaks[5];
+    time_t lastUpdated;
 };

 struct EnergyAccountingData6 {
@@ -80,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();
@@ -115,7 +116,6 @@ public:
    void setData(EnergyAccountingData&);

    void setCurrency(String currency);
-    float getPriceForHour(uint8_t d, uint8_t h);

 private:
    #if defined(AMS_REMOTE_DEBUG)
@@ -128,7 +128,7 @@ private:
    PriceService *ps = NULL;
    EnergyAccountingConfig *config = NULL;
    Timezone *tz = NULL;
-    EnergyAccountingData data = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+    EnergyAccountingData data = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
    EnergyAccountingRealtimeData* realtimeData = NULL;
    String currency = "";

--- a/lib/EnergyAccounting/src/EnergyAccounting.cpp
+++ b/lib/EnergyAccounting/src/EnergyAccounting.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
@@ -30,7 +30,7 @@ EnergyAccounting::EnergyAccounting(Stream* Stream, EnergyAccountingRealtimeData*
        rtd->lastImportUpdateMillis = 0;
        rtd->lastExportUpdateMillis = 0;
    }
-    this->realtimeData = rtd;
+    realtimeData = rtd;
 }

 void EnergyAccounting::setup(AmsDataStorage *ds, EnergyAccountingConfig *config) {
@@ -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;
@@ -67,14 +66,14 @@ bool EnergyAccounting::update(AmsData* amsData) {
    breakTime(tz->toLocal(now), local);

    if(!init) {
-        this->realtimeData->lastImportUpdateMillis = 0;
-        this->realtimeData->lastExportUpdateMillis = 0;
-        this->realtimeData->currentHour = local.Hour;
-        this->realtimeData->currentDay = local.Day;
+        realtimeData->lastImportUpdateMillis = 0;
+        realtimeData->lastExportUpdateMillis = 0;
+        realtimeData->currentHour = local.Hour;
+        realtimeData->currentDay = local.Day;
        if(!load()) {
            data = { 7, local.Month, 
-                0, 0, 0, // Cost
-                0, 0, 0, // Income
+                0, 0, 0, 0, // Cost
+                0, 0, 0, 0, // Income
                0, 0, 0, // Last month import, export and accuracy
                0, 0, 0, // Peak 1
                0, 0, 0, // Peak 2
@@ -86,12 +85,11 @@ bool EnergyAccounting::update(AmsData* amsData) {
        init = true;
    }

-    float importPrice = getPriceForHour(PRICE_DIRECTION_IMPORT, 0);
-    if(!initPrice && importPrice != PRICE_NO_VALUE) {
+    if(!initPrice && ps != NULL && ps->hasPrice()) {
        calcDayCost();
    }

-    if(local.Hour != this->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);
@@ -99,27 +97,24 @@ bool EnergyAccounting::update(AmsData* amsData) {
        breakTime(tz->toLocal(now-3600), oneHrAgoLocal);
        ret |= updateMax(val, oneHrAgoLocal.Day, oneHrAgoLocal.Hour);

-        this->realtimeData->currentHour = local.Hour; // Need to be defined here so that day cost is correctly calculated
-        if(local.Hour > 0) {
-            calcDayCost();
-        }
+        realtimeData->currentHour = local.Hour; // Need to be defined here so that day cost is correctly calculated

-        this->realtimeData->use = 0;
-        this->realtimeData->produce = 0;
-        this->realtimeData->costHour = 0;
-        this->realtimeData->incomeHour = 0;
+        realtimeData->use = 0;
+        realtimeData->produce = 0;
+        realtimeData->costHour = 0;
+        realtimeData->incomeHour = 0;

-        uint8_t prevDay = this->realtimeData->currentDay;
-        if(local.Day != this->realtimeData->currentDay) {
-            data.costYesterday = this->realtimeData->costDay * 100;
-            data.costThisMonth += this->realtimeData->costDay * 100;
-            this->realtimeData->costDay = 0;
+        uint8_t prevDay = realtimeData->currentDay;
+        if(local.Day != realtimeData->currentDay) {
+            data.costYesterday = realtimeData->costDay * 100;
+            data.costThisMonth += realtimeData->costDay * 100;
+            realtimeData->costDay = 0;

-            data.incomeYesterday = this->realtimeData->incomeDay * 100;
-            data.incomeThisMonth += this->realtimeData->incomeDay * 100;
-            this->realtimeData->incomeDay = 0;
+            data.incomeYesterday = realtimeData->incomeDay * 100;
+            data.incomeThisMonth += realtimeData->incomeDay * 100;
+            realtimeData->incomeDay = 0;

-            this->realtimeData->currentDay = local.Day;
+            realtimeData->currentDay = local.Day;
            ret = true;
        }

@@ -149,42 +144,49 @@ bool EnergyAccounting::update(AmsData* amsData) {
            data.lastMonthAccuracy = accuracy;

            data.month = local.Month;
-            this->realtimeData->currentThresholdIdx = 0;
+            realtimeData->currentThresholdIdx = 0;
            ret = true;
        }
+
+        if(ret) {
+            data.costToday = realtimeData->costDay * 100;
+            data.incomeToday = realtimeData->incomeDay * 100;
+            data.lastUpdated = now;
+        }
    }

-    if(this->realtimeData->lastImportUpdateMillis < amsData->getLastUpdateMillis()) {
-        unsigned long ms = amsData->getLastUpdateMillis() - this->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) {
-            this->realtimeData->use += kwhi;
+            realtimeData->use += kwhi;
+            float importPrice = ps == NULL ? PRICE_NO_VALUE : ps->getCurrentPrice(PRICE_DIRECTION_IMPORT);
            if(importPrice != PRICE_NO_VALUE) {
                float cost = importPrice * kwhi;
-                this->realtimeData->costHour += cost;
-                this->realtimeData->costDay += cost;
+                realtimeData->costHour += cost;
+                realtimeData->costDay += cost;
            }
        }
-        this->realtimeData->lastImportUpdateMillis = amsData->getLastUpdateMillis();
+        realtimeData->lastImportUpdateMillis = lastUpdatedMillis;
    }

-    if(amsData->getListType() > 1 && this->realtimeData->lastExportUpdateMillis < amsData->getLastUpdateMillis()) {
-        unsigned long ms = amsData->getLastUpdateMillis() - this->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) {
-            this->realtimeData->produce += kwhe;
-            float exportPrice = getPriceForHour(PRICE_DIRECTION_EXPORT, 0);
+            realtimeData->produce += kwhe;
+            float exportPrice = ps == NULL ? PRICE_NO_VALUE : ps->getCurrentPrice(PRICE_DIRECTION_EXPORT);
            if(exportPrice != PRICE_NO_VALUE) {
                float income = exportPrice * kwhe;
-                this->realtimeData->incomeHour += income;
-                this->realtimeData->incomeDay += income;
+                realtimeData->incomeHour += income;
+                realtimeData->incomeDay += income;
            }
        }
-        this->realtimeData->lastExportUpdateMillis = amsData->getLastUpdateMillis();
+        realtimeData->lastExportUpdateMillis = lastUpdatedMillis;
    }

    if(config != NULL) {
-        while(getMonthMax() > config->thresholds[this->realtimeData->currentThresholdIdx] && this->realtimeData->currentThresholdIdx < 10) this->realtimeData->currentThresholdIdx++;
+        while(getMonthMax() > config->thresholds[realtimeData->currentThresholdIdx] && realtimeData->currentThresholdIdx < 10) realtimeData->currentThresholdIdx++;
    }

    return ret;
@@ -192,28 +194,36 @@ bool EnergyAccounting::update(AmsData* amsData) {

 void EnergyAccounting::calcDayCost() {
    time_t now = time(nullptr);
-    tmElements_t local, utc;
+    tmElements_t local, utc, lastUpdateUtc;
    if(tz == NULL) return;
    breakTime(tz->toLocal(now), local);
+    if(ps == NULL) return;

-    if(getPriceForHour(PRICE_DIRECTION_IMPORT, 0) != PRICE_NO_VALUE) {
-        if(initPrice) {
-            this->realtimeData->costDay = 0;
-            this->realtimeData->incomeDay = 0;
+    if(ps->hasPrice()) {
+        breakTime(data.lastUpdated, lastUpdateUtc);
+        uint8_t calcFromHour = 0;
+        if(lastUpdateUtc.Day != local.Day || lastUpdateUtc.Month != local.Month || lastUpdateUtc.Year != local.Year) {
+            realtimeData->costDay = 0;
+            realtimeData->incomeDay = 0;
+            calcFromHour = 0;
+        } else {
+            realtimeData->costDay = data.costToday / 100.0;
+            realtimeData->incomeDay = data.incomeToday / 100.0;
+            calcFromHour = lastUpdateUtc.Hour;
        }
-        for(uint8_t i = 0; i < this->realtimeData->currentHour; i++) {
+        for(uint8_t i = calcFromHour; i < realtimeData->currentHour; i++) {
            breakTime(now - ((local.Hour - i) * 3600), utc);

-            float priceIn = getPriceForHour(PRICE_DIRECTION_IMPORT, i - local.Hour);
+            float priceIn = ps->getPriceForRelativeHour(PRICE_DIRECTION_IMPORT, i - local.Hour);
            if(priceIn != PRICE_NO_VALUE) {
                int16_t wh = ds->getHourImport(utc.Hour);
-                this->realtimeData->costDay += priceIn * (wh / 1000.0);
+                realtimeData->costDay += priceIn * (wh / 1000.0);
            }

-            float priceOut = getPriceForHour(PRICE_DIRECTION_EXPORT, i - local.Hour);
+            float priceOut = ps->getPriceForRelativeHour(PRICE_DIRECTION_EXPORT, i - local.Hour);
            if(priceOut != PRICE_NO_VALUE) {
                int16_t wh = ds->getHourExport(utc.Hour);
-                this->realtimeData->incomeDay += priceOut * (wh / 1000.0);
+                realtimeData->incomeDay += priceOut * (wh / 1000.0);
            }
        }
        initPrice = true;
@@ -221,7 +231,7 @@ void EnergyAccounting::calcDayCost() {
 }

 float EnergyAccounting::getUseThisHour() {
-    return this->realtimeData->use;
+    return realtimeData->use;
 }

 float EnergyAccounting::getUseToday() {
@@ -231,7 +241,7 @@ float EnergyAccounting::getUseToday() {
    if(now < FirmwareVersion::BuildEpoch) return 0.0;
    tmElements_t utc, local;
    breakTime(tz->toLocal(now), local);
-    for(uint8_t i = 0; i < this->realtimeData->currentHour; i++) {
+    for(uint8_t i = 0; i < realtimeData->currentHour; i++) {
        breakTime(now - ((local.Hour - i) * 3600), utc);
        ret += ds->getHourImport(utc.Hour) / 1000.0;
    }
@@ -242,18 +252,20 @@ float EnergyAccounting::getUseThisMonth() {
    time_t now = time(nullptr);
    if(now < FirmwareVersion::BuildEpoch) return 0.0;
    float ret = 0;
-    for(uint8_t i = 1; i < this->realtimeData->currentDay; i++) {
+    for(uint8_t i = 1; i < realtimeData->currentDay; i++) {
        ret += ds->getDayImport(i) / 1000.0;
    }
    return ret + getUseToday();
 }

 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() {
-    return this->realtimeData->produce;
+    return realtimeData->produce;
 }

 float EnergyAccounting::getProducedToday() {
@@ -263,7 +275,7 @@ float EnergyAccounting::getProducedToday() {
    if(now < FirmwareVersion::BuildEpoch) return 0.0;
    tmElements_t utc, local;
    breakTime(tz->toLocal(now), local);
-    for(uint8_t i = 0; i < this->realtimeData->currentHour; i++) {
+    for(uint8_t i = 0; i < realtimeData->currentHour; i++) {
        breakTime(now - ((local.Hour - i) * 3600), utc);
        ret += ds->getHourExport(utc.Hour) / 1000.0;
    }
@@ -274,22 +286,24 @@ float EnergyAccounting::getProducedThisMonth() {
    time_t now = time(nullptr);
    if(now < FirmwareVersion::BuildEpoch) return 0.0;
    float ret = 0;
-    for(uint8_t i = 1; i < this->realtimeData->currentDay; i++) {
+    for(uint8_t i = 1; i < realtimeData->currentDay; i++) {
        ret += ds->getDayExport(i) / 1000.0;
    }
    return ret + getProducedToday();
 }

 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() {
-    return this->realtimeData->costHour;
+    return realtimeData->costHour;
 }

 float EnergyAccounting::getCostToday() {
-    return this->realtimeData->costDay;
+    return realtimeData->costDay;
 }

 float EnergyAccounting::getCostYesterday() {
@@ -305,11 +319,11 @@ float EnergyAccounting::getCostLastMonth() {
 }

 float EnergyAccounting::getIncomeThisHour() {
-    return this->realtimeData->incomeHour;
+    return realtimeData->incomeHour;
 }

 float EnergyAccounting::getIncomeToday() {
-    return this->realtimeData->incomeDay;
+    return realtimeData->incomeDay;
 }

 float EnergyAccounting::getIncomeYesterday() {
@@ -327,7 +341,7 @@ float EnergyAccounting::getIncomeLastMonth() {
 uint8_t EnergyAccounting::getCurrentThreshold() {
    if(config == NULL)
        return 0;
-    return config->thresholds[this->realtimeData->currentThresholdIdx];
+    return config->thresholds[realtimeData->currentThresholdIdx];
 }

 float EnergyAccounting::getMonthMax() {
@@ -414,9 +428,11 @@ bool EnergyAccounting::load() {
        } else if(buf[0] == 6) {
            EnergyAccountingData6* data = (EnergyAccountingData6*) buf;
            this->data = { 7, data->month, 
+                0, // Cost today
                data->costYesterday,
                data->costThisMonth,
                data->costLastMonth,
+                0, // Income today
                data->incomeYesterday,
                data->incomeThisMonth,
                data->incomeLastMonth,
@@ -495,8 +511,3 @@ bool EnergyAccounting::updateMax(uint16_t val, uint8_t day, uint8_t hour) {
 void EnergyAccounting::setCurrency(String currency) {
    this->currency = currency;
 }
-
-float EnergyAccounting::getPriceForHour(uint8_t d, uint8_t h) {
-    if(ps == NULL) return PRICE_NO_VALUE;
-    return ps->getValueForHour(d, h);
-}
--- a/lib/FirmwareVersion/include/FirmwareVersion.h
+++ b/lib/FirmwareVersion/include/FirmwareVersion.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/FirmwareVersion/src/FirmwareVersion.cpp
+++ b/lib/FirmwareVersion/src/FirmwareVersion.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h
+++ b/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;
@@ -27,7 +27,7 @@ public:
    bool publishTemperatures(AmsConfiguration*, HwTools*);
    bool publishPrices(PriceService*);
    bool publishSystem(HwTools* hw, PriceService* ps, EnergyAccounting* ea);
-    bool publishRaw(String data);
+    bool publishRaw(uint8_t* raw, size_t length);
    bool publishFirmware();

    bool postConnect();
@@ -51,9 +51,9 @@ private:
    String updateTopic;
    String sensorNamePrefix;

-    bool l1Init, l2Init, l2eInit, l3Init, l3eInit, l4Init, l4eInit, rtInit, rteInit, pInit, sInit, rInit, fInit;
+    bool l1Init, l2Init, l2eInit, l3Init, l3eInit, l4Init, l4eInit, rtInit, rteInit, pInit, sInit, rInit, fInit, dInit;
    bool tInit[32] = {false};
-    bool prInit[38] = {false};
+    uint8_t priceImportInit = 0, priceExportInit = 0;
    uint32_t lastThresholdPublish = 0;

    HwTools* 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) {
--- a/lib/HomeAssistantMqttHandler/include/HomeAssistantStatic.h
+++ b/lib/HomeAssistantMqttHandler/include/HomeAssistantStatic.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
@@ -17,113 +17,113 @@ struct HomeAssistantSensor {
    const char* uom;
    const char* devcl;
    const char* stacl;
+    const char* uid;
 };


 const uint8_t List1SensorCount PROGMEM = 2;
 const HomeAssistantSensor List1Sensors[List1SensorCount] PROGMEM = {
-    {"Active import",              "/power",   "P",                   30, "W",    "power",           "measurement"},
-    {"Data timestamp",             "/power",   "t",                   30, "",     "timestamp",       ""}
+    {"Active import",              "/power",   "P",                   30, "W",    "power",           "measurement", ""},
+    {"Data timestamp",             "/power",   "t",                   30, "",     "timestamp",       "",            ""}
 };

 const uint8_t List2SensorCount PROGMEM = 8;
 const HomeAssistantSensor List2Sensors[List2SensorCount] PROGMEM = {
-    {"Reactive import",            "/power",   "Q",                   30, "var",  "reactive_power",  "measurement"},
-    {"Reactive export",            "/power",   "QO",                  30, "var",  "reactive_power",  "measurement"},
-    {"L1 current",                 "/power",   "I1",                  30, "A",    "current",         "measurement"},
-    {"L2 current",                 "/power",   "I2",                  30, "A",    "current",         "measurement"},
-    {"L3 current",                 "/power",   "I3",                  30, "A",    "current",         "measurement"},
-    {"L1 voltage",                 "/power",   "U1",                  30, "V",    "voltage",         "measurement"},
-    {"L2 voltage",                 "/power",   "U2",                  30, "V",    "voltage",         "measurement"},
-    {"L3 voltage",                 "/power",   "U3",                  30, "V",    "voltage",         "measurement"}
+    {"Reactive import",            "/power",   "Q",                   30, "var",  "reactive_power",  "measurement", ""},
+    {"Reactive export",            "/power",   "QO",                  30, "var",  "reactive_power",  "measurement", ""},
+    {"L1 current",                 "/power",   "I1",                  30, "A",    "current",         "measurement", ""},
+    {"L2 current",                 "/power",   "I2",                  30, "A",    "current",         "measurement", ""},
+    {"L3 current",                 "/power",   "I3",                  30, "A",    "current",         "measurement", ""},
+    {"L1 voltage",                 "/power",   "U1",                  30, "V",    "voltage",         "measurement", ""},
+    {"L2 voltage",                 "/power",   "U2",                  30, "V",    "voltage",         "measurement", ""},
+    {"L3 voltage",                 "/power",   "U3",                  30, "V",    "voltage",         "measurement", ""}
 };

 const uint8_t List2ExportSensorCount PROGMEM = 1;
 const HomeAssistantSensor List2ExportSensors[List2ExportSensorCount] PROGMEM = {
-    {"Active export",              "/power",   "PO",                  30, "W",    "power",           "measurement"}
+    {"Active export",              "/power",   "PO",                  30, "W",    "power",           "measurement", ""}
 };

 const uint8_t List3SensorCount PROGMEM = 4;
 const HomeAssistantSensor List3Sensors[List3SensorCount] PROGMEM = {
-    {"Accumulated active import",  "/energy",  "tPI",               4000, "kWh",  "energy",          "total_increasing"},
-    {"Accumulated reactive import","/energy",  "tQI",               4000, "kvarh","",                "total_increasing"},
-    {"Accumulated reactive export","/energy",  "tQO",               4000, "kvarh","",                "total_increasing"},
-    {"Meter timestamp",            "/energy",  "rtc",               4000, "",     "timestamp",       ""}
+    {"Accumulated active import",  "/energy",  "tPI",               4000, "kWh",  "energy",          "total_increasing", ""},
+    {"Accumulated reactive import","/energy",  "tQI",               4000, "kvarh","",                "total_increasing", ""},
+    {"Accumulated reactive export","/energy",  "tQO",               4000, "kvarh","",                "total_increasing", ""},
+    {"Meter timestamp",            "/energy",  "rtc",               4000, "",     "timestamp",       "",                 ""}
 };

 const uint8_t List3ExportSensorCount PROGMEM = 1;
 const HomeAssistantSensor List3ExportSensors[List3ExportSensorCount] PROGMEM = {
-    {"Accumulated active export",  "/energy",  "tPO",               4000, "kWh",  "energy",          "total_increasing"}
+    {"Accumulated active export",  "/energy",  "tPO",               4000, "kWh",  "energy",          "total_increasing", ""}
 };

 const uint8_t List4SensorCount PROGMEM = 10;
 const HomeAssistantSensor List4Sensors[List4SensorCount] PROGMEM = {
-    {"Power factor",                "/power",   "PF",                  30, "%",    "power_factor",    "measurement"},
-    {"L1 power factor",             "/power",   "PF1",                 30, "%",    "power_factor",    "measurement"},
-    {"L2 power factor",             "/power",   "PF2",                 30, "%",    "power_factor",    "measurement"},
-    {"L3 power factor",             "/power",   "PF3",                 30, "%",    "power_factor",    "measurement"},
-    {"L1 active import",            "/power",   "P1",                  30, "W",    "power",           "measurement"},
-    {"L2 active import",            "/power",   "P2",                  30, "W",    "power",           "measurement"},
-    {"L3 active import",            "/power",   "P3",                  30, "W",    "power",           "measurement"},
-    {"L1 accumulated active import","/power",   "tPI1",                30, "kWh",  "energy",          "total_increasing"},
-    {"L2 accumulated active import","/power",   "tPI2",                30, "kWh",  "energy",          "total_increasing"},
-    {"L3 accumulated active import","/power",   "tPI3",                30, "kWh",  "energy",          "total_increasing"}
+    {"Power factor",                "/power",   "PF",                  30, "%",    "power_factor",    "measurement", ""},
+    {"L1 power factor",             "/power",   "PF1",                 30, "%",    "power_factor",    "measurement", ""},
+    {"L2 power factor",             "/power",   "PF2",                 30, "%",    "power_factor",    "measurement", ""},
+    {"L3 power factor",             "/power",   "PF3",                 30, "%",    "power_factor",    "measurement", ""},
+    {"L1 active import",            "/power",   "P1",                  30, "W",    "power",           "measurement", ""},
+    {"L2 active import",            "/power",   "P2",                  30, "W",    "power",           "measurement", ""},
+    {"L3 active import",            "/power",   "P3",                  30, "W",    "power",           "measurement", ""},
+    {"L1 accumulated active import","/power",   "tPI1",                30, "kWh",  "energy",          "total_increasing", ""},
+    {"L2 accumulated active import","/power",   "tPI2",                30, "kWh",  "energy",          "total_increasing", ""},
+    {"L3 accumulated active import","/power",   "tPI3",                30, "kWh",  "energy",          "total_increasing", ""}
 };

 const uint8_t List4ExportSensorCount PROGMEM = 6;
 const HomeAssistantSensor List4ExportSensors[List4ExportSensorCount] PROGMEM = {
-    {"L1 active export",            "/power",   "PO1",                 30, "W",    "power",           "measurement"},
-    {"L2 active export",            "/power",   "PO2",                 30, "W",    "power",           "measurement"},
-    {"L3 active export",            "/power",   "PO3",                 30, "W",    "power",           "measurement"},
-    {"L1 accumulated active export","/power",   "tPO1",                30, "kWh",  "energy",          "total_increasing"},
-    {"L2 accumulated active export","/power",   "tPO2",                30, "kWh",  "energy",          "total_increasing"},
-    {"L3 accumulated active export","/power",   "tPO3",                30, "kWh",  "energy",          "total_increasing"}
+    {"L1 active export",            "/power",   "PO1",                 30, "W",    "power",           "measurement", ""},
+    {"L2 active export",            "/power",   "PO2",                 30, "W",    "power",           "measurement", ""},
+    {"L3 active export",            "/power",   "PO3",                 30, "W",    "power",           "measurement", ""},
+    {"L1 accumulated active export","/power",   "tPO1",                30, "kWh",  "energy",          "total_increasing", ""},
+    {"L2 accumulated active export","/power",   "tPO2",                30, "kWh",  "energy",          "total_increasing", ""},
+    {"L3 accumulated active export","/power",   "tPO3",                30, "kWh",  "energy",          "total_increasing", ""}
 };

 const uint8_t RealtimeSensorCount PROGMEM = 8;
 const HomeAssistantSensor RealtimeSensors[RealtimeSensorCount] PROGMEM = {
-    {"Month max",                  "/realtime","max",                120, "kWh",  "energy",          ""},
-    {"Tariff threshold",           "/realtime","threshold",          120, "kWh",  "energy",          ""},
-    {"Current hour used",          "/realtime","hour.use",           120, "kWh",  "energy",          "total_increasing"},
-    {"Current hour cost",          "/realtime","hour.cost",          120, "",     "monetary",        ""},
-    {"Current day used",           "/realtime","day.use",            120, "kWh",  "energy",          "total_increasing"},
-    {"Current day cost",           "/realtime","day.cost",           120, "",     "monetary",        ""},
-    {"Current month used",         "/realtime","month.use",          120, "kWh",  "energy",          "total_increasing"},
-    {"Current month cost",         "/realtime","month.cost",         120, "",     "monetary",        ""}
+    {"Month max",                  "/realtime","max",                120, "kWh",  "energy",          "",  ""},
+    {"Tariff threshold",           "/realtime","threshold",          120, "kWh",  "energy",          "",  ""},
+    {"Current hour used",          "/realtime","hour.use",           120, "kWh",  "energy",          "total_increasing", ""},
+    {"Current hour cost",          "/realtime","hour.cost",          120, "",     "monetary",        "",  ""},
+    {"Current day used",           "/realtime","day.use",            120, "kWh",  "energy",          "total_increasing", ""},
+    {"Current day cost",           "/realtime","day.cost",           120, "",     "monetary",        "",  ""},
+    {"Current month used",         "/realtime","month.use",          120, "kWh",  "energy",          "total_increasing", ""},
+    {"Current month cost",         "/realtime","month.cost",         120, "",     "monetary",        "",  ""}
 };

 const uint8_t RealtimeExportSensorCount PROGMEM = 6;
 const HomeAssistantSensor RealtimeExportSensors[RealtimeExportSensorCount] PROGMEM = {
-    {"Current hour produced",      "/realtime","hour.produced",      120, "kWh",  "energy",          "total_increasing"},
-    {"Current hour income",        "/realtime","hour.income",        120, "",     "monetary",        ""},
-    {"Current day produced",       "/realtime","day.produced",       120, "kWh",  "energy",          "total_increasing"},
-    {"Current day income",         "/realtime","day.income",         120, "",     "monetary",        ""},
-    {"Current month produced",     "/realtime","month.produced",     120, "kWh",  "energy",          "total_increasing"},
-    {"Current month income",       "/realtime","month.income",       120, "",     "monetary",        ""}
+    {"Current hour produced",      "/realtime","hour.produced",      120, "kWh",  "energy",          "total_increasing", ""},
+    {"Current hour income",        "/realtime","hour.income",        120, "",     "monetary",        "",  ""},
+    {"Current day produced",       "/realtime","day.produced",       120, "kWh",  "energy",          "total_increasing", ""},
+    {"Current day income",         "/realtime","day.income",         120, "",     "monetary",        "",  ""},
+    {"Current month produced",     "/realtime","month.produced",     120, "kWh",  "energy",          "total_increasing", ""},
+    {"Current month income",       "/realtime","month.income",       120, "",     "monetary",        "",  ""}
 };

-const HomeAssistantSensor RealtimePeakSensor PROGMEM = {"Current month peak %d", "/realtime", "peaks[%d]", 4000, "kWh", "energy", ""};
-const HomeAssistantSensor RealtimeThresholdSensor PROGMEM = {"Tariff threshold %d", "/realtime", "thresholds[%d]", 4000, "kWh", "energy", ""};
+const HomeAssistantSensor RealtimePeakSensor PROGMEM = {"Current month peak %d", "/realtime", "peaks[%d]", 4000, "kWh", "energy", "",  ""};
+const HomeAssistantSensor RealtimeThresholdSensor PROGMEM = {"Tariff threshold %d", "/realtime", "thresholds[%d]", 4000, "kWh", "energy", "",  ""};

 const uint8_t PriceSensorCount PROGMEM = 5;
 const HomeAssistantSensor PriceSensors[PriceSensorCount] PROGMEM = {
-    {"Minimum price ahead",        "/prices",  "prices.min",        4000, "",     "monetary",        ""},
-    {"Maximum price ahead",        "/prices",  "prices.max",        4000, "",     "monetary",        ""},
-    {"Cheapest 1hr period ahead",  "/prices",  "prices.cheapest1hr",4000, "",     "timestamp",       ""},
-    {"Cheapest 3hr period ahead",  "/prices",  "prices.cheapest3hr",4000, "",     "timestamp",       ""},
-    {"Cheapest 6hr period ahead",  "/prices",  "prices.cheapest6hr",4000, "",     "timestamp",       ""}
+    {"Minimum price ahead",        "/prices",  "prices.min",     4000, "",     "monetary",        "",  ""},
+    {"Maximum price ahead",        "/prices",  "prices.max",     4000, "",     "monetary",        "",  ""},
+    {"Cheapest 1hr period ahead",  "/prices",  "prices.cheapest1hr",    4000, "",     "timestamp",       "",  ""},
+    {"Cheapest 3hr period ahead",  "/prices",  "prices.cheapest3hr",    4000, "",     "timestamp",       "",  ""},
+    {"Cheapest 6hr period ahead",  "/prices",  "prices.cheapest6hr",    4000, "",     "timestamp",       "",  ""}
 };

-const HomeAssistantSensor PriceSensor PROGMEM = {"Price in %02d %s", "/prices", "prices['%d']", 4000, "", "monetary", ""};
-
 const uint8_t SystemSensorCount PROGMEM = 3;
 const HomeAssistantSensor SystemSensors[SystemSensorCount] PROGMEM = {
-    {"Status",                     "/state",   "rssi",               180, "dBm",  "signal_strength", "measurement"},
-    {"Supply volt",                "/state",   "vcc",                180, "V",    "voltage",         "measurement"},
-    {"Uptime",                     "/state",   "up",                 180, "s",    "duration",        "measurement"}
+    {"Status",                     "/state",   "rssi",               180, "dBm",  "signal_strength", "measurement", ""},
+    {"Supply volt",                "/state",   "vcc",                180, "V",    "voltage",         "measurement", ""},
+    {"Uptime",                     "/state",   "up",                 180, "s",    "duration",        "measurement", ""}
 };

-const HomeAssistantSensor TemperatureSensor PROGMEM = {"Temperature sensor %s", "/temperatures", "temperatures['%s']", 900, "°C", "temperature", "measurement"};
+const HomeAssistantSensor TemperatureSensor PROGMEM = {"Temperature sensor %s", "/temperatures", "temperatures['%s']", 900, "°C", "temperature", "measurement", ""};

+const HomeAssistantSensor DataSensor PROGMEM = {"Data", "/data", "data", 900, "", "", "", ""};

 #endif
--- a/lib/HomeAssistantMqttHandler/json/ha1.json
+++ b/lib/HomeAssistantMqttHandler/json/ha1.json
@@ -1,4 +1,4 @@
 {
    "P" : %lu,
-    "t" : "%s"
+    "t" : %s
 }
--- a/lib/HomeAssistantMqttHandler/json/ha2.json
+++ b/lib/HomeAssistantMqttHandler/json/ha2.json
@@ -3,6 +3,6 @@
    "tPO" : %.3f,
    "tQI" : %.3f,
    "tQO" : %.3f,
-    "rtc" : "%s",
-    "t" : "%s"
+    "rtc" : %s,
+    "t" : %s
 }
--- a/lib/HomeAssistantMqttHandler/json/ha3.json
+++ b/lib/HomeAssistantMqttHandler/json/ha3.json
@@ -12,5 +12,5 @@
    "U1" : %.2f,
    "U2" : %.2f,
    "U3" : %.2f,
-    "t" : "%s"
+    "t" : %s
 }
--- a/lib/HomeAssistantMqttHandler/json/ha4.json
+++ b/lib/HomeAssistantMqttHandler/json/ha4.json
@@ -28,5 +28,5 @@
    "tPO1" : %.3f,
    "tPO2" : %.3f,
    "tPO3" : %.3f,
-    "t" : "%s"
+    "t" : %s
 }
--- a/lib/HomeAssistantMqttHandler/json/hadiscover.json
+++ b/lib/HomeAssistantMqttHandler/json/hadiscover.json
@@ -2,8 +2,7 @@
    "name" : "%s%s",
    "stat_t" : "%s%s",
    "uniq_id" : "%s_%s",
-    "obj_id" : "%s_%s",
-    "unit_of_meas" : "%s",
+    "default_entity_id" : "sensor.%s_%s",
    "val_tpl" : "{{ value_json.%s | is_defined }}",
    "expire_after" : %d,
    "dev" : {
@@ -13,5 +12,8 @@
      "sw" : "%s",
      "mf" : "%s",
      "cu" : "%s"
-    }%s%s%s%s%s%s
+    }
+    %s%s%s
+    %s%s%s
+    %s%s%s
 }
--- a/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp
+++ b/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
@@ -20,7 +20,7 @@
 #endif

 void HomeAssistantMqttHandler::setHomeAssistantConfig(HomeAssistantConfig config, char* hostname) {
-    l1Init = l2Init = l2eInit = l3Init = l3eInit = l4Init = l4eInit = rtInit = rteInit = pInit = sInit = rInit = fInit = false;
+    l1Init = l2Init = l2eInit = l3Init = l3eInit = l4Init = l4eInit = rtInit = rteInit = pInit = sInit = rInit = fInit = dInit = false;

    if(strlen(config.discoveryNameTag) > 0) {
        snprintf_P(json, 128, PSTR("AMS reader (%s)"), config.discoveryNameTag);
@@ -28,13 +28,18 @@ 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);
    manufacturer = boardManufacturerToString(boardType);

    deviceUid = String(hostname); // Maybe configurable in the future?
+    #if defined(AMS_REMOTE_DEBUG)
+    if (debugger->isActive(RemoteDebug::INFO))
+    #endif
+    debugger->printf_P(PSTR("  Hostname is [%s]\n"), hostname);

    if(strlen(config.discoveryHostname) > 0) {
        if(strncmp_P(config.discoveryHostname, PSTR("http"), 4) == 0) {
@@ -48,36 +53,42 @@ 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());
 }

 bool HomeAssistantMqttHandler::postConnect() {
-    if(!subTopic.isEmpty() && !mqtt.subscribe(subTopic)) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::ERROR))
-        #endif
-        debugger->printf_P(PSTR("  Unable to subscribe to to [%s]\n"), subTopic.c_str());
-        return false;
+    bool ret = true;
+    if(!statusTopic.isEmpty()) {
+        if(mqtt.subscribe(statusTopic)) {
+            #if defined(AMS_REMOTE_DEBUG)
+            if (debugger->isActive(RemoteDebug::ERROR))
+            #endif
+            debugger->printf_P(PSTR("  Subscribed to [%s]\n"), statusTopic.c_str());
+        } else {
+            #if defined(AMS_REMOTE_DEBUG)
+            if (debugger->isActive(RemoteDebug::ERROR))
+            #endif
+            debugger->printf_P(PSTR("  Unable to subscribe to [%s]\n"), statusTopic.c_str());
+            ret = false;
+        }
    }
-    return true;
+    return ret;
 }

 bool HomeAssistantMqttHandler::publish(AmsData* update, AmsData* previousState, EnergyAccounting* ea, PriceService* ps) {
-	if(pubTopic.isEmpty() || !mqtt.connected())
+	if(pubTopic.isEmpty() || !connected())
 		return false;

    if(time(nullptr) < FirmwareVersion::BuildEpoch)
@@ -122,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);
@@ -138,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(),
@@ -169,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(),
@@ -200,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(),
@@ -295,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';
@@ -331,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);
@@ -346,9 +323,9 @@ bool HomeAssistantMqttHandler::publishTemperatures(AmsConfiguration* config, HwT
 }

 bool HomeAssistantMqttHandler::publishPrices(PriceService* ps) {
-	if(pubTopic.isEmpty() || !mqtt.connected())
+	if(pubTopic.isEmpty() || !connected())
 		return false;
-	if(ps->getValueForHour(PRICE_DIRECTION_IMPORT, 0) == PRICE_NO_VALUE)
+	if(!ps->hasPrice())
 		return false;

    publishPriceSensors(ps);
@@ -361,7 +338,7 @@ bool HomeAssistantMqttHandler::publishPrices(PriceService* ps) {
 	float values[38];
    for(int i = 0;i < 38; i++) values[i] = PRICE_NO_VALUE;
 	for(uint8_t i = 0; i < 38; i++) {
-		float val = ps->getValueForHour(PRICE_DIRECTION_IMPORT, now, i);
+		float val = ps->getPriceForRelativeHour(PRICE_DIRECTION_IMPORT, i);
 		values[i] = val;

 		if(val == PRICE_NO_VALUE) break;
@@ -409,59 +386,73 @@ 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\":{"), WiFi.macAddress().c_str());
-    for(uint8_t i = 0;i < 38; i++) {
-        if(values[i] == PRICE_NO_VALUE) {
-            pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"%d\":null,"), i);
+    uint16_t pos = snprintf_P(json, BufferSize, PSTR("{\"id\":\"%s\",\"prices\":{\"import\":["), WiFi.macAddress().c_str());
+
+    uint8_t currentPricePointIndex = ps->getCurrentPricePointIndex();
+	uint8_t numberOfPoints = ps->getNumberOfPointsAvailable();
+	for(int i = currentPricePointIndex; i < numberOfPoints; i++) {
+		float val = ps->getPricePoint(PRICE_DIRECTION_IMPORT, i);
+        if(val == PRICE_NO_VALUE) {
+            pos += snprintf_P(json+pos, BufferSize-pos, PSTR("null,"));
        } else {
-            pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"%d\":%.4f,"), i, values[i]);
+            pos += snprintf_P(json+pos, BufferSize-pos, PSTR("%.4f,"), val);
+        }
+	}
+    if(rteInit && ps->isExportPricesDifferentFromImport()) {
+        pos--;
+        pos += snprintf_P(json+pos, BufferSize-pos, PSTR("],\"export\":["));
+        for(int i = currentPricePointIndex; i < numberOfPoints; i++) {
+            float val = ps->getPricePoint(PRICE_DIRECTION_EXPORT, i);
+            if(val == PRICE_NO_VALUE) {
+                pos += snprintf_P(json+pos, BufferSize-pos, PSTR("null,"));
+            } else {
+                pos += snprintf_P(json+pos, BufferSize-pos, PSTR("%.4f,"), val);
+            }
        }
    }

-    pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"min\":%.4f,\"max\":%.4f,\"cheapest1hr\":\"%s\",\"cheapest3hr\":\"%s\",\"cheapest6hr\":\"%s\"}"),
+    pos--;
+    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,
        ts3hr,
        ts6hr
    );
-
-    float val = ps->getValueForHour(PRICE_DIRECTION_EXPORT, now, 0);
-    if(val == PRICE_NO_VALUE) {
-        pos += snprintf_P(json+pos, BufferSize-pos, PSTR(",\"exportprices\":{\"0\":null}"));
-    } else {
-        pos += snprintf_P(json+pos, BufferSize-pos, PSTR(",\"exportprices\":{\"0\":%.4f}"), val);
-    }
-
-	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);
+    
+    char pt[24];
+    toJsonIsoTimestamp(now, pt, sizeof(pt));
+    pos += snprintf_P(json+pos, BufferSize-pos, PSTR(",\"t\":%s"), pt);

    json[pos++] = '}';
    json[pos] = '\0';
@@ -472,7 +463,7 @@ bool HomeAssistantMqttHandler::publishPrices(PriceService* ps) {
 }

 bool HomeAssistantMqttHandler::publishSystem(HwTools* hw, PriceService* ps, EnergyAccounting* ea) {
-	if(pubTopic.isEmpty() || !mqtt.connected())
+	if(pubTopic.isEmpty() || !connected())
 		return false;

    publishSystemSensors();
@@ -480,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),
@@ -503,18 +489,22 @@ bool HomeAssistantMqttHandler::publishSystem(HwTools* hw, PriceService* ps, Ener
 }

 void HomeAssistantMqttHandler::publishSensor(const HomeAssistantSensor sensor) {
-    String uid = String(sensor.path);
-    uid.replace(".", "");
-    uid.replace("[", "");
-    uid.replace("]", "");
-    uid.replace("'", "");
+    String uid;
+    if(strlen(sensor.uid) > 0) {
+        uid = String(sensor.uid);
+    } else {
+        uid = String(sensor.path);
+        uid.replace(".", "");
+        uid.replace("[", "");
+        uid.replace("]", "");
+        uid.replace("'", "");
+    }
    snprintf_P(json, BufferSize, HADISCOVER_JSON,
        sensorNamePrefix.c_str(),
        sensor.name,
        mqttConfig.publishTopic, sensor.topic,
        deviceUid.c_str(), uid.c_str(),
        deviceUid.c_str(), uid.c_str(),
-        sensor.uom,
        sensor.path,
        sensor.ttl,
        deviceUid.c_str(),
@@ -523,14 +513,21 @@ void HomeAssistantMqttHandler::publishSensor(const HomeAssistantSensor sensor) {
        FirmwareVersion::VersionString,
        manufacturer.c_str(),
        deviceUrl.c_str(),
+
        strlen_P(sensor.devcl) > 0 ? ",\"dev_cla\":\"" : "",
        strlen_P(sensor.devcl) > 0 ? (char *) FPSTR(sensor.devcl) : "",
        strlen_P(sensor.devcl) > 0 ? "\"" : "",
+
        strlen_P(sensor.stacl) > 0 ? ",\"stat_cla\":\"" : "",
        strlen_P(sensor.stacl) > 0 ? (char *) FPSTR(sensor.stacl) : "",
-        strlen_P(sensor.stacl) > 0 ? "\"" : ""
+        strlen_P(sensor.stacl) > 0 ? "\"" : "",
+
+        strlen_P(sensor.uom) > 0 ? ",\"unit_of_meas\":\"" : "",
+        strlen_P(sensor.uom) > 0 ? (char *) FPSTR(sensor.uom) : "",
+        strlen_P(sensor.uom) > 0 ? "\"" : ""
    );
-    mqtt.publish(sensorTopic + "/" + deviceUid + "_" + uid.c_str() + "/config", json, true, 0);
+
+    mqtt.publish(sensorTopic + "/" + deviceUid + "_" + uid + "/config", json, true, 0);
    loop();
 }

@@ -619,7 +616,8 @@ void HomeAssistantMqttHandler::publishRealtimeSensors(EnergyAccounting* ea, Pric
            RealtimePeakSensor.ttl,
            RealtimePeakSensor.uom,
            RealtimePeakSensor.devcl,
-            RealtimePeakSensor.stacl
+            RealtimePeakSensor.stacl,
+            RealtimePeakSensor.uid
        };
        publishSensor(sensor);
    }
@@ -658,7 +656,8 @@ void HomeAssistantMqttHandler::publishTemperatureSensor(uint8_t index, String id
        TemperatureSensor.ttl,
        TemperatureSensor.uom,
        TemperatureSensor.devcl,
-        TemperatureSensor.stacl
+        TemperatureSensor.stacl,
+        TemperatureSensor.uid
    };
    publishSensor(sensor);
    tInit[index] = true;
@@ -678,45 +677,96 @@ void HomeAssistantMqttHandler::publishPriceSensors(PriceService* ps) {
        }
        pInit = true;
    }
-    for(uint8_t i = 0; i < 38; i++) {
-        if(prInit[i]) continue;
-        float val = ps->getValueForHour(PRICE_DIRECTION_IMPORT, i);
-        if(val == PRICE_NO_VALUE) continue;
-        
-        char name[strlen(PriceSensor.name)+2];
-        snprintf(name, strlen(PriceSensor.name)+2, PriceSensor.name, i, i == 1 ? "hour" : "hours");
-        char path[strlen(PriceSensor.path)+1];
-        snprintf(path, strlen(PriceSensor.path)+1, PriceSensor.path, i);
-        HomeAssistantSensor sensor = {
-            i == 0 ? "Price current hour" : name,
-            PriceSensor.topic,
-            path,
-            PriceSensor.ttl,
-            uom.c_str(),
-            PriceSensor.devcl,
-            i == 0 ? "total" : PriceSensor.stacl
-        };
-        publishSensor(sensor);
-        prInit[i] = true;
+
+    uint8_t currentPricePointIndex = ps->getCurrentPricePointIndex();
+	uint8_t numberOfPoints = ps->getNumberOfPointsAvailable();
+
+    if(priceImportInit < numberOfPoints-currentPricePointIndex) {
+        uint8_t importPriceSensorNo = 0;
+        for(int pricePointIndex = currentPricePointIndex; pricePointIndex < numberOfPoints; pricePointIndex++) {
+            float val = ps->getPricePoint(PRICE_DIRECTION_IMPORT, pricePointIndex);
+            if(val == PRICE_NO_VALUE) break;
+            if(importPriceSensorNo < priceImportInit) {
+                importPriceSensorNo++;
+                continue;
+            }
+
+            uint8_t resolution = ps->getResolutionInMinutes();
+
+            char path[64];
+            memset(path, 0, 64);
+            snprintf_P(path, 64, PSTR("prices.import[%d]"), importPriceSensorNo);
+
+            char uid[32];
+            memset(uid, 0, 32);
+            snprintf_P(uid, 32, PSTR("prices%d"), importPriceSensorNo);
+
+            char name[64];
+            if(resolution == 60) 
+                snprintf_P(name, 64, PSTR("Import price in %02d hour%s"), importPriceSensorNo, importPriceSensorNo == 1 ? "" : "s");
+            else    
+                snprintf_P(name, 64, PSTR("Import price in %03d minutes"), importPriceSensorNo * resolution);
+
+            HomeAssistantSensor sensor = {
+                importPriceSensorNo == 0 ? "Current import price" : name,
+                "/prices",
+                path,
+                resolution * 60 + 300,
+                uom.c_str(),
+                "monetary",
+                importPriceSensorNo == 0 ? "total" : "",
+                uid
+            };
+            publishSensor(sensor);
+
+            priceImportInit = importPriceSensorNo++;
+        }
    }

-    float exportPrice = ps->getValueForHour(PRICE_DIRECTION_EXPORT, 0);
-    if(exportPrice != PRICE_NO_VALUE) {
-        char path[20];
-        snprintf(path, 20, "exportprices['%d']", 0);
-        HomeAssistantSensor sensor = {
-            "Export price current hour",
-            PriceSensor.topic,
-            path,
-            PriceSensor.ttl,
-            uom.c_str(),
-            PriceSensor.devcl,
-            "total"
-        };
-        publishSensor(sensor);
+    if(priceExportInit < numberOfPoints-currentPricePointIndex) {
+        uint8_t exportPriceSensorNo = 0;
+        for(int pricePointIndex = currentPricePointIndex; pricePointIndex < numberOfPoints; pricePointIndex++) {
+            float val = ps->getPricePoint(PRICE_DIRECTION_EXPORT, pricePointIndex);
+            if(val == PRICE_NO_VALUE) break;
+            if(exportPriceSensorNo < priceExportInit) {
+                exportPriceSensorNo++;
+                continue;
+            }
+
+            uint8_t resolution = ps->getResolutionInMinutes();
+
+            char path[64];
+            memset(path, 0, 64);
+            snprintf_P(path, 64, PSTR("prices.export[%d]"), exportPriceSensorNo);
+
+            char uid[32];
+            memset(uid, 0, 32);
+            snprintf_P(uid, 32, PSTR("exportprices%d"), exportPriceSensorNo);
+
+                        char name[64];
+            if(resolution == 60) 
+                snprintf_P(name, 64, PSTR("Export price in %02d hour%s"), exportPriceSensorNo, exportPriceSensorNo == 1 ? "" : "s");
+            else    
+                snprintf_P(name, 64, PSTR("Export price in %03d minutes"), exportPriceSensorNo * resolution);
+
+            HomeAssistantSensor sensor = {
+                exportPriceSensorNo == 0 ? "Current export price" : name,
+                "/prices",
+                path,
+                resolution * 60 + 300,
+                uom.c_str(),
+                "monetary",
+                exportPriceSensorNo == 0 ? "total" : "",
+                uid
+            };
+            publishSensor(sensor);
+
+            priceExportInit = exportPriceSensorNo++;
+        }
    }
 }

+
 void HomeAssistantMqttHandler::publishSystemSensors() {
    if(sInit) return;
    for(uint8_t i = 0; i < SystemSensorCount; i++) {
@@ -739,7 +789,8 @@ void HomeAssistantMqttHandler::publishThresholdSensors() {
            RealtimeThresholdSensor.ttl,
            RealtimeThresholdSensor.uom,
            RealtimeThresholdSensor.devcl,
-            RealtimeThresholdSensor.stacl
+            RealtimeThresholdSensor.stacl,
+            RealtimeThresholdSensor.uid
        };
        publishSensor(sensor);
    }
@@ -750,8 +801,26 @@ uint8_t HomeAssistantMqttHandler::getFormat() {
    return 4;
 }

-bool HomeAssistantMqttHandler::publishRaw(String data) {
-    return false;
+bool HomeAssistantMqttHandler::publishRaw(uint8_t* raw, size_t length) {
+	if(strlen(mqttConfig.publishTopic) == 0 || !mqtt.connected())
+		return false;
+    
+    if(length <= 0 || length > BufferSize) return false;
+
+    if(!dInit) {
+        // Not sure how this sensor should be defined in HA, so skipping for now
+        //publishSensor(DataSensor);
+        dInit = true;
+    }
+
+    String str = toHex(raw, length);
+
+    snprintf_P(json, BufferSize, PSTR("{\"data\":\"%s\"}"), str.c_str());
+    char topic[192];
+    snprintf_P(topic, 192, PSTR("%s/data"), mqttConfig.publishTopic);
+    bool ret = mqtt.publish(topic, json);
+    loop();
+    return ret;
 }

 bool HomeAssistantMqttHandler::publishFirmware() {
@@ -784,9 +853,10 @@ void HomeAssistantMqttHandler::onMessage(String &topic, String &payload) {
            if (debugger->isActive(RemoteDebug::INFO))
            #endif
            debugger->printf_P(PSTR("Received online status from HA, resetting sensor status\n"));
-            l1Init = l2Init = l2eInit = l3Init = l3eInit = l4Init = l4eInit = rtInit = rteInit = pInit = sInit = rInit = false;
+            l1Init = l2Init = l2eInit = l3Init = l3eInit = l4Init = l4eInit = rtInit = rteInit = pInit = sInit = rInit = fInit = dInit = false;
            for(uint8_t i = 0; i < 32; i++) tInit[i] = false;
-            for(uint8_t i = 0; i < 38; i++) prInit[i] = false;
+            priceImportInit = 0;
+            priceExportInit = 0;
        }
    } else if(topic.equals(subTopic)) {
        if(payload.equals("fwupgrade")) {
@@ -796,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"));
+    }
+}
--- a/lib/HwTools/include/HwTools.h
+++ b/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;
--- a/lib/HwTools/src/HwTools.cpp
+++ b/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);
 }
--- a/lib/JsonMqttHandler/include/JsonMqttHandler.h
+++ b/lib/JsonMqttHandler/include/JsonMqttHandler.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
@@ -23,17 +23,16 @@ public:
    bool publishTemperatures(AmsConfiguration*, HwTools*);
    bool publishPrices(PriceService*);
    bool publishSystem(HwTools* hw, PriceService* ps, EnergyAccounting* ea);
-    bool publishRaw(String data);
+    bool publishRaw(uint8_t* raw, size_t length);
    bool publishFirmware();

-    bool postConnect();
-
    void onMessage(String &topic, String &payload);

    uint8_t getFormat();

 private:
    HwTools* hw;
+    bool hasExport = false;
    AmsDataStorage* ds;

    uint16_t appendJsonHeader(AmsData* data);
@@ -43,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
--- a/lib/JsonMqttHandler/src/JsonMqttHandler.cpp
+++ b/lib/JsonMqttHandler/src/JsonMqttHandler.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
@@ -10,22 +10,11 @@
 #include "Uptime.h"
 #include "AmsJsonGenerator.h"

-bool JsonMqttHandler::postConnect() {
-    if(!subTopic.isEmpty() && !mqtt.subscribe(subTopic)) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::ERROR))
-        #endif
-        debugger->printf_P(PSTR("  Unable to subscribe to to [%s]\n"), subTopic.c_str());
-        return false;
-    }
-    return true;
-}
-
 bool JsonMqttHandler::publish(AmsData* update, AmsData* previousState, EnergyAccounting* ea, PriceService* ps) {
    if(strlen(mqttConfig.publishTopic) == 0) {
        return false;
    }
-	if(!mqtt.connected()) {
+	if(!connected()) {
 		return false;
    }

@@ -56,6 +45,15 @@ bool JsonMqttHandler::publish(AmsData* update, AmsData* previousState, EnergyAcc
        ret = publishList4(&data, ea);
        mqtt.loop();
    }
+
+    if(data.getListType() >= 2 && data.getActiveExportPower() > 0.0) {
+        hasExport = true;
+    }
+
+    if(data.getListType() >= 3 && data.getActiveExportCounter() > 0.0) {
+        hasExport = true;
+    }
+
    loop();
    return ret;
 }
@@ -297,9 +295,9 @@ bool JsonMqttHandler::publishTemperatures(AmsConfiguration* config, HwTools* hw)
 }

 bool JsonMqttHandler::publishPrices(PriceService* ps) {
-	if(strlen(mqttConfig.publishTopic) == 0 || !mqtt.connected())
+	if(strlen(mqttConfig.publishTopic) == 0 || !connected())
 		return false;
-	if(ps->getValueForHour(PRICE_DIRECTION_IMPORT, 0) == PRICE_NO_VALUE)
+	if(!ps->hasPrice())
 		return false;

 	time_t now = time(nullptr);
@@ -310,7 +308,7 @@ bool JsonMqttHandler::publishPrices(PriceService* ps) {
 	float values[38];
    for(int i = 0;i < 38; i++) values[i] = PRICE_NO_VALUE;
 	for(uint8_t i = 0; i < 38; i++) {
-		float val = ps->getValueForHour(PRICE_DIRECTION_IMPORT, now, i);
+		float val = ps->getPriceForRelativeHour(PRICE_DIRECTION_IMPORT, i);
 		values[i] = val;

 		if(val == PRICE_NO_VALUE) break;
@@ -358,59 +356,89 @@ 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));
 	}

-    char pf[4];
-    uint16_t pos = snprintf_P(json, BufferSize, PSTR("{\"id\":\"%s\","), WiFi.macAddress().c_str());
-    if(mqttConfig.payloadFormat != 6) {
-        memset(pf, 0, 4);
-        pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"prices\":{"));
-    } else {
-        strcpy_P(pf, PSTR("pr_"));
-    }
+    if(mqttConfig.payloadFormat == 6) {
+        uint16_t pos = snprintf_P(json, BufferSize, PSTR("{\"id\":\"%s\","), WiFi.macAddress().c_str());

-    for(uint8_t i = 0;i < 38; i++) {
-        if(values[i] == PRICE_NO_VALUE) {
-            pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"%s%d\":null,"), pf, i);
-        } else {
-            pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"%s%d\":%.4f,"), pf, i, values[i]);
+        for(uint8_t i = 0;i < 38; i++) {
+            if(values[i] == PRICE_NO_VALUE) {
+                pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"pr_%d\":null,"), i);
+            } else {
+                pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"pr_%d\":%.4f,"), i, values[i]);
+            }
        }
-    }

-    pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"%smin\":%.4f,\"%smax\":%.4f,\"%scheapest1hr\":\"%s\",\"%scheapest3hr\":\"%s\",\"%scheapest6hr\":\"%s\"}"),
-        pf,
-        min == INT16_MAX ? 0.0 : min,
-        pf,
-        max == INT16_MIN ? 0.0 : max,
-        pf,
-        ts1hr,
-        pf,
-        ts3hr,
-        pf,
-        ts6hr
-    );
-    if(mqttConfig.payloadFormat != 6) {
-        json[pos++] = '}';
-        json[pos] = '\0';
+        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,
+            ts3hr,
+            ts6hr
+        );
+    } else {
+        uint16_t pos = snprintf_P(json, BufferSize, PSTR("{\"id\":\"%s\",\"prices\":{\"import\":["), WiFi.macAddress().c_str());
+
+        uint8_t currentPricePointIndex = ps->getCurrentPricePointIndex();
+        uint8_t numberOfPoints = ps->getNumberOfPointsAvailable();
+        for(int i = currentPricePointIndex; i < numberOfPoints; i++) {
+            float val = ps->getPricePoint(PRICE_DIRECTION_IMPORT, i);
+            if(val == PRICE_NO_VALUE) {
+                pos += snprintf_P(json+pos, BufferSize-pos, PSTR("null,"));
+            } else {
+                pos += snprintf_P(json+pos, BufferSize-pos, PSTR("%.4f,"), val);
+            }
+        }
+        if(hasExport && ps->isExportPricesDifferentFromImport()) {
+            pos--;
+            pos += snprintf_P(json+pos, BufferSize-pos, PSTR("],\"export\":["));
+            for(int i = currentPricePointIndex; i < numberOfPoints; i++) {
+                float val = ps->getPricePoint(PRICE_DIRECTION_EXPORT, i);
+                if(val == PRICE_NO_VALUE) {
+                    pos += snprintf_P(json+pos, BufferSize-pos, PSTR("null,"));
+                } else {
+                    pos += snprintf_P(json+pos, BufferSize-pos, PSTR("%.4f,"), val);
+                }
+            }
+        }
+
+        pos--;
+        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,
+            ts3hr,
+            ts6hr
+        );
+        
    }
    bool ret = false;
    if(mqttConfig.payloadFormat == 5) {
@@ -425,7 +453,7 @@ bool JsonMqttHandler::publishPrices(PriceService* ps) {
 }

 bool JsonMqttHandler::publishSystem(HwTools* hw, PriceService* ps, EnergyAccounting* ea) {
-	if(strlen(mqttConfig.publishTopic) == 0 || !mqtt.connected())
+	if(strlen(mqttConfig.publishTopic) == 0 || !connected())
 		return false;

    snprintf_P(json, BufferSize, PSTR("{\"id\":\"%s\",\"name\":\"%s\",\"up\":%d,\"vcc\":%.3f,\"rssi\":%d,\"temp\":%.2f,\"version\":\"%s\"}"),
@@ -453,8 +481,20 @@ uint8_t JsonMqttHandler::getFormat() {
    return 0;
 }

-bool JsonMqttHandler::publishRaw(String data) {
-    return false;
+bool JsonMqttHandler::publishRaw(uint8_t* raw, size_t length) {
+	if(strlen(mqttConfig.publishTopic) == 0 || !mqtt.connected())
+		return false;
+    
+    if(length <= 0 || length > BufferSize) return false;
+
+    String str = toHex(raw, length);
+
+    snprintf_P(json, BufferSize, PSTR("{\"data\":\"%s\"}"), str.c_str());
+    char topic[192];
+    snprintf_P(topic, 192, PSTR("%s/data"), mqttConfig.publishTopic);
+    bool ret = mqtt.publish(topic, json);
+    loop();
+    return ret;
 }

 bool JsonMqttHandler::publishFirmware() {
@@ -472,7 +512,7 @@ bool JsonMqttHandler::publishFirmware() {
 }

 void JsonMqttHandler::onMessage(String &topic, String &payload) {
-    if(strlen(mqttConfig.publishTopic) == 0 || !mqtt.connected())
+    if(strlen(mqttConfig.publishTopic) == 0 || !connected())
 		return;

    #if defined(AMS_REMOTE_DEBUG)
@@ -504,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"));
+    }
+}
--- a/lib/MeterCommunicators/include/IEC6205621.h
+++ b/lib/MeterCommunicators/include/IEC6205621.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/MeterCommunicators/include/IEC6205675.h
+++ b/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
@@ -25,9 +26,9 @@ struct AmsOctetTimestamp {
 class IEC6205675 : public AmsData {
 public:
    #if defined(AMS_REMOTE_DEBUG)
-    IEC6205675(const char* payload, uint8_t useMeterType, MeterConfig* meterConfig, DataParserContext &ctx, AmsData &state, RemoteDebug* debugger);
+    IEC6205675(const char* payload, Timezone* tz, uint8_t useMeterType, MeterConfig* meterConfig, DataParserContext &ctx, AmsData &state, RemoteDebug* debugger);
    #else
-    IEC6205675(const char* payload, uint8_t useMeterType, MeterConfig* meterConfig, DataParserContext &ctx, AmsData &state, Stream* debugger);
+    IEC6205675(const char* payload, Timezone* tz, uint8_t useMeterType, MeterConfig* meterConfig, DataParserContext &ctx, AmsData &state, Stream* debugger);
    #endif

 private:
@@ -37,8 +38,9 @@ private:
    float getNumber(uint8_t* obis, int matchlength, const char* ptr);
    float getNumber(CosemData*);
    time_t getTimestamp(uint8_t* obis, int matchlength, const char* ptr);
+    time_t adjustForKnownIssues(CosemDateTime dt, Timezone* tz, uint8_t meterType);

-    uint8_t AMS_OBIS_UNKNOWN_1[4]                 = { 25, 9, 0, 255 };
+    uint8_t AMS_OBIS_UNKNOWN_1[4]               = { 25, 9, 0, 255 };

    uint8_t AMS_OBIS_VERSION[4]                 = {  0, 2, 129, 255 };
    uint8_t AMS_OBIS_METER_MODEL[4]             = { 96, 1, 1, 255 };
--- a/lib/MeterCommunicators/include/ImpulseAmsData.h
+++ b/lib/MeterCommunicators/include/ImpulseAmsData.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/MeterCommunicators/include/KmpCommunicator.h
+++ b/lib/MeterCommunicators/include/KmpCommunicator.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2024
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/MeterCommunicators/include/KmpTalker.h
+++ b/lib/MeterCommunicators/include/KmpTalker.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: All rights reserved
 * 
 */
--- a/lib/MeterCommunicators/include/LNG.h
+++ b/lib/MeterCommunicators/include/LNG.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/MeterCommunicators/include/LNG2.h
+++ b/lib/MeterCommunicators/include/LNG2.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/MeterCommunicators/include/MeterCommunicator.h
+++ b/lib/MeterCommunicators/include/MeterCommunicator.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
@@ -13,6 +13,7 @@
 #endif
 #include "AmsData.h"
 #include "AmsConfiguration.h"
+#include "AmsMqttHandler.h"

 class MeterCommunicator {
 public:
@@ -24,6 +25,13 @@ public:
    virtual bool isConfigChanged();
    virtual void ackConfigChanged();
    virtual void getCurrentConfig(MeterConfig& meterConfig);
+    virtual void setMqttHandlerForDebugging(AmsMqttHandler* mqttHandler) {
+        this->mqttDebug = mqttHandler;
+    };
+
+protected:
+    AmsMqttHandler* mqttDebug = NULL;
+
 };

 #endif
--- a/lib/MeterCommunicators/include/PassiveMeterCommunicator.h
+++ b/lib/MeterCommunicators/include/PassiveMeterCommunicator.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
@@ -14,7 +14,7 @@
 #include "AmsConfiguration.h"
 #include "DataParsers.h"
 #include "Timezone.h"
-#include "PassthroughMqttHandler.h"
+#include "AmsMqttHandler.h"

 #if defined(ESP8266)
 #include "SoftwareSerial.h"
@@ -36,7 +36,9 @@ public:
    bool isConfigChanged();
    void ackConfigChanged();
    void getCurrentConfig(MeterConfig& meterConfig);
-    void setPassthroughMqttHandler(PassthroughMqttHandler*);
+    void setTimezone(Timezone* tz) {
+        this->tz = tz;
+    };

    HardwareSerial* getHwSerial();
    void rxerr(int err);
@@ -51,8 +53,6 @@ protected:
    bool configChanged = false;
    Timezone* tz;

-    PassthroughMqttHandler* pt = NULL;
-
    uint8_t *hanBuffer = NULL;
    uint16_t hanBufferSize = 0;
    Stream *hanSerial;
--- a/lib/MeterCommunicators/include/PulseMeterCommunicator.h
+++ b/lib/MeterCommunicators/include/PulseMeterCommunicator.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2024
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/MeterCommunicators/src/IEC6205621.cpp
+++ b/lib/MeterCommunicators/src/IEC6205621.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/MeterCommunicators/src/IEC6205675.cpp
+++ b/lib/MeterCommunicators/src/IEC6205675.cpp
--- a/lib/MeterCommunicators/src/ImpulseAmsData.cpp
+++ b/lib/MeterCommunicators/src/ImpulseAmsData.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/MeterCommunicators/src/KmpCommunicator.cpp
+++ b/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;
 }
--- a/lib/MeterCommunicators/src/LNG.cpp
+++ b/lib/MeterCommunicators/src/LNG.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/MeterCommunicators/src/LNG2.cpp
+++ b/lib/MeterCommunicators/src/LNG2.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/MeterCommunicators/src/PassiveMeterCommunicator.cpp
+++ b/lib/MeterCommunicators/src/PassiveMeterCommunicator.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
@@ -174,8 +174,8 @@ bool PassiveMeterCommunicator::loop() {
        lastError = pos;
 		printHanReadError(pos);
 		len += hanSerial->readBytes(hanBuffer+len, hanBufferSize-len);
-        if(pt != NULL) {
-            pt->publishBytes(hanBuffer, len);
+        if(mqttDebug != NULL) {
+            mqttDebug->publishRaw(hanBuffer, len);
        }
 		#if defined(AMS_REMOTE_DEBUG)
 		if (debugger->isActive(RemoteDebug::VERBOSE))
@@ -229,8 +229,8 @@ AmsData* PassiveMeterCommunicator::getData(AmsData& meterState) {
 	char* payload = ((char *) (hanBuffer)) + pos;
 	if(maxDetectedPayloadSize < pos) maxDetectedPayloadSize = pos;
 	if(ctx.type == DATA_TAG_DLMS) {
-        if(pt != NULL) {
-            pt->publishBytes((uint8_t*) payload, ctx.length);
+        if(mqttDebug != NULL) {
+            mqttDebug->publishRaw((uint8_t*) payload, ctx.length);
        }

 		#if defined(AMS_REMOTE_DEBUG)
@@ -278,7 +278,7 @@ AmsData* PassiveMeterCommunicator::getData(AmsData& meterState) {
 			#endif
 			debugger->printf_P(PSTR("DLMS\n"));
 			// TODO: Split IEC6205675 into DataParserKaifa and DataParserObis. This way we can add other means of parsing, for those other proprietary formats
-			data = new IEC6205675(payload, meterState.getMeterType(), &meterConfig, ctx, meterState, debugger);
+			data = new IEC6205675(payload, tz, meterState.getMeterType(), &meterConfig, ctx, meterState, debugger);
 		}
 	} else if(ctx.type == DATA_TAG_DSMR) {
 		data = new IEC6205621(payload, tz, &meterConfig);
@@ -405,8 +405,8 @@ int16_t PassiveMeterCommunicator::unwrapData(uint8_t *buf, DataParserContext &co
 				if (debugger->isActive(RemoteDebug::VERBOSE))
 				#endif
 				debugger->printf_P(PSTR("HDLC frame:\n"));
-                if(pt != NULL) {
-                    pt->publishBytes(buf, curLen);
+                if(mqttDebug != NULL) {
+                    mqttDebug->publishRaw(buf, curLen);
                }
                break;
            case DATA_TAG_MBUS:
@@ -414,8 +414,8 @@ int16_t PassiveMeterCommunicator::unwrapData(uint8_t *buf, DataParserContext &co
 				if (debugger->isActive(RemoteDebug::VERBOSE))
 				#endif
 				debugger->printf_P(PSTR("MBUS frame:\n"));
-                if(pt != NULL) {
-                    pt->publishBytes(buf, curLen);
+                if(mqttDebug != NULL) {
+                    mqttDebug->publishRaw(buf, curLen);
                }
                break;
            case DATA_TAG_GBT:
@@ -447,8 +447,8 @@ int16_t PassiveMeterCommunicator::unwrapData(uint8_t *buf, DataParserContext &co
 				if (debugger->isActive(RemoteDebug::VERBOSE))
 				#endif
 				debugger->printf_P(PSTR("DSMR frame:\n"));
-                if(pt != NULL) {
-                    pt->publishString((char*) buf);
+                if(mqttDebug != NULL) {
+                    mqttDebug->publishRaw(buf, curLen);
                }
                break;
 			case DATA_TAG_SNRM:
@@ -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)
--- a/lib/MeterCommunicators/src/PulseMeterCommunicator.cpp
+++ b/lib/MeterCommunicators/src/PulseMeterCommunicator.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/PassthroughMqttHandler/include/PassthroughMqttHandler.h
+++ b/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
--- a/lib/PassthroughMqttHandler/src/PassthroughMqttHandler.cpp
+++ b/lib/PassthroughMqttHandler/src/PassthroughMqttHandler.cpp
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/PriceService/include/DnbCurrParser.h
+++ b/lib/PriceService/include/DnbCurrParser.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
--- a/lib/PriceService/include/EntsoeA44Parser.h
+++ b/lib/PriceService/include/EntsoeA44Parser.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
@@ -15,28 +15,23 @@
 #define DOCPOS_MEASUREMENTUNIT 2
 #define DOCPOS_POSITION 3
 #define DOCPOS_AMOUNT 4
+#define DOCPOS_RESOLUTION 5

 class EntsoeA44Parser: public Stream {
 public:
-    EntsoeA44Parser();
+    EntsoeA44Parser(PricesContainer *container);
    virtual ~EntsoeA44Parser();

-    char* getCurrency();
-    char* getMeasurementUnit();
-    float getPoint(uint8_t position);
-    
    int available();
    int read();
    int peek();
    void flush();
    size_t write(const uint8_t *buffer, size_t size);
    size_t write(uint8_t);
-    void get(PricesContainer*);

 private:
-    char currency[4];
-    char measurementUnit[4];
-    float points[25];
+    PricesContainer *container;
+    float multiplier = 1.0;

    char buf[64];
    uint8_t pos = 0;
--- a/lib/PriceService/include/PriceService.h
+++ b/lib/PriceService/include/PriceService.h
@@ -1,5 +1,5 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */
@@ -27,10 +27,6 @@

 #define SSL_BUF_SIZE 512

-#define PRICE_DIRECTION_IMPORT 0x01
-#define PRICE_DIRECTION_EXPORT 0x02
-#define PRICE_DIRECTION_BOTH 0x03
-
 #define PRICE_DAY_MO 0x01
 #define PRICE_DAY_TU 0x02
 #define PRICE_DAY_WE 0x04
@@ -57,10 +53,13 @@ struct PriceConfig {
    uint8_t end_dayofmonth;
 };

-struct PricePart {
-    char name[32];
-    char description[32];
-    uint32_t value;
+struct AmsPriceV2Header {
+    char currency[4];
+    char measurementUnit[4];
+    char source[4];
+    uint8_t resolutionInMinutes;
+    bool differentExportPrices;
+    uint8_t numberOfPoints;
 };

 class PriceService {
@@ -78,17 +77,25 @@ public:
    char* getCurrency();
    char* getArea();
    char* getSource();
-    float getValueForHour(uint8_t direction, int8_t hour);
-    float getValueForHour(uint8_t direction, time_t ts, int8_t hour);

-    float getEnergyPriceForHour(uint8_t direction, time_t ts, int8_t hour);
+    uint8_t getResolutionInMinutes();
+    uint8_t getNumberOfPointsAvailable();
+    uint8_t getCurrentPricePointIndex();
+
+    bool isExportPricesDifferentFromImport();
+
+    bool hasPrice() { return hasPrice(PRICE_DIRECTION_IMPORT); }
+    bool hasPrice(uint8_t direction) { return getCurrentPrice(direction) != PRICE_NO_VALUE; }
+    bool hasPricePoint(uint8_t direction, int8_t point) { return getPricePoint(direction, point) != PRICE_NO_VALUE; }
+    
+    float getCurrentPrice(uint8_t direction);
+    float getPricePoint(uint8_t direction, uint8_t point);
+    float getPriceForRelativeHour(uint8_t direction, int8_t hour); // If not 60min interval, average

    std::vector<PriceConfig>& getPriceConfig();
    void setPriceConfig(uint8_t index, PriceConfig &priceConfig);
    void cropPriceConfig(uint8_t size);

-    PricePart getPricePart(uint8_t index);
-
    int16_t getLastError();

    bool load();
@@ -103,7 +110,7 @@ private:
    PriceServiceConfig* config = NULL;
    HTTPClient* http = NULL;

-    uint8_t currentDay = 0, currentHour = 0;
+    uint8_t currentDay = 0, currentPricePoint = 0;
    uint8_t tomorrowFetchMinute = 15; // How many minutes over 13:00 should it fetch prices
    uint8_t nextFetchDelayMinutes = 15;
    uint64_t lastTodayFetch = 0;
@@ -117,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;
@@ -132,5 +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 point);
+    float getEnergyPricePoint(uint8_t direction, uint8_t point);
 };
 #endif
--- a/lib/PriceService/include/PricesContainer.h
+++ b/lib/PriceService/include/PricesContainer.h
@@ -1,18 +1,46 @@
 /**
- * @copyright Utilitech AS 2023
+ * @copyright Utilitech AS 2023-2026
 * License: Fair Source
 * 
 */

+#include <stdint.h>
+
 #ifndef _PRICESCONTAINER_H
 #define _PRICESCONTAINER_H

 #define PRICE_NO_VALUE -127
+#define PRICE_DIRECTION_IMPORT 0x01
+#define PRICE_DIRECTION_EXPORT 0x02
+#define PRICE_DIRECTION_BOTH 0x03

-struct PricesContainer {
-    char currency[4];
-    char measurementUnit[4];
-    int32_t points[25];
+class PricesContainer {
+public:
+    PricesContainer(char* source);
+
+    void setup(uint8_t resolutionInMinutes, uint8_t numberOfPoints, bool differentExportPrices);
+
+    char* getSource();
+    void setCurrency(char* currency);
+    char* getCurrency();
+
+    bool isExportPricesDifferentFromImport() {
+        return differentExportPrices;
+    }
+
+    uint8_t getResolutionInMinutes();
+    uint8_t getNumberOfPoints();
+
+    void setPrice(uint8_t point, float value, uint8_t direction);
+    bool hasPrice(uint8_t point, uint8_t direction);
+    float getPrice(uint8_t point, uint8_t direction); // int32_t / 10_000
+
+private:
    char source[4];
+    char currency[4];
+    uint8_t resolutionInMinutes;
+    bool differentExportPrices;
+    uint8_t numberOfPoints;
+    int32_t *points;
 };
 #endif
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gunnar Skjold	8a8e26dcc4	Merge branch 'main' into upgrade/svelte	2026-04-09 12:14:56 +02:00
Copilot	4673feaaf3	Fix day dropdowns in price config to respect selected month (#1168 ) * 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>	2026-04-09 12:10:28 +02:00
Gunnar Skjold	2c96b4d94f	Fixed tariff peaks on wrong date and time (#1159 ) * Trying to fix tariff on wrong date. Also some code cleanup * Fix issue for ex DLMS where accumulated is always included * Stricter time restrictions when updating history * Adjustments after testing	2026-04-09 11:41:58 +02:00
Mads Fox	6011d3169e	Fix uninitialized loop variable in GcmParser causing undefined behavior (#1163 ) In GcmParser::parse(), the authentication check loop used an uninitialized loop counter: `for(uint8_t i; i < 16; i++)`. This is undefined behavior in C++ because `i` has an indeterminate value, potentially causing the authentication check to be skipped entirely or to read out-of-bounds memory. Fix: initialize `i` to 0 so the loop correctly iterates all 16 bytes of the authentication key. Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-09 09:51:27 +02:00
Gunnar Skjold	f0c3873635	Fixed price from config file reboot loop (#1172 )	2026-04-09 09:48:02 +02:00
Gunnar Skjold	fb4eea8208	Prevent boot loop in voltage check (#1171 ) * Prevent boot loop if voltage is outside operating range * Fixed code error	2026-04-09 09:47:41 +02:00
Gunnar Skjold	e628056e56	Fixed parsing of Iskra (#1158 )	2026-04-09 09:46:44 +02:00
Gunnar Skjold	df5611844f	Moved reset of reboot reason to main program (#1153 ) * Moved reset of reboot reason to main program * Allow up to 8 cycles to charge capacitor	2026-04-09 09:46:23 +02:00
Gunnar Skjold	3cb6e09341	Use unique SSID on first boot (#1143 ) * Use unique SSID on first boot * Debugger adjustments	2026-04-09 09:41:16 +02:00
Gunnar Skjold	f7ccd2a96b	Updated copyright (#1173 )	2026-04-09 09:40:09 +02:00
Gunnar Skjold	13aff62aff	Fixed PR workflow double zipping (#1162 ) * Added .zip extension to avoid double zipping * Fixed double zip	2026-03-15 10:07:45 +01:00
Gunnar Skjold	64a0667947	Added workflow to attach firmware in PR (#1160 ) * Added PR workflow that creates a comment with firmware zip * Fixed URL * Show version in comment	2026-03-15 09:31:59 +01:00
Gunnar Skjold	4d128700c1	Added UI readme	2026-03-05 16:40:05 +01:00
Gunnar Skjold	6743750d8f	Made proxy target configurable	2026-03-05 16:39:20 +01:00
Gunnar Skjold	640e957065	Optimizing footprint	2026-03-05 16:34:10 +01:00
Gunnar Skjold	d4f11c0412	Updated node version in workflows	2026-03-05 16:22:40 +01:00
Gunnar Skjold	01acc6d6e8	Consolidated new routes and old components	2026-03-05 16:22:19 +01:00
Gunnar Skjold	e89bb53941	Initial changes to migrate to Svelte 5	2026-03-05 15:51:06 +01:00
Gunnar Skjold	009c4686ee	Fixed incorrect color LED on boot (#1149 )	2026-03-05 14:54:51 +01:00
dependabot[bot]	33dc5fc177	Bump rollup from 3.29.5 to 3.30.0 in /lib/SvelteUi/app (#1147 ) 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>	2026-03-05 14:54:01 +01:00
dependabot[bot]	faf047e25f	Bump minimatch in /lib/SvelteUi/app (#1154 ) Bumps and [minimatch](https://github.com/isaacs/minimatch). These dependencies needed to be updated together. Updates `minimatch` from 9.0.5 to 9.0.9 - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](https://github.com/isaacs/minimatch/compare/v9.0.5...v9.0.9) Updates `minimatch` from 3.1.2 to 3.1.5 - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](https://github.com/isaacs/minimatch/compare/v9.0.5...v9.0.9) --- updated-dependencies: - dependency-name: minimatch dependency-version: 9.0.9 dependency-type: indirect - dependency-name: minimatch dependency-version: 3.1.5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-03-05 14:53:36 +01:00
dependabot[bot]	b4322c5f9c	Bump svgo from 2.8.0 to 2.8.2 in /lib/SvelteUi/app (#1157 ) Bumps [svgo](https://github.com/svg/svgo) from 2.8.0 to 2.8.2. - [Release notes](https://github.com/svg/svgo/releases) - [Commits](https://github.com/svg/svgo/compare/v2.8.0...v2.8.2) --- updated-dependencies: - dependency-name: svgo dependency-version: 2.8.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-03-05 14:53:05 +01:00
Gunnar Skjold	0b4884652f	Allow for more errors during upgrade (#1139 ) * Allow for more errors during upgrade * More instead of equals	2026-02-12 12:28:31 +01:00
Gunnar Skjold	82aeae8699	Fixed compile error for 8266 after #1121 (#1138 )	2026-02-12 09:45:04 +01:00
Gunnar Skjold	a7333653b0	Fixed decimal accuracy on saved values (#1133 )	2026-02-12 08:25:32 +01:00
Gunnar Skjold	24e63d5e32	Fixed HA object id (#1132 )	2026-02-12 08:25:17 +01:00
Gunnar Skjold	eb7c266378	Fixed double slash on Wiki links (#1123 )	2026-02-12 08:25:04 +01:00
Gunnar Skjold	cf8c48ab99	Added code to ensure stable boot (#1121 ) * If BUS powered, wait for capacitor to charge on boot, this ensures better boot stability * Some cleanup	2026-02-12 08:24:50 +01:00
Gunnar Skjold	78a1cd78ea	Added support for a new format for a Iskra meter in Switzerland (#1118 )	2026-02-12 08:24:26 +01:00
Gunnar Skjold	fdfa6c1b52	Fixed MQTT JSON for prices (#1116 )	2026-01-01 20:07:48 +01:00
Gunnar Skjold	4f1790a464	Added support for Iskraemeco IE.5 in Croatia (#1107 ) * Added support for Croation Iskra * Temp removed meterid * Fixed HDLC block decoding * Fixed context length * Changing some stuff back * Change some stuff back * Final test * Added debugging * Updated selector for iskra dataformat * Added fake test frame	2025-12-30 10:12:31 +01:00
Gunnar Skjold	ca4cef5233	Fixed empty timestamp in Home-Assistant JSON (#1105 ) * Nullable timestamps for HA JSON * Nullable timestamps for MQTT JSON	2025-12-30 10:05:39 +01:00
Gunnar Skjold	a0d7fd0d95	Fixed extraction of negative prices from server (#1104 )	2025-12-30 10:04:55 +01:00
Gunnar Skjold	489dbf9254	Fixed IPv6 formatting (#1106 )	2025-12-30 10:04:30 +01:00
Gunnar Skjold	a81aa11558	Added support for frames without checksum (#1108 )	2025-12-29 13:25:36 +01:00
Gunnar Skjold	2e4a0fc0a3	Fixed price shift for non-CET price area (#1090 ) * Fixed non-CET price presentation * Added compiled version * Updated fix for non cet * Fixed! I think...	2025-12-11 11:42:17 +01:00
Gunnar Skjold	fc6e9e8085	Fixed ESP8266 memory issue with price decoding (#1089 )	2025-12-11 11:37:52 +01:00
Gunnar Skjold	ad73821f1c	Disable auto buffer size for HAN on ESP8266 (#1086 )	2025-12-11 11:34:46 +01:00
Gunnar Skjold	98bf5b958f	Fixed float infinity issue (#1087 )	2025-12-11 11:34:15 +01:00
Gunnar Skjold	f323c5a4f6	Fixed building without remote debug (#1084 )	2025-12-09 12:19:00 +01:00
Gunnar Skjold	ea91248e67	Changed MQTT client timeout setting for ESP8266 (#1077 )	2025-12-05 15:37:23 +01:00
Gunnar Skjold	271ce2081f	Fixed reboot loop for some meters (#1075 )	2025-12-05 10:02:59 +01:00
Gunnar Skjold	8438020dbd	Feature: Dump hex data from meter to MQTT (#1071 ) * Send raw data debug to MQTT * Publish hexdump to /data * Sensor for /data, but it doesnt work	2025-12-01 14:02:07 +01:00
Gunnar Skjold	9252a810df	Improve power stability when using MQTT (#1070 ) * Changes to improve MQTT and power stability * Re-added the memory leak fix * Re-added the memory leak fix * Stop client before deleting * Fixed potential nullpointer	2025-12-01 10:01:20 +01:00
Gunnar Skjold	c0c696a55c	Fixed default MQTT subscription (#1065 )	2025-11-27 09:37:06 +01:00
Gunnar Skjold	ef70d39f70	Fixed what hours the fixed price is applied to (#1069 )	2025-11-27 09:36:10 +01:00
Gunnar Skjold	1cf890dc26	Improvements for 2.5.0-rc3 (#1064 ) * Various changes for 2.5.0-rc3 * Changed to official amsleser wiki	2025-11-21 12:40:13 +01:00
Gunnar Skjold	9d307e3192	Fixed premature cut on version string if release candidate (#1061 )	2025-11-21 08:22:55 +01:00
Gunnar Skjold	61f0356a10	Added option to select firmware channel (#1060 )	2025-11-13 15:14:52 +01:00
Gunnar Skjold	c648546b61	Added support for 15 minute price resolution (#1031 ) * 15min prices WIP * WIP more changes for 15min prices * More work on 15min pricing * Fixed some errors * Some changes after testing * Graphical changes for 15min pricing * Adjustments on MQTT handlers after switching to 15min prices * Reverted some MQTT changes * Adapted HA integration for 15min pricing * Adapted JSON payload for 15min * Adjustments during testing * Set default price interval * Fixed refresh of price graph when data changes * Bugfixes * Fixed some issues with raw payload * Adjustments for meter timestamp from Kamstrup * Updated readme * Added detailed breakdown of payloads coming from Norwegian meters * Minor changes relating to price * Fixed byte alignment on price config * Changes to support RC upgraders	2025-11-13 15:10:54 +01:00