Merge branch 'master' into dev-v2.1.8

.devcontainer/devcontainer.json

@@ -1,31 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
-{
-	"name": "amsreader-devcontainer",
-	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/base:jammy",
-	"features": {
-		"ghcr.io/devcontainers/features/node:1": {
-			"version": "19",
-			"pnpmVersion": "none",
-			"nvmVersion": "latest"
-		},
-		"ghcr.io/devcontainers/features/python:1": {
-			"version": "3.9"
-		}
-	},
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": ".devcontainer/postCreateCommand.sh",
-
-	// Configure tool-specific properties.
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"platformio.platformio-ide",
-				"ms-vscode.cpptools",
-				"svelte.svelte-vscode"
-			]
-		}
-	}
-}

.devcontainer/postCreateCommand.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-set -e
-
-# Upgrade pip
-python -m pip install --upgrade pip
-
-# Install Python packages
-pip install -U platformio css_html_js_minify
-
-# Navigate to the Svelte app directory
-cd lib/SvelteUi/app
-
-# Install npm dependencies and build the app
-npm ci
-npm run build
-
-# Return to the previous directory
-cd -

.gitattributes

@@ -1,3 +0,0 @@
-* text=auto eol=lf
-*.{cmd,[cC][mM][dD]} text eol=crlf
-*.{bat,[bB][aA][tT]} text eol=crlf

.github/FUNDING.yml

@@ -1 +1 @@
-custom: ["https://amsleser.no"]
+custom: ["https://paypal.me/gskjold"]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -33,7 +33,6 @@ If applicable, add screenshots to help explain your problem.
 **Relevant firmware information:**
  - Version: [e.g. 2.1.0]
  - MQTT: [yes/no]
- - MQTT payload type: [e.g. JSON]
  - HAN GPIO: [e.g. GPIO5]
  - HAN baud and parity: [e.g. 2400 8E1]
  - Temperature sensors [e.g. 3xDS18B20]

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
   - name: Meter configuration
-    url: https://github.com/UtilitechAS/amsreader-firmware/wiki/Known-hardware-configurations
+    url: https://github.com/gskjold/AmsToMqttBridge/wiki/Known-hardware-configurations
     about: Please check your meter configuration here first.
   - name: Frequently asked questions
-    url: https://github.com/UtilitechAS/amsreader-firmware/wiki/FAQ
+    url: https://github.com/gskjold/AmsToMqttBridge/wiki/FAQ
     about: Please check frequently asked questions first.

.github/ISSUE_TEMPLATE/support.md

@@ -20,7 +20,6 @@ A clear and concise description of what the problem is.
 **Relevant firmware information:**
  - Version: [e.g. 2.1.0]
  - MQTT: [yes/no]
- - MQTT payload type: [e.g. JSON]
  - HAN GPIO: [e.g. GPIO5]
  - HAN baud and parity: [e.g. 2400 8E1]
  - Temperature sensors [e.g. 3xDS18B20]

.github/workflows/build.yml

@@ -8,7 +8,6 @@ on:
       - scripts/**
       - web/**
       - platformio.ini
-      - .github/workflows/**
     branches:
       - '*'
     tags:
@@ -22,45 +21,26 @@ jobs:
 
     steps:
     - name: Check out code from repo
-      uses: actions/checkout@v4
-    - 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
+      uses: actions/checkout@v1
     - name: Cache Python dependencies
-      uses: actions/cache@v4
+      uses: actions/cache@v1
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('platformio.ini') }}
     - name: Cache PlatformIO dependencies
-      uses: actions/cache@v4
+      uses: actions/cache@v1
       with:
         path: ~/.pio/libdeps
         key: ${{ runner.os }}-pio-${{ hashFiles('platformio.ini') }}
     - name: Set up Python 3.9
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v1
       with:
         python-version: 3.9
     - 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: true
     - name: PlatformIO lib install
-      run: pio pkg install
+      run: pio lib install
     - name: PlatformIO run
       run: pio run

.github/workflows/localazy.yml

@@ -1,41 +0,0 @@
-name: Deploy language files from localazy
-
-on:
-  workflow_dispatch:
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Check out code from repo
-      uses: actions/checkout@v4
-
-    - name: Set up Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: '22.x'
-    
-    - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v2
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: eu-north-1
-
-    - name: Generate localazy-keys.json
-      run: |
-        echo '{"writeKey": "", "readKey": "${{secrets.LOCALAZY_READ_KEY}}"}' > localazy/localazy-keys.json
-    
-    - name: Create localazy language folder
-      run: mkdir -p localazy/language
-
-    - name: Install Localazy CLI
-      run: npm install -g @localazy/cli
-
-    - name: Download translations
-      working-directory: localazy
-      run: localazy download -k localazy-keys.json
-
-    - name: Upload translations to S3
-      run: aws s3 sync ./localazy/language/ s3://${{ secrets.AWS_S3_BUCKET }}/language/

.github/workflows/prerelease.yml

@@ -1,85 +0,0 @@
-name: Release candidate build and upload
-
-on:
-  push:
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+'
-
-jobs:
-  prepare:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check out code from repo
-      uses: actions/checkout@v4
-    - name: Get release version for filenames
-      id: release_tag
-      env:
-        GITHUB_REF: ${{ github.ref }}
-      run: echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
-
-    - name: Create release with release notes
-      id: create_release
-      uses: ncipollo/release-action@v1
-      with:
-        name: Release candidate v${{ steps.release_tag.outputs.tag }}
-        prerelease: true
-
-    outputs:
-      version: ${{ steps.release_tag.outputs.tag }}
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
-
-  esp32s2:
-    needs: prepare
-    uses: ./.github/workflows/release-deploy-env.yml
-    secrets: inherit
-    with:
-      env: esp32s2
-      version: ${{ needs.prepare.outputs.version }}
-      upload_url: ${{ needs.prepare.outputs.upload_url }}
-      subfolder: /rc
-  esp32s3:
-    needs: prepare
-    uses: ./.github/workflows/release-deploy-env.yml
-    secrets: inherit
-    with:
-      env: esp32s3
-      version: ${{ needs.prepare.outputs.version }}
-      upload_url: ${{ needs.prepare.outputs.upload_url }}
-      subfolder: /rc
-  esp32c3:
-    needs: prepare
-    uses: ./.github/workflows/release-deploy-env.yml
-    secrets: inherit
-    with:
-      env: esp32c3
-      version: ${{ needs.prepare.outputs.version }}
-      upload_url: ${{ needs.prepare.outputs.upload_url }}
-      subfolder: /rc
-  esp32:
-    needs: prepare
-    uses: ./.github/workflows/release-deploy-env.yml
-    secrets: inherit
-    with:
-      env: esp32
-      version: ${{ needs.prepare.outputs.version }}
-      upload_url: ${{ needs.prepare.outputs.upload_url }}
-      subfolder: /rc
-  esp32solo:
-    needs: prepare
-    uses: ./.github/workflows/release-deploy-env.yml
-    secrets: inherit
-    with:
-      env: esp32solo
-      version: ${{ needs.prepare.outputs.version }}
-      upload_url: ${{ needs.prepare.outputs.upload_url }}
-      subfolder: /rc
-  esp8266:
-    needs: prepare
-    uses: ./.github/workflows/release-deploy-env.yml
-    secrets: inherit
-    with:
-      env: esp8266
-      version: ${{ needs.prepare.outputs.version }}
-      upload_url: ${{ needs.prepare.outputs.upload_url }}
-      subfolder: /rc
-      is_esp32: false

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

@@ -1,136 +0,0 @@
-name: Build with env and deploy
-
-on:
-  workflow_call:
-    inputs:
-      env:
-        description: 'The environment to build for'
-        required: true
-        type: string
-      upload_url:
-        description: 'The upload URL for the release assets'
-        required: true
-        type: string
-      version:
-        description: 'The version tag for the release assets'
-        required: true
-        type: string
-      subfolder:
-        description: 'The subfolder in S3 to upload the binary to'
-        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:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check out code from repo
-      uses: actions/checkout@v4
-
-    - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v2
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: eu-north-1
-
-    - 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
-      env:
-        GITHUB_TAG: v${{ inputs.version }}
-      run: pio run -e ${{ inputs.env }}
-
-    - name: Create zip file
-      run: /bin/sh scripts/${{ inputs.env }}/mkzip.sh
-
-    - name: Upload binary to release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ inputs.upload_url }}
-        asset_path: .pio/build/${{ inputs.env }}/firmware.bin
-        asset_name: ams2mqtt-${{ inputs.env }}-${{ inputs.version }}.bin
-        asset_content_type: application/octet-stream
-
-    - name: Upload zip to release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ inputs.upload_url }}
-        asset_path: ${{ inputs.env }}.zip
-        asset_name: ams2mqtt-${{ inputs.env }}-${{ inputs.version }}.zip
-        asset_content_type: application/zip
-    
-    - name: Create MD5 checksum file
-      run: md5sum .pio/build/${{ inputs.env }}/firmware.bin | cut -z -d ' ' -f 1 > firmware.md5
-
-    - name: Upload binary to S3
-      run: aws s3 cp .pio/build/${{ inputs.env }}/firmware.bin s3://${{ secrets.AWS_S3_BUCKET }}/firmware${{ inputs.subfolder }}/ams2mqtt-${{ inputs.env }}-${{ inputs.version }}.bin
-
-    - name: Upload MD5 checksum to S3
-      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

.github/workflows/release.yml

@@ -1,79 +1,124 @@
-name: Release build and upload
+name: Release
 
 on:
   push:
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - 'v*.*.*'
+
 
 jobs:
-  prepare:
+  build:
+
     runs-on: ubuntu-latest
+
     steps:
-      - name: Check out code from repo
-        uses: actions/checkout@v4
-      - name: Get release version for filenames
-        id: release_tag
-        env:
-          GITHUB_REF: ${{ github.ref }}
-        run: echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
+    - name: Check out code from repo
+      uses: actions/checkout@v1
+    - name: Get release version for filenames
+      id: release_tag
+      env:
+        GITHUB_REF: ${{ github.ref }}
+      run: echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
+    - name: Get release version for code
+      env:
+        GITHUB_REF: ${{ github.ref }}
+      run: echo "GITHUB_TAG=$(echo ${GITHUB_REF##*/})" >> $GITHUB_ENV
+    - name: Cache Python dependencies
+      uses: actions/cache@v1
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('platformio.ini') }}
+    - name: Cache PlatformIO dependencies
+      uses: actions/cache@v1
+      with:
+        path: ~/.pio/libdeps
+        key: ${{ runner.os }}-pio-${{ hashFiles('platformio.ini') }}
+    - name: Set up Python 3.9
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.9
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -U platformio css_html_js_minify
+    - name: PlatformIO lib install
+      run: pio lib install
+    - name: PlatformIO run
+      run: pio run
+    - name: Create zip files
+      run: /bin/sh scripts/mkzip.sh
+    - name: Create Release
+      id: create_release
+      uses: actions/create-release@v1.0.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: Release ${{ github.ref }}
+        draft: false
+        prerelease: false
 
-      - name: Create release with release notes
-        id: create_release
-        uses: ncipollo/release-action@v1
-        with:
-          name: Release v${{ steps.release_tag.outputs.tag }}
-          generateReleaseNotes: true
+    - name: Upload esp8266 zip to release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: esp8266.zip
+        asset_name: ams2mqtt-esp8266-${{ steps.release_tag.outputs.tag }}.zip
+        asset_content_type: application/zip
+    - name: Upload esp32 zip to release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: esp32.zip
+        asset_name: ams2mqtt-esp32-${{ steps.release_tag.outputs.tag }}.zip
+        asset_content_type: application/zip
+    - name: Upload esp32s2 zip to release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: esp32s2.zip
+        asset_name: ams2mqtt-esp32s2-${{ steps.release_tag.outputs.tag }}.zip
+        asset_content_type: application/zip
 
-    outputs:
-      version: ${{ steps.release_tag.outputs.tag }}
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
-
-  esp32s2:
-    needs: prepare
-    uses: ./.github/workflows/release-deploy-env.yml
-    secrets: inherit
-    with:
-      env: esp32s2
-      version: ${{ needs.prepare.outputs.version }}
-      upload_url: ${{ needs.prepare.outputs.upload_url }}
-  esp32s3:
-    needs: prepare
-    uses: ./.github/workflows/release-deploy-env.yml
-    secrets: inherit
-    with:
-      env: esp32s3
-      version: ${{ needs.prepare.outputs.version }}
-      upload_url: ${{ needs.prepare.outputs.upload_url }}
-  esp32c3:
-    needs: prepare
-    uses: ./.github/workflows/release-deploy-env.yml
-    secrets: inherit
-    with:
-      env: esp32c3
-      version: ${{ needs.prepare.outputs.version }}
-      upload_url: ${{ needs.prepare.outputs.upload_url }}
-  esp32:
-    needs: prepare
-    uses: ./.github/workflows/release-deploy-env.yml
-    secrets: inherit
-    with:
-      env: esp32
-      version: ${{ needs.prepare.outputs.version }}
-      upload_url: ${{ needs.prepare.outputs.upload_url }}
-  esp32solo:
-    needs: prepare
-    uses: ./.github/workflows/release-deploy-env.yml
-    secrets: inherit
-    with:
-      env: esp32solo
-      version: ${{ needs.prepare.outputs.version }}
-      upload_url: ${{ needs.prepare.outputs.upload_url }}
-  esp8266:
-    needs: prepare
-    uses: ./.github/workflows/release-deploy-env.yml
-    secrets: inherit
-    with:
-      env: esp8266
-      version: ${{ needs.prepare.outputs.version }}
-      upload_url: ${{ needs.prepare.outputs.upload_url }}
-      is_esp32: false
+    - name: Upload esp8266 binary to release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: .pio/build/esp8266/firmware.bin
+        asset_name: ams2mqtt-esp8266-${{ steps.release_tag.outputs.tag }}.bin
+        asset_content_type: application/octet-stream
+    - name: Upload esp32 binary to release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: .pio/build/esp32/firmware.bin
+        asset_name: ams2mqtt-esp32-${{ steps.release_tag.outputs.tag }}.bin
+        asset_content_type: application/octet-stream
+    - name: Upload esp32solo binary to release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: .pio/build/esp32solo/firmware.bin
+        asset_name: ams2mqtt-esp32solo-${{ steps.release_tag.outputs.tag }}.bin
+        asset_content_type: application/octet-stream
+    - name: Upload esp32s2 binary to release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: .pio/build/esp32s2/firmware.bin
+        asset_name: ams2mqtt-esp32s2-${{ steps.release_tag.outputs.tag }}.bin
+        asset_content_type: application/octet-stream

.gitignore

@@ -1,5 +1,4 @@
 .vs/
-.idea/
 [Dd]ebug/
 [Rr]elease/
 **/__vm/
@@ -8,7 +7,7 @@
 .vscode
 .pio
 platformio-user.ini
-/lib/FirmwareVersion/src/generated_version.h
+/src/version.h
 /src/web/root
 /src/AmsToMqttBridge.ino.cpp
 /test
@@ -16,8 +15,3 @@ platformio-user.ini
 /sdkconfig
 /.tmp
 /*.zip
-node_modules
-/gui/dist
-/scripts/*dev
-localazy-keys.json
-localazy/language

LICENSE

@@ -1,44 +1,617 @@
-Fair Source License, version 0.9
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-Copyright (C) 2023 Utilitech AS
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Licensor: Utilitech AS
+                            Preamble
 
-Software: AMS reader
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-Use Limitation: 5 users
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
 
-License Grant. Licensor hereby grants to each recipient of the
-Software ("you") a non-exclusive, non-transferable, royalty-free and
-fully-paid-up license, under all of the Licensor's copyright and
-patent rights, to use, copy, distribute, prepare derivative works of,
-publicly perform and display the Software, subject to the Use
-Limitation and the conditions set forth below.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-Use Limitation. The license granted above allows use by up to the
-number of users per entity set forth above (the "Use Limitation"). For
-determining the number of users, "you" includes all affiliates,
-meaning legal entities controlling, controlled by, or under common
-control with you. If you exceed the Use Limitation, your use is
-subject to payment of Licensor's then-current list price for licenses.
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
 
-Conditions. Redistribution in source code or other forms must include
-a copy of this license document to be provided in a reasonable
-manner. Any redistribution of the Software is only allowed subject to
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
 this license.
 
-Trademarks. This license does not grant you any right in the
-trademarks, service marks, brand names or logos of Licensor.
+  The precise terms and conditions for copying, distribution and
+modification follow.
 
-DISCLAIMER. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OR
-CONDITION, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. LICENSORS HEREBY DISCLAIM ALL LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE.
+                       TERMS AND CONDITIONS
 
-Termination. If you violate the terms of this license, your rights
-will terminate automatically and will not be reinstated without the
-prior written consent of Licensor. Any such termination will not
-affect the right of others who may have received copies of the
-Software from you.
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.

README.md

@@ -1,15 +1,12 @@
-# AMS Reader
+# AMS MQTT Bridge
 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://www.amsleser.no/).
+Later development have added Energy usage graph for both day and month, as well as future energy price (Prices only  available for ESP32). The code can run on any ESP8266 or ESP32 hardware which you can read more about in the [WiKi](https://github.com/gskjold/AmsToMqttBridge/wiki). If you don't have the knowledge to set up a ESP device yourself, have a look at the shop at [amsleser.no](https://amsleser.no/).
 
 
-<img src="images/dashboard.png">
+<img src="webui.png">
 
-## 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
+Go to the [WiKi](https://github.com/gskjold/AmsToMqttBridge/wiki) for information on how to get your own device! And find the latest prebuilt firmware file at the [release section](https://github.com/gskjold/AmsToMqttBridge/releases).
 
 ## Building this project with PlatformIO
 To build this project, you need [PlatformIO](https://platformio.org/) installed.
@@ -21,12 +18,3 @@ It is recommended to use Visual Studio Code with the PlatformIO plugin for devel
 [PlatformIO vscode plugin](https://platformio.org/install/ide?install=vscode)
 
 For development purposes, copy the ```platformio-user.ini-example``` to ```platformio-user.ini``` and customize to your preference. The code will adapt to the platform and board set in your profile.
-
-## Licensing
-Initially, this project began as a hobby, consuming countless hours of our spare time. However, the time required to support this project has expanded beyond the scope of a hobby. As a result, we established ‘Utilitech’, a company dedicated to maintaining the software and hardware for this project as part of our regular work.
-
-To ensure the sustainability of our venture, we have opted to license our software under the [Fair Source License] (https://fair.io). This approach allows the software to remain free for personal use, while also ensuring full transparency of our code’s inner workings. It also prevents competitors from exploiting our work without contributing to the maintenance of the code or providing technical support to end users.
-
-For more information, please refer to our [LICENSE](/LICENSE) file.
-
-If your usage falls outside the scope of this license and you require a separate license, please contact us at [post@utilitech.no](mailto:post@utilitech.no) for further details.

custom_partition.csv

@@ -1,7 +0,0 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-nvs,      data, nvs,     0x9000,  0x5000,
-otadata,  data, ota,     0xe000,  0x2000,
-app0,     app,  ota_0,   0x10000, 0x1D0000,
-app1,     app,  ota_1,   0x1E0000,0x1D0000,
-spiffs,   data, spiffs,  0x3B0000,0x40000,
-coredump, data, coredump,0x3F0000,0x10000,

doc/Poland/Stoen/placeholder.txt

@@ -1 +0,0 @@
-

frames/Aidon-TN-3p.raw

@@ -31,59 +31,3 @@ Object with three values      Value    Object with two values
 02 03 09 06 01 00 04 08 00 FF 06 00 0A F5 EC 02 02 0F 01 16 20 
 51 D7 
 7E 
-
-
-Received 21.09.24 20:00:10:
-(V) 7E A1 8A 41  08 83 13 EB  FD E6 E7 00  0F 40 00 00 
-(V) 00 00 01 12  02 02 09 06  01 01 00 02  81 FF 0A 0B 
-(V) 41 49 44 4F  4E 5F 56 30  30 30 31 02  02 09 06 00 
-(V) 00 60 01 00  FF 0A 10 37  33 35 39 39  39 32 38 39 
-(V) 30 34 39 37  39 39 37 02  02 09 06 00  00 60 01 07 
-(V) FF 0A 04 36  35 33 34 02  03 09 06 01  00 01 07 00 
-(V) FF 06 00 00  02 71 02 02  0F 00 16 1B  02 03 09 06 
-(V) 01 00 02 07  00 FF 06 00  00 00 00 02  02 0F 00 16 
-(V) 1B 02 03 09  06 01 00 03  07 00 FF 06  00 00 00 00 
-(V) 02 02 0F 00  16 1D 02 03  09 06 01 00  04 07 00 FF 
-(V) 06 00 00 01  F0 02 02 0F  00 16 1D 02  03 09 06 01 
-(V) 00 1F 07 00  FF 10 00 06  02 02 0F FF  16 21 02 03 
-(V) 09 06 01 00  33 07 00 FF  10 00 05 02  02 0F FF 16 
-(V) 21 02 03 09  06 01 00 47  07 00 FF 10  00 17 02 02 
-(V) 0F FF 16 21  02 03 09 06  01 00 20 07  00 FF 12 09 
-(V) 3F 02 02 0F  FF 16 23 02  03 09 06 01  00 34 07 00 
-(V) FF 12 09 36  02 02 0F FF  16 23 02 03  09 06 01 00 
-(V) 48 07 00 FF  12 09 22 02  02 0F FF 16  23 02 02 09 
-(V) 06 00 00 01  00 00 FF 09  0C 07 E8 09  15 06 13 00 
-(V) 00 FF 00 00  00 02 03 09  06 01 00 01  08 00 FF 06 
-(V) 00 8D 98 13  02 02 0F 01  16 1E 02 03  09 06 01 00 
-(V) 02 08 00 FF  06 00 00 00  00 02 02 0F  01 16 1E 02 
-(V) 03 09 06 01  00 03 08 00  FF 06 00 00  29 6E 02 02 
-(V) 0F 01 16 20  02 03 09 06  01 00 04 08  00 FF 06 00 
-(V) 13 F2 06 02  02 0F 01 16  20 C8 1D 7E  
-
-
-Received 27.10.24 11:00:13:
-(V) 7E A1 8A 41  08 83 13 EB  FD E6 E7 00  0F 40 00 00 
-(V) 00 00 01 12  02 02 09 06  01 01 00 02  81 FF 0A 0B 
-(V) 41 49 44 4F  4E 5F 56 30  30 30 31 02  02 09 06 00 
-(V) 00 60 01 00  FF 0A 10 37  33 35 39 39  39 32 38 39 
-(V) 30 34 39 37  39 39 37 02  02 09 06 00  00 60 01 07 
-(V) FF 0A 04 36  35 33 34 02  03 09 06 01  00 01 07 00 
-(V) FF 06 00 00  02 AA 02 02  0F 00 16 1B  02 03 09 06 
-(V) 01 00 02 07  00 FF 06 00  00 00 00 02  02 0F 00 16 
-(V) 1B 02 03 09  06 01 00 03  07 00 FF 06  00 00 00 00 
-(V) 02 02 0F 00  16 1D 02 03  09 06 01 00  04 07 00 FF 
-(V) 06 00 00 01  CC 02 02 0F  00 16 1D 02  03 09 06 01 
-(V) 00 1F 07 00  FF 10 00 02  02 02 0F FF  16 21 02 03 
-(V) 09 06 01 00  33 07 00 FF  10 00 0B 02  02 0F FF 16 
-(V) 21 02 03 09  06 01 00 47  07 00 FF 10  00 16 02 02 
-(V) 0F FF 16 21  02 03 09 06  01 00 20 07  00 FF 12 09 
-(V) 2F 02 02 0F  FF 16 23 02  03 09 06 01  00 34 07 00 
-(V) FF 12 09 00  02 02 0F FF  16 23 02 03  09 06 01 00 
-(V) 48 07 00 FF  12 09 0F 02  02 0F FF 16  23 02 02 09 
-(V) 06 00 00 01  00 00 FF 09  0C 07 E8 0A  1B 00 0B 00 
-(V) 00 FF 00 00  00 02 03 09  06 01 00 01  08 00 FF 06 
-(V) 00 8F 25 6F  02 02 0F 01  16 1E 02 03  09 06 01 00 
-(V) 02 08 00 FF  06 00 00 00  00 02 02 0F  01 16 1E 02 
-(V) 03 09 06 01  00 03 08 00  FF 06 00 00  29 8D 02 02 
-(V) 0F 01 16 20  02 03 09 06  01 00 04 08  00 FF 06 00 
-(V) 14 44 26 02  02 0F 01 16  20 84 09 7E  

frames/EGM5G35.txt

@@ -1,14 +0,0 @@
-2F 45 47 4D 35 47 33 35 // DSMR Identifier  
-0D 0A                   // CRLF
-0D 0A                   // CRLF 
-00                      // System title, blank 
-82                      // Two-byte length follows 
-02 30                   // 560 bytes
-30                      // Security tag 0011 0000, 0=Compression off, 0=Unicast, 1=Encryption, 1=Authentication, 0000= Security Suite ID
-00 00 00 00             // Frame counter, blank
-
-// Encrypted payload follows (560 - security tag - frame counter = 555 bytes)
-30 10 73 D6 59 85 96 B0 2A 8B CC E7 33 AD 19 A3 A5 4A 4D 0E 3A CE F6 33 DB 57 0A 45 9A C3 5B F0 D4 C0 AA 15 B9 93 B0 E8 67 85 EC 22 CA 40 8C D7 1A B5 62 AE DF 0F 48 EA D9 E6 56 FB 84 B3 7B 47 C6 29 12 F1 EE BB 22 88 26 75 5C F8 A2 20 F4 93 F3 64 CA 7C C6 60 32 62 B0 7F F9 7F 71 0A 9F DF AB 61 89 6A 9A 10 B1 DF 94 2C 74 8F 51 B6 09 5C F2 45 6C 38 54 52 FE B6 CB 1F 42 F2 93 DC 57 BE EE 5A 0D F8 1F 53 55 0E 21 EF 46 0A 72 74 CA AB D8 9C A9 05 9E FD 54 5E CC 7B 71 40 E1 22 B2 25 5C D5 63 80 BD 97 6E 54 4B 24 A6 58 1F 79 1F 45 C7 DF C0 83 3B 7F 1E C7 43 B9 26 F6 EB 6E F2 B1 7C 99 3A 91 EA 39 72 E5 FB 72 B1 E1 24 AF 9D 19 8A 6C 50 69 97 90 D3 3D 68 97 57 C2 EC 49 EF 12 1D 11 44 46 70 46 88 88 98 37 6F B0 93 FC D2 3F 37 66 1C C7 F0 93 E3 AF 4D 3C BE 41 8E B9 48 77 A9 92 5B 42 0A 96 E5 34 4D 30 56 90 5A 08 03 CC 41 78 58 79 FD 89 82 E0 46 3D 66 AA 42 85 F4 A8 46 2D 4A E4 81 12 40 68 D6 F5 F9 11 5A 94 51 21 3C 9F 4F F7 FE B3 B5 BF 1E D2 12 CF B9 FB 28 D0 B4 82 9E 11 D8 1C FC E3 36 EC DE 8A 7C 83 76 F7 EB 3D 2C 4A B7 7F 75 91 F1 F5 18 D4 70 6A C9 3E 3D 3F 9E 0F C6 0F A7 E7 20 11 03 E7 75 4E 40 F1 5E BA 86 30 6D C0 28 C4 14 47 DF 6A EF CC FE E4 B6 23 58 2B 9D 4F BF 6A A8 93 84 F4 CD 4D FF 47 B5 C4 81 D2 DA D3 6B C3 F4 1D C4 6E E1 9B 24 30 91 7B 33 57 67 B6 E4 93 FE 8B 5B AE 8A 0D 81 DE A5 C3 3F 82 9A CE E2 BA 6D 50 39 FC 99 E6 7A 7B B4 E9 A9 84 78 AF 2D 4C D2 15 53 6B 98 2B 1F C8 3D 57 9E 49 68 40 0C D3 4A 9E D6 4F 1F 12 50 84 32 AD 62 C6 D3 42 34 46 66 65 56 49 81 F4 BC 8E C6 75 77 11 1F 29 BB 80 20 23 0A 80 D5 31 50 16 89 6F 07 4A 25 BE F0 4B 60 36 87 AE A6 2A 53 79 22 15 A5 2A C7 1D 15 7B 87 DD B5 07 3D 1C 28 C1 B6 51 47 2F 39 DE D9 B9 29 B6 78
-21                      // End of DSMR (!)
-46 45 30 43             // FE0C - Checksum 
-0D 0A                   // CRLF

frames/Kaifa-TN-3p.raw

@@ -31,183 +31,4 @@ C9 95 7E // CRC and end tag
 06 00 00 00 00 06 00 00 00 00 06 00 00 01 67 06 00 00 03 BF 06 00 00 05 05 
 06 00 00 24 34 06 00 00 09 45 06 00 00 09 4F 06 00 00 09 3B 
 09 0C 07 E5 03 17 02 13 00 0A FF 80 00 00 06 01 34 3B 5D 06 00 00 00 00 06 00 00 09 36 06 00 3C 7A 98 DA 15 7E
-7E A0 79 01 02 01 10 80 93 E6 E7 00 0F 40 00 00 00 09 0C 07 E1 09 0E 04 15 1F 14 FF 80 00 00 02 0D 09 07 4B 46 4D 5F 30 30 31 09 10 36 39 37 30 36 33 31 34 30 31 37 35 33 39 38 35 09 08 4D 41 33 30 34 48 33 45 06 00 00 04 0C 06 00 00 00 00 06 00 00 00 00 06 00 00 00 4E 06 00 00 07 C1 06 00 00 0C 9E 06 00 00 0D 7E 06 00 00 09 5F 06 00 00 00 00 06 00 00 09 66 87 96 7E 
-
-
-01.10.24 19:00 ish:
-(D) READY to update (internal clock 16:59:58 UTC, meter clock: 00:00:00, list type 1, est: 1, using clock: 1)
-(V) HDLC frame:
-(V) 7E A0 78 01  02 01 10 C4  98 E6 E7 00  0F 40 00 00 
-(V) 00 09 0C 07  E8 0A 01 02  13 00 00 FF  80 00 00 02 
-(V) 0D 09 07 4B  46 4D 5F 30  30 31 09 10  36 39 37 30 
-(V) 36 33 31 34  30 37 32 36  32 39 38 36  09 07 4D 41 
-(V) 33 30 34 48  34 06 00 00  13 C0 06 00  00 00 00 06 
-(V) 00 00 00 00  06 00 00 01  D5 06 00 00  4C DF 06 00 
-(V) 00 05 0C 06  00 00 03 9B  06 00 00 09  34 06 00 00 
-(V) 09 69 06 00  00 09 59 18  EB 7E 
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  09 0C 07 E8  0A 01 02 13 
-(V) 00 00 FF 80  00 00 02 0D  09 07 4B 46  4D 5F 30 30 
-(V) 31 09 10 36  39 37 30 36  33 31 34 30  37 32 36 32 
-(V) 39 38 36 09  07 4D 41 33  30 34 48 34  06 00 00 13 
-(V) C0 06 00 00  00 00 06 00  00 00 00 06  00 00 01 D5 
-(V) 06 00 00 4C  DF 06 00 00  05 0C 06 00  00 03 9B 06 
-(V) 00 00 09 34  06 00 00 09  69 06 00 00  09 59 
-(V) DLMS frame:
-(V) 0F 40 00 00  00 09 0C 07  E8 0A 01 02  13 00 00 FF 
-(V) 80 00 00 02  0D 09 07 4B  46 4D 5F 30  30 31 09 10 
-(V) 36 39 37 30  36 33 31 34  30 37 32 36  32 39 38 36 
-(V) 09 07 4D 41  33 30 34 48  34 06 00 00  13 C0 06 00 
-(V) 00 00 00 06  00 00 00 00  06 00 00 01  D5 06 00 00 
-(V) 4C DF 06 00  00 05 0C 06  00 00 03 9B  06 00 00 09 
-(V) 34 06 00 00  09 69 06 00  00 09 59 
-(D) Received valid DLMS at 31
-(V) Using application data:
-(V) 02 0D 09 07  4B 46 4D 5F  30 30 31 09  10 36 39 37 
-(V) 30 36 33 31  34 30 37 32  36 32 39 38  36 09 07 4D 
-(V) 41 33 30 34  48 34 06 00  00 13 C0 06  00 00 00 00 
-(V) 06 00 00 00  00 06 00 00  01 D5 06 00  00 4C DF 06 
-(V) 00 00 05 0C  06 00 00 03  9B 06 00 00  09 34 06 00 
-(V) 00 09 69 06  00 00 09 59  
-(V) DLMS
-(D) READY to update (internal clock 17:00:01 UTC, meter clock: 00:00:00, list type 2, est: 1, using clock: 1)
-(V) HDLC frame:
-(V) 7E A0 27 01  02 01 10 5A  87 E6 E7 00  0F 40 00 00 
-(V) 00 09 0C 07  E8 0A 01 02  13 00 02 FF  80 00 00 02 
-(V) 01 06 00 00  13 C1 56 F5  7E 
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  09 0C 07 E8  0A 01 02 13 
-(V) 00 02 FF 80  00 00 02 01  06 00 00 13  C1 
-(V) DLMS frame:
-(V) 0F 40 00 00  00 09 0C 07  E8 0A 01 02  13 00 02 FF 
-(V) 80 00 00 02  01 06 00 00  13 C1 
-(D) Received valid DLMS at 31
-(V) Using application data:
-(V) 02 01 06 00  00 13 C1 
-(V) DLMS
-(D) READY to update (internal clock 17:00:02 UTC, meter clock: 00:00:00, list type 1, est: 1, using clock: 1)
-(V) HDLC frame:
-(V) 7E A0 27 01  02 01 10 5A  87 E6 E7 00  0F 40 00 00 
-(V) 00 09 0C 07  E8 0A 01 02  13 00 04 FF  80 00 00 02 
-(V) 01 06 00 00  13 BC F9 5A  7E 
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  09 0C 07 E8  0A 01 02 13 
-(V) 00 04 FF 80  00 00 02 01  06 00 00 13  BC 
-(V) DLMS frame:
-(V) 0F 40 00 00  00 09 0C 07  E8 0A 01 02  13 00 04 FF 
-(V) 80 00 00 02  01 06 00 00  13 BC 
-(D) Received valid DLMS at 31
-(V) Using application data:
-(V) 02 01 06 00  00 13 BC 
-(V) DLMS
-(D) READY to update (internal clock 17:00:04 UTC, meter clock: 00:00:00, list type 1, est: 1, using clock: 1)
-(V) HDLC frame:
-(V) 7E A0 27 01  02 01 10 5A  87 E6 E7 00  0F 40 00 00 
-(V) 00 09 0C 07  E8 0A 01 02  13 00 06 FF  80 00 00 02 
-(V) 01 06 00 00  13 BC 42 58  7E 
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  09 0C 07 E8  0A 01 02 13 
-(V) 00 06 FF 80  00 00 02 01  06 00 00 13  BC 
-(V) DLMS frame:
-(V) 0F 40 00 00  00 09 0C 07  E8 0A 01 02  13 00 06 FF 
-(V) 80 00 00 02  01 06 00 00  13 BC 
-(D) Received valid DLMS at 31
-(V) Using application data:
-(V) 02 01 06 00  00 13 BC 
-(V) DLMS
-(D) READY to update (internal clock 17:00:06 UTC, meter clock: 00:00:00, list type 1, est: 1, using clock: 1)
-(V) HDLC frame:
-(V) 7E A0 27 01  02 01 10 5A  87 E6 E7 00  0F 40 00 00 
-(V) 00 09 0C 07  E8 0A 01 02  13 00 08 FF  80 00 00 02 
-(V) 01 06 00 00  13 BB DC 21  7E 
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  09 0C 07 E8  0A 01 02 13 
-(V) 00 08 FF 80  00 00 02 01  06 00 00 13  BB 
-(V) DLMS frame:
-(V) 0F 40 00 00  00 09 0C 07  E8 0A 01 02  13 00 08 FF 
-(V) 80 00 00 02  01 06 00 00  13 BB 
-(D) Received valid DLMS at 31
-(V) Using application data:
-(V) 02 01 06 00  00 13 BB 
-(V) DLMS
-(D) READY to update (internal clock 17:00:08 UTC, meter clock: 00:00:00, list type 1, est: 1, using clock: 1)
-(V) HDLC frame:
-(V) 7E A0 9A 01  02 01 10 AA  A5 E6 E7 00  0F 40 00 00 
-(V) 00 09 0C 07  E8 0A 01 02  13 00 0A FF  80 00 00 02 
-(V) 12 09 07 4B  46 4D 5F 30  30 31 09 10  36 39 37 30 
-(V) 36 33 31 34  30 37 32 36  32 39 38 36  09 07 4D 41 
-(V) 33 30 34 48  34 06 00 00  13 C0 06 00  00 00 00 06 
-(V) 00 00 00 00  06 00 00 01  D5 06 00 00  4C DD 06 00 
-(V) 00 05 0E 06  00 00 03 90  06 00 00 09  34 06 00 00 
-(V) 09 69 06 00  00 09 59 09  0C 07 E8 0A  01 02 13 00 
-(V) 0A FF 80 00  00 06 02 8E  4B 5E 06 00  00 00 00 06 
-(V) 00 97 35 DE  06 00 08 97  2F FA E5 7E  
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  09 0C 07 E8  0A 01 02 13 
-(V) 00 0A FF 80  00 00 02 12  09 07 4B 46  4D 5F 30 30 
-(V) 31 09 10 36  39 37 30 36  33 31 34 30  37 32 36 32 
-(V) 39 38 36 09  07 4D 41 33  30 34 48 34  06 00 00 13 
-(V) C0 06 00 00  00 00 06 00  00 00 00 06  00 00 01 D5 
-(V) 06 00 00 4C  DD 06 00 00  05 0E 06 00  00 03 90 06 
-(V) 00 00 09 34  06 00 00 09  69 06 00 00  09 59 09 0C 
-(V) 07 E8 0A 01  02 13 00 0A  FF 80 00 00  06 02 8E 4B 
-(V) 5E 06 00 00  00 00 06 00  97 35 DE 06  00 08 97 2F 
-(V) 
-(V) DLMS frame:
-(V) 0F 40 00 00  00 09 0C 07  E8 0A 01 02  13 00 0A FF 
-(V) 80 00 00 02  12 09 07 4B  46 4D 5F 30  30 31 09 10 
-(V) 36 39 37 30  36 33 31 34  30 37 32 36  32 39 38 36 
-(V) 09 07 4D 41  33 30 34 48  34 06 00 00  13 C0 06 00 
-(V) 00 00 00 06  00 00 00 00  06 00 00 01  D5 06 00 00 
-(V) 4C DD 06 00  00 05 0E 06  00 00 03 90  06 00 00 09 
-(V) 34 06 00 00  09 69 06 00  00 09 59 09  0C 07 E8 0A 
-(V) 01 02 13 00  0A FF 80 00  00 06 02 8E  4B 5E 06 00 
-(V) 00 00 00 06  00 97 35 DE  06 00 08 97  2F 
-(D) Received valid DLMS at 31
-(V) Using application data:
-(V) 02 12 09 07  4B 46 4D 5F  30 30 31 09  10 36 39 37 
-(V) 30 36 33 31  34 30 37 32  36 32 39 38  36 09 07 4D 
-(V) 41 33 30 34  48 34 06 00  00 13 C0 06  00 00 00 00 
-(V) 06 00 00 00  00 06 00 00  01 D5 06 00  00 4C DD 06 
-(V) 00 00 05 0E  06 00 00 03  90 06 00 00  09 34 06 00 
-(V) 00 09 69 06  00 00 09 59  09 0C 07 E8  0A 01 02 13 
-(V) 00 0A FF 80  00 00 06 02  8E 4B 5E 06  00 00 00 00 
-(V) 06 00 97 35  DE 06 00 08  97 2F 
-(V) DLMS
-(D) READY to update (internal clock 17:00:12 UTC, meter clock: 17:00:10, list type 3, est: 1, using clock: 0)
-(D) Updating data storage using actual data
-(D) Clearing hours from 16 to 17
-(D) Clearing days from 1 to 1
-(D) Day is not happy
-(D)  - normal
-(I) Saving data
-(I) Saving energy accounting
-(W) Used 1249ms to read HAN port (true)
-(V) HDLC frame:
-(V) 7E A0 27 01  02 01 10 5A  87 E6 E7 00  0F 40 00 00 
-(V) 00 09 0C 07  E8 0A 01 02  13 00 0C FF  80 00 00 02 
-(V) 01 06 00 00  13 BC 15 50  7E 
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  09 0C 07 E8  0A 01 02 13 
-(V) 00 0C FF 80  00 00 02 01  06 00 00 13  BC 
-(V) DLMS frame:
-(V) 0F 40 00 00  00 09 0C 07  E8 0A 01 02  13 00 0C FF 
-(V) 80 00 00 02  01 06 00 00  13 BC 
-(D) Received valid DLMS at 31
-(V) Using application data:
-(V) 02 01 06 00  00 13 BC 
-(V) DLMS
-(D) NOT Ready to update (internal clock 17:00:12 UTC, meter clock: 00:00:00, list type 1, est: 0)
-(V) HDLC frame:
-(V) 7E A0 27 01  02 01 10 5A  87 E6 E7 00  0F 40 00 00 
-(V) 00 09 0C 07  E8 0A 01 02  13 00 0E FF  80 00 00 02 
-(V) 01 06 00 00  13 B7 7D EC  7E 
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  09 0C 07 E8  0A 01 02 13 
-(V) 00 0E FF 80  00 00 02 01  06 00 00 13  B7 
-(V) DLMS frame:
-(V) 0F 40 00 00  00 09 0C 07  E8 0A 01 02  13 00 0E FF 
-(V) 80 00 00 02  01 06 00 00  13 B7 
-(D) Received valid DLMS at 31
-(V) Using application data:
-(V) 02 01 06 00  00 13 B7 
+7E A0 79 01 02 01 10 80 93 E6 E7 00 0F 40 00 00 00 09 0C 07 E1 09 0E 04 15 1F 14 FF 80 00 00 02 0D 09 07 4B 46 4D 5F 30 30 31 09 10 36 39 37 30 36 33 31 34 30 31 37 35 33 39 38 35 09 08 4D 41 33 30 34 48 33 45 06 00 00 04 0C 06 00 00 00 00 06 00 00 00 00 06 00 00 00 4E 06 00 00 07 C1 06 00 00 0C 9E 06 00 00 0D 7E 06 00 00 09 5F 06 00 00 00 00 06 00 00 09 66 87 96 7E 

frames/L&G-E350_Norway.raw

@@ -1,682 +0,0 @@
-*** Remote debug - over telnet - for ESP32 - version 3.0.5
-* Host name: ams-e603 IP:10.10.10.62 Mac address:D8:3B:DA:C4:03:E6
-* Free Heap RAM: 87952
-* ESP SDK version: 4.4.5.230722
-******************************************************
-* Commands:
-    ? or help -> display these help of commands
-    q -> quit (close this connection)
-    m -> display memory available
-    v -> set debug level to verbose
-    d -> set debug level to debug
-    i -> set debug level to info
-    w -> set debug level to warning
-    e -> set debug level to errors
-    s -> set debug silence on/off
-    l -> show debug level
-    t -> show time (millis)
-    profiler:
-      p      -> show time between actual and last message (in millis)
-      p min  -> show only if time is this minimal
-      P time -> set debug level to profiler
-    c -> show colors
-    filter:
-          filter <string> -> show only debugs with this
-          nofilter        -> disable the filter
-* Please type the command and press enter to execute.(? or h for this help)
-***
-(V) HDLC frame:
-(V) 7E A1 1E 41  08 83 13 EE  EE E6 E7 00  0F 40 00 00
-(V) 00 00 01 0D  02 02 09 06  01 01 00 02  81 FF 0A 0B
-(V) 45 4D 42 52  49 51 5F 56  31 5F 31 02  02 09 06 00
-(V) 00 60 01 00  FF 0A 10 31  33 39 34 33  35 39 37 00
-(V) 00 00 00 00  00 00 00 02  02 09 06 00  00 60 01 07
-(V) FF 0A 04 5A  46 46 31 02  03 09 06 01  00 01 07 00
-(V) FF 06 00 00  24 F4 02 02  0F 00 16 1B  02 03 09 06
-(V) 01 00 02 07  00 FF 06 00  00 00 00 02  02 0F 00 16
-(V) 1B 02 03 09  06 01 00 03  07 00 FF 06  00 00 00 31
-(V) 02 02 0F 00  16 1D 02 03  09 06 01 00  04 07 00 FF
-(V) 06 00 00 00  00 02 02 0F  00 16 1D 02  03 09 06 01
-(V) 00 1F 07 00  FF 10 0C 6C  02 02 0F FE  16 21 02 03
-(V) 09 06 01 00  33 07 00 FF  10 00 00 02  02 0F FE 16
-(V) 21 02 03 09  06 01 00 47  07 00 FF 10  0D 68 02 02
-(V) 0F FE 16 21  02 03 09 06  01 00 20 07  00 FF 12 09
-(V) 2E 02 02 0F  FF 16 23 02  03 09 06 01  00 34 07 00
-(V) FF 12 00 00  02 02 0F FF  16 23 02 03  09 06 01 00
-(V) 48 07 00 FF  12 09 10 02  02 0F FF 16  23 2F AF 7E
-(V)
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 0D 02  02 09 06 01
-(V) 01 00 02 81  FF 0A 0B 45  4D 42 52 49  51 5F 56 31
-(V) 5F 31 02 02  09 06 00 00  60 01 00 FF  0A 10 31 33
-(V) 39 34 33 35  39 37 00 00  00 00 00 00  00 00 02 02
-(V) 09 06 00 00  60 01 07 FF  0A 04 5A 46  46 31 02 03
-(V) 09 06 01 00  01 07 00 FF  06 00 00 24  F4 02 02 0F
-(V) 00 16 1B 02  03 09 06 01  00 02 07 00  FF 06 00 00
-(V) 00 00 02 02  0F 00 16 1B  02 03 09 06  01 00 03 07
-(V) 00 FF 06 00  00 00 31 02  02 0F 00 16  1D 02 03 09
-(V) 06 01 00 04  07 00 FF 06  00 00 00 00  02 02 0F 00
-(V) 16 1D 02 03  09 06 01 00  1F 07 00 FF  10 0C 6C 02
-(V) 02 0F FE 16  21 02 03 09  06 01 00 33  07 00 FF 10
-(V) 00 00 02 02  0F FE 16 21  02 03 09 06  01 00 47 07
-(V) 00 FF 10 0D  68 02 02 0F  FE 16 21 02  03 09 06 01
-(V) 00 20 07 00  FF 12 09 2E  02 02 0F FF  16 23 02 03
-(V) 09 06 01 00  34 07 00 FF  12 00 00 02  02 0F FF 16
-(V) 23 02 03 09  06 01 00 48  07 00 FF 12  09 10 02 02
-(V) 0F FF 16 23
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 0D  02 02 09 06  01 01 00 02
-(V) 81 FF 0A 0B  45 4D 42 52  49 51 5F 56  31 5F 31 02
-(V) 02 09 06 00  00 60 01 00  FF 0A 10 31  33 39 34 33
-(V) 35 39 37 00  00 00 00 00  00 00 00 02  02 09 06 00
-(V) 00 60 01 07  FF 0A 04 5A  46 46 31 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 F4 02 02  0F 00 16 1B
-(V) 02 03 09 06  01 00 02 07  00 FF 06 00  00 00 00 02
-(V) 02 0F 00 16  1B 02 03 09  06 01 00 03  07 00 FF 06
-(V) 00 00 00 31  02 02 0F 00  16 1D 02 03  09 06 01 00
-(V) 04 07 00 FF  06 00 00 00  00 02 02 0F  00 16 1D 02
-(V) 03 09 06 01  00 1F 07 00  FF 10 0C 6C  02 02 0F FE
-(V) 16 21 02 03  09 06 01 00  33 07 00 FF  10 00 00 02
-(V) 02 0F FE 16  21 02 03 09  06 01 00 47  07 00 FF 10
-(V) 0D 68 02 02  0F FE 16 21  02 03 09 06  01 00 20 07
-(V) 00 FF 12 09  2E 02 02 0F  FF 16 23 02  03 09 06 01
-(V) 00 34 07 00  FF 12 00 00  02 02 0F FF  16 23 02 03
-(V) 09 06 01 00  48 07 00 FF  12 09 10 02  02 0F FF 16
-(V) 23
-(D) Received valid DLMS at 18 +267
-(V) Using application data:
-(V) 01 0D 02 02  09 06 01 01  00 02 81 FF  0A 0B 45 4D
-(V) 42 52 49 51  5F 56 31 5F  31 02 02 09  06 00 00 60
-(V) 01 00 FF 0A  10 31 33 39  34 33 35 39  37 00 00 00
-(V) 00 00 00 00  00 02 02 09  06 00 00 60  01 07 FF 0A
-(V) 04 5A 46 46  31 02 03 09  06 01 00 01  07 00 FF 06
-(V) 00 00 24 F4  02 02 0F 00  16 1B 02 03  09 06 01 00
-(V) 02 07 00 FF  06 00 00 00  00 02 02 0F  00 16 1B 02
-(V) 03 09 06 01  00 03 07 00  FF 06 00 00  00 31 02 02
-(V) 0F 00 16 1D  02 03 09 06  01 00 04 07  00 FF 06 00
-(V) 00 00 00 02  02 0F 00 16  1D 02 03 09  06 01 00 1F
-(V) 07 00 FF 10  0C 6C 02 02  0F FE 16 21  02 03 09 06
-(V) 01 00 33 07  00 FF 10 00  00 02 02 0F  FE 16 21 02
-(V) 03 09 06 01  00 47 07 00  FF 10 0D 68  02 02 0F FE
-(V) 16 21 02 03  09 06 01 00  20 07 00 FF  12 09 2E 02
-(V) 02 0F FF 16  23 02 03 09  06 01 00 34  07 00 FF 12
-(V) 00 00 02 02  0F FF 16 23  02 03 09 06  01 00 48 07
-(V) 00 FF 12 09  10 02 02 0F  FF 16 23
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:06 UTC, meter clock: 00:00:00, list type 2, est: 1)
-(V) HDLC frame:
-(V) 7E A0 2A 41  08 83 13 04  13 E6 E7 00  0F 40 00 00
-(V) 00 00 01 01  02 03 09 06  01 00 01 07  00 FF 06 00
-(V) 00 24 F4 02  02 0F 00 16  1B A7 7F 7E
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 01 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 F4 02 02  0F 00 16 1B
-(V)
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 01  02 03 09 06  01 00 01 07
-(V) 00 FF 06 00  00 24 F4 02  02 0F 00 16  1B
-(D) Received valid DLMS at 18 +23
-(V) Using application data:
-(V) 01 01 02 03  09 06 01 00  01 07 00 FF  06 00 00 24
-(V) F4 02 02 0F  00 16 1B
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:07 UTC, meter clock: 00:00:00, list type 1, est: 1)
-(V) HDLC frame:
-(V) 7E A0 2A 41  08 83 13 04  13 E6 E7 00  0F 40 00 00
-(V) 00 00 01 01  02 03 09 06  01 00 01 07  00 FF 06 00
-(V) 00 24 F4 02  02 0F 00 16  1B A7 7F 7E
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 01 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 F4 02 02  0F 00 16 1B
-(V)
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 01  02 03 09 06  01 00 01 07
-(V) 00 FF 06 00  00 24 F4 02  02 0F 00 16  1B
-(D) Received valid DLMS at 18 +23
-(V) Using application data:
-(V) 01 01 02 03  09 06 01 00  01 07 00 FF  06 00 00 24
-(V) F4 02 02 0F  00 16 1B
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:10 UTC, meter clock: 00:00:00, list type 1, est: 1)
-(V) HDLC frame:
-(V) 7E A0 2A 41  08 83 13 04  13 E6 E7 00  0F 40 00 00
-(V) 00 00 01 01  02 03 09 06  01 00 01 07  00 FF 06 00
-(V) 00 24 E0 02  02 0F 00 16  1B 18 A5 7E
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 01 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 E0 02 02  0F 00 16 1B
-(V)
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 01  02 03 09 06  01 00 01 07
-(V) 00 FF 06 00  00 24 E0 02  02 0F 00 16  1B
-(D) Received valid DLMS at 18 +23
-(V) Using application data:
-(V) 01 01 02 03  09 06 01 00  01 07 00 FF  06 00 00 24
-(V) E0 02 02 0F  00 16 1B
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:12 UTC, meter clock: 00:00:00, list type 1, est: 1)
-(V) HDLC frame:
-(V) 7E A1 1E 41  08 83 13 EE  EE E6 E7 00  0F 40 00 00
-(V) 00 00 01 0D  02 02 09 06  01 01 00 02  81 FF 0A 0B
-(V) 45 4D 42 52  49 51 5F 56  31 5F 31 02  02 09 06 00
-(V) 00 60 01 00  FF 0A 10 31  33 39 34 33  35 39 37 00
-(V) 00 00 00 00  00 00 00 02  02 09 06 00  00 60 01 07
-(V) FF 0A 04 00  00 00 00 02  03 09 06 01  00 01 07 00
-(V) FF 06 00 00  24 E0 02 02  0F 00 16 1B  02 03 09 06
-(V) 01 00 02 07  00 FF 06 00  00 00 00 02  02 0F 00 16
-(V) 1B 02 03 09  06 01 00 03  07 00 FF 06  00 00 00 28
-(V) 02 02 0F 00  16 1D 02 03  09 06 01 00  04 07 00 FF
-(V) 06 00 00 00  00 02 02 0F  00 16 1D 02  03 09 06 01
-(V) 00 1F 07 00  FF 10 0C 68  02 02 0F FE  16 21 02 03
-(V) 09 06 01 00  33 07 00 FF  10 00 00 02  02 0F FE 16
-(V) 21 02 03 09  06 01 00 47  07 00 FF 10  0D 5D 02 02
-(V) 0F FE 16 21  02 03 09 06  01 00 20 07  00 FF 12 09
-(V) 2E 02 02 0F  FF 16 23 02  03 09 06 01  00 34 07 00
-(V) FF 12 00 00  02 02 0F FF  16 23 02 03  09 06 01 00
-(V) 48 07 00 FF  12 09 10 02  02 0F FF 16  23 AE 9D 7E
-(V)
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 0D 02  02 09 06 01
-(V) 01 00 02 81  FF 0A 0B 45  4D 42 52 49  51 5F 56 31
-(V) 5F 31 02 02  09 06 00 00  60 01 00 FF  0A 10 31 33
-(V) 39 34 33 35  39 37 00 00  00 00 00 00  00 00 02 02
-(V) 09 06 00 00  60 01 07 FF  0A 04 00 00  00 00 02 03
-(V) 09 06 01 00  01 07 00 FF  06 00 00 24  E0 02 02 0F
-(V) 00 16 1B 02  03 09 06 01  00 02 07 00  FF 06 00 00
-(V) 00 00 02 02  0F 00 16 1B  02 03 09 06  01 00 03 07
-(V) 00 FF 06 00  00 00 28 02  02 0F 00 16  1D 02 03 09
-(V) 06 01 00 04  07 00 FF 06  00 00 00 00  02 02 0F 00
-(V) 16 1D 02 03  09 06 01 00  1F 07 00 FF  10 0C 68 02
-(V) 02 0F FE 16  21 02 03 09  06 01 00 33  07 00 FF 10
-(V) 00 00 02 02  0F FE 16 21  02 03 09 06  01 00 47 07
-(V) 00 FF 10 0D  5D 02 02 0F  FE 16 21 02  03 09 06 01
-(V) 00 20 07 00  FF 12 09 2E  02 02 0F FF  16 23 02 03
-(V) 09 06 01 00  34 07 00 FF  12 00 00 02  02 0F FF 16
-(V) 23 02 03 09  06 01 00 48  07 00 FF 12  09 10 02 02
-(V) 0F FF 16 23
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 0D  02 02 09 06  01 01 00 02
-(V) 81 FF 0A 0B  45 4D 42 52  49 51 5F 56  31 5F 31 02
-(V) 02 09 06 00  00 60 01 00  FF 0A 10 31  33 39 34 33
-(V) 35 39 37 00  00 00 00 00  00 00 00 02  02 09 06 00
-(V) 00 60 01 07  FF 0A 04 00  00 00 00 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 E0 02 02  0F 00 16 1B
-(V) 02 03 09 06  01 00 02 07  00 FF 06 00  00 00 00 02
-(V) 02 0F 00 16  1B 02 03 09  06 01 00 03  07 00 FF 06
-(V) 00 00 00 28  02 02 0F 00  16 1D 02 03  09 06 01 00
-(V) 04 07 00 FF  06 00 00 00  00 02 02 0F  00 16 1D 02
-(V) 03 09 06 01  00 1F 07 00  FF 10 0C 68  02 02 0F FE
-(V) 16 21 02 03  09 06 01 00  33 07 00 FF  10 00 00 02
-(V) 02 0F FE 16  21 02 03 09  06 01 00 47  07 00 FF 10
-(V) 0D 5D 02 02  0F FE 16 21  02 03 09 06  01 00 20 07
-(V) 00 FF 12 09  2E 02 02 0F  FF 16 23 02  03 09 06 01
-(V) 00 34 07 00  FF 12 00 00  02 02 0F FF  16 23 02 03
-(V) 09 06 01 00  48 07 00 FF  12 09 10 02  02 0F FF 16
-(V) 23
-(D) Received valid DLMS at 18 +267
-(V) Using application data:
-(V) 01 0D 02 02  09 06 01 01  00 02 81 FF  0A 0B 45 4D
-(V) 42 52 49 51  5F 56 31 5F  31 02 02 09  06 00 00 60
-(V) 01 00 FF 0A  10 31 33 39  34 33 35 39  37 00 00 00
-(V) 00 00 00 00  00 02 02 09  06 00 00 60  01 07 FF 0A
-(V) 04 00 00 00  00 02 03 09  06 01 00 01  07 00 FF 06
-(V) 00 00 24 E0  02 02 0F 00  16 1B 02 03  09 06 01 00
-(V) 02 07 00 FF  06 00 00 00  00 02 02 0F  00 16 1B 02
-(V) 03 09 06 01  00 03 07 00  FF 06 00 00  00 28 02 02
-(V) 0F 00 16 1D  02 03 09 06  01 00 04 07  00 FF 06 00
-(V) 00 00 00 02  02 0F 00 16  1D 02 03 09  06 01 00 1F
-(V) 07 00 FF 10  0C 68 02 02  0F FE 16 21  02 03 09 06
-(V) 01 00 33 07  00 FF 10 00  00 02 02 0F  FE 16 21 02
-(V) 03 09 06 01  00 47 07 00  FF 10 0D 5D  02 02 0F FE
-(V) 16 21 02 03  09 06 01 00  20 07 00 FF  12 09 2E 02
-(V) 02 0F FF 16  23 02 03 09  06 01 00 34  07 00 FF 12
-(V) 00 00 02 02  0F FF 16 23  02 03 09 06  01 00 48 07
-(V) 00 FF 12 09  10 02 02 0F  FF 16 23
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:16 UTC, meter clock: 00:00:00, list type 2, est: 1)
-(V) HDLC frame:
-(V) 7E A0 2A 41  08 83 13 04  13 E6 E7 00  0F 40 00 00
-(V) 00 00 01 01  02 03 09 06  01 00 01 07  00 FF 06 00
-(V) 00 24 E0 02  02 0F 00 16  1B 18 A5 7E
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 01 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 E0 02 02  0F 00 16 1B
-(V)
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 01  02 03 09 06  01 00 01 07
-(V) 00 FF 06 00  00 24 E0 02  02 0F 00 16  1B
-(D) Received valid DLMS at 18 +23
-(V) Using application data:
-(V) 01 01 02 03  09 06 01 00  01 07 00 FF  06 00 00 24
-(V) E0 02 02 0F  00 16 1B
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:17 UTC, meter clock: 00:00:00, list type 1, est: 1)
-(V) HDLC frame:
-(V) 7E A0 2A 41  08 83 13 04  13 E6 E7 00  0F 40 00 00
-(V) 00 00 01 01  02 03 09 06  01 00 01 07  00 FF 06 00
-(V) 00 24 A4 02  02 0F 00 16  1B 68 0D 7E
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 01 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 A4 02 02  0F 00 16 1B
-(V)
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 01  02 03 09 06  01 00 01 07
-(V) 00 FF 06 00  00 24 A4 02  02 0F 00 16  1B
-(D) Received valid DLMS at 18 +23
-(V) Using application data:
-(V) 01 01 02 03  09 06 01 00  01 07 00 FF  06 00 00 24
-(V) A4 02 02 0F  00 16 1B
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:20 UTC, meter clock: 00:00:00, list type 1, est: 1)
-(V) HDLC frame:
-(V) 7E A0 2A 41  08 83 13 04  13 E6 E7 00  0F 40 00 00
-(V) 00 00 01 01  02 03 09 06  01 00 01 07  00 FF 06 00
-(V) 00 24 A4 02  02 0F 00 16  1B 68 0D 7E
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 01 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 A4 02 02  0F 00 16 1B
-(V)
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 01  02 03 09 06  01 00 01 07
-(V) 00 FF 06 00  00 24 A4 02  02 0F 00 16  1B
-(D) Received valid DLMS at 18 +23
-(V) Using application data:
-(V) 01 01 02 03  09 06 01 00  01 07 00 FF  06 00 00 24
-(V) A4 02 02 0F  00 16 1B
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:22 UTC, meter clock: 00:00:00, list type 1, est: 1)
-(V) HDLC frame:
-(V) 7E A1 1E 41  08 83 13 EE  EE E6 E7 00  0F 40 00 00
-(V) 00 00 01 0D  02 02 09 06  01 01 00 02  81 FF 0A 0B
-(V) 45 4D 42 52  49 51 5F 56  31 5F 31 02  02 09 06 00
-(V) 00 60 01 00  FF 0A 10 31  33 39 34 33  35 39 37 00
-(V) 00 00 00 00  00 00 00 02  02 09 06 00  00 60 01 07
-(V) FF 0A 04 5A  46 46 31 02  03 09 06 01  00 01 07 00
-(V) FF 06 00 00  24 A4 02 02  0F 00 16 1B  02 03 09 06
-(V) 01 00 02 07  00 FF 06 00  00 00 00 02  02 0F 00 16
-(V) 1B 02 03 09  06 01 00 03  07 00 FF 06  00 00 00 31
-(V) 02 02 0F 00  16 1D 02 03  09 06 01 00  04 07 00 FF
-(V) 06 00 00 00  00 02 02 0F  00 16 1D 02  03 09 06 01
-(V) 00 1F 07 00  FF 10 0C 6E  02 02 0F FE  16 21 02 03
-(V) 09 06 01 00  33 07 00 FF  10 00 00 02  02 0F FE 16
-(V) 21 02 03 09  06 01 00 47  07 00 FF 10  0D 5C 02 02
-(V) 0F FE 16 21  02 03 09 06  01 00 20 07  00 FF 12 09
-(V) 38 02 02 0F  FF 16 23 02  03 09 06 01  00 34 07 00
-(V) FF 12 00 00  02 02 0F FF  16 23 02 03  09 06 01 00
-(V) 48 07 00 FF  12 09 10 02  02 0F FF 16  23 4A DF 7E
-(V)
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 0D 02  02 09 06 01
-(V) 01 00 02 81  FF 0A 0B 45  4D 42 52 49  51 5F 56 31
-(V) 5F 31 02 02  09 06 00 00  60 01 00 FF  0A 10 31 33
-(V) 39 34 33 35  39 37 00 00  00 00 00 00  00 00 02 02
-(V) 09 06 00 00  60 01 07 FF  0A 04 5A 46  46 31 02 03
-(V) 09 06 01 00  01 07 00 FF  06 00 00 24  A4 02 02 0F
-(V) 00 16 1B 02  03 09 06 01  00 02 07 00  FF 06 00 00
-(V) 00 00 02 02  0F 00 16 1B  02 03 09 06  01 00 03 07
-(V) 00 FF 06 00  00 00 31 02  02 0F 00 16  1D 02 03 09
-(V) 06 01 00 04  07 00 FF 06  00 00 00 00  02 02 0F 00
-(V) 16 1D 02 03  09 06 01 00  1F 07 00 FF  10 0C 6E 02
-(V) 02 0F FE 16  21 02 03 09  06 01 00 33  07 00 FF 10
-(V) 00 00 02 02  0F FE 16 21  02 03 09 06  01 00 47 07
-(V) 00 FF 10 0D  5C 02 02 0F  FE 16 21 02  03 09 06 01
-(V) 00 20 07 00  FF 12 09 38  02 02 0F FF  16 23 02 03
-(V) 09 06 01 00  34 07 00 FF  12 00 00 02  02 0F FF 16
-(V) 23 02 03 09  06 01 00 48  07 00 FF 12  09 10 02 02
-(V) 0F FF 16 23
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 0D  02 02 09 06  01 01 00 02
-(V) 81 FF 0A 0B  45 4D 42 52  49 51 5F 56  31 5F 31 02
-(V) 02 09 06 00  00 60 01 00  FF 0A 10 31  33 39 34 33
-(V) 35 39 37 00  00 00 00 00  00 00 00 02  02 09 06 00
-(V) 00 60 01 07  FF 0A 04 5A  46 46 31 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 A4 02 02  0F 00 16 1B
-(V) 02 03 09 06  01 00 02 07  00 FF 06 00  00 00 00 02
-(V) 02 0F 00 16  1B 02 03 09  06 01 00 03  07 00 FF 06
-(V) 00 00 00 31  02 02 0F 00  16 1D 02 03  09 06 01 00
-(V) 04 07 00 FF  06 00 00 00  00 02 02 0F  00 16 1D 02
-(V) 03 09 06 01  00 1F 07 00  FF 10 0C 6E  02 02 0F FE
-(V) 16 21 02 03  09 06 01 00  33 07 00 FF  10 00 00 02
-(V) 02 0F FE 16  21 02 03 09  06 01 00 47  07 00 FF 10
-(V) 0D 5C 02 02  0F FE 16 21  02 03 09 06  01 00 20 07
-(V) 00 FF 12 09  38 02 02 0F  FF 16 23 02  03 09 06 01
-(V) 00 34 07 00  FF 12 00 00  02 02 0F FF  16 23 02 03
-(V) 09 06 01 00  48 07 00 FF  12 09 10 02  02 0F FF 16
-(V) 23
-(D) Received valid DLMS at 18 +267
-(V) Using application data:
-(V) 01 0D 02 02  09 06 01 01  00 02 81 FF  0A 0B 45 4D
-(V) 42 52 49 51  5F 56 31 5F  31 02 02 09  06 00 00 60
-(V) 01 00 FF 0A  10 31 33 39  34 33 35 39  37 00 00 00
-(V) 00 00 00 00  00 02 02 09  06 00 00 60  01 07 FF 0A
-(V) 04 5A 46 46  31 02 03 09  06 01 00 01  07 00 FF 06
-(V) 00 00 24 A4  02 02 0F 00  16 1B 02 03  09 06 01 00
-(V) 02 07 00 FF  06 00 00 00  00 02 02 0F  00 16 1B 02
-(V) 03 09 06 01  00 03 07 00  FF 06 00 00  00 31 02 02
-(V) 0F 00 16 1D  02 03 09 06  01 00 04 07  00 FF 06 00
-(V) 00 00 00 02  02 0F 00 16  1D 02 03 09  06 01 00 1F
-(V) 07 00 FF 10  0C 6E 02 02  0F FE 16 21  02 03 09 06
-(V) 01 00 33 07  00 FF 10 00  00 02 02 0F  FE 16 21 02
-(V) 03 09 06 01  00 47 07 00  FF 10 0D 5C  02 02 0F FE
-(V) 16 21 02 03  09 06 01 00  20 07 00 FF  12 09 38 02
-(V) 02 0F FF 16  23 02 03 09  06 01 00 34  07 00 FF 12
-(V) 00 00 02 02  0F FF 16 23  02 03 09 06  01 00 48 07
-(V) 00 FF 12 09  10 02 02 0F  FF 16 23
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:26 UTC, meter clock: 00:00:00, list type 2, est: 1)
-(V) HDLC frame:
-(V) 7E A0 2A 41  08 83 13 04  13 E6 E7 00  0F 40 00 00
- (V) 00 00 01 01  02 03 09 06  01 00 01 07  00 FF 06 00
-(V) 00 24 B8 02  02 0F 00 16  1B 3B 09 7E
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 01 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 B8 02 02  0F 00 16 1B
-(V)
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 01  02 03 09 06  01 00 01 07
-(V) 00 FF 06 00  00 24 B8 02  02 0F 00 16  1B
-(D) Received valid DLMS at 18 +23
-(V) Using application data:
-(V) 01 01 02 03  09 06 01 00  01 07 00 FF  06 00 00 24
-(V) B8 02 02 0F  00 16 1B
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:27 UTC, meter clock: 00:00:00, list type 1, est: 1)
-(V) HDLC frame:
-(V) 7E A0 2A 41  08 83 13 04  13 E6 E7 00  0F 40 00 00
-(V) 00 00 01 01  02 03 09 06  01 00 01 07  00 FF 06 00
-(V) 00 24 B8 02  02 0F 00 16  1B 3B 09 7E
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 01 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 B8 02 02  0F 00 16 1B
-(V)
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 01  02 03 09 06  01 00 01 07
-(V) 00 FF 06 00  00 24 B8 02  02 0F 00 16  1B
-(D) Received valid DLMS at 18 +23
-(V) Using application data:
-(V) 01 01 02 03  09 06 01 00  01 07 00 FF  06 00 00 24
-(V) B8 02 02 0F  00 16 1B
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:29 UTC, meter clock: 00:00:00, list type 1, est: 1)
-(V) HDLC frame:
-(V) 7E A0 2A 41  08 83 13 04  13 E6 E7 00  0F 40 00 00
-(V) 00 00 01 01  02 03 09 06  01 00 01 07  00 FF 06 00
-(V) 00 24 B8 02  02 0F 00 16  1B 3B 09 7E
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 01 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 B8 02 02  0F 00 16 1B
-(V)
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 01  02 03 09 06  01 00 01 07
-(V) 00 FF 06 00  00 24 B8 02  02 0F 00 16  1B
-(D) Received valid DLMS at 18 +23
-(V) Using application data:
-(V) 01 01 02 03  09 06 01 00  01 07 00 FF  06 00 00 24
-(V) B8 02 02 0F  00 16 1B
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:32 UTC, meter clock: 00:00:00, list type 1, est: 1)
-q(V) HDLC frame:
-(V) 7E A1 1E 41  08 83 13 EE  EE E6 E7 00  0F 40 00 00
-(V) 00 00 01 0D  02 02 09 06  01 01 00 02  81 FF 0A 0B
-(V) 45 4D 42 52  49 51 5F 56  31 5F 31 02  02 09 06 00
-(V) 00 60 01 00  FF 0A 10 31  33 39 34 33  35 39 37 00
-(V) 00 00 00 00  00 00 00 02  02 09 06 00  00 60 01 07
-(V) FF 0A 04 5A  46 46 31 02  03 09 06 01  00 01 07 00
-(V) FF 06 00 00  24 A4 02 02  0F 00 16 1B  02 03 09 06
-(V) 01 00 02 07  00 FF 06 00  00 00 00 02  02 0F 00 16
-(V) 1B 02 03 09  06 01 00 03  07 00 FF 06  00 00 00 46
-(V) 02 02 0F 00  16 1D 02 03  09 06 01 00  04 07 00 FF
-(V) 06 00 00 00  00 02 02 0F  00 16 1D 02  03 09 06 01
-(V) 00 1F 07 00  FF 10 0C 67  02 02 0F FE  16 21 02 03
-(V) 09 06 01 00  33 07 00 FF  10 00 00 02  02 0F FE 16
-(V) 21 02 03 09  06 01 00 47  07 00 FF 10  0D 5D 02 02
-(V) 0F FE 16 21  02 03 09 06  01 00 20 07  00 FF 12 09
-(V) 2E 02 02 0F  FF 16 23 02  03 09 06 01  00 34 07 00
-(V) FF 12 00 00  02 02 0F FF  16 23 02 03  09 06 01 00
-(V) 48 07 00 FF  12 09 06 02  02 0F FF 16  23 3A 49 7E
-(V)
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 0D 02  02 09 06 01
-(V) 01 00 02 81  FF 0A 0B 45  4D 42 52 49  51 5F 56 31
-(V) 5F 31 02 02  09 06 00 00  60 01 00 FF  0A 10 31 33
-(V) 39 34 33 35  39 37 00 00  00 00 00 00  00 00 02 02
-(V) 09 06 00 00  60 01 07 FF  0A 04 5A 46  46 31 02 03
-(V) 09 06 01 00  01 07 00 FF  06 00 00 24  A4 02 02 0F
-(V) 00 16 1B 02  03 09 06 01  00 02 07 00  FF 06 00 00
-(V) 00 00 02 02  0F 00 16 1B  02 03 09 06  01 00 03 07
-(V) 00 FF 06 00  00 00 46 02  02 0F 00 16  1D 02 03 09
-(V) 06 01 00 04  07 00 FF 06  00 00 00 00  02 02 0F 00
-(V) 16 1D 02 03  09 06 01 00  1F 07 00 FF  10 0C 67 02
-(V) 02 0F FE 16  21 02 03 09  06 01 00 33  07 00 FF 10
-(V) 00 00 02 02  0F FE 16 21  02 03 09 06  01 00 47 07
-(V) 00 FF 10 0D  5D 02 02 0F  FE 16 21 02  03 09 06 01
-(V) 00 20 07 00  FF 12 09 2E  02 02 0F FF  16 23 02 03
-(V) 09 06 01 00  34 07 00 FF  12 00 00 02  02 0F FF 16
-(V) 23 02 03 09  06 01 00 48  07 00 FF 12  09 06 02 02
-(V) 0F FF 16 23
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 0D  02 02 09 06  01 01 00 02
-(V) 81 FF 0A 0B  45 4D 42 52  49 51 5F 56  31 5F 31 02
-(V) 02 09 06 00  00 60 01 00  FF 0A 10 31  33 39 34 33
-(V) 35 39 37 00  00 00 00 00  00 00 00 02  02 09 06 00
-(V) 00 60 01 07  FF 0A 04 5A  46 46 31 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 A4 02 02  0F 00 16 1B
-(V) 02 03 09 06  01 00 02 07  00 FF 06 00  00 00 00 02
-(V) 02 0F 00 16  1B 02 03 09  06 01 00 03  07 00 FF 06
-(V) 00 00 00 46  02 02 0F 00  16 1D 02 03  09 06 01 00
-(V) 04 07 00 FF  06 00 00 00  00 02 02 0F  00 16 1D 02
-(V) 03 09 06 01  00 1F 07 00  FF 10 0C 67  02 02 0F FE
-(V) 16 21 02 03  09 06 01 00  33 07 00 FF  10 00 00 02
-(V) 02 0F FE 16  21 02 03 09  06 01 00 47  07 00 FF 10
-(V) 0D 5D 02 02  0F FE 16 21  02 03 09 06  01 00 20 07
-(V) 00 FF 12 09  2E 02 02 0F  FF 16 23 02  03 09 06 01
-(V) 00 34 07 00  FF 12 00 00  02 02 0F FF  16 23 02 03
-(V) 09 06 01 00  48 07 00 FF  12 09 06 02  02 0F FF 16
-(V) 23
-(D) Received valid DLMS at 18 +267
-(V) Using application data:
-(V) 01 0D 02 02  09 06 01 01  00 02 81 FF  0A 0B 45 4D
-(V) 42 52 49 51  5F 56 31 5F  31 02 02 09  06 00 00 60
-(V) 01 00 FF 0A  10 31 33 39  34 33 35 39  37 00 00 00
-(V) 00 00 00 00  00 02 02 09  06 00 00 60  01 07 FF 0A
-(V) 04 5A 46 46  31 02 03 09  06 01 00 01  07 00 FF 06
-(V) 00 00 24 A4  02 02 0F 00  16 1B 02 03  09 06 01 00
-(V) 02 07 00 FF  06 00 00 00  00 02 02 0F  00 16 1B 02
-(V) 03 09 06 01  00 03 07 00  FF 06 00 00  00 46 02 02
-(V) 0F 00 16 1D  02 03 09 06  01 00 04 07  00 FF 06 00
-(V) 00 00 00 02  02 0F 00 16  1D 02 03 09  06 01 00 1F
-(V) 07 00 FF 10  0C 67 02 02  0F FE 16 21  02 03 09 06
-(V) 01 00 33 07  00 FF 10 00  00 02 02 0F  FE 16 21 02
-(V) 03 09 06 01  00 47 07 00  FF 10 0D 5D  02 02 0F FE
-(V) 16 21 02 03  09 06 01 00  20 07 00 FF  12 09 2E 02
-(V) 02 0F FF 16  23 02 03 09  06 01 00 34  07 00 FF 12
-(V) 00 00 02 02  0F FF 16 23  02 03 09 06  01 00 48 07
-(V) 00 FF 12 09  06 02 02 0F  FF 16 23
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:36 UTC, meter clock: 00:00:00, list type 2, est: 1)
-(V) HDLC frame:
-(V) 7E A0 2A 41  08 83 13 04  13 E6 E7 00  0F 40 00 00
-(V) 00 00 01 01  02 03 09 06  01 00 01 07  00 FF 06 00
-(V) 00 24 A4 02  02 0F 00 16  1B 68 0D 7E
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 01 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 A4 02 02  0F 00 16 1B
-(V)
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 01  02 03 09 06  01 00 01 07
-(V) 00 FF 06 00  00 24 A4 02  02 0F 00 16  1B
-(D) Received valid DLMS at 18 +23
-(V) Using application data:
-(V) 01 01 02 03  09 06 01 00  01 07 00 FF  06 00 00 24
-(V) A4 02 02 0F  00 16 1B
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:37 UTC, meter clock: 00:00:00, list type 1, est: 1)
-(V) HDLC frame:
-(V) 7E A0 2A 41  08 83 13 04  13 E6 E7 00  0F 40 00 00
-(V) 00 00 01 01  02 03 09 06  01 00 01 07  00 FF 06 00
-(V) 00 24 A4 02  02 0F 00 16  1B 68 0D 7E
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 01 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 A4 02 02  0F 00 16 1B
-(V)
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 01  02 03 09 06  01 00 01 07
-(V) 00 FF 06 00  00 24 A4 02  02 0F 00 16  1B
-(D) Received valid DLMS at 18 +23
-(V) Using application data:
-(V) 01 01 02 03  09 06 01 00  01 07 00 FF  06 00 00 24
-(V) A4 02 02 0F  00 16 1B
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:39 UTC, meter clock: 00:00:00, list type 1, est: 1)
-(V) HDLC frame:
-(V) 7E A0 2A 41  08 83 13 04  13 E6 E7 00  0F 40 00 00
-(V) 00 00 01 01  02 03 09 06  01 00 01 07  00 FF 06 00
-(V) 00 24 D5 02  02 0F 00 16  1B F1 83 7E
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 01 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 D5 02 02  0F 00 16 1B
-(V)
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 01  02 03 09 06  01 00 01 07
-(V) 00 FF 06 00  00 24 D5 02  02 0F 00 16  1B
-(D) Received valid DLMS at 18 +23
-(V) Using application data:
-(V) 01 01 02 03  09 06 01 00  01 07 00 FF  06 00 00 24
-(V) D5 02 02 0F  00 16 1B
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:42 UTC, meter clock: 00:00:00, list type 1, est: 1)
-(V) HDLC frame:
-(V) 7E A1 1E 41  08 83 13 EE  EE E6 E7 00  0F 40 00 00
-(V) 00 00 01 0D  02 02 09 06  01 01 00 02  81 FF 0A 0B
-(V) 45 4D 42 52  49 51 5F 56  31 5F 31 02  02 09 06 00
-(V) 00 60 01 00  FF 0A 10 31  33 39 34 33  35 39 37 00
-(V) 00 00 00 00  00 00 00 02  02 09 06 00  00 60 01 07
-(V) FF 0A 04 5A  46 46 31 02  03 09 06 01  00 01 07 00
-(V) FF 06 00 00  24 D5 02 02  0F 00 16 1B  02 03 09 06
-(V) 01 00 02 07  00 FF 06 00  00 00 00 02  02 0F 00 16
-(V) 1B 02 03 09  06 01 00 03  07 00 FF 06  00 00 00 3C
-(V) 02 02 0F 00  16 1D 02 03  09 06 01 00  04 07 00 FF
-(V) 06 00 00 00  00 02 02 0F  00 16 1D 02  03 09 06 01
-(V) 00 1F 07 00  FF 10 0C 77  02 02 0F FE  16 21 02 03
-(V) 09 06 01 00  33 07 00 FF  10 00 00 02  02 0F FE 16
-(V) 21 02 03 09  06 01 00 47  07 00 FF 10  0D 5F 02 02
-(V) 0F FE 16 21  02 03 09 06  01 00 20 07  00 FF 12 09
-(V) 2E 02 02 0F  FF 16 23 02  03 09 06 01  00 34 07 00
-(V) FF 12 00 00  02 02 0F FF  16 23 02 03  09 06 01 00
-(V) 48 07 00 FF  12 09 06 02  02 0F FF 16  23 4A 9D 7E
-(V)
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 0D 02  02 09 06 01
-(V) 01 00 02 81  FF 0A 0B 45  4D 42 52 49  51 5F 56 31
-(V) 5F 31 02 02  09 06 00 00  60 01 00 FF  0A 10 31 33
-(V) 39 34 33 35  39 37 00 00  00 00 00 00  00 00 02 02
-(V) 09 06 00 00  60 01 07 FF  0A 04 5A 46  46 31 02 03
-(V) 09 06 01 00  01 07 00 FF  06 00 00 24  D5 02 02 0F
-(V) 00 16 1B 02  03 09 06 01  00 02 07 00  FF 06 00 00
-(V) 00 00 02 02  0F 00 16 1B  02 03 09 06  01 00 03 07
-(V) 00 FF 06 00  00 00 3C 02  02 0F 00 16  1D 02 03 09
-(V) 06 01 00 04  07 00 FF 06  00 00 00 00  02 02 0F 00
-(V) 16 1D 02 03  09 06 01 00  1F 07 00 FF  10 0C 77 02
-(V) 02 0F FE 16  21 02 03 09  06 01 00 33  07 00 FF 10
-(V) 00 00 02 02  0F FE 16 21  02 03 09 06  01 00 47 07
-(V) 00 FF 10 0D  5F 02 02 0F  FE 16 21 02  03 09 06 01
-(V) 00 20 07 00  FF 12 09 2E  02 02 0F FF  16 23 02 03
-(V) 09 06 01 00  34 07 00 FF  12 00 00 02  02 0F FF 16
-(V) 23 02 03 09  06 01 00 48  07 00 FF 12  09 06 02 02
-(V) 0F FF 16 23
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 0D  02 02 09 06  01 01 00 02
-(V) 81 FF 0A 0B  45 4D 42 52  49 51 5F 56  31 5F 31 02
-(V) 02 09 06 00  00 60 01 00  FF 0A 10 31  33 39 34 33
-(V) 35 39 37 00  00 00 00 00  00 00 00 02  02 09 06 00
-(V) 00 60 01 07  FF 0A 04 5A  46 46 31 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 D5 02 02  0F 00 16 1B
-(V) 02 03 09 06  01 00 02 07  00 FF 06 00  00 00 00 02
-(V) 02 0F 00 16  1B 02 03 09  06 01 00 03  07 00 FF 06
-(V) 00 00 00 3C  02 02 0F 00  16 1D 02 03  09 06 01 00
-(V) 04 07 00 FF  06 00 00 00  00 02 02 0F  00 16 1D 02
-(V) 03 09 06 01  00 1F 07 00  FF 10 0C 77  02 02 0F FE
-(V) 16 21 02 03  09 06 01 00  33 07 00 FF  10 00 00 02
-(V) 02 0F FE 16  21 02 03 09  06 01 00 47  07 00 FF 10
-(V) 0D 5F 02 02  0F FE 16 21  02 03 09 06  01 00 20 07
-(V) 00 FF 12 09  2E 02 02 0F  FF 16 23 02  03 09 06 01
-(V) 00 34 07 00  FF 12 00 00  02 02 0F FF  16 23 02 03
-(V) 09 06 01 00  48 07 00 FF  12 09 06 02  02 0F FF 16
-(V) 23
-(D) Received valid DLMS at 18 +267
-(V) Using application data:
-(V) 01 0D 02 02  09 06 01 01  00 02 81 FF  0A 0B 45 4D
-(V) 42 52 49 51  5F 56 31 5F  31 02 02 09  06 00 00 60
-(V) 01 00 FF 0A  10 31 33 39  34 33 35 39  37 00 00 00
-(V) 00 00 00 00  00 02 02 09  06 00 00 60  01 07 FF 0A
-(V) 04 5A 46 46  31 02 03 09  06 01 00 01  07 00 FF 06
-(V) 00 00 24 D5  02 02 0F 00  16 1B 02 03  09 06 01 00
-(V) 02 07 00 FF  06 00 00 00  00 02 02 0F  00 16 1B 02
-(V) 03 09 06 01  00 03 07 00  FF 06 00 00  00 3C 02 02
-(V) 0F 00 16 1D  02 03 09 06  01 00 04 07  00 FF 06 00
-(V) 00 00 00 02  02 0F 00 16  1D 02 03 09  06 01 00 1F
-(V) 07 00 FF 10  0C 77 02 02  0F FE 16 21  02 03 09 06
-(V) 01 00 33 07  00 FF 10 00  00 02 02 0F  FE 16 21 02
-(V) 03 09 06 01  00 47 07 00  FF 10 0D 5F  02 02 0F FE
-(V) 16 21 02 03  09 06 01 00  20 07 00 FF  12 09 2E 02
-(V) 02 0F FF 16  23 02 03 09  06 01 00 34  07 00 FF 12
-(V) 00 00 02 02  0F FF 16 23  02 03 09 06  01 00 48 07
-(V) 00 FF 12 09  06 02 02 0F  FF 16 23
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:46 UTC, meter clock: 00:00:00, list type 2, est: 1)
-qq(V) HDLC frame:
-(V) 7E A0 2A 41  08 83 13 04  13 E6 E7 00  0F 40 00 00
-(V) 00 00 01 01  02 03 09 06  01 00 01 07  00 FF 06 00
-(V) 00 24 D5 02  02 0F 00 16  1B F1 83 7E
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 01 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 D5 02 02  0F 00 16 1B
-(V)
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 01  02 03 09 06  01 00 01 07
-(V) 00 FF 06 00  00 24 D5 02  02 0F 00 16  1B
-(D) Received valid DLMS at 18 +23
-(V) Using application data:
-(V) 01 01 02 03  09 06 01 00  01 07 00 FF  06 00 00 24
-(V) D5 02 02 0F  00 16 1B
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:47 UTC, meter clock: 00:00:00, list type 1, est: 1)
-q
-* Debug: Command received: qqqqq
-(V) HDLC frame:
-(V) 7E A0 2A 41  08 83 13 04  13 E6 E7 00  0F 40 00 00
-(V) 00 00 01 01  02 03 09 06  01 00 01 07  00 FF 06 00
-(V) 00 24 B8 02  02 0F 00 16  1B 3B 09 7E
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 01 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 B8 02 02  0F 00 16 1B
-(V)
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 01  02 03 09 06  01 00 01 07
-(V) 00 FF 06 00  00 24 B8 02  02 0F 00 16  1B
-(D) Received valid DLMS at 18 +23
-(V) Using application data:
-(V) 01 01 02 03  09 06 01 00  01 07 00 FF  06 00 00 24
-(V) B8 02 02 0F  00 16 1B
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:49 UTC, meter clock: 00:00:00, list type 1, est: 1)
-(V) HDLC frame:
-(V) 7E A0 2A 41  08 83 13 04  13 E6 E7 00  0F 40 00 00
-(V) 00 00 01 01  02 03 09 06  01 00 01 07  00 FF 06 00
-(V) 00 24 B8 02  02 0F 00 16  1B 3B 09 7E
-(V) LLC frame:
-(V) E6 E7 00 0F  40 00 00 00  00 01 01 02  03 09 06 01
-(V) 00 01 07 00  FF 06 00 00  24 B8 02 02  0F 00 16 1B
-(V)
-(V) DLMS frame:
-(V) 0F 40 00 00  00 00 01 01  02 03 09 06  01 00 01 07
-(V) 00 FF 06 00  00 24 B8 02  02 0F 00 16  1B
-(D) Received valid DLMS at 18 +23
-(V) Using application data:
-(V) 01 01 02 03  09 06 01 00  01 07 00 FF  06 00 00 24
-(V) B8 02 02 0F  00 16 1B
-(V) DLMS
-(D) NOT Ready to update (internal clock 12:32:51 UTC, meter clock: 00:00:00, list type 1, est: 1)
-q
-* Debug: Command received: q
-* Closing client connection ...

frames/austria.raw

@@ -42,4 +42,4 @@ DB
 09 06 01 00 47 07 00 FF 12 00 54 02 02 0F FE 16 21 
 09 06 01 00 0D 07 00 FF 10 03 CF 02 02 0F FD 16 FF // Power factor
 09 0C 31 37 38 32 31 30 30 31 35 31 36 35 // Meter ID
-01 67
+01 67

frames/dsmr.raw

@@ -1 +0,0 @@
-2F454C4C355C3235333833333633355F410D0A0D0A302D303A312E302E302832343132313232303133343857290D0A312D303A312E382E302830303034373532322E3237382A6B5768290D0A312D303A322E382E302830303030303030302E3030312A6B5768290D0A312D303A332E382E302830303030303035392E3033392A6B76617268290D0A312D303A342E382E302830303031323537302E3937362A6B76617268290D0A312D303A312E372E3028303030312E3233312A6B57290D0A312D303A322E372E3028303030302E3030302A6B57290D0A312D303A332E372E3028303030302E3030302A6B766172290D0A312D303A342E372E3028303030302E3435312A6B766172290D0A312D303A32312E372E3028303030302E3337362A6B57290D0A312D303A34312E372E3028303030302E3832342A6B57290D0A312D303A36312E372E3028303030302E3033302A6B57290D0A312D303A32322E372E3028303030302E3030302A6B57290D0A312D303A34322E372E3028303030302E3030302A6B57290D0A312D303A36322E372E3028303030302E3030302A6B57290D0A312D303A32332E372E3028303030302E3030302A6B766172290D0A312D303A34332E372E3028303030302E3030302A6B766172290D0A312D303A36332E372E3028303030302E3030302A6B766172290D0A312D303A32342E372E3028303030302E3037322A6B766172290D0A312D303A34342E372E3028303030302E3334392A6B766172290D0A312D303A36342E372E3028303030302E3032392A6B766172290D0A312D303A33322E372E30283233322E382A56290D0A312D303A35322E372E30283233332E352A56290D0A312D303A37322E372E30283233382E352A56290D0A312D303A33312E372E30283030312E382A41290D0A312D303A35312E372E30283030342E302A41290D0A312D303A37312E372E30283030302E312A41290D0A21343736300D0A

frames/lng2.raw

@@ -1,33 +0,0 @@
-7E 
-A0 76 CE FF 03 13 3C 02 E6 E7 00 
-
-DB 
-08 4C 47 5A 67 72 A9 A1 11 
-5E 30 00 21 80 F7 FE B8 07 C6
-72 B1 90 AE AC 15 D0 AD 95 7B AC 13 7E 67 D8 A2
-F0 43 51 3C 63 B6 A1 89 10 AE 9A 7E 55 4A 12 49
-B9 6D EB A5 7B 57 03 69 9A BF 16 5E AD 2A 54 41
-65 5E 79 C6 95 71 92 46 A2 3F 5B 63 0D 53 96 7D
-42 52 1F A3 80 1C 00 E8 E3 
-A4 B3 9B 86 CB E5 2D 2C CA B0 E2 B7 
-AE 4D 
-7E
-
-
-0f00057e41 // UI Frame header
-0c07e60c0c010c232dff800000 // Date & time
-020e // Structure with 14 items
-1200ec // U1 = 236 V
-1200ec // U2 = 236 V
-1200ec // U3 = 236 V
-120000 // I1 = 0.00 A
-12002e // I2 = 0.46 A
-12001a // I3 = 0.26 A
-060000007d // Active import = 125 W
-0600000000 // Active export = 0 W
-0601a96ebd // Accumulated import = 27881.149 kWh
-0600001dc3 // Accumulated export = 7.619 kWh
-120190 // 400 ?
-120003 // 3 ?
-120120 // 288 ?
-09083330313337313831 // Meter ID = 30137181

frames/slovenia-iskra.raw

@@ -1,34 +0,0 @@
-02 12 
-09 10 49 53 4B 31 30 33 30 37 38 39 33 37 35 36 30 36 // str: ISK1030789375606 (device name)
-09 08 31 36 38 32 30 30 30 35 // str: 16820005 (device id)
-06 00 00 05 71 // active import
-06 00 00 00 00 // active export
-06 00 00 00 00 // reactive import
-06 00 00 02 E2 // reactive export
-12 09 4B // U1
-12 09 4B // U2
-12 08 F8 // U3
-12 00 67 // I1
-12 00 7D // I2
-12 02 55 // I3
-06 00 00 00 10 // L1 a+
-06 00 00 00 33 // L2 a+
-06 00 00 05 2D // L3 a+
-06 00 00 00 00 // L1 a-
-06 00 00 00 00 // L2 a-
-06 00 00 00 00 // L3 a-
-
-
-02 0C 
-09 10 49 53 4B 31 30 33 30 37 38 39 33 37 35 36 30 36 
-09 08 31 36 38 32 30 30 30 36 
-16 01 // Disconnect control
-09 02 00 01 // Currently active energy tariff
-06 00 00 CE 65 // 1.8.0 a+
-06 00 00 35 19 // 1.8.1
-06 00 00 99 4C // 1.8.2
-06 00 02 B7 07 // 2.8.0 a-
-06 00 01 33 17 // 2.8.1
-06 00 01 83 F0 // 2.8.2
-06 00 01 A5 6A // q+
-06 00 00 A8 F5 // q-

hardware/README.md

@@ -1 +1 @@
-[See Hardware page in Wiki](https://github.com/UtilitechAS/amsreader-firmware/wiki)
+[See Hardware page in Wiki](https://github.com/gskjold/AmsToMqttBridge/wiki)

hardware/v1/kicad/HAN_ESP_TSS721.kicad_prl

@@ -1,76 +0,0 @@
-{
-  "board": {
-    "active_layer": 0,
-    "active_layer_preset": "",
-    "auto_track_width": true,
-    "hidden_nets": [],
-    "high_contrast_mode": 0,
-    "net_color_mode": 1,
-    "opacity": {
-      "pads": 1.0,
-      "tracks": 1.0,
-      "vias": 1.0,
-      "zones": 0.6
-    },
-    "ratsnest_display_mode": 0,
-    "selection_filter": {
-      "dimensions": true,
-      "footprints": true,
-      "graphics": true,
-      "keepouts": true,
-      "lockedItems": true,
-      "otherItems": true,
-      "pads": true,
-      "text": true,
-      "tracks": true,
-      "vias": true,
-      "zones": true
-    },
-    "visible_items": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      7,
-      8,
-      9,
-      10,
-      11,
-      12,
-      13,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24,
-      25,
-      26,
-      27,
-      28,
-      29,
-      30,
-      32,
-      33,
-      34,
-      35,
-      36
-    ],
-    "visible_layers": "fffffff_ffffffff",
-    "zone_display_mode": 0
-  },
-  "meta": {
-    "filename": "HAN_ESP_TSS721.kicad_prl",
-    "version": 3
-  },
-  "project": {
-    "files": []
-  }
-}

hardware/v1/kicad/HAN_ESP_TSS721.kicad_pro

@@ -1,440 +0,0 @@
-{
-  "board": {
-    "design_settings": {
-      "defaults": {
-        "board_outline_line_width": 0.15,
-        "copper_line_width": 0.19999999999999998,
-        "copper_text_italic": false,
-        "copper_text_size_h": 1.5,
-        "copper_text_size_v": 1.5,
-        "copper_text_thickness": 0.3,
-        "copper_text_upright": false,
-        "courtyard_line_width": 0.049999999999999996,
-        "dimension_precision": 4,
-        "dimension_units": 3,
-        "dimensions": {
-          "arrow_length": 1270000,
-          "extension_offset": 500000,
-          "keep_text_aligned": true,
-          "suppress_zeroes": false,
-          "text_position": 0,
-          "units_format": 1
-        },
-        "fab_line_width": 0.09999999999999999,
-        "fab_text_italic": false,
-        "fab_text_size_h": 1.0,
-        "fab_text_size_v": 1.0,
-        "fab_text_thickness": 0.15,
-        "fab_text_upright": false,
-        "other_line_width": 0.09999999999999999,
-        "other_text_italic": false,
-        "other_text_size_h": 1.0,
-        "other_text_size_v": 1.0,
-        "other_text_thickness": 0.15,
-        "other_text_upright": false,
-        "pads": {
-          "drill": 0.762,
-          "height": 1.524,
-          "width": 1.524
-        },
-        "silk_line_width": 0.15,
-        "silk_text_italic": false,
-        "silk_text_size_h": 1.0,
-        "silk_text_size_v": 1.0,
-        "silk_text_thickness": 0.15,
-        "silk_text_upright": false,
-        "zones": {
-          "45_degree_only": true,
-          "min_clearance": 0.508
-        }
-      },
-      "diff_pair_dimensions": [],
-      "drc_exclusions": [],
-      "meta": {
-        "filename": "board_design_settings.json",
-        "version": 2
-      },
-      "rule_severities": {
-        "annular_width": "error",
-        "clearance": "error",
-        "copper_edge_clearance": "error",
-        "courtyards_overlap": "error",
-        "diff_pair_gap_out_of_range": "error",
-        "diff_pair_uncoupled_length_too_long": "error",
-        "drill_out_of_range": "error",
-        "duplicate_footprints": "warning",
-        "extra_footprint": "warning",
-        "footprint_type_mismatch": "error",
-        "hole_clearance": "error",
-        "hole_near_hole": "error",
-        "invalid_outline": "error",
-        "item_on_disabled_layer": "error",
-        "items_not_allowed": "error",
-        "length_out_of_range": "error",
-        "malformed_courtyard": "error",
-        "microvia_drill_out_of_range": "error",
-        "missing_courtyard": "ignore",
-        "missing_footprint": "warning",
-        "net_conflict": "warning",
-        "npth_inside_courtyard": "ignore",
-        "padstack": "error",
-        "pth_inside_courtyard": "ignore",
-        "shorting_items": "error",
-        "silk_over_copper": "warning",
-        "silk_overlap": "warning",
-        "skew_out_of_range": "error",
-        "through_hole_pad_without_hole": "error",
-        "too_many_vias": "error",
-        "track_dangling": "warning",
-        "track_width": "error",
-        "tracks_crossing": "error",
-        "unconnected_items": "error",
-        "unresolved_variable": "error",
-        "via_dangling": "warning",
-        "zone_has_empty_net": "error",
-        "zones_intersect": "error"
-      },
-      "rules": {
-        "allow_blind_buried_vias": false,
-        "allow_microvias": false,
-        "max_error": 0.005,
-        "min_clearance": 0.0,
-        "min_copper_edge_clearance": 0.075,
-        "min_hole_clearance": 0.25,
-        "min_hole_to_hole": 0.25,
-        "min_microvia_diameter": 0.19999999999999998,
-        "min_microvia_drill": 0.09999999999999999,
-        "min_silk_clearance": 0.0,
-        "min_through_hole_diameter": 0.3,
-        "min_track_width": 0.19999999999999998,
-        "min_via_annular_width": 0.049999999999999996,
-        "min_via_diameter": 0.39999999999999997,
-        "use_height_for_length_calcs": true
-      },
-      "track_widths": [
-        0.0,
-        0.2,
-        0.4,
-        0.6,
-        1.0
-      ],
-      "via_dimensions": [],
-      "zones_allow_external_fillets": false,
-      "zones_use_no_outline": true
-    },
-    "layer_presets": []
-  },
-  "boards": [],
-  "cvpcb": {
-    "equivalence_files": []
-  },
-  "erc": {
-    "erc_exclusions": [],
-    "meta": {
-      "version": 0
-    },
-    "pin_map": [
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        2,
-        0,
-        1,
-        0,
-        0,
-        1,
-        0,
-        2,
-        2,
-        2,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
-        1,
-        0,
-        1,
-        2
-      ],
-      [
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        2,
-        1,
-        1,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        1,
-        1,
-        1,
-        1,
-        1,
-        0,
-        1,
-        1,
-        1,
-        1,
-        1,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        1,
-        0,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        2,
-        1,
-        2,
-        0,
-        0,
-        1,
-        0,
-        2,
-        2,
-        2,
-        2
-      ],
-      [
-        0,
-        2,
-        0,
-        1,
-        0,
-        0,
-        1,
-        0,
-        2,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        2,
-        1,
-        1,
-        0,
-        0,
-        1,
-        0,
-        2,
-        0,
-        0,
-        2
-      ],
-      [
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2
-      ]
-    ],
-    "rule_severities": {
-      "bus_definition_conflict": "error",
-      "bus_entry_needed": "error",
-      "bus_label_syntax": "error",
-      "bus_to_bus_conflict": "error",
-      "bus_to_net_conflict": "error",
-      "different_unit_footprint": "error",
-      "different_unit_net": "error",
-      "duplicate_reference": "error",
-      "duplicate_sheet_names": "error",
-      "extra_units": "error",
-      "global_label_dangling": "warning",
-      "hier_label_mismatch": "error",
-      "label_dangling": "error",
-      "lib_symbol_issues": "warning",
-      "multiple_net_names": "warning",
-      "net_not_bus_member": "warning",
-      "no_connect_connected": "warning",
-      "no_connect_dangling": "warning",
-      "pin_not_connected": "error",
-      "pin_not_driven": "error",
-      "pin_to_pin": "warning",
-      "power_pin_not_driven": "error",
-      "similar_labels": "warning",
-      "unannotated": "error",
-      "unit_value_mismatch": "error",
-      "unresolved_variable": "error",
-      "wire_dangling": "error"
-    }
-  },
-  "libraries": {
-    "pinned_footprint_libs": [],
-    "pinned_symbol_libs": []
-  },
-  "meta": {
-    "filename": "HAN_ESP_TSS721.kicad_pro",
-    "version": 1
-  },
-  "net_settings": {
-    "classes": [
-      {
-        "bus_width": 12.0,
-        "clearance": 0.2,
-        "diff_pair_gap": 0.25,
-        "diff_pair_via_gap": 0.25,
-        "diff_pair_width": 0.2,
-        "line_style": 0,
-        "microvia_diameter": 0.3,
-        "microvia_drill": 0.1,
-        "name": "Default",
-        "pcb_color": "rgba(0, 0, 0, 0.000)",
-        "schematic_color": "rgba(0, 0, 0, 0.000)",
-        "track_width": 0.25,
-        "via_diameter": 0.6,
-        "via_drill": 0.4,
-        "wire_width": 6.0
-      },
-      {
-        "bus_width": 12.0,
-        "clearance": 0.5,
-        "diff_pair_gap": 0.25,
-        "diff_pair_via_gap": 0.25,
-        "diff_pair_width": 0.2,
-        "line_style": 0,
-        "microvia_diameter": 0.5,
-        "microvia_drill": 0.2,
-        "name": "PWR",
-        "nets": [
-          "+3V3"
-        ],
-        "pcb_color": "rgba(0, 0, 0, 0.000)",
-        "schematic_color": "rgba(0, 0, 0, 0.000)",
-        "track_width": 0.5,
-        "via_diameter": 0.8,
-        "via_drill": 0.6,
-        "wire_width": 6.0
-      }
-    ],
-    "meta": {
-      "version": 2
-    },
-    "net_colors": null
-  },
-  "pcbnew": {
-    "last_paths": {
-      "gencad": "",
-      "idf": "",
-      "netlist": "",
-      "specctra_dsn": "",
-      "step": "",
-      "vrml": ""
-    },
-    "page_layout_descr_file": ""
-  },
-  "schematic": {
-    "annotate_start_num": 0,
-    "drawing": {
-      "default_line_thickness": 6.0,
-      "default_text_size": 50.0,
-      "field_names": [],
-      "intersheets_ref_own_page": false,
-      "intersheets_ref_prefix": "",
-      "intersheets_ref_short": false,
-      "intersheets_ref_show": false,
-      "intersheets_ref_suffix": "",
-      "junction_size_choice": 3,
-      "label_size_ratio": 0.25,
-      "pin_symbol_size": 0.0,
-      "text_offset_ratio": 0.08
-    },
-    "legacy_lib_dir": "",
-    "legacy_lib_list": [],
-    "meta": {
-      "version": 1
-    },
-    "net_format_name": "",
-    "ngspice": {
-      "fix_include_paths": true,
-      "fix_passive_vals": false,
-      "meta": {
-        "version": 0
-      },
-      "model_mode": 0,
-      "workbook_filename": ""
-    },
-    "page_layout_descr_file": "",
-    "plot_directory": "",
-    "spice_adjust_passive_values": false,
-    "spice_external_command": "spice \"%I\"",
-    "subpart_first_id": 65,
-    "subpart_id_separator": 0
-  },
-  "sheets": [],
-  "text_variables": {}
-}

hardware/v1/kicad/fp-info-cache

@@ -1 +0,0 @@
-0

hardware/wemos_mbus_shield/kicad/d1_mini_shield-rescue.dcm

@@ -1,3 +0,0 @@
-EESchema-DOCLIB  Version 2.0
-#
-#End Doc Library

hardware/wemos_mbus_shield/kicad/d1_mini_shield-rescue.lib

@@ -1,21 +1,6 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# +3.3V-power
-#
-DEF +3.3V-power #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "+3.3V-power" 0 140 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +3V3 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
 # CONN_01X08
 #
 DEF CONN_01X08 P 0 40 Y N 1 F N
@@ -50,23 +35,4 @@ X P8 8 -200 -350 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Jumper-Device
-#
-DEF Jumper-Device JP 0 30 Y N 1 F N
-F0 "JP" 0 150 50 H V C CNN
-F1 "Jumper-Device" 0 -80 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- SolderJumper*
-$ENDFPLIST
-DRAW
-C -100 0 35 0 1 0 N
-A 0 -26 125 375 1422 0 1 0 N 99 50 -98 50
-C 100 0 35 0 1 0 N
-X 1 1 -300 0 165 R 50 50 0 1 P
-X 2 2 300 0 165 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
 #End Library

hardware/wemos_mbus_shield/kicad/d1_mini_shield.kicad_prl

@@ -1,75 +0,0 @@
-{
-  "board": {
-    "active_layer": 0,
-    "active_layer_preset": "",
-    "auto_track_width": true,
-    "hidden_nets": [],
-    "high_contrast_mode": 0,
-    "net_color_mode": 1,
-    "opacity": {
-      "pads": 1.0,
-      "tracks": 1.0,
-      "vias": 1.0,
-      "zones": 0.6
-    },
-    "ratsnest_display_mode": 0,
-    "selection_filter": {
-      "dimensions": true,
-      "footprints": true,
-      "graphics": true,
-      "keepouts": true,
-      "lockedItems": true,
-      "otherItems": true,
-      "pads": true,
-      "text": true,
-      "tracks": true,
-      "vias": true,
-      "zones": true
-    },
-    "visible_items": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      8,
-      9,
-      10,
-      11,
-      12,
-      13,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24,
-      25,
-      26,
-      27,
-      28,
-      29,
-      30,
-      32,
-      33,
-      34,
-      35,
-      36
-    ],
-    "visible_layers": "fffffff_ffffffff",
-    "zone_display_mode": 0
-  },
-  "meta": {
-    "filename": "d1_mini_shield.kicad_prl",
-    "version": 3
-  },
-  "project": {
-    "files": []
-  }
-}

hardware/wemos_mbus_shield/kicad/d1_mini_shield.kicad_pro

@@ -1,356 +0,0 @@
-{
-  "board": {
-    "design_settings": {
-      "defaults": {
-        "board_outline_line_width": 0.15,
-        "copper_line_width": 0.2,
-        "copper_text_italic": false,
-        "copper_text_size_h": 1.5,
-        "copper_text_size_v": 1.5,
-        "copper_text_thickness": 0.3,
-        "copper_text_upright": true,
-        "courtyard_line_width": 0.05,
-        "other_line_width": 0.15,
-        "other_text_italic": false,
-        "other_text_size_h": 1.0,
-        "other_text_size_v": 1.0,
-        "other_text_thickness": 0.15,
-        "other_text_upright": true,
-        "silk_line_width": 0.15,
-        "silk_text_italic": false,
-        "silk_text_size_h": 1.0,
-        "silk_text_size_v": 1.0,
-        "silk_text_thickness": 0.15,
-        "silk_text_upright": true
-      },
-      "diff_pair_dimensions": [
-        {
-          "gap": 0.25,
-          "via_gap": 0.25,
-          "width": 0.2
-        }
-      ],
-      "drc_exclusions": [],
-      "rule_severitieslegacy_courtyards_overlap": true,
-      "rule_severitieslegacy_no_courtyard_defined": false,
-      "rules": {
-        "allow_blind_buried_vias": false,
-        "allow_microvias": false,
-        "min_hole_to_hole": 0.25,
-        "min_microvia_diameter": 0.2,
-        "min_microvia_drill": 0.09999999999999999,
-        "min_through_hole_diameter": 0.3,
-        "min_track_width": 0.2,
-        "min_via_diameter": 0.4,
-        "solder_mask_clearance": 0.2,
-        "solder_mask_min_width": 0.0,
-        "solder_paste_clearance": 0.0,
-        "solder_paste_margin_ratio": -0.0
-      },
-      "track_widths": [
-        0.25,
-        0.5
-      ],
-      "via_dimensions": [
-        {
-          "diameter": 0.6,
-          "drill": 0.4
-        }
-      ]
-    },
-    "layer_presets": []
-  },
-  "boards": [],
-  "cvpcb": {
-    "equivalence_files": []
-  },
-  "erc": {
-    "erc_exclusions": [],
-    "meta": {
-      "version": 0
-    },
-    "pin_map": [
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        2,
-        0,
-        1,
-        0,
-        0,
-        1,
-        0,
-        2,
-        2,
-        2,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
-        1,
-        0,
-        1,
-        2
-      ],
-      [
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        2,
-        1,
-        1,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        1,
-        1,
-        1,
-        1,
-        1,
-        0,
-        1,
-        1,
-        1,
-        1,
-        1,
-        2
-      ],
-      [
-        0,
-        0,
-        0,
-        1,
-        0,
-        0,
-        1,
-        0,
-        0,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        2,
-        1,
-        2,
-        0,
-        0,
-        1,
-        0,
-        2,
-        2,
-        2,
-        2
-      ],
-      [
-        0,
-        2,
-        0,
-        1,
-        0,
-        0,
-        1,
-        0,
-        2,
-        0,
-        0,
-        2
-      ],
-      [
-        0,
-        2,
-        1,
-        1,
-        0,
-        0,
-        1,
-        0,
-        2,
-        0,
-        0,
-        2
-      ],
-      [
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2
-      ]
-    ],
-    "rule_severities": {
-      "bus_definition_conflict": "error",
-      "bus_entry_needed": "error",
-      "bus_label_syntax": "error",
-      "bus_to_bus_conflict": "error",
-      "bus_to_net_conflict": "error",
-      "different_unit_footprint": "error",
-      "different_unit_net": "error",
-      "duplicate_reference": "error",
-      "duplicate_sheet_names": "error",
-      "extra_units": "error",
-      "global_label_dangling": "warning",
-      "hier_label_mismatch": "error",
-      "label_dangling": "error",
-      "lib_symbol_issues": "warning",
-      "multiple_net_names": "warning",
-      "net_not_bus_member": "warning",
-      "no_connect_connected": "warning",
-      "no_connect_dangling": "warning",
-      "pin_not_connected": "error",
-      "pin_not_driven": "error",
-      "pin_to_pin": "warning",
-      "power_pin_not_driven": "error",
-      "similar_labels": "warning",
-      "unannotated": "error",
-      "unit_value_mismatch": "error",
-      "unresolved_variable": "error",
-      "wire_dangling": "error"
-    }
-  },
-  "libraries": {
-    "pinned_footprint_libs": [],
-    "pinned_symbol_libs": []
-  },
-  "meta": {
-    "filename": "d1_mini_shield.kicad_pro",
-    "version": 1
-  },
-  "net_settings": {
-    "classes": [
-      {
-        "bus_width": 12.0,
-        "clearance": 0.2,
-        "diff_pair_gap": 0.25,
-        "diff_pair_via_gap": 0.25,
-        "diff_pair_width": 0.2,
-        "line_style": 0,
-        "microvia_diameter": 0.3,
-        "microvia_drill": 0.1,
-        "name": "Default",
-        "pcb_color": "rgba(0, 0, 0, 0.000)",
-        "schematic_color": "rgba(0, 0, 0, 0.000)",
-        "track_width": 0.25,
-        "via_diameter": 0.8,
-        "via_drill": 0.4,
-        "wire_width": 6.0
-      }
-    ],
-    "meta": {
-      "version": 2
-    },
-    "net_colors": null
-  },
-  "pcbnew": {
-    "last_paths": {
-      "gencad": "",
-      "idf": "",
-      "netlist": "d1_mini_shield.net",
-      "specctra_dsn": "",
-      "step": "",
-      "vrml": ""
-    },
-    "page_layout_descr_file": ""
-  },
-  "schematic": {
-    "annotate_start_num": 0,
-    "drawing": {
-      "default_line_thickness": 6.0,
-      "default_text_size": 50.0,
-      "field_names": [],
-      "intersheets_ref_own_page": false,
-      "intersheets_ref_prefix": "",
-      "intersheets_ref_short": false,
-      "intersheets_ref_show": false,
-      "intersheets_ref_suffix": "",
-      "junction_size_choice": 3,
-      "label_size_ratio": 0.25,
-      "pin_symbol_size": 0.0,
-      "text_offset_ratio": 0.08
-    },
-    "legacy_lib_dir": "",
-    "legacy_lib_list": [],
-    "meta": {
-      "version": 1
-    },
-    "net_format_name": "Pcbnew",
-    "ngspice": {
-      "fix_include_paths": true,
-      "fix_passive_vals": false,
-      "meta": {
-        "version": 0
-      },
-      "model_mode": 0,
-      "workbook_filename": ""
-    },
-    "page_layout_descr_file": "",
-    "plot_directory": "",
-    "spice_adjust_passive_values": false,
-    "spice_external_command": "spice \"%I\"",
-    "subpart_first_id": 65,
-    "subpart_id_separator": 0
-  },
-  "sheets": [],
-  "text_variables": {}
-}

lib/AmsConfiguration/include/AmsConfiguration.h

@@ -1,401 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _AMSCONFIGURATION_h
-#define _AMSCONFIGURATION_h
-#include <EEPROM.h>
-#include "Arduino.h"
-
-#define EEPROM_SIZE 1024*3
-#define EEPROM_CHECK_SUM 104 // Used to check if config is stored. Change if structure changes
-#define EEPROM_CLEARED_INDICATOR 0xFC
-#define EEPROM_CONFIG_ADDRESS 0
-
-#define CONFIG_SYSTEM_START 8
-#define CONFIG_NETWORK_START 40
-#define CONFIG_METER_START 296
-#define CONFIG_GPIO_START 368
-#define CONFIG_PRICE_START 400
-#define CONFIG_ENERGYACCOUNTING_START 472
-#define CONFIG_WEB_START 496
-#define CONFIG_DEBUG_START 632
-#define CONFIG_NTP_START 640
-#define CONFIG_MQTT_START 768
-#define CONFIG_DOMOTICZ_START 1536
-#define CONFIG_HA_START 1552
-#define CONFIG_UI_START 1720
-#define CONFIG_CLOUD_START 1742
-#define CONFIG_UPGRADE_INFO_START 1934
-#define CONFIG_ZC_START 2000
-
-#define CONFIG_METER_START_103 32
-#define CONFIG_UPGRADE_INFO_START_103 216
-#define CONFIG_UI_START_103 248
-#define CONFIG_GPIO_START_103 266
-#define CONFIG_ENTSOE_START_103 290
-#define CONFIG_WIFI_START_103 360
-#define CONFIG_ENERGYACCOUNTING_START_103 576
-#define CONFIG_WEB_START_103 648
-#define CONFIG_DEBUG_START_103 824
-#define CONFIG_DOMOTICZ_START_103 856 
-#define CONFIG_NTP_START_103 872
-#define CONFIG_MQTT_START_103 1004
-#define CONFIG_HA_START_103 1680
-
-#define LED_BEHAVIOUR_DEFAULT 0
-#define LED_BEHAVIOUR_BOOT 1
-#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;
-	uint8_t magic;
-};
-
-struct SystemConfig {
-	uint8_t boardType;
-	bool vendorConfigured;
-	bool userConfigured;
-	uint8_t dataCollectionConsent; // 0 = unknown, 1 = accepted, 2 = declined
-	char country[3];
-	uint8_t energyspeedometer;
-	uint8_t firmwareChannel;
-}; // 9
-
-struct NetworkConfig {
-	char ssid[32];
-	char psk[64];
-    char ip[16];
-    char gateway[16];
-    char subnet[16];
-	char dns1[16];
-	char dns2[16];
-	char hostname[32];
-	bool mdns;
-	uint8_t power;
-	uint8_t sleep;
-	uint8_t use11b;
-	bool ipv6;
-	uint8_t mode;
-}; // 214
-
-struct MqttConfig {
-	char host[128];
-	uint16_t port;
-	char clientId[32];
-	char publishTopic[64];
-	char subscribeTopic[64];
-	char username[128];
-	char password[256];
-	uint8_t payloadFormat;
-	bool ssl;
-	uint8_t magic;
-	bool stateUpdate;
-	uint16_t stateUpdateInterval;
-	uint16_t timeout;
-	uint8_t keepalive;
-	uint8_t rebootMinutes;
-}; // 684
-
-struct WebConfig {
-	uint8_t security;
-	char username[37];
-	char password[37];
-	char context[37];
-}; // 112
-
-struct WebConfig103 {
-	uint8_t security;
-	char username[64];
-	char password[64];
-}; // 129
-
-struct MeterConfig {
-	uint32_t baud;
-	uint8_t parity;
-	bool invert;
-	uint8_t distributionSystem;
-	uint16_t mainFuse;
-	uint16_t productionCapacity;
-	uint8_t encryptionKey[16];
-	uint8_t authenticationKey[16];
-	uint32_t wattageMultiplier;
-	uint32_t voltageMultiplier;
-	uint32_t amperageMultiplier;
-	uint32_t accumulatedMultiplier;
-	uint8_t source;
-	uint8_t parser;
-	uint8_t bufferSize;
-	uint8_t rxPin;
-	bool rxPinPullup;
-	uint8_t txPin;
-}; // 65
-
-struct DebugConfig {
-	bool telnet;
-	bool serial;
-	uint8_t level;
-}; // 3
-
-struct GpioConfig {
-	uint8_t apPin;
-	uint8_t ledPin;
-	bool ledInverted;
-	uint8_t ledPinRed;
-	uint8_t ledPinGreen;
-	uint8_t ledPinBlue;
-	bool ledRgbInverted;
-	uint8_t tempSensorPin;
-	uint8_t tempAnalogSensorPin;
-	uint8_t vccPin;
-	int16_t vccOffset;
-	uint16_t vccMultiplier;
-	uint8_t vccBootLimit;
-	uint16_t vccResistorGnd;
-	uint16_t vccResistorVcc;
-	uint8_t ledDisablePin;
-	uint8_t ledBehaviour;
-	uint8_t powersaving;
-}; // 22
-
-struct GpioConfig103 {
-	uint8_t hanPin;
-	uint8_t apPin;
-	uint8_t ledPin;
-	bool ledInverted;
-	uint8_t ledPinRed;
-	uint8_t ledPinGreen;
-	uint8_t ledPinBlue;
-	bool ledRgbInverted;
-	uint8_t tempSensorPin;
-	uint8_t tempAnalogSensorPin;
-	uint8_t vccPin;
-	int16_t vccOffset;
-	uint16_t vccMultiplier;
-	uint8_t vccBootLimit;
-	uint16_t vccResistorGnd;
-	uint16_t vccResistorVcc;
-	bool hanPinPullup;
-	uint8_t ledDisablePin;
-	uint8_t ledBehaviour;
-}; // 23
-
-struct DomoticzConfig {
-	uint16_t elidx;
-	uint16_t vl1idx;
-	uint16_t vl2idx;
-	uint16_t vl3idx;
-	uint16_t cl1idx;
-}; // 10
-
-struct HomeAssistantConfig {
-	char discoveryPrefix[64];
-	char discoveryHostname[64];
-	char discoveryNameTag[16];
-}; // 145
-
-struct NtpConfig {
-	bool enable;
-	bool dhcp;
-	char server[64];
-	char timezone[32];
-}; // 98
-
-struct PriceServiceConfig {
-	char entsoeToken[37];
-	char area[17];
-	char currency[4];
-	uint8_t resolutionInMinutes;
-	uint16_t unused2;
-	uint16_t unused3;
-	bool enabled;
-	uint16_t unused6;
-};
-
-struct EnergyAccountingConfig {
-	uint16_t thresholds[10];
-	uint8_t hours;
-}; // 21
-
-struct UiConfig {
-	uint8_t showImport;
-	uint8_t showExport;
-	uint8_t showVoltage;
-	uint8_t showAmperage;
-	uint8_t showReactive;
-	uint8_t showRealtime;
-	uint8_t showPeaks;
-	uint8_t showPricePlot;
-	uint8_t showDayPlot;
-	uint8_t showMonthPlot;
-	uint8_t showTemperaturePlot;
-	uint8_t showRealtimePlot;
-	uint8_t showPerPhasePower;
-	uint8_t showPowerFactor;
-	uint8_t darkMode;
-	char language[3];
-}; // 15
-
-struct UpgradeInformation {
-	char fromVersion[16];
-	char toVersion[16];
-    uint32_t size;
-    uint16_t block_position;
-    uint8_t retry_count;
-    uint8_t reboot_count;
-	int8_t errorCode;
-}; // 41+3
-
-struct CloudConfig {
-	bool enabled;
-	uint8_t interval;
-	char hostname[64];
-	uint16_t port;
-	uint8_t clientId[16];
-	uint8_t proto;
-}; // 88
-
-struct ZmartChargeConfig {
-	bool enabled;
-	char token[21];
-	char baseUrl[64];
-}; // 86
-
-class AmsConfiguration {
-public:
-	bool hasConfig();
-	int getConfigVersion();
-
-	bool save();
-
-	bool getSystemConfig(SystemConfig&);
-	bool setSystemConfig(SystemConfig&);
-	bool isSystemConfigChanged();
-	void ackSystemConfigChanged();
-
-	bool getNetworkConfig(NetworkConfig&);
-	bool setNetworkConfig(NetworkConfig&);
-	void clearNetworkConfig(NetworkConfig&);
-	void clearNetworkConfigIp(NetworkConfig&);
-	bool isNetworkConfigChanged();
-	void ackNetworkConfigChange();
-
-	bool getMqttConfig(MqttConfig&);
-	bool setMqttConfig(MqttConfig&);
-	void clearMqtt(MqttConfig&);
-	void setMqttChanged();
-	bool isMqttChanged();
-	void ackMqttChange();
-
-	bool getWebConfig(WebConfig&);
-	bool setWebConfig(WebConfig&);
-	void clearWebConfig(WebConfig&);
-	bool isWebChanged();
-	void ackWebChange();
-
-	bool getMeterConfig(MeterConfig&);
-	bool setMeterConfig(MeterConfig&);
-	void clearMeter(MeterConfig&);
-	void setMeterChanged();
-	bool isMeterChanged();
-	void ackMeterChanged();
-
-	bool getDebugConfig(DebugConfig&);
-	bool setDebugConfig(DebugConfig&);
-	void clearDebug(DebugConfig&);
-
-	bool pinUsed(uint8_t, GpioConfig&);
-
-	bool getGpioConfig(GpioConfig&);
-	bool setGpioConfig(GpioConfig&);
-	void clearGpio(GpioConfig& config, bool all=true);
-
-	void print(Print* debugger);
-
-	bool getDomoticzConfig(DomoticzConfig&);
-	bool setDomoticzConfig(DomoticzConfig&);
-	void clearDomo(DomoticzConfig&);
-
-	bool getHomeAssistantConfig(HomeAssistantConfig&);
-	bool setHomeAssistantConfig(HomeAssistantConfig&);
-	void clearHomeAssistantConfig(HomeAssistantConfig&);
-	
-	bool getNtpConfig(NtpConfig&);
-	bool setNtpConfig(NtpConfig&);
-	void clearNtp(NtpConfig&);
-	bool isNtpChanged();
-	void ackNtpChange();
-
-	bool getPriceServiceConfig(PriceServiceConfig&);
-	bool setPriceServiceConfig(PriceServiceConfig&);
-	void clearPriceServiceConfig(PriceServiceConfig&);
-	bool isPriceServiceChanged();
-	void ackPriceServiceChange();
-
-	bool getEnergyAccountingConfig(EnergyAccountingConfig&);
-	bool setEnergyAccountingConfig(EnergyAccountingConfig&);
-	void clearEnergyAccountingConfig(EnergyAccountingConfig&);
-	bool isEnergyAccountingChanged();
-	void ackEnergyAccountingChange();
-
-	bool getUiConfig(UiConfig&);
-	bool setUiConfig(UiConfig&);
-	void clearUiConfig(UiConfig&);
-	void setUiLanguageChanged();
-	bool isUiLanguageChanged();
-	void ackUiLanguageChange();
-
-	bool getUpgradeInformation(UpgradeInformation&);
-	bool setUpgradeInformation(UpgradeInformation&);
-	void clearUpgradeInformation(UpgradeInformation&);
-
-	bool getCloudConfig(CloudConfig&);
-	bool setCloudConfig(CloudConfig&);
-	void clearCloudConfig(CloudConfig&);
-	bool isCloudChanged();
-	void ackCloudConfig();
-	
-	bool getZmartChargeConfig(ZmartChargeConfig&);
-	bool setZmartChargeConfig(ZmartChargeConfig&);
-	void clearZmartChargeConfig(ZmartChargeConfig&);
-	bool isZmartChargeConfigChanged();
-	void ackZmartChargeConfig();
-	
-
-	void clear();
-
-protected:
-
-private:
-	uint8_t configVersion = 0;
-
-	bool sysChanged = false, networkChanged = false, mqttChanged = false, webChanged = false, meterChanged = true, ntpChanged = true, priceChanged = false, energyAccountingChanged = true, cloudChanged = true, uiLanguageChanged = false, zcChanged = true;
-
-	bool relocateConfig103(); // 2.2.12, until, but not including 2.3
-
-	void saveToFs();
-	bool loadFromFs(uint8_t version);
-	void deleteFromFs(uint8_t version);
-};
-#endif
-

lib/AmsConfiguration/include/Timezones.h

@@ -1,92 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include <Timezone.h>
-
-#define JULY1970 15634800
-
-TimeChangeRule TC_GMT  = {"GMT",  Last, Sun, Jan, 0,   0};
-TimeChangeRule TC_WET  = {"WET",  Last, Sun, Oct, 2,   0};
-TimeChangeRule TC_WEST = {"WEST", Last, Sun, Mar, 1,  60};
-TimeChangeRule TC_CET  = {"CET",  Last, Sun, Oct, 3,  60};
-TimeChangeRule TC_CEST = {"CEST", Last, Sun, Mar, 2, 120};
-TimeChangeRule TC_EET  = {"EET",  Last, Sun, Oct, 4, 120};
-TimeChangeRule TC_EEST = {"EEST", Last, Sun, Mar, 3, 180};
-
-Timezone GMT                   = Timezone(TC_GMT);
-Timezone WesterEuropean        = Timezone(TC_WET, TC_WEST);
-Timezone CentralEuropean       = Timezone(TC_CET, TC_CEST);
-Timezone EasternEuropean       = Timezone(TC_EET, TC_EEST);
-
-Timezone* resolveTimezone(char* name) {
-    if(strncmp_P(name, PSTR("Europe/"), 7) == 0) {
-        if(strncmp_P(name+7, PSTR("Amsterdam"), 9) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Athens"), 6) == 0)
-            return &EasternEuropean;
-        if(strncmp_P(name+7, PSTR("Belfast"), 7) == 0)
-            return &WesterEuropean;
-        if(strncmp_P(name+7, PSTR("Berlin"), 6) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Bratislava"), 10) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Brussels"), 8) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Bucharest"), 9) == 0)
-            return &EasternEuropean;
-        if(strncmp_P(name+7, PSTR("Budapest"), 8) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Copenhagen"), 10) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Dublin"), 6) == 0)
-            return &WesterEuropean;
-        if(strncmp_P(name+7, PSTR("Helsinki"), 8) == 0)
-            return &EasternEuropean;
-        if(strncmp_P(name+7, PSTR("Lisbon"), 6) == 0)
-            return &WesterEuropean;
-        if(strncmp_P(name+7, PSTR("Ljubljana"), 9) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("London"), 6) == 0)
-            return &WesterEuropean;
-        if(strncmp_P(name+7, PSTR("Luxembourg"), 10) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Madrid"), 6) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Malta"), 5) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Nicosia"), 7) == 0)
-            return &EasternEuropean;
-        if(strncmp_P(name+7, PSTR("Oslo"), 4) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Paris"), 5) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Podgorica"), 9) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Prague"), 6) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Riga"), 4) == 0)
-            return &EasternEuropean;
-        if(strncmp_P(name+7, PSTR("Rome"), 4) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Sofia"), 5) == 0)
-            return &EasternEuropean;
-        if(strncmp_P(name+7, PSTR("Stockholm"), 9) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Tallinn"), 7) == 0)
-            return &EasternEuropean;
-        if(strncmp_P(name+7, PSTR("Vienna"), 6) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Vilnius"), 7) == 0)
-            return &EasternEuropean;
-        if(strncmp_P(name+7, PSTR("Warsaw"), 6) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Zagreb"), 6) == 0)
-            return &CentralEuropean;
-        if(strncmp_P(name+7, PSTR("Zurich"), 6) == 0)
-            return &CentralEuropean;
-    }
-    return &GMT;
-}

lib/AmsConfiguration/include/hexutils.h

@@ -1,19 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _HEXUTILS_H
-#define _HEXUTILS_H
-
-#include <stdint.h>
-#include "Arduino.h"
-
-String toHex(uint8_t* in);
-String toHex(uint8_t* in, uint16_t size);
-void fromHex(uint8_t *out, String in, uint16_t size);
-bool stripNonAscii(uint8_t* in, uint16_t size, bool extended = false, bool trim = true);
-void debugPrint(uint8_t *buffer, uint16_t start, uint16_t length, Print* debugger);
-
-#endif

lib/AmsConfiguration/src/hexutils.cpp

@@ -1,80 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include "hexutils.h"
-
-String toHex(uint8_t* in) {
-	return toHex(in, sizeof(in)*2);
-}
-
-String toHex(uint8_t* in, uint16_t size) {
-	String hex;
-	for(int i = 0; i < size; i++) {
-		if(in[i] < 0x10) {
-			hex += '0';
-		}
-		hex += String(in[i], HEX);
-	}
-	hex.toUpperCase();
-	return hex;
-}
-
-void fromHex(uint8_t *out, String in, uint16_t size) {
-	for(int i = 0; i < size*2; i += 2) {
-		out[i/2] = strtol(in.substring(i, i+2).c_str(), 0, 16);
-	}
-}
-
-bool stripNonAscii(uint8_t* in, uint16_t size, bool extended, bool trim) {
-	bool ret = false;
-	for(uint16_t i = 0; i < size; i++) {
-		if(in[i] == 0) { // Clear the rest with null-terminator
-			memset(in+i, 0, size-i);
-			break;
-		}
-		if(extended && (in[i] < 32 || in[i] == 127 || in[i] == 129 || in[i] == 141 || in[i] == 143 || in[i] == 144 || in[i] == 157 || in[i] == 160)) {
-			memset(in+i, ' ', 1);
-			ret = true;
-		} else if(!extended && (in[i] < 32 || in[i] > 126)) {
-			memset(in+i, ' ', 1);
-			ret = true;
-		}
-	}
-	if(trim) {
-		// Strip leading spaces
-		while(in[0] == ' ') {
-			for(uint16_t i = 0; i < size; i++) {
-				in[i] = in[i+1];
-			}
-		}
-		// Strip trailing spaces
-		for(int i = size-1; i > 0; i--) {
-			if(in[i] == ' ' || in[i] == 0) {
-				memset(in+i, 0, 1);
-			} else {
-				break;
-			}
-		}
-	}
-	memset(in+size-1, 0, 1); // Make sure the last character is null-terminator
-	return ret;
-}
-
-void debugPrint(uint8_t *buffer, uint16_t start, uint16_t length, Print* debugger) {
-	for (uint16_t i = start; i < start + length; i++) {
-		if (buffer[i] < 0x10)
-			debugger->print(F("0"));
-		debugger->print(buffer[i], HEX);
-		debugger->print(F(" "));
-		if ((i - start + 1) % 16 == 0)
-			debugger->println(F(""));
-		else if ((i - start + 1) % 4 == 0)
-			debugger->print(F(" "));
-
-		yield(); // Let other get some resources too
-	}
-	debugger->println(F(""));
-}

lib/AmsData/include/AmsData.h

@@ -1,115 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _AMSDATA_H
-#define _AMSDATA_H
-
-#include "Arduino.h"
-#include <Timezone.h>
-#include "OBIScodes.h"
-
-enum AmsType {
-    AmsTypeAutodetect = 0x00,
-    AmsTypeAidon = 0x01,
-    AmsTypeKaifa = 0x02,
-    AmsTypeKamstrup = 0x03,
-    AmsTypeIskra = 0x08,
-    AmsTypeLandisGyr = 0x09,
-    AmsTypeSagemcom = 0x0A,
-    AmsTypeCustom = 0x88,
-    AmsTypeUnknown = 0xFF
-};
-
-class AmsData {
-public:
-    AmsData();
-
-    void apply(AmsData& other);
-    void apply(const OBIS_code_t obis, double value);
-
-    uint64_t getLastUpdateMillis();
-
-    time_t getPackageTimestamp();
-
-    uint8_t getListType();
-
-    String getListId();
-    String getMeterId();
-    uint8_t getMeterType();
-    String getMeterModel();
-
-    time_t getMeterTimestamp();
-
-    uint32_t getActiveImportPower();
-    uint32_t getReactiveImportPower();
-    uint32_t getActiveExportPower();
-    uint32_t getReactiveExportPower();
-
-    float getL1Voltage();
-    float getL2Voltage();
-    float getL3Voltage();
-
-    float getL1Current();
-    float getL2Current();
-    float getL3Current();
-
-    float getPowerFactor();
-    float getL1PowerFactor();
-    float getL2PowerFactor();
-    float getL3PowerFactor();
-
-    uint32_t getL1ActiveImportPower();
-    uint32_t getL2ActiveImportPower();
-    uint32_t getL3ActiveImportPower();
-
-    uint32_t getL1ActiveExportPower();
-    uint32_t getL2ActiveExportPower();
-    uint32_t getL3ActiveExportPower();
-
-    double getL1ActiveImportCounter();
-    double getL2ActiveImportCounter();
-    double getL3ActiveImportCounter();
-
-    double getL1ActiveExportCounter();
-    double getL2ActiveExportCounter();
-    double getL3ActiveExportCounter();
-
-    double getActiveImportCounter();
-    double getReactiveImportCounter();
-    double getActiveExportCounter();
-    double getReactiveExportCounter();
-
-    bool isThreePhase();
-    bool isTwoPhase();
-    bool isCounterEstimated();
-    bool isL2currentMissing();
-
-    int8_t getLastError();
-    void setLastError(int8_t);
-
-protected:
-    uint64_t lastUpdateMillis = 0;
-    uint64_t lastList2 = 0;
-    uint8_t listType = 0, meterType = AmsTypeUnknown;
-    time_t packageTimestamp = 0;
-    String listId = "", meterId = "", meterModel = "";
-    time_t meterTimestamp = 0;
-    uint32_t activeImportPower = 0, reactiveImportPower = 0, activeExportPower = 0, reactiveExportPower = 0;
-    float l1voltage = 0, l2voltage = 0, l3voltage = 0, l1current = 0, l2current = 0, l3current = 0;
-    uint32_t l1activeImportPower = 0, l2activeImportPower = 0, l3activeImportPower = 0;
-    uint32_t l1activeExportPower = 0, l2activeExportPower = 0, l3activeExportPower = 0;
-    double l1activeImportCounter = 0, l2activeImportCounter = 0, l3activeImportCounter = 0;
-    double l1activeExportCounter = 0, l2activeExportCounter = 0, l3activeExportCounter = 0;
-    float powerFactor = 0, l1PowerFactor = 0, l2PowerFactor = 0, l3PowerFactor = 0;
-    double activeImportCounter = 0, reactiveImportCounter = 0, activeExportCounter = 0, reactiveExportCounter = 0;
-    double lastKnownCounter = 0;
-    bool threePhase = false, twoPhase = false, counterEstimated = false, l2currentMissing = false;;
-
-    int8_t lastError = 0x00;
-    uint8_t lastErrorCount = 0;
-};
-
-#endif

lib/AmsData/include/OBIScodes.h

@@ -1,93 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _OBISCODES_H
-#define _OBISCODES_H
-
-#include "lwip/def.h"
-
-#define OBIS_MEDIUM_ABSTRACT 0
-#define OBIS_MEDIUM_ELECTRICITY 1
-
-#define OBIS_CHAN_0 0
-#define OBIS_CHAN_1 1
-
-#define OBIS_RANGE_NA 0xFF
-
-struct OBIS_head_t {
-    uint8_t medium;
-    uint8_t channel;
-} __attribute__((packed));
-
-struct OBIS_code_t {
-    uint8_t sensor;
-    uint8_t gr;
-    uint8_t tariff;
-} __attribute__((packed));
-
-struct OBIS_t {
-    OBIS_head_t head;
-    OBIS_code_t code;
-    uint8_t range;
-} __attribute__((packed));
-
-
-const OBIS_code_t OBIS_NULL PROGMEM =                  {   0,   0,   0 };
-
-const OBIS_code_t OBIS_FIRMWARE_VERSION PROGMEM =      {   0,   2,   0 };
-
-const OBIS_code_t OBIS_VERSION PROGMEM =               {   0,   2, 129 };
-const OBIS_code_t OBIS_METER_MODEL PROGMEM =           {  96,   1,   1 };
-const OBIS_code_t OBIS_METER_MODEL_2 PROGMEM =         {  96,   1,   7 };
-const OBIS_code_t OBIS_METER_ID PROGMEM =              {  96,   1,   0 };
-const OBIS_code_t OBIS_METER_ID_2 PROGMEM =            {   0,   0,   5 };
-const OBIS_code_t OBIS_METER_TIMESTAMP PROGMEM =       {   1,   0,   0 };
-
-const OBIS_code_t OBIS_ACTIVE_IMPORT PROGMEM =         {   1,   7,   0 };
-const OBIS_code_t OBIS_ACTIVE_IMPORT_COUNT PROGMEM =   {   1,   8,   0 };
-const OBIS_code_t OBIS_ACTIVE_EXPORT PROGMEM =         {   2,   7,   0 };
-const OBIS_code_t OBIS_ACTIVE_EXPORT_COUNT PROGMEM =   {   2,   8,   0 };
-const OBIS_code_t OBIS_REACTIVE_IMPORT PROGMEM =       {   3,   7,   0 };
-const OBIS_code_t OBIS_REACTIVE_IMPORT_COUNT PROGMEM = {   3,   8,   0 };
-const OBIS_code_t OBIS_REACTIVE_EXPORT PROGMEM =       {   4,   7,   0 };
-const OBIS_code_t OBIS_REACTIVE_EXPORT_COUNT PROGMEM = {   4,   8,   0 };
-
-const OBIS_code_t OBIS_POWER_FACTOR PROGMEM =          {  13,   7,   0 };
-
-const OBIS_code_t OBIS_ACTIVE_IMPORT_L1 PROGMEM =      {  21,   7,   0 };
-const OBIS_code_t OBIS_ACTIVE_EXPORT_L1 PROGMEM =      {  22,   7,   0 };
-const OBIS_code_t OBIS_REACTIVE_IMPORT_L1 PROGMEM =    {  23,   7,   0 };
-const OBIS_code_t OBIS_REACTIVE_EXPORT_L1 PROGMEM =    {  24,   7,   0 };
-const OBIS_code_t OBIS_ACTIVE_IMPORT_COUNT_L1 PROGMEM ={  21,   8,   0 };
-const OBIS_code_t OBIS_REACTIVE_IMPORT_COUNT_L1 PROGMEM ={  22,   8,   0 };
-
-const OBIS_code_t OBIS_CURRENT_L1 PROGMEM =            {  31,   7,   0 };
-const OBIS_code_t OBIS_VOLTAGE_L1 PROGMEM =            {  32,   7,   0 };
-const OBIS_code_t OBIS_POWER_FACTOR_L1 PROGMEM =       {  33,   7,   0 };
-
-const OBIS_code_t OBIS_ACTIVE_IMPORT_L2 PROGMEM =      {  41,   7,   0 };
-const OBIS_code_t OBIS_ACTIVE_EXPORT_L2 PROGMEM =      {  42,   7,   0 };
-const OBIS_code_t OBIS_REACTIVE_IMPORT_L2 PROGMEM =    {  43,   7,   0 };
-const OBIS_code_t OBIS_REACTIVE_EXPORT_L2 PROGMEM =    {  44,   7,   0 };
-const OBIS_code_t OBIS_ACTIVE_IMPORT_COUNT_L2 PROGMEM ={  41,   8,   0 };
-const OBIS_code_t OBIS_REACTIVE_IMPORT_COUNT_L2 PROGMEM ={  42,   8,   0 };
-
-const OBIS_code_t OBIS_CURRENT_L2 PROGMEM =            {  51,   7,   0 };
-const OBIS_code_t OBIS_VOLTAGE_L2 PROGMEM =            {  52,   7,   0 };
-const OBIS_code_t OBIS_POWER_FACTOR_L2 PROGMEM =       {  53,   7,   0 };
-
-const OBIS_code_t OBIS_ACTIVE_IMPORT_L3 PROGMEM =      {  61,   7,   0 };
-const OBIS_code_t OBIS_ACTIVE_EXPORT_L3 PROGMEM =      {  62,   7,   0 };
-const OBIS_code_t OBIS_REACTIVE_IMPORT_L3 PROGMEM =    {  63,   7,   0 };
-const OBIS_code_t OBIS_REACTIVE_EXPORT_L3 PROGMEM =    {  64,   7,   0 };
-const OBIS_code_t OBIS_ACTIVE_IMPORT_COUNT_L3 PROGMEM ={  61,   8,   0 };
-const OBIS_code_t OBIS_REACTIVE_IMPORT_COUNT_L3 PROGMEM ={  62,   8,   0 };
-
-const OBIS_code_t OBIS_CURRENT_L3 PROGMEM =            {  71,   7,   0 };
-const OBIS_code_t OBIS_VOLTAGE_L3 PROGMEM =            {  72,   7,   0 };
-const OBIS_code_t OBIS_POWER_FACTOR_L3 PROGMEM =       {  73,   7,   0 };
-
-#endif

lib/AmsData/src/AmsData.cpp

@@ -1,447 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include "AmsData.h"
-
-AmsData::AmsData() {}
-
-void AmsData::apply(AmsData& other) {
-    if(other.getListType() < 3) {
-        unsigned long ms = this->lastUpdateMillis > other.getLastUpdateMillis() ? 0 : other.getLastUpdateMillis() - this->lastUpdateMillis;
-
-        if(ms > 0) {
-            if(other.getActiveImportPower() > 0) {
-                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) {
-                ms = this->lastList2 > other.getLastUpdateMillis() ? 0 : other.getLastUpdateMillis() - this->lastList2;
-                if(other.getActiveExportPower() > 0) {
-                    uint32_t power = (activeExportPower + other.getActiveExportPower()) / 2;
-                    float add = power * (((float) ms) / 3600000.0);
-                    activeExportCounter += add / 1000.0;
-                }
-                if(other.getReactiveImportPower() > 0) {
-                    uint32_t power = (reactiveImportPower + other.getReactiveImportPower()) / 2;
-                    float add = power * (((float) ms) / 3600000.0);
-                    reactiveImportCounter += add / 1000.0;
-                }
-                if(other.getReactiveExportPower() > 0) {
-                    uint32_t power = (reactiveExportPower + other.getReactiveExportPower()) / 2;
-                    float add = power * (((float) ms) / 3600000.0);
-                    reactiveExportCounter += add / 1000.0;
-                }
-            }
-            counterEstimated = true;
-        }
-    }
-
-    this->lastUpdateMillis = other.getLastUpdateMillis();
-    if(other.getListType() > 1) {
-        this->lastList2 = this->lastUpdateMillis;
-    }
-    this->packageTimestamp = other.getPackageTimestamp();
-    if(other.getListType() > this->listType)
-        this->listType = other.getListType();
-    switch(other.getListType()) {
-        case 4:
-            this->powerFactor = other.getPowerFactor();
-            this->l1PowerFactor = other.getL1PowerFactor();
-            this->l2PowerFactor = other.getL2PowerFactor();
-            this->l3PowerFactor = other.getL3PowerFactor();
-            this->l1activeImportPower = other.getL1ActiveImportPower();
-            this->l2activeImportPower = other.getL2ActiveImportPower();
-            this->l3activeImportPower = other.getL3ActiveImportPower();
-            this->l1activeExportPower = other.getL1ActiveExportPower();
-            this->l2activeExportPower = other.getL2ActiveExportPower();
-            this->l3activeExportPower = other.getL3ActiveExportPower();
-            this->l1activeImportCounter = other.getL1ActiveImportCounter();
-            this->l2activeImportCounter = other.getL2ActiveImportCounter();
-            this->l3activeImportCounter = other.getL3ActiveImportCounter();
-            this->l1activeExportCounter = other.getL1ActiveExportCounter();
-            this->l2activeExportCounter = other.getL2ActiveExportCounter();
-            this->l3activeExportCounter = other.getL3ActiveExportCounter();
-        case 3:
-            this->meterTimestamp = other.getMeterTimestamp();
-            // Aidon tends to sometime send the same counter as last hour by accident
-            if(meterType == AmsTypeAidon && counterEstimated && lastKnownCounter == other.getActiveImportCounter()-other.getActiveExportCounter()) {
-                double diff = activeImportCounter - activeExportCounter - lastKnownCounter;
-                if(diff < 1.0) { // In case a very low value have been calculated, use the new values
-                    this->activeImportCounter = other.getActiveImportCounter();
-                    this->activeExportCounter = other.getActiveExportCounter();
-                    this->reactiveImportCounter = other.getReactiveImportCounter();
-                    this->reactiveExportCounter = other.getReactiveExportCounter();
-                    this->lastKnownCounter = activeImportCounter - activeExportCounter;
-                }
-            } else {
-                this->activeImportCounter = other.getActiveImportCounter();
-                this->activeExportCounter = other.getActiveExportCounter();
-                this->reactiveImportCounter = other.getReactiveImportCounter();
-                this->reactiveExportCounter = other.getReactiveExportCounter();
-                this->lastKnownCounter = activeImportCounter - activeExportCounter;
-            }
-            this->counterEstimated = false;
-        case 2:
-            this->listId = other.getListId();
-            this->meterId = other.getMeterId();
-            this->meterType = other.getMeterType();
-            this->meterModel = other.getMeterModel();
-            this->reactiveImportPower = other.getReactiveImportPower();
-            this->reactiveExportPower = other.getReactiveExportPower();
-            this->l1current = other.getL1Current();
-            this->l2current = other.getL2Current();
-            this->l2currentMissing = other.isL2currentMissing();
-            this->l3current = other.getL3Current();
-            this->l1voltage = other.getL1Voltage();
-            this->l2voltage = other.getL2Voltage();
-            this->l3voltage = other.getL3Voltage();
-            this->threePhase = other.isThreePhase();
-            this->twoPhase = other.isTwoPhase();
-    }
-
-    // Moved outside switch to handle meters alternating between sending active and accumulated values
-    if(other.getListType() == 1 || (other.getActiveImportPower() > 0 || other.getActiveExportPower() > 0))
-        this->activeImportPower = other.getActiveImportPower();
-    if(other.getListType() == 2 || (other.getActiveImportPower() > 0 || other.getActiveExportPower() > 0))
-        this->activeExportPower = other.getActiveExportPower();
-}
-
-void AmsData::apply(OBIS_code_t obis, double value) {
-    if(obis.sensor == 0 && obis.gr == 0 && obis.tariff == 0) {
-        meterType = value;
-    }
-    if(obis.gr == 1) {
-        if(obis.sensor == 96) {
-            if(obis.tariff == 0) {
-                meterId = String((long) value, 10);
-                return;
-            } else if(obis.tariff == 1) {
-                return;
-            }
-        }
-    }
-    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);
-                break;
-            case 2:
-                activeExportPower = value;
-                listType = max(listType, (uint8_t) 2);
-                break;
-            case 3:
-                reactiveImportPower = value;
-                listType = max(listType, (uint8_t) 2);
-                break;
-            case 4:
-                reactiveExportPower = value;
-                listType = max(listType, (uint8_t) 2);
-                break;
-            case 13:
-                powerFactor = value;
-                listType = max(listType, (uint8_t) 4);
-                break;
-            case 21:
-                l1activeImportPower = value;
-                listType = max(listType, (uint8_t) 4);
-                break;
-            case 22:
-                l1activeExportPower = value;
-                listType = max(listType, (uint8_t) 4);
-                break;
-            case 31:
-                l1current = value;
-                listType = max(listType, (uint8_t) 2);
-                break;
-            case 32:
-                l1voltage = value;
-                listType = max(listType, (uint8_t) 2);
-                break;
-            case 33:
-                l1PowerFactor = value;
-                listType = max(listType, (uint8_t) 4);
-                break;
-            case 41:
-                l2activeImportPower = value;
-                listType = max(listType, (uint8_t) 4);
-                break;
-            case 42:
-                l2activeExportPower = value;
-                listType = max(listType, (uint8_t) 4);
-                break;
-            case 51:
-                l2current = value;
-                listType = max(listType, (uint8_t) 2);
-                break;
-            case 52:
-                l2voltage = value;
-                listType = max(listType, (uint8_t) 2);
-                break;
-            case 53:
-                l2PowerFactor = value;
-                listType = max(listType, (uint8_t) 4);
-                break;
-            case 61:
-                l3activeImportPower = value;
-                listType = max(listType, (uint8_t) 4);
-                break;
-            case 62:
-                l3activeExportPower = value;
-                listType = max(listType, (uint8_t) 4);
-                break;
-            case 71:
-                l3current = value;
-                listType = max(listType, (uint8_t) 2);
-                break;
-            case 72:
-                l3voltage = value;
-                listType = max(listType, (uint8_t) 2);
-                break;
-            case 73:
-                l3PowerFactor = value;
-                listType = 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);
-                break;
-            case 2:
-                activeExportCounter = value;
-                listType = max(listType, (uint8_t) 3);
-                break;
-            case 3:
-                reactiveImportCounter = value;
-                listType = max(listType, (uint8_t) 3);
-                break;
-            case 4:
-                reactiveExportCounter = value;
-                listType = max(listType, (uint8_t) 3);
-                break;
-            case 21:
-                l1activeImportCounter = value;
-                listType = max(listType, (uint8_t) 4);
-                break;
-            case 22:
-                l1activeExportCounter = value;
-                listType = max(listType, (uint8_t) 4);
-                break;
-            case 41:
-                l2activeImportCounter = value;
-                listType = max(listType, (uint8_t) 4);
-                break;
-            case 42:
-                l2activeExportCounter = value;
-                listType = max(listType, (uint8_t) 4);
-                break;
-            case 61:
-                l3activeImportCounter = value;
-                listType = max(listType, (uint8_t) 4);
-                break;
-            case 62:
-                l3activeExportCounter = value;
-                listType = max(listType, (uint8_t) 4);
-                break;
-        }
-    }
-    if(listType > 0)
-        lastUpdateMillis = millis();
-
-    threePhase = l1voltage > 0 && l2voltage > 0 && l3voltage > 0;
-    if(!threePhase)
-        twoPhase = (l1voltage > 0 && l2voltage > 0) || (l2voltage > 0 && l3voltage > 0) || (l3voltage > 0  && l1voltage > 0);
-}
-
-uint64_t AmsData::getLastUpdateMillis() {
-    return this->lastUpdateMillis;
-}
-
-time_t AmsData::getPackageTimestamp() {
-    return this->packageTimestamp;
-}
-
-uint8_t AmsData::getListType() {
-    return this->listType;
-}
-
-String AmsData::getListId() {
-    return this->listId;
-}
-
-String AmsData::getMeterId() {
-    return this->meterId;
-}
-
-uint8_t AmsData::getMeterType() {
-    return this->meterType;
-}
-
-String AmsData::getMeterModel() {
-    return this->meterModel;
-}
-
-time_t AmsData::getMeterTimestamp() {
-    return this->meterTimestamp;
-}
-
-uint32_t AmsData::getActiveImportPower() {
-    return this->activeImportPower;
-}
-
-uint32_t AmsData::getReactiveImportPower() {
-    return this->reactiveImportPower;
-}
-
-uint32_t AmsData::getActiveExportPower() {
-    return this->activeExportPower;
-}
-
-uint32_t AmsData::getReactiveExportPower() {
-    return this->reactiveExportPower;
-}
-
-float AmsData::getL1Voltage() {
-    return this->l1voltage;
-}
-
-float AmsData::getL2Voltage() {
-    return this->l2voltage;
-}
-
-float AmsData::getL3Voltage() {
-    return this->l3voltage;
-}
-
-float AmsData::getL1Current() {
-    return this->l1current;
-}
-
-float AmsData::getL2Current() {
-    return this->l2current;
-}
-
-float AmsData::getL3Current() {
-    return this->l3current;
-}
-
-float AmsData::getPowerFactor() {
-    return this->powerFactor;
-}
-
-float AmsData::getL1PowerFactor() {
-    return this->l1PowerFactor;
-}
-
-float AmsData::getL2PowerFactor() {
-    return this->l2PowerFactor;
-}
-
-float AmsData::getL3PowerFactor() {
-    return this->l3PowerFactor;
-}
-
-uint32_t AmsData::getL1ActiveImportPower() {
-    return this->l1activeImportPower;
-}
-
-uint32_t AmsData::getL2ActiveImportPower() {
-    return this->l2activeImportPower;
-}
-
-uint32_t AmsData::getL3ActiveImportPower() {
-    return this->l3activeImportPower;
-}
-
-uint32_t AmsData::getL1ActiveExportPower() {
-    return this->l1activeExportPower;
-}
-
-uint32_t AmsData::getL2ActiveExportPower() {
-    return this->l2activeExportPower;
-}
-
-uint32_t AmsData::getL3ActiveExportPower() {
-    return this->l3activeExportPower;
-}
-
-double AmsData::getL1ActiveImportCounter() {
-    return this->l1activeImportCounter;
-}
-
-double AmsData::getL2ActiveImportCounter() {
-    return this->l2activeImportCounter;
-}
-
-double AmsData::getL3ActiveImportCounter() {
-    return this->l3activeImportCounter;
-}
-
-double AmsData::getL1ActiveExportCounter() {
-    return this->l1activeExportCounter;
-}
-
-double AmsData::getL2ActiveExportCounter() {
-    return this->l2activeExportCounter;
-}
-
-double AmsData::getL3ActiveExportCounter() {
-    return this->l3activeExportCounter;
-}
-
-double AmsData::getActiveImportCounter() {
-    return this->activeImportCounter;
-}
-
-double AmsData::getReactiveImportCounter() {
-    return this->reactiveImportCounter;
-}
-
-double AmsData::getActiveExportCounter() {
-    return this->activeExportCounter;
-}
-
-double AmsData::getReactiveExportCounter() {
-    return this->reactiveExportCounter;
-}
-
-bool AmsData::isThreePhase() {
-    return this->threePhase;
-}
-
-bool AmsData::isTwoPhase() {
-    return this->twoPhase;
-}
-
-bool AmsData::isCounterEstimated() {
-    return this->counterEstimated;
-}
-
-bool AmsData::isL2currentMissing() {
-    return this->l2currentMissing;
-}
-
-int8_t AmsData::getLastError() {
-    return lastErrorCount > 2 ? lastError : 0;
-}
-
-void AmsData::setLastError(int8_t lastError) {
-    this->lastError = lastError;
-    if(lastError == 0) {
-        lastErrorCount = 0;
-    } else {
-        lastErrorCount++;
-    }
-}

lib/AmsDataStorage/include/AmsDataStorage.h

@@ -1,116 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _AMSDATASTORAGE_H
-#define _AMSDATASTORAGE_H
-#include "Arduino.h"
-#include "AmsData.h"
-#if defined(AMS_REMOTE_DEBUG)
-#include "RemoteDebug.h"
-#endif
-#include "Timezone.h"
-
-struct DayDataPoints5 {
-    uint8_t version;
-    uint16_t hImport[24];
-    time_t lastMeterReadTime;
-    uint32_t activeImport;
-    uint32_t activeExport;
-    uint16_t hExport[24];
-    uint8_t accuracy;
-};
-
-struct MonthDataPoints6 {
-    uint8_t version;
-    uint16_t dImport[31];
-    time_t lastMeterReadTime;
-    uint32_t activeImport;
-    uint32_t activeExport;
-    uint16_t dExport[31];
-    uint8_t accuracy;
-};
-
-struct DayDataPoints {
-    uint8_t version;
-    uint16_t hImport[24];
-    time_t lastMeterReadTime;
-    uint64_t activeImport;
-    uint64_t activeExport;
-    uint16_t hExport[24];
-    uint8_t accuracy;
-};
-
-struct MonthDataPoints {
-    uint8_t version;
-    uint16_t dImport[31];
-    time_t lastMeterReadTime;
-    uint64_t activeImport;
-    uint64_t activeExport;
-    uint16_t dExport[31];
-    uint8_t accuracy;
-};
-
-class AmsDataStorage {
-public:
-    #if defined(AMS_REMOTE_DEBUG)
-    AmsDataStorage(RemoteDebug*);
-    #else
-    AmsDataStorage(Stream*);
-    #endif
-    void setTimezone(Timezone*);
-    bool update(AmsData* data, time_t now);
-    uint32_t getHourImport(uint8_t);
-    uint32_t getHourExport(uint8_t);
-    uint32_t getDayImport(uint8_t);
-    uint32_t getDayExport(uint8_t);
-    bool load();
-    bool save();
-
-    DayDataPoints getDayData();
-    bool setDayData(DayDataPoints&);
-    MonthDataPoints getMonthData();
-    bool setMonthData(MonthDataPoints&);
-
-    uint8_t getDayAccuracy();
-    void setDayAccuracy(uint8_t);
-    uint8_t getMonthAccuracy();
-    void setMonthAccuracy(uint8_t);
-
-    bool isHappy(time_t now);
-    bool isDayHappy(time_t now);
-    bool isMonthHappy(time_t now);
-
-    double getEstimatedImportCounter();
-
-    void setHourImport(uint8_t, uint32_t);
-    void setHourExport(uint8_t, uint32_t);
-    void setDayImport(uint8_t, uint32_t);
-    void setDayExport(uint8_t, uint32_t);
-
-private:
-    Timezone* tz;
-    DayDataPoints day = {
-        0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        10
-    };
-    MonthDataPoints month = {
-        0, 
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-        0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        10
-    };
-    #if defined(AMS_REMOTE_DEBUG)
-    RemoteDebug* debugger;
-    #else
-    Stream* debugger;
-    #endif
-};
-
-#endif

lib/AmsDataStorage/src/AmsDataStorage.cpp

@@ -1,700 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include "AmsDataStorage.h"
-#include <lwip/apps/sntp.h>
-#include "LittleFS.h"
-#include "AmsStorage.h"
-#include "FirmwareVersion.h"
-
-#if defined(AMS_REMOTE_DEBUG)
-AmsDataStorage::AmsDataStorage(RemoteDebug* debugger) {
-#else
-AmsDataStorage::AmsDataStorage(Stream* debugger) {
-#endif
-    day.version = 6;
-    day.accuracy = 1;
-    month.version = 7;
-    month.accuracy = 1;
-    this->debugger = debugger;
-}
-
-void AmsDataStorage::setTimezone(Timezone* tz) {
-    this->tz = tz;
-}
-
-bool AmsDataStorage::update(AmsData* data, time_t now) {
-    if(isHappy(now)) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::DEBUG))
-        #endif
-            debugger->printf_P(PSTR("Happy, not updating\n"));
-        return false;
-    }
-
-    if(tz == NULL) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::DEBUG))
-        #endif
-            debugger->printf_P(PSTR("No timezone, not updating\n"));
-        return false;
-    }
-    if(now < FirmwareVersion::BuildEpoch) {
-        if(data->getMeterTimestamp() > FirmwareVersion::BuildEpoch) {
-            now = data->getMeterTimestamp();
-        } else if(data->getPackageTimestamp() > FirmwareVersion::BuildEpoch) {
-            now = data->getPackageTimestamp();
-        }
-    }
-    if(now < FirmwareVersion::BuildEpoch) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::DEBUG))
-        #endif
-            debugger->printf_P(PSTR("Before build time, not updating\n"));
-        return false;
-    }
-
-    tmElements_t utc, ltz, utcYesterday, ltzYesterDay;
-    breakTime(now, utc);
-    breakTime(tz->toLocal(now), ltz);
-    breakTime(now-3600, utcYesterday);
-    breakTime(tz->toLocal(now-3600), ltzYesterDay);
-
-    uint64_t importCounter = data->getActiveImportCounter() * 1000;
-    uint64_t exportCounter = data->getActiveExportCounter() * 1000;
-
-    // Clear hours between last update and now
-    if(!isDayHappy(now) && day.lastMeterReadTime > now) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::DEBUG))
-        #endif
-            debugger->printf_P(PSTR("Day was updated in the future, resetting\n"));
-        day.activeImport = importCounter;
-        day.activeExport = exportCounter;
-        day.lastMeterReadTime = now;
-    } else if(importCounter > 0 && day.activeImport == 0) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::DEBUG))
-        #endif
-            debugger->printf_P(PSTR("Initializing day data\n"));
-        day.activeImport = importCounter;
-        day.activeExport = exportCounter;
-        day.lastMeterReadTime = now;
-        for(int i = 0; i<24; i++) {
-            setHourImport(i, 0);
-            setHourExport(i, 0);
-        }
-    } else if(now - day.lastMeterReadTime > 86400) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::DEBUG))
-        #endif
-            debugger->printf_P(PSTR("Day was updated to long ago, clearing\n"));
-        day.activeImport = importCounter;
-        day.activeExport = exportCounter;
-        day.lastMeterReadTime = now;
-        for(int i = 0; i<24; i++) {
-            setHourImport(i, 0);
-            setHourExport(i, 0);
-        }
-    } else {
-        tmElements_t last;
-        breakTime(day.lastMeterReadTime, last);
-        uint8_t endHour = utc.Hour;
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::DEBUG))
-        #endif
-            debugger->printf_P(PSTR("Clearing hours from %d to %d\n"), last.Hour, endHour);
-        if(last.Hour > utc.Hour){
-            for(int i = 0; i < utc.Hour; i++) {
-                setHourImport(i, 0);
-                setHourExport(i, 0);
-            }
-            endHour = 24;
-        }
-        for(int i = last.Hour; i < endHour; i++) {
-            setHourImport(i, 0);
-            setHourExport(i, 0);
-        }
-    }
-
-    // Clear days between last update and now
-    if(!isMonthHappy(now) && month.lastMeterReadTime > now) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::DEBUG))
-        #endif
-            debugger->printf_P(PSTR("Month was updated in the future, resetting\n"));
-        month.activeImport = importCounter;
-        month.activeExport = exportCounter;
-        month.lastMeterReadTime = now;
-    } else if(importCounter > 0 && month.activeImport == 0) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::DEBUG))
-        #endif
-            debugger->printf_P(PSTR("Initializing month data\n"));
-        month.activeImport = importCounter;
-        month.activeExport = exportCounter;
-        month.lastMeterReadTime = now;
-        for(int i = 1; i<=31; i++) {
-            setDayImport(i, 0);
-            setDayExport(i, 0);
-        }
-    } else if(now - month.lastMeterReadTime > 2682000) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::DEBUG))
-        #endif
-            debugger->printf_P(PSTR("Month was updated to long ago, clearing\n"));
-        month.activeImport = importCounter;
-        month.activeExport = exportCounter;
-        month.lastMeterReadTime = now;
-        for(int i = 1; i<=31; i++) {
-            setDayImport(i, 0);
-            setDayExport(i, 0);
-        }
-    } else {
-        tmElements_t last;
-        breakTime(tz->toLocal(month.lastMeterReadTime), last);
-        uint8_t endDay = ltz.Day;
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::DEBUG))
-        #endif
-            debugger->printf_P(PSTR("Clearing days from %d to %d\n"), last.Day, endDay);
-        if(last.Day > ltz.Day) {
-            for(int i = 1; i < ltz.Day; i++) {
-                setDayImport(i, 0);
-                setDayExport(i, 0);
-            }
-            endDay = 31;
-        }
-        for(int i = last.Day; i < endDay; i++) {
-            setDayImport(i, 0);
-            setDayExport(i, 0);
-        }
-    }
-
-    if(data->getListType() < 3) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::DEBUG))
-        #endif
-            debugger->printf_P(PSTR("Type %d, not updating\n"), data->getListType());
-        return false;
-    }
-
-    bool ret = false;
-
-    // Update day plot
-    if(!isDayHappy(now)) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::DEBUG))
-        #endif
-            debugger->printf_P(PSTR("Day is not happy\n"));
-        if(day.activeImport > importCounter || day.activeExport > exportCounter) {
-            #if defined(AMS_REMOTE_DEBUG)
-            if (debugger->isActive(RemoteDebug::DEBUG))
-            #endif
-                debugger->printf_P(PSTR(" - reset\n"));
-            day.activeImport = importCounter;
-            day.activeExport = exportCounter;
-            day.lastMeterReadTime = now;
-            setHourImport(utcYesterday.Hour, 0);
-            setHourExport(utcYesterday.Hour, 0);
-        } else if(now - day.lastMeterReadTime < 4000) {
-            #if defined(AMS_REMOTE_DEBUG)
-            if (debugger->isActive(RemoteDebug::DEBUG))
-            #endif
-                debugger->printf_P(PSTR(" - normal\n"));
-            uint32_t imp = importCounter - day.activeImport;
-            uint32_t exp = exportCounter - day.activeExport;
-            setHourImport(utcYesterday.Hour, imp);
-            setHourExport(utcYesterday.Hour, exp);
-
-            day.activeImport = importCounter;
-            day.activeExport = exportCounter;
-            day.lastMeterReadTime = now;
-        } else {
-            #if defined(AMS_REMOTE_DEBUG)
-            if (debugger->isActive(RemoteDebug::DEBUG))
-            #endif
-                debugger->printf_P(PSTR(" - average\n"));
-            float mins = (now - day.lastMeterReadTime) / 60.0;
-            uint32_t im = importCounter - day.activeImport;
-            uint32_t ex = exportCounter - day.activeExport;
-            float ipm = im / mins;
-            float epm = ex / mins;
-
-            tmElements_t last;
-            breakTime(day.lastMeterReadTime, last);
-            day.lastMeterReadTime = day.lastMeterReadTime - (last.Minute * 60) - last.Second;
-            time_t stopAt = now - (utc.Minute * 60) - utc.Second;
-            while(day.lastMeterReadTime < stopAt) {
-                time_t cur = min(day.lastMeterReadTime + 3600, stopAt);
-                uint8_t minutes = round((cur - day.lastMeterReadTime) / 60.0);
-                if(minutes < 1) break;
-
-                breakTime(day.lastMeterReadTime, last);
-                float imp = (ipm * minutes);
-                float exp = (epm * minutes);
-                setHourImport(last.Hour, imp);
-                setHourExport(last.Hour, exp);
-
-                day.activeImport += imp;
-                day.activeExport += exp;
-                day.lastMeterReadTime = cur;
-            }
-        }
-        ret = true;
-    }
-
-    // Update month plot
-    if(ltz.Hour == 0 && !isMonthHappy(now)) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::DEBUG))
-        #endif
-            debugger->printf_P(PSTR("Month is not happy\n"));
-        if(month.activeImport > importCounter || month.activeExport > exportCounter) {
-            #if defined(AMS_REMOTE_DEBUG)
-            if (debugger->isActive(RemoteDebug::DEBUG))
-            #endif
-                debugger->printf_P(PSTR(" - reset\n"));
-            month.activeImport = importCounter;
-            month.activeExport = exportCounter;
-            month.lastMeterReadTime = now;
-            setDayImport(ltzYesterDay.Day, 0);
-            setDayExport(ltzYesterDay.Day, 0);
-        } else if(now - month.lastMeterReadTime < 90100 && now - month.lastMeterReadTime > 82700) { // DST days are 23h (82800s) and 25h (90000)
-            #if defined(AMS_REMOTE_DEBUG)
-            if (debugger->isActive(RemoteDebug::DEBUG))
-            #endif
-                debugger->printf_P(PSTR(" - normal\n"));
-            uint32_t imp = importCounter - month.activeImport;
-            uint32_t exp = exportCounter - month.activeExport;
-
-            setDayImport(ltzYesterDay.Day, imp);
-            setDayExport(ltzYesterDay.Day, exp);
-            month.activeImport = importCounter;
-            month.activeExport = exportCounter;
-            month.lastMeterReadTime = now;
-        } else {
-            #if defined(AMS_REMOTE_DEBUG)
-            if (debugger->isActive(RemoteDebug::DEBUG))
-            #endif
-                debugger->printf_P(PSTR(" - average\n"));
-            // Make sure last month read is at midnight
-            tmElements_t last;
-            breakTime(tz->toLocal(month.lastMeterReadTime), last);
-            month.lastMeterReadTime = month.lastMeterReadTime - (last.Hour * 3600) - (last.Minute * 60) - last.Second;
-
-            float hrs = (now - month.lastMeterReadTime) / 3600.0;
-            uint32_t im = importCounter - month.activeImport;
-            uint32_t ex = exportCounter - month.activeExport;
-            float iph = im / hrs;
-            float eph = ex / hrs;
-
-            time_t stopAt = now - (ltz.Hour * 3600) - (ltz.Minute * 60) - ltz.Second;
-            while(month.lastMeterReadTime < stopAt) {
-                time_t cur = min(month.lastMeterReadTime + 86400, stopAt);
-                uint8_t hours = round((cur - month.lastMeterReadTime) / 3600.0);
-
-                breakTime(tz->toLocal(month.lastMeterReadTime), last);
-                float imp = (iph * hours);
-                float exp = (eph * hours);
-                setDayImport(last.Day, imp);
-                setDayExport(last.Day, exp);
-
-                month.activeImport += imp;
-                month.activeExport += exp;
-                month.lastMeterReadTime = cur;
-            }
-        }
-        ret = true;
-    }
-    return ret;
-}
-
-void AmsDataStorage::setHourImport(uint8_t hour, uint32_t val) {
-    if(hour < 0 || hour > 24) return;
-    
-    uint8_t accuracy = day.accuracy;
-    uint32_t update = val / pow(10, accuracy);
-    while(update > UINT16_MAX) {
-        accuracy++;
-        update = val / pow(10, accuracy);
-    }
-   
-    if(accuracy != day.accuracy) {
-        setDayAccuracy(accuracy);
-    }
-    
-    day.hImport[hour] = update;
-
-    uint32_t max = 0;
-    for(uint8_t i = 0; i < 24; i++) {
-        if(day.hImport[i] > max)
-            max = day.hImport[i];
-        if(day.hExport[i] > max)
-            max = day.hExport[i];
-    }
-
-    while(max < UINT16_MAX/10 && accuracy > 0) {
-        accuracy--;
-        max = max*10;
-    }
-    
-    if(accuracy != day.accuracy) {
-        setDayAccuracy(accuracy);
-    }
-}
-
-uint32_t AmsDataStorage::getHourImport(uint8_t hour) {
-    if(hour < 0 || hour > 24) return 0;
-    return day.hImport[hour] * pow(10, day.accuracy);
-}
-
-void AmsDataStorage::setHourExport(uint8_t hour, uint32_t val) {
-    if(hour < 0 || hour > 24) return;
-    
-    uint8_t accuracy = day.accuracy;
-    uint32_t update = val / pow(10, accuracy);
-    while(update > UINT16_MAX) {
-        accuracy++;
-        update = val / pow(10, accuracy);
-    }
-    
-    if(accuracy != day.accuracy) {
-        setDayAccuracy(accuracy);
-    }
-
-    day.hExport[hour] = update;
-
-    uint32_t max = 0;
-    for(uint8_t i = 0; i < 24; i++) {
-        if(day.hImport[i] > max)
-            max = day.hImport[i];
-        if(day.hExport[i] > max)
-            max = day.hExport[i];
-    }
-
-    while(max < UINT16_MAX/10 && accuracy > 0) {
-        accuracy--;
-        max = max*10;
-    }
-    
-    if(accuracy != day.accuracy) {
-        setDayAccuracy(accuracy);
-    }
-}
-
-uint32_t AmsDataStorage::getHourExport(uint8_t hour) {
-    if(hour < 0 || hour > 24) return 0;
-    return day.hExport[hour] * pow(10, day.accuracy);
-}
-
-void AmsDataStorage::setDayImport(uint8_t day, uint32_t val) {
-    if(day < 1 || day > 31) return;
-    
-    uint8_t accuracy = month.accuracy;
-    uint32_t update = val / pow(10, accuracy);
-    while(update > UINT16_MAX) {
-        accuracy++;
-        update = val / pow(10, accuracy);
-    }
-    
-    if(accuracy != month.accuracy) {
-        setMonthAccuracy(accuracy);
-    }
-
-    month.dImport[day-1] = update;
-
-    uint32_t max = 0;
-    for(uint8_t i = 0; i < 31; i++) {
-        if(month.dImport[i] > max)
-            max = month.dImport[i];
-        if(month.dExport[i] > max)
-            max = month.dExport[i];
-    }
-
-    while(max < UINT16_MAX/10 && accuracy > 0) {
-        accuracy--;
-        max = max*10;
-    }
-    
-    if(accuracy != month.accuracy) {
-        setMonthAccuracy(accuracy);
-    }
-}
-
-uint32_t AmsDataStorage::getDayImport(uint8_t day) {
-    if(day < 1 || day > 31) return 0;
-    return (month.dImport[day-1] * pow(10, month.accuracy));
-}
-
-void AmsDataStorage::setDayExport(uint8_t day, uint32_t val) {
-    if(day < 1 || day > 31) return;
-    
-    uint8_t accuracy = month.accuracy;
-    uint32_t update = val / pow(10, accuracy);
-    while(update > UINT16_MAX) {
-        accuracy++;
-        update = val / pow(10, accuracy);
-    }
-    
-    if(accuracy != month.accuracy) {
-        setMonthAccuracy(accuracy);
-    }
-
-    month.dExport[day-1] = update;
-
-    uint32_t max = 0;
-    for(uint8_t i = 0; i < 31; i++) {
-        if(month.dImport[i] > max)
-            max = month.dImport[i];
-        if(month.dExport[i] > max)
-            max = month.dExport[i];
-    }
-
-    while(max < UINT16_MAX/10 && accuracy > 0) {
-        accuracy--;
-        max = max*10;
-    }
-    
-    if(accuracy != month.accuracy) {
-        setMonthAccuracy(accuracy);
-    }
-}
-
-uint32_t AmsDataStorage::getDayExport(uint8_t day) {
-    if(day < 1 || day > 31) return 0;
-    return (month.dExport[day-1] * pow(10, month.accuracy));
-}
-
-bool AmsDataStorage::load() {
-    if(!LittleFS.begin()) {
-        return false;
-    }
-
-    bool ret = false;
-    if(LittleFS.exists(FILE_DAYPLOT)) {
-        File file = LittleFS.open(FILE_DAYPLOT, "r");
-        char buf[file.size()];
-        file.readBytes(buf, file.size());
-        if(buf[0] > 5) {
-            DayDataPoints* day = (DayDataPoints*) buf;
-            ret = setDayData(*day);
-        } else {
-            DayDataPoints5* old = (DayDataPoints5*) buf;
-            DayDataPoints day = { old->version };
-            day.lastMeterReadTime = old->lastMeterReadTime;
-            day.activeImport = old->activeImport;
-            day.activeExport = old->activeExport;
-            day.accuracy = old->accuracy;
-            for(uint8_t i = 0; i < 24; i++) {
-                day.hImport[i] = old->hImport[i];
-                day.hExport[i] = old->hExport[i];
-            }
-
-            ret = setDayData(day);
-        }
-        file.close();
-    }
-
-    if(LittleFS.exists(FILE_MONTHPLOT)) {
-        File file = LittleFS.open(FILE_MONTHPLOT, "r");
-        char buf[file.size()];
-        file.readBytes(buf, file.size());
-        if(buf[0] > 6) {
-            MonthDataPoints* month = (MonthDataPoints*) buf;
-            ret &= setMonthData(*month);
-        } else {
-            MonthDataPoints6* old = (MonthDataPoints6*) buf;
-            MonthDataPoints month = { old->version };
-            month.lastMeterReadTime = old->lastMeterReadTime;
-            month.activeImport = old->activeImport;
-            month.activeExport = old->activeExport;
-            month.accuracy = old->accuracy;
-            for(uint8_t i = 0; i < 31; i++) {
-                month.dImport[i] = old->dImport[i];
-                month.dExport[i] = old->dExport[i];
-            }
-
-            ret &= setMonthData(month);
-        }
-        file.close();
-    }
-
-    return ret;
-}
-
-bool AmsDataStorage::save() {
-    if(!LittleFS.begin()) {
-        return false;
-    }
-    {
-        File file = LittleFS.open(FILE_DAYPLOT, "w");
-        char buf[sizeof(day)];
-        memcpy(buf, &day, sizeof(day));
-        for(unsigned long i = 0; i < sizeof(day); i++) {
-            file.write(buf[i]);
-        }
-        file.close();
-    }
-    {
-        File file = LittleFS.open(FILE_MONTHPLOT, "w");
-        char buf[sizeof(month)];
-        memcpy(buf, &month, sizeof(month));
-        for(unsigned long i = 0; i < sizeof(month); i++) {
-            file.write(buf[i]);
-        }
-        file.close();
-    }
-    return true;
-}
-
-DayDataPoints AmsDataStorage::getDayData() {
-    return day;
-}
-
-MonthDataPoints AmsDataStorage::getMonthData() {
-    return month;
-}
-
-bool AmsDataStorage::setDayData(DayDataPoints& day) {
-    if(day.version == 5 || day.version == 6) {
-        this->day = day;
-        this->day.version = 6;
-        return true;
-    } else if(day.version == 4) {
-        this->day = day;
-        this->day.accuracy = 1;
-        this->day.version = 6;
-        return true;
-    } else if(day.version == 3) {
-        this->day = day;
-        for(uint8_t i = 0; i < 24; i++) this->day.hExport[i] = 0;
-        this->day.accuracy = 1;
-        this->day.version = 6;
-        return true;
-    }
-    return false;
-}
-
-bool AmsDataStorage::setMonthData(MonthDataPoints& month) {
-    if(month.version == 6 || month.version == 7) {
-        this->month = month;
-        this->month.version = 7;
-        return true;
-    } else if(month.version == 5) {
-        this->month = month;
-        this->month.accuracy = 1;
-        this->month.version = 7;
-        return true;
-    } else if(month.version == 4) {
-        this->month = month;
-        for(uint8_t i = 0; i < 31; i++) this->month.dExport[i] = 0;
-        this->month.accuracy = 1;
-        this->month.version = 7;
-        return true;
-    }
-    return false;
-}
-
-uint8_t AmsDataStorage::getDayAccuracy() {
-    return day.accuracy;
-}
-
-void AmsDataStorage::setDayAccuracy(uint8_t accuracy) {
-    if(day.accuracy != accuracy) {
-        double multiplier = pow(10, day.accuracy)/pow(10, accuracy);
-        for(uint8_t i = 0; i < 24; i++) {
-            day.hImport[i] = day.hImport[i] * multiplier;
-            day.hExport[i] = day.hExport[i] * multiplier;
-        }
-        day.accuracy = accuracy;
-    }
-}
-
-uint8_t AmsDataStorage::getMonthAccuracy() {
-    return month.accuracy;
-}
-
-void AmsDataStorage::setMonthAccuracy(uint8_t accuracy) {
-    if(month.accuracy != accuracy) {
-        double multiplier = pow(10, month.accuracy)/pow(10, accuracy);
-        for(uint8_t i = 0; i < 31; i++) {
-            month.dImport[i] = month.dImport[i] * multiplier;
-            month.dExport[i] = month.dExport[i] * multiplier;
-        }
-        month.accuracy = accuracy;
-    }
-    month.accuracy = accuracy;
-}
-
-bool AmsDataStorage::isHappy(time_t now) {
-    return isDayHappy(now) && isMonthHappy(now);
-}
-
-bool AmsDataStorage::isDayHappy(time_t now) {
-    if(tz == NULL) {
-        return false;
-    }
-
-    if(now < FirmwareVersion::BuildEpoch) return false;
-
-    if(now < day.lastMeterReadTime) {
-        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) {
-        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;
-}
-
-bool AmsDataStorage::isMonthHappy(time_t now) {
-    if(tz == NULL) {
-        return false;
-    }
-
-    if(now < FirmwareVersion::BuildEpoch) return false;
-    
-    if(now < month.lastMeterReadTime) {
-        return false;
-    }
-
-    // 25 hours, because of DST
-    if(now-month.lastMeterReadTime > 90000) {
-        return false;
-    }
-
-    tmElements_t tm, last;
-    breakTime(tz->toLocal(now), tm);
-    breakTime(tz->toLocal(month.lastMeterReadTime), last);
-    if(tm.Day != last.Day) {
-        return false;
-    }
-
-    return true;
-}
-
-double AmsDataStorage::getEstimatedImportCounter() {
-    if(day.lastMeterReadTime == 0) return 0;
-
-    time_t now = time(nullptr);
-    double hours = (now - day.lastMeterReadTime) / 3600.0;
-    uint64_t total = 0;
-    for(uint8_t i = 0; i < 24; i++) {
-        total += getHourImport(i);
-    }
-    double perHour = total / 24.0;
-    return (day.activeImport + (perHour * hours)) / 1000.0;
-}

lib/AmsDecoder/include/DsmrParser.h

@@ -1,27 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _DSMRPARSER_H
-#define _DSMRPARSER_H
-
-#include "Arduino.h"
-#include "DataParser.h"
-#include "GcmParser.h"
-
-class DSMRParser {
-public:
-    DSMRParser(GCMParser* gcmParser) { this->gcmParser = gcmParser; };
-    int8_t parse(uint8_t *buf, DataParserContext &ctx, bool verified, Print* debugger);
-    uint16_t getCrc();
-    uint16_t getCrcCalc();
-private:
-    uint16_t crc;
-    uint16_t crc_calc;
-
-    GCMParser* gcmParser;
-};
-
-#endif

lib/AmsDecoder/src/DsmrParser.cpp

@@ -1,92 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include "DsmrParser.h"
-#include "crc.h"
-#include "hexutils.h"
-#include "lwip/def.h"
-
-// verified indicates that this data was encapsulated in something else, so we know this has the correct size etc
-int8_t DSMRParser::parse(uint8_t *buf, DataParserContext &ctx, bool verified, Print* debugger) {
-    uint16_t lenBefore = ctx.length;
-    uint16_t crcPos = 0;
-    bool reachedEnd = verified;
-    uint8_t lastByte = 0x00;
-    for(uint16_t pos = 0; pos < ctx.length; pos++) {
-        uint8_t b = *(buf+pos);
-        if(pos == 0 && b != '/') return DATA_PARSE_BOUNDARY_FLAG_MISSING;
-        if(pos > 0 && b == '!') crcPos = pos+1;
-        if(crcPos > 0 && b == 0x0A && lastByte == 0x0D) {
-            reachedEnd = true;
-            ctx.length = pos;
-            break;
-        }
-        lastByte = b;
-    }
-    if(!reachedEnd) return DATA_PARSE_INCOMPLETE;
-    buf[ctx.length+1] = '\0';
-
-    // If we expect data to be encrypted and it was not previously verified, decrypt content
-    if(gcmParser != NULL && !verified) {
-        uint8_t* ptr = (uint8_t*) buf;
-        while(*ptr != 0x0D && *ptr != 0x0A) ptr++;
-        while(*ptr == 0x0D || *ptr == 0x0A) ptr++;
-        uint16_t pos = ptr-buf;
-        DataParserContext gcmCtx = {
-            DATA_TAG_GCM,
-            crcPos - pos - 1,
-            ctx.timestamp
-        };
-        if(debugger != NULL) {
-            debugger->printf_P(PSTR("DSMR wants to decrypt at position %lu, length: %d, payload:\n"), pos, gcmCtx.length);
-            debugPrint(ptr, 0, gcmCtx.length, debugger);
-        }
-        int8_t gcmRet = gcmParser->parse(ptr, gcmCtx, false);
-        if(gcmRet < 0) {
-            if(debugger != NULL) {
-                debugger->printf_P(PSTR(" - Failed! (%d)\n"), gcmRet);
-            }
-            return gcmRet;
-        } else {
-            if(debugger != NULL) {
-                debugger->printf_P(PSTR(" - Success! (%d)\n"), gcmRet);
-            }
-            ptr += gcmRet;
-            for(uint16_t i = 0; i < gcmCtx.length; i++) {
-                buf[pos++] = ptr[i];
-            }
-            ptr = buf + crcPos - 1;
-            crcPos = pos + 1;
-            while(*ptr != '\0') {
-                ctx.length = pos;
-                buf[pos++] = *(ptr++);
-            }
-            while(pos < lenBefore) {
-                buf[pos++] = '\0';
-            }
-        }
-    } else if(crcPos > 0) {
-	    crc_calc = crc16(buf, crcPos);
-        crc = 0x0000;
-        fromHex((uint8_t*) &crc, String((char*) buf+crcPos), 2);
-        crc = ntohs(crc);
-
-        if(crc != crc_calc) {
-            if(debugger != NULL) {
-                debugger->printf_P(PSTR("CRC incorrrect, %04X != %04X at position %lu\n"), crc, crc_calc, crcPos);
-            }
-            return DATA_PARSE_FOOTER_CHECKSUM_ERROR;
-        }
-    }
-    return DATA_PARSE_OK;
-}
-
-uint16_t DSMRParser::getCrc() {
-    return crc;
-}
-uint16_t DSMRParser::getCrcCalc() {
-    return crc_calc;
-}

lib/AmsDecoder/src/crc.cpp

@@ -1,35 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include "crc.h"
-
-uint16_t crc16_x25(const uint8_t* p, int len)
-{
-	uint16_t crc = UINT16_MAX;
-
-	while(len--)
-		for (uint16_t i = 0, d = 0xff & *p++; i < 8; i++, d >>= 1)
-			crc = ((crc & 1) ^ (d & 1)) ? (crc >> 1) ^ 0x8408 : (crc >> 1);
-
-	return (~crc << 8) | (~crc >> 8 & 0xff);
-}
-
-uint16_t crc16 (const uint8_t *p, int len) {
-    uint16_t crc = 0;
-
-    while (len--) {
-		uint8_t i;
-		crc ^= *p++;
-		for (i = 0 ; i < 8 ; ++i) {
-			if (crc & 1)
-				crc = (crc >> 1) ^ 0xa001;
-			else
-				crc = (crc >> 1);
-		}    			
-    }
-    
-    return crc;
-}

lib/AmsFirmwareUpdater/include/AmsFirmwareUpdater.h

@@ -1,151 +0,0 @@
-#pragma once
-#include <stdint.h>
-#include <Print.h>
-#include "HwTools.h"
-#include "AmsData.h"
-#include "AmsConfiguration.h"
-
-#if defined(ESP32)
-    #include "esp_flash_partitions.h"
-    #include "LittleFS.h"
-    #include "WiFi.h"
-    #include "HTTPClient.h"
-
-    #define AMS_PARTITION_TABLE_OFFSET 0x8000
-    #define AMS_PARTITION_APP0_OFFSET 0x10000
-    #define AMS_PARTITION_APP_SIZE 0x1D0000
-    #define AMS_PARTITION_MIN_SPIFFS_SIZE 0x20000
-#elif defined(ESP8266)
-	#include <ESP8266HTTPClient.h>
-
-    #define AMS_FLASH_SKETCH_SIZE 0xFEFF0
-    #define AMS_FLASH_OTA_START AMS_FLASH_OTA_SIZE
-#endif
-
-#if defined(AMS_REMOTE_DEBUG)
-#include "RemoteDebug.h"
-#endif
-
-#define AMS_UPDATE_ERR_OK 0
-#define AMS_UPDATE_ERR_DETAILS 1
-#define AMS_UPDATE_ERR_FETCH 2
-#define AMS_UPDATE_ERR_ERASE 3
-#define AMS_UPDATE_ERR_WRITE 4
-#define AMS_UPDATE_ERR_READ 5
-#define AMS_UPDATE_ERR_MD5 6
-#define AMS_UPDATE_ERR_ACTIVATE 7
-#define AMS_UPDATE_ERR_REBOOT 64
-#define AMS_UPDATE_ERR_SUCCESS_SIGNAL 122
-#define AMS_UPDATE_ERR_SUCCESS_CONFIRMED 123
-
-#define UPDATE_BUF_SIZE 4096
-
-class AmsFirmwareUpdater {
-public:
-    #if defined(AMS_REMOTE_DEBUG)
-    AmsFirmwareUpdater(RemoteDebug* debugger, HwTools* hw, AmsData* meterState);
-    #else
-    AmsFirmwareUpdater(Print* debugger, HwTools* hw, AmsData* meterState);
-    #endif
-    bool relocateOrRepartitionIfNecessary();
-    void loop();
-
-    char* getNextVersion();
-    bool setTargetVersion(const char* version);
-    void getUpgradeInformation(UpgradeInformation&);
-    float getProgress();
-    bool activateDownloadedFirmware();
-
-    void setUpgradeInformation(UpgradeInformation&);
-    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);
-
-private:
-    #if defined(ESP8266)
-		char chipType[10] = "esp8266";
-	#elif defined(CONFIG_IDF_TARGET_ESP32S2)
-		char chipType[10] = "esp32s2";
-	#elif defined(CONFIG_IDF_TARGET_ESP32S3)
-		char chipType[10] = "esp32s3";
-	#elif defined(CONFIG_IDF_TARGET_ESP32C3)
-		char chipType[10] = "esp32c3";
-	#elif defined(ESP32)
-		#if defined(CONFIG_FREERTOS_UNICORE)
-			char chipType[10] = "esp32solo";
-		#else
-			char chipType[10] = "esp32";
-		#endif
-	#endif
-
-    #if defined(AMS_REMOTE_DEBUG)
-    RemoteDebug* debugger;
-    #else
-    Print* debugger;
-    #endif
-    HwTools* hw;
-    AmsData* meterState;
-
-    bool updateStatusChanged = false;
-    UpgradeInformation updateStatus = {"","",0,0,0,0,0};
-    uint16_t lastSaveBlocksWritten = 0;
-    String md5;
-
-    uint32_t lastVersionCheck = 0;
-    uint8_t firmwareChannel;
-    bool autoUpgrade;
-    char nextVersion[17];
-
-    void getChannelName(char * buffer);
-
-    bool fetchNextVersion();
-    bool fetchVersionDetails();
-    bool fetchFirmwareChunk(HTTPClient& http);
-    bool writeBufferToFlash();
-    bool verifyChecksum();
-    bool activateNewFirmware();
-    bool writeUpdateStatus();
-    bool isFlashReadyForNextUpdateVersion(uint32_t size);
-
-    uint8_t* buf = NULL;
-    uint16_t bufPos = 0;
-
-    #if defined(ESP32)
-    bool readPartition(uint8_t num, const esp_partition_info_t* info);
-    bool writePartition(uint8_t num, const esp_partition_info_t* info);
-    bool copyData(const esp_partition_info_t* src, esp_partition_info_t* dst, bool eraseFirst=true);
-    bool copyFile(fs::LittleFSFS* src, fs::LittleFSFS* dst, const char* filename);
-    uint8_t* extractFileData(const char* filename, size_t& size);
-    void saveFileData(const char* filename, uint8_t* data, size_t size);
-
-    bool relocateAppToFirst(const esp_partition_t* active);
-    bool findPartition(const char* label, const esp_partition_info_t* info);
-
-    bool hasLargeEnoughAppPartitions();
-    bool canMigratePartitionTable();
-    bool hasTwoSpiffs();
-    bool spiffsOnCorrectLocation();
-    bool hasFiles();
-
-    bool clearPartitionTable();
-    bool writeNewPartitionChecksum(uint8_t num);
-    bool writePartitionTableWithSpiffsAtOldAndApp1();
-    bool writePartitionTableWithSpiffsAtApp1AndNew();
-    bool writePartitionTableFinal();
-
-    bool moveLittleFsFromOldToApp1();
-    bool moveLittleFsFromApp1ToNew();
-    #elif defined(ESP8266)
-    uintptr_t getFirmwareUpdateStart();
-    #endif
-};

lib/AmsJsonGenerator/include/AmsJsonGenerator.h

@@ -1,9 +0,0 @@
-#pragma once
-
-#include "AmsDataStorage.h"
-
-class AmsJsonGenerator {
-public:
-    static void generateDayPlotJson(AmsDataStorage* ds, char* buf, size_t bufSize);
-    static void generateMonthPlotJson(AmsDataStorage* ds, char* buf, size_t bufSize);
-};

lib/AmsJsonGenerator/src/AmsJsonGenerator.cpp

@@ -1,17 +0,0 @@
-#include "AmsJsonGenerator.h"
-
-void AmsJsonGenerator::generateDayPlotJson(AmsDataStorage* ds, char* buf, size_t bufSize) {
-		uint16_t pos = snprintf_P(buf, bufSize, PSTR("{\"unit\":\"kwh\""));
-		for(uint8_t i = 0; i < 24; i++) {
-			pos += snprintf_P(buf+pos, bufSize-pos, PSTR(",\"i%02d\":%.3f,\"e%02d\":%.3f"), i, ds->getHourImport(i) / 1000.0, i, ds->getHourExport(i) / 1000.0);
-		}
-		snprintf_P(buf+pos, bufSize-pos, PSTR("}"));
-}
-
-void AmsJsonGenerator::generateMonthPlotJson(AmsDataStorage* ds, char* buf, size_t bufSize) {
-		uint16_t pos = snprintf_P(buf, bufSize, PSTR("{\"unit\":\"kwh\""));
-		for(uint8_t i = 1; i < 32; i++) {
-			pos += snprintf_P(buf+pos, bufSize-pos, PSTR(",\"i%02d\":%.3f,\"e%02d\":%.3f"), i, ds->getDayImport(i) / 1000.0, i, ds->getDayExport(i) / 1000.0);
-		}
-		snprintf_P(buf+pos, bufSize-pos, PSTR("}"));
-}

lib/AmsMqttHandler/include/AmsMqttHandler.h

@@ -1,102 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _AMSMQTTHANDLER_H
-#define _AMSMQTTHANDLER_H
-
-#include "Arduino.h"
-#include <MQTT.h>
-#include "AmsData.h"
-#include "AmsConfiguration.h"
-#include "EnergyAccounting.h"
-#include "HwTools.h"
-#include "PriceService.h"
-#include "AmsFirmwareUpdater.h"
-
-#if defined(ESP32)
-#include <esp_task_wdt.h>
-#endif
-
-class AmsMqttHandler {
-public:
-    #if defined(AMS_REMOTE_DEBUG)
-    AmsMqttHandler(MqttConfig& mqttConfig, RemoteDebug* debugger, char* buf, AmsFirmwareUpdater* updater) {
-    #else
-    AmsMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf) {
-    #endif
-        this->mqttConfig = mqttConfig;
-    	this->mqttConfigChanged = true;
-        this->debugger = debugger;
-        this->json = buf;
-        this->updater = updater;
-        mqtt.dropOverflow(true);
-
-        pubTopic = String(mqttConfig.publishTopic);
-        subTopic = String(mqttConfig.subscribeTopic);
-        if(subTopic.isEmpty()) subTopic = pubTopic+"/command";
-    };
-
-    void setCaVerification(bool);
-    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; };
-
-    virtual bool postConnect() { return false; };
-    virtual bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, PriceService* ps) { return false; };
-    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(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;
-        }
-    };
-
-protected:
-    #if defined(AMS_REMOTE_DEBUG)
-    RemoteDebug* debugger;
-    #else
-    Stream* debugger;
-    #endif
-    MqttConfig mqttConfig;
-    bool mqttConfigChanged = true;
-    MQTTClient mqtt = MQTTClient(256);
-    unsigned long lastMqttRetry = -10000;
-    bool caVerification = true;
-    WiFiClient *mqttClient = NULL;
-    WiFiClientSecure *mqttSecureClient = NULL;
-    boolean _connected = false;
-    char* json;
-    uint16_t BufferSize = 2048;
-    uint64_t lastStateUpdate = 0;
-    uint64_t lastSuccessfulLoop = 0;
-
-    String pubTopic;
-    String subTopic;
-
-    AmsFirmwareUpdater* updater = NULL;
-    bool rebootSuggested = false;
-};
-
-#endif

lib/AmsMqttHandler/src/AmsMqttHandler.cpp

@@ -1,216 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include "AmsMqttHandler.h"
-#include "FirmwareVersion.h"
-#include "AmsStorage.h"
-#include "LittleFS.h"
-#include "Uptime.h"
-
-void AmsMqttHandler::setCaVerification(bool caVerification) {
-	this->caVerification = caVerification;
-}
-
-void AmsMqttHandler::setConfig(MqttConfig& mqttConfig) {
-	this->mqttConfig = mqttConfig;
-	this->mqttConfigChanged = true;
-}
-
-bool AmsMqttHandler::connect() {
-	if(millis() - lastMqttRetry < 10000) {
-		yield();
-		return false;
-	}
-	lastMqttRetry = millis();
-
-	time_t epoch = time(nullptr);
-	
-	WiFiClient *actualClient = NULL;
-
-	if(mqttConfig.ssl) {
-		if(epoch < FirmwareVersion::BuildEpoch) {
-			return false;
-		}
-		
-		bool applySslConfiguration = mqttConfigChanged;
-		if(mqttSecureClient == NULL) {
-			mqttSecureClient = new WiFiClientSecure();
-			#if defined(ESP8266)
-				mqttSecureClient->setBufferSizes(512, 512);
-				return false;
-			#endif
-			applySslConfiguration = true;
-		}
-
-		if(applySslConfiguration) {
-			if(caVerification && LittleFS.begin()) {
-				File file;
-
-				if(LittleFS.exists(FILE_MQTT_CA)) {
-					file = LittleFS.open(FILE_MQTT_CA, (char*) "r");
-					#if defined(ESP8266)
-						BearSSL::X509List *serverTrustedCA = new BearSSL::X509List(file);
-						mqttSecureClient->setTrustAnchors(serverTrustedCA);
-					#elif defined(ESP32)
-						if(!mqttSecureClient->loadCACert(file, file.size())) {
-							return false;
-						}
-					#endif
-					file.close();
-				} else {
-					mqttSecureClient->setInsecure();
-				}
-
-				#if defined(ESP8266)
-					if(LittleFS.exists(FILE_MQTT_CERT) && LittleFS.exists(FILE_MQTT_KEY)) {
-						file = LittleFS.open(FILE_MQTT_CERT, (char*) "r");
-						BearSSL::X509List *serverCertList = new BearSSL::X509List(file);
-						file.close();
-
-						file = LittleFS.open(FILE_MQTT_KEY, (char*) "r");
-						BearSSL::PrivateKey *serverPrivKey = new BearSSL::PrivateKey(file);
-						file.close();
-
-						mqttSecureClient->setClientRSACert(serverCertList, serverPrivKey);
-					}
-				#endif
-
-				#if defined(ESP32)
-					if(LittleFS.exists(FILE_MQTT_CERT)) {
-						file = LittleFS.open(FILE_MQTT_CERT, (char*) "r");
-						mqttSecureClient->loadCertificate(file, file.size());
-						file.close();
-					}
-				
-					if(LittleFS.exists(FILE_MQTT_KEY)) {
-						file = LittleFS.open(FILE_MQTT_KEY, (char*) "r");
-						mqttSecureClient->loadPrivateKey(file, file.size());
-						file.close();
-					}
-				#endif
-			} else {
-				mqttSecureClient->setInsecure();
-			}
-		}
-		actualClient = mqttSecureClient;
-	} else {
-		if(mqttClient == NULL) {
-			mqttClient = new WiFiClient();
-		}
-		actualClient = mqttClient;
-	}
-	int clientTimeout = mqttConfig.timeout / 1000;
-	if(clientTimeout > 3) clientTimeout = 3; // 3000ms is default, see WiFiClient.cpp WIFI_CLIENT_DEF_CONN_TIMEOUT_MS
-	actualClient->setTimeout(clientTimeout);
-	// Why can't we set number of retries for write here? WiFiClient defaults to 10 (10*3s == 30s)
-
-	mqttConfigChanged = false;
-	mqtt.setTimeout(mqttConfig.timeout);
-	mqtt.setKeepAlive(mqttConfig.keepalive);
-	mqtt.begin(mqttConfig.host, mqttConfig.port, *actualClient);
-	String statusTopic = String(mqttConfig.publishTopic) + "/status";
-	mqtt.setWill(statusTopic.c_str(), "offline", true, 0);
-
-	#if defined(ESP8266)
-		if(mqttSecureClient) {
-			time_t epoch = time(nullptr);
-			mqttSecureClient->setX509Time(epoch);
-		}
-	#endif
-
-	// Connect to a unsecure or secure MQTT server
-	if ((strlen(mqttConfig.username) == 0 && mqtt.connect(mqttConfig.clientId)) ||
-		(strlen(mqttConfig.username) > 0 && mqtt.connect(mqttConfig.clientId, mqttConfig.username, mqttConfig.password))) {
-		#if defined(AMS_REMOTE_DEBUG)
-		if (debugger->isActive(RemoteDebug::INFO))
-		#endif
-		debugger->printf_P(PSTR("Successfully connected to MQTT\n"));
-		mqtt.onMessage(std::bind(&AmsMqttHandler::onMessage, this, std::placeholders::_1, std::placeholders::_2));
-		_connected = mqtt.publish(statusTopic, "online", true, 0);
-        mqtt.loop();
-		defaultSubscribe();
-		postConnect();
-        return true;
-	} else {
-		#if defined(AMS_REMOTE_DEBUG)
-		if (debugger->isActive(RemoteDebug::ERROR))
-		#endif
-		{
-			debugger->printf_P(PSTR("Failed to connect to MQTT: %d\n"), mqtt.lastError());
-			#if defined(ESP8266)
-				if(mqttSecureClient) {
-					mqttSecureClient->getLastSSLError((char*) json, BufferSize);
-					debugger->println((char*) json);
-				}
-			#endif
-		}
-        return false;
-	}
-}
-
-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();
-	_connected = false;
-    delay(10);
-    yield();
-}
-
-lwmqtt_err_t AmsMqttHandler::lastError() {
-    return mqtt.lastError();
-}
-
-bool AmsMqttHandler::connected() {
-	return _connected && mqtt.connected();
-}
-
-bool AmsMqttHandler::loop() {
-	uint64_t now = millis64();
-    bool ret = connected() && mqtt.loop();
-	if(ret) {
-		lastSuccessfulLoop = now;
-	} else if(mqttConfig.rebootMinutes > 0) {
-		if(now - lastSuccessfulLoop > (uint64_t) mqttConfig.rebootMinutes * 60000) {
-			// Reboot the device if the MQTT connection is lost for too long
-			#if defined(AMS_REMOTE_DEBUG)
-			if (debugger->isActive(RemoteDebug::WARNING))
-			#endif
-			debugger->printf_P(PSTR("MQTT connection lost for over %d minutes, rebooting device\n"), mqttConfig.rebootMinutes);
-			rebootSuggested = true;
-		}
-	}
-	delay(10); // Needed to preserve power. After adding this, the voltage is super smooth on a HAN powered device
-    yield();
-	#if defined(ESP32)
-		esp_task_wdt_reset();
-	#elif defined(ESP8266)
-		ESP.wdtFeed();
-	#endif
-    return ret;
-}
-
-bool AmsMqttHandler::isRebootSuggested() {
-	return rebootSuggested;
-}

lib/CloudConnector/include/CloudConnector.h

@@ -1,135 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _CLOUDCONNECTOR_H
-#define _CLOUDCONNECTOR_H
-
-#if defined(AMS_REMOTE_DEBUG)
-#include "RemoteDebug.h"
-#endif
-#include "mbedtls/ssl.h"
-#include "mbedtls/platform.h"
-#include "mbedtls/net.h"
-#include "mbedtls/esp_debug.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
-#include "mbedtls/error.h"
-#include "mbedtls/certs.h"
-#include "mbedtls/rsa.h"
-#include "AmsConfiguration.h"
-#include "AmsData.h"
-#include "EnergyAccounting.h"
-#include "HwTools.h"
-#include "AmsMqttHandler.h"
-#include "ConnectionHandler.h"
-
-#if defined(ESP8266)
-	#include <ESP8266HTTPClient.h>
-#elif defined(ESP32) // ARDUINO_ARCH_ESP32
-	#include <HTTPClient.h>
-    #include <esp_wifi.h>
-    #include <esp_task_wdt.h>
-    #include <WiFiUdp.h>
-#else
-	#warning "Unsupported board type"
-#endif
-
-#define CC_BUF_SIZE 4096
-
-static const char CC_JSON_POWER[] PROGMEM = ",\"%s\":{\"P\":%lu,\"Q\":%lu}";
-static const char CC_JSON_POWER_LIST3[] PROGMEM = ",\"%s\":{\"P\":%lu,\"Q\":%lu,\"tP\":%.3f,\"tQ\":%.3f}";
-static const char CC_JSON_PHASE[] PROGMEM = "%s\"%d\":{\"u\":%.2f,\"i\":%s}";
-static const char CC_JSON_PHASE_LIST4[] PROGMEM = "%s\"%d\":{\"u\":%.2f,\"i\":%s,\"Pim\":%lu,\"Pex\":%lu,\"pf\":%.2f}";
-static const char CC_JSON_STATUS[] PROGMEM = ",\"status\":{\"esp\":{\"state\":%d,\"error\":%d},\"han\":{\"state\":%d,\"error\":%d},\"wifi\":{\"state\":%d,\"error\":%d},\"mqtt\":{\"state\":%d,\"error\":%d}}";
-static const char CC_JSON_INIT[] PROGMEM = ",\"init\":{\"mac\":\"%s\",\"apmac\":\"%s\",\"version\":\"%s\",\"boardType\":%d,\"bootReason\":%d,\"bootCause\":%d,\"tz\":\"%s\"},\"meter\":{\"manufacturerId\":%d,\"manufacturer\":\"%s\",\"model\":\"%s\",\"id\":\"%s\",\"system\":\"%s\",\"fuse\":%d,\"import\":%d,\"export\":%d},\"network\":{\"ip\":\"%s\",\"mask\":\"%s\",\"gw\":\"%s\",\"dns1\":\"%s\",\"dns2\":\"%s\"}";
-
-struct CloudData {
-    uint8_t type;
-	int16_t data;
-} __attribute__((packed));
-
-class CloudConnector {
-public:
-    #if defined(AMS_REMOTE_DEBUG)
-    CloudConnector(RemoteDebug*);
-    #else
-    CloudConnector(Stream*);
-    #endif
-    bool setup(CloudConfig& config, MeterConfig& meter, SystemConfig& system, NtpConfig& ntp, HwTools* hw, ResetDataContainer* rdc, PriceService* ps);
-    void setMqttHandler(AmsMqttHandler* mqttHandler);
-    void update(AmsData& data, EnergyAccounting& ea);
-    void setPriceConfig(PriceServiceConfig&);
-    void setEnergyAccountingConfig(EnergyAccountingConfig&);
-    void forceUpdate();
-    void forcePriceUpdate();
-    void setConnectionHandler(ConnectionHandler* ch);
-    String generateSeed();
-
-private:
-    #if defined(AMS_REMOTE_DEBUG)
-    RemoteDebug* debugger = NULL;
-    #else
-    Stream* debugger = NULL;
-    #endif
-    HwTools* hw = NULL;
-    ConnectionHandler* ch = NULL;
-    ResetDataContainer* rdc = NULL;
-    PriceService* ps = NULL;
-    AmsMqttHandler* mqttHandler = NULL;
-    CloudConfig config;
-    PriceServiceConfig priceConfig;
-    unsigned long lastPriceConfig = 0;
-    EnergyAccountingConfig eac;
-    unsigned long lastEac = 0;
-    HTTPClient http;
-    WiFiUDP udp;
-    WiFiClient tcp;
-	int maxPwr = 0;
-    uint8_t boardType = 0;
-    char timezone[32];
-	uint8_t distributionSystem = 0;
-	uint16_t mainFuse = 0, productionCapacity = 0;
-
-    String uuid;
-    bool initialized = false;
-    unsigned long lastUpdate = 0;
-    char mac[18];
-    char apmac[18];
-
-    String seed = "";
-
-    char clearBuffer[CC_BUF_SIZE];
-    uint8_t* httpBuffer = NULL;
-    unsigned char encryptedBuffer[256];
-    mbedtls_rsa_context* rsa = nullptr;
-    mbedtls_ctr_drbg_context ctr_drbg;
-    mbedtls_entropy_context entropy;
-    char* pers = "amsreader";
-
-    bool init();
-
-    String meterManufacturer(uint8_t type) {
-        switch(type) {
-            case AmsTypeAidon: return F("Aidon");
-            case AmsTypeKaifa: return F("Kaifa");
-            case AmsTypeKamstrup: return F("Kamstrup");
-            case AmsTypeIskra: return F("Iskra");
-            case AmsTypeLandisGyr: return F("Landis+Gyr");
-            case AmsTypeSagemcom: return F("Sagemcom");
-        }
-        return F("");
-    }
-
-    String distributionSystemStr(uint8_t ds) {
-        switch(ds) {
-            case 1: return F("IT");
-            case 2: return F("TN");
-        }
-        return F("");
-    }
-
-};
-#endif

lib/CloudConnector/src/CloudConnector.cpp

@@ -1,630 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include "CloudConnector.h"
-#include "FirmwareVersion.h"
-#include "crc.h"
-#include "Uptime.h"
-#include "hexutils.h"
-#if defined(ESP32)
-#include <ESPRandom.h>
-#endif
-
-#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4
-#include "esp32/rom/rtc.h"
-#elif CONFIG_IDF_TARGET_ESP32S2
-#include "esp32s2/rom/rtc.h"
-#elif CONFIG_IDF_TARGET_ESP32C3
-#include "esp32c3/rom/rtc.h"
-#elif CONFIG_IDF_TARGET_ESP32S3
-#include "esp32s3/rom/rtc.h"
-#endif
-
-#if defined(AMS_REMOTE_DEBUG)
-CloudConnector::CloudConnector(RemoteDebug* debugger) {
-#else
-CloudConnector::CloudConnector(Stream* debugger) {
-#endif
-    this->debugger = debugger;
-
-    http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
-    http.setReuse(false);
-    http.setTimeout(60000);
-    http.setUserAgent("ams2mqtt/" + String(FirmwareVersion::VersionString));
-    http.useHTTP10(true);
-
-    uint8_t mac[6];
-    uint8_t apmac[6];
-
-    #if defined(ESP8266)
-    wifi_get_macaddr(STATION_IF, mac);
-    wifi_get_macaddr(SOFTAP_IF, apmac);
-	#elif defined(ESP32)
-    esp_wifi_get_mac((wifi_interface_t)ESP_IF_WIFI_STA, mac);
-    esp_wifi_get_mac((wifi_interface_t)ESP_IF_WIFI_AP, apmac);
-	#endif
-    sprintf_P(this->mac, PSTR("%02X:%02X:%02X:%02X:%02X:%02X"), mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-    sprintf_P(this->apmac, PSTR("%02X:%02X:%02X:%02X:%02X:%02X"), apmac[0], apmac[1], apmac[2], apmac[3], apmac[4], apmac[5]);
-}
-
-bool CloudConnector::setup(CloudConfig& config, MeterConfig& meter, SystemConfig& system, NtpConfig& ntp, HwTools* hw, ResetDataContainer* rdc, PriceService* ps) {
-    bool ret = false;
-    #if defined(ESP32)
-    if(!ESPRandom::isValidV4Uuid(config.clientId)) {
-        ESPRandom::uuid4(config.clientId);
-        ret = true;
-    }
-    uuid = ESPRandom::uuidToString(config.clientId);
-    #endif
-
-    this->config = config;
-    this->hw = hw;
-    this->rdc = rdc;
-    this->ps = ps;
-
-    this->boardType = system.boardType;
-    strcpy(this->timezone, ntp.timezone);
-
-	this->maxPwr = 0;
-	this->distributionSystem = meter.distributionSystem;
-	this->mainFuse = meter.mainFuse;
-	this->productionCapacity = meter.productionCapacity;
-
-    this->initialized = false;
-
-    return ret;
-}
-
-void CloudConnector::setMqttHandler(AmsMqttHandler* mqttHandler) {
-    this->mqttHandler = mqttHandler;
-}
-
-bool CloudConnector::init() {
-    if(config.enabled) {
-        //if(config.port == 0) 
-        config.port = 7443;
-        //if(strlen(config.hostname) == 0) 
-        strcpy_P(config.hostname, PSTR("cloud.amsleser.no"));
-
-        snprintf_P(clearBuffer, CC_BUF_SIZE, PSTR("http://%s/hub/cloud/public.key"), config.hostname);
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::INFO))
-        #endif
-        debugger->printf_P(PSTR("(CloudConnector) Downloading public key from %s\n"), clearBuffer);
-        #if defined(ESP8266)
-        WiFiClient client;
-        client.setTimeout(5000);
-        if(http.begin(client, clearBuffer)) {
-        #elif defined(ESP32)
-        if(http.begin(clearBuffer)) {
-        #endif
-            int status = http.GET();
-
-            #if defined(ESP32)
-                esp_task_wdt_reset();
-            #elif defined(ESP8266)
-                ESP.wdtFeed();
-            #endif
-
-            if(status == HTTP_CODE_OK) {
-                String pub = http.getString();
-                http.end();
-
-                memset(clearBuffer, 0, CC_BUF_SIZE);
-                snprintf(clearBuffer, CC_BUF_SIZE, pub.c_str());
-
-                mbedtls_pk_context pk;
-                mbedtls_pk_init(&pk);
-
-                int error_code = 0;
-                if((error_code =  mbedtls_pk_parse_public_key(&pk, (unsigned char*) clearBuffer, strlen((const char*) clearBuffer)+1)) == 0){
-                    rsa = mbedtls_pk_rsa(pk);
-                    mbedtls_ctr_drbg_init(&ctr_drbg);
-                    mbedtls_entropy_init(&entropy);
-
-                    int ret = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func,
-                                                &entropy, (const unsigned char *) pers,
-                                                strlen(pers));
-                    if(ret != 0) {
-                        #if defined(AMS_REMOTE_DEBUG)
-                        if (debugger->isActive(RemoteDebug::ERROR))
-                        #endif
-                        debugger->printf_P(PSTR("mbedtls_ctr_drbg_seed return code: %d\n"), ret);
-                    }
-                    return ret == 0;
-                } else {
-                    #if defined(AMS_REMOTE_DEBUG)
-                    if (debugger->isActive(RemoteDebug::ERROR))
-                    #endif
-                    debugger->printf("RSA public key read error: ");
-                    mbedtls_strerror(error_code, clearBuffer, CC_BUF_SIZE);
-                    #if defined(AMS_REMOTE_DEBUG)
-                    if (debugger->isActive(RemoteDebug::ERROR))
-                    #endif
-                    debugger->printf("%s\n", clearBuffer);
-                }
-            } else {
-                #if defined(AMS_REMOTE_DEBUG)
-                if (debugger->isActive(RemoteDebug::ERROR))
-                #endif
-                debugger->printf_P(PSTR("(CloudConnector) Communication error, returned status: %d\n"), status);
-                #if defined(AMS_REMOTE_DEBUG)
-                if (debugger->isActive(RemoteDebug::ERROR))
-                #endif
-                debugger->printf(http.errorToString(status).c_str());
-                debugger->println();
-                #if defined(AMS_REMOTE_DEBUG)
-                if (debugger->isActive(RemoteDebug::DEBUG))
-                #endif
-                debugger->printf(http.getString().c_str());
-
-                http.end();
-            }
-        }
-    }
-    return false;
-}
-
-void CloudConnector::update(AmsData& data, EnergyAccounting& ea) {
-    unsigned long now = millis();
-    if(now-lastUpdate < ((unsigned long)config.interval)*1000) {
-        return;
-    };
-    bool sendFirst = lastUpdate == 0;
-    lastUpdate = now;
-    if(config.enabled) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::VERBOSE))
-        #endif
-        debugger->printf_P(PSTR("(CloudConnector) Enabled\n"));
-    } else {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::VERBOSE))
-        #endif
-        debugger->printf_P(PSTR("(CloudConnector) Not enabled\n"));
-        return;
-    }
-    if(!ESPRandom::isValidV4Uuid(config.clientId)) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::WARNING))
-        #endif
-        debugger->printf_P(PSTR("(CloudConnector) Client ID is not valid\n"));
-        return;
-    }
-    if(data.getListType() < 2) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::VERBOSE))
-        #endif
-        debugger->printf_P(PSTR("(CloudConnector) List type not enough data\n"));
-        return;
-    }
-
-    if(!initialized && !init()) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::WARNING))
-        #endif
-        debugger->printf_P(PSTR("Unable to initialize cloud connector\n"));
-        return;
-    }
-    initialized = true;
-
-    memset(clearBuffer, 0, CC_BUF_SIZE);
-
-    int pos = 0;
-
-    pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, PSTR("{\"id\":\"%s\""), uuid.c_str());
-    if(!seed.isEmpty()) {
-        pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, PSTR(",\"seed\":\"%s\""), seed.c_str());
-    }
-
-    bool sendData = true;
-    if(sendFirst) {
-        seed.clear();
-        if(mainFuse > 0 && distributionSystem > 0) {
-            int voltage = distributionSystem == 2 ? 400 : 230;
-            if(data.isThreePhase()) {
-                maxPwr = mainFuse * sqrt(3) * voltage;
-            } else if(data.isTwoPhase()) {
-                maxPwr = mainFuse * voltage;
-            } else {
-                maxPwr = mainFuse * 230;
-            }
-        }
-
-        IPAddress localIp;
-        IPAddress subnet;
-        IPAddress gateway;
-        IPAddress dns1;
-        IPAddress dns2;
-
-        if(ch == NULL) {
-            localIp = WiFi.localIP();
-            subnet = IPAddress(255,255,255,0);
-            gateway = WiFi.subnetMask();
-            dns1 = WiFi.dnsIP(0);
-            dns2 = WiFi.dnsIP(1);
-        } else {
-            localIp = ch->getIP();
-            subnet = ch->getSubnetMask();
-            gateway = ch->getGateway();
-            dns1 = ch->getDns(0);
-            dns2 = ch->getDns(1);
-        }
-
-        pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, CC_JSON_INIT,
-            mac, 
-            apmac, 
-            FirmwareVersion::VersionString,
-            boardType,
-            rtc_get_reset_reason(0),
-            rdc == NULL ? 0 : rdc->last_cause,
-            timezone,
-            data.getMeterType(),
-            meterManufacturer(data.getMeterType()).c_str(),
-            data.getMeterModel().c_str(),
-            data.getMeterId().c_str(),
-            distributionSystemStr(distributionSystem).c_str(),
-            mainFuse,
-            maxPwr,
-            productionCapacity,
-            localIp.toString().c_str(),
-            subnet.toString().c_str(),
-            gateway.toString().c_str(),
-            dns1.toString().c_str(),
-            dns2.toString().c_str()
-        );
-    } else if(lastPriceConfig == 0) {
-        pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, PSTR(",\"price\":{\"area\":\"%s\",\"currency\":\"%s\",\"modifiers\":["), priceConfig.area, priceConfig.currency);
-        if(ps != NULL) {
-            std::vector<PriceConfig> pc = ps->getPriceConfig();
-            if(pc.size() > 0) {
-                for(uint8_t i = 0; i < pc.size(); i++) {
-                    PriceConfig& p = pc.at(i);
-
-                    String days;
-                    for(uint8_t d = 0; d < 7; d++) {
-                        if((p.days >> d) & 0x1 == 0x1) {
-                            days += String(d, 10) + ",";
-                        }
-                    }
-                    days = days.substring(0, days.length()-1);
-
-                    String hours;
-                    for(uint8_t h = 0; h < 24; h++) {
-                        if((p.hours >> h) & 0x1 == 0x1) {
-                            hours += String(h, 10) + ",";
-                        }
-                    }
-                    hours = hours.substring(0, hours.length()-1);
-
-                    char start[8];
-                    memset(start, 0, 8);
-                    if(p.start_dayofmonth > 0 && p.start_month > 0) {
-                        snprintf_P(start, 8, PSTR("[%d,%d]"), p.start_month, p.start_dayofmonth);
-                    } else {
-                        strcpy_P(start, PSTR("null"));
-                    }
-
-                    char end[8];
-                    memset(end, 0, 8);
-                    if(p.end_dayofmonth > 0 && p.end_month > 0) {
-                        snprintf_P(end, 8, PSTR("[%d,%d]"), p.end_month, p.end_dayofmonth);
-                    } else {
-                        strcpy_P(end, PSTR("null"));
-                    }
-
-                    pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, PSTR("{\"type\":%d,\"name\":\"%s\",\"dir\":%d,\"days\":[%s],\"hours\":[%s],\"value\":%.4f,\"start\":%s,\"end\":%s}%s"),
-                        p.type,
-                        p.name,
-                        p.direction,
-                        days.c_str(),
-                        hours.c_str(),
-                        p.value / 10000.0,
-                        start,
-                        end,
-                        i == pc.size()-1 ? "" : ","
-                    );
-                }
-            }
-        }
-        pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, PSTR("]}"));
-        lastPriceConfig = now;
-        sendData = false;
-    } else if(lastEac == 0) {
-        pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, PSTR(",\"accounting\":{\"hours\":%d,\"thresholds\":[%d,%d,%d,%d,%d,%d,%d,%d,%d]}"), 
-            eac.hours,
-            eac.thresholds[0],
-            eac.thresholds[1],
-            eac.thresholds[2],
-            eac.thresholds[3],
-            eac.thresholds[4],
-            eac.thresholds[5],
-            eac.thresholds[6],
-            eac.thresholds[7],
-            eac.thresholds[8]
-        );
-        lastEac = now;
-    }
-
-    if(sendData) {
-        float vcc = 0.0;
-        int rssi = 0;
-        float temperature = -127;
-        if(hw != NULL) {
-            vcc = hw->getVcc();
-            rssi = hw->getWifiRssi();
-            temperature = hw->getTemperature();
-        }
-
-        uint8_t espStatus;
-        #if defined(ESP8266)
-        if(vcc < 2.0) { // Voltage not correct, ESP would not run on this voltage
-            espStatus = 1;
-        } else if(vcc > 2.8 && vcc < 3.5) {
-            espStatus = 1;
-        } else if(vcc > 2.7 && vcc < 3.6) {
-            espStatus = 2;
-        } else {
-            espStatus = 3;
-        }
-        #elif defined(ESP32)
-        if(vcc < 2.0) { // Voltage not correct, ESP would not run on this voltage
-            espStatus = 1;
-        } else if(vcc > 3.1 && vcc < 3.5) {
-            espStatus = 1;
-        } else if(vcc > 3.0 && vcc < 3.6) {
-            espStatus = 2;
-        } else {
-            espStatus = 3;
-        }
-        #endif
-
-        uint8_t hanStatus;
-        if(data.getLastError() != 0) {
-            hanStatus = 3;
-        } else if(data.getLastUpdateMillis() == 0 && now < 30000) {
-            hanStatus = 0;
-        } else if(now - data.getLastUpdateMillis() < 15000) {
-            hanStatus = 1;
-        } else if(now - data.getLastUpdateMillis() < 30000) {
-            hanStatus = 2;
-        } else {
-            hanStatus = 3;
-        }
-
-        uint8_t wifiStatus;
-        if(rssi > -75) {
-            wifiStatus = 1;
-        } else if(rssi > -95) {
-            wifiStatus = 2;
-        } else {
-            wifiStatus = 3;
-        }
-
-        uint8_t mqttStatus;
-        if(mqttHandler == NULL) {
-            mqttStatus = 0;
-        } else if(mqttHandler->connected()) {
-            mqttStatus = 1;
-        } else if(mqttHandler->lastError() == 0) {
-            mqttStatus = 2;
-        } else {
-            mqttStatus = 3;
-        }
-
-        pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, PSTR(",\"data\":{\"clock\":%lu,\"up\":%lu,\"lastUpdate\":%lu,\"est\":%s"), 
-            (uint32_t) time(nullptr),
-            (uint32_t) (millis64()/1000),
-            (uint32_t) (data.getLastUpdateMillis()/1000),
-            data.isCounterEstimated() ? "true" : "false"
-        );
-        if(data.getListType() > 2) {
-            pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, CC_JSON_POWER_LIST3, "import", data.getActiveImportPower(), data.getReactiveImportPower(), data.getActiveImportCounter(), data.getReactiveImportCounter());
-        } else {
-            pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, CC_JSON_POWER, "import", data.getActiveImportPower(), data.getReactiveImportPower());
-        }
-        if(data.getListType() > 2) {
-            pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, CC_JSON_POWER_LIST3, "export", data.getActiveExportPower(), data.getReactiveExportPower(), data.getActiveExportCounter(), data.getReactiveExportCounter());
-        } else {
-            pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, CC_JSON_POWER, "export", data.getActiveExportPower(), data.getReactiveExportPower());
-        }
-        
-        if(data.getListType() > 1) {
-            pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, PSTR(",\"phases\":{"));
-            bool first = true;
-            if(data.getL1Voltage() > 0.0) {
-                if(data.getListType() > 3) {
-                    pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, CC_JSON_PHASE_LIST4, first ? "" : ",", 1, data.getL1Voltage(), String(data.getL1Current(), 2).c_str(), data.getL1ActiveImportPower(), data.getL1ActiveExportPower(), data.getL1PowerFactor());
-                } else {
-                    pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, CC_JSON_PHASE, first ? "" : ",", 1, data.getL1Voltage(), String(data.getL1Current(), 2).c_str());
-                }
-                first = false;
-            }
-            if(data.getL2Voltage() > 0.0) {
-                if(data.getListType() > 3) {
-                    pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, CC_JSON_PHASE_LIST4, first ? "" : ",", 2, data.getL2Voltage(), String(data.getL2Current(), 2).c_str(), data.getL2ActiveImportPower(), data.getL2ActiveExportPower(), data.getL2PowerFactor());
-                } else {
-                    pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, CC_JSON_PHASE, first ? "" : ",", 2, data.getL2Voltage(), data.isL2currentMissing() ? "null" : String(data.getL2Current(), 2).c_str());
-                }
-                first = false;
-            }
-            if(data.getL3Voltage() > 0.0) {
-                if(data.getListType() > 3) {
-                    pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, CC_JSON_PHASE_LIST4, first ? "" : ",", 3, data.getL3Voltage(), String(data.getL3Current(), 2).c_str(), data.getL3ActiveImportPower(), data.getL3ActiveExportPower(), data.getL3PowerFactor());
-                } else {
-                    pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, CC_JSON_PHASE, first ? "" : ",", 3, data.getL3Voltage(), String(data.getL3Current(), 2).c_str());
-                }
-                first = false;
-            }
-            pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, PSTR("}"));
-        }
-        if(data.getListType() > 3) {
-            pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, PSTR(",\"pf\":%.2f"), data.getPowerFactor());
-        }
-
-        pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, PSTR(",\"realtime\":{\"import\":%.3f,\"export\":%.3f}"), ea.getUseThisHour(), ea.getProducedThisHour());
-        pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, PSTR(",\"vcc\":%.2f,\"temp\":%.2f,\"rssi\":%d,\"free\":%d"), vcc, temperature, rssi, ESP.getFreeHeap());
-        pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, CC_JSON_STATUS, 
-            espStatus, 0,
-            hanStatus, data.getLastError(),
-            wifiStatus, 0,
-            mqttStatus, mqttHandler == NULL ? 0 : mqttHandler->lastError()
-        );
-
-        pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, PSTR("}"));
-    }
-    uint16_t crc = crc16((uint8_t*) clearBuffer, pos);
-    pos += snprintf_P(clearBuffer+pos, CC_BUF_SIZE-pos, PSTR(",\"crc\":\"%04X\"}"), crc);
-
-    if(rsa == nullptr) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::WARNING))
-        #endif
-        debugger->printf_P(PSTR("RSA is null\n"));
-        return;
-    }
-    int ret = mbedtls_rsa_check_pubkey(rsa);
-    if(ret != 0) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::ERROR))
-        #endif
-        debugger->printf_P(PSTR("mbedtls_rsa_pkcs1_encrypt return code: %d\n"), ret);
-        mbedtls_strerror(ret, clearBuffer, CC_BUF_SIZE);
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::ERROR))
-        #endif
-        debugger->printf_P(PSTR("%s\n"), clearBuffer);
-        return;
-    }
-    memset(encryptedBuffer, 0, rsa->len);
-
-    int maxlen = rsa->len - 11; // 11 should be the correct padding size for PKCS1
-
-    Stream *stream = NULL;
-
-    if(config.proto == 0) {
-        udp.beginPacket(config.hostname, config.port);
-        stream = &udp;
-    } else if(config.proto == 1) {
-        if(!tcp.connected()) {
-            int ret = tcp.connect(config.hostname, config.port, 1000);
-            if(ret != 1) {
-                #if defined(AMS_REMOTE_DEBUG)
-                if (debugger->isActive(RemoteDebug::ERROR))
-                #endif
-                debugger->printf_P(PSTR("tcp.connect(%s, %d) return code: %d\n"), config.hostname, config.port, ret);
-                return;
-            }
-            tcp.setTimeout((config.interval * 1000) / 2);
-        }
-        while(tcp.available()) tcp.read(); // Empty incoming buffer
-        stream = &tcp;
-    } else if(config.proto == 2) {
-        if(!http.connected()) {
-            http.setReuse(true);
-            snprintf_P(clearBuffer, CC_BUF_SIZE, PSTR("http://%s/hub/cloud/data"), config.hostname);
-            if(!http.begin(clearBuffer)) {
-                #if defined(AMS_REMOTE_DEBUG)
-                if (debugger->isActive(RemoteDebug::ERROR))
-                #endif
-                debugger->printf_P(PSTR("(CloudConnector) Unable to start HTTP connector\n"));
-                http.end();
-                return;
-            }
-        }
-        if(httpBuffer == NULL) {
-            httpBuffer = (uint8_t*) malloc(CC_BUF_SIZE);
-        }
-    }
-
-    int sendBytes = 0;
-    for(int i = 0; i < pos; i += maxlen) {
-        int ret = mbedtls_rsa_pkcs1_encrypt(rsa, mbedtls_ctr_drbg_random, &ctr_drbg, MBEDTLS_RSA_PUBLIC, maxlen, (unsigned char*) (clearBuffer+i), encryptedBuffer);
-        if(ret == 0) {
-            if(stream != NULL) {
-                stream->write(encryptedBuffer, rsa->len);
-                stream->flush();
-            } else {
-                memcpy(httpBuffer + sendBytes, encryptedBuffer, rsa->len);
-            }
-            sendBytes += rsa->len;
-            delay(1);
-        } else {
-            #if defined(AMS_REMOTE_DEBUG)
-            if (debugger->isActive(RemoteDebug::ERROR))
-            #endif
-            debugger->printf_P(PSTR("mbedtls_rsa_pkcs1_encrypt return code: %d\n"), ret);
-            mbedtls_strerror(ret, clearBuffer, CC_BUF_SIZE);
-            #if defined(AMS_REMOTE_DEBUG)
-            if (debugger->isActive(RemoteDebug::ERROR))
-            #endif
-            debugger->printf_P(PSTR("%s\n"), clearBuffer);
-        }
-    }
-
-    if(config.proto == 0) {
-        udp.endPacket();
-    } else if(config.proto == 1) {
-        tcp.write("\r\n");
-        tcp.flush();
-    } else if(config.proto == 2) {
-        http.addHeader("Content-Type", "application/octet-stream");
-        int status = http.POST(httpBuffer, sendBytes);
-        if(status != 200) {
-            #if defined(AMS_REMOTE_DEBUG)
-            if (debugger->isActive(RemoteDebug::ERROR))
-            #endif
-            debugger->printf_P(PSTR("(CloudConnector) Communication error 2, returned status: %d\n"), status);
-            #if defined(AMS_REMOTE_DEBUG)
-            if (debugger->isActive(RemoteDebug::ERROR))
-            #endif
-            debugger->printf(http.errorToString(status).c_str());
-            debugger->println();
-            #if defined(AMS_REMOTE_DEBUG)
-            if (debugger->isActive(RemoteDebug::DEBUG))
-            #endif
-            debugger->printf(http.getString().c_str());
-
-            http.end();
-        }
-    }
-
-    #if defined(AMS_REMOTE_DEBUG)
-    if (debugger->isActive(RemoteDebug::DEBUG))
-    #endif
-    debugger->printf_P(PSTR("(CloudConnector) %d bytes sent to %s:%d from %s\n"), sendBytes, config.hostname, config.proto == 2 ? 80 : config.port, uuid.c_str());
-}
-
-void CloudConnector::forceUpdate() {
-    lastUpdate = 0;
-    lastPriceConfig = 0;
-    lastEac = 0;
-}
-
-void CloudConnector::forcePriceUpdate() {
-    lastPriceConfig = 0;
-}
-
-void CloudConnector::setConnectionHandler(ConnectionHandler* ch) {
-	this->ch = ch;
-}
-
-void CloudConnector::setPriceConfig(PriceServiceConfig& priceConfig) {
-    this->priceConfig = priceConfig;
-    this->lastPriceConfig = 0;
-}
-
-void CloudConnector::setEnergyAccountingConfig(EnergyAccountingConfig& eac) {
-    this->eac = eac;
-    this->lastEac = 0;
-}
-
-String CloudConnector::generateSeed() {
-    uint8_t key[16];
-    ESPRandom::uuid4(key);
-    seed = ESPRandom::uuidToString(key);
-    return seed;
-}

lib/ConnectionHandler/include/ConnectionHandler.h

@@ -1,48 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _CONNECTIONHANDLER_H
-#define _CONNECTIONHANDLER_H
-
-#include "AmsConfiguration.h"
-#if defined(ESP8266)
-#include <ESP8266WiFi.h>
-#elif defined(ESP32)
-#include <WiFi.h>
-esp_netif_t* get_esp_interface_netif(esp_interface_t interface);
-#endif
-
-#define NETWORK_MODE_WIFI_CLIENT 1
-#define NETWORK_MODE_WIFI_AP 2
-#define NETWORK_MODE_ETH_CLIENT 3
-
-class ConnectionHandler {
-public:
-    virtual ~ConnectionHandler() {};
-    virtual bool connect(NetworkConfig config, SystemConfig sys);
-    virtual void disconnect(unsigned long reconnectDelay);
-    virtual bool isConnected();
-    virtual bool isConfigChanged();
-    virtual void getCurrentConfig(NetworkConfig& networkConfig);
-    virtual IPAddress getIP();
-    virtual IPAddress getSubnetMask();
-    virtual IPAddress getGateway();
-    virtual IPAddress getDns(uint8_t idx);
-    #if defined(ESP32)
-    virtual IPv6Address getIPv6();
-    virtual IPv6Address getDNSv6(uint8_t idx);
-    virtual void eventHandler(WiFiEvent_t event, WiFiEventInfo_t info);
-    #endif
-
-    uint8_t getMode() {
-        return this->mode;
-    }
-
-protected:
-    uint8_t mode;
-};
-
-#endif

lib/ConnectionHandler/include/EthernetConnectionHandler.h

@@ -1,59 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _ETHERNETCONNECTIONHANDLER_H
-#define _ETHERNETCONNECTIONHANDLER_H
-
-#include "ConnectionHandler.h"
-#include <Arduino.h>
-#if defined(AMS_REMOTE_DEBUG)
-#include "RemoteDebug.h"
-#endif
-
-#define CONNECTION_TIMEOUT 30000
-
-class EthernetConnectionHandler : public ConnectionHandler {
-public:
-    #if defined(AMS_REMOTE_DEBUG)
-    EthernetConnectionHandler(RemoteDebug* debugger);
-    #else
-    EthernetConnectionHandler(Stream* debugger);
-    #endif
-
-    bool connect(NetworkConfig config, SystemConfig sys);
-    void disconnect(unsigned long reconnectDelay);
-    bool isConnected();
-    bool isConfigChanged();
-    void getCurrentConfig(NetworkConfig& networkConfig);
-    IPAddress getIP();
-    IPAddress getSubnetMask();
-    IPAddress getGateway();
-    IPAddress getDns(uint8_t idx);
-    #if defined(ESP32)
-    IPv6Address getIPv6();
-    IPv6Address getDNSv6(uint8_t idx);
-    void eventHandler(WiFiEvent_t event, WiFiEventInfo_t info);
-    #endif
-
-private:
-    #if defined(AMS_REMOTE_DEBUG)
-    RemoteDebug* debugger;
-    #else
-    Stream* debugger;
-    #endif
-    NetworkConfig config;
-
-    bool connected = false;
-    bool configChanged = false;
-    unsigned long timeout = CONNECTION_TIMEOUT;
-    unsigned long lastRetry = 0;
-
-    int8_t ethPowerPin = -1;
-    uint8_t ethEnablePin = 0;
-
-};
-
-#endif

lib/ConnectionHandler/include/WiFiAccessPointConnectionHandler.h

@@ -1,54 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _WIFIACCESSPOINTCONNECTIONHANDLER_H
-#define _WIFIACCESSPOINTCONNECTIONHANDLER_H
-
-#include "ConnectionHandler.h"
-#include <Arduino.h>
-#if defined(AMS_REMOTE_DEBUG)
-#include "RemoteDebug.h"
-#endif
-#include <DNSServer.h>
-
-class WiFiAccessPointConnectionHandler : public ConnectionHandler {
-public:
-    #if defined(AMS_REMOTE_DEBUG)
-    WiFiAccessPointConnectionHandler(RemoteDebug* debugger);
-    #else
-    WiFiAccessPointConnectionHandler(Stream* debugger);
-    #endif
-
-    bool connect(NetworkConfig config, SystemConfig sys);
-    void disconnect(unsigned long reconnectDelay);
-    bool isConnected();
-    bool isConfigChanged();
-    void getCurrentConfig(NetworkConfig& networkConfig);
-    IPAddress getIP();
-    IPAddress getSubnetMask();
-    IPAddress getGateway();
-    IPAddress getDns(uint8_t idx);
-    #if defined(ESP32)
-    IPv6Address getIPv6();
-    IPv6Address getDNSv6(uint8_t idx);
-    void eventHandler(WiFiEvent_t event, WiFiEventInfo_t info);
-    #endif
-
-private:
-    #if defined(AMS_REMOTE_DEBUG)
-    RemoteDebug* debugger;
-    #else
-    Stream* debugger;
-    #endif
-    NetworkConfig config;
-
-    DNSServer dnsServer;
-
-    bool connected = false;
-    bool configChanged = false;
-};
-
-#endif

lib/ConnectionHandler/include/WiFiClientConnectionHandler.h

@@ -1,66 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _WIFICLIENTCONNECTIONHANDLER_H
-#define _WIFICLIENTCONNECTIONHANDLER_H
-
-#include "ConnectionHandler.h"
-#include <Arduino.h>
-#if defined(AMS_REMOTE_DEBUG)
-#include "RemoteDebug.h"
-#endif
-
-#define CONNECTION_TIMEOUT 30000
-#define RECONNECT_TIMEOUT 5000
-
-#if defined(ESP32)
-esp_err_t set_esp_interface_ip(esp_interface_t interface, IPAddress local_ip=INADDR_NONE, IPAddress gateway=INADDR_NONE, IPAddress subnet=INADDR_NONE, IPAddress dhcp_lease_start=INADDR_NONE);
-#endif
-
-class WiFiClientConnectionHandler : public ConnectionHandler {
-public:
-    #if defined(AMS_REMOTE_DEBUG)
-    WiFiClientConnectionHandler(RemoteDebug* debugger);
-    #else
-    WiFiClientConnectionHandler(Stream* debugger);
-    #endif
-
-    bool connect(NetworkConfig config, SystemConfig sys);
-    void disconnect(unsigned long reconnectDelay);
-    bool isConnected();
-    bool isConfigChanged();
-    void getCurrentConfig(NetworkConfig& networkConfig);
-    IPAddress getIP();
-    IPAddress getSubnetMask();
-    IPAddress getGateway();
-    IPAddress getDns(uint8_t idx);
-    #if defined(ESP32)
-    IPv6Address getIPv6();
-    IPv6Address getDNSv6(uint8_t idx);
-    void eventHandler(WiFiEvent_t event, WiFiEventInfo_t info);
-    #endif
-
-private:
-    #if defined(AMS_REMOTE_DEBUG)
-    RemoteDebug* debugger;
-    #else
-    Stream* debugger;
-    #endif
-    NetworkConfig config;
-    bool busPowered = false;
-    bool firstConnect = true;
-    bool configChanged = false;
-
-    unsigned long timeout = CONNECTION_TIMEOUT;
-    unsigned long lastRetry = 0;
-
-    wl_status_t begin(const char* ssid, const char* psk);
-    #if defined(ESP32)
-    void wifi_sta_config(wifi_config_t * wifi_config, const char * ssid=NULL, const char * password=NULL, const uint8_t * bssid=NULL, uint8_t channel=0, wifi_auth_mode_t min_security=WIFI_AUTH_WPA2_PSK, wifi_scan_method_t scan_method=WIFI_ALL_CHANNEL_SCAN, wifi_sort_method_t sort_method=WIFI_CONNECT_AP_BY_SIGNAL, uint16_t listen_interval=0, bool pmf_required=false);
-    #endif
-};
-
-#endif

lib/ConnectionHandler/src/EthernetConnectionHandler.cpp

@@ -1,266 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include "EthernetConnectionHandler.h"
-
-#if defined(ESP32)
-#include <ETH.h>
-#include <esp_wifi.h>
-#include <lwip/dns.h>
-#endif
-
-#if defined(AMS_REMOTE_DEBUG)
-EthernetConnectionHandler::EthernetConnectionHandler(RemoteDebug* debugger) {
-#else
-EthernetConnectionHandler::EthernetConnectionHandler(Stream* debugger) {
-#endif
-    this->debugger = debugger;
-    this->mode = NETWORK_MODE_ETH_CLIENT;
-}
-
-bool EthernetConnectionHandler::connect(NetworkConfig config, SystemConfig sys) {
-	if(lastRetry > 0 && (millis() - lastRetry) < timeout) {
-		delay(50);
-		return false;
-	}
-	lastRetry = millis();
-
-    #if defined(ESP32)
-	if (!connected) {
-        eth_phy_type_t ethType = ETH_PHY_LAN8720;
-        eth_clock_mode_t ethClkMode = ETH_CLOCK_GPIO0_IN;
-        uint8_t ethAddr = 0;
-        uint8_t ethMdc = 0;
-        uint8_t ethMdio = 0;
-
-        if(sys.boardType == 241) { // LilyGO T-ETH-POE
-            ethType = ETH_PHY_LAN8720;
-            ethEnablePin = -1;
-            ethAddr = 0;
-            ethClkMode = ETH_CLOCK_GPIO17_OUT;
-            ethPowerPin = 5;
-            ethMdc = 23;
-            ethMdio = 18;
-        } else if(sys.boardType == 242) { // M5 PoESP32
-            ethType = ETH_PHY_IP101;
-            ethEnablePin = -1;
-            ethAddr = 1;
-            ethClkMode = ETH_CLOCK_GPIO0_IN;
-            ethPowerPin = 5;
-            ethMdc = 23;
-            ethMdio = 18;
-        } else if(sys.boardType == 243) { // WT32-ETH01
-            ethType = ETH_PHY_LAN8720;
-            ethEnablePin = -1;
-            ethAddr = 1;
-            ethClkMode = ETH_CLOCK_GPIO17_OUT;
-            ethPowerPin = 16;
-            ethMdc = 23;
-            ethMdio = 18;
-        } else if (sys.boardType == 245) { // wESP32
-            ethType = ETH_PHY_RTL8201;
-            ethEnablePin = -1;
-            ethAddr = 0;
-            ethClkMode = ETH_CLOCK_GPIO0_IN;
-            ethPowerPin = -1;
-            ethMdc = 16;
-            ethMdio = 17;
-        } else if(sys.boardType == 244) {
-            return false; // TODO
-        } else {
-			#if defined(AMS_REMOTE_DEBUG)
-            if (debugger->isActive(RemoteDebug::ERROR))
-            #endif
-            debugger->printf_P(PSTR("Board type %d incompatible with ETH\n"), sys.boardType);
-            return false;
-        }
-
-        if(ethEnablePin > 0) {
-            pinMode(ethEnablePin, OUTPUT);
-            digitalWrite(ethEnablePin, 1);
-        }
-
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::INFO))
-        #endif
-        debugger->printf_P(PSTR("Connecting to Ethernet\n"));
-
-        if(ETH.begin(ethAddr, ethPowerPin, ethMdc, ethMdio, ethType, ethClkMode)) {
-            #if defined(ESP32)
-                if(strlen(config.hostname) > 0) {
-                    ETH.setHostname(config.hostname);
-                }
-            #endif
-
-            if(strlen(config.ip) > 0) {
-                IPAddress ip, gw, sn(255,255,255,0), dns1, dns2;
-                ip.fromString(config.ip);
-                gw.fromString(config.gateway);
-                sn.fromString(config.subnet);
-                if(strlen(config.dns1) > 0) {
-                    dns1.fromString(config.dns1);
-                } else if(strlen(config.gateway) > 0) {
-                    dns1.fromString(config.gateway); // If no DNS, set gateway by default
-                }
-                if(strlen(config.dns2) > 0) {
-                    dns2.fromString(config.dns2);
-                } else if(dns1.toString().isEmpty()) {
-                    dns2.fromString(F("208.67.220.220")); // Add OpenDNS as second by default if nothing is configured
-                }
-                if(!ETH.config(ip, gw, sn, dns1, dns2)) {
-                    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))
-            #endif
-            debugger->printf_P(PSTR("Unable to start Ethernet\n"));
-        }
-    }
-    #endif
-    return false;
-}
-
-void EthernetConnectionHandler::disconnect(unsigned long reconnectDelay) {
-	#if defined(AMS_REMOTE_DEBUG)
-    if (debugger->isActive(RemoteDebug::ERROR))
-    #endif
-    debugger->printf_P(PSTR("Disconnecting!\n"));
-}
-
-bool EthernetConnectionHandler::isConnected() {
-    return connected;
-}
-
-#if defined(ESP32)
-void EthernetConnectionHandler::eventHandler(WiFiEvent_t event, WiFiEventInfo_t info) {
-    switch(event) {
-        case ARDUINO_EVENT_ETH_CONNECTED:
-            connected = true;
-            #if defined(AMS_REMOTE_DEBUG)
-            if (debugger->isActive(RemoteDebug::INFO))
-            #endif
-            {
-                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)
-            if (debugger->isActive(RemoteDebug::INFO))
-            #endif
-            {
-                debugger->printf_P(PSTR("IP:  %s\n"), getIP().toString().c_str());
-                debugger->printf_P(PSTR("GW:  %s\n"), getGateway().toString().c_str());
-				for(uint8_t i = 0; i < 3; i++) {
-					IPAddress dns4 = getDns(i);
-					if(dns4 == IPAddress()) {
-						// No IP
-					} else {
-						debugger->printf_P(PSTR("DNS: %s\n"), dns4.toString().c_str());
-					}
-				}
-            }
-			break;
-		case ARDUINO_EVENT_ETH_GOT_IP6: {
-            #if defined(AMS_REMOTE_DEBUG)
-            if (debugger->isActive(RemoteDebug::INFO))
-            #endif
-            {
-				IPv6Address ipv6 = getIPv6();
-				if(ipv6 == IPv6Address()) {
-					// No IP
-				} else {
-					debugger->printf_P(PSTR("IPv6:  %s\n"), ipv6.toString().c_str());
-				}
-
-				for(uint8_t i = 0; i < 3; i++) {
-					IPv6Address dns6 = getDNSv6(i);
-					if(dns6 == IPv6Address()) {
-						// No IP
-					} else {
-						debugger->printf_P(PSTR("DNSv6: %s\n"), dns6.toString().c_str());
-					}
-				}
-            }
-			break;
-		}
-        case ARDUINO_EVENT_ETH_DISCONNECTED:
-            connected = false;
-            #if defined(AMS_REMOTE_DEBUG)
-            if (debugger->isActive(RemoteDebug::WARNING))
-            #endif
-            {
-                debugger->printf_P(PSTR("Ethernet was disconnected!\n"));
-            }
-            break;
-    }
-}
-#endif
-
-bool EthernetConnectionHandler::isConfigChanged() {
-	return configChanged;
-}
-
-void EthernetConnectionHandler::getCurrentConfig(NetworkConfig& networkConfig) {
-	networkConfig = this->config;
-}
-
-IPAddress EthernetConnectionHandler::getIP() {
-    #if defined(ESP32)
-	return ETH.localIP();
-    #else
-    return NULL;
-    #endif
-}
-
-IPAddress EthernetConnectionHandler::getSubnetMask() {
-    #if defined(ESP32)
-	return ETH.subnetMask();
-    #else
-    return NULL;
-    #endif
-}
-
-IPAddress EthernetConnectionHandler::getGateway() {
-    #if defined(ESP32)
-	return ETH.gatewayIP();
-    #else
-    return NULL;
-    #endif
-}
-
-IPAddress EthernetConnectionHandler::getDns(uint8_t idx) {
-    #if defined(ESP32)
-	return ETH.dnsIP(idx);
-    #else
-    return NULL;
-    #endif
-}
-
-#if defined(ESP32)
-IPv6Address EthernetConnectionHandler::getIPv6() {
-	esp_ip6_addr_t addr;
-	if(esp_netif_get_ip6_global(get_esp_interface_netif(ESP_IF_ETH), &addr) == ESP_OK) {
-		return IPv6Address(addr.addr);
-	}
-	return IPv6Address();
-}
-
-IPv6Address EthernetConnectionHandler::getDNSv6(uint8_t idx) {
-	for(uint8_t i = 0; i < 3; i++) {
-		const ip_addr_t * dns = dns_getserver(i);
-		if(dns->type == IPADDR_TYPE_V6) {
-			if(idx-- == 0) return IPv6Address(dns->u_addr.ip6.addr);
-		}
-	}
-	return IPv6Address();
-}
-#endif

lib/ConnectionHandler/src/WiFiAccessPointConnectionHandler.cpp

@@ -1,121 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include "WiFiAccessPointConnectionHandler.h"
-
-#if defined(AMS_REMOTE_DEBUG)
-WiFiAccessPointConnectionHandler::WiFiAccessPointConnectionHandler(RemoteDebug* debugger) {
-#else
-WiFiAccessPointConnectionHandler::WiFiAccessPointConnectionHandler(Stream* debugger) {
-#endif
-    this->debugger = debugger;
-    this->mode = NETWORK_MODE_WIFI_AP;
-}
-
-bool WiFiAccessPointConnectionHandler::connect(NetworkConfig config, SystemConfig sys) {
-		//wifi_softap_set_dhcps_offer_option(OFFER_ROUTER, 0); // Disable default gw
-
-		WiFi.mode(WIFI_AP);
-		WiFi.softAP(config.ssid, config.psk);
-
-		dnsServer.setErrorReplyCode(DNSReplyCode::NoError);
-		dnsServer.start(53, PSTR("*"), WiFi.softAPIP());
-        connected = true;
-
-        return true;
-}
-
-void WiFiAccessPointConnectionHandler::disconnect(unsigned long reconnectDelay) {
-	WiFi.disconnect(true);
-	WiFi.softAPdisconnect(true);
-	WiFi.enableAP(false);
-	WiFi.mode(WIFI_OFF);
-	yield();
-}
-
-bool WiFiAccessPointConnectionHandler::isConnected() {
-    return connected;
-}
-
-#if defined(ESP32)
-void WiFiAccessPointConnectionHandler::eventHandler(WiFiEvent_t event, WiFiEventInfo_t info) {
-    uint8_t mac[6];
-    IPAddress stationIP;
-    switch(event) {
-        case ARDUINO_EVENT_WIFI_AP_START:
-            #if defined(AMS_REMOTE_DEBUG)
-if (debugger->isActive(RemoteDebug::INFO))
-#endif
-debugger->printf_P(PSTR("WiFi access point started with SSID %s\n"), config.ssid);
-            break;
-	    case ARDUINO_EVENT_WIFI_AP_STOP:
-            #if defined(AMS_REMOTE_DEBUG)
-if (debugger->isActive(RemoteDebug::INFO))
-#endif
-debugger->printf_P(PSTR("WiFi access point stopped!\n"));
-            break;
-	    case ARDUINO_EVENT_WIFI_AP_STACONNECTED:
-            memcpy(mac, info.wifi_ap_staconnected.mac, 6);
-            #if defined(AMS_REMOTE_DEBUG)
-if (debugger->isActive(RemoteDebug::INFO))
-#endif
-debugger->printf_P(PSTR("Client connected to AP, client MAC: %02x:%02x:%02x:%02x:%02x:%02x\n"), mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-            break;
-	    case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED:
-            memcpy(mac, info.wifi_ap_staconnected.mac, 6);
-            #if defined(AMS_REMOTE_DEBUG)
-if (debugger->isActive(RemoteDebug::INFO))
-#endif
-debugger->printf_P(PSTR("Client disconnected from AP, client MAC: %02x:%02x:%02x:%02x:%02x:%02x\n"), mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-            break;
-	    case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED:
-            stationIP = info.wifi_ap_staipassigned.ip.addr;
-            #if defined(AMS_REMOTE_DEBUG)
-if (debugger->isActive(RemoteDebug::INFO))
-#endif
-debugger->printf_P(PSTR("Client was assigned IP %s\n"), stationIP.toString().c_str());
-            break;
-    }
-}
-#endif
-
-bool WiFiAccessPointConnectionHandler::isConfigChanged() {
-	return configChanged;
-}
-
-void WiFiAccessPointConnectionHandler::getCurrentConfig(NetworkConfig& networkConfig) {
-	networkConfig = this->config;
-}
-
-IPAddress WiFiAccessPointConnectionHandler::getIP() {
-	return WiFi.softAPIP();
-}
-
-IPAddress WiFiAccessPointConnectionHandler::getSubnetMask() {
-    #if defined(ESP32)
-	return WiFi.softAPSubnetMask();
-    #else
-    return IPAddress(255,255,255,0);
-    #endif
-}
-
-IPAddress WiFiAccessPointConnectionHandler::getGateway() {
-	return WiFi.softAPIP();
-}
-
-IPAddress WiFiAccessPointConnectionHandler::getDns(uint8_t idx) {
-	return WiFi.softAPIP();
-}
-
-#if defined(ESP32)
-IPv6Address WiFiAccessPointConnectionHandler::getIPv6() {
-    return IPv6Address();
-}
-
-IPv6Address WiFiAccessPointConnectionHandler::getDNSv6(uint8_t idx) {
-    return IPv6Address();
-}
-#endif

lib/ConnectionHandler/src/WiFiClientConnectionHandler.cpp

@@ -1,424 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include "WiFiClientConnectionHandler.h"
-#if defined(ESP32)
-#include <esp_wifi.h>
-#include <lwip/dns.h>
-#endif
-
-#if defined(AMS_REMOTE_DEBUG)
-WiFiClientConnectionHandler::WiFiClientConnectionHandler(RemoteDebug* debugger) {
-#else
-WiFiClientConnectionHandler::WiFiClientConnectionHandler(Stream* debugger) {
-#endif
-    this->debugger = debugger;
-    this->mode = NETWORK_MODE_WIFI_CLIENT;
-}
-
-bool WiFiClientConnectionHandler::connect(NetworkConfig config, SystemConfig sys) {
-	if(lastRetry > 0 && (millis() - lastRetry) < timeout) {
-		delay(50);
-		return false;
-	}
-	lastRetry = millis();
-
-	if (WiFi.status() != WL_CONNECTED) {
-		if(config.mode != this->mode || strlen(config.ssid) == 0) {
-			return false;
-		}
-
-		if(WiFi.getMode() != WIFI_OFF) {
-			#if defined(AMS_REMOTE_DEBUG)
-			if (debugger->isActive(RemoteDebug::INFO))
-			#endif
-			debugger->printf_P(PSTR("Not connected to WiFi, closing resources\n"));
-
-			disconnect(RECONNECT_TIMEOUT);
-			return false;
-		}
-		timeout = CONNECTION_TIMEOUT;
-
-		#if defined(AMS_REMOTE_DEBUG)
-		if (debugger->isActive(RemoteDebug::INFO))
-		#endif
-		debugger->printf_P(PSTR("Connecting to WiFi network: %s\n"), config.ssid);
-		switch(sys.boardType) {
-			case 2: // spenceme
-			case 3: // Pow-K UART0
-			case 4: // Pow-U UART0
-			case 5: // Pow-K+
-			case 6: // Pow-P1
-			case 7: // Pow-U+
-			case 8: // dbeinder: HAN mosquito
-				busPowered = true;
-				break;
-			default:
-				busPowered = false;
-		}
-		firstConnect = sys.dataCollectionConsent == 0;
-
-		#if defined(ESP32)
-			if(strlen(config.hostname) > 0) {
-				WiFi.setHostname(config.hostname);
-			}
-		#endif
-		WiFi.mode(WIFI_STA);
-
-		if(strlen(config.ip) > 0) {
-			IPAddress ip, gw, sn(255,255,255,0), dns1, dns2;
-			ip.fromString(config.ip);
-			gw.fromString(config.gateway);
-			sn.fromString(config.subnet);
-			if(strlen(config.dns1) > 0) {
-				dns1.fromString(config.dns1);
-			} else if(strlen(config.gateway) > 0) {
-				dns1.fromString(config.gateway); // If no DNS, set gateway by default
-			}
-			if(strlen(config.dns2) > 0) {
-				dns2.fromString(config.dns2);
-			} else if(dns1.toString().isEmpty()) {
-				dns2.fromString(F("208.67.220.220")); // Add OpenDNS as second by default if nothing is configured
-			}
-			if(!WiFi.config(ip, gw, sn, dns1, dns2)) {
-				debugger->printf_P(PSTR("Static IP configuration is invalid, not using\n"));
-			}
-		}
-		#if defined(ESP8266)
-			if(strlen(config.hostname) > 0) {
-				WiFi.hostname(config.hostname);
-			}
-			//wifi_set_phy_mode(PHY_MODE_11N);
-			if(!config.use11b) {
-				wifi_set_user_sup_rate(RATE_11G6M, RATE_11G54M);
-				wifi_set_user_rate_limit(RC_LIMIT_11G, 0x00, RATE_11G_G54M, RATE_11G_G6M);
-				wifi_set_user_rate_limit(RC_LIMIT_11N, 0x00, RATE_11N_MCS7S, RATE_11N_MCS0);
-				wifi_set_user_limit_rate_mask(LIMIT_RATE_MASK_ALL);
-			}
-		#endif
-		WiFi.setAutoReconnect(true);
-        this->config = config;
-		#if defined(ESP32)
-		if(begin(config.ssid, config.psk)) {
-		#else
-		if(WiFi.begin(config.ssid, config.psk)) {
-		#endif
-			if(config.sleep <= 2) {
-				switch(config.sleep) {
-					case 0:
-						WiFi.setSleep(WIFI_PS_NONE);
-						break;
-					case 1:
-						WiFi.setSleep(WIFI_PS_MIN_MODEM);
-						break;
-					case 2:
-						WiFi.setSleep(WIFI_PS_MAX_MODEM);
-						break;
-				}
-			}
-			yield();
-		} else {
-			#if defined(AMS_REMOTE_DEBUG)
-			if (debugger->isActive(RemoteDebug::ERROR))
-			#endif
-			debugger->printf_P(PSTR("Unable to start WiFi\n"));
-		}
-        return true;
-  	}
-    return false;
-}
-
-#if defined(ESP32)
-wl_status_t WiFiClientConnectionHandler::begin(const char* ssid, const char* passphrase) {
-   if(!WiFi.enableSTA(true)) {
-        log_e("STA enable failed!");
-        return WL_CONNECT_FAILED;
-    }
-
-    if(!ssid || *ssid == 0x00 || strlen(ssid) > 32) {
-        log_e("SSID too long or missing!");
-        return WL_CONNECT_FAILED;
-    }
-
-    if(passphrase && strlen(passphrase) > 64) {
-        log_e("passphrase too long!");
-        return WL_CONNECT_FAILED;
-    }
-
-    wifi_config_t conf;
-    memset(&conf, 0, sizeof(wifi_config_t));
-
-    wifi_sta_config(&conf, ssid, passphrase, NULL, 0, WIFI_AUTH_WPA2_PSK, WIFI_ALL_CHANNEL_SCAN, WIFI_CONNECT_AP_BY_SIGNAL);
-
-    wifi_config_t current_conf;
-    if(esp_wifi_get_config((wifi_interface_t)ESP_IF_WIFI_STA, &current_conf) != ESP_OK){
-        log_e("get current config failed!");
-        return WL_CONNECT_FAILED;
-    }
-    if(memcmp(&current_conf, &conf, sizeof(wifi_config_t)) == 0) {
-        if(esp_wifi_disconnect()){
-            log_e("disconnect failed!");
-            return WL_CONNECT_FAILED;
-        }
-
-        if(esp_wifi_set_config((wifi_interface_t)ESP_IF_WIFI_STA, &conf) != ESP_OK){
-            log_e("set config failed!");
-            return WL_CONNECT_FAILED;
-        }
-    } else if(WiFi.status() == WL_CONNECTED){
-        return WL_CONNECTED;
-    } else {
-        if(esp_wifi_set_config((wifi_interface_t)ESP_IF_WIFI_STA, &conf) != ESP_OK){
-            log_e("set config failed!");
-            return WL_CONNECT_FAILED;
-        }
-    }
-
-    if(strlen(config.ip) == 0){
-    	if(set_esp_interface_ip(ESP_IF_WIFI_STA) != ESP_OK) {
-            return WL_CONNECT_FAILED;
-        }
-    }
-
-	if(esp_wifi_connect() != ESP_OK) {
-		log_e("connect failed!");
-		return WL_CONNECT_FAILED;
-	}
-	return WiFi.status();
-}
-
-void WiFiClientConnectionHandler::wifi_sta_config(wifi_config_t * wifi_config, const char * ssid, const char * password, const uint8_t * bssid, uint8_t channel, wifi_auth_mode_t min_security, wifi_scan_method_t scan_method, wifi_sort_method_t sort_method, uint16_t listen_interval, bool pmf_required){
-    wifi_config->sta.channel = channel;
-    wifi_config->sta.listen_interval = listen_interval;
-    wifi_config->sta.scan_method = scan_method;//WIFI_ALL_CHANNEL_SCAN or WIFI_FAST_SCAN
-    wifi_config->sta.sort_method = sort_method;//WIFI_CONNECT_AP_BY_SIGNAL or WIFI_CONNECT_AP_BY_SECURITY
-    wifi_config->sta.threshold.rssi = -127;
-    wifi_config->sta.pmf_cfg.capable = true;
-    wifi_config->sta.pmf_cfg.required = pmf_required;
-    wifi_config->sta.bssid_set = 0;
-    memset(wifi_config->sta.bssid, 0, 6);
-    wifi_config->sta.threshold.authmode = WIFI_AUTH_OPEN;
-    wifi_config->sta.ssid[0] = 0;
-    wifi_config->sta.password[0] = 0;
-    if(ssid != NULL && ssid[0] != 0){
-        strncpy((char*)wifi_config->sta.ssid, ssid, 32);
-    	if(password != NULL && password[0] != 0){
-    		wifi_config->sta.threshold.authmode = min_security;
-    		strncpy((char*)wifi_config->sta.password, password, 64);
-    	}
-        if(bssid != NULL){
-            wifi_config->sta.bssid_set = 1;
-            memcpy(wifi_config->sta.bssid, bssid, 6);
-        }
-    }
-	wifi_config->sta.rm_enabled = true;
-	wifi_config->sta.btm_enabled = true;
-	wifi_config->sta.mbo_enabled = true;
-}
-#endif
-
-void WiFiClientConnectionHandler::disconnect(unsigned long reconnectDelay) {
-	#if defined(AMS_REMOTE_DEBUG)
-	if (debugger->isActive(RemoteDebug::ERROR))
-	#endif
-	debugger->printf_P(PSTR("Disconnecting!\n"));
-	#if defined(ESP8266)
-		WiFiClient::stopAll();
-	#endif
-
-	WiFi.disconnect(true);
-	WiFi.softAPdisconnect(true);
-	WiFi.enableAP(false);
-	WiFi.mode(WIFI_OFF);
-	yield();
-	timeout = reconnectDelay;
-}
-
-bool WiFiClientConnectionHandler::isConnected() {
-    return WiFi.status() == WL_CONNECTED;
-}
-
-#if defined(ESP32)
-void WiFiClientConnectionHandler::eventHandler(WiFiEvent_t event, WiFiEventInfo_t info) {
-    switch(event) {
-		case ARDUINO_EVENT_WIFI_READY:
-			if (!config.use11b) {
-				esp_wifi_config_11b_rate(WIFI_IF_AP, true);
-				esp_wifi_config_11b_rate(WIFI_IF_STA, true);
-			}
-			break;
-		case ARDUINO_EVENT_WIFI_STA_CONNECTED:
-            #if defined(AMS_REMOTE_DEBUG)
-			if (debugger->isActive(RemoteDebug::INFO))
-			#endif
-			debugger->printf_P(PSTR("Successfully connected to WiFi!\n"));
-			if(config.ipv6 && !WiFi.enableIpV6()) {
-				debugger->printf_P(PSTR("Unable to enable IPv6\n"));
-			}
-            #if defined(ESP32)
-				if(firstConnect && config.use11b) {
-					// If first boot and phyMode is better than 11b, disable 11b for BUS powered devices
-					if(busPowered) {
-						wifi_phy_mode_t phyMode;
-						if(esp_wifi_sta_get_negotiated_phymode(&phyMode) == ESP_OK) {
-							if(phyMode > WIFI_PHY_MODE_11B) {
-								#if defined(AMS_REMOTE_DEBUG)
-								if (debugger->isActive(RemoteDebug::INFO))
-								#endif
-								debugger->printf_P(PSTR("WiFi supports better rates than 802.11b, disabling\n"));
-								config.use11b = false;
-								configChanged = true;
-								return;
-							}
-						}
-					}
-				}
-
-                if(config.power >= 195)
-                    WiFi.setTxPower(WIFI_POWER_19_5dBm);
-                else if(config.power >= 190)
-                    WiFi.setTxPower(WIFI_POWER_19dBm);
-                else if(config.power >= 185)
-                    WiFi.setTxPower(WIFI_POWER_18_5dBm);
-                else if(config.power >= 170)
-                    WiFi.setTxPower(WIFI_POWER_17dBm);
-                else if(config.power >= 150)
-                    WiFi.setTxPower(WIFI_POWER_15dBm);
-                else if(config.power >= 130)
-                    WiFi.setTxPower(WIFI_POWER_13dBm);
-                else if(config.power >= 110)
-                    WiFi.setTxPower(WIFI_POWER_11dBm);
-                else if(config.power >= 85)
-                    WiFi.setTxPower(WIFI_POWER_8_5dBm);
-                else if(config.power >= 70)
-                    WiFi.setTxPower(WIFI_POWER_7dBm);
-                else if(config.power >= 50)
-                    WiFi.setTxPower(WIFI_POWER_5dBm);
-                else if(config.power >= 20)
-                    WiFi.setTxPower(WIFI_POWER_2dBm);
-                else
-                    WiFi.setTxPower(WIFI_POWER_MINUS_1dBm);
-            #elif defined(ESP8266)
-                WiFi.setOutputPower(config.power / 10.0);
-            #endif
-			break;
-		case ARDUINO_EVENT_WIFI_STA_GOT_IP: {
-            #if defined(AMS_REMOTE_DEBUG)
-			if (debugger->isActive(RemoteDebug::INFO))
-			#endif
-			{
-                debugger->printf_P(PSTR("IP:  %s\n"), getIP().toString().c_str());
-                debugger->printf_P(PSTR("GW:  %s\n"), getGateway().toString().c_str());
-				for(uint8_t i = 0; i < 3; i++) {
-					IPAddress dns4 = getDns(i);
-					if(dns4 == IPAddress()) {
-						// No IP
-					} else {
-						debugger->printf_P(PSTR("DNS: %s\n"), dns4.toString().c_str());
-					}
-				}
-            }
-			break;
-        }
-		case ARDUINO_EVENT_WIFI_STA_GOT_IP6: {
-            #if defined(AMS_REMOTE_DEBUG)
-			if (debugger->isActive(RemoteDebug::INFO))
-			#endif
-			{
-				IPv6Address ipv6 = getIPv6();
-				if(ipv6 == IPv6Address()) {
-					// No IP
-				} else {
-					debugger->printf_P(PSTR("IPv6:  %s\n"), ipv6.toString().c_str());
-				}
-
-				for(uint8_t i = 0; i < 3; i++) {
-					IPv6Address dns6 = getDNSv6(i);
-					if(dns6 == IPv6Address()) {
-						// No IP
-					} else {
-						debugger->printf_P(PSTR("DNSv6: %s\n"), dns6.toString().c_str());
-					}
-				}
-            }
-			break;
-		}
-		case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: {
-			wifi_err_reason_t reason = (wifi_err_reason_t) info.wifi_sta_disconnected.reason;
-			const char* descr = WiFi.disconnectReasonName(reason);
-			switch(reason) {
-				case WIFI_REASON_ASSOC_LEAVE:
-					break;
-				default:
-					if(strlen(descr) > 0) {
-						#if defined(AMS_REMOTE_DEBUG)
-						if (debugger->isActive(RemoteDebug::WARNING))
-						#endif
-						{
-							debugger->printf_P(PSTR("WiFi disconnected, reason %s\n"), descr);
-						}
-						disconnect(RECONNECT_TIMEOUT);
-					}
-			}
-			break;
-		}
-    }
-}
-#endif
-
-bool WiFiClientConnectionHandler::isConfigChanged() {
-	return configChanged;
-}
-
-void WiFiClientConnectionHandler::getCurrentConfig(NetworkConfig& networkConfig) {
-	networkConfig = this->config;
-}
-
-IPAddress WiFiClientConnectionHandler::getIP() {
-	return WiFi.localIP();
-}
-
-IPAddress WiFiClientConnectionHandler::getSubnetMask() {
-	return WiFi.subnetMask();
-}
-
-IPAddress WiFiClientConnectionHandler::getGateway() {
-	return WiFi.gatewayIP();
-}
-
-IPAddress WiFiClientConnectionHandler::getDns(uint8_t idx) {
-	#if defined(ESP32)
-	for(uint8_t i = 0; i < 3; i++) {
-		const ip_addr_t * dns = dns_getserver(i);
-		if(dns->type == IPADDR_TYPE_V4) {
-			if(idx-- == 0) return IPAddress(dns->u_addr.ip4.addr);
-		}
-	}
-	#else
-		return WiFi.dnsIP(idx);
-	#endif
-	return IPAddress();
-}
-
-#if defined(ESP32)
-IPv6Address WiFiClientConnectionHandler::getIPv6() {
-	esp_ip6_addr_t addr;
-	if(esp_netif_get_ip6_global(get_esp_interface_netif(ESP_IF_WIFI_STA), &addr) == ESP_OK) {
-		return IPv6Address(addr.addr);
-	}
-	return IPv6Address();
-}
-
-IPv6Address WiFiClientConnectionHandler::getDNSv6(uint8_t idx) {
-	for(uint8_t i = 0; i < 3; i++) {
-		const ip_addr_t * dns = dns_getserver(i);
-		if(dns->type == IPADDR_TYPE_V6) {
-			if(idx-- == 0) return IPv6Address(dns->u_addr.ip6.addr);
-		}
-	}
-	return IPv6Address();
-}
-#endif

lib/DomoticzMqttHandler/include/.gitignore

@@ -1 +0,0 @@
-json/*.h

lib/DomoticzMqttHandler/include/DomoticzMqttHandler.h

@@ -1,43 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _DOMOTICZMQTTHANDLER_H
-#define _DOMOTICZMQTTHANDLER_H
-
-#include "AmsMqttHandler.h"
-#include "AmsConfiguration.h"
-
-class DomoticzMqttHandler : public AmsMqttHandler {
-public:
-    #if defined(AMS_REMOTE_DEBUG)
-    DomoticzMqttHandler(MqttConfig& mqttConfig, RemoteDebug* debugger, char* buf, DomoticzConfig config, AmsFirmwareUpdater* updater) : AmsMqttHandler(mqttConfig, debugger, buf, updater) {
-        this->config = config;
-    };
-    #else
-    DomoticzMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, DomoticzConfig config) : AmsMqttHandler(mqttConfig, debugger, buf) {
-        this->config = config;
-    };
-    #endif
-    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, PriceService* ps);
-    bool publishTemperatures(AmsConfiguration*, HwTools*);
-    bool publishPrices(PriceService*);
-    bool publishSystem(HwTools* hw, PriceService* ps, EnergyAccounting* ea);
-    bool publishRaw(uint8_t* raw, size_t length);
-
-    void onMessage(String &topic, String &payload);
-
-    uint8_t getFormat();
-
-    void setDomoticzConfig(DomoticzConfig config) {
-        this->config = config;
-    }
-
-private:
-    DomoticzConfig config;
-    double energy = 0.0;
-};
-
-#endif

lib/DomoticzMqttHandler/src/DomoticzMqttHandler.cpp

@@ -1,111 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include "DomoticzMqttHandler.h"
-#include "json/domoticz_json.h"
-#include "Uptime.h"
-
-bool DomoticzMqttHandler::publish(AmsData* update, AmsData* previousState, EnergyAccounting* ea, PriceService* ps) {
-    bool ret = false;
-
-    AmsData data;
-    if(mqttConfig.stateUpdate) {
-        uint64_t now = millis64();
-        if(now-lastStateUpdate < mqttConfig.stateUpdateInterval * 1000) return false;
-        data.apply(*previousState);
-        data.apply(*update);
-        lastStateUpdate = now;
-    } else {
-        data = *update;
-    }
-
-    if (config.elidx > 0) {
-        if(data.getActiveImportCounter() > 1.0 && !data.isCounterEstimated()) {
-            energy = data.getActiveImportCounter();
-        }
-        if(energy > 0.0) {
-            char val[16];
-            snprintf_P(val, 16, PSTR("%.1f;%.1f"), (data.getActiveImportPower()/1.0), energy*1000.0);
-            snprintf_P(json, BufferSize, DOMOTICZ_JSON,
-                config.elidx,
-                val
-            );
-            ret = mqtt.publish(F("domoticz/in"), json);
-            mqtt.loop();
-        }
-    }
-
-    if(data.getListType() == 1)
-        return ret;
-
-    if (config.vl1idx > 0){				
-        char val[16];
-        snprintf_P(val, 16, PSTR("%.2f"), data.getL1Voltage());
-        snprintf_P(json, BufferSize, DOMOTICZ_JSON,
-            config.vl1idx,
-            val
-        );
-        ret |= mqtt.publish(F("domoticz/in"), json);
-        mqtt.loop();
-    }
-
-    if (config.vl2idx > 0){				
-        char val[16];
-        snprintf_P(val, 16, PSTR("%.2f"), data.getL2Voltage());
-        snprintf_P(json, BufferSize, DOMOTICZ_JSON,
-            config.vl2idx,
-            val
-        );
-        ret |= mqtt.publish(F("domoticz/in"), json);
-        mqtt.loop();
-    }
-
-    if (config.vl3idx > 0){				
-        char val[16];
-        snprintf(val, 16, "%.2f", data.getL3Voltage());
-        snprintf_P(json, BufferSize, DOMOTICZ_JSON,
-            config.vl3idx,
-            val
-        );
-        ret |= mqtt.publish(F("domoticz/in"), json);
-        mqtt.loop();
-    }
-
-    if (config.cl1idx > 0){				
-        char val[16];
-        snprintf(val, 16, "%.1f;%.1f;%.1f", data.getL1Current(), data.getL2Current(), data.getL3Current());
-        snprintf_P(json, BufferSize, DOMOTICZ_JSON,
-            config.cl1idx,
-            val
-        );
-        ret |= mqtt.publish(F("domoticz/in"), json);
-        mqtt.loop();
-    }			
-    return ret;
-}
-
-bool DomoticzMqttHandler::publishTemperatures(AmsConfiguration* config, HwTools* hw) {
-    return false;
-}
-
-bool DomoticzMqttHandler::publishPrices(PriceService* ps) {
-    return false;
-}
-
-bool DomoticzMqttHandler::publishSystem(HwTools* hw, PriceService* ps, EnergyAccounting* ea) {
-    return false;
-}
-
-uint8_t DomoticzMqttHandler::getFormat() {
-    return 3;
-}
-
-bool DomoticzMqttHandler::publishRaw(uint8_t* raw, size_t length) {
-    return false;
-}
-
-void DomoticzMqttHandler::onMessage(String &topic, String &payload) {
-}

lib/EnergyAccounting/include/EnergyAccounting.h

@@ -1,141 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _ENERGYACCOUNTING_H
-#define _ENERGYACCOUNTING_H
-
-#include "Arduino.h"
-#include "AmsData.h"
-#include "AmsDataStorage.h"
-#include "PriceService.h"
-
-struct EnergyAccountingPeak {
-    uint8_t day;
-    uint8_t hour;
-    uint16_t value;
-};
-
-struct EnergyAccountingPeak6 {
-    uint8_t day;
-    uint16_t value;
-};
-
-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;
-    uint32_t lastMonthImport;
-    uint32_t lastMonthExport;
-    uint8_t lastMonthAccuracy;
-    EnergyAccountingPeak peaks[5];
-    time_t lastUpdated;
-};
-
-struct EnergyAccountingData6 {
-    uint8_t version;
-    uint8_t month;
-    int32_t costYesterday;
-    int32_t costThisMonth;
-    int32_t costLastMonth;
-    int32_t incomeYesterday;
-    int32_t incomeThisMonth;
-    int32_t incomeLastMonth;
-    uint32_t lastMonthImport;
-    uint32_t lastMonthExport;
-    uint8_t lastMonthAccuracy;
-    EnergyAccountingPeak6 peaks[5];
-};
-
-struct EnergyAccountingRealtimeData {
-    uint8_t magic;
-    uint8_t currentHour;
-    uint8_t currentDay;
-    uint8_t currentThresholdIdx;
-    float use;
-    float costHour;
-    float costDay;
-    float produce;
-    float incomeHour;
-    float incomeDay;
-    unsigned long lastImportUpdateMillis;
-    unsigned long lastExportUpdateMillis;
-};
-
-
-class EnergyAccounting {
-public:
-    #if defined(AMS_REMOTE_DEBUG)
-    EnergyAccounting(RemoteDebug*, EnergyAccountingRealtimeData*);
-    #else
-    EnergyAccounting(Stream*, EnergyAccountingRealtimeData*);
-    #endif
-    void setup(AmsDataStorage *ds, EnergyAccountingConfig *config);
-    void setPriceService(PriceService *ps);
-    void setTimezone(Timezone*);
-    EnergyAccountingConfig* getConfig();
-    bool update(AmsData* amsData);
-    bool load();
-    bool save();
-    bool isInitialized();
-
-    float getUseThisHour();
-    float getUseToday();
-    float getUseThisMonth();
-    float getUseLastMonth();
-
-    float getProducedThisHour();
-    float getProducedToday();
-    float getProducedThisMonth();
-    float getProducedLastMonth();
-
-    float getCostThisHour();
-    float getCostToday();
-    float getCostYesterday();
-    float getCostThisMonth();
-    float getCostLastMonth();
-
-    float getIncomeThisHour();
-    float getIncomeToday();
-    float getIncomeYesterday();
-    float getIncomeThisMonth();
-    float getIncomeLastMonth();
-
-    float getMonthMax();
-    uint8_t getCurrentThreshold();
-    EnergyAccountingPeak getPeak(uint8_t);
-
-    EnergyAccountingData getData();
-    void setData(EnergyAccountingData&);
-
-    void setCurrency(String currency);
-
-private:
-    #if defined(AMS_REMOTE_DEBUG)
-    RemoteDebug* debugger = NULL;
-    #else
-    Stream* debugger = NULL;
-    #endif
-    bool init = false, initPrice = false;
-    AmsDataStorage *ds = NULL;
-    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, 0, 0, 0 };
-    EnergyAccountingRealtimeData* realtimeData = NULL;
-    String currency = "";
-
-    void calcDayCost();
-    bool updateMax(uint16_t val, uint8_t day, uint8_t hour);
-};
-
-#endif

lib/EnergyAccounting/src/EnergyAccounting.cpp

@@ -1,510 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include "EnergyAccounting.h"
-#include "LittleFS.h"
-#include "AmsStorage.h"
-#include "FirmwareVersion.h"
-
-#if defined(AMS_REMOTE_DEBUG)
-EnergyAccounting::EnergyAccounting(RemoteDebug* debugger, EnergyAccountingRealtimeData* rtd) {
-#else
-EnergyAccounting::EnergyAccounting(Stream* Stream, EnergyAccountingRealtimeData* rtd) {
-#endif
-    data.version = 1;
-    this->debugger = debugger;
-    if(rtd->magic != 0x6A) {
-        rtd->magic = 0x6A;
-        rtd->currentHour = 0;
-        rtd->currentDay = 0;
-        rtd->currentThresholdIdx = 0;
-        rtd->use = 0;
-        rtd->costHour = 0;
-        rtd->costDay = 0;
-        rtd->produce = 0;
-        rtd->incomeHour = 0;
-        rtd->incomeDay = 0;
-        rtd->lastImportUpdateMillis = 0;
-        rtd->lastExportUpdateMillis = 0;
-    }
-    realtimeData = rtd;
-}
-
-void EnergyAccounting::setup(AmsDataStorage *ds, EnergyAccountingConfig *config) {
-    this->ds = ds;
-    this->config = config;
-}
-
-void EnergyAccounting::setPriceService(PriceService *ps) {
-    this->ps = ps;
-}
-
-EnergyAccountingConfig* EnergyAccounting::getConfig() {
-    return config;
-}
-
-void EnergyAccounting::setTimezone(Timezone* tz) {
-    this->tz = tz;
-}
-
-bool EnergyAccounting::isInitialized() {
-    return this->init;
-}
-
-bool EnergyAccounting::update(AmsData* amsData) {
-    if(config == NULL) return false;
-    time_t now = time(nullptr);
-    if(now < FirmwareVersion::BuildEpoch) return false;
-    if(tz == NULL) {
-        return false;
-    }
-
-    bool ret = false;
-    tmElements_t local;
-    breakTime(tz->toLocal(now), local);
-
-    if(!init) {
-        realtimeData->lastImportUpdateMillis = 0;
-        realtimeData->lastExportUpdateMillis = 0;
-        realtimeData->currentHour = local.Hour;
-        realtimeData->currentDay = local.Day;
-        if(!load()) {
-            data = { 7, local.Month, 
-                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
-                0, 0, 0, // Peak 3
-                0, 0, 0, // Peak 4
-                0, 0, 0  // Peak 5
-            };
-        }
-        init = true;
-    }
-
-    if(!initPrice && ps != NULL && ps->hasPrice()) {
-        calcDayCost();
-    }
-
-    if(local.Hour != realtimeData->currentHour && (amsData->getListType() >= 3 || local.Minute == 1)) {
-        tmElements_t oneHrAgo, oneHrAgoLocal;
-        breakTime(now-3600, oneHrAgo);
-        uint16_t val = round(ds->getHourImport(oneHrAgo.Hour) / 10.0);
-
-        breakTime(tz->toLocal(now-3600), oneHrAgoLocal);
-        ret |= updateMax(val, oneHrAgoLocal.Day, oneHrAgoLocal.Hour);
-
-        realtimeData->currentHour = local.Hour; // Need to be defined here so that day cost is correctly calculated
-
-        realtimeData->use = 0;
-        realtimeData->produce = 0;
-        realtimeData->costHour = 0;
-        realtimeData->incomeHour = 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 = realtimeData->incomeDay * 100;
-            data.incomeThisMonth += realtimeData->incomeDay * 100;
-            realtimeData->incomeDay = 0;
-
-            realtimeData->currentDay = local.Day;
-            ret = true;
-        }
-
-        if(local.Month != data.month) {
-            data.costLastMonth = data.costThisMonth;
-            data.costThisMonth = 0;
-            data.incomeLastMonth = data.incomeThisMonth;
-            data.incomeThisMonth = 0;
-            for(uint8_t i = 0; i < 5; i++) {
-                data.peaks[i] = { 0, 0 };
-            }
-
-            uint64_t totalImport = 0, totalExport = 0;
-            for(uint8_t i = 1; i <= prevDay; i++) {
-                totalImport += ds->getDayImport(i);
-                totalExport += ds->getDayExport(i);
-            }
-            uint8_t accuracy = 0;
-            uint64_t importUpdate = totalImport, exportUpdate = totalExport;
-            while(importUpdate > UINT32_MAX || exportUpdate > UINT32_MAX) {
-                accuracy++;
-                importUpdate = totalImport / pow(10, accuracy);
-                exportUpdate = totalExport / pow(10, accuracy);
-            }
-            data.lastMonthImport = importUpdate;
-            data.lastMonthExport = exportUpdate;
-            data.lastMonthAccuracy = accuracy;
-
-            data.month = local.Month;
-            realtimeData->currentThresholdIdx = 0;
-            ret = true;
-        }
-
-        if(ret) {
-            data.costToday = realtimeData->costDay * 100;
-            data.incomeToday = realtimeData->incomeDay * 100;
-            data.lastUpdated = now;
-        }
-    }
-
-    if(realtimeData->lastImportUpdateMillis < amsData->getLastUpdateMillis()) {
-        unsigned long ms = amsData->getLastUpdateMillis() - realtimeData->lastImportUpdateMillis;
-        float kwhi = (amsData->getActiveImportPower() * (((float) ms) / 3600000.0)) / 1000.0;
-        if(kwhi > 0) {
-            realtimeData->use += kwhi;
-            float importPrice = ps == NULL ? PRICE_NO_VALUE : ps->getCurrentPrice(PRICE_DIRECTION_IMPORT);
-            if(importPrice != PRICE_NO_VALUE) {
-                float cost = importPrice * kwhi;
-                realtimeData->costHour += cost;
-                realtimeData->costDay += cost;
-            }
-        }
-        realtimeData->lastImportUpdateMillis = amsData->getLastUpdateMillis();
-    }
-
-    if(amsData->getListType() > 1 && realtimeData->lastExportUpdateMillis < amsData->getLastUpdateMillis()) {
-        unsigned long ms = amsData->getLastUpdateMillis() - realtimeData->lastExportUpdateMillis;
-        float kwhe = (amsData->getActiveExportPower() * (((float) ms) / 3600000.0)) / 1000.0;
-        if(kwhe > 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;
-                realtimeData->incomeHour += income;
-                realtimeData->incomeDay += income;
-            }
-        }
-        realtimeData->lastExportUpdateMillis = amsData->getLastUpdateMillis();
-    }
-
-    if(config != NULL) {
-        while(getMonthMax() > config->thresholds[realtimeData->currentThresholdIdx] && realtimeData->currentThresholdIdx < 10) realtimeData->currentThresholdIdx++;
-    }
-
-    return ret;
-}
-
-void EnergyAccounting::calcDayCost() {
-    time_t now = time(nullptr);
-    tmElements_t local, utc, lastUpdateUtc;
-    if(tz == NULL) return;
-    breakTime(tz->toLocal(now), local);
-    if(ps == NULL) return;
-
-    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 = calcFromHour; i < realtimeData->currentHour; i++) {
-            breakTime(now - ((local.Hour - i) * 3600), utc);
-
-            float priceIn = ps->getPriceForRelativeHour(PRICE_DIRECTION_IMPORT, i - local.Hour);
-            if(priceIn != PRICE_NO_VALUE) {
-                int16_t wh = ds->getHourImport(utc.Hour);
-                realtimeData->costDay += priceIn * (wh / 1000.0);
-            }
-
-            float priceOut = ps->getPriceForRelativeHour(PRICE_DIRECTION_EXPORT, i - local.Hour);
-            if(priceOut != PRICE_NO_VALUE) {
-                int16_t wh = ds->getHourExport(utc.Hour);
-                realtimeData->incomeDay += priceOut * (wh / 1000.0);
-            }
-        }
-        initPrice = true;
-    }
-}
-
-float EnergyAccounting::getUseThisHour() {
-    return realtimeData->use;
-}
-
-float EnergyAccounting::getUseToday() {
-    if(tz == NULL) return 0.0;
-    float ret = 0.0;
-    time_t now = time(nullptr);
-    if(now < FirmwareVersion::BuildEpoch) return 0.0;
-    tmElements_t utc, local;
-    breakTime(tz->toLocal(now), local);
-    for(uint8_t i = 0; i < realtimeData->currentHour; i++) {
-        breakTime(now - ((local.Hour - i) * 3600), utc);
-        ret += ds->getHourImport(utc.Hour) / 1000.0;
-    }
-    return ret + getUseThisHour();
-}
-
-float EnergyAccounting::getUseThisMonth() {
-    time_t now = time(nullptr);
-    if(now < FirmwareVersion::BuildEpoch) return 0.0;
-    float ret = 0;
-    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 EnergyAccounting::getProducedThisHour() {
-    return realtimeData->produce;
-}
-
-float EnergyAccounting::getProducedToday() {
-    if(tz == NULL) return 0.0;
-    float ret = 0.0;
-    time_t now = time(nullptr);
-    if(now < FirmwareVersion::BuildEpoch) return 0.0;
-    tmElements_t utc, local;
-    breakTime(tz->toLocal(now), local);
-    for(uint8_t i = 0; i < realtimeData->currentHour; i++) {
-        breakTime(now - ((local.Hour - i) * 3600), utc);
-        ret += ds->getHourExport(utc.Hour) / 1000.0;
-    }
-    return ret + getProducedThisHour();
-}
-
-float EnergyAccounting::getProducedThisMonth() {
-    time_t now = time(nullptr);
-    if(now < FirmwareVersion::BuildEpoch) return 0.0;
-    float ret = 0;
-    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 EnergyAccounting::getCostThisHour() {
-    return realtimeData->costHour;
-}
-
-float EnergyAccounting::getCostToday() {
-    return realtimeData->costDay;
-}
-
-float EnergyAccounting::getCostYesterday() {
-    return data.costYesterday / 100.0;
-}
-
-float EnergyAccounting::getCostThisMonth() {
-    return (data.costThisMonth / 100.0) + getCostToday();
-}
-
-float EnergyAccounting::getCostLastMonth() {
-    return data.costLastMonth / 100.0;
-}
-
-float EnergyAccounting::getIncomeThisHour() {
-    return realtimeData->incomeHour;
-}
-
-float EnergyAccounting::getIncomeToday() {
-    return realtimeData->incomeDay;
-}
-
-float EnergyAccounting::getIncomeYesterday() {
-    return data.incomeYesterday / 100.0;
-}
-
-float EnergyAccounting::getIncomeThisMonth() {
-    return (data.incomeThisMonth / 100.0) + getIncomeToday();
-}
-
-float EnergyAccounting::getIncomeLastMonth() {
-    return data.incomeLastMonth / 100.0;
-}
-
-uint8_t EnergyAccounting::getCurrentThreshold() {
-    if(config == NULL)
-        return 0;
-    return config->thresholds[realtimeData->currentThresholdIdx];
-}
-
-float EnergyAccounting::getMonthMax() {
-    if(config == NULL)
-        return 0.0;
-    uint8_t count = 0;
-    uint32_t maxHour = 0.0;
-    bool included[5] = { false, false, false, false, false };
-
-    for(uint8_t x = 0;x < min((uint8_t) 5, config->hours); x++) {
-        uint8_t maxIdx = 0;
-        uint16_t maxVal = 0;
-        for(uint8_t i = 0; i < 5; i++) {
-            if(included[i]) continue;
-            if(data.peaks[i].day == 0) continue;
-            if(data.peaks[i].value > maxVal) {
-                maxVal = data.peaks[i].value;
-                maxIdx = i;
-            }
-        }
-        if(maxVal > 0) {
-            included[maxIdx] = true;
-            count++;
-        }
-    }
-
-    for(uint8_t i = 0; i < 5; i++) {
-        if(!included[i]) continue;
-        maxHour += data.peaks[i].value;
-    }
-    return maxHour > 0 ? maxHour / count / 100.0 : 0.0;
-}
-
-EnergyAccountingPeak EnergyAccounting::getPeak(uint8_t num) {
-    if(config == NULL)
-        return EnergyAccountingPeak({0,0});
-    if(num < 1 || num > 5) return EnergyAccountingPeak({0,0});
-
-    uint8_t count = 0;
-    bool included[5] = { false, false, false, false, false };
-
-    for(uint8_t x = 0;x < min((uint8_t) 5, config->hours); x++) {
-        uint8_t maxIdx = 0;
-        uint16_t maxVal = 0;
-        for(uint8_t i = 0; i < 5; i++) {
-            if(included[i]) continue;
-            if(data.peaks[i].value > maxVal) {
-                maxVal = data.peaks[i].value;
-                maxIdx = i;
-            }
-        }
-        if(maxVal > 0) {
-            included[maxIdx] = true;
-            count++;
-        }
-    }
-
-    uint8_t pos = 0;
-    for(uint8_t i = 0; i < 5; i++) {
-        if(!included[i]) continue;
-        pos++;
-        if(pos == num) {
-            return data.peaks[i];
-        }
-    }
-    return EnergyAccountingPeak({0,0});
-}
-
-bool EnergyAccounting::load() {
-    if(!LittleFS.begin()) {
-        return false;
-    }
-
-    bool ret = false;
-    if(LittleFS.exists(FILE_ENERGYACCOUNTING)) {
-        File file = LittleFS.open(FILE_ENERGYACCOUNTING, "r");
-        char buf[file.size()];
-        file.readBytes(buf, file.size());
-
-        if(buf[0] == 7) {
-            EnergyAccountingData* data = (EnergyAccountingData*) buf;
-            memcpy(&this->data, data, sizeof(this->data));
-            ret = true;
-        } 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,
-                data->lastMonthImport,
-                data->lastMonthExport,
-                data->lastMonthAccuracy,
-                data->peaks[0].day, 0, data->peaks[0].value,
-                data->peaks[1].day, 0, data->peaks[1].value,
-                data->peaks[2].day, 0, data->peaks[2].value,
-                data->peaks[3].day, 0, data->peaks[3].value,
-                data->peaks[4].day, 0, data->peaks[4].value
-            };
-            ret = true;
-        }
-
-        file.close();
-    }
-
-    return ret;
-}
-
-bool EnergyAccounting::save() {
-    if(!LittleFS.begin()) {
-        return false;
-    }
-    {
-        File file = LittleFS.open(FILE_ENERGYACCOUNTING, "w");
-        char buf[sizeof(data)];
-        memcpy(buf, &data, sizeof(data));
-        for(uint8_t i = 0; i < sizeof(buf); i++) {
-            file.write(buf[i]);
-        }
-        file.close();
-    }
-    return true;
-}
-
-EnergyAccountingData EnergyAccounting::getData() {
-    return this->data;
-}
-
-void EnergyAccounting::setData(EnergyAccountingData& data) {
-    this->data = data;
-}
-
-bool EnergyAccounting::updateMax(uint16_t val, uint8_t day, uint8_t hour) {
-    for(uint8_t i = 0; i < 5; i++) {
-        if(data.peaks[i].day == day || data.peaks[i].day == 0) {
-            if(val > data.peaks[i].value) {
-                data.peaks[i].day = day;
-                data.peaks[i].hour = hour;
-                data.peaks[i].value = val;
-                return true;
-            }
-            return false;
-        }
-    }
-    uint16_t test = val;
-    uint8_t idx = 255;
-    for(uint8_t i = 0; i < 5; i++) {
-        if(val > data.peaks[i].value) {
-            if(test > data.peaks[i].value) {
-                test = data.peaks[i].value;
-                idx = i;
-            }
-        }
-    }
-    if(idx < 5) {
-        data.peaks[idx].value = val;
-        data.peaks[idx].day = day;
-        return true;
-    }
-    return false;
-}
-
-void EnergyAccounting::setCurrency(String currency) {
-    this->currency = currency;
-}

lib/FirmwareVersion/include/FirmwareVersion.h

@@ -1,18 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _FIRMWARE_VERSION_h
-#define _FIRMWARE_VERSION_h
-
-
-class FirmwareVersion {
-public:
-	static long BuildEpoch;
-	static const char* VersionString;
-};
-
-#endif
-

lib/FirmwareVersion/src/FirmwareVersion.cpp

@@ -1,11 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include "FirmwareVersion.h"
-#include "generated_version.h"
-
-long FirmwareVersion::BuildEpoch = BUILD_EPOCH;
-const char* FirmwareVersion::VersionString = VERSION_STRING;

lib/HomeAssistantMqttHandler/include/.gitignore

@@ -1 +0,0 @@
-json/*.h

lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h

@@ -1,155 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _HOMEASSISTANTMQTTHANDLER_H
-#define _HOMEASSISTANTMQTTHANDLER_H
-
-#include "AmsMqttHandler.h"
-#include "HomeAssistantStatic.h"
-#include "AmsConfiguration.h"
-#include "hexutils.h"
-
-class HomeAssistantMqttHandler : public AmsMqttHandler {
-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) {
-    #endif
-        this->boardType = boardType;
-        this->hw = hw;
-        setHomeAssistantConfig(config, hostname);
-    };
-    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, PriceService* ps);
-    bool publishTemperatures(AmsConfiguration*, HwTools*);
-    bool publishPrices(PriceService*);
-    bool publishSystem(HwTools* hw, PriceService* ps, EnergyAccounting* ea);
-    bool publishRaw(uint8_t* raw, size_t length);
-    bool publishFirmware();
-
-    bool postConnect();
-
-    void onMessage(String &topic, String &payload);
-
-    uint8_t getFormat();
-
-    void setHomeAssistantConfig(HomeAssistantConfig config, char* hostname);
-private:
-    uint8_t boardType;
-
-    String deviceName;
-    String deviceModel;
-    String deviceUid;
-    String manufacturer;
-    String deviceUrl;
-
-    String statusTopic;
-    String sensorTopic;
-    String updateTopic;
-    String sensorNamePrefix;
-
-    bool l1Init, l2Init, l2eInit, l3Init, l3eInit, l4Init, l4eInit, rtInit, rteInit, pInit, sInit, rInit, fInit, dInit;
-    bool tInit[32] = {false};
-    uint8_t priceImportInit = 0, priceExportInit = 0;
-    uint32_t lastThresholdPublish = 0;
-
-    HwTools* hw;
-
-    bool publishList1(AmsData* data, EnergyAccounting* ea);
-    bool publishList2(AmsData* data, EnergyAccounting* ea);
-    bool publishList3(AmsData* data, EnergyAccounting* ea);
-    bool publishList4(AmsData* data, EnergyAccounting* ea);
-    String getMeterModel(AmsData* data);
-    bool publishRealtime(AmsData* data, EnergyAccounting* ea, PriceService* ps);
-    void publishSensor(const HomeAssistantSensor sensor);
-    void publishList1Sensors();
-    void publishList1ExportSensors();
-    void publishList2Sensors();
-    void publishList2ExportSensors();
-    void publishList3Sensors();
-    void publishList3ExportSensors();
-    void publishList4Sensors();
-    void publishList4ExportSensors();
-    void publishRealtimeSensors(EnergyAccounting* ea, PriceService* ps);
-    void publishRealtimeExportSensors(EnergyAccounting* ea, PriceService* ps);
-    void publishTemperatureSensor(uint8_t index, String id);
-    void publishPriceSensors(PriceService* ps);
-    void publishSystemSensors();
-    void publishThresholdSensors();
-
-    String boardTypeToString(uint8_t b) {
-        switch(b) {
-            case 5:
-                #if defined(ESP8266)
-                    return F("Pow-K");
-                #elif defined(ESP32)
-                    return F("Pow-K+");
-                #endif
-            case 7:
-                #if defined(ESP8266)
-                    return F("Pow-U");
-                #elif defined(ESP32)
-                    return F("Pow-U+");
-                #endif
-            case 6:
-                return F("Pow-P1");
-            case 51:
-                return F("S2 mini");
-            case 50:
-                return F("ESP32-S2");
-            case 201:
-                return F("LOLIN D32");
-            case 202:
-                return F("HUZZAH32");
-            case 203:
-                return F("DevKitC");
-            case 200:
-                return F("ESP32");
-            case 2:
-                return F("HAN Reader 2.0 by Max Spencer");
-            case 0:
-                return F("Custom hardware by Roar Fredriksen");
-            case 1:
-                return F("Kamstrup module by Egil Opsahl");
-            case 3:
-                return F("Pow-K");
-            case 4:
-                return F("Pow-U");
-            case 101:
-                return F("D1 mini");
-            case 100:
-                return F("ESP8266");
-            case 70:
-                return F("ESP32-C3");
-            case 71:
-                return F("ESP32-C3-DevKitM-1");
-            case 80:
-                return F("ESP32-S3");
-        }
-        #if defined(ESP8266)
-            return F("ESP8266");
-        #elif defined(ESP32)
-            return F("ESP32");
-        #endif
-    };
-
-    String boardManufacturerToString(uint8_t b) {
-        if(b >= 3 && b <= 7)
-            return F("amsleser.no");
-        if(b < 50)
-            return F("Custom");
-        switch(b) {
-            case 51:
-            case 101:
-            case 201:
-                return F("Wemos");
-            case 202:
-                return F("Adafruit");
-        }
-        return F("Espressif");
-    };
-};
-#endif

lib/HomeAssistantMqttHandler/include/HomeAssistantStatic.h

@@ -1,129 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _HOMEASSISTANTSTATIC_H
-#define _HOMEASSISTANTSTATIC_H
-
-#include "Arduino.h"
-
-struct HomeAssistantSensor {
-    const char* name;
-    const char* topic;
-    const char* path;
-    uint16_t ttl;
-    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",       "",            ""}
-};
-
-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", ""}
-};
-
-const uint8_t List2ExportSensorCount PROGMEM = 1;
-const HomeAssistantSensor List2ExportSensors[List2ExportSensorCount] PROGMEM = {
-    {"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",       "",                 ""}
-};
-
-const uint8_t List3ExportSensorCount PROGMEM = 1;
-const HomeAssistantSensor List3ExportSensors[List3ExportSensorCount] PROGMEM = {
-    {"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", ""}
-};
-
-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", ""}
-};
-
-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",        "",  ""}
-};
-
-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",        "",  ""}
-};
-
-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",       "",  ""}
-};
-
-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", ""}
-};
-
-const HomeAssistantSensor TemperatureSensor PROGMEM = {"Temperature sensor %s", "/temperatures", "temperatures['%s']", 900, "°C", "temperature", "measurement", ""};
-
-const HomeAssistantSensor DataSensor PROGMEM = {"Data", "/data", "data", 900, "", "", "", ""};
-
-#endif

lib/HomeAssistantMqttHandler/json/ha1.json

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

lib/HomeAssistantMqttHandler/json/ha2.json

@@ -1,8 +0,0 @@
-{
-    "tPI" : %.3f,
-    "tPO" : %.3f,
-    "tQI" : %.3f,
-    "tQO" : %.3f,
-    "rtc" : "%s",
-    "t" : "%s"
-}

lib/HomeAssistantMqttHandler/json/ha4.json

@@ -1,32 +0,0 @@
-{
-    "lv" : "%s",
-    "id" : "%s",
-    "type" : "%s",
-    "P" : %lu,
-    "P1" : %lu,
-    "P2" : %lu,
-    "P3" : %lu,
-    "Q" : %lu,
-    "PO" : %lu,
-    "PO1" : %lu,
-    "PO2" : %lu,
-    "PO3" : %lu,
-    "QO" : %lu,
-    "I1" : %.2f,
-    "I2" : %.2f,
-    "I3" : %.2f,
-    "U1" : %.2f,
-    "U2" : %.2f,
-    "U3" : %.2f,
-    "PF" : %d,
-    "PF1" : %d,
-    "PF2" : %d,
-    "PF3" : %d,
-    "tPI1" : %.3f,
-    "tPI2" : %.3f,
-    "tPI3" : %.3f,
-    "tPO1" : %.3f,
-    "tPO2" : %.3f,
-    "tPO3" : %.3f,
-    "t" : "%s"
-}

lib/HomeAssistantMqttHandler/scripts/generate_includes.py

@@ -1,76 +0,0 @@
-import os
-import re
-import shutil
-import subprocess
-
-try:
-    from css_html_js_minify import js_minify
-except:
-    from SCons.Script import (
-        ARGUMENTS,
-        COMMAND_LINE_TARGETS,
-        DefaultEnvironment,
-    )
-    env = DefaultEnvironment()
-
-    env.Execute(
-        env.VerboseAction(
-            '$PYTHONEXE -m pip install "css_html_js_minify" ',
-            "Installing Python dependencies",
-        )
-    )
-    try:
-        from css_html_js_minify import js_minify
-    except:
-        print("WARN: Unable to load minifier")
-
-
-webroot = "lib/HomeAssistantMqttHandler/json"
-srcroot = "lib/HomeAssistantMqttHandler/include/json"
-
-version = os.environ.get('GITHUB_TAG')
-if version == None:
-    try:
-      result = subprocess.run(['git','rev-parse','--short','HEAD'], capture_output=True, check=False)
-      if result.returncode == 0:
-        version = result.stdout.decode('utf-8').strip()
-      else:
-        version = "SNAPSHOT"
-    except:
-      version = "SNAPSHOT"
-
-if os.path.exists(srcroot):
-    shutil.rmtree(srcroot)
-    os.mkdir(srcroot)
-else:
-    os.mkdir(srcroot)
-
-for filename in os.listdir(webroot):
-    basename = re.sub("[^0-9a-zA-Z]+", "_", filename)
-
-    srcfile = webroot + "/" + filename
-    dstfile = srcroot + "/" + basename + ".h"
-
-    varname = basename.upper()
-
-    with open(srcfile, encoding="utf-8") as f:
-        content = f.read().replace("${version}", version)
-
-    try:    
-        if (filename.endswith(".js") and filename != 'gaugemeter.js') or filename.endswith(".json"):
-            content = js_minify(content)
-    except:
-        print("WARN: Unable to minify")
-
-    with open(dstfile, "w") as dst:
-        dst.write("static const char ")
-        dst.write(varname)
-        dst.write("[] PROGMEM = R\"==\"==(")
-        dst.write(content)
-        dst.write(")==\"==\";\n")
-        dst.write("const int ");
-        dst.write(varname)
-        dst.write("_LEN PROGMEM = ");
-        dst.write(str(len(content)))
-        dst.write(";");
-        

lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp

@@ -1,904 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include "HomeAssistantMqttHandler.h"
-#include "hexutils.h"
-#include "Uptime.h"
-#include "FirmwareVersion.h"
-#include "json/ha1_json.h"
-#include "json/ha2_json.h"
-#include "json/ha3_json.h"
-#include "json/ha4_json.h"
-#include "json/hadiscover_json.h"
-#include "FirmwareVersion.h"
-
-#if defined(ESP32)
-#include <esp_task_wdt.h>
-#endif
-
-void HomeAssistantMqttHandler::setHomeAssistantConfig(HomeAssistantConfig config, char* hostname) {
-    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);
-        deviceName = String(json);
-        snprintf_P(json, 128, PSTR("[%s] "), config.discoveryNameTag);
-        sensorNamePrefix = String(json);
-    } else {
-        deviceName = F("AMS reader");
-        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) {
-            deviceUrl = String(config.discoveryHostname);
-        } else {
-            snprintf_P(json, 128, PSTR("http://%s/"), config.discoveryHostname);
-            deviceUrl = String(json);
-        }
-    } else {
-        snprintf_P(json, 128, PSTR("http://%s.local/"), hostname);
-        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");
-    }
-    strcpy(this->mqttConfig.subscribeTopic, statusTopic.c_str());
-}
-
-bool HomeAssistantMqttHandler::postConnect() {
-    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 ret;
-}
-
-bool HomeAssistantMqttHandler::publish(AmsData* update, AmsData* previousState, EnergyAccounting* ea, PriceService* ps) {
-	if(pubTopic.isEmpty() || !connected())
-		return false;
-
-    if(time(nullptr) < FirmwareVersion::BuildEpoch)
-        return false;
-
-    AmsData data;
-    if(mqttConfig.stateUpdate) {
-        uint64_t now = millis64();
-        if(now-lastStateUpdate < mqttConfig.stateUpdateInterval * 1000) return false;
-        data.apply(*previousState);
-        data.apply(*update);
-        lastStateUpdate = now;
-    } else {
-        data = *update;
-    }
-
-    if(data.getListType() >= 3 && !data.isCounterEstimated()) { // publish energy counts
-        publishList3(&data, ea);
-        mqtt.loop();
-    }
-
-    if(data.getListType() == 1) { // publish power counts
-        publishList1(&data, ea);
-        mqtt.loop();
-    } else if(data.getListType() <= 3) { // publish power counts and volts/amps
-        publishList2(&data, ea);
-        mqtt.loop();
-    } else if(data.getListType() == 4) { // publish power counts and volts/amps/phase power and PF
-        publishList4(&data, ea);
-        mqtt.loop();
-    }
-
-    if(ea->isInitialized()) {
-        publishRealtime(&data, ea, ps);
-        mqtt.loop();
-    }
-    loop();
-    return true;
-}
-
-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);
-    }
-
-    snprintf_P(json, BufferSize, HA1_JSON, data->getActiveImportPower(), pt);
-    return mqtt.publish(pubTopic + "/power", json);
-}
-
-bool HomeAssistantMqttHandler::publishList2(AmsData* data, EnergyAccounting* ea) {
-    publishList2Sensors();
-    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);
-    }
-
-    snprintf_P(json, BufferSize, HA3_JSON,
-        data->getListId().c_str(),
-        data->getMeterId().c_str(),
-        getMeterModel(data).c_str(),
-        data->getActiveImportPower(),
-        data->getReactiveImportPower(),
-        data->getActiveExportPower(),
-        data->getReactiveExportPower(),
-        data->getL1Current(),
-        data->getL2Current(),
-        data->getL3Current(),
-        data->getL1Voltage(),
-        data->getL2Voltage(),
-        data->getL3Voltage(),
-        pt
-    );
-    return mqtt.publish(pubTopic + "/power", json);
-}
-
-bool HomeAssistantMqttHandler::publishList3(AmsData* data, EnergyAccounting* ea) {
-    publishList3Sensors();
-    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);
-    }
-
-	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);
-    }
-
-    snprintf_P(json, BufferSize, HA2_JSON,
-        data->getActiveImportCounter(),
-        data->getActiveExportCounter(),
-        data->getReactiveImportCounter(),
-        data->getReactiveExportCounter(),
-        mt,
-        pt
-    );
-    return mqtt.publish(pubTopic + "/energy", json);
-}
-
-bool HomeAssistantMqttHandler::publishList4(AmsData* data, EnergyAccounting* ea) {
-    publishList4Sensors();
-    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);
-    }
-
-    snprintf_P(json, BufferSize, HA4_JSON,
-        data->getListId().c_str(),
-        data->getMeterId().c_str(),
-        getMeterModel(data).c_str(),
-        data->getActiveImportPower(),
-        data->getL1ActiveImportPower(),
-        data->getL2ActiveImportPower(),
-        data->getL3ActiveImportPower(),
-        data->getReactiveImportPower(),
-        data->getActiveExportPower(),
-        data->getL1ActiveExportPower(),
-        data->getL2ActiveExportPower(),
-        data->getL3ActiveExportPower(),
-        data->getReactiveExportPower(),
-        data->getL1Current(),
-        data->getL2Current(),
-        data->getL3Current(),
-        data->getL1Voltage(),
-        data->getL2Voltage(),
-        data->getL3Voltage(),
-        data->getPowerFactor() == 0 ? 100 : (int) (data->getPowerFactor() * 100),
-        data->getPowerFactor() == 0 ? 100 : (int) (data->getL1PowerFactor() * 100),
-        data->getPowerFactor() == 0 ? 100 : (int) (data->getL2PowerFactor() * 100),
-        data->getPowerFactor() == 0 ? 100 : (int) (data->getL3PowerFactor() * 100),
-        data->getL1ActiveImportCounter(),
-        data->getL2ActiveImportCounter(),
-        data->getL3ActiveImportCounter(),
-        data->getL1ActiveExportCounter(),
-        data->getL2ActiveExportCounter(),
-        data->getL3ActiveExportCounter(),
-        pt
-    );
-    return mqtt.publish(pubTopic + "/power", json);
-}
-
-String HomeAssistantMqttHandler::getMeterModel(AmsData* data) {
-    String meterModel = data->getMeterModel();
-    meterModel.replace("\\", "\\\\");
-    return meterModel;
-}
-
-bool HomeAssistantMqttHandler::publishRealtime(AmsData* data, EnergyAccounting* ea, PriceService* ps) {
-    publishRealtimeSensors(ea, ps);
-    if(ea->getProducedThisHour() > 0.0 || ea->getProducedToday() > 0.0 || ea->getProducedThisMonth() > 0.0) publishRealtimeExportSensors(ea, ps);
-    if(lastThresholdPublish == 0) publishThresholdSensors();
-    String peaks = "";
-    uint8_t peakCount = ea->getConfig()->hours;
-    if(peakCount > 5) peakCount = 5;
-    for(uint8_t i = 1; i <= peakCount; i++) {
-        if(!peaks.isEmpty()) peaks += ",";
-        peaks += String(ea->getPeak(i).value / 100.0, 2);
-    }
-    uint16_t pos = snprintf_P(json, BufferSize, PSTR("{\"max\":%.1f,\"peaks\":[%s],\"threshold\":%d,\"hour\":{\"use\":%.2f,\"cost\":%.2f,\"produced\":%.2f,\"income\":%.2f},\"day\":{\"use\":%.2f,\"cost\":%.2f,\"produced\":%.2f,\"income\":%.2f},\"month\":{\"use\":%.2f,\"cost\":%.2f,\"produced\":%.2f,\"income\":%.2f}"),
-        ea->getMonthMax(),
-        peaks.c_str(),
-        ea->getCurrentThreshold(),
-        ea->getUseThisHour(),
-        ea->getCostThisHour(),
-        ea->getProducedThisHour(),
-        ea->getIncomeThisHour(),
-        ea->getUseToday(),
-        ea->getCostToday(),
-        ea->getProducedToday(),
-        ea->getIncomeToday(),
-        ea->getUseThisMonth(),
-        ea->getCostThisMonth(),
-        ea->getProducedThisMonth(),
-        ea->getIncomeThisMonth()
-    );
-    uint32_t ms = millis();
-    if(lastThresholdPublish == 0 || ms-lastThresholdPublish > 3600000) {
-        EnergyAccountingConfig* conf = ea->getConfig();
-        pos += snprintf_P(json+pos, BufferSize-pos, PSTR(",\"thresholds\": [%d,%d,%d,%d,%d,%d,%d,%d,%d]"),
-            conf->thresholds[0],
-            conf->thresholds[1],
-            conf->thresholds[2],
-            conf->thresholds[3],
-            conf->thresholds[4],
-            conf->thresholds[5],
-            conf->thresholds[6],
-            conf->thresholds[7],
-            conf->thresholds[8]
-        );
-        lastThresholdPublish = ms;
-    }
-
-    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);
-    
-    json[pos++] = '}';
-    json[pos] = '\0';
-
-    return mqtt.publish(pubTopic + "/realtime", json);
-}
-
-bool HomeAssistantMqttHandler::publishTemperatures(AmsConfiguration* config, HwTools* hw) {
-	int count = hw->getTempSensorCount();
-    if(count < 2) return false;
-
-	uint16_t pos = snprintf_P(json, 24, PSTR("{\"temperatures\":{"));
-
-	for(int i = 0; i < count; i++) {
-		TempSensorData* data = hw->getTempSensorData(i);
-        if(data != NULL) {
-            String id = toHex(data->address, 8);
-            pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"%s\":%.2f,"), 
-                id.c_str(),
-                data->lastRead
-            );
-            data->changed = false;
-            publishTemperatureSensor(i+1, id);
-        }
-	}
-	pos += snprintf_P(json+pos, BufferSize-pos, PSTR("}"));
-
-    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);
-	pos += snprintf_P(json+pos, BufferSize-pos, PSTR("}"));
-
-    bool ret = mqtt.publish(pubTopic + "/temperatures", json);
-    loop();
-    return ret;
-}
-
-bool HomeAssistantMqttHandler::publishPrices(PriceService* ps) {
-	if(pubTopic.isEmpty() || !connected())
-		return false;
-	if(!ps->hasPrice())
-		return false;
-
-    publishPriceSensors(ps);
-
-	time_t now = time(nullptr);
-
-	float min1hr = 0.0, min3hr = 0.0, min6hr = 0.0;
-	int8_t min1hrIdx = -1, min3hrIdx = -1, min6hrIdx = -1;
-	float min = INT16_MAX, max = INT16_MIN;
-	float values[38];
-    for(int i = 0;i < 38; i++) values[i] = PRICE_NO_VALUE;
-	for(uint8_t i = 0; i < 38; i++) {
-		float val = ps->getPriceForRelativeHour(PRICE_DIRECTION_IMPORT, i);
-		values[i] = val;
-
-		if(val == PRICE_NO_VALUE) break;
-		
-		if(val < min) min = val;
-		if(val > max) max = val;
-
-		if(min1hrIdx == -1 || min1hr > val) {
-			min1hr = val;
-			min1hrIdx = i;
-		}
-
-		if(i >= 2) {
-			i -= 2;
-			float val1 = values[i++];
-			float val2 = values[i++];
-			float val3 = val;
-			if(val1 == PRICE_NO_VALUE || val2 == PRICE_NO_VALUE || val3 == PRICE_NO_VALUE) continue;
-			float val3hr = val1+val2+val3;
-			if(min3hrIdx == -1 || min3hr > val3hr) {
-				min3hr = val3hr;
-				min3hrIdx = i-2;
-			}
-		}
-
-		if(i >= 5) {
-			i -= 5;
-			float val1 = values[i++];
-			float val2 = values[i++];
-			float val3 = values[i++];
-			float val4 = values[i++];
-			float val5 = values[i++];
-			float val6 = val;
-			if(val1 == PRICE_NO_VALUE || val2 == PRICE_NO_VALUE || val3 == PRICE_NO_VALUE || val4 == PRICE_NO_VALUE || val5 == PRICE_NO_VALUE || val6 == PRICE_NO_VALUE) continue;
-			float val6hr = val1+val2+val3+val4+val5+val6;
-			if(min6hrIdx == -1 || min6hr > val6hr) {
-				min6hr = val6hr;
-				min6hrIdx = i-5;
-			}
-		}
-
-	}
-
-	char ts1hr[24];
-    memset(ts1hr, 0, 24);
-	if(min1hrIdx > -1) {
-        time_t ts = now + (SECS_PER_HOUR * min1hrIdx);
-		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);
-	}
-	char ts3hr[24];
-    memset(ts3hr, 0, 24);
-	if(min3hrIdx > -1) {
-        time_t ts = now + (SECS_PER_HOUR * min3hrIdx);
-		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);
-	}
-	char ts6hr[24];
-    memset(ts6hr, 0, 24);
-	if(min6hrIdx > -1) {
-        time_t ts = now + (SECS_PER_HOUR * min6hrIdx);
-		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);
-	}
-
-    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(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--;
-    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
-    );
-    
-    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);
-
-    json[pos++] = '}';
-    json[pos] = '\0';
-
-    bool ret = mqtt.publish(pubTopic + "/prices", json, true, 0);
-    loop();
-    return ret;
-}
-
-bool HomeAssistantMqttHandler::publishSystem(HwTools* hw, PriceService* ps, EnergyAccounting* ea) {
-	if(pubTopic.isEmpty() || !connected())
-		return false;
-
-    publishSystemSensors();
-    if(hw->getTemperature() > -50) publishTemperatureSensor(0, "");
-
-	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);
-    }
-
-    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),
-        hw->getVcc(),
-        hw->getWifiRssi(),
-        hw->getTemperature(),
-        FirmwareVersion::VersionString,
-        pt
-    );
-    bool ret = mqtt.publish(pubTopic + "/state", json);
-    loop();
-    return ret;
-}
-
-void HomeAssistantMqttHandler::publishSensor(const HomeAssistantSensor sensor) {
-    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.path,
-        sensor.ttl,
-        deviceUid.c_str(),
-        deviceName.c_str(),
-        deviceModel.c_str(),
-        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.uom) > 0 ? ",\"unit_of_meas\":\"" : "",
-        strlen_P(sensor.uom) > 0 ? (char *) FPSTR(sensor.uom) : "",
-        strlen_P(sensor.uom) > 0 ? "\"" : ""
-    );
-
-    mqtt.publish(sensorTopic + "/" + deviceUid + "_" + uid + "/config", json, true, 0);
-    loop();
-}
-
-void HomeAssistantMqttHandler::publishList1Sensors() {
-    if(l1Init) return;
-    for(uint8_t i = 0; i < List1SensorCount; i++) {
-        publishSensor(List1Sensors[i]);
-    }
-    l1Init = true;
-}
-
-void HomeAssistantMqttHandler::publishList2Sensors() {
-    publishList1Sensors();
-    if(l2Init) return;
-    for(uint8_t i = 0; i < List2SensorCount; i++) {
-        publishSensor(List2Sensors[i]);
-    }
-    l2Init = true;
-}
-
-void HomeAssistantMqttHandler::publishList2ExportSensors() {
-    if(l2eInit) return;
-    for(uint8_t i = 0; i < List2ExportSensorCount; i++) {
-        publishSensor(List2ExportSensors[i]);
-    }
-    l2eInit = true;
-}
-
-void HomeAssistantMqttHandler::publishList3Sensors() {
-    publishList2Sensors();
-    if(l3Init) return;
-    for(uint8_t i = 0; i < List3SensorCount; i++) {
-        publishSensor(List3Sensors[i]);
-    }
-    l3Init = true;
-}
-
-void HomeAssistantMqttHandler::publishList3ExportSensors() {
-    publishList2ExportSensors();
-    if(l3eInit) return;
-    for(uint8_t i = 0; i < List3ExportSensorCount; i++) {
-        publishSensor(List3ExportSensors[i]);
-    }
-    l3eInit = true;
-}
-
-void HomeAssistantMqttHandler::publishList4Sensors() {
-    publishList3Sensors();
-    if(l4Init) return;
-    for(uint8_t i = 0; i < List4SensorCount; i++) {
-        publishSensor(List4Sensors[i]);
-    }
-    l4Init = true;
-}
-
-void HomeAssistantMqttHandler::publishList4ExportSensors() {
-    publishList3ExportSensors();
-    if(l4eInit) return;
-    for(uint8_t i = 0; i < List4ExportSensorCount; i++) {
-        publishSensor(List4ExportSensors[i]);
-    }
-    l4eInit = true;
-}
-
-void HomeAssistantMqttHandler::publishRealtimeSensors(EnergyAccounting* ea, PriceService* ps) {
-    if(rtInit) return;
-    for(uint8_t i = 0; i < RealtimeSensorCount; i++) {
-        HomeAssistantSensor sensor = RealtimeSensors[i];
-        if(strncmp_P(sensor.devcl, PSTR("monetary"), 8) == 0) {
-            if(ps == NULL) continue;
-            sensor.uom = ps->getCurrency();
-        }
-        publishSensor(sensor);
-    }
-    uint8_t peakCount = ea->getConfig()->hours;
-    if(peakCount > 5) peakCount = 5;
-    for(uint8_t i = 0; i < peakCount; i++) {
-        char name[strlen(RealtimePeakSensor.name)];
-        snprintf(name, strlen(RealtimePeakSensor.name), RealtimePeakSensor.name, i+1);
-        char path[strlen(RealtimePeakSensor.path)];
-        snprintf(path, strlen(RealtimePeakSensor.path), RealtimePeakSensor.path, i);
-        HomeAssistantSensor sensor = {
-            name,
-            RealtimePeakSensor.topic,
-            path,
-            RealtimePeakSensor.ttl,
-            RealtimePeakSensor.uom,
-            RealtimePeakSensor.devcl,
-            RealtimePeakSensor.stacl,
-            RealtimePeakSensor.uid
-        };
-        publishSensor(sensor);
-    }
-    rtInit = true;
-}
-
-void HomeAssistantMqttHandler::publishRealtimeExportSensors(EnergyAccounting* ea, PriceService* ps) {
-    if(rteInit) return;
-    for(uint8_t i = 0; i < RealtimeExportSensorCount; i++) {
-        HomeAssistantSensor sensor = RealtimeExportSensors[i];
-        if(strncmp_P(sensor.devcl, PSTR("monetary"), 8) == 0) {
-            if(ps == NULL) continue;
-            sensor.uom = ps->getCurrency();
-        }
-        publishSensor(sensor);
-    }
-    rteInit = true;
-}
-
-void HomeAssistantMqttHandler::publishTemperatureSensor(uint8_t index, String id) {
-    if(index > 32) return;
-    if(tInit[index]) return;
-    char name[strlen(TemperatureSensor.name)+id.length()];
-    snprintf(name, strlen(TemperatureSensor.name)+id.length(), TemperatureSensor.name, id.c_str());
-
-    char path[strlen(TemperatureSensor.path)+id.length()];
-    if(index == 0) {
-        memcpy_P(path, PSTR("temp\0"), 5);
-    } else {
-        snprintf(path, strlen(TemperatureSensor.path)+id.length(), TemperatureSensor.path, id.c_str());
-    }
-    HomeAssistantSensor sensor = {
-        name,
-        index == 0 ? SystemSensors[0].topic : TemperatureSensor.topic,
-        path,
-        TemperatureSensor.ttl,
-        TemperatureSensor.uom,
-        TemperatureSensor.devcl,
-        TemperatureSensor.stacl,
-        TemperatureSensor.uid
-    };
-    publishSensor(sensor);
-    tInit[index] = true;
-}
-
-void HomeAssistantMqttHandler::publishPriceSensors(PriceService* ps) {
-    if(ps == NULL) return;
-    String uom = String(ps->getCurrency()) + "/kWh";
-
-    if(!pInit) {
-        for(uint8_t i = 0; i < PriceSensorCount; i++) {
-            HomeAssistantSensor sensor = PriceSensors[i];
-            if(strncmp_P(sensor.devcl, PSTR("monetary"), 8) == 0) {
-                sensor.uom = uom.c_str();
-            }
-            publishSensor(sensor);
-        }
-        pInit = 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++;
-        }
-    }
-
-    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++) {
-        publishSensor(SystemSensors[i]);
-    }
-    sInit = true;
-}
-
-void HomeAssistantMqttHandler::publishThresholdSensors() {
-    if(rInit) return;
-    for(uint8_t i = 0; i < 9; i++) {
-        char name[strlen(RealtimeThresholdSensor.name)+1];
-        snprintf(name, strlen(RealtimeThresholdSensor.name)+2, RealtimeThresholdSensor.name, i+1);
-        char path[strlen(RealtimeThresholdSensor.path)+1];
-        snprintf(path, strlen(RealtimeThresholdSensor.path)+1, RealtimeThresholdSensor.path, i);
-        HomeAssistantSensor sensor = {
-            name,
-            RealtimeThresholdSensor.topic,
-            path,
-            RealtimeThresholdSensor.ttl,
-            RealtimeThresholdSensor.uom,
-            RealtimeThresholdSensor.devcl,
-            RealtimeThresholdSensor.stacl,
-            RealtimeThresholdSensor.uid
-        };
-        publishSensor(sensor);
-    }
-    rInit = true;
-}
-
-uint8_t HomeAssistantMqttHandler::getFormat() {
-    return 4;
-}
-
-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() {
-    if(!fInit) {
-        snprintf_P(json, BufferSize, PSTR("{\"name\":\"%sFirmware\",\"stat_t\":\"%s/firmware\",\"uniq_id\":\"%s_fwupgrade\",\"dev_cla\":\"firmware\",\"cmd_t\":\"%s\",\"pl_inst\":\"fwupgrade\"}"),
-            sensorNamePrefix.c_str(),
-            pubTopic.c_str(),
-            deviceUid.c_str(),
-            subTopic.c_str()
-        );
-        fInit = mqtt.publish(updateTopic + "/" + deviceUid + "/config", json, true, 0);
-        loop();
-        return fInit;
-    }
-    snprintf_P(json, BufferSize, PSTR("{\"installed_version\":\"%s\",\"latest_version\":\"%s\",\"title\":\"amsreader firmware\",\"release_url\":\"https://github.com/UtilitechAS/amsreader-firmware/releases\",\"release_summary\":\"New version %s is available\",\"update_percentage\":%s}"),
-        FirmwareVersion::VersionString,
-        strlen(updater->getNextVersion()) == 0 ? FirmwareVersion::VersionString : updater->getNextVersion(),
-        strlen(updater->getNextVersion()) == 0 ? FirmwareVersion::VersionString : updater->getNextVersion(),
-        updater->getProgress() < 0 ? "null" : String(updater->getProgress(), 0)
-    );
-    bool ret = mqtt.publish(pubTopic + "/firmware", json);
-    loop();
-    return ret;
-}
-
-void HomeAssistantMqttHandler::onMessage(String &topic, String &payload) {
-    if(topic.equals(statusTopic)) {
-        if(payload.equals("online")) {
- 			#if defined(AMS_REMOTE_DEBUG)
-            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 = fInit = dInit = false;
-            for(uint8_t i = 0; i < 32; i++) tInit[i] = false;
-            priceImportInit = 0;
-            priceExportInit = 0;
-        }
-    } else if(topic.equals(subTopic)) {
-        if(payload.equals("fwupgrade")) {
-            if(strcmp(updater->getNextVersion(), FirmwareVersion::VersionString) != 0) {
-                updater->setTargetVersion(updater->getNextVersion());
-            }
-        }
-    }
-}

lib/JsonMqttHandler/include/JsonMqttHandler.h

@@ -1,46 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _JSONMQTTHANDLER_H
-#define _JSONMQTTHANDLER_H
-
-#include "AmsMqttHandler.h"
-
-class JsonMqttHandler : public AmsMqttHandler {
-public:
-    #if defined(AMS_REMOTE_DEBUG)
-    JsonMqttHandler(MqttConfig& mqttConfig, RemoteDebug* debugger, char* buf, HwTools* hw, AmsDataStorage* ds, AmsFirmwareUpdater* updater) : AmsMqttHandler(mqttConfig, debugger, buf, updater) {
-    #else
-    JsonMqttHandler(MqttConfig& mqttConfig, Stream* debugger, char* buf, HwTools* hw, AmsDataStorage* ds, AmsFirmwareUpdater* updater) : AmsMqttHandler(mqttConfig, debugger, buf, updater) {
-    #endif
-        this->hw = hw;
-        this->ds = ds;
-    };
-    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, PriceService* ps);
-    bool publishTemperatures(AmsConfiguration*, HwTools*);
-    bool publishPrices(PriceService*);
-    bool publishSystem(HwTools* hw, PriceService* ps, EnergyAccounting* ea);
-    bool publishRaw(uint8_t* raw, size_t length);
-    bool publishFirmware();
-
-    void onMessage(String &topic, String &payload);
-
-    uint8_t getFormat();
-
-private:
-    HwTools* hw;
-    bool hasExport = false;
-    AmsDataStorage* ds;
-
-    uint16_t appendJsonHeader(AmsData* data);
-    uint16_t appendJsonFooter(EnergyAccounting* ea, uint16_t pos);
-    bool publishList1(AmsData* data, EnergyAccounting* ea);
-    bool publishList2(AmsData* data, EnergyAccounting* ea);
-    bool publishList3(AmsData* data, EnergyAccounting* ea);
-    bool publishList4(AmsData* data, EnergyAccounting* ea);
-    String getMeterModel(AmsData* data);
-};
-#endif

lib/JsonMqttHandler/src/JsonMqttHandler.cpp

@@ -1,537 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#include "JsonMqttHandler.h"
-#include "FirmwareVersion.h"
-#include "hexutils.h"
-#include "Uptime.h"
-#include "AmsJsonGenerator.h"
-
-bool JsonMqttHandler::publish(AmsData* update, AmsData* previousState, EnergyAccounting* ea, PriceService* ps) {
-    if(strlen(mqttConfig.publishTopic) == 0) {
-        return false;
-    }
-	if(!connected()) {
-		return false;
-    }
-
-    bool ret = false;
-    memset(json, 0, BufferSize);
-
-    AmsData data;
-    if(mqttConfig.stateUpdate) {
-        uint64_t now = millis64();
-        if(now-lastStateUpdate < mqttConfig.stateUpdateInterval * 1000) return false;
-        data.apply(*previousState);
-        data.apply(*update);
-        lastStateUpdate = now;
-    } else {
-        data = *update;
-    }
-
-    if(data.getListType() == 1) {
-        ret = publishList1(&data, ea);
-        mqtt.loop();
-    } else if(data.getListType() == 2) {
-        ret = publishList2(&data, ea);
-        mqtt.loop();
-    } else if(data.getListType() == 3) {
-        ret = publishList3(&data, ea);
-        mqtt.loop();
-    } else if(data.getListType() == 4) {
-        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;
-}
-
-uint16_t JsonMqttHandler::appendJsonHeader(AmsData* data) {
-    return snprintf_P(json, BufferSize, PSTR("{\"id\":\"%s\",\"name\":\"%s\",\"up\":%u,\"t\":%lu,\"vcc\":%.3f,\"rssi\":%d,\"temp\":%.2f,"),
-        WiFi.macAddress().c_str(),
-        mqttConfig.clientId,
-        (uint32_t) (millis64()/1000),
-        data->getPackageTimestamp(),
-        hw->getVcc(),
-        hw->getWifiRssi(),
-        hw->getTemperature()
-    );
-}
-
-uint16_t JsonMqttHandler::appendJsonFooter(EnergyAccounting* ea, uint16_t pos) {
-    char pf[4];
-    if(mqttConfig.payloadFormat == 6) {
-        strcpy_P(pf, PSTR("rt_"));
-    } else {
-        memset(pf, 0, 4);
-    }
-
-    String peaks = "";
-    uint8_t peakCount = ea->getConfig()->hours;
-    if(peakCount > 5) peakCount = 5;
-    for(uint8_t i = 1; i <= peakCount; i++) {
-        if(!peaks.isEmpty()) peaks += ",";
-        peaks += String(ea->getPeak(i).value / 100.0, 2);
-    }
-    
-    return snprintf_P(json+pos, BufferSize-pos, PSTR("%s\"%sh\":%.3f,\"%sd\":%.2f,\"%sm\":%.1f,\"%st\":%d,\"%sx\":%.2f,\"%she\":%.3f,\"%sde\":%.2f,\"%sme\":%.1f,\"peaks\":[%s]%s"),
-        strlen(pf) == 0 ? "},\"realtime\":{" : ",",
-        pf,
-        ea->getUseThisHour(),
-        pf,
-        ea->getUseToday(),
-        pf,
-        ea->getUseThisMonth(),
-        pf,
-        ea->getCurrentThreshold(),
-        pf,
-        ea->getMonthMax(),
-        pf,
-        ea->getProducedThisHour(),
-        pf,
-        ea->getProducedToday(),
-        pf,
-        ea->getProducedThisMonth(),
-        peaks.c_str(),
-        strlen(pf) == 0 ? "}" : ""
-    );
-}
-
-bool JsonMqttHandler::publishList1(AmsData* data, EnergyAccounting* ea) {
-    uint16_t pos = appendJsonHeader(data);
-    if(mqttConfig.payloadFormat != 6) {
-        pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"data\":{"));
-    }
-    pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"P\":%d"), data->getActiveImportPower());
-    pos += appendJsonFooter(ea, pos);
-    json[pos++] = '}';
-    json[pos] = '\0';
-    if(mqttConfig.payloadFormat == 5) {
-        char topic[192];
-        snprintf_P(topic, 192, PSTR("%s/list1"), mqttConfig.publishTopic);
-        return mqtt.publish(topic, json);
-    } else {
-        return mqtt.publish(mqttConfig.publishTopic, json);
-    }
-}
-
-bool JsonMqttHandler::publishList2(AmsData* data, EnergyAccounting* ea) {
-    uint16_t pos = appendJsonHeader(data);
-    if(mqttConfig.payloadFormat != 6) {
-        pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"data\":{"));
-    }
-    pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"lv\":\"%s\",\"meterId\":\"%s\",\"type\":\"%s\",\"P\":%d,\"Q\":%d,\"PO\":%d,\"QO\":%d,\"I1\":%.2f,\"I2\":%.2f,\"I3\":%.2f,\"U1\":%.2f,\"U2\":%.2f,\"U3\":%.2f"),
-        data->getListId().c_str(),
-        data->getMeterId().c_str(),
-        getMeterModel(data).c_str(),
-        data->getActiveImportPower(),
-        data->getReactiveImportPower(),
-        data->getActiveExportPower(),
-        data->getReactiveExportPower(),
-        data->getL1Current(),
-        data->getL2Current(),
-        data->getL3Current(),
-        data->getL1Voltage(),
-        data->getL2Voltage(),
-        data->getL3Voltage()
-    );
-    pos += appendJsonFooter(ea, pos);
-    json[pos++] = '}';
-    json[pos] = '\0';
-    if(mqttConfig.payloadFormat == 5) {
-        char topic[192];
-        snprintf_P(topic, 192, PSTR("%s/list2"), mqttConfig.publishTopic);
-        return mqtt.publish(topic, json);
-    } else {
-        return mqtt.publish(mqttConfig.publishTopic, json);
-    }
-}
-
-bool JsonMqttHandler::publishList3(AmsData* data, EnergyAccounting* ea) {
-    uint16_t pos = appendJsonHeader(data);
-    if(mqttConfig.payloadFormat != 6) {
-        pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"data\":{"));
-    }
-    pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"lv\":\"%s\",\"meterId\":\"%s\",\"type\":\"%s\",\"P\":%d,\"Q\":%d,\"PO\":%d,\"QO\":%d,\"I1\":%.2f,\"I2\":%.2f,\"I3\":%.2f,\"U1\":%.2f,\"U2\":%.2f,\"U3\":%.2f,\"tPI\":%.3f,\"tPO\":%.3f,\"tQI\":%.3f,\"tQO\":%.3f,\"rtc\":%lu"),
-        data->getListId().c_str(),
-        data->getMeterId().c_str(),
-        getMeterModel(data).c_str(),
-        data->getActiveImportPower(),
-        data->getReactiveImportPower(),
-        data->getActiveExportPower(),
-        data->getReactiveExportPower(),
-        data->getL1Current(),
-        data->getL2Current(),
-        data->getL3Current(),
-        data->getL1Voltage(),
-        data->getL2Voltage(),
-        data->getL3Voltage(),
-        data->getActiveImportCounter(),
-        data->getActiveExportCounter(),
-        data->getReactiveImportCounter(),
-        data->getReactiveExportCounter(),
-        data->getMeterTimestamp()
-    );
-    pos += appendJsonFooter(ea, pos);
-    json[pos++] = '}';
-    json[pos] = '\0';
-    if(mqttConfig.payloadFormat == 5) {
-        char topic[192];
-        snprintf_P(topic, 192, PSTR("%s/list3"), mqttConfig.publishTopic);
-        return mqtt.publish(topic, json);
-    } else {
-        return mqtt.publish(mqttConfig.publishTopic, json);
-    }
-}
-
-bool JsonMqttHandler::publishList4(AmsData* data, EnergyAccounting* ea) {
-    uint16_t pos = appendJsonHeader(data);
-    if(mqttConfig.payloadFormat != 6) {
-        pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"data\":{"));
-    }
-    pos += snprintf_P(json+pos, BufferSize-pos, PSTR("\"lv\":\"%s\",\"meterId\":\"%s\",\"type\":\"%s\",\"P\":%d,\"P1\":%d,\"P2\":%d,\"P3\":%d,\"Q\":%d,\"PO\":%d,\"PO1\":%d,\"PO2\":%d,\"PO3\":%d,\"QO\":%d,\"I1\":%.2f,\"I2\":%.2f,\"I3\":%.2f,\"U1\":%.2f,\"U2\":%.2f,\"U3\":%.2f,\"PF\":%.2f,\"PF1\":%.2f,\"PF2\":%.2f,\"PF3\":%.2f,\"tPI\":%.3f,\"tPO\":%.3f,\"tQI\":%.3f,\"tQO\":%.3f,\"tPI1\":%.3f,\"tPI2\":%.3f,\"tPI3\":%.3f,\"tPO1\":%.3f,\"tPO2\":%.3f,\"tPO3\":%.3f,\"rtc\":%lu"),
-        data->getListId().c_str(),
-        data->getMeterId().c_str(),
-        getMeterModel(data).c_str(),
-        data->getActiveImportPower(),
-        data->getL1ActiveImportPower(),
-        data->getL2ActiveImportPower(),
-        data->getL3ActiveImportPower(),
-        data->getReactiveImportPower(),
-        data->getActiveExportPower(),
-        data->getL1ActiveExportPower(),
-        data->getL2ActiveExportPower(),
-        data->getL3ActiveExportPower(),
-        data->getReactiveExportPower(),
-        data->getL1Current(),
-        data->getL2Current(),
-        data->getL3Current(),
-        data->getL1Voltage(),
-        data->getL2Voltage(),
-        data->getL3Voltage(),
-        data->getPowerFactor(),
-        data->getL1PowerFactor(),
-        data->getL2PowerFactor(),
-        data->getL3PowerFactor(),
-        data->getActiveImportCounter(),
-        data->getActiveExportCounter(),
-        data->getReactiveImportCounter(),
-        data->getReactiveExportCounter(),
-        data->getL1ActiveImportCounter(),
-        data->getL2ActiveImportCounter(),
-        data->getL3ActiveImportCounter(),
-        data->getL1ActiveExportCounter(),
-        data->getL2ActiveExportCounter(),
-        data->getL3ActiveExportCounter(),
-        data->getMeterTimestamp()
-    );
-    pos += appendJsonFooter(ea, pos);
-    json[pos++] = '}';
-    json[pos] = '\0';
-    if(mqttConfig.payloadFormat == 5) {
-        char topic[192];
-        snprintf_P(topic, 192, PSTR("%s/list4"), mqttConfig.publishTopic);
-        return mqtt.publish(topic, json);
-    } else {
-        return mqtt.publish(mqttConfig.publishTopic, json);
-    }
-}
-
-String JsonMqttHandler::getMeterModel(AmsData* data) {
-    String meterModel = data->getMeterModel();
-    meterModel.replace("\\", "\\\\");
-    return meterModel;
-}
-
-bool JsonMqttHandler::publishTemperatures(AmsConfiguration* config, HwTools* hw) {
-	int count = hw->getTempSensorCount();
-    if(count < 2) {
-        return false;
-    }
-
-	uint16_t pos = 0;
-    if(mqttConfig.payloadFormat == 6) {
-        json[pos++] = '{';
-    } else {
-        pos = snprintf_P(json, 24, PSTR("{\"temperatures\":{"));
-    }
-	for(int i = 0; i < count; i++) {
-		TempSensorData* data = hw->getTempSensorData(i);
-        if(data != NULL) {
-            pos += snprintf_P(json+pos, 26, PSTR("\"%s\":%.2f,"), 
-                toHex(data->address, 8).c_str(),
-                data->lastRead
-            );
-            data->changed = false;
-        }
-	}
-    bool ret = false;
-    json[pos-1] = '}';
-    if(mqttConfig.payloadFormat != 6) {
-        json[pos++] = '}';
-        json[pos] = '\0';
-    }
-    if(mqttConfig.payloadFormat == 5) {
-        char topic[192];
-        snprintf_P(topic, 192, PSTR("%s/temperatures"), mqttConfig.publishTopic);
-        ret = mqtt.publish(topic, json);
-    } else {
-        ret = mqtt.publish(mqttConfig.publishTopic, json);
-    }
-    loop();
-    return ret;
-}
-
-bool JsonMqttHandler::publishPrices(PriceService* ps) {
-	if(strlen(mqttConfig.publishTopic) == 0 || !connected())
-		return false;
-	if(!ps->hasPrice())
-		return false;
-
-	time_t now = time(nullptr);
-
-	float min1hr = 0.0, min3hr = 0.0, min6hr = 0.0;
-	int8_t min1hrIdx = -1, min3hrIdx = -1, min6hrIdx = -1;
-	float min = INT16_MAX, max = INT16_MIN;
-	float values[38];
-    for(int i = 0;i < 38; i++) values[i] = PRICE_NO_VALUE;
-	for(uint8_t i = 0; i < 38; i++) {
-		float val = ps->getPriceForRelativeHour(PRICE_DIRECTION_IMPORT, i);
-		values[i] = val;
-
-		if(val == PRICE_NO_VALUE) break;
-		
-		if(val < min) min = val;
-		if(val > max) max = val;
-
-		if(min1hrIdx == -1 || min1hr > val) {
-			min1hr = val;
-			min1hrIdx = i;
-		}
-
-		if(i >= 2) {
-			i -= 2;
-			float val1 = values[i++];
-			float val2 = values[i++];
-			float val3 = val;
-			if(val1 == PRICE_NO_VALUE || val2 == PRICE_NO_VALUE || val3 == PRICE_NO_VALUE) continue;
-			float val3hr = val1+val2+val3;
-			if(min3hrIdx == -1 || min3hr > val3hr) {
-				min3hr = val3hr;
-				min3hrIdx = i-2;
-			}
-		}
-
-		if(i >= 5) {
-			i -= 5;
-			float val1 = values[i++];
-			float val2 = values[i++];
-			float val3 = values[i++];
-			float val4 = values[i++];
-			float val5 = values[i++];
-			float val6 = val;
-			if(val1 == PRICE_NO_VALUE || val2 == PRICE_NO_VALUE || val3 == PRICE_NO_VALUE || val4 == PRICE_NO_VALUE || val5 == PRICE_NO_VALUE || val6 == PRICE_NO_VALUE) continue;
-			float val6hr = val1+val2+val3+val4+val5+val6;
-			if(min6hrIdx == -1 || min6hr > val6hr) {
-				min6hr = val6hr;
-				min6hrIdx = i-5;
-			}
-		}
-
-	}
-
-	char ts1hr[24];
-    memset(ts1hr, 0, 24);
-	if(min1hrIdx > -1) {
-        time_t ts = now + (SECS_PER_HOUR * min1hrIdx);
-		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);
-	}
-	char ts3hr[24];
-    memset(ts3hr, 0, 24);
-	if(min3hrIdx > -1) {
-        time_t ts = now + (SECS_PER_HOUR * min3hrIdx);
-		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);
-	}
-	char ts6hr[24];
-    memset(ts6hr, 0, 24);
-	if(min6hrIdx > -1) {
-        time_t ts = now + (SECS_PER_HOUR * min6hrIdx);
-		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);
-	}
-
-    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("\"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("\"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) {
-        char topic[192];
-        snprintf_P(topic, 192, PSTR("%s/prices"), mqttConfig.publishTopic);
-        ret = mqtt.publish(topic, json);
-    } else {
-        ret = mqtt.publish(mqttConfig.publishTopic, json);
-    }
-    loop();
-    return ret;
-}
-
-bool JsonMqttHandler::publishSystem(HwTools* hw, PriceService* ps, EnergyAccounting* ea) {
-	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\"}"),
-        WiFi.macAddress().c_str(),
-        mqttConfig.clientId,
-        (uint32_t) (millis64()/1000),
-        hw->getVcc(),
-        hw->getWifiRssi(),
-        hw->getTemperature(),
-        FirmwareVersion::VersionString
-    );
-    bool ret = false;
-    if(mqttConfig.payloadFormat == 5) {
-        char topic[192];
-        snprintf_P(topic, 192, PSTR("%s/system"), mqttConfig.publishTopic);
-        ret = mqtt.publish(topic, json);
-    } else {
-        ret = mqtt.publish(mqttConfig.publishTopic, json);
-    }
-    loop();
-    return ret;
-}
-
-uint8_t JsonMqttHandler::getFormat() {
-    return 0;
-}
-
-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() {
-    snprintf_P(json, BufferSize, PSTR("{\"installed_version\":\"%s\",\"latest_version\":\"%s\",\"title\":\"amsreader firmware\",\"release_url\":\"https://github.com/UtilitechAS/amsreader-firmware/releases\",\"release_summary\":\"New version %s is available\",\"update_percentage\":%s}"),
-        FirmwareVersion::VersionString,
-        strlen(updater->getNextVersion()) == 0 ? FirmwareVersion::VersionString : updater->getNextVersion(),
-        strlen(updater->getNextVersion()) == 0 ? FirmwareVersion::VersionString : updater->getNextVersion(),
-        updater->getProgress() < 0 ? "null" : String(updater->getProgress(), 0)
-    );
-    char topic[192];
-    snprintf_P(topic, 192, PSTR("%s/firmware"), mqttConfig.publishTopic);
-    bool ret = mqtt.publish(topic, json);
-    loop();
-    return ret;
-}
-
-void JsonMqttHandler::onMessage(String &topic, String &payload) {
-    if(strlen(mqttConfig.publishTopic) == 0 || !connected())
-		return;
-
-    #if defined(AMS_REMOTE_DEBUG)
-    if (debugger->isActive(RemoteDebug::INFO))
-    #endif
-    debugger->printf_P(PSTR("Received command [%s] to [%s]\n"), payload.c_str(), topic.c_str());
-
-    if(topic.equals(subTopic)) {
-        #if defined(AMS_REMOTE_DEBUG)
-        if (debugger->isActive(RemoteDebug::DEBUG))
-        #endif
-        debugger->printf_P(PSTR(" - this is our subscribed topic\n"));
-        if(payload.equals("fwupgrade")) {
-            if(strcmp(updater->getNextVersion(), FirmwareVersion::VersionString) != 0) {
-                updater->setTargetVersion(updater->getNextVersion());
-            }
-        } else if(payload.equals("dayplot")) {
-            char pubTopic[192];
-            snprintf_P(pubTopic, 192, PSTR("%s/dayplot"), mqttConfig.publishTopic);
-            AmsJsonGenerator::generateDayPlotJson(ds, json, BufferSize);
-            bool ret = mqtt.publish(pubTopic, json);
-            loop();
-        } else if(payload.equals("monthplot")) {
-            char pubTopic[192];
-            snprintf_P(pubTopic, 192, PSTR("%s/monthplot"), mqttConfig.publishTopic);
-            AmsJsonGenerator::generateMonthPlotJson(ds, json, BufferSize);
-            bool ret = mqtt.publish(pubTopic, json);
-            loop();
-        }
-    }
-}

lib/MeterCommunicators/include/ImpulseAmsData.h

@@ -1,18 +0,0 @@
-/**
- * @copyright Utilitech AS 2023
- * License: Fair Source
- * 
- */
-
-#ifndef _IMPULSEAMSDATA_H
-#define _IMPULSEAMSDATA_H
-
-#include "AmsData.h"
-
-class ImpulseAmsData : public AmsData {
-public:
-    ImpulseAmsData(AmsData &state, uint16_t pulsePerKwh, uint8_t pulses);
-    ImpulseAmsData(double activeImportCounter);
-};
-
-#endif

lib/MeterCommunicators/include/KmpCommunicator.h

@@ -1,39 +0,0 @@
-/**
- * @copyright Utilitech AS 2024
- * License: Fair Source
- * 
- */
-
-#pragma once
-
-#include "PassiveMeterCommunicator.h"
-#if defined(AMS_REMOTE_DEBUG)
-#include "RemoteDebug.h"
-#endif
-#include "AmsConfiguration.h"
-#include "Timezone.h"
-#include "ImpulseAmsData.h"
-
-#if defined(ESP8266)
-#include "SoftwareSerial.h"
-#endif
-
-#include "KmpTalker.h"
-
-class KmpCommunicator : public PassiveMeterCommunicator  {
-public:
-    #if defined(AMS_REMOTE_DEBUG)
-    KmpCommunicator(RemoteDebug* debugger) : PassiveMeterCommunicator(debugger) {};
-    #else
-    KmpCommunicator(Stream* debugger) : PassiveMeterCommunicator(debugger) {};
-    #endif
-    void configure(MeterConfig&);
-    bool loop();
-    AmsData* getData(AmsData& meterState);
-    int getLastError();
-    void getCurrentConfig(MeterConfig& meterConfig) {
-        meterConfig = this->meterConfig;
-    }
-private:
-    KmpTalker* talker = NULL;
-};