Merge branch 'development'

this battery provider implementation subscribes to a user-configurable
MQTT topic to retrieve the battery SoC value. the value is not
re-published under a different topic. there is no card created in the
web app's live view, since the SoC is already part of the totals at the
top of the live view. that is the only info this battery provider
implements.

closes #293.
relates to #581.

.editorconfig

@@ -1,9 +0,0 @@
-# http://editorconfig.org
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-indent_style = space
-indent_size = 4
-trim_trailing_whitespace = true

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,18 +5,11 @@ body:
   - type: markdown
     attributes:
       value: >
-        ### ⚠️ Please remember: issues are for *bugs*
+        ### ✋ **This is bug tracker, not a support forum**
-        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).
 
-        #### 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).
+        Please quickly search existing issues first before submitting a bug.
-        - [The FAQs](https://www.opendtu.solar/firmware/faq/).
-        - [Existing issues and discussions](https://github.com/tbnobody/OpenDTU/search?q=&type=issues).
   - 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
-        - Pre-Compiled binary from GitHub actions/pull-request
         - 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:
@@ -81,17 +65,4 @@ body:
         Links? References? Anything that will give us more context about the issue you are encountering!
         Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
     validations:
-      required: false
+      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/**
@@ -18,14 +23,14 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.x"
 
@@ -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:
@@ -56,7 +61,7 @@ jobs:
         run: git fetch --force --tags origin
 
       - name: Cache pip
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
@@ -64,13 +69,13 @@ jobs:
             ${{ runner.os }}-pip-
 
       - name: Cache PlatformIO
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ~/.platformio
           key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
         with:
           python-version: "3.x"
 
@@ -79,56 +84,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: |
+        run: yarn --cwd webapp install --frozen-lockfile
-            cd webapp
-            yarn install --frozen-lockfile
 
       - name: Build WebApp
-        run: |
+        run: yarn --cwd webapp build
-            cd webapp
-            yarn 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-onbattery-${{ matrix.environment }}.bin
-            .pio/build/${{ matrix.environment }}/opendtu-${{ matrix.environment }}.factory.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 +157,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,9 +7,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
         with:
           python-version: "3.x"
       - name: Install dependencies

.github/workflows/repo-maintenance.yml

@@ -1,54 +0,0 @@
-name: 'Repository Maintenance'
-
-on:
-    schedule:
-      - cron: '0 4 * * *'
-    workflow_dispatch:
-
-permissions:
-    issues: write
-    pull-requests: write
-    discussions: write
-
-concurrency:
-    group: lock
-
-jobs:
-    stale:
-        name: 'Stale'
-        runs-on: ubuntu-latest
-        steps:
-          - uses: actions/stale@v9
-            with:
-                days-before-stale: 14
-                days-before-close: 60
-                any-of-labels: 'cant-reproduce,not a bug'
-                stale-issue-label: stale
-                stale-pr-label: stale
-                stale-issue-message: >
-                    This issue has been automatically marked as stale because it has not had
-                    recent activity. It will be closed if no further activity occurs. Thank you
-                    for your contributions.
-
-    lock-threads:
-        name: 'Lock Old Threads'
-        runs-on: ubuntu-latest
-        steps:
-          - uses: dessant/lock-threads@v5
-            with:
-                issue-inactive-days: '30'
-                pr-inactive-days: '30'
-                discussion-inactive-days: '30'
-                log-output: true
-                issue-comment: >
-                    This issue has been automatically locked since there
-                    has not been any recent activity after it was closed.
-                    Please open a new discussion or issue for related concerns.
-                pr-comment: >
-                    This pull request has been automatically locked since there
-                    has not been any recent activity after it was closed.
-                    Please open a new discussion or issue for related concerns.
-                discussion-comment: >
-                    This discussion has been automatically locked since there
-                    has not been any recent activity after it was closed.
-                    Please open a new discussion for related concerns.

.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
+      - uses: actions/checkout@v3
-      - name: Enable Corepack
-        run: corepack enable
       - 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/extensions.json

@@ -3,8 +3,8 @@
     // for the documentation about the extensions.json format
     "recommendations": [
         "DavidAnson.vscode-markdownlint",
-        "EditorConfig.EditorConfig",
         "Vue.volar",
+        "Vue.vscode-typescript-vue-plugin",
         "platformio.platformio-ide"
     ],
     "unwantedRecommendations": [

.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,60 @@
-# 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)
+# OpenDTU-onBattery
-[![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)
 
-## !! 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).
+## What is OpenDTU-onBattery
-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.
 
+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:
+
+> **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.
+
+* 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/).
+[Full documentation of OpenDTU-onBattery extensions can be found at the project's wiki](https://github.com/helgeerbe/OpenDTU-OnBattery/wiki).
-Please feel free to support and create a PR in [this](https://github.com/tbnobody/OpenDTU-docs) repository to make the documentation even better.
 
-## Breaking changes
+For documentation of openDTU core functionality I refer to the original [repo](https://github.com/tbnobody/OpenDTU) and its [wiki](https://github.com/tbnobody/OpenDTU/wiki).
 
-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
+To find out what's new or improved have a look at the [changelog](https://github.com/helgeerbe/OpenDTU-OnBattery/releases).
-* 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
-```
 
-## 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/AhoyDTU-ESP32.json

@@ -1,76 +0,0 @@
-[
-    {
-        "name": "AhoyDTU ESP32 Display LED",
-        "links": [
-            {"name": "Information", "url": "https://ahoydtu.de/getting_started/"}
-        ],
-        "nrf24": {
-            "miso": 19,
-            "mosi": 23,
-            "clk": 18,
-            "irq": 16,
-            "en": 4,
-            "cs": 5
-        },
-        "led": {
-            "led0": 25,
-            "led1": 26
-        },
-        "display": {
-            "type": 2,
-            "data": 21,
-            "clk": 22
-        }
-    },
-    {
-        "name": "AhoyDTU ESP32 Display",
-        "links": [
-            {"name": "Information", "url": "https://ahoydtu.de/getting_started/"}
-        ],
-        "nrf24": {
-            "miso": 19,
-            "mosi": 23,
-            "clk": 18,
-            "irq": 16,
-            "en": 4,
-            "cs": 5
-        },
-        "display": {
-            "type": 2,
-            "data": 21,
-            "clk": 22
-        }
-    },
-    {
-        "name": "AhoyDTU ESP32 LED",
-        "links": [
-            {"name": "Information", "url": "https://ahoydtu.de/getting_started/"}
-        ],
-        "nrf24": {
-            "miso": 19,
-            "mosi": 23,
-            "clk": 18,
-            "irq": 16,
-            "en": 4,
-            "cs": 5
-        },
-        "led": {
-            "led0": 25,
-            "led1": 26
-        }
-    },
-    {
-        "name": "AhoyDTU ESP32",
-        "links": [
-            {"name": "Information", "url": "https://ahoydtu.de/getting_started/"}
-        ],
-        "nrf24": {
-            "miso": 19,
-            "mosi": 23,
-            "clk": 18,
-            "irq": 16,
-            "en": 4,
-            "cs": 5
-        }
-    }
-]

docs/DeviceProfiles/liligo_t-eth-lite_poe.json

@@ -1,74 +0,0 @@
-[
-    {
-        "name": "LILYGO T-ETH-Lite-POE CMT",
-        "links": [
-            {"name": "Datasheet", "url": "https://www.lilygo.cc/products/t-eth-lite"}
-        ],
-        "eth": {
-            "enabled": true,
-            "phy_addr": 0,
-            "power": 12,
-            "mdc": 23,
-            "mdio": 18,
-            "type": 2,
-            "clk_mode": 0
-        },
-        "cmt": {
-            "clk": 15,
-            "cs": 32,
-            "fcs": 33,
-            "sdio": 4
-        }
-    },
-    {
-        "name": "LILYGO T-ETH-Lite-POE NRF24",
-        "links": [
-            {"name": "Datasheet", "url": "https://www.lilygo.cc/products/t-eth-lite"}
-        ],
-        "eth": {
-            "enabled": true,
-            "phy_addr": 0,
-            "power": 12,
-            "mdc": 23,
-            "mdio": 18,
-            "type": 2,
-            "clk_mode": 0
-        },
-        "nrf24": {
-            "miso": 34,
-            "mosi": 13,
-            "clk": 14,
-            "irq": 35,
-            "en": 4,
-            "cs": 2
-        }
-    },
-    {
-        "name": "LILYGO T-ETH-Lite-POE NRF24 + Display",
-        "links": [
-            {"name": "Datasheet", "url": "https://www.lilygo.cc/products/t-eth-lite"}
-        ],
-        "eth": {
-            "enabled": true,
-            "phy_addr": 0,
-            "power": 12,
-            "mdc": 23,
-            "mdio": 18,
-            "type": 2,
-            "clk_mode": 0
-        },
-        "nrf24": {
-            "miso": 34,
-            "mosi": 13,
-            "clk": 14,
-            "irq": 35,
-            "en": 4,
-            "cs": 2
-        },
-        "display": {
-            "type": 3,
-            "data": 32,
-            "clk": 33
-        }
-    }
-]

docs/DeviceProfiles/olimex_esp32_gateway.json

@@ -1,47 +0,0 @@
-[
-    {
-        "name": "Olimex ESP32-Gateway",
-        "nrf24": {
-            "miso": 14,
-            "mosi": 13,
-            "clk": 12,
-            "irq": 15,
-            "en": 2,
-            "cs": 4
-        },
-        "eth": {
-            "enabled": true,
-            "phy_addr": 0,
-            "power": 12,
-            "mdc": 23,
-            "mdio": 18,
-            "type": 0,
-            "clk_mode": 3
-        }
-    },
-    {
-        "name": "Olimex ESP32-Gateway with SSH1106",
-        "nrf24": {
-            "miso": 14,
-            "mosi": 13,
-            "clk": 12,
-            "irq": 15,
-            "en": 2,
-            "cs": 4
-        },
-        "eth": {
-            "enabled": true,
-            "phy_addr": 0,
-            "power": 12,
-            "mdc": 23,
-            "mdio": 18,
-            "type": 0,
-            "clk_mode": 3
-        },
-        "display": {
-            "type": 3,
-            "data": 32,
-            "clk": 16
-        }
-    }
-]

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": [
@@ -106,4 +78,4 @@
             "clk": 17
         }
     }
-]
+]

docs/Display.md

@@ -1,3 +1,20 @@
 # Display integration
 
-This documentation will has been moved and can be found here: <https://tbnobody.github.io/OpenDTU-docs/hardware/display/>
+OpenDTU currently supports 3 types of displays (SSD1306, SH1106 and PCD8544). Currently only displays with a resolution of 128x64 pixel are supported. To activate a display you have to specify it's type and pin assignment either in the `platformio_override.ini` or in a device profile. Due to the fact that device profiles work with the pre-compiled binary the following documentation will only cover the device profile method.
+
+You can either create your own device profile as described [here](DeviceProfiles.md) or use some pre-defined. The pre-defined profiles can be found [here](DeviceProfiles/). You can simply open the json file with a text editor of your choice to view/edit the pin assignment.
+
+## Uploading Device Profiles
+
+Use the "Config Management" site to upload (Restore) the json file. Make sure to choose "Pin Mapping (pin_mapping.json)" in the combo box. After you click on restore the ESP will restart. At this point, the profile is not yet active. Please read the next chapter.
+![Config Management](screenshots/14_ConfigManagement.png)
+
+## Selecting a Device Profile
+
+After you uploaded the device profile you can select the profile in the "Device Manager" view. After a click on "Save" the ESP will be restarted and the pin assignment is active. At this point the display should already show something. Please see the next chapter for display settings.
+![Device Manager](screenshots/20_DeviceManager_Pin.png)
+
+## Display Settings
+
+Display settings can also be found in the "Device Manager".
+![Device Manager Display](screenshots/21_DeviceManager_Display.png)

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,21 @@
 # Upgrade Partition
 
-This documentation has been moved and can be found here: <https://tbnobody.github.io/OpenDTU-docs/firmware/howto/upgrade_partition/>
+To be able to install further updates you have to update the partition table of the ESP32. Doing so will **erase** all configuration data. Over The Air update using the web interface is **NOT** possible!
+
+**So make sure you export a backup of your configuration files before continuing.**
+
+There are several possibilities to update the partition table:
+
+- Using Visual Studio Code or PlatformIO CLI
+
+   If you have already used Visual Studio Code or the `platformio` command you can use it again to install the latest version. The partition table is upgraded automatically.
+
+- Any kind of flash interface
+
+   If you like to use any kind of flash interface like `esptool.py`, Espressif Flash Download Tool, ESP_Flasher or esptool-js you have to make sure to upload the provided .factory.bin file. It is important to enter the correct target address.
+
+   | Address  | File                   |
+   | ---------| ---------------------- |
+   | 0x0      | opendtu-*.factory.bin  |
+
+After upgrading the ESP32 will open the intergrated access point (AP) again. Just connect to it using the default password ("openDTU42"). If you are connected, just visit <http://192.168.4.1> and enter the "Configuration Management". Recover the previously backuped config files.

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,191 @@
+# 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
+
+The MCP2515 CAN bus module consists of a CAN bus controller and a CAN bus transceiver and is used to interface with the Huawei AC charger. This CAN bus operates at 125kbit/s. The module is connected via SPI and currently requires a separate SPI bus. If you want to use the Huawei AC charger make sure to get an ESP which supports 2 SPI busses. Currently the SPI bus host is hardcoded to number 2. This may change in future. Please note: Using the Huawei AC charger in combination with the CMT2300A radio board is not supported at the moment.
+
+MCP2515 CAN bus modules that are widely available are designed for 5V supply voltage. To make them work with 3.3V / the ESP32 a modification is required. [This modification is described here.](https://forums.raspberrypi.com/viewtopic.php?t=141052)
+
+### 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,37 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <stdint.h>
+#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;
+};
+
+class BatteryClass {
+    public:
+        void init(Scheduler&);
+        void updateSettings();
+
+        std::shared_ptr<BatteryStats const> getStats() const;
+    private:
+        void loop();
+
+        Task _loopTask;
+
+        uint32_t _lastMqttPublish = 0;
+        mutable std::mutex _mutex;
+        std::unique_ptr<BatteryProvider> _upProvider = nullptr;
+};
+
+extern BatteryClass Battery;

include/BatteryStats.h

@@ -0,0 +1,143 @@
+// 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"
+
+// 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 { return _lastUpdate > since; }
+
+        uint8_t getSoC() const { return _SoC; }
+        uint32_t getSoCAgeSeconds() const { return (millis() - _lastUpdateSoC) / 1000; }
+
+        // convert stats to JSON for web application live view
+        virtual void getLiveViewData(JsonVariant& root) const;
+
+        virtual void mqttPublish() const;
+
+        bool isValid() const { return _lastUpdateSoC > 0 && _lastUpdate > 0; }
+
+    protected:
+        String _manufacturer = "unknown";
+        uint8_t _SoC = 0;
+        uint32_t _lastUpdateSoC = 0;
+        uint32_t _lastUpdate = 0;
+};
+
+class PylontechBatteryStats : public BatteryStats {
+    friend class PylontechCanReceiver;
+
+    public:
+        void getLiveViewData(JsonVariant& root) const final;
+        void mqttPublish() const final;
+
+    private:
+        void setManufacturer(String&& m) { _manufacturer = std::move(m); }
+        void setSoC(uint8_t SoC) { _SoC = SoC; _lastUpdateSoC = millis(); }
+        void setLastUpdate(uint32_t ts) { _lastUpdate = ts; }
+
+        float _chargeVoltage;
+        float _chargeCurrentLimitation;
+        float _dischargeCurrentLimitation;
+        uint16_t _stateOfHealth;
+        float _voltage; // total voltage of the battery pack
+        // 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;
+
+        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::veShuntStruct const& shuntData);
+
+    private:
+        float _voltage;
+        float _current;
+        float _temperature;
+        bool _tempPresent;
+        uint8_t _chargeCycles;
+        uint32_t _timeToGo;
+        float _chargedEnergy;
+        float _dischargedEnergy;
+        String _modelName;
+
+        bool _alarmLowVoltage;
+        bool _alarmHighVoltage;
+        bool _alarmLowSOC;
+        bool _alarmLowTemperature;
+        bool _alarmHighTemperature;
+};
+
+class MqttBatteryStats : public BatteryStats {
+    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 { }
+
+        // the SoC is the only interesting value in this case, which is already
+        // displayed at the top of the live view. do not generate a card.
+        void getLiveViewData(JsonVariant& root) const final { }
+
+        void setSoC(uint8_t SoC) { _SoC = SoC; _lastUpdateSoC = _lastUpdate = millis(); }
+};

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 0x00011900 // 0.1.24 // make sure to clean all after change
 
 #define WIFI_MAX_SSID_STRLEN 32
 #define WIFI_MAX_PASSWORD_STRLEN 64
@@ -19,21 +16,30 @@
 #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
 
 #define INV_MAX_NAME_STRLEN 31
-#define INV_MAX_COUNT 10
+#define INV_MAX_COUNT 5
 #define INV_MAX_CHAN_COUNT 6
 
 #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
+
+#define JSON_BUFFER_SIZE 15360
 
 struct CHANNEL_CONFIG_T {
     uint16_t MaxChannelPower;
@@ -52,11 +58,23 @@ struct INVERTER_CONFIG_T {
     uint8_t ReachableThreshold;
     bool ZeroRuntimeDataIfUnrechable;
     bool ZeroYieldDayOnMidnight;
-    bool ClearEventlogOnMidnight;
     bool YieldDayCorrection;
     CHANNEL_CONFIG_T channel[INV_MAX_CHAN_COUNT];
 };
 
+enum Auth { none, basic, digest };
+struct POWERMETER_HTTP_PHASE_CONFIG_T {
+    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];
+};
+
 struct CONFIG_T {
     struct {
         uint32_t Version;
@@ -92,8 +110,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];
@@ -134,8 +152,8 @@ struct CONFIG_T {
         struct {
             int8_t PaLevel;
             uint32_t Frequency;
-            uint8_t CountryMode;
         } Cmt;
+        bool VerboseLogging;
     } Dtu;
 
     struct {
@@ -148,49 +166,94 @@ struct CONFIG_T {
         bool ScreenSaver;
         uint8_t Rotation;
         uint8_t Contrast;
-        char Locale[LOCALE_STRLEN + 1];
+        uint8_t Language;
-        struct {
+        uint32_t DiagramDuration;
-            uint32_t Duration;
-            uint8_t Mode;
-        } Diagram;
     } Display;
 
     struct {
         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;
+        POWERMETER_HTTP_PHASE_CONFIG_T Http_Phase[POWERMETER_MAX_PHASES];
+    } PowerMeter;
+    
+    struct {
+        bool Enabled;
+        bool VerboseLogging;
+        bool SolarPassThroughEnabled;
+        uint8_t SolarPassThroughLosses;
+        uint8_t BatteryDrainStategy;
+        uint32_t Interval;
+        bool IsInverterBehindPowerMeter;
+        uint8_t InverterId;
+        uint8_t InverterChannelId;
+        int32_t TargetPowerConsumption;
+        int32_t TargetPowerConsumptionHysteresis;
+        int32_t LowerPowerLimit;
+        int32_t UpperPowerLimit;
+        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 MqttTopic[MQTT_MAX_TOPIC_STRLEN + 1];
+    } Battery;
+
+    struct {
+        bool Enabled;
+        uint32_t CAN_Controller_Frequency;
+        bool Auto_Power_Enabled;
+        float Auto_Power_Voltage_Limit;
+        float Auto_Power_Enable_Voltage_Limit;
+        float Auto_Power_Lower_Power_Limit;
+        float Auto_Power_Upper_Power_Limit;   
+    } 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();
+    CONFIG_T& get();
-
-    class WriteGuard {
-    public:
-        WriteGuard();
-        CONFIG_T& getConfig();
-        ~WriteGuard();
-
-    private:
-        std::unique_lock<std::mutex> _lock;
-    };
-
-    WriteGuard getWriteGuard();
 
     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;
+extern ConfigurationClass Configuration;

include/Datastore.h

@@ -6,7 +6,6 @@
 
 class DatastoreClass {
 public:
-    DatastoreClass();
     void init(Scheduler& scheduler);
 
     // Sum of yield total of all enabled inverters, a inverter which is just disabled at night is also included
@@ -82,4 +81,4 @@ private:
     bool _isAtLeastOnePollEnabled = false;
 };
 
-extern DatastoreClass Datastore;
+extern DatastoreClass Datastore;

include/Display_Graphic.h

@@ -6,31 +6,15 @@
 #include <TaskSchedulerDeclarations.h>
 #include <U8g2lib.h>
 
-#define CHART_HEIGHT 20 // chart area hight in pixels
-#define CHART_WIDTH 47 // chart area width in pixels
-
-// Left-Upper position of diagram is drawn
-// (text of Y-axis is display left of that pos)
-#define CHART_POSX 80
-#define CHART_POSY 0
-
 enum DisplayType_t {
     None,
     PCD8544,
     SSD1306,
     SH1106,
     SSD1309,
-    ST7567_GM12864I_59N,
     DisplayType_Max,
 };
 
-enum DiagramMode_t {
-    Off,
-    Small,
-    Fullscreen,
-    DisplayMode_Max,
-};
-
 class DisplayGraphicClass {
 public:
     DisplayGraphicClass();
@@ -40,8 +24,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();
 
     DisplayGraphicDiagramClass& Diagram();
@@ -64,24 +47,14 @@ private:
     bool _displayTurnedOn;
 
     DisplayType_t _display_type = DisplayType_t::None;
-    DiagramMode_t _diagram_mode = DiagramMode_t::Off;
+    uint8_t _display_language = DISPLAY_LANGUAGE;
-    String _display_language = DISPLAY_LOCALE;
     uint8_t _mExtra;
-    const uint16_t _period = 1000;
+    uint16_t _period = 1000;
-    const uint16_t _interval = 60000; // interval at which to power save (milliseconds)
+    uint16_t _interval = 60000; // interval at which to power save (milliseconds)
     uint32_t _previousMillis = 0;
     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;
+extern DisplayGraphicClass Display;

include/Display_Graphic_Diagram.h

@@ -5,14 +5,20 @@
 #include <U8g2lib.h>
 #include <array>
 
-#define MAX_DATAPOINTS 128
+#define CHART_HEIGHT 20 // chart area hight in pixels
+#define CHART_WIDTH 47 // chart area width in pixels
+
+// Left-Upper position of diagram is drawn
+// (text of Y-axis is display left of that pos)
+#define DIAG_POSX 80
+#define DIAG_POSY 0
 
 class DisplayGraphicDiagramClass {
 public:
     DisplayGraphicDiagramClass();
 
     void init(Scheduler& scheduler, U8G2* display);
-    void redraw(uint8_t screenSaverOffsetX, uint8_t xPos, uint8_t yPos, uint8_t width, uint8_t height, bool isFullscreen);
+    void redraw(uint8_t screenSaverOffsetX);
 
     void updatePeriod();
 
@@ -20,17 +26,15 @@ private:
     void averageLoop();
     void dataPointLoop();
 
-    uint32_t getSecondsPerDot();
+    static uint32_t getSecondsPerDot();
 
     Task _averageTask;
     Task _dataPointTask;
 
     U8G2* _display = nullptr;
-    std::array<float, MAX_DATAPOINTS> _graphValues = {};
+    std::array<float, CHART_WIDTH> _graphValues = {};
     uint8_t _graphValuesCount = 0;
 
-    uint8_t _chartWidth = MAX_DATAPOINTS;
-
     float _iRunningAverage = 0;
     uint16_t _iRunningAverageCnt = 0;
 };

include/HttpPowerMeter.h

@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <stdint.h>
+#include <Arduino.h>
+#include <HTTPClient.h>
+
+class HttpPowerMeterClass {
+public:
+    void init();
+    bool updateValues();
+    float getPower(int8_t phase);
+    bool httpRequest(const char* url, Auth authType, const char* username, const char* password, const char* httpHeader, const char* httpValue, uint32_t timeout,
+        char* response, size_t responseSize, char* error, size_t errorSize);
+    float getFloatValueByJsonPath(const char* jsonString, const char* jsonPath, float &value);
+
+private:
+     void extractUrlComponents(const String& url, String& protocol, String& hostname, String& uri);
+     void prepareRequest(uint32_t timeout, const char* httpHeader, const char* httpValue);
+     HTTPClient httpClient;
+     float power[POWERMETER_MAX_PHASES];
+     String sha256(const String& data);
+     
+};
+
+extern HttpPowerMeterClass HttpPowerMeter;

include/Huawei_can.h

@@ -0,0 +1,156 @@
+// 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();
+    bool getAutoPowerStatus();
+
+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;
+};
+
+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/InverterSettings.h

@@ -8,7 +8,6 @@
 
 class InverterSettingsClass {
 public:
-    InverterSettingsClass();
     void init(Scheduler& scheduler);
 
 private:

include/JkBmsController.h

@@ -0,0 +1,75 @@
+#pragma once
+
+#include <memory>
+#include <vector>
+
+#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; }
+
+    private:
+        enum class Status : unsigned {
+            Initializing,
+            Timeout,
+            WaitingForPollInterval,
+            HwSerialNotAvailableForWrite,
+            BusyReading,
+            RequestSent,
+            FrameCompleted
+        };
+
+        std::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,302 @@
+#pragma once
+
+#include <Arduino.h>
+#include <map>
+#include <optional>
+#include <string>
+#include <unordered_map>
+#include <variant>
+
+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 std::map<AlarmBits, std::string> 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 std::map<StatusBits, std::string> 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

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

include/MqttBattery.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#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;
+        std::shared_ptr<MqttBatteryStats> _stats = std::make_shared<MqttBatteryStats>();
+
+        void onMqttMessage(espMqttClientTypes::MessageProperties const& properties,
+                char const* topic, uint8_t const* payload, size_t len, size_t index, size_t total);
+};

include/MqttHandleDtu.h

@@ -6,7 +6,6 @@
 
 class MqttHandleDtuClass {
 public:
-    MqttHandleDtuClass();
     void init(Scheduler& scheduler);
 
 private:
@@ -15,4 +14,4 @@ private:
     Task _loopTask;
 };
 
-extern MqttHandleDtuClass MqttHandleDtu;
+extern MqttHandleDtuClass MqttHandleDtu;

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_REACTIVE_POWER
-    DEVICE_CLS_CONNECTIVITY,
-    DEVICE_CLS_DURATION,
-    DEVICE_CLS_SIGNAL_STRENGTH,
-    DEVICE_CLS_TEMPERATURE,
-    DEVICE_CLS_RESTART
 };
-const char* const deviceClass_name[] = { 0, "current", "energy", "power", "voltage", "frequency", "power_factor", "reactive_power", "connectivity", "duration", "signal_strength", "temperature", "restart" };
+const char* const deviceClasses[] = { 0, "current", "energy", "power", "voltage", "frequency", "temperature", "power_factor", "reactive_power" };
-
+enum {
-enum StateClassType {
     STATE_CLS_NONE = 0,
     STATE_CLS_MEASUREMENT,
     STATE_CLS_TOTAL_INCREASING
 };
-const char* const stateClass_name[] = { 0, "measurement", "total_increasing" };
+const char* const stateClasses[] = { 0, "measurement", "total_increasing" };
-
-enum CategoryType {
-    CATEGORY_NONE = 0,
-    CATEGORY_CONFIG,
-    CATEGORY_DIAGNOSTIC
-};
-const char* const category_name[] = { 0, "config", "diagnostic" };
-
 
 typedef struct {
     FieldId_t fieldId; // field id
-    DeviceClassType deviceClsId; // device class
+    uint8_t deviceClsId; // device class
-    StateClassType stateClsId; // state 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 },
@@ -64,36 +51,24 @@ const byteAssign_fieldDeviceClass_t deviceFieldAssignment[] = {
 
 class MqttHandleHassClass {
 public:
-    MqttHandleHassClass();
     void init(Scheduler& scheduler);
     void publishConfig();
     void forceUpdate();
 
 private:
     void loop();
-    static void publish(const String& subtopic, const String& payload);
+    void publish(const String& subtopic, const String& payload);
-    static void publish(const String& subtopic, const JsonDocument& doc);
+    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 addCommonMetadata(JsonDocument& doc, const String& unit_of_measure, const String& icon, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
+    static void createInverterInfo(DynamicJsonDocument& doc, std::shared_ptr<InverterAbstract> inv);
+    static void createDtuInfo(DynamicJsonDocument& doc);
 
-    // Binary Sensor
+    static void createDeviceInfo(DynamicJsonDocument& doc, const String& name, const String& identifiers, const String& configuration_url, const String& manufacturer, const String& model, const String& sw_version, const String& via_device = "");
-    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);
-
-    static void createInverterInfo(JsonDocument& doc, std::shared_ptr<InverterAbstract> inv);
-    static void createDtuInfo(JsonDocument& doc);
-
-    static void createDeviceInfo(JsonDocument& doc, const String& name, const String& identifiers, const String& configuration_url, const String& manufacturer, const String& model, const String& sw_version, const String& via_device = "");
 
     static String getDtuUniqueId();
     static String getDtuUrl();
@@ -104,4 +79,4 @@ private:
     bool _updateForced = false;
 };
 
-extern MqttHandleHassClass MqttHandleHass;
+extern MqttHandleHassClass MqttHandleHass;

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,22 +5,17 @@
 #include <Hoymiles.h>
 #include <TaskSchedulerDeclarations.h>
 #include <espMqttClient.h>
-#include <frozen/map.h>
-#include <frozen/string.h>
 
 class MqttHandleInverterClass {
 public:
-    MqttHandleInverterClass();
     void init(Scheduler& scheduler);
 
     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 +37,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;
+extern MqttHandleInverterClass MqttHandleInverter;

include/MqttHandleInverterTotal.h

@@ -5,7 +5,6 @@
 
 class MqttHandleInverterTotalClass {
 public:
-    MqttHandleInverterTotalClass();
     void init(Scheduler& scheduler);
 
 private:
@@ -14,4 +13,4 @@ private:
     Task _loopTask;
 };
 
-extern MqttHandleInverterTotalClass MqttHandleInverterTotal;
+extern MqttHandleInverterTotalClass MqttHandleInverterTotal;

include/MqttHandlePowerLimiter.h

@@ -0,0 +1,31 @@
+// 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();
+    void onCmdMode(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/MqttHandlePylontechHass.h

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <ArduinoJson.h>
+#include <TaskSchedulerDeclarations.h>
+
+class MqttHandlePylontechHassClass {
+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);
+    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 _wasConnected = false;
+    bool _updateForced = false;
+    String serial = "0001"; // pseudo-serial, can be replaced in future with real serialnumber
+};
+
+extern MqttHandlePylontechHassClass MqttHandlePylontechHass;

include/MqttHandleVedirect.h

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "VeDirectMpptController.h"
+#include "Configuration.h"
+#include <Arduino.h>
+#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();
+    VeDirectMpptController::veMpptStruct _kvFrame{};
+
+    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;
+};
+
+extern MqttHandleVedirectClass MqttHandleVedirect;

include/MqttHandleVedirectHass.h

@@ -0,0 +1,27 @@
+// 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);
+    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 _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;
+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 {
+typedef struct NetworkEventCbList {
-    DtuNetworkEventCb cb;
+    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;
+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,14 +33,23 @@ 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 victron_tx;
+    int8_t victron_rx;
+    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 led[PINMAPPING_LED_COUNT];
 };
 
@@ -59,19 +59,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,106 @@
+// 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 <TaskSchedulerDeclarations.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
+
+#define PL_MODE_ENABLE_NORMAL_OP 0
+#define PL_MODE_FULL_DISABLE 1
+#define PL_MODE_SOLAR_PT_ONLY 2
+
+typedef enum {
+    EMPTY_WHEN_FULL= 0, 
+    EMPTY_AT_NIGHT
+} batDrainStrategy;
+   
+
+class PowerLimiterClass {
+public:
+    enum class Status : unsigned {
+        Initializing,
+        DisabledByConfig,
+        DisabledByMqtt,
+        WaitingForValidTimestamp,
+        PowerMeterDisabled,
+        PowerMeterTimeout,
+        PowerMeterPending,
+        InverterInvalid,
+        InverterChanged,
+        InverterOffline,
+        InverterCommandsDisabled,
+        InverterLimitPending,
+        InverterPowerCmdPending,
+        InverterDevInfoPending,
+        InverterStatsPending,
+        UnconditionalSolarPassthrough,
+        NoVeDirect,
+        Settling,
+        Stable,
+    };
+
+    void init(Scheduler& scheduler);
+    uint8_t getPowerLimiterState();
+    int32_t getLastRequestedPowerLimit();
+
+    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;
+    uint32_t _lastPowerLimitMillis = 0;
+    uint32_t _shutdownTimeout = 0;
+    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;
+
+    std::string const& getStatusText(Status status);
+    void announceStatus(Status status);
+    bool shutdown(Status status);
+    bool shutdown() { return shutdown(_lastStatus); }
+    int32_t inverterPowerDcToAc(std::shared_ptr<InverterAbstract> inverter, int32_t dcPower);
+    void unconditionalSolarPassthrough(std::shared_ptr<InverterAbstract> inverter);
+    bool canUseDirectSolarPower();
+    int32_t calcPowerLimit(std::shared_ptr<InverterAbstract> inverter, bool solarPowerEnabled, bool batteryDischargeEnabled);
+    void commitPowerLimit(std::shared_ptr<InverterAbstract> inverter, int32_t limit, bool enablePowerProduction);
+    bool setNewPowerLimit(std::shared_ptr<InverterAbstract> inverter, int32_t newPowerLimit);
+    int32_t getSolarChargePower();
+    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,79 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "Configuration.h"
+#include <espMqttClient.h>
+#include <Arduino.h>
+#include <map>
+#include <list>
+#include "SDM.h"
+#include "sml.h"
+#include <TaskSchedulerDeclarations.h>
+
+#ifndef SDM_RX_PIN
+#define SDM_RX_PIN 13
+#endif
+
+#ifndef SDM_TX_PIN
+#define SDM_TX_PIN 32
+#endif
+
+#ifndef SML_RX_PIN
+#define SML_RX_PIN 35
+#endif
+
+typedef struct {
+  const unsigned char OBIS[6];
+  void (*Fn)(double&);
+  float* Arg;
+} OBISHandler;
+
+class PowerMeterClass {
+public:
+    enum SOURCE {
+        SOURCE_MQTT = 0,
+        SOURCE_SDM1PH = 1,
+        SOURCE_SDM3PH = 2,
+        SOURCE_HTTP = 3,
+        SOURCE_SML = 4
+    };
+    void init(Scheduler& scheduler);
+    float getPowerTotal(bool forceUpdate = true);
+    uint32_t getLastPowerMeterUpdate();
+
+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;
+
+    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/Utils.h

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

include/VictronMppt.h

@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <mutex>
+#include <memory>
+
+#include "VeDirectMpptController.h"
+#include <TaskSchedulerDeclarations.h>
+
+class VictronMpptClass {
+public:
+    VictronMpptClass() = default;
+    ~VictronMpptClass() = default;
+
+    void init(Scheduler& scheduler);
+    void updateSettings();
+
+    bool isDataValid() const;
+
+    // returns the data age of all controllers,
+    // i.e, the youngest data's age is returned.
+    uint32_t getDataAgeMillis() const;
+
+    VeDirectMpptController::spData_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
+    double getYieldTotal() const;
+
+    // sum of today's yield of all MPPT charge controllers in kWh
+    double getYieldDay() 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;
+};
+
+extern VictronMpptClass VictronMppt;

include/VictronSmartShunt.h

@@ -0,0 +1,16 @@
+// 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; }
+
+private:
+    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,14 @@
 // 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,13 +16,19 @@
 #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"
 #include "WebApi_webapp.h"
 #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,30 +36,27 @@ class WebApiClass {
 public:
     WebApiClass();
     void init(Scheduler& scheduler);
-    void reload();
 
     static bool checkCredentials(AsyncWebServerRequest* request);
     static bool checkCredentialsReadonly(AsyncWebServerRequest* request);
 
     static void sendTooManyRequests(AsyncWebServerRequest* request);
 
-    static void writeConfig(JsonVariant& retMsg, const WebApiError code = WebApiError::GenericSuccess, const String& message = "Settings saved!");
-
-    static bool parseRequestData(AsyncWebServerRequest* request, AsyncJsonResponse* response, JsonDocument& json_document);
-    static uint64_t parseSerialFromRequest(AsyncWebServerRequest* request, String param_name = "inv");
-    static bool sendJsonResponse(AsyncWebServerRequest* request, AsyncJsonResponse* response, const char* function, const uint16_t line);
-
 private:
+    void loop();
+
+    Task _loopTask;
+
     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 +64,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;
+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 <AsyncJson.h>
+
+class WebApiHuaweiClass {
+public:
+    void init(AsyncWebServer& server);
+    void loop();
+    void getJsonData(JsonObject& 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,18 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <ESPAsyncWebServer.h>
+
+
+class WebApiBatteryClass {
+public:
+    void init(AsyncWebServer& server);
+    void loop();
+
+private:
+    void onStatus(AsyncWebServerRequest* request);
+    void onAdminGet(AsyncWebServerRequest* request);
+    void onAdminPost(AsyncWebServerRequest* request);
+
+    AsyncWebServer* _server;
+};

include/WebApi_config.h

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <ESPAsyncWebServer.h>
+
+class WebApiConfigClass {
+public:
+    void init(AsyncWebServer& server);
+    void loop();
+
+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);
+
+    AsyncWebServer* _server;
+};

include/WebApi_device.h

@@ -2,13 +2,15 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiDeviceClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
     void onDeviceAdminGet(AsyncWebServerRequest* request);
     void onDeviceAdminPost(AsyncWebServerRequest* request);
-};
+
+    AsyncWebServer* _server;
+};

include/WebApi_devinfo.h

@@ -2,12 +2,14 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiDevInfoClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
     void onDevInfoStatus(AsyncWebServerRequest* request);
-};
+
+    AsyncWebServer* _server;
+};

include/WebApi_dtu.h

@@ -2,17 +2,15 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiDtuClass {
 public:
-    WebApiDtuClass();
+    void init(AsyncWebServer& server);
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void loop();
 
 private:
     void onDtuAdminGet(AsyncWebServerRequest* request);
     void onDtuAdminPost(AsyncWebServerRequest* request);
 
-    Task _applyDataTask;
+    AsyncWebServer* _server;
-    void applyDataTaskCb();
+};
-};

include/WebApi_errors.h

@@ -5,23 +5,19 @@ enum WebApiError {
     GenericBase = 1000,
     GenericSuccess,
     GenericNoValueFound,
-    GenericDataTooLarge, // not used anymore
+    GenericDataTooLarge,
     GenericParseError,
     GenericValueMissing,
-    GenericWriteFailed,
-    GenericInternalServerError,
 
     DtuBase = 2000,
     DtuSerialZero,
     DtuPollZero,
     DtuInvalidPowerLevel,
     DtuInvalidCmtFrequency,
-    DtuInvalidCmtCountry,
 
-    FileBase = 3000,
+    ConfigBase = 3000,
-    FileNotDeleted,
+    ConfigNotDeleted,
-    FileSuccess,
+    ConfigSuccess,
-    FileDeleteSuccess,
 
     InverterBase = 4000,
     InverterSerialZero,
@@ -33,7 +29,6 @@ enum WebApiError {
     InverterChanged,
     InverterDeleted,
     InverterOrdered,
-    InverterStatsResetted,
 
     LimitBase = 5000,
     LimitSerialZero,
@@ -62,7 +57,6 @@ enum WebApiError {
     MqttHassTopicLength,
     MqttHassTopicCharacter,
     MqttLwtQos,
-    MqttClientIdLength,
 
     NetworkBase = 8000,
     NetworkIpInvalid,
@@ -94,4 +88,4 @@ enum WebApiError {
 
     HardwareBase = 12000,
     HardwarePinMappingLength,
-};
+};

include/WebApi_eventlog.h

@@ -2,12 +2,14 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiEventlogClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
     void onEventlogStatus(AsyncWebServerRequest* request);
-};
+
+    AsyncWebServer* _server;
+};

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_firmware.h

@@ -2,13 +2,15 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiFirmwareClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
     void onFirmwareUpdateFinish(AsyncWebServerRequest* request);
     void onFirmwareUpdateUpload(AsyncWebServerRequest* request, String filename, size_t index, uint8_t* data, size_t len, bool final);
-};
+
+    AsyncWebServer* _server;
+};

include/WebApi_gridprofile.h

@@ -2,13 +2,15 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiGridProfileClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
     void onGridProfileStatus(AsyncWebServerRequest* request);
     void onGridProfileRawdata(AsyncWebServerRequest* request);
-};
+
+    AsyncWebServer* _server;
+};

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

@@ -2,11 +2,11 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiInverterClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
     void onInverterList(AsyncWebServerRequest* request);
@@ -14,5 +14,6 @@ private:
     void onInverterEdit(AsyncWebServerRequest* request);
     void onInverterDelete(AsyncWebServerRequest* request);
     void onInverterOrder(AsyncWebServerRequest* request);
-    void onInverterStatReset(AsyncWebServerRequest* request);
+
-};
+    AsyncWebServer* _server;
+};

include/WebApi_limit.h

@@ -2,13 +2,15 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiLimitClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
     void onLimitStatus(AsyncWebServerRequest* request);
     void onLimitPost(AsyncWebServerRequest* request);
-};
+
+    AsyncWebServer* _server;
+};

include/WebApi_maintenance.h

@@ -2,12 +2,14 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiMaintenanceClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
     void onRebootPost(AsyncWebServerRequest* request);
-};
+
+    AsyncWebServer* _server;
+};

include/WebApi_mqtt.h

@@ -2,15 +2,19 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
+
+#define MQTT_JSON_DOC_SIZE 10240
 
 class WebApiMqttClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
     void onMqttStatus(AsyncWebServerRequest* request);
     void onMqttAdminGet(AsyncWebServerRequest* request);
     void onMqttAdminPost(AsyncWebServerRequest* request);
     String getTlsCertInfo(const char* cert);
-};
+
+    AsyncWebServer* _server;
+};

include/WebApi_network.h

@@ -2,14 +2,16 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiNetworkClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
     void onNetworkStatus(AsyncWebServerRequest* request);
     void onNetworkAdminGet(AsyncWebServerRequest* request);
     void onNetworkAdminPost(AsyncWebServerRequest* request);
-};
+
+    AsyncWebServer* _server;
+};

include/WebApi_ntp.h

@@ -2,11 +2,11 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiNtpClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
     void onNtpStatus(AsyncWebServerRequest* request);
@@ -14,4 +14,6 @@ private:
     void onNtpAdminPost(AsyncWebServerRequest* request);
     void onNtpTimeGet(AsyncWebServerRequest* request);
     void onNtpTimePost(AsyncWebServerRequest* request);
-};
+
+    AsyncWebServer* _server;
+};

include/WebApi_power.h

@@ -2,13 +2,15 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiPowerClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
     void onPowerStatus(AsyncWebServerRequest* request);
     void onPowerPost(AsyncWebServerRequest* request);
-};
+
+    AsyncWebServer* _server;
+};

include/WebApi_powerlimiter.h

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

include/WebApi_powermeter.h

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

include/WebApi_prometheus.h

@@ -3,12 +3,12 @@
 
 #include <ESPAsyncWebServer.h>
 #include <Hoymiles.h>
-#include <TaskSchedulerDeclarations.h>
 #include <map>
 
 class WebApiPrometheusClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
     void onPrometheusMetricsGet(AsyncWebServerRequest* request);
@@ -17,6 +17,8 @@ private:
 
     void addPanelInfo(AsyncResponseStream* stream, const String& serial, const uint8_t idx, std::shared_ptr<InverterAbstract> inv, const ChannelType_t type, const ChannelNum_t channel);
 
+    AsyncWebServer* _server;
+
     enum MetricType_t {
         NONE = 0,
         GAUGE,
@@ -45,4 +47,4 @@ private:
         { FLD_EFF, MetricType_t::GAUGE },
         { FLD_IRR, MetricType_t::GAUGE },
     };
-};
+};

include/WebApi_security.h

@@ -2,15 +2,17 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiSecurityClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
     void onSecurityGet(AsyncWebServerRequest* request);
     void onSecurityPost(AsyncWebServerRequest* request);
 
     void onAuthenticateGet(AsyncWebServerRequest* request);
-};
+
+    AsyncWebServer* _server;
+};

include/WebApi_sysstatus.h

@@ -2,12 +2,14 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiSysstatusClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
     void onSystemStatus(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>
+
+
+class WebApiVedirectClass {
+public:
+    void init(AsyncWebServer& server);
+    void loop();
+
+private:
+    void onVedirectStatus(AsyncWebServerRequest* request);
+    void onVedirectAdminGet(AsyncWebServerRequest* request);
+    void onVedirectAdminPost(AsyncWebServerRequest* request);
+
+    AsyncWebServer* _server;
+};

include/WebApi_webapp.h

@@ -2,12 +2,12 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiWebappClass {
 public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
+    void loop();
 
 private:
-    void responseBinaryDataWithETagCache(AsyncWebServerRequest* request, const String &contentType, const String &contentEncoding, const uint8_t *content, size_t len);
+    AsyncWebServer* _server;
-};
+};

include/WebApi_ws_Huawei.h

@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "ArduinoJson.h"
+#include <ESPAsyncWebServer.h>
+//#include <HuaweiFrameHandler.h>
+
+class WebApiWsHuaweiLiveClass {
+public:
+    WebApiWsHuaweiLiveClass();
+    void init(AsyncWebServer& server);
+    void loop();
+
+private:
+    void generateJsonResponse(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 _lastWsCleanup = 0;
+    uint32_t _lastUpdateCheck = 0;
+};

include/WebApi_ws_battery.h

@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "ArduinoJson.h"
+#include <ESPAsyncWebServer.h>
+
+class WebApiWsBatteryLiveClass {
+public:
+    WebApiWsBatteryLiveClass();
+    void init(AsyncWebServer& server);
+    void loop();
+
+private:
+    void generateJsonResponse(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 _lastWsCleanup = 0;
+    uint32_t _lastUpdateCheck = 0;
+    static constexpr uint16_t _responseSize = 1024 + 512;
+};

include/WebApi_ws_console.h

@@ -1,19 +1,17 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
+#pragma once
-
+
-#include <ESPAsyncWebServer.h>
+#include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
+
-
+class WebApiWsConsoleClass {
-class WebApiWsConsoleClass {
+public:
-public:
+    WebApiWsConsoleClass();
-    WebApiWsConsoleClass();
+    void init(AsyncWebServer& server);
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void loop();
-    void reload();
+
-
+private:
-private:
+    AsyncWebServer* _server;
-    AsyncWebSocket _ws;
+    AsyncWebSocket _ws;
-    AsyncAuthenticationMiddleware _simpleDigestAuth;
+
-
+    uint32_t _lastWsCleanup = 0;
-    Task _wsCleanupTask;
+};
-    void wsCleanupTaskCb();
-};

include/WebApi_ws_live.h

@@ -1,39 +1,30 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "Configuration.h"
 #include <ArduinoJson.h>
 #include <ESPAsyncWebServer.h>
 #include <Hoymiles.h>
-#include <TaskSchedulerDeclarations.h>
 
 class WebApiWsLiveClass {
 public:
     WebApiWsLiveClass();
-    void init(AsyncWebServer& server, Scheduler& scheduler);
+    void init(AsyncWebServer& server);
-    void reload();
+    void loop();
 
 private:
-    static void generateInverterCommonJsonResponse(JsonObject& root, std::shared_ptr<InverterAbstract> inv);
+    void generateJsonResponse(JsonVariant& root);
-    static void generateInverterChannelJsonResponse(JsonObject& root, std::shared_ptr<InverterAbstract> inv);
+    void addField(JsonObject& root, uint8_t idx, std::shared_ptr<InverterAbstract> inv, const ChannelType_t type, const ChannelNum_t channel, const FieldId_t fieldId, String topic = "");
-    static void generateCommonJsonResponse(JsonVariant& root);
+    void addTotalField(JsonObject& root, const String& name, const float value, const String& unit, const uint8_t digits);
-
-    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);
-
     void onLivedataStatus(AsyncWebServerRequest* request);
     void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len);
 
+    AsyncWebServer* _server;
     AsyncWebSocket _ws;
-    AsyncAuthenticationMiddleware _simpleDigestAuth;
 
-    uint32_t _lastPublishStats[INV_MAX_COUNT] = { 0 };
+    uint32_t _lastWsPublish = 0;
+    uint32_t _lastInvUpdateCheck = 0;
+    uint32_t _lastWsCleanup = 0;
+    uint32_t _newestInverterTimestamp = 0;
 
     std::mutex _mutex;
-
+};
-    Task _wsCleanupTask;
-    void wsCleanupTaskCb();
-
-    Task _sendDataTask;
-    void sendDataTaskCb();
-};

include/WebApi_ws_vedirect_live.h

@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "ArduinoJson.h"
+#include <ESPAsyncWebServer.h>
+#include <VeDirectMpptController.h>
+
+class WebApiWsVedirectLiveClass {
+public:
+    WebApiWsVedirectLiveClass();
+    void init(AsyncWebServer& server);
+    void loop();
+
+private:
+    void generateJsonResponse(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 _lastWsPublish = 0;
+    uint32_t _lastWsCleanup = 0;
+    uint32_t _dataAgeMillis = 0;
+    static constexpr uint16_t _responseSize = 1024 + 128;
+};

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,11 +9,11 @@
 
 #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
 
-#define WIFI_RECONNECT_TIMEOUT 30
+#define WIFI_RECONNECT_TIMEOUT 15
 #define WIFI_RECONNECT_REDO_TIMEOUT 600
 
 #define WIFI_SSID ""
@@ -22,8 +22,7 @@
 
 #define MDNS_ENABLED false
 
-#define NTP_SERVER_OLD "pool.ntp.org"
+#define NTP_SERVER "pool.ntp.org"
-#define NTP_SERVER "opendtu.pool.ntp.org"
 #define NTP_TIMEZONE "CET-1CEST,M3.5.0,M10.5.0/3"
 #define NTP_TIMEZONEDESCR "Europe/Berlin"
 #define NTP_LONGITUDE 10.4515f
@@ -84,8 +83,7 @@
 #define DTU_POLL_INTERVAL 5U
 #define DTU_NRF_PA_LEVEL 0U
 #define DTU_CMT_PA_LEVEL 0
-#define DTU_CMT_FREQUENCY 865000000U
+#define DTU_CMT_FREQUENCY 865000U
-#define DTU_CMT_COUNTRY_MODE 0U
 
 #define MQTT_HASS_ENABLED false
 #define MQTT_HASS_EXPIRE true
@@ -99,14 +97,61 @@
 #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
 
 #define REACHABLE_THRESHOLD 2U
 
 #define LED_BRIGHTNESS 100U
 
 #define MAX_INVERTER_LIMIT 2250
+#define VEDIRECT_ENABLED false
+#define VEDIRECT_VERBOSE_LOGGING false
+#define VEDIRECT_UPDATESONLY true
 
-#define LANG_PACK_SUFFIX ".lang.json"
+#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_DRAIN_STRATEGY 0
+#define POWERLIMITER_INTERVAL 10
+#define POWERLIMITER_IS_INVERTER_BEHIND_POWER_METER true
+#define POWERLIMITER_INVERTER_ID 0
+#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_UPPER_POWER_LIMIT 800
+#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 VERBOSE_LOGGING true
+
+#define LED_BRIGHTNESS 100U
+
+#define MAX_INVERTER_LIMIT 2250