Prepare Release 2024.05.03 (merge development into master)

when calculating efficiency, we need to take into account that the load
might also sink a significant amount of current and power, which adds to
the total output of the charge controller.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,18 +5,11 @@ body:
   - type: markdown
     attributes:
       value: >
-        ### ⚠️ Please remember: issues are for *bugs*
-        That is, something you believe affects every single user of OpenDTU, not just you. If you're not sure, start with one of the other options below.
-  - type: markdown
-    attributes:
-      value: |
-        #### Have a question? 👉 [Start a new discussion](https://github.com/tbnobody/OpenDTU/discussions/new) or [ask in chat](https://discord.gg/WzhxEY62mB).
+        ### ✋ **This is bug tracker, not a support forum**
 
-        #### Before opening an issue, please double check:
+        If something isn't working right, you have questions or need help, [**get in touch on the Discussions**](https://github.com/tbnobody/OpenDTU/discussions).
 
-        - [Documentation](https://www.opendtu.solar).
-        - [The FAQs](https://www.opendtu.solar/firmware/faq/).
-        - [Existing issues and discussions](https://github.com/tbnobody/OpenDTU/search?q=&type=issues).
+        Please quickly search existing issues first before submitting a bug.
   - type: textarea
     id: what-happened
     attributes:
@@ -47,8 +40,7 @@ body:
       label: Install Method
       description: How did you install OpenDTU?
       options:
-        - Pre-Compiled binary from GitHub releases
-        - Pre-Compiled binary from GitHub actions/pull-request
+        - Pre-Compiled binary from GitHub
         - Self-Compiled
     validations:
       required: true
@@ -60,14 +52,6 @@ body:
       placeholder: "e.g. 359d513"
     validations:
       required: true
-  - type: input
-    id: environment
-    attributes:
-      label: What firmware variant (PIO Environment) are you using?
-      description: You can find this in by going to Info -> System
-      placeholder: "generic_esp32s3_usb"
-    validations:
-      required: true
   - type: textarea
     id: logs
     attributes:
@@ -82,16 +66,3 @@ body:
         Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
     validations:
       required: false
-  - type: checkboxes
-    id: required-checks
-    attributes:
-      label: Please confirm the following
-      options:
-        - label: I believe this issue is a bug that affects all users of OpenDTU, not something specific to my installation.
-          required: true
-        - label: I have already searched for relevant existing issues and discussions before opening this report.
-          required: true
-        - label: I have updated the title field above with a concise description.
-          required: true
-        - label: I have double checked that my inverter does not contain a W in the model name (like HMS-xxxW) as they are not supported.
-          required: true

.github/workflows/build.yml

@@ -1,10 +1,15 @@
-name: OpenDTU Build
+name: OpenDTU-onBattery Build
 
 on:
   push:
     paths-ignore:
       - docs/**
       - '**/*.md'
+    branches:
+      - master
+      - development
+    tags-ignore:        
+      - 'v**'
   pull_request:
     paths-ignore:
       - docs/**
@@ -43,7 +48,7 @@ jobs:
       environments: ${{ steps.envs.outputs.environments }}
 
   build:
-    name: Build Environments
+    name: Build Enviornments
     runs-on: ubuntu-latest
     needs: get_default_envs
     strategy:
@@ -55,6 +60,15 @@ jobs:
       - name: Get tags
         run: git fetch --force --tags origin
 
+      - name: Create and switch to a meaningful branch for pull-requests
+        if: github.event_name == 'pull_request'
+        run: |
+          OWNER=${{ github.repository_owner }}
+          NAME=${{ github.event.repository.name }}
+          ID=${{ github.event.pull_request.number }}
+          DATE=$(date +'%Y%m%d%H%M')
+          git switch -c ${OWNER}/${NAME}/pr${ID}-${DATE}
+
       - name: Cache pip
         uses: actions/cache@v4
         with:
@@ -79,56 +93,64 @@ jobs:
           python -m pip install --upgrade pip
           pip install --upgrade platformio setuptools
 
-      - name: Enable Corepack
-        run: |
-            cd webapp
-            corepack enable
-
       - name: Setup Node.js and yarn
         uses: actions/setup-node@v4
         with:
-          node-version: "22"
+          node-version: "20"
           cache: "yarn"
           cache-dependency-path: "webapp/yarn.lock"
 
       - name: Install WebApp dependencies
-        run: |
-            cd webapp
-            yarn install --frozen-lockfile
+        run: yarn --cwd webapp install --frozen-lockfile
 
       - name: Build WebApp
-        run: |
-            cd webapp
-            yarn build
+        run: yarn --cwd webapp build
 
       - name: Build firmware
         run: pio run -e ${{ matrix.environment }}
 
       - name: Rename Firmware
-        run: mv .pio/build/${{ matrix.environment }}/firmware.bin .pio/build/${{ matrix.environment }}/opendtu-${{ matrix.environment }}.bin
+        run: mv .pio/build/${{ matrix.environment }}/firmware.bin .pio/build/${{ matrix.environment }}/opendtu-onbattery-${{ matrix.environment }}.bin
 
       - name: Rename Factory Firmware
-        run: mv .pio/build/${{ matrix.environment }}/firmware.factory.bin .pio/build/${{ matrix.environment }}/opendtu-${{ matrix.environment }}.factory.bin
+        run: mv .pio/build/${{ matrix.environment }}/firmware.factory.bin .pio/build/${{ matrix.environment }}/opendtu-onbattery-${{ matrix.environment }}.factory.bin
 
       - uses: actions/upload-artifact@v4
         with:
-          name: opendtu-${{ matrix.environment }}
+          name: opendtu-onbattery-${{ matrix.environment }}
           path: |
-            .pio/build/${{ matrix.environment }}/opendtu-${{ matrix.environment }}.bin
-            .pio/build/${{ matrix.environment }}/opendtu-${{ matrix.environment }}.factory.bin
+            .pio/build/${{ matrix.environment }}/opendtu-onbattery-${{ matrix.environment }}.bin
+            .pio/build/${{ matrix.environment }}/opendtu-onbattery-${{ matrix.environment }}.factory.bin
 
   release:
     name: Create Release
     runs-on: ubuntu-latest
     needs: [get_default_envs, build]
-    if: startsWith(github.ref, 'refs/tags/')
+    if: startsWith(github.ref, 'refs/tags/2')
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
+      
+      - name: Get tags
+        run: git fetch --force --tags origin
+
+      - name: Get openDTU core release
+        run: |
+          echo "OPEN_DTU_CORE_RELEASE=$(git for-each-ref --sort=creatordate --format '%(refname) %(creatordate)' refs/tags | grep 'refs/tags/v' | tail -1 | sed 's#.*/##' | sed 's/ .*//')" >> $GITHUB_ENV
+      
+      - name: Create openDTU-core-release-Badge
+        uses: schneegans/dynamic-badges-action@v1.6.0
+        with:
+          auth: ${{ secrets.GIST_SECRET }}
+          gistID: 68b47cc8c8994d04ab3a4fa9d8aee5e6
+          filename: openDTUcoreRelease.json
+          label: based on original OpenDTU
+          message: ${{ env.OPEN_DTU_CORE_RELEASE }}
+          color: lightblue
 
       - name: Build Changelog
         id: github_release
-        uses: mikepenz/release-changelog-builder-action@v4
+        uses: mikepenz/release-changelog-builder-action@v3
         with:
           failOnError: true
           commitMode: true
@@ -144,10 +166,10 @@ jobs:
         run: |
           ls -R
           cd artifacts
-          for i in */; do cp ${i}opendtu-*.bin ./; done
+          for i in */; do cp ${i}opendtu-onbattery-*.bin ./; done
 
       - name: Create release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
         with:
           body: ${{steps.github_release.outputs.changelog}}
           draft: False

.github/workflows/config/release-notes-config.json

@@ -18,12 +18,6 @@
                 "fix"
             ]
         },
-        {
-            "title": "## 🌎 Web Application",
-            "labels": [
-                "webapp"
-            ]
-        },
         {
             "title": "## 📚 Documentation",
             "labels": [
@@ -36,7 +30,7 @@
         }
     ],
     "template": "${{CHANGELOG}}",
-    "pr_template": "- [${{TITLE}}](https://github.com/tbnobody/OpenDTU/commit/${{MERGE_SHA}})",
+    "pr_template": "- [${{TITLE}}](https://github.com/helgeerbe/OpenDTU-OnBattery/commit/${{MERGE_SHA}})",
     "empty_template": "- no changes",
     "label_extractor": [
         {

.github/workflows/cpplint.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up Python
         uses: actions/setup-python@v5
         with:

.github/workflows/test_build.yml

@@ -0,0 +1,103 @@
+name: OpenDTU-onBattery Test Build
+
+on: workflow_dispatch
+
+jobs:
+  get_default_envs:
+    name: Gather Environments
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Cache pip
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.9"
+
+      - name: Install PlatformIO
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade platformio
+
+      - name: Get default environments
+        id: envs
+        run: |
+          echo "environments=$(pio project config --json-output | jq -cr '.[1][1][0][1]|split(",")')" >> $GITHUB_OUTPUT
+
+    outputs:
+      environments: ${{ steps.envs.outputs.environments }}
+
+  build:
+    name: Build Enviornments
+    runs-on: ubuntu-latest
+    needs: get_default_envs
+    strategy:
+      matrix:
+        environment: ${{ fromJSON(needs.get_default_envs.outputs.environments) }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Get tags
+        run: git fetch --force --tags origin
+
+      - name: Cache pip
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
+      - name: Cache PlatformIO
+        uses: actions/cache@v3
+        with:
+          path: ~/.platformio
+          key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.9"
+
+      - name: Install PlatformIO
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade platformio
+
+      - name: Setup Node.js and yarn
+        uses: actions/setup-node@v3
+        with:
+          node-version: "18"
+          cache: "yarn"
+          cache-dependency-path: "webapp/yarn.lock"
+
+      - name: Install WebApp dependencies
+        run: yarn --cwd webapp install --frozen-lockfile
+
+      - name: Build WebApp
+        run: yarn --cwd webapp build
+
+      - name: Build firmware
+        run: pio run -e ${{ matrix.environment }}
+
+      - name: Rename Firmware
+        run: mv .pio/build/${{ matrix.environment }}/firmware.bin .pio/build/${{ matrix.environment }}/opendtu-onbattery-${{ matrix.environment }}.bin
+
+      - name: Rename Factory Firmware
+        run: mv .pio/build/${{ matrix.environment }}/firmware.factory.bin .pio/build/${{ matrix.environment }}/opendtu-onbattery-${{ matrix.environment }}.factory.bin
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: opendtu-onbattery-${{ matrix.environment }}
+          path: |
+            .pio/build/${{ matrix.environment }}/opendtu-onbattery-${{ matrix.environment }}.bin
+            .pio/build/${{ matrix.environment }}/opendtu-onbattery-${{ matrix.environment }}.factory.bin
+
+

.github/workflows/yarnlint.yml

@@ -6,23 +6,17 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
-    defaults:
-      run:
-        working-directory: webapp
-
     steps:
-      - uses: actions/checkout@v4
-      - name: Enable Corepack
-        run: corepack enable
+      - uses: actions/checkout@v3
       - name: Setup Node.js and yarn
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
-          node-version: "22"
+          node-version: "18"
           cache: "yarn"
           cache-dependency-path: "webapp/yarn.lock"
 
       - name: Install WebApp dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn --cwd webapp install --frozen-lockfile
 
       - name: Linting
-        run: yarn lint
+        run: yarn --cwd webapp lint

.github/workflows/yarnprettier.yml

@@ -1,28 +0,0 @@
-name: Yarn Prettier
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    defaults:
-      run:
-        working-directory: webapp
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Enable Corepack
-        run: corepack enable
-      - name: Setup Node.js and yarn
-        uses: actions/setup-node@v4
-        with:
-          node-version: "22"
-          cache: "yarn"
-          cache-dependency-path: "webapp/yarn.lock"
-
-      - name: Install WebApp dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Check Formatting
-        run: yarn prettier --check src/

.vscode/settings.json

@@ -1,3 +1,63 @@
 {
-    "C_Cpp.clang_format_style": "WebKit"
+    "C_Cpp.clang_format_style": "WebKit",
+    "files.associations": {
+        "*.tcc": "cpp",
+        "algorithm": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "chrono": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "condition_variable": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "list": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "map": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "regex": "cpp",
+        "string": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "fstream": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "ostream": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "thread": "cpp",
+        "cinttypes": "cpp",
+        "typeinfo": "cpp",
+        "variant": "cpp"
+    }
 }

README.md

@@ -1,43 +1,56 @@
-# OpenDTU
+- [OpenDTU-onBattery](#opendtu-onbattery)
+  - [What is OpenDTU-onBattery](#what-is-opendtu-onbattery)
+  - [History of the project](#history-of-the-project)
+  - [Highlights of OpenDTU-onBattery](#highlights-of-opendtu-onbattery)
+  - [Documentation](#documentation)
+  - [Acknowledgment](#acknowledgment)
 
-[![OpenDTU Build](https://github.com/tbnobody/OpenDTU/actions/workflows/build.yml/badge.svg)](https://github.com/tbnobody/OpenDTU/actions/workflows/build.yml)
-[![cpplint](https://github.com/tbnobody/OpenDTU/actions/workflows/cpplint.yml/badge.svg)](https://github.com/tbnobody/OpenDTU/actions/workflows/cpplint.yml)
-[![Yarn Linting](https://github.com/tbnobody/OpenDTU/actions/workflows/yarnlint.yml/badge.svg)](https://github.com/tbnobody/OpenDTU/actions/workflows/yarnlint.yml)
+# OpenDTU-onBattery
 
-## !! IMPORTANT UPGRADE NOTES !!
+This is a fork from the Hoymiles project [OpenDTU](https://github.com/tbnobody/OpenDTU).
 
-If you are upgrading from a version before 15.03.2023 you have to upgrade the partition table of the ESP32. Please follow the [this](docs/UpgradePartition.md) documentation!
+![GitHub tag (latest SemVer)](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/helgeerbe/68b47cc8c8994d04ab3a4fa9d8aee5e6/raw/openDTUcoreRelease.json)
 
-## Background
+[![OpenDTU-onBattery Build](https://github.com/helgeerbe/OpenDTU-OnBattery/actions/workflows/build.yml/badge.svg)](https://github.com/helgeerbe/OpenDTU-OnBattery/actions/workflows/build.yml)
+[![cpplint](https://github.com/helgeerbe/OpenDTU-OnBattery/actions/workflows/cpplint.yml/badge.svg)](https://github.com/helgeerbe/OpenDTU-OnBattery/actions/workflows/cpplint.yml)
+[![Yarn Linting](https://github.com/helgeerbe/OpenDTU-OnBattery/actions/workflows/yarnlint.yml/badge.svg)](https://github.com/helgeerbe/OpenDTU-OnBattery/actions/workflows/yarnlint.yml)
 
-This project was started from [this](https://www.mikrocontroller.net/topic/525778) discussion (Mikrocontroller.net).
-It was the goal to replace the original Hoymiles DTU (Telemetry Gateway) with their cloud access. With a lot of reverse engineering the Hoymiles protocol was decrypted and analyzed.
+## What is OpenDTU-onBattery
+
+OpenDTU-onBattery is an extension of the original OpenDTU to support battery chargers, battery management systems (BMS) and power meters on a single esp32. With the help of a dynamic power limiter, the power production can be adjusted to the actual consumption. In this way, it is possible to come as close as possible to the goal of zero feed-in.
+
+## History of the project
+
+The original OpenDTU project was started from [this](https://www.mikrocontroller.net/topic/525778) discussion (Mikrocontroller.net). It was the goal to replace the original Hoymiles DTU (Telemetry Gateway) with their cloud access. With a lot of reverse engineering the Hoymiles protocol was decrypted and analyzed.
+
+Summer 2022 I bought my Victron MPPT battery charger, and didn't like the idea to set up a separate esp32 to recieve the charger data. I decided to fork OpenDTU and extend it with battery charger support and a dynamic power limitter to my own needs. Hoping someone can make use of it.
+
+## Highlights of OpenDTU-onBattery
+
+This project is still under development and adds following features:
+
+* Support Victron's Ve.Direct protocol on the same chip (cable based serial interface!). Additional information about Ve.direct can be downloaded directly from [Victron's website](https://www.victronenergy.com/support-and-downloads/technical-information).
+* Dynamically sets the Hoymiles power limited according to the currently used energy in the household. Needs an HTTP JSON based power meter (e.g. Tasmota), an MQTT based power meter like Shelly 3EM or an SDM power meter.
+* Battery support: Read the voltage from Victron MPPT charge controller or from the Hoymiles DC inputs and starts/stops the power producing based on configurable voltage thresholds
+* Voltage correction that takes the voltage drop because of the current output load into account (not 100% reliable calculation)
+* Can read the current solar panel power from the Victron MPPT and adjust the limiter accordingly to not save energy in the battery (for increased system efficiency). Increases the battery lifespan and reduces energy loses.
+* Settings can be configured in the UI
+* Pylontech Battery support (via CAN bus interface). Use the SOC for starting/stopping the power output and provide the battery data via MQTT (autodiscovery for home assistant is currently not supported). Pin Mapping is supported (default RX PIN 27, TX PIN 26). Actual no live view support for Pylontech Battery.
+* Huawei R4850G2 power supply unit that can act as AC charger. Supports status shown on the web interface and options to set voltage and current limits on the web interface and via MQTT. Connection is done using CAN bus (needs to be separate from Pylontech CAN bus) via SN65HVD230 interface.
   
 ## Documentation
 
-The documentation can be found [here](https://tbnobody.github.io/OpenDTU-docs/).
-Please feel free to support and create a PR in [this](https://github.com/tbnobody/OpenDTU-docs) repository to make the documentation even better.
+[Full documentation of OpenDTU-onBattery extensions can be found at the project's wiki](https://github.com/helgeerbe/OpenDTU-OnBattery/wiki).
 
-## Breaking changes
+For documentation of openDTU core functionality I refer to the original [repo](https://github.com/tbnobody/OpenDTU) and its [documentation](https://tbnobody.github.io/OpenDTU-docs/).
 
-Generated using: `git log --date=short --pretty=format:"* %h%x09%ad%x09%s" | grep BREAKING`
+Please note that openDTU-onBattery may change significantly during its development.
+Bug reports, comments, feature requests and fixes are most welcome!
 
-```code
-* 1b637f08      2024-01-30      BREAKING CHANGE: Web API Endpoint /api/livedata/status and /api/prometheus/metrics
-* e1564780      2024-01-30      BREAKING CHANGE: Web API Endpoint /api/livedata/status and /api/prometheus/metrics
-* f0b5542c      2024-01-30      BREAKING CHANGE: Web API Endpoint /api/livedata/status and /api/prometheus/metrics
-* c27ecc36      2024-01-29      BREAKING CHANGE: Web API Endpoint /api/livedata/status
-* 71d1b3b       2023-11-07      BREAKING CHANGE: Home Assistant Auto Discovery to new naming scheme
-* 04f62e0       2023-04-20      BREAKING CHANGE: Web API Endpoint /api/eventlog/status no nested serial object
-* 59f43a8       2023-04-17      BREAKING CHANGE: Web API Endpoint /api/devinfo/status requires GET parameter inv=
-* 318136d       2023-03-15      BREAKING CHANGE: Updated partition table: Make sure you have a configuration backup and completly reflash the device!
-* 3b7aef6       2023-02-13      BREAKING CHANGE: Web API!
-* d4c838a       2023-02-06      BREAKING CHANGE: Prometheus API!
-* daf847e       2022-11-14      BREAKING CHANGE: Removed deprecated config parsing method
-* 69b675b       2022-11-01      BREAKING CHANGE: Structure WebAPI /api/livedata/status changed
-* 27ed4e3       2022-10-31      BREAKING: Change power factor from percent value to value between 0 and 1
-```
+To find out what's new or improved have a look at the [changelog](https://github.com/helgeerbe/OpenDTU-OnBattery/releases).
 
-## Currently supported Inverters
+## Acknowledgment
 
-A list of all currently supported inverters can be found [here](https://www.opendtu.solar/hardware/inverter_overview/)
+A special Thank to Thomas Basler (tbnobody) the author of the original [OpenDTU](https://github.com/tbnobody/OpenDTU) project. You are doing a great job!
+
+Last but not least, I would like to thank all the contributors. With your ideas and enhancements, you have made OpenDTU-onBattery much more than I originally had in mind.

README_onBattery.md

@@ -0,0 +1,186 @@
+# OpenDTU-OnBattery
+
+This is a fork from the Hoymiles project [OpenDTU](https://github.com/tbnobody/OpenDTU). This project is still under development but is being used on a day to day basis as well.
+
+![GitHub tag (latest SemVer)](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/helgeerbe/68b47cc8c8994d04ab3a4fa9d8aee5e6/raw/openDTUcoreRelease.json)
+
+> **Warning**
+> 
+> In contrast to the original openDTU, with release 2023.05.23.post1 openDTU-onBattery supports only 5 inverters. Otherwise, there is not enough memory for the liveData view.
+
+## Features
+
+* Hoymiles inverter support for live data and display of various inverter internal information. (Partial) support for multiple inverters.
+* MQTT support (with TLS) with partial Home Assistant MQTT Auto Discovery
+* Automatic inverter power control of a selected Hoymiles inverter to compensate the currently used energy in the household. 
+* Energy meter support with interface options to HTTP JSON based power meters (e.g. Tasmota), MQTT based power meters (e.g. Shelly 3EM) or SDM power meters.
+* Support for Victron MPPT charge controller using Ve.Direct. cf. Ve.direct: https://www.victronenergy.com/support-and-downloads/technical-information.
+* Generic voltage based battery support using Victron MPPT charge controller or Hoymiles inverter voltage values to start / stop inverter power output. (with load compensation)
+* Pylontech battery support via CAN bus interface. State of Charge reported by BMS is used to start / stop inverter power output. Battery data is exported via MQTT (no support for home assistant auto discovery). 
+* Support for Huawei R4850G2 power supply unit that can act as AC charging source. [Overview](https://www.beyondlogic.org/review-huawei-r4850g2-power-supply-53-5vdc-3kw/)
+* Other features from [OpenDTU](https://github.com/tbnobody/OpenDTU) maintained
+
+## Hardware
+
+To get started with this project you will need to assemble a few hardware components that allow interfacing with the desired devices. What is needed depends on the use-case but may consist of:
+
+* ESP32 board that contains the CPU and WIFI connectivity
+* NRF24L01+ or CMT2300A radio board to interface with the inverter. Please check the list of the supported inverters below for the board needed.
+* 3.3V / 5V logic level shifter to interface with the Victron MPPT charge controller
+* SN65HVD230 CAN bus transceiver to interface with a Pylontech battery
+* MCP2515 SPI / CAN bus transceiver to interface with the Huawei AC PSU
+* Relais board + 3.3V / 5 V logic level shifter to switch the slot detect on the Huawei AC PSU
+* Display [Display](docs/Display.md)
+
+More detailed information on the hardware can be found in the [Hardware and flashing](docs/hardware_flash.md) document.
+
+### Currently supported Inverters
+
+| Model               | Required RF Module | DC Inputs | MPP-Tracker | AC Phases |
+| --------------------| ------------------ | --------- | ----------- | --------- |
+| Hoymiles HM-300     | NRF24L01+          | 1         | 1           | 1         |
+| Hoymiles HM-350     | NRF24L01+          | 1         | 1           | 1         |
+| Hoymiles HM-400     | NRF24L01+          | 1         | 1           | 1         |
+| Hoymiles HM-600     | NRF24L01+          | 2         | 2           | 1         |
+| Hoymiles HM-700     | NRF24L01+          | 2         | 2           | 1         |
+| Hoymiles HM-800     | NRF24L01+          | 2         | 2           | 1         |
+| Hoymiles HM-1000    | NRF24L01+          | 4         | 2           | 1         |
+| Hoymiles HM-1200    | NRF24L01+          | 4         | 2           | 1         |
+| Hoymiles HM-1500    | NRF24L01+          | 4         | 2           | 1         |
+| Hoymiles HMS-300    | CMT2300A           | 1         | 1           | 1         |
+| Hoymiles HMS-350    | CMT2300A           | 1         | 1           | 1         |
+| Hoymiles HMS-400    | CMT2300A           | 1         | 1           | 1         |
+| Hoymiles HMS-450    | CMT2300A           | 1         | 1           | 1         |
+| Hoymiles HMS-500    | CMT2300A           | 1         | 1           | 1         |
+| Hoymiles HMS-600    | CMT2300A           | 2         | 2           | 1         |
+| Hoymiles HMS-700    | CMT2300A           | 2         | 2           | 1         |
+| Hoymiles HMS-800    | CMT2300A           | 2         | 2           | 1         |
+| Hoymiles HMS-900    | CMT2300A           | 2         | 2           | 1         |
+| Hoymiles HMS-1000   | CMT2300A           | 2         | 2           | 1         |
+| Hoymiles HMS-1600   | CMT2300A           | 4         | 4           | 1         |
+| Hoymiles HMS-1800   | CMT2300A           | 4         | 4           | 1         |
+| Hoymiles HMS-2000   | CMT2300A           | 4         | 4           | 1         |
+| Hoymiles HMT-1800   | CMT2300A           | 6         | 3           | 3         |
+| Hoymiles HMT-2250   | CMT2300A           | 6         | 3           | 3         |
+| Solenso SOL-H350    | NRF24L01+          | 1         | 1           | 1         |
+| Solenso SOL-H400    | NRF24L01+          | 1         | 1           | 1         |
+| Solenso SOL-H800    | NRF24L01+          | 2         | 2           | 1         |
+| TSUN TSOL-M350      | NRF24L01+          | 1         | 1           | 1         |
+| TSUN TSOL-M800      | NRF24L01+          | 2         | 2           | 1         |
+| TSUN TSOL-M1600     | NRF24L01+          | 4         | 2           | 1         |
+
+**TSUN compatibility remark:**
+Compatibility with OpenDTU is most likely related to the serial number of the inverter. Current findings indicate that TSUN inverters with a serial number starting with "11" are supported, whereby inverters with a serial number starting with "10" are not.
+
+
+## Screenshots
+
+Several screenshots of the frontend can be found here: [Screenshots](docs/screenshots/README.md)
+
+## Configuration and usage
+
+### First configuration
+
+* After the [initial flashing](docs/hardware_flash.md#flashing-and-starting-up) of the microcontroller, an Access Point called "OpenDTU-*" is opened. The default password is "openDTU42".
+* Use a web browser to open the address [http://192.168.4.1](http://192.168.4.1)
+* Navigate to Settings --> Network Settings and enter your WiFi credentials. The username to access the config menu is "admin" and the password the same as for accessing the Access Point (default: "openDTU42").
+* OpenDTU then simultaneously connects to your WiFi AP with these credentials. Navigate to Info --> Network and look into section "Network Interface (Station)" for the IP address received via DHCP.
+* If your WiFi AP uses an allow-list for MAC-addresses, please be aware that the ESP32 has two different MAC addresses for its AP and client modes, they are also listed at Info --> Network.
+* When OpenDTU is connected to a configured WiFI AP, the "OpenDTU-*" Access Point is closed after 3 minutes.
+* OpenDTU needs access to a working NTP server to get the current date & time. Both are sent to the inverter with each request. Default NTP server is pool.ntp.org. If your network has different requirements please change accordingly (Settings --> NTP Settings).
+* Activate Ve.direct, Battery and the AC Charger according to the available hardware 
+* Configure a Power Meter to provide a data source for the current consumption
+* Configure the Dynamic Power Limiter according to the used battery. Documentation about the power limiter interface and states can be found below.
+* If desired connect to a home automation system using MQTT or the Webapi. 
+  * A documentation of all available MQTT Topics can be found here: [MQTT Documentation](docs/MQTT_Topics.md)
+  * A documentation of the Web API can be found here: [Web-API Documentation](docs/Web-API.md)
+  * Home Assistant auto discovery is supported. [Example image](https://user-images.githubusercontent.com/59169507/217558862-a83846c5-6070-43cd-9a0b-90a8b2e2e8c6.png)
+
+### Huawei PSU 
+
+The Huawei PSU can be used to charge a battery. This can be be useful if an external (AC) connected solar system shall be utilized or if variable energy prices should be exploited. 
+
+Some points for consideration are: 
+* Make sure to consider the PSU voltage range when selecting the battery voltage as lower voltages <42V are not supported. 
+* The PSU runs a noisy fan and it is therefore desireable to switch it off when not being used. Some users have found that switching the slot detect pins with a relay accomplishes this. A GPIO pin is made available from the ESP to turn the PSU on/off
+
+#### Operation modes
+
+openDTU-onBattery supports three operation modes for the Huawei PSU:
+1. Fully manual - In this mode the PSU needs to be turned on/off externally using MQTT and voltage and current limits need to be provided. See [MQTT Documentation](docs/MQTT_Topics.md) for details on these commands
+2. Manual with auto power on / off - In this mode the PSU is turned on when a current limit > 1A is set. If the current limit is < 1A for some time the PSU is turned off. Current and voltage limits need to be provided externally using MQTT. See [MQTT Documentation](docs/MQTT_Topics.md) for details on these commands.
+3. Automatic - In this mode the PSU power is controlled by the Power Meter and information provided in the web-interface. If excess power is present the PSU is turned on. The voltage limit is set as per web-interface and the current limit is set so that the maximum PSU output power equals the Power Meter value. Minium and maximum PSU power levels as configured in the web-interface are respected in this process. The PSU is turned off if the output current is limited and the output power drops below the minium power level. This will disable automatic mode until the battery is discharged below the start voltage level (set in the web-interface). This mode can be enabled using the web-interface and MQTT. See [MQTT Documentation](docs/MQTT_Topics.md)
+
+## Troubleshooting
+
+* First: When there is no light on the solar panels, the inverter completely turns off and does not answer to OpenDTU! So if you assembled your OpenDTU in the evening, wait until tomorrow.
+* When there is no data received from the inverter(s) - try to reduce the distance between the openDTU and the inverter (e.g. move it to the window towards the roof)
+* Under Settings -> DTU Settings you can increase the transmit power "PA level". Default is "minimum".
+* The NRF24L01+ needs relatively much current. With bad power supply (and especially bad cables!) a 10 µF capacitor soldered directly to the NRF24L01+ board connector brings more stability (pin 1+2 are the power supply). Note the polarity of the capacitor…
+* You can try to use an USB power supply with 1 A or more instead of connecting the ESP32 to the computer.
+* Try a different USB cable. Once again, a stable power source is important. Some USB cables are made of much plastic and very little copper inside.
+* Double check that you have a radio module NRF24L01+ with a plus sign at the end. NRF24L01 module without the plus are not compatible with this project.
+* There is no possibility of auto-discovering the inverters. Double check you have entered the serial numbers of the inverters correctly.
+* OpenDTU needs access to a working NTP server to get the current date & time.
+* If your problem persists, check the  [Issues on Github](https://github.com/tbnobody/OpenDTU/issues). Please inspect not only the open issues, also the closed issues contain useful information.
+* Another source of information are the [Discussions](https://github.com/tbnobody/OpenDTU/discussions/)
+* When flashing with VSCode Plattform.IO fails and also with ESPRESSIF tool a demo bin file cannot be flashed to the ESP32 with error message "A fatal error occurred: MD5 of file does not match data in flash!" than un-wire/unconnect ESP32 from the NRF24L01+ board. Try to flash again and rewire afterwards.
+
+## Background
+
+This project was started from [this](https://www.mikrocontroller.net/topic/525778) discussion (Mikrocontroller.net).
+It was the goal to replace the original Hoymiles DTU (Telemetry Gateway) with their cloud access. With a lot of reverse engineering the Hoymiles protocol was decrypted and analyzed.
+
+## Features for developers
+
+### Status
+
+[![OpenDTU-onBattery Build](https://github.com/helgeerbe/OpenDTU-OnBattery/actions/workflows/build.yml/badge.svg)](https://github.com/helgeerbe/OpenDTU-OnBattery/actions/workflows/build.yml)
+[![cpplint](https://github.com/helgeerbe/OpenDTU-OnBattery/actions/workflows/cpplint.yml/badge.svg)](https://github.com/helgeerbe/OpenDTU-OnBattery/actions/workflows/cpplint.yml)
+[![Yarn Linting](https://github.com/helgeerbe/OpenDTU-OnBattery/actions/workflows/yarnlint.yml/badge.svg)](https://github.com/helgeerbe/OpenDTU-OnBattery/actions/workflows/yarnlint.yml)
+
+### Core technologies used
+
+* The microcontroller part
+  * Build with Arduino PlatformIO Framework for the ESP32
+  * Uses a fork of [ESPAsyncWebserver](https://github.com/yubox-node-org/ESPAsyncWebServer) and [espMqttClient](https://github.com/bertmelis/espMqttClient)
+
+* The WebApp part
+  * Build with [Vue.js](https://vuejs.org)
+  * Source is written in TypeScript
+
+### Breaking changes
+
+Generated using: `git log --date=short --pretty=format:"* %h%x09%ad%x09%s" | grep BREAKING`
+
+```code
+* 59f43a8       2023-04-17      BREAKING CHANGE: Web API Endpoint /api/devinfo/status requires GET parameter inv=
+* 318136d       2023-03-15      BREAKING CHANGE: Updated partition table: Make sure you have a configuration backup and completly reflash the device!
+* 3b7aef6       2023-02-13      BREAKING CHANGE: Web API!
+* d4c838a       2023-02-06      BREAKING CHANGE: Prometheus API!
+* daf847e       2022-11-14      BREAKING CHANGE: Removed deprecated config parsing method
+* 69b675b       2022-11-01      BREAKING CHANGE: Structure WebAPI /api/livedata/status changed
+* 27ed4e3       2022-10-31      BREAKING: Change power factor from percent value to value between 0 and 1
+```
+
+### Building
+
+* Building the WebApp
+  * The WebApp can be build using yarn
+
+    ```bash
+    cd webapp
+    yarn install
+    yarn build
+    ```
+
+  * The updated output is placed in the 'webapp_dist' directory
+  * It is only necessary to build the webapp when you made changes to it
+* Building the microcontroller firmware
+  * Visual Studio Code with the PlatformIO Extension is required for building
+
+## Related Projects
+
+* [Ahoy](https://github.com/grindylow/ahoy)
+* [DTU Simulator](https://github.com/Ziyatoe/DTUsimMI1x00-Hoymiles)
+* [OpenDTU extended to talk to Victrons MPPT battery chargers (Ve.Direct)](https://github.com/helgeerbe/OpenDTU_VeDirect)

docs/DeviceProfiles.md

@@ -1,3 +1,91 @@
 # Device Profiles
 
 This documentation will has been moved and can be found here: <https://tbnobody.github.io/OpenDTU-docs/firmware/device_profiles/>
+
+## Structure of the json file for openDTU-onBattery (outdated example)
+
+```json
+[
+    {
+        "name": "Generic NodeMCU 38 pin",
+        "nrf24": {
+            "miso": 19,
+            "mosi": 23,
+            "clk": 18,
+            "irq": 16,
+            "en": 4,
+            "cs": 5
+        },
+        "victron": {
+            "rx": 22,
+            "tx": 21
+        },
+        "battery": {
+            "rx": 27,
+            "tx": 14
+        },
+        "huawei": {
+            "miso": 12,
+            "mosi": 13,
+            "clk": 26,
+            "irq": 25,
+            "power": 33,
+            "cs": 15
+        },
+        "eth": {
+            "enabled": false,
+            "phy_addr": -1,
+            "power": -1,
+            "mdc": -1,
+            "mdio": -1,
+            "type": -1,
+            "clk_mode": -1
+        }
+    },
+    {
+        "name": "Generic NodeMCU 38 pin with SSD1306",
+        "nrf24": {
+            "miso": 19,
+            "mosi": 23,
+            "clk": 18,
+            "irq": 16,
+            "en": 4,
+            "cs": 5
+        },
+        "eth": {
+            "enabled": false,
+            "phy_addr": -1,
+            "power": -1,
+            "mdc": -1,
+            "mdio": -1,
+            "type": -1,
+            "clk_mode": -1
+        },
+        "display": {
+            "type": 2,
+            "data": 21,
+            "clk": 22
+        }
+    },
+    {
+        "name": "Olimex ESP32-POE",
+        "nrf24": {
+            "miso": 15,
+            "mosi": 2,
+            "clk": 14,
+            "irq": 13,
+            "en": 16,
+            "cs": 5
+        },
+        "eth": {
+            "enabled": true,
+            "phy_addr": 0,
+            "power": 12,
+            "mdc": 23,
+            "mdio": 18,
+            "type": 0,
+            "clk_mode": 3
+        }
+    }
+]
+```

docs/DeviceProfiles/opendtu_fusion.json

@@ -1,9 +1,6 @@
 [
     {
         "name": "OpenDTU Fusion v1",
-        "links": [
-            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
-        ],
         "nrf24": {
             "miso": 48,
             "mosi": 35,
@@ -28,9 +25,6 @@
     },
     {
         "name": "OpenDTU Fusion v1 with SSD1306 Display",
-        "links": [
-            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
-        ],
         "nrf24": {
             "miso": 48,
             "mosi": 35,
@@ -60,9 +54,6 @@
     },
     {
         "name": "OpenDTU Fusion v1 with SH1106 Display",
-        "links": [
-            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
-        ],
         "nrf24": {
             "miso": 48,
             "mosi": 35,
@@ -92,9 +83,6 @@
     },
     {
         "name": "OpenDTU Fusion v2 with CMT2300A and NRF24",
-        "links": [
-            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
-        ],
         "nrf24": {
             "miso": 48,
             "mosi": 35,
@@ -127,9 +115,6 @@
     },
     {
         "name": "OpenDTU Fusion v2 with CMT2300A, NRF24 and SH1106 Display",
-        "links": [
-            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
-        ],
         "nrf24": {
             "miso": 48,
             "mosi": 35,
@@ -167,9 +152,6 @@
     },
     {
         "name": "OpenDTU Fusion v2 with CMT2300A, NRF24 and SSD1306 Display",
-        "links": [
-            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
-        ],
         "nrf24": {
             "miso": 48,
             "mosi": 35,
@@ -204,122 +186,5 @@
             "data": 2,
             "clk": 1
         }
-    },
-    {
-        "name": "OpenDTU Fusion v2 PoE",
-        "links": [
-            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
-        ],
-        "nrf24": {
-            "miso": 48,
-            "mosi": 35,
-            "clk": 36,
-            "irq": 47,
-            "en": 38,
-            "cs": 37
-        },
-        "cmt": {
-            "clk": 6,
-            "cs": 4,
-            "fcs": 21,
-            "sdio": 5,
-            "gpio2": 3,
-            "gpio3": 8
-        },
-        "w5500": {
-            "mosi": 40,
-            "miso": 41,
-            "sclk": 39,
-            "cs": 42,
-            "int": 44,
-            "rst": 43
-        },
-        "led": {
-            "led0": 17,
-            "led1": 18
-        },
-        "display": {
-            "type": 0,
-            "data": 2,
-            "clk": 1
-        }
-    },
-    {
-        "name": "OpenDTU Fusion v2 PoE with SH1106 Display",
-        "links": [
-            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
-        ],
-        "nrf24": {
-            "miso": 48,
-            "mosi": 35,
-            "clk": 36,
-            "irq": 47,
-            "en": 38,
-            "cs": 37
-        },
-        "cmt": {
-            "clk": 6,
-            "cs": 4,
-            "fcs": 21,
-            "sdio": 5,
-            "gpio2": 3,
-            "gpio3": 8
-        },
-        "w5500": {
-            "mosi": 40,
-            "miso": 41,
-            "sclk": 39,
-            "cs": 42,
-            "int": 44,
-            "rst": 43
-        },
-        "led": {
-            "led0": 17,
-            "led1": 18
-        },
-        "display": {
-            "type": 3,
-            "data": 2,
-            "clk": 1
-        }
-    },
-    {
-        "name": "OpenDTU Fusion v2 PoE with SSD1306 Display",
-        "links": [
-            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
-        ],
-        "nrf24": {
-            "miso": 48,
-            "mosi": 35,
-            "clk": 36,
-            "irq": 47,
-            "en": 38,
-            "cs": 37
-        },
-        "cmt": {
-            "clk": 6,
-            "cs": 4,
-            "fcs": 21,
-            "sdio": 5,
-            "gpio2": 3,
-            "gpio3": 8
-        },
-        "w5500": {
-            "mosi": 40,
-            "miso": 41,
-            "sclk": 39,
-            "cs": 42,
-            "int": 44,
-            "rst": 43
-        },
-        "led": {
-            "led0": 17,
-            "led1": 18
-        },
-        "display": {
-            "type": 2,
-            "data": 2,
-            "clk": 1
-        }
     }
 ]

docs/DeviceProfiles/wt32-eth01.json

@@ -22,34 +22,6 @@
             "clk_mode": 0
         }
     },
-    {
-        "name": "WT32-ETH01 with SH1106",
-        "links": [
-            {"name": "Datasheet", "url": "http://www.wireless-tag.com/portfolio/wt32-eth01/"}
-        ],
-        "nrf24": {
-            "miso": 4,
-            "mosi": 2,
-            "clk": 32,
-            "irq": 33,
-            "en": 14,
-            "cs": 15
-        },
-        "eth": {
-            "enabled": true,
-            "phy_addr": 1,
-            "power": 16,
-            "mdc": 23,
-            "mdio": 18,
-            "type": 0,
-            "clk_mode": 0
-        },
-        "display": {
-            "type": 3,
-            "data": 5,
-            "clk": 17
-        }
-    },
     {
         "name": "WT32-ETH01 with SSD1306",
         "links": [

docs/PowerLimiterInverterStates.drawio

@@ -0,0 +1,275 @@
+<mxfile host="65bd71144e">
+    <diagram name="Page-1" id="b5b7bab2-c9e2-2cf4-8b2a-24fd1a2a6d21">
+        <mxGraphModel dx="1370" dy="985" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" background="none" math="0" shadow="0">
+            <root>
+                <mxCell id="0"/>
+                <mxCell id="1" parent="0"/>
+                <mxCell id="6e0c8c40b5770093-72" value="" style="shape=folder;fontStyle=1;spacingTop=10;tabWidth=194;tabHeight=22;tabPosition=left;html=1;rounded=0;shadow=0;comic=0;labelBackgroundColor=none;strokeWidth=1;fillColor=none;fontFamily=Verdana;fontSize=10;align=center;" parent="1" vertex="1">
+                    <mxGeometry x="150" y="114.5" width="1090" height="1065.5" as="geometry"/>
+                </mxCell>
+                <mxCell id="6e0c8c40b5770093-73" value="&lt;div style=&quot;color: rgb(212, 212, 212); background-color: rgb(30, 30, 30); font-family: Menlo, Monaco, &amp;quot;Courier New&amp;quot;, monospace; font-size: 12px; line-height: 18px;&quot;&gt;&lt;span style=&quot;color: #4ec9b0;&quot;&gt;PowerLimiterClass&lt;/span&gt;::&lt;span style=&quot;color: #dcdcaa;&quot;&gt;loop&lt;/span&gt;()&lt;/div&gt;" style="text;html=1;align=left;verticalAlign=top;spacingTop=-4;fontSize=10;fontFamily=Verdana" parent="1" vertex="1">
+                    <mxGeometry x="150" y="114.5" width="130" height="20" as="geometry"/>
+                </mxCell>
+                <mxCell id="sqCMRMHiXPc9LqBIY9SA-1" value="" style="ellipse;html=1;shape=startState;fillColor=#000000;strokeColor=#ff0000;" parent="1" vertex="1">
+                    <mxGeometry x="475" y="50" width="30" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="sqCMRMHiXPc9LqBIY9SA-2" value="discover state on initial call or after enabling powerLimiter" style="html=1;verticalAlign=bottom;endArrow=open;endSize=8;strokeColor=#ff0000;rounded=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="sqCMRMHiXPc9LqBIY9SA-1" target="2" edge="1">
+                    <mxGeometry relative="1" as="geometry">
+                        <mxPoint x="205" y="370" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="sqCMRMHiXPc9LqBIY9SA-6" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;STATE_OFF&lt;/p&gt;&lt;hr&gt;&lt;p&gt;&lt;/p&gt;&lt;p style=&quot;margin:0px;margin-left:8px;text-align:left;&quot;&gt;entry / stop inverter, limit lower limit&lt;br&gt;do / nothing&lt;br&gt;exit / nothing&lt;/p&gt;" style="shape=mxgraph.sysml.simpleState;html=1;overflow=fill;whiteSpace=wrap;align=center;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
+                    <mxGeometry x="170" y="585" width="200" height="100" as="geometry"/>
+                </mxCell>
+                <mxCell id="sqCMRMHiXPc9LqBIY9SA-7" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;STATE_CONSUME_SOLAR_POWER_ONLY&lt;/p&gt;&lt;hr&gt;&lt;p&gt;&lt;/p&gt;&lt;p style=&quot;margin:0px;margin-left:8px;text-align:left;&quot;&gt;entry /&lt;br&gt;do / setNewLimit&lt;br&gt;exit /&lt;/p&gt;" style="shape=mxgraph.sysml.simpleState;html=1;overflow=fill;whiteSpace=wrap;align=center;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
+                    <mxGeometry x="525" y="590" width="270" height="90" as="geometry"/>
+                </mxCell>
+                <mxCell id="sqCMRMHiXPc9LqBIY9SA-8" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;STATE_NORMAL_OPERATION&lt;/p&gt;&lt;hr&gt;&lt;p&gt;&lt;/p&gt;&lt;p style=&quot;margin:0px;margin-left:8px;text-align:left;&quot;&gt;entry /&lt;br&gt;do / setNewLimit&lt;br&gt;exit /&lt;/p&gt;" style="shape=mxgraph.sysml.simpleState;html=1;overflow=fill;whiteSpace=wrap;align=center;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
+                    <mxGeometry x="970" y="585" width="200" height="100" as="geometry"/>
+                </mxCell>
+                <mxCell id="2" value="&lt;p style=&quot;margin:0px;margin-top:4px;text-align:center;&quot;&gt;STATE_DISOVER&lt;/p&gt;&lt;hr&gt;&lt;p&gt;&lt;/p&gt;&lt;p style=&quot;margin:0px;margin-left:8px;text-align:left;&quot;&gt;entry /&amp;nbsp;&lt;br&gt;do / nothing&lt;br&gt;exit /&amp;nbsp;&lt;/p&gt;" style="shape=mxgraph.sysml.simpleState;html=1;overflow=fill;whiteSpace=wrap;align=center;fillColor=#f5f5f5;strokeColor=#666666;fontColor=#333333;" parent="1" vertex="1">
+                    <mxGeometry x="390" y="180" width="200" height="100" as="geometry"/>
+                </mxCell>
+                <mxCell id="5" value="" style="shape=ellipse;html=1;dashed=0;whitespace=wrap;aspect=fixed;strokeWidth=5;perimeter=ellipsePerimeter;" parent="1" vertex="1">
+                    <mxGeometry x="414" y="780" width="30" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="7" value="&lt;p&gt;&lt;span style=&quot;font-size: 11px; background-color: rgb(255, 255, 255);&quot;&gt;!Inverter-&amp;gt;isProducing || isStopThresholdReached&lt;/span&gt;&lt;/p&gt;" style="rhombus;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="425" y="300" width="130" height="130" as="geometry"/>
+                </mxCell>
+                <mxCell id="10" value="&lt;span style=&quot;font-size: 11px; background-color: rgb(255, 255, 255);&quot;&gt;canUseDirectSolarPower&lt;/span&gt;" style="rhombus;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="595" y="390" width="130" height="120" as="geometry"/>
+                </mxCell>
+                <mxCell id="11" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="10" target="sqCMRMHiXPc9LqBIY9SA-7" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="620" y="540" as="sourcePoint"/>
+                        <mxPoint x="670" y="490" as="targetPoint"/>
+                        <Array as="points"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="20" value="yes" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="11" vertex="1" connectable="0">
+                    <mxGeometry x="0.075" y="1" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="12" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="2" target="7" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="484" y="280" as="sourcePoint"/>
+                        <mxPoint x="420" y="220" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="13" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryPerimeter=0;" parent="1" source="7" target="sqCMRMHiXPc9LqBIY9SA-6" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="570" y="290" as="sourcePoint"/>
+                        <mxPoint x="400" y="330" as="targetPoint"/>
+                        <Array as="points">
+                            <mxPoint x="270" y="365"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="14" value="yes" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="13" vertex="1" connectable="0">
+                    <mxGeometry x="0.3049" relative="1" as="geometry">
+                        <mxPoint x="80" y="-105" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="15" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="7" target="10" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="360" y="370" as="sourcePoint"/>
+                        <mxPoint x="280" y="595" as="targetPoint"/>
+                        <Array as="points">
+                            <mxPoint x="660" y="365"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="16" value="no" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="15" vertex="1" connectable="0">
+                    <mxGeometry x="0.3049" relative="1" as="geometry">
+                        <mxPoint x="-45" y="-15" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="18" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="10" target="sqCMRMHiXPc9LqBIY9SA-8" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="760" y="340" as="sourcePoint"/>
+                        <mxPoint x="810" y="290" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="19" value="no" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="18" vertex="1" connectable="0">
+                    <mxGeometry x="0.142" y="2" relative="1" as="geometry">
+                        <mxPoint x="-239" y="-8" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="21" value="isStopThresholdReached" style="rhombus;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="220" y="730" width="130" height="130" as="geometry"/>
+                </mxCell>
+                <mxCell id="22" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="21" target="24" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="620" y="540" as="sourcePoint"/>
+                        <mxPoint x="670" y="490" as="targetPoint"/>
+                        <Array as="points">
+                            <mxPoint x="285" y="995"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="31" value="no" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="22" vertex="1" connectable="0">
+                    <mxGeometry x="-0.702" y="1" relative="1" as="geometry">
+                        <mxPoint x="39" y="91" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="23" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.581;exitY=0.998;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="sqCMRMHiXPc9LqBIY9SA-6" target="21" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="480" y="810" as="sourcePoint"/>
+                        <mxPoint x="530" y="760" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="41" style="edgeStyle=none;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="24" target="25">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="42" value="no" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="41">
+                    <mxGeometry x="0.36" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="24" value="canUseDirectSolarPower" style="rhombus;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="600" y="930" width="130" height="130" as="geometry"/>
+                </mxCell>
+                <mxCell id="25" value="isStartThresholdReached" style="rhombus;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                    <mxGeometry x="830" y="930" width="130" height="130" as="geometry"/>
+                </mxCell>
+                <mxCell id="29" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="21" target="5" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="350" y="830" as="sourcePoint"/>
+                        <mxPoint x="400" y="780" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="30" value="yes" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="29" vertex="1" connectable="0">
+                    <mxGeometry x="-0.1" relative="1" as="geometry">
+                        <mxPoint x="3" y="-15" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="JKiNQljIdbqBsyxyxwz1-38" value="" style="endArrow=classic;html=1;rounded=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="sqCMRMHiXPc9LqBIY9SA-7" target="sqCMRMHiXPc9LqBIY9SA-6" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="570" y="820" as="sourcePoint"/>
+                        <mxPoint x="620" y="770" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="JKiNQljIdbqBsyxyxwz1-39" value="isStopThresholdReached ||&lt;br&gt;(!canUseDirectSolarPower &lt;br&gt;&amp;amp;&amp;amp; EMPTY_WHEN_FULL)" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="JKiNQljIdbqBsyxyxwz1-38" vertex="1" connectable="0">
+                    <mxGeometry x="-0.2129" y="-2" relative="1" as="geometry">
+                        <mxPoint x="-14" y="-33" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="JKiNQljIdbqBsyxyxwz1-40" value="isStartThresholdReached ||&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;(!canUseDirectSolarPower&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;&amp;amp;&amp;amp; EMPTY_AT_NIGHT)" style="endArrow=classic;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="sqCMRMHiXPc9LqBIY9SA-7" target="sqCMRMHiXPc9LqBIY9SA-8" edge="1">
+                    <mxGeometry x="-0.0286" y="25" width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="570" y="560" as="sourcePoint"/>
+                        <mxPoint x="620" y="510" as="targetPoint"/>
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="JKiNQljIdbqBsyxyxwz1-41" value="" style="endArrow=classic;html=1;rounded=0;entryX=0.22;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;exitX=0.354;exitY=1.025;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="sqCMRMHiXPc9LqBIY9SA-8" target="sqCMRMHiXPc9LqBIY9SA-6" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="1040" y="680" as="sourcePoint"/>
+                        <mxPoint x="890" y="750" as="targetPoint"/>
+                        <Array as="points">
+                            <mxPoint x="1040" y="1070"/>
+                            <mxPoint x="214" y="1070"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="JKiNQljIdbqBsyxyxwz1-42" value="isStopThresholdReached ||" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="JKiNQljIdbqBsyxyxwz1-41" vertex="1" connectable="0">
+                    <mxGeometry x="-0.2129" y="-2" relative="1" as="geometry">
+                        <mxPoint x="-151" y="32" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="JKiNQljIdbqBsyxyxwz1-43" value="" style="shape=ellipse;html=1;dashed=0;whitespace=wrap;aspect=fixed;strokeWidth=5;perimeter=ellipsePerimeter;" parent="1" vertex="1">
+                    <mxGeometry x="1055" y="799.7" width="30" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="JKiNQljIdbqBsyxyxwz1-44" value="" style="endArrow=classic;html=1;exitX=0.82;exitY=1.003;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitPerimeter=0;" parent="1" target="JKiNQljIdbqBsyxyxwz1-43" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="1069.0000000000002" y="685" as="sourcePoint"/>
+                        <mxPoint x="1119" y="749.7" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="JKiNQljIdbqBsyxyxwz1-45" value="inTargetRange do nothing" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="JKiNQljIdbqBsyxyxwz1-44" vertex="1" connectable="0">
+                    <mxGeometry x="-0.1" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="JKiNQljIdbqBsyxyxwz1-46" value="" style="shape=ellipse;html=1;dashed=0;whitespace=wrap;aspect=fixed;strokeWidth=5;perimeter=ellipsePerimeter;" parent="1" vertex="1">
+                    <mxGeometry x="530" y="795" width="30" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="JKiNQljIdbqBsyxyxwz1-47" value="" style="endArrow=classic;html=1;exitX=0.82;exitY=1.003;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitPerimeter=0;" parent="1" target="JKiNQljIdbqBsyxyxwz1-46" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="544" y="680" as="sourcePoint"/>
+                        <mxPoint x="594" y="745" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="JKiNQljIdbqBsyxyxwz1-48" value="after setNewLimit" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="JKiNQljIdbqBsyxyxwz1-47" vertex="1" connectable="0">
+                    <mxGeometry x="-0.1" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="JKiNQljIdbqBsyxyxwz1-49" value="" style="shape=ellipse;html=1;dashed=0;whitespace=wrap;aspect=fixed;strokeWidth=5;perimeter=ellipsePerimeter;" parent="1" vertex="1">
+                    <mxGeometry x="1110" y="800" width="30" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="JKiNQljIdbqBsyxyxwz1-50" value="" style="endArrow=classic;html=1;exitX=0.82;exitY=1.003;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitPerimeter=0;" parent="1" target="JKiNQljIdbqBsyxyxwz1-49" edge="1">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="1124.0000000000002" y="685.3" as="sourcePoint"/>
+                        <mxPoint x="1174" y="750" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="JKiNQljIdbqBsyxyxwz1-51" value="after setNewLimit" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="JKiNQljIdbqBsyxyxwz1-50" vertex="1" connectable="0">
+                    <mxGeometry x="-0.1" relative="1" as="geometry">
+                        <mxPoint x="16" y="33" as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="38" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="24" target="sqCMRMHiXPc9LqBIY9SA-7">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="580" y="710" as="sourcePoint"/>
+                        <mxPoint x="630" y="660" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="39" value="yes" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="38">
+                    <mxGeometry x="0.104" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="40" value="" style="endArrow=classic;html=1;entryX=1;entryY=0.75;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" target="sqCMRMHiXPc9LqBIY9SA-7">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="970" y="658" as="sourcePoint"/>
+                        <mxPoint x="800" y="660" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="48" value="canUseDirectSolarPower&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;&amp;amp;&amp;amp; EMPTY_AT_NIGHT" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="40">
+                    <mxGeometry x="-0.04" y="1" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="43" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="25" target="sqCMRMHiXPc9LqBIY9SA-8">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="960" y="980" as="sourcePoint"/>
+                        <mxPoint x="1010" y="930" as="targetPoint"/>
+                        <Array as="points">
+                            <mxPoint x="1020" y="995"/>
+                        </Array>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="44" value="yes" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="43">
+                    <mxGeometry x="0.1135" y="2" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="45" value="" style="shape=ellipse;html=1;dashed=0;whitespace=wrap;aspect=fixed;strokeWidth=5;perimeter=ellipsePerimeter;" vertex="1" parent="1">
+                    <mxGeometry x="880" y="850" width="30" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="46" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="25" target="45">
+                    <mxGeometry width="50" height="50" relative="1" as="geometry">
+                        <mxPoint x="580" y="710" as="sourcePoint"/>
+                        <mxPoint x="630" y="660" as="targetPoint"/>
+                    </mxGeometry>
+                </mxCell>
+                <mxCell id="47" value="no" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="46">
+                    <mxGeometry x="-0.08" relative="1" as="geometry">
+                        <mxPoint as="offset"/>
+                    </mxGeometry>
+                </mxCell>
+            </root>
+        </mxGraphModel>
+    </diagram>
+</mxfile>

docs/UpgradePartition.md

@@ -1,3 +1,3 @@
 # Upgrade Partition
 
-This documentation has been moved and can be found here: <https://tbnobody.github.io/OpenDTU-docs/firmware/howto/upgrade_partition/>
+This documentation will has been moved and can be found here: <https://tbnobody.github.io/OpenDTU-docs/firmware/howto/upgrade_partition/>

docs/Web-API.md

@@ -1,3 +1,44 @@
 # Web API
 
 This documentation will has been moved and can be found here: <https://tbnobody.github.io/OpenDTU-docs/firmware/web_api/>
+
+## List of URLs
+
+This list may be incomplete
+
+| GET/POST | Auth required | URL |
+| -------- | --- | -- |
+| Get      | no  | /api/vedirectlivedata/status |
+| Get      | no  | /api/vedirect/status |
+| Get      | no  | /api/huawei/status |
+| Get      | no  | /api/huawei/config |
+| Get      | no  | /api/huawei/limit/config |
+| Get      | no  | /api/batterylivedata/status |
+| Get      | no  | /api/battery/status |
+| Get      | no  | /api/powerlimiter/status |
+
+### Victron REST-API (/api/vedirectlivedata/status):
+````JSON
+{
+"data_age":0,
+"age_critical":false,
+"PID":"SmartSolar MPPT 100|30",
+"SER":"XXX",
+"FW":"159",
+"LOAD":"ON",
+"CS":"Bulk",
+"ERR":"No error",
+"OR":"Not off",
+"MPPT":"MPP Tracker active",
+"HSDS":{"v":46,"u":"Days"},
+"V":{"v":26.36,"u":"V"},
+"I":{"v":3.4,"u":"A"},
+"VPV":{"v":37.13,"u":"V"},
+"PPV":{"v":93,"u":"W"},
+"H19":{"v":83.16,"u":"kWh"},
+"H20":{"v":1.39,"u":"kWh"},
+"H21":{"v":719,"u":"W"},
+"H22":{"v":1.43,"u":"kWh"},
+"H23":{"v":737,"u":"W"}
+}
+````

docs/hardware_flash.md

@@ -0,0 +1,189 @@
+# Hardware, building and flashing Firmware
+
+## Hardware you need
+
+### ESP32 board
+
+For ease of use, buy a "ESP32 DEVKIT DOIT" or "ESP32 NodeMCU Development Board" with an ESP32-S3 or ESP-WROOM-32 chipset on it.
+
+Sample Picture:
+
+![NodeMCU-ESP32](nodemcu-esp32.png)
+
+Also supported: Board with Ethernet-Connector and Power-over-Ethernet [Olimex ESP32-POE](https://www.olimex.com/Products/IoT/ESP32/ESP32-POE/open-source-hardware)
+
+### NRF24L01+ radio board (See inverter table above for supported inverters)
+
+The PLUS sign is IMPORTANT! There are different variants available, with antenna on the printed circuit board or external antenna.
+
+Sample picture:
+
+![nrf24l01plus](nrf24l01plus.png)
+
+Buy your hardware from a trusted source, at best from a dealer/online shop in your country where you have support and the right to return non-functional hardware.
+When you want to buy from Amazon, AliExpress, eBay etc., take note that there is a lot of low-quality or fake hardware offered. Read customer comments and ratings carefully!
+
+A heavily incomplete list of trusted hardware shops in Germany is:
+
+* [AZ-Delivery](https://www.az-delivery.de/)
+* [Makershop](https://www.makershop.de/)
+* [Berrybase](https://www.berrybase.de/)
+
+This list is for your convenience only, the project is not related to any of these shops.
+
+### CMT2300A radio board  (See inverter table above for supported inverters)
+
+It is important to get a module which supports SPI communication. The following modules are currently supported:
+
+* EBYTE E49-900M20S
+
+The CMT2300A uses 3-Wire half duplex SPI communication. Due to this fact it currently requires a separate SPI bus. If you want to run the CMT2300A module on the same ESP32 as a NRF24L01+ module or a PCD8544 display make sure you get a ESP which supports 2 SPI busses. Currently the SPI bus host is hardcoded to number 2. This may change in future.
+
+### 3.3V / 5V logic level converter
+
+The logic level converter is used to interface with the Victron MPPT charge controller and the relay board. It converts the 3.3V logic level used by the ESP32 to 5V logic used by the other devices. 
+
+### SN65HVD230 CAN bus transceiver
+
+The SN65HVD230 CAN bus transceiver is used to interface with the Pylontech battery. It leverages the CAN bus controller of the ESP32. This CAN bus operates at 500kbit/s
+
+### MCP2515 CAN bus module
+
+See [Wiki](https://github.com/helgeerbe/OpenDTU-OnBattery/wiki/Huawei-AC-PSU) for details.
+
+### Relay module
+
+The Huawei PSU can be switched on / off using the slot detect port. This is done by this relay.
+
+### Power supply
+
+Use a power supply with 5 V and 1 A. The USB cable connected to your PC/Notebook may be powerful enough or may be not.
+
+## Wiring up the NRF24L01+ module
+
+### Schematic
+
+![Schematic](Wiring_ESP32_Schematic.png)
+
+### Symbolic view
+
+![Symbolic](Wiring_ESP32_Symbol.png)
+
+### Change pin assignment
+
+Its possible to change all the pins of the NRF24L01+ module, the Display, the LED etc.
+The recommend way to change the pin assignment is by creating a custom [device profile](DeviceProfiles.md).
+It is also possible to create a custom environment and compile the source yourself. This can be achieved by copying one of the [env:....] sections from 'platformio.ini' to 'platformio_override.ini' and editing the 'platformio_override.ini' file and add/change one or more of the following lines to the 'build_flags' parameter:
+
+```makefile
+-DHOYMILES_PIN_MISO=19
+-DHOYMILES_PIN_MOSI=23
+-DHOYMILES_PIN_SCLK=18
+-DHOYMILES_PIN_IRQ=16
+-DHOYMILES_PIN_CE=4
+-DHOYMILES_PIN_CS=5
+-DVICTRON_PIN_TX=21
+-DVICTRON_PIN_RX=22
+-DPYLONTECH_PIN_RX=27
+-DPYLONTECH_PIN_TX=14
+-DHUAWEI_PIN_MISO=12
+-DHUAWEI_PIN_MOSI=13
+-DHUAWEI_PIN_SCLK=26
+-DHUAWEI_PIN_IRQ=25
+-DHUAWEI_PIN_CS=15
+-DHUAWEI_PIN_POWER=33
+```
+
+It is recommended to make all changes only in the  'platformio_override.ini', this is your personal copy.
+
+## Flashing and starting up
+
+### with Visual Studio Code
+
+* Install [Visual Studio Code](https://code.visualstudio.com/download) (from now named "vscode")
+* In Visual Studio Code, install the [PlatformIO Extension](https://marketplace.visualstudio.com/items?itemName=platformio.platformio-ide)
+* Install git and enable git in vscode - [git download](https://git-scm.com/downloads/) - [Instructions](https://www.jcchouinard.com/install-git-in-vscode/)
+* Clone this repository (you really have to clone it, don't just download the ZIP file. During the build process the git hash gets embedded into the firmware. If you download the ZIP file a build error will occur): Inside vscode open the command palette by pressing `CTRL` + `SHIFT` + `P`. Enter `git clone`, add the repository-URL `https://github.com/tbnobody/OpenDTU`. Next you have to choose (or create) a target directory.
+* In vscode, choose File --> Open Folder and select the previously downloaded source code. (You have to select the folder which contains the "platformio.ini" and "platformio_override.ini" file)
+* Adjust the COM port in the file "platformio_override.ini" for your USB-to-serial-converter. It occurs twice:
+  * upload_port
+  * monitor_port
+* Select the arrow button in the blue bottom status bar (PlatformIO: Upload) to compile and upload the firmware. During the compilation, all required libraries are downloaded automatically.
+* Under Linux, if the upload fails with error messages "Could not open /dev/ttyUSB0, the port doesn't exist", you can check via ```ls -la /dev/tty*``` to which group your port belongs to, and then add your user this group via ```sudo adduser <yourusername> dialout``` (if you are using ```arch-linux``` use: ```sudo gpasswd -a <yourusername> uucp```, this method requires a logout/login of the affected user).
+* There are two videos showing these steps:
+  * [Git Clone and compilation](https://youtu.be/9cA_esv3zeA)
+  * [Full installation and compilation](https://youtu.be/xs6TqHn7QWM)
+
+### on the commandline with PlatformIO Core
+
+* Install [PlatformIO Core](https://platformio.org/install/cli)
+* Clone this repository (you really have to clone it, don't just download the ZIP file. During the build process the git hash gets embedded into the firmware. If you download the ZIP file a build error will occur)
+* Adjust the COM port in the file "platformio_override.ini". It occurs twice:
+  * upload_port
+  * monitor_port
+* build: `platformio run -e generic`
+* upload to esp module: `platformio run -e generic -t upload`
+* other options:
+  * clean the sources:  `platformio run -e generic -t clean`
+  * erase flash: `platformio run -e generic -t erase`
+
+### using the pre-compiled .bin files
+
+The pre-compiled files can be found on the [github page](https://github.com/tbnobody/OpenDTU) in the tab "Actions" and the sub menu "OpenDTU Build". Just choose the latest build from the master branch (search for "master" in the blue font text but click on the white header text!). You need to be logged in with your github account to download the files.
+Use a ESP32 flash tool of your choice (see next chapter) and flash the `.bin` files to the right addresses:
+
+| Address  | File                   |
+| ---------| ---------------------- |
+| 0x1000   | bootloader.bin         |
+| 0x8000   | partitions.bin         |
+| 0xe000   | boot_app0.bin          |
+| 0x10000  | opendtu-*.bin          |
+
+For further updates you can just use the web interface and upload the `opendtu-*.bin` file.
+
+#### Flash with esptool.py (Linux)
+
+```bash
+esptool.py --port /dev/ttyUSB0 --chip esp32 --before default_reset --after hard_reset \
+  write_flash --flash_mode dout --flash_freq 40m --flash_size detect \
+  0x1000 bootloader.bin \
+  0x8000 partitions.bin \
+  0xe000 boot_app0.bin \
+  0x10000 opendtu-generic.bin
+```
+
+#### Flash with Espressif Flash Download Tool (Windows)
+
+[Download link](https://www.espressif.com/en/support/download/other-tools)
+
+* On startup, select Chip Type -> "ESP32" / WorkMode -> "Develop"
+* Prepare all settings (see picture). Make sure to uncheck the `DoNotChgBin` option. Otherwise you may get errors like "invalid header".
+* ![flash tool image](esp32_flash_download_tool.png)
+* Press "Erase" button on screen. Look into the terminal window, you should see dots appear. Then press  the "Boot" button on the ESP32 board. Wait for "FINISH" to see if flashing/erasing is done.
+* To program, press "Start" on screen, then the "Boot" button.
+* When flashing is complete (FINISH appears) then press the Reset button on the ESP32 board (or powercycle ) to start the OpenDTU application.
+
+#### Flash with ESP_Flasher (Windows)
+
+Users report that [ESP_Flasher](https://github.com/Jason2866/ESP_Flasher/releases/) is suitable for flashing OpenDTU on Windows.
+
+#### Flash with [ESP_Flasher](https://espressif.github.io/esptool-js/) - web version
+
+It is also possible to flash it via the web tools which might be more convenient and is platform independent.
+
+## Flashing an Update using "Over The Air" OTA Update
+
+Once you have your OpenDTU running and connected to WLAN, you can do further updates through the web interface.
+Navigate to Settings --> Firmware upgrade and press the browse button. Select the firmware file from your local computer.
+
+You'll find the firmware file (after a successful build process) under `.pio/build/generic/firmware.bin`.
+
+If you downloaded a precompiled zip archive, unpack it and choose `opendtu-generic.bin`.
+
+After the successful upload, the OpenDTU immediately restarts into the new firmware.
+
+
+## Builds
+
+Different builds from existing installations can be found here [Builds](builds/README.md)
+Like to show your own build? Just send me a Pull Request.

include/Battery.h

@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <memory>
+#include <mutex>
+#include <TaskSchedulerDeclarations.h>
+
+#include "BatteryStats.h"
+
+class BatteryProvider {
+public:
+    // returns true if the provider is ready for use, false otherwise
+    virtual bool init(bool verboseLogging) = 0;
+    virtual void deinit() = 0;
+    virtual void loop() = 0;
+    virtual std::shared_ptr<BatteryStats> getStats() const = 0;
+    virtual bool usesHwPort2() const { return false; }
+};
+
+class BatteryClass {
+public:
+    void init(Scheduler&);
+    void updateSettings();
+
+    std::shared_ptr<BatteryStats const> getStats() const;
+
+private:
+    void loop();
+
+    Task _loopTask;
+    mutable std::mutex _mutex;
+    std::unique_ptr<BatteryProvider> _upProvider = nullptr;
+};
+
+extern BatteryClass Battery;

include/BatteryStats.h

@@ -0,0 +1,183 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <stdint.h>
+
+#include "AsyncJson.h"
+#include "Arduino.h"
+#include "JkBmsDataPoints.h"
+#include "VeDirectShuntController.h"
+#include <cfloat>
+
+// mandatory interface for all kinds of batteries
+class BatteryStats {
+    public:
+        String const& getManufacturer() const { return _manufacturer; }
+
+        // the last time *any* datum was updated
+        uint32_t getAgeSeconds() const { return (millis() - _lastUpdate) / 1000; }
+        bool updateAvailable(uint32_t since) const;
+
+        uint8_t getSoC() const { return _soc; }
+        uint32_t getSoCAgeSeconds() const { return (millis() - _lastUpdateSoC) / 1000; }
+
+        float getVoltage() const { return _voltage; }
+        uint32_t getVoltageAgeSeconds() const { return (millis() - _lastUpdateVoltage) / 1000; }
+
+        // convert stats to JSON for web application live view
+        virtual void getLiveViewData(JsonVariant& root) const;
+
+        void mqttLoop();
+
+        // the interval at which all battery datums will be re-published, even
+        // if they did not change. used to calculate Home Assistent expiration.
+        virtual uint32_t getMqttFullPublishIntervalMs() const;
+
+        bool isSoCValid() const { return _lastUpdateSoC > 0; }
+        bool isVoltageValid() const { return _lastUpdateVoltage > 0; }
+
+        // returns true if the battery reached a critically low voltage/SoC,
+        // such that it is in need of charging to prevent degredation.
+        virtual bool getImmediateChargingRequest() const { return false; };
+
+        virtual float getChargeCurrent() const { return 0; };
+        virtual float getChargeCurrentLimitation() const { return FLT_MAX; };
+
+    protected:
+        virtual void mqttPublish() const;
+
+        void setSoC(float soc, uint8_t precision, uint32_t timestamp) {
+            _soc = soc;
+            _socPrecision = precision;
+            _lastUpdateSoC = _lastUpdate = timestamp;
+        }
+
+        void setVoltage(float voltage, uint32_t timestamp) {
+            _voltage = voltage;
+            _lastUpdateVoltage = _lastUpdate = timestamp;
+        }
+
+        String _manufacturer = "unknown";
+        uint32_t _lastUpdate = 0;
+
+    private:
+        uint32_t _lastMqttPublish = 0;
+        float _soc = 0;
+        uint8_t _socPrecision = 0; // decimal places
+        uint32_t _lastUpdateSoC = 0;
+        float _voltage = 0; // total battery pack voltage
+        uint32_t _lastUpdateVoltage = 0;
+};
+
+class PylontechBatteryStats : public BatteryStats {
+    friend class PylontechCanReceiver;
+
+    public:
+        void getLiveViewData(JsonVariant& root) const final;
+        void mqttPublish() const final;
+        bool getImmediateChargingRequest() const { return _chargeImmediately; } ;
+        float getChargeCurrent() const { return _current; } ;
+        float getChargeCurrentLimitation() const { return _chargeCurrentLimitation; } ;
+
+    private:
+        void setManufacturer(String&& m) { _manufacturer = std::move(m); }
+        void setLastUpdate(uint32_t ts) { _lastUpdate = ts; }
+
+        float _chargeVoltage;
+        float _chargeCurrentLimitation;
+        float _dischargeCurrentLimitation;
+        uint16_t _stateOfHealth;
+        // total current into (positive) or from (negative)
+        // the battery, i.e., the charging current
+        float _current;
+        float _temperature;
+
+        bool _alarmOverCurrentDischarge;
+        bool _alarmOverCurrentCharge;
+        bool _alarmUnderTemperature;
+        bool _alarmOverTemperature;
+        bool _alarmUnderVoltage;
+        bool _alarmOverVoltage;
+        bool _alarmBmsInternal;
+
+        bool _warningHighCurrentDischarge;
+        bool _warningHighCurrentCharge;
+        bool _warningLowTemperature;
+        bool _warningHighTemperature;
+        bool _warningLowVoltage;
+        bool _warningHighVoltage;
+        bool _warningBmsInternal;
+
+        bool _chargeEnabled;
+        bool _dischargeEnabled;
+        bool _chargeImmediately;
+};
+
+class JkBmsBatteryStats : public BatteryStats {
+    public:
+        void getLiveViewData(JsonVariant& root) const final {
+            getJsonData(root, false);
+        }
+
+        void getInfoViewData(JsonVariant& root) const {
+            getJsonData(root, true);
+        }
+
+        void mqttPublish() const final;
+
+        uint32_t getMqttFullPublishIntervalMs() const final { return 60 * 1000; }
+
+        void updateFrom(JkBms::DataPointContainer const& dp);
+
+    private:
+        void getJsonData(JsonVariant& root, bool verbose) const;
+
+        JkBms::DataPointContainer _dataPoints;
+        mutable uint32_t _lastMqttPublish = 0;
+        mutable uint32_t _lastFullMqttPublish = 0;
+
+        uint16_t _cellMinMilliVolt = 0;
+        uint16_t _cellAvgMilliVolt = 0;
+        uint16_t _cellMaxMilliVolt = 0;
+        uint32_t _cellVoltageTimestamp = 0;
+};
+
+class VictronSmartShuntStats : public BatteryStats {
+    public:
+        void getLiveViewData(JsonVariant& root) const final;
+        void mqttPublish() const final;
+
+        void updateFrom(VeDirectShuntController::data_t const& shuntData);
+
+    private:
+        float _current;
+        float _temperature;
+        bool _tempPresent;
+        uint8_t _chargeCycles;
+        uint32_t _timeToGo;
+        float _chargedEnergy;
+        float _dischargedEnergy;
+        String _modelName;
+        int32_t _instantaneousPower;
+        float _consumedAmpHours;
+        int32_t _lastFullCharge;
+
+        bool _alarmLowVoltage;
+        bool _alarmHighVoltage;
+        bool _alarmLowSOC;
+        bool _alarmLowTemperature;
+        bool _alarmHighTemperature;
+};
+
+class MqttBatteryStats : public BatteryStats {
+    friend class MqttBattery;
+
+    public:
+        // since the source of information was MQTT in the first place,
+        // we do NOT publish the same data under a different topic.
+        void mqttPublish() const final { }
+
+        // if the voltage is subscribed to at all, it alone does not warrant a
+        // card in the live view, since the SoC is already displayed at the top
+        void getLiveViewData(JsonVariant& root) const final { }
+};

include/Configuration.h

@@ -3,12 +3,9 @@
 
 #include "PinMapping.h"
 #include <cstdint>
-#include <TaskSchedulerDeclarations.h>
-#include <mutex>
-#include <condition_variable>
 
 #define CONFIG_FILENAME "/config.json"
-#define CONFIG_VERSION 0x00011d00 // 0.1.29 // make sure to clean all after change
+#define CONFIG_VERSION 0x00011c00 // 0.1.28 // make sure to clean all after change
 
 #define WIFI_MAX_SSID_STRLEN 32
 #define WIFI_MAX_PASSWORD_STRLEN 64
@@ -19,10 +16,9 @@
 #define NTP_MAX_TIMEZONEDESCR_STRLEN 50
 
 #define MQTT_MAX_HOSTNAME_STRLEN 128
-#define MQTT_MAX_CLIENTID_STRLEN 64
 #define MQTT_MAX_USERNAME_STRLEN 64
 #define MQTT_MAX_PASSWORD_STRLEN 64
-#define MQTT_MAX_TOPIC_STRLEN 32
+#define MQTT_MAX_TOPIC_STRLEN 256
 #define MQTT_MAX_LWTVALUE_STRLEN 20
 #define MQTT_MAX_CERT_STRLEN 2560
 
@@ -33,7 +29,15 @@
 #define CHAN_MAX_NAME_STRLEN 31
 
 #define DEV_MAX_MAPPING_NAME_STRLEN 63
-#define LOCALE_STRLEN 2
+
+#define POWERMETER_MAX_PHASES 3
+#define POWERMETER_MAX_HTTP_URL_STRLEN 1024
+#define POWERMETER_MAX_USERNAME_STRLEN 64
+#define POWERMETER_MAX_PASSWORD_STRLEN 64
+#define POWERMETER_MAX_HTTP_HEADER_KEY_STRLEN 64
+#define POWERMETER_MAX_HTTP_HEADER_VALUE_STRLEN 256
+#define POWERMETER_MAX_HTTP_JSON_PATH_STRLEN 256
+#define POWERMETER_HTTP_TIMEOUT 1000
 
 struct CHANNEL_CONFIG_T {
     uint16_t MaxChannelPower;
@@ -52,11 +56,27 @@ struct INVERTER_CONFIG_T {
     uint8_t ReachableThreshold;
     bool ZeroRuntimeDataIfUnrechable;
     bool ZeroYieldDayOnMidnight;
-    bool ClearEventlogOnMidnight;
     bool YieldDayCorrection;
     CHANNEL_CONFIG_T channel[INV_MAX_CHAN_COUNT];
 };
 
+struct POWERMETER_HTTP_PHASE_CONFIG_T {
+    enum Auth { None, Basic, Digest };
+    enum Unit { Watts = 0, MilliWatts = 1, KiloWatts = 2 };
+    bool Enabled;
+    char Url[POWERMETER_MAX_HTTP_URL_STRLEN + 1];
+    Auth AuthType;
+    char Username[POWERMETER_MAX_USERNAME_STRLEN +1];
+    char Password[POWERMETER_MAX_USERNAME_STRLEN +1];
+    char HeaderKey[POWERMETER_MAX_HTTP_HEADER_KEY_STRLEN + 1];
+    char HeaderValue[POWERMETER_MAX_HTTP_HEADER_VALUE_STRLEN + 1];
+    uint16_t Timeout;
+    char JsonPath[POWERMETER_MAX_HTTP_JSON_PATH_STRLEN + 1];
+    Unit PowerUnit;
+    bool SignInverted;
+};
+using PowerMeterHttpConfig = struct POWERMETER_HTTP_PHASE_CONFIG_T;
+
 struct CONFIG_T {
     struct {
         uint32_t Version;
@@ -92,8 +112,8 @@ struct CONFIG_T {
     struct {
         bool Enabled;
         char Hostname[MQTT_MAX_HOSTNAME_STRLEN + 1];
+        bool VerboseLogging;
         uint32_t Port;
-        char ClientId[MQTT_MAX_CLIENTID_STRLEN + 1];
         char Username[MQTT_MAX_USERNAME_STRLEN + 1];
         char Password[MQTT_MAX_PASSWORD_STRLEN + 1];
         char Topic[MQTT_MAX_TOPIC_STRLEN + 1];
@@ -136,6 +156,7 @@ struct CONFIG_T {
             uint32_t Frequency;
             uint8_t CountryMode;
         } Cmt;
+        bool VerboseLogging;
     } Dtu;
 
     struct {
@@ -148,7 +169,7 @@ struct CONFIG_T {
         bool ScreenSaver;
         uint8_t Rotation;
         uint8_t Contrast;
-        char Locale[LOCALE_STRLEN + 1];
+        uint8_t Language;
         struct {
             uint32_t Duration;
             uint8_t Mode;
@@ -159,38 +180,96 @@ struct CONFIG_T {
         uint8_t Brightness;
     } Led_Single[PINMAPPING_LED_COUNT];
 
+    struct {
+        bool Enabled;
+        bool VerboseLogging;
+        bool UpdatesOnly;
+    } Vedirect;
+
+    struct {
+        bool Enabled;
+        bool VerboseLogging;
+        uint32_t Interval;
+        uint32_t Source;
+        char MqttTopicPowerMeter1[MQTT_MAX_TOPIC_STRLEN + 1];
+        char MqttTopicPowerMeter2[MQTT_MAX_TOPIC_STRLEN + 1];
+        char MqttTopicPowerMeter3[MQTT_MAX_TOPIC_STRLEN + 1];
+        uint32_t SdmBaudrate;
+        uint32_t SdmAddress;
+        uint32_t HttpInterval;
+        bool HttpIndividualRequests;
+        PowerMeterHttpConfig Http_Phase[POWERMETER_MAX_PHASES];
+    } PowerMeter;
+
+    struct {
+        bool Enabled;
+        bool VerboseLogging;
+        bool SolarPassThroughEnabled;
+        uint8_t SolarPassThroughLosses;
+        bool BatteryAlwaysUseAtNight;
+        uint32_t Interval;
+        bool IsInverterBehindPowerMeter;
+        bool IsInverterSolarPowered;
+        uint64_t InverterId;
+        uint8_t InverterChannelId;
+        int32_t TargetPowerConsumption;
+        int32_t TargetPowerConsumptionHysteresis;
+        int32_t LowerPowerLimit;
+        int32_t BaseLoadLimit;
+        int32_t UpperPowerLimit;
+        bool IgnoreSoc;
+        uint32_t BatterySocStartThreshold;
+        uint32_t BatterySocStopThreshold;
+        float VoltageStartThreshold;
+        float VoltageStopThreshold;
+        float VoltageLoadCorrectionFactor;
+        int8_t RestartHour;
+        uint32_t FullSolarPassThroughSoc;
+        float FullSolarPassThroughStartVoltage;
+        float FullSolarPassThroughStopVoltage;
+    } PowerLimiter;
+
+    struct {
+        bool Enabled;
+        bool VerboseLogging;
+        uint8_t Provider;
+        uint8_t JkBmsInterface;
+        uint8_t JkBmsPollingInterval;
+        char MqttSocTopic[MQTT_MAX_TOPIC_STRLEN + 1];
+        char MqttVoltageTopic[MQTT_MAX_TOPIC_STRLEN + 1];
+    } Battery;
+
+    struct {
+        bool Enabled;
+        bool VerboseLogging;
+        uint32_t CAN_Controller_Frequency;
+        bool Auto_Power_Enabled;
+        bool Auto_Power_BatterySoC_Limits_Enabled;
+        bool Emergency_Charge_Enabled;
+        float Auto_Power_Voltage_Limit;
+        float Auto_Power_Enable_Voltage_Limit;
+        float Auto_Power_Lower_Power_Limit;
+        float Auto_Power_Upper_Power_Limit;
+        uint8_t Auto_Power_Stop_BatterySoC_Threshold;
+        float Auto_Power_Target_Power_Consumption;
+    } Huawei;
+
+
     INVERTER_CONFIG_T Inverter[INV_MAX_COUNT];
     char Dev_PinMapping[DEV_MAX_MAPPING_NAME_STRLEN + 1];
 };
 
 class ConfigurationClass {
 public:
-    void init(Scheduler& scheduler);
+    void init();
     bool read();
     bool write();
     void migrate();
-    CONFIG_T const& get();
-
-    class WriteGuard {
-    public:
-        WriteGuard();
-        CONFIG_T& getConfig();
-        ~WriteGuard();
-
-    private:
-        std::unique_lock<std::mutex> _lock;
-    };
-
-    WriteGuard getWriteGuard();
+    CONFIG_T& get();
 
     INVERTER_CONFIG_T* getFreeInverterSlot();
     INVERTER_CONFIG_T* getInverterConfig(const uint64_t serial);
     void deleteInverterById(const uint8_t id);
-
-private:
-    void loop();
-
-    Task _loopTask;
 };
 
 extern ConfigurationClass Configuration;

include/Display_Graphic.h

@@ -40,7 +40,7 @@ public:
     void setContrast(const uint8_t contrast);
     void setStatus(const bool turnOn);
     void setOrientation(const uint8_t rotation = DISPLAY_ROTATION);
-    void setLocale(const String& locale);
+    void setLanguage(const uint8_t language);
     void setDiagramMode(DiagramMode_t mode);
     void setStartupDisplay();
 
@@ -65,7 +65,7 @@ private:
 
     DisplayType_t _display_type = DisplayType_t::None;
     DiagramMode_t _diagram_mode = DiagramMode_t::Off;
-    String _display_language = DISPLAY_LOCALE;
+    uint8_t _display_language = DISPLAY_LANGUAGE;
     uint8_t _mExtra;
     const uint16_t _period = 1000;
     const uint16_t _interval = 60000; // interval at which to power save (milliseconds)
@@ -73,15 +73,6 @@ private:
     char _fmtText[32];
     bool _isLarge = false;
     uint8_t _lineOffsets[5];
-
-    String _i18n_offline;
-    String _i18n_yield_today_kwh;
-    String _i18n_yield_today_wh;
-    String _i18n_date_format;
-    String _i18n_current_power_kw;
-    String _i18n_current_power_w;
-    String _i18n_yield_total_mwh;
-    String _i18n_yield_total_kwh;
 };
 
 extern DisplayGraphicClass Display;

include/HttpPowerMeter.h

@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <stdint.h>
+#include <Arduino.h>
+#include <HTTPClient.h>
+#include "Configuration.h"
+
+using Auth_t = PowerMeterHttpConfig::Auth;
+using Unit_t = PowerMeterHttpConfig::Unit;
+
+class HttpPowerMeterClass {
+public:
+    void init();
+    bool updateValues();
+    float getPower(int8_t phase);
+    char httpPowerMeterError[256];
+    bool queryPhase(int phase, PowerMeterHttpConfig const& config);
+
+private:
+    float power[POWERMETER_MAX_PHASES];
+    HTTPClient httpClient;
+    String httpResponse;
+    bool httpRequest(int phase, WiFiClient &wifiClient, const String& host, uint16_t port, const String& uri, bool https, PowerMeterHttpConfig const& config);
+    bool extractUrlComponents(String url, String& _protocol, String& _hostname, String& _uri, uint16_t& uint16_t, String& _base64Authorization);
+    String extractParam(String& authReq, const String& param, const char delimit);
+    String getcNonce(const int len);
+    String getDigestAuth(String& authReq, const String& username, const String& password, const String& method, const String& uri, unsigned int counter);
+    bool tryGetFloatValueForPhase(int phase, const char* jsonPath, Unit_t unit, bool signInverted);
+    void prepareRequest(uint32_t timeout, const char* httpHeader, const char* httpValue);
+    String sha256(const String& data);
+};
+
+extern HttpPowerMeterClass HttpPowerMeter;

include/Huawei_can.h

@@ -0,0 +1,158 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <cstdint>
+#include "SPI.h"
+#include <mcp_can.h>
+#include <mutex>
+#include <TaskSchedulerDeclarations.h>
+
+#ifndef HUAWEI_PIN_MISO
+#define HUAWEI_PIN_MISO 12
+#endif
+
+#ifndef HUAWEI_PIN_MOSI
+#define HUAWEI_PIN_MOSI 13
+#endif
+
+#ifndef HUAWEI_PIN_SCLK
+#define HUAWEI_PIN_SCLK 26
+#endif
+
+#ifndef HUAWEI_PIN_IRQ
+#define HUAWEI_PIN_IRQ 25
+#endif
+
+#ifndef HUAWEI_PIN_CS
+#define HUAWEI_PIN_CS 15
+#endif
+
+#ifndef HUAWEI_PIN_POWER
+#define HUAWEI_PIN_POWER 33
+#endif
+
+#define HUAWEI_MINIMAL_OFFLINE_VOLTAGE 48
+#define HUAWEI_MINIMAL_ONLINE_VOLTAGE 42
+
+#define MAX_CURRENT_MULTIPLIER 20
+
+// Index values for rec_values array
+#define HUAWEI_INPUT_POWER_IDX 0
+#define HUAWEI_INPUT_FREQ_IDX 1
+#define HUAWEI_INPUT_CURRENT_IDX 2
+#define HUAWEI_OUTPUT_POWER_IDX 3
+#define HUAWEI_EFFICIENCY_IDX 4
+#define HUAWEI_OUTPUT_VOLTAGE_IDX 5
+#define HUAWEI_OUTPUT_CURRENT_MAX_IDX 6
+#define HUAWEI_INPUT_VOLTAGE_IDX 7
+#define HUAWEI_OUTPUT_TEMPERATURE_IDX 8
+#define HUAWEI_INPUT_TEMPERATURE_IDX 9
+#define HUAWEI_OUTPUT_CURRENT_IDX 10
+#define HUAWEI_OUTPUT_CURRENT1_IDX 11
+
+// Defines and index values for tx_values array
+#define HUAWEI_OFFLINE_VOLTAGE 0x01
+#define HUAWEI_ONLINE_VOLTAGE 0x00
+#define HUAWEI_OFFLINE_CURRENT 0x04
+#define HUAWEI_ONLINE_CURRENT 0x03
+
+// Modes of operation
+#define HUAWEI_MODE_OFF 0
+#define HUAWEI_MODE_ON 1
+#define HUAWEI_MODE_AUTO_EXT 2
+#define HUAWEI_MODE_AUTO_INT 3
+
+// Error codes
+#define HUAWEI_ERROR_CODE_RX 0x01
+#define HUAWEI_ERROR_CODE_TX 0x02
+
+// Wait time/current before shuting down the PSU / charger
+// This is set to allow the fan to run for some time
+#define HUAWEI_AUTO_MODE_SHUTDOWN_DELAY 60000
+#define HUAWEI_AUTO_MODE_SHUTDOWN_CURRENT 0.75
+
+// Updateinterval used to request new values from the PSU
+#define HUAWEI_DATA_REQUEST_INTERVAL_MS 2500
+
+typedef struct RectifierParameters {
+    float input_voltage;
+    float input_frequency;
+    float input_current;
+    float input_power;
+    float input_temp;
+    float efficiency;
+    float output_voltage;
+    float output_current;
+    float max_output_current;
+    float output_power;
+    float output_temp;
+    float amp_hour;
+} RectifierParameters_t;
+
+class HuaweiCanCommClass {
+public:
+    bool init(uint8_t huawei_miso, uint8_t huawei_mosi, uint8_t huawei_clk,
+            uint8_t huawei_irq, uint8_t huawei_cs, uint32_t frequency);
+    void loop();
+    bool gotNewRxDataFrame(bool clear);
+    uint8_t  getErrorCode(bool clear);
+    uint32_t getParameterValue(uint8_t parameter);
+    void setParameterValue(uint16_t in, uint8_t parameterType);
+
+private:
+    void sendRequest();
+
+    SPIClass *SPI;
+    MCP_CAN  *_CAN;
+    uint8_t  _huaweiIrq;                         // IRQ pin
+    uint32_t _nextRequestMillis = 0;              // When to send next data request to PSU
+
+    std::mutex _mutex;
+
+    uint32_t _recValues[12];
+    uint16_t _txValues[5];
+    bool     _hasNewTxValue[5];
+
+    uint8_t _errorCode;
+    bool _completeUpdateReceived;
+};
+
+class HuaweiCanClass {
+public:
+    void init(Scheduler& scheduler, uint8_t huawei_miso, uint8_t huawei_mosi, uint8_t huawei_clk, uint8_t huawei_irq, uint8_t huawei_cs, uint8_t huawei_power);
+    void updateSettings(uint8_t huawei_miso, uint8_t huawei_mosi, uint8_t huawei_clk, uint8_t huawei_irq, uint8_t huawei_cs, uint8_t huawei_power);
+    void setValue(float in, uint8_t parameterType);
+    void setMode(uint8_t mode);
+
+    RectifierParameters_t * get();
+    uint32_t getLastUpdate() const { return _lastUpdateReceivedMillis; };
+    bool getAutoPowerStatus() const { return _autoPowerEnabled; };
+    uint8_t getMode() const { return _mode; };
+
+private:
+    void loop();
+    void processReceivedParameters();
+    void _setValue(float in, uint8_t parameterType);
+
+    Task _loopTask;
+
+    TaskHandle_t _HuaweiCanCommunicationTaskHdl = NULL;
+    bool    _initialized = false;
+    uint8_t _huaweiPower;           // Power pin
+    uint8_t _mode = HUAWEI_MODE_AUTO_EXT;
+
+    RectifierParameters_t _rp;
+
+    uint32_t _lastUpdateReceivedMillis;           // Timestamp for last data seen from the PSU
+    uint32_t _outputCurrentOnSinceMillis;         // Timestamp since when the PSU was idle at zero amps
+    uint32_t _nextAutoModePeriodicIntMillis;      // When to set the next output voltage in automatic mode
+    uint32_t _lastPowerMeterUpdateReceivedMillis; // Timestamp of last seen power meter value
+    uint32_t _autoModeBlockedTillMillis = 0;      // Timestamp to block running auto mode for some time
+
+    uint8_t _autoPowerEnabledCounter = 0;
+    bool _autoPowerEnabled = false;
+    bool _batteryEmergencyCharging = false;
+};
+
+extern HuaweiCanClass HuaweiCan;
+extern HuaweiCanCommClass HuaweiCanComm;

include/I18n.h

@@ -1,35 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include <TaskSchedulerDeclarations.h>
-#include <WString.h>
-#include <list>
-
-struct LanguageInfo_t {
-    String code;
-    String name;
-    String filename;
-};
-
-class I18nClass {
-public:
-    I18nClass();
-    void init(Scheduler& scheduler);
-    std::list<LanguageInfo_t> getAvailableLanguages();
-    String getFilenameByLocale(const String& locale) const;
-    void readDisplayStrings(
-        const String& locale,
-        String& date_format,
-        String& offline,
-        String& power_w, String& power_kw,
-        String& yield_today_wh, String& yield_today_kwh,
-        String& yield_total_kwh, String& yield_total_mwh);
-
-private:
-    void readLangPacks();
-    void readConfig(String file);
-
-    std::list<LanguageInfo_t> _availLanguages;
-};
-
-extern I18nClass I18n;

include/JkBmsController.h

@@ -0,0 +1,79 @@
+#pragma once
+
+#include <memory>
+#include <vector>
+#include <frozen/string.h>
+
+#include "Battery.h"
+#include "JkBmsSerialMessage.h"
+
+class DataPointContainer;
+
+namespace JkBms {
+
+class Controller : public BatteryProvider {
+    public:
+        Controller() = default;
+
+        bool init(bool verboseLogging) final;
+        void deinit() final;
+        void loop() final;
+        std::shared_ptr<BatteryStats> getStats() const final { return _stats; }
+        bool usesHwPort2() const final {
+            return ARDUINO_USB_CDC_ON_BOOT != 1;
+        }
+
+    private:
+        enum class Status : unsigned {
+            Initializing,
+            Timeout,
+            WaitingForPollInterval,
+            HwSerialNotAvailableForWrite,
+            BusyReading,
+            RequestSent,
+            FrameCompleted
+        };
+
+        frozen::string const& getStatusText(Status status);
+        void announceStatus(Status status);
+        void sendRequest(uint8_t pollInterval);
+        void rxData(uint8_t inbyte);
+        void reset();
+        void frameComplete();
+        void processDataPoints(DataPointContainer const& dataPoints);
+
+        enum class Interface : unsigned {
+            Invalid,
+            Uart,
+            Transceiver
+        };
+
+        Interface getInterface() const;
+
+        enum class ReadState : unsigned {
+            Idle,
+            WaitingForFrameStart,
+            FrameStartReceived,
+            StartMarkerReceived,
+            FrameLengthMsbReceived,
+            ReadingFrame
+        };
+        ReadState _readState;
+        void setReadState(ReadState state) {
+            _readState = state;
+        }
+
+        bool _verboseLogging = true;
+        int8_t _rxEnablePin = -1;
+        int8_t _txEnablePin = -1;
+        Status _lastStatus = Status::Initializing;
+        uint32_t _lastStatusPrinted = 0;
+        uint32_t _lastRequest = 0;
+        uint16_t _frameLength = 0;
+        uint8_t _protocolVersion = -1;
+        SerialResponse::tData _buffer = {};
+        std::shared_ptr<JkBmsBatteryStats> _stats =
+            std::make_shared<JkBmsBatteryStats>();
+};
+
+} /* namespace JkBms */

include/JkBmsDataPoints.h

@@ -0,0 +1,304 @@
+#pragma once
+
+#include <Arduino.h>
+#include <map>
+#include <optional>
+#include <string>
+#include <unordered_map>
+#include <variant>
+#include <frozen/map.h>
+#include <frozen/string.h>
+
+namespace JkBms {
+
+#define ALARM_BITS(fnc) \
+    fnc(LowCapacity, (1<<0)) \
+    fnc(BmsOvertemperature, (1<<1)) \
+    fnc(ChargingOvervoltage, (1<<2)) \
+    fnc(DischargeUndervoltage, (1<<3)) \
+    fnc(BatteryOvertemperature, (1<<4)) \
+    fnc(ChargingOvercurrent, (1<<5)) \
+    fnc(DischargeOvercurrent, (1<<6)) \
+    fnc(CellVoltageDifference, (1<<7)) \
+    fnc(BatteryBoxOvertemperature, (1<<8)) \
+    fnc(BatteryUndertemperature, (1<<9)) \
+    fnc(CellOvervoltage, (1<<10)) \
+    fnc(CellUndervoltage, (1<<11)) \
+    fnc(AProtect, (1<<12)) \
+    fnc(BProtect, (1<<13)) \
+    fnc(Reserved1, (1<<14)) \
+    fnc(Reserved2, (1<<15))
+
+enum class AlarmBits : uint16_t {
+#define ALARM_ENUM(name, value) name = value,
+    ALARM_BITS(ALARM_ENUM)
+#undef ALARM_ENUM
+};
+
+static const frozen::map<AlarmBits, frozen::string, 16> AlarmBitTexts = {
+#define ALARM_TEXT(name, value) { AlarmBits::name, #name },
+    ALARM_BITS(ALARM_TEXT)
+#undef ALARM_TEXT
+};
+
+#define STATUS_BITS(fnc) \
+    fnc(ChargingActive, (1<<0)) \
+    fnc(DischargingActive, (1<<1)) \
+    fnc(BalancingActive, (1<<2)) \
+    fnc(BatteryOnline, (1<<3))
+
+enum class StatusBits : uint16_t {
+#define STATUS_ENUM(name, value) name = value,
+    STATUS_BITS(STATUS_ENUM)
+#undef STATUS_ENUM
+};
+
+static const frozen::map<StatusBits, frozen::string, 4> StatusBitTexts = {
+#define STATUS_TEXT(name, value) { StatusBits::name, #name },
+    STATUS_BITS(STATUS_TEXT)
+#undef STATUS_TEXT
+};
+
+enum class DataPointLabel : uint8_t {
+    CellsMilliVolt = 0x79,
+    BmsTempCelsius = 0x80,
+    BatteryTempOneCelsius = 0x81,
+    BatteryTempTwoCelsius = 0x82,
+    BatteryVoltageMilliVolt = 0x83,
+    BatteryCurrentMilliAmps = 0x84,
+    BatterySoCPercent = 0x85,
+    BatteryTemperatureSensorAmount = 0x86,
+    BatteryCycles = 0x87,
+    BatteryCycleCapacity = 0x89,
+    BatteryCellAmount = 0x8a,
+    AlarmsBitmask = 0x8b,
+    StatusBitmask = 0x8c,
+    TotalOvervoltageThresholdMilliVolt = 0x8e,
+    TotalUndervoltageThresholdMilliVolt = 0x8f,
+    CellOvervoltageThresholdMilliVolt = 0x90,
+    CellOvervoltageRecoveryMilliVolt = 0x91,
+    CellOvervoltageProtectionDelaySeconds = 0x92,
+    CellUndervoltageThresholdMilliVolt = 0x93,
+    CellUndervoltageRecoveryMilliVolt = 0x94,
+    CellUndervoltageProtectionDelaySeconds = 0x95,
+    CellVoltageDiffThresholdMilliVolt = 0x96,
+    DischargeOvercurrentThresholdAmperes = 0x97,
+    DischargeOvercurrentDelaySeconds = 0x98,
+    ChargeOvercurrentThresholdAmps = 0x99,
+    ChargeOvercurrentDelaySeconds = 0x9a,
+    BalanceCellVoltageThresholdMilliVolt = 0x9b,
+    BalanceVoltageDiffThresholdMilliVolt = 0x9c,
+    BalancingEnabled = 0x9d,
+    BmsTempProtectionThresholdCelsius = 0x9e,
+    BmsTempRecoveryThresholdCelsius = 0x9f,
+    BatteryTempProtectionThresholdCelsius = 0xa0,
+    BatteryTempRecoveryThresholdCelsius = 0xa1,
+    BatteryTempDiffThresholdCelsius = 0xa2,
+    ChargeHighTempThresholdCelsius = 0xa3,
+    DischargeHighTempThresholdCelsius = 0xa4,
+    ChargeLowTempThresholdCelsius = 0xa5,
+    ChargeLowTempRecoveryCelsius = 0xa6,
+    DischargeLowTempThresholdCelsius = 0xa7,
+    DischargeLowTempRecoveryCelsius = 0xa8,
+    CellAmountSetting = 0xa9,
+    BatteryCapacitySettingAmpHours = 0xaa,
+    BatteryChargeEnabled = 0xab,
+    BatteryDischargeEnabled = 0xac,
+    CurrentCalibrationMilliAmps = 0xad,
+    BmsAddress = 0xae,
+    BatteryType = 0xaf,
+    SleepWaitTime = 0xb0, // what's this?
+    LowCapacityAlarmThresholdPercent = 0xb1,
+    ModificationPassword = 0xb2,
+    DedicatedChargerSwitch = 0xb3, // what's this?
+    EquipmentId = 0xb4,
+    DateOfManufacturing = 0xb5,
+    BmsHourMeterMinutes = 0xb6,
+    BmsSoftwareVersion = 0xb7,
+    CurrentCalibration = 0xb8,
+    ActualBatteryCapacityAmpHours = 0xb9,
+    ProductId = 0xba,
+    ProtocolVersion = 0xc0
+};
+
+using tCells = std::map<uint8_t, uint16_t>;
+
+template<DataPointLabel> struct DataPointLabelTraits;
+
+#define LABEL_TRAIT(n, t, u) template<> struct DataPointLabelTraits<DataPointLabel::n> { \
+    using type = t; \
+    static constexpr char const name[] = #n; \
+    static constexpr char const unit[] = u; \
+};
+
+/**
+ * the types associated with the labels are the types for the respective data
+ * points in the JkBms::DataPoint class. they are *not* always equal to the
+ * type used in the serial message.
+ *
+ * it is unfortunate that we have to repeat all enum values here to define the
+ * traits. code generation could help here (labels are defined in a single
+ * source of truth and this code is generated -- no typing errors, etc.).
+ * however, the compiler will complain if an enum is misspelled or traits are
+ * defined for a removed enum, so we will notice. it will also complain when a
+ * trait is missing and if a data point for a label without traits is added to
+ * the DataPointContainer class, because the traits must be available then.
+ * even though this is tedious to maintain, human errors will be caught.
+ */
+LABEL_TRAIT(CellsMilliVolt,                         tCells,      "mV");
+LABEL_TRAIT(BmsTempCelsius,                         int16_t,     "°C");
+LABEL_TRAIT(BatteryTempOneCelsius,                  int16_t,     "°C");
+LABEL_TRAIT(BatteryTempTwoCelsius,                  int16_t,     "°C");
+LABEL_TRAIT(BatteryVoltageMilliVolt,                uint32_t,    "mV");
+LABEL_TRAIT(BatteryCurrentMilliAmps,                int32_t,     "mA");
+LABEL_TRAIT(BatterySoCPercent,                      uint8_t,     "%");
+LABEL_TRAIT(BatteryTemperatureSensorAmount,         uint8_t,     "");
+LABEL_TRAIT(BatteryCycles,                          uint16_t,    "");
+LABEL_TRAIT(BatteryCycleCapacity,                   uint32_t,    "Ah");
+LABEL_TRAIT(BatteryCellAmount,                      uint16_t,    "");
+LABEL_TRAIT(AlarmsBitmask,                          uint16_t,    "");
+LABEL_TRAIT(StatusBitmask,                          uint16_t,    "");
+LABEL_TRAIT(TotalOvervoltageThresholdMilliVolt,     uint32_t,    "mV");
+LABEL_TRAIT(TotalUndervoltageThresholdMilliVolt,    uint32_t,    "mV");
+LABEL_TRAIT(CellOvervoltageThresholdMilliVolt,      uint16_t,    "mV");
+LABEL_TRAIT(CellOvervoltageRecoveryMilliVolt,       uint16_t,    "mV");
+LABEL_TRAIT(CellOvervoltageProtectionDelaySeconds,  uint16_t,    "s");
+LABEL_TRAIT(CellUndervoltageThresholdMilliVolt,     uint16_t,    "mV");
+LABEL_TRAIT(CellUndervoltageRecoveryMilliVolt,      uint16_t,    "mV");
+LABEL_TRAIT(CellUndervoltageProtectionDelaySeconds, uint16_t,    "s");
+LABEL_TRAIT(CellVoltageDiffThresholdMilliVolt,      uint16_t,    "mV");
+LABEL_TRAIT(DischargeOvercurrentThresholdAmperes,   uint16_t,    "A");
+LABEL_TRAIT(DischargeOvercurrentDelaySeconds,       uint16_t,    "s");
+LABEL_TRAIT(ChargeOvercurrentThresholdAmps,         uint16_t,    "A");
+LABEL_TRAIT(ChargeOvercurrentDelaySeconds,          uint16_t,    "s");
+LABEL_TRAIT(BalanceCellVoltageThresholdMilliVolt,   uint16_t,    "mV");
+LABEL_TRAIT(BalanceVoltageDiffThresholdMilliVolt,   uint16_t,    "mV");
+LABEL_TRAIT(BalancingEnabled,                       bool,        "");
+LABEL_TRAIT(BmsTempProtectionThresholdCelsius,      uint16_t,    "°C");
+LABEL_TRAIT(BmsTempRecoveryThresholdCelsius,        uint16_t,    "°C");
+LABEL_TRAIT(BatteryTempProtectionThresholdCelsius,  uint16_t,    "°C");
+LABEL_TRAIT(BatteryTempRecoveryThresholdCelsius,    uint16_t,    "°C");
+LABEL_TRAIT(BatteryTempDiffThresholdCelsius,        uint16_t,    "°C");
+LABEL_TRAIT(ChargeHighTempThresholdCelsius,         uint16_t,    "°C");
+LABEL_TRAIT(DischargeHighTempThresholdCelsius,      uint16_t,    "°C");
+LABEL_TRAIT(ChargeLowTempThresholdCelsius,          int16_t,     "°C");
+LABEL_TRAIT(ChargeLowTempRecoveryCelsius,           int16_t,     "°C");
+LABEL_TRAIT(DischargeLowTempThresholdCelsius,       int16_t,     "°C");
+LABEL_TRAIT(DischargeLowTempRecoveryCelsius,        int16_t,     "°C");
+LABEL_TRAIT(CellAmountSetting,                      uint8_t,     "");
+LABEL_TRAIT(BatteryCapacitySettingAmpHours,         uint32_t,    "Ah");
+LABEL_TRAIT(BatteryChargeEnabled,                   bool,        "");
+LABEL_TRAIT(BatteryDischargeEnabled,                bool,        "");
+LABEL_TRAIT(CurrentCalibrationMilliAmps,            uint16_t,    "mA");
+LABEL_TRAIT(BmsAddress,                             uint8_t,     "");
+LABEL_TRAIT(BatteryType,                            uint8_t,     "");
+LABEL_TRAIT(SleepWaitTime,                          uint16_t,    "s");
+LABEL_TRAIT(LowCapacityAlarmThresholdPercent,       uint8_t,     "%");
+LABEL_TRAIT(ModificationPassword,                   std::string, "");
+LABEL_TRAIT(DedicatedChargerSwitch,                 bool,        "");
+LABEL_TRAIT(EquipmentId,                            std::string, "");
+LABEL_TRAIT(DateOfManufacturing,                    std::string, "");
+LABEL_TRAIT(BmsHourMeterMinutes,                    uint32_t,    "min");
+LABEL_TRAIT(BmsSoftwareVersion,                     std::string, "");
+LABEL_TRAIT(CurrentCalibration,                     bool,        "");
+LABEL_TRAIT(ActualBatteryCapacityAmpHours,          uint32_t,    "Ah");
+LABEL_TRAIT(ProductId,                              std::string, "");
+LABEL_TRAIT(ProtocolVersion,                        uint8_t,     "");
+#undef LABEL_TRAIT
+
+class DataPoint {
+    friend class DataPointContainer;
+
+    public:
+        using tValue = std::variant<bool, uint8_t, uint16_t, uint32_t,
+              int16_t, int32_t, std::string, tCells>;
+
+        DataPoint() = delete;
+
+        DataPoint(DataPoint const& other)
+            : _strLabel(other._strLabel)
+            , _strValue(other._strValue)
+            , _strUnit(other._strUnit)
+            , _value(other._value)
+            , _timestamp(other._timestamp) { }
+
+        DataPoint(std::string const& strLabel, std::string const& strValue,
+                std::string const& strUnit, tValue value, uint32_t timestamp)
+            : _strLabel(strLabel)
+            , _strValue(strValue)
+            , _strUnit(strUnit)
+            , _value(std::move(value))
+            , _timestamp(timestamp) { }
+
+        std::string const& getLabelText() const { return _strLabel; }
+        std::string const& getValueText() const { return _strValue; }
+        std::string const& getUnitText() const { return _strUnit; }
+        uint32_t getTimestamp() const { return _timestamp; }
+
+        bool operator==(DataPoint const& other) const {
+            return _value == other._value;
+        }
+
+    private:
+        std::string _strLabel;
+        std::string _strValue;
+        std::string _strUnit;
+        tValue _value;
+        uint32_t _timestamp;
+};
+
+template<typename T> std::string dataPointValueToStr(T const& v);
+
+class DataPointContainer {
+    public:
+        DataPointContainer() = default;
+
+        using Label = DataPointLabel;
+        template<Label L> using Traits = JkBms::DataPointLabelTraits<L>;
+
+        template<Label L>
+        void add(typename Traits<L>::type val) {
+            _dataPoints.emplace(
+                    L,
+                    DataPoint(
+                        Traits<L>::name,
+                        dataPointValueToStr(val),
+                        Traits<L>::unit,
+                        DataPoint::tValue(std::move(val)),
+                        millis()
+                    )
+            );
+        }
+
+        // make sure add() is only called with the type expected for the
+        // respective label, no implicit conversions allowed.
+        template<Label L, typename T>
+        void add(T) = delete;
+
+        template<Label L>
+        std::optional<DataPoint const> getDataPointFor() const {
+            auto it = _dataPoints.find(L);
+            if (it == _dataPoints.end()) { return std::nullopt; }
+            return it->second;
+        }
+
+        template<Label L>
+        std::optional<typename Traits<L>::type> get() const {
+            auto optionalDataPoint = getDataPointFor<L>();
+            if (!optionalDataPoint.has_value()) { return std::nullopt; }
+            return std::get<typename Traits<L>::type>(optionalDataPoint->_value);
+        }
+
+        using tMap = std::unordered_map<Label, DataPoint const>;
+        tMap::const_iterator cbegin() const { return _dataPoints.cbegin(); }
+        tMap::const_iterator cend() const { return _dataPoints.cend(); }
+
+        // copy all data points from source into this instance, overwriting
+        // existing data points in this instance.
+        void updateFrom(DataPointContainer const& source);
+
+    private:
+        tMap _dataPoints;
+};
+
+} /* namespace JkBms */

include/JkBmsSerialMessage.h

@@ -0,0 +1,93 @@
+#pragma once
+
+#include <utility>
+#include <vector>
+#include <Arduino.h>
+
+#include "JkBmsDataPoints.h"
+
+namespace JkBms {
+
+class SerialMessage {
+    public:
+        using tData = std::vector<uint8_t>;
+
+        SerialMessage() = delete;
+
+        enum class Command : uint8_t {
+            Activate = 0x01,
+            Write = 0x02,
+            Read = 0x03,
+            Password = 0x05,
+            ReadAll = 0x06
+        };
+
+        Command getCommand() const { return static_cast<Command>(_raw[8]); }
+
+        enum class Source : uint8_t {
+            BMS = 0x00,
+            Bluetooth = 0x01,
+            GPS = 0x02,
+            Host = 0x03
+        };
+        Source getSource() const { return static_cast<Source>(_raw[9]); }
+
+        enum class Type : uint8_t {
+            Command = 0x00,
+            Response = 0x01,
+            Unsolicited = 0x02
+        };
+        Type getType() const { return static_cast<Type>(_raw[10]); }
+
+        // this does *not* include the two byte start marker
+        uint16_t getFrameLength() const { return get<uint16_t>(_raw.cbegin()+2); }
+
+        uint32_t getTerminalId() const { return get<uint32_t>(_raw.cbegin()+4); }
+
+        // there are 20 bytes of overhead. two of those are the start marker
+        // bytes, which are *not* counted by the frame length.
+        uint16_t getVariableFieldLength() const { return getFrameLength() - 18; }
+
+        // the upper byte of the 4-byte "record number" is reserved (for encryption)
+        uint32_t getSequence() const { return get<uint32_t>(_raw.cend()-9) >> 8; }
+
+        bool isValid() const;
+
+        uint8_t const* data() { return _raw.data(); }
+        size_t size() { return _raw.size(); }
+
+    protected:
+        template <typename... Args>
+        explicit SerialMessage(Args&&... args) : _raw(std::forward<Args>(args)...) { }
+
+        template<typename T, typename It> T get(It&& pos) const;
+        template<typename It> bool getBool(It&& pos) const;
+        template<typename It> int16_t getTemperature(It&& pos) const;
+        template<typename It> std::string getString(It&& pos, size_t len, bool replaceZeroes = false) const;
+        void processBatteryCurrent(tData::const_iterator& pos, uint8_t protocolVersion);
+        template<typename T> void set(tData::iterator const& pos, T val);
+        uint16_t calcChecksum() const;
+        void updateChecksum();
+
+        tData _raw;
+        JkBms::DataPointContainer _dp;
+
+        static constexpr uint16_t startMarker = 0x4e57;
+        static constexpr uint8_t endMarker = 0x68;
+};
+
+class SerialResponse : public SerialMessage {
+    public:
+        using tData = SerialMessage::tData;
+        explicit SerialResponse(tData&& raw, uint8_t protocolVersion = -1);
+
+        DataPointContainer const& getDataPoints() const { return _dp; }
+};
+
+class SerialCommand : public SerialMessage {
+    public:
+        using Command = SerialMessage::Command;
+        explicit SerialCommand(Command cmd);
+};
+
+} /* namespace JkBms */

include/MessageOutput.h

@@ -2,12 +2,13 @@
 #pragma once
 
 #include <AsyncWebSocket.h>
-#include <HardwareSerial.h>
-#include <Stream.h>
 #include <TaskSchedulerDeclarations.h>
+#include <Print.h>
+#include <freertos/task.h>
 #include <mutex>
-
-#define BUFFER_SIZE 500
+#include <vector>
+#include <unordered_map>
+#include <queue>
 
 class MessageOutputClass : public Print {
 public:
@@ -22,13 +23,19 @@ private:
 
     Task _loopTask;
 
+    using message_t = std::vector<uint8_t>;
+
+    // we keep a buffer for every task and only write complete lines to the
+    // serial output and then move them to be pushed through the websocket.
+    // this way we prevent mangling of messages from different contexts.
+    std::unordered_map<TaskHandle_t, message_t> _task_messages;
+    std::queue<message_t> _lines;
+
     AsyncWebSocket* _ws = nullptr;
-    char _buffer[BUFFER_SIZE];
-    uint16_t _buff_pos = 0;
-    uint32_t _lastSend = 0;
-    bool _forceSend = false;
 
     std::mutex _msgLock;
+
+    void serialWrite(message_t const& m);
 };
 
 extern MessageOutputClass MessageOutput;

include/MqttBattery.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <optional>
+#include "Battery.h"
+#include <espMqttClient.h>
+
+class MqttBattery : public BatteryProvider {
+public:
+    MqttBattery() = default;
+
+    bool init(bool verboseLogging) final;
+    void deinit() final;
+    void loop() final { return; } // this class is event-driven
+    std::shared_ptr<BatteryStats> getStats() const final { return _stats; }
+
+private:
+    bool _verboseLogging = false;
+    String _socTopic;
+    String _voltageTopic;
+    std::shared_ptr<MqttBatteryStats> _stats = std::make_shared<MqttBatteryStats>();
+
+    std::optional<float> getFloat(std::string const& src, char const* topic);
+    void onMqttMessageSoC(espMqttClientTypes::MessageProperties const& properties,
+                          char const* topic, uint8_t const* payload, size_t len, size_t index, size_t total);
+    void onMqttMessageVoltage(espMqttClientTypes::MessageProperties const& properties,
+                              char const* topic, uint8_t const* payload, size_t len, size_t index, size_t total);
+};

include/MqttHandleBatteryHass.h

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <ArduinoJson.h>
+#include <TaskSchedulerDeclarations.h>
+
+class MqttHandleBatteryHassClass {
+public:
+    void init(Scheduler& scheduler);
+    void forceUpdate() { _doPublish = true; }
+
+private:
+    void loop();
+    void publish(const String& subtopic, const String& payload);
+    void publishBinarySensor(const char* caption, const char* icon, const char* subTopic, const char* payload_on, const char* payload_off);
+    void publishSensor(const char* caption, const char* icon, const char* subTopic, const char* deviceClass = NULL, const char* stateClass = NULL, const char* unitOfMeasurement = NULL);
+    void createDeviceInfo(JsonObject& object);
+
+    Task _loopTask;
+
+    bool _doPublish = true;
+    String serial = "0001"; // pseudo-serial, can be replaced in future with real serialnumber
+};
+
+extern MqttHandleBatteryHassClass MqttHandleBatteryHass;

include/MqttHandleHass.h

@@ -6,42 +6,29 @@
 #include <TaskSchedulerDeclarations.h>
 
 // mqtt discovery device classes
-enum DeviceClassType {
+enum {
     DEVICE_CLS_NONE = 0,
     DEVICE_CLS_CURRENT,
     DEVICE_CLS_ENERGY,
     DEVICE_CLS_PWR,
     DEVICE_CLS_VOLTAGE,
     DEVICE_CLS_FREQ,
+    DEVICE_CLS_TEMP,
     DEVICE_CLS_POWER_FACTOR,
-    DEVICE_CLS_REACTIVE_POWER,
-    DEVICE_CLS_CONNECTIVITY,
-    DEVICE_CLS_DURATION,
-    DEVICE_CLS_SIGNAL_STRENGTH,
-    DEVICE_CLS_TEMPERATURE,
-    DEVICE_CLS_RESTART
+    DEVICE_CLS_REACTIVE_POWER
 };
-const char* const deviceClass_name[] = { 0, "current", "energy", "power", "voltage", "frequency", "power_factor", "reactive_power", "connectivity", "duration", "signal_strength", "temperature", "restart" };
-
-enum StateClassType {
+const char* const deviceClasses[] = { 0, "current", "energy", "power", "voltage", "frequency", "temperature", "power_factor", "reactive_power" };
+enum {
     STATE_CLS_NONE = 0,
     STATE_CLS_MEASUREMENT,
     STATE_CLS_TOTAL_INCREASING
 };
-const char* const stateClass_name[] = { 0, "measurement", "total_increasing" };
-
-enum CategoryType {
-    CATEGORY_NONE = 0,
-    CATEGORY_CONFIG,
-    CATEGORY_DIAGNOSTIC
-};
-const char* const category_name[] = { 0, "config", "diagnostic" };
-
+const char* const stateClasses[] = { 0, "measurement", "total_increasing" };
 
 typedef struct {
     FieldId_t fieldId; // field id
-    DeviceClassType deviceClsId; // device class
-    StateClassType stateClsId; // state class
+    uint8_t deviceClsId; // device class
+    uint8_t stateClsId; // state class
 } byteAssign_fieldDeviceClass_t;
 
 const byteAssign_fieldDeviceClass_t deviceFieldAssignment[] = {
@@ -54,7 +41,7 @@ const byteAssign_fieldDeviceClass_t deviceFieldAssignment[] = {
     { FLD_IAC, DEVICE_CLS_CURRENT, STATE_CLS_MEASUREMENT },
     { FLD_PAC, DEVICE_CLS_PWR, STATE_CLS_MEASUREMENT },
     { FLD_F, DEVICE_CLS_FREQ, STATE_CLS_MEASUREMENT },
-    { FLD_T, DEVICE_CLS_TEMPERATURE, STATE_CLS_MEASUREMENT },
+    { FLD_T, DEVICE_CLS_TEMP, STATE_CLS_MEASUREMENT },
     { FLD_PF, DEVICE_CLS_POWER_FACTOR, STATE_CLS_MEASUREMENT },
     { FLD_EFF, DEVICE_CLS_NONE, STATE_CLS_NONE },
     { FLD_IRR, DEVICE_CLS_NONE, STATE_CLS_NONE },
@@ -71,24 +58,13 @@ public:
 
 private:
     void loop();
-    static void publish(const String& subtopic, const String& payload);
-    static void publish(const String& subtopic, const JsonDocument& doc);
-
-    static void addCommonMetadata(JsonDocument& doc, const String& unit_of_measure, const String& icon, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
-
-    // Binary Sensor
-    static void publishBinarySensor(JsonDocument& doc, const String& root_device, const String& unique_id_prefix, const String& name, const String& state_topic, const String& payload_on, const String& payload_off, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
-    static void publishDtuBinarySensor(const String& name, const String& state_topic, const String& payload_on, const String& payload_off, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
-    static void publishInverterBinarySensor(std::shared_ptr<InverterAbstract> inv, const String& name, const String& state_topic, const String& payload_on, const String& payload_off, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
-
-    // Sensor
-    static void publishSensor(JsonDocument& doc, const String& root_device, const String& unique_id_prefix, const String& name, const String& state_topic, const String& unit_of_measure, const String& icon, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
-    static void publishDtuSensor(const String& name, const String& state_topic, const String& unit_of_measure, const String& icon, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
-    static void publishInverterSensor(std::shared_ptr<InverterAbstract> inv, const String& name, const String& state_topic, const String& unit_of_measure, const String& icon, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
-
-    static void publishInverterField(std::shared_ptr<InverterAbstract> inv, const ChannelType_t type, const ChannelNum_t channel, const byteAssign_fieldDeviceClass_t fieldType, const bool clear = false);
-    static void publishInverterButton(std::shared_ptr<InverterAbstract> inv, const String& name, const String& state_topic, const String& payload, const String& icon, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
-    static void publishInverterNumber(std::shared_ptr<InverterAbstract> inv, const String& name, const String& state_topic, const String& command_topic, const int16_t min, const int16_t max, float step, const String& unit_of_measure, const String& icon, const StateClassType state_class, const CategoryType category);
+    void publish(const String& subtopic, const String& payload);
+    void publishDtuSensor(const char* name, const char* device_class, const char* category, const char* icon, const char* unit_of_measure, const char* subTopic);
+    void publishDtuBinarySensor(const char* name, const char* device_class, const char* category, const char* payload_on, const char* payload_off, const char* subTopic = "");
+    void publishInverterField(std::shared_ptr<InverterAbstract> inv, const ChannelType_t type, const ChannelNum_t channel, const byteAssign_fieldDeviceClass_t fieldType, const bool clear = false);
+    void publishInverterButton(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* icon, const char* category, const char* deviceClass, const char* subTopic, const char* payload);
+    void publishInverterNumber(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* icon, const char* category, const char* commandTopic, const char* stateTopic, const char* unitOfMeasure, const int16_t min = 1, const int16_t max = 100);
+    void publishInverterBinarySensor(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* subTopic, const char* payload_on, const char* payload_off);
 
     static void createInverterInfo(JsonDocument& doc, std::shared_ptr<InverterAbstract> inv);
     static void createDtuInfo(JsonDocument& doc);

include/MqttHandleHuawei.h

@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "Configuration.h"
+#include <Huawei_can.h>
+#include <espMqttClient.h>
+#include <TaskSchedulerDeclarations.h>
+#include <mutex>
+#include <deque>
+#include <functional>
+
+class MqttHandleHuaweiClass {
+public:
+    void init(Scheduler& scheduler);
+
+private:
+    void loop();
+
+    enum class Topic : unsigned {
+        LimitOnlineVoltage,
+        LimitOnlineCurrent,
+        LimitOfflineVoltage,
+        LimitOfflineCurrent,
+        Mode
+    };
+
+    void onMqttMessage(Topic t,
+            const espMqttClientTypes::MessageProperties& properties,
+            const char* topic, const uint8_t* payload, size_t len,
+            size_t index, size_t total);
+
+    Task _loopTask;
+
+    uint32_t _lastPublishStats;
+    uint32_t _lastPublish;
+
+    // MQTT callbacks to process updates on subscribed topics are executed in
+    // the MQTT thread's context. we use this queue to switch processing the
+    // user requests into the main loop's context (TaskScheduler context).
+    mutable std::mutex _mqttMutex;
+    std::deque<std::function<void()>> _mqttCallbacks;
+};
+
+extern MqttHandleHuaweiClass MqttHandleHuawei;

include/MqttHandleInverter.h

@@ -5,8 +5,6 @@
 #include <Hoymiles.h>
 #include <TaskSchedulerDeclarations.h>
 #include <espMqttClient.h>
-#include <frozen/map.h>
-#include <frozen/string.h>
 
 class MqttHandleInverterClass {
 public:
@@ -15,12 +13,10 @@ public:
 
     static String getTopic(std::shared_ptr<InverterAbstract> inv, const ChannelType_t type, const ChannelNum_t channel, const FieldId_t fieldId);
 
-    void subscribeTopics();
-    void unsubscribeTopics();
-
 private:
     void loop();
     void publishField(std::shared_ptr<InverterAbstract> inv, const ChannelType_t type, const ChannelNum_t channel, const FieldId_t fieldId);
+    void onMqttMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, const size_t len, const size_t index, const size_t total);
 
     Task _loopTask;
 
@@ -42,29 +38,6 @@ private:
         FLD_IRR,
         FLD_Q
     };
-
-    enum class Topic : unsigned {
-        LimitPersistentRelative,
-        LimitPersistentAbsolute,
-        LimitNonPersistentRelative,
-        LimitNonPersistentAbsolute,
-        Power,
-        Restart,
-        ResetRfStats,
-    };
-
-    static constexpr frozen::string _cmdtopic = "+/cmd/";
-    static constexpr frozen::map<frozen::string, Topic, 7> _subscriptions = {
-        { "limit_persistent_relative", Topic::LimitPersistentRelative },
-        { "limit_persistent_absolute", Topic::LimitPersistentAbsolute },
-        { "limit_nonpersistent_relative", Topic::LimitNonPersistentRelative },
-        { "limit_nonpersistent_absolute", Topic::LimitNonPersistentAbsolute },
-        { "power", Topic::Power },
-        { "restart", Topic::Restart },
-        { "reset_rf_stats", Topic::ResetRfStats },
-    };
-
-    void onMqttMessage(Topic t, const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, const size_t len, const size_t index, const size_t total);
 };
 
 extern MqttHandleInverterClass MqttHandleInverter;

include/MqttHandlePowerLimiter.h

@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "Configuration.h"
+#include <espMqttClient.h>
+#include <TaskSchedulerDeclarations.h>
+#include <mutex>
+#include <deque>
+#include <functional>
+
+class MqttHandlePowerLimiterClass {
+public:
+    void init(Scheduler& scheduler);
+
+private:
+    void loop();
+
+    enum class MqttPowerLimiterCommand : unsigned {
+        Mode,
+        BatterySoCStartThreshold,
+        BatterySoCStopThreshold,
+        FullSolarPassthroughSoC,
+        VoltageStartThreshold,
+        VoltageStopThreshold,
+        FullSolarPassThroughStartVoltage,
+        FullSolarPassThroughStopVoltage
+    };
+
+    void onMqttCmd(MqttPowerLimiterCommand command, const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, size_t len, size_t index, size_t total);
+
+    Task _loopTask;
+
+    uint32_t _lastPublishStats;
+    uint32_t _lastPublish;
+
+    // MQTT callbacks to process updates on subscribed topics are executed in
+    // the MQTT thread's context. we use this queue to switch processing the
+    // user requests into the main loop's context (TaskScheduler context).
+    mutable std::mutex _mqttMutex;
+    std::deque<std::function<void()>> _mqttCallbacks;
+};
+
+extern MqttHandlePowerLimiterClass MqttHandlePowerLimiter;

include/MqttHandlePowerLimiterHass.h

@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <ArduinoJson.h>
+#include <TaskSchedulerDeclarations.h>
+
+class MqttHandlePowerLimiterHassClass {
+public:
+    void init(Scheduler& scheduler);
+    void publishConfig();
+    void forceUpdate();
+
+private:
+    void loop();
+    void publish(const String& subtopic, const String& payload);
+    void publishNumber(const char* caption, const char* icon, const char* category, const char* commandTopic, const char* stateTopic, const char* unitOfMeasure, const int16_t min, const int16_t max);
+    void publishSelect(const char* caption, const char* icon, const char* category, const char* commandTopic, const char* stateTopic);
+    void createDeviceInfo(JsonObject& object);
+
+    Task _loopTask;
+
+    bool _wasConnected = false;
+    bool _updateForced = false;
+};
+
+extern MqttHandlePowerLimiterHassClass MqttHandlePowerLimiterHass;

include/MqttHandleVedirect.h

@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "VeDirectMpptController.h"
+#include "Configuration.h"
+#include <Arduino.h>
+#include <map>
+#include <TaskSchedulerDeclarations.h>
+
+#ifndef VICTRON_PIN_RX
+#define VICTRON_PIN_RX 22
+#endif
+
+#ifndef VICTRON_PIN_TX
+#define VICTRON_PIN_TX 21
+#endif
+
+class MqttHandleVedirectClass {
+public:
+    void init(Scheduler& scheduler);
+    void forceUpdate();
+private:
+    void loop();
+    std::map<std::string, VeDirectMpptController::data_t> _kvFrames;
+
+    Task _loopTask;
+
+    // point of time in millis() when updated values will be published
+    uint32_t _nextPublishUpdatesOnly = 0;
+
+    // point of time in millis() when all values will be published
+    uint32_t _nextPublishFull = 1;
+
+    bool _PublishFull;
+
+    void publish_mppt_data(const VeDirectMpptController::data_t &mpptData,
+                           const VeDirectMpptController::data_t &frame) const;
+};
+
+extern MqttHandleVedirectClass MqttHandleVedirect;

include/MqttHandleVedirectHass.h

@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <ArduinoJson.h>
+#include "VeDirectMpptController.h"
+#include <TaskSchedulerDeclarations.h>
+
+class MqttHandleVedirectHassClass {
+public:
+    void init(Scheduler& scheduler);
+    void publishConfig();
+    void forceUpdate();
+
+private:
+    void loop();
+    void publish(const String& subtopic, const String& payload);
+    void publishBinarySensor(const char *caption, const char *icon, const char *subTopic,
+                             const char *payload_on, const char *payload_off,
+                             const VeDirectMpptController::data_t &mpptData);
+    void publishSensor(const char *caption, const char *icon, const char *subTopic,
+                       const char *deviceClass, const char *stateClass,
+                       const char *unitOfMeasurement,
+                       const VeDirectMpptController::data_t &mpptData);
+    void createDeviceInfo(JsonObject &object,
+                          const VeDirectMpptController::data_t &mpptData);
+
+    Task _loopTask;
+
+    bool _wasConnected = false;
+    bool _updateForced = false;
+};
+
+extern MqttHandleVedirectHassClass MqttHandleVedirectHass;

include/MqttSettings.h

@@ -11,6 +11,7 @@ class MqttSettingsClass {
 public:
     MqttSettingsClass();
     void init();
+    void loop();
     void performReconnect();
     bool getConnected();
     void publish(const String& subtopic, const String& payload);
@@ -20,7 +21,6 @@ public:
     void unsubscribe(const String& topic);
 
     String getPrefix() const;
-    String getClientId() const;
 
 private:
     void NetworkEvent(network_event event);
@@ -38,6 +38,7 @@ private:
     Ticker _mqttReconnectTimer;
     MqttSubscribeParser _mqttSubscribeParser;
     std::mutex _clientLock;
+    bool _verboseLogging = true;
 };
 
 extern MqttSettingsClass MqttSettings;

include/NetworkSettings.h

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "W5500.h"
 #include <DNSServer.h>
 #include <TaskSchedulerDeclarations.h>
 #include <WiFi.h>
@@ -24,18 +23,18 @@ enum class network_event {
     NETWORK_EVENT_MAX
 };
 
-typedef std::function<void(network_event event)> DtuNetworkEventCb;
+typedef std::function<void(network_event event)> NetworkEventCb;
 
-typedef struct DtuNetworkEventCbList {
-    DtuNetworkEventCb cb;
+typedef struct NetworkEventCbList {
+    NetworkEventCb cb;
     network_event event;
 
-    DtuNetworkEventCbList()
+    NetworkEventCbList()
         : cb(nullptr)
         , event(network_event::NETWORK_UNKNOWN)
     {
     }
-} DtuNetworkEventCbList_t;
+} NetworkEventCbList_t;
 
 class NetworkSettingsClass {
 public:
@@ -54,7 +53,7 @@ public:
     bool isConnected() const;
     network_mode NetworkMode() const;
 
-    bool onEvent(DtuNetworkEventCb cbEvent, const network_event event = network_event::NETWORK_EVENT_MAX);
+    bool onEvent(NetworkEventCb cbEvent, const network_event event = network_event::NETWORK_EVENT_MAX);
     void raiseEvent(const network_event event);
 
 private:
@@ -63,7 +62,7 @@ private:
     void setStaticIp();
     void handleMDNS();
     void setupMode();
-    void NetworkEvent(const WiFiEvent_t event, WiFiEventInfo_t info);
+    void NetworkEvent(const WiFiEvent_t event);
 
     Task _loopTask;
 
@@ -82,9 +81,8 @@ private:
     bool _dnsServerStatus = false;
     network_mode _networkMode = network_mode::Undefined;
     bool _ethConnected = false;
-    std::vector<DtuNetworkEventCbList_t> _cbEventList;
+    std::vector<NetworkEventCbList_t> _cbEventList;
     bool _lastMdnsEnabled = false;
-    std::unique_ptr<W5500> _w5500;
 };
 
 extern NetworkSettingsClass NetworkSettings;

include/PinMapping.h

@@ -12,7 +12,6 @@
 
 struct PinMapping_t {
     char name[MAPPING_NAME_STRLEN + 1];
-
     int8_t nrf24_miso;
     int8_t nrf24_mosi;
     int8_t nrf24_clk;
@@ -27,14 +26,6 @@ struct PinMapping_t {
     int8_t cmt_gpio3;
     int8_t cmt_sdio;
 
-    int8_t w5500_mosi;
-    int8_t w5500_miso;
-    int8_t w5500_sclk;
-    int8_t w5500_cs;
-    int8_t w5500_int;
-    int8_t w5500_rst;
-
-#if CONFIG_ETH_USE_ESP32_EMAC
     int8_t eth_phy_addr;
     bool eth_enabled;
     int eth_power;
@@ -42,15 +33,31 @@ struct PinMapping_t {
     int eth_mdio;
     eth_phy_type_t eth_type;
     eth_clock_mode_t eth_clk_mode;
-#endif
-
     uint8_t display_type;
     uint8_t display_data;
     uint8_t display_clk;
     uint8_t display_cs;
     uint8_t display_reset;
-
     int8_t led[PINMAPPING_LED_COUNT];
+
+    // OpenDTU-OnBattery-specific pins below
+    int8_t victron_tx;
+    int8_t victron_rx;
+    int8_t victron_tx2;
+    int8_t victron_rx2;
+    int8_t battery_rx;
+    int8_t battery_rxen;
+    int8_t battery_tx;
+    int8_t battery_txen;
+    int8_t huawei_miso;
+    int8_t huawei_mosi;
+    int8_t huawei_clk;
+    int8_t huawei_irq;
+    int8_t huawei_cs;
+    int8_t huawei_power;
+    int8_t powermeter_rx;
+    int8_t powermeter_tx;
+    int8_t powermeter_dere;
 };
 
 class PinMappingClass {
@@ -59,19 +66,13 @@ public:
     bool init(const String& deviceMapping);
     PinMapping_t& get();
 
-    bool isMappingSelected() const { return _mappingSelected; }
-
     bool isValidNrf24Config() const;
     bool isValidCmt2300Config() const;
-    bool isValidW5500Config() const;
-#if CONFIG_ETH_USE_ESP32_EMAC
     bool isValidEthConfig() const;
-#endif
+    bool isValidHuaweiConfig() const;
 
 private:
     PinMapping_t _pinMapping;
-
-    bool _mappingSelected = false;
 };
 
 extern PinMappingClass PinMapping;

include/PowerLimiter.h

@@ -0,0 +1,104 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "Configuration.h"
+#include <espMqttClient.h>
+#include <Arduino.h>
+#include <Hoymiles.h>
+#include <memory>
+#include <functional>
+#include <optional>
+#include <TaskSchedulerDeclarations.h>
+#include <frozen/string.h>
+
+#define PL_UI_STATE_INACTIVE 0
+#define PL_UI_STATE_CHARGING 1
+#define PL_UI_STATE_USE_SOLAR_ONLY 2
+#define PL_UI_STATE_USE_SOLAR_AND_BATTERY 3
+
+class PowerLimiterClass {
+public:
+    enum class Status : unsigned {
+        Initializing,
+        DisabledByConfig,
+        DisabledByMqtt,
+        WaitingForValidTimestamp,
+        PowerMeterPending,
+        InverterInvalid,
+        InverterChanged,
+        InverterOffline,
+        InverterCommandsDisabled,
+        InverterLimitPending,
+        InverterPowerCmdPending,
+        InverterDevInfoPending,
+        InverterStatsPending,
+        CalculatedLimitBelowMinLimit,
+        UnconditionalSolarPassthrough,
+        NoVeDirect,
+        NoEnergy,
+        HuaweiPsu,
+        Stable,
+    };
+
+    void init(Scheduler& scheduler);
+    uint8_t getInverterUpdateTimeouts() const { return _inverterUpdateTimeouts; }
+    uint8_t getPowerLimiterState();
+    int32_t getLastRequestedPowerLimit() { return _lastRequestedPowerLimit; }
+
+    enum class Mode : unsigned {
+        Normal = 0,
+        Disabled = 1,
+        UnconditionalFullSolarPassthrough = 2
+    };
+
+    void setMode(Mode m) { _mode = m; }
+    Mode getMode() const { return _mode; }
+    void calcNextInverterRestart();
+
+private:
+    void loop();
+
+    Task _loopTask;
+
+    int32_t _lastRequestedPowerLimit = 0;
+    bool _shutdownPending = false;
+    std::optional<uint32_t> _oInverterStatsMillis = std::nullopt;
+    std::optional<uint32_t> _oUpdateStartMillis = std::nullopt;
+    std::optional<int32_t> _oTargetPowerLimitWatts = std::nullopt;
+    std::optional<bool> _oTargetPowerState = std::nullopt;
+    Status _lastStatus = Status::Initializing;
+    uint32_t _lastStatusPrinted = 0;
+    uint32_t _lastCalculation = 0;
+    static constexpr uint32_t _calculationBackoffMsDefault = 128;
+    uint32_t _calculationBackoffMs = _calculationBackoffMsDefault;
+    Mode _mode = Mode::Normal;
+    std::shared_ptr<InverterAbstract> _inverter = nullptr;
+    bool _batteryDischargeEnabled = false;
+    uint32_t _nextInverterRestart = 0; // Values: 0->not calculated / 1->no restart configured / >1->time of next inverter restart in millis()
+    uint32_t _nextCalculateCheck = 5000; // time in millis for next NTP check to calulate restart
+    bool _fullSolarPassThroughEnabled = false;
+    bool _verboseLogging = true;
+    uint8_t _inverterUpdateTimeouts = 0;
+
+    frozen::string const& getStatusText(Status status);
+    void announceStatus(Status status);
+    bool shutdown(Status status);
+    bool shutdown() { return shutdown(_lastStatus); }
+    float getBatteryVoltage(bool log = false);
+    int32_t inverterPowerDcToAc(std::shared_ptr<InverterAbstract> inverter, int32_t dcPower);
+    void unconditionalSolarPassthrough(std::shared_ptr<InverterAbstract> inverter);
+    bool canUseDirectSolarPower();
+    bool calcPowerLimit(std::shared_ptr<InverterAbstract> inverter, int32_t solarPower, bool batteryPower);
+    bool updateInverter();
+    bool setNewPowerLimit(std::shared_ptr<InverterAbstract> inverter, int32_t newPowerLimit);
+    int32_t getSolarPower();
+    float getLoadCorrectedVoltage();
+    bool testThreshold(float socThreshold, float voltThreshold,
+            std::function<bool(float, float)> compare);
+    bool isStartThresholdReached();
+    bool isStopThresholdReached();
+    bool isBelowStopThreshold();
+    bool useFullSolarPassthrough();
+};
+
+extern PowerLimiterClass PowerLimiter;

include/PowerMeter.h

@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "Configuration.h"
+#include <espMqttClient.h>
+#include <Arduino.h>
+#include <map>
+#include <list>
+#include <mutex>
+#include "SDM.h"
+#include "sml.h"
+#include <TaskSchedulerDeclarations.h>
+#include <SoftwareSerial.h>
+
+typedef struct {
+  const unsigned char OBIS[6];
+  void (*Fn)(double&);
+  float* Arg;
+} OBISHandler;
+
+class PowerMeterClass {
+public:
+    enum class Source : unsigned {
+        MQTT = 0,
+        SDM1PH = 1,
+        SDM3PH = 2,
+        HTTP = 3,
+        SML = 4,
+        SMAHM2 = 5
+    };
+    void init(Scheduler& scheduler);
+    float getPowerTotal(bool forceUpdate = true);
+    uint32_t getLastPowerMeterUpdate();
+    bool isDataValid();
+
+private:
+    void loop();
+    void mqtt();
+
+    void onMqttMessage(const espMqttClientTypes::MessageProperties& properties,
+        const char* topic, const uint8_t* payload, size_t len, size_t index, size_t total);
+
+    Task _loopTask;
+
+    bool _verboseLogging = true;
+    uint32_t _lastPowerMeterCheck;
+    // Used in Power limiter for safety check
+    uint32_t _lastPowerMeterUpdate;
+
+    float _powerMeter1Power = 0.0;
+    float _powerMeter2Power = 0.0;
+    float _powerMeter3Power = 0.0;
+    float _powerMeter1Voltage = 0.0;
+    float _powerMeter2Voltage = 0.0;
+    float _powerMeter3Voltage = 0.0;
+    float _powerMeterImport = 0.0;
+    float _powerMeterExport = 0.0;
+
+    std::map<String, float*> _mqttSubscriptions;
+
+    mutable std::mutex _mutex;
+
+    std::unique_ptr<SDM> _upSdm = nullptr;
+    std::unique_ptr<SoftwareSerial> _upSmlSerial = nullptr;
+
+    void readPowerMeter();
+
+    bool smlReadLoop();
+    const std::list<OBISHandler> smlHandlerList{
+        {{0x01, 0x00, 0x10, 0x07, 0x00, 0xff}, &smlOBISW, &_powerMeter1Power},
+        {{0x01, 0x00, 0x01, 0x08, 0x00, 0xff}, &smlOBISWh, &_powerMeterImport},
+        {{0x01, 0x00, 0x02, 0x08, 0x00, 0xff}, &smlOBISWh, &_powerMeterExport}
+    };
+};
+
+extern PowerMeterClass PowerMeter;

include/PylontechCanReceiver.h

@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "Configuration.h"
+#include "Battery.h"
+#include <espMqttClient.h>
+#include <driver/twai.h>
+#include <Arduino.h>
+#include <memory>
+
+class PylontechCanReceiver : public BatteryProvider {
+public:
+    bool init(bool verboseLogging) final;
+    void deinit() final;
+    void loop() final;
+    std::shared_ptr<BatteryStats> getStats() const final { return _stats; }
+
+private:
+    uint16_t readUnsignedInt16(uint8_t *data);
+    int16_t readSignedInt16(uint8_t *data);
+    float scaleValue(int16_t value, float factor);
+    bool getBit(uint8_t value, uint8_t bit);
+
+    void dummyData();
+
+    bool _verboseLogging = true;
+    std::shared_ptr<PylontechBatteryStats> _stats =
+        std::make_shared<PylontechBatteryStats>();
+};

include/RestartHelper.h

@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include <TaskSchedulerDeclarations.h>
-
-class RestartHelperClass {
-public:
-    RestartHelperClass();
-    void init(Scheduler& scheduler);
-    void triggerRestart();
-
-private:
-    void loop();
-
-    Task _rebootTask;
-};
-
-extern RestartHelperClass RestartHelper;

include/SMA_HM.h

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2024 Holger-Steffen Stapf
+ */
+#pragma once
+
+#include <cstdint>
+#include <TaskSchedulerDeclarations.h>
+
+class SMA_HMClass {
+public:
+    void init(Scheduler& scheduler, bool verboseLogging);
+    void loop();
+    void event1();
+    float getPowerTotal() const { return _powerMeterPower; }
+    float getPowerL1() const { return _powerMeterL1; }
+    float getPowerL2() const { return _powerMeterL2; }
+    float getPowerL3() const { return _powerMeterL3; }
+
+private:
+    void Soutput(int kanal, int index, int art, int tarif,
+            char const* name, float value, uint32_t timestamp);
+
+    uint8_t* decodeGroup(uint8_t* offset, uint16_t grouplen);
+
+    bool _verboseLogging = false;
+    float _powerMeterPower = 0.0;
+    float _powerMeterL1 = 0.0;
+    float _powerMeterL2 = 0.0;
+    float _powerMeterL3 = 0.0;
+    uint32_t _previousMillis = 0;
+    uint32_t _serial = 0;
+    Task _loopTask;
+};
+
+extern SMA_HMClass SMA_HM;

include/SerialPortManager.h

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <map>
+
+class SerialPortManagerClass {
+public:
+    bool allocateMpptPort(int port);
+    bool allocateBatteryPort(int port);
+    void invalidateBatteryPort();
+    void invalidateMpptPorts();
+
+private:
+    enum Owner {
+        BATTERY,
+        MPPT
+    };
+
+    std::map<uint8_t, Owner> allocatedPorts;
+
+    bool allocatePort(uint8_t port, Owner owner);
+    void invalidate(Owner owner);
+
+    static const char* print(Owner owner);
+};
+
+extern SerialPortManagerClass SerialPortManager;

include/Utils.h

@@ -2,7 +2,6 @@
 #pragma once
 
 #include <ArduinoJson.h>
-#include <LittleFS.h>
 #include <cstdint>
 
 class Utils {
@@ -10,8 +9,7 @@ public:
     static uint32_t getChipId();
     static uint64_t generateDtuSerial();
     static int getTimezoneOffset();
+    static void restartDtu();
     static bool checkJsonAlloc(const JsonDocument& doc, const char* function, const uint16_t line);
     static void removeAllFiles();
-    static String generateMd5FromFile(String file);
-    static void skipBom(File& f);
 };

include/VictronMppt.h

@@ -0,0 +1,61 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <mutex>
+#include <memory>
+
+#include "VeDirectMpptController.h"
+#include "Configuration.h"
+#include <TaskSchedulerDeclarations.h>
+
+class VictronMpptClass {
+public:
+    VictronMpptClass() = default;
+    ~VictronMpptClass() = default;
+
+    void init(Scheduler& scheduler);
+    void updateSettings();
+
+    bool isDataValid() const;
+    bool isDataValid(size_t idx) const;
+
+    // returns the data age of all controllers,
+    // i.e, the youngest data's age is returned.
+    uint32_t getDataAgeMillis() const;
+    uint32_t getDataAgeMillis(size_t idx) const;
+
+    size_t controllerAmount() const { return _controllers.size(); }
+    std::optional<VeDirectMpptController::data_t> getData(size_t idx = 0) const;
+
+    // total output of all MPPT charge controllers in Watts
+    int32_t getPowerOutputWatts() const;
+
+    // total panel input power of all MPPT charge controllers in Watts
+    int32_t getPanelPowerWatts() const;
+
+    // sum of total yield of all MPPT charge controllers in kWh
+    float getYieldTotal() const;
+
+    // sum of today's yield of all MPPT charge controllers in kWh
+    float getYieldDay() const;
+
+    // minimum of all MPPT charge controllers' output voltages in V
+    float getOutputVoltage() const;
+
+private:
+    void loop();
+    VictronMpptClass(VictronMpptClass const& other) = delete;
+    VictronMpptClass(VictronMpptClass&& other) = delete;
+    VictronMpptClass& operator=(VictronMpptClass const& other) = delete;
+    VictronMpptClass& operator=(VictronMpptClass&& other) = delete;
+
+    Task _loopTask;
+
+    mutable std::mutex _mutex;
+    using controller_t = std::unique_ptr<VeDirectMpptController>;
+    std::vector<controller_t> _controllers;
+
+    bool initController(int8_t rx, int8_t tx, bool logging, int hwSerialPort);
+};
+
+extern VictronMpptClass VictronMppt;

include/VictronSmartShunt.h

@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "Battery.h"
+
+class VictronSmartShunt : public BatteryProvider {
+public:
+    bool init(bool verboseLogging) final;
+    void deinit() final { }
+    void loop() final;
+    std::shared_ptr<BatteryStats> getStats() const final { return _stats; }
+    bool usesHwPort2() const final {
+        return ARDUINO_USB_CDC_ON_BOOT != 1;
+    }
+
+private:
+    uint32_t _lastUpdate = 0;
+    std::shared_ptr<VictronSmartShuntStats> _stats =
+        std::make_shared<VictronSmartShuntStats>();
+};

include/W5500.h

@@ -1,29 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include <Arduino.h>
-#include <driver/spi_master.h>
-#include <esp_eth.h> // required for esp_eth_handle_t
-#include <esp_netif.h>
-
-#include <memory>
-
-class W5500 {
-private:
-    explicit W5500(spi_device_handle_t spi, gpio_num_t pin_int);
-
-public:
-    W5500(const W5500&) = delete;
-    W5500& operator=(const W5500&) = delete;
-    ~W5500();
-
-    static std::unique_ptr<W5500> setup(int8_t pin_mosi, int8_t pin_miso, int8_t pin_sclk, int8_t pin_cs, int8_t pin_int, int8_t pin_rst);
-    String macAddress();
-
-private:
-    static bool connection_check_spi(spi_device_handle_t spi);
-    static bool connection_check_interrupt(gpio_num_t pin_int);
-
-    esp_eth_handle_t eth_handle;
-    esp_netif_t* eth_netif;
-};

include/WebApi.h

@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
+#include "WebApi_battery.h"
+#include "WebApi_config.h"
 #include "WebApi_device.h"
 #include "WebApi_devinfo.h"
 #include "WebApi_dtu.h"
 #include "WebApi_errors.h"
 #include "WebApi_eventlog.h"
-#include "WebApi_file.h"
 #include "WebApi_firmware.h"
 #include "WebApi_gridprofile.h"
-#include "WebApi_i18n.h"
 #include "WebApi_inverter.h"
 #include "WebApi_limit.h"
 #include "WebApi_maintenance.h"
@@ -17,6 +17,8 @@
 #include "WebApi_network.h"
 #include "WebApi_ntp.h"
 #include "WebApi_power.h"
+#include "WebApi_powermeter.h"
+#include "WebApi_powerlimiter.h"
 #include "WebApi_prometheus.h"
 #include "WebApi_security.h"
 #include "WebApi_sysstatus.h"
@@ -24,6 +26,11 @@
 #include "WebApi_ws_console.h"
 #include "WebApi_ws_live.h"
 #include <AsyncJson.h>
+#include "WebApi_ws_vedirect_live.h"
+#include "WebApi_vedirect.h"
+#include "WebApi_ws_Huawei.h"
+#include "WebApi_Huawei.h"
+#include "WebApi_ws_battery.h"
 #include <ESPAsyncWebServer.h>
 #include <TaskSchedulerDeclarations.h>
 
@@ -31,7 +38,6 @@ class WebApiClass {
 public:
     WebApiClass();
     void init(Scheduler& scheduler);
-    void reload();
 
     static bool checkCredentials(AsyncWebServerRequest* request);
     static bool checkCredentialsReadonly(AsyncWebServerRequest* request);
@@ -47,14 +53,14 @@ public:
 private:
     AsyncWebServer _server;
 
+    WebApiBatteryClass _webApiBattery;
+    WebApiConfigClass _webApiConfig;
     WebApiDeviceClass _webApiDevice;
     WebApiDevInfoClass _webApiDevInfo;
     WebApiDtuClass _webApiDtu;
     WebApiEventlogClass _webApiEventlog;
-    WebApiFileClass _webApiFile;
     WebApiFirmwareClass _webApiFirmware;
     WebApiGridProfileClass _webApiGridprofile;
-    WebApiI18nClass _webApiI18n;
     WebApiInverterClass _webApiInverter;
     WebApiLimitClass _webApiLimit;
     WebApiMaintenanceClass _webApiMaintenance;
@@ -62,12 +68,19 @@ private:
     WebApiNetworkClass _webApiNetwork;
     WebApiNtpClass _webApiNtp;
     WebApiPowerClass _webApiPower;
+    WebApiPowerMeterClass _webApiPowerMeter;
+    WebApiPowerLimiterClass _webApiPowerLimiter;
     WebApiPrometheusClass _webApiPrometheus;
     WebApiSecurityClass _webApiSecurity;
     WebApiSysstatusClass _webApiSysstatus;
     WebApiWebappClass _webApiWebapp;
     WebApiWsConsoleClass _webApiWsConsole;
     WebApiWsLiveClass _webApiWsLive;
+    WebApiWsVedirectLiveClass _webApiWsVedirectLive;
+    WebApiVedirectClass _webApiVedirect;
+    WebApiHuaweiClass _webApiHuaweiClass;
+    WebApiWsHuaweiLiveClass _webApiWsHuaweiLive;
+    WebApiWsBatteryLiveClass _webApiWsBatteryLive;
 };
 
 extern WebApiClass WebApi;

include/WebApi_Huawei.h

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
+#include <AsyncJson.h>
+
+class WebApiHuaweiClass {
+public:
+    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void getJsonData(JsonVariant& root);
+private:
+    void onStatus(AsyncWebServerRequest* request);
+    void onAdminGet(AsyncWebServerRequest* request);
+    void onAdminPost(AsyncWebServerRequest* request);
+    void onPost(AsyncWebServerRequest* request);
+    
+    AsyncWebServer* _server;
+};

include/WebApi_battery.h

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
+
+class WebApiBatteryClass {
+public:
+    void init(AsyncWebServer& server, Scheduler& scheduler);
+
+private:
+    void onStatus(AsyncWebServerRequest* request);
+    void onAdminGet(AsyncWebServerRequest* request);
+    void onAdminPost(AsyncWebServerRequest* request);
+
+    AsyncWebServer* _server;
+};

include/WebApi_config.h

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
+
+class WebApiConfigClass {
+public:
+    void init(AsyncWebServer& server, Scheduler& scheduler);
+
+private:
+    void onConfigGet(AsyncWebServerRequest* request);
+    void onConfigDelete(AsyncWebServerRequest* request);
+    void onConfigListGet(AsyncWebServerRequest* request);
+    void onConfigUploadFinish(AsyncWebServerRequest* request);
+    void onConfigUpload(AsyncWebServerRequest* request, String filename, size_t index, uint8_t* data, size_t len, bool final);
+};

include/WebApi_errors.h

@@ -18,10 +18,9 @@ enum WebApiError {
     DtuInvalidCmtFrequency,
     DtuInvalidCmtCountry,
 
-    FileBase = 3000,
-    FileNotDeleted,
-    FileSuccess,
-    FileDeleteSuccess,
+    ConfigBase = 3000,
+    ConfigNotDeleted,
+    ConfigSuccess,
 
     InverterBase = 4000,
     InverterSerialZero,
@@ -33,7 +32,6 @@ enum WebApiError {
     InverterChanged,
     InverterDeleted,
     InverterOrdered,
-    InverterStatsResetted,
 
     LimitBase = 5000,
     LimitSerialZero,
@@ -62,7 +60,6 @@ enum WebApiError {
     MqttHassTopicLength,
     MqttHassTopicCharacter,
     MqttLwtQos,
-    MqttClientIdLength,
 
     NetworkBase = 8000,
     NetworkIpInvalid,

include/WebApi_file.h

@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
-
-class WebApiFileClass {
-public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
-
-private:
-    void onFileGet(AsyncWebServerRequest* request);
-    void onFileDelete(AsyncWebServerRequest* request);
-    void onFileDeleteAll(AsyncWebServerRequest* request);
-    void onFileListGet(AsyncWebServerRequest* request);
-    void onFileUploadFinish(AsyncWebServerRequest* request);
-    void onFileUpload(AsyncWebServerRequest* request, String filename, size_t index, uint8_t* data, size_t len, bool final);
-};

include/WebApi_i18n.h

@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
-
-class WebApiI18nClass {
-public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
-
-private:
-    void onI18nLanguages(AsyncWebServerRequest* request);
-    void onI18nLanguage(AsyncWebServerRequest* request);
-};

include/WebApi_inverter.h

@@ -14,5 +14,4 @@ private:
     void onInverterEdit(AsyncWebServerRequest* request);
     void onInverterDelete(AsyncWebServerRequest* request);
     void onInverterOrder(AsyncWebServerRequest* request);
-    void onInverterStatReset(AsyncWebServerRequest* request);
 };

include/WebApi_powerlimiter.h

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
+
+
+class WebApiPowerLimiterClass {
+public:
+    void init(AsyncWebServer& server, Scheduler& scheduler);
+
+private:
+    void onStatus(AsyncWebServerRequest* request);
+    void onMetaData(AsyncWebServerRequest* request);
+    void onAdminGet(AsyncWebServerRequest* request);
+    void onAdminPost(AsyncWebServerRequest* request);
+
+    AsyncWebServer* _server;
+};

include/WebApi_powermeter.h

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
+#include <ArduinoJson.h>
+#include "Configuration.h"
+
+class WebApiPowerMeterClass {
+public:
+    void init(AsyncWebServer& server, Scheduler& scheduler);
+
+private:
+    void onStatus(AsyncWebServerRequest* request);
+    void onAdminGet(AsyncWebServerRequest* request);
+    void onAdminPost(AsyncWebServerRequest* request);
+    void decodeJsonPhaseConfig(JsonObject const& json, PowerMeterHttpConfig& config) const;
+    void onTestHttpRequest(AsyncWebServerRequest* request);
+
+    AsyncWebServer* _server;
+};

include/WebApi_vedirect.h

@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
+
+
+class WebApiVedirectClass {
+public:
+    void init(AsyncWebServer& server, Scheduler& scheduler);
+
+private:
+    void onVedirectStatus(AsyncWebServerRequest* request);
+    void onVedirectAdminGet(AsyncWebServerRequest* request);
+    void onVedirectAdminPost(AsyncWebServerRequest* request);
+
+    AsyncWebServer* _server;
+};

include/WebApi_ws_Huawei.h

@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "ArduinoJson.h"
+#include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
+#include <mutex>
+
+class WebApiWsHuaweiLiveClass {
+public:
+    WebApiWsHuaweiLiveClass();
+    void init(AsyncWebServer& server, Scheduler& scheduler);
+
+private:
+    void generateCommonJsonResponse(JsonVariant& root);
+    void onLivedataStatus(AsyncWebServerRequest* request);
+    void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len);
+
+    AsyncWebServer* _server;
+    AsyncWebSocket _ws;
+
+    std::mutex _mutex;
+    
+    Task _wsCleanupTask;
+    void wsCleanupTaskCb();
+
+    Task _sendDataTask;
+    void sendDataTaskCb();
+};

include/WebApi_ws_battery.h

@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "ArduinoJson.h"
+#include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
+#include <mutex>
+
+class WebApiWsBatteryLiveClass {
+public:
+    WebApiWsBatteryLiveClass();
+    void init(AsyncWebServer& server, Scheduler& scheduler);
+
+private:
+    void generateCommonJsonResponse(JsonVariant& root);
+    void onLivedataStatus(AsyncWebServerRequest* request);
+    void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len);
+
+    AsyncWebServer* _server;
+    AsyncWebSocket _ws;
+
+    uint32_t _lastUpdateCheck = 0;
+    static constexpr uint16_t _responseSize = 1024 + 512;
+
+    std::mutex _mutex;
+
+    Task _wsCleanupTask;
+    void wsCleanupTaskCb();
+
+    Task _sendDataTask;
+    void sendDataTaskCb();
+};

include/WebApi_ws_console.h

@@ -8,11 +8,9 @@ class WebApiWsConsoleClass {
 public:
     WebApiWsConsoleClass();
     void init(AsyncWebServer& server, Scheduler& scheduler);
-    void reload();
 
 private:
     AsyncWebSocket _ws;
-    AsyncAuthenticationMiddleware _simpleDigestAuth;
 
     Task _wsCleanupTask;
     void wsCleanupTaskCb();

include/WebApi_ws_live.h

@@ -11,13 +11,15 @@ class WebApiWsLiveClass {
 public:
     WebApiWsLiveClass();
     void init(AsyncWebServer& server, Scheduler& scheduler);
-    void reload();
 
 private:
     static void generateInverterCommonJsonResponse(JsonObject& root, std::shared_ptr<InverterAbstract> inv);
     static void generateInverterChannelJsonResponse(JsonObject& root, std::shared_ptr<InverterAbstract> inv);
     static void generateCommonJsonResponse(JsonVariant& root);
 
+    void generateOnBatteryJsonResponse(JsonVariant& root, bool all);
+    void sendOnBatteryStats();
+
     static void addField(JsonObject& root, std::shared_ptr<InverterAbstract> inv, const ChannelType_t type, const ChannelNum_t channel, const FieldId_t fieldId, String topic = "");
     static void addTotalField(JsonObject& root, const String& name, const float value, const String& unit, const uint8_t digits);
 
@@ -25,7 +27,12 @@ private:
     void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len);
 
     AsyncWebSocket _ws;
-    AsyncAuthenticationMiddleware _simpleDigestAuth;
+
+    uint32_t _lastPublishOnBatteryFull = 0;
+    uint32_t _lastPublishVictron = 0;
+    uint32_t _lastPublishHuawei = 0;
+    uint32_t _lastPublishBattery = 0;
+    uint32_t _lastPublishPowerMeter = 0;
 
     uint32_t _lastPublishStats[INV_MAX_COUNT] = { 0 };
 

include/WebApi_ws_vedirect_live.h

@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "ArduinoJson.h"
+#include "Configuration.h"
+#include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
+#include <VeDirectMpptController.h>
+#include <mutex>
+
+class WebApiWsVedirectLiveClass {
+public:
+    WebApiWsVedirectLiveClass();
+    void init(AsyncWebServer& server, Scheduler& scheduler);
+
+private:
+    void generateCommonJsonResponse(JsonVariant& root, bool fullUpdate);
+    static void populateJson(const JsonObject &root, const VeDirectMpptController::data_t &mpptData);
+    void onLivedataStatus(AsyncWebServerRequest* request);
+    void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len);
+    bool hasUpdate(size_t idx);
+
+    AsyncWebServer* _server;
+    AsyncWebSocket _ws;
+
+    uint32_t _lastFullPublish = 0;
+    uint32_t _lastPublish = 0;
+    uint16_t responseSize() const;
+
+    std::mutex _mutex;
+
+    Task _wsCleanupTask;
+    void wsCleanupTaskCb();
+
+    Task _sendDataTask;
+    void sendDataTaskCb();
+};

include/__compiled_constants.h

@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-// The referenced values are generated by pio-scripts/auto_firmware_version.py
-
-
-extern const char *__COMPILED_GIT_HASH__;
-extern const char *__COMPILED_GIT_BRANCH__;
-// extern const char *__COMPILED_DATE_TIME_UTC_STR__;

include/defaults.h

@@ -9,7 +9,7 @@
 
 #define ACCESS_POINT_NAME "OpenDTU-"
 #define ACCESS_POINT_PASSWORD "openDTU42"
-#define ACCESS_POINT_TIMEOUT 3
+#define ACCESS_POINT_TIMEOUT 3;
 #define AUTH_USERNAME "admin"
 #define SECURITY_ALLOW_READONLY true
 
@@ -99,7 +99,7 @@
 #define DISPLAY_SCREENSAVER true
 #define DISPLAY_ROTATION 2U
 #define DISPLAY_CONTRAST 60U
-#define DISPLAY_LOCALE "en"
+#define DISPLAY_LANGUAGE 0U
 #define DISPLAY_DIAGRAM_DURATION (10UL * 60UL * 60UL)
 #define DISPLAY_DIAGRAM_MODE 1U
 
@@ -109,4 +109,54 @@
 
 #define MAX_INVERTER_LIMIT 2250
 
-#define LANG_PACK_SUFFIX ".lang.json"
+// values specific to downstream project OpenDTU-OnBattery start here:
+#define VEDIRECT_ENABLED false
+#define VEDIRECT_VERBOSE_LOGGING false
+#define VEDIRECT_UPDATESONLY true
+
+#define POWERMETER_ENABLED false
+#define POWERMETER_INTERVAL 10
+#define POWERMETER_SOURCE 2
+#define POWERMETER_SDMBAUDRATE 9600
+#define POWERMETER_SDMADDRESS 1
+
+#define POWERLIMITER_ENABLED false
+#define POWERLIMITER_SOLAR_PASSTHROUGH_ENABLED true
+#define POWERLIMITER_SOLAR_PASSTHROUGH_LOSSES 3
+#define POWERLIMITER_BATTERY_ALWAYS_USE_AT_NIGHT false
+#define POWERLIMITER_INTERVAL 10
+#define POWERLIMITER_IS_INVERTER_BEHIND_POWER_METER true
+#define POWERLIMITER_IS_INVERTER_SOLAR_POWERED false
+#define POWERLIMITER_INVERTER_ID 0ULL
+#define POWERLIMITER_INVERTER_CHANNEL_ID 0
+#define POWERLIMITER_TARGET_POWER_CONSUMPTION 0
+#define POWERLIMITER_TARGET_POWER_CONSUMPTION_HYSTERESIS 0
+#define POWERLIMITER_LOWER_POWER_LIMIT 10
+#define POWERLIMITER_BASE_LOAD_LIMIT 100
+#define POWERLIMITER_UPPER_POWER_LIMIT 800
+#define POWERLIMITER_IGNORE_SOC false
+#define POWERLIMITER_BATTERY_SOC_START_THRESHOLD 80
+#define POWERLIMITER_BATTERY_SOC_STOP_THRESHOLD 20
+#define POWERLIMITER_VOLTAGE_START_THRESHOLD 50.0
+#define POWERLIMITER_VOLTAGE_STOP_THRESHOLD 49.0
+#define POWERLIMITER_VOLTAGE_LOAD_CORRECTION_FACTOR 0.001
+#define POWERLIMITER_RESTART_HOUR -1
+#define POWERLIMITER_FULL_SOLAR_PASSTHROUGH_SOC 100
+#define POWERLIMITER_FULL_SOLAR_PASSTHROUGH_START_VOLTAGE 100.0
+#define POWERLIMITER_FULL_SOLAR_PASSTHROUGH_STOP_VOLTAGE 100.0
+
+#define BATTERY_ENABLED false
+#define BATTERY_PROVIDER 0 // Pylontech CAN receiver
+#define BATTERY_JKBMS_INTERFACE 0
+#define BATTERY_JKBMS_POLLING_INTERVAL 5
+
+#define HUAWEI_ENABLED false
+#define HUAWEI_CAN_CONTROLLER_FREQUENCY 8000000UL
+#define HUAWEI_AUTO_POWER_VOLTAGE_LIMIT 42.0
+#define HUAWEI_AUTO_POWER_ENABLE_VOLTAGE_LIMIT 42.0
+#define HUAWEI_AUTO_POWER_LOWER_POWER_LIMIT 150
+#define HUAWEI_AUTO_POWER_UPPER_POWER_LIMIT 2000
+#define HUAWEI_AUTO_POWER_STOP_BATTERYSOC_THRESHOLD 95
+#define HUAWEI_AUTO_POWER_TARGET_POWER_CONSUMPTION 0
+
+#define VERBOSE_LOGGING true

lang/README.md

@@ -1,9 +0,0 @@
-# Language Packs
-
-This folder contains language packs for OpenDTU which can be uploaded to the
-device using the "Config Management" function.
-Select "Language Pack" in the restore section, select a `.json` file containing
-your language and press "Restore". Afterwards all language selection drop down
-menues contain the new language.
-
-Create a pull to request to share your own language pack (or corrections) with the community.

lang/es.lang.json

@@ -1,696 +0,0 @@
-{
-    "meta": {
-        "name": "Español",
-        "code": "es"
-    },
-    "display": {
-        "date_format": "%d/%m/%Y %H:%M",
-        "offline": "Apagado",
-        "power_w": "%.0f W",
-        "power_kw": "%.1f kW",
-        "yield_today_wh": "Hoy: %4.0f Wh",
-        "yield_today_kwh": "Hoy: %.1f kWh",
-        "yield_total_kwh": "Total: %.1f kWh",
-        "yield_total_mwh": "Total: %.0f kWh"
-    },
-    "webapp": {
-        "menu": {
-            "LiveView": "Vista en directo",
-            "Settings": "Ajustes",
-            "NetworkSettings": "Ajustes de Red",
-            "NTPSettings": "Ajustes NTP",
-            "MQTTSettings": "Ajustes MQTT",
-            "InverterSettings": "Ajustes Inversor",
-            "SecuritySettings": "Ajustes Seguridad",
-            "DTUSettings": "Ajustes DTU",
-            "DeviceManager": "Administrador Dispositivos",
-            "ConfigManagement": "Gestión configuración",
-            "FirmwareUpgrade": "Actualización Firmware",
-            "DeviceReboot": "Reinicio Dispositivo",
-            "Info": "Info",
-            "System": "Sistema",
-            "Network": "Red",
-            "NTP": "NTP",
-            "MQTT": "MQTT",
-            "Console": "Consola",
-            "About": "Acerca",
-            "Logout": "Logout",
-            "Login": "Login"
-        },
-        "base": {
-            "Loading": "Cargando...",
-            "Reload": "Recargar",
-            "Cancel": "Cancelar",
-            "Save": "Guardar",
-            "Refreshing": "Refrescando",
-            "Pull": "Tira hacia abajo para refrescar",
-            "Release": "Soltar para refrescar",
-            "Close": "Cerrar",
-            "Yes": "Yes",
-            "No": "No"
-        },
-        "wait": {
-            "NotReady": "OpenDTU is not yet ready",
-            "PleaseWait": "Please wait. You will be automatically redirected to the home page."
-        },
-        "Error": {
-            "Oops": "Oops!"
-        },
-        "localeswitcher": {
-            "Dark": "Oscuro",
-            "Light": "Claro",
-            "Auto": "Automático"
-        },
-        "apiresponse": {
-            "1001": "¡Opciones guardadas!",
-            "1002": "No se encontraron valores",
-            "1003": "Datos demasiado grandes",
-            "1004": "Fallo al procesar los datos",
-            "1005": "Faltan valores",
-            "1006": "Fallo en la escritura",
-            "2001": "¡El número de serie no puede ser cero!",
-            "2002": "Intervalo de Poll interval debe ser mayor que cero!",
-            "2003": "Configuración de potencia incorrecta!",
-            "2004": "La frecuencia debe estar entre {min} y {max} kHz y debe ser un múltiplo de 250 kHz!",
-            "2005": "Modelo desconocido! Por favor, informe el \"Modelo de pieza de hardware\" y el modelo (por ejemplo, HM-350) como un problema en <a href=\"https://github.com/tbnobody/OpenDTU/issues\" target=\"_blank\">aquí</a>.",
-            "3001": "No se eliminó nada",
-            "3002": "Configuración borrada. Reinicio en curso...",
-            "4001": "@:apiresponse.2001",
-            "4002": "El nombre debe tener entre 1 y {max} caracteres de longitud!",
-            "4003": "Solo se admiten {max} inversores!",
-            "4004": "Inversor creado!",
-            "4005": "ID no válido especificado",
-            "4006": "Cantidad de canales máxima incorrecta dada!",
-            "4007": "Inversor modificado!",
-            "4008": "Inversor eliminado!",
-            "4009": "Orden de inversores guardado!",
-            "5001": "@:apiresponse.2001",
-            "5002": "Límite debe estar entre 1 y {max}!",
-            "5003": "Tipo incorrecto especificado!",
-            "5004": "Inversor incorrecto especificado!",
-            "6001": "Reinicio desencadenado!",
-            "6002": "Reinicio cancelado!",
-            "7001": "¡El servidor MQTT debe tener entre 1 y {max} caracteres de longitud!",
-            "7002": "¡El nombre de usuario debe no tener más de {max} caracteres!",
-            "7003": "¡La contraseña debe no tener más de {max} caracteres!",
-            "7004": "¡El tema debe tener entre 1 y {max} caracteres de longitud!",
-            "7005": "¡El tema no debe contener caracteres de espacio!",
-            "7006": "¡El tema debe terminar con barra inclinada (/)!",
-            "7007": "¡El puerto debe ser un número entre 1 y 65535!",
-            "7008": "¡El certificado debe tener entre 1 y {max} caracteres de longitud!",
-            "7009": "¡El tema LWT debe tener entre 1 y {max} caracteres de longitud!",
-            "7010": "¡El tema LWT no debe contener caracteres de espacio!",
-            "7011": "¡El valor LWT en línea debe tener entre 1 y {max} caracteres de longitud!",
-            "7012": "¡El valor LWT fuera de línea debe tener entre 1 y {max} caracteres de longitud!",
-            "7013": "¡El intervalo de publicación debe ser un número entre {min} y {max}!",
-            "7014": "¡El tema Hass debe tener entre 1 y {max} caracteres de longitud!",
-            "7015": "¡El tema Hass no debe contener caracteres de espacio!",
-            "7016": "¡La QoS LWT no debe ser mayor que {max}!",
-            "7017": "Client ID must not longer then {max} characters!",
-            "8001": "¡La dirección IP no es válida!",
-            "8002": "¡La máscara de red no es válida!",
-            "8003": "¡El gateway no es válido!",
-            "8004": "¡La dirección IP del servidor DNS 1 no es válida!",
-            "8005": "¡La dirección IP del servidor DNS 2 no es válida!",
-            "8006": "¡El valor de tiempo de espera del punto de acceso administrativo es inválido!",
-            "9001": "¡El servidor NTP debe tener entre 1 y {max} caracteres de longitud!",
-            "9002": "¡La zona horaria debe tener entre 1 y {max} caracteres de longitud!",
-            "9003": "¡La descripción de la zona horaria debe tener entre 1 y {max} caracteres de longitud!",
-            "9004": "¡El año debe ser un número entre {min} y {max}!",
-            "9005": "¡El mes debe ser un número entre {min} y {max}!",
-            "9006": "¡El día debe ser un número entre {min} y {max}!",
-            "9007": "¡La hora debe ser un número entre {min} y {max}!",
-            "9008": "¡Los minutos deben ser un número entre {min} y {max}!",
-            "9009": "¡Los segundos deben ser un número entre {min} y {max}!",
-            "9010": "¡Hora actualizada!",
-            "10001": "¡La contraseña debe tener entre 8 y {max} caracteres de longitud!",
-            "10002": "¡Autenticación exitosa!",
-            "11001": "¡@:apiresponse.2001",
-            "11002": "¡@:apiresponse:5004",
-            "12001": "¡El perfil debe tener entre 1 y {max} caracteres de longitud!"
-        },
-        "home": {
-            "LiveData": "Datos en Vivo",
-            "SerialNumber": "Número de Serie: ",
-            "CurrentLimit": "Límite de Corriente: ",
-            "DataAge": "Edad de los Datos: ",
-            "Seconds": "{val} segundos",
-            "ShowSetInverterLimit": "Ver / Establecer Límite del Inversor",
-            "TurnOnOff": "Encender/Apagar el Inversor",
-            "ShowInverterInfo": "Ver Información del Inversor",
-            "ShowEventlog": "Ver Registro de Eventos",
-            "UnreadMessages": "mensajes sin leer",
-            "Loading": "@:base.Cargando",
-            "EventLog": "Registro de Eventos",
-            "InverterInfo": "Información del Inversor",
-            "LimitSettings": "Configuración de Límites",
-            "LastLimitSetStatus": "Último Estado de Configuración del Límite:",
-            "SetLimit": "Establecer Límite:",
-            "Relative": "Relativo (%)",
-            "Absolute": "Absoluto (W)",
-            "LimitHint": "<b>Consejo:</b> Si establece el límite como un valor absoluto, la visualización del valor actual solo se actualizará después de ~4 minutos.",
-            "SetPersistent": "Establecer Límite Permanente",
-            "SetNonPersistent": "Establecer Límite No Permanente",
-            "PowerSettings": "Configuración de Energía",
-            "LastPowerSetStatus": "Último Estado de Configuración de Energía:",
-            "TurnOn": "Encender",
-            "TurnOff": "Apagar",
-            "Restart": "Reiniciar",
-            "Failure": "Fallo",
-            "Pending": "Pendiente",
-            "Ok": "Aceptar",
-            "Unknown": "Desconocido",
-            "ShowGridProfile": "Ver Perfil de la Red",
-            "GridProfile": "Perfil de la Red",
-            "LoadingInverter": "Waiting for data... (can take up to 10 seconds)",
-            "RadioStats": "Radio Statistics",
-            "TxRequest": "TX Request Count",
-            "RxSuccess": "RX Success",
-            "RxFailNothing": "RX Fail: Receive Nothing",
-            "RxFailPartial": "RX Fail: Receive Partial",
-            "RxFailCorrupt": "RX Fail: Receive Corrupt",
-            "TxReRequest": "TX Re-Request Fragment",
-            "StatsReset": "Reset Statistics",
-            "StatsResetting": "Resetting...",
-            "Rssi": "RSSI of last received packet",
-            "RssiHint": "HM inverters only support RSSI values < -64 dBm and > -64 dBm. In this case, -80 dbm and -30 dbm is shown.",
-            "dBm": "{dbm} dBm"
-        },
-        "eventlog": {
-            "Start": "Iniciar",
-            "Stop": "Parar",
-            "Id": "ID",
-            "Message": "Mensaje"
-        },
-        "devinfo": {
-            "NoInfo": "Sin información disponible",
-            "NoInfoLong": "No se ha recibido ningún dato válido del inversor hasta ahora. Todavía estamos intentando...",
-            "UnknownModel": "¡Modelo desconocido! Por favor, informe el \"Número de parte de hardware\" y el modelo (por ejemplo, HM-350) como un problema <a href=\"https://github.com/tbnobody/OpenDTU/issues\" target=\"_blank\">aquí</a>.",
-            "Serial": "Número de serie",
-            "ProdYear": "Año de producción",
-            "ProdWeek": "Semana de producción",
-            "Model": "Modelo",
-            "DetectedMaxPower": "Potencia máxima detectada",
-            "BootloaderVersion": "Versión del cargador de arranque",
-            "FirmwareVersion": "Versión del firmware",
-            "FirmwareBuildDate": "Fecha de construcción del firmware",
-            "HardwarePartNumber": "Número de parte de hardware",
-            "HardwareVersion": "Versión de hardware",
-            "SupportsPowerDistributionLogic": "'Power Distribution Logic' supported",
-            "Yes": "@:base.Yes",
-            "No": "@:base.No"
-        },
-        "gridprofile": {
-            "NoInfo": "@:devinfo.NoInfo",
-            "NoInfoLong": "@:devinfo.NoInfoLong",
-            "Name": "Nombre",
-            "Version": "Versión",
-            "Enabled": "@:wifistationinfo.Enabled",
-            "Disabled": "@:wifistationinfo.Disabled",
-            "GridprofileSupport": "Apoyar el desarrollo",
-            "GridprofileSupportLong": "Por favor, consulte <a href=\"https://github.com/tbnobody/OpenDTU/wiki/Grid-Profile-Parser\" target=\"_blank\">aquí</a> para obtener más información."
-        },
-        "systeminfo": {
-            "SystemInfo": "Información del sistema",
-            "VersionError": "Error al obtener información de la versión",
-            "VersionNew": "¡Nueva versión disponible! ¡Mostrar cambios!",
-            "VersionOk": "¡Actualizado!"
-        },
-        "firmwareinfo": {
-            "FirmwareInformation": "Información del firmware",
-            "Hostname": "Hostname",
-            "SdkVersion": "Versión del SDK",
-            "ConfigVersion": "Versión de la configuración",
-            "FirmwareVersion": "Versión del firmware / Hash de Git",
-            "PioEnv": "Entorno PIO",
-            "FirmwareVersionHint": "Haga clic aquí para mostrar información sobre su versión actual",
-            "FirmwareUpdate": "Actualización de firmware",
-            "FirmwareUpdateHint": "Haga clic aquí para ver las diferencias entre su versión y la última versión",
-            "FrmwareUpdateAllow": "Al activar la comprobación de actualización, se envía una solicitud a GitHub.com cada vez que se llama a la página para recuperar la versión actualmente disponible. Si no está de acuerdo con esto, deje esta función desactivada.",
-            "ResetReason0": "Razón de reinicio CPU 0",
-            "ResetReason1": "Razón de reinicio CPU 1",
-            "ConfigSaveCount": "Contador de guardado de configuración",
-            "Uptime": "Tiempo de actividad",
-            "UptimeValue": "0 días {time} | 1 día {time} | {count} días {time}"
-        },
-        "hardwareinfo": {
-            "HardwareInformation": "Información del hardware",
-            "ChipModel": "Modelo de chip",
-            "ChipRevision": "Revisión de chip",
-            "ChipCores": "Núcleos del chip",
-            "CpuFrequency": "Frecuencia de la CPU",
-            "Mhz": "MHz",
-            "CpuTemperature": "CPU Temperature",
-            "FlashSize": "Flash Memory Size"
-        },
-        "memoryinfo": {
-            "MemoryInformation": "Información de la memoria",
-            "Type": "Tipo",
-            "Usage": "Uso",
-            "Free": "Libre",
-            "Used": "Usado",
-            "Size": "Tamaño",
-            "Heap": "Montón",
-            "PsRam": "PSRAM",
-            "LittleFs": "LittleFs",
-            "Sketch": "Boceto"
-        },
-        "heapdetails": {
-            "HeapDetails": "Detalles del montón",
-            "TotalFree": "Total libre",
-            "LargestFreeBlock": "Bloque libre contiguo más grande",
-            "MaxUsage": "Uso máximo desde el inicio",
-            "Fragmentation": "Nivel de fragmentación"
-        },
-        "taskdetails": {
-            "TaskDetails": "Task Details",
-            "Name": "Name",
-            "StackFree": "Stack Free",
-            "Priority": "Priority",
-            "Task_idle0": "Idle (CPU Core 0)",
-            "Task_idle1": "Idle (CPU Core 1)",
-            "Task_wifi": "Wi-Fi",
-            "Task_tit": "TCP/IP",
-            "Task_looptask": "Arduino Main Loop",
-            "Task_asynctcp": "Async TCP",
-            "Task_mqttclient": "MQTT Client",
-            "Task_huaweican0": "AC Charger CAN",
-            "Task_pmsdm": "PowerMeter (SDM)",
-            "Task_pmhttpjson": "PowerMeter (HTTP+JSON)",
-            "Task_pmsml": "PowerMeter (Serial SML)",
-            "Task_pmhttpsml": "PowerMeter (HTTP+SML)"
-        },
-        "radioinfo": {
-            "RadioInformation": "Información de la radio",
-            "Status": "Estado de {module}",
-            "ChipStatus": "Estado del chip de {module}",
-            "ChipType": "Tipo de chip de {module}",
-            "Connected": "conectado",
-            "NotConnected": "no conectado",
-            "Configured": "configurado",
-            "NotConfigured": "no configurado",
-            "Unknown": "Desconocido"
-        },
-        "networkinfo": {
-            "NetworkInformation": "Información de la red"
-        },
-        "wifistationinfo": {
-            "WifiStationInfo": "Información de WiFi (Estación)",
-            "Status": "Estado",
-            "Enabled": "habilitado",
-            "Disabled": "deshabilitado",
-            "Ssid": "SSID",
-            "Bssid": "BSSID",
-            "Quality": "Calidad",
-            "Rssi": "RSSI"
-        },
-        "wifiapinfo": {
-            "WifiApInfo": "Información de WiFi (Punto de acceso)",
-            "Status": "@:wifistationinfo.Status",
-            "Enabled": "@:wifistationinfo.Enabled",
-            "Disabled": "@:wifistationinfo.Disabled",
-            "Ssid": "@:wifistationinfo.Ssid",
-            "Stations": "# Estaciones"
-        },
-        "interfacenetworkinfo": {
-            "NetworkInterface": "Interfaz de red ({iface})",
-            "Hostname": "@:firmwareinfo.Hostname",
-            "IpAddress": "Dirección IP",
-            "Netmask": "Máscara de red",
-            "DefaultGateway": "Puerta de enlace predeterminada",
-            "Dns": "DNS {num}",
-            "MacAddress": "Dirección MAC"
-        },
-        "interfaceapinfo": {
-            "NetworkInterface": "Interfaz de red (Punto de acceso)",
-            "IpAddress": "@:interfacenetworkinfo.IpAddress",
-            "MacAddress": "@:interfacenetworkinfo.MacAddress"
-        },
-        "ntpinfo": {
-            "NtpInformation": "Información de NTP",
-            "ConfigurationSummary": "Resumen de configuración",
-            "Server": "Servidor",
-            "Timezone": "Zona horaria",
-            "TimezoneDescription": "Descripción de la zona horaria",
-            "CurrentTime": "Hora actual",
-            "Status": "Estado",
-            "Synced": "sincronizado",
-            "NotSynced": "no sincronizado",
-            "LocalTime": "Hora local",
-            "Sunrise": "Amanecer",
-            "Sunset": "Atardecer",
-            "NotAvailable": "No disponible",
-            "Mode": "Modo",
-            "Day": "Día",
-            "Night": "Noche"
-        },
-        "mqttinfo": {
-            "MqttInformation": "Información de MQTT",
-            "ConfigurationSummary": "@:ntpinfo.ConfigurationSummary",
-            "Status": "@:ntpinfo.Status",
-            "Enabled": "Habilitado",
-            "Disabled": "Deshabilitado",
-            "Server": "@:ntpinfo.Server",
-            "Port": "Puerto",
-            "ClientId": "Client ID",
-            "Username": "Nombre de usuario",
-            "BaseTopic": "Tema base",
-            "PublishInterval": "Intervalo de publicación",
-            "Seconds": "{sec} segundos",
-            "CleanSession": "Bandera CleanSession",
-            "Retain": "Retener",
-            "Tls": "TLS",
-            "RootCertifcateInfo": "Información del certificado raíz de CA",
-            "TlsCertLogin": "Iniciar sesión con certificado TLS",
-            "ClientCertifcateInfo": "Información del Certificado del Cliente",
-            "HassSummary": "Resumen de la Configuración de Descubrimiento Automático MQTT de Home Assistant",
-            "Expire": "Expirar",
-            "IndividualPanels": "Paneles Individuales",
-            "RuntimeSummary": "Resumen de Tiempo de Ejecución",
-            "ConnectionStatus": "Estado de Conexión",
-            "Connected": "conectado",
-            "Disconnected": "desconectado"
-        },
-        "console": {
-            "Console": "Consola",
-            "VirtualDebugConsole": "Consola de Depuración Virtual",
-            "EnableAutoScroll": "Habilitar Desplazamiento Automático",
-            "ClearConsole": "Limpiar Consola",
-            "CopyToClipboard": "Copiar al Portapapeles"
-        },
-        "inverterchannelinfo": {
-            "String": "Cadena {num}",
-            "Phase": "Fase {num}",
-            "General": "General"
-        },
-        "invertertotalinfo": {
-            "TotalYieldTotal": "Total de Rendimiento Acumulado",
-            "TotalYieldDay": "Total de Rendimiento del Día",
-            "TotalPower": "Potencia Total"
-        },
-        "inverterchannelproperty": {
-            "Power": "Potencia",
-            "Voltage": "Voltaje",
-            "Current": "Corriente",
-            "Power DC": "Potencia DC",
-            "YieldDay": "Rendimiento del Día",
-            "YieldTotal": "Rendimiento Total",
-            "Frequency": "Frecuencia",
-            "Temperature": "Temperatura",
-            "PowerFactor": "Factor de Potencia",
-            "ReactivePower": "Potencia Reactiva",
-            "Efficiency": "Eficiencia",
-            "Irradiation": "Irradiación"
-        },
-        "maintenancereboot": {
-            "DeviceReboot": "Reinicio del Dispositivo",
-            "PerformReboot": "Realizar Reinicio",
-            "Reboot": "¡Reiniciar!",
-            "Cancel": "@:base.Cancel",
-            "RebootOpenDTU": "Reiniciar OpenDTU",
-            "RebootQuestion": "¿Realmente desea reiniciar el dispositivo?",
-            "RebootHint": "<b>Nota:</b> Normalmente no es necesario realizar un reinicio manual. OpenDTU realiza cualquier reinicio necesario (por ejemplo, después de una actualización de firmware) automáticamente. También se adoptan configuraciones sin reiniciar. Si necesita reiniciar debido a un error, considere informarlo en <a href=\"https://github.com/tbnobody/OpenDTU/issues\" class=\"alert-link\" target=\"_blank\">https://github.com/tbnobody/OpenDTU/issues</a>."
-        },
-        "dtuadmin": {
-            "DtuSettings": "Configuración de DTU",
-            "DtuConfiguration": "Configuración de DTU",
-            "Serial": "Serial",
-            "SerialHint": "Tanto el inversor como el DTU tienen un número de serie. El número de serie del DTU se genera aleatoriamente en el primer inicio y generalmente no es necesario cambiarlo.",
-            "PollInterval": "Intervalo de Sondeo",
-            "Seconds": "Segundos",
-            "NrfPaLevel": "Potencia de Transmisión NRF24",
-            "CmtPaLevel": "Potencia de Transmisión CMT2300A",
-            "NrfPaLevelHint": "Utilizado para inversores HM. Asegúrese de que su fuente de alimentación sea lo suficientemente estable antes de aumentar la potencia de transmisión.",
-            "CmtPaLevelHint": "Utilizado para inversores HMS/HMT. Asegúrese de que su fuente de alimentación sea lo suficientemente estable antes de aumentar la potencia de transmisión.",
-            "CmtCountry": "Región/País CMT2300A",
-            "CmtCountryHint": "Cada país tiene asignaciones de frecuencia diferentes.",
-            "country_0": "Europa ({min}MHz - {max}MHz)",
-            "country_1": "América del Norte ({min}MHz - {max}MHz)",
-            "country_2": "Brasil ({min}MHz - {max}MHz)",
-            "CmtFrequency": "Frecuencia CMT2300A",
-            "CmtFrequencyHint": "¡Asegúrese de utilizar solo frecuencias permitidas en el país respectivo! Después de un cambio de frecuencia, puede tardar hasta 15 minutos en establecer una conexión.",
-            "CmtFrequencyWarning": "La frecuencia seleccionada está fuera del rango permitido en su región/país seleccionado. Asegúrese de que esta selección no infrinja ninguna regulación local.",
-            "MHz": "{mhz} MHz",
-            "dBm": "{dbm} dBm",
-            "Min": "Mínimo ({db} dBm)",
-            "Low": "Bajo ({db} dBm)",
-            "High": "Alto ({db} dBm)",
-            "Max": "Máximo ({db} dBm)"
-        },
-        "securityadmin": {
-            "SecuritySettings": "Configuración de Seguridad",
-            "AdminPassword": "Contraseña de Administrador",
-            "Password": "Contraseña",
-            "RepeatPassword": "Repetir Contraseña",
-            "PasswordHint": "<b>Consejo:</b> La contraseña de administrador se utiliza para acceder a esta interfaz web (usuario 'admin'), pero también para conectarse al dispositivo cuando está en modo AP. Debe tener 8 a 64 caracteres.",
-            "Permissions": "Permisos",
-            "ReadOnly": "Permitir acceso de solo lectura a la interfaz web sin contraseña"
-        },
-        "ntpadmin": {
-            "NtpSettings": "Configuración de NTP",
-            "NtpConfiguration": "Configuración de NTP",
-            "TimeServer": "Servidor de Tiempo",
-            "TimeServerHint": "El valor predeterminado es adecuado siempre que OpenDTU tenga acceso directo a Internet.",
-            "Timezone": "Zona Horaria",
-            "TimezoneConfig": "Configuración de Zona Horaria",
-            "LocationConfiguration": "Configuración de Ubicación",
-            "Longitude": "Longitud",
-            "Latitude": "Latitud",
-            "SunSetType": "Tipo de Atardecer",
-            "SunSetTypeHint": "Afecta al cálculo día/noche. Puede tardar hasta un minuto en aplicarse el nuevo tipo.",
-            "OFFICIAL": "Amanecer estándar (90.8°)",
-            "NAUTICAL": "Amanecer náutico (102°)",
-            "CIVIL": "Amanecer civil (96°)",
-            "ASTONOMICAL": "Amanecer astronómico (108°)",
-            "ManualTimeSynchronization": "Sincronización Manual del Tiempo",
-            "CurrentOpenDtuTime": "Hora Actual de OpenDTU",
-            "CurrentLocalTime": "Hora Local Actual",
-            "SynchronizeTime": "Sincronizar Tiempo",
-            "SynchronizeTimeHint": "<b>Consejo:</b> Puede utilizar la sincronización manual del tiempo para establecer la hora actual de OpenDTU si no hay un servidor NTP disponible. Pero tenga en cuenta que en caso de un ciclo de energía, se perderá la hora. Además, tenga en cuenta que la precisión del tiempo se verá gravemente afectada, ya que no se puede resincronizar regularmente y el microcontrolador ESP32 no tiene un reloj en tiempo real."
-        },
-        "networkadmin": {
-            "NetworkSettings": "Configuración de Red",
-            "WifiConfiguration": "Configuración de WiFi",
-            "WifiSsid": "SSID de WiFi",
-            "WifiPassword": "Contraseña de WiFi",
-            "Hostname": "Nombre de Host",
-            "HostnameHint": "<b>Consejo:</b> El texto <span class=\"font-monospace\">%06X</span> se remplazará con los últimos 6 dígitos del ChipID de ESP en formato hexadecimal.",
-            "EnableDhcp": "Habilitar DHCP",
-            "StaticIpConfiguration": "Configuración de IP Estática",
-            "IpAddress": "Dirección IP",
-            "Netmask": "Máscara de Red",
-            "DefaultGateway": "Puerta de Enlace Predeterminada",
-            "Dns": "Servidor DNS {num}",
-            "AdminAp": "Configuración de WiFi (Punto de Acceso de Administrador)",
-            "ApTimeout": "Tiempo de espera del Punto de Acceso",
-            "ApTimeoutHint": "Tiempo que se mantiene abierto el Punto de Acceso. Un valor de 0 significa infinito.",
-            "Minutes": "minutos",
-            "EnableMdns": "Habilitar mDNS",
-            "MdnsSettings": "Configuración de mDNS"
-        },
-        "mqttadmin": {
-            "MqttSettings": "Configuración de MQTT",
-            "MqttConfiguration": "Configuración de MQTT",
-            "EnableMqtt": "Habilitar MQTT",
-            "EnableHass": "Habilitar Descubrimiento Automático MQTT de Home Assistant",
-            "MqttBrokerParameter": "Parámetros del Broker MQTT",
-            "Hostname": "Nombre de Host",
-            "HostnameHint": "Nombre de host o dirección IP",
-            "Port": "Puerto",
-            "ClientId": "Client ID",
-            "Username": "Nombre de Usuario",
-            "UsernameHint": "Nombre de usuario, dejar vacío para conexión anónima",
-            "Password": "Contraseña",
-            "PasswordHint": "Contraseña, dejar vacío para conexión anónima",
-            "BaseTopic": "Tema Base",
-            "BaseTopicHint": "Tema base, se antepondrá a todos los temas publicados (por ejemplo, inverter/)",
-            "PublishInterval": "Intervalo de Publicación",
-            "Seconds": "segundos",
-            "CleanSession": "Habilitar Bandera CleanSession",
-            "EnableRetain": "Habilitar Bandera Retain",
-            "EnableTls": "Habilitar TLS",
-            "RootCa": "Certificado Raíz CA (predeterminado Letsencrypt)",
-            "TlsCertLoginEnable": "Habilitar Inicio de Sesión con Certificado TLS",
-            "ClientCert": "Certificado del Cliente TLS",
-            "ClientKey": "Clave del Cliente TLS",
-            "LwtParameters": "Parámetros de LWT",
-            "LwtTopic": "Tema de LWT",
-            "LwtTopicHint": "Tema de LWT, se añadirá al tema base",
-            "LwtOnline": "Mensaje de LWT en línea",
-            "LwtOnlineHint": "Mensaje que se publicará en el tema de LWT cuando esté en línea",
-            "LwtOffline": "Mensaje de LWT fuera de línea",
-            "LwtOfflineHint": "Mensaje que se publicará en el tema de LWT cuando esté fuera de línea",
-            "LwtQos": "QoS (Calidad de Servicio)",
-            "QOS0": "0 (Como máximo una vez)",
-            "QOS1": "1 (Al menos una vez)",
-            "QOS2": "2 (Exactamente una vez)",
-            "HassParameters": "Parámetros de Descubrimiento Automático MQTT de Home Assistant",
-            "HassPrefixTopic": "Tema de Prefijo",
-            "HassPrefixTopicHint": "El prefijo para el tema de descubrimiento",
-            "HassRetain": "Habilitar Bandera Retain",
-            "HassExpire": "Habilitar Expiración",
-            "HassIndividual": "Paneles Individuales"
-        },
-        "inverteradmin": {
-            "InverterSettings": "Configuración del Inversor",
-            "AddInverter": "Agregar un nuevo Inversor",
-            "Serial": "Serial",
-            "Name": "Nombre",
-            "Add": "Agregar",
-            "AddHint": "<b>Consejo:</b> Puede configurar parámetros adicionales después de haber creado el inversor. Use el ícono de lápiz en la lista de inversores.",
-            "InverterList": "Lista de Inversores",
-            "Status": "Estado",
-            "Send": "Enviar",
-            "Receive": "Recibir",
-            "StatusHint": "<b>Consejo:</b> El inversor se alimenta con su entrada de CC. Si no hay sol, el inversor está apagado. Aún se pueden enviar solicitudes.",
-            "Type": "Tipo",
-            "Action": "Acción",
-            "SaveOrder": "Guardar orden",
-            "DeleteInverter": "Eliminar inversor",
-            "EditInverter": "Editar inversor",
-            "General": "General",
-            "String": "Cadena",
-            "Advanced": "Avanzado",
-            "InverterSerial": "Serial del Inversor:",
-            "InverterName": "Nombre del Inversor:",
-            "InverterNameHint": "Aquí puede especificar un nombre personalizado para su inversor.",
-            "InverterStatus": "Recibir / Enviar",
-            "PollEnable": "Sondear datos del inversor",
-            "PollEnableNight": "Sondear datos del inversor por la noche",
-            "CommandEnable": "Enviar comandos",
-            "CommandEnableNight": "Enviar comandos por la noche",
-            "StringName": "Nombre de cadena {num}:",
-            "StringNameHint": "Aquí puede especificar un nombre personalizado para el puerto respectivo de su inversor.",
-            "StringMaxPower": "Potencia máxima de cadena {num}:",
-            "StringMaxPowerHint": "Ingrese la potencia máxima de los paneles solares conectados.",
-            "StringYtOffset": "Compensación total de rendimiento de cadena {num}:",
-            "StringYtOffsetHint": "Esta compensación se aplica al valor total de rendimiento leído del inversor. Esto se puede usar para ajustar el rendimiento total del inversor a cero si se utiliza un inversor usado. Pero aún puede intentar sondear datos.",
-            "InverterHint": "*) Ingrese W<sub>p</sub> del canal para calcular la irradiación.",
-            "ReachableThreshold": "Umbral de Alcanzabilidad",
-            "ReachableThresholdHint": "Define cuántas solicitudes se permiten fallar hasta que el inversor se considere no alcanzable.",
-            "ZeroRuntime": "Datos de tiempo cero",
-            "ZeroRuntimeHint": "Datos de tiempo cero (sin datos de rendimiento) si el inversor se vuelve inalcanzable.",
-            "ZeroDay": "Rendimiento diario cero a medianoche",
-            "ZeroDayHint": "Esto solo funciona si el inversor es inalcanzable. Si se leen datos del inversor, se usarán sus valores. (El reinicio solo ocurre en el ciclo de energía)",
-            "ClearEventlog": "Clear Eventlog at midnight",
-            "Cancel": "@:base.Cancel",
-            "Save": "@:base.Save",
-            "DeleteMsg": "¿Está seguro de que desea eliminar el inversor \"{name}\" con número de serie {serial}?",
-            "Delete": "Eliminar",
-            "YieldDayCorrection": "Corrección de Rendimiento Diario",
-            "YieldDayCorrectionHint": "Sumar el rendimiento diario incluso si el inversor se reinicia. El valor se restablecerá a medianoche"
-        },
-        "fileadmin": {
-            "ConfigManagement": "Gestión de Configuración",
-            "BackupHeader": "Copia de seguridad: Copia de Seguridad del Archivo de Configuración",
-            "BackupConfig": "Copia de seguridad del archivo de configuración",
-            "Backup": "Copia de seguridad",
-            "Restore": "Restaurar",
-            "NoFileSelected": "Ningún archivo seleccionado",
-            "RestoreHeader": "Restaurar: Restaurar el Archivo de Configuración",
-            "Back": "Atrás",
-            "UploadSuccess": "Carga Exitosa",
-            "RestoreHint": "<b>Nota:</b> Esta operación reemplaza el archivo de configuración con la configuración restaurada y reinicia OpenDTU para aplicar todas las configuraciones.",
-            "ResetHeader": "Inicializar: Realizar Restablecimiento de Fábrica",
-            "FactoryResetButton": "Restaurar Configuraciones Predeterminadas de Fábrica",
-            "ResetHint": "<b>Nota:</b> Haga clic en Restaurar Configuraciones Predeterminadas de Fábrica para restaurar e inicializar las configuraciones predeterminadas de fábrica y reiniciar.",
-            "FactoryReset": "Restablecimiento de Fábrica",
-            "ResetMsg": "¿Está seguro de que desea eliminar la configuración actual y restablecer todas las configuraciones a sus valores predeterminados de fábrica?",
-            "ResetConfirm": "Restablecimiento de Fábrica",
-            "Cancel": "@:base.Cancel",
-            "InvalidJson": "JSON file is formatted incorrectly.",
-            "InvalidJsonContent": "JSON file has the wrong content."
-        },
-        "login": {
-            "Login": "Iniciar Sesión",
-            "SystemLogin": "Inicio de Sesión en el Sistema",
-            "Username": "Nombre de Usuario",
-            "UsernameRequired": "Se requiere el nombre de usuario",
-            "Password": "Contraseña",
-            "PasswordRequired": "Se requiere la contraseña",
-            "LoginButton": "Iniciar Sesión"
-        },
-        "firmwareupgrade": {
-            "FirmwareUpgrade": "Actualización de Firmware",
-            "Loading": "@:base.Loading",
-            "OtaError": "Error OTA",
-            "Back": "Atrás",
-            "Retry": "Reintentar",
-            "OtaStatus": "Estado OTA",
-            "OtaSuccess": "La carga de firmware fue exitosa. El dispositivo se reinició automáticamente. Cuando el dispositivo vuelva a ser accesible, la interfaz se recargará automáticamente.",
-            "FirmwareUpload": "Carga de Firmware",
-            "UploadProgress": "Progreso de Carga"
-        },
-        "about": {
-            "AboutOpendtu": "Acerca de OpenDTU",
-            "Documentation": "Documentation",
-            "DocumentationBody": "The firmware and hardware documentation can be found here: <a href=\"https://www.opendtu.solar\" target=\"_blank\">https://www.opendtu.solar</a>",
-            "ProjectOrigin": "Origen del Proyecto",
-            "ProjectOriginBody1": "Este proyecto se inició a partir de <a href=\"https://www.mikrocontroller.net/topic/525778\" target=\"_blank\">esta discusión. (Mikrocontroller.net)</a>",
-            "ProjectOriginBody2": "El protocolo de Hoymiles fue descifrado mediante los esfuerzos voluntarios de muchos participantes. OpenDTU, entre otros, se desarrolló basado en este trabajo. El proyecto está bajo una Licencia de Código Abierto (<a href=\"https://www.gnu.de/documents/gpl-2.0.de.html\" target=\"_blank\">Licencia Pública General de GNU versión 2</a>).",
-            "ProjectOriginBody3": "El software se desarrolló según nuestro mejor conocimiento y creencia. Sin embargo, no se acepta ninguna responsabilidad por un mal funcionamiento o pérdida de garantía del inversor.",
-            "ProjectOriginBody4": "OpenDTU está disponible de forma gratuita. Si pagaste dinero por el software, probablemente te estafaron.",
-            "NewsUpdates": "Noticias y Actualizaciones",
-            "NewsUpdatesBody": "Las nuevas actualizaciones se pueden encontrar en Github: <a href=\"https://github.com/tbnobody/OpenDTU\" target=\"_blank\">https://github.com/tbnobody/OpenDTU</a>",
-            "ErrorReporting": "Reporte de Errores",
-            "ErrorReportingBody": "Por favor, informa problemas utilizando la función proporcionada por <a href=\"https://github.com/tbnobody/OpenDTU/issues\" target=\"_blank\">Github</a>",
-            "Discussion": "Discusión",
-            "DiscussionBody": "Discute con nosotros en <a href=\"https://discord.gg/WzhxEY62mB\" target=\"_blank\">Discord</a> o <a href=\"https://github.com/tbnobody/OpenDTU/discussions\" target=\"_blank\">Github</a>"
-        },
-        "hints": {
-            "RadioProblem": "No se pudo conectar a un módulo de radio configurado. Por favor, verifica la conexión.",
-            "TimeSync": "El reloj aún no ha sido sincronizado. Sin un reloj correctamente ajustado, no se realizan solicitudes al inversor. Esto es normal poco después del inicio. Sin embargo, después de un tiempo de ejecución más largo (>1 minuto), indica que el servidor NTP no es accesible.",
-            "TimeSyncLink": "Por favor, verifica la configuración de tu hora.",
-            "DefaultPassword": "Estás utilizando la contraseña predeterminada para la interfaz web y el punto de acceso de emergencia. Esto potencialmente es inseguro.",
-            "DefaultPasswordLink": "Por favor, cambia la contraseña.",
-            "PinMappingIssue": "You are using a generic firmware image, but have not yet uploaded a file with device profiles (<code>pin_mapping.json</code>) or have not selected a profile defined there. Please refer to the <a href=\"https://opendtu.solar/firmware/device_profiles/\" target=\"_blank\" class=\"alert-link\">documentation</a> for details."
-        },
-        "deviceadmin": {
-            "DeviceManager": "Administrador de Dispositivos",
-            "ParseError": "Error de análisis en 'pin_mapping.json': {error}",
-            "PinAssignment": "Configuración de Conexión",
-            "SelectedProfile": "Perfil Seleccionado",
-            "DefaultProfile": "(Configuraciones predeterminadas)",
-            "ProfileHint": "Tu dispositivo puede dejar de responder si seleccionas un perfil incompatible. En este caso, debes realizar una eliminación a través de la interfaz serial.",
-            "Display": "Pantalla",
-            "PowerSafe": "Habilitar Ahorro de Energía",
-            "PowerSafeHint": "Apaga la pantalla si no hay un inversor produciendo.",
-            "Screensaver": "Habilitar Protector de Pantalla",
-            "ScreensaverHint": "Mueve la pantalla un poco en cada actualización para evitar el quemado. (Útil especialmente para pantallas OLED)",
-            "DiagramMode": "Modo de Diagrama",
-            "off": "Apagar",
-            "small": "Pequeño",
-            "fullscreen": "Pantalla Completa",
-            "DiagramDuration": "Duración del Diagrama",
-            "DiagramDurationHint": "El período de tiempo que se muestra en el diagrama.",
-            "Seconds": "Segundos",
-            "Contrast": "Contraste ({contrast})",
-            "Rotation": "Rotación",
-            "rot0": "Sin rotación",
-            "rot90": "Rotación de 90 grados",
-            "rot180": "Rotación de 180 grados",
-            "rot270": "Rotación de 270 grados",
-            "DisplayLanguage": "Idioma de la Pantalla",
-            "en": "Inglés",
-            "de": "Alemán",
-            "fr": "Francés",
-            "Leds": "LEDs",
-            "EqualBrightness": "Brillo Equitativo",
-            "LedBrightness": "Brillo del LED {led} ({brightness})"
-        },
-        "pininfo": {
-            "Category": "Categoría",
-            "Name": "Nombre",
-            "Number": "Número",
-            "ValueSelected": "Seleccionado",
-            "ValueActive": "Activo"
-        },
-        "inputserial": {
-            "format_hoymiles": "Hoymiles serial number format",
-            "format_converted": "Already converted serial number",
-            "format_herf_valid": "E-Star HERF format (will be saved converted): {serial}",
-            "format_herf_invalid": "E-Star HERF format: Invalid checksum",
-            "format_unknown": "Unknown format"
-        }
-    }
-}

lang/it.lang.json

@@ -1,696 +0,0 @@
-{
-    "meta": {
-        "name": "Italiano",
-        "code": "it"
-    },
-    "display": {
-        "date_format": "%d/%m/%Y %H:%M",
-        "offline": "Offline",
-        "power_w": "%.0f W",
-        "power_kw": "%.1f kW",
-        "yield_today_wh": "oggi: %4.0f Wh",
-        "yield_today_kwh": "oggi: %.1f kWh",
-        "yield_total_kwh": "totale: %.1f kWh",
-        "yield_total_mwh": "totale: %.0f kWh"
-    },
-    "webapp": {
-        "menu": {
-            "LiveView": "Dati in tempo reale",
-            "Settings": "Impostazioni",
-            "NetworkSettings": "Impostazioni di rete",
-            "NTPSettings": "Impostazioni NTP",
-            "MQTTSettings": "Impostazioni MQTT",
-            "InverterSettings": "Impostazioni Inverter",
-            "SecuritySettings": "Impostazioni di Sicurezza",
-            "DTUSettings": "Impostazioni DTU",
-            "DeviceManager": "Gestione Dispositivi",
-            "ConfigManagement": "Gestione Configurazione",
-            "FirmwareUpgrade": "Aggiornamento Firmware",
-            "DeviceReboot": "Riavvio DTU",
-            "Info": "Info",
-            "System": "Sistema",
-            "Network": "Rete",
-            "NTP": "NTP",
-            "MQTT": "MQTT",
-            "Console": "Console",
-            "About": "Informazioni DTU",
-            "Logout": "Esci",
-            "Login": "Login"
-        },
-        "base": {
-            "Loading": "Caricamento...",
-            "Reload": "Ricarica",
-            "Cancel": "Cancella",
-            "Save": "Salva",
-            "Refreshing": "Aggiorna",
-            "Pull": "Trascina in basso per aggiornare",
-            "Release": "Rilascia per aggiornare",
-            "Close": "Chiudi",
-            "Yes": "Yes",
-            "No": "No"
-        },
-        "wait": {
-            "NotReady": "OpenDTU is not yet ready",
-            "PleaseWait": "Please wait. You will be automatically redirected to the home page."
-        },
-        "Error": {
-            "Oops": "Oops!"
-        },
-        "localeswitcher": {
-            "Dark": "Scuro",
-            "Light": "Chiaro",
-            "Auto": "Automatico"
-        },
-        "apiresponse": {
-            "1001": "Settings saved!",
-            "1002": "No values found!",
-            "1003": "Data too large!",
-            "1004": "Failed to parse data!",
-            "1005": "Values are missing!",
-            "1006": "Write failed!",
-            "2001": "Serial cannot be zero!",
-            "2002": "Poll interval must be greater zero!",
-            "2003": "Invalid power level setting!",
-            "2004": "The frequency must be set between {min} and {max} kHz and must be a multiple of 250kHz!",
-            "2005": "Invalid country selection!",
-            "3001": "Not deleted anything!",
-            "3002": "Configuration resettet. Rebooting now...",
-            "4001": "@:apiresponse.2001",
-            "4002": "Name must between 1 and {max} characters long!",
-            "4003": "Only {max} inverters are supported!",
-            "4004": "Inverter created!",
-            "4005": "Invalid ID specified!",
-            "4006": "Invalid amount of max channel setting given!",
-            "4007": "Inverter changed!",
-            "4008": "Inverter deleted!",
-            "4009": "Inverter order saved!",
-            "5001": "@:apiresponse.2001",
-            "5002": "Limit must between 1 and {max}!",
-            "5003": "Invalid type specified!",
-            "5004": "Invalid inverter specified!",
-            "6001": "Reboot triggered!",
-            "6002": "Reboot cancled!",
-            "7001": "MQTT Server must between 1 and {max} characters long!",
-            "7002": "Username must not longer then {max} characters!",
-            "7003": "Password must not longer then {max} characters!",
-            "7004": "Topic must not longer then {max} characters!",
-            "7005": "Topic must not contain space characters!",
-            "7006": "Topic must end with slash (/)!",
-            "7007": "Port must be a number between 1 and 65535!",
-            "7008": "Certificate must not longer then {max} characters!",
-            "7009": "LWT topic must not longer then {max} characters!",
-            "7010": "LWT topic must not contain space characters!",
-            "7011": "LWT online value must not longer then {max} characters!",
-            "7012": "LWT offline value must not longer then {max} characters!",
-            "7013": "Publish interval must be a number between {min} and {max}!",
-            "7014": "Hass topic must not longer then {max} characters!",
-            "7015": "Hass topic must not contain space characters!",
-            "7016": "LWT QOS must not greater then {max}!",
-            "7017": "Client ID must not longer then {max} characters!",
-            "8001": "IP address is invalid!",
-            "8002": "Netmask is invalid!",
-            "8003": "Gateway is invalid!",
-            "8004": "DNS Server IP 1 is invalid!",
-            "8005": "DNS Server IP 2 is invalid!",
-            "8006": "Administrative AccessPoint Timeout value is invalid",
-            "9001": "NTP Server must between 1 and {max} characters long!",
-            "9002": "Timezone must between 1 and {max} characters long!",
-            "9003": "Timezone description must between 1 and {max} characters long!",
-            "9004": "Year must be a number between {min} and {max}!",
-            "9005": "Month must be a number between {min} and {max}!",
-            "9006": "Day must be a number between {min} and {max}!",
-            "9007": "Hour must be a number between {min} and {max}!",
-            "9008": "Minute must be a number between {min} and {max}!",
-            "9009": "Second must be a number between {min} and {max}!",
-            "9010": "Time updated!",
-            "10001": "Password must between 8 and {max} characters long!",
-            "10002": "Authentication successful!",
-            "11001": "@:apiresponse.2001",
-            "11002": "@:apiresponse:5004",
-            "12001": "Profil must between 1 and {max} characters long!"
-        },
-        "home": {
-            "LiveData": "Dati in tempo reale",
-            "SerialNumber": "Numero seriale: ",
-            "CurrentLimit": "Limite attuale: ",
-            "DataAge": "Aggiornamento Dati: ",
-            "Seconds": "{val} secondi",
-            "ShowSetInverterLimit": "Mostra / Imposta Limite di Potenza",
-            "TurnOnOff": "Accendi/Spegni Inverter",
-            "ShowInverterInfo": "Mostra info Inverter",
-            "ShowEventlog": "Mostra Log Eventi",
-            "UnreadMessages": "msg non letti",
-            "Loading": "@:base.Loading",
-            "EventLog": "Log Eventi",
-            "InverterInfo": "Info Inverter",
-            "LimitSettings": "Impostazioni Limite Potenza",
-            "LastLimitSetStatus": "Stato ultimo limite impostato:",
-            "SetLimit": "Imposta Limite a:",
-            "Relative": "Percentuale (%)",
-            "Absolute": "Assoluto (W)",
-            "LimitHint": "<b>Nota:</b> Se imposti il limite assoluto, il valore sul display sarà aggiornato dopo circa 4 minuti.",
-            "SetPersistent": "Imposta Limite in Modo Persistente",
-            "SetNonPersistent": "Imposta Limite Temporaneamente",
-            "PowerSettings": "Impostazioni Potenza",
-            "LastPowerSetStatus": "Ultimo Stato dell'Inverter:",
-            "TurnOn": "Accendi Inverter",
-            "TurnOff": "Spegni Inverter",
-            "Restart": "Riavvia Inverter",
-            "Failure": "Fallito",
-            "Pending": "In Attesa",
-            "Ok": "Ok",
-            "Unknown": "Sconosciuto",
-            "ShowGridProfile": "Mostra Settaggi Inverter",
-            "GridProfile": "Settaggi Inverter",
-            "LoadingInverter": "In attesa dei dati... (puo' richiedere fino a 10 secondi)",
-            "RadioStats": "Radio Statistics",
-            "TxRequest": "TX Request Count",
-            "RxSuccess": "RX Success",
-            "RxFailNothing": "RX Fail: Receive Nothing",
-            "RxFailPartial": "RX Fail: Receive Partial",
-            "RxFailCorrupt": "RX Fail: Receive Corrupt",
-            "TxReRequest": "TX Re-Request Fragment",
-            "StatsReset": "Reset Statistics",
-            "StatsResetting": "Resetting...",
-            "Rssi": "RSSI of last received packet",
-            "RssiHint": "HM inverters only support RSSI values < -64 dBm and > -64 dBm. In this case, -80 dbm and -30 dbm is shown.",
-            "dBm": "{dbm} dBm"
-        },
-        "eventlog": {
-            "Start": "Inizio",
-            "Stop": "Fine",
-            "Id": "ID",
-            "Message": "Messaggio"
-        },
-        "devinfo": {
-            "NoInfo": "Informazioni non disponibili",
-            "NoInfoLong": "Ancora nessuna informazione dall'inverter. Sto riprovando...",
-            "UnknownModel": "Modello sconosciuto! Per favore fornisci \"Hardware Part Number\" ed il modello (esempio HM-350) in una Issue su <a href=\"https://github.com/tbnobody/OpenDTU/issues\" target=\"_blank\">GitHub</a>.",
-            "Serial": "Seriale",
-            "ProdYear": "Produzione Annua",
-            "ProdWeek": "Produzione Settimanale",
-            "Model": "Modello",
-            "DetectedMaxPower": "Rilevata potenza massima",
-            "BootloaderVersion": "Versione Bootloader",
-            "FirmwareVersion": "Versione Firmware",
-            "FirmwareBuildDate": "Data Firmware",
-            "HardwarePartNumber": "Hardware Part Number",
-            "HardwareVersion": "Hardware Version",
-            "SupportsPowerDistributionLogic": "'Power Distribution Logic' supported",
-            "Yes": "@:base.Yes",
-            "No": "@:base.No"
-        },
-        "gridprofile": {
-            "NoInfo": "@:devinfo.NoInfo",
-            "NoInfoLong": "@:devinfo.NoInfoLong",
-            "Name": "Nome",
-            "Version": "Versione",
-            "Enabled": "@:wifistationinfo.Enabled",
-            "Disabled": "@:wifistationinfo.Disabled",
-            "GridprofileSupport": "Supporto sviluppatori",
-            "GridprofileSupportLong": "Clicca <a href=\"https://github.com/tbnobody/OpenDTU/wiki/Grid-Profile-Parser\" target=\"_blank\">qui</a> per ulteriori informazioni."
-        },
-        "systeminfo": {
-            "SystemInfo": "Info Sistema",
-            "VersionError": "Errore ricezione della versione",
-            "VersionNew": "Nuova versione disponibile! Mostra aggiornamenti!",
-            "VersionOk": "Già aggiornato!"
-        },
-        "firmwareinfo": {
-            "FirmwareInformation": "Info Firmware",
-            "Hostname": "Hostname",
-            "SdkVersion": "SDK Version",
-            "ConfigVersion": "Config Version",
-            "FirmwareVersion": "Firmware Version / Git Hash",
-            "PioEnv": "PIO Environment",
-            "FirmwareVersionHint": "Click here to show information about your current version",
-            "FirmwareUpdate": "Firmware Update",
-            "FirmwareUpdateHint": "Click here to view the changes between your version and the latest version",
-            "FrmwareUpdateAllow": "By activating the update check, a request is sent to GitHub.com each time the page is called up to retrieve the currently available version. If you do not agree with this, leave this function deactivated.",
-            "ResetReason0": "Reset Reason CPU 0",
-            "ResetReason1": "Reset Reason CPU 1",
-            "ConfigSaveCount": "Config save count",
-            "Uptime": "Uptime",
-            "UptimeValue": "0 days {time} | 1 day {time} | {count} days {time}"
-        },
-        "hardwareinfo": {
-            "HardwareInformation": "Info Hardware",
-            "ChipModel": "Chip Model",
-            "ChipRevision": "Chip Revision",
-            "ChipCores": "Chip Cores",
-            "CpuFrequency": "CPU Frequency",
-            "Mhz": "MHz",
-            "CpuTemperature": "CPU Temperature",
-            "FlashSize": "Flash Memory Size"
-        },
-        "memoryinfo": {
-            "MemoryInformation": "Info Memoria",
-            "Type": "Tipo",
-            "Usage": "Uso",
-            "Free": "Libera",
-            "Used": "Usata",
-            "Size": "Dimensione",
-            "Heap": "Heap",
-            "PsRam": "PSRAM",
-            "LittleFs": "LittleFs",
-            "Sketch": "Sketch"
-        },
-        "heapdetails": {
-            "HeapDetails": "Dettagli memoria Heap",
-            "TotalFree": "Libera totale",
-            "LargestFreeBlock": "Blocco contiguo libero più grande",
-            "MaxUsage": "Massima utilizzata dall'avvio",
-            "Fragmentation": "Livello frammentazione"
-        },
-        "taskdetails": {
-            "TaskDetails": "Task Details",
-            "Name": "Name",
-            "StackFree": "Stack Free",
-            "Priority": "Priority",
-            "Task_idle0": "Idle (CPU Core 0)",
-            "Task_idle1": "Idle (CPU Core 1)",
-            "Task_wifi": "Wi-Fi",
-            "Task_tit": "TCP/IP",
-            "Task_looptask": "Arduino Main Loop",
-            "Task_asynctcp": "Async TCP",
-            "Task_mqttclient": "MQTT Client",
-            "Task_huaweican0": "AC Charger CAN",
-            "Task_pmsdm": "PowerMeter (SDM)",
-            "Task_pmhttpjson": "PowerMeter (HTTP+JSON)",
-            "Task_pmsml": "PowerMeter (Serial SML)",
-            "Task_pmhttpsml": "PowerMeter (HTTP+SML)"
-        },
-        "radioinfo": {
-            "RadioInformation": "Info Transceiver Radio",
-            "Status": "{module} Stato",
-            "ChipStatus": "{module} Chip Stato",
-            "ChipType": "{module} Chip Tipo",
-            "Connected": "connesso",
-            "NotConnected": "non connesso",
-            "Configured": "configurato",
-            "NotConfigured": "no configurato",
-            "Unknown": "Sconosciuto"
-        },
-        "networkinfo": {
-            "NetworkInformation": "Informazioni Rete"
-        },
-        "wifistationinfo": {
-            "WifiStationInfo": "Info WiFi (Station)",
-            "Status": "Stato",
-            "Enabled": "abilitato",
-            "Disabled": "disabilitato",
-            "Ssid": "SSID",
-            "Bssid": "BSSID",
-            "Quality": "Qualità",
-            "Rssi": "RSSI"
-        },
-        "wifiapinfo": {
-            "WifiApInfo": "Info WiFi (Access Point)",
-            "Status": "@:wifistationinfo.Status",
-            "Enabled": "@:wifistationinfo.Enabled",
-            "Disabled": "@:wifistationinfo.Disabled",
-            "Ssid": "@:wifistationinfo.Ssid",
-            "Stations": "Numero Stazioni"
-        },
-        "interfacenetworkinfo": {
-            "NetworkInterface": "Interfaccia di Rete ({iface})",
-            "Hostname": "@:firmwareinfo.Hostname",
-            "IpAddress": "Indirizzo IP",
-            "Netmask": "Netmask",
-            "DefaultGateway": "Gateway",
-            "Dns": "DNS {num}",
-            "MacAddress": "Indirizzo MAC"
-        },
-        "interfaceapinfo": {
-            "NetworkInterface": "Interfaccia di Rete (Access Point)",
-            "IpAddress": "@:interfacenetworkinfo.IpAddress",
-            "MacAddress": "@:interfacenetworkinfo.MacAddress"
-        },
-        "ntpinfo": {
-            "NtpInformation": "Informazioni NTP",
-            "ConfigurationSummary": "Riepilogo Configurazione",
-            "Server": "Server",
-            "Timezone": "Timezone",
-            "TimezoneDescription": "Descrizione Timezone",
-            "CurrentTime": "Data/Ora attuale",
-            "Status": "Stato",
-            "Synced": "sincronizzata",
-            "NotSynced": "non sincronizzata",
-            "LocalTime": "Ora Locale",
-            "Sunrise": "Alba",
-            "Sunset": "Tramonto",
-            "NotAvailable": "Non Disponibile",
-            "Mode": "Modalità",
-            "Day": "Giorno",
-            "Night": "Notte"
-        },
-        "mqttinfo": {
-            "MqttInformation": "Informazioni MQTT",
-            "ConfigurationSummary": "@:ntpinfo.ConfigurationSummary",
-            "Status": "@:ntpinfo.Status",
-            "Enabled": "Abilitato",
-            "Disabled": "Disabilitato",
-            "Server": "@:ntpinfo.Server",
-            "Port": "Porta",
-            "ClientId": "Client ID",
-            "Username": "Username",
-            "BaseTopic": "Topic Base",
-            "PublishInterval": "Intervallo Publish",
-            "Seconds": "{sec} secondi",
-            "CleanSession": "CleanSession",
-            "Retain": "Retain",
-            "Tls": "TLS",
-            "RootCertifcateInfo": "Info Certificato Root CA",
-            "TlsCertLogin": "Entra con Certificato TLS",
-            "ClientCertifcateInfo": "Info Certificato Client",
-            "HassSummary": "Riepilogo Configurazione Home Assistant MQTT Auto Discovery",
-            "Expire": "Scade",
-            "IndividualPanels": "Pannello Individuale",
-            "RuntimeSummary": "Riepilogo Runtime",
-            "ConnectionStatus": "Stato Connessione",
-            "Connected": "connesso",
-            "Disconnected": "disconnesso"
-        },
-        "console": {
-            "Console": "Console",
-            "VirtualDebugConsole": "Virtual Debug Console",
-            "EnableAutoScroll": "Abilita AutoScroll",
-            "ClearConsole": "Pulisci Console",
-            "CopyToClipboard": "Copia nella clipboard"
-        },
-        "inverterchannelinfo": {
-            "String": "Stringa {num}",
-            "Phase": "Fase {num}",
-            "General": "Generale"
-        },
-        "invertertotalinfo": {
-            "TotalYieldTotal": "Totale Energia",
-            "TotalYieldDay": "Energia Giornaliera",
-            "TotalPower": "Potenza Totale"
-        },
-        "inverterchannelproperty": {
-            "Power": "Potenza",
-            "Voltage": "Tensione",
-            "Current": "Corrente",
-            "Power DC": "PotenzaDC",
-            "YieldDay": "EnergiaOggi",
-            "YieldTotal": "EnergiaTotale",
-            "Frequency": "Frequenza",
-            "Temperature": "Temperatura",
-            "PowerFactor": "FattorePotenza",
-            "ReactivePower": "PotenzaReattiva",
-            "Efficiency": "Efficienza",
-            "Irradiation": "Irragiamento"
-        },
-        "maintenancereboot": {
-            "DeviceReboot": "Riavvio DTU",
-            "PerformReboot": "Fai il riavvio",
-            "Reboot": "Riavvio!",
-            "Cancel": "@:base.Cancel",
-            "RebootOpenDTU": "Riavvio OpenDTU",
-            "RebootQuestion": "Vuoi veramente riavvia il DTU?",
-            "RebootHint": "<b>Nota:</b> Normalmente non serve riavviare OpenDTU, in quanto esegue automaticamente il ravvio quando necessario (ad esempio dopo aggiornamento firmware). Modifiche alla configurazione vengono apprese subito, senza richiedere riavvio. Se devi riavviare a causa di un errore, ti preghiamo di segnalarcelo cliccando su <a href=\"https://github.com/tbnobody/OpenDTU/issues\" class=\"alert-link\" target=\"_blank\">https://github.com/tbnobody/OpenDTU/issues</a>."
-        },
-        "dtuadmin": {
-            "DtuSettings": "Impostazioni DTU",
-            "DtuConfiguration": "Configurazione DTU",
-            "Serial": "Seriale",
-            "SerialHint": "Sia il DTU che l'inverter hanno un numero seriale. Il numero seriale del DTU è generato casualmente al primo avvio e normalmente non serve modificarlo.",
-            "PollInterval": "Intervallo Interrogazione",
-            "Seconds": "Secondi",
-            "NrfPaLevel": "Potenza Trasmettitore NRF24",
-            "CmtPaLevel": "Potenza Trasmettitore CMT2300A",
-            "NrfPaLevelHint": "Usato per inverter HM. Considera che aumentando la potenza aumentano il consumo di corrente.",
-            "CmtPaLevelHint": "Usato per inverter HMS/HMT. Considera che aumentando la potenza aumentano il consumo di corrente.",
-            "CmtCountry": "CMT2300A Zona/Paese",
-            "CmtCountryHint": "Ogni zona ha una differente allocazione di frequenze utilizzabili.",
-            "country_0": "Europa ({min}MHz - {max}MHz)",
-            "country_1": "Nord America ({min}MHz - {max}MHz)",
-            "country_2": "Brasile ({min}MHz - {max}MHz)",
-            "CmtFrequency": "Frequenza CMT2300A",
-            "CmtFrequencyHint": "Fai attenzione ad usare solo frequenze ammesse nel tuo Paese! Dopo la modifica frequenza, servono fino a 15 minuti affinché la connessione si ristabilisca.",
-            "CmtFrequencyWarning": "La frequenza selezionata è fuori dal range selezionato dal tuo Paese. Verifica che la frequenza selezionata non violi le normative del tuo Paese.",
-            "MHz": "{mhz} MHz",
-            "dBm": "{dbm} dBm",
-            "Min": "Minima ({db} dBm)",
-            "Low": "Bassa ({db} dBm)",
-            "High": "Alta ({db} dBm)",
-            "Max": "Massima ({db} dBm)"
-        },
-        "securityadmin": {
-            "SecuritySettings": "Impostazioni di Sicurezza",
-            "AdminPassword": "Password Admin",
-            "Password": "Password",
-            "RepeatPassword": "Ripeti Password",
-            "PasswordHint": "<b>Nota:</b> La password di amministrazione viene utilizzata non solo per accedere a questa interfaccia web (con user 'admin'), ma anche per connettersi al dispositivo in modalità AP. Deve avere da 8 a 64 caratteri.",
-            "Permissions": "Permessi",
-            "ReadOnly": "Permetti accessi web in sola lettura senza richiedere la password"
-        },
-        "ntpadmin": {
-            "NtpSettings": "Impostazioni NTP (Data / Ora)",
-            "NtpConfiguration": "Configurazione NTP",
-            "TimeServer": "Server NTP",
-            "TimeServerHint": "Puoi lasciare il valore di default, nel caso in cui OpenDTU abbia accesso ad internet.",
-            "Timezone": "Timezone",
-            "TimezoneConfig": "Timezone Config",
-            "LocationConfiguration": "Configurazione Posizione",
-            "Longitude": "Longitudine",
-            "Latitude": "Latitudine",
-            "SunSetType": "Tipo di Alba",
-            "SunSetTypeHint": "Influenza il calcolo dell'ora di Alba/Tramonto. Dopo la conferma, è richiesto fino ad un minuto perché la modifica venga applicata.",
-            "OFFICIAL": "Standard dawn (90.8°)",
-            "NAUTICAL": "Nautical dawn (102°)",
-            "CIVIL": "Civil dawn (96°)",
-            "ASTONOMICAL": "Astronomical dawn (108°)",
-            "ManualTimeSynchronization": "Sincronizzazione Manuale Data/Ora",
-            "CurrentOpenDtuTime": "Ora OpenDTU attuale",
-            "CurrentLocalTime": "Ora Locale attuale",
-            "SynchronizeTime": "Sincronizza Data/Ora",
-            "SynchronizeTimeHint": "<b>Nota:</b> Puoi usare la sincronizzazione manuale per impostare Data/Ora nel caso che non sia disponibile un server NTP. In questo caso la data/ora viene persa in caso di mancata alimentazione. Inoltre, con la sincronizzazione manuale ci sarà una progressiva deriva della Data/Ora in quanto l'ESP32 non ha un Real Time Clock interno."
-        },
-        "networkadmin": {
-            "NetworkSettings": "Impostazioni di Rete",
-            "WifiConfiguration": "Configurazione WiFi",
-            "WifiSsid": "WiFi SSID",
-            "WifiPassword": "WiFi Password",
-            "Hostname": "Hostname",
-            "HostnameHint": "<b>Nota:</b> Il testo <span class=\"font-monospace\">%06X</span> sarà rimpiazzato con le ultime 6 cifre del ChipID dell'ESP32 in formato esadecimale.",
-            "EnableDhcp": "Abilita DHCP",
-            "StaticIpConfiguration": "Configurazione IP Statico",
-            "IpAddress": "Indirizzo IP",
-            "Netmask": "Netmask",
-            "DefaultGateway": "Default Gateway",
-            "Dns": "DNS Server {num}",
-            "AdminAp": "Configurazione WiFi (Admin AccessPoint)",
-            "ApTimeout": "Timeout AccessPoint",
-            "ApTimeoutHint": "Tempo in cui la modalità AccessPoint rimarrà attiva. 0=per sempre.",
-            "Minutes": "minuti",
-            "EnableMdns": "Abilita mDNS",
-            "MdnsSettings": "Configurazione mDNS"
-        },
-        "mqttadmin": {
-            "MqttSettings": "Impostazioni MQTT",
-            "MqttConfiguration": "Configurazione MQTT",
-            "EnableMqtt": "Abilita MQTT",
-            "EnableHass": "Abilita Home Assistant MQTT Auto Discovery",
-            "MqttBrokerParameter": "Parametri Broker MQTT",
-            "Hostname": "Hostname",
-            "HostnameHint": "Hostname o Indirizzo IP",
-            "Port": "Porta",
-            "ClientId": "Client ID",
-            "Username": "Username",
-            "UsernameHint": "Username, lascia vuoto per connessione anonima",
-            "Password": "Password",
-            "PasswordHint": "Password, lascia vuota per connessione anonima",
-            "BaseTopic": "Topic Base",
-            "BaseTopicHint": "Topic Base, prefisso da aggiungere (ad esempio inverter/)",
-            "PublishInterval": "Intervallo pubblicazione",
-            "Seconds": "secondi",
-            "CleanSession": "Abilita CleanSession",
-            "EnableRetain": "Abilita Retain",
-            "EnableTls": "Abilita TLS",
-            "RootCa": "CA-Root-Certificate (default Letsencrypt)",
-            "TlsCertLoginEnable": "Abilita Login con certificato TLS",
-            "ClientCert": "TLS Client-Certificate",
-            "ClientKey": "TLS Client-Key",
-            "LwtParameters": "Parametri LWT",
-            "LwtTopic": "Topic LWT",
-            "LwtTopicHint": "Topic LWT, da aggiungere al Topic Base",
-            "LwtOnline": "Messaggio 'Online0 LWT",
-            "LwtOnlineHint": "Messaggio pubblicato quando online",
-            "LwtOffline": "Messaggio 'Offline' LWT",
-            "LwtOfflineHint": "Messaggio che sarà pubblicato quando offline",
-            "LwtQos": "QoS (Quality of Service)",
-            "QOS0": "0 (Al massimo una volta)",
-            "QOS1": "1 (Almeno una volta)",
-            "QOS2": "2 (Esattamente una volta)",
-            "HassParameters": "Parametri Home Assistant MQTT Auto Discovery",
-            "HassPrefixTopic": "Prefisso Topic",
-            "HassPrefixTopicHint": "Prefisso per Topic autodiscovery",
-            "HassRetain": "Abilita Retain",
-            "HassExpire": "Abilita Scadenza",
-            "HassIndividual": "Pannelli Individuale"
-        },
-        "inverteradmin": {
-            "InverterSettings": "Impostazioni Inverter",
-            "AddInverter": "Aggiungi nuovo Inverter",
-            "Serial": "Seriale",
-            "Name": "Nome",
-            "Add": "Aggiungi",
-            "AddHint": "<b>Nota:</b> Potrai aggiungere ulteriori parametri dopo aver creato l'inverter, cliccando sull'icona 'Matita' nella lista inverter.",
-            "InverterList": "Lista Inverter",
-            "Status": "Stato",
-            "Send": "Invia",
-            "Receive": "Riceve",
-            "StatusHint": "<b>Nota:</b> L'inverter viene alimentato dal fotovoltaico. Durante la notte, l'inverter risulterà spento. Le richieste potranno comunque essere trasmesse.",
-            "Type": "Tipo",
-            "Action": "Azione",
-            "SaveOrder": "Salva ordine",
-            "DeleteInverter": "Rimuovi inverter",
-            "EditInverter": "Modifica inverter",
-            "General": "Generale",
-            "String": "Stringa",
-            "Advanced": "Avanzate",
-            "InverterSerial": "Seriale Inverter:",
-            "InverterName": "Nome Inverter:",
-            "InverterNameHint": "Puoi specificare un nome qualsiasi da assegnare all'inverter.",
-            "InverterStatus": "Riceve / Invia",
-            "PollEnable": "Interroga inverter",
-            "PollEnableNight": "Interroga inverter di notte",
-            "CommandEnable": "Invia comandi",
-            "CommandEnableNight": "Invia comandi di notte",
-            "StringName": "Nome stringa {num}:",
-            "StringNameHint": "Qui puoi specificare un nome qualsiasi per la porta dell'inverter o per il pannello fotovoltaico collegato.",
-            "StringMaxPower": "Massima potenza stringa {num}:",
-            "StringMaxPowerHint": "Inserisci la potenza massima associata ai panelli fotovoltaici collegati a questa stringa.",
-            "StringYtOffset": "Offset Energia totale per la stringa {num}:",
-            "StringYtOffsetHint": "Questo offset viene utilizzato per azzerare il contatore qualora venga usato un inverter usato.",
-            "InverterHint": "*) Inserisci la potenza W<sub>p</sub> dei pannelli fotovoltaici collegati alla stringa: servirà per calcolare l'irragiamento.",
-            "ReachableThreshold": "Reachable Threshold",
-            "ReachableThresholdHint": "Definisce il numero di richieste fallite prima che l'inverter sia considerato irraggiungibile.",
-            "ZeroRuntime": "Azzera dati in tempo reale",
-            "ZeroRuntimeHint": "Azzera i dati in tempo reale (tranne l'Energia) se l'inverter diventa irraggiunbile.",
-            "ZeroDay": "Azzera dati energia alla mezzanotte",
-            "ZeroDayHint": "Questo vale se l'inverter risulta irraggiungibile. Se l'inverter risponde anche di notte, verranno mostrati i suoi valori. (Il Reset si verifica al riavvio)",
-            "ClearEventlog": "Clear Eventlog at midnight",
-            "Cancel": "@:base.Cancel",
-            "Save": "@:base.Save",
-            "DeleteMsg": "Sicuro di voler rimuovere l'inverter \"{name}\" con numero seriale {serial}?",
-            "Delete": "Rimuovi",
-            "YieldDayCorrection": "Correzione energia giornaliera",
-            "YieldDayCorrectionHint": "Aggiungi questo valore all'energia giornaliera se l'inverter è stato riavviato. Questo valore sarò resettato a mezzanotte"
-        },
-        "fileadmin": {
-            "ConfigManagement": "Configurazione Gestione",
-            "BackupHeader": "Backup: Configurazione File Backup",
-            "BackupConfig": "Esegui il backup del file",
-            "Backup": "Backup",
-            "Restore": "Ripristina",
-            "NoFileSelected": "Nessun file selezionato",
-            "RestoreHeader": "Ripristina: Ripristina File Configurazione",
-            "Back": "Indietro",
-            "UploadSuccess": "Invio File con successo",
-            "RestoreHint": "<b>Nota:</b> questa operazione rimpiazza la configurazione con quella contenuta nel file, e poi riavvia automaticamente OpenDTU per applicare la nuova configurazione.",
-            "ResetHeader": "Inizializza: Esegui il Factory Reset",
-            "FactoryResetButton": "Ripristina Configurazione Factory-Default",
-            "ResetHint": "<b>Nota:</b> Clicca 'Ripristina Configurazione Factory-Default' per stabilire le impostazioni di fabbrica e riavviare automaticamente OpenDTU.",
-            "FactoryReset": "Factory Reset",
-            "ResetMsg": "Sei sicuro di voler cancellare la configurazione attuale e applicare la configurazione di fabbrica?",
-            "ResetConfirm": "Factory Reset!",
-            "Cancel": "@:base.Cancel",
-            "InvalidJson": "JSON file is formatted incorrectly.",
-            "InvalidJsonContent": "JSON file has the wrong content."
-        },
-        "login": {
-            "Login": "Login",
-            "SystemLogin": "System Login",
-            "Username": "Username",
-            "UsernameRequired": "Inserisci Username",
-            "Password": "Password",
-            "PasswordRequired": "Inserisci Password",
-            "LoginButton": "Login"
-        },
-        "firmwareupgrade": {
-            "FirmwareUpgrade": "Aggiornamento Firmware",
-            "Loading": "@:base.Loading",
-            "OtaError": "Errore aggiornamento OTA",
-            "Back": "Indietro",
-            "Retry": "Riprova",
-            "OtaStatus": "Stato OTA",
-            "OtaSuccess": "Aggiornamento firmware eseguito con successo. Il dispositivo si riavvierà automaticamente. Quando sarà nuovamente disponibile, l'interfacca sarà ricaricata automaticamente.",
-            "FirmwareUpload": "Invia Firmware",
-            "UploadProgress": "Upload in corso"
-        },
-        "about": {
-            "AboutOpendtu": "About OpenDTU",
-            "Documentation": "Documentazione",
-            "DocumentationBody": "La documentazione firmware e hardware sono disponibili qui: <a href=\"https://www.opendtu.solar\" target=\"_blank\">https://www.opendtu.solar</a>",
-            "ProjectOrigin": "Origine Progetto",
-            "ProjectOriginBody1": "Questo progetto è partito da <a href=\"https://www.mikrocontroller.net/topic/525778\" target=\"_blank\">questa discussione. (Mikrocontroller.net)</a>",
-            "ProjectOriginBody2": "Il protocollo Hoymiles è stato decriptato grazie al contributo volontario di molti programmatori. OpenDTU, fra gli altri, è stato sviluppato grazie a questo lavoro. Il progetto è distribuito con Licenza Open Source (<a href=\"https://www.gnu.de/documents/gpl-2.0.de.html\" target=\"_blank\">GNU General Public License version 2</a>).",
-            "ProjectOriginBody3": "Il software è stato sviluppato con le nostre migliori conoscenze e convinzioni. Tuttavia, non si assume alcuna responsabilità per malfunzionamenti o perdita di garanzia dell'inverter.",
-            "ProjectOriginBody4": "OpenDTU è disponibile gratuitamente. Se hai pagato per questo software, probabilmente sei stato truffato.",
-            "NewsUpdates": "Novità e Aggiornamenti",
-            "NewsUpdatesBody": "Nuovi aggiornamenti sono disponibili su Github: <a href=\"https://github.com/tbnobody/OpenDTU\" target=\"_blank\">https://github.com/tbnobody/OpenDTU</a>",
-            "ErrorReporting": "Segnalazione Errori",
-            "ErrorReportingBody": "Per favore segnala eventuali problemi utilizzando le funzionalità della piattaforma <a href=\"https://github.com/tbnobody/OpenDTU/issues\" target=\"_blank\">Github</a>",
-            "Discussion": "Discussioni",
-            "DiscussionBody": "Puoi avviare una discussione con noi su <a href=\"https://discord.gg/WzhxEY62mB\" target=\"_blank\">Discord</a> o <a href=\"https://github.com/tbnobody/OpenDTU/discussions\" target=\"_blank\">Github</a>"
-        },
-        "hints": {
-            "RadioProblem": "Non è possibile dialogare con il modulo radio selezionato. Controlla i collegamenti alla radio.",
-            "TimeSync": "La Data/Ora non sono state sincronizzate, ed in tal caso non è possibile eseguire richieste all'inverter. Questa condizione è normale appena avviato, tuttavia dopo un po' (>1 minuto), questa situazione potrebbe indicare un problema di accesso al server NTP.",
-            "TimeSyncLink": "Controlla le impostazioni Data/Ora.",
-            "DefaultPassword": "Stai usando la password di default per accedere all'interfaccia web e per la modalità Access Point di emergenza. Questo può portare ad un rischio di sicurezza.",
-            "DefaultPasswordLink": "Per favore cambia la password.",
-            "PinMappingIssue": "You are using a generic firmware image, but have not yet uploaded a file with device profiles (<code>pin_mapping.json</code>) or have not selected a profile defined there. Please refer to the <a href=\"https://opendtu.solar/firmware/device_profiles/\" target=\"_blank\" class=\"alert-link\">documentation</a> for details."
-        },
-        "deviceadmin": {
-            "DeviceManager": "Device-Manager",
-            "ParseError": "Parse error in 'pin_mapping.json': {error}",
-            "PinAssignment": "Impostazioni Connessione",
-            "SelectedProfile": "Profilo selezionato",
-            "DefaultProfile": "(Impostazioni di Default)",
-            "ProfileHint": "Il tuo dispositivo potrebbe smettere di rispondere selezionando un profilo incompatibile. In questo caso, dovrai eseguire una cancellazione collegandoti all'interfaccia seriale.",
-            "Display": "Display",
-            "PowerSafe": "Abilita Risparmio Energetico",
-            "PowerSafeHint": "Spegni il display se l'inverter non produce.",
-            "Screensaver": "Abilita Screensaver",
-            "ScreensaverHint": "Muove il testo nel display per prevenire danneggiamento pixel. (Utile in caso di display OLED)",
-            "DiagramMode": "Modalità grafica",
-            "off": "Off",
-            "small": "Small",
-            "fullscreen": "Fullscreen",
-            "DiagramDuration": "Durata grafico",
-            "DiagramDurationHint": "Periodo che viene mostrato nel grafico.",
-            "Seconds": "Secondi",
-            "Contrast": "Contrasto ({contrast})",
-            "Rotation": "Rotazione",
-            "rot0": "Nessuna rotazione",
-            "rot90": "Rotazione 90 gradi",
-            "rot180": "Rotazione 180 gradi",
-            "rot270": "Rotazione 270 gradi",
-            "DisplayLanguage": "Linuga Display",
-            "en": "English",
-            "de": "German",
-            "fr": "French",
-            "Leds": "LEDs",
-            "EqualBrightness": "Equalizza luminosità",
-            "LedBrightness": "LED {led}, Luminosità ({brightness})"
-        },
-        "pininfo": {
-            "Category": "Categoria",
-            "Name": "Nome",
-            "Number": "Numero",
-            "ValueSelected": "Selezionato",
-            "ValueActive": "Attivo"
-        },
-        "inputserial": {
-            "format_hoymiles": "Hoymiles serial number format",
-            "format_converted": "Already converted serial number",
-            "format_herf_valid": "E-Star HERF format (will be saved converted): {serial}",
-            "format_herf_invalid": "E-Star HERF format: Invalid checksum",
-            "format_unknown": "Unknown format"
-        }
-    }
-}

lib/CMT2300a/cmt_spi3.c

@@ -0,0 +1,142 @@
+#include "cmt_spi3.h"
+#include <Arduino.h>
+#include <driver/spi_master.h>
+#include <esp_rom_gpio.h> // for esp_rom_gpio_connect_out_signal
+
+SemaphoreHandle_t paramLock = NULL;
+#define SPI_PARAM_LOCK() \
+    do {                 \
+    } while (xSemaphoreTake(paramLock, portMAX_DELAY) != pdPASS)
+#define SPI_PARAM_UNLOCK() xSemaphoreGive(paramLock)
+
+// for ESP32 this is the so-called HSPI
+// for ESP32-S2/S3/C3 this nomenclature does not really exist anymore,
+// it is simply the first externally usable hardware SPI master controller
+#define SPI_CMT SPI2_HOST
+
+spi_device_handle_t spi_reg, spi_fifo;
+
+void cmt_spi3_init(const int8_t pin_sdio, const int8_t pin_clk, const int8_t pin_cs, const int8_t pin_fcs, const uint32_t spi_speed)
+{
+    paramLock = xSemaphoreCreateMutex();
+
+    spi_bus_config_t buscfg = {
+        .mosi_io_num = pin_sdio,
+        .miso_io_num = -1, // single wire MOSI/MISO
+        .sclk_io_num = pin_clk,
+        .quadwp_io_num = -1,
+        .quadhd_io_num = -1,
+        .max_transfer_sz = 32,
+    };
+    spi_device_interface_config_t devcfg = {
+        .command_bits = 1,
+        .address_bits = 7,
+        .dummy_bits = 0,
+        .mode = 0, // SPI mode 0
+        .cs_ena_pretrans = 1,
+        .cs_ena_posttrans = 1,
+        .clock_speed_hz = spi_speed,
+        .spics_io_num = pin_cs,
+        .flags = SPI_DEVICE_HALFDUPLEX | SPI_DEVICE_3WIRE,
+        .queue_size = 1,
+        .pre_cb = NULL,
+        .post_cb = NULL,
+    };
+
+    ESP_ERROR_CHECK(spi_bus_initialize(SPI_CMT, &buscfg, SPI_DMA_DISABLED));
+    ESP_ERROR_CHECK(spi_bus_add_device(SPI_CMT, &devcfg, &spi_reg));
+
+    // FiFo
+    spi_device_interface_config_t devcfg2 = {
+        .command_bits = 0,
+        .address_bits = 0,
+        .dummy_bits = 0,
+        .mode = 0, // SPI mode 0
+        .cs_ena_pretrans = 2,
+        .cs_ena_posttrans = (uint8_t)(1 / (spi_speed * 10e6 * 2) + 2), // >2 us
+        .clock_speed_hz = spi_speed,
+        .spics_io_num = pin_fcs,
+        .flags = SPI_DEVICE_HALFDUPLEX | SPI_DEVICE_3WIRE,
+        .queue_size = 1,
+        .pre_cb = NULL,
+        .post_cb = NULL,
+    };
+    ESP_ERROR_CHECK(spi_bus_add_device(SPI_CMT, &devcfg2, &spi_fifo));
+
+    esp_rom_gpio_connect_out_signal(pin_sdio, spi_periph_signal[SPI_CMT].spid_out, true, false);
+    delay(100);
+}
+
+void cmt_spi3_write(const uint8_t addr, const uint8_t dat)
+{
+    uint8_t tx_data;
+    tx_data = ~dat;
+    spi_transaction_t t = {
+        .cmd = 1,
+        .addr = ~addr,
+        .length = 8,
+        .tx_buffer = &tx_data,
+        .rx_buffer = NULL
+    };
+    SPI_PARAM_LOCK();
+    ESP_ERROR_CHECK(spi_device_polling_transmit(spi_reg, &t));
+    SPI_PARAM_UNLOCK();
+    delayMicroseconds(100);
+}
+
+uint8_t cmt_spi3_read(const uint8_t addr)
+{
+    uint8_t rx_data;
+    spi_transaction_t t = {
+        .cmd = 0,
+        .addr = ~addr,
+        .length = 8,
+        .rxlength = 8,
+        .tx_buffer = NULL,
+        .rx_buffer = &rx_data
+    };
+    SPI_PARAM_LOCK();
+    ESP_ERROR_CHECK(spi_device_polling_transmit(spi_reg, &t));
+    SPI_PARAM_UNLOCK();
+    delayMicroseconds(100);
+    return rx_data;
+}
+
+void cmt_spi3_write_fifo(const uint8_t* buf, const uint16_t len)
+{
+    uint8_t tx_data;
+
+    spi_transaction_t t = {
+        .length = 8,
+        .tx_buffer = &tx_data, // reference to write data
+        .rx_buffer = NULL
+    };
+
+    SPI_PARAM_LOCK();
+    for (uint8_t i = 0; i < len; i++) {
+        tx_data = ~buf[i]; // negate buffer contents
+        ESP_ERROR_CHECK(spi_device_polling_transmit(spi_fifo, &t));
+        delayMicroseconds(4); // > 4 us
+    }
+    SPI_PARAM_UNLOCK();
+}
+
+void cmt_spi3_read_fifo(uint8_t* buf, const uint16_t len)
+{
+    uint8_t rx_data;
+
+    spi_transaction_t t = {
+        .length = 8,
+        .rxlength = 8,
+        .tx_buffer = NULL,
+        .rx_buffer = &rx_data
+    };
+
+    SPI_PARAM_LOCK();
+    for (uint8_t i = 0; i < len; i++) {
+        ESP_ERROR_CHECK(spi_device_polling_transmit(spi_fifo, &t));
+        delayMicroseconds(4); // > 4 us
+        buf[i] = rx_data;
+    }
+    SPI_PARAM_UNLOCK();
+}

lib/CMT2300a/cmt_spi3.cpp

@@ -1,155 +0,0 @@
-#include "cmt_spi3.h"
-#include <Arduino.h>
-#include <driver/spi_master.h>
-#include <SpiManager.h>
-
-SemaphoreHandle_t paramLock = NULL;
-#define SPI_PARAM_LOCK() \
-    do {                 \
-    } while (xSemaphoreTake(paramLock, portMAX_DELAY) != pdPASS)
-#define SPI_PARAM_UNLOCK() xSemaphoreGive(paramLock)
-
-static void IRAM_ATTR pre_cb(spi_transaction_t *trans) {
-    gpio_set_level(*reinterpret_cast<gpio_num_t*>(trans->user), 0);
-}
-
-static void IRAM_ATTR post_cb(spi_transaction_t *trans) {
-    gpio_set_level(*reinterpret_cast<gpio_num_t*>(trans->user), 1);
-}
-
-spi_device_handle_t spi;
-gpio_num_t cs_reg, cs_fifo;
-
-void cmt_spi3_init(const int8_t pin_sdio, const int8_t pin_clk, const int8_t pin_cs, const int8_t pin_fcs, const int32_t spi_speed)
-{
-    paramLock = xSemaphoreCreateMutex();
-
-    auto bus_config = std::make_shared<SpiBusConfig>(
-        static_cast<gpio_num_t>(pin_sdio),
-        GPIO_NUM_NC,
-        static_cast<gpio_num_t>(pin_clk)
-    );
-
-    spi_device_interface_config_t device_config {
-        .command_bits = 0, // set by transactions individually
-        .address_bits = 0, // set by transactions individually
-        .dummy_bits = 0,
-        .mode = 0, // SPI mode 0
-        .duty_cycle_pos = 0,
-        .cs_ena_pretrans = 2, // only 1 pre and post cycle would be required for register access
-        .cs_ena_posttrans = static_cast<uint8_t>(2 * spi_speed / 1000000), // >2 us
-        .clock_speed_hz = spi_speed,
-        .input_delay_ns = 0,
-        .spics_io_num = -1, // CS handled by callbacks
-        .flags = SPI_DEVICE_HALFDUPLEX | SPI_DEVICE_3WIRE,
-        .queue_size = 1,
-        .pre_cb = pre_cb,
-        .post_cb = post_cb,
-    };
-
-    spi = SpiManagerInst.alloc_device("", bus_config, device_config);
-    if (!spi)
-        ESP_ERROR_CHECK(ESP_FAIL);
-
-    cs_reg = static_cast<gpio_num_t>(pin_cs);
-    ESP_ERROR_CHECK(gpio_reset_pin(cs_reg));
-    ESP_ERROR_CHECK(gpio_set_level(cs_reg, 1));
-    ESP_ERROR_CHECK(gpio_set_direction(cs_reg, GPIO_MODE_OUTPUT));
-
-    cs_fifo = static_cast<gpio_num_t>(pin_fcs);
-    ESP_ERROR_CHECK(gpio_reset_pin(cs_fifo));
-    ESP_ERROR_CHECK(gpio_set_level(cs_fifo, 1));
-    ESP_ERROR_CHECK(gpio_set_direction(cs_fifo, GPIO_MODE_OUTPUT));
-}
-
-void cmt_spi3_write(const uint8_t addr, const uint8_t data)
-{
-    spi_transaction_ext_t trans {
-        .base {
-            .flags = SPI_TRANS_VARIABLE_CMD | SPI_TRANS_VARIABLE_ADDR,
-            .cmd = 0,
-            .addr = addr,
-            .length = 8,
-            .rxlength = 0,
-            .user = &cs_reg, // CS for register access
-            .tx_buffer = &data,
-            .rx_buffer = nullptr,
-        },
-        .command_bits = 1,
-        .address_bits = 7,
-        .dummy_bits = 0,
-    };
-    SPI_PARAM_LOCK();
-    ESP_ERROR_CHECK(spi_device_polling_transmit(spi, reinterpret_cast<spi_transaction_t*>(&trans)));
-    SPI_PARAM_UNLOCK();
-}
-
-uint8_t cmt_spi3_read(const uint8_t addr)
-{
-    uint8_t data;
-    spi_transaction_ext_t trans {
-        .base {
-            .flags = SPI_TRANS_VARIABLE_CMD | SPI_TRANS_VARIABLE_ADDR,
-            .cmd = 1,
-            .addr = addr,
-            .length = 0,
-            .rxlength = 8,
-            .user = &cs_reg, // CS for register access
-            .tx_buffer = nullptr,
-            .rx_buffer = &data,
-        },
-        .command_bits = 1,
-        .address_bits = 7,
-        .dummy_bits = 0,
-    };
-    SPI_PARAM_LOCK();
-    ESP_ERROR_CHECK(spi_device_polling_transmit(spi, reinterpret_cast<spi_transaction_t*>(&trans)));
-    SPI_PARAM_UNLOCK();
-    return data;
-}
-
-void cmt_spi3_write_fifo(const uint8_t* buf, const uint16_t len)
-{
-    spi_transaction_t trans {
-        .flags = 0,
-        .cmd = 0,
-        .addr = 0,
-        .length = 8,
-        .rxlength = 0,
-        .user = &cs_fifo, // CS for FIFO access
-        .tx_buffer = nullptr,
-        .rx_buffer = nullptr,
-    };
-
-    SPI_PARAM_LOCK();
-    spi_device_acquire_bus(spi, portMAX_DELAY);
-    for (uint8_t i = 0; i < len; i++) {
-        trans.tx_buffer = buf + i;
-        ESP_ERROR_CHECK(spi_device_polling_transmit(spi, &trans));
-    }
-    spi_device_release_bus(spi);
-    SPI_PARAM_UNLOCK();
-}
-
-void cmt_spi3_read_fifo(uint8_t* buf, const uint16_t len)
-{
-    spi_transaction_t trans {
-        .flags = 0,
-        .cmd = 0,
-        .addr = 0,
-        .length = 0,
-        .rxlength = 8,
-        .user = &cs_fifo, // CS for FIFO access
-        .tx_buffer = nullptr,
-        .rx_buffer = nullptr,
-    };
-
-    SPI_PARAM_LOCK();
-    spi_device_acquire_bus(spi, portMAX_DELAY);
-    for (uint8_t i = 0; i < len; i++) {
-        trans.rx_buffer = buf + i;
-        ESP_ERROR_CHECK(spi_device_polling_transmit(spi, &trans));
-    }
-    spi_device_release_bus(spi);
-    SPI_PARAM_UNLOCK();
-}

lib/CMT2300a/cmt_spi3.h

@@ -3,11 +3,7 @@
 
 #include <stdint.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void cmt_spi3_init(const int8_t pin_sdio, const int8_t pin_clk, const int8_t pin_cs, const int8_t pin_fcs, const int32_t spi_speed);
+void cmt_spi3_init(const int8_t pin_sdio, const int8_t pin_clk, const int8_t pin_cs, const int8_t pin_fcs, const uint32_t spi_speed);
 
 void cmt_spi3_write(const uint8_t addr, const uint8_t dat);
 uint8_t cmt_spi3_read(const uint8_t addr);
@@ -15,8 +11,4 @@ uint8_t cmt_spi3_read(const uint8_t addr);
 void cmt_spi3_write_fifo(const uint8_t* p_buf, const uint16_t len);
 void cmt_spi3_read_fifo(uint8_t* p_buf, const uint16_t len);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

lib/CpuTemperature/src/CpuTemperature.cpp

@@ -1,57 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2024 Thomas Basler and others
- */
-
-#include "CpuTemperature.h"
-#include <Arduino.h>
-
-#if defined(CONFIG_IDF_TARGET_ESP32)
-// there is no official API available on the original ESP32
-extern "C" {
-uint8_t temprature_sens_read();
-}
-#elif defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
-#include "driver/temp_sensor.h"
-#endif
-
-CpuTemperatureClass CpuTemperature;
-
-float CpuTemperatureClass::read()
-{
-#ifdef CONFIG_IDF_TARGET_ESP32S2
-    // Disabling temperature reading for ESP32-S2 models as it might lead to WDT resets.
-    // See: https://github.com/espressif/esp-idf/issues/8088
-    return NAN;
-#endif
-
-    std::lock_guard<std::mutex> lock(_mutex);
-
-    float temperature = NAN;
-    bool success = false;
-
-#if defined(CONFIG_IDF_TARGET_ESP32)
-    uint8_t raw = temprature_sens_read();
-    ESP_LOGV(TAG, "Raw temperature value: %d", raw);
-    temperature = (raw - 32) / 1.8f;
-    success = (raw != 128);
-#elif defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
-    temp_sensor_config_t tsens = TSENS_CONFIG_DEFAULT();
-    temp_sensor_set_config(tsens);
-    temp_sensor_start();
-#if defined(CONFIG_IDF_TARGET_ESP32S3) && (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 4, 3))
-#error \
-    "ESP32-S3 internal temperature sensor requires ESP IDF V4.4.3 or higher. See https://github.com/esphome/issues/issues/4271"
-#endif
-    esp_err_t result = temp_sensor_read_celsius(&temperature);
-    temp_sensor_stop();
-    success = (result == ESP_OK);
-#endif
-
-    if (success && std::isfinite(temperature)) {
-        return temperature;
-    } else {
-        ESP_LOGD(TAG, "Ignoring invalid temperature (success=%d, value=%.1f)", success, temperature);
-        return NAN;
-    }
-}

lib/CpuTemperature/src/CpuTemperature.h

@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include <mutex>
-
-class CpuTemperatureClass {
-public:
-    float read();
-
-private:
-    std::mutex _mutex;
-};
-
-extern CpuTemperatureClass CpuTemperature;

lib/Hoymiles/src/Hoymiles.cpp

@@ -4,7 +4,6 @@
  */
 #include "Hoymiles.h"
 #include "Utils.h"
-#include "inverters/HERF_1CH.h"
 #include "inverters/HERF_2CH.h"
 #include "inverters/HERF_4CH.h"
 #include "inverters/HMS_1CH.h"
@@ -57,7 +56,7 @@ void HoymilesClass::loop()
             }
         }
 
-        if (iv != nullptr && iv->getRadio()->isInitialized()) {
+        if (iv != nullptr && iv->getRadio()->isInitialized() && iv->getRadio()->isQueueEmpty()) {
 
             if (iv->getZeroValuesIfUnreachable() && !iv->isReachable()) {
                 iv->Statistics()->zeroRuntimeData();
@@ -119,7 +118,6 @@ void HoymilesClass::loop()
                     iv->sendGridOnProFileParaRequest();
                 }
 
-                 _messageOutput->printf("Queue size - NRF: %" PRId32 " CMT: %" PRId32 "\r\n", _radioNrf->getQueueSize(), _radioCmt->getQueueSize());
                 _lastPoll = millis();
             }
 
@@ -137,7 +135,12 @@ void HoymilesClass::loop()
             if (currentWeekDay != lastWeekDay) {
 
                 for (auto& inv : _inverters) {
-                    inv->performDailyTask();
+                    // Have to reset the offets first, otherwise it will
+                    // Substract the offset from zero which leads to a high value
+                    inv->Statistics()->resetYieldDayCorrection();
+                    if (inv->getZeroYieldDayOnMidnight()) {
+                        inv->Statistics()->zeroDailyData();
+                    }
                 }
 
                 lastWeekDay = currentWeekDay;
@@ -167,8 +170,6 @@ std::shared_ptr<InverterAbstract> HoymilesClass::addInverter(const char* name, c
         i = std::make_shared<HM_2CH>(_radioNrf.get(), serial);
     } else if (HM_1CH::isValidSerial(serial)) {
         i = std::make_shared<HM_1CH>(_radioNrf.get(), serial);
-    } else if (HERF_1CH::isValidSerial(serial)) {
-        i = std::make_shared<HERF_1CH>(_radioNrf.get(), serial);
     } else if (HERF_2CH::isValidSerial(serial)) {
         i = std::make_shared<HERF_2CH>(_radioNrf.get(), serial);
     } else if (HERF_4CH::isValidSerial(serial)) {
@@ -196,9 +197,9 @@ std::shared_ptr<InverterAbstract> HoymilesClass::getInverterByPos(const uint8_t
 
 std::shared_ptr<InverterAbstract> HoymilesClass::getInverterBySerial(const uint64_t serial)
 {
-    for (auto& inv : _inverters) {
-        if (inv->serial() == serial) {
-            return inv;
+    for (uint8_t i = 0; i < _inverters.size(); i++) {
+        if (_inverters[i]->serial() == serial) {
+            return _inverters[i];
         }
     }
     return nullptr;
@@ -210,7 +211,9 @@ std::shared_ptr<InverterAbstract> HoymilesClass::getInverterByFragment(const fra
         return nullptr;
     }
 
-    for (auto& inv : _inverters) {
+    std::shared_ptr<InverterAbstract> inv;
+    for (uint8_t i = 0; i < _inverters.size(); i++) {
+        inv = _inverters[i];
         serial_u p;
         p.u64 = inv->serial();
 
@@ -230,7 +233,6 @@ void HoymilesClass::removeInverterBySerial(const uint64_t serial)
     for (uint8_t i = 0; i < _inverters.size(); i++) {
         if (_inverters[i]->serial() == serial) {
             std::lock_guard<std::mutex> lock(_mutex);
-            _inverters[i]->getRadio()->removeCommands(_inverters[i].get());
             _inverters.erase(_inverters.begin() + i);
             return;
         }
@@ -267,6 +269,11 @@ void HoymilesClass::setPollInterval(const uint32_t interval)
     _pollInterval = interval;
 }
 
+void HoymilesClass::setVerboseLogging(bool verboseLogging)
+{
+    _verboseLogging = verboseLogging;
+}
+
 void HoymilesClass::setMessageOutput(Print* output)
 {
     _messageOutput = output;
@@ -276,3 +283,18 @@ Print* HoymilesClass::getMessageOutput()
 {
     return _messageOutput;
 }
+
+class Silent : public Print {
+    public:
+        size_t write(uint8_t c) final { return 0; }
+};
+
+Silent Dummy;
+
+Print* HoymilesClass::getVerboseMessageOutput()
+{
+    if (_verboseLogging) {
+        return _messageOutput;
+    }
+    return &Dummy;
+}

lib/Hoymiles/src/Hoymiles.h

@@ -22,6 +22,7 @@ public:
 
     void setMessageOutput(Print* output);
     Print* getMessageOutput();
+    Print* getVerboseMessageOutput();
 
     std::shared_ptr<InverterAbstract> addInverter(const char* name, const uint64_t serial);
     std::shared_ptr<InverterAbstract> getInverterByPos(const uint8_t pos);
@@ -35,6 +36,7 @@ public:
 
     uint32_t PollInterval() const;
     void setPollInterval(const uint32_t interval);
+    void setVerboseLogging(bool verboseLogging);
 
     bool isAllRadioIdle() const;
 
@@ -46,6 +48,7 @@ private:
     std::mutex _mutex;
 
     uint32_t _pollInterval = 0;
+    bool _verboseLogging = true;
     uint32_t _lastPoll = 0;
 
     Print* _messageOutput = &Serial;

lib/Hoymiles/src/HoymilesRadio.cpp

@@ -54,7 +54,7 @@ void HoymilesRadio::sendLastPacketAgain()
 void HoymilesRadio::handleReceivedPackage()
 {
     if (_busyFlag && _rxTimeout.occured()) {
-        Hoymiles.getMessageOutput()->println("RX Period End");
+        Hoymiles.getVerboseMessageOutput()->println("RX Period End");
         std::shared_ptr<InverterAbstract> inv = Hoymiles.getInverterBySerial(_commandQueue.front().get()->getTargetAddress());
 
         if (nullptr != inv) {
@@ -66,31 +66,16 @@ void HoymilesRadio::handleReceivedPackage()
 
             } else if (verifyResult == FRAGMENT_ALL_MISSING_TIMEOUT) {
                 Hoymiles.getMessageOutput()->println("Nothing received, resend count exeeded");
-                // Statistics: Count RX Fail No Answer
-                if (inv->RadioStats.TxRequestData > 0) {
-                    inv->RadioStats.RxFailNoAnswer++;
-                }
-
                 _commandQueue.pop();
                 _busyFlag = false;
 
             } else if (verifyResult == FRAGMENT_RETRANSMIT_TIMEOUT) {
                 Hoymiles.getMessageOutput()->println("Retransmit timeout");
-                // Statistics: Count RX Fail Partial Answer
-                if (inv->RadioStats.TxRequestData > 0) {
-                    inv->RadioStats.RxFailPartialAnswer++;
-                }
-
                 _commandQueue.pop();
                 _busyFlag = false;
 
             } else if (verifyResult == FRAGMENT_HANDLE_ERROR) {
                 Hoymiles.getMessageOutput()->println("Packet handling error");
-                // Statistics: Count RX Fail Corrupt Data
-                if (inv->RadioStats.TxRequestData > 0) {
-                    inv->RadioStats.RxFailCorruptData++;
-                }
-
                 _commandQueue.pop();
                 _busyFlag = false;
 
@@ -98,26 +83,17 @@ void HoymilesRadio::handleReceivedPackage()
                 // Perform Retransmit
                 Hoymiles.getMessageOutput()->print("Request retransmit: ");
                 Hoymiles.getMessageOutput()->println(verifyResult);
-                // Statistics: Count TX Re-Request Fragment
-                inv->RadioStats.TxReRequestFragment++;
-
                 sendRetransmitPacket(verifyResult);
 
             } else {
                 // Successful received all packages
                 Hoymiles.getMessageOutput()->println("Success");
-                // Statistics: Count RX Success
-                if (inv->RadioStats.TxRequestData > 0) {
-                    inv->RadioStats.RxSuccess++;
-                }
-
                 _commandQueue.pop();
                 _busyFlag = false;
             }
         } else {
             // If inverter was not found, assume the command is invalid
             Hoymiles.getMessageOutput()->println("RX: Invalid inverter found");
-            // Statistics: Count RX Fail Unknown Data
             _commandQueue.pop();
             _busyFlag = false;
         }
@@ -129,9 +105,6 @@ void HoymilesRadio::handleReceivedPackage()
             auto inv = Hoymiles.getInverterBySerial(cmd->getTargetAddress());
             if (nullptr != inv) {
                 inv->clearRxFragmentBuffer();
-                // Statistics: TX Requests
-                inv->RadioStats.TxRequestData++;
-
                 sendEsbPacket(*cmd);
             } else {
                 Hoymiles.getMessageOutput()->println("TX: Invalid inverter found");
@@ -144,10 +117,10 @@ void HoymilesRadio::handleReceivedPackage()
 void HoymilesRadio::dumpBuf(const uint8_t buf[], const uint8_t len, const bool appendNewline)
 {
     for (uint8_t i = 0; i < len; i++) {
-        Hoymiles.getMessageOutput()->printf("%02X ", buf[i]);
+        Hoymiles.getVerboseMessageOutput()->printf("%02X ", buf[i]);
     }
     if (appendNewline) {
-        Hoymiles.getMessageOutput()->println("");
+        Hoymiles.getVerboseMessageOutput()->println("");
     }
 }
 
@@ -156,16 +129,6 @@ bool HoymilesRadio::isInitialized() const
     return _isInitialized;
 }
 
-void HoymilesRadio::removeCommands(InverterAbstract* inv)
-{
-    _commandQueue.removeAllEntriesForInverter(inv);
-}
-
-uint8_t HoymilesRadio::countSimilarCommands(std::shared_ptr<CommandAbstract> cmd)
-{
-    return _commandQueue.countSimilarCommands(cmd);
-}
-
 bool HoymilesRadio::isIdle() const
 {
     return !_busyFlag;
@@ -175,8 +138,3 @@ bool HoymilesRadio::isQueueEmpty() const
 {
     return _commandQueue.size() == 0;
 }
-
-uint32_t HoymilesRadio::getQueueSize() const
-{
-    return _commandQueue.size();
-}

lib/Hoymiles/src/HoymilesRadio.h

@@ -1,17 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "Arduino.h"
 #include "commands/CommandAbstract.h"
-#include "queue/CommandQueue.h"
 #include "types.h"
+#include <ThreadSafeQueue.h>
 #include <TimeoutHelper.h>
-
-#ifdef HOY_DEBUG_QUEUE
-#define DEBUG_PRINT(fmt, args...) Serial.printf(fmt, ##args)
-#else
-#define DEBUG_PRINT(fmt, args...) /* Don't do anything in release builds */
-#endif
+#include <memory>
 
 class HoymilesRadio {
 public:
@@ -20,54 +14,17 @@ public:
 
     bool isIdle() const;
     bool isQueueEmpty() const;
-    uint32_t getQueueSize() const;
     bool isInitialized() const;
 
-    void removeCommands(InverterAbstract* inv);
-    uint8_t countSimilarCommands(std::shared_ptr<CommandAbstract> cmd);
-
     void enqueCommand(std::shared_ptr<CommandAbstract> cmd)
     {
-        DEBUG_PRINT("Queue size before: %ld\r\n", _commandQueue.size());
-        DEBUG_PRINT("Handling command %s with type %d\r\n", cmd.get()->getCommandName().c_str(), static_cast<uint8_t>(cmd.get()->getQueueInsertType()));
-        switch (cmd.get()->getQueueInsertType()) {
-        case QueueInsertType::RemoveOldest:
-            _commandQueue.removeDuplicatedEntries(cmd);
-            break;
-        case QueueInsertType::ReplaceExistent:
-            // Checks if the queue already contains a command like the new one
-            // and replaces the existing one with the new one.
-            // (The new one will not be pushed at the end of the queue)
-            if (_commandQueue.countSimilarCommands(cmd) > 0) {
-                DEBUG_PRINT("    ... existing entry will be replaced\r\n");
-                _commandQueue.replaceEntries(cmd);
-                return;
-            }
-            break;
-        case QueueInsertType::RemoveNewest:
-            // Checks if the queue already contains a command like the new one
-            // and drops the new one. The new one will not be inserted.
-            if (_commandQueue.countSimilarCommands(cmd) > 0) {
-                DEBUG_PRINT("    ... new entry will be dropped\r\n");
-                return;
-            }
-            break;
-        case QueueInsertType::AllowMultiple:
-            // Dont do anything, just fall through and insert the command.
-            break;
-        }
-
-        // Push the command into the queue if we reach this position of the code
-        DEBUG_PRINT("    ... new entry will be appended\r\n");
         _commandQueue.push(cmd);
-
-        DEBUG_PRINT("Queue size after: %ld\r\n", _commandQueue.size());
     }
 
     template <typename T>
-    std::shared_ptr<T> prepareCommand(InverterAbstract* inv)
+    std::shared_ptr<T> prepareCommand()
     {
-        return std::make_shared<T>(inv);
+        return std::make_shared<T>();
     }
 
 protected:
@@ -81,7 +38,7 @@ protected:
     void handleReceivedPackage();
 
     serial_u _dtuSerial;
-    CommandQueue _commandQueue;
+    ThreadSafeQueue<std::shared_ptr<CommandAbstract>> _commandQueue;
     bool _isInitialized = false;
     bool _busyFlag = false;
 

lib/Hoymiles/src/HoymilesRadio_CMT.cpp

@@ -34,7 +34,7 @@ uint32_t HoymilesRadio_CMT::getFrequencyFromChannel(const uint8_t channel) const
 uint8_t HoymilesRadio_CMT::getChannelFromFrequency(const uint32_t frequency) const
 {
     if ((frequency % getChannelWidth()) != 0) {
-        Hoymiles.getMessageOutput()->printf("%.3f MHz is not divisible by %" PRId32 " kHz!\r\n", frequency / 1000000.0, getChannelWidth());
+        Hoymiles.getMessageOutput()->printf("%.3f MHz is not divisible by %d kHz!\r\n", frequency / 1000000.0, getChannelWidth());
         return 0xFF; // ERROR
     }
     if (frequency < getMinFrequency() || frequency > getMaxFrequency()) {
@@ -43,7 +43,7 @@ uint8_t HoymilesRadio_CMT::getChannelFromFrequency(const uint32_t frequency) con
         return 0xFF; // ERROR
     }
     if (frequency < countryDefinition.at(_countryMode).Freq_Legal_Min || frequency > countryDefinition.at(_countryMode).Freq_Legal_Max) {
-        Hoymiles.getMessageOutput()->printf("!!! caution: %.2f MHz is out of region legal range! (%" PRId32 " - %" PRId32 " MHz)\r\n",
+        Hoymiles.getMessageOutput()->printf("!!! caution: %.2f MHz is out of region legal range! (%d - %d MHz)\r\n",
             frequency / 1000000.0,
             static_cast<uint32_t>(countryDefinition.at(_countryMode).Freq_Legal_Min / 1e6),
             static_cast<uint32_t>(countryDefinition.at(_countryMode).Freq_Legal_Max / 1e6));
@@ -126,7 +126,7 @@ void HoymilesRadio_CMT::loop()
     }
 
     if (_packetReceived) {
-        Hoymiles.getMessageOutput()->println("Interrupt received");
+        Hoymiles.getVerboseMessageOutput()->println("Interrupt received");
         while (_radio->available()) {
             if (!(_rxBuffer.size() > FRAGMENT_BUFFER_SIZE)) {
                 fragment_t f;
@@ -165,11 +165,11 @@ void HoymilesRadio_CMT::loop()
 
                     if (nullptr != inv) {
                         // Save packet in inverter rx buffer
-                        Hoymiles.getMessageOutput()->printf("RX %.2f MHz --> ", getFrequencyFromChannel(f.channel) / 1000000.0);
+                        Hoymiles.getVerboseMessageOutput()->printf("RX %.2f MHz --> ", getFrequencyFromChannel(f.channel) / 1000000.0);
                         dumpBuf(f.fragment, f.len, false);
-                        Hoymiles.getMessageOutput()->printf("| %" PRId8 " dBm\r\n", f.rssi);
+                        Hoymiles.getVerboseMessageOutput()->printf("| %d dBm\r\n", f.rssi);
 
-                        inv->addRxFragment(f.fragment, f.len, f.rssi);
+                        inv->addRxFragment(f.fragment, f.len);
                     } else {
                         Hoymiles.getMessageOutput()->println("Inverter Not found!");
                     }
@@ -194,9 +194,9 @@ void HoymilesRadio_CMT::setPALevel(const int8_t paLevel)
     }
 
     if (_radio->setPALevel(paLevel)) {
-        Hoymiles.getMessageOutput()->printf("CMT TX power set to %" PRId8 " dBm\r\n", paLevel);
+        Hoymiles.getMessageOutput()->printf("CMT TX power set to %d dBm\r\n", paLevel);
     } else {
-        Hoymiles.getMessageOutput()->printf("CMT TX power %" PRId8 " dBm is not defined! (min: -10 dBm, max: 20 dBm)\r\n", paLevel);
+        Hoymiles.getMessageOutput()->printf("CMT TX power %d dBm is not defined! (min: -10 dBm, max: 20 dBm)\r\n", paLevel);
     }
 }
 
@@ -274,9 +274,9 @@ void HoymilesRadio_CMT::sendEsbPacket(CommandAbstract& cmd)
         cmtSwitchDtuFreq(getInvBootFrequency());
     }
 
-    Hoymiles.getMessageOutput()->printf("TX %s %.2f MHz --> ",
+    Hoymiles.getVerboseMessageOutput()->printf("TX %s %.2f MHz --> ",
         cmd.getCommandName().c_str(), getFrequencyFromChannel(_radio->getChannel()) / 1000000.0);
-    cmd.dumpDataPayload(Hoymiles.getMessageOutput());
+    cmd.dumpDataPayload(Hoymiles.getVerboseMessageOutput());
 
     if (!_radio->write(cmd.getDataPayload(), cmd.getDataSize())) {
         Hoymiles.getMessageOutput()->println("TX SPI Timeout");

lib/Hoymiles/src/HoymilesRadio_NRF.cpp

@@ -48,7 +48,7 @@ void HoymilesRadio_NRF::loop()
     }
 
     if (_packetReceived) {
-        Hoymiles.getMessageOutput()->println("Interrupt received");
+        Hoymiles.getVerboseMessageOutput()->println("Interrupt received");
         while (_radio->available()) {
             if (!(_rxBuffer.size() > FRAGMENT_BUFFER_SIZE)) {
                 fragment_t f;
@@ -76,11 +76,11 @@ void HoymilesRadio_NRF::loop()
 
                 if (nullptr != inv) {
                     // Save packet in inverter rx buffer
-                    Hoymiles.getMessageOutput()->printf("RX Channel: %" PRId8 " --> ", f.channel);
+                    Hoymiles.getVerboseMessageOutput()->printf("RX Channel: %d --> ", f.channel);
                     dumpBuf(f.fragment, f.len, false);
-                    Hoymiles.getMessageOutput()->printf("| %" PRId8 " dBm\r\n", f.rssi);
+                    Hoymiles.getVerboseMessageOutput()->printf("| %d dBm\r\n", f.rssi);
 
-                    inv->addRxFragment(f.fragment, f.len, f.rssi);
+                    inv->addRxFragment(f.fragment, f.len);
                 } else {
                     Hoymiles.getMessageOutput()->println("Inverter Not found!");
                 }
@@ -183,9 +183,9 @@ void HoymilesRadio_NRF::sendEsbPacket(CommandAbstract& cmd)
     openWritingPipe(s);
     _radio->setRetries(3, 15);
 
-    Hoymiles.getMessageOutput()->printf("TX %s Channel: %" PRId8 " --> ",
+    Hoymiles.getVerboseMessageOutput()->printf("TX %s Channel: %d --> ",
         cmd.getCommandName().c_str(), _radio->getChannel());
-    cmd.dumpDataPayload(Hoymiles.getMessageOutput());
+    cmd.dumpDataPayload(Hoymiles.getVerboseMessageOutput());
     _radio->write(cmd.getDataPayload(), cmd.getDataSize());
 
     _radio->setRetries(0, 0);

lib/Hoymiles/src/commands/ActivePowerControlCommand.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * Copyright (C) 2022-2024 Thomas Basler and others
+ * Copyright (C) 2022-2023 Thomas Basler and others
  */
 
 /*
@@ -25,8 +25,8 @@ ID   Target Addr   Source Addr   Cmd  SCmd ?    Limit   Type    CRC16   CRC8
 
 #define CRC_SIZE 6
 
-ActivePowerControlCommand::ActivePowerControlCommand(InverterAbstract* inv, const uint64_t router_address)
-    : DevControlCommand(inv, router_address)
+ActivePowerControlCommand::ActivePowerControlCommand(const uint64_t target_address, const uint64_t router_address)
+    : DevControlCommand(target_address, router_address)
 {
     _payload[10] = 0x0b;
     _payload[11] = 0x00;
@@ -44,15 +44,7 @@ ActivePowerControlCommand::ActivePowerControlCommand(InverterAbstract* inv, cons
 
 String ActivePowerControlCommand::getCommandName() const
 {
-    char buffer[30];
-    snprintf(buffer, sizeof(buffer), "ActivePowerControl (%02X)", getType());
-    return buffer;
-}
-
-bool ActivePowerControlCommand::areSameParameter(CommandAbstract* other)
-{
-    return CommandAbstract::areSameParameter(other)
-        && this->getType() == static_cast<ActivePowerControlCommand*>(other)->getType();
+    return "ActivePowerControl";
 }
 
 void ActivePowerControlCommand::setActivePowerLimit(const float limit, const PowerLimitControlType type)
@@ -70,42 +62,39 @@ void ActivePowerControlCommand::setActivePowerLimit(const float limit, const Pow
     udpateCRC(CRC_SIZE);
 }
 
-bool ActivePowerControlCommand::handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id)
+bool ActivePowerControlCommand::handleResponse(InverterAbstract& inverter, const fragment_t fragment[], const uint8_t max_fragment_id)
 {
-    if (!DevControlCommand::handleResponse(fragment, max_fragment_id)) {
+    if (!DevControlCommand::handleResponse(inverter, fragment, max_fragment_id)) {
         return false;
     }
 
     if ((getType() == PowerLimitControlType::RelativNonPersistent) || (getType() == PowerLimitControlType::RelativPersistent)) {
-        _inv->SystemConfigPara()->setLimitPercent(getLimit());
+        inverter.SystemConfigPara()->setLimitPercent(getLimit());
     } else {
-        const uint16_t max_power = _inv->DevInfo()->getMaxPower();
+        const uint16_t max_power = inverter.DevInfo()->getMaxPower();
         if (max_power > 0) {
-            _inv->SystemConfigPara()->setLimitPercent(static_cast<float>(getLimit()) / max_power * 100);
+            inverter.SystemConfigPara()->setLimitPercent(static_cast<float>(getLimit()) / max_power * 100);
         } else {
             // TODO(tbnobody): Not implemented yet because we only can publish the percentage value
         }
     }
-    _inv->SystemConfigPara()->setLastUpdateCommand(millis());
-    std::shared_ptr<ActivePowerControlCommand> cmd(std::shared_ptr<ActivePowerControlCommand>(), this);
-    if (_inv->getRadio()->countSimilarCommands(cmd) == 1) {
-        _inv->SystemConfigPara()->setLastLimitCommandSuccess(CMD_OK);
-    }
+    inverter.SystemConfigPara()->setLastUpdateCommand(millis());
+    inverter.SystemConfigPara()->setLastLimitCommandSuccess(CMD_OK);
     return true;
 }
 
 float ActivePowerControlCommand::getLimit() const
 {
-    const float l = (static_cast<uint16_t>(_payload[12]) << 8) | _payload[13];
+    const uint16_t l = (((uint16_t)_payload[12] << 8) | _payload[13]);
     return l / 10;
 }
 
-PowerLimitControlType ActivePowerControlCommand::getType() const
+PowerLimitControlType ActivePowerControlCommand::getType()
 {
-    return (PowerLimitControlType)((static_cast<uint16_t>(_payload[14]) << 8) | _payload[15]);
+    return (PowerLimitControlType)(((uint16_t)_payload[14] << 8) | _payload[15]);
 }
 
-void ActivePowerControlCommand::gotTimeout()
+void ActivePowerControlCommand::gotTimeout(InverterAbstract& inverter)
 {
-    _inv->SystemConfigPara()->setLastLimitCommandSuccess(CMD_NOK);
+    inverter.SystemConfigPara()->setLastLimitCommandSuccess(CMD_NOK);
 }

lib/Hoymiles/src/commands/ActivePowerControlCommand.h

@@ -12,16 +12,14 @@ typedef enum { // ToDo: to be verified by field tests
 
 class ActivePowerControlCommand : public DevControlCommand {
 public:
-    explicit ActivePowerControlCommand(InverterAbstract* inv, const uint64_t router_address = 0);
+    explicit ActivePowerControlCommand(const uint64_t target_address = 0, const uint64_t router_address = 0);
 
     virtual String getCommandName() const;
-    virtual QueueInsertType getQueueInsertType() const { return QueueInsertType::RemoveOldest; }
-    virtual bool areSameParameter(CommandAbstract* other);
 
-    virtual bool handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id);
-    virtual void gotTimeout();
+    virtual bool handleResponse(InverterAbstract& inverter, const fragment_t fragment[], const uint8_t max_fragment_id);
+    virtual void gotTimeout(InverterAbstract& inverter);
 
     void setActivePowerLimit(const float limit, const PowerLimitControlType type = RelativNonPersistent);
     float getLimit() const;
-    PowerLimitControlType getType() const;
+    PowerLimitControlType getType();
 };

lib/Hoymiles/src/commands/AlarmDataCommand.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * Copyright (C) 2022-2024 Thomas Basler and others
+ * Copyright (C) 2022-2023 Thomas Basler and others
  */
 
 /*
@@ -23,8 +23,8 @@ ID   Target Addr   Source Addr   Idx  DT   ?    Time          Gap     AlarmId Pa
 #include "AlarmDataCommand.h"
 #include "inverters/InverterAbstract.h"
 
-AlarmDataCommand::AlarmDataCommand(InverterAbstract* inv, const uint64_t router_address, const time_t time)
-    : MultiDataCommand(inv, router_address)
+AlarmDataCommand::AlarmDataCommand(const uint64_t target_address, const uint64_t router_address, const time_t time)
+    : MultiDataCommand(target_address, router_address)
 {
     setTime(time);
     setDataType(0x11);
@@ -36,28 +36,28 @@ String AlarmDataCommand::getCommandName() const
     return "AlarmData";
 }
 
-bool AlarmDataCommand::handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id)
+bool AlarmDataCommand::handleResponse(InverterAbstract& inverter, const fragment_t fragment[], const uint8_t max_fragment_id)
 {
     // Check CRC of whole payload
-    if (!MultiDataCommand::handleResponse(fragment, max_fragment_id)) {
+    if (!MultiDataCommand::handleResponse(inverter, fragment, max_fragment_id)) {
         return false;
     }
 
     // Move all fragments into target buffer
     uint8_t offs = 0;
-    _inv->EventLog()->beginAppendFragment();
-    _inv->EventLog()->clearBuffer();
+    inverter.EventLog()->beginAppendFragment();
+    inverter.EventLog()->clearBuffer();
     for (uint8_t i = 0; i < max_fragment_id; i++) {
-        _inv->EventLog()->appendFragment(offs, fragment[i].fragment, fragment[i].len);
+        inverter.EventLog()->appendFragment(offs, fragment[i].fragment, fragment[i].len);
         offs += (fragment[i].len);
     }
-    _inv->EventLog()->endAppendFragment();
-    _inv->EventLog()->setLastAlarmRequestSuccess(CMD_OK);
-    _inv->EventLog()->setLastUpdate(millis());
+    inverter.EventLog()->endAppendFragment();
+    inverter.EventLog()->setLastAlarmRequestSuccess(CMD_OK);
+    inverter.EventLog()->setLastUpdate(millis());
     return true;
 }
 
-void AlarmDataCommand::gotTimeout()
+void AlarmDataCommand::gotTimeout(InverterAbstract& inverter)
 {
-    _inv->EventLog()->setLastAlarmRequestSuccess(CMD_NOK);
+    inverter.EventLog()->setLastAlarmRequestSuccess(CMD_NOK);
 }

lib/Hoymiles/src/commands/AlarmDataCommand.h

@@ -5,10 +5,10 @@
 
 class AlarmDataCommand : public MultiDataCommand {
 public:
-    explicit AlarmDataCommand(InverterAbstract* inv, const uint64_t router_address = 0, const time_t time = 0);
+    explicit AlarmDataCommand(const uint64_t target_address = 0, const uint64_t router_address = 0, const time_t time = 0);
 
     virtual String getCommandName() const;
 
-    virtual bool handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id);
-    virtual void gotTimeout();
+    virtual bool handleResponse(InverterAbstract& inverter, const fragment_t fragment[], const uint8_t max_fragment_id);
+    virtual void gotTimeout(InverterAbstract& inverter);
 };

lib/Hoymiles/src/commands/ChannelChangeCommand.cpp

@@ -19,8 +19,8 @@ ID   Target Addr   Source Addr   ?    ?    ?    CH   ?    CRC8
 */
 #include "ChannelChangeCommand.h"
 
-ChannelChangeCommand::ChannelChangeCommand(InverterAbstract* inv, const uint64_t router_address, const uint8_t channel)
-    : CommandAbstract(inv, router_address)
+ChannelChangeCommand::ChannelChangeCommand(const uint64_t target_address, const uint64_t router_address, const uint8_t channel)
+    : CommandAbstract(target_address, router_address)
 {
     _payload[0] = 0x56;
     _payload[13] = 0x14;
@@ -67,7 +67,7 @@ void ChannelChangeCommand::setCountryMode(const CountryModeId_t mode)
     }
 }
 
-bool ChannelChangeCommand::handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id)
+bool ChannelChangeCommand::handleResponse(InverterAbstract& inverter, const fragment_t fragment[], const uint8_t max_fragment_id)
 {
     return true;
 }

lib/Hoymiles/src/commands/ChannelChangeCommand.h

@@ -6,7 +6,7 @@
 
 class ChannelChangeCommand : public CommandAbstract {
 public:
-    explicit ChannelChangeCommand(InverterAbstract* inv, const uint64_t router_address = 0, const uint8_t channel = 0);
+    explicit ChannelChangeCommand(const uint64_t target_address = 0, const uint64_t router_address = 0, const uint8_t channel = 0);
 
     virtual String getCommandName() const;
 
@@ -15,7 +15,7 @@ public:
 
     void setCountryMode(const CountryModeId_t mode);
 
-    virtual bool handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id);
+    virtual bool handleResponse(InverterAbstract& inverter, const fragment_t fragment[], const uint8_t max_fragment_id);
 
     virtual uint8_t getMaxResendCount();
 };

lib/Hoymiles/src/commands/CommandAbstract.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * Copyright (C) 2022-2024 Thomas Basler and others
+ * Copyright (C) 2022-2023 Thomas Basler and others
  */
 
 /*
@@ -29,16 +29,13 @@ Source Address: 80 12 23 04
 #include "CommandAbstract.h"
 #include "crc.h"
 #include <string.h>
-#include "../inverters/InverterAbstract.h"
 
-CommandAbstract::CommandAbstract(InverterAbstract* inv, const uint64_t router_address)
+CommandAbstract::CommandAbstract(const uint64_t target_address, const uint64_t router_address)
 {
     memset(_payload, 0, RF_LEN);
     _payload_size = 0;
 
-    _inv = inv;
-
-    setTargetAddress(_inv->serial());
+    setTargetAddress(target_address);
     setRouterAddress(router_address);
     setSendCount(0);
     setTimeout(0);
@@ -125,7 +122,7 @@ void CommandAbstract::convertSerialToPacketId(uint8_t buffer[], const uint64_t s
     buffer[0] = s.b[3];
 }
 
-void CommandAbstract::gotTimeout()
+void CommandAbstract::gotTimeout(InverterAbstract& inverter)
 {
 }
 
@@ -138,9 +135,3 @@ uint8_t CommandAbstract::getMaxRetransmitCount() const
 {
     return MAX_RETRANSMIT_COUNT;
 }
-
-bool CommandAbstract::areSameParameter(CommandAbstract* other)
-{
-    return this->getCommandName() == other->getCommandName()
-        && this->_targetAddress == other->getTargetAddress();
-}

lib/Hoymiles/src/commands/CommandAbstract.h

@@ -11,21 +11,9 @@
 
 class InverterAbstract;
 
-enum class QueueInsertType {
-    AllowMultiple,
-     // Remove from  beginning of the queue
-    RemoveOldest,
-
-    // Don't insert command if it already exist
-    RemoveNewest,
-
-    // Replace the existing entry in the queue by the one to be added
-    ReplaceExistent,
-};
-
 class CommandAbstract {
 public:
-    explicit CommandAbstract(InverterAbstract* inv, const uint64_t router_address = 0);
+    explicit CommandAbstract(const uint64_t target_address = 0, const uint64_t router_address = 0);
     virtual ~CommandAbstract() {};
 
     const uint8_t* getDataPayload();
@@ -33,6 +21,7 @@ public:
 
     uint8_t getDataSize() const;
 
+    void setTargetAddress(const uint64_t address);
     uint64_t getTargetAddress() const;
 
     void setRouterAddress(const uint64_t address);
@@ -49,8 +38,8 @@ public:
 
     virtual CommandAbstract* getRequestFrameCommand(const uint8_t frame_no);
 
-    virtual bool handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id) = 0;
-    virtual void gotTimeout();
+    virtual bool handleResponse(InverterAbstract& inverter, const fragment_t fragment[], const uint8_t max_fragment_id) = 0;
+    virtual void gotTimeout(InverterAbstract& inverter);
 
     // Sets the amount how often the specific command is resent if all fragments where missing
     virtual uint8_t getMaxResendCount() const;
@@ -58,10 +47,6 @@ public:
     // Sets the amount how often a missing fragment is re-requested if it was not available
     virtual uint8_t getMaxRetransmitCount() const;
 
-    // Returns whether multiple instances of this command are allowed in the command queue.
-    virtual QueueInsertType getQueueInsertType() const { return QueueInsertType::RemoveNewest; }
-    virtual bool areSameParameter(CommandAbstract* other);
-
 protected:
     uint8_t _payload[RF_LEN];
     uint8_t _payload_size;
@@ -71,9 +56,6 @@ protected:
     uint64_t _targetAddress;
     uint64_t _routerAddress;
 
-    InverterAbstract* _inv;
-
 private:
-    void setTargetAddress(const uint64_t address);
     static void convertSerialToPacketId(uint8_t buffer[], const uint64_t serial);
 };

lib/Hoymiles/src/commands/DevControlCommand.cpp

@@ -1,7 +1,7 @@
 
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * Copyright (C) 2022-2024 Thomas Basler and others
+ * Copyright (C) 2022-2023 Thomas Basler and others
  */
 
 /*
@@ -23,8 +23,8 @@ ID   Target Addr   Source Addr   Cmd  Payload CRC16 CRC8
 #include "DevControlCommand.h"
 #include "crc.h"
 
-DevControlCommand::DevControlCommand(InverterAbstract* inv, const uint64_t router_address)
-    : CommandAbstract(inv, router_address)
+DevControlCommand::DevControlCommand(const uint64_t target_address, const uint64_t router_address)
+    : CommandAbstract(target_address, router_address)
 {
     _payload[0] = 0x51;
     _payload[9] = 0x81;
@@ -35,11 +35,11 @@ DevControlCommand::DevControlCommand(InverterAbstract* inv, const uint64_t route
 void DevControlCommand::udpateCRC(const uint8_t len)
 {
     const uint16_t crc = crc16(&_payload[10], len);
-    _payload[10 + len] = static_cast<uint8_t>(crc >> 8);
-    _payload[10 + len + 1] = static_cast<uint8_t>(crc);
+    _payload[10 + len] = (uint8_t)(crc >> 8);
+    _payload[10 + len + 1] = (uint8_t)(crc);
 }
 
-bool DevControlCommand::handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id)
+bool DevControlCommand::handleResponse(InverterAbstract& inverter, const fragment_t fragment[], const uint8_t max_fragment_id)
 {
     for (uint8_t i = 0; i < max_fragment_id; i++) {
         if (fragment[i].mainCmd != (_payload[0] | 0x80)) {