Fixed reboot loop, changed temperature sensor behaviour and changed some debugging

Fixed loading error from previous version energy accounting
Some changes after testing
2026-03-11 13:05:31 +00:00 · 2023-01-29 22:45:35 +01:00 · 2023-01-29 17:04:04 +01:00 · 2023-01-28 20:24:18 +01:00 · 2023-01-28 20:19:06 +01:00 · 2023-01-28 11:53:26 +01:00
235 changed files with 15578 additions and 1915 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1 @@
-custom: ["https://paypal.me/gskjold"]
+custom: ["https://amsleser.no"]
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -33,6 +33,7 @@ If applicable, add screenshots to help explain your problem.
 **Relevant firmware information:**
 - Version: [e.g. 2.1.0]
 - MQTT: [yes/no]
+ - MQTT payload type: [e.g. JSON]
 - HAN GPIO: [e.g. GPIO5]
 - HAN baud and parity: [e.g. 2400 8E1]
 - Temperature sensors [e.g. 3xDS18B20]
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.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.
--- a/.github/ISSUE_TEMPLATE/support.md
+++ b/.github/ISSUE_TEMPLATE/support.md
@@ -20,6 +20,7 @@ A clear and concise description of what the problem is.
 **Relevant firmware information:**
 - Version: [e.g. 2.1.0]
 - MQTT: [yes/no]
+ - MQTT payload type: [e.g. JSON]
 - HAN GPIO: [e.g. GPIO5]
 - HAN baud and parity: [e.g. 2400 8E1]
 - Temperature sensors [e.g. 3xDS18B20]
--- a/.github/workflows/build.yml
+++ b/.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
--- a/.github/workflows/release.yml
+++ b/.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,12 @@ 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_content_type: application/octet-stream
+        asset_path: esp32solo.zip
+        asset_name: ams2mqtt-esp32solo-${{ steps.release_tag.outputs.tag }}.zip
+        asset_content_type: application/zip
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@
 .vscode
 .pio
 platformio-user.ini
-/src/version.h
+/lib/AmsConfiguration/include/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
--- a/README.md
+++ b/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.
--- a/frames/lng.raw
+++ b/frames/lng.raw
@@ -43,3 +43,37 @@ FF // Last byte of OBIS in previous block
 0600000000 // Accumulated export
 8BA4
 7E
+
+
+
+
+7E A1 23 CE FF 03 13 21 55 E6 E7 00 
+
+0F 00 00 08 E2 
+0C 07 E5 07 13 01 0C 1A 0A FF 80 00 00 
+
+02 0B // 11
+  01 0B // 11
+    02 04 12 00 28 09 06 00 08 19 09 00 FF 0F 02 12 00 00 
+    02 04 12 00 28 09 06 00 08 19 09 00 FF 0F 01 12 00 00 
+    02 04 12 00 01 09 06 00 00 60 01 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 00 01 07 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 00 02 07 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 01 01 08 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 01 02 08 00 FF 0F 02 12 00 00
+    02 04 12 00 03 09 06 01 01 05 08 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 01 06 08 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 01 07 08 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 01 08 08 00 FF 0F 02 12 00 00 
+  09 06 00 08 19 09 00 FF
+  09 08 34 33 30 39 34 33 35 31 
+  06 00 00 00 0B 
+  06 00 00 00 00 
+  06 00 00 00 10 
+  06 00 00 00 04 
+  06 00 00 00 00 
+  06 00 00 00 08 
+  06 00 00 00 00 
+  06 00 00 00 01 
+7C 8B
+7E
--- a/hardware/README.md
+++ b/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)
--- a/hardware/v1/kicad/HAN_ESP_TSS721-backups/HAN_ESP_TSS721-2022-06-25_174436.zip
+++ b/hardware/v1/kicad/HAN_ESP_TSS721-backups/HAN_ESP_TSS721-2022-06-25_174436.zip
--- a/hardware/v1/kicad/HAN_ESP_TSS721-backups/HAN_ESP_TSS721-2022-06-25_190751.zip
+++ b/hardware/v1/kicad/HAN_ESP_TSS721-backups/HAN_ESP_TSS721-2022-06-25_190751.zip
--- a/hardware/v1/kicad/HAN_ESP_TSS721.kicad_prl
+++ b/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": []
+  }
+}
--- a/hardware/v1/kicad/HAN_ESP_TSS721.kicad_pro
+++ b/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": {}
+}
--- a/hardware/v1/kicad/fp-info-cache
+++ b/hardware/v1/kicad/fp-info-cache
@@ -0,0 +1 @@
+0
--- a/hardware/wemos_mbus_shield/kicad/d1_mini_shield-backups/d1_mini_shield-2023-01-06_143235.zip
+++ b/hardware/wemos_mbus_shield/kicad/d1_mini_shield-backups/d1_mini_shield-2023-01-06_143235.zip
--- a/hardware/wemos_mbus_shield/kicad/d1_mini_shield-rescue.dcm
+++ b/hardware/wemos_mbus_shield/kicad/d1_mini_shield-rescue.dcm
@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0
+#
+#End Doc Library
--- a/hardware/wemos_mbus_shield/kicad/d1_mini_shield-rescue.lib
+++ b/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
--- a/hardware/wemos_mbus_shield/kicad/d1_mini_shield.kicad_prl
+++ b/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": []
+  }
+}
--- a/hardware/wemos_mbus_shield/kicad/d1_mini_shield.kicad_pro
+++ b/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": {}
+}
--- a/images/dashboard.png
+++ b/images/dashboard.png
--- a/images/dayplot.png
+++ b/images/dayplot.png
--- a/images/future-energy-price.png
+++ b/images/future-energy-price.png
--- a/images/main-header.png
+++ b/images/main-header.png
--- a/images/monthplot.png
+++ b/images/monthplot.png
--- a/images/real-time-calculation.png
+++ b/images/real-time-calculation.png
--- a/images/sensor-displays.png
+++ b/images/sensor-displays.png
--- a/images/status-bar.png
+++ b/images/status-bar.png
--- a/images/tempsensors.png
+++ b/images/tempsensors.png
--- a/lib/AmsConfiguration/include/AmsConfiguration.h
+++ b/lib/AmsConfiguration/include/AmsConfiguration.h
@@ -4,12 +4,14 @@
 #include "Arduino.h"

 #define EEPROM_SIZE 1024*3
-#define EEPROM_CHECK_SUM 95 // Used to check if config is stored. Change if structure changes
+#define EEPROM_CHECK_SUM 101 // 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_UI_START 248
 #define CONFIG_GPIO_START 266
 #define CONFIG_ENTSOE_START 290
 #define CONFIG_WIFI_START 360
@@ -29,7 +31,11 @@

 struct SystemConfig {
 	uint8_t boardType;
-}; // 1
+	bool vendorConfigured;
+	bool userConfigured;
+	uint8_t dataCollectionConsent; // 0 = unknown, 1 = accepted, 2 = declined
+	char country[3];
+}; // 7

 struct WiFiConfig91 {
 	char ssid[32];
@@ -54,7 +60,10 @@ struct WiFiConfig {
 	char hostname[32];
 	bool mdns;
 	uint8_t power;
-}; // 210
+	uint8_t sleep;
+	uint8_t mode;
+	bool autoreboot;
+}; // 213

 struct MqttConfig86 {
 	char host[128];
@@ -87,6 +96,40 @@ 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;
+}; // 52
+
+struct MeterConfig100 {
+	uint32_t baud;
+	uint8_t parity;
+	bool invert;
+	uint8_t distributionSystem;
+	uint8_t mainFuse;
+	uint8_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;
+}; // 50
+
+struct MeterConfig95 {
 	uint32_t baud;
 	uint8_t parity;
 	bool invert;
@@ -147,6 +190,13 @@ struct DomoticzConfig {
 }; // 10

 struct NtpConfig {
+	bool enable;
+	bool dhcp;
+	char server[64];
+	char timezone[32];
+}; // 98
+
+struct NtpConfig96 {
 	bool enable;
 	bool dhcp;
 	int16_t offset;
@@ -159,6 +209,7 @@ struct EntsoeConfig {
 	char area[17];
 	char currency[4];
 	uint32_t multiplier;
+	bool enabled;
 }; // 62

 struct EnergyAccountingConfig {
@@ -166,6 +217,20 @@ struct EnergyAccountingConfig {
 	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];
@@ -242,6 +307,10 @@ public:
 	bool isEnergyAccountingChanged();
 	void ackEnergyAccountingChange();

+	bool getUiConfig(UiConfig&);
+	bool setUiConfig(UiConfig&);
+	void clearUiConfig(UiConfig&);
+
 	void loadTempSensors();
 	void saveTempSensors();
 	uint8_t getTempSensorCount();
@@ -262,13 +331,14 @@ private:
 	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 relocateConfig94(); // 2.1.0
+	bool relocateConfig95(); // 2.1.4
+	bool relocateConfig96(); // 2.1.14
+	bool relocateConfig100(); // 2.2-dev

 	void saveToFs();
 	bool loadFromFs(uint8_t version);
--- a/lib/AmsConfiguration/include/AmsStorage.h
+++ b/lib/AmsConfiguration/include/AmsStorage.h
--- a/lib/AmsConfiguration/include/Timezones.h
+++ b/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;
+}
--- a/lib/AmsConfiguration/include/hexutils.h
+++ b/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);
+void stripNonAscii(uint8_t* in, uint16_t size);

 #endif
--- a/lib/AmsConfiguration/src/AmsConfiguration.cpp
+++ b/lib/AmsConfiguration/src/AmsConfiguration.cpp
@@ -1,18 +1,26 @@
 #include "AmsConfiguration.h"
+#include "hexutils.h"

 bool AmsConfiguration::getSystemConfig(SystemConfig& config) {
-	if(hasConfig()) {
-		EEPROM.begin(EEPROM_SIZE);
+	EEPROM.begin(EEPROM_SIZE);
+	uint8_t configVersion = EEPROM.read(EEPROM_CONFIG_ADDRESS);
+	if(configVersion == EEPROM_CHECK_SUM || configVersion == EEPROM_CLEARED_INDICATOR) {
 		EEPROM.get(CONFIG_SYSTEM_START, config);
 		EEPROM.end();
 		return true;
 	} else {
+		config.boardType = 0xFF;
+		config.vendorConfigured = false;
+		config.userConfigured = false;
+		config.dataCollectionConsent = 0;
+		strcpy(config.country, "");
 		return false;
 	}
 }

 bool AmsConfiguration::setSystemConfig(SystemConfig& config) {
 	EEPROM.begin(EEPROM_SIZE);
+	stripNonAscii((uint8_t*) config.country, 2);
 	EEPROM.put(CONFIG_SYSTEM_START, config);
 	bool ret = EEPROM.commit();
 	EEPROM.end();
@@ -24,6 +32,7 @@ bool AmsConfiguration::getWiFiConfig(WiFiConfig& config) {
 		EEPROM.begin(EEPROM_SIZE);
 		EEPROM.get(CONFIG_WIFI_START, config);
 		EEPROM.end();
+		if(config.sleep > 2) config.sleep = 1;
 		return true;
 	} else {
 		clearWifi(config);
@@ -33,6 +42,7 @@ bool AmsConfiguration::getWiFiConfig(WiFiConfig& config) {

 bool AmsConfiguration::setWiFiConfig(WiFiConfig& config) {
 	WiFiConfig existing;
+	if(config.sleep > 2) config.sleep = 1;
 	if(getWiFiConfig(existing)) {
 		wifiChanged |= strcmp(config.ssid, existing.ssid) != 0;
 		wifiChanged |= strcmp(config.psk, existing.psk) != 0;
@@ -45,9 +55,22 @@ bool AmsConfiguration::setWiFiConfig(WiFiConfig& config) {
 		}
 		wifiChanged |= strcmp(config.hostname, existing.hostname) != 0;
 		wifiChanged |= config.power != existing.power;
+		wifiChanged |= config.sleep != existing.sleep;
+		wifiChanged |= config.mode != existing.mode;
+		wifiChanged |= config.autoreboot != existing.autoreboot;
 	} else {
 		wifiChanged = true;
 	}
+	
+	stripNonAscii((uint8_t*) config.ssid, 32);
+	stripNonAscii((uint8_t*) config.psk, 64);
+	stripNonAscii((uint8_t*) config.ip, 16);
+	stripNonAscii((uint8_t*) config.gateway, 16);
+	stripNonAscii((uint8_t*) config.subnet, 16);
+	stripNonAscii((uint8_t*) config.dns1, 16);
+	stripNonAscii((uint8_t*) config.dns2, 16);
+	stripNonAscii((uint8_t*) config.hostname, 32);
+
 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(CONFIG_WIFI_START, config);
 	bool ret = EEPROM.commit();
@@ -63,11 +86,14 @@ void AmsConfiguration::clearWifi(WiFiConfig& config) {
 	uint16_t chipId;
 	#if defined(ESP32)
 		chipId = ESP.getEfuseMac();
+		config.power = 195;
 	#else
 		chipId = ESP.getChipId();
+		config.power = 205;
 	#endif
 	strcpy(config.hostname, (String("ams-") + String(chipId, HEX)).c_str());
 	config.mdns = true;
+	config.sleep = 0xFF;
 }

 void AmsConfiguration::clearWifiIp(WiFiConfig& config) {
@@ -113,6 +139,14 @@ bool AmsConfiguration::setMqttConfig(MqttConfig& config) {
 	} else {
 		mqttChanged = true;
 	}
+
+	stripNonAscii((uint8_t*) config.host, 128);
+	stripNonAscii((uint8_t*) config.clientId, 32);
+	stripNonAscii((uint8_t*) config.publishTopic, 64);
+	stripNonAscii((uint8_t*) config.subscribeTopic, 64);
+	stripNonAscii((uint8_t*) config.username, 128);
+	stripNonAscii((uint8_t*) config.password, 256);
+
 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(CONFIG_MQTT_START, config);
 	bool ret = EEPROM.commit();
@@ -157,6 +191,10 @@ bool AmsConfiguration::getWebConfig(WebConfig& config) {
 }

 bool AmsConfiguration::setWebConfig(WebConfig& config) {
+
+	stripNonAscii((uint8_t*) config.username, 64);
+	stripNonAscii((uint8_t*) config.password, 64);
+
 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(CONFIG_WEB_START, config);
 	bool ret = EEPROM.commit();
@@ -204,11 +242,11 @@ bool AmsConfiguration::setMeterConfig(MeterConfig& config) {
 }

 void AmsConfiguration::clearMeter(MeterConfig& config) {
-	config.baud = 2400;
-	config.parity = 11; // 8E1
+	config.baud = 0;
+	config.parity = 0;
 	config.invert = false;
-	config.distributionSystem = 0;
-	config.mainFuse = 0;
+	config.distributionSystem = 2;
+	config.mainFuse = 40;
 	config.productionCapacity = 0;
 	memset(config.encryptionKey, 0, 16);
 	memset(config.authenticationKey, 0, 16);
@@ -216,6 +254,8 @@ void AmsConfiguration::clearMeter(MeterConfig& config) {
 	config.voltageMultiplier = 0;
 	config.amperageMultiplier = 0;
 	config.accumulatedMultiplier = 0;
+	config.source = 1; // Serial
+	config.parser = 0; // Auto
 }

 bool AmsConfiguration::isMeterChanged() {
@@ -424,12 +464,15 @@ bool AmsConfiguration::setNtpConfig(NtpConfig& config) {
 			}
 		}
 		ntpChanged |= config.dhcp != existing.dhcp;
-		ntpChanged |= config.offset != existing.offset;
-		ntpChanged |= config.summerOffset != existing.summerOffset;
 		ntpChanged |= strcmp(config.server, existing.server) != 0;
+		ntpChanged |= strcmp(config.timezone, existing.timezone) != 0;
 	} else {
 		ntpChanged = true;
 	}
+
+	stripNonAscii((uint8_t*) config.server, 64);
+	stripNonAscii((uint8_t*) config.timezone, 32);
+
 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(CONFIG_NTP_START, config);
 	bool ret = EEPROM.commit();
@@ -448,9 +491,8 @@ void AmsConfiguration::ackNtpChange() {
 void AmsConfiguration::clearNtp(NtpConfig& config) {
 	config.enable = true;
 	config.dhcp = true;
-	config.offset = 360;
-	config.summerOffset = 360;
 	strcpy(config.server, "pool.ntp.org");
+	strcpy(config.timezone, "Europe/Oslo");
 }

 bool AmsConfiguration::getEntsoeConfig(EntsoeConfig& config) {
@@ -474,9 +516,15 @@ bool AmsConfiguration::setEntsoeConfig(EntsoeConfig& config) {
 		entsoeChanged |= strcmp(config.area, existing.area) != 0;
 		entsoeChanged |= strcmp(config.currency, existing.currency) != 0;
 		entsoeChanged |= config.multiplier != existing.multiplier;
+		entsoeChanged |= config.enabled != existing.enabled;
 	} else {
 		entsoeChanged = true;
 	}
+
+	stripNonAscii((uint8_t*) config.token, 37);
+	stripNonAscii((uint8_t*) config.area, 17);
+	stripNonAscii((uint8_t*) config.currency, 4);
+
 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(CONFIG_ENTSOE_START, config);
 	bool ret = EEPROM.commit();
@@ -489,6 +537,7 @@ void AmsConfiguration::clearEntsoe(EntsoeConfig& config) {
 	strcpy(config.area, "");
 	strcpy(config.currency, "");
 	config.multiplier = 1000;
+	config.enabled = false;
 }

 bool AmsConfiguration::isEntsoeChanged() {
@@ -508,6 +557,7 @@ bool AmsConfiguration::getEnergyAccountingConfig(EnergyAccountingConfig& config)
 		if(config.thresholds[9] != 255) {
 			clearEnergyAccountingConfig(config);
 		}
+		if(config.hours > 5) config.hours = 5;
 		return true;
 	} else {
 		return false;
@@ -515,6 +565,7 @@ bool AmsConfiguration::getEnergyAccountingConfig(EnergyAccountingConfig& config)
 }

 bool AmsConfiguration::setEnergyAccountingConfig(EnergyAccountingConfig& config) {
+	if(config.hours > 5) config.hours = 5;
 	EnergyAccountingConfig existing;
 	if(getEnergyAccountingConfig(existing)) {
 		for(int i = 0; i < 9; i++) {
@@ -523,6 +574,7 @@ bool AmsConfiguration::setEnergyAccountingConfig(EnergyAccountingConfig& config)
 			}
 		}
 		config.thresholds[9] = 255;
+		energyAccountingChanged |= config.hours != existing.hours;
 	} else {
 		energyAccountingChanged = true;
 	}
@@ -531,7 +583,6 @@ bool AmsConfiguration::setEnergyAccountingConfig(EnergyAccountingConfig& config)
 	bool ret = EEPROM.commit();
 	EEPROM.end();
 	return ret;
-
 }

 void AmsConfiguration::clearEnergyAccountingConfig(EnergyAccountingConfig& config) {
@@ -545,6 +596,7 @@ void AmsConfiguration::clearEnergyAccountingConfig(EnergyAccountingConfig& confi
 	config.thresholds[7] = 100;
 	config.thresholds[8] = 150;
 	config.thresholds[9] = 255;
+	config.hours = 3;
 }

 bool AmsConfiguration::isEnergyAccountingChanged() {
@@ -555,9 +607,53 @@ void AmsConfiguration::ackEnergyAccountingChange() {
 	energyAccountingChanged = false;
 }

+bool AmsConfiguration::getUiConfig(UiConfig& config) {
+	if(hasConfig()) {
+		EEPROM.begin(EEPROM_SIZE);
+		EEPROM.get(CONFIG_UI_START, config);
+		if(config.showImport > 2) clearUiConfig(config); // Must be wrong
+		EEPROM.end();
+		return true;
+	} else {
+		clearUiConfig(config);
+		return false;
+	}
+}
+
+bool AmsConfiguration::setUiConfig(UiConfig& config) {
+	EEPROM.begin(EEPROM_SIZE);
+	EEPROM.put(CONFIG_UI_START, config);
+	bool ret = EEPROM.commit();
+	EEPROM.end();
+	return ret;
+}
+
+void AmsConfiguration::clearUiConfig(UiConfig& config) {
+	// 1 = Always, 2 = If value present, 0 = Hidden
+	config.showImport = 1;
+	config.showExport = 2;
+	config.showVoltage = 2;
+	config.showAmperage = 2;
+	config.showReactive = 0;
+	config.showRealtime = 1;
+	config.showPeaks = 2;
+	config.showPricePlot = 2;
+	config.showDayPlot = 1;
+	config.showMonthPlot = 1;
+	config.showTemperaturePlot = 2;
+}
+

 void AmsConfiguration::clear() {
 	EEPROM.begin(EEPROM_SIZE);
+
+	SystemConfig sys;
+	EEPROM.get(CONFIG_SYSTEM_START, sys);
+	sys.userConfigured = false;
+	sys.dataCollectionConsent = 0;
+	strcpy(sys.country, "");
+	EEPROM.put(CONFIG_SYSTEM_START, sys);
+
 	MeterConfig meter;
 	clearMeter(meter);
 	EEPROM.put(CONFIG_METER_START, meter);
@@ -590,7 +686,15 @@ void AmsConfiguration::clear() {
 	clearEnergyAccountingConfig(eac);
 	EEPROM.put(CONFIG_ENERGYACCOUNTING_START, eac);

-	EEPROM.put(EEPROM_CONFIG_ADDRESS, -1);
+	DebugConfig debug;
+	clearDebug(debug);
+	EEPROM.put(CONFIG_DEBUG_START, debug);
+
+	UiConfig ui;
+	clearUiConfig(ui);
+	EEPROM.put(CONFIG_UI_START, ui);
+
+	EEPROM.put(EEPROM_CONFIG_ADDRESS, EEPROM_CLEARED_INDICATOR);
 	EEPROM.commit();
 	EEPROM.end();
 }
@@ -609,22 +713,6 @@ bool AmsConfiguration::hasConfig() {
 		}
 	} else {
 		switch(configVersion) {
-			case 86:
-				configVersion = -1; // Prevent loop
-				if(relocateConfig86()) {
-					configVersion = 87;
-				} else {
-					configVersion = 0;
-					return false;
-				}
-			case 87:
-				configVersion = -1; // Prevent loop
-				if(relocateConfig87()) {
-					configVersion = 88;
-				} else {
-					configVersion = 0;
-					return false;
-				}
 			case 90:
 				configVersion = -1; // Prevent loop
 				if(relocateConfig90()) {
@@ -665,6 +753,30 @@ bool AmsConfiguration::hasConfig() {
 					configVersion = 0;
 					return false;
 				}
+			case 95:
+				configVersion = -1; // Prevent loop
+				if(relocateConfig95()) {
+					configVersion = 96;
+				} else {
+					configVersion = 0;
+					return false;
+				}
+			case 96:
+				configVersion = -1; // Prevent loop
+				if(relocateConfig96()) {
+					configVersion = 100;
+				} else {
+					configVersion = 0;
+					return false;
+				}
+			case 100:
+				configVersion = -1; // Prevent loop
+				if(relocateConfig100()) {
+					configVersion = 101;
+				} else {
+					configVersion = 0;
+					return false;
+				}
 			case EEPROM_CHECK_SUM:
 				return true;
 			default:
@@ -717,51 +829,6 @@ void AmsConfiguration::saveTempSensors() {
 	}
 }

-bool AmsConfiguration::relocateConfig86() {
-	MqttConfig86 mqtt86;
-	MqttConfig mqtt;
-	EEPROM.begin(EEPROM_SIZE);
-	EEPROM.get(CONFIG_MQTT_START_86, mqtt86);
-	strcpy(mqtt.host, mqtt86.host);
-	mqtt.port = mqtt86.port;
-	strcpy(mqtt.clientId, mqtt86.clientId);
-	strcpy(mqtt.publishTopic, mqtt86.publishTopic);
-	strcpy(mqtt.subscribeTopic, mqtt86.subscribeTopic);
-	strcpy(mqtt.username, mqtt86.username);
-	strcpy(mqtt.password, mqtt86.password);
-	mqtt.payloadFormat = mqtt86.payloadFormat;
-	mqtt.ssl = mqtt86.ssl;
-	EEPROM.put(CONFIG_MQTT_START, mqtt);
-	EEPROM.put(EEPROM_CONFIG_ADDRESS, 87);
-	bool ret = EEPROM.commit();
-	EEPROM.end();
-	return ret;
-}
-
-bool AmsConfiguration::relocateConfig87() {
-	MeterConfig87 meter87;
-	MeterConfig meter;
-	EEPROM.begin(EEPROM_SIZE);
-    EEPROM.get(CONFIG_METER_START_87, meter87);
-	if(meter87.type < 5) {
-		meter.baud = 2400;
-		meter.parity = meter87.type == 3 || meter87.type == 4 ? 3 : 11;
-		meter.invert = false;
-	} else {
-		meter.baud = 115200;
-		meter.parity = 3;
-		meter.invert = meter87.type == 6;
-	}
-	meter.distributionSystem = meter87.distributionSystem;
-	meter.mainFuse = meter87.mainFuse;
-	meter.productionCapacity = meter87.productionCapacity;
-	EEPROM.put(CONFIG_METER_START, meter);
-	EEPROM.put(EEPROM_CONFIG_ADDRESS, 88);
-	bool ret = EEPROM.commit();
-	EEPROM.end();
-	return ret;
-}
-
 bool AmsConfiguration::relocateConfig90() {
 	EntsoeConfig entsoe;
 	EEPROM.begin(EEPROM_SIZE);
@@ -842,6 +909,129 @@ bool AmsConfiguration::relocateConfig94() {
 	return ret;
 }

+bool AmsConfiguration::relocateConfig95() {
+	MeterConfig meter;
+	MeterConfig95 meter95;
+	EEPROM.begin(EEPROM_SIZE);
+	EEPROM.get(CONFIG_METER_START, meter);
+	EEPROM.get(CONFIG_METER_START, meter95);
+	meter.wattageMultiplier = meter95.wattageMultiplier;
+	meter.voltageMultiplier = meter95.voltageMultiplier;
+	meter.amperageMultiplier = meter95.amperageMultiplier;
+	meter.accumulatedMultiplier = meter95.accumulatedMultiplier;
+	EEPROM.put(CONFIG_METER_START, meter);
+	EEPROM.put(EEPROM_CONFIG_ADDRESS, 96);
+	bool ret = EEPROM.commit();
+	EEPROM.end();
+	return ret;
+}
+
+bool AmsConfiguration::relocateConfig96() {
+	EEPROM.begin(EEPROM_SIZE);
+	SystemConfig sys;
+	EEPROM.get(CONFIG_SYSTEM_START, sys);
+
+	MeterConfig meter;
+	EEPROM.get(CONFIG_METER_START, meter);
+	meter.source = 1; // Serial
+	meter.parser = 0; // Auto
+	EEPROM.put(CONFIG_METER_START, meter);
+
+	#if defined(ESP8266)
+	GpioConfig gpio;
+	EEPROM.get(CONFIG_GPIO_START, gpio);
+
+	switch(sys.boardType) {
+		case 3: // Pow UART0 -- Now Pow-K UART0
+		case 4: // Pow GPIO12 -- Now Pow-U UART0
+		case 5: // Pow-K+ -- Now also Pow-K GPIO12
+		case 7: // Pow-U+ -- Now also Pow-U GPIO12
+			if(meter.baud == 2400 && meter.parity == 3) { // 3 == 8N1, assuming Pow-K
+				if(gpio.hanPin == 3) { // UART0
+					sys.boardType = 3;
+				} else if(gpio.hanPin == 12) {
+					sys.boardType = 5;
+				}
+			} else { // Assuming Pow-U
+				if(gpio.hanPin == 3) { // UART0
+					sys.boardType = 4;
+				} else if(gpio.hanPin == 12) {
+					sys.boardType = 7;
+				}
+			}
+			break;
+	}
+	#endif
+
+	sys.vendorConfigured = true;
+	sys.userConfigured = true;
+	sys.dataCollectionConsent = 0;
+	strcpy(sys.country, "");
+	EEPROM.put(CONFIG_SYSTEM_START, sys);
+
+	WiFiConfig wifi;
+	EEPROM.get(CONFIG_WIFI_START, wifi);
+	wifi.mode = 1; // WIFI_STA
+	wifi.autoreboot = true;
+	EEPROM.put(CONFIG_WIFI_START, wifi);
+
+	NtpConfig ntp;
+	NtpConfig96 ntp96;
+	EEPROM.get(CONFIG_NTP_START, ntp96);
+	ntp.enable = ntp96.enable;
+	ntp.dhcp = ntp96.dhcp;
+	if(ntp96.offset == 360 && ntp96.summerOffset == 360) {
+		strcpy(ntp.timezone, "Europe/Oslo");
+	} else {
+		strcpy(ntp.timezone, "GMT");
+	}
+	strcpy(ntp.server, ntp96.server);
+	EEPROM.put(CONFIG_NTP_START, ntp);
+
+	EntsoeConfig entsoe;
+	EEPROM.get(CONFIG_ENTSOE_START, entsoe);
+	entsoe.enabled = strlen(entsoe.token) > 0;
+	EEPROM.put(CONFIG_ENTSOE_START, entsoe);
+
+	EEPROM.put(EEPROM_CONFIG_ADDRESS, 100);
+	bool ret = EEPROM.commit();
+	EEPROM.end();
+	return ret;
+}
+
+bool AmsConfiguration::relocateConfig100() {
+	EEPROM.begin(EEPROM_SIZE);
+
+	MeterConfig100 meter100;
+	EEPROM.get(CONFIG_METER_START, meter100);
+	MeterConfig meter;
+	meter.baud = meter100.baud;
+	meter.parity = meter100.parity;
+	meter.invert = meter100.invert;
+	meter.distributionSystem = meter100.distributionSystem;
+	meter.mainFuse = meter100.mainFuse;
+	meter.productionCapacity = meter100.productionCapacity;
+	memcpy(meter.encryptionKey, meter100.encryptionKey, 16);
+	memcpy(meter.authenticationKey, meter100.authenticationKey, 16);
+	meter.wattageMultiplier = meter100.wattageMultiplier;
+	meter.voltageMultiplier = meter100.voltageMultiplier;
+	meter.amperageMultiplier = meter100.amperageMultiplier;
+	meter.accumulatedMultiplier = meter100.accumulatedMultiplier;
+	meter.source = meter100.source;
+	meter.parser = meter100.parser;
+
+	EEPROM.put(CONFIG_METER_START, meter);
+
+	UiConfig ui;
+	clearUiConfig(ui);
+	EEPROM.put(CONFIG_UI_START, ui);
+
+	EEPROM.put(EEPROM_CONFIG_ADDRESS, 101);
+	bool ret = EEPROM.commit();
+	EEPROM.end();
+	return ret;
+}
+
 bool AmsConfiguration::save() {
 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(EEPROM_CONFIG_ADDRESS, EEPROM_CHECK_SUM);
@@ -1045,8 +1235,7 @@ void AmsConfiguration::print(Print* debugger)
 		debugger->println("--NTP configuration--");
 		debugger->printf("Enabled:              %s\r\n", ntp.enable ? "Yes" : "No");
 		if(ntp.enable) {
-			debugger->printf("Offset:               %i\r\n", ntp.offset);
-			debugger->printf("Summer offset:        %i\r\n", ntp.summerOffset);
+			debugger->printf("Timezone:             %s\r\n", ntp.timezone);
 			debugger->printf("Server:               %s\r\n", ntp.server);
 			debugger->printf("DHCP:                 %s\r\n", ntp.dhcp ? "Yes" : "No");
 		}
@@ -1057,12 +1246,12 @@ void AmsConfiguration::print(Print* debugger)

 	EntsoeConfig entsoe;
 	if(getEntsoeConfig(entsoe)) {
-		debugger->println("--ENTSO-E configuration--");
-		debugger->printf("Token:                %s\r\n", entsoe.token);
-		if(strlen(entsoe.token) > 0) {
+		if(strlen(entsoe.area) > 0) {
+			debugger->println("--ENTSO-E configuration--");
 			debugger->printf("Area:                 %s\r\n", entsoe.area);
 			debugger->printf("Currency:             %s\r\n", entsoe.currency);
 			debugger->printf("Multiplier:           %f\r\n", entsoe.multiplier / 1000.0);
+			debugger->printf("Token:                %s\r\n", entsoe.token);
 		}
 		debugger->println("");
 		delay(10);
--- a/lib/AmsConfiguration/src/hexutils.cpp
+++ b/lib/AmsConfiguration/src/hexutils.cpp
@@ -20,4 +20,17 @@ 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);
 	}
+}
+
+void stripNonAscii(uint8_t* in, uint16_t size) {
+	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(in[i] < 32 || in[i] > 126) {
+			memset(in+i, ' ', 1);
+		}
+	}
+	memset(in+size-1, 0, 1); // Make sure the last character is null-terminator
 }
--- a/lib/AmsData/include/AmsData.h
+++ b/lib/AmsData/include/AmsData.h
@@ -10,7 +10,7 @@ enum AmsType {
    AmsTypeKaifa = 0x02,
    AmsTypeKamstrup = 0x03,
    AmsTypeIskra = 0x08,
-    AmsTypeLandis = 0x09,
+    AmsTypeLandisGyr = 0x09,
    AmsTypeSagemcom = 0x0A,
    AmsTypeCustom = 0x88,
    AmsTypeUnknown = 0xFF
@@ -53,6 +53,14 @@ public:
    float getL2PowerFactor();
    float getL3PowerFactor();

+    float getL1ActiveImportPower();
+    float getL2ActiveImportPower();
+    float getL3ActiveImportPower();
+
+    float getL1ActiveExportPower();
+    float getL2ActiveExportPower();
+    float getL3ActiveExportPower();
+
    double getActiveImportCounter();
    double getReactiveImportCounter();
    double getActiveExportCounter();
@@ -61,18 +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;
    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
--- a/lib/AmsData/include/AmsMqttHandler.h
+++ b/lib/AmsData/include/AmsMqttHandler.h
@@ -7,7 +7,7 @@
 #include "AmsConfiguration.h"
 #include "EnergyAccounting.h"
 #include "HwTools.h"
-#include "entsoe/EntsoeApi.h"
+#include "EntsoeApi.h"

 class AmsMqttHandler {
 public:
@@ -15,11 +15,12 @@ public:
        this->mqtt = mqtt;
        this->json = buf;
    };
+    virtual ~AmsMqttHandler() {};

    virtual bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
    virtual bool publishTemperatures(AmsConfiguration*, HwTools*);
    virtual bool publishPrices(EntsoeApi* eapi);
-    virtual bool publishSystem(HwTools*);
+    virtual bool publishSystem(HwTools*, EntsoeApi*, EnergyAccounting*);

 protected:
    MQTTClient* mqtt;
--- a/lib/AmsData/src/AmsData.cpp
+++ b/lib/AmsData/src/AmsData.cpp
@@ -45,6 +45,12 @@ void AmsData::apply(AmsData& other) {
            this->l1PowerFactor = other.getL1PowerFactor();
            this->l2PowerFactor = other.getL2PowerFactor();
            this->l3PowerFactor = other.getL3PowerFactor();
+            this->l1activeImportPower = other.getL1ActiveImportPower();
+            this->l2activeImportPower = other.getL2ActiveImportPower();
+            this->l3activeImportPower = other.getL3ActiveImportPower();
+            this->l1activeExportPower = other.getL1ActiveExportPower();
+            this->l2activeExportPower = other.getL2ActiveExportPower();
+            this->l3activeExportPower = other.getL3ActiveExportPower();
        case 3:
            this->meterTimestamp = other.getMeterTimestamp();
            this->activeImportCounter = other.getActiveImportCounter();
@@ -58,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();
@@ -68,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() {
@@ -161,6 +170,30 @@ float AmsData::getL3PowerFactor() {
    return this->l3PowerFactor;
 }

+float AmsData::getL1ActiveImportPower() {
+    return this->l1activeImportPower;
+}
+
+float AmsData::getL2ActiveImportPower() {
+    return this->l2activeImportPower;
+}
+
+float AmsData::getL3ActiveImportPower() {
+    return this->l3activeImportPower;
+}
+
+float AmsData::getL1ActiveExportPower() {
+    return this->l1activeExportPower;
+}
+
+float AmsData::getL2ActiveExportPower() {
+    return this->l2activeExportPower;
+}
+
+float AmsData::getL3ActiveExportPower() {
+    return this->l3activeExportPower;
+}
+
 double AmsData::getActiveImportCounter() {
    return this->activeImportCounter;
 }
@@ -184,3 +217,16 @@ bool AmsData::isThreePhase() {
 bool AmsData::isTwoPhase() {
    return this->twoPhase;
 }
+
+int8_t AmsData::getLastError() {
+    return lastErrorCount > 3 ? lastError : 0;
+}
+
+void AmsData::setLastError(int8_t lastError) {
+    this->lastError = lastError;
+    if(lastError == 0) {
+        lastErrorCount = 0;
+    } else {
+        lastErrorCount++;
+    }
+}
--- a/lib/AmsDataStorage/include/AmsDataStorage.h
+++ b/lib/AmsDataStorage/include/AmsDataStorage.h
@@ -7,31 +7,33 @@

 struct DayDataPoints {
    uint8_t version;
-    int16_t hImport[24];
+    uint16_t hImport[24];
    time_t lastMeterReadTime;
    uint32_t activeImport;
    uint32_t activeExport;
-    int16_t hExport[24];
-}; // 112 bytes
+    uint16_t hExport[24];
+    uint8_t accuracy;
+}; // 113 bytes

 struct MonthDataPoints {
    uint8_t version;
-    int16_t dImport[31];
+    uint16_t dImport[31];
    time_t lastMeterReadTime;
    uint32_t activeImport;
    uint32_t activeExport;
-    int16_t dExport[31];
-}; // 141 bytes
+    uint16_t dExport[31];
+    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
--- a/lib/AmsDataStorage/src/AmsDataStorage.cpp
+++ b/lib/AmsDataStorage/src/AmsDataStorage.cpp
@@ -5,8 +5,10 @@
 #include "version.h"

 AmsDataStorage::AmsDataStorage(RemoteDebug* debugger) {
-    day.version = 4;
-    month.version = 5;
+    day.version = 5;
+    day.accuracy = 1;
+    month.version = 6;
+    month.accuracy = 1;
    this->debugger = debugger;
 }

@@ -21,7 +23,7 @@ bool AmsDataStorage::update(AmsData* data) {
    }

    time_t now = time(nullptr);
-    if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Time is: %lld\n", (int64_t) now);
+    if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Time is: %lu\n", (int32_t) now);
    if(tz == NULL) {
        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Timezone is missing\n");
        return false;
@@ -30,18 +32,18 @@ bool AmsDataStorage::update(AmsData* data) {
        if(data->getMeterTimestamp() > BUILD_EPOCH) {
            now = data->getMeterTimestamp();
            if(debugger->isActive(RemoteDebug::DEBUG)) {
-                debugger->printf("(AmsDataStorage) Using meter timestamp, which is: %lld\n", (int64_t) now);
+                debugger->printf("(AmsDataStorage) Using meter timestamp, which is: %lu\n", (int32_t) now);
            }
        } else if(data->getPackageTimestamp() > BUILD_EPOCH) {
            now = data->getPackageTimestamp();
            if(debugger->isActive(RemoteDebug::DEBUG)) {
-                debugger->printf("(AmsDataStorage) Using package timestamp, which is: %lld\n", (int64_t) now);
+                debugger->printf("(AmsDataStorage) Using package timestamp, which is: %lu\n", (int32_t) now);
            }
        }
    }
    if(now < BUILD_EPOCH) {
        if(debugger->isActive(RemoteDebug::VERBOSE)) {
-            debugger->printf("(AmsDataStorage) Invalid time: %lld\n", (int64_t) now);
+            debugger->printf("(AmsDataStorage) Invalid time: %lu\n", (int32_t) now);
        }
        return false;
    }
@@ -63,7 +65,7 @@ bool AmsDataStorage::update(AmsData* data) {
        return true;
    } else {
        if(debugger->isActive(RemoteDebug::DEBUG)) {
-            debugger->printf("(AmsDataStorage) Last day update: %lld\n", (int64_t) day.lastMeterReadTime);
+            debugger->printf("(AmsDataStorage) Last day update: %lu\n", (int32_t) day.lastMeterReadTime);
        }
        tmElements_t last;
        breakTime(day.lastMeterReadTime, last);
@@ -86,7 +88,7 @@ bool AmsDataStorage::update(AmsData* data) {
        month.lastMeterReadTime = now;
    } else {
        if(debugger->isActive(RemoteDebug::DEBUG)) {
-            debugger->printf("(AmsDataStorage) Last month update: %lld\n", (int64_t) month.lastMeterReadTime);
+            debugger->printf("(AmsDataStorage) Last month update: %lu\n", (int32_t) month.lastMeterReadTime);
        }
        tmElements_t last;
        breakTime(tz->toLocal(month.lastMeterReadTime), last);
@@ -156,7 +158,7 @@ bool AmsDataStorage::update(AmsData* data) {
                setHourExport(last.Hour, exp);

                if(debugger->isActive(RemoteDebug::INFO)) {
-                    debugger->printf("(AmsDataStorage) Estimated usage for hour %u: %.1f - %.1f (%lld)\n", last.Hour, imp, exp, (int64_t) cur);
+                    debugger->printf("(AmsDataStorage) Estimated usage for hour %u: %.1f - %.1f (%lu)\n", last.Hour, imp, exp, (int32_t) cur);
                }

                day.activeImport += imp;
@@ -199,7 +201,7 @@ bool AmsDataStorage::update(AmsData* data) {
            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("(AmsDataStorage) Last month read after resetting to midnight: %lld\n", (int64_t) month.lastMeterReadTime);
+                debugger->printf("(AmsDataStorage) Last month read after resetting to midnight: %lu\n", (int32_t) month.lastMeterReadTime);
            }

            float hrs = (now - month.lastMeterReadTime) / 3600.0;
@@ -224,7 +226,7 @@ bool AmsDataStorage::update(AmsData* data) {
                setDayExport(last.Day, exp);

                if(debugger->isActive(RemoteDebug::INFO)) {
-                    debugger->printf("(AmsDataStorage) Estimated usage for day %u: %.1f - %.1f (%lld)\n", last.Day, imp, exp, (int64_t) cur);
+                    debugger->printf("(AmsDataStorage) Estimated usage for day %u: %.1f - %.1f (%lu)\n", last.Day, imp, exp, (int32_t) cur);
                }

                month.activeImport += imp;
@@ -237,44 +239,160 @@ bool AmsDataStorage::update(AmsData* data) {
    return ret;
 }

-void AmsDataStorage::setHourImport(uint8_t hour, int32_t val) {
+void AmsDataStorage::setHourImport(uint8_t hour, uint32_t val) {
    if(hour < 0 || hour > 24) return;
-    day.hImport[hour] = val / 10;
+    
+    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);
+    }
 }

-int32_t AmsDataStorage::getHourImport(uint8_t hour) {
+uint32_t AmsDataStorage::getHourImport(uint8_t hour) {
    if(hour < 0 || hour > 24) return 0;
-    return day.hImport[hour] * 10;
+    return day.hImport[hour] * pow(10, day.accuracy);
 }

-void AmsDataStorage::setHourExport(uint8_t hour, int32_t val) {
+void AmsDataStorage::setHourExport(uint8_t hour, uint32_t val) {
    if(hour < 0 || hour > 24) return;
-    day.hExport[hour] = val / 10;
+    
+    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);
+    }
 }

-int32_t AmsDataStorage::getHourExport(uint8_t hour) {
+uint32_t AmsDataStorage::getHourExport(uint8_t hour) {
    if(hour < 0 || hour > 24) return 0;
-    return day.hExport[hour] * 10;
+    return day.hExport[hour] * pow(10, day.accuracy);
 }

-void AmsDataStorage::setDayImport(uint8_t day, int32_t val) {
+void AmsDataStorage::setDayImport(uint8_t day, uint32_t val) {
    if(day < 1 || day > 31) return;
-    month.dImport[day-1] = val / 10;
+    
+    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);
+    }
 }

-int32_t AmsDataStorage::getDayImport(uint8_t day) {
+uint32_t AmsDataStorage::getDayImport(uint8_t day) {
    if(day < 1 || day > 31) return 0;
-    return (month.dImport[day-1] * 10);
+    return (month.dImport[day-1] * pow(10, month.accuracy));
 }

-void AmsDataStorage::setDayExport(uint8_t day, int32_t val) {
+void AmsDataStorage::setDayExport(uint8_t day, uint32_t val) {
    if(day < 1 || day > 31) return;
-    month.dExport[day-1] = val / 10;
+    
+    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);
+    }
 }

-int32_t AmsDataStorage::getDayExport(uint8_t day) {
+uint32_t AmsDataStorage::getDayExport(uint8_t day) {
    if(day < 1 || day > 31) return 0;
-    return (month.dExport[day-1] * 10);
+    return (month.dExport[day-1] * pow(10, month.accuracy));
 }

 bool AmsDataStorage::load() {
@@ -348,31 +466,74 @@ MonthDataPoints AmsDataStorage::getMonthData() {
 }

 bool AmsDataStorage::setDayData(DayDataPoints& day) {
-    if(day.version == 4) {
+    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.version = 4;
+        this->day.accuracy = 1;
+        this->day.version = 5;
        return true;
    }
    return false;
 }

 bool AmsDataStorage::setMonthData(MonthDataPoints& month) {
-    if(month.version == 5) {
+    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.version = 5;
+        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();
 }
@@ -383,11 +544,11 @@ bool AmsDataStorage::isDayHappy() {
    tmElements_t tm, last;

    if(now < day.lastMeterReadTime) {
-        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Day %lld < %lld\n", (int64_t) now, (int64_t) day.lastMeterReadTime);
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Day %lu < %lu\n", (int32_t) now, (int32_t) day.lastMeterReadTime);
        return false;
    }
    if(now-day.lastMeterReadTime > 3600) {
-        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Day %lld - %lld > 3600\n", (int64_t) now, (int64_t) day.lastMeterReadTime);
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Day %lu - %lu > 3600\n", (int32_t) now, (int32_t) day.lastMeterReadTime);
        return false;
    }
    breakTime(tz->toLocal(now), tm);
@@ -411,11 +572,11 @@ bool AmsDataStorage::isMonthHappy() {
    tmElements_t tm, last;
    
    if(now < month.lastMeterReadTime) {
-        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Month %lld < %lld\n", (int64_t) now, (int64_t) month.lastMeterReadTime);
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Month %lu < %lu\n", (int32_t) now, (int32_t) month.lastMeterReadTime);
        return false;
    }
    if(now-month.lastMeterReadTime > 86400) {
-        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Month %lld - %lld > 3600\n", (int64_t) now, (int64_t) month.lastMeterReadTime);
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(AmsDataStorage) Month %lu - %lu > 3600\n", (int32_t) now, (int32_t) month.lastMeterReadTime);
        return false;
    }
    breakTime(tz->toLocal(now), tm);
--- a/lib/AmsDecoder/include/Cosem.h
+++ b/lib/AmsDecoder/include/Cosem.h
--- a/lib/AmsDecoder/include/DataParser.h
+++ b/lib/AmsDecoder/include/DataParser.h
--- a/lib/AmsDecoder/include/DataParsers.h
+++ b/lib/AmsDecoder/include/DataParsers.h
--- a/lib/AmsDecoder/include/DlmsParser.h
+++ b/lib/AmsDecoder/include/DlmsParser.h
--- a/lib/AmsDecoder/include/DsmrParser.h
+++ b/lib/AmsDecoder/include/DsmrParser.h
--- a/lib/AmsDecoder/include/GbtParser.h
+++ b/lib/AmsDecoder/include/GbtParser.h
--- a/lib/AmsDecoder/include/GcmParser.h
+++ b/lib/AmsDecoder/include/GcmParser.h
--- a/lib/AmsDecoder/include/HdlcParser.h
+++ b/lib/AmsDecoder/include/HdlcParser.h
--- a/lib/AmsDecoder/include/LlcParser.h
+++ b/lib/AmsDecoder/include/LlcParser.h
--- a/lib/AmsDecoder/include/MbusParser.h
+++ b/lib/AmsDecoder/include/MbusParser.h
--- a/lib/AmsDecoder/include/crc.h
+++ b/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
--- a/lib/AmsDecoder/include/ntohll.h
+++ b/lib/AmsDecoder/include/ntohll.h
--- a/lib/AmsDecoder/src/Cosem.cpp
+++ b/lib/AmsDecoder/src/Cosem.cpp
--- a/lib/AmsDecoder/src/DlmsParser.cpp
+++ b/lib/AmsDecoder/src/DlmsParser.cpp
--- a/lib/AmsDecoder/src/DsmrParser.cpp
+++ b/lib/AmsDecoder/src/DsmrParser.cpp
@@ -1,10 +1,12 @@
 #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;
    bool reachedEnd = verified;
    uint8_t lastByte = 0x00;
-    int c = 0;
    for(int pos = 0; pos < ctx.length; pos++) {
        uint8_t b = *(buf+pos);
        if(pos == 0 && b != '/') return DATA_PARSE_BOUNDRY_FLAG_MISSING;
@@ -15,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;
 }
--- a/lib/AmsDecoder/src/GbtParser.cpp
+++ b/lib/AmsDecoder/src/GbtParser.cpp
--- a/lib/AmsDecoder/src/GcmParser.cpp
+++ b/lib/AmsDecoder/src/GcmParser.cpp
@@ -27,7 +27,7 @@ int8_t GCMParser::parse(uint8_t *d, DataParserContext &ctx) {
    memcpy(ctx.system_title, ptr, systemTitleLength);
    memcpy(initialization_vector, ctx.system_title, systemTitleLength);

-    int len;
+    int len = 0;
    int headersize = 2 + systemTitleLength;
    ptr += systemTitleLength;
    if(((*ptr) & 0xFF) == 0x81) {
--- a/lib/AmsDecoder/src/HdlcParser.cpp
+++ b/lib/AmsDecoder/src/HdlcParser.cpp
@@ -5,8 +5,6 @@
 int8_t HDLCParser::parse(uint8_t *d, DataParserContext &ctx) {
    int len;

-    uint8_t flag = *d;
-
    uint8_t* ptr;
    if(ctx.length < 3)
        return DATA_PARSE_INCOMPLETE;
--- a/lib/AmsDecoder/src/LlcParser.cpp
+++ b/lib/AmsDecoder/src/LlcParser.cpp
@@ -1,7 +1,6 @@
 #include "LlcParser.h"

 int8_t LLCParser::parse(uint8_t *buf, DataParserContext &ctx) {
-    LLCHeader* llc = (LLCHeader*) buf;
    ctx.length -= 3;
    return 3;
 }
--- a/lib/AmsDecoder/src/MbusParser.cpp
+++ b/lib/AmsDecoder/src/MbusParser.cpp
@@ -5,8 +5,6 @@ int8_t MBUSParser::parse(uint8_t *d, DataParserContext &ctx) {
    int headersize = 3;
    int footersize = 1;

-    uint8_t flag = *d;
-
    uint8_t* ptr;

    // https://m-bus.com/documentation-wired/06-application-layer
--- a/lib/AmsDecoder/src/crc.cpp
+++ b/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;
+}
--- a/lib/AmsDecoder/src/ntohll.cpp
+++ b/lib/AmsDecoder/src/ntohll.cpp
--- a/lib/ClassicUi/html/application.js
+++ b/lib/ClassicUi/html/application.js
@@ -316,6 +316,7 @@ $(function() {
            url: swv.data('url'),
            dataType: 'json'
        }).done(function(releases) {
+            var isnew = false;
            if(/^v\d{1,2}\.\d{1,2}\.\d{1,2}$/.test(swv.text()) && fwl.length == 0) {
                releases.reverse();
                var next_patch;
@@ -352,10 +353,13 @@ $(function() {
                });
                if(next_minor) {
                    nextVersion = next_minor;
+                    isnew = true;
                } else if(next_major) {
                    nextVersion = next_major;
+                    isnew = true;
                } else if(next_patch) {
                    nextVersion = next_patch;
+                    isnew = true;
                }
            } else {
                nextVersion = releases[0];
@@ -375,9 +379,11 @@ $(function() {
                        }
                    });
                };
-                $('#newVersionTag').text(nextVersion.tag_name);
-                $('#newVersionUrl').prop('href', nextVersion.html_url);
-                $('#newVersion').removeClass('d-none');
+                if(isnew) {
+                    $('#newVersionTag').text(nextVersion.tag_name);
+                    $('#newVersionUrl').prop('href', nextVersion.html_url);
+                    $('#newVersion').removeClass('d-none');
+                }
            }
        });
    }
@@ -478,7 +484,7 @@ var drawDay = function() {
        timeout: 30000,
        dataType: 'json',
    }).done(function(json) {
-        data = [['Hour', 'Import', { role: 'style' }, { role: 'annotation' }, 'Export', { role: 'style' }]];
+        data = [['Hour', 'Import', { role: 'style' }, { role: 'annotation' }, 'Export', { role: 'style' }, { role: 'annotation' }]];
        var r = 1;
        var hour = moment.utc().hours();
        var offset = moment().utcOffset()/60;
@@ -486,13 +492,13 @@ var drawDay = function() {
        for(var i = hour; i<24; i++) {
            var imp = json["i"+zeropad(i)];
            var exp = json["e"+zeropad(i)];
-            data[r++] = [zeropad((i+offset)%24), imp, "opacity: 0.9;", exp == 0 ? imp.toFixed(1) : imp.toFixed(1) + '\n' + -exp.toFixed(1), exp == 0 ? 0 : -exp, "opacity: 0.9;"];
+            data[r++] = [zeropad((i+offset)%24), imp, "opacity: 0.9;", imp == 0 ? "" : imp.toFixed(1), exp == 0 ? 0 : -exp, "opacity: 0.9;", exp == 0 ? "" : -exp.toFixed(1)];
            min = Math.min(0, -exp);
        };
        for(var i = 0; i < hour; i++) {
            var imp = json["i"+zeropad(i)];
            var exp = json["e"+zeropad(i)];
-            data[r++] = [zeropad((i+offset)%24), imp, "opacity: 0.9;", exp == 0 ? imp.toFixed(1) : imp.toFixed(1) + '\n' + -exp.toFixed(1), exp == 0 ? 0 : -exp, "opacity: 0.9;"];
+            data[r++] = [zeropad((i+offset)%24), imp, "opacity: 0.9;", imp == 0 ? "" : imp.toFixed(1), exp == 0 ? 0 : -exp, "opacity: 0.9;", exp == 0 ? "" : -exp.toFixed(1)];
            min = Math.min(0, -exp);
        };
        ea = google.visualization.arrayToDataTable(data);
@@ -511,7 +517,7 @@ var drawMonth = function() {
        timeout: 30000,
        dataType: 'json',
    }).done(function(json) {
-        data = [['Hour', 'Import', { role: 'style' }, { role: 'annotation' }, 'Export', { role: 'style' }]];
+        data = [['Hour', 'Import', { role: 'style' }, { role: 'annotation' }, 'Export', { role: 'style' }, { role: 'annotation' }]];
        var r = 1;
        var day = moment().date();
        var eom = moment().subtract(1, 'months').endOf('month').date();
@@ -519,13 +525,13 @@ var drawMonth = function() {
        for(var i = day; i<=eom; i++) {
            var imp = json["i"+zeropad(i)];
            var exp = json["e"+zeropad(i)];
-            data[r++] = [zeropad(i), imp, "opacity: 0.9;", exp == 0 ? imp.toFixed(0) : imp.toFixed(0) + '\n' + -exp.toFixed(0), exp == 0 ? 0 : -exp, "opacity: 0.9;"];
+            data[r++] = [zeropad(i), imp, "opacity: 0.9;", imp == 0 ? "" : imp.toFixed(0), exp == 0 ? 0 : -exp, "opacity: 0.9;", exp == 0 ? "" : -exp.toFixed(0)];
            min = Math.min(0, -exp);
        }
        for(var i = 1; i < day; i++) {
            var imp = json["i"+zeropad(i)];
            var exp = json["e"+zeropad(i)];
-            data[r++] = [zeropad(i), imp, "opacity: 0.9;", exp == 0 ? imp.toFixed(0) : imp.toFixed(0) + '\n' + -exp.toFixed(0), exp == 0 ? 0 : -exp, "opacity: 0.9;"];
+            data[r++] = [zeropad(i), imp, "opacity: 0.9;", imp == 0 ? "" : imp.toFixed(0), exp == 0 ? 0 : -exp, "opacity: 0.9;", exp == 0 ? "" : -exp.toFixed(0)];
            min = Math.min(0, -exp);
        }
        ma = google.visualization.arrayToDataTable(data);
@@ -651,7 +657,7 @@ var fetch = function() {

        if(ip) {
            var v = parseInt(json.i);
-            var pct = (v*100)/parseInt(json.im);
+            var pct = Math.min((v*100)/parseInt(json.im), 100);
            var append = "W";
            if(v > 1000 && !swatt) {
                v = (v/1000).toFixed(1);
@@ -677,7 +683,7 @@ var fetch = function() {
            $('.rim').hide();
            if(xp) {
                var v = parseInt(json.e);
-                var pct = (v*100)/(om*1000);
+                var pct = Math.min((v*100)/(om*1000), 100);
                var append = "W";
                if(v > 1000 && !swatt) {
                    v = (v/1000).toFixed(1);
@@ -717,21 +723,21 @@ var fetch = function() {
                var u1 = parseFloat(json.u1);
                t += u1;
                c++;
-                var pct = (Math.max(parseFloat(json.u1)-195.5, 1)*100/69);
+                var pct = Math.min(Math.max(parseFloat(json.u1)-195.5, 1)*100/69, 100);
                arr[r++] = [ds == 1 ? 'L1-L2' : 'L1', u1, "color: " + voltcol(pct) + ";opacity: 0.9;", u1 + "V"];
            }
            if(json.u2) {
                var u2 = parseFloat(json.u2);
                t += u2;
                c++;
-                var pct = (Math.max(parseFloat(json.u2)-195.5, 1)*100/69);
+                var pct = Math.min(Math.max(parseFloat(json.u2)-195.5, 1)*100/69, 100);
                arr[r++] = [ds == 1 ? 'L1-L3' : 'L2', u2, "color: " + voltcol(pct) + ";opacity: 0.9;", u2 + "V"];
            }
            if(json.u3) {
                var u3 = parseFloat(json.u3);
                t += u3;
                c++;
-                var pct = (Math.max(parseFloat(json.u3)-195.5, 1)*100/69);
+                var pct = Math.min(Math.max(parseFloat(json.u3)-195.5, 1)*100/69, 100);
                arr[r++] = [ds == 1 ? 'L2-L3' : 'L3', u3, "color: " + voltcol(pct) + ";opacity: 0.9;", u3 + "V"];
            }
            v = t/c;
@@ -756,19 +762,19 @@ var fetch = function() {
            if(json.i1 || json.u1) {
                var i1 = parseFloat(json.i1);
                dA = true;
-                var pct = (parseFloat(json.i1)/parseInt(json.mf))*100;
+                var pct = Math.min((parseFloat(json.i1)/parseInt(json.mf))*100, 100);
                arr[r++] = ['L1', pct, "color: " + ampcol(pct) + ";opacity: 0.9;", i1 + "A"];
            }
            if(json.i2 || json.u2) {
                var i2 = parseFloat(json.i2);
                dA = true;
-                var pct = (parseFloat(json.i2)/parseInt(json.mf))*100;
+                var pct = Math.min((parseFloat(json.i2)/parseInt(json.mf))*100, 100);
                arr[r++] = ['L2', pct, "color: " + ampcol(pct) + ";opacity: 0.9;", i2 + "A"];
            }
            if(json.i3 || json.u3) {
                var i3 = parseFloat(json.i3);
                dA = true;
-                var pct = (parseFloat(json.i3)/parseInt(json.mf))*100;
+                var pct = Math.min((parseFloat(json.i3)/parseInt(json.mf))*100, 100);
                arr[r++] = ['L3', pct, "color: " + ampcol(pct) + ";opacity: 0.9;", i3 + "A"];
            }
            if(dA) {
@@ -790,6 +796,12 @@ var fetch = function() {
            if(currency) {
                $('.sp').show();
            }
+            if(om > 0) {
+                $('.se').removeClass('d-none');
+                $('#eache').html(json.ea.h.p.toFixed(2));
+                $('#eacde').html(json.ea.d.p.toFixed(1));
+                $('#eacme').html(json.ea.m.p.toFixed(0));
+            }
        }

        if(json.me) {
@@ -842,7 +854,7 @@ var fetch = function() {
                $('.jmt').html("Iskra");
                break;
            case 9:
-                $('.jmt').html("Landis");
+                $('.jmt').html("Landis+Gyr");
                break;
            case 10:
                $('.jmt').html("Sagemcom");
@@ -878,7 +890,7 @@ var fetch = function() {

 var upgrade = function() {
    if(nextVersion) {
-        if(confirm("Are you sure you want to perform upgrade to " + nextVersion.tag_name + "?")) {
+        if(confirm("WARNING: If you have a M-BUS powered device (Pow-U), please keep USB power connected while upgrading.\n\nAre you sure you want to perform upgrade to " + nextVersion.tag_name + "?")) {
            $('#loading-indicator').show();
            window.location.href="/upgrade?version=" + nextVersion.tag_name;
        }
--- a/lib/ClassicUi/html/boot.css
+++ b/lib/ClassicUi/html/boot.css
--- a/lib/ClassicUi/html/configfile.html
+++ b/lib/ClassicUi/html/configfile.html
--- a/lib/ClassicUi/html/data.json
+++ b/lib/ClassicUi/html/data.json
@@ -23,8 +23,8 @@
    "v" : %.3f,
    "r" : %d,
    "t" : %.2f,
-    "u" : %lu,
-    "m" : %lu,
+    "u" : %u,
+    "m" : %u,
    "em" : %d,
    "hm" : %d,
    "wm" : %d,
@@ -35,19 +35,26 @@
    "ds" : %d,
    "ea" : {
        "x" : %.1f,
+        "p" : [ %s ],
        "t" : %d,
        "h" : {
            "u" : %.2f,
-            "c" : %.2f
+            "c" : %.2f,
+            "p" : %.2f,
+            "i" : %.2f
        },
        "d" : {
            "u" : %.2f,
-            "c" : %.2f
+            "c" : %.2f,
+            "p" : %.2f,
+            "i" : %.2f
        },
        "m" : {
            "u" : %.2f,
-            "c" : %.2f
+            "c" : %.2f,
+            "p" : %.2f,
+            "i" : %.2f
        }
    },
-    "c" : %lu
+    "c" : %u
 }
--- a/lib/ClassicUi/html/dayplot.json
+++ b/lib/ClassicUi/html/dayplot.json
--- a/lib/ClassicUi/html/debugging.html
+++ b/lib/ClassicUi/html/debugging.html
--- a/lib/ClassicUi/html/delete.html
+++ b/lib/ClassicUi/html/delete.html
--- a/lib/ClassicUi/html/domoticz.html
+++ b/lib/ClassicUi/html/domoticz.html
--- a/lib/ClassicUi/html/energyprice.json
+++ b/lib/ClassicUi/html/energyprice.json
--- a/lib/ClassicUi/html/firmware.html
+++ b/lib/ClassicUi/html/firmware.html
@@ -1,18 +1,21 @@
 <div class="alert alert-danger">
-    WARNING: Units powered over M-bus must be connected to an external power supply during firmware upload. Failure to do so may cause power-down during upload resulting in non-functioning unit.
+    WARNING: Units powered by M-BUS (Pow-U) must be connected to an external power supply during firmware upload. Failure to do so may cause power-down during upload resulting in non-functioning unit.
 </div>
 <div class="alert alert-warning">
    Your board is using {chipset} chipset. Only upload firmware designed for this chipset. Failure to do so may result in non-functioning unit.
    <span id="fwDownload" style="display: none;"><br/>Download latest firmware file <a  id="fwLink" href="#" data-chipset="{chipset}">here</a></span>
 </div>
+<div class="alert alert-warning">
+    When using URL, only a valid ESP OTA server response will be accepted.
+</div>

 <form method="post" enctype="multipart/form-data" class="upload-form">
    <div class="my-3 p-3 bg-white rounded shadow">
        <div class="row">
            <div class="col-lg-6">
-                <div class="input-group mb-3">
+                <div class="input-group">
                    <div class="input-group-prepend">
-                        <span class="input-group-text">Upload</span>
+                        <span class="input-group-text">Upload file</span>
                    </div>
                    <div class="custom-file">
                        <input name="file" type="file" class="custom-file-input" id="fileUploadField">
@@ -21,6 +24,19 @@
                </div>
            </div>
        </div>
+        <div class="row">
+            <div class="col-lg-6">or</div>
+        </div>
+        <div class="row">
+            <div class="col-lg-6">
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Use URL</span>
+                    </div>
+                    <input type="text" name="url" class="form-control"/>
+                </div>
+            </div>
+        </div>
    </div>
    <hr/>
    <div class="row form-group">
@@ -28,7 +44,7 @@
            <a href="javascript:history.back();" class="btn btn-outline-secondary">Back</a>
        </div>
        <div class="col-6 text-right">
-            <button class="btn btn-primary">Upload</button>
+            <button class="btn btn-primary">Upgrade firmware</button>
        </div>
    </div>
-</form>
+</form>
--- a/lib/ClassicUi/html/foot.html
+++ b/lib/ClassicUi/html/foot.html
@@ -1,6 +1,5 @@
        <div id="newVersion" class="alert alert-info d-none">New version <span id="newVersionTag"></span>! 
-            <a id="newVersionUrl" href="#" target="_blank">view</a>
-            <span class="d-none ssl-capable"> or <a href="javascript:upgrade();">upgrade</a></span>
+            <a id="newVersionUrl" href="#" target="_blank">view</a> or <a href="javascript:upgrade();">click here to upgrade</a>
        </div>
    </main>

--- a/lib/ClassicUi/html/github.svg
+++ b/lib/ClassicUi/html/github.svg
--- a/lib/ClassicUi/html/gpio.html
+++ b/lib/ClassicUi/html/gpio.html
@@ -1,6 +1,6 @@
 <div class="alert alert-warning">!!WARNING!!<br/>Do not change anything here unless you know exactly what you are doing! Changing things here could cause the device to stop responding</div>
 <form method="post" action="/save">
-    <input type="hidden" name="gpioConfig" value="true"/>
+    <input type="hidden" name="gc" value="true"/>
    <div class="my-3 p-3 bg-white rounded shadow">
        <h6>GPIO settings</h6>
        <div class="d-flex flex-row flex-wrap">
@@ -8,18 +8,18 @@
                <div class="input-group-prepend">
                    <span class="input-group-text">HAN</span>
                </div>
-                <select name="hanPin" class="form-control">
-                    ${options.han}
+                <select name="h" class="form-control">
+                    ${h}
                </select>
            </div>
            <div class="m-2 input-group input-group-sm" style="width: 150px;">
                <div class="input-group-prepend">
                    <span class="input-group-text">LED</span>
                </div>
-                <input name="ledPin" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPin}"/>
+                <input name="l" type="number" min="2" max="${g}" class="form-control" value="${l}"/>
                <div class="input-group-append" title="Inverted">
                    <label class="input-group-text">
-                        <input type="checkbox" name="ledInverted" value="true" ${config.ledInverted}/> inv
+                        <input type="checkbox" name="i" value="true" ${i}/> inv
                    </label>
                </div>
            </div>
@@ -27,12 +27,12 @@
                <div class="input-group-prepend">
                    <span class="input-group-text">RGB</span>
                </div>
-                <input name="ledPinRed" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPinRed}"/>
-                <input name="ledPinGreen" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPinGreen}"/>
-                <input name="ledPinBlue" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPinBlue}"/>
+                <input name="r" type="number" min="2" max="${g}" class="form-control" value="${r}"/>
+                <input name="e" type="number" min="2" max="${g}" class="form-control" value="${e}"/>
+                <input name="b" type="number" min="2" max="${g}" class="form-control" value="${b}"/>
                <div class="input-group-append" title="Inverted">
                    <label class="input-group-text">
-                        <input type="checkbox" name="ledRgbInverted" value="true" ${config.ledRgbInverted}/> inv
+                        <input type="checkbox" name="n" value="true" ${n}/> inv
                    </label>
                </div>
            </div>
@@ -40,31 +40,31 @@
                <div class="input-group-prepend">
                    <span class="input-group-text">AP button</span>
                </div>
-                <input name="apPin" type="number" min="0" max="${gpio.max}" class="form-control" value="${config.apPin}"/>
+                <input name="a" type="number" min="0" max="${g}" class="form-control" value="${a}"/>
            </div>
            <div class="m-2 input-group input-group-sm" style="width: 150px;">
                <div class="input-group-prepend">
                    <span class="input-group-text">Temperature</span>
                </div>
-                <input name="tempSensorPin" type="number" min="0" max="${gpio.max}" class="form-control" value="${config.tempSensorPin}"/>
+                <input name="t" type="number" min="0" max="${g}" class="form-control" value="${t}"/>
            </div>
            <div class="m-2 input-group input-group-sm" style="width: 150px;">
                <div class="input-group-prepend">
                    <span class="input-group-text">Analog temp</span>
                </div>
-                <input name="tempAnalogSensorPin" type="number" min="0" max="${gpio.max}" class="form-control" value="${config.tempAnalogSensorPin}"/>
+                <input name="m" type="number" min="0" max="${g}" class="form-control" value="${m}"/>
            </div>
            <div class="m-2 input-group input-group-sm" style="width: 100px;">
                <div class="input-group-prepend">
                    <span class="input-group-text">Vcc</span>
                </div>
-                <input name="vccPin" type="number" min="0" max="${gpio.max}" class="form-control" value="${config.vccPin}"/>
+                <input name="v" type="number" min="0" max="${g}" class="form-control" value="${v}"/>
            </div>
            <div class="m-2 input-group input-group-sm" style="width: 200px;">
                <div class="input-group-prepend">
                    <span class="input-group-text">GND resistor</span>
                </div>
-                <input type="number" min="1" max="1000" step="1" class="form-control" name="vccResistorGnd" value="${config.vccResistorGnd}" />
+                <input type="number" min="1" max="1000" step="1" class="form-control" name="d" value="${d}" />
                <div class="input-group-append" title="Inverted">
                    <label class="input-group-text">k&ohm;</label>
                </div>
@@ -73,7 +73,7 @@
                <div class="input-group-prepend">
                    <span class="input-group-text">Vcc resistor</span>
                </div>
-                <input type="number" min="1" max="1000" step="1" class="form-control" name="vccResistorVcc" value="${config.vccResistorVcc}" />
+                <input type="number" min="1" max="1000" step="1" class="form-control" name="s" value="${s}" />
                <div class="input-group-append" title="Inverted">
                    <label class="input-group-text">k&ohm;</label>
                </div>
@@ -82,19 +82,19 @@
                <div class="input-group-prepend">
                    <span class="input-group-text">Multiplier</span>
                </div>
-                <input type="number" min="0.1" max="10" step="0.01" class="form-control" name="vccMultiplier" value="${config.vccMultiplier}" />
+                <input type="number" min="0.1" max="10" step="0.01" class="form-control" name="u" value="${u}" />
            </div>
            <div class="m-2 input-group input-group-sm" style="width: 120px;">
                <div class="input-group-prepend">
                    <span class="input-group-text">Offset</span>
                </div>
-                <input type="number" min="0.0" max="3.5" step="0.01" class="form-control" name="vccOffset" value="${config.vccOffset}" />
+                <input type="number" min="0.0" max="3.5" step="0.01" class="form-control" name="o" value="${o}" />
            </div>
            <div class="m-2 input-group input-group-sm" style="width: 130px;">
                <div class="input-group-prepend">
                    <span class="input-group-text">Boot limit</span>
                </div>
-                <input type="number" min="2.5" max="3.5" step="0.1" class="form-control" name="vccBootLimit" value="${config.vccBootLimit}" />
+                <input type="number" min="2.5" max="3.5" step="0.1" class="form-control" name="c" value="${c}" />
            </div>
        </div>
    </div>
--- a/lib/ClassicUi/html/head.html
+++ b/lib/ClassicUi/html/head.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
    <meta charset="UTF-8">
@@ -47,7 +48,7 @@
 <main role="main" class="container">
    <header class="navbar navbar-expand navbar-dark flex-column flex-lg-row rounded shadow mt-2 mb-3" style="background-color: var(--purple);">
        <a href="/" class="">
-            <h6 class="navbar-brand">AMS reader <small id="swVersion" data-url="https://api.github.com/repos/gskjold/AmsToMqttBridge/releases">${version}</small></h6>
+            <h6 class="navbar-brand">AMS reader <small id="swVersion" data-url="https://api.github.com/repos/UtilitechAS/amsreader-firmware/releases">${version}</small></h6>
        </a>
        <div class="navbar-nav-scroll">
            <ul class="navbar-nav bd-navbar-nav flex-row">
@@ -63,9 +64,9 @@
                            <a class="dropdown-item" href="/mqtt">MQTT</a>
                            <a class="dropdown-item" href="/web">Web</a>
                            <a class="dropdown-item" href="/ntp">NTP</a>
-                            <a class="dropdown-item d-none ssl-capable" href="/entsoe">ENTSO-E API</a>
+                            <a class="dropdown-item" href="/priceapi">Price API</a>
                            <div class="dropdown-divider"></div>
-                            <a class="dropdown-item" href="https://github.com/gskjold/AmsToMqttBridge/wiki" target="_blank">Documentation</a>
+                            <a class="dropdown-item" href="https://github.com/UtilitechAS/amsreader-firmware/wiki" target="_blank">Documentation</a>
                        </div>
                    </div>
                </li>
@@ -95,7 +96,7 @@
        </div>
        <ul class="navbar-nav flex-row ml-md-auto d-none d-lg-flex">
            <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
+                <a class="nav-link p-2" href="https://github.com/UtilitechAS/amsreader-firmware" target="_blank" rel="noopener" aria-label="GitHub">
                    <img class="d-inline-block align-text-top" style="width: 2rem; height: 2rem;" src="github.svg"/>
                </a>
            </li>
--- a/lib/ClassicUi/html/index.html
+++ b/lib/ClassicUi/html/index.html
@@ -113,7 +113,7 @@

    <div class="col-xl-12 mb-3">
        <div class="bg-white rounded shadow pt-3 pb-3" style="font-size: 14px;">
-            <strong class="mr-3 ml-3">Real time calculation</strong><br/>
+            <strong class="mr-3 ml-3">Real time consumption</strong><br/>
            <div class="row">
                <div class="col-lg-3 col-sm-6">
                    <div class="mr-3 ml-3 d-flex">
@@ -151,6 +151,35 @@
                    </div>
                </div>
            </div>
+
+            <strong class="mr-3 ml-3 se d-none">Real time production</strong><br/>
+            <div class="row se d-none">
+                <div class="col-lg-3 col-sm-6">
+                    <div class="mr-3 ml-3 d-flex">
+                        <div>Hour</div>
+                        <div class="flex-fill text-right">
+                            <span id="eache"></span> kWh
+                        </div>
+                    </div>
+                </div>
+                <div class="col-lg-3 col-sm-6">
+                    <div class="mr-3 ml-3 d-flex">
+                        <div>Day</div>
+                        <div class="flex-fill text-right">
+                            <span id="eacde"></span> kWh
+                        </div>
+                    </div>
+                </div>
+                <div class="col-lg-3 col-sm-6">
+                    <div class="mr-3 ml-3 d-flex">
+                        <div>Month</div>
+                        <div class="flex-fill text-right">
+                            <span id="eacme"></span> kWh
+                        </div>
+                    </div>
+                </div>
+                <div class="col-lg-3 col-sm-6"></div>
+            </div>
        </div>
    </div>

--- a/lib/ClassicUi/html/meter.html
+++ b/lib/ClassicUi/html/meter.html
@@ -35,6 +35,7 @@
                        <span class="input-group-text">Baud rate</span>
                    </div>
                    <select class="form-control sd" name="b">
+                        <option value="300" {b300}>300</option>
                        <option value="2400" {b2400}>2400</option>
                        <option value="4800" {b4800}>4800</option>
                        <option value="9600" {b9600}>9600</option>
@@ -64,7 +65,7 @@
                </div>
            </div>
            <div class="col-lg-4 col-sm-8">
-                <a href="https://github.com/gskjold/AmsToMqttBridge/wiki/Known-hardware-configurations" target="_blank">Known hardware configurations</a>
+                <a href="https://github.com/UtilitechAS/amsreader-firmware/wiki/Known-hardware-configurations" target="_blank">Known hardware configurations</a>
            </div>
        </div>
        <div class="row">
--- a/lib/ClassicUi/html/meteradvanced.html
+++ b/lib/ClassicUi/html/meteradvanced.html
--- a/lib/ClassicUi/html/monthplot.json
+++ b/lib/ClassicUi/html/monthplot.json
--- a/lib/ClassicUi/html/mqtt.html
+++ b/lib/ClassicUi/html/mqtt.html
--- a/lib/ClassicUi/html/notfound.html
+++ b/lib/ClassicUi/html/notfound.html
--- a/lib/ClassicUi/html/ntp.html
+++ b/lib/ClassicUi/html/ntp.html
--- a/lib/ClassicUi/html/priceapi.html
+++ b/lib/ClassicUi/html/priceapi.html
@@ -0,0 +1,86 @@
+<form method="post" action="/save">
+    <input type="hidden" name="ec" value="true"/>
+    <div class="my-3 p-3 bg-white rounded shadow">
+        <h6>Price API</h6>
+        <div class="row">
+            <div class="col-xl-2 col-lg-3 col-md-4 col-sm-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Region</span>
+                    </div>
+                    <select name="ea" class="form-control">
+                        <option value="">None</option>
+                        <optgroup label="Norway">
+                            <option value="10YNO-1--------2" {no1}>NO1</option>
+                            <option value="10YNO-2--------T" {no2}>NO2</option>
+                            <option value="10YNO-3--------J" {no3}>NO3</option>
+                            <option value="10YNO-4--------9" {no4}>NO4</option>
+                            <option value="10Y1001A1001A48H" {no5}>NO5</option>
+                        </optgroup>
+                        <optgroup label="Sweden">
+                            <option value="10Y1001A1001A44P" {se1}>SE1</option>
+                            <option value="10Y1001A1001A45N" {se2}>SE2</option>
+                            <option value="10Y1001A1001A46L" {se3}>SE3</option>
+                            <option value="10Y1001A1001A47J" {se4}>SE4</option>
+                            </optgroup>
+                        <optgroup label="Denmark">
+                            <option value="10YDK-1--------W" {dk1}>DK1</option>
+                            <option value="10YDK-2--------M" {dk2}>DK2</option>
+                        </optgroup>
+                        <option value="10YAT-APG------L" {at}>Austria</option>
+                        <option value="10YBE----------2" {be}>Belgium</option>
+                        <option value="10YCZ-CEPS-----N" {cz}>Czech Republic</option>
+                        <option value="10Y1001A1001A39I" {ee}>Estonia</option>
+                        <option value="10YFI-1--------U" {fi}>Finland</option>
+                        <option value="10YFR-RTE------C" {fr}>France</option>
+                        <option value="10Y1001A1001A83F" {de}>Germany</option>
+                        <option value="10YGB----------A" {gb}>Great Britain</option>
+                        <option value="10YLV-1001A00074" {lv}>Latvia</option>
+                        <option value="10YLT-1001A0008Q" {lt}>Lithuania</option>
+                        <option value="10YNL----------L" {nl}>Netherland</option>
+                        <option value="10YPL-AREA-----S" {pl}>Poland</option>
+                        <option value="10YCH-SWISSGRIDZ" {ch}>Switzerland</option>
+                    </select>
+                </div>
+            </div>
+            <div class="col-xl-2 col-lg-3 col-md-4 col-sm-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Currency</span>
+                    </div>
+                    <select name="ecu" class="form-control">
+                        <option value="NOK" {nok}>NOK</option>
+                        <option value="SEK" {sek}>SEK</option>
+                        <option value="DKK" {dkk}>DKK</option>
+                        <option value="EUR" {eur}>EUR</option>
+                    </select>
+                </div>
+            </div>
+            <div class="col-xl-2 col-lg-3 col-md-4 col-sm-6">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Multiplier</span>
+                    </div>
+                    <input name="em" type="number" min="0.001" max="1000" step="0.001" class="form-control" value="{em}"/>
+                </div>
+            </div>
+            <div class="col-xl-4 col-lg-6 col-md-8 {dt}">
+                <div class="m-2 input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">ENTSO-E token</span>
+                    </div>
+                    <input type="text" name="et" class="form-control" value="{et}" placeholder="Optional"/>
+                </div>
+            </div>
+        </div>
+    </div>
+    <hr/>
+    <div class="row form-group">
+        <div class="col-6">
+            <a href="/" class="btn btn-outline-secondary">Back</a>
+        </div>
+        <div class="col-6 text-right">
+            <button class="btn btn-primary">Save</button>
+        </div>
+    </div>
+</form>
--- a/lib/ClassicUi/html/reset.html
+++ b/lib/ClassicUi/html/reset.html
--- a/lib/ClassicUi/html/restart.html
+++ b/lib/ClassicUi/html/restart.html
--- a/lib/ClassicUi/html/restartwait.html
+++ b/lib/ClassicUi/html/restartwait.html
@@ -12,15 +12,16 @@
        <a href="/" class=""><h6 class="navbar-brand">AMS reader <small>${version}</small></h6></a>
        <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
            <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
+                <a class="nav-link p-2" href="https://github.com/UtilitechAS/amsreader-firmware" target="_blank" rel="noopener" aria-label="GitHub">
                    <img class="d-inline-block align-text-top" style="width: 2rem; height: 2rem;" src="github.svg"/>
                </a>
            </li>
        </ul>
    </header>
-    <div class="my-3 p-3 bg-white rounded shadow">
+    <div class="my-3 p-3 bg-white rounded shadow {rs}">
        Device is rebooting. You will be redirected to the main page when it is available again.
    </div>
+    <div class="alert alert-warning shadow {us}">Firmware upgrade in progress, DO NOT disconnect power from the device. You will be redirected to the main page when firmware upgrade is complete.</div>
 </main>
 <script>
    var tries = 0;
--- a/lib/ClassicUi/html/setup.html
+++ b/lib/ClassicUi/html/setup.html
@@ -12,7 +12,7 @@
        <a href="/" class=""><h6 class="navbar-brand">AMS reader <small>${version}</small></h6></a>
        <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
            <li class="nav-item">
-                <a class="nav-link p-2" href="https://github.com/gskjold/AmsToMqttBridge" target="_blank" rel="noopener" aria-label="GitHub">
+                <a class="nav-link p-2" href="https://github.com/UtilitechAS/amsreader-firmware" target="_blank" rel="noopener" aria-label="GitHub">
                    <img style="width: 2rem; height: 2rem;" src="github.svg"/>
                </a>
            </li>
@@ -26,6 +26,7 @@
                    <select name="board" class="form-control" required>
                        <option value=""></option>
                        <optgroup label="Custom hardware">
+                            <option value="7" ${config.boardType7}>Pow-U+ (ESP32) from amsleser.no</option>
                            <option value="6" ${config.boardType6}>Pow-P1 from amsleser.no</option>
                            <option value="5" ${config.boardType5}>Pow-K+ (ESP32) from amsleser.no</option>
                            <option value="4" ${config.boardType4}>Pow-U or Pow-K from amsleser.no (GPIO12)</option>
--- a/lib/ClassicUi/html/temperature.html
+++ b/lib/ClassicUi/html/temperature.html
--- a/lib/ClassicUi/html/tempsensor.json
+++ b/lib/ClassicUi/html/tempsensor.json
--- a/lib/ClassicUi/html/thresholds.html
+++ b/lib/ClassicUi/html/thresholds.html
--- a/lib/ClassicUi/html/upload.html
+++ b/lib/ClassicUi/html/upload.html
--- a/lib/ClassicUi/html/web.html
+++ b/lib/ClassicUi/html/web.html
--- a/lib/ClassicUi/html/wifi.html
+++ b/lib/ClassicUi/html/wifi.html
@@ -37,7 +37,7 @@
            </div>
        </div>
        <div class="row" id="i">
-            <div class="col-xl-3 col-lg-4 form-group">
+            <div class="col-xl-3 col-lg-4 col-md-6 form-group">
                <div class="input-group input-group-sm">
                    <div class="input-group-prepend">
                        <span class="input-group-text">IP</span>
@@ -45,7 +45,7 @@
                    <input type="text" name="i" class="form-control sip" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" value="{i}"/>
                </div>
            </div>
-            <div class="col-xl-3 col-lg-4 form-group">
+            <div class="col-xl-3 col-lg-4 col-md-6 form-group">
                <div class="input-group input-group-sm">
                    <div class="input-group-prepend">
                        <span class="input-group-text">Netmask</span>
@@ -53,7 +53,7 @@
                    <input type="text" name="sn" class="form-control sip" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" value="{sn}"/>
                </div>
            </div>
-            <div class="col-xl-3 col-lg-4 form-group">
+            <div class="col-xl-3 col-lg-4 col-md-6 form-group">
                <div class="input-group input-group-sm">
                    <div class="input-group-prepend">
                        <span class="input-group-text">Gateway</span>
@@ -61,7 +61,7 @@
                    <input type="text" name="g" class="form-control sip" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" value="{g}"/>
                </div>
            </div>
-            <div class="col-xl-4 col-lg-5 form-group">
+            <div class="col-xl-4 col-lg-5 col-md-6 form-group">
                <div class="input-group input-group-sm">
                    <div class="input-group-prepend">
                        <span class="input-group-text">DNS 1</span>
@@ -69,7 +69,7 @@
                    <input type="text" name="d1" class="form-control sip" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" value="{d1}"/>
                </div>
            </div>
-            <div class="col-xl-4 col-lg-5 form-group">
+            <div class="col-xl-4 col-lg-5 col-md-6 form-group">
                <div class="input-group input-group-sm">
                    <div class="input-group-prepend">
                        <span class="input-group-text">DNS 2</span>
@@ -89,7 +89,21 @@
                    </div>
                </div>
            </div>
-        </div>
+    
+            <div class="col-lg-3 col-md-4 col-sm-6 form-group">
+                <div class="input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Power saving</span>
+                    </div>
+                    <select name="z" class="form-control">
+                        <option value="255">Default</option>
+                        <option value="0" {z0}>Off</option>
+                        <option value="1" {z1}>Minimum</option>
+                        <option value="2" {z2}>Maximum</option>
+                    </select>
+                </div>
+            </div>
+    </div>
    </div>
    <hr/>
    <div class="row form-group">
--- a/lib/ClassicUi/include/.gitignore
+++ b/lib/ClassicUi/include/.gitignore
@@ -0,0 +1 @@
+root/*.h
--- a/lib/ClassicUi/include/AmsWebHeaders.h
+++ b/lib/ClassicUi/include/AmsWebHeaders.h
@@ -2,6 +2,7 @@ static const char HEADER_CACHE_CONTROL[] PROGMEM = "Cache-Control";
 static const char HEADER_PRAGMA[] PROGMEM = "Pragma";
 static const char HEADER_EXPIRES[] PROGMEM = "Expires";
 static const char HEADER_AUTHENTICATE[] PROGMEM = "WWW-Authenticate";
+static const char HEADER_LOCATION[] PROGMEM = "Location";

 static const char CACHE_CONTROL_NO_CACHE[] PROGMEM = "no-cache, no-store, must-revalidate";
 static const char CACHE_1HR[] PROGMEM = "public, max-age=3600";
--- a/lib/ClassicUi/include/AmsWebServer.h
+++ b/lib/ClassicUi/include/AmsWebServer.h
@@ -13,7 +13,7 @@
 #include "EnergyAccounting.h"
 #include "Uptime.h"
 #include "RemoteDebug.h"
-#include "entsoe/EntsoeApi.h"
+#include "EntsoeApi.h"

 #if defined(ESP8266)
 	#include <ESP8266WiFi.h>
@@ -24,6 +24,7 @@
 	#include <WiFi.h>
 	#include <WebServer.h>
 	#include <HTTPClient.h>
+	#include <HTTPUpdate.h>
 #else
 	#warning "Unsupported board type"
 #endif
@@ -58,6 +59,13 @@ private:
 	bool uploading = false;
 	File file;
 	bool performRestart = false;
+	bool performUpgrade = false;
+	bool rebootForUpgrade = false;
+	#if defined(AMS2MQTT_FIRMWARE_URL)
+	String customFirmwareUrl = AMS2MQTT_FIRMWARE_URL;
+	#else
+	String customFirmwareUrl;
+	#endif

    static const uint16_t BufferSize = 2048;
    char* buf;
@@ -81,7 +89,7 @@ private:
 	void configMqttHtml();
 	void configWebHtml();
 	void configDomoticzHtml();
-	void configEntsoeHtml();
+	void configPriceApiHtml();
 	void configNtpHtml();
 	void configGpioHtml();
 	void configDebugHtml();
@@ -101,6 +109,7 @@ private:

 	String getSerialSelectOptions(int selected);
 	void firmwareHtml();
+	void firmwarePost();
 	void firmwareUpload();
 	void firmwareDownload();
 	void restartHtml();
--- a/lib/ClassicUi/scripts/generate_includes.py
+++ b/lib/ClassicUi/scripts/generate_includes.py
@@ -25,8 +25,8 @@ except:
        print("WARN: Unable to load minifier")


-webroot = "web"
-srcroot = "src/web/root"
+webroot = "lib/ClassicUi/html"
+srcroot = "lib/ClassicUi/include/root"

 version = os.environ.get('GITHUB_TAG')
 if version == None:
--- a/lib/ClassicUi/src/AmsWebServer.cpp
+++ b/lib/ClassicUi/src/AmsWebServer.cpp
--- a/lib/DomoticzMqttHandler/include/.gitignore
+++ b/lib/DomoticzMqttHandler/include/.gitignore
@@ -0,0 +1 @@
+json/*.h
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gunnar Skjold	0d6df03c94	Fixed reboot loop, changed temperature sensor behaviour and changed some debugging	2023-01-29 22:45:35 +01:00
Gunnar Skjold	d777040c0a	Fixed loading error from previous version energy accounting	2023-01-29 17:04:04 +01:00
Gunnar Skjold	a5636a60f8	Some changes after testing	2023-01-28 20:24:18 +01:00
Gunnar Skjold	6f817b2ed5	Some changes after testing	2023-01-28 20:19:06 +01:00
Gunnar Skjold	e4fec4f4c2	Some final changes	2023-01-28 11:53:26 +01:00
Gunnar Skjold	3a25964ec4	Merge pull request #412 from UtilitechAS/dev-v2.2 v2.2	2023-01-28 10:54:20 +01:00
Gunnar Skjold	1227dff412	Changed autocomplete in setup form	2023-01-26 19:55:39 +01:00
Gunnar Skjold	26ee2e6efc	Some changes after testing + changing hostname for hub	2023-01-26 19:42:19 +01:00
Gunnar Skjold	d6a8d31278	Some updates for documentation	2023-01-23 18:19:33 +01:00
Gunnar Skjold	3f2b534baa	Merge branch 'master' into dev-v2.2	2023-01-23 13:59:38 +01:00
Gunnar Skjold	70f413013c	Merge pull request #408 from aadnehovda/patch-1 Unknown HA entity units.	2023-01-23 13:57:33 +01:00
Ådne Hovda	6edcd174bb	Unknown HA entity units. It appears that HA units are case sensitive: https://developers.home-assistant.io/docs/core/entity/sensor/, so for SensorDeviceClass.REACTIVE_POWER it should be "var", not "VAr". Also for SensorDeviceClass.TEMPERATURE, the degree symbol is required: "°C". Entity sensor.ams_ed6e_qo (<class 'homeassistant.components.mqtt.sensor.MqttSensor'>) is using native unit of measurement 'VAr' which is not a valid unit for the device class ('reactive_power') it is using; Please update your configuration if your entity is manually configured, otherwise create a bug report at https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+mqtt%22 Entity sensor.ams_ed6e_q (<class 'homeassistant.components.mqtt.sensor.MqttSensor'>) is using native unit of measurement 'VAr' which is not a valid unit for the device class ('reactive_power') it is using; Please update your configuration if your entity is manually configured, otherwise create a bug report at https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+mqtt%22 Entity sensor.ams_ed6e_tqo (<class 'homeassistant.components.mqtt.sensor.MqttSensor'>) is using native unit of measurement 'kVArh' which is not a valid unit for the device class ('energy') it is using; Please update your configuration if your entity is manually configured, otherwise create a bug report at https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+mqtt%22 Entity sensor.ams_ed6e_tqi (<class 'homeassistant.components.mqtt.sensor.MqttSensor'>) is using native unit of measurement 'kVArh' which is not a valid unit for the device class ('energy') it is using; Please update your configuration if your entity is manually configured, otherwise create a bug report at https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+mqtt%22	2023-01-23 11:09:47 +01:00
Gunnar Skjold	3170ef6ce9	c3 scripts	2023-01-21 13:45:47 +01:00
Gunnar Skjold	fb56f4d012	More changes for repo	2023-01-21 13:45:09 +01:00
Gunnar Skjold	c5756f0cba	Renamed repo	2023-01-21 13:43:11 +01:00
Gunnar Skjold	95c9ecc8b2	Merge branch 'master' into dev-v2.2	2023-01-18 21:14:49 +01:00
Gunnar Skjold	bdee066c33	Fixed reboot loop	2023-01-18 21:14:40 +01:00
Gunnar Skjold	957039d0c0	Merge branch 'master' into dev-v2.2	2023-01-18 20:48:38 +01:00
Gunnar Skjold	dd23a0fa60	Fixed reboot look	2023-01-18 20:48:27 +01:00
Gunnar Skjold	7777a0a059	Merge branch 'master' into dev-v2.2	2023-01-18 17:11:10 +01:00
Gunnar Skjold	e8fc6d48bf	Fixed issue where GPIO setup becomes invalid	2023-01-18 17:11:01 +01:00
Gunnar Skjold	c98148c886	Update readme	2023-01-17 19:56:28 +01:00
Gunnar Skjold	6ba2b4060e	Update images for readme and wiki	2023-01-17 19:55:00 +01:00
Gunnar Skjold	762c17ca8e	Updated readme and example ini file	2023-01-17 19:48:24 +01:00
Gunnar Skjold	fad6ada1e0	Updated release	2023-01-17 19:15:57 +01:00
Gunnar Skjold	fb1d343ee3	Removed debugging	2023-01-17 19:03:07 +01:00
Gunnar Skjold	1f3c32e80a	Adding secrets to build	2023-01-17 18:57:11 +01:00
Gunnar Skjold	43fbca7099	Update release build	2023-01-17 18:42:09 +01:00
Gunnar Skjold	7a36082564	Trying stuff to get build working	2023-01-17 18:34:47 +01:00
Gunnar Skjold	fb2cfdfe01	Trying to fix build	2023-01-17 18:28:08 +01:00
Gunnar Skjold	6c3dca9344	Updated build	2023-01-17 18:15:32 +01:00
Gunnar Skjold	cce5d75fd7	Updated build	2023-01-17 18:13:54 +01:00
Gunnar Skjold	8fd411c1d6	Updated build	2023-01-17 18:13:20 +01:00
Gunnar Skjold	4b15ac74fc	Update FUNDING.yml	2023-01-17 18:05:44 +01:00
Gunnar Skjold	508b2e6c45	Icon for safari	2023-01-17 17:51:50 +01:00
Gunnar Skjold	af630615db	Changes after testing	2023-01-17 17:49:01 +01:00
Gunnar Skjold	222a4f13e2	Changes after testing	2023-01-17 17:48:42 +01:00
Gunnar Skjold	3bc6c75c5a	Some more changes for L&G	2023-01-15 11:20:28 +01:00
Gunnar Skjold	dbb3eac709	Some changes for L&G	2023-01-15 10:56:46 +01:00
Gunnar Skjold	1cee48eab4	Some design changes	2023-01-14 09:34:28 +01:00
Gunnar Skjold	c28752a00a	Fixed firmware upgrade	2023-01-12 21:24:36 +01:00
Gunnar Skjold	365061df29	Some changes after testing	2023-01-12 20:17:37 +01:00
Gunnar Skjold	870617f780	More changes for v2.2	2023-01-11 20:41:27 +01:00
Gunnar Skjold	4972b980ba	Changes for v2.2	2023-01-06 14:34:07 +01:00
Gunnar Skjold	51c70abda3	Merge branch 'master' into dev-v2.2	2023-01-04 18:55:38 +01:00
Gunnar Skjold	8d448533c7	Fixed config export for esp32	2022-12-19 18:36:04 +01:00
Gunnar Skjold	43cb9a0000	Fixed DSMR CRC check	2022-12-19 18:14:12 +01:00
Gunnar Skjold	d49b7eac09	Minor change	2022-12-19 16:49:40 +01:00
Gunnar Skjold	8f057e687c	Merge pull request #387 from lassebm/lg-e360-fixes Landis+Gyr E360 fixes	2022-12-19 16:45:52 +01:00
Lasse Bang Mikkelsen	5b4f680114	Align Landis+Gyr naming	2022-12-17 12:38:18 +01:00
Lasse Bang Mikkelsen	fabdfbadf4	Add support for Landis+Gyr meters using "LGF" manufacturer ID	2022-12-16 20:20:40 +01:00
Lasse Bang Mikkelsen	afa47ea633	Use list type 4 when phase active import/export power is available	2022-12-16 20:19:15 +01:00
Gunnar Skjold	461d76e651	Merge branch 'master' into dev-v2.2	2022-12-15 18:32:36 +01:00
Gunnar Skjold	c40e20c8e9	Extract active import/export per phase from DSMR	2022-12-15 18:25:13 +01:00
Gunnar Skjold	4e97554514	Some changes during testing	2022-12-14 19:37:32 +01:00
Gunnar Skjold	28a9d6746b	Fixed discover when setting different hostname in setup	2022-12-14 18:15:46 +01:00
Gunnar Skjold	7ea4fe881c	HAN serial autodetect	2022-12-13 21:05:42 +01:00
Gunnar Skjold	c4eaf8184b	Check if authenticated to show upgrade links and config up/download	2022-12-10 09:27:18 +01:00
Gunnar Skjold	312972f77d	Some improvements to v2.2	2022-12-09 20:26:48 +01:00
Gunnar Skjold	27b9058af5	Some improvements to v2.2	2022-12-09 20:26:31 +01:00
Gunnar Skjold	bc4d61098c	Some error handling	2022-12-09 19:10:24 +01:00
Gunnar Skjold	b2de6472cf	Some experiments with captive portal	2022-12-09 18:24:43 +01:00
Gunnar Skjold	6c3ddc57b5	Removed "auto multiplier" for Kamstrup	2022-12-08 13:44:21 +01:00
Gunnar Skjold	2ff7044c85	Fixed incorrect value for peaks in MQTT	2022-12-07 20:13:30 +01:00
Gunnar Skjold	0145be851e	Merge branch 'master' into dev-v2.2	2022-12-07 20:11:14 +01:00
Gunnar Skjold	6b0d540f39	Added 300 baud	2022-12-07 11:51:45 +01:00
Gunnar Skjold	2218ac4e8a	Fixed graph clearing problem	2022-12-07 11:32:55 +01:00
Gunnar Skjold	33bd3da310	Various fix for realtime values	2022-12-06 15:45:43 +01:00
Gunnar Skjold	a239e1a63d	Fix on special case for Kaifa MA304T3	2022-12-06 08:28:30 +01:00
Gunnar Skjold	8a809ec128	Bugfix from testing	2022-12-04 14:32:47 +01:00
Gunnar Skjold	b48a0f13fe	More v2.2	2022-12-04 14:12:35 +01:00
Gunnar Skjold	b07ed075f4	Even more v2.2	2022-12-02 20:38:56 +01:00
Gunnar Skjold	0927cab8e2	Some changes for fetching prices from amshub	2022-12-02 19:24:53 +01:00
Gunnar Skjold	eed35b7bbc	Merge branch 'hub-prices' into dev-v2.2	2022-12-02 19:08:29 +01:00
Gunnar Skjold	e34da5fd83	Merge branch 'master' into hub-prices	2022-12-02 19:04:14 +01:00
Gunnar Skjold	148fb14c93	More v2.2	2022-12-02 19:03:16 +01:00
Gunnar Skjold	000cfd8697	Merge branch 'master' into dev-v2.2	2022-12-01 18:12:32 +01:00
Gunnar Skjold	1ef5703971	Fixed changing mdns settings	2022-12-01 18:06:19 +01:00
Gunnar Skjold	cda3b80b35	Some changes	2022-11-29 21:24:58 +01:00
Gunnar Skjold	c7b8090634	Some minor changes	2022-11-29 21:02:23 +01:00
Gunnar Skjold	63a8d79b95	Making it work on 8266	2022-11-29 20:50:36 +01:00
Gunnar Skjold	02ae3fc7f5	More v2.2	2022-11-29 20:20:56 +01:00
Gunnar Skjold	2dcc874592	More v2.2	2022-11-25 19:18:32 +01:00
Gunnar Skjold	d4d9d2224f	More v2.2	2022-11-23 20:52:37 +01:00
Gunnar Skjold	902e43979b	Even more v2.2	2022-11-21 18:48:04 +01:00
Gunnar Skjold	8e54f23367	More v2.2	2022-11-20 20:47:29 +01:00
Gunnar Skjold	ab7128c53a	Further work on v2.2	2022-11-19 15:44:23 +01:00
Gunnar Skjold	6563700df4	Merge branch 'master' into dev-v2.2	2022-11-15 18:07:02 +01:00
Gunnar Skjold	538de5ea99	Increased range of multipliers	2022-11-08 18:41:31 +01:00
Gunnar Skjold	042e2bcc85	Fixed power saving	2022-11-07 14:57:53 +01:00
Gunnar Skjold	b6f630b134	Some more Svelte implementation	2022-11-01 20:59:38 +01:00
Gunnar Skjold	65a09dcecf	Merge branch 'master' into dev-v2.2	2022-11-01 19:07:00 +01:00
Gunnar Skjold	775e5a0881	Support different size numbers in L&G payload	2022-11-01 18:41:43 +01:00
Gunnar Skjold	6c0d5fcc09	Some adjustments to wifi power saving option	2022-10-31 10:09:07 +01:00
Gunnar Skjold	69d8fa9254	Made wifi sleep mode configurable	2022-10-27 19:17:50 +02:00
root	71d261bf34	Merge branch 'hub-prices' of github.com:gskjold/AmsReader into hub-prices	2022-10-23 19:11:51 +02:00
root	9f4f5b4620	Merge branch 'master' into hub-prices	2022-10-23 19:09:15 +02:00
Gunnar Skjold	c38c305bab	Fixed threshold update via config file	2022-10-21 19:21:55 +02:00
Gunnar Skjold	bfee2a1d64	Fixed month average calculation	2022-10-21 18:43:30 +02:00
Gunnar Skjold	ec7edae9a1	Updated issue templates	2022-10-21 17:43:33 +02:00
Gunnar Skjold	d8e265b7ac	Fixed JSON errors	2022-10-20 20:12:33 +02:00
Gunnar Skjold	1987cddab7	Some more cleanup	2022-10-20 20:11:13 +02:00
Gunnar Skjold	e18be5f97c	Better memory optimization	2022-10-19 20:58:57 +02:00
Gunnar Skjold	537597d6d1	Expanding size of daily and monthly data points	2022-10-19 20:30:29 +02:00
Gunnar Skjold	a89013cec3	Fixed config file upload	2022-10-19 20:24:21 +02:00
Gunnar Skjold	9c7a0cb7ff	Fixed graph error	2022-10-19 19:59:41 +02:00
Gunnar Skjold	ade12199b9	Reclaiming some heap space	2022-10-19 19:54:26 +02:00
Gunnar Skjold	92692c6eaf	More implementation of Svelte GUI	2022-10-18 20:52:42 +02:00
Gunnar Skjold	e4114c3e74	Merge branch 'master' into dev-v2.2	2022-10-18 18:30:37 +02:00
Gunnar Skjold	39b68aca51	Removed invalid code	2022-10-18 18:30:26 +02:00
root	feffbb53a3	Merge branch 'master' of github.com:gskjold/AmsToMqttBridge into hub-prices	2022-10-17 15:42:23 +02:00
Gunnar Skjold	8ac1e034b1	Reverted WiFi_connect method	2022-10-17 13:09:28 +02:00
Gunnar Skjold	f446dff865	Fixed LED blink delay	2022-10-17 13:09:04 +02:00
root	e1b2554af2	Merge branch 'master' of github.com:gskjold/AmsToMqttBridge into hub-prices	2022-10-16 18:46:47 +02:00
Gunnar Skjold	627a50ab50	Fixed priceapi dropdowns	2022-10-16 18:46:31 +02:00
Gunnar Skjold	a20d007b45	Merge branch 'hub-prices' of github.com:gskjold/AmsReader into hub-prices	2022-10-16 18:32:25 +02:00
Gunnar Skjold	64840e13f0	Merge branch 'master' into hub-prices	2022-10-16 18:31:26 +02:00
Gunnar Skjold	34ebe9601a	Changed blink behaviour	2022-10-16 18:31:11 +02:00
root	72f1d59338	Merge branch 'hub-prices' of github.com:gskjold/AmsReader into hub-prices	2022-10-16 17:36:48 +02:00
Gunnar Skjold	07ed425320	Merge branch 'master' into hub-prices	2022-10-16 17:34:19 +02:00
Gunnar Skjold	2e75e1c4dc	Moved HA files	2022-10-13 20:58:08 +02:00
Gunnar Skjold	e6df68481f	Merge branch 'master' into dev-v2.2	2022-10-13 20:47:48 +02:00
Gunnar Skjold	fa299198fc	Fixed all build warnings	2022-10-13 20:33:59 +02:00
Gunnar Skjold	6d81b0a856	Fixed all build warnings	2022-10-13 20:24:56 +02:00
Gunnar Skjold	dd095da97b	Reduced footprint of GPIO config page	2022-10-13 19:27:25 +02:00
Gunnar Skjold	1b6ce203b7	Better debug output whem receiving unknown data	2022-10-13 17:40:44 +02:00
Gunnar Skjold	2850be4e48	Merge pull request #322 from tbarnekov/extend_power_info Populate Active Import and Export per phase and export to HA	2022-10-12 20:34:09 +02:00
Gunnar Skjold	7eca31de84	Fixed build errors	2022-10-12 20:01:55 +02:00
Gunnar Skjold	a64f960cc7	Added Pow-U+ profile	2022-10-12 19:30:00 +02:00
Gunnar Skjold	ce3a47a7e6	Fixed error blinks and improved WiFi reconnect	2022-10-12 19:25:48 +02:00
Thomas Barnekov	8395e1dc77	Merge remote-tracking branch 'origin/master' into extend_power_info	2022-10-10 17:06:09 +02:00
Thomas Barnekov	39a4761415	Add DOCTYPE to html to fix quirks mode	2022-10-10 16:59:43 +02:00
root	dc25c147b9	Merge remote-tracking branch 'public/master' into hub-prices	2022-10-07 17:36:49 +00:00
Gunnar Skjold	867ab9d6c2	Build variable for upgrade URL	2022-10-07 19:35:30 +02:00
Gunnar Skjold	6a76144566	Merge branch 'master' into hub-prices	2022-10-07 17:49:47 +02:00
Thomas Barnekov	5e03e3d3c2	Move per-phase power consumption and power factor values to new ha4.json	2022-10-07 13:40:29 +02:00
Thomas Barnekov	adb5050621	Merge branch 'gskjold:master' into extend_power_info	2022-10-06 17:31:43 +02:00
Gunnar Skjold	026cd25c8c	Setting modem sleep to max	2022-10-06 17:30:37 +02:00
Gunnar Skjold	06ec97b42a	Make sure we dont use more than 5 peaks if defined higher	2022-10-06 17:20:13 +02:00
Gunnar Skjold	b420a0e6f4	Limit peak count if over 5	2022-10-06 17:12:12 +02:00
Thomas Barnekov	7cd52d5689	Add individual power reading for all phases (include in HA)	2022-10-06 00:35:30 +02:00
Thomas Barnekov	ad78ff3082	Fix implicit cast and non-const char pointer warnings	2022-10-05 22:42:43 +02:00
Gunnar Skjold	fe7be81f1e	Rudimentary detection for L&G data. Probably change this in the future	2022-10-01 12:11:46 +02:00
Gunnar Skjold	7674fc2ad0	Merge branch 'lng-parser'	2022-10-01 11:56:08 +02:00
Gunnar Skjold	d50181c347	Upgrade with custom URL	2022-10-01 11:43:42 +02:00
Gunnar Skjold	8ca771fa5a	Changed "BUS" to "M-BUS"	2022-10-01 09:25:56 +02:00
Gunnar Skjold	7d557b2679	Only show new version when actually new in firmware page. Also be more specific on USB power in upgrade warning	2022-10-01 09:24:07 +02:00
Gunnar Skjold	2f0c912388	Exclude decimals in BUILD_EPOCH flag	2022-10-01 09:22:09 +02:00
Gunnar Skjold	57e6d0fbe3	Modifications to make price sensors work in HA	2022-09-30 19:18:23 +02:00
Gunnar Skjold	e7c25fafda	Prices and realtime HA sensors	2022-09-28 20:13:03 +02:00
Gunnar Skjold	2a4772fe25	Fixed memory leak when reconnecting to MQTT/SSL	2022-09-27 19:59:37 +02:00
Gunnar Skjold	f1f7408208	Added price zones	2022-09-25 11:46:04 +02:00
Gunnar Skjold	feb8e5007b	Fixed MQTT buffer size	2022-09-25 10:50:34 +02:00
Gunnar Skjold	c4af1ee74f	Fixed saving tariff thresholds	2022-09-25 10:50:09 +02:00
Gunnar Skjold	992e1b6121	Net value for active power (L&G)	2022-09-12 08:03:32 +02:00
Gunnar Skjold	95d3008a66	Updates to Svelte UI	2022-09-12 07:29:25 +02:00
Gunnar Skjold	04cd6ac387	Some changes to make Svelte UI work	2022-09-03 14:37:31 +02:00
Gunnar Skjold	584c7b1154	More restructuring	2022-09-03 14:03:15 +02:00
Gunnar Skjold	493c4b4337	Moved Svelte UI to lib folder	2022-09-03 13:41:11 +02:00
Gunnar Skjold	488c969858	Some serious restructuring to be able to swap between implementations	2022-09-03 13:12:29 +02:00
Gunnar Skjold	8b0d4185d3	Created new UI with Svelte	2022-09-03 12:19:56 +02:00
Gunnar Skjold	9cc7529934	Fixed L&G scaling	2022-08-31 08:19:09 +02:00
Gunnar Skjold	ef8715be6d	Merge branch 'master' into lng-parser	2022-08-31 08:04:24 +02:00
Gunnar Skjold	e232b875fa	Fixed Aidon timestamp	2022-08-23 21:07:06 +02:00
Gunnar Skjold	f18171fecc	Fixed MQTT byte mode	2022-08-23 20:39:47 +02:00
Gunnar Skjold	a3c7a09211	Adding peaks to data.json and MQTT RAW	2022-08-23 20:21:19 +02:00
Gunnar Skjold	a6f3bc3f71	Added version to system json	2022-08-23 19:49:19 +02:00
Gunnar Skjold	44bcd386d1	aggregate obis 1.8.x and 2.8.x for L&G	2022-08-23 09:04:45 +02:00
Gunnar Skjold	01547f9a52	Adjustments to make L&G parser work	2022-08-19 13:26:29 +02:00
Gunnar Skjold	608470c5f7	Merge branch 'master' into hub-prices	2022-08-18 19:56:31 +02:00
Gunnar Skjold	940d38af5c	Merge branch 'master' into lng-parser	2022-08-17 17:33:24 +02:00
Gunnar Skjold	4e451c51e1	HW serial fix for S2	2022-08-17 17:33:06 +02:00
Gunnar Skjold	43def1c311	Fixed Pow-P1 profile	2022-08-17 17:32:53 +02:00
Gunnar Skjold	2978116207	Fixed formatting error in HA payload	2022-08-16 11:55:07 +02:00
Gunnar Skjold	a055465ce0	Untestet L&G data parser	2022-08-16 08:22:43 +02:00
Gunnar Skjold	68b3415a6c	Cleanup for price API	2022-08-13 16:32:55 +02:00
Gunnar Skjold	d8f3ae8b07	Merge branch 'master' into hub-prices	2022-08-13 16:00:25 +02:00
Gunnar Skjold	998b986604	Adjusted modem sleep to a safer value	2022-08-12 20:48:34 +02:00
Gunnar Skjold	7799431405	Remove unused files	2022-08-12 20:42:13 +02:00
Gunnar Skjold	1a92cd1978	Fetch prices from hub	2022-08-12 20:41:53 +02:00
Gunnar Skjold	508c14a671	Fixed modem sleep on S2 and fixed default wifi power	2022-08-12 09:02:04 +02:00
Gunnar Skjold	4a7ef87269	Fixed realtime day calculation	2022-08-10 17:43:51 +02:00
Gunnar Skjold	3a4fc707b0	Show real time production	2022-08-10 10:53:16 +02:00
Gunnar Skjold	5d2e320b07	Fixed export labels on graph	2022-08-10 10:28:31 +02:00
Gunnar Skjold	d12613b91a	Trying to fix HA accumulated	2022-08-10 10:01:24 +02:00
Gunnar Skjold	e6a02f34ab	USB power warning when upgrading	2022-08-10 09:31:50 +02:00
Gunnar Skjold	0b2ffbfd77	Revert to arduino 2.0.3 because of #298	2022-08-10 09:30:31 +02:00
Gunnar Skjold	cab6c54ed9	Correct Vcc GPIO for Pow-K+	2022-08-01 12:48:31 +02:00
Gunnar Skjold	313024f273	Support OTA upgrade from ESP8266	2022-08-01 08:17:24 +02:00
Gunnar Skjold	91fc078c5e	Higher precision on prices	2022-07-31 20:26:38 +02:00
Gunnar Skjold	5b9d44a3e9	Fixed loading of energy accounting	2022-07-31 20:19:01 +02:00