Improved on automatic clearing of graph

Speedup build

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/workflows/build.yml

@@ -8,6 +8,7 @@ on:
       - scripts/**
       - web/**
       - platformio.ini
+      - .github/workflows/**
     branches:
       - '*'
     tags:
@@ -22,6 +23,12 @@ jobs:
     steps:
     - name: Check out code from repo
       uses: actions/checkout@v1
+
+    - 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
+
     - name: Cache Python dependencies
       uses: actions/cache@v1
       with:
@@ -40,6 +47,18 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -U platformio css_html_js_minify
+    - name: Set up node
+      uses: actions/setup-node@v1
+      with:
+        node-version: '16.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 lib install
     - name: PlatformIO run

.github/workflows/release.yml

@@ -23,6 +23,12 @@ jobs:
       env:
         GITHUB_REF: ${{ github.ref }}
       run: echo "GITHUB_TAG=$(echo ${GITHUB_REF##*/})" >> $GITHUB_ENV
+
+    - 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
+
     - name: Cache Python dependencies
       uses: actions/cache@v1
       with:
@@ -41,12 +47,23 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -U platformio css_html_js_minify
+
+    - name: Set up node
+      uses: actions/setup-node@v1
+      with:
+        node-version: '16.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: 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
@@ -58,6 +75,19 @@ jobs:
         draft: false
         prerelease: false
 
+    - name: Build esp8266 firmware
+      run: pio run -e esp8266
+    - name: Create esp8266 zip file
+      run: /bin/sh scripts/esp8266/mkzip.sh
+    - 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 esp8266 zip to release
       uses: actions/upload-release-asset@v1
       env:
@@ -67,6 +97,20 @@ jobs:
         asset_path: esp8266.zip
         asset_name: ams2mqtt-esp8266-${{ steps.release_tag.outputs.tag }}.zip
         asset_content_type: application/zip
+
+    - name: Build esp32 firmware
+      run: pio run -e esp32
+    - name: Create esp32 zip file
+      run: /bin/sh scripts/esp32/mkzip.sh
+    - 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 esp32 zip to release
       uses: actions/upload-release-asset@v1
       env:
@@ -76,6 +120,20 @@ jobs:
         asset_path: esp32.zip
         asset_name: ams2mqtt-esp32-${{ steps.release_tag.outputs.tag }}.zip
         asset_content_type: application/zip
+
+    - name: Build esp32s2 firmware
+      run: pio run -e esp32s2
+    - name: Create esp32s2 zip file
+      run: /bin/sh scripts/esp32s2/mkzip.sh
+    - 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
     - name: Upload esp32s2 zip to release
       uses: actions/upload-release-asset@v1
       env:
@@ -86,24 +144,10 @@ jobs:
         asset_name: ams2mqtt-esp32s2-${{ steps.release_tag.outputs.tag }}.zip
         asset_content_type: application/zip
 
-    - 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: Build esp32solo firmware
+      run: pio run -e esp32solo
+    - name: Create esp32solo zip file
+      run: /bin/sh scripts/esp32solo/mkzip.sh
     - name: Upload esp32solo binary to release
       uses: actions/upload-release-asset@v1
       env:
@@ -113,12 +157,35 @@ jobs:
         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
+    - name: Upload esp32solo 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: .pio/build/esp32s2/firmware.bin
-        asset_name: ams2mqtt-esp32s2-${{ steps.release_tag.outputs.tag }}.bin
+        asset_path: esp32solo.zip
+        asset_name: ams2mqtt-esp32solo-${{ steps.release_tag.outputs.tag }}.zip
+        asset_content_type: application/zip
+
+    - name: Build esp32c3 firmware
+      run: pio run -e esp32c3
+    - name: Create esp32c3 zip file
+      run: /bin/sh scripts/esp32c3/mkzip.sh
+    - name: Upload esp32c3 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/esp32c3/firmware.bin
+        asset_name: ams2mqtt-esp32c3-${{ steps.release_tag.outputs.tag }}.bin
         asset_content_type: application/octet-stream
+    - name: Upload esp32c3 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: esp32c3.zip
+        asset_name: ams2mqtt-esp32c3-${{ steps.release_tag.outputs.tag }}.zip
+        asset_content_type: application/zip

.gitignore

@@ -7,7 +7,7 @@
 .vscode
 .pio
 platformio-user.ini
-/src/version.h
+/lib/FirmwareVersion/src/generated_version.h
 /src/web/root
 /src/AmsToMqttBridge.ino.cpp
 /test
@@ -15,3 +15,6 @@ platformio-user.ini
 /sdkconfig
 /.tmp
 /*.zip
+node_modules
+/gui/dist
+/scripts/*dev

README.md

@@ -1,12 +1,12 @@
-# AMS MQTT Bridge
+# AMS Reader
 This code is designed to decode data from electric smart meters installed in many countries in Europe these days. The data is presented in a graphical web interface and can also send the data to a MQTT broker which makes it suitable for home automation project. Originally it was only designed to work with Norwegian meters, but has since been adapter to read any IEC-62056-7-5 or IEC-62056-21 compliant meters.
 
-Later development have added Energy usage graph for both day and month, as well as future energy price (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/).
+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, have a look at the shop at [amsleser.no](https://amsleser.no/).
 
 
-<img src="webui.png">
+<img src="images/dashboard.png">
 
-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).
+Go to the [WiKi](https://github.com/UtilitechAS/amsreader-firmware/wiki) for information on how to get your own device! And find the latest prebuilt firmware file at the [release section](https://github.com/UtilitechAS/amsreader-firmware/releases).
 
 ## Building this project with PlatformIO
 To build this project, you need [PlatformIO](https://platformio.org/) installed.

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/lng2.raw

@@ -0,0 +1,33 @@
+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

hardware/README.md

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

hardware/v1/kicad/HAN_ESP_TSS721.kicad_prl

@@ -0,0 +1,76 @@
+{
+  "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

@@ -0,0 +1,440 @@
+{
+  "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

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

hardware/wemos_mbus_shield/kicad/d1_mini_shield-rescue.dcm

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

hardware/wemos_mbus_shield/kicad/d1_mini_shield-rescue.lib

@@ -1,6 +1,21 @@
 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
@@ -35,4 +50,23 @@ 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

@@ -0,0 +1,75 @@
+{
+  "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

@@ -0,0 +1,356 @@
+{
+  "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

@@ -4,12 +4,15 @@
 #include "Arduino.h"
 
 #define EEPROM_SIZE 1024*3
-#define EEPROM_CHECK_SUM 96 // Used to check if config is stored. Change if structure changes
+#define EEPROM_CHECK_SUM 103 // Used to check if config is stored. Change if structure changes
+#define EEPROM_CLEARED_INDICATOR 0xFC
 #define EEPROM_CONFIG_ADDRESS 0
 #define EEPROM_TEMP_CONFIG_ADDRESS 2048
 
 #define CONFIG_SYSTEM_START 8
 #define CONFIG_METER_START 32
+#define CONFIG_UPGRADE_INFO_START 216
+#define CONFIG_UI_START 248
 #define CONFIG_GPIO_START 266
 #define CONFIG_ENTSOE_START 290
 #define CONFIG_WIFI_START 360
@@ -19,29 +22,18 @@
 #define CONFIG_DOMOTICZ_START 856 
 #define CONFIG_NTP_START 872
 #define CONFIG_MQTT_START 1004
+#define CONFIG_HA_START 1680
 
-#define CONFIG_MQTT_START_86 224
-#define CONFIG_METER_START_87 784
-#define CONFIG_ENTSOE_START_90 286
-#define CONFIG_WIFI_START_91 16
 #define CONFIG_METER_START_93 224
 
 
 struct SystemConfig {
 	uint8_t boardType;
-}; // 1
-
-struct WiFiConfig91 {
-	char ssid[32];
-	char psk[64];
-    char ip[15];
-    char gateway[15];
-    char subnet[15];
-	char dns1[15];
-	char dns2[15];
-	char hostname[32];
-	bool mdns;
-}; // 204 
+	bool vendorConfigured;
+	bool userConfigured;
+	uint8_t dataCollectionConsent; // 0 = unknown, 1 = accepted, 2 = declined
+	char country[3];
+}; // 7
 
 struct WiFiConfig {
 	char ssid[32];
@@ -55,19 +47,9 @@ struct WiFiConfig {
 	bool mdns;
 	uint8_t power;
 	uint8_t sleep;
-}; // 211
-
-struct MqttConfig86 {
-	char host[128];
-	uint16_t port;
-	char clientId[32];
-	char publishTopic[64];
-	char subscribeTopic[64];
-	char username[64];
-	char password[64];
-	uint8_t payloadFormat;
-	bool ssl;
-}; // 420
+	uint8_t mode;
+	bool autoreboot;
+}; // 213
 
 struct MqttConfig {
 	char host[128];
@@ -88,6 +70,23 @@ struct WebConfig {
 }; // 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;
+}; // 61
+
+struct MeterConfig100 {
 	uint32_t baud;
 	uint8_t parity;
 	bool invert;
@@ -102,7 +101,7 @@ struct MeterConfig {
 	uint32_t accumulatedMultiplier;
 	uint8_t source;
 	uint8_t parser;
-}; // 50
+}; // 59
 
 struct MeterConfig95 {
 	uint32_t baud;
@@ -121,16 +120,6 @@ struct MeterConfig95 {
 	uint8_t parser;
 }; // 50
 
-struct MeterConfig87 {
-	uint8_t type;
-	uint8_t distributionSystem;
-	uint8_t mainFuse;
-	uint8_t productionCapacity;
-	uint8_t encryptionKey[16];
-	uint8_t authenticationKey[16];
-	bool substituteMissing;
-}; // 37
-
 struct DebugConfig {
 	bool telnet;
 	bool serial;
@@ -154,7 +143,8 @@ struct GpioConfig {
 	uint8_t vccBootLimit;
 	uint16_t vccResistorGnd;
 	uint16_t vccResistorVcc;
-}; // 20
+	bool hanPinPullup;
+}; // 21
 
 struct DomoticzConfig {
 	uint16_t elidx;
@@ -164,7 +154,20 @@ struct DomoticzConfig {
 	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 NtpConfig96 {
 	bool enable;
 	bool dhcp;
 	int16_t offset;
@@ -177,19 +180,47 @@ struct EntsoeConfig {
 	char area[17];
 	char currency[4];
 	uint32_t multiplier;
-}; // 62
+	bool enabled;
+	uint16_t fixedPrice;
+}; // 64
 
 struct EnergyAccountingConfig {
+	uint16_t thresholds[10];
+	uint8_t hours;
+}; // 21
+
+struct EnergyAccountingConfig101 {
 	uint8_t thresholds[10];
 	uint8_t hours;
 }; // 11
 
+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;
+}; // 11
+
 struct TempSensorConfig {
 	uint8_t address[8];
 	char name[16];
 	bool common;
 };
 
+struct UpgradeInformation {
+	char fromVersion[8];
+	char toVersion[8];
+	int16_t exitCode;
+	int16_t errorCode;
+}; // 20
+
 class AmsConfiguration {
 public:
 	bool hasConfig();
@@ -221,6 +252,7 @@ public:
 	bool getMeterConfig(MeterConfig&);
 	bool setMeterConfig(MeterConfig&);
 	void clearMeter(MeterConfig&);
+	void setMeterChanged();
 	bool isMeterChanged();
 	void ackMeterChanged();
 
@@ -239,8 +271,10 @@ public:
 	bool getDomoticzConfig(DomoticzConfig&);
 	bool setDomoticzConfig(DomoticzConfig&);
 	void clearDomo(DomoticzConfig&);
-	bool isDomoChanged();
-	void ackDomoChange();
+
+	bool getHomeAssistantConfig(HomeAssistantConfig&);
+	bool setHomeAssistantConfig(HomeAssistantConfig&);
+	void clearHomeAssistantConfig(HomeAssistantConfig&);
 	
 	bool getNtpConfig(NtpConfig&);
 	bool setNtpConfig(NtpConfig&);
@@ -260,6 +294,10 @@ public:
 	bool isEnergyAccountingChanged();
 	void ackEnergyAccountingChange();
 
+	bool getUiConfig(UiConfig&);
+	bool setUiConfig(UiConfig&);
+	void clearUiConfig(UiConfig&);
+
 	void loadTempSensors();
 	void saveTempSensors();
 	uint8_t getTempSensorCount();
@@ -268,6 +306,10 @@ public:
 
     bool isSensorAddressEqual(uint8_t a[8], uint8_t b[8]);
 
+	bool getUpgradeInformation(UpgradeInformation&);
+	bool setUpgradeInformation(int16_t exitCode, int16_t errorCode, const char* currentVersion, const char* nextVersion);
+	void clearUpgradeInformation(UpgradeInformation&);
+
 	void clear();
 
 protected:
@@ -275,22 +317,22 @@ protected:
 private:
 	uint8_t configVersion = 0;
 
-	bool wifiChanged, mqttChanged, meterChanged = true, domoChanged, ntpChanged = true, entsoeChanged = false, energyAccountingChanged = true;
+	bool wifiChanged, mqttChanged, meterChanged = true, ntpChanged = true, entsoeChanged = false, energyAccountingChanged = true;
 
 	uint8_t tempSensorCount = 0;
 	TempSensorConfig** tempSensors = NULL;
 
-	bool relocateConfig86(); // 1.5.0
-	bool relocateConfig87(); // 1.5.4
-	bool relocateConfig90(); // 2.0.0
-	bool relocateConfig91(); // 2.0.2
-	bool relocateConfig92(); // 2.0.3
 	bool relocateConfig93(); // 2.1.0
-	bool relocateConfig94(); // 2.1.4
-	bool relocateConfig95(); // 2.1.13
+	bool relocateConfig94(); // 2.1.0
+	bool relocateConfig95(); // 2.1.4
+	bool relocateConfig96(); // 2.1.14
+	bool relocateConfig100(); // 2.2-dev
+	bool relocateConfig101(); // 2.2.0 through 2.2.8
+	bool relocateConfig102(); // 2.2.9 through 2.2.11
 
 	void saveToFs();
 	bool loadFromFs(uint8_t version);
 	void deleteFromFs(uint8_t version);
 };
 #endif
+

lib/AmsConfiguration/include/Timezones.h

@@ -0,0 +1,86 @@
+#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

@@ -7,5 +7,6 @@
 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);
 
 #endif

lib/AmsConfiguration/src/hexutils.cpp

@@ -0,0 +1,42 @@
+#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 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)) {
+			memset(in+i, ' ', 1);
+			ret = true;
+		} else if(!extended && (in[i] < 32 || in[i] > 126)) {
+			memset(in+i, ' ', 1);
+			ret = true;
+		}
+	}
+	memset(in+size-1, 0, 1); // Make sure the last character is null-terminator
+	return ret;
+}

lib/AmsData/include/AmsData.h

@@ -10,9 +10,8 @@ enum AmsType {
     AmsTypeKaifa = 0x02,
     AmsTypeKamstrup = 0x03,
     AmsTypeIskra = 0x08,
-    AmsTypeLandis = 0x09,
+    AmsTypeLandisGyr = 0x09,
     AmsTypeSagemcom = 0x0A,
-    AmsTypeLng = 0x0B,
     AmsTypeCustom = 0x88,
     AmsTypeUnknown = 0xFF
 };
@@ -36,10 +35,10 @@ public:
 
     time_t getMeterTimestamp();
 
-    uint16_t getActiveImportPower();
-    uint16_t getReactiveImportPower();
-    uint16_t getActiveExportPower();
-    uint16_t getReactiveExportPower();
+    uint32_t getActiveImportPower();
+    uint32_t getReactiveImportPower();
+    uint32_t getActiveExportPower();
+    uint32_t getReactiveExportPower();
 
     float getL1Voltage();
     float getL2Voltage();
@@ -70,20 +69,26 @@ public:
     bool isThreePhase();
     bool isTwoPhase();
 
+    int8_t getLastError();
+    void setLastError(int8_t);
+
 protected:
     unsigned long lastUpdateMillis = 0;
     unsigned long lastList2 = 0;
     uint8_t listType = 0, meterType = AmsTypeUnknown;
     time_t packageTimestamp = 0;
-    String listId, meterId, meterModel;
+    String listId = "", meterId = "", meterModel = "";
     time_t meterTimestamp = 0;
-    uint16_t activeImportPower = 0, reactiveImportPower = 0, activeExportPower = 0, reactiveExportPower = 0;
+    uint32_t activeImportPower = 0, reactiveImportPower = 0, activeExportPower = 0, reactiveExportPower = 0;
     float l1voltage = 0, l2voltage = 0, l3voltage = 0, l1current = 0, l2current = 0, l3current = 0;
     float l1activeImportPower = 0, l2activeImportPower = 0, l3activeImportPower = 0;
     float l1activeExportPower = 0, l2activeExportPower = 0, l3activeExportPower = 0;
     float powerFactor = 0, l1PowerFactor = 0, l2PowerFactor = 0, l3PowerFactor = 0;
     double activeImportCounter = 0, reactiveImportCounter = 0, activeExportCounter = 0, reactiveExportCounter = 0;
     bool threePhase = false, twoPhase = false, counterEstimated = false;
+
+    int8_t lastError = 0x00;
+    uint8_t lastErrorCount = 0;
 };
 
 #endif

lib/AmsData/include/AmsMqttHandler.h

@@ -7,7 +7,11 @@
 #include "AmsConfiguration.h"
 #include "EnergyAccounting.h"
 #include "HwTools.h"
-#include "entsoe/EntsoeApi.h"
+#include "EntsoeApi.h"
+
+#if defined(ESP32)
+#include <esp_task_wdt.h>
+#endif
 
 class AmsMqttHandler {
 public:
@@ -17,7 +21,7 @@ public:
     };
     virtual ~AmsMqttHandler() {};
 
-    virtual bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
+    virtual bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, EntsoeApi* eapi);
     virtual bool publishTemperatures(AmsConfiguration*, HwTools*);
     virtual bool publishPrices(EntsoeApi* eapi);
     virtual bool publishSystem(HwTools*, EntsoeApi*, EnergyAccounting*);
@@ -25,7 +29,9 @@ public:
 protected:
     MQTTClient* mqtt;
     char* json;
-    uint16_t BufferSize = 1024;
+    uint16_t BufferSize = 2048;
+
+    bool loop();
 };
 
 #endif

lib/AmsData/src/AmsData.cpp

@@ -64,7 +64,6 @@ void AmsData::apply(AmsData& other) {
             this->meterType = other.getMeterType();
             this->meterModel = other.getMeterModel();
             this->reactiveImportPower = other.getReactiveImportPower();
-            this->activeExportPower = other.getActiveExportPower();
             this->reactiveExportPower = other.getReactiveExportPower();
             this->l1current = other.getL1Current();
             this->l2current = other.getL2Current();
@@ -74,9 +73,13 @@ void AmsData::apply(AmsData& other) {
             this->l3voltage = other.getL3Voltage();
             this->threePhase = other.isThreePhase();
             this->twoPhase = other.isTwoPhase();
-        case 1:
-            this->activeImportPower = other.getActiveImportPower();
     }
+
+    // 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();
 }
 
 unsigned long AmsData::getLastUpdateMillis() {
@@ -111,19 +114,19 @@ time_t AmsData::getMeterTimestamp() {
     return this->meterTimestamp;
 }
 
-uint16_t AmsData::getActiveImportPower() {
+uint32_t AmsData::getActiveImportPower() {
     return this->activeImportPower;
 }
 
-uint16_t AmsData::getReactiveImportPower() {
+uint32_t AmsData::getReactiveImportPower() {
     return this->reactiveImportPower;
 }
 
-uint16_t AmsData::getActiveExportPower() {
+uint32_t AmsData::getActiveExportPower() {
     return this->activeExportPower;
 }
 
-uint16_t AmsData::getReactiveExportPower() {
+uint32_t AmsData::getReactiveExportPower() {
     return this->reactiveExportPower;
 }
 
@@ -214,3 +217,16 @@ bool AmsData::isThreePhase() {
 bool AmsData::isTwoPhase() {
     return this->twoPhase;
 }
+
+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

@@ -12,7 +12,8 @@ struct DayDataPoints {
     uint32_t activeImport;
     uint32_t activeExport;
     uint16_t hExport[24];
-}; // 112 bytes
+    uint8_t accuracy;
+}; // 113 bytes
 
 struct MonthDataPoints {
     uint8_t version;
@@ -21,17 +22,18 @@ struct MonthDataPoints {
     uint32_t activeImport;
     uint32_t activeExport;
     uint16_t dExport[31];
-}; // 141 bytes
+    uint8_t accuracy;
+}; // 142 bytes
 
 class AmsDataStorage {
 public:
     AmsDataStorage(RemoteDebug*);
     void setTimezone(Timezone*);
     bool update(AmsData*);
-    int32_t getHourImport(uint8_t);
-    int32_t getHourExport(uint8_t);
-    int32_t getDayImport(uint8_t);
-    int32_t getDayExport(uint8_t);
+    uint32_t getHourImport(uint8_t);
+    uint32_t getHourExport(uint8_t);
+    uint32_t getDayImport(uint8_t);
+    uint32_t getDayExport(uint8_t);
     bool load();
     bool save();
 
@@ -40,6 +42,11 @@ public:
     MonthDataPoints getMonthData();
     bool setMonthData(MonthDataPoints&);
 
+    uint8_t getDayAccuracy();
+    void setDayAccuracy(uint8_t);
+    uint8_t getMonthAccuracy();
+    void setMonthAccuracy(uint8_t);
+
     bool isHappy();
     bool isDayHappy();
     bool isMonthHappy();
@@ -50,19 +57,21 @@ private:
         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, 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
+        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
     };
     RemoteDebug* debugger;
-    void setHourImport(uint8_t, int32_t);
-    void setHourExport(uint8_t, int32_t);
-    void setDayImport(uint8_t, int32_t);
-    void setDayExport(uint8_t, int32_t);
+    void setHourImport(uint8_t, uint32_t);
+    void setHourExport(uint8_t, uint32_t);
+    void setDayImport(uint8_t, uint32_t);
+    void setDayExport(uint8_t, uint32_t);
 };
 
 #endif

lib/AmsDataStorage/src/AmsDataStorage.cpp

@@ -0,0 +1,625 @@
+#include "AmsDataStorage.h"
+#include <lwip/apps/sntp.h>
+#include "LittleFS.h"
+#include "AmsStorage.h"
+#include "FirmwareVersion.h"
+
+AmsDataStorage::AmsDataStorage(RemoteDebug* debugger) {
+    day.version = 5;
+    day.accuracy = 1;
+    month.version = 6;
+    month.accuracy = 1;
+    this->debugger = debugger;
+}
+
+void AmsDataStorage::setTimezone(Timezone* tz) {
+    this->tz = tz;
+}
+
+bool AmsDataStorage::update(AmsData* data) {
+    if(isHappy()) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(AmsDataStorage) Data is up to date\n"));
+        return false;
+    }
+
+    time_t now = time(nullptr);
+    if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(AmsDataStorage) Time is: %lu\n"), (int32_t) now);
+    if(tz == NULL) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(AmsDataStorage) Timezone is missing\n"));
+        return false;
+    }
+    if(now < FirmwareVersion::BuildEpoch) {
+        if(data->getMeterTimestamp() > FirmwareVersion::BuildEpoch) {
+            now = data->getMeterTimestamp();
+            if(debugger->isActive(RemoteDebug::DEBUG)) {
+                debugger->printf_P(PSTR("(AmsDataStorage) Using meter timestamp, which is: %lu\n"), (int32_t) now);
+            }
+        } else if(data->getPackageTimestamp() > FirmwareVersion::BuildEpoch) {
+            now = data->getPackageTimestamp();
+            if(debugger->isActive(RemoteDebug::DEBUG)) {
+                debugger->printf_P(PSTR("(AmsDataStorage) Using package timestamp, which is: %lu\n"), (int32_t) now);
+            }
+        }
+    }
+    if(now < FirmwareVersion::BuildEpoch) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) {
+            debugger->printf_P(PSTR("(AmsDataStorage) Invalid time: %lu\n"), (int32_t) now);
+        }
+        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);
+
+    uint32_t importCounter = data->getActiveImportCounter() * 1000;
+    uint32_t exportCounter = data->getActiveExportCounter() * 1000;
+
+    // Clear hours between last update and now
+    if(day.lastMeterReadTime > now) {
+        if(debugger->isActive(RemoteDebug::WARNING)) {
+            debugger->printf_P(PSTR("(AmsDataStorage) Invalid future timestamp for day plot, resetting\n"));
+        }
+        day.activeImport = importCounter;
+        day.activeExport = exportCounter;
+        day.lastMeterReadTime = now;
+        return true;
+    } else if(day.activeImport == 0 || now - day.lastMeterReadTime > 86400) {
+        day.activeImport = importCounter;
+        day.activeExport = exportCounter;
+        day.lastMeterReadTime = now;
+        if(debugger->isActive(RemoteDebug::WARNING)) {
+            debugger->printf_P(PSTR("(AmsDataStorage) Too long since last day update, clearing data\n"));
+        }
+        for(int i = 0; i<24; i++) {
+            setHourImport(i, 0);
+            setHourExport(i, 0);
+        }
+    } else {
+        if(debugger->isActive(RemoteDebug::DEBUG)) {
+            debugger->printf_P(PSTR("(AmsDataStorage) Last day update: %lu\n"), (int32_t) day.lastMeterReadTime);
+        }
+        tmElements_t last;
+        breakTime(day.lastMeterReadTime, last);
+        uint8_t endHour = utc.Hour;
+        if(last.Hour > utc.Hour){
+            for(int i = 0; i < utc.Hour; i++) {
+                if(debugger->isActive(RemoteDebug::VERBOSE)) {
+                    debugger->printf_P(PSTR("(AmsDataStorage) Clearing hour: %d\n"), i);
+                }
+                setHourImport(i, 0);
+                setHourExport(i, 0);
+            }
+            endHour = 24;
+        }
+        for(int i = last.Hour; i < endHour; i++) {
+            if(debugger->isActive(RemoteDebug::VERBOSE)) {
+                debugger->printf_P(PSTR("(AmsDataStorage) Clearing hour: %d\n"), i);
+            }
+            setHourImport(i, 0);
+            setHourExport(i, 0);
+        }
+    }
+
+    // Clear days between last update and now
+    if(month.lastMeterReadTime > now) {
+        if(debugger->isActive(RemoteDebug::WARNING)) {
+            debugger->printf_P(PSTR("(AmsDataStorage) Invalid future timestamp for month plot, resetting\n"));
+        }
+        month.activeImport = importCounter;
+        month.activeExport = exportCounter;
+        month.lastMeterReadTime = now;
+    } else if(month.activeImport == 0 || now - month.lastMeterReadTime > 2682000) {
+        month.activeImport = importCounter;
+        month.activeExport = exportCounter;
+        month.lastMeterReadTime = now;
+        if(debugger->isActive(RemoteDebug::WARNING)) {
+            debugger->printf_P(PSTR("(AmsDataStorage) Too long since last month update, clearing data\n"));
+        }
+        for(int i = 1; i<=31; i++) {
+            setDayImport(i, 0);
+            setDayExport(i, 0);
+        }
+    } else {
+        if(debugger->isActive(RemoteDebug::DEBUG)) {
+            debugger->printf_P(PSTR("(AmsDataStorage) Last month update: %lu\n"), (int32_t) month.lastMeterReadTime);
+        }
+        tmElements_t last;
+        breakTime(tz->toLocal(month.lastMeterReadTime), last);
+        uint8_t endDay = ltz.Day;
+        if(last.Day > ltz.Day) {
+            for(int i = 1; i < ltz.Day; i++) {
+                if(debugger->isActive(RemoteDebug::VERBOSE)) {
+                    debugger->printf_P(PSTR("(AmsDataStorage) Clearing day: %d\n"), i);
+                }
+                setDayImport(i, 0);
+                setDayExport(i, 0);
+            }
+            endDay = 31;
+        }
+        for(int i = last.Day; i < endDay; i++) {
+            if(debugger->isActive(RemoteDebug::VERBOSE)) {
+                debugger->printf_P(PSTR("(AmsDataStorage) Clearing day: %d\n"), i);
+            }
+            setDayImport(i, 0);
+            setDayExport(i, 0);
+        }
+    }
+
+    if(data->getListType() < 3) {
+        debugger->printf_P(PSTR("(AmsDataStorage) Not enough data in list type: %d\n"), data->getListType());
+        return false;
+    }
+
+    bool ret = false;
+
+    // Update day plot
+    if(!isDayHappy()) {
+        if(day.activeImport > importCounter || day.activeExport > exportCounter) {
+            day.activeImport = importCounter;
+            day.activeExport = exportCounter;
+            day.lastMeterReadTime = now;
+            setHourImport(utcYesterday.Hour, 0);
+            setHourExport(utcYesterday.Hour, 0);
+        } else if(now - day.lastMeterReadTime < 4000) {
+            uint32_t imp = importCounter - day.activeImport;
+            uint32_t exp = exportCounter - day.activeExport;
+            setHourImport(utcYesterday.Hour, imp);
+            setHourExport(utcYesterday.Hour, exp);
+
+            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(AmsDataStorage) Usage for hour %d: %d - %d\n"), ltzYesterDay.Hour, imp, exp);
+            day.activeImport = importCounter;
+            day.activeExport = exportCounter;
+            day.lastMeterReadTime = now;
+        } else {
+            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;
+
+            if(debugger->isActive(RemoteDebug::DEBUG)) {
+                debugger->printf_P(PSTR("(AmsDataStorage) Since last day update, minutes: %.1f, import: %d (%.2f/min), export: %d (%.2f/min)\n"), mins, im, ipm, ex, epm);
+            }
+
+            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);
+
+                if(debugger->isActive(RemoteDebug::INFO)) {
+                    debugger->printf_P(PSTR("(AmsDataStorage) Estimated usage for hour %u: %.1f - %.1f (%lu)\n"), last.Hour, imp, exp, (int32_t) cur);
+                }
+
+                day.activeImport += imp;
+                day.activeExport += exp;
+                day.lastMeterReadTime = cur;
+            }
+        }
+        ret = true;
+    }
+
+    // Update month plot
+    if(ltz.Hour == 0 && !isMonthHappy()) {
+        if(month.activeImport > importCounter || month.activeExport > exportCounter) {
+            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)
+            int32_t imp = importCounter - month.activeImport;
+            int32_t exp = exportCounter - month.activeExport;
+
+            if(debugger->isActive(RemoteDebug::INFO)) {
+                debugger->printf_P(PSTR("(AmsDataStorage) Usage for day %d: %d - %d\n"), ltzYesterDay.Day, imp, exp);
+            }
+
+            setDayImport(ltzYesterDay.Day, imp);
+            setDayExport(ltzYesterDay.Day, exp);
+            month.activeImport = importCounter;
+            month.activeExport = exportCounter;
+            month.lastMeterReadTime = now;
+        } else {
+            // 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;
+            if(debugger->isActive(RemoteDebug::DEBUG)) {
+                debugger->printf_P(PSTR("(AmsDataStorage) Last month read after resetting to midnight: %lu\n"), (int32_t) month.lastMeterReadTime);
+            }
+
+            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;
+
+            if(debugger->isActive(RemoteDebug::DEBUG)) {
+                debugger->printf_P(PSTR("(AmsDataStorage) Since last month update, hours: %.1f, import: %d (%.2f/hr), export: %d (%.2f/hr)\n"), hrs, im, iph, ex, eph);
+            }
+
+            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);
+
+                if(debugger->isActive(RemoteDebug::INFO)) {
+                    debugger->printf_P(PSTR("(AmsDataStorage) Estimated usage for day %u: %.1f - %.1f (%lu)\n"), last.Day, imp, exp, (int32_t) cur);
+                }
+
+                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()) {
+        if(debugger->isActive(RemoteDebug::ERROR)) {
+            debugger->printf_P(PSTR("(AmsDataStorage) Unable to load LittleFS\n"));
+        }
+        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());
+        DayDataPoints* day = (DayDataPoints*) buf;
+        file.close();
+        ret = setDayData(*day);
+    }
+
+    if(LittleFS.exists(FILE_MONTHPLOT)) {
+        File file = LittleFS.open(FILE_MONTHPLOT, "r");
+        char buf[file.size()];
+        file.readBytes(buf, file.size());
+        MonthDataPoints* month = (MonthDataPoints*) buf;
+        file.close();
+        ret = ret && setMonthData(*month);
+    }
+
+    return ret;
+}
+
+bool AmsDataStorage::save() {
+    if(!LittleFS.begin()) {
+        if(debugger->isActive(RemoteDebug::ERROR)) {
+            debugger->printf_P(PSTR("(AmsDataStorage) Unable to load LittleFS\n"));
+        }
+        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) {
+        this->day = day;
+        return true;
+    } else if(day.version == 4) {
+        this->day = day;
+        this->day.accuracy = 1;
+        this->day.version = 5;
+        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 = 5;
+        return true;
+    }
+    return false;
+}
+
+bool AmsDataStorage::setMonthData(MonthDataPoints& month) {
+    if(month.version == 6) {
+        this->month = month;
+        return true;
+    } else if(month.version == 5) {
+        this->month = month;
+        this->month.accuracy = 1;
+        this->month.version = 6;
+        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 = 6;
+        return true;
+    }
+    return false;
+}
+
+uint8_t AmsDataStorage::getDayAccuracy() {
+    return day.accuracy;
+}
+
+void AmsDataStorage::setDayAccuracy(uint8_t accuracy) {
+    if(day.accuracy != accuracy) {
+        uint16_t 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) {
+        uint16_t 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() {
+    return isDayHappy() && isMonthHappy();
+}
+
+bool AmsDataStorage::isDayHappy() {
+    time_t now = time(nullptr);
+    if(now < FirmwareVersion::BuildEpoch) return false;
+    tmElements_t tm, last;
+
+    if(now < day.lastMeterReadTime) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(AmsDataStorage) Day data timestamp %lu < %lu\n"), (int32_t) now, (int32_t) day.lastMeterReadTime);
+        return false;
+    }
+    breakTime(tz->toLocal(now), tm);
+    breakTime(tz->toLocal(day.lastMeterReadTime), last);
+    if(now-day.lastMeterReadTime > 3600) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(AmsDataStorage) Day data timestamp age %lu - %lu > 3600\n"), (int32_t) now, (int32_t) day.lastMeterReadTime);
+        return false;
+    }
+    if(tm.Hour > last.Hour) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(AmsDataStorage) Day data hour of last timestamp %d > %d\n"), tm.Hour, last.Hour);
+        return false;
+    }
+
+    return true;
+}
+
+bool AmsDataStorage::isMonthHappy() {
+    if(tz == NULL) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(AmsDataStorage) Timezone is missing\n"));
+        return false;
+    }
+
+    time_t now = time(nullptr);
+    if(now < FirmwareVersion::BuildEpoch) return false;
+    tmElements_t tm, last;
+    
+    if(now < month.lastMeterReadTime) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(AmsDataStorage) Month data timestamp %lu < %lu\n"), (int32_t) now, (int32_t) month.lastMeterReadTime);
+        return false;
+    }
+
+    breakTime(tz->toLocal(now), tm);
+    breakTime(tz->toLocal(month.lastMeterReadTime), last);
+    if(tm.Day != last.Day) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(AmsDataStorage) Month data day of last timestamp %d > %d\n"), tm.Day, last.Day);
+        return false;
+    }
+
+    if(now-month.lastMeterReadTime > 90100) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Month %lu - %lu > 3600\n", (int32_t) now, (int32_t) month.lastMeterReadTime);
+        return false;
+    }
+
+    return true;
+}

lib/AmsDecoder/include/crc.h

@@ -4,6 +4,7 @@
 #include "Arduino.h"
 #include <stdint.h>
 
+uint16_t crc16(const uint8_t* p, int len);
 uint16_t crc16_x25(const uint8_t* p, int len);
 
 #endif

lib/AmsDecoder/src/DsmrParser.cpp

@@ -1,4 +1,7 @@
 #include "DsmrParser.h"
+#include "crc.h"
+#include "hexutils.h"
+#include "lwip/def.h"
 
 int8_t DSMRParser::parse(uint8_t *buf, DataParserContext &ctx, bool verified) {
     uint16_t crcPos = 0;
@@ -14,8 +17,13 @@ int8_t DSMRParser::parse(uint8_t *buf, DataParserContext &ctx, bool verified) {
     if(!reachedEnd) return DATA_PARSE_INCOMPLETE;
     buf[ctx.length+1] = '\0';
     if(crcPos > 0) {
-        // TODO: CRC
-        Serial.printf("CRC: %s\n", buf+crcPos);
+	    uint16_t crc_calc = crc16(buf, crcPos);
+        uint16_t crc = 0x0000;
+        fromHex((uint8_t*) &crc, String((char*) buf+crcPos), 2);
+        crc = ntohs(crc);
+
+        if(crc != crc_calc)
+            return DATA_PARSE_FOOTER_CHECKSUM_ERROR;
     }
     return DATA_PARSE_OK;
 }

lib/AmsDecoder/src/GcmParser.cpp

@@ -44,6 +44,10 @@ int8_t GCMParser::parse(uint8_t *d, DataParserContext &ctx) {
 
         ptr += 3;
         headersize += 3;
+    } else {
+        len = *ptr;
+        ptr++;
+        headersize++;
     }
     if(len + headersize > ctx.length)
         return DATA_PARSE_INCOMPLETE;

lib/AmsDecoder/src/crc.cpp

@@ -10,3 +10,20 @@ uint16_t crc16_x25(const uint8_t* p, int len)
 
 	return (~crc << 8) | (~crc >> 8 & 0xff);
 }
+
+uint16_t crc16 (const uint8_t *p, int len) {
+    uint16_t crc = 0;
+
+    while (len--) {
+		int i;
+		crc ^= *p++;
+		for (i = 0 ; i < 8 ; ++i) {
+			if (crc & 1)
+				crc = (crc >> 1) ^ 0xa001;
+			else
+				crc = (crc >> 1);
+		}    			
+    }
+    
+    return crc;
+}

lib/CloudConnector/include/CloudConnector.h

@@ -0,0 +1,47 @@
+#ifndef _CLOUDCONNECTOR_H
+#define _CLOUDCONNECTOR_H
+
+#include "RemoteDebug.h"
+#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"
+
+
+const unsigned char PUBLIC_KEY[] = \
+"-----BEGIN PUBLIC KEY-----\n"\
+"MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDoIo0CSuuX3tAdF7KPssdlzJNX\n"\
+"QryhgVV1rQIFPhHv3SxzyKtRrRM9s0CVfymcibhnEBXxxg3pxlGmwI/R6k7HHXJN\n"\
+"lBsXzzDtZ/GHDVnw+xRakTfRT0Zt+xdJSH5xJNWq4EwpvJfjA22L1Nz4dKSpgWMx\n"\
+"VRndAaXf0s7Q1XBz2wIDAQAB\n"\
+"-----END PUBLIC KEY-----\0";
+
+
+//const unsigned char PUBLIC_KEY[] = { 0x30, 0x81, 0x9f, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x81, 0x8d, 0x00, 0x30, 0x81, 0x89, 0x02, 0x81, 0x81, 0x00, 0xe8, 0x22, 0x8d, 0x02, 0x4a, 0xeb, 0x97, 0xde, 0xd0, 0x1d, 0x17, 0xb2, 0x8f, 0xb2, 0xc7, 0x65, 0xcc, 0x93, 0x57, 0x42, 0xbc, 0xa1, 0x81, 0x55, 0x75, 0xad, 0x02, 0x05, 0x3e, 0x11, 0xef, 0xdd, 0x2c, 0x73, 0xc8, 0xab, 0x51, 0xad, 0x13, 0x3d, 0xb3, 0x40, 0x95, 0x7f, 0x29, 0x9c, 0x89, 0xb8, 0x67, 0x10, 0x15, 0xf1, 0xc6, 0x0d, 0xe9, 0xc6, 0x51, 0xa6, 0xc0, 0x8f, 0xd1, 0xea, 0x4e, 0xc7, 0x1d, 0x72, 0x4d, 0x94, 0x1b, 0x17, 0xcf, 0x30, 0xed, 0x67, 0xf1, 0x87, 0x0d, 0x59, 0xf0, 0xfb, 0x14, 0x5a, 0x91, 0x37, 0xd1, 0x4f, 0x46, 0x6d, 0xfb, 0x17, 0x49, 0x48, 0x7e, 0x71, 0x24, 0xd5, 0xaa, 0xe0, 0x4c, 0x29, 0xbc, 0x97, 0xe3, 0x03, 0x6d, 0x8b, 0xd4, 0xdc, 0xf8, 0x74, 0xa4, 0xa9, 0x81, 0x63, 0x31, 0x55, 0x19, 0xdd, 0x01, 0xa5, 0xdf, 0xd2, 0xce, 0xd0, 0xd5, 0x70, 0x73, 0xdb, 0x02, 0x03, 0x01, 0x00, 0x01};
+
+struct CloudData {
+    uint8_t type;
+	int16_t data;
+} __attribute__((packed));
+
+class CloudConnector {
+public:
+    CloudConnector(RemoteDebug*);
+    void setup(const unsigned char * key);
+    void send();
+
+private:
+    RemoteDebug* debugger;
+
+    unsigned char buf[4096];
+    mbedtls_rsa_context* rsa = nullptr;
+
+    void debugPrint(byte *buffer, int start, int length);
+
+};
+#endif

lib/CloudConnector/src/CloudConnector.cpp

@@ -0,0 +1,56 @@
+#include "CloudConnector.h"
+
+CloudConnector::CloudConnector(RemoteDebug* debugger) {
+    this->debugger = debugger;
+    mbedtls_pk_context pk;
+    mbedtls_pk_init(&pk);
+
+    int error_code = 0;
+    if((error_code =  mbedtls_pk_parse_public_key(&pk, PUBLIC_KEY, sizeof(PUBLIC_KEY))) == 0){
+        debugger->printf("RSA public key OK\n");
+        rsa = mbedtls_pk_rsa(pk);
+    } else {
+        debugger->printf("RSA public key read error: ");
+        mbedtls_strerror(error_code, (char*) buf, 4096);
+        debugger->printf("%s\n", buf);
+    }
+    debugger->flush();
+    //send();
+}
+
+void CloudConnector::send() {
+    if(rsa != nullptr && mbedtls_rsa_check_pubkey(rsa) == 0) {
+        memset(buf, 0, 4096);
+
+        CloudData data = {65, 127};
+        unsigned char toEncrypt[4096] = {0};
+
+        debugger->println("RSA clear data: ");
+        debugPrint(toEncrypt, 0, 256);
+
+        mbedtls_rsa_rsaes_pkcs1_v15_encrypt(rsa, NULL, NULL, MBEDTLS_RSA_PUBLIC, 256, toEncrypt, buf);
+
+        //byte hashResult[32];
+        //mbedtls_sha256(toEncrypt, strlen((char*) toEncrypt), hashResult, 0);
+        //int success = mbedtls_rsa_rsassa_pkcs1_v15_sign(rsa, NULL, NULL, MBEDTLS_RSA_PUBLIC, MBEDTLS_MD_SHA256,  strlen((char*) hashResult), hashResult, buf);
+        debugger->println("RSA encrypted data: ");
+        debugPrint(buf, 0, 256);
+    } else {
+        debugger->println("RSA key is invalid");
+    }
+}
+void CloudConnector::debugPrint(byte *buffer, int start, int length) {
+	for (int 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/DomoticzMqttHandler/include/.gitignore

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

lib/DomoticzMqttHandler/include/DomoticzMqttHandler.h

@@ -9,14 +9,14 @@ public:
     DomoticzMqttHandler(MQTTClient* mqtt, char* buf, DomoticzConfig config) : AmsMqttHandler(mqtt, buf) {
         this->config = config;
     };
-    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
+    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, EntsoeApi* eapi);
     bool publishTemperatures(AmsConfiguration*, HwTools*);
     bool publishPrices(EntsoeApi*);
     bool publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea);
 
 private:
     DomoticzConfig config;
-    int energy = 0.0;
+    double energy = 0.0;
 };
 
 #endif

lib/DomoticzMqttHandler/scripts/generate_includes.py

@@ -4,7 +4,7 @@ import shutil
 import subprocess
 
 try:
-    from css_html_js_minify import html_minify, js_minify, css_minify
+    from css_html_js_minify import js_minify
 except:
     from SCons.Script import (
         ARGUMENTS,
@@ -20,13 +20,13 @@ except:
         )
     )
     try:
-        from css_html_js_minify import html_minify, js_minify, css_minify
+        from css_html_js_minify import js_minify
     except:
         print("WARN: Unable to load minifier")
 
 
-webroot = "web"
-srcroot = "src/web/root"
+webroot = "lib/DomoticzMqttHandler/json"
+srcroot = "lib/DomoticzMqttHandler/include/json"
 
 version = os.environ.get('GITHUB_TAG')
 if version == None:
@@ -57,11 +57,7 @@ for filename in os.listdir(webroot):
         content = f.read().replace("${version}", version)
 
     try:    
-        if filename.endswith(".html"):
-            content = html_minify(content)
-        elif filename.endswith(".css"):
-            content = css_minify(content)
-        elif (filename.endswith(".js") and filename != 'gaugemeter.js') or filename.endswith(".json"):
+        if (filename.endswith(".js") and filename != 'gaugemeter.js') or filename.endswith(".json"):
             content = js_minify(content)
     except:
         print("WARN: Unable to minify")

lib/DomoticzMqttHandler/src/DomoticzMqttHandler.cpp

@@ -1,7 +1,7 @@
 #include "DomoticzMqttHandler.h"
-#include "web/root/domoticz_json.h"
+#include "json/domoticz_json.h"
 
-bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea) {
+bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, EntsoeApi* eapi) {
     bool ret = false;
     if (config.elidx > 0) {
         if(data->getActiveImportCounter() > 1.0) {
@@ -9,12 +9,12 @@ bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyA
         }
         if(energy > 0.0) {
             char val[16];
-            snprintf(val, 16, "%.1f;%.1f", (data->getActiveImportPower()/1.0), energy*1000.0);
+            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("domoticz/in", json);
+            ret = mqtt->publish(F("domoticz/in"), json);
         }
     }
 
@@ -23,22 +23,22 @@ bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyA
 
     if (config.vl1idx > 0){				
         char val[16];
-        snprintf(val, 16, "%.2f", data->getL1Voltage());
+        snprintf_P(val, 16, PSTR("%.2f"), data->getL1Voltage());
         snprintf_P(json, BufferSize, DOMOTICZ_JSON,
             config.vl1idx,
             val
         );
-        ret |= mqtt->publish("domoticz/in", json);
+        ret |= mqtt->publish(F("domoticz/in"), json);
     }
 
     if (config.vl2idx > 0){				
         char val[16];
-        snprintf(val, 16, "%.2f", data->getL2Voltage());
+        snprintf_P(val, 16, PSTR("%.2f"), data->getL2Voltage());
         snprintf_P(json, BufferSize, DOMOTICZ_JSON,
             config.vl2idx,
             val
         );
-        ret |= mqtt->publish("domoticz/in", json);
+        ret |= mqtt->publish(F("domoticz/in"), json);
     }
 
     if (config.vl3idx > 0){				
@@ -48,7 +48,7 @@ bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyA
             config.vl3idx,
             val
         );
-        ret |= mqtt->publish("domoticz/in", json);
+        ret |= mqtt->publish(F("domoticz/in"), json);
     }
 
     if (config.cl1idx > 0){				
@@ -58,7 +58,7 @@ bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyA
             config.cl1idx,
             val
         );
-        ret |= mqtt->publish("domoticz/in", json);
+        ret |= mqtt->publish(F("domoticz/in"), json);
     }			
     return ret;
 }

lib/EnergyAccounting/include/EnergyAccounting.h

@@ -4,7 +4,7 @@
 #include "Arduino.h"
 #include "AmsData.h"
 #include "AmsDataStorage.h"
-#include "entsoe/EntsoeApi.h"
+#include "EntsoeApi.h"
 
 struct EnergyAccountingPeak {
     uint8_t day;
@@ -12,6 +12,18 @@ struct EnergyAccountingPeak {
 };
 
 struct EnergyAccountingData {
+    uint8_t version;
+    uint8_t month;
+    uint16_t costYesterday;
+    uint16_t costThisMonth;
+    uint16_t costLastMonth;
+    uint16_t incomeYesterday;
+    uint16_t incomeThisMonth;
+    uint16_t incomeLastMonth;
+    EnergyAccountingPeak peaks[5];
+};
+
+struct EnergyAccountingData4 {
     uint8_t version;
     uint8_t month;
     uint16_t costYesterday;
@@ -40,28 +52,38 @@ public:
     bool update(AmsData* amsData);
     bool load();
     bool save();
+    bool isInitialized();
 
-    double getUseThisHour();
-    double getUseToday();
-    double getUseThisMonth();
+    float getUseThisHour();
+    float getUseToday();
+    float getUseThisMonth();
 
-    double getProducedThisHour();
-    double getProducedToday();
-    double getProducedThisMonth();
+    float getProducedThisHour();
+    float getProducedToday();
+    float getProducedThisMonth();
 
-    double getCostThisHour();
-    double getCostToday();
-    double getCostYesterday();
-    double getCostThisMonth();
+    float getCostThisHour();
+    float getCostToday();
+    float getCostYesterday();
+    float getCostThisMonth();
     uint16_t getCostLastMonth();
 
+    float getIncomeThisHour();
+    float getIncomeToday();
+    float getIncomeYesterday();
+    float getIncomeThisMonth();
+    uint16_t getIncomeLastMonth();
+
     float getMonthMax();
     uint8_t getCurrentThreshold();
-    float getPeak(uint8_t);
+    EnergyAccountingPeak getPeak(uint8_t);
 
     EnergyAccountingData getData();
     void setData(EnergyAccountingData&);
 
+    void setFixedPrice(float price, String currency);
+    float getPriceForHour(uint8_t h);
+
 private:
     RemoteDebug* debugger = NULL;
     unsigned long lastUpdateMillis = 0;
@@ -71,9 +93,11 @@ private:
     EnergyAccountingConfig *config = NULL;
     Timezone *tz = NULL;
     uint8_t currentHour = 0, currentDay = 0, currentThresholdIdx = 0;
-    double use, costHour, costDay;
-    double produce;
+    float use = 0, costHour = 0, costDay = 0;
+    float produce = 0, incomeHour = 0, incomeDay = 0;
     EnergyAccountingData data = { 0, 0, 0, 0, 0, 0 };
+    float fixedPrice = 0;
+    String currency = "";
 
     void calcDayCost();
     bool updateMax(uint16_t val, uint8_t day);

lib/EnergyAccounting/src/EnergyAccounting.cpp

@@ -1,7 +1,7 @@
 #include "EnergyAccounting.h"
 #include "LittleFS.h"
 #include "AmsStorage.h"
-#include "version.h"
+#include "FirmwareVersion.h"
 
 EnergyAccounting::EnergyAccounting(RemoteDebug* debugger) {
     data.version = 1;
@@ -26,12 +26,16 @@ 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 < BUILD_EPOCH) return false;
+    if(now < FirmwareVersion::BuildEpoch) return false;
     if(tz == NULL) {
-        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting) Timezone is missing\n");
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(EnergyAccounting) Timezone is missing\n"));
         return false;
     }
 
@@ -42,11 +46,12 @@ bool EnergyAccounting::update(AmsData* amsData) {
     if(!init) {
         currentHour = local.Hour;
         currentDay = local.Day;
-        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EnergyAccounting) Initializing data at %lld\n", (int64_t) now);
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(EnergyAccounting) Initializing data at %lu\n"), (int32_t) now);
         if(!load()) {
-            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EnergyAccounting) Unable to load existing data\n");
-            data = { 4, local.Month, 
-                0, 0, 0,
+            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(EnergyAccounting) Unable to load existing data\n"));
+            data = { 5, local.Month, 
+                0, 0, 0, // Cost
+                0, 0, 0, // Income
                 0, 0, // Peak 1
                 0, 0, // Peak 2
                 0, 0, // Peak 3
@@ -55,20 +60,22 @@ bool EnergyAccounting::update(AmsData* amsData) {
             };
         } else if(debugger->isActive(RemoteDebug::DEBUG)) {
             for(uint8_t i = 0; i < 5; i++) {
-                debugger->printf("(EnergyAccounting) Peak hour from day %d: %d\n", data.peaks[i].day, data.peaks[i].value*10);
+                debugger->printf_P(PSTR("(EnergyAccounting) Peak hour from day %d: %d\n"), data.peaks[i].day, data.peaks[i].value*10);
             }
-            debugger->printf("(EnergyAccounting) Loaded cost yesterday: %.2f, this month: %d, last month: %d\n", data.costYesterday / 10.0, data.costThisMonth, data.costLastMonth);
+            debugger->printf_P(PSTR("(EnergyAccounting) Loaded cost yesterday: %.2f, this month: %d, last month: %d\n"), data.costYesterday / 10.0, data.costThisMonth, data.costLastMonth);
+            debugger->printf_P(PSTR("(EnergyAccounting) Loaded income yesterday: %.2f, this month: %d, last month: %d\n"), data.incomeYesterday / 10.0, data.incomeThisMonth, data.incomeLastMonth);
         }
         init = true;
     }
 
-    if(!initPrice && eapi != NULL && eapi->getValueForHour(0) != ENTSOE_NO_VALUE) {
-        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EnergyAccounting) Initializing prices at %lld\n", (int64_t) now);
+    float price = getPriceForHour(0);
+    if(!initPrice && price != ENTSOE_NO_VALUE) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(EnergyAccounting) Initializing prices at %lu\n"), (int32_t) now);
         calcDayCost();
     }
 
     if(local.Hour != currentHour && (amsData->getListType() >= 3 || local.Minute == 1)) {
-        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EnergyAccounting) New local hour %d\n", local.Hour);
+        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(EnergyAccounting) New local hour %d\n"), local.Hour);
 
         tmElements_t oneHrAgo, oneHrAgoLocal;
         breakTime(now-3600, oneHrAgo);
@@ -85,21 +92,28 @@ bool EnergyAccounting::update(AmsData* amsData) {
         use = 0;
         produce = 0;
         costHour = 0;
-        currentHour = local.Hour;
+        incomeHour = 0;
 
         if(local.Day != currentDay) {
-            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EnergyAccounting) New day %d\n", local.Day);
+            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(EnergyAccounting) New day %d\n"), local.Day);
             data.costYesterday = costDay * 10;
             data.costThisMonth += costDay;
             costDay = 0;
+
+            data.incomeYesterday = incomeDay * 10;
+            data.incomeThisMonth += incomeDay;
+            incomeDay = 0;
+
             currentDay = local.Day;
             ret = true;
         }
 
         if(local.Month != data.month) {
-            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EnergyAccounting) New month %d\n", local.Month);
+            if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(EnergyAccounting) New month %d\n"), local.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 };
             }
@@ -114,25 +128,30 @@ bool EnergyAccounting::update(AmsData* amsData) {
     float kwhe = (amsData->getActiveExportPower() * (((float) ms) / 3600000.0)) / 1000.0;
     lastUpdateMillis = amsData->getLastUpdateMillis();
     if(kwhi > 0) {
-        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting) Adding %.4f kWh import\n", kwhi);
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(EnergyAccounting) Adding %.4f kWh import\n"), kwhi);
         use += kwhi;
-        if(eapi != NULL && eapi->getValueForHour(0) != ENTSOE_NO_VALUE) {
-            float price = eapi->getValueForHour(0);
+        if(price != ENTSOE_NO_VALUE) {
             float cost = price * kwhi;
-            if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting)  and %.4f %s\n", cost / 100.0, eapi->getCurrency());
+            if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(EnergyAccounting)  and %.4f %s\n"), cost / 100.0, currency.c_str());
             costHour += cost;
             costDay += cost;
         }
     }
     if(kwhe > 0) {
-        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting) Adding %.4f kWh export\n", kwhe);
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(EnergyAccounting) Adding %.4f kWh export\n"), kwhe);
         produce += kwhe;
+        if(price != ENTSOE_NO_VALUE) {
+            float income = price * kwhe;
+            if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(EnergyAccounting)  and %.4f %s\n"), income / 100.0, currency.c_str());
+            incomeHour += income;
+            incomeDay += income;
+        }
     }
 
     if(config != NULL) {
-        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting)  calculating threshold, currently at %d\n", currentThresholdIdx);
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(EnergyAccounting)  calculating threshold, currently at %d\n"), currentThresholdIdx);
         while(getMonthMax() > config->thresholds[currentThresholdIdx] && currentThresholdIdx < 10) currentThresholdIdx++;
-        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting)  new threshold %d\n", currentThresholdIdx);
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(EnergyAccounting)  new threshold %d\n"), currentThresholdIdx);
     }
 
     return ret;
@@ -143,86 +162,94 @@ void EnergyAccounting::calcDayCost() {
     tmElements_t local, utc;
     breakTime(tz->toLocal(now), local);
 
-    if(eapi != NULL && eapi->getValueForHour(0) != ENTSOE_NO_VALUE) {
-        if(initPrice) costDay = 0;
-        for(int i = 0; i < currentHour; i++) {
-            float price = eapi->getValueForHour(i - local.Hour);
+    if(getPriceForHour(0) != ENTSOE_NO_VALUE) {
+        if(initPrice) {
+            costDay = 0;
+            incomeDay = 0;
+        }
+        for(uint8_t i = 0; i < currentHour; i++) {
+            float price = getPriceForHour(i - local.Hour);
             if(price == ENTSOE_NO_VALUE) break;
             breakTime(now - ((local.Hour - i) * 3600), utc);
             int16_t wh = ds->getHourImport(utc.Hour);
             costDay += price * (wh / 1000.0);
+
+            wh = ds->getHourExport(utc.Hour);
+            incomeDay += price * (wh / 1000.0);
         }
         initPrice = true;
     }
 }
 
-double EnergyAccounting::getUseThisHour() {
+float EnergyAccounting::getUseThisHour() {
     return use;
 }
 
-double EnergyAccounting::getUseToday() {
+float EnergyAccounting::getUseToday() {
     float ret = 0.0;
     time_t now = time(nullptr);
-    if(now < BUILD_EPOCH) return 0;
+    if(now < FirmwareVersion::BuildEpoch) return 0.0;
+    if(tz == NULL) return 0.0;
     tmElements_t utc, local;
     breakTime(tz->toLocal(now), local);
-    for(int i = 0; i < currentHour; i++) {
+    for(uint8_t i = 0; i < currentHour; i++) {
         breakTime(now - ((local.Hour - i) * 3600), utc);
         ret += ds->getHourImport(utc.Hour) / 1000.0;
     }
     return ret + getUseThisHour();
 }
 
-double EnergyAccounting::getUseThisMonth() {
+float EnergyAccounting::getUseThisMonth() {
     time_t now = time(nullptr);
-    if(now < BUILD_EPOCH) return 0;
+    if(now < FirmwareVersion::BuildEpoch) return 0.0;
     float ret = 0;
-    for(int i = 0; i < currentDay; i++) {
+    for(uint8_t i = 0; i < currentDay; i++) {
         ret += ds->getDayImport(i) / 1000.0;
     }
     return ret + getUseToday();
 }
 
-double EnergyAccounting::getProducedThisHour() {
+float EnergyAccounting::getProducedThisHour() {
     return produce;
 }
 
-double EnergyAccounting::getProducedToday() {
+float EnergyAccounting::getProducedToday() {
     float ret = 0.0;
     time_t now = time(nullptr);
-    if(now < BUILD_EPOCH) return 0;
-    tmElements_t utc;
-    for(int i = 0; i < currentHour; i++) {
-        breakTime(now - ((currentHour - i) * 3600), utc);
+    if(now < FirmwareVersion::BuildEpoch) return 0.0;
+    tmElements_t utc, local;
+    breakTime(tz->toLocal(now), local);
+    for(uint8_t i = 0; i < currentHour; i++) {
+        breakTime(now - ((local.Hour - i) * 3600), utc);
         ret += ds->getHourExport(utc.Hour) / 1000.0;
     }
     return ret + getProducedThisHour();
 }
 
-double EnergyAccounting::getProducedThisMonth() {
+float EnergyAccounting::getProducedThisMonth() {
     time_t now = time(nullptr);
-    if(now < BUILD_EPOCH) return 0;
+    if(now < FirmwareVersion::BuildEpoch) return 0.0;
     float ret = 0;
-    for(int i = 0; i < currentDay; i++) {
+    for(uint8_t i = 0; i < currentDay; i++) {
         ret += ds->getDayExport(i) / 1000.0;
     }
     return ret + getProducedToday();
 }
 
 
-double EnergyAccounting::getCostThisHour() {
+float EnergyAccounting::getCostThisHour() {
     return costHour;
 }
 
-double EnergyAccounting::getCostToday() {
+float EnergyAccounting::getCostToday() {
     return costDay;
 }
 
-double EnergyAccounting::getCostYesterday() {
+float EnergyAccounting::getCostYesterday() {
     return data.costYesterday / 10.0;
 }
 
-double EnergyAccounting::getCostThisMonth() {
+float EnergyAccounting::getCostThisMonth() {
     return data.costThisMonth + getCostToday();
 }
 
@@ -230,6 +257,26 @@ uint16_t EnergyAccounting::getCostLastMonth() {
     return data.costLastMonth;
 }
 
+float EnergyAccounting::getIncomeThisHour() {
+    return incomeHour;
+}
+
+float EnergyAccounting::getIncomeToday() {
+    return incomeDay;
+}
+
+float EnergyAccounting::getIncomeYesterday() {
+    return data.incomeYesterday / 10.0;
+}
+
+float EnergyAccounting::getIncomeThisMonth() {
+    return data.incomeThisMonth + getIncomeToday();
+}
+
+uint16_t EnergyAccounting::getIncomeLastMonth() {
+    return data.incomeLastMonth;
+}
+
 uint8_t EnergyAccounting::getCurrentThreshold() {
     if(config == NULL)
         return 0;
@@ -237,6 +284,8 @@ uint8_t EnergyAccounting::getCurrentThreshold() {
 }
 
 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 };
@@ -265,8 +314,10 @@ float EnergyAccounting::getMonthMax() {
     return maxHour > 0 ? maxHour / count / 100.0 : 0.0;
 }
 
-float EnergyAccounting::getPeak(uint8_t num) {
-    if(num < 1 || num > 5) return 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 };
@@ -292,16 +343,16 @@ float EnergyAccounting::getPeak(uint8_t num) {
         if(!included[i]) continue;
         pos++;
         if(pos == num) {
-            return data.peaks[i].value / 100.0;
+            return data.peaks[i];
         }
     }
-    return 0.0;
+    return EnergyAccountingPeak({0,0});
 }
 
 bool EnergyAccounting::load() {
     if(!LittleFS.begin()) {
         if(debugger->isActive(RemoteDebug::ERROR)) {
-            debugger->printf("(EnergyAccounting) Unable to load LittleFS\n");
+            debugger->printf_P(PSTR("(EnergyAccounting) Unable to load LittleFS\n"));
         }
         return false;
     }
@@ -312,15 +363,30 @@ bool EnergyAccounting::load() {
         char buf[file.size()];
         file.readBytes(buf, file.size());
 
-        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EnergyAccounting) Data version %d\n", buf[0]);
-        if(buf[0] == 4) {
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(EnergyAccounting) Data version %d\n"), buf[0]);
+        if(buf[0] == 5) {
             EnergyAccountingData* data = (EnergyAccountingData*) buf;
             memcpy(&this->data, data, sizeof(this->data));
             ret = true;
+        } else if(buf[0] == 4) {
+            EnergyAccountingData4* data = (EnergyAccountingData4*) buf;
+            this->data = { 5, data->month, 
+                data->costYesterday,
+                data->costThisMonth,
+                data->costLastMonth,
+                0,0,0, // Income from production
+                data->peaks[0].day, data->peaks[0].value,
+                data->peaks[1].day, data->peaks[1].value,
+                data->peaks[2].day, data->peaks[2].value,
+                data->peaks[3].day, data->peaks[3].value,
+                data->peaks[4].day, data->peaks[4].value
+            };
+            ret = true;
         } else if(buf[0] == 3) {
             EnergyAccountingData* data = (EnergyAccountingData*) buf;
-            this->data = { 4, data->month, 
+            this->data = { 5, data->month, 
                 (uint16_t) (data->costYesterday / 10), (uint16_t) (data->costThisMonth / 100), (uint16_t) (data->costLastMonth / 100),
+                0,0,0, // Income from production
                 data->peaks[0].day, data->peaks[0].value,
                 data->peaks[1].day, data->peaks[1].value,
                 data->peaks[2].day, data->peaks[2].value,
@@ -329,8 +395,9 @@ bool EnergyAccounting::load() {
             };
             ret = true;
         } else {
-            data = { 4, 0, 
-                0, 0, 0,
+            data = { 5, 0, 
+                0, 0, 0, // Cost
+                0,0,0, // Income from production
                 0, 0, // Peak 1
                 0, 0, // Peak 2
                 0, 0, // Peak 3
@@ -361,25 +428,23 @@ bool EnergyAccounting::load() {
                 this->data.peaks[0].value = data->maxHour;
                 ret = true;
             } else {
-                if(debugger->isActive(RemoteDebug::WARNING)) debugger->printf("(EnergyAccounting) Unknown version\n");
+                if(debugger->isActive(RemoteDebug::WARNING)) debugger->printf_P(PSTR("(EnergyAccounting) Unknown version\n"));
                 ret = false;
             }
         }
 
         file.close();
     } else {
-        if(debugger->isActive(RemoteDebug::WARNING)) debugger->printf("(EnergyAccounting) File not found\n");
+        if(debugger->isActive(RemoteDebug::WARNING)) debugger->printf_P(PSTR("(EnergyAccounting) File not found\n"));
     }
 
-    LittleFS.end();
-
     return ret;
 }
 
 bool EnergyAccounting::save() {
     if(!LittleFS.begin()) {
         if(debugger->isActive(RemoteDebug::ERROR)) {
-            debugger->printf("(EnergyAccounting) Unable to load LittleFS\n");
+            debugger->printf_P(PSTR("(EnergyAccounting) Unable to load LittleFS\n"));
         }
         return false;
     }
@@ -392,8 +457,6 @@ bool EnergyAccounting::save() {
         }
         file.close();
     }
-
-    LittleFS.end();
     return true;
 }
 
@@ -409,7 +472,7 @@ bool EnergyAccounting::updateMax(uint16_t val, uint8_t day) {
     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) {
-                if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EnergyAccounting) Adding new max %d for day %d which is larger than %d\n", val*10, day, data.peaks[i].value*10);
+                if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(EnergyAccounting) Adding new max %d for day %d which is larger than %d\n"), val*10, day, data.peaks[i].value*10);
                 data.peaks[i].day = day;
                 data.peaks[i].value = val;
                 return true;
@@ -428,10 +491,21 @@ bool EnergyAccounting::updateMax(uint16_t val, uint8_t day) {
         }
     }
     if(idx < 5) {
-        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EnergyAccounting) Adding new max %d for day %d\n", val*10, day);
+        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(EnergyAccounting) Adding new max %d for day %d\n"), val*10, day);
         data.peaks[idx].value = val;
         data.peaks[idx].day = day;
         return true;
     }
     return false;
+}
+
+void EnergyAccounting::setFixedPrice(float price, String currency) {
+    this->fixedPrice = price;
+    this->currency = currency;
+}
+
+float EnergyAccounting::getPriceForHour(uint8_t h) {
+    if(fixedPrice > 0.0) return fixedPrice;
+    if(eapi == NULL) return ENTSOE_NO_VALUE;
+    return eapi->getValueForHour(h);
 }

lib/EntsoePriceApi/include/EntsoeA44Parser.h

@@ -2,6 +2,7 @@
 #define _ENTSOEA44PARSER_H
 
 #include "Stream.h"
+#include "PricesContainer.h"
 
 #define DOCPOS_SEEK 0
 #define DOCPOS_CURRENCY 1
@@ -26,11 +27,12 @@ public:
     void flush();
     size_t write(const uint8_t *buffer, size_t size);
     size_t write(uint8_t);
+    void get(PricesContainer*);
 
 private:
     char currency[4];
     char measurementUnit[4];
-    float points[24];
+    float points[25];
 
     char buf[64];
     uint8_t pos = 0;

lib/EntsoePriceApi/include/EntsoeApi.h

@@ -4,8 +4,8 @@
 #include "TimeLib.h"
 #include "Timezone.h"
 #include "RemoteDebug.h"
-#include "EntsoeA44Parser.h"
 #include "AmsConfiguration.h"
+#include "EntsoeA44Parser.h"
 
 #if defined(ESP8266)
 	#include <ESP8266HTTPClient.h>
@@ -25,33 +25,43 @@ public:
 
     char* getToken();
     char* getCurrency();
+    char* getArea();
     float getValueForHour(int8_t);
     float getValueForHour(time_t, int8_t);
 
+    int16_t getLastError();
+
 private:
     RemoteDebug* debugger;
     EntsoeConfig* config = NULL;
+    HTTPClient http;
 
     uint8_t currentDay = 0, currentHour = 0;
-    uint32_t tomorrowFetchMillis = 36000000; // Number of ms before midnight. Default fetch 10hrs before midnight (14:00 CE(S)T)
-    uint64_t midnightMillis = 0;
+    uint8_t tomorrowFetchMinute = 15; // How many minutes over 13:00 should it fetch prices
+    uint8_t nextFetchDelayMinutes = 15;
     uint64_t lastTodayFetch = 0;
     uint64_t lastTomorrowFetch = 0;
     uint64_t lastCurrencyFetch = 0;
-    EntsoeA44Parser* today = NULL;
-    EntsoeA44Parser* tomorrow = NULL;
+    PricesContainer* today = NULL;
+    PricesContainer* tomorrow = NULL;
 
     Timezone* tz = NULL;
 
     static const uint16_t BufferSize = 256;
     char* buf;
 
+    bool hub = false;
+    uint8_t* key = NULL;
+    uint8_t* auth = NULL;
+
     float currencyMultiplier = 0;
 
-    bool retrieve(const char* url, Stream* doc);
-    float getCurrencyMultiplier(const char* from, const char* to);
+    int16_t lastError = 0;
 
-	void printD(String fmt, ...);
-	void printE(String fmt, ...);
+    PricesContainer* fetchPrices(time_t);
+    bool retrieve(const char* url, Stream* doc);
+    float getCurrencyMultiplier(const char* from, const char* to, time_t t);
+
+    void debugPrint(byte *buffer, int start, int length);
 };
 #endif

lib/EntsoePriceApi/include/PricesContainer.h

@@ -0,0 +1,8 @@
+#ifndef _PRICESCONTAINER_H
+#define _PRICESCONTAINER_H
+struct PricesContainer {
+    char currency[4];
+    char measurementUnit[4];
+    int32_t points[25];
+};
+#endif

lib/EntsoePriceApi/src/EntsoeA44Parser.cpp

@@ -2,7 +2,7 @@
 #include "HardwareSerial.h"
 
 EntsoeA44Parser::EntsoeA44Parser() {
-    for(int i = 0; i < 24; i++) points[i] = ENTSOE_NO_VALUE;
+    for(int i = 0; i < 25; i++) points[i] = ENTSOE_NO_VALUE;
 }
 
 EntsoeA44Parser::~EntsoeA44Parser() {
@@ -18,7 +18,7 @@ char* EntsoeA44Parser::getMeasurementUnit() {
 }
 
 float EntsoeA44Parser::getPoint(uint8_t position) {
-    if(position >= 24) return ENTSOE_NO_VALUE;
+    if(position >= 25) return ENTSOE_NO_VALUE;
     return points[position];
 }
 
@@ -106,3 +106,12 @@ size_t EntsoeA44Parser::write(uint8_t byte) {
     }
     return 1;
 }
+
+void EntsoeA44Parser::get(PricesContainer* container) {
+    strcpy(container->currency, currency);
+    strcpy(container->measurementUnit, measurementUnit);
+
+    for(uint8_t i = 0; i < 25; i++) {
+        container->points[i] = points[i] == ENTSOE_NO_VALUE ? ENTSOE_NO_VALUE : points[i] * 10000;
+    }
+}

lib/EntsoePriceApi/src/EntsoeApi.cpp

@@ -0,0 +1,434 @@
+#include "EntsoeApi.h"
+#include <EEPROM.h>
+#include "Uptime.h"
+#include "TimeLib.h"
+#include "DnbCurrParser.h"
+#include "FirmwareVersion.h"
+
+#include "GcmParser.h"
+
+#if defined(ESP32)
+#include <esp_task_wdt.h>
+#endif
+
+EntsoeApi::EntsoeApi(RemoteDebug* Debug) {
+    this->buf = (char*) malloc(BufferSize);
+
+    debugger = Debug;
+
+    // Entso-E uses CET/CEST
+    TimeChangeRule CEST = {"CEST", Last, Sun, Mar, 2, 120};
+	TimeChangeRule CET = {"CET ", Last, Sun, Oct, 3, 60};
+	tz = new Timezone(CEST, CET);
+
+    tomorrowFetchMinute = 15 + random(45); // Random between 13:15 and 14:00
+}
+
+void EntsoeApi::setup(EntsoeConfig& config) {
+    if(this->config == NULL) {
+        this->config = new EntsoeConfig();
+    }
+    memcpy(this->config, &config, sizeof(config));
+    lastTodayFetch = lastTomorrowFetch = lastCurrencyFetch = 0;
+    if(today != NULL) delete today;
+    if(tomorrow != NULL) delete tomorrow;
+    today = tomorrow = NULL;
+
+    http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
+    http.setReuse(false);
+    http.setTimeout(60000);
+    http.setUserAgent("ams2mqtt/" + String(FirmwareVersion::VersionString));
+    http.useHTTP10(true);
+
+    #if defined(AMS2MQTT_PRICE_KEY)
+        key = new uint8_t[16] AMS2MQTT_PRICE_KEY;
+        hub = true;
+    #else
+        hub = false;
+    #endif
+    #if defined(AMS2MQTT_PRICE_AUTHENTICATION)
+        auth = new uint8_t[16] AMS2MQTT_PRICE_AUTHENTICATION;
+        hub = hub && true;
+    #else
+        hub = false;
+    #endif
+
+}
+
+char* EntsoeApi::getToken() {
+    return this->config->token;
+}
+
+char* EntsoeApi::getCurrency() {
+    return this->config->currency;
+}
+
+char* EntsoeApi::getArea() {
+    return this->config->area;
+}
+
+float EntsoeApi::getValueForHour(int8_t hour) {
+    time_t cur = time(nullptr);
+    return getValueForHour(cur, hour);
+}
+
+float EntsoeApi::getValueForHour(time_t ts, int8_t hour) {
+    tmElements_t tm;
+    int8_t pos = hour;
+
+    breakTime(tz->toLocal(ts), tm);
+    while(tm.Hour > 0) {
+        ts -= 3600;
+        breakTime(tz->toLocal(ts), tm);
+        pos++;
+    }
+    uint8_t hoursToday = 0;
+    uint8_t todayDate = tm.Day;
+    while(tm.Day == todayDate) {
+        ts += 3600;
+        breakTime(tz->toLocal(ts), tm);
+        hoursToday++;
+    }
+    if(pos >= 48)
+        return ENTSOE_NO_VALUE;
+
+    float value = ENTSOE_NO_VALUE;
+    float multiplier = config->multiplier / 1000.0;
+    if(pos >= hoursToday) {
+        if(tomorrow == NULL)
+            return ENTSOE_NO_VALUE;
+        if(tomorrow->points[pos-hoursToday] == ENTSOE_NO_VALUE)
+            return ENTSOE_NO_VALUE;
+        value = tomorrow->points[pos-hoursToday] / 10000.0;
+        if(strcmp(tomorrow->measurementUnit, "KWH") == 0) {
+            // Multiplier is 1
+        } else if(strcmp(tomorrow->measurementUnit, "MWH") == 0) {
+            multiplier *= 0.001;
+        } else {
+            return ENTSOE_NO_VALUE;
+        }
+        float mult = getCurrencyMultiplier(tomorrow->currency, config->currency, time(nullptr));
+        if(mult == 0) return ENTSOE_NO_VALUE;
+        multiplier *= mult;
+    } else if(pos >= 0) {
+        if(today == NULL)
+            return ENTSOE_NO_VALUE;
+        if(today->points[pos] == ENTSOE_NO_VALUE)
+            return ENTSOE_NO_VALUE;
+        value = today->points[pos] / 10000.0;
+        if(strcmp(today->measurementUnit, "KWH") == 0) {
+            // Multiplier is 1
+        } else if(strcmp(today->measurementUnit, "MWH") == 0) {
+            multiplier *= 0.001;
+        } else {
+            return ENTSOE_NO_VALUE;
+        }
+        float mult = getCurrencyMultiplier(today->currency, config->currency, time(nullptr));
+        if(mult == 0) return ENTSOE_NO_VALUE;
+        multiplier *= mult;
+    }
+    return value * multiplier;
+}
+
+bool EntsoeApi::loop() {
+    uint64_t now = millis64();
+    if(now < 10000) return false; // Grace period
+
+    time_t t = time(nullptr);
+    if(t < FirmwareVersion::BuildEpoch) return false;
+
+    #ifndef AMS2MQTT_PRICE_KEY
+    if(strlen(getToken()) == 0) {
+        return false;
+    }
+    #endif
+    if(!config->enabled)
+        return false;
+    if(strlen(config->area) == 0)
+        return false;
+    if(strlen(config->currency) == 0)
+        return false;
+
+    tmElements_t tm;
+    breakTime(tz->toLocal(t), tm);
+
+    if(currentDay == 0) {
+        currentDay = tm.Day;
+        currentHour = tm.Hour;
+    }
+    
+    if(currentDay != tm.Day) {
+        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(EntsoeApi) Rotating price objects at %lu\n"), t);
+        if(today != NULL) delete today;
+        if(tomorrow != NULL) {
+            today = tomorrow;
+            tomorrow = NULL;
+        }
+        currentDay = tm.Day;
+        currentHour = tm.Hour;
+        return today != NULL; // Only trigger MQTT publish if we have todays prices.
+    } else if(currentHour != tm.Hour) {
+        currentHour = tm.Hour;
+        return today != NULL; // Only trigger MQTT publish if we have todays prices.
+    }
+
+    bool readyToFetchForTomorrow = tomorrow == NULL && (tm.Hour > 13 || (tm.Hour == 13 && tm.Minute >= tomorrowFetchMinute)) && (lastTomorrowFetch == 0 || now - lastTomorrowFetch > (nextFetchDelayMinutes*60000));
+
+    if(today == NULL && (lastTodayFetch == 0 || now - lastTodayFetch > (nextFetchDelayMinutes*60000))) {
+        try {
+            lastTodayFetch = now;
+            today = fetchPrices(t);
+        } catch(const std::exception& e) {
+            if(lastError == 0) {
+                lastError = 900;
+                nextFetchDelayMinutes = 60;
+            }
+            today = NULL;
+        }
+        return today != NULL && !readyToFetchForTomorrow; // Only trigger MQTT publish if we have todays prices and we are not immediately ready to fetch price for tomorrow.
+    }
+
+    // Prices for next day are published at 13:00 CE(S)T, but to avoid heavy server traffic at that time, we will 
+    // fetch with one hour (with some random delay) and retry every 15 minutes
+    if(readyToFetchForTomorrow) {
+        try {
+            lastTomorrowFetch = now;
+            tomorrow = fetchPrices(t+SECS_PER_DAY);
+        } catch(const std::exception& e) {
+            if(lastError == 0) {
+                lastError = 900;
+                nextFetchDelayMinutes = 60;
+            }
+            tomorrow = NULL;
+        }
+        return tomorrow != NULL;
+    }
+
+    return false;
+}
+
+bool EntsoeApi::retrieve(const char* url, Stream* doc) {
+    #if defined(ESP32)
+        if(http.begin(url)) {
+            if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("Connection established\n"));
+
+            #if defined(ESP32)
+                esp_task_wdt_reset();
+            #elif defined(ESP8266)
+                ESP.wdtFeed();
+            #endif
+
+            int status = http.GET();
+
+            #if defined(ESP32)
+                esp_task_wdt_reset();
+            #elif defined(ESP8266)
+                ESP.wdtFeed();
+            #endif
+
+            if(status == HTTP_CODE_OK) {
+                if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("Receiving data\n"));
+                http.writeToStream(doc);
+                http.end();
+                lastError = 0;
+                nextFetchDelayMinutes = 1;
+                return true;
+            } else {
+                lastError = status;
+                if(status == 429) {
+                    nextFetchDelayMinutes = 60;
+                } else if(status == 404) {
+                    nextFetchDelayMinutes = 180;
+                } else {
+                    nextFetchDelayMinutes = 30;
+                }
+                if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("(EntsoeApi) Communication error, returned status: %d\n"), status);
+                if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf(http.errorToString(status).c_str());
+                if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf(http.getString().c_str());
+
+                http.end();
+                return false;
+            }
+        } else {
+            return false;
+        }
+    #endif
+    return false;
+}
+
+float EntsoeApi::getCurrencyMultiplier(const char* from, const char* to, time_t t) {
+    if(strcmp(from, to) == 0)
+        return 1.00;
+
+    uint64_t now = millis64();
+    if(now > lastCurrencyFetch && (lastCurrencyFetch == 0 || (now - lastCurrencyFetch) > 60000)) {
+        lastCurrencyFetch = now;
+        
+        DnbCurrParser p;
+
+        #if defined(ESP32)
+            esp_task_wdt_reset();
+        #elif defined(ESP8266)
+            ESP.wdtFeed();
+        #endif
+
+        snprintf_P(buf, BufferSize, PSTR("https://data.norges-bank.no/api/data/EXR/M.%s.NOK.SP?lastNObservations=1"), from);
+        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(EntsoeApi) Retrieving %s to NOK conversion\n"), from);
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(EntsoeApi)  url: %s\n"), buf);
+        if(retrieve(buf, &p)) {
+            if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(EntsoeApi)  got exchange rate %.4f\n"), p.getValue());
+            currencyMultiplier = p.getValue();
+            if(strncmp(to, "NOK", 3) != 0) {
+                snprintf_P(buf, BufferSize, PSTR("https://data.norges-bank.no/api/data/EXR/M.%s.NOK.SP?lastNObservations=1"), to);
+                if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(EntsoeApi) Retrieving %s to NOK conversion\n"), to);
+                if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(EntsoeApi)  url: %s\n"), buf);
+                if(retrieve(buf, &p)) {
+                    if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(EntsoeApi)  got exchange rate %.4f\n"), p.getValue());
+                    currencyMultiplier /= p.getValue();
+                } else {
+                    return 0;
+                }
+            }
+        } else {
+            return 0;
+        }
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(EntsoeApi) Resulting currency multiplier: %.4f\n"), currencyMultiplier);
+        tmElements_t tm;
+        breakTime(t, tm);
+        lastCurrencyFetch = now + (SECS_PER_DAY * 1000) - (((((tm.Hour * 60) + tm.Minute) * 60) + tm.Second) * 1000);
+    }
+    return currencyMultiplier;
+}
+
+PricesContainer* EntsoeApi::fetchPrices(time_t t) {
+    tmElements_t tm;
+    breakTime(t, tm);
+    if(strlen(getToken()) > 0) {
+        time_t e1 = t - (tm.Hour * 3600) - (tm.Minute * 60) - tm.Second; // UTC midnight
+        time_t e2 = e1 + SECS_PER_DAY;
+        tmElements_t d1, d2;
+        breakTime(tz->toUTC(e1), d1); // To get day and hour for CET/CEST at UTC midnight
+        breakTime(tz->toUTC(e2), d2);
+
+        snprintf_P(buf, BufferSize, PSTR("https://web-api.tp.entsoe.eu/api?securityToken=%s&documentType=A44&periodStart=%04d%02d%02d%02d%02d&periodEnd=%04d%02d%02d%02d%02d&in_Domain=%s&out_Domain=%s"), 
+        getToken(), 
+        d1.Year+1970, d1.Month, d1.Day, d1.Hour, 00,
+        d2.Year+1970, d2.Month, d2.Day, d2.Hour, 00,
+        config->area, config->area);
+
+        #if defined(ESP32)
+            esp_task_wdt_reset();
+        #elif defined(ESP8266)
+            ESP.wdtFeed();
+        #endif
+
+        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(EntsoeApi) Fetching prices for %d.%d.%d\n"), tm.Day, tm.Month, tm.Year+1970);
+        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(EntsoeApi)  url: %s\n"), buf);
+        EntsoeA44Parser a44;
+        if(retrieve(buf, &a44) && a44.getPoint(0) != ENTSOE_NO_VALUE) {
+            PricesContainer* ret = new PricesContainer();
+            a44.get(ret);
+            return ret;
+        } else {
+            return NULL;
+        }
+    } else if(hub) {
+        String data;
+        snprintf_P(buf, BufferSize, PSTR("http://hub.amsleser.no/hub/price/%s/%d/%d/%d?currency=%s"),
+            config->area,
+            tm.Year+1970,
+            tm.Month,
+            tm.Day,
+            config->currency
+        );
+        #if defined(ESP8266)
+        WiFiClient client;
+        client.setTimeout(5000);
+        if(http.begin(client, buf)) {
+        #elif defined(ESP32)
+        if(http.begin(buf)) {
+        #endif
+            int status = http.GET();
+
+            #if defined(ESP32)
+                esp_task_wdt_reset();
+            #elif defined(ESP8266)
+                ESP.wdtFeed();
+            #endif
+
+            if(status == HTTP_CODE_OK) {
+                if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("Receiving data\n"));
+                data = http.getString();
+                http.end();
+                
+                uint8_t* content = (uint8_t*) (data.c_str());
+                if(debugger->isActive(RemoteDebug::DEBUG)) {
+                    if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("Received content for prices:\n"));
+                    debugPrint(content, 0, data.length());
+                }
+
+                DataParserContext ctx = {0,0,0,0};
+                ctx.length = data.length();
+                GCMParser gcm(key, auth);
+                int8_t gcmRet = gcm.parse(content, ctx);
+                if(debugger->isActive(RemoteDebug::DEBUG)) {
+                    if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("Decrypted content for prices:\n"));
+                    debugPrint(content, 0, data.length());
+                }
+                if(gcmRet > 0) {
+                    if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(EntsoeApi) Price data starting at: %d\n"), gcmRet);
+                    PricesContainer* ret = new PricesContainer();
+                    for(uint8_t i = 0; i < 25; i++) {
+                        ret->points[i] = ENTSOE_NO_VALUE;
+                    }
+                    memcpy(ret, content+gcmRet, sizeof(*ret));
+                    for(uint8_t i = 0; i < 25; i++) {
+                        ret->points[i] = ntohl(ret->points[i]);
+                    }
+                    lastError = 0;
+                    nextFetchDelayMinutes = 1;
+                    return ret;
+                } else {
+                    lastError = gcmRet;
+                    nextFetchDelayMinutes = 60;
+                    if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("(EntsoeApi) Error code while decrypting prices: %d\n"), gcmRet);
+                }
+            } else {
+                lastError = status;
+                if(status == 429) {
+                    nextFetchDelayMinutes = 60;
+                } else if(status == 404) {
+                    nextFetchDelayMinutes = 180;
+                } else {
+                    nextFetchDelayMinutes = 30;
+                }
+                if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf_P(PSTR("(EntsoeApi) Communication error, returned status: %d\n"), status);
+                if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf(http.errorToString(status).c_str());
+                if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf(http.getString().c_str());
+
+                http.end();
+            }
+        }
+    }
+    return NULL;
+}
+
+void EntsoeApi::debugPrint(byte *buffer, int start, int length) {
+	for (int 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(""));
+}
+
+int16_t EntsoeApi::getLastError() {
+    return lastError;
+}

lib/FirmwareVersion/include/FirmwareVersion.h

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

lib/FirmwareVersion/src/FirmwareVersion.cpp

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

lib/HomeAssistantMqttHandler/include/.gitignore

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

lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h

@@ -0,0 +1,172 @@
+#ifndef _HOMEASSISTANTMQTTHANDLER_H
+#define _HOMEASSISTANTMQTTHANDLER_H
+
+#include "AmsMqttHandler.h"
+#include "HomeAssistantStatic.h"
+#include "AmsConfiguration.h"
+
+class HomeAssistantMqttHandler : public AmsMqttHandler {
+public:
+    HomeAssistantMqttHandler(MQTTClient* mqtt, char* buf, const char* clientId, const char* topic, uint8_t boardType, HomeAssistantConfig config, HwTools* hw) : AmsMqttHandler(mqtt, buf) {
+        this->clientId = clientId;
+        this->topic = String(topic);
+        this->hw = hw;
+        l1Init = l2Init = l2eInit = l3Init = l3eInit = l4Init = l4eInit = rtInit = rteInit = pInit = sInit = false;
+
+        if(strlen(config.discoveryNameTag) > 0) {
+            snprintf_P(buf, 128, PSTR("AMS reader (%s)"), config.discoveryNameTag);
+            deviceName = String(buf);
+            snprintf_P(buf, 128, PSTR("[%s] "), config.discoveryNameTag);
+            sensorNamePrefix = String(buf);
+        } else {
+            deviceName = F("AMS reader");
+            sensorNamePrefix = "";
+        }
+        deviceModel = boardTypeToString(boardType);
+        manufacturer = boardManufacturerToString(boardType);
+
+        #if defined(ESP8266)
+            String hostname = WiFi.hostname();
+        #elif defined(ESP32)
+            String hostname = WiFi.getHostname();
+        #endif
+
+        deviceUid = hostname; // Maybe configurable in the future?
+
+        if(strlen(config.discoveryHostname) > 0) {
+            if(strncmp_P(config.discoveryHostname, PSTR("http"), 4) == 0) {
+                deviceUrl = String(config.discoveryHostname);
+            } else {
+                snprintf_P(buf, 128, PSTR("http://%s/"), config.discoveryHostname);
+                deviceUrl = String(buf);
+            }
+        } else {
+            snprintf_P(buf, 128, PSTR("http://%s.local/"), hostname);
+            deviceUrl = String(buf);
+        }
+
+        if(strlen(config.discoveryPrefix) > 0) {
+            snprintf_P(buf, 128, PSTR("%s/sensor/"), config.discoveryPrefix);
+            discoveryTopic = String(buf);
+        } else {
+            discoveryTopic = F("homeassistant/sensor/");
+        }
+    };
+    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, EntsoeApi* eapi);
+    bool publishTemperatures(AmsConfiguration*, HwTools*);
+    bool publishPrices(EntsoeApi*);
+    bool publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea);
+
+protected:
+    bool loop();
+
+private:
+    String deviceName;
+    String deviceModel;
+    String deviceUid;
+    String manufacturer;
+    String deviceUrl;
+
+    String discoveryTopic;
+    String sensorNamePrefix;
+
+    bool l1Init, l2Init, l2eInit, l3Init, l3eInit, l4Init, l4eInit, rtInit, rteInit, pInit, sInit;
+    bool tInit[32] = {false};
+    bool prInit[38] = {false};
+
+    String clientId;
+    String topic;
+    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, EntsoeApi* eapi);
+    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, EntsoeApi* eapi);
+    void publishRealtimeExportSensors(EnergyAccounting* ea, EntsoeApi* eapi);
+    void publishTemperatureSensor(uint8_t index, String id);
+    void publishPriceSensors(EntsoeApi* eapi);
+    void publishSystemSensors();
+
+    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");
+        }
+        #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

@@ -0,0 +1,112 @@
+#ifndef _HOMEASSISTANTSTATIC_H
+#define _HOMEASSISTANTSTATIC_H
+
+#include "Arduino.h"
+
+struct HomeAssistantSensor {
+    const char* name;
+    const char* topic;
+    const char* path;
+    const char* uom;
+    const char* devcl;
+    const char* stacl;
+};
+
+
+const uint8_t List1SensorCount PROGMEM = 1;
+const HomeAssistantSensor List1Sensors[List1SensorCount] PROGMEM = {
+    {"Active import",              "/power",   "P",                 "W",    "power",           "measurement"}
+};
+
+const uint8_t List2SensorCount PROGMEM = 8;
+const HomeAssistantSensor List2Sensors[List2SensorCount] PROGMEM = {
+    {"Reactive import",            "/power",   "Q",                 "var",  "reactive_power",  "measurement"},
+    {"Reactive export",            "/power",   "QO",                "var",  "reactive_power",  "measurement"},
+    {"L1 current",                 "/power",   "I1",                "A",    "current",         "measurement"},
+    {"L2 current",                 "/power",   "I2",                "A",    "current",         "measurement"},
+    {"L3 current",                 "/power",   "I3",                "A",    "current",         "measurement"},
+    {"L1 voltage",                 "/power",   "U1",                "V",    "voltage",         "measurement"},
+    {"L2 voltage",                 "/power",   "U2",                "V",    "voltage",         "measurement"},
+    {"L3 voltage",                 "/power",   "U3",                "V",    "voltage",         "measurement"}
+};
+
+const uint8_t List2ExportSensorCount PROGMEM = 1;
+const HomeAssistantSensor List2ExportSensors[List2ExportSensorCount] PROGMEM = {
+    {"Active export",              "/power",   "PO",                "W",    "power",           "measurement"}
+};
+
+const uint8_t List3SensorCount PROGMEM = 3;
+const HomeAssistantSensor List3Sensors[List3SensorCount] PROGMEM = {
+    {"Accumulated active import",  "/energy",  "tPI",               "kWh",  "energy",          "total_increasing"},
+    {"Accumulated reactive import","/energy",  "tQI",               "kvarh","",                "total_increasing"},
+    {"Accumulated reactive export","/energy",  "tQO",               "kvarh","",                "total_increasing"}
+};
+
+const uint8_t List3ExportSensorCount PROGMEM = 1;
+const HomeAssistantSensor List3ExportSensors[List3ExportSensorCount] PROGMEM = {
+    {"Accumulated active export",  "/energy",  "tPO",               "kWh",  "energy",          "total_increasing"}
+};
+
+const uint8_t List4SensorCount PROGMEM = 7;
+const HomeAssistantSensor List4Sensors[List4SensorCount] PROGMEM = {
+    {"Power factor",               "/power",   "PF",                "%",    "power_factor",    "measurement"},
+    {"L1 power factor",            "/power",   "PF1",               "%",    "power_factor",    "measurement"},
+    {"L2 power factor",            "/power",   "PF2",               "%",    "power_factor",    "measurement"},
+    {"L3 power factor",            "/power",   "PF3",               "%",    "power_factor",    "measurement"},
+    {"L1 active import",           "/power",   "P1",                "W",    "power",           "measurement"},
+    {"L2 active import",           "/power",   "P2",                "W",    "power",           "measurement"},
+    {"L3 active import",           "/power",   "P3",                "W",    "power",           "measurement"}
+};
+
+const uint8_t List4ExportSensorCount PROGMEM = 3;
+const HomeAssistantSensor List4ExportSensors[List4ExportSensorCount] PROGMEM = {
+    {"L1 active export",           "/power",   "PO1",               "W",    "power",           "measurement"},
+    {"L2 active export",           "/power",   "PO2",               "W",    "power",           "measurement"},
+    {"L3 active export",           "/power",   "PO3",               "W",    "power",           "measurement"}
+};
+
+const uint8_t RealtimeSensorCount PROGMEM = 8;
+const HomeAssistantSensor RealtimeSensors[RealtimeSensorCount] PROGMEM = {
+    {"Month max",                  "/realtime","max",               "kWh",  "energy",          "total_increasing"},
+    {"Tariff threshold",           "/realtime","threshold",         "kWh",  "energy",          "total_increasing"},
+    {"Current hour used",          "/realtime","hour.use",          "kWh",  "energy",          "total_increasing"},
+    {"Current hour cost",          "/realtime","hour.cost",         "",     "monetary",        ""},
+    {"Current day used",           "/realtime","day.use",           "kWh",  "energy",          "total_increasing"},
+    {"Current day cost",           "/realtime","day.cost",          "",     "monetary",        ""},
+    {"Current month used",         "/realtime","month.use",         "kWh",  "energy",          "total_increasing"},
+    {"Current month cost",         "/realtime","month.cost",        "",     "monetary",        ""}
+};
+
+const uint8_t RealtimeExportSensorCount PROGMEM = 6;
+const HomeAssistantSensor RealtimeExportSensors[RealtimeExportSensorCount] PROGMEM = {
+    {"Current hour produced",      "/realtime","hour.produced",     "kWh",  "energy",          "total_increasing"},
+    {"Current hour income",        "/realtime","hour.income",       "",     "monetary",        ""},
+    {"Current day produced",       "/realtime","day.produced",      "kWh",  "energy",          "total_increasing"},
+    {"Current day income",         "/realtime","day.income",        "",     "monetary",        ""},
+    {"Current month produced",     "/realtime","month.produced",    "kWh",  "energy",          "total_increasing"},
+    {"Current month income",       "/realtime","month.income",      "",     "monetary",        ""}
+};
+
+const HomeAssistantSensor RealtimePeakSensor PROGMEM = {"Current month peak %d", "/realtime", "peaks[%d]", "kWh", "energy", ""};
+
+const uint8_t PriceSensorCount PROGMEM = 5;
+const HomeAssistantSensor PriceSensors[PriceSensorCount] PROGMEM = {
+    {"Minimum price ahead",        "/prices",  "prices.min",        "",     "monetary",        ""},
+    {"Maximum price ahead",        "/prices",  "prices.max",        "",     "monetary",        ""},
+    {"Cheapest 1hr period ahead",  "/prices",  "prices.cheapest1hr","",     "timestamp",       ""},
+    {"Cheapest 3hr period ahead",  "/prices",  "prices.cheapest3hr","",     "timestamp",       ""},
+    {"Cheapest 6hr period ahead",  "/prices",  "prices.cheapest6hr","",     "timestamp",       ""}
+};
+
+const HomeAssistantSensor PriceSensor PROGMEM = {"Price in %02d %s", "/prices", "prices['%d']", "", "monetary", ""};
+
+const uint8_t SystemSensorCount PROGMEM = 2;
+const HomeAssistantSensor SystemSensors[SystemSensorCount] PROGMEM = {
+    {"Status",                     "/state",   "rssi",              "dBm",  "signal_strength", "measurement"},
+    {"Supply volt",                "/state",   "vcc",               "V",    "voltage",         "measurement"}
+};
+
+const HomeAssistantSensor TemperatureSensor PROGMEM = {"Temperature sensor %s", "/temperatures", "temperatures['%s']", "°C", "temperature", "measurement"};
+
+
+#endif

lib/HomeAssistantMqttHandler/json/hadiscover.json

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

lib/HomeAssistantMqttHandler/json/realtime.json

@@ -5,16 +5,19 @@
     "hour" : {
         "use" : %.2f,
         "cost" : %.2f,
-        "produced" : %.2f
+        "produced" : %.2f,
+        "income" : %.2f
     },
     "day" : {
         "use" : %.2f,
         "cost" : %.2f,
-        "produced" : %.2f
+        "produced" : %.2f,
+        "income" : %.2f
     },
     "month" : {
         "use" : %.2f,
         "cost" : %.2f,
-        "produced" : %.2f
+        "produced" : %.2f,
+        "income" : %.2f
     }
 }

lib/HomeAssistantMqttHandler/scripts/generate_includes.py

@@ -0,0 +1,76 @@
+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

@@ -0,0 +1,553 @@
+#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/jsonsys_json.h"
+#include "json/jsonprices_json.h"
+#include "json/hadiscover_json.h"
+#include "json/realtime_json.h"
+
+#if defined(ESP32)
+#include <esp_task_wdt.h>
+#endif
+
+bool HomeAssistantMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, EntsoeApi* eapi) {
+	if(topic.isEmpty() || !mqtt->connected())
+		return false;
+
+    if(data->getListType() >= 3) { // publish energy counts
+        publishList3(data, ea);
+        loop();
+    }
+
+    if(data->getListType() == 1) { // publish power counts
+        publishList1(data, ea);
+    } else if(data->getListType() <= 3) { // publish power counts and volts/amps
+        publishList2(data, ea);
+    } else if(data->getListType() == 4) { // publish power counts and volts/amps/phase power and PF
+        publishList4(data, ea);
+    }
+    loop();
+
+    if(ea->isInitialized()) {
+        publishRealtime(data, ea, eapi);
+        loop();
+    }
+    return true;
+}
+
+bool HomeAssistantMqttHandler::publishList1(AmsData* data, EnergyAccounting* ea) {
+    publishList1Sensors();
+    snprintf_P(json, BufferSize, HA1_JSON,
+        data->getActiveImportPower()
+    );
+    return mqtt->publish(topic + "/power", json);
+}
+
+bool HomeAssistantMqttHandler::publishList2(AmsData* data, EnergyAccounting* ea) {
+    publishList2Sensors();
+    if(data->getActiveExportPower() > 0) publishList2ExportSensors();
+    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()
+    );
+    return mqtt->publish(topic + "/power", json);
+}
+
+bool HomeAssistantMqttHandler::publishList3(AmsData* data, EnergyAccounting* ea) {
+    publishList3Sensors();
+    if(data->getActiveExportCounter() > 0.0) publishList3ExportSensors();
+    snprintf_P(json, BufferSize, HA2_JSON,
+        data->getActiveImportCounter(),
+        data->getActiveExportCounter(),
+        data->getReactiveImportCounter(),
+        data->getReactiveExportCounter(),
+        data->getMeterTimestamp()
+    );
+    return mqtt->publish(topic + "/energy", json);
+}
+
+bool HomeAssistantMqttHandler::publishList4(AmsData* data, EnergyAccounting* ea) {
+    publishList4Sensors();
+    if(data->getL1ActiveExportPower() > 0 || data->getL2ActiveExportPower() > 0 || data->getL3ActiveExportPower() > 0) publishList4ExportSensors();
+    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 ? 1 : data->getPowerFactor(),
+        data->getPowerFactor() == 0 ? 1 : data->getL1PowerFactor(),
+        data->getPowerFactor() == 0 ? 1 : data->getL2PowerFactor(),
+        data->getPowerFactor() == 0 ? 1 : data->getL3PowerFactor()
+    );
+    return mqtt->publish(topic + "/power", json);
+}
+
+String HomeAssistantMqttHandler::getMeterModel(AmsData* data) {
+    String meterModel = data->getMeterModel();
+    meterModel.replace("\\", "\\\\");
+    return meterModel;
+}
+
+bool HomeAssistantMqttHandler::publishRealtime(AmsData* data, EnergyAccounting* ea, EntsoeApi* eapi) {
+    publishRealtimeSensors(ea, eapi);
+    if(ea->getProducedThisHour() > 0.0 || ea->getProducedToday() > 0.0 || ea->getProducedThisMonth() > 0.0) publishRealtimeExportSensors(ea, eapi);
+    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);
+    }
+    snprintf_P(json, BufferSize, REALTIME_JSON,
+        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()
+    );
+    return mqtt->publish(topic + "/realtime", json);
+}
+
+
+bool HomeAssistantMqttHandler::publishTemperatures(AmsConfiguration* config, HwTools* hw) {
+	int count = hw->getTempSensorCount();
+    if(count < 2) return false;
+
+	int size = 32 + (count * 26);
+
+	char buf[size];
+	snprintf_P(buf, 24, PSTR("{\"temperatures\":{"));
+
+	for(int i = 0; i < count; i++) {
+		TempSensorData* data = hw->getTempSensorData(i);
+        if(data != NULL) {
+            char* pos = buf+strlen(buf);
+            String id = toHex(data->address, 8);
+            snprintf_P(pos, 26, PSTR("\"%s\":%.2f,"), 
+                id.c_str(),
+                data->lastRead
+            );
+            data->changed = false;
+            publishTemperatureSensor(i+1, id);
+        }
+	}
+	char* pos = buf+strlen(buf);
+	snprintf_P(count == 0 ? pos : pos-1, 8, PSTR("}}"));
+    bool ret = mqtt->publish(topic + "/temperatures", buf);
+    loop();
+    return ret;
+}
+
+bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) {
+	if(topic.isEmpty() || !mqtt->connected())
+		return false;
+	if(eapi->getValueForHour(0) == ENTSOE_NO_VALUE)
+		return false;
+
+    publishPriceSensors(eapi);
+
+	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] = ENTSOE_NO_VALUE;
+	for(uint8_t i = 0; i < 38; i++) {
+		float val = eapi->getValueForHour(now, i);
+		values[i] = val;
+
+		if(val == ENTSOE_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 == ENTSOE_NO_VALUE || val2 == ENTSOE_NO_VALUE || val3 == ENTSOE_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 == ENTSOE_NO_VALUE || val2 == ENTSOE_NO_VALUE || val3 == ENTSOE_NO_VALUE || val4 == ENTSOE_NO_VALUE || val5 == ENTSOE_NO_VALUE || val6 == ENTSOE_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);
+	}
+
+    snprintf_P(json, BufferSize, JSONPRICES_JSON,
+        WiFi.macAddress().c_str(),
+        values[0],
+        values[1],
+        values[2],
+        values[3],
+        values[4],
+        values[5],
+        values[6],
+        values[7],
+        values[8],
+        values[9],
+        values[10],
+        values[11],
+        values[12],
+        values[13],
+        values[14],
+        values[15],
+        values[16],
+        values[17],
+        values[18],
+        values[19],
+        values[20],
+        values[21],
+        values[22],
+        values[23],
+        values[24],
+        values[25],
+        values[26],
+        values[27],
+        values[28],
+        values[29],
+        values[30],
+        values[31],
+        values[32],
+        values[33],
+        values[34],
+        values[35],
+        values[36],
+        values[37],
+        min == INT16_MAX ? 0.0 : min,
+        max == INT16_MIN ? 0.0 : max,
+        ts1hr,
+        ts3hr,
+        ts6hr
+    );
+    bool ret = mqtt->publish(topic + "/prices", json, true, 0);
+    loop();
+    return ret;
+}
+
+bool HomeAssistantMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea) {
+	if(topic.isEmpty() || !mqtt->connected())
+		return false;
+
+    publishSystemSensors();
+    if(hw->getTemperature() > -50) publishTemperatureSensor(0, "");
+
+    snprintf_P(json, BufferSize, JSONSYS_JSON,
+        WiFi.macAddress().c_str(),
+        clientId.c_str(),
+        (uint32_t) (millis64()/1000),
+        hw->getVcc(),
+        hw->getWifiRssi(),
+        hw->getTemperature(),
+        FirmwareVersion::VersionString
+    );
+    bool ret = mqtt->publish(topic + "/state", json);
+    loop();
+    return ret;
+}
+
+void HomeAssistantMqttHandler::publishSensor(const HomeAssistantSensor& sensor) {
+    String uid = String(sensor.path);
+    uid.replace(".", "");
+    uid.replace("[", "");
+    uid.replace("]", "");
+    uid.replace("'", "");
+    snprintf_P(json, BufferSize, HADISCOVER_JSON,
+        sensorNamePrefix.c_str(),
+        sensor.name,
+        topic.c_str(), sensor.topic,
+        deviceUid.c_str(), uid.c_str(),
+        deviceUid.c_str(), uid.c_str(),
+        sensor.uom,
+        sensor.path,
+        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 ? "\"" : ""
+    );
+    mqtt->publish(discoveryTopic + deviceUid + "_" + uid.c_str() + "/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, EntsoeApi* eapi) {
+    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(eapi == NULL) continue;
+            sensor.uom = eapi->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+1);
+        HomeAssistantSensor sensor = {
+            name,
+            RealtimePeakSensor.topic,
+            path,
+            RealtimePeakSensor.uom,
+            RealtimePeakSensor.devcl,
+            RealtimePeakSensor.stacl
+        };
+        publishSensor(sensor);
+    }
+    rtInit = true;
+}
+
+void HomeAssistantMqttHandler::publishRealtimeExportSensors(EnergyAccounting* ea, EntsoeApi* eapi) {
+    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(eapi == NULL) continue;
+            sensor.uom = eapi->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.uom,
+        TemperatureSensor.devcl,
+        TemperatureSensor.stacl
+    };
+    publishSensor(sensor);
+    tInit[index] = true;
+}
+
+void HomeAssistantMqttHandler::publishPriceSensors(EntsoeApi* eapi) {
+    if(eapi == NULL) return;
+    String uom = String(eapi->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;
+    }
+    for(uint8_t i = 0; i < 38; i++) {
+        if(prInit[i]) continue;
+        float val = eapi->getValueForHour(i);
+        if(val == ENTSOE_NO_VALUE) continue;
+        
+        char name[strlen(PriceSensor.name)+2];
+        snprintf(name, strlen(PriceSensor.name)+2, PriceSensor.name, i, i == 1 ? "hour" : "hours");
+        char path[strlen(PriceSensor.path)+1];
+        snprintf(path, strlen(PriceSensor.path)+1, PriceSensor.path, i);
+        HomeAssistantSensor sensor = {
+            i == 0 ? "Price current hour" : name,
+            PriceSensor.topic,
+            path,
+            uom.c_str(),
+            PriceSensor.devcl,
+            PriceSensor.stacl
+        };
+        publishSensor(sensor);
+        prInit[i] = true;
+    }
+
+}
+
+void HomeAssistantMqttHandler::publishSystemSensors() {
+    if(sInit) return;
+    for(uint8_t i = 0; i < SystemSensorCount; i++) {
+        publishSensor(SystemSensors[i]);
+    }
+    sInit = true;
+}
+
+bool HomeAssistantMqttHandler::loop() {
+    bool ret = mqtt->loop();
+    delay(10);
+    yield();
+	#if defined(ESP32)
+		esp_task_wdt_reset();
+	#elif defined(ESP8266)
+		ESP.wdtFeed();
+	#endif
+    return ret;
+}

lib/HwTools/include/HwTools.h

@@ -37,13 +37,13 @@ struct AdcConfig {
 class HwTools {
 public:
     void setup(GpioConfig*, AmsConfiguration*);
-    double getVcc();
+    float getVcc();
     uint8_t getTempSensorCount();
     TempSensorData* getTempSensorData(uint8_t);
     bool updateTemperatures();
-    double getTemperature();
-    double getTemperatureAnalog();
-    double getTemperature(uint8_t address[8]);
+    float getTemperature();
+    float getTemperatureAnalog();
+    float getTemperature(uint8_t address[8]);
     int getWifiRssi();
     bool ledOn(uint8_t color);
     bool ledOff(uint8_t color);

lib/HwTools/src/HwTools.cpp

@@ -119,74 +119,102 @@ void HwTools::getAdcChannel(uint8_t pin, AdcConfig& config) {
                 config.unit = ADC_UNIT_1;
                 config.channel = ADC1_CHANNEL_4;
                 break;
+            #if defined(ADC1_CHANNEL_5_GPIO_NUM)
             case ADC1_CHANNEL_5_GPIO_NUM:
                 config.unit = ADC_UNIT_1;
                 config.channel = ADC1_CHANNEL_5;
                 break;
+            #endif
+            #if defined(ADC1_CHANNEL_6_GPIO_NUM)
             case ADC1_CHANNEL_6_GPIO_NUM:
                 config.unit = ADC_UNIT_1;
                 config.channel = ADC1_CHANNEL_6;
                 break;
+            #endif
+            #if defined(ADC1_CHANNEL_7_GPIO_NUM)
             case ADC1_CHANNEL_7_GPIO_NUM:
                 config.unit = ADC_UNIT_1;
                 config.channel = ADC1_CHANNEL_7;
                 break;
-            #if defined(CONFIG_IDF_TARGET_ESP32S2)
+            #endif
+            #if defined(ADC1_CHANNEL_8_GPIO_NUM)
             case ADC1_CHANNEL_8_GPIO_NUM:
                 config.unit = ADC_UNIT_1;
                 config.channel = ADC1_CHANNEL_8;
                 break;
+            #endif
+            #if defined(ADC1_CHANNEL_9_GPIO_NUM)
             case ADC1_CHANNEL_9_GPIO_NUM:
                 config.unit = ADC_UNIT_1;
                 config.channel = ADC1_CHANNEL_9;
                 break;
             #endif
+            #if defined(ADC2_CHANNEL_0_GPIO_NUM)
             case ADC2_CHANNEL_0_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_0;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_1_GPIO_NUM)
             case ADC2_CHANNEL_1_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_1;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_2_GPIO_NUM)
             case ADC2_CHANNEL_2_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_2;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_3_GPIO_NUM)
             case ADC2_CHANNEL_3_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_3;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_4_GPIO_NUM)
             case ADC2_CHANNEL_4_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_4;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_5_GPIO_NUM)
             case ADC2_CHANNEL_5_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_5;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_6_GPIO_NUM)
             case ADC2_CHANNEL_6_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_6;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_7_GPIO_NUM)
             case ADC2_CHANNEL_7_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_7;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_8_GPIO_NUM)
             case ADC2_CHANNEL_8_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_8;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_9_GPIO_NUM)
             case ADC2_CHANNEL_9_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_9;
                 break;
+            #endif
         }
     #endif
 }
 
-double HwTools::getVcc() {
-    double volts = 0.0;
+float HwTools::getVcc() {
+    float volts = 0.0;
     if(config->vccPin != 0xFF) {
         #if defined(ESP32)
             if(voltAdc.unit != 0xFF) {
@@ -229,7 +257,7 @@ double HwTools::getVcc() {
     if(volts == 0.0) return 0.0;
 
     if(config->vccResistorGnd > 0 && config->vccResistorVcc > 0) {
-        volts *= ((double) (config->vccResistorGnd + config->vccResistorVcc) / config->vccResistorGnd);
+        volts *= ((float) (config->vccResistorGnd + config->vccResistorVcc) / config->vccResistorGnd);
     }
 
 
@@ -290,7 +318,7 @@ bool HwTools::updateTemperatures() {
                     }
                     tempSensors[sensorCount++] = data;
                 }
-                delay(10);
+                yield();
             }
         } else {
             if(sensorCount > 0) {
@@ -320,10 +348,10 @@ bool HwTools::isSensorAddressEqual(uint8_t a[8], uint8_t b[8]) {
     return true;
 }
 
-double HwTools::getTemperature() {
+float HwTools::getTemperature() {
     uint8_t c = 0;
-    double ret = 0;
-    double analogTemp = getTemperatureAnalog();
+    float ret = 0;
+    float analogTemp = getTemperatureAnalog();
     if(analogTemp != DEVICE_DISCONNECTED_C) {
         ret += analogTemp;
         c++;
@@ -338,10 +366,10 @@ double HwTools::getTemperature() {
     }
     return c == 0 ? DEVICE_DISCONNECTED_C : ret/c;
 }
-double HwTools::getTemperatureAnalog() {
+float HwTools::getTemperatureAnalog() {
     if(config->tempAnalogSensorPin != 0xFF) {
         float adcCalibrationFactor = 1.06587;
-        int volts = ((double) analogRead(config->tempAnalogSensorPin) / analogRange) * 3.3;
+        int volts = ((float) analogRead(config->tempAnalogSensorPin) / analogRange) * 3.3;
         return ((volts * adcCalibrationFactor) - 0.4) / 0.0195;
     }
     return DEVICE_DISCONNECTED_C;
@@ -371,9 +399,9 @@ bool HwTools::ledOff(uint8_t color) {
 bool HwTools::ledBlink(uint8_t color, uint8_t blink) {
     for(int i = 0; i < blink; i++) {
         if(!ledOn(color)) return false;
-        delay(50);
+        delay(75);
         ledOff(color);
-        delay(200);
+        if(i != blink) delay(75);
     }
     return true;
 }

lib/JsonMqttHandler/include/.gitignore

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

lib/JsonMqttHandler/include/JsonMqttHandler.h

@@ -10,15 +10,23 @@ public:
         this->topic = String(topic);
         this->hw = hw;
     };
-    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
+    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, EntsoeApi* eapi);
     bool publishTemperatures(AmsConfiguration*, HwTools*);
     bool publishPrices(EntsoeApi*);
     bool publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea);
 
+protected:
+    bool loop();
+
 private:
     String clientId;
     String topic;
     HwTools* hw;
-    bool init = false;
+
+    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/json/jsonprices.json

@@ -0,0 +1,48 @@
+{
+    "id" : "%s",
+    "prices" : {
+        "0" : %.4f,
+        "1" : %.4f,
+        "2" : %.4f,
+        "3" : %.4f,
+        "4" : %.4f,
+        "5" : %.4f,
+        "6" : %.4f,
+        "7" : %.4f,
+        "8" : %.4f,
+        "9" : %.4f,
+        "10" : %.4f,
+        "11" : %.4f,
+        "12" : %.4f,
+        "13" : %.4f,
+        "14" : %.4f,
+        "15" : %.4f,
+        "16" : %.4f,
+        "17" : %.4f,
+        "18" : %.4f,
+        "19" : %.4f,
+        "20" : %.4f,
+        "21" : %.4f,
+        "22" : %.4f,
+        "23" : %.4f,
+        "24" : %.4f,
+        "25" : %.4f,
+        "26" : %.4f,
+        "27" : %.4f,
+        "28" : %.4f,
+        "29" : %.4f,
+        "30" : %.4f,
+        "31" : %.4f,
+        "32" : %.4f,
+        "33" : %.4f,
+        "34" : %.4f,
+        "35" : %.4f,
+        "36" : %.4f,
+        "37" : %.4f,
+        "min" : %.4f,
+        "max" : %.4f,
+        "cheapest1hr" : "%s",
+        "cheapest3hr" : "%s",
+        "cheapest6hr" : "%s"
+    }
+}

lib/JsonMqttHandler/scripts/generate_includes.py

@@ -0,0 +1,76 @@
+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/JsonMqttHandler/json"
+srcroot = "lib/JsonMqttHandler/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(";");
+