update changelog

- stop webserver on shutdown
- enable asyncio debug mode for debug versions

.coveragerc

@@ -1,3 +1,2 @@
 [run]
-branch = True
-relative_files = True
+branch = True

.github/workflows/python-app.yml

@@ -18,11 +18,10 @@ on:
     - '**.dockerfile' # Do no build on *.dockerfile changes
     - '**.sh' # Do no build on *.sh changes     
   pull_request:
-    branches: [ "main", "dev-*" ]
+    branches: [ "main" ]
 
 permissions:
   contents: read
-  pull-requests: read # allows SonarCloud to decorate PRs with analysis results
 
 jobs:
   build:
@@ -30,24 +29,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Set timezone
-      uses: szenius/set-timezone@v2.0
-      with:
-        timezoneLinux: "Europe/Berlin"
-        timezoneMacos: "Europe/Berlin"
-        timezoneWindows: "Europe/Berlin"
-    # - name: Start Mosquitto
-    #  uses: namoshek/mosquitto-github-action@v1
-    #  with:
-    #    version: '1.6'
-    #    ports: '1883:1883 8883:8883'
-        # certificates: ${{ github.workspace }}/.ci/tls-certificates
-        # config: ${{ github.workspace }}/.ci/mosquitto.conf
-        # password-file: ${{ github.workspace}}/.ci/mosquitto.passwd
-    #    container-name: 'mqtt'
     - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
     - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:
@@ -55,28 +37,14 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        if [ -f requirements-test.txt ]; then pip install -r requirements-test.txt; fi
+        pip install flake8 pytest pytest-asyncio
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 --exit-zero --ignore=C901,E121,E123,E126,E133,E226,E241,E242,E704,W503,W504,W505 --format=pylint --output-file=output_flake.txt --exclude=*.pyc app/src/
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
-        python -m pytest app --cov=app/src --cov-report=xml
-        coverage report
-    - name: Analyze with SonarCloud
-      uses: SonarSource/sonarcloud-github-action@v2.2.0
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      with:
-        projectBaseDir: .
-        args:
-          -Dsonar.projectKey=s-allius_tsun-gen3-proxy
-          -Dsonar.python.coverage.reportPaths=coverage.xml
-          -Dsonar.python.flake8.reportPaths=output_flake.txt
-          # -Dsonar.docker.hadolint.reportPaths=
-  
+        python -m pytest app

.sonarlint/connectedMode.json

@@ -1,4 +0,0 @@
-{
-    "sonarCloudOrganization": "s-allius",
-    "projectKey": "s-allius_tsun-gen3-proxy"
-}

.vscode/settings.json

@@ -11,12 +11,5 @@
     "python.testing.pytestEnabled": true,
     "flake8.args": [
         "--extend-exclude=app/tests/*.py system_tests/*.py"   
-    ],
-    "sonarlint.connectedMode.project": {
-        "connectionId": "s-allius",
-        "projectKey": "s-allius_tsun-gen3-proxy"
-    },
-    "files.exclude": {
-        "**/*.pyi": true
-    }
+    ]
 }

CHANGELOG.md

@@ -7,38 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
-- GEN3: add support for new messages of version 3 firmwares
-- add support for controller MAC and serial number
-- GEN3: don't crash on overwritten msg in the receive buffer
-- Reading the version string from the image updates it even if the image is re-pulled without re-deployment
-  
-## [0.10.1] - 2024-08-10
-
-- fix displaying the version string at startup and in HA [#153](https://github.com/s-allius/tsun-gen3-proxy/issues/153)
-
-## [0.10.0] - 2024-08-09
-
-- bump aiohttp to version 3.10.2
-- add SonarQube and code coverage support
-- don't send MODBUS request when state is note up; adapt timeouts [#141](https://github.com/s-allius/tsun-gen3-proxy/issues/141)
-- build multi arch images with sboms [#144](https://github.com/s-allius/tsun-gen3-proxy/issues/144)
-- add timestamp to MQTT topics [#138](https://github.com/s-allius/tsun-gen3-proxy/issues/138)
-- improve the message handling, to avoid hangs
-- GEN3: allow long timeouts until we received first inverter data (not only device data)
-- bump aiomqtt to version 2.2.0
-- bump schema to version 0.7.7
-- Home Assistant: improve inverter status value texts
-- GEN3: add inverter status
-- fix flapping registers [#128](https://github.com/s-allius/tsun-gen3-proxy/issues/128)
-- register OUTPUT_COEFFICIENT at HA
-- GEN3: INVERTER_STATUS,
-- add config option to disable the MODBUS polling [#120](https://github.com/s-allius/tsun-gen3-proxy/issues/120)
-- make the maximum output coefficient configurable [#123](https://github.com/s-allius/tsun-gen3-proxy/issues/123)
-- cleanup shutdown
-- add preview build
-- MODBUS: the last digit of the inverter version is a hexadecimal number [#119](https://github.com/s-allius/tsun-gen3-proxy/issues/119)
-- GEN3PLUS: add client_mode connection on port 8899 [#117](https://github.com/s-allius/tsun-gen3-proxy/issues/117)
-
 ## [0.9.0] - 2024-07-01
 
 - fix exception in MODBUS timeout callback

README.md

@@ -7,15 +7,9 @@
 <p align="center">
     <a href="https://opensource.org/licenses/BSD-3-Clause"><img alt="License: BSD-3-Clause" src="https://img.shields.io/badge/License-BSD_3--Clause-green.svg"></a>
     <a href="https://www.python.org/downloads/release/python-3120/"><img alt="Supported Python versions" src="https://img.shields.io/badge/python-3.12-blue.svg"></a>
-    <a href="https://sbtinstruments.github.io/aiomqtt/introduction.html"><img alt="Supported aiomqtt versions" src="https://img.shields.io/badge/aiomqtt-2.2.0-lightblue.svg"></a>
+    <a href="https://sbtinstruments.github.io/aiomqtt/introduction.html"><img alt="Supported aiomqtt versions" src="https://img.shields.io/badge/aiomqtt-2.0.1-lightblue.svg"></a>
     <a href="https://libraries.io/pypi/aiocron"><img alt="Supported aiocron versions" src="https://img.shields.io/badge/aiocron-1.8-lightblue.svg"></a>
-    <a href="https://toml.io/en/v1.0.0"><img alt="Supported toml versions" src="https://img.shields.io/badge/toml-1.0.0-lightblue.svg"></a>   
-    <br>
-    <a href="https://sonarcloud.io/component_measures?id=s-allius_tsun-gen3-proxy&metric=alert_status"><img src="https://sonarcloud.io/api/project_badges/measure?project=s-allius_tsun-gen3-proxy&metric=alert_status"></a>
-    <a href="https://sonarcloud.io/component_measures?id=s-allius_tsun-gen3-proxy&metric=bugs"><img src="https://sonarcloud.io/api/project_badges/measure?project=s-allius_tsun-gen3-proxy&metric=bugs"></a>
-    <a href="https://sonarcloud.io/component_measures?id=s-allius_tsun-gen3-proxy&metric=code_smells"><img src="https://sonarcloud.io/api/project_badges/measure?project=s-allius_tsun-gen3-proxy&metric=code_smells"></a>
-    <br>
-    <a href="https://sonarcloud.io/component_measures?id=s-allius_tsun-gen3-proxy&metric=coverage"><img src="https://sonarcloud.io/api/project_badges/measure?project=s-allius_tsun-gen3-proxy&metric=coverage"></a>
+    <a href="https://toml.io/en/v1.0.0"><img alt="Supported toml versions" src="https://img.shields.io/badge/toml-1.0.0-lightblue.svg"></a>
 </p>
 
 # Overview
@@ -158,14 +152,12 @@ inverters.allow_all = false   # True: allow inverters, even if we have no invert
 [inverters."R17xxxxxxxxxxxx1"]
 node_id = 'inv1'              # Optional, MQTT replacement for inverters serial number  
 suggested_area = 'roof'       # Optional, suggested installation area for home-assistant
-modbus_polling = false        # Disable optional MODBUS polling for GEN3 inverter
 pv1 = {type = 'RSM40-8-395M', manufacturer = 'Risen'}   # Optional, PV module descr
 pv2 = {type = 'RSM40-8-395M', manufacturer = 'Risen'}   # Optional, PV module descr
 
 [inverters."R17xxxxxxxxxxxx2"]
 node_id = 'inv2'              # Optional, MQTT replacement for inverters serial number  
 suggested_area = 'balcony'    # Optional, suggested installation area for home-assistant
-modbus_polling = false        # Disable optional MODBUS polling for GEN3 inverter
 pv1 = {type = 'RSM40-8-405M', manufacturer = 'Risen'}   # Optional, PV module descr
 pv2 = {type = 'RSM40-8-405M', manufacturer = 'Risen'}   # Optional, PV module descr
 
@@ -173,10 +165,6 @@ pv2 = {type = 'RSM40-8-405M', manufacturer = 'Risen'}   # Optional, PV module de
 monitor_sn = 2000000000       # The "Monitoring SN:" can be found on a sticker enclosed with the inverter
 node_id = 'inv_3'             # MQTT replacement for inverters serial number  
 suggested_area = 'garage'     # suggested installation place for home-assistant
-modbus_polling = false        # Enable optional MODBUS polling for GEN3PLUS inverter
-# if your inverter supports SSL connections you must use the client_mode. Pls, uncomment
-# the next line and configure the fixed IP of your inverter
-#client_mode = {host = '192.168.0.1', port = 8899}       
 pv1 = {type = 'RSM40-8-410M', manufacturer = 'Risen'}   # Optional, PV module descr
 pv2 = {type = 'RSM40-8-410M', manufacturer = 'Risen'}   # Optional, PV module descr
 pv3 = {type = 'RSM40-8-410M', manufacturer = 'Risen'}   # Optional, PV module descr
@@ -200,25 +188,8 @@ The standard web interface of the inverter can be accessed at `http://<ip-adress
 
 For our purpose, the hidden URL `http://<ip-adress>/config_hide.html` should be called. There you can see and modify the parameters for accessing the cloud. Here we enter the IP address of our proxy and the IP port `10000` for the `Server A Setting` and for `Optional Server Setting`. The second entry is used as a backup in the event of connection problems.
 
-```txt
-❗If the IP port is set to 10443 in the inverter configuration, you probably have a firmware with SSL support.
-In this case, you MUST NOT change the port or the host address, as this may cause the inverter to hang and
-require a complete reset. Use the configuration in client mode instead.
-```
-
-
 If access to the web interface does not work, it can also be redirected via DNS redirection, as is necessary for the GEN3 inverters.
 
-## Client Mode (GEN3PLUS only)
-
-Newer GEN3PLUS inverters support SSL encrypted connections over port 10443 to the TSUN cloud. In this case you can't loop the proxy into this connection, since the certicate verification of the inverter don't allow this. You can configure the proxy in client-mode to establish an unencrypted connection to the inverter. For this porpuse the inverter listen on port `8899`.
-
-There are some requirements to be met:
-
-- the inverter should have a fixed IP
-- the proxy must be able to reach the inverter. You must configure a corresponding route in your router if the inverter and the proxy are in different IP networks
-- add a 'client_mode' line to your config.toml file, to specify the inverter's ip address
-
 ## DNS Settings
 
 ### Loop the proxy into the connection
@@ -255,11 +226,11 @@ In the following table you will find an overview of which inverter model has bee
 A combination with a red question mark should work, but I have not checked it in detail.
 
 <table align="center">
-  <tr><th align="center">Micro Inverter Model</th><th align="center">Fw. 1.00.06</th><th align="center">Fw. 1.00.17</th><th align="center">Fw. 1.00.20</th><th align="center">Fw. 4.0.10</th><th align="center">Fw. 4.0.20</th></tr>
-  <tr><td>GEN3 micro inverters (single MPPT):<br>MS300, MS350, MS400<br>MS400-D</td><td align="center">❓</td><td align="center">❓</td><td align="center">❓</td><td align="center">➖</td><td align="center">➖</td></tr>
-  <tr><td>GEN3 micro inverters (dual MPPT):<br>MS600, MS700, MS800<br>MS600-D, MS800-D</td><td align="center">✔️</td><td align="center">✔️</td><td align="center">✔️</td><td align="center">➖</td><td align="center">➖</td></tr>
-  <tr><td>GEN3 PLUS micro inverters:<br>MS1600, MS1800, MS2000<br>MS2000-D</td><td align="center">➖</td><td align="center">➖</td><td align="center">➖</td><td align="center">✔️</td><td align="center">✔️</td></tr>
-  <tr><td>TITAN micro inverters:<br>TSOL-MP3000, MP2250, MS3000</td><td align="center">❓</td><td align="center">❓</td><td align="center">❓</td><td align="center">❓</td><td align="center">❓</td></tr>
+  <tr><th align="center">Micro Inverter Model</th><th align="center">Fw. 1.00.06</th><th align="center">Fw. 1.00.17</th><th align="center">Fw. 1.00.20</th><th align="center">Fw. 4.0.10</th></tr>
+  <tr><td>GEN3 micro inverters (single MPPT):<br>MS300, MS350, MS400<br>MS400-D</td><td align="center">❓</td><td align="center">❓</td><td align="center">❓</td><td align="center">➖</td></tr>
+  <tr><td>GEN3 micro inverters (dual MPPT):<br>MS600, MS700, MS800<br>MS600-D, MS800-D</td><td align="center">✔️</td><td align="center">✔️</td><td align="center">✔️</td><td align="center">➖</td></tr>
+  <tr><td>GEN3 PLUS micro inverters:<br>MS1600, MS1800, MS2000<br>MS2000-D</td><td align="center">➖</td><td align="center">➖</td><td align="center">➖</td><td align="center">✔️</td></tr>
+  <tr><td>TITAN micro inverters:<br>TSOL-MP3000, MP2250, MS3000</td><td align="center">❓</td><td align="center">❓</td><td align="center">❓</td><td align="center">❓</td></tr>
 </table>
 
 ```txt

app/Dockerfile

@@ -34,6 +34,7 @@ ARG GID
 ARG LOG_LVL
 ARG environment
 
+ENV VERSION=$VERSION
 ENV SERVICE_NAME=$SERVICE_NAME
 ENV UID=$UID
 ENV GID=$GID 
@@ -62,10 +63,17 @@ RUN python -m pip install --no-cache --no-index /root/wheels/* && \
 COPY --chmod=0700 entrypoint.sh /root/entrypoint.sh
 COPY config .
 COPY src .
-RUN echo ${VERSION} > /proxy-version.txt \
-  && date > /build-date.txt
+RUN date > /build-date.txt
 EXPOSE 5005 8127 10000
 
 # command to run on container start
 ENTRYPOINT ["/root/entrypoint.sh"]
 CMD [ "python3", "./server.py" ]
+
+
+LABEL org.opencontainers.image.title="TSUN Gen3 Proxy"
+LABEL org.opencontainers.image.authors="Stefan Allius"
+LABEL org.opencontainers.image.source=https://github.com/s-allius/tsun-gen3-proxy
+LABEL org.opencontainers.image.description='This proxy enables a reliable connection between TSUN third generation inverters (eg. TSOL MS600, MS800, MS2000) and an MQTT broker to integrate the inverter into typical home automations.'
+LABEL org.opencontainers.image.licenses="BSD-3-Clause"
+LABEL org.opencontainers.image.vendor="Stefan Allius"

app/build.sh

@@ -18,34 +18,38 @@ arr=(${VERSION//./ })
 MAJOR=${arr[0]}
 IMAGE=tsun-gen3-proxy
 
-GREEN='\033[0;32m'
-BLUE='\033[0;34m'
-NC='\033[0m'
-
 if [[ $1 == debug ]] || [[ $1 == dev ]] ;then
 IMAGE=docker.io/sallius/${IMAGE}
-VERSION=${VERSION}+$1
-elif [[ $1 == rc ]] || [[ $1 == rel ]] || [[ $1 == preview ]] ;then
+VERSION=${VERSION}-$1
+elif [[ $1 == rc ]] || [[ $1 == rel ]];then
 IMAGE=ghcr.io/s-allius/${IMAGE}
-echo 'login to ghcr.io'    
-echo $GHCR_TOKEN | docker login ghcr.io -u s-allius --password-stdin
 else
 echo argument missing!
-echo try: $0 '[debug|dev|preview|rc|rel]'
+echo try: $0 '[debug|dev|rc|rel]'
 exit 1
 fi
 
-export IMAGE
-export VERSION
-export BUILD_DATE
-export BRANCH
-export MAJOR
-
 echo version: $VERSION  build-date: $BUILD_DATE   image: $IMAGE
-docker buildx bake -f app/docker-bake.hcl $1
+if [[ $1 == debug ]];then
+docker build --build-arg "VERSION=${VERSION}" --build-arg environment=dev --build-arg "LOG_LVL=DEBUG" --label "org.opencontainers.image.created=${BUILD_DATE}" --label "org.opencontainers.image.version=${VERSION}" --label "org.opencontainers.image.revision=${BRANCH}" -t ${IMAGE}:debug app
+elif [[ $1 == dev ]];then
+docker build --build-arg "VERSION=${VERSION}" --build-arg environment=production --label "org.opencontainers.image.created=${BUILD_DATE}" --label "org.opencontainers.image.version=${VERSION}" --label "org.opencontainers.image.revision=${BRANCH}" -t ${IMAGE}:dev app
 
-echo -e "${BLUE} => checking docker-compose.yaml file${NC}"
-docker-compose config -q
-echo
-echo -e "${GREEN}${BUILD_DATE} => Version: ${VERSION}${NC} finished"
-echo
+elif [[ $1 == rc ]];then
+docker build --build-arg "VERSION=${VERSION}" --build-arg environment=production --label "org.opencontainers.image.created=${BUILD_DATE}" --label "org.opencontainers.image.version=${VERSION}" --label "org.opencontainers.image.revision=${BRANCH}" -t ${IMAGE}:rc -t ${IMAGE}:${VERSION} app
+echo 'login to ghcr.io'    
+echo $GHCR_TOKEN | docker login ghcr.io -u s-allius --password-stdin
+docker push -q ghcr.io/s-allius/tsun-gen3-proxy:rc
+docker push -q ghcr.io/s-allius/tsun-gen3-proxy:${VERSION}
+
+elif [[ $1 == rel ]];then
+docker build --no-cache --build-arg "VERSION=${VERSION}" --build-arg environment=production --label "org.opencontainers.image.created=${BUILD_DATE}" --label "org.opencontainers.image.version=${VERSION}" --label "org.opencontainers.image.revision=${BRANCH}" -t ${IMAGE}:latest -t ${IMAGE}:${MAJOR} -t ${IMAGE}:${VERSION} app
+echo 'login to ghcr.io'    
+echo $GHCR_TOKEN | docker login ghcr.io -u s-allius --password-stdin
+docker push -q ghcr.io/s-allius/tsun-gen3-proxy:latest
+docker push -q ghcr.io/s-allius/tsun-gen3-proxy:${MAJOR}
+docker push -q ghcr.io/s-allius/tsun-gen3-proxy:${VERSION}
+fi
+
+echo 'check docker-compose.yaml file'
+docker-compose config -q

app/config/default_config.toml

@@ -31,14 +31,12 @@ inverters.allow_all = true   # allow inverters, even if we have no inverter mapp
 [inverters."R170000000000001"]
 #node_id = ''                 # Optional, MQTT replacement for inverters serial number  
 #suggested_area = ''          # Optional, suggested installation area for home-assistant
-modbus_polling = false        # Disable optional MODBUS polling
 #pv1 = {type = 'RSM40-8-395M', manufacturer = 'Risen'}   # Optional, PV module descr
 #pv2 = {type = 'RSM40-8-395M', manufacturer = 'Risen'}   # Optional, PV module descr
 
 #[inverters."R17xxxxxxxxxxxx2"]
 #node_id = ''                 # Optional, MQTT replacement for inverters serial number  
 #suggested_area = ''          # Optional, suggested installation area for home-assistant
-#modbus_polling = false        # Disable optional MODBUS polling
 #pv1 = {type = 'RSM40-8-405M', manufacturer = 'Risen'}   # Optional, PV module descr
 #pv2 = {type = 'RSM40-8-405M', manufacturer = 'Risen'}   # Optional, PV module descr
 
@@ -46,12 +44,6 @@ modbus_polling = false        # Disable optional MODBUS polling
 monitor_sn = 2000000000       # The "Monitoring SN:" can be found on a sticker enclosed with the inverter
 #node_id = ''                 # Optional, MQTT replacement for inverters serial number  
 #suggested_area = ''          # Optional, suggested installation place for home-assistant
-modbus_polling = true         # Enable optional MODBUS polling
-
-# if your inverter supports SSL connections you must use the client_mode. Pls, uncomment
-# the next line and configure the fixed IP of your inverter
-#client_mode = {host = '192.168.0.1', port = 8899}  
-
 #pv1 = {type = 'RSM40-8-410M', manufacturer = 'Risen'}   # Optional, PV module descr
 #pv2 = {type = 'RSM40-8-410M', manufacturer = 'Risen'}   # Optional, PV module descr
 #pv3 = {type = 'RSM40-8-410M', manufacturer = 'Risen'}   # Optional, PV module descr

app/docker-bake.hcl

@@ -1,93 +0,0 @@
-variable "IMAGE" {
-    default = "tsun-gen3-proxy"
-}
-variable "VERSION" {
-    default = "0.0.0"
-}
-variable "MAJOR" {
-    default = "0"
-}
-variable "BUILD_DATE" {
-    default = "dev"
-}
-variable "BRANCH" {
-    default = ""
-}
-variable "DESCRIPTION" {
-    default = "This proxy enables a reliable connection between TSUN third generation inverters (eg. TSOL MS600, MS800, MS2000) and an MQTT broker to integrate the inverter into typical home automations."
-}
-
-target "_common" {
-  context = "app"
-  dockerfile = "Dockerfile"
-  args = {
-    VERSION = "${VERSION}"
-    environment = "production"
-  }
-  attest = [
-    "type =provenance,mode=max",
-    "type =sbom,generator=docker/scout-sbom-indexer:latest"
-  ]
-  annotations = [
-    "index:org.opencontainers.image.title=TSUN Gen3 Proxy",
-    "index:org.opencontainers.image.authors=Stefan Allius",
-    "index:org.opencontainers.image.created=${BUILD_DATE}",
-    "index:org.opencontainers.image.version=${VERSION}",
-    "index:org.opencontainers.image.revision=${BRANCH}",
-    "index:org.opencontainers.image.description=${DESCRIPTION}",
-    "index:org.opencontainers.image.licenses=BSD-3-Clause",
-    "index:org.opencontainers.image.source=https://github.com/s-allius/tsun-gen3-proxy"
-  ]
-  labels = {
-    "org.opencontainers.image.title" = "TSUN Gen3 Proxy"
-    "org.opencontainers.image.authors" = "Stefan Allius"
-    "org.opencontainers.image.created" = "${BUILD_DATE}"
-    "org.opencontainers.image.version" = "${VERSION}"
-    "org.opencontainers.image.revision" = "${BRANCH}"
-    "org.opencontainers.image.description" = "${DESCRIPTION}"
-    "org.opencontainers.image.licenses" = "BSD-3-Clause"
-    "org.opencontainers.image.source" = "https://github.com/s-allius/tsun-gen3-proxy"
-  }
-  output = [
-    "type=image,push=true"
-  ]
-
-  no-cache = false
-  platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7"]
-}
-
-target "_debug" {
-  args = {
-    LOG_LVL = "DEBUG"
-    environment = "dev"
-  }
-}
-target "_prod" {
-  args = {
-  }
-}
-target "debug" {
-  inherits = ["_common", "_debug"]
-  tags = ["${IMAGE}:debug"]
-}
-
-target "dev" {
-  inherits = ["_common"]
-  tags = ["${IMAGE}:dev"]
-}
-
-target "preview" {
-  inherits = ["_common", "_prod"]
-  tags = ["${IMAGE}:preview", "${IMAGE}:${VERSION}"]
-}
-
-target "rc" {
-  inherits = ["_common", "_prod"]
-  tags = ["${IMAGE}:rc", "${IMAGE}:${VERSION}"]
-}
-
-target "rel" {
-  inherits = ["_common", "_prod"]
-  tags = ["${IMAGE}:latest", "${IMAGE}:${MAJOR}", "${IMAGE}:${VERSION}"]
-  no-cache = true
-}

app/entrypoint.sh

@@ -2,8 +2,6 @@
 set -e
 
 user="$(id -u)"
-export VERSION=$(cat /proxy-version.txt)
-
 echo "######################################################"
 echo "# prepare: '$SERVICE_NAME' Version:$VERSION"
 echo "# for running with UserID:$UID, GroupID:$GID"

app/proxy.svg

@@ -4,408 +4,381 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: G Pages: 1 -->
-<svg width="720pt" height="1360pt"
- viewBox="0.00 0.00 719.50 1360.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1356)">
+<svg width="691pt" height="1312pt"
+ viewBox="0.00 0.00 691.35 1312.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1308)">
 <title>G</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1356 715.5,-1356 715.5,4 -4,4"/>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1308 687.348,-1308 687.348,4 -4,4"/>
 <!-- A0 -->
 <g id="node1" class="node">
 <title>A0</title>
-<polygon fill="#fff8dc" stroke="#000000" points="153.6964,-1250 45.3036,-1250 45.3036,-1214 159.6964,-1214 159.6964,-1244 153.6964,-1250"/>
-<polyline fill="none" stroke="#000000" points="153.6964,-1250 153.6964,-1244 "/>
-<polyline fill="none" stroke="#000000" points="159.6964,-1244 153.6964,-1244 "/>
-<text text-anchor="middle" x="102.5" y="-1235" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">You can stick notes</text>
-<text text-anchor="middle" x="102.5" y="-1223" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">on diagrams too!</text>
+<polygon fill="#fff8dc" stroke="#000000" points="108.5444,-1208 .1516,-1208 .1516,-1172 114.5444,-1172 114.5444,-1202 108.5444,-1208"/>
+<polyline fill="none" stroke="#000000" points="108.5444,-1208 108.5444,-1202 "/>
+<polyline fill="none" stroke="#000000" points="114.5444,-1202 108.5444,-1202 "/>
+<text text-anchor="middle" x="57.348" y="-1193" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">You can stick notes</text>
+<text text-anchor="middle" x="57.348" y="-1181" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">on diagrams too!</text>
 </g>
 <!-- A1 -->
 <g id="node2" class="node">
 <title>A1</title>
-<polygon fill="none" stroke="#000000" points="685.1817,-942 615.8183,-942 615.8183,-906 685.1817,-906 685.1817,-942"/>
-<text text-anchor="middle" x="650.5" y="-921" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Singleton</text>
+<polygon fill="none" stroke="#000000" points="657.0297,-906 587.6663,-906 587.6663,-870 657.0297,-870 657.0297,-906"/>
+<text text-anchor="middle" x="622.348" y="-885" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Singleton</text>
 </g>
 <!-- A2 -->
 <g id="node3" class="node">
 <title>A2</title>
-<polygon fill="none" stroke="#000000" points="589.5,-644 589.5,-676 711.5,-676 711.5,-644 589.5,-644"/>
-<text text-anchor="start" x="640.777" y="-657" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Mqtt</text>
-<polygon fill="none" stroke="#000000" points="589.5,-588 589.5,-644 711.5,-644 711.5,-588 589.5,-588"/>
-<text text-anchor="start" x="607.9875" y="-625" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;static&gt;ha_restarts</text>
-<text text-anchor="start" x="615.7665" y="-613" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;static&gt;__client</text>
-<text text-anchor="start" x="599.3735" y="-601" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;static&gt;__cb_MqttIsUp</text>
-<polygon fill="none" stroke="#000000" points="589.5,-544 589.5,-588 711.5,-588 711.5,-544 589.5,-544"/>
-<text text-anchor="start" x="612.436" y="-569" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;publish()</text>
-<text text-anchor="start" x="616.6045" y="-557" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;close()</text>
+<polygon fill="none" stroke="#000000" points="561.348,-608 561.348,-640 683.348,-640 683.348,-608 561.348,-608"/>
+<text text-anchor="start" x="612.625" y="-621" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Mqtt</text>
+<polygon fill="none" stroke="#000000" points="561.348,-552 561.348,-608 683.348,-608 683.348,-552 561.348,-552"/>
+<text text-anchor="start" x="579.8355" y="-589" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;static&gt;ha_restarts</text>
+<text text-anchor="start" x="587.6145" y="-577" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;static&gt;__client</text>
+<text text-anchor="start" x="571.2215" y="-565" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;static&gt;__cb_MqttIsUp</text>
+<polygon fill="none" stroke="#000000" points="561.348,-508 561.348,-552 683.348,-552 683.348,-508 561.348,-508"/>
+<text text-anchor="start" x="584.284" y="-533" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;publish()</text>
+<text text-anchor="start" x="588.4525" y="-521" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;close()</text>
 </g>
 <!-- A1&#45;&gt;A2 -->
 <g id="edge1" class="edge">
 <title>A1&#45;&gt;A2</title>
-<path fill="none" stroke="#000000" d="M650.5,-895.5395C650.5,-846.311 650.5,-744.0351 650.5,-676.2069"/>
-<polygon fill="none" stroke="#000000" points="647.0001,-895.7608 650.5,-905.7608 654.0001,-895.7608 647.0001,-895.7608"/>
+<path fill="none" stroke="#000000" d="M622.348,-859.5395C622.348,-810.311 622.348,-708.0351 622.348,-640.2069"/>
+<polygon fill="none" stroke="#000000" points="618.8481,-859.7608 622.348,-869.7608 625.8481,-859.7608 618.8481,-859.7608"/>
 </g>
 <!-- A11 -->
 <g id="node12" class="node">
 <title>A11</title>
-<polygon fill="none" stroke="#000000" points="596.5,-348 596.5,-380 704.5,-380 704.5,-348 596.5,-348"/>
-<text text-anchor="start" x="633.5535" y="-361" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Inverter</text>
-<polygon fill="none" stroke="#000000" points="596.5,-256 596.5,-348 704.5,-348 704.5,-256 596.5,-256"/>
-<text text-anchor="start" x="626.604" y="-329" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">cls.db_stat</text>
-<text text-anchor="start" x="619.9405" y="-317" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">cls.entity_prfx</text>
-<text text-anchor="start" x="610.7755" y="-305" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">cls.discovery_prfx</text>
-<text text-anchor="start" x="610.2115" y="-293" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">cls.proxy_node_id</text>
-<text text-anchor="start" x="606.3225" y="-281" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">cls.proxy_unique_id</text>
-<text text-anchor="start" x="622.1655" y="-269" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">cls.mqtt:Mqtt</text>
-<polygon fill="none" stroke="#000000" points="596.5,-236 596.5,-256 704.5,-256 704.5,-236 596.5,-236"/>
+<polygon fill="none" stroke="#000000" points="568.348,-324 568.348,-356 676.348,-356 676.348,-324 568.348,-324"/>
+<text text-anchor="start" x="605.4015" y="-337" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Inverter</text>
+<polygon fill="none" stroke="#000000" points="568.348,-232 568.348,-324 676.348,-324 676.348,-232 568.348,-232"/>
+<text text-anchor="start" x="598.452" y="-305" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">cls.db_stat</text>
+<text text-anchor="start" x="591.7885" y="-293" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">cls.entity_prfx</text>
+<text text-anchor="start" x="582.6235" y="-281" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">cls.discovery_prfx</text>
+<text text-anchor="start" x="582.0595" y="-269" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">cls.proxy_node_id</text>
+<text text-anchor="start" x="578.1705" y="-257" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">cls.proxy_unique_id</text>
+<text text-anchor="start" x="594.0135" y="-245" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">cls.mqtt:Mqtt</text>
+<polygon fill="none" stroke="#000000" points="568.348,-212 568.348,-232 676.348,-232 676.348,-212 568.348,-212"/>
 </g>
 <!-- A2&#45;&gt;A11 -->
 <g id="edge13" class="edge">
 <title>A2&#45;&gt;A11</title>
-<path fill="none" stroke="#000000" d="M650.5,-543.7248C650.5,-495.3688 650.5,-429.8734 650.5,-380.1918"/>
+<path fill="none" stroke="#000000" d="M622.348,-507.8316C622.348,-462.6124 622.348,-402.6972 622.348,-356.2361"/>
 </g>
 <!-- A3 -->
 <g id="node4" class="node">
 <title>A3</title>
-<polygon fill="none" stroke="#000000" points="318.5,-402 318.5,-434 393.5,-434 393.5,-402 318.5,-402"/>
-<text text-anchor="start" x="338.2175" y="-415" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Modbus</text>
-<polygon fill="none" stroke="#000000" points="318.5,-250 318.5,-402 393.5,-402 393.5,-250 318.5,-250"/>
-<text text-anchor="start" x="347.6615" y="-383" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">que</text>
-<text text-anchor="start" x="328.49" y="-359" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">snd_handler</text>
-<text text-anchor="start" x="329.605" y="-347" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rsp_handler</text>
-<text text-anchor="start" x="339.6085" y="-335" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">timeout</text>
-<text text-anchor="start" x="329.8895" y="-323" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">max_retires</text>
-<text text-anchor="start" x="337.942" y="-311" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">last_xxx</text>
-<text text-anchor="start" x="349.8915" y="-299" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">err</text>
-<text text-anchor="start" x="336.5535" y="-287" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">retry_cnt</text>
-<text text-anchor="start" x="334.879" y="-275" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">req_pend</text>
-<text text-anchor="start" x="349.3365" y="-263" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tim</text>
-<polygon fill="none" stroke="#000000" points="318.5,-182 318.5,-250 393.5,-250 393.5,-182 318.5,-182"/>
-<text text-anchor="start" x="329.89" y="-231" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">build_msg()</text>
-<text text-anchor="start" x="333.224" y="-219" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">recv_req()</text>
-<text text-anchor="start" x="330.724" y="-207" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">recv_resp()</text>
-<text text-anchor="start" x="341.0025" y="-195" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
+<polygon fill="none" stroke="#000000" points="257.348,-366 257.348,-398 364.348,-398 364.348,-366 257.348,-366"/>
+<text text-anchor="start" x="293.0655" y="-379" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Modbus</text>
+<polygon fill="none" stroke="#000000" points="257.348,-226 257.348,-366 364.348,-366 364.348,-226 257.348,-226"/>
+<text text-anchor="start" x="302.5095" y="-347" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">que</text>
+<text text-anchor="start" x="283.338" y="-323" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">snd_handler</text>
+<text text-anchor="start" x="284.453" y="-311" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rsp_handler</text>
+<text text-anchor="start" x="266.9565" y="-299" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">timeout:max_retires</text>
+<text text-anchor="start" x="292.79" y="-287" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">last_xxx</text>
+<text text-anchor="start" x="304.7395" y="-275" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">err</text>
+<text text-anchor="start" x="291.4015" y="-263" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">retry_cnt</text>
+<text text-anchor="start" x="289.727" y="-251" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">req_pend</text>
+<text text-anchor="start" x="304.1845" y="-239" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tim</text>
+<polygon fill="none" stroke="#000000" points="257.348,-170 257.348,-226 364.348,-226 364.348,-170 257.348,-170"/>
+<text text-anchor="start" x="284.738" y="-207" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">build_msg()</text>
+<text text-anchor="start" x="288.072" y="-195" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">recv_req()</text>
+<text text-anchor="start" x="285.572" y="-183" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">recv_resp()</text>
 </g>
 <!-- A4 -->
 <g id="node5" class="node">
 <title>A4</title>
-<polygon fill="none" stroke="#000000" points="308.5,-1242 308.5,-1274 379.5,-1274 379.5,-1242 308.5,-1242"/>
-<text text-anchor="start" x="318.445" y="-1255" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">IterRegistry</text>
-<polygon fill="none" stroke="#000000" points="308.5,-1222 308.5,-1242 379.5,-1242 379.5,-1222 308.5,-1222"/>
-<polygon fill="none" stroke="#000000" points="308.5,-1190 308.5,-1222 379.5,-1222 379.5,-1190 308.5,-1190"/>
-<text text-anchor="start" x="325.939" y="-1203" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__iter__</text>
+<polygon fill="none" stroke="#000000" points="263.348,-1200 263.348,-1232 334.348,-1232 334.348,-1200 263.348,-1200"/>
+<text text-anchor="start" x="273.293" y="-1213" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">IterRegistry</text>
+<polygon fill="none" stroke="#000000" points="263.348,-1180 263.348,-1200 334.348,-1200 334.348,-1180 263.348,-1180"/>
+<polygon fill="none" stroke="#000000" points="263.348,-1148 263.348,-1180 334.348,-1180 334.348,-1148 263.348,-1148"/>
+<text text-anchor="start" x="280.787" y="-1161" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__iter__</text>
 </g>
 <!-- A5 -->
 <g id="node6" class="node">
 <title>A5</title>
-<polygon fill="none" stroke="#000000" points="276.5,-1030 276.5,-1062 410.5,-1062 410.5,-1030 276.5,-1030"/>
-<text text-anchor="start" x="323.2175" y="-1043" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Message</text>
-<polygon fill="none" stroke="#000000" points="276.5,-854 276.5,-1030 410.5,-1030 410.5,-854 276.5,-854"/>
-<text text-anchor="start" x="306.8265" y="-1011" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">server_side:bool</text>
-<text text-anchor="start" x="304.043" y="-999" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">header_valid:bool</text>
-<text text-anchor="start" x="296.814" y="-987" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">header_len:unsigned</text>
-<text text-anchor="start" x="302.648" y="-975" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">data_len:unsigned</text>
-<text text-anchor="start" x="321.8245" y="-963" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">unique_id</text>
-<text text-anchor="start" x="325.7135" y="-951" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">node_id</text>
-<text text-anchor="start" x="322.6585" y="-939" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">sug_area</text>
-<text text-anchor="start" x="293.489" y="-927" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_recv_buffer:bytearray</text>
-<text text-anchor="start" x="292.0945" y="-915" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_send_buffer:bytearray</text>
-<text text-anchor="start" x="286.2665" y="-903" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_forward_buffer:bytearray</text>
-<text text-anchor="start" x="325.7135" y="-891" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">db:Infos</text>
-<text text-anchor="start" x="314.326" y="-879" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">new_data:list</text>
-<text text-anchor="start" x="332.662" y="-867" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">state</text>
-<polygon fill="none" stroke="#000000" points="276.5,-786 276.5,-854 410.5,-854 410.5,-786 276.5,-786"/>
-<text text-anchor="start" x="293.2095" y="-835" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_read():void&lt;abstract&gt;</text>
-<text text-anchor="start" x="317.9445" y="-823" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close():void</text>
-<text text-anchor="start" x="303.7725" y="-811" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">inc_counter():void</text>
-<text text-anchor="start" x="302.1025" y="-799" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">dec_counter():void</text>
+<polygon fill="none" stroke="#000000" points="231.348,-994 231.348,-1026 365.348,-1026 365.348,-994 231.348,-994"/>
+<text text-anchor="start" x="278.0655" y="-1007" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Message</text>
+<polygon fill="none" stroke="#000000" points="231.348,-818 231.348,-994 365.348,-994 365.348,-818 231.348,-818"/>
+<text text-anchor="start" x="261.6745" y="-975" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">server_side:bool</text>
+<text text-anchor="start" x="258.891" y="-963" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">header_valid:bool</text>
+<text text-anchor="start" x="251.662" y="-951" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">header_len:unsigned</text>
+<text text-anchor="start" x="257.496" y="-939" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">data_len:unsigned</text>
+<text text-anchor="start" x="276.6725" y="-927" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">unique_id</text>
+<text text-anchor="start" x="280.5615" y="-915" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">node_id</text>
+<text text-anchor="start" x="277.5065" y="-903" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">sug_area</text>
+<text text-anchor="start" x="248.337" y="-891" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_recv_buffer:bytearray</text>
+<text text-anchor="start" x="246.9425" y="-879" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_send_buffer:bytearray</text>
+<text text-anchor="start" x="241.1145" y="-867" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_forward_buffer:bytearray</text>
+<text text-anchor="start" x="280.5615" y="-855" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">db:Infos</text>
+<text text-anchor="start" x="269.174" y="-843" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">new_data:list</text>
+<text text-anchor="start" x="287.51" y="-831" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">state</text>
+<polygon fill="none" stroke="#000000" points="231.348,-750 231.348,-818 365.348,-818 365.348,-750 231.348,-750"/>
+<text text-anchor="start" x="248.0575" y="-799" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_read():void&lt;abstract&gt;</text>
+<text text-anchor="start" x="272.7925" y="-787" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close():void</text>
+<text text-anchor="start" x="258.6205" y="-775" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">inc_counter():void</text>
+<text text-anchor="start" x="256.9505" y="-763" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">dec_counter():void</text>
 </g>
 <!-- A4&#45;&gt;A5 -->
 <g id="edge2" class="edge">
 <title>A4&#45;&gt;A5</title>
-<path fill="none" stroke="#000000" d="M343.5,-1179.6793C343.5,-1147.2188 343.5,-1103.8616 343.5,-1062.0836"/>
-<polygon fill="none" stroke="#000000" points="340.0001,-1179.8197 343.5,-1189.8197 347.0001,-1179.8198 340.0001,-1179.8197"/>
+<path fill="none" stroke="#000000" d="M298.348,-1137.5879C298.348,-1106.6429 298.348,-1065.8843 298.348,-1026.2983"/>
+<polygon fill="none" stroke="#000000" points="294.8481,-1137.6902 298.348,-1147.6902 301.8481,-1137.6902 294.8481,-1137.6902"/>
 </g>
 <!-- A6 -->
 <g id="node7" class="node">
 <title>A6</title>
-<polygon fill="none" stroke="#000000" points="415.5,-704 415.5,-736 529.5,-736 529.5,-704 415.5,-704"/>
-<text text-anchor="start" x="458.608" y="-717" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Talent</text>
-<polygon fill="none" stroke="#000000" points="415.5,-600 415.5,-704 529.5,-704 529.5,-600 415.5,-600"/>
-<text text-anchor="start" x="425.263" y="-685" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">await_conn_resp_cnt</text>
-<text text-anchor="start" x="460.2775" y="-673" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">id_str</text>
-<text text-anchor="start" x="441.1" y="-661" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">contact_name</text>
-<text text-anchor="start" x="444.44" y="-649" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">contact_mail</text>
-<text text-anchor="start" x="448.0445" y="-637" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">db:InfosG3</text>
-<text text-anchor="start" x="446.384" y="-625" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">mb:Modbus</text>
-<text text-anchor="start" x="458.612" y="-613" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">switch</text>
-<polygon fill="none" stroke="#000000" points="415.5,-484 415.5,-600 529.5,-600 529.5,-484 415.5,-484"/>
-<text text-anchor="start" x="429.9925" y="-581" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_contact_info()</text>
-<text text-anchor="start" x="431.9325" y="-569" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_ota_update()</text>
-<text text-anchor="start" x="437.7765" y="-557" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_get_time()</text>
-<text text-anchor="start" x="425.8285" y="-545" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_collector_data()</text>
-<text text-anchor="start" x="427.7735" y="-533" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_inverter_data()</text>
-<text text-anchor="start" x="436.9405" y="-521" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_unknown()</text>
-<text text-anchor="start" x="457.5025" y="-497" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
+<polygon fill="none" stroke="#000000" points="370.348,-668 370.348,-700 484.348,-700 484.348,-668 370.348,-668"/>
+<text text-anchor="start" x="413.456" y="-681" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Talent</text>
+<polygon fill="none" stroke="#000000" points="370.348,-564 370.348,-668 484.348,-668 484.348,-564 370.348,-564"/>
+<text text-anchor="start" x="380.111" y="-649" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">await_conn_resp_cnt</text>
+<text text-anchor="start" x="415.1255" y="-637" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">id_str</text>
+<text text-anchor="start" x="395.948" y="-625" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">contact_name</text>
+<text text-anchor="start" x="399.288" y="-613" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">contact_mail</text>
+<text text-anchor="start" x="402.8925" y="-601" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">db:InfosG3</text>
+<text text-anchor="start" x="401.232" y="-589" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">mb:Modbus</text>
+<text text-anchor="start" x="413.46" y="-577" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">switch</text>
+<polygon fill="none" stroke="#000000" points="370.348,-448 370.348,-564 484.348,-564 484.348,-448 370.348,-448"/>
+<text text-anchor="start" x="384.8405" y="-545" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_contact_info()</text>
+<text text-anchor="start" x="386.7805" y="-533" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_ota_update()</text>
+<text text-anchor="start" x="392.6245" y="-521" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_get_time()</text>
+<text text-anchor="start" x="380.6765" y="-509" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_collector_data()</text>
+<text text-anchor="start" x="382.6215" y="-497" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_inverter_data()</text>
+<text text-anchor="start" x="391.7885" y="-485" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_unknown()</text>
+<text text-anchor="start" x="412.3505" y="-461" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
 </g>
 <!-- A5&#45;&gt;A6 -->
 <g id="edge3" class="edge">
 <title>A5&#45;&gt;A6</title>
-<path fill="none" stroke="#000000" d="M404.0814,-776.5383C409.5999,-763.1056 415.1569,-749.5794 420.5898,-736.355"/>
-<polygon fill="none" stroke="#000000" points="400.8317,-775.2382 400.269,-785.8181 407.3066,-777.8983 400.8317,-775.2382"/>
+<path fill="none" stroke="#000000" d="M358.9294,-740.5383C364.4479,-727.1056 370.0049,-713.5794 375.4378,-700.355"/>
+<polygon fill="none" stroke="#000000" points="355.6797,-739.2382 355.117,-749.8181 362.1546,-741.8983 355.6797,-739.2382"/>
 </g>
 <!-- A7 -->
 <g id="node8" class="node">
 <title>A7</title>
-<polygon fill="none" stroke="#000000" points="172.5,-668 172.5,-700 263.5,-700 263.5,-668 172.5,-668"/>
-<text text-anchor="start" x="190.495" y="-681" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">SolarmanV5</text>
-<polygon fill="none" stroke="#000000" points="172.5,-576 172.5,-668 263.5,-668 263.5,-576 172.5,-576"/>
-<text text-anchor="start" x="202.998" y="-649" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">control</text>
-<text text-anchor="start" x="206.0575" y="-637" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">serial</text>
-<text text-anchor="start" x="211.056" y="-625" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">snr</text>
-<text text-anchor="start" x="190.21" y="-613" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">db:InfosG3P</text>
-<text text-anchor="start" x="191.884" y="-601" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">mb:Modbus</text>
-<text text-anchor="start" x="204.112" y="-589" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">switch</text>
-<polygon fill="none" stroke="#000000" points="172.5,-520 172.5,-576 263.5,-576 263.5,-520 172.5,-520"/>
-<text text-anchor="start" x="182.4405" y="-557" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_unknown()</text>
-<text text-anchor="start" x="203.0025" y="-533" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
+<polygon fill="none" stroke="#000000" points="127.348,-632 127.348,-664 218.348,-664 218.348,-632 127.348,-632"/>
+<text text-anchor="start" x="145.343" y="-645" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">SolarmanV5</text>
+<polygon fill="none" stroke="#000000" points="127.348,-540 127.348,-632 218.348,-632 218.348,-540 127.348,-540"/>
+<text text-anchor="start" x="157.846" y="-613" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">control</text>
+<text text-anchor="start" x="160.9055" y="-601" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">serial</text>
+<text text-anchor="start" x="165.904" y="-589" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">snr</text>
+<text text-anchor="start" x="145.058" y="-577" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">db:InfosG3P</text>
+<text text-anchor="start" x="146.732" y="-565" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">mb:Modbus</text>
+<text text-anchor="start" x="158.96" y="-553" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">switch</text>
+<polygon fill="none" stroke="#000000" points="127.348,-484 127.348,-540 218.348,-540 218.348,-484 127.348,-484"/>
+<text text-anchor="start" x="137.2885" y="-521" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_unknown()</text>
+<text text-anchor="start" x="157.8505" y="-497" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
 </g>
 <!-- A5&#45;&gt;A7 -->
 <g id="edge4" class="edge">
 <title>A5&#45;&gt;A7</title>
-<path fill="none" stroke="#000000" d="M284.228,-776.2903C273.8281,-750.3733 263.2923,-724.1174 253.7595,-700.3611"/>
-<polygon fill="none" stroke="#000000" points="281.0788,-777.8409 288.0512,-785.8181 287.5753,-775.2339 281.0788,-777.8409"/>
+<path fill="none" stroke="#000000" d="M239.076,-740.2903C228.6761,-714.3733 218.1403,-688.1174 208.6075,-664.3611"/>
+<polygon fill="none" stroke="#000000" points="235.9268,-741.8409 242.8992,-749.8181 242.4233,-739.2339 235.9268,-741.8409"/>
 </g>
 <!-- A6&#45;&gt;A3 -->
 <g id="edge6" class="edge">
 <title>A6&#45;&gt;A3</title>
-<path fill="none" stroke="#000000" d="M420.9917,-483.781C414.3472,-467.074 407.7026,-450.1475 401.5,-434 399.8828,-429.7898 398.247,-425.4956 396.6047,-421.154"/>
-<polygon fill="#000000" stroke="#000000" points="393.0037,-411.5882 400.7383,-419.3616 394.7652,-416.2676 396.5268,-420.947 396.5268,-420.947 396.5268,-420.947 394.7652,-416.2676 392.3154,-422.5325 393.0037,-411.5882 393.0037,-411.5882"/>
-<text text-anchor="middle" x="407.3001" y="-422.5743" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">1</text>
-<text text-anchor="middle" x="406.4454" y="-467.0549" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">has</text>
+<path fill="none" stroke="#000000" d="M376.3705,-447.6454C371.0187,-434.3805 365.5816,-420.9039 360.2423,-407.6696"/>
+<polygon fill="#000000" stroke="#000000" points="356.3743,-398.0824 364.289,-405.6724 358.2451,-402.7192 360.1158,-407.3561 360.1158,-407.3561 360.1158,-407.3561 358.2451,-402.7192 355.9427,-409.0397 356.3743,-398.0824 356.3743,-398.0824"/>
+<text text-anchor="middle" x="370.9946" y="-408.7296" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">1</text>
+<text text-anchor="middle" x="361.7502" y="-430.9982" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">has</text>
 </g>
 <!-- A8 -->
 <g id="node9" class="node">
 <title>A8</title>
-<polygon fill="none" stroke="#000000" points="410.5,-330 410.5,-362 560.5,-362 560.5,-330 410.5,-330"/>
-<text text-anchor="start" x="453.5455" y="-343" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ConnectionG3</text>
-<polygon fill="none" stroke="#000000" points="410.5,-298 410.5,-330 560.5,-330 560.5,-298 410.5,-298"/>
-<text text-anchor="start" x="420.487" y="-311" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">remote_stream:ConnectionG3</text>
-<polygon fill="none" stroke="#000000" points="410.5,-254 410.5,-298 560.5,-298 560.5,-254 410.5,-254"/>
-<text text-anchor="start" x="466.054" y="-279" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">healthy()</text>
-<text text-anchor="start" x="470.5025" y="-267" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
+<polygon fill="none" stroke="#000000" points="382.348,-300 382.348,-332 532.348,-332 532.348,-300 382.348,-300"/>
+<text text-anchor="start" x="425.3935" y="-313" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ConnectionG3</text>
+<polygon fill="none" stroke="#000000" points="382.348,-268 382.348,-300 532.348,-300 532.348,-268 382.348,-268"/>
+<text text-anchor="start" x="392.335" y="-281" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">remoteStream:ConnectionG3</text>
+<polygon fill="none" stroke="#000000" points="382.348,-236 382.348,-268 532.348,-268 532.348,-236 382.348,-236"/>
+<text text-anchor="start" x="442.3505" y="-249" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
 </g>
 <!-- A6&#45;&gt;A8 -->
 <g id="edge5" class="edge">
 <title>A6&#45;&gt;A8</title>
-<path fill="none" stroke="#000000" d="M478.3685,-473.6691C480.0687,-434.1731 481.827,-393.3258 483.1723,-362.0732"/>
-<polygon fill="none" stroke="#000000" points="474.8712,-473.5333 477.9378,-483.6747 481.8648,-473.8345 474.8712,-473.5333"/>
+<path fill="none" stroke="#000000" d="M441.464,-437.5454C445.3714,-399.7739 449.3591,-361.2265 452.3615,-332.203"/>
+<polygon fill="none" stroke="#000000" points="437.9668,-437.3383 440.4192,-447.6454 444.9297,-438.0587 437.9668,-437.3383"/>
 </g>
 <!-- A7&#45;&gt;A3 -->
 <g id="edge8" class="edge">
 <title>A7&#45;&gt;A3</title>
-<path fill="none" stroke="#000000" d="M254.1161,-519.7083C259.8714,-507.5039 266.0613,-495.3029 272.5,-484 286.0537,-460.2067 295.6001,-458.1541 308.5,-434 310.2529,-430.7178 311.9697,-427.3559 313.6482,-423.937"/>
-<polygon fill="#000000" stroke="#000000" points="317.9998,-414.7692 317.7769,-425.7328 315.8557,-419.2862 313.7116,-423.8032 313.7116,-423.8032 313.7116,-423.8032 315.8557,-419.2862 309.6463,-421.8735 317.9998,-414.7692 317.9998,-414.7692"/>
-<text text-anchor="middle" x="317.8629" y="-431.7687" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">1</text>
-<text text-anchor="middle" x="254.262" y="-496.7088" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">has</text>
+<path fill="none" stroke="#000000" d="M210.935,-483.8952C216.3404,-471.7801 221.9084,-459.553 227.348,-448 235.1472,-431.4354 243.6196,-414.0579 252.0717,-397.0641"/>
+<polygon fill="#000000" stroke="#000000" points="256.7608,-387.6701 256.3209,-398.6272 254.5277,-392.1437 252.2946,-396.6174 252.2946,-396.6174 252.2946,-396.6174 254.5277,-392.1437 248.2683,-394.6076 256.7608,-387.6701 256.7608,-387.6701"/>
+<text text-anchor="middle" x="256.228" y="-404.663" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">1</text>
+<text text-anchor="middle" x="210.6174" y="-460.8977" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">has</text>
 </g>
 <!-- A9 -->
 <g id="node10" class="node">
 <title>A9</title>
-<polygon fill="none" stroke="#000000" points="125.5,-330 125.5,-362 281.5,-362 281.5,-330 125.5,-330"/>
-<text text-anchor="start" x="168.211" y="-343" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ConnectionG3P</text>
-<polygon fill="none" stroke="#000000" points="125.5,-298 125.5,-330 281.5,-330 281.5,-298 125.5,-298"/>
-<text text-anchor="start" x="135.1525" y="-311" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">remote_stream:ConnectionG3P</text>
-<polygon fill="none" stroke="#000000" points="125.5,-254 125.5,-298 281.5,-298 281.5,-254 125.5,-254"/>
-<text text-anchor="start" x="184.054" y="-279" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">healthy()</text>
-<text text-anchor="start" x="188.5025" y="-267" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
+<polygon fill="none" stroke="#000000" points="64.348,-300 64.348,-332 220.348,-332 220.348,-300 64.348,-300"/>
+<text text-anchor="start" x="107.059" y="-313" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ConnectionG3P</text>
+<polygon fill="none" stroke="#000000" points="64.348,-268 64.348,-300 220.348,-300 220.348,-268 64.348,-268"/>
+<text text-anchor="start" x="74.0005" y="-281" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">remoteStream:ConnectionG3P</text>
+<polygon fill="none" stroke="#000000" points="64.348,-236 64.348,-268 220.348,-268 220.348,-236 64.348,-236"/>
+<text text-anchor="start" x="127.3505" y="-249" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
 </g>
 <!-- A7&#45;&gt;A9 -->
 <g id="edge7" class="edge">
 <title>A7&#45;&gt;A9</title>
-<path fill="none" stroke="#000000" d="M212.8528,-509.7531C210.5717,-460.5471 207.9134,-403.2043 206.0152,-362.2565"/>
-<polygon fill="none" stroke="#000000" points="209.3591,-509.972 213.3185,-519.7991 216.3516,-509.6477 209.3591,-509.972"/>
+<path fill="none" stroke="#000000" d="M161.9757,-473.7349C157.0236,-425.8645 151.3255,-370.7828 147.349,-332.3431"/>
+<polygon fill="none" stroke="#000000" points="158.5098,-474.2451 163.0203,-483.8319 165.4726,-473.5248 158.5098,-474.2451"/>
 </g>
 <!-- A8&#45;&gt;A8 -->
 <g id="edge15" class="edge">
 <title>A8&#45;&gt;A8</title>
-<path fill="none" stroke="#000000" d="M560.6684,-348.7195C571.3394,-342.1337 578.5,-328.5605 578.5,-308 578.5,-292.9008 574.6382,-281.57 568.3604,-274.0076"/>
-<polygon fill="#000000" stroke="#000000" points="560.6684,-267.2805 571.1583,-270.4763 564.4321,-270.5721 568.1958,-273.8637 568.1958,-273.8637 568.1958,-273.8637 564.4321,-270.5721 565.2334,-277.251 560.6684,-267.2805 560.6684,-267.2805"/>
-<text text-anchor="middle" x="579.877" y="-269.8507" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">0..1</text>
-<text text-anchor="middle" x="570.593" y="-328.3557" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">has</text>
+<path fill="none" stroke="#000000" d="M532.5164,-321.6908C543.1874,-315.5948 550.348,-303.0313 550.348,-284 550.348,-270.3213 546.6488,-259.9838 540.6058,-252.9875"/>
+<polygon fill="#000000" stroke="#000000" points="532.5164,-246.3092 543.0929,-249.2054 536.3722,-249.4924 540.228,-252.6756 540.228,-252.6756 540.228,-252.6756 536.3722,-249.4924 537.3632,-256.1459 532.5164,-246.3092 532.5164,-246.3092"/>
+<text text-anchor="middle" x="551.8757" y="-248.3308" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">0..1</text>
+<text text-anchor="middle" x="543.0584" y="-301.6947" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">has</text>
 </g>
 <!-- A12 -->
 <g id="node13" class="node">
 <title>A12</title>
-<polygon fill="none" stroke="#000000" points="506.5,-100 506.5,-132 628.5,-132 628.5,-100 506.5,-100"/>
-<text text-anchor="start" x="543.8845" y="-113" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">InverterG3</text>
-<polygon fill="none" stroke="#000000" points="506.5,-68 506.5,-100 628.5,-100 628.5,-68 506.5,-68"/>
-<text text-anchor="start" x="536.9355" y="-81" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__ha_restarts</text>
-<polygon fill="none" stroke="#000000" points="506.5,0 506.5,-68 628.5,-68 628.5,0 506.5,0"/>
-<text text-anchor="start" x="516.1035" y="-49" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">async_create_remote()</text>
-<text text-anchor="start" x="526.382" y="-37" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">async_publ_mqtt()</text>
-<text text-anchor="start" x="552.5025" y="-13" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
+<polygon fill="none" stroke="#000000" points="478.348,-88 478.348,-120 600.348,-120 600.348,-88 478.348,-88"/>
+<text text-anchor="start" x="515.7325" y="-101" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">InverterG3</text>
+<polygon fill="none" stroke="#000000" points="478.348,-56 478.348,-88 600.348,-88 600.348,-56 478.348,-56"/>
+<text text-anchor="start" x="508.7835" y="-69" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__ha_restarts</text>
+<polygon fill="none" stroke="#000000" points="478.348,0 478.348,-56 600.348,-56 600.348,0 478.348,0"/>
+<text text-anchor="start" x="487.9515" y="-37" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">async_create_remote()</text>
+<text text-anchor="start" x="524.3505" y="-13" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
 </g>
 <!-- A8&#45;&gt;A12 -->
 <g id="edge14" class="edge">
 <title>A8&#45;&gt;A12</title>
-<path fill="none" stroke="#000000" d="M507.022,-244.4839C518.719,-209.9635 533.1714,-167.3112 545.0148,-132.3588"/>
-<polygon fill="none" stroke="#000000" points="503.6947,-243.3974 503.8003,-253.9917 510.3245,-245.6439 503.6947,-243.3974"/>
+<path fill="none" stroke="#000000" d="M478.5265,-226.1465C490.409,-193.6871 505.2165,-153.2373 517.2458,-120.3767"/>
+<polygon fill="none" stroke="#000000" points="475.09,-225.3526 474.9391,-235.9464 481.6634,-227.759 475.09,-225.3526"/>
 </g>
 <!-- A9&#45;&gt;A9 -->
 <g id="edge17" class="edge">
 <title>A9&#45;&gt;A9</title>
-<path fill="none" stroke="#000000" d="M281.8471,-348.2542C292.4443,-341.506 299.5,-328.0879 299.5,-308 299.5,-293.248 295.6948,-282.093 289.4763,-274.5351"/>
-<polygon fill="#000000" stroke="#000000" points="281.8471,-267.7458 292.3089,-271.0321 285.5822,-271.0697 289.3174,-274.3937 289.3174,-274.3937 289.3174,-274.3937 285.5822,-271.0697 286.3258,-277.7553 281.8471,-267.7458 281.8471,-267.7458"/>
-<text text-anchor="middle" x="301.0069" y="-270.4817" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">0..1</text>
-<text text-anchor="middle" x="291.5637" y="-327.7732" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">has</text>
+<path fill="none" stroke="#000000" d="M220.6951,-321.2601C231.2923,-315.0138 238.348,-302.5938 238.348,-284 238.348,-270.6357 234.703,-260.4608 228.7179,-253.4753"/>
+<polygon fill="#000000" stroke="#000000" points="220.6951,-246.7399 231.2473,-249.7232 224.5245,-249.9548 228.3539,-253.1697 228.3539,-253.1697 228.3539,-253.1697 224.5245,-249.9548 225.4605,-256.6162 220.6951,-246.7399 220.6951,-246.7399"/>
+<text text-anchor="middle" x="240.0123" y="-248.9211" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">0..1</text>
+<text text-anchor="middle" x="231.039" y="-301.1428" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">has</text>
 </g>
 <!-- A13 -->
 <g id="node14" class="node">
 <title>A13</title>
-<polygon fill="none" stroke="#000000" points="144.5,-94 144.5,-126 263.5,-126 263.5,-94 144.5,-94"/>
-<text text-anchor="start" x="177.05" y="-107" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">InverterG3P</text>
-<polygon fill="none" stroke="#000000" points="144.5,-62 144.5,-94 263.5,-94 263.5,-62 144.5,-62"/>
-<text text-anchor="start" x="173.4355" y="-75" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__ha_restarts</text>
-<polygon fill="none" stroke="#000000" points="144.5,-6 144.5,-62 263.5,-62 263.5,-6 144.5,-6"/>
-<text text-anchor="start" x="154.268" y="-43" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">async_create_remote(</text>
-<text text-anchor="start" x="161.2175" y="-31" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">)async_publ_mqtt()</text>
-<text text-anchor="start" x="189.0025" y="-19" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
+<polygon fill="none" stroke="#000000" points="251.348,-88 251.348,-120 373.348,-120 373.348,-88 251.348,-88"/>
+<text text-anchor="start" x="285.398" y="-101" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">InverterG3P</text>
+<polygon fill="none" stroke="#000000" points="251.348,-56 251.348,-88 373.348,-88 373.348,-56 251.348,-56"/>
+<text text-anchor="start" x="281.7835" y="-69" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__ha_restarts</text>
+<polygon fill="none" stroke="#000000" points="251.348,0 251.348,-56 373.348,-56 373.348,0 251.348,0"/>
+<text text-anchor="start" x="260.9515" y="-37" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">async_create_remote()</text>
+<text text-anchor="start" x="297.3505" y="-13" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
 </g>
 <!-- A9&#45;&gt;A13 -->
 <g id="edge16" class="edge">
 <title>A9&#45;&gt;A13</title>
-<path fill="none" stroke="#000000" d="M203.5,-243.955C203.5,-207.4743 203.5,-162.045 203.5,-126.2187"/>
-<polygon fill="none" stroke="#000000" points="200.0001,-243.9917 203.5,-253.9917 207.0001,-243.9917 200.0001,-243.9917"/>
+<path fill="none" stroke="#000000" d="M184.9859,-227.8183C209.8288,-195.0842 241.1576,-153.8039 266.5264,-120.3767"/>
+<polygon fill="none" stroke="#000000" points="182.0747,-225.8647 178.8173,-235.9464 187.6507,-230.0965 182.0747,-225.8647"/>
 </g>
 <!-- A10 -->
 <g id="node11" class="node">
 <title>A10</title>
-<polygon fill="none" stroke="#000000" points="281.5,-698 281.5,-730 397.5,-730 397.5,-698 281.5,-698"/>
-<text text-anchor="start" x="309.774" y="-711" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">AsyncStream</text>
-<polygon fill="none" stroke="#000000" points="281.5,-618 281.5,-698 397.5,-698 397.5,-618 281.5,-618"/>
-<text text-anchor="start" x="325.053" y="-679" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">reader</text>
-<text text-anchor="start" x="327.283" y="-667" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">writer</text>
-<text text-anchor="start" x="329.497" y="-655" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">addr</text>
-<text text-anchor="start" x="325.053" y="-643" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">r_addr</text>
-<text text-anchor="start" x="325.608" y="-631" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">l_addr</text>
-<polygon fill="none" stroke="#000000" points="281.5,-490 281.5,-618 397.5,-618 397.5,-490 281.5,-490"/>
-<text text-anchor="start" x="291.1575" y="-599" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;server_loop()</text>
-<text text-anchor="start" x="293.378" y="-587" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;client_loop()</text>
-<text text-anchor="start" x="311.154" y="-575" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;loop</text>
-<text text-anchor="start" x="327.282" y="-563" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">disc()</text>
-<text text-anchor="start" x="324.5025" y="-551" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
-<text text-anchor="start" x="304.7705" y="-527" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__async_read()</text>
-<text text-anchor="start" x="309.78" y="-515" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">async_write()</text>
-<text text-anchor="start" x="298.107" y="-503" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__async_forward()</text>
+<polygon fill="none" stroke="#000000" points="236.348,-662 236.348,-694 352.348,-694 352.348,-662 236.348,-662"/>
+<text text-anchor="start" x="264.622" y="-675" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">AsyncStream</text>
+<polygon fill="none" stroke="#000000" points="236.348,-582 236.348,-662 352.348,-662 352.348,-582 236.348,-582"/>
+<text text-anchor="start" x="279.901" y="-643" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">reader</text>
+<text text-anchor="start" x="282.131" y="-631" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">writer</text>
+<text text-anchor="start" x="284.345" y="-619" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">addr</text>
+<text text-anchor="start" x="279.901" y="-607" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">r_addr</text>
+<text text-anchor="start" x="280.456" y="-595" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">l_addr</text>
+<polygon fill="none" stroke="#000000" points="236.348,-454 236.348,-582 352.348,-582 352.348,-454 236.348,-454"/>
+<text text-anchor="start" x="246.0055" y="-563" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;server_loop()</text>
+<text text-anchor="start" x="248.226" y="-551" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;client_loop()</text>
+<text text-anchor="start" x="266.002" y="-539" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;loop</text>
+<text text-anchor="start" x="282.13" y="-527" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">disc()</text>
+<text text-anchor="start" x="279.3505" y="-515" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
+<text text-anchor="start" x="259.6185" y="-491" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__async_read()</text>
+<text text-anchor="start" x="264.628" y="-479" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">async_write()</text>
+<text text-anchor="start" x="252.955" y="-467" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__async_forward()</text>
 </g>
 <!-- A10&#45;&gt;A8 -->
 <g id="edge9" class="edge">
 <title>A10&#45;&gt;A8</title>
-<path fill="none" stroke="#000000" d="M402.0319,-480.6532C422.1536,-439.0316 443.3588,-395.1687 459.3606,-362.0691"/>
-<polygon fill="none" stroke="#000000" points="398.824,-479.2474 397.6226,-489.7739 405.1262,-482.2941 398.824,-479.2474"/>
+<path fill="none" stroke="#000000" d="M357.3002,-455.2837C358.6569,-452.8318 360.0073,-450.4016 361.348,-448 383.2991,-408.6787 409.1348,-364.6637 428.4716,-332.1398"/>
+<polygon fill="none" stroke="#000000" points="354.1241,-453.7956 352.3659,-464.2436 360.2557,-457.1724 354.1241,-453.7956"/>
 </g>
 <!-- A10&#45;&gt;A9 -->
 <g id="edge10" class="edge">
 <title>A10&#45;&gt;A9</title>
-<path fill="none" stroke="#000000" d="M281.2511,-480.6532C262.5076,-439.0316 242.7548,-395.1687 227.849,-362.0691"/>
-<polygon fill="none" stroke="#000000" points="278.0609,-482.0929 285.3584,-489.7739 284.4435,-479.2186 278.0609,-482.0929"/>
+<path fill="none" stroke="#000000" d="M231.478,-454.0506C209.0706,-411.2997 185.0929,-365.5527 167.6574,-332.2876"/>
+<polygon fill="none" stroke="#000000" points="228.4903,-455.8898 236.2327,-463.1221 234.6903,-452.6401 228.4903,-455.8898"/>
 </g>
 <!-- A11&#45;&gt;A12 -->
 <g id="edge11" class="edge">
 <title>A11&#45;&gt;A12</title>
-<path fill="none" stroke="#000000" d="M622.3544,-225.9369C611.8702,-195.3687 600.1133,-161.0894 590.181,-132.1301"/>
-<polygon fill="none" stroke="#000000" points="619.1547,-227.3962 625.7097,-235.7198 625.7761,-225.1252 619.1547,-227.3962"/>
+<path fill="none" stroke="#000000" d="M592.1173,-202.4136C582.0634,-175.28 571.0546,-145.5697 561.7056,-120.3387"/>
+<polygon fill="none" stroke="#000000" points="588.8729,-203.7311 595.6294,-211.892 595.4368,-201.2989 588.8729,-203.7311"/>
 </g>
 <!-- A11&#45;&gt;A13 -->
 <g id="edge12" class="edge">
 <title>A11&#45;&gt;A13</title>
-<path fill="none" stroke="#000000" d="M622.0673,-226.7211C613.147,-210.1001 601.7805,-194.0346 587.5,-182 538.0407,-140.3192 358.189,-98.0533 263.2057,-77.9953"/>
-<polygon fill="none" stroke="#000000" points="619.1257,-228.6587 626.7743,-235.9901 625.367,-225.4892 619.1257,-228.6587"/>
+<path fill="none" stroke="#000000" d="M586.2753,-202.8933C578.5712,-190.8884 569.6045,-179.4114 559.348,-170 530.8998,-143.8959 437.024,-105.9199 373.5518,-82.1078"/>
+<polygon fill="none" stroke="#000000" points="583.4606,-204.9994 591.6624,-211.7061 589.4331,-201.3485 583.4606,-204.9994"/>
 </g>
 <!-- A14 -->
 <g id="node15" class="node">
 <title>A14</title>
-<polygon fill="none" stroke="#000000" points="178.5,-1320 178.5,-1352 281.5,-1352 281.5,-1320 178.5,-1320"/>
-<text text-anchor="start" x="219.162" y="-1333" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Infos</text>
-<polygon fill="none" stroke="#000000" points="178.5,-1264 178.5,-1320 281.5,-1320 281.5,-1264 178.5,-1264"/>
-<text text-anchor="start" x="221.9415" y="-1301" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">stat</text>
-<text text-anchor="start" x="197.486" y="-1289" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">new_stat_data</text>
-<text text-anchor="start" x="211.1035" y="-1277" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">info_dev</text>
-<polygon fill="none" stroke="#000000" points="178.5,-1112 178.5,-1264 281.5,-1264 281.5,-1112 178.5,-1112"/>
-<text text-anchor="start" x="205.8355" y="-1245" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">static_init()</text>
-<text text-anchor="start" x="203.8845" y="-1233" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">dev_value()</text>
-<text text-anchor="start" x="200.8305" y="-1221" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">inc_counter()</text>
-<text text-anchor="start" x="199.1605" y="-1209" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">dec_counter()</text>
-<text text-anchor="start" x="197.21" y="-1197" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_proxy_conf</text>
-<text text-anchor="start" x="212.213" y="-1185" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_conf</text>
-<text text-anchor="start" x="204.994" y="-1173" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_remove</text>
-<text text-anchor="start" x="206.3745" y="-1161" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">update_db</text>
-<text text-anchor="start" x="190.537" y="-1149" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">set_db_def_value</text>
-<text text-anchor="start" x="199.9855" y="-1137" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">get_db_value</text>
-<text text-anchor="start" x="188.3225" y="-1125" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ignore_this_device</text>
+<polygon fill="none" stroke="#000000" points="133.348,-1272 133.348,-1304 236.348,-1304 236.348,-1272 133.348,-1272"/>
+<text text-anchor="start" x="174.01" y="-1285" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Infos</text>
+<polygon fill="none" stroke="#000000" points="133.348,-1216 133.348,-1272 236.348,-1272 236.348,-1216 133.348,-1216"/>
+<text text-anchor="start" x="176.7895" y="-1253" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">stat</text>
+<text text-anchor="start" x="152.334" y="-1241" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">new_stat_data</text>
+<text text-anchor="start" x="165.9515" y="-1229" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">info_dev</text>
+<polygon fill="none" stroke="#000000" points="133.348,-1076 133.348,-1216 236.348,-1216 236.348,-1076 133.348,-1076"/>
+<text text-anchor="start" x="160.6835" y="-1197" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">static_init()</text>
+<text text-anchor="start" x="158.7325" y="-1185" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">dev_value()</text>
+<text text-anchor="start" x="155.6785" y="-1173" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">inc_counter()</text>
+<text text-anchor="start" x="154.0085" y="-1161" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">dec_counter()</text>
+<text text-anchor="start" x="152.058" y="-1149" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_proxy_conf</text>
+<text text-anchor="start" x="167.061" y="-1137" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_conf</text>
+<text text-anchor="start" x="161.2225" y="-1125" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">update_db</text>
+<text text-anchor="start" x="145.385" y="-1113" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">set_db_def_value</text>
+<text text-anchor="start" x="154.8335" y="-1101" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">get_db_value</text>
+<text text-anchor="start" x="143.1705" y="-1089" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ignore_this_device</text>
 </g>
 <!-- A15 -->
 <g id="node16" class="node">
 <title>A15</title>
-<polygon fill="none" stroke="#000000" points="431.5,-940 431.5,-972 498.5,-972 498.5,-940 431.5,-940"/>
-<text text-anchor="start" x="447.493" y="-953" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">InfosG3</text>
-<polygon fill="none" stroke="#000000" points="431.5,-920 431.5,-940 498.5,-940 498.5,-920 431.5,-920"/>
-<polygon fill="none" stroke="#000000" points="431.5,-876 431.5,-920 498.5,-920 498.5,-876 431.5,-876"/>
-<text text-anchor="start" x="441.384" y="-901" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_confs()</text>
-<text text-anchor="start" x="449.168" y="-889" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">parse()</text>
+<polygon fill="none" stroke="#000000" points="386.348,-904 386.348,-936 453.348,-936 453.348,-904 386.348,-904"/>
+<text text-anchor="start" x="402.341" y="-917" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">InfosG3</text>
+<polygon fill="none" stroke="#000000" points="386.348,-884 386.348,-904 453.348,-904 453.348,-884 386.348,-884"/>
+<polygon fill="none" stroke="#000000" points="386.348,-840 386.348,-884 453.348,-884 453.348,-840 386.348,-840"/>
+<text text-anchor="start" x="396.232" y="-865" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_confs()</text>
+<text text-anchor="start" x="404.016" y="-853" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">parse()</text>
 </g>
 <!-- A14&#45;&gt;A15 -->
 <g id="edge18" class="edge">
 <title>A14&#45;&gt;A15</title>
-<path fill="none" stroke="#000000" d="M287.6238,-1123.7067C291.4001,-1119.5529 295.359,-1115.6229 299.5,-1112 342.985,-1073.9563 380.3024,-1104.4478 419.5,-1062 442.1524,-1037.4693 453.4109,-1001.3633 459.0018,-972.2357"/>
-<polygon fill="none" stroke="#000000" points="284.8741,-1121.5366 281.0238,-1131.4071 290.1891,-1126.0921 284.8741,-1121.5366"/>
+<path fill="none" stroke="#000000" d="M242.8857,-1086.9876C246.5464,-1083.0913 250.3682,-1079.4032 254.348,-1076 298.2601,-1038.4501 335.1504,-1068.4478 374.348,-1026 397.0004,-1001.4693 408.2589,-965.3633 413.8498,-936.2357"/>
+<polygon fill="none" stroke="#000000" points="240.0515,-1084.9088 236.0452,-1094.717 245.2936,-1089.548 240.0515,-1084.9088"/>
 </g>
 <!-- A16 -->
 <g id="node17" class="node">
 <title>A16</title>
-<polygon fill="none" stroke="#000000" points="187.5,-940 187.5,-972 254.5,-972 254.5,-940 187.5,-940"/>
-<text text-anchor="start" x="200.1585" y="-953" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">InfosG3P</text>
-<polygon fill="none" stroke="#000000" points="187.5,-920 187.5,-940 254.5,-940 254.5,-920 187.5,-920"/>
-<polygon fill="none" stroke="#000000" points="187.5,-876 187.5,-920 254.5,-920 254.5,-876 187.5,-876"/>
-<text text-anchor="start" x="197.384" y="-901" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_confs()</text>
-<text text-anchor="start" x="205.168" y="-889" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">parse()</text>
+<polygon fill="none" stroke="#000000" points="142.348,-904 142.348,-936 209.348,-936 209.348,-904 142.348,-904"/>
+<text text-anchor="start" x="155.0065" y="-917" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">InfosG3P</text>
+<polygon fill="none" stroke="#000000" points="142.348,-884 142.348,-904 209.348,-904 209.348,-884 142.348,-884"/>
+<polygon fill="none" stroke="#000000" points="142.348,-840 142.348,-884 209.348,-884 209.348,-840 142.348,-840"/>
+<text text-anchor="start" x="152.232" y="-865" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_confs()</text>
+<text text-anchor="start" x="160.016" y="-853" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">parse()</text>
 </g>
 <!-- A14&#45;&gt;A16 -->
 <g id="edge19" class="edge">
 <title>A14&#45;&gt;A16</title>
-<path fill="none" stroke="#000000" d="M225.6878,-1101.5366C224.3454,-1055.5988 222.9195,-1006.7991 221.9029,-972.012"/>
-<polygon fill="none" stroke="#000000" points="222.191,-1101.7024 225.9817,-1111.5959 229.188,-1101.4979 222.191,-1101.7024"/>
+<path fill="none" stroke="#000000" d="M180.6399,-1065.5724C179.2846,-1020.0932 177.8303,-971.2935 176.7899,-936.3828"/>
+<polygon fill="none" stroke="#000000" points="177.1491,-1065.9355 180.9455,-1075.8267 184.146,-1065.7269 177.1491,-1065.9355"/>
 </g>
 <!-- A15&#45;&gt;A6 -->
 <g id="edge21" class="edge">
 <title>A15&#45;&gt;A6</title>
-<path fill="none" stroke="#000000" d="M465.7237,-875.9684C466.6086,-841.2366 467.8512,-792.4655 469.031,-746.1572"/>
-<polygon fill="#000000" stroke="#000000" points="469.2896,-736.0098 473.5333,-746.1212 469.1622,-741.0082 469.0348,-746.0066 469.0348,-746.0066 469.0348,-746.0066 469.1622,-741.0082 464.5362,-745.8919 469.2896,-736.0098 469.2896,-736.0098"/>
+<path fill="none" stroke="#000000" d="M420.5717,-839.9684C421.4566,-805.2366 422.6992,-756.4655 423.879,-710.1572"/>
+<polygon fill="#000000" stroke="#000000" points="424.1376,-700.0098 428.3813,-710.1212 424.0102,-705.0082 423.8828,-710.0066 423.8828,-710.0066 423.8828,-710.0066 424.0102,-705.0082 419.3842,-709.8919 424.1376,-700.0098 424.1376,-700.0098"/>
 </g>
 <!-- A16&#45;&gt;A7 -->
 <g id="edge20" class="edge">
 <title>A16&#45;&gt;A7</title>
-<path fill="none" stroke="#000000" d="M220.0411,-875.9684C219.6216,-832.0581 218.9877,-765.7079 218.4579,-710.2644"/>
-<polygon fill="#000000" stroke="#000000" points="218.3603,-700.0467 222.9557,-710.0032 218.4081,-705.0465 218.456,-710.0463 218.456,-710.0463 218.456,-710.0463 218.4081,-705.0465 213.9562,-710.0893 218.3603,-700.0467 218.3603,-700.0467"/>
-</g>
-<!-- A17 -->
-<g id="node18" class="node">
-<title>A17</title>
-<polygon fill="none" stroke="#000000" points=".5,-336 .5,-368 107.5,-368 107.5,-336 .5,-336"/>
-<text text-anchor="start" x="24.2695" y="-349" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ModbusConn</text>
-<polygon fill="none" stroke="#000000" points=".5,-268 .5,-336 107.5,-336 107.5,-268 .5,-268"/>
-<text text-anchor="start" x="44.5515" y="-317" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">host</text>
-<text text-anchor="start" x="45.387" y="-305" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">port</text>
-<text text-anchor="start" x="43.997" y="-293" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">addr</text>
-<text text-anchor="start" x="10.383" y="-281" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">stream:InverterG3P</text>
-<polygon fill="none" stroke="#000000" points=".5,-248 .5,-268 107.5,-268 107.5,-248 .5,-248"/>
-</g>
-<!-- A17&#45;&gt;A13 -->
-<g id="edge22" class="edge">
-<title>A17&#45;&gt;A13</title>
-<path fill="none" stroke="#000000" d="M80.8473,-247.8342C91.2165,-226.5814 103.6422,-202.8044 116.5,-182 126.2708,-166.1905 137.6417,-149.852 148.8772,-134.6044"/>
-<polygon fill="#000000" stroke="#000000" points="155.0942,-126.2561 152.7306,-136.9642 152.1078,-130.2663 149.1214,-134.2765 149.1214,-134.2765 149.1214,-134.2765 152.1078,-130.2663 145.5123,-131.5887 155.0942,-126.2561 155.0942,-126.2561"/>
-<text text-anchor="middle" x="151.047" y="-142.8423" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">1</text>
-<text text-anchor="middle" x="81.2636" y="-224.8385" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">has</text>
+<path fill="none" stroke="#000000" d="M174.8891,-839.9684C174.4696,-796.0581 173.8357,-729.7079 173.3059,-674.2644"/>
+<polygon fill="#000000" stroke="#000000" points="173.2083,-664.0467 177.8037,-674.0032 173.2561,-669.0465 173.304,-674.0463 173.304,-674.0463 173.304,-674.0463 173.2561,-669.0465 168.8042,-674.0893 173.2083,-664.0467 173.2083,-664.0467"/>
 </g>
 </g>
 </svg>

app/proxy.yuml

@@ -4,27 +4,25 @@
 
 [note: You can stick notes on diagrams too!{bg:cornsilk}]
 [Singleton]^[Mqtt|<static>ha_restarts;<static>__client;<static>__cb_MqttIsUp|<async>publish();<async>close()]
-[Modbus|que;;snd_handler;rsp_handler;timeout;max_retires;last_xxx;err;retry_cnt;req_pend;tim|build_msg();recv_req();recv_resp();close()]
+[Modbus|que;;snd_handler;rsp_handler;timeout:max_retires;last_xxx;err;retry_cnt;req_pend;tim|build_msg();recv_req();recv_resp()]
 [IterRegistry||__iter__]^[Message|server_side:bool;header_valid:bool;header_len:unsigned;data_len:unsigned;unique_id;node_id;sug_area;_recv_buffer:bytearray;_send_buffer:bytearray;_forward_buffer:bytearray;db:Infos;new_data:list;state|_read():void<abstract>;close():void;inc_counter():void;dec_counter():void]
 [Message]^[Talent|await_conn_resp_cnt;id_str;contact_name;contact_mail;db:InfosG3;mb:Modbus;switch|msg_contact_info();msg_ota_update();msg_get_time();msg_collector_data();msg_inverter_data();msg_unknown();;close()]
 [Message]^[SolarmanV5|control;serial;snr;db:InfosG3P;mb:Modbus;switch|msg_unknown();;close()]
-[Talent]^[ConnectionG3|remote_stream:ConnectionG3|healthy();close()]
+[Talent]^[ConnectionG3|remoteStream:ConnectionG3|close()]
 [Talent]has-1>[Modbus]
-[SolarmanV5]^[ConnectionG3P|remote_stream:ConnectionG3P|healthy();close()]
+[SolarmanV5]^[ConnectionG3P|remoteStream:ConnectionG3P|close()]
 [SolarmanV5]has-1>[Modbus]
 [AsyncStream|reader;writer;addr;r_addr;l_addr|<async>server_loop();<async>client_loop();<async>loop;disc();close();;__async_read();async_write();__async_forward()]^[ConnectionG3]
 [AsyncStream]^[ConnectionG3P]
-[Inverter|cls.db_stat;cls.entity_prfx;cls.discovery_prfx;cls.proxy_node_id;cls.proxy_unique_id;cls.mqtt:Mqtt|]^[InverterG3|__ha_restarts|async_create_remote();async_publ_mqtt();;close()]
-[Inverter]^[InverterG3P|__ha_restarts|async_create_remote(;)async_publ_mqtt();close()]
+[Inverter|cls.db_stat;cls.entity_prfx;cls.discovery_prfx;cls.proxy_node_id;cls.proxy_unique_id;cls.mqtt:Mqtt|]^[InverterG3|__ha_restarts|async_create_remote();;close()]
+[Inverter]^[InverterG3P|__ha_restarts|async_create_remote();;close()]
 [Mqtt]-[Inverter]
 [ConnectionG3]^[InverterG3]
 [ConnectionG3]has-0..1>[ConnectionG3]
 [ConnectionG3P]^[InverterG3P]
 [ConnectionG3P]has-0..1>[ConnectionG3P]
-
-[Infos|stat;new_stat_data;info_dev|static_init();dev_value();inc_counter();dec_counter();ha_proxy_conf;ha_conf;ha_remove;update_db;set_db_def_value;get_db_value;ignore_this_device]^[InfosG3||ha_confs();parse()]
+[Infos|stat;new_stat_data;info_dev|static_init();dev_value();inc_counter();dec_counter();ha_proxy_conf;ha_conf;update_db;set_db_def_value;get_db_value;ignore_this_device]^[InfosG3||ha_confs();parse()]
 [Infos]^[InfosG3P||ha_confs();parse()]
 [InfosG3P]->[SolarmanV5]
 [InfosG3]->[Talent]
-[ModbusConn|host;port;addr;stream:InverterG3P;|]has-1>[InverterG3P]
 

app/requirements-test.txt

@@ -1,6 +0,0 @@
-    flake8
-    pytest
-    pytest-asyncio
-    pytest-cov
-    mock
-    coverage

app/requirements.txt

@@ -1,4 +1,4 @@
-    aiomqtt==2.3.0
-    schema==0.7.7
+    aiomqtt==2.0.1
+    schema==0.7.5
     aiocron==1.8
-    aiohttp==3.10.5
+    aiohttp==3.9.5

app/src/async_stream.py

@@ -3,15 +3,10 @@ import logging
 import traceback
 import time
 from asyncio import StreamReader, StreamWriter
+from messages import hex_dump_memory, State
 from typing import Self
 from itertools import count
 
-if __name__ == "app.src.async_stream":
-    from app.src.messages import hex_dump_memory, State
-else:  # pragma: no cover
-    from messages import hex_dump_memory, State
-
-
 import gc
 logger = logging.getLogger('conn')
 
@@ -22,10 +17,10 @@ class AsyncStream():
     '''maximum processing time for a received msg in sec'''
     MAX_START_TIME = 400
     '''maximum time without a received msg in sec'''
-    MAX_INV_IDLE_TIME = 120
+    MAX_INV_IDLE_TIME = 90
     '''maximum time without a received msg from the inverter in sec'''
-    MAX_DEF_IDLE_TIME = 360
-    '''maximum default time without a received msg in sec'''
+    MAX_CLOUD_IDLE_TIME = 360
+    '''maximum time without a received msg from cloud side in sec'''
 
     def __init__(self, reader: StreamReader, writer: StreamWriter,
                  addr) -> None:
@@ -40,50 +35,43 @@ class AsyncStream():
         self.proc_max = 0
 
     def __timeout(self) -> int:
-        if self.state == State.init or self.state == State.received:
+        if self.state == State.init:
             to = self.MAX_START_TIME
-        elif self.state == State.up and \
-                self.server_side and self.modbus_polling:
-            to = self.MAX_INV_IDLE_TIME
         else:
-            to = self.MAX_DEF_IDLE_TIME
+            if self.server_side:
+                to = self.MAX_INV_IDLE_TIME
+            else:
+                to = self.MAX_CLOUD_IDLE_TIME
         return to
 
-    async def publish_outstanding_mqtt(self):
-        '''Publish all outstanding MQTT topics'''
-        try:
-            if self.unique_id:
-                await self.async_publ_mqtt()
-            await self._async_publ_mqtt_proxy_stat('proxy')
-        except Exception:
-            pass
-
     async def server_loop(self, addr: str) -> None:
         '''Loop for receiving messages from the inverter (server-side)'''
         logger.info(f'[{self.node_id}:{self.conn_no}] '
                     f'Accept connection from {addr}')
         self.inc_counter('Inverter_Cnt')
-        await self.publish_outstanding_mqtt()
         await self.loop()
         self.dec_counter('Inverter_Cnt')
-        await self.publish_outstanding_mqtt()
         logger.info(f'[{self.node_id}:{self.conn_no}] Server loop stopped for'
                     f' r{self.r_addr}')
 
         # if the server connection closes, we also have to disconnect
         # the connection to te TSUN cloud
-        if self.remote_stream:
+        if self.remoteStream:
             logger.info(f'[{self.node_id}:{self.conn_no}] disc client '
-                        f'connection: [{self.remote_stream.node_id}:'
-                        f'{self.remote_stream.conn_no}]')
-            await self.remote_stream.disc()
+                        f'connection: [{self.remoteStream.node_id}:'
+                        f'{self.remoteStream.conn_no}]')
+            await self.remoteStream.disc()
+        try:
+            await self._async_publ_mqtt_proxy_stat('proxy')
+        except Exception:
+            pass
 
-    async def client_loop(self, _: str) -> None:
+    async def client_loop(self, addr: str) -> None:
         '''Loop for receiving messages from the TSUN cloud (client-side)'''
-        client_stream = await self.remote_stream.loop()
-        logger.info(f'[{client_stream.node_id}:{client_stream.conn_no}] '
+        clientStream = await self.remoteStream.loop()
+        logger.info(f'[{clientStream.node_id}:{clientStream.conn_no}] '
                     'Client loop stopped for'
-                    f' l{client_stream.l_addr}')
+                    f' l{clientStream.l_addr}')
 
         # if the client connection closes, we don't touch the server
         # connection. Instead we erase the client connection stream,
@@ -91,13 +79,13 @@ class AsyncStream():
         # establish a new connection to the TSUN cloud
 
         # erase backlink to inverter
-        client_stream.remote_stream = None
+        clientStream.remoteStream = None
 
-        if self.remote_stream == client_stream:
-            # logging.debug(f'Client l{client_stream.l_addr} refs:'
-            #               f' {gc.get_referrers(client_stream)}')
+        if self.remoteStream == clientStream:
+            # logging.debug(f'Client l{clientStream.l_addr} refs:'
+            #               f' {gc.get_referrers(clientStream)}')
             # than erase client connection
-            self.remote_stream = None
+            self.remoteStream = None
 
     async def loop(self) -> Self:
         """Async loop handler for precessing all received messages"""
@@ -147,7 +135,6 @@ class AsyncStream():
                 logger.error(
                     f"Exception for {self.addr}:\n"
                     f"{traceback.format_exc()}")
-            await asyncio.sleep(0)  # be cooperative to other task
 
     async def async_write(self, headline: str = 'Transmit to ') -> None:
         """Async write handler to transmit the send_buffer"""
@@ -209,35 +196,35 @@ class AsyncStream():
         if not self._forward_buffer:
             return
         try:
-            if not self.remote_stream:
+            if not self.remoteStream:
                 await self.async_create_remote()
-                if self.remote_stream:
-                    if self.remote_stream._init_new_client_conn():
-                        await self.remote_stream.async_write()
+                if self.remoteStream:
+                    if self.remoteStream._init_new_client_conn():
+                        await self.remoteStream.async_write()
 
-            if self.remote_stream:
-                self.remote_stream._update_header(self._forward_buffer)
+            if self.remoteStream:
+                self.remoteStream._update_header(self._forward_buffer)
                 hex_dump_memory(logging.INFO,
-                                f'Forward to {self.remote_stream.addr}:',
+                                f'Forward to {self.remoteStream.addr}:',
                                 self._forward_buffer,
                                 len(self._forward_buffer))
-                self.remote_stream.writer.write(self._forward_buffer)
-                await self.remote_stream.writer.drain()
+                self.remoteStream.writer.write(self._forward_buffer)
+                await self.remoteStream.writer.drain()
                 self._forward_buffer = bytearray(0)
 
         except OSError as error:
-            if self.remote_stream:
-                rmt = self.remote_stream
-                self.remote_stream = None
+            if self.remoteStream:
+                rmt = self.remoteStream
+                self.remoteStream = None
                 logger.error(f'[{rmt.node_id}:{rmt.conn_no}] Fwd: {error} for '
                              f'l{rmt.l_addr} | r{rmt.r_addr}')
                 await rmt.disc()
                 rmt.close()
 
         except RuntimeError as error:
-            if self.remote_stream:
-                rmt = self.remote_stream
-                self.remote_stream = None
+            if self.remoteStream:
+                rmt = self.remoteStream
+                self.remoteStream = None
                 logger.info(f'[{rmt.node_id}:{rmt.conn_no}] '
                             f'Fwd: {error} for {rmt.l_addr}')
                 await rmt.disc()

app/src/config.py

@@ -12,84 +12,76 @@ class Config():
     Read config.toml file and sanitize it with read().
     Get named parts of the config with get()'''
 
-    act_config = {}
+    config = {}
     def_config = {}
     conf_schema = Schema({
         'tsun': {
             'enabled': Use(bool),
-            'host': Use(str),
-            'port': And(Use(int), lambda n: 1024 <= n <= 65535)
-        },
+            'host':    Use(str),
+            'port':    And(Use(int), lambda n: 1024 <= n <= 65535)
+            },
         'solarman': {
             'enabled': Use(bool),
-            'host': Use(str),
-            'port': And(Use(int), lambda n: 1024 <= n <= 65535)
-        },
+            'host':    Use(str),
+            'port':    And(Use(int), lambda n: 1024 <= n <= 65535)
+            },
         'mqtt': {
-            'host': Use(str),
-            'port': And(Use(int), lambda n: 1024 <= n <= 65535),
-            'user': And(Use(str), Use(lambda s: s if len(s) > 0 else None)),
-            'passwd': And(Use(str), Use(lambda s: s if len(s) > 0 else None))
-        },
+            'host':    Use(str),
+            'port':    And(Use(int), lambda n: 1024 <= n <= 65535),
+            'user':    And(Use(str), Use(lambda s: s if len(s) > 0 else None)),
+            'passwd':  And(Use(str), Use(lambda s: s if len(s) > 0 else None))
+            },
         'ha': {
             'auto_conf_prefix': Use(str),
             'discovery_prefix': Use(str),
-            'entity_prefix': Use(str),
-            'proxy_node_id': Use(str),
-            'proxy_unique_id': Use(str)
-        },
+            'entity_prefix':    Use(str),
+            'proxy_node_id':    Use(str),
+            'proxy_unique_id':  Use(str)
+            },
         'gen3plus': {
             'at_acl': {
                 Or('mqtt', 'tsun'): {
                     'allow': [str],
                     Optional('block', default=[]): [str]
+                    }
                 }
-            }
-        },
+            },
         'inverters': {
             'allow_all': Use(bool), And(Use(str), lambda s: len(s) == 16): {
                 Optional('monitor_sn', default=0): Use(int),
                 Optional('node_id', default=""): And(Use(str),
                                                      Use(lambda s: s + '/'
-                                                         if len(s) > 0
-                                                         and s[-1] != '/'
-                                                         else s)),
-                Optional('client_mode'): {
-                    'host': Use(str),
-                    Optional('port', default=8899):
-                        And(Use(int), lambda n: 1024 <= n <= 65535)
-                },
-                Optional('modbus_polling', default=True): Use(bool),
-                Optional('suggested_area', default=""): Use(str),
-                Optional('sensor_list', default=0x2b0): Use(int),
+                                                         if len(s) > 0 and
+                                                         s[-1] != '/' else s)),
+
+                Optional('suggested_area',  default=""): Use(str),
                 Optional('pv1'): {
                     Optional('type'): Use(str),
                     Optional('manufacturer'): Use(str),
-                },
+                    },
                 Optional('pv2'): {
                     Optional('type'): Use(str),
                     Optional('manufacturer'): Use(str),
-                },
+                    },
                 Optional('pv3'): {
                     Optional('type'): Use(str),
                     Optional('manufacturer'): Use(str),
-                },
+                    },
                 Optional('pv4'): {
                     Optional('type'): Use(str),
                     Optional('manufacturer'): Use(str),
-                },
+                    },
                 Optional('pv5'): {
                     Optional('type'): Use(str),
                     Optional('manufacturer'): Use(str),
-                },
+                    },
                 Optional('pv6'): {
                     Optional('type'): Use(str),
                     Optional('manufacturer'): Use(str),
-                }
-            }
-        }
-    }, ignore_extra_keys=True
-    )
+                    }
+                }}
+            }, ignore_extra_keys=True
+        )
 
     @classmethod
     def class_init(cls) -> None | str:  # pragma: no cover
@@ -149,17 +141,17 @@ class Config():
                     config[key] |= usr_config[key]
 
             try:
-                cls.act_config = cls.conf_schema.validate(config)
+                cls.config = cls.conf_schema.validate(config)
             except Exception as error:
                 err = f'Config.read: {error}'
                 logging.error(err)
 
-            # logging.debug(f'Readed config: "{cls.act_config}" ')
+            # logging.debug(f'Readed config: "{cls.config}" ')
 
         except Exception as error:
             err = f'Config.read: {error}'
             logger.error(err)
-            cls.act_config = {}
+            cls.config = {}
 
         return err
 
@@ -169,12 +161,12 @@ class Config():
           None it returns the complete config dict'''
 
         if member:
-            return cls.act_config.get(member, {})
+            return cls.config.get(member, {})
         else:
-            return cls.act_config
+            return cls.config
 
     @classmethod
     def is_default(cls, member: str) -> bool:
         '''Check if the member is the default value'''
 
-        return cls.act_config.get(member) == cls.def_config.get(member)
+        return cls.config.get(member) == cls.def_config.get(member)

app/src/gen3/connection_g3.py

@@ -1,4 +1,5 @@
 import logging
+# import gc
 from asyncio import StreamReader, StreamWriter
 from async_stream import AsyncStream
 from gen3.talent import Talent
@@ -14,7 +15,7 @@ class ConnectionG3(AsyncStream, Talent):
         AsyncStream.__init__(self, reader, writer, addr)
         Talent.__init__(self, server_side, id_str)
 
-        self.remote_stream: 'ConnectionG3' = remote_stream
+        self.remoteStream: 'ConnectionG3' = remote_stream
 
     '''
     Our puplic methods
@@ -25,10 +26,10 @@ class ConnectionG3(AsyncStream, Talent):
         # logger.info(f'AsyncStream refs: {gc.get_referrers(self)}')
 
     async def async_create_remote(self) -> None:
-        pass  # virtual interface # pragma: no cover
+        pass
 
     async def async_publ_mqtt(self) -> None:
-        pass  # virtual interface # pragma: no cover
+        pass
 
     def healthy(self) -> bool:
         logger.debug('ConnectionG3 healthy()')

app/src/gen3/infos_g3.py

@@ -14,7 +14,6 @@ class RegisterMap:
         0x00092ba8: Register.COLLECTOR_FW_VERSION,
         0x000927c0: Register.CHIP_TYPE,
         0x00092f90: Register.CHIP_MODEL,
-        0x00094ae8: Register.MAC_ADDR,
         0x00095a88: Register.TRACE_URL,
         0x00095aec: Register.LOGGER_URL,
         0x0000000a: Register.PRODUCT_NAME,
@@ -32,9 +31,6 @@ class RegisterMap:
         0xffffff06: Register.OTA_START_MSG,
         0xffffff07: Register.SW_EXCEPTION,
         0xffffff08: Register.MAX_DESIGNED_POWER,
-        0xffffff09: Register.OUTPUT_COEFFICIENT,
-        0xffffff0a: Register.INVERTER_STATUS,
-        0xffffff0b: Register.POLLING_INTERVAL,
         0xfffffffe: Register.TEST_REG1,
         0xffffffff: Register.TEST_REG2,
         0x00000640: Register.OUTPUT_POWER,
@@ -140,6 +136,7 @@ class InfosG3(Infos):
                 i = elms  # abort the loop
 
             elif data_type == 0x41:  # 'A' -> Nop ??
+                # result = struct.unpack_from('!l', buf, ind)[0]
                 ind += 0
                 i += 1
                 continue
@@ -171,17 +168,17 @@ class InfosG3(Infos):
                               " not supported")
                 return
 
-            yield from self.__store_result(addr, result, info_id, node_id)
-            i += 1
+            keys, level, unit, must_incr = self._key_obj(info_id)
 
-    def __store_result(self, addr, result, info_id, node_id):
-        keys, level, unit, must_incr = self._key_obj(info_id)
-        if keys:
-            name, update = self.update_db(keys, must_incr, result)
-            yield keys[0], update
-        else:
-            update = False
-            name = str(f'info-id.0x{addr:x}')
-        if update:
-            self.tracer.log(level, f'[{node_id}] GEN3: {name} :'
-                                   f' {result}{unit}')
+            if keys:
+                name, update = self.update_db(keys, must_incr, result)
+                yield keys[0], update
+            else:
+                update = False
+                name = str(f'info-id.0x{addr:x}')
+
+            if update:
+                self.tracer.log(level, f'[{node_id}] GEN3: {name} :'
+                                       f' {result}{unit}')
+
+            i += 1

app/src/gen3/inverter_g3.py

@@ -9,7 +9,9 @@ from gen3.connection_g3 import ConnectionG3
 from aiomqtt import MqttCodeError
 from infos import Infos
 
+# import gc
 
+# logger = logging.getLogger('conn')
 logger_mqtt = logging.getLogger('mqtt')
 
 
@@ -58,10 +60,10 @@ class InverterG3(Inverter, ConnectionG3):
             logging.info(f'[{self.node_id}] Connect to {addr}')
             connect = asyncio.open_connection(host, port)
             reader, writer = await connect
-            self.remote_stream = ConnectionG3(reader, writer, addr, self,
-                                              False, self.id_str)
-            logging.info(f'[{self.remote_stream.node_id}:'
-                         f'{self.remote_stream.conn_no}] '
+            self.remoteStream = ConnectionG3(reader, writer, addr, self,
+                                             False, self.id_str)
+            logging.info(f'[{self.remoteStream.node_id}:'
+                         f'{self.remoteStream.conn_no}] '
                          f'Connected to {addr}')
             asyncio.create_task(self.client_loop(addr))
 

app/src/gen3/talent.py

@@ -1,8 +1,7 @@
 import struct
 import logging
-from zoneinfo import ZoneInfo
+import time
 from datetime import datetime
-from tzlocal import get_localzone
 
 if __name__ == "app.src.gen3.talent":
     from app.src.messages import hex_dump_memory, Message, State
@@ -10,14 +9,12 @@ if __name__ == "app.src.gen3.talent":
     from app.src.my_timer import Timer
     from app.src.config import Config
     from app.src.gen3.infos_g3 import InfosG3
-    from app.src.infos import Register
 else:  # pragma: no cover
     from messages import hex_dump_memory, Message, State
     from modbus import Modbus
     from my_timer import Timer
     from config import Config
     from gen3.infos_g3 import InfosG3
-    from infos import Register
 
 logger = logging.getLogger('msg')
 
@@ -42,10 +39,9 @@ class Control:
 class Talent(Message):
     MB_START_TIMEOUT = 40
     MB_REGULAR_TIMEOUT = 60
-    TXT_UNKNOWN_CTRL = 'Unknown Ctrl'
 
     def __init__(self, server_side: bool, id_str=b''):
-        super().__init__(server_side, self.send_modbus_cb, mb_timeout=15)
+        super().__init__(server_side, self.send_modbus_cb, mb_timeout=11)
         self.await_conn_resp_cnt = 0
         self.id_str = id_str
         self.contact_name = b''
@@ -56,46 +52,31 @@ class Talent(Message):
             0x00: self.msg_contact_info,
             0x13: self.msg_ota_update,
             0x22: self.msg_get_time,
-            0x99: self.msg_act_time,
             0x71: self.msg_collector_data,
             # 0x76:
             0x77: self.msg_modbus,
             # 0x78:
-            0x87: self.msg_modbus2,
             0x04: self.msg_inverter_data,
         }
         self.log_lvl = {
             0x00: logging.INFO,
             0x13: logging.INFO,
             0x22: logging.INFO,
-            0x99: logging.INFO,
             0x71: logging.INFO,
             # 0x76:
             0x77: self.get_modbus_log_lvl,
             # 0x78:
-            0x87: self.get_modbus_log_lvl,
             0x04: logging.INFO,
         }
         self.modbus_elms = 0    # for unit tests
         self.node_id = 'G3'     # will be overwritten in __set_serial_no
         self.mb_timer = Timer(self.mb_timout_cb, self.node_id)
-        self.mb_timeout = self.MB_REGULAR_TIMEOUT
-        self.mb_first_timeout = self.MB_START_TIMEOUT
-        self.modbus_polling = False
 
     '''
     Our puplic methods
     '''
     def close(self) -> None:
         logging.debug('Talent.close()')
-        if self.server_side:
-            # set inverter state to offline, if output power is very low
-            logging.debug('close power: '
-                          f'{self.db.get_db_value(Register.OUTPUT_POWER, -1)}')
-            if self.db.get_db_value(Register.OUTPUT_POWER, 999) < 2:
-                self.db.set_db_def_value(Register.INVERTER_STATUS, 0)
-                self.new_data['env'] = True
-
         # we have references to methods of this class in self.switch
         # so we have to erase self.switch, otherwise this instance can't be
         # deallocated by the garbage collector ==> we get a memory leak
@@ -117,7 +98,6 @@ class Talent(Message):
                 inv = inverters[serial_no]
                 self.node_id = inv['node_id']
                 self.sug_area = inv['suggested_area']
-                self.modbus_polling = inv['modbus_polling']
                 logger.debug(f'SerialNo {serial_no} allowed! area:{self.sug_area}')  # noqa: E501
                 self.db.set_pv_module_details(inv)
             else:
@@ -131,68 +111,43 @@ class Talent(Message):
                 logger.debug(f'SerialNo {serial_no} not known but accepted!')
 
             self.unique_id = serial_no
-            self.db.set_db_def_value(Register.COLLECTOR_SNR, serial_no)
 
     def read(self) -> float:
-        '''process all received messages in the _recv_buffer'''
         self._read()
-        while True:
-            if not self.header_valid:
-                self.__parse_header(self._recv_buffer, len(self._recv_buffer))
 
-            if self.header_valid and \
-               len(self._recv_buffer) >= (self.header_len + self.data_len):
-                if self.state == State.init:
-                    self.state = State.received     # received 1st package
+        if not self.header_valid:
+            self.__parse_header(self._recv_buffer, len(self._recv_buffer))
 
-                log_lvl = self.log_lvl.get(self.msg_id, logging.WARNING)
-                if callable(log_lvl):
-                    log_lvl = log_lvl()
+        if self.header_valid and len(self._recv_buffer) >= (self.header_len +
+                                                            self.data_len):
+            if self.state == State.init:
+                self.state = State.received     # received 1st package
 
-                hex_dump_memory(log_lvl, f'Received from {self.addr}:'
-                                f' BufLen: {len(self._recv_buffer)}'
-                                f' HdrLen: {self.header_len}'
-                                f' DtaLen: {self.data_len}',
-                                self._recv_buffer, len(self._recv_buffer))
+            log_lvl = self.log_lvl.get(self.msg_id, logging.WARNING)
+            if callable(log_lvl):
+                log_lvl = log_lvl()
 
-                self.__set_serial_no(self.id_str.decode("utf-8"))
-                self.__dispatch_msg()
-                self.__flush_recv_msg()
-            else:
-                return 0  # don not wait before sending a response
+            hex_dump_memory(log_lvl, f'Received from {self.addr}:',
+                            self._recv_buffer, self.header_len+self.data_len)
 
-    def forward(self) -> None:
-        '''add the actual receive msg to the forwarding queue'''
+            self.__set_serial_no(self.id_str.decode("utf-8"))
+            self.__dispatch_msg()
+            self.__flush_recv_msg()
+        return 0.5  # wait 500ms before sending a response
+
+    def forward(self, buffer, buflen) -> None:
         tsun = Config.get('tsun')
         if tsun['enabled']:
-            buffer = self._recv_buffer
-            buflen = self.header_len+self.data_len
-            self._forward_buffer += buffer[:buflen]
+            self._forward_buffer = buffer[:buflen]
             hex_dump_memory(logging.DEBUG, 'Store for forwarding:',
                             buffer, buflen)
 
+            self.__parse_header(self._forward_buffer,
+                                len(self._forward_buffer))
             fnc = self.switch.get(self.msg_id, self.msg_unknown)
             logger.info(self.__flow_str(self.server_side, 'forwrd') +
                         f' Ctl: {int(self.ctrl):#02x} Msg: {fnc.__name__!r}')
-
-    def forward_snd(self) -> None:
-        '''add the actual receive msg to the forwarding queue'''
-        tsun = Config.get('tsun')
-        if tsun['enabled']:
-            _len = len(self._send_buffer) - self.send_msg_ofs
-            struct.pack_into('!l', self._send_buffer, self.send_msg_ofs,
-                             _len-4)
-
-            buffer = self._send_buffer[self.send_msg_ofs:]
-            buflen = _len
-            self._forward_buffer += buffer[:buflen]
-            hex_dump_memory(logging.INFO, 'Store for forwarding:',
-                            buffer, buflen)
-
-            fnc = self.switch.get(self.msg_id, self.msg_unknown)
-            logger.info(self.__flow_str(self.server_side, 'forwrd') +
-                        f' Ctl: {int(self.ctrl):#02x} Msg: {fnc.__name__!r}')
-        self._send_buffer = self._send_buffer[:self.send_msg_ofs]
+        return
 
     def send_modbus_cb(self, modbus_pdu: bytearray, log_lvl: int, state: str):
         if self.state != State.up:
@@ -201,7 +156,7 @@ class Talent(Message):
             return
 
         self.__build_header(0x70, 0x77)
-        self._send_buffer += b'\x00\x01\xa3\x28'   # magic ?
+        self._send_buffer += b'\x00\x01\xa3\x28'   # fixme
         self._send_buffer += struct.pack('!B', len(modbus_pdu))
         self._send_buffer += modbus_pdu
         self.__finish_send_msg()
@@ -222,13 +177,13 @@ class Talent(Message):
         self._send_modbus_cmd(func, addr, val, log_lvl)
 
     def mb_timout_cb(self, exp_cnt):
-        self.mb_timer.start(self.mb_timeout)
+        self.mb_timer.start(self.MB_REGULAR_TIMEOUT)
 
-        if 2 == (exp_cnt % 30):
+        if 0 == (exp_cnt % 30):
             # logging.info("Regular Modbus Status request")
-            self._send_modbus_cmd(Modbus.READ_REGS, 0x2000, 96, logging.DEBUG)
+            self._send_modbus_cmd(Modbus.READ_REGS, 0x2007, 2, logging.DEBUG)
         else:
-            self._send_modbus_cmd(Modbus.READ_REGS, 0x3000, 48, logging.DEBUG)
+            self._send_modbus_cmd(Modbus.READ_REGS, 0x3008, 21, logging.DEBUG)
 
     def _init_new_client_conn(self) -> bool:
         contact_name = self.contact_name
@@ -263,43 +218,31 @@ class Talent(Message):
         return switch.get(type, '???')
 
     def _timestamp(self):   # pragma: no cover
-        '''returns timestamp fo the inverter as localtime
-        since 1.1.1970 in msec'''
-        # convert localtime in epoche
-        ts = (datetime.now() - datetime(1970, 1, 1)).total_seconds()
+        if False:
+            # utc as epoche
+            ts = time.time()
+        else:
+            # convert localtime in epoche
+            ts = (datetime.now() - datetime(1970, 1, 1)).total_seconds()
         return round(ts*1000)
 
-    def _utcfromts(self, ts: float):
-        '''converts inverter timestamp into unix time (epoche)'''
-        dt = datetime.fromtimestamp(ts/1000, tz=ZoneInfo("UTC")). \
-            replace(tzinfo=get_localzone())
-        return dt.timestamp()
-
-    def _utc(self):   # pragma: no cover
-        '''returns unix time (epoche)'''
-        return datetime.now().timestamp()
-
     def _update_header(self, _forward_buffer):
         '''update header for message before forwarding,
         add time offset to timestamp'''
         _len = len(_forward_buffer)
-        ofs = 0
-        while ofs < _len:
-            result = struct.unpack_from('!lB', _forward_buffer, 0)
-            msg_len = 4 + result[0]
-            id_len = result[1]    # len of variable id string
-            if _len < 2*id_len + 21:
-                return
+        result = struct.unpack_from('!lB', _forward_buffer, 0)
+        id_len = result[1]    # len of variable id string
+        if _len < 2*id_len + 21:
+            return
 
-            result = struct.unpack_from('!B', _forward_buffer, id_len+6)
-            msg_code = result[0]
-            if msg_code == 0x71 or msg_code == 0x04:
-                result = struct.unpack_from('!q', _forward_buffer, 13+2*id_len)
-                ts = result[0] + self.ts_offset
-                logger.debug(f'offset: {self.ts_offset:08x}'
-                             f'  proxy-time: {ts:08x}')
-                struct.pack_into('!q', _forward_buffer, 13+2*id_len, ts)
-            ofs += msg_len
+        result = struct.unpack_from('!B', _forward_buffer, id_len+6)
+        msg_code = result[0]
+        if msg_code == 0x71 or msg_code == 0x04:
+            result = struct.unpack_from('!q', _forward_buffer, 13+2*id_len)
+            ts = result[0] + self.ts_offset
+            logger.debug(f'offset: {self.ts_offset:08x}'
+                         f'  proxy-time: {ts:08x}')
+            struct.pack_into('!q', _forward_buffer, 13+2*id_len, ts)
 
     # check if there is a complete header in the buffer, parse it
     # and set
@@ -316,15 +259,8 @@ class Talent(Message):
         if (buf_len < 5):      # enough bytes to read len and id_len?
             return
         result = struct.unpack_from('!lB', buf, 0)
-        msg_len = result[0]    # len of complete message
+        len = result[0]    # len of complete message
         id_len = result[1]    # len of variable id string
-        if id_len > 17:
-            logger.warning(f'len of ID string must == 16 but is {id_len}')
-            self.inc_counter('Invalid_Msg_Format')
-
-            # erase broken recv buffer
-            self._recv_buffer = bytearray()
-            return
 
         hdr_len = 5+id_len+2
 
@@ -337,9 +273,10 @@ class Talent(Message):
         self.id_str = result[0]
         self.ctrl = Control(result[1])
         self.msg_id = result[2]
-        self.data_len = msg_len-id_len-3
+        self.data_len = len-id_len-3
         self.header_len = hdr_len
         self.header_valid = True
+        return
 
     def __build_header(self, ctrl, msg_id=None) -> None:
         if not msg_id:
@@ -384,11 +321,12 @@ class Talent(Message):
             elif self.await_conn_resp_cnt > 0:
                 self.await_conn_resp_cnt -= 1
             else:
-                self.forward()
+                self.forward(self._recv_buffer, self.header_len+self.data_len)
+            return
         else:
-            logger.warning(self.TXT_UNKNOWN_CTRL)
+            logger.warning('Unknown Ctrl')
             self.inc_counter('Unknown_Ctrl')
-            self.forward()
+            self.forward(self._recv_buffer, self.header_len+self.data_len)
 
     def __process_contact_info(self) -> bool:
         result = struct.unpack_from('!B', self._recv_buffer, self.header_len)
@@ -410,9 +348,8 @@ class Talent(Message):
     def msg_get_time(self):
         if self.ctrl.is_ind():
             if self.data_len == 0:
-                if self.state == State.up:
-                    self.state = State.pend     # block MODBUS cmds
-
+                self.state = State.pend     # block MODBUS cmds
+                self.mb_timer.start(self.MB_START_TIMEOUT)
                 ts = self._timestamp()
                 logger.debug(f'time: {ts:08x}')
                 self.__build_header(0x91)
@@ -424,52 +361,15 @@ class Talent(Message):
                 result = struct.unpack_from('!q', self._recv_buffer,
                                             self.header_len)
                 self.ts_offset = result[0]-ts
-                if self.remote_stream:
-                    self.remote_stream.ts_offset = self.ts_offset
                 logger.debug(f'tsun-time: {int(result[0]):08x}'
                              f'  proxy-time: {ts:08x}'
                              f'  offset: {self.ts_offset}')
                 return  # ignore received response
         else:
-            logger.warning(self.TXT_UNKNOWN_CTRL)
+            logger.warning('Unknown Ctrl')
             self.inc_counter('Unknown_Ctrl')
 
-        self.forward()
-
-    def msg_act_time(self):
-        if self.ctrl.is_ind():
-            if self.data_len == 9:
-                self.state = State.up  # allow MODBUS cmds
-                if (self.modbus_polling):
-                    self.mb_timer.start(self.mb_first_timeout)
-                    self.db.set_db_def_value(Register.POLLING_INTERVAL,
-                                             self.mb_timeout)
-                self.__build_header(0x99)
-                self._send_buffer += b'\x02'
-                self.__finish_send_msg()
-
-                result = struct.unpack_from('!Bq', self._recv_buffer,
-                                            self.header_len)
-                resp_code = result[0]
-                ts = result[1]+self.ts_offset
-                logger.debug(f'inv-time: {int(result[1]):08x}'
-                             f'  tsun-time: {ts:08x}'
-                             f'  offset: {self.ts_offset}')
-                self.__build_header(0x91)
-                self._send_buffer += struct.pack('!Bq', resp_code, ts)
-                self.forward_snd()
-                return
-        elif self.ctrl.is_resp():
-            result = struct.unpack_from('!B', self._recv_buffer,
-                                        self.header_len)
-            resp_code = result[0]
-            logging.debug(f'TimeActRespCode: {resp_code}')
-            return
-        else:
-            logger.warning(self.TXT_UNKNOWN_CTRL)
-            self.inc_counter('Unknown_Ctrl')
-
-        self.forward()
+        self.forward(self._recv_buffer, self.header_len+self.data_len)
 
     def parse_msg_header(self):
         result = struct.unpack_from('!lB', self._recv_buffer, self.header_len)
@@ -483,12 +383,11 @@ class Talent(Message):
         result = struct.unpack_from(f'!{id_len+1}pBq', self._recv_buffer,
                                     self.header_len + 4)
 
-        timestamp = result[2]
         logger.debug(f'ID: {result[0]}  B: {result[1]}')
-        logger.debug(f'time: {timestamp:08x}')
+        logger.debug(f'time: {result[2]:08x}')
         # logger.info(f'time: {datetime.utcfromtimestamp(result[2]).strftime(
         # "%Y-%m-%d %H:%M:%S")}')
-        return msg_hdr_len, timestamp
+        return msg_hdr_len
 
     def msg_collector_data(self):
         if self.ctrl.is_ind():
@@ -500,10 +399,10 @@ class Talent(Message):
         elif self.ctrl.is_resp():
             return  # ignore received response
         else:
-            logger.warning(self.TXT_UNKNOWN_CTRL)
+            logger.warning('Unknown Ctrl')
             self.inc_counter('Unknown_Ctrl')
 
-        self.forward()
+        self.forward(self._recv_buffer, self.header_len+self.data_len)
 
     def msg_inverter_data(self):
         if self.ctrl.is_ind():
@@ -512,37 +411,32 @@ class Talent(Message):
             self.__finish_send_msg()
             self.__process_data()
             self.state = State.up  # allow MODBUS cmds
-            if (self.modbus_polling):
-                self.mb_timer.start(self.mb_first_timeout)
-                self.db.set_db_def_value(Register.POLLING_INTERVAL,
-                                         self.mb_timeout)
 
         elif self.ctrl.is_resp():
             return  # ignore received response
         else:
-            logger.warning(self.TXT_UNKNOWN_CTRL)
+            logger.warning('Unknown Ctrl')
             self.inc_counter('Unknown_Ctrl')
 
-        self.forward()
+        self.forward(self._recv_buffer, self.header_len+self.data_len)
 
     def __process_data(self):
-        msg_hdr_len, ts = self.parse_msg_header()
+        msg_hdr_len = self.parse_msg_header()
 
         for key, update in self.db.parse(self._recv_buffer, self.header_len
                                          + msg_hdr_len, self.node_id):
             if update:
-                self._set_mqtt_timestamp(key, self._utcfromts(ts))
                 self.new_data[key] = True
 
     def msg_ota_update(self):
         if self.ctrl.is_req():
             self.inc_counter('OTA_Start_Msg')
         elif self.ctrl.is_ind():
-            pass  # Ok, nothing to do
+            pass
         else:
-            logger.warning(self.TXT_UNKNOWN_CTRL)
+            logger.warning('Unknown Ctrl')
             self.inc_counter('Unknown_Ctrl')
-        self.forward()
+        self.forward(self._recv_buffer, self.header_len+self.data_len)
 
     def parse_modbus_header(self):
 
@@ -551,40 +445,27 @@ class Talent(Message):
         result = struct.unpack_from('!lBB', self._recv_buffer,
                                     self.header_len)
         modbus_len = result[1]
-        return msg_hdr_len, modbus_len
-
-    def parse_modbus_header2(self):
-
-        msg_hdr_len = 6
-
-        result = struct.unpack_from('!lBBB', self._recv_buffer,
-                                    self.header_len)
-        modbus_len = result[2]
+        # logger.debug(f'Ref: {result[0]}')
+        # logger.debug(f'Modbus MsgLen: {modbus_len} Func:{result[2]}')
         return msg_hdr_len, modbus_len
 
     def get_modbus_log_lvl(self) -> int:
         if self.ctrl.is_req():
             return logging.INFO
-        elif self.ctrl.is_ind() and self.server_side:
-            return self.mb.last_log_lvl
+        elif self.ctrl.is_ind():
+            if self.server_side:
+                return self.mb.last_log_lvl
         return logging.WARNING
 
     def msg_modbus(self):
-        hdr_len, _ = self.parse_modbus_header()
-        self.__msg_modbus(hdr_len)
-
-    def msg_modbus2(self):
-        hdr_len, _ = self.parse_modbus_header2()
-        self.__msg_modbus(hdr_len)
-
-    def __msg_modbus(self, hdr_len):
+        hdr_len, modbus_len = self.parse_modbus_header()
         data = self._recv_buffer[self.header_len:
                                  self.header_len+self.data_len]
 
         if self.ctrl.is_req():
-            if self.remote_stream.mb.recv_req(data[hdr_len:],
-                                              self.remote_stream.
-                                              msg_forward):
+            if self.remoteStream.mb.recv_req(data[hdr_len:],
+                                             self.remoteStream.
+                                             msg_forward):
                 self.inc_counter('Modbus_Command')
             else:
                 self.inc_counter('Invalid_Msg_Format')
@@ -600,18 +481,17 @@ class Talent(Message):
                     hdr_len:],
                     self.node_id):
                 if update:
-                    self._set_mqtt_timestamp(key, self._utc())
                     self.new_data[key] = True
                 self.modbus_elms += 1          # count for unit tests
         else:
-            logger.warning(self.TXT_UNKNOWN_CTRL)
+            logger.warning('Unknown Ctrl')
             self.inc_counter('Unknown_Ctrl')
-            self.forward()
+            self.forward(self._recv_buffer, self.header_len+self.data_len)
 
     def msg_forward(self):
-        self.forward()
+        self.forward(self._recv_buffer, self.header_len+self.data_len)
 
     def msg_unknown(self):
         logger.warning(f"Unknow Msg: ID:{self.msg_id}")
         self.inc_counter('Unknown_Msg')
-        self.forward()
+        self.forward(self._recv_buffer, self.header_len+self.data_len)

app/src/gen3plus/connection_g3p.py

@@ -1,12 +1,8 @@
 import logging
+# import gc
 from asyncio import StreamReader, StreamWriter
-
-if __name__ == "app.src.gen3plus.connection_g3p":
-    from app.src.async_stream import AsyncStream
-    from app.src.gen3plus.solarman_v5 import SolarmanV5
-else:  # pragma: no cover
-    from async_stream import AsyncStream
-    from gen3plus.solarman_v5 import SolarmanV5
+from async_stream import AsyncStream
+from gen3plus.solarman_v5 import SolarmanV5
 
 logger = logging.getLogger('conn')
 
@@ -15,12 +11,11 @@ class ConnectionG3P(AsyncStream, SolarmanV5):
 
     def __init__(self, reader: StreamReader, writer: StreamWriter,
                  addr, remote_stream: 'ConnectionG3P',
-                 server_side: bool,
-                 client_mode: bool) -> None:
+                 server_side: bool) -> None:
         AsyncStream.__init__(self, reader, writer, addr)
-        SolarmanV5.__init__(self, server_side, client_mode)
+        SolarmanV5.__init__(self, server_side)
 
-        self.remote_stream: 'ConnectionG3P' = remote_stream
+        self.remoteStream: 'ConnectionG3P' = remote_stream
 
     '''
     Our puplic methods
@@ -31,10 +26,10 @@ class ConnectionG3P(AsyncStream, SolarmanV5):
         #  logger.info(f'AsyncStream refs: {gc.get_referrers(self)}')
 
     async def async_create_remote(self) -> None:
-        pass  # virtual interface # pragma: no cover
+        pass
 
     async def async_publ_mqtt(self) -> None:
-        pass  # virtual interface # pragma: no cover
+        pass
 
     def healthy(self) -> bool:
         logger.debug('ConnectionG3P healthy()')

app/src/gen3plus/infos_g3p.py

@@ -3,9 +3,9 @@ import struct
 from typing import Generator
 
 if __name__ == "app.src.gen3plus.infos_g3p":
-    from app.src.infos import Infos, Register, ProxyMode
+    from app.src.infos import Infos, Register
 else:  # pragma: no cover
-    from infos import Infos, Register, ProxyMode
+    from infos import Infos, Register
 
 
 class RegisterMap:
@@ -14,17 +14,15 @@ class RegisterMap:
     __slots__ = ()
     map = {
         # 0x41020007: {'reg': Register.DEVICE_SNR,           'fmt': '<L'},                 # noqa: E501
-        0x41020018: {'reg': Register.DATA_UP_INTERVAL,     'fmt': '<B', 'ratio':   60, 'dep': ProxyMode.SERVER},  # noqa: E501
-        0x41020019: {'reg': Register.COLLECT_INTERVAL,     'fmt': '<B', 'eval': 'round(result/60)', 'dep': ProxyMode.SERVER},  # noqa: E501
+        0x41020018: {'reg': Register.DATA_UP_INTERVAL,     'fmt': '<B', 'ratio':   60},  # noqa: E501
+        0x41020019: {'reg': Register.COLLECT_INTERVAL,     'fmt': '<B', 'eval': 'round(result/60)'},  # noqa: E501
         0x4102001a: {'reg': Register.HEARTBEAT_INTERVAL,   'fmt': '<B', 'ratio':    1},  # noqa: E501
-        0x4102001c: {'reg': Register.SIGNAL_STRENGTH,      'fmt': '<B', 'ratio':    1, 'dep': ProxyMode.SERVER},  # noqa: E501
+        0x4102001c: {'reg': Register.SIGNAL_STRENGTH,      'fmt': '<B', 'ratio':    1},  # noqa: E501
         0x4102001e: {'reg': Register.CHIP_MODEL,           'fmt': '!40s'},               # noqa: E501
         0x4102004c: {'reg': Register.IP_ADDRESS,           'fmt': '!16s'},               # noqa: E501
-        0x4102005f: {'reg': Register.SENSOR_LIST,          'fmt': '<H', 'eval': "f'{result:04x}'"},                 # noqa: E501
         0x41020064: {'reg': Register.COLLECTOR_FW_VERSION, 'fmt': '!40s'},               # noqa: E501
 
-        0x4201000c: {'reg': Register.SENSOR_LIST,          'fmt': '<H', 'eval': "f'{result:04x}'"},                 # noqa: E501
-        0x4201001c: {'reg': Register.POWER_ON_TIME,        'fmt': '<H', 'ratio':    1, 'dep': ProxyMode.SERVER},  # noqa: E501, or packet number
+        0x4201001c: {'reg': Register.POWER_ON_TIME,        'fmt': '<H', 'ratio':    1},  # noqa: E501
         0x42010020: {'reg': Register.SERIAL_NUMBER,        'fmt': '!16s'},               # noqa: E501
         0x420100c0: {'reg': Register.INVERTER_STATUS,      'fmt': '!H'},                 # noqa: E501
         0x420100d0: {'reg': Register.VERSION,              'fmt': '!H', 'eval': "f'V{(result>>12)}.{(result>>8)&0xf}.{(result>>4)&0xf}{result&0xf}'"},  # noqa: E501
@@ -58,31 +56,19 @@ class RegisterMap:
         0x42010110: {'reg': Register.PV4_DAILY_GENERATION, 'fmt': '!H', 'ratio': 0.01},  # noqa: E501
         0x42010112: {'reg': Register.PV4_TOTAL_GENERATION, 'fmt': '!L', 'ratio': 0.01},  # noqa: E501
         0x42010126: {'reg': Register.MAX_DESIGNED_POWER,   'fmt': '!H', 'ratio':    1},  # noqa: E501
+        0x42010170: {'reg': Register.NO_INPUTS,            'fmt': '!B'},                 # noqa: E501
 
-        0xffffff01: {'reg': Register.OUTPUT_COEFFICIENT},
-        0xffffff02: {'reg': Register.POLLING_INTERVAL},
         # 0x4281001c: {'reg': Register.POWER_ON_TIME,        'fmt': '<H', 'ratio':    1},  # noqa: E501
 
     }
 
 
 class InfosG3P(Infos):
-    def __init__(self, client_mode: bool):
+    def __init__(self):
         super().__init__()
-        self.client_mode = client_mode
         self.set_db_def_value(Register.MANUFACTURER, 'TSUN')
         self.set_db_def_value(Register.EQUIPMENT_MODEL, 'TSOL-MSxx00')
         self.set_db_def_value(Register.CHIP_TYPE, 'IGEN TECH')
-        self.set_db_def_value(Register.NO_INPUTS, 4)
-
-    def __hide_topic(self, row: dict) -> bool:
-        if 'dep' in row:
-            mode = row['dep']
-            if self.client_mode:
-                return mode != ProxyMode.CLIENT
-            else:
-                return mode != ProxyMode.SERVER
-        return False
 
     def ha_confs(self, ha_prfx: str, node_id: str, snr: str,
                  sug_area: str = '') \
@@ -98,10 +84,7 @@ class InfosG3P(Infos):
         # iterate over RegisterMap.map and get the register values
         for row in RegisterMap.map.values():
             info_id = row['reg']
-            if self.__hide_topic(row):
-                res = self.ha_remove(info_id, node_id, snr)  # noqa: E501
-            else:
-                res = self.ha_conf(info_id, ha_prfx, node_id, snr, False, sug_area)  # noqa: E501
+            res = self.ha_conf(info_id, ha_prfx, node_id, snr, False, sug_area)  # noqa: E501
             if res:
                 yield res
 
@@ -120,7 +103,15 @@ class InfosG3P(Infos):
             if not isinstance(row, dict):
                 continue
             info_id = row['reg']
-            result = self.__get_value(buf, addr, row)
+            fmt = row['fmt']
+            res = struct.unpack_from(fmt, buf, addr)
+            result = res[0]
+            if isinstance(result, (bytearray, bytes)):
+                result = result.decode().split('\x00')[0]
+            if 'eval' in row:
+                result = eval(row['eval'])
+            if 'ratio' in row:
+                result = round(result * row['ratio'], 2)
 
             keys, level, unit, must_incr = self._key_obj(info_id)
 
@@ -134,16 +125,3 @@ class InfosG3P(Infos):
             if update:
                 self.tracer.log(level, f'[{node_id}] GEN3PLUS: {name}'
                                        f' : {result}{unit}')
-
-    def __get_value(self, buf, idx, row):
-        '''Get a value from buf and interpret as in row'''
-        fmt = row['fmt']
-        res = struct.unpack_from(fmt, buf, idx)
-        result = res[0]
-        if isinstance(result, (bytearray, bytes)):
-            result = result.decode().split('\x00')[0]
-        if 'eval' in row:
-            result = eval(row['eval'])
-        if 'ratio' in row:
-            result = round(result * row['ratio'], 2)
-        return result

app/src/gen3plus/inverter_g3p.py

@@ -3,20 +3,15 @@ import traceback
 import json
 import asyncio
 from asyncio import StreamReader, StreamWriter
+from config import Config
+from inverter import Inverter
+from gen3plus.connection_g3p import ConnectionG3P
 from aiomqtt import MqttCodeError
+from infos import Infos
 
-if __name__ == "app.src.gen3plus.inverter_g3p":
-    from app.src.config import Config
-    from app.src.inverter import Inverter
-    from app.src.gen3plus.connection_g3p import ConnectionG3P
-    from app.src.infos import Infos
-else:  # pragma: no cover
-    from config import Config
-    from inverter import Inverter
-    from gen3plus.connection_g3p import ConnectionG3P
-    from infos import Infos
-
+# import gc
 
+# logger = logging.getLogger('conn')
 logger_mqtt = logging.getLogger('mqtt')
 
 
@@ -50,10 +45,8 @@ class InverterG3P(Inverter, ConnectionG3P):
                  destroyed
     '''
 
-    def __init__(self, reader: StreamReader, writer: StreamWriter, addr,
-                 client_mode: bool = False):
-        super().__init__(reader, writer, addr, None,
-                         server_side=True, client_mode=client_mode)
+    def __init__(self, reader: StreamReader, writer: StreamWriter, addr):
+        super().__init__(reader, writer, addr, None, True)
         self.__ha_restarts = -1
 
     async def async_create_remote(self) -> None:
@@ -67,11 +60,10 @@ class InverterG3P(Inverter, ConnectionG3P):
             logging.info(f'[{self.node_id}] Connect to {addr}')
             connect = asyncio.open_connection(host, port)
             reader, writer = await connect
-            self.remote_stream = ConnectionG3P(reader, writer, addr, self,
-                                               server_side=False,
-                                               client_mode=False)
-            logging.info(f'[{self.remote_stream.node_id}:'
-                         f'{self.remote_stream.conn_no}] '
+            self.remoteStream = ConnectionG3P(reader, writer, addr, self,
+                                              False)
+            logging.info(f'[{self.remoteStream.node_id}:'
+                         f'{self.remoteStream.conn_no}] '
                          f'Connected to {addr}')
             asyncio.create_task(self.client_loop(addr))
 

app/src/gen3plus/solarman_v5.py

@@ -1,4 +1,5 @@
 import struct
+# import json
 import logging
 import time
 import asyncio
@@ -18,6 +19,7 @@ else:  # pragma: no cover
     from my_timer import Timer
     from gen3plus.infos_g3p import InfosG3P
     from infos import Register
+# import traceback
 
 logger = logging.getLogger('msg')
 
@@ -52,26 +54,18 @@ class SolarmanV5(Message):
     AT_CMD = 1
     MB_RTU_CMD = 2
     MB_START_TIMEOUT = 40
-    '''start delay for Modbus polling in server mode'''
     MB_REGULAR_TIMEOUT = 60
-    '''regular Modbus polling time in server mode'''
-    MB_CLIENT_DATA_UP = 30
-    '''Data up time in client mode'''
-    HDR_FMT = '<BLLL'
-    '''format string for packing of the header'''
 
-    def __init__(self, server_side: bool, client_mode: bool):
-        super().__init__(server_side, self.send_modbus_cb, mb_timeout=8)
+    def __init__(self, server_side: bool):
+        super().__init__(server_side, self.send_modbus_cb, mb_timeout=5)
 
         self.header_len = 11  # overwrite construcor in class Message
         self.control = 0
         self.seq = Sequence(server_side)
         self.snr = 0
-        self.db = InfosG3P(client_mode)
+        self.db = InfosG3P()
         self.time_ofs = 0
         self.forward_at_cmd_resp = False
-        self.no_forwarding = False
-        '''not allowed to connect to TSUN cloud by connection type'''
         self.switch = {
 
             0x4210: self.msg_data_ind,   # real time data
@@ -134,25 +128,12 @@ class SolarmanV5(Message):
 
         self.node_id = 'G3P'  # will be overwritten in __set_serial_no
         self.mb_timer = Timer(self.mb_timout_cb, self.node_id)
-        self.mb_timeout = self.MB_REGULAR_TIMEOUT
-        self.mb_first_timeout = self.MB_START_TIMEOUT
-        '''timer value for next Modbus polling request'''
-        self.modbus_polling = False
-        self.sensor_list = 0x0000
 
     '''
     Our puplic methods
     '''
     def close(self) -> None:
         logging.debug('Solarman.close()')
-        if self.server_side:
-            # set inverter state to offline, if output power is very low
-            logging.debug('close power: '
-                          f'{self.db.get_db_value(Register.OUTPUT_POWER, -1)}')
-            if self.db.get_db_value(Register.OUTPUT_POWER, 999) < 2:
-                self.db.set_db_def_value(Register.INVERTER_STATUS, 0)
-                self.new_data['env'] = True
-
         # we have references to methods of this class in self.switch
         # so we have to erase self.switch, otherwise this instance can't be
         # deallocated by the garbage collector ==> we get a memory leak
@@ -162,58 +143,26 @@ class SolarmanV5(Message):
         self.mb_timer.close()
         super().close()
 
-    async def send_start_cmd(self, snr: int, host: str,
-                             start_timeout=MB_CLIENT_DATA_UP):
-        self.no_forwarding = True
-        self.snr = snr
-        self.__set_serial_no(snr)
-        self.mb_timeout = start_timeout
-        self.db.set_db_def_value(Register.IP_ADDRESS, host)
-        self.db.set_db_def_value(Register.POLLING_INTERVAL,
-                                 self.mb_timeout)
-        self.db.set_db_def_value(Register.HEARTBEAT_INTERVAL,
-                                 120)
-        self.new_data['controller'] = True
-
-        self.state = State.up
-        self._send_modbus_cmd(Modbus.READ_REGS, 0x3000, 48, logging.DEBUG)
-        self.mb_timer.start(self.mb_timeout)
-
-    def new_state_up(self):
-        if self.state is not State.up:
-            self.state = State.up
-            if (self.modbus_polling):
-                self.mb_timer.start(self.mb_first_timeout)
-                self.db.set_db_def_value(Register.POLLING_INTERVAL,
-                                         self.mb_timeout)
-
-    def __set_config_parms(self, inv: dict):
-        '''init connection with params from the configuration'''
-        self.node_id = inv['node_id']
-        self.sug_area = inv['suggested_area']
-        self.modbus_polling = inv['modbus_polling']
-        self.sensor_list = inv['sensor_list']
-
     def __set_serial_no(self, snr: int):
-        '''check the serial number and configure the inverter connection'''
         serial_no = str(snr)
         if self.unique_id == serial_no:
             logger.debug(f'SerialNo: {serial_no}')
         else:
+            found = False
             inverters = Config.get('inverters')
             # logger.debug(f'Inverters: {inverters}')
 
-            for key, inv in inverters.items():
+            for inv in inverters.values():
                 # logger.debug(f'key: {key} -> {inv}')
                 if (type(inv) is dict and 'monitor_sn' in inv
                    and inv['monitor_sn'] == snr):
-                    self.__set_config_parms(inv)
-                    self.db.set_pv_module_details(inv)
+                    found = True
+                    self.node_id = inv['node_id']
+                    self.sug_area = inv['suggested_area']
                     logger.debug(f'SerialNo {serial_no} allowed! area:{self.sug_area}')  # noqa: E501
+                    self.db.set_pv_module_details(inv)
 
-                    self.db.set_db_def_value(Register.COLLECTOR_SNR, key)
-                    break
-            else:
+            if not found:
                 self.node_id = ''
                 self.sug_area = ''
                 if 'allow_all' not in inverters or not inverters['allow_all']:
@@ -221,54 +170,55 @@ class SolarmanV5(Message):
                     self.unique_id = None
                     logger.warning(f'ignore message from unknow inverter! (SerialNo: {serial_no})')  # noqa: E501
                     return
-                logger.warning(f'SerialNo {serial_no} not known but accepted!')
+                logger.debug(f'SerialNo {serial_no} not known but accepted!')
 
             self.unique_id = serial_no
 
     def read(self) -> float:
-        '''process all received messages in the _recv_buffer'''
         self._read()
-        while True:
-            if not self.header_valid:
-                self.__parse_header(self._recv_buffer, len(self._recv_buffer))
 
-            if self.header_valid and len(self._recv_buffer) >= \
-               (self.header_len + self.data_len+2):
-                self.__process_complete_received_msg()
-                self.__flush_recv_msg()
-            else:
-                return 0  # wait 0s before sending a response
+        if not self.header_valid:
+            self.__parse_header(self._recv_buffer, len(self._recv_buffer))
 
-    def __process_complete_received_msg(self):
-        log_lvl = self.log_lvl.get(self.control, logging.WARNING)
-        if callable(log_lvl):
-            log_lvl = log_lvl()
-        hex_dump_memory(log_lvl, f'Received from {self.addr}:',
-                        self._recv_buffer, self.header_len +
-                        self.data_len+2)
-        if self.__trailer_is_ok(self._recv_buffer, self.header_len
-                                + self.data_len + 2):
-            if self.state == State.init:
-                self.state = State.received
-            self.__set_serial_no(self.snr)
-            self.__dispatch_msg()
+        if self.header_valid and len(self._recv_buffer) >= (self.header_len +
+                                                            self.data_len+2):
+            log_lvl = self.log_lvl.get(self.control, logging.WARNING)
+            if callable(log_lvl):
+                log_lvl = log_lvl()
+            hex_dump_memory(log_lvl, f'Received from {self.addr}:',
+                            self._recv_buffer, self.header_len+self.data_len+2)
+            if self.__trailer_is_ok(self._recv_buffer, self.header_len
+                                    + self.data_len + 2):
+                if self.state == State.init:
+                    self.state = State.received
+
+                self.__set_serial_no(self.snr)
+                self.__dispatch_msg()
+            self.__flush_recv_msg()
+        return 0  # wait 0s before sending a response
 
     def forward(self, buffer, buflen) -> None:
-        '''add the actual receive msg to the forwarding queue'''
-        if self.no_forwarding:
-            return
         tsun = Config.get('solarman')
         if tsun['enabled']:
-            self._forward_buffer += buffer[:buflen]
+            self._forward_buffer = buffer[:buflen]
             hex_dump_memory(logging.DEBUG, 'Store for forwarding:',
                             buffer, buflen)
 
+            self.__parse_header(self._forward_buffer,
+                                len(self._forward_buffer))
             fnc = self.switch.get(self.control, self.msg_unknown)
             logger.info(self.__flow_str(self.server_side, 'forwrd') +
                         f' Ctl: {int(self.control):#04x}'
                         f' Msg: {fnc.__name__!r}')
+        return
 
     def _init_new_client_conn(self) -> bool:
+        # self.__build_header(0x91)
+        # self._send_buffer += struct.pack(f'!{len(contact_name)+1}p'
+        #                                  f'{len(contact_mail)+1}p',
+        #                                  contact_name, contact_mail)
+
+        # self.__finish_send_msg()
         return False
 
     '''
@@ -320,6 +270,7 @@ class SolarmanV5(Message):
             self._recv_buffer = bytearray()
             return
         self.header_valid = True
+        return
 
     def __trailer_is_ok(self, buf: bytes, buf_len: int) -> bool:
         crc = buf[self.data_len+11]
@@ -369,17 +320,13 @@ class SolarmanV5(Message):
         '''update header for message before forwarding,
         set sequence and checksum'''
         _len = len(_forward_buffer)
-        ofs = 0
-        while ofs < _len:
-            result = struct.unpack_from('<BH', _forward_buffer, ofs)
-            data_len = result[1]    # len of variable id string
+        struct.pack_into('<H', _forward_buffer, 1,
+                         _len-13)
+        struct.pack_into('<H', _forward_buffer, 5,
+                         self.seq.get_send())
 
-            struct.pack_into('<H', _forward_buffer, ofs+5,
-                             self.seq.get_send())
-
-            check = sum(_forward_buffer[ofs+1:ofs+data_len+11]) & 0xff
-            struct.pack_into('<B', _forward_buffer, ofs+data_len+11, check)
-            ofs += (13 + data_len)
+        check = sum(_forward_buffer[1:_len-2]) & 0xff
+        struct.pack_into('<B', _forward_buffer, _len-2, check)
 
     def __dispatch_msg(self) -> None:
         fnc = self.switch.get(self.control, self.msg_unknown)
@@ -412,7 +359,7 @@ class SolarmanV5(Message):
             return
         self.__build_header(0x4510)
         self._send_buffer += struct.pack('<BHLLL', self.MB_RTU_CMD,
-                                         self.sensor_list, 0, 0, 0)
+                                         0x2b0, 0, 0, 0)
         self._send_buffer += pdu
         self.__finish_send_msg()
         hex_dump_memory(log_lvl, f'Send Modbus {state}:{self.addr}:',
@@ -431,27 +378,27 @@ class SolarmanV5(Message):
         self._send_modbus_cmd(func, addr, val, log_lvl)
 
     def mb_timout_cb(self, exp_cnt):
-        self.mb_timer.start(self.mb_timeout)
+        self.mb_timer.start(self.MB_REGULAR_TIMEOUT)
 
-        self._send_modbus_cmd(Modbus.READ_REGS, 0x3000, 48, logging.DEBUG)
+        self._send_modbus_cmd(Modbus.READ_REGS, 0x3008, 21, logging.DEBUG)
 
-        if 1 == (exp_cnt % 30):
+        if 0 == (exp_cnt % 30):
             # logging.info("Regular Modbus Status request")
-            self._send_modbus_cmd(Modbus.READ_REGS, 0x2000, 96, logging.DEBUG)
+            self._send_modbus_cmd(Modbus.READ_REGS, 0x2007, 2, logging.DEBUG)
 
     def at_cmd_forbidden(self, cmd: str, connection: str) -> bool:
         return not cmd.startswith(tuple(self.at_acl[connection]['allow'])) or \
                 cmd.startswith(tuple(self.at_acl[connection]['block']))
 
-    async def send_at_cmd(self, at_cmd: str) -> None:
+    async def send_at_cmd(self, AT_cmd: str) -> None:
         if self.state != State.up:
             logger.warning(f'[{self.node_id}] ignore AT+ cmd,'
                            ' as the state is not UP')
             return
-        at_cmd = at_cmd.strip()
+        AT_cmd = AT_cmd.strip()
 
-        if self.at_cmd_forbidden(cmd=at_cmd, connection='mqtt'):
-            data_json = f'\'{at_cmd}\' is forbidden'
+        if self.at_cmd_forbidden(cmd=AT_cmd, connection='mqtt'):
+            data_json = f'\'{AT_cmd}\' is forbidden'
             node_id = self.node_id
             key = 'at_resp'
             logger.info(f'{key}: {data_json}')
@@ -460,9 +407,9 @@ class SolarmanV5(Message):
 
         self.forward_at_cmd_resp = False
         self.__build_header(0x4510)
-        self._send_buffer += struct.pack(f'<BHLLL{len(at_cmd)}sc', self.AT_CMD,
-                                         0x0002, 0, 0, 0,
-                                         at_cmd.encode('utf-8'), b'\r')
+        self._send_buffer += struct.pack(f'<BHLLL{len(AT_cmd)}sc', self.AT_CMD,
+                                         2, 0, 0, 0, AT_cmd.encode('utf-8'),
+                                         b'\r')
         self.__finish_send_msg()
         try:
             await self.async_write('Send AT Command:')
@@ -474,21 +421,21 @@ class SolarmanV5(Message):
 
     def __build_model_name(self):
         db = self.db
-        max_pow = db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
-        rated = db.get_db_value(Register.RATED_POWER, 0)
-        model = None
-        if max_pow == 2000:
-            if rated == 800 or rated == 600:
-                model = f'TSOL-MS{max_pow}({rated})'
+        MaxPow = db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
+        Rated = db.get_db_value(Register.RATED_POWER, 0)
+        Model = None
+        if MaxPow == 2000:
+            if Rated == 800 or Rated == 600:
+                Model = f'TSOL-MS{MaxPow}({Rated})'
             else:
-                model = f'TSOL-MS{max_pow}'
-        elif max_pow == 1800 or max_pow == 1600:
-            model = f'TSOL-MS{max_pow}'
-        if model:
-            logger.info(f'Model: {model}')
-            self.db.set_db_def_value(Register.EQUIPMENT_MODEL, model)
+                Model = f'TSOL-MS{MaxPow}'
+        elif MaxPow == 1800 or MaxPow == 1600:
+            Model = f'TSOL-MS{MaxPow}'
+        if Model:
+            logger.info(f'Model: {Model}')
+            self.db.set_db_def_value(Register.EQUIPMENT_MODEL, Model)
 
-    def __process_data(self, ftype, ts):
+    def __process_data(self, ftype):
         inv_update = False
         msg_type = self.control >> 8
         for key, update in self.db.parse(self._recv_buffer, msg_type, ftype,
@@ -496,7 +443,6 @@ class SolarmanV5(Message):
             if update:
                 if key == 'inverter':
                     inv_update = True
-                self._set_mqtt_timestamp(key, ts)
                 self.new_data[key] = True
 
         if inv_update:
@@ -511,22 +457,18 @@ class SolarmanV5(Message):
 
     def msg_dev_ind(self):
         data = self._recv_buffer[self.header_len:]
-        result = struct.unpack_from(self.HDR_FMT, data, 0)
+        result = struct.unpack_from('<BLLL', data, 0)
         ftype = result[0]  # always 2
-        total = result[1]
+        # total = result[1]
         tim = result[2]
         res = result[3]  # always zero
         logger.info(f'frame type:{ftype:02x}'
                     f' timer:{tim:08x}s  null:{res}')
-        if self.time_ofs:
-            #     dt = datetime.fromtimestamp(total + self.time_ofs)
-            #     logger.info(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}')
-            ts = total + self.time_ofs
-        else:
-            ts = None
-        self.__process_data(ftype, ts)
-        self.sensor_list = int(self.db.get_db_value(Register.SENSOR_LIST, 0),
-                               16)
+        # if self.time_ofs:
+        #     dt = datetime.fromtimestamp(total + self.time_ofs)
+        #     logger.info(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}')
+
+        self.__process_data(ftype)
         self.__forward_msg()
         self.__send_ack_rsp(0x1110, ftype)
 
@@ -534,33 +476,28 @@ class SolarmanV5(Message):
         data = self._recv_buffer
         result = struct.unpack_from('<BHLLLHL', data, self.header_len)
         ftype = result[0]  # 1 or 0x81
-        sensor = result[1]
-        total = result[2]
+        # total = result[2]
         tim = result[3]
         if 1 == ftype:
             self.time_ofs = result[4]
         unkn = result[5]
         cnt = result[6]
-        if sensor != self.sensor_list:
-            logger.warning(f'Unexpected Sensor-List:{sensor:04x}'
-                           f' (!={self.sensor_list:04x})')
         logger.info(f'ftype:{ftype:02x} timer:{tim:08x}s'
                     f' ??: {unkn:04x} cnt:{cnt}')
-        if self.time_ofs:
-            #     dt = datetime.fromtimestamp(total + self.time_ofs)
-            #     logger.info(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}')
-            ts = total + self.time_ofs
-        else:
-            ts = None
+        # if self.time_ofs:
+        #     dt = datetime.fromtimestamp(total + self.time_ofs)
+        #     logger.info(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}')
 
-        self.__process_data(ftype, ts)
+        self.__process_data(ftype)
         self.__forward_msg()
         self.__send_ack_rsp(0x1210, ftype)
-        self.new_state_up()
+        if self.state is not State.up:
+            self.state = State.up
+            self.mb_timer.start(self.MB_START_TIMEOUT)
 
     def msg_sync_start(self):
         data = self._recv_buffer[self.header_len:]
-        result = struct.unpack_from(self.HDR_FMT, data, 0)
+        result = struct.unpack_from('<BLLL', data, 0)
         ftype = result[0]
         total = result[1]
         self.time_ofs = result[3]
@@ -577,17 +514,17 @@ class SolarmanV5(Message):
         result = struct.unpack_from('<B', data, 0)
         ftype = result[0]
         if ftype == self.AT_CMD:
-            at_cmd = data[15:].decode()
-            if self.at_cmd_forbidden(cmd=at_cmd, connection='tsun'):
+            AT_cmd = data[15:].decode()
+            if self.at_cmd_forbidden(cmd=AT_cmd, connection='tsun'):
                 self.inc_counter('AT_Command_Blocked')
                 return
             self.inc_counter('AT_Command')
             self.forward_at_cmd_resp = True
 
         elif ftype == self.MB_RTU_CMD:
-            if self.remote_stream.mb.recv_req(data[15:],
-                                              self.remote_stream.
-                                              __forward_msg):
+            if self.remoteStream.mb.recv_req(data[15:],
+                                             self.remoteStream.
+                                             __forward_msg):
                 self.inc_counter('Modbus_Command')
             else:
                 logger.error('Invalid Modbus Msg')
@@ -596,7 +533,7 @@ class SolarmanV5(Message):
 
         self.__forward_msg()
 
-    def publish_mqtt(self, key, data):  # pragma: no cover
+    def publish_mqtt(self, key, data):
         asyncio.ensure_future(
             self.mqtt.publish(key, data))
 
@@ -606,9 +543,9 @@ class SolarmanV5(Message):
             if self.forward_at_cmd_resp:
                 return logging.INFO
             return logging.DEBUG
-        elif ftype == self.MB_RTU_CMD \
-                and self.server_side:
-            return self.mb.last_log_lvl
+        elif ftype == self.MB_RTU_CMD:
+            if self.server_side:
+                return self.mb.last_log_lvl
 
         return logging.WARNING
 
@@ -625,30 +562,27 @@ class SolarmanV5(Message):
                 self.publish_mqtt(f'{self.entity_prfx}{node_id}{key}', data_json)  # noqa: E501
                 return
         elif ftype == self.MB_RTU_CMD:
-            self.__modbus_command_rsp(data)
+            valid = data[1]
+            modbus_msg_len = self.data_len - 14
+            # logger.debug(f'modbus_len:{modbus_msg_len} accepted:{valid}')
+            if valid == 1 and modbus_msg_len > 4:
+                # logger.info(f'first byte modbus:{data[14]}')
+                inv_update = False
+                self.modbus_elms = 0
+
+                for key, update, _ in self.mb.recv_resp(self.db, data[14:],
+                                                        self.node_id):
+                    self.modbus_elms += 1
+                    if update:
+                        if key == 'inverter':
+                            inv_update = True
+                        self.new_data[key] = True
+
+                if inv_update:
+                    self.__build_model_name()
             return
         self.__forward_msg()
 
-    def __modbus_command_rsp(self, data):
-        '''precess MODBUS RTU response'''
-        valid = data[1]
-        modbus_msg_len = self.data_len - 14
-        # logger.debug(f'modbus_len:{modbus_msg_len} accepted:{valid}')
-        if valid == 1 and modbus_msg_len > 4:
-            # logger.info(f'first byte modbus:{data[14]}')
-            inv_update = False
-            self.modbus_elms = 0
-            for key, update, _ in self.mb.recv_resp(self.db, data[14:],
-                                                    self.node_id):
-                self.modbus_elms += 1
-                if update:
-                    if key == 'inverter':
-                        inv_update = True
-                    self._set_mqtt_timestamp(key, self._timestamp())
-                    self.new_data[key] = True
-            if inv_update:
-                self.__build_model_name()
-
     def msg_hbeat_ind(self):
         data = self._recv_buffer[self.header_len:]
         result = struct.unpack_from('<B', data, 0)
@@ -656,11 +590,13 @@ class SolarmanV5(Message):
 
         self.__forward_msg()
         self.__send_ack_rsp(0x1710, ftype)
-        self.new_state_up()
+        if self.state is not State.up:
+            self.state = State.up
+            self.mb_timer.start(self.MB_START_TIMEOUT)
 
     def msg_sync_end(self):
         data = self._recv_buffer[self.header_len:]
-        result = struct.unpack_from(self.HDR_FMT, data, 0)
+        result = struct.unpack_from('<BLLL', data, 0)
         ftype = result[0]
         total = result[1]
         self.time_ofs = result[3]

app/src/infos.py

@@ -5,19 +5,12 @@ from enum import Enum
 from typing import Generator
 
 
-class ProxyMode(Enum):
-    SERVER = 1
-    CLIENT = 2
-
-
 class Register(Enum):
     COLLECTOR_FW_VERSION = 1
     CHIP_TYPE = 2
     CHIP_MODEL = 3
     TRACE_URL = 4
     LOGGER_URL = 5
-    MAC_ADDR = 6
-    COLLECTOR_SNR = 7
     PRODUCT_NAME = 20
     MANUFACTURER = 21
     VERSION = 22
@@ -25,7 +18,6 @@ class Register(Enum):
     EQUIPMENT_MODEL = 24
     NO_INPUTS = 25
     MAX_DESIGNED_POWER = 26
-    OUTPUT_COEFFICIENT = 27
     INVERTER_CNT = 50
     UNKNOWN_SNR = 51
     UNKNOWN_MSG = 52
@@ -97,8 +89,6 @@ class Register(Enum):
     CONNECT_COUNT = 405
     HEARTBEAT_INTERVAL = 406
     IP_ADDRESS = 407
-    POLLING_INTERVAL = 408
-    SENSOR_LIST = 409
     EVENT_401 = 500
     EVENT_402 = 501
     EVENT_403 = 502
@@ -115,9 +105,6 @@ class Register(Enum):
     EVENT_414 = 513
     EVENT_415 = 514
     EVENT_416 = 515
-    TS_INPUT = 600
-    TS_GRID = 601
-    TS_TOTAL = 602
     VALUE_1 = 9000
     TEST_REG1 = 10000
     TEST_REG2 = 10001
@@ -133,16 +120,16 @@ class ClrAtMidnight:
             return
 
         prfx += f'{keys[0]}'
-        db_dict = cls.db
-        if prfx not in db_dict:
-            db_dict[prfx] = {}
-        db_dict = db_dict[prfx]
+        dict = cls.db
+        if prfx not in dict:
+            dict[prfx] = {}
+        dict = dict[prfx]
 
         for key in keys[1:-1]:
-            if key not in db_dict:
-                db_dict[key] = {}
-            db_dict = db_dict[key]
-        db_dict[keys[-1]] = 0
+            if key not in dict:
+                dict[key] = {}
+            dict = dict[key]
+        dict[keys[-1]] = 0
 
     @classmethod
     def elm(cls) -> Generator[tuple[str, dict], None, None]:
@@ -152,21 +139,10 @@ class ClrAtMidnight:
 
 
 class Infos:
-    LIGHTNING = 'mdi:lightning-bolt'
-    COUNTER = 'mdi:counter'
-    GAUGE = 'mdi:gauge'
-    SOLAR_POWER_VAR = 'mdi:solar-power-variant'
-    SOLAR_POWER = 'mdi:solar-power'
-    WIFI = 'mdi:wifi'
-    UPDATE = 'mdi:update'
-    DAILY_GEN = 'Daily Generation'
-    TOTAL_GEN = 'Total Generation'
-    FMT_INT = '| int'
-    FMT_FLOAT = '| float'
-    FMT_STRING_SEC = '| string + " s"'
     stat = {}
     app_name = os.getenv('SERVICE_NAME', 'proxy')
     version = os.getenv('VERSION', 'unknown')
+
     new_stat_data = {}
 
     @classmethod
@@ -190,8 +166,8 @@ class Infos:
 
     __info_devs = {
         'proxy':      {'singleton': True,   'name': 'Proxy', 'mf': 'Stefan Allius'},  # noqa: E501
-        'controller': {'via': 'proxy',      'name': 'Controller',     'mdl': Register.CHIP_MODEL, 'mf': Register.CHIP_TYPE, 'sw': Register.COLLECTOR_FW_VERSION, 'mac': Register.MAC_ADDR, 'sn': Register.COLLECTOR_SNR},  # noqa: E501
-        'inverter':   {'via': 'controller', 'name': 'Micro Inverter', 'mdl': Register.EQUIPMENT_MODEL, 'mf': Register.MANUFACTURER, 'sw': Register.VERSION, 'sn': Register.SERIAL_NUMBER},  # noqa: E501
+        'controller': {'via': 'proxy',      'name': 'Controller',     'mdl': Register.CHIP_MODEL, 'mf': Register.CHIP_TYPE, 'sw': Register.COLLECTOR_FW_VERSION},  # noqa: E501
+        'inverter':   {'via': 'controller', 'name': 'Micro Inverter', 'mdl': Register.EQUIPMENT_MODEL, 'mf': Register.MANUFACTURER, 'sw': Register.VERSION},  # noqa: E501
         'input_pv1':  {'via': 'inverter',   'name': 'Module PV1', 'mdl': Register.PV1_MODEL, 'mf': Register.PV1_MANUFACTURER},  # noqa: E501
         'input_pv2':  {'via': 'inverter',   'name': 'Module PV2', 'mdl': Register.PV2_MODEL, 'mf': Register.PV2_MANUFACTURER, 'dep': {'reg': Register.NO_INPUTS, 'gte': 2}},  # noqa: E501
         'input_pv3':  {'via': 'inverter',   'name': 'Module PV3', 'mdl': Register.PV3_MODEL, 'mf': Register.PV3_MANUFACTURER, 'dep': {'reg': Register.NO_INPUTS, 'gte': 3}},  # noqa: E501
@@ -201,32 +177,15 @@ class Infos:
     }
 
     __comm_type_val_tpl = "{%set com_types = ['n/a','Wi-Fi', 'G4', 'G5', 'GPRS'] %}{{com_types[value_json['Communication_Type']|int(0)]|default(value_json['Communication_Type'])}}"    # noqa: E501
-    __status_type_val_tpl = "{%set inv_status = ['Off-line', 'On-grid', 'Off-grid'] %}{{inv_status[value_json['Inverter_Status']|int(0)]|default(value_json['Inverter_Status'])}}"    # noqa: E501
-    __rated_power_val_tpl = "{% if 'Rated_Power' in value_json and value_json['Rated_Power'] != None %}{{value_json['Rated_Power']|string() +' W'}}{% else %}{{ this.state }}{% endif %}"  # noqa: E501
-    __designed_power_val_tpl = '''
-{% if 'Max_Designed_Power' in value_json and
-      value_json['Max_Designed_Power'] != None %}
-  {% if value_json['Max_Designed_Power'] | int(0xffff) < 0x8000 %}
-    {{value_json['Max_Designed_Power']|string() +' W'}}
-  {% else %}
-    n/a
-  {% endif %}
-{% else %}
-  {{ this.state }}
-{% endif %}
-'''
-    __output_coef_val_tpl = "{% if 'Output_Coefficient' in value_json and value_json['Output_Coefficient'] != None %}{{value_json['Output_Coefficient']|string() +' %'}}{% else %}{{ this.state }}{% endif %}"  # noqa: E501
+    __status_type_val_tpl = "{%set inv_status = ['n/a', 'Online', 'Offline'] %}{{inv_status[value_json['Inverter_Status']|int(0)]|default(value_json['Inverter_Status'])}}"    # noqa: E501
 
     __info_defs = {
         # collector values used for device registration:
         Register.COLLECTOR_FW_VERSION:  {'name': ['collector', 'Collector_Fw_Version'],       'level': logging.INFO,  'unit': ''},  # noqa: E501
-        Register.CHIP_TYPE:  {'name': ['collector', 'Chip_Type'],        'singleton': False,  'level': logging.DEBUG, 'unit': ''},  # noqa: E501
-        Register.CHIP_MODEL: {'name': ['collector', 'Chip_Model'],       'singleton': False,  'level': logging.DEBUG, 'unit': ''},  # noqa: E501
-        Register.TRACE_URL:  {'name': ['collector', 'Trace_URL'],        'singleton': False,  'level': logging.DEBUG, 'unit': ''},  # noqa: E501
-        Register.LOGGER_URL: {'name': ['collector', 'Logger_URL'],       'singleton': False,  'level': logging.DEBUG, 'unit': ''},  # noqa: E501
-        Register.MAC_ADDR:   {'name': ['collector', 'MAC-Addr'],         'singleton': False,  'level': logging.INFO,  'unit': ''},  # noqa: E501
-        Register.COLLECTOR_SNR: {'name': ['collector', 'Serial_Number'], 'singleton': False,  'level': logging.INFO,  'unit': ''},  # noqa: E501
-
+        Register.CHIP_TYPE:  {'name': ['collector', 'Chip_Type'],                  'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.CHIP_MODEL: {'name': ['collector', 'Chip_Model'],                 'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.TRACE_URL:  {'name': ['collector', 'Trace_URL'],                  'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.LOGGER_URL: {'name': ['collector', 'Logger_URL'],                 'level': logging.DEBUG, 'unit': ''},  # noqa: E501
 
         # inverter values used for device registration:
         Register.PRODUCT_NAME:    {'name': ['inverter', 'Product_Name'],           'level': logging.DEBUG, 'unit': ''},  # noqa: E501
@@ -235,9 +194,9 @@ class Infos:
         Register.SERIAL_NUMBER:   {'name': ['inverter', 'Serial_Number'],          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
         Register.EQUIPMENT_MODEL: {'name': ['inverter', 'Equipment_Model'],        'level': logging.DEBUG, 'unit': ''},  # noqa: E501
         Register.NO_INPUTS:       {'name': ['inverter', 'No_Inputs'],              'level': logging.DEBUG, 'unit': ''},  # noqa: E501
-        Register.MAX_DESIGNED_POWER: {'name': ['inverter',  'Max_Designed_Power'], 'level': logging.INFO,  'unit': 'W',    'ha': {'dev': 'inverter', 'dev_cla': None, 'stat_cla': None, 'id': 'designed_power_', 'val_tpl': __designed_power_val_tpl, 'name': 'Max Designed Power', 'icon': LIGHTNING, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.RATED_POWER:        {'name': ['inverter',  'Rated_Power'],        'level': logging.DEBUG, 'unit': 'W',    'ha': {'dev': 'inverter', 'dev_cla': None, 'stat_cla': None, 'id': 'rated_power_',    'val_tpl': __rated_power_val_tpl,    'name': 'Rated Power',        'icon': LIGHTNING, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.OUTPUT_COEFFICIENT: {'name': ['inverter',  'Output_Coefficient'], 'level': logging.INFO,  'unit': '%',    'ha': {'dev': 'inverter', 'dev_cla': None, 'stat_cla': None, 'id': 'output_coef_',    'val_tpl': __output_coef_val_tpl,    'name': 'Output Coefficient', 'icon': LIGHTNING, 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.MAX_DESIGNED_POWER: {'name': ['inverter',  'Max_Designed_Power'], 'level': logging.INFO, 'unit': 'W',    'ha': {'dev': 'inverter', 'dev_cla': None,          'stat_cla': None,          'id': 'designed_power_', 'fmt': '| string + " W"', 'name': 'Max Designed Power', 'icon': 'mdi:lightning-bolt', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.RATED_POWER:     {'name': ['inverter',  'Rated_Power'],           'level': logging.DEBUG, 'unit': 'W',    'ha': {'dev': 'inverter', 'dev_cla': None,          'stat_cla': None,          'id': 'rated_power_', 'fmt': '| string + " W"', 'name': 'Rated Power', 'icon': 'mdi:lightning-bolt', 'ent_cat': 'diagnostic'}},  # noqa: E501
+
         Register.PV1_MANUFACTURER: {'name': ['inverter', 'PV1_Manufacturer'],      'level': logging.DEBUG, 'unit': ''},  # noqa: E501
         Register.PV1_MODEL:        {'name': ['inverter', 'PV1_Model'],             'level': logging.DEBUG, 'unit': ''},  # noqa: E501
         Register.PV2_MANUFACTURER: {'name': ['inverter', 'PV2_Manufacturer'],      'level': logging.DEBUG, 'unit': ''},  # noqa: E501
@@ -252,19 +211,19 @@ class Infos:
         Register.PV6_MODEL:        {'name': ['inverter', 'PV6_Model'],             'level': logging.DEBUG, 'unit': ''},  # noqa: E501
 
         # proxy:
-        Register.INVERTER_CNT:       {'name': ['proxy', 'Inverter_Cnt'],       'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_count_',     'fmt': FMT_INT, 'name': 'Active Inverter Connections',    'icon': COUNTER}},  # noqa: E501
-        Register.UNKNOWN_SNR:        {'name': ['proxy', 'Unknown_SNR'],        'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'unknown_snr_',   'fmt': FMT_INT, 'name': 'Unknown Serial No',    'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.UNKNOWN_MSG:        {'name': ['proxy', 'Unknown_Msg'],        'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'unknown_msg_',   'fmt': FMT_INT, 'name': 'Unknown Msg Type',     'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.INVALID_DATA_TYPE:  {'name': ['proxy', 'Invalid_Data_Type'],  'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_data_type_', 'fmt': FMT_INT, 'name': 'Invalid Data Type',    'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.INTERNAL_ERROR:     {'name': ['proxy', 'Internal_Error'],     'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'intern_err_',    'fmt': FMT_INT, 'name': 'Internal Error',       'icon': COUNTER, 'ent_cat': 'diagnostic', 'en': False}},  # noqa: E501
-        Register.UNKNOWN_CTRL:       {'name': ['proxy', 'Unknown_Ctrl'],       'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'unknown_ctrl_',  'fmt': FMT_INT, 'name': 'Unknown Control Type', 'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.OTA_START_MSG:      {'name': ['proxy', 'OTA_Start_Msg'],      'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'ota_start_cmd_', 'fmt': FMT_INT, 'name': 'OTA Start Cmd',        'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.SW_EXCEPTION:       {'name': ['proxy', 'SW_Exception'],       'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'sw_exception_',  'fmt': FMT_INT, 'name': 'Internal SW Exception', 'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.INVALID_MSG_FMT:    {'name': ['proxy', 'Invalid_Msg_Format'], 'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_msg_fmt_',   'fmt': FMT_INT, 'name': 'Invalid Message Format', 'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.AT_COMMAND:         {'name': ['proxy', 'AT_Command'],         'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'at_cmd_',        'fmt': FMT_INT, 'name': 'AT Command',           'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.AT_COMMAND_BLOCKED: {'name': ['proxy', 'AT_Command_Blocked'], 'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'at_cmd_blocked_', 'fmt': FMT_INT, 'name': 'AT Command Blocked',   'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.MODBUS_COMMAND:     {'name': ['proxy', 'Modbus_Command'],     'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'modbus_cmd_',    'fmt': FMT_INT, 'name': 'Modbus Command',       'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        # 0xffffff03:  {'name':['proxy', 'Voltage'],                        'level': logging.DEBUG, 'unit': 'V',    'ha':{'dev':'proxy', 'dev_cla': 'voltage',     'stat_cla': 'measurement', 'id':'proxy_volt_',  'fmt':FMT_FLOAT,'name': 'Grid Voltage'}},  # noqa: E501
+        Register.INVERTER_CNT:       {'name': ['proxy', 'Inverter_Cnt'],       'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_count_',     'fmt': '| int', 'name': 'Active Inverter Connections',    'icon': 'mdi:counter'}},  # noqa: E501
+        Register.UNKNOWN_SNR:        {'name': ['proxy', 'Unknown_SNR'],        'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'unknown_snr_',   'fmt': '| int', 'name': 'Unknown Serial No',    'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.UNKNOWN_MSG:        {'name': ['proxy', 'Unknown_Msg'],        'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'unknown_msg_',   'fmt': '| int', 'name': 'Unknown Msg Type',     'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.INVALID_DATA_TYPE:  {'name': ['proxy', 'Invalid_Data_Type'],  'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_data_type_', 'fmt': '| int', 'name': 'Invalid Data Type',    'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.INTERNAL_ERROR:     {'name': ['proxy', 'Internal_Error'],     'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'intern_err_',    'fmt': '| int', 'name': 'Internal Error',       'icon': 'mdi:counter', 'ent_cat': 'diagnostic', 'en': False}},  # noqa: E501
+        Register.UNKNOWN_CTRL:       {'name': ['proxy', 'Unknown_Ctrl'],       'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'unknown_ctrl_',  'fmt': '| int', 'name': 'Unknown Control Type', 'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.OTA_START_MSG:      {'name': ['proxy', 'OTA_Start_Msg'],      'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'ota_start_cmd_', 'fmt': '| int', 'name': 'OTA Start Cmd',        'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.SW_EXCEPTION:       {'name': ['proxy', 'SW_Exception'],       'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'sw_exception_',  'fmt': '| int', 'name': 'Internal SW Exception', 'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.INVALID_MSG_FMT:    {'name': ['proxy', 'Invalid_Msg_Format'], 'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_msg_fmt_',   'fmt': '| int', 'name': 'Invalid Message Format', 'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.AT_COMMAND:         {'name': ['proxy', 'AT_Command'],         'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'at_cmd_',        'fmt': '| int', 'name': 'AT Command',           'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.AT_COMMAND_BLOCKED: {'name': ['proxy', 'AT_Command_Blocked'], 'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'at_cmd_blocked_', 'fmt': '| int', 'name': 'AT Command Blocked',   'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.MODBUS_COMMAND:     {'name': ['proxy', 'Modbus_Command'],     'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'modbus_cmd_',    'fmt': '| int', 'name': 'Modbus Command',       'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        # 0xffffff03:  {'name':['proxy', 'Voltage'],                        'level': logging.DEBUG, 'unit': 'V',    'ha':{'dev':'proxy', 'dev_cla': 'voltage',     'stat_cla': 'measurement', 'id':'proxy_volt_',  'fmt':'| float','name': 'Grid Voltage'}},  # noqa: E501
 
         # events
         Register.EVENT_401:  {'name': ['events', '401_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
@@ -285,62 +244,57 @@ class Infos:
         Register.EVENT_416:  {'name': ['events', '416_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
 
         # grid measures:
-        Register.TS_GRID:         {'name': ['grid', 'Timestamp'],                  'level': logging.INFO,  'unit': ''},  # noqa: E501
-        Register.GRID_VOLTAGE:    {'name': ['grid', 'Voltage'],                    'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'inverter', 'dev_cla': 'voltage',     'stat_cla': 'measurement', 'id': 'out_volt_',  'fmt': FMT_FLOAT, 'name': 'Grid Voltage', 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.GRID_CURRENT:    {'name': ['grid', 'Current'],                    'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'inverter', 'dev_cla': 'current',     'stat_cla': 'measurement', 'id': 'out_cur_',   'fmt': FMT_FLOAT, 'name': 'Grid Current', 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.GRID_FREQUENCY:  {'name': ['grid', 'Frequency'],                  'level': logging.DEBUG, 'unit': 'Hz',   'ha': {'dev': 'inverter', 'dev_cla': 'frequency',   'stat_cla': 'measurement', 'id': 'out_freq_',  'fmt': FMT_FLOAT, 'name': 'Grid Frequency', 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.OUTPUT_POWER:    {'name': ['grid', 'Output_Power'],               'level': logging.INFO,  'unit': 'W',    'ha': {'dev': 'inverter', 'dev_cla': 'power',       'stat_cla': 'measurement', 'id': 'out_power_', 'fmt': FMT_FLOAT, 'name': 'Power'}},  # noqa: E501
-        Register.INVERTER_TEMP:   {'name': ['env',  'Inverter_Temp'],              'level': logging.DEBUG, 'unit': '°C',   'ha': {'dev': 'inverter', 'dev_cla': 'temperature', 'stat_cla': 'measurement', 'id': 'temp_',       'fmt': FMT_INT, 'name': 'Temperature'}},  # noqa: E501
-        Register.INVERTER_STATUS: {'name': ['env',  'Inverter_Status'],            'level': logging.INFO,  'unit': '',     'ha': {'dev': 'inverter', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_status_', 'name': 'Inverter Status', 'val_tpl': __status_type_val_tpl,          'icon': 'mdi:power'}},  # noqa: E501
+        Register.GRID_VOLTAGE:    {'name': ['grid', 'Voltage'],                    'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'inverter', 'dev_cla': 'voltage',     'stat_cla': 'measurement', 'id': 'out_volt_',  'fmt': '| float', 'name': 'Grid Voltage', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.GRID_CURRENT:    {'name': ['grid', 'Current'],                    'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'inverter', 'dev_cla': 'current',     'stat_cla': 'measurement', 'id': 'out_cur_',   'fmt': '| float', 'name': 'Grid Current', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.GRID_FREQUENCY:  {'name': ['grid', 'Frequency'],                  'level': logging.DEBUG, 'unit': 'Hz',   'ha': {'dev': 'inverter', 'dev_cla': 'frequency',   'stat_cla': 'measurement', 'id': 'out_freq_',  'fmt': '| float', 'name': 'Grid Frequency', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.OUTPUT_POWER:    {'name': ['grid', 'Output_Power'],               'level': logging.INFO,  'unit': 'W',    'ha': {'dev': 'inverter', 'dev_cla': 'power',       'stat_cla': 'measurement', 'id': 'out_power_', 'fmt': '| float', 'name': 'Power'}},  # noqa: E501
+        Register.INVERTER_TEMP:   {'name': ['env',  'Inverter_Temp'],              'level': logging.DEBUG, 'unit': '°C',   'ha': {'dev': 'inverter', 'dev_cla': 'temperature', 'stat_cla': 'measurement', 'id': 'temp_',       'fmt': '| int', 'name': 'Temperature'}},  # noqa: E501
+        Register.INVERTER_STATUS: {'name': ['env',  'Inverter_Status'],            'level': logging.INFO,  'unit': '',     'ha': {'dev': 'inverter', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_status_', 'name': 'Inverter Status', 'val_tpl': __status_type_val_tpl,          'icon': 'mdi:counter'}},  # noqa: E501
 
         # input measures:
-        Register.TS_INPUT:     {'name': ['input', 'Timestamp'],                    'level': logging.INFO,  'unit': ''},  # noqa: E501
-        Register.PV1_VOLTAGE:  {'name': ['input', 'pv1', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv1', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv1_',  'val_tpl': "{{ (value_json['pv1']['Voltage'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.PV1_CURRENT:  {'name': ['input', 'pv1', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv1', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv1_',   'val_tpl': "{{ (value_json['pv1']['Current'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV1_VOLTAGE:  {'name': ['input', 'pv1', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv1', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv1_',  'val_tpl': "{{ (value_json['pv1']['Voltage'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV1_CURRENT:  {'name': ['input', 'pv1', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv1', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv1_',   'val_tpl': "{{ (value_json['pv1']['Current'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.PV1_POWER:    {'name': ['input', 'pv1', 'Power'],                 'level': logging.DEBUG, 'unit': 'W',    'ha': {'dev': 'input_pv1', 'dev_cla': 'power',   'stat_cla': 'measurement', 'id': 'power_pv1_', 'val_tpl': "{{ (value_json['pv1']['Power'] | float)}}"}},  # noqa: E501
-        Register.PV2_VOLTAGE:  {'name': ['input', 'pv2', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv2', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv2_',  'val_tpl': "{{ (value_json['pv2']['Voltage'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.PV2_CURRENT:  {'name': ['input', 'pv2', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv2', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv2_',   'val_tpl': "{{ (value_json['pv2']['Current'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV2_VOLTAGE:  {'name': ['input', 'pv2', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv2', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv2_',  'val_tpl': "{{ (value_json['pv2']['Voltage'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV2_CURRENT:  {'name': ['input', 'pv2', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv2', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv2_',   'val_tpl': "{{ (value_json['pv2']['Current'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.PV2_POWER:    {'name': ['input', 'pv2', 'Power'],                 'level': logging.DEBUG, 'unit': 'W',    'ha': {'dev': 'input_pv2', 'dev_cla': 'power',   'stat_cla': 'measurement', 'id': 'power_pv2_', 'val_tpl': "{{ (value_json['pv2']['Power'] | float)}}"}},  # noqa: E501
-        Register.PV3_VOLTAGE:  {'name': ['input', 'pv3', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv3', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv3_',  'val_tpl': "{{ (value_json['pv3']['Voltage'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.PV3_CURRENT:  {'name': ['input', 'pv3', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv3', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv3_',   'val_tpl': "{{ (value_json['pv3']['Current'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV3_VOLTAGE:  {'name': ['input', 'pv3', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv3', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv3_',  'val_tpl': "{{ (value_json['pv3']['Voltage'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV3_CURRENT:  {'name': ['input', 'pv3', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv3', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv3_',   'val_tpl': "{{ (value_json['pv3']['Current'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.PV3_POWER:    {'name': ['input', 'pv3', 'Power'],                 'level': logging.DEBUG, 'unit': 'W',    'ha': {'dev': 'input_pv3', 'dev_cla': 'power',   'stat_cla': 'measurement', 'id': 'power_pv3_', 'val_tpl': "{{ (value_json['pv3']['Power'] | float)}}"}},  # noqa: E501
-        Register.PV4_VOLTAGE:  {'name': ['input', 'pv4', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv4', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv4_',  'val_tpl': "{{ (value_json['pv4']['Voltage'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.PV4_CURRENT:  {'name': ['input', 'pv4', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv4', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv4_',   'val_tpl': "{{ (value_json['pv4']['Current'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV4_VOLTAGE:  {'name': ['input', 'pv4', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv4', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv4_',  'val_tpl': "{{ (value_json['pv4']['Voltage'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV4_CURRENT:  {'name': ['input', 'pv4', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv4', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv4_',   'val_tpl': "{{ (value_json['pv4']['Current'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.PV4_POWER:    {'name': ['input', 'pv4', 'Power'],                 'level': logging.DEBUG, 'unit': 'W',    'ha': {'dev': 'input_pv4', 'dev_cla': 'power',   'stat_cla': 'measurement', 'id': 'power_pv4_', 'val_tpl': "{{ (value_json['pv4']['Power'] | float)}}"}},  # noqa: E501
-        Register.PV5_VOLTAGE:  {'name': ['input', 'pv5', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv5', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv5_',  'val_tpl': "{{ (value_json['pv5']['Voltage'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.PV5_CURRENT:  {'name': ['input', 'pv5', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv5', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv5_',   'val_tpl': "{{ (value_json['pv5']['Current'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV5_VOLTAGE:  {'name': ['input', 'pv5', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv5', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv5_',  'val_tpl': "{{ (value_json['pv5']['Voltage'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV5_CURRENT:  {'name': ['input', 'pv5', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv5', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv5_',   'val_tpl': "{{ (value_json['pv5']['Current'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.PV5_POWER:    {'name': ['input', 'pv5', 'Power'],                 'level': logging.DEBUG, 'unit': 'W',    'ha': {'dev': 'input_pv5', 'dev_cla': 'power',   'stat_cla': 'measurement', 'id': 'power_pv5_', 'val_tpl': "{{ (value_json['pv5']['Power'] | float)}}"}},  # noqa: E501
-        Register.PV6_VOLTAGE:  {'name': ['input', 'pv6', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv6', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv6_',  'val_tpl': "{{ (value_json['pv6']['Voltage'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.PV6_CURRENT:  {'name': ['input', 'pv6', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv6', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv6_',   'val_tpl': "{{ (value_json['pv6']['Current'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV6_VOLTAGE:  {'name': ['input', 'pv6', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv6', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv6_',  'val_tpl': "{{ (value_json['pv6']['Voltage'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV6_CURRENT:  {'name': ['input', 'pv6', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv6', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv6_',   'val_tpl': "{{ (value_json['pv6']['Current'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.PV6_POWER:    {'name': ['input', 'pv6', 'Power'],                 'level': logging.DEBUG, 'unit': 'W',    'ha': {'dev': 'input_pv6', 'dev_cla': 'power',   'stat_cla': 'measurement', 'id': 'power_pv6_', 'val_tpl': "{{ (value_json['pv6']['Power'] | float)}}"}},  # noqa: E501
-        Register.PV1_DAILY_GENERATION:  {'name': ['input', 'pv1', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv1', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv1_', 'name': DAILY_GEN, 'val_tpl': "{{ (value_json['pv1']['Daily_Generation'] | float)}}", 'icon': SOLAR_POWER_VAR, 'must_incr': True}},  # noqa: E501
-        Register.PV1_TOTAL_GENERATION:  {'name': ['input', 'pv1', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv1', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv1_', 'name': TOTAL_GEN, 'val_tpl': "{{ (value_json['pv1']['Total_Generation'] | float)}}", 'icon': SOLAR_POWER, 'must_incr': True}},  # noqa: E501
-        Register.PV2_DAILY_GENERATION:  {'name': ['input', 'pv2', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv2', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv2_', 'name': DAILY_GEN, 'val_tpl': "{{ (value_json['pv2']['Daily_Generation'] | float)}}", 'icon': SOLAR_POWER_VAR, 'must_incr': True}},  # noqa: E501
-        Register.PV2_TOTAL_GENERATION:  {'name': ['input', 'pv2', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv2', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv2_', 'name': TOTAL_GEN, 'val_tpl': "{{ (value_json['pv2']['Total_Generation'] | float)}}", 'icon': SOLAR_POWER, 'must_incr': True}},  # noqa: E501
-        Register.PV3_DAILY_GENERATION:  {'name': ['input', 'pv3', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv3', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv3_', 'name': DAILY_GEN, 'val_tpl': "{{ (value_json['pv3']['Daily_Generation'] | float)}}", 'icon': SOLAR_POWER_VAR, 'must_incr': True}},  # noqa: E501
-        Register.PV3_TOTAL_GENERATION:  {'name': ['input', 'pv3', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv3', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv3_', 'name': TOTAL_GEN, 'val_tpl': "{{ (value_json['pv3']['Total_Generation'] | float)}}", 'icon': SOLAR_POWER, 'must_incr': True}},  # noqa: E501
-        Register.PV4_DAILY_GENERATION:  {'name': ['input', 'pv4', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv4', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv4_', 'name': DAILY_GEN, 'val_tpl': "{{ (value_json['pv4']['Daily_Generation'] | float)}}", 'icon': SOLAR_POWER_VAR, 'must_incr': True}},  # noqa: E501
-        Register.PV4_TOTAL_GENERATION:  {'name': ['input', 'pv4', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv4', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv4_', 'name': TOTAL_GEN, 'val_tpl': "{{ (value_json['pv4']['Total_Generation'] | float)}}", 'icon': SOLAR_POWER, 'must_incr': True}},  # noqa: E501
-        Register.PV5_DAILY_GENERATION:  {'name': ['input', 'pv5', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv5', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv5_', 'name': DAILY_GEN, 'val_tpl': "{{ (value_json['pv5']['Daily_Generation'] | float)}}", 'icon': SOLAR_POWER_VAR, 'must_incr': True}},  # noqa: E501
-        Register.PV5_TOTAL_GENERATION:  {'name': ['input', 'pv5', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv5', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv5_', 'name': TOTAL_GEN, 'val_tpl': "{{ (value_json['pv5']['Total_Generation'] | float)}}", 'icon': SOLAR_POWER, 'must_incr': True}},  # noqa: E501
-        Register.PV6_DAILY_GENERATION:  {'name': ['input', 'pv6', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv6', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv6_', 'name': DAILY_GEN, 'val_tpl': "{{ (value_json['pv6']['Daily_Generation'] | float)}}", 'icon': SOLAR_POWER_VAR, 'must_incr': True}},  # noqa: E501
-        Register.PV6_TOTAL_GENERATION:  {'name': ['input', 'pv6', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv6', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv6_', 'name': TOTAL_GEN, 'val_tpl': "{{ (value_json['pv6']['Total_Generation'] | float)}}", 'icon': SOLAR_POWER, 'must_incr': True}},  # noqa: E501
+        Register.PV1_DAILY_GENERATION:  {'name': ['input', 'pv1', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv1', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv1_', 'name': 'Daily Generation', 'val_tpl': "{{ (value_json['pv1']['Daily_Generation'] | float)}}", 'icon': 'mdi:solar-power-variant', 'must_incr': True}},  # noqa: E501
+        Register.PV1_TOTAL_GENERATION:  {'name': ['input', 'pv1', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv1', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv1_', 'name': 'Total Generation', 'val_tpl': "{{ (value_json['pv1']['Total_Generation'] | float)}}", 'icon': 'mdi:solar-power', 'must_incr': True}},  # noqa: E501
+        Register.PV2_DAILY_GENERATION:  {'name': ['input', 'pv2', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv2', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv2_', 'name': 'Daily Generation', 'val_tpl': "{{ (value_json['pv2']['Daily_Generation'] | float)}}", 'icon': 'mdi:solar-power-variant', 'must_incr': True}},  # noqa: E501
+        Register.PV2_TOTAL_GENERATION:  {'name': ['input', 'pv2', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv2', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv2_', 'name': 'Total Generation', 'val_tpl': "{{ (value_json['pv2']['Total_Generation'] | float)}}", 'icon': 'mdi:solar-power', 'must_incr': True}},  # noqa: E501
+        Register.PV3_DAILY_GENERATION:  {'name': ['input', 'pv3', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv3', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv3_', 'name': 'Daily Generation', 'val_tpl': "{{ (value_json['pv3']['Daily_Generation'] | float)}}", 'icon': 'mdi:solar-power-variant', 'must_incr': True}},  # noqa: E501
+        Register.PV3_TOTAL_GENERATION:  {'name': ['input', 'pv3', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv3', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv3_', 'name': 'Total Generation', 'val_tpl': "{{ (value_json['pv3']['Total_Generation'] | float)}}", 'icon': 'mdi:solar-power', 'must_incr': True}},  # noqa: E501
+        Register.PV4_DAILY_GENERATION:  {'name': ['input', 'pv4', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv4', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv4_', 'name': 'Daily Generation', 'val_tpl': "{{ (value_json['pv4']['Daily_Generation'] | float)}}", 'icon': 'mdi:solar-power-variant', 'must_incr': True}},  # noqa: E501
+        Register.PV4_TOTAL_GENERATION:  {'name': ['input', 'pv4', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv4', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv4_', 'name': 'Total Generation', 'val_tpl': "{{ (value_json['pv4']['Total_Generation'] | float)}}", 'icon': 'mdi:solar-power', 'must_incr': True}},  # noqa: E501
+        Register.PV5_DAILY_GENERATION:  {'name': ['input', 'pv5', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv5', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv5_', 'name': 'Daily Generation', 'val_tpl': "{{ (value_json['pv5']['Daily_Generation'] | float)}}", 'icon': 'mdi:solar-power-variant', 'must_incr': True}},  # noqa: E501
+        Register.PV5_TOTAL_GENERATION:  {'name': ['input', 'pv5', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv5', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv5_', 'name': 'Total Generation', 'val_tpl': "{{ (value_json['pv5']['Total_Generation'] | float)}}", 'icon': 'mdi:solar-power', 'must_incr': True}},  # noqa: E501
+        Register.PV6_DAILY_GENERATION:  {'name': ['input', 'pv6', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv6', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv6_', 'name': 'Daily Generation', 'val_tpl': "{{ (value_json['pv6']['Daily_Generation'] | float)}}", 'icon': 'mdi:solar-power-variant', 'must_incr': True}},  # noqa: E501
+        Register.PV6_TOTAL_GENERATION:  {'name': ['input', 'pv6', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv6', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv6_', 'name': 'Total Generation', 'val_tpl': "{{ (value_json['pv6']['Total_Generation'] | float)}}", 'icon': 'mdi:solar-power', 'must_incr': True}},  # noqa: E501
         # total:
-        Register.TS_TOTAL:          {'name': ['total', 'Timestamp'],               'level': logging.INFO,  'unit': ''},  # noqa: E501
-        Register.DAILY_GENERATION:  {'name': ['total', 'Daily_Generation'],        'level': logging.INFO,  'unit': 'kWh',  'ha': {'dev': 'inverter', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_', 'fmt': FMT_FLOAT, 'name': DAILY_GEN, 'icon': SOLAR_POWER_VAR, 'must_incr': True}},  # noqa: E501
-        Register.TOTAL_GENERATION:  {'name': ['total', 'Total_Generation'],        'level': logging.INFO,  'unit': 'kWh',  'ha': {'dev': 'inverter', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_', 'fmt': FMT_FLOAT, 'name': TOTAL_GEN, 'icon': SOLAR_POWER, 'must_incr': True}},  # noqa: E501
+        Register.DAILY_GENERATION:  {'name': ['total', 'Daily_Generation'],        'level': logging.INFO,  'unit': 'kWh',  'ha': {'dev': 'inverter', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_', 'fmt': '| float', 'name': 'Daily Generation', 'icon': 'mdi:solar-power-variant', 'must_incr': True}},  # noqa: E501
+        Register.TOTAL_GENERATION:  {'name': ['total', 'Total_Generation'],        'level': logging.INFO,  'unit': 'kWh',  'ha': {'dev': 'inverter', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_', 'fmt': '| float', 'name': 'Total Generation', 'icon': 'mdi:solar-power', 'must_incr': True}},  # noqa: E501
 
         # controller:
-        Register.SIGNAL_STRENGTH:    {'name': ['controller', 'Signal_Strength'],    'level': logging.DEBUG, 'unit': '%',    'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': 'measurement', 'id': 'signal_',              'fmt': FMT_INT,           'name': 'Signal Strength', 'icon': WIFI}},  # noqa: E501
-        Register.POWER_ON_TIME:      {'name': ['controller', 'Power_On_Time'],      'level': logging.DEBUG, 'unit': 's',    'ha': {'dev': 'controller', 'dev_cla': 'duration', 'stat_cla': 'measurement', 'id': 'power_on_time_',       'fmt': FMT_INT,           'name': 'Power on Time', 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.COLLECT_INTERVAL:   {'name': ['controller', 'Collect_Interval'],   'level': logging.DEBUG, 'unit': 'min',  'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'data_collect_intval_', 'fmt': '| string + " min"', 'name': 'Data Collect Interval', 'icon': UPDATE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.CONNECT_COUNT:      {'name': ['controller', 'Connect_Count'],      'level': logging.DEBUG, 'unit': '',     'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'connect_count_',       'fmt': FMT_INT,           'name': 'Connect Count',    'icon': COUNTER, 'comp': 'sensor', 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.COMMUNICATION_TYPE: {'name': ['controller', 'Communication_Type'], 'level': logging.DEBUG, 'unit': '',     'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'comm_type_',           'name': 'Communication Type', 'val_tpl': __comm_type_val_tpl, 'comp': 'sensor', 'icon': WIFI}},  # noqa: E501
-        Register.DATA_UP_INTERVAL:   {'name': ['controller', 'Data_Up_Interval'],   'level': logging.DEBUG, 'unit': 's',    'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'data_up_intval_', 'fmt': FMT_STRING_SEC, 'name': 'Data Up Interval', 'icon': UPDATE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.HEARTBEAT_INTERVAL: {'name': ['controller', 'Heartbeat_Interval'], 'level': logging.DEBUG, 'unit': 's',    'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'heartbeat_intval_',    'fmt': FMT_STRING_SEC, 'name': 'Heartbeat Interval', 'icon': UPDATE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.IP_ADDRESS:         {'name': ['controller', 'IP_Address'],         'level': logging.DEBUG, 'unit': '',     'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'ip_address_',           'fmt': '| string',        'name': 'IP Address', 'icon': WIFI, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.POLLING_INTERVAL:   {'name': ['controller', 'Polling_Interval'],   'level': logging.DEBUG, 'unit': 's',    'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'polling_intval_', 'fmt': FMT_STRING_SEC, 'name': 'Polling Interval', 'icon': UPDATE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.SENSOR_LIST:        {'name': ['controller', 'Sensor_List'],        'level': logging.INFO,  'unit': ''},  # noqa: E501
+        Register.SIGNAL_STRENGTH:    {'name': ['controller', 'Signal_Strength'],    'level': logging.DEBUG, 'unit': '%',    'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': 'measurement', 'id': 'signal_',              'fmt': '| int',           'name': 'Signal Strength', 'icon': 'mdi:wifi'}},  # noqa: E501
+        Register.POWER_ON_TIME:      {'name': ['controller', 'Power_On_Time'],      'level': logging.DEBUG, 'unit': 's',    'ha': {'dev': 'controller', 'dev_cla': 'duration', 'stat_cla': 'measurement', 'id': 'power_on_time_',       'fmt': '| int',           'name': 'Power on Time', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.COLLECT_INTERVAL:   {'name': ['controller', 'Collect_Interval'],   'level': logging.DEBUG, 'unit': 'min',  'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'data_collect_intval_', 'fmt': '| string + " min"', 'name': 'Data Collect Interval', 'icon': 'mdi:update', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.CONNECT_COUNT:      {'name': ['controller', 'Connect_Count'],      'level': logging.DEBUG, 'unit': '',     'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'connect_count_',       'fmt': '| int',           'name': 'Connect Count',    'icon': 'mdi:counter', 'comp': 'sensor', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.COMMUNICATION_TYPE: {'name': ['controller', 'Communication_Type'], 'level': logging.DEBUG, 'unit': '',     'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'comm_type_',           'name': 'Communication Type', 'val_tpl': __comm_type_val_tpl, 'comp': 'sensor', 'icon': 'mdi:wifi'}},  # noqa: E501
+        Register.DATA_UP_INTERVAL:   {'name': ['controller', 'Data_Up_Interval'],   'level': logging.DEBUG, 'unit': 's',    'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'data_up_intval_', 'fmt': '| string + " s"', 'name': 'Data Up Interval', 'icon': 'mdi:update', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.HEARTBEAT_INTERVAL: {'name': ['controller', 'Heartbeat_Interval'], 'level': logging.DEBUG, 'unit': 's',    'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'heartbeat_intval_',    'fmt': '| string + " s"', 'name': 'Heartbeat Interval', 'icon': 'mdi:update', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.IP_ADDRESS:         {'name': ['controller', 'IP_Address'],         'level': logging.DEBUG, 'unit': '',     'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'ip_address_',           'fmt': '| string',        'name': 'IP Address', 'icon': 'mdi:wifi', 'ent_cat': 'diagnostic'}},  # noqa: E501
     }
 
     @property
@@ -351,7 +305,7 @@ class Infos:
     def info_defs(self) -> dict:
         return self.__info_defs
 
-    def dev_value(self, idx: str | int) -> str | int | float | dict | None:
+    def dev_value(self, idx: str | int) -> str | int | float | None:
         '''returns the stored device value from our database
 
         idx:int ==> lookup the value in the database and return it as str,
@@ -364,29 +318,29 @@ class Infos:
         elif idx in self.info_defs:
             row = self.info_defs[idx]
             if 'singleton' in row and row['singleton']:
-                db_dict = self.stat
+                dict = self.stat
             else:
-                db_dict = self.db
+                dict = self.db
 
             keys = row['name']
 
             for key in keys:
-                if key not in db_dict:
+                if key not in dict:
                     return None      # value not found in the database
-                db_dict = db_dict[key]
-            return db_dict              # value of the reqeusted entry
+                dict = dict[key]
+            return dict              # value of the reqeusted entry
 
         return None                  # unknwon idx, not in info_defs
 
     def inc_counter(self, counter: str) -> None:
         '''inc proxy statistic counter'''
-        db_dict = self.stat['proxy']
-        db_dict[counter] += 1
+        dict = self.stat['proxy']
+        dict[counter] += 1
 
     def dec_counter(self, counter: str) -> None:
         '''dec proxy statistic counter'''
-        db_dict = self.stat['proxy']
-        db_dict[counter] -= 1
+        dict = self.stat['proxy']
+        dict[counter] -= 1
 
     def ha_proxy_confs(self, ha_prfx: str, node_id: str, snr: str) \
             -> Generator[tuple[str, str, str, str], None, None]:
@@ -409,20 +363,6 @@ class Infos:
 
     def ha_conf(self, key, ha_prfx, node_id, snr,  singleton: bool,
                 sug_area: str = '') -> tuple[str, str, str, str] | None:
-        '''Method to build json register struct for home-assistant
-        auto configuration and the unique entity string, for all proxy
-        registers
-
-        arguments:
-        key          ==> index of info_defs dict which reference the topic
-        ha_prfx:str  ==> MQTT prefix for the home assistant 'stat_t string
-        node_id:str  ==> node id of the inverter, used to build unique entity
-        snr:str      ==> serial number of the inverter, used to build unique
-                         entity strings
-        singleton    ==> bool to allow/disaalow proxy topics which are common
-                         for all invters
-        sug_area     ==> area name for home assistant
-        '''
         if key not in self.info_defs:
             return None
         row = self.info_defs[key]
@@ -432,148 +372,7 @@ class Infos:
                 return None
         elif singleton:
             return None
-
-        # check if we have details for home assistant
-        if 'ha' in row:
-            return self.__ha_conf(row, key, ha_prfx, node_id, snr, sug_area)
-        return None
-
-    def __ha_conf(self, row, key, ha_prfx, node_id, snr,
-                  sug_area: str) -> tuple[str, str, str, str] | None:
-        ha = row['ha']
-        if 'comp' in ha:
-            component = ha['comp']
-        else:
-            component = 'sensor'
-        attr = self.__build_attr(row, key, ha_prfx, node_id, snr)
-        if 'dev' in ha:
-            device = self.info_devs[ha['dev']]
-            if 'dep' in device and self.ignore_this_device(device['dep']):  # noqa: E501
-                return None
-            attr['dev'] = self.__build_dev(device, key, ha, snr,
-                                           sug_area)
-            attr['o'] = self.__build_origin()
-
-        else:
-            self.inc_counter('Internal_Error')
-            logging.error(f"Infos.info_defs: the row for {key} "
-                          "missing 'dev' value for ha register")
-        return json.dumps(attr), component, node_id, attr['uniq_id']
-
-    def __build_attr(self, row, key, ha_prfx, node_id, snr):
-        attr = {}
-        ha = row['ha']
-        if 'name' in ha:
-            attr['name'] = ha['name']
-        else:
-            attr['name'] = row['name'][-1]
         prfx = ha_prfx + node_id
-        attr['stat_t'] = prfx + row['name'][0]
-        attr['dev_cla'] = ha['dev_cla']
-        attr['stat_cla'] = ha['stat_cla']
-        attr['uniq_id'] = ha['id']+snr
-        if 'val_tpl' in ha:
-            attr['val_tpl'] = ha['val_tpl']
-        elif 'fmt' in ha:
-            attr['val_tpl'] = '{{value_json' + f"['{row['name'][-1]}'] {ha['fmt']}" + '}}'       # eg.   'val_tpl': "{{ value_json['Output_Power']|float }} # noqa: E501
-        else:
-            self.inc_counter('Internal_Error')
-            logging.error(f"Infos.info_defs: the row for {key} do"
-                          " not have a 'val_tpl' nor a 'fmt' value")
-        # add unit_of_meas only, if status_class isn't none. If
-        # status_cla is None we want a number format and not line
-        # graph in home assistant. A unit will change the number
-        # format to a line graph
-        if 'unit' in row and attr['stat_cla'] is not None:
-            attr['unit_of_meas'] = row['unit']  # 'unit_of_meas'
-        if 'icon' in ha:
-            attr['ic'] = ha['icon']             # icon for the entity
-        if 'nat_prc' in ha:  # pragma: no cover
-            attr['sug_dsp_prc'] = ha['nat_prc']  # precison of floats
-        if 'ent_cat' in ha:
-            attr['ent_cat'] = ha['ent_cat']     # diagnostic, config
-        # enabled_by_default is deactivated, since it avoid the via
-        # setup of the devices. It seems, that there is a bug in home
-        # assistant. tested with 'Home Assistant 2023.10.4'
-        # if 'en' in ha:                       # enabled_by_default
-        #    attr['en'] = ha['en']
-        return attr
-
-    def __build_dev(self, device, key, ha, snr, sug_area):
-        dev = {}
-        singleton = 'singleton' in device and device['singleton']
-        # the same name for 'name' and 'suggested area', so we get
-        # dedicated devices in home assistant with short value
-        # name and headline
-        if (sug_area == '' or singleton):
-            dev['name'] = device['name']
-            dev['sa'] = device['name']
-        else:
-            dev['name'] = device['name']+' - '+sug_area
-            dev['sa'] = device['name']+' - '+sug_area
-        self.__add_via_dev(dev, device, key, snr)
-        for key in ('mdl', 'mf', 'sw', 'hw', 'sn'):      # add optional
-            # values fpr 'modell', 'manufacturer', 'sw version' and
-            # 'hw version'
-            if key in device:
-                data = self.dev_value(device[key])
-                if data is not None:
-                    dev[key] = data
-        if singleton:
-            dev['ids'] = [f"{ha['dev']}"]
-        else:
-            dev['ids'] = [f"{ha['dev']}_{snr}"]
-        self.__add_connection(dev, device)
-        return dev
-
-    def __add_connection(self, dev, device):
-        if 'mac' in device:
-            mac_str = self.dev_value(device['mac'])
-            if mac_str is not None:
-                if 12 == len(mac_str):
-                    mac_str = ':'.join(mac_str[i:i+2] for i in range(0, 12, 2))
-                dev['cns'] = [["mac", f"{mac_str}"]]
-
-    def __add_via_dev(self, dev, device, key, snr):
-        if 'via' in device:  # add the link to the parent device
-            via = device['via']
-            if via in self.info_devs:
-                via_dev = self.info_devs[via]
-                if 'singleton' in via_dev and via_dev['singleton']:
-                    dev['via_device'] = via
-                else:
-                    dev['via_device'] = f"{via}_{snr}"
-            else:
-                self.inc_counter('Internal_Error')
-                logging.error(f"Infos.info_defs: the row for "
-                              f"{key} has an invalid via value: "
-                              f"{via}")
-
-    def __build_origin(self):
-        origin = {}
-        origin['name'] = self.app_name
-        origin['sw'] = self.version
-        return origin
-
-    def ha_remove(self, key, node_id, snr) -> tuple[str, str, str, str] | None:
-        '''Method to build json unregister struct for home-assistant
-        to remove topics per auto configuration. Only for inverer topics.
-
-        arguments:
-        key          ==> index of info_defs dict which reference the topic
-        node_id:str  ==> node id of the inverter, used to build unique entity
-        snr:str      ==> serial number of the inverter, used to build unique
-                         entity strings
-
-        hint:
-        the returned tuple must have the same format as self.ha_conf()
-        '''
-        if key not in self.info_defs:
-            return None
-        row = self.info_defs[key]
-
-        if 'singleton' in row and row['singleton']:
-            return None
 
         # check if we have details for home assistant
         if 'ha' in row:
@@ -583,12 +382,91 @@ class Infos:
             else:
                 component = 'sensor'
             attr = {}
-            uniq_id = ha['id']+snr
-
-            return json.dumps(attr), component, node_id, uniq_id
+            if 'name' in ha:
+                attr['name'] = ha['name']
+            else:
+                attr['name'] = row['name'][-1]
+            attr['stat_t'] = prfx + row['name'][0]
+            attr['dev_cla'] = ha['dev_cla']
+            attr['stat_cla'] = ha['stat_cla']
+            attr['uniq_id'] = ha['id']+snr
+            if 'val_tpl' in ha:
+                attr['val_tpl'] = ha['val_tpl']
+            elif 'fmt' in ha:
+                attr['val_tpl'] = '{{value_json' + f"['{row['name'][-1]}'] {ha['fmt']}" + '}}'       # eg.   'val_tpl': "{{ value_json['Output_Power']|float }} # noqa: E501
+            else:
+                self.inc_counter('Internal_Error')
+                logging.error(f"Infos.info_defs: the row for {key} do"
+                              " not have a 'val_tpl' nor a 'fmt' value")
+            # add unit_of_meas only, if status_class isn't none. If
+            # status_cla is None we want a number format and not line
+            # graph in home assistant. A unit will change the number
+            # format to a line graph
+            if 'unit' in row and attr['stat_cla'] is not None:
+                attr['unit_of_meas'] = row['unit']  # 'unit_of_meas'
+            if 'icon' in ha:
+                attr['ic'] = ha['icon']             # icon for the entity
+            if 'nat_prc' in ha:  # pragma: no cover
+                attr['sug_dsp_prc'] = ha['nat_prc']  # precison of floats
+            if 'ent_cat' in ha:
+                attr['ent_cat'] = ha['ent_cat']     # diagnostic, config
+            # enabled_by_default is deactivated, since it avoid the via
+            # setup of the devices. It seems, that there is a bug in home
+            # assistant. tested with 'Home Assistant 2023.10.4'
+            # if 'en' in ha:                       # enabled_by_default
+            #    attr['en'] = ha['en']
+            if 'dev' in ha:
+                device = self.info_devs[ha['dev']]
+                if 'dep' in device and self.ignore_this_device(device['dep']):  # noqa: E501
+                    return None
+                dev = {}
+                # the same name for 'name' and 'suggested area', so we get
+                # dedicated devices in home assistant with short value
+                # name and headline
+                if (sug_area == '' or
+                        ('singleton' in device and device['singleton'])):
+                    dev['name'] = device['name']
+                    dev['sa'] = device['name']
+                else:
+                    dev['name'] = device['name']+' - '+sug_area
+                    dev['sa'] = device['name']+' - '+sug_area
+                if 'via' in device:  # add the link to the parent device
+                    via = device['via']
+                    if via in self.info_devs:
+                        via_dev = self.info_devs[via]
+                        if 'singleton' in via_dev and via_dev['singleton']:
+                            dev['via_device'] = via
+                        else:
+                            dev['via_device'] = f"{via}_{snr}"
+                    else:
+                        self.inc_counter('Internal_Error')
+                        logging.error(f"Infos.info_defs: the row for "
+                                      f"{key} has an invalid via value: "
+                                      f"{via}")
+                for key in ('mdl', 'mf', 'sw', 'hw'):      # add optional
+                    # values fpr 'modell', 'manufacturer', 'sw version' and
+                    # 'hw version'
+                    if key in device:
+                        data = self.dev_value(device[key])
+                        if data is not None:
+                            dev[key] = data
+                if 'singleton' in device and device['singleton']:
+                    dev['ids'] = [f"{ha['dev']}"]
+                else:
+                    dev['ids'] = [f"{ha['dev']}_{snr}"]
+                attr['dev'] = dev
+                origin = {}
+                origin['name'] = self.app_name
+                origin['sw'] = self.version
+                attr['o'] = origin
+            else:
+                self.inc_counter('Internal_Error')
+                logging.error(f"Infos.info_defs: the row for {key} "
+                              "missing 'dev' value for ha register")
+            return json.dumps(attr), component, node_id, attr['uniq_id']
         return None
 
-    def _key_obj(self, id: Register) -> tuple:
+    def _key_obj(self, id: Register) -> list:
         d = self.info_defs.get(id, {'name': None, 'level': logging.DEBUG,
                                     'unit': ''})
         if 'ha' in d and 'must_incr' in d['ha']:
@@ -600,21 +478,21 @@ class Infos:
 
     def update_db(self, keys: list, must_incr: bool, result):
         name = ''
-        db_dict = self.db
+        dict = self.db
         for key in keys[:-1]:
-            if key not in db_dict:
-                db_dict[key] = {}
-            db_dict = db_dict[key]
+            if key not in dict:
+                dict[key] = {}
+            dict = dict[key]
             name += key + '.'
-        if keys[-1] not in db_dict:
+        if keys[-1] not in dict:
             update = (not must_incr or result > 0)
         else:
             if must_incr:
-                update = db_dict[keys[-1]] < result
+                update = dict[keys[-1]] < result
             else:
-                update = db_dict[keys[-1]] != result
+                update = dict[keys[-1]] != result
         if update:
-            db_dict[keys[-1]] = result
+            dict[keys[-1]] = result
         name += keys[-1]
         return name, update
 
@@ -668,13 +546,13 @@ class Infos:
                 return True
 
             if 'gte' in dep:
-                return value < dep['gte']
+                return not value >= dep['gte']
             elif 'less_eq' in dep:
-                return value > dep['less_eq']
+                return not value <= dep['less_eq']
         return True
 
     def set_pv_module_details(self, inv: dict) -> None:
-        pvs = {'pv1': {'manufacturer': Register.PV1_MANUFACTURER, 'model': Register.PV1_MODEL},  # noqa: E501
+        map = {'pv1': {'manufacturer': Register.PV1_MANUFACTURER, 'model': Register.PV1_MODEL},  # noqa: E501
                'pv2': {'manufacturer': Register.PV2_MANUFACTURER, 'model': Register.PV2_MODEL},  # noqa: E501
                'pv3': {'manufacturer': Register.PV3_MANUFACTURER, 'model': Register.PV3_MODEL},  # noqa: E501
                'pv4': {'manufacturer': Register.PV4_MANUFACTURER, 'model': Register.PV4_MODEL},  # noqa: E501
@@ -682,7 +560,7 @@ class Infos:
                'pv6': {'manufacturer': Register.PV6_MANUFACTURER, 'model': Register.PV6_MODEL}  # noqa: E501
                }
 
-        for key, reg in pvs.items():
+        for key, reg in map.items():
             if key in inv:
                 if 'manufacturer' in inv[key]:
                     self.set_db_def_value(reg['manufacturer'],

app/src/inverter.py

@@ -1,15 +1,11 @@
 import asyncio
 import logging
 import json
-if __name__ == "app.src.inverter":
-    from app.src.config import Config
-    from app.src.mqtt import Mqtt
-    from app.src.infos import Infos
-else:  # pragma: no cover
-    from config import Config
-    from mqtt import Mqtt
-    from infos import Infos
+from config import Config
+from mqtt import Mqtt
+from infos import Infos
 
+# logger = logging.getLogger('conn')
 logger_mqtt = logging.getLogger('mqtt')
 
 
@@ -76,7 +72,7 @@ class Inverter():
             Infos.new_stat_data[key] = False
 
     @classmethod
-    def class_close(cls, loop) -> None:   # pragma: no cover
+    def class_close(cls, loop) -> None:
         logging.debug('Inverter.class_close')
         logging.info('Close MQTT Task')
         loop.run_until_complete(cls.mqtt.close())

app/src/messages.py

@@ -5,35 +5,16 @@ from enum import Enum
 
 
 if __name__ == "app.src.messages":
-    from app.src.infos import Infos, Register
+    from app.src.infos import Infos
     from app.src.modbus import Modbus
 else:  # pragma: no cover
-    from infos import Infos, Register
+    from infos import Infos
     from modbus import Modbus
 
 logger = logging.getLogger('msg')
 
 
-def __hex_val(n, data, data_len):
-    line = ''
-    for j in range(n-16, n):
-        if j >= data_len:
-            break
-        line += '%02x ' % abs(data[j])
-    return line
-
-
-def __asc_val(n, data, data_len):
-    line = ''
-    for j in range(n-16, n):
-        if j >= data_len:
-            break
-        c = data[j] if not (data[j] < 0x20 or data[j] > 0x7e) else '.'
-        line += '%c' % c
-    return line
-
-
-def hex_dump_memory(level, info, data, data_len):
+def hex_dump_memory(level, info, data, num):
     n = 0
     lines = []
     lines.append(info)
@@ -41,13 +22,24 @@ def hex_dump_memory(level, info, data, data_len):
     if not tracer.isEnabledFor(level):
         return
 
-    for i in range(0, data_len, 16):
+    for i in range(0, num, 16):
         line = '  '
         line += '%04x | ' % (i)
         n += 16
-        line += __hex_val(n, data, data_len)
+
+        for j in range(n-16, n):
+            if j >= len(data):
+                break
+            line += '%02x ' % abs(data[j])
+
         line += ' ' * (3 * 16 + 9 - len(line)) + ' | '
-        line += __asc_val(n, data, data_len)
+
+        for j in range(n-16, n):
+            if j >= len(data):
+                break
+            c = data[j] if not (data[j] < 0x20 or data[j] > 0x7e) else '.'
+            line += '%c' % c
+
         lines.append(line)
 
     tracer.log(level, '\n'.join(lines))
@@ -99,7 +91,6 @@ class Message(metaclass=IterRegistry):
         self._forward_buffer = bytearray(0)
         self.new_data = {}
         self.state = State.init
-        self.shutdown_started = False
 
     '''
     Empty methods, that have to be implemented in any child class which
@@ -111,22 +102,7 @@ class Message(metaclass=IterRegistry):
 
     def _update_header(self, _forward_buffer):
         '''callback for updating the header of the forward buffer'''
-        pass  # pragma: no cover
-
-    def _set_mqtt_timestamp(self, key, ts: float | None):
-        if key not in self.new_data or \
-           not self.new_data[key]:
-            if key == 'grid':
-                info_id = Register.TS_GRID
-            elif key == 'input':
-                info_id = Register.TS_INPUT
-            elif key == 'total':
-                info_id = Register.TS_TOTAL
-            else:
-                return
-            # tstr = time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(ts))
-            # logger.info(f'update: key: {key} ts:{tstr}'
-            self.db.set_db_def_value(info_id, round(ts))
+        return  # pragma: no cover
 
     '''
     Our puplic methods
@@ -135,7 +111,7 @@ class Message(metaclass=IterRegistry):
         if self.mb:
             self.mb.close()
             self.mb = None
-        # pragma: no cover
+        pass  # pragma: no cover
 
     def inc_counter(self, counter: str) -> None:
         self.db.inc_counter(counter)

app/src/modbus.py

@@ -39,12 +39,10 @@ class Modbus():
     '''Modbus function code: Write Single Register'''
 
     __crc_tab = []
-    mb_reg_mapping = {
+    map = {
         0x2007: {'reg': Register.MAX_DESIGNED_POWER,   'fmt': '!H', 'ratio':  1},  # noqa: E501
-        0x202c: {'reg': Register.OUTPUT_COEFFICIENT,   'fmt': '!H', 'ratio':  100/1024},  # noqa: E501
-
-        0x3000: {'reg': Register.INVERTER_STATUS,      'fmt': '!H'},                 # noqa: E501
-        0x3008: {'reg': Register.VERSION,              'fmt': '!H', 'eval': "f'V{(result>>12)}.{(result>>8)&0xf}.{(result>>4)&0xf}{result&0xf:1X}'"},  # noqa: E501
+        # 0x????: {'reg': Register.INVERTER_STATUS,      'fmt': '!H'},                 # noqa: E501
+        0x3008: {'reg': Register.VERSION,              'fmt': '!H', 'eval': "f'V{(result>>12)}.{(result>>8)&0xf}.{(result>>4)&0xf}{result&0xf}'"},  # noqa: E501
         0x3009: {'reg': Register.GRID_VOLTAGE,         'fmt': '!H', 'ratio':  0.1},  # noqa: E501
         0x300a: {'reg': Register.GRID_CURRENT,         'fmt': '!H', 'ratio': 0.01},  # noqa: E501
         0x300b: {'reg': Register.GRID_FREQUENCY,       'fmt': '!H', 'ratio': 0.01},  # noqa: E501
@@ -106,7 +104,6 @@ class Modbus():
         self.loop = asyncio.get_event_loop()
         self.req_pend = False
         self.tim = None
-        self.node_id = ''
 
     def close(self):
         """free the queue and erase the callback handlers"""
@@ -114,7 +111,7 @@ class Modbus():
         self.__stop_timer()
         self.rsp_handler = None
         self.snd_handler = None
-        while not self.que.empty():
+        while not self.que.empty:
             self.que.get_nowait()
 
     def __del__(self):
@@ -139,7 +136,7 @@ class Modbus():
         if self.que.qsize() == 1:
             self.__send_next_from_que()
 
-    def recv_req(self, buf: bytes,
+    def recv_req(self, buf: bytearray,
                  rsp_handler: Callable[[None], None] = None) -> bool:
         """Add the received Modbus RTU request to the tx queue
 
@@ -164,7 +161,7 @@ class Modbus():
 
         return True
 
-    def recv_resp(self, info_db, buf: bytes, node_id: str) -> \
+    def recv_resp(self, info_db, buf: bytearray, node_id: str) -> \
             Generator[tuple[str, bool, int | float | str], None, None]:
         """Generator which check and parse a received MODBUS response.
 
@@ -181,20 +178,58 @@ class Modbus():
             5: No MODBUS request pending
         """
         # logging.info(f'recv_resp: first byte modbus:{buf[0]} len:{len(buf)}')
-        self.node_id = node_id
-
-        fcode = buf[1]
-        data_available = self.last_addr == self.INV_ADDR and \
-            (fcode == 3 or fcode == 4)
-
-        if self.__resp_error_check(buf, data_available):
+        if not self.req_pend:
+            self.err = 5
             return
-
-        if data_available:
+        if not self.__check_crc(buf):
+            logger.error(f'[{node_id}] Modbus resp: CRC error')
+            self.err = 1
+            return
+        if buf[0] != self.last_addr:
+            logger.info(f'[{node_id}] Modbus resp: Wrong addr {buf[0]}')
+            self.err = 2
+            return
+        fcode = buf[1]
+        if fcode != self.last_fcode:
+            logger.info(f'[{node_id}] Modbus: Wrong fcode {fcode}'
+                        f' != {self.last_fcode}')
+            self.err = 3
+            return
+        if self.last_addr == self.INV_ADDR and \
+                (fcode == 3 or fcode == 4):
             elmlen = buf[2] >> 1
+            if elmlen != self.last_len:
+                logger.info(f'[{node_id}] Modbus: len error {elmlen}'
+                            f' != {self.last_len}')
+                self.err = 4
+                return
             first_reg = self.last_reg  # save last_reg before sending next pdu
             self.__stop_timer()          # stop timer and send next pdu
-            yield from self.__process_data(info_db, buf, first_reg, elmlen)
+
+            for i in range(0, elmlen):
+                addr = first_reg+i
+                if addr in self.map:
+                    row = self.map[addr]
+                    info_id = row['reg']
+                    fmt = row['fmt']
+                    val = struct.unpack_from(fmt, buf, 3+2*i)
+                    result = val[0]
+
+                    if 'eval' in row:
+                        result = eval(row['eval'])
+                    if 'ratio' in row:
+                        result = round(result * row['ratio'], 2)
+
+                    keys, level, unit, must_incr = info_db._key_obj(info_id)
+
+                    if keys:
+                        name, update = info_db.update_db(keys, must_incr,
+                                                         result)
+                        yield keys[0], update, result
+                        if update:
+                            info_db.tracer.log(level,
+                                               f'[{node_id}] MODBUS: {name}'
+                                               f' : {result}{unit}')
         else:
             self.__stop_timer()
 
@@ -203,64 +238,6 @@ class Modbus():
             self.rsp_handler()
         self.__send_next_from_que()
 
-    def __resp_error_check(self, buf: bytes, data_available: bool) -> bool:
-        '''Check the MODBUS response for errors, returns True if one accure'''
-        if not self.req_pend:
-            self.err = 5
-            return True
-        if not self.__check_crc(buf):
-            logger.error(f'[{self.node_id}] Modbus resp: CRC error')
-            self.err = 1
-            return True
-        if buf[0] != self.last_addr:
-            logger.info(f'[{self.node_id}] Modbus resp: Wrong addr {buf[0]}')
-            self.err = 2
-            return True
-        fcode = buf[1]
-        if fcode != self.last_fcode:
-            logger.info(f'[{self.node_id}] Modbus: Wrong fcode {fcode}'
-                        f' != {self.last_fcode}')
-            self.err = 3
-            return True
-        if data_available:
-            elmlen = buf[2] >> 1
-            if elmlen != self.last_len:
-                logger.info(f'[{self.node_id}] Modbus: len error {elmlen}'
-                            f' != {self.last_len}')
-                self.err = 4
-                return True
-
-        return False
-
-    def __get_value(self, buf: bytes, idx: int, row: dict):
-        '''get a value from the received buffer'''
-        val = struct.unpack_from(row['fmt'], buf, idx)
-        result = val[0]
-
-        if 'eval' in row:
-            result = eval(row['eval'])
-        if 'ratio' in row:
-            result = round(result * row['ratio'], 2)
-        return result
-
-    def __process_data(self, info_db, buf: bytes, first_reg, elmlen):
-        '''Generator over received registers, updates the db'''
-        for i in range(0, elmlen):
-            addr = first_reg+i
-            if addr in self.mb_reg_mapping:
-                row = self.mb_reg_mapping[addr]
-                info_id = row['reg']
-                keys, level, unit, must_incr = info_db._key_obj(info_id)
-                if keys:
-                    result = self.__get_value(buf, 3+2*i, row)
-                    name, update = info_db.update_db(keys, must_incr,
-                                                     result)
-                    yield keys[0], update, result
-                    if update:
-                        info_db.tracer.log(level,
-                                           f'[{self.node_id}] MODBUS: {name}'
-                                           f' : {result}{unit}')
-
     '''
     MODBUS response timer
     '''
@@ -288,10 +265,7 @@ class Modbus():
             self.__start_timer()
             self.snd_handler(self.last_req, self.last_log_lvl, state='Retrans')
         else:
-            logger.info(f'[{self.node_id}] Modbus timeout '
-                        f'(FCode: {self.last_fcode} '
-                        f'Reg: 0x{self.last_reg:04x}, '
-                        f'{self.last_len})')
+            logger.info(f'Modbus timeout {self}')
             self.counter['timeouts'] += 1
             self.__send_next_from_que()
 
@@ -320,11 +294,11 @@ class Modbus():
     '''
     Helper function for CRC-16 handling
     '''
-    def __check_crc(self, msg: bytes) -> bool:
+    def __check_crc(self, msg: bytearray) -> bool:
         '''Check CRC-16 and returns True if valid'''
         return 0 == self.__calc_crc(msg)
 
-    def __calc_crc(self, buffer: bytes) -> int:
+    def __calc_crc(self, buffer: bytearray) -> int:
         '''Build CRC-16 for buffer and returns it'''
         crc = CRC_INIT
 

app/src/modbus_tcp.py

@@ -1,84 +0,0 @@
-import logging
-import traceback
-import asyncio
-
-if __name__ == "app.src.modbus_tcp":
-    from app.src.config import Config
-    from app.src.gen3plus.inverter_g3p import InverterG3P
-else:  # pragma: no cover
-    from config import Config
-    from gen3plus.inverter_g3p import InverterG3P
-
-logger = logging.getLogger('conn')
-
-
-class ModbusConn():
-    def __init__(self, host, port):
-        self.host = host
-        self.port = port
-        self.addr = (host, port)
-        self.stream = None
-
-    async def __aenter__(self) -> 'InverterG3P':
-        '''Establish a client connection to the TSUN cloud'''
-        connection = asyncio.open_connection(self.host, self.port)
-        reader, writer = await connection
-        self.stream = InverterG3P(reader, writer, self.addr,
-                                  client_mode=True)
-        logging.info(f'[{self.stream.node_id}:{self.stream.conn_no}] '
-                     f'Connected to {self.addr}')
-        self.stream.inc_counter('Inverter_Cnt')
-        await self.stream.publish_outstanding_mqtt()
-        return self.stream
-
-    async def __aexit__(self, exc_type, exc, tb):
-        self.stream.dec_counter('Inverter_Cnt')
-        await self.stream.publish_outstanding_mqtt()
-
-
-class ModbusTcp():
-
-    def __init__(self, loop, tim_restart=10) -> None:
-        self.tim_restart = tim_restart
-
-        inverters = Config.get('inverters')
-        # logging.info(f'Inverters: {inverters}')
-
-        for inv in inverters.values():
-            if (type(inv) is dict
-               and 'monitor_sn' in inv
-               and 'client_mode' in inv):
-                client = inv['client_mode']
-                # logging.info(f"SerialNo:{inv['monitor_sn']} host:{client['host']} port:{client['port']}")  # noqa: E501
-                loop.create_task(self.modbus_loop(client['host'],
-                                                  client['port'],
-                                                  inv['monitor_sn']))
-
-    async def modbus_loop(self, host, port, snr: int) -> None:
-        '''Loop for receiving messages from the TSUN cloud (client-side)'''
-        while True:
-            try:
-                async with ModbusConn(host, port) as stream:
-                    await stream.send_start_cmd(snr, host)
-                    await stream.loop()
-                    logger.info(f'[{stream.node_id}:{stream.conn_no}] '
-                                f'Connection closed - Shutdown: '
-                                f'{stream.shutdown_started}')
-                    if stream.shutdown_started:
-                        return
-
-            except (ConnectionRefusedError, TimeoutError) as error:
-                logging.debug(f'Inv-conn:{error}')
-
-            except OSError as error:
-                if error.errno == 113:
-                    logging.debug(f'os-error:{error}')
-                else:
-                    logging.info(f'os-error: {error}')
-
-            except Exception:
-                logging.error(
-                    f"ModbusTcpCreate: Exception for {(host, port)}:\n"
-                    f"{traceback.format_exc()}")
-
-            await asyncio.sleep(self.tim_restart)

app/src/mqtt.py

@@ -2,40 +2,26 @@ import asyncio
 import logging
 import aiomqtt
 import traceback
-if __name__ == "app.src.mqtt":
-    from app.src.modbus import Modbus
-    from app.src.messages import Message
-    from app.src.config import Config
-    from app.src.singleton import Singleton
-else:  # pragma: no cover
-    from modbus import Modbus
-    from messages import Message
-    from config import Config
-    from singleton import Singleton
+from modbus import Modbus
+from messages import Message
+from config import Config
+from singleton import Singleton
 
 logger_mqtt = logging.getLogger('mqtt')
 
 
 class Mqtt(metaclass=Singleton):
     __client = None
-    __cb_mqtt_is_up = None
+    __cb_MqttIsUp = None
 
-    def __init__(self, cb_mqtt_is_up):
+    def __init__(self, cb_MqttIsUp):
         logger_mqtt.debug('MQTT: __init__')
-        if cb_mqtt_is_up:
-            self.__cb_mqtt_is_up = cb_mqtt_is_up
+        if cb_MqttIsUp:
+            self.__cb_MqttIsUp = cb_MqttIsUp
         loop = asyncio.get_event_loop()
         self.task = loop.create_task(self.__loop())
         self.ha_restarts = 0
 
-        ha = Config.get('ha')
-        self.ha_status_topic = f"{ha['auto_conf_prefix']}/status"
-        self.mb_rated_topic = f"{ha['entity_prefix']}/+/rated_load"
-        self.mb_out_coeff_topic = f"{ha['entity_prefix']}/+/out_coeff"
-        self.mb_reads_topic = f"{ha['entity_prefix']}/+/modbus_read_regs"
-        self.mb_inputs_topic = f"{ha['entity_prefix']}/+/modbus_read_inputs"
-        self.mb_at_cmd_topic = f"{ha['entity_prefix']}/+/at_cmd"
-
     @property
     def ha_restarts(self):
         return self._ha_restarts
@@ -52,8 +38,7 @@ class Mqtt(metaclass=Singleton):
         self.task.cancel()
         try:
             await self.task
-
-        except (asyncio.CancelledError, Exception) as e:
+        except Exception as e:
             logging.debug(f"Mqtt.close: exception: {e} ...")
 
     async def publish(self, topic: str, payload: str | bytes | bytearray
@@ -63,6 +48,7 @@ class Mqtt(metaclass=Singleton):
 
     async def __loop(self) -> None:
         mqtt = Config.get('mqtt')
+        ha = Config.get('ha')
         logger_mqtt.info(f'start MQTT: host:{mqtt["host"]}  port:'
                          f'{mqtt["port"]}  '
                          f'user:{mqtt["user"]}')
@@ -72,24 +58,51 @@ class Mqtt(metaclass=Singleton):
                                        password=mqtt['passwd'])
 
         interval = 5  # Seconds
+        ha_status_topic = f"{ha['auto_conf_prefix']}/status"
+        mb_rated_topic = "tsun/+/rated_load"  # fixme
+        mb_reads_topic = "tsun/+/modbus_read_regs"  # fixme
+        mb_inputs_topic = "tsun/+/modbus_read_inputs"  # fixme
+        mb_at_cmd_topic = "tsun/+/at_cmd"  # fixme
 
         while True:
             try:
                 async with self.__client:
                     logger_mqtt.info('MQTT broker connection established')
 
-                    if self.__cb_mqtt_is_up:
-                        await self.__cb_mqtt_is_up()
+                    if self.__cb_MqttIsUp:
+                        await self.__cb_MqttIsUp()
 
-                    await self.__client.subscribe(self.ha_status_topic)
-                    await self.__client.subscribe(self.mb_rated_topic)
-                    await self.__client.subscribe(self.mb_out_coeff_topic)
-                    await self.__client.subscribe(self.mb_reads_topic)
-                    await self.__client.subscribe(self.mb_inputs_topic)
-                    await self.__client.subscribe(self.mb_at_cmd_topic)
+                    # async with self.__client.messages() as messages:
+                    await self.__client.subscribe(ha_status_topic)
+                    await self.__client.subscribe(mb_rated_topic)
+                    await self.__client.subscribe(mb_reads_topic)
+                    await self.__client.subscribe(mb_inputs_topic)
+                    await self.__client.subscribe(mb_at_cmd_topic)
 
                     async for message in self.__client.messages:
-                        await self.dispatch_msg(message)
+                        if message.topic.matches(ha_status_topic):
+                            status = message.payload.decode("UTF-8")
+                            logger_mqtt.info('Home-Assistant Status:'
+                                             f' {status}')
+                            if status == 'online':
+                                self.ha_restarts += 1
+                                await self.__cb_MqttIsUp()
+
+                        if message.topic.matches(mb_rated_topic):
+                            await self.modbus_cmd(message,
+                                                  Modbus.WRITE_SINGLE_REG,
+                                                  1, 0x2008)
+
+                        if message.topic.matches(mb_reads_topic):
+                            await self.modbus_cmd(message,
+                                                  Modbus.READ_REGS, 2)
+
+                        if message.topic.matches(mb_inputs_topic):
+                            await self.modbus_cmd(message,
+                                                  Modbus.READ_INPUTS, 2)
+
+                        if message.topic.matches(mb_at_cmd_topic):
+                            await self.at_cmd(message)
 
             except aiomqtt.MqttError:
                 if Config.is_default('mqtt'):
@@ -113,76 +126,46 @@ class Mqtt(metaclass=Singleton):
                     f"Exception:\n"
                     f"{traceback.format_exc()}")
 
-    async def dispatch_msg(self, message):
-        if message.topic.matches(self.ha_status_topic):
-            status = message.payload.decode("UTF-8")
-            logger_mqtt.info('Home-Assistant Status:'
-                             f' {status}')
-            if status == 'online':
-                self.ha_restarts += 1
-                await self.__cb_mqtt_is_up()
-
-        if message.topic.matches(self.mb_rated_topic):
-            await self.modbus_cmd(message,
-                                  Modbus.WRITE_SINGLE_REG,
-                                  1, 0x2008)
-
-        if message.topic.matches(self.mb_out_coeff_topic):
-            payload = message.payload.decode("UTF-8")
-            try:
-                val = round(float(payload) * 1024/100)
-                if val < 0 or val > 1024:
-                    logger_mqtt.error('out_coeff: value must be in'
-                                      'the range 0..100,'
-                                      f' got: {payload}')
-                else:
-                    await self.modbus_cmd(message,
-                                          Modbus.WRITE_SINGLE_REG,
-                                          0, 0x202c, val)
-            except Exception:
-                pass
-
-        if message.topic.matches(self.mb_reads_topic):
-            await self.modbus_cmd(message,
-                                  Modbus.READ_REGS, 2)
-
-        if message.topic.matches(self.mb_inputs_topic):
-            await self.modbus_cmd(message,
-                                  Modbus.READ_INPUTS, 2)
-
-        if message.topic.matches(self.mb_at_cmd_topic):
-            await self.at_cmd(message)
-
     def each_inverter(self, message, func_name: str):
         topic = str(message.topic)
         node_id = topic.split('/')[1] + '/'
+        found = False
         for m in Message:
             if m.server_side and (m.node_id == node_id):
+                found = True
                 logger_mqtt.debug(f'Found: {node_id}')
                 fnc = getattr(m, func_name, None)
                 if callable(fnc):
                     yield fnc
                 else:
                     logger_mqtt.warning(f'Cmd not supported by: {node_id}')
-                break
 
-        else:
+        if not found:
             logger_mqtt.warning(f'Node_id: {node_id} not found')
 
     async def modbus_cmd(self, message, func, params=0, addr=0, val=0):
+        topic = str(message.topic)
+        node_id = topic.split('/')[1] + '/'
+        # refactor into a loop over a table
         payload = message.payload.decode("UTF-8")
-        for fnc in self.each_inverter(message, "send_modbus_cmd"):
-            res = payload.split(',')
-            if params > 0 and params != len(res):
-                logger_mqtt.error(f'Parameter expected: {params}, '
-                                  f'got: {len(res)}')
-                return
-            if params == 1:
-                val = int(payload)
-            elif params == 2:
-                addr = int(res[0], base=16)
-                val = int(res[1])  # lenght
-            await fnc(func, addr, val, logging.INFO)
+        logger_mqtt.info(f'MODBUS via MQTT: {topic} = {payload}')
+        for m in Message:
+            if m.server_side and (m.node_id == node_id):
+                logger_mqtt.debug(f'Found: {node_id}')
+                fnc = getattr(m, "send_modbus_cmd", None)
+                res = payload.split(',')
+                if params != len(res):
+                    logger_mqtt.error(f'Parameter expected: {params}, '
+                                      f'got: {len(res)}')
+                    return
+
+                if callable(fnc):
+                    if params == 1:
+                        val = int(payload)
+                    elif params == 2:
+                        addr = int(res[0], base=16)
+                        val = int(res[1])  # lenght
+                    await fnc(func, addr, val, logging.INFO)
 
     async def at_cmd(self, message):
         payload = message.payload.decode("UTF-8")

app/src/server.py

@@ -11,7 +11,6 @@ from gen3.inverter_g3 import InverterG3
 from gen3plus.inverter_g3p import InverterG3P
 from scheduler import Schedule
 from config import Config
-from modbus_tcp import ModbusTcp
 
 routes = web.RouteTableDef()
 proxy_is_up = False
@@ -95,7 +94,6 @@ async def handle_shutdown(web_task):
     # first, disc all open TCP connections gracefully
     #
     for stream in Message:
-        stream.shutdown_started = True
         try:
             await asyncio.wait_for(stream.disc(), 2)
         except Exception:
@@ -117,13 +115,6 @@ async def handle_shutdown(web_task):
     web_task.cancel()
     await web_task
 
-    #
-    # now cancel all remaining (pending) tasks
-    #
-    pending = asyncio.all_tasks()
-    for task in pending:
-        task.cancel()
-
     #
     # at last, start a coro for stopping the loop
     #
@@ -173,7 +164,6 @@ if __name__ == "__main__":
         logging.info(f'ConfigErr: {ConfigErr}')
     Inverter.class_init()
     Schedule.start()
-    mb_tcp = ModbusTcp(loop)
 
     #
     # Create tasks for our listening servers. These must be tasks! If we call

app/src/singleton.py

@@ -1,14 +1,9 @@
-from weakref import WeakValueDictionary
-
-
 class Singleton(type):
-    _instances = WeakValueDictionary()
+    _instances = {}
 
     def __call__(cls, *args, **kwargs):
         # logger_mqtt.debug('singleton: __call__')
         if cls not in cls._instances:
-            instance = super(Singleton,
-                             cls).__call__(*args, **kwargs)
-            cls._instances[cls] = instance
-
+            cls._instances[cls] = super(Singleton,
+                                        cls).__call__(*args, **kwargs)
         return cls._instances[cls]

app/tests/test_config.py

@@ -7,11 +7,11 @@ class TstConfig(Config):
 
     @classmethod
     def set(cls, cnf):
-        cls.act_config = cnf
+        cls.config = cnf
 
     @classmethod
     def _read_config_file(cls) -> dict:
-        return cls.act_config
+        return cls.config
 
 
 def test_empty_config():
@@ -20,7 +20,7 @@ def test_empty_config():
         Config.conf_schema.validate(cnf)
         assert False
     except SchemaMissingKeyError:
-        pass
+        assert True
 
 def test_default_config():
     with open("app/config/default_config.toml", "rb") as f:
@@ -28,9 +28,10 @@ def test_default_config():
 
     try:
         validated = Config.conf_schema.validate(cnf)
-    except Exception:
+        assert True
+    except:
         assert False
-    assert validated == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'node_id': '', 'modbus_polling': False, 'monitor_sn': 0, 'suggested_area': '', 'sensor_list': 688}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'node_id': '', 'suggested_area': '', 'sensor_list': 688}}}
+    assert validated == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'node_id': '', 'monitor_sn': 0, 'suggested_area': ''}, 'Y170000000000001': {'monitor_sn': 2000000000, 'node_id': '', 'suggested_area': ''}}}
 
 def test_full_config():
     cnf = {'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 
@@ -40,13 +41,14 @@ def test_full_config():
            'mqtt': {'host': 'mqtt', 'port': 1883, 'user': '', 'passwd': ''}, 
            'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 
            'inverters': {'allow_all': True, 
-                         'R170000000000001': {'modbus_polling': True, 'node_id': '', 'sensor_list': 0, 'suggested_area': '', 'pv1': {'type': 'type1', 'manufacturer': 'man1'}, 'pv2': {'type': 'type2', 'manufacturer': 'man2'}, 'pv3': {'type': 'type3', 'manufacturer': 'man3'}}, 
-                         'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'node_id': '', 'sensor_list': 0x1511, 'suggested_area': ''}}}
+                         'R170000000000001': {'node_id': '', 'suggested_area': '', 'pv1': {'type': 'type1', 'manufacturer': 'man1'}, 'pv2': {'type': 'type2', 'manufacturer': 'man2'}, 'pv3': {'type': 'type3', 'manufacturer': 'man3'}}, 
+                         'Y170000000000001': {'monitor_sn': 2000000000, 'node_id': '', 'suggested_area': ''}}}
     try:
         validated = Config.conf_schema.validate(cnf)
-    except Exception:
+        assert True
+    except:
         assert False
-    assert validated == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'node_id': '', 'modbus_polling': True, 'monitor_sn': 0, 'pv1': {'manufacturer': 'man1','type': 'type1'},'pv2': {'manufacturer': 'man2','type': 'type2'},'pv3': {'manufacturer': 'man3','type': 'type3'}, 'suggested_area': '', 'sensor_list': 0}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'node_id': '', 'suggested_area': '', 'sensor_list': 5393}}}
+    assert validated == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'node_id': '', 'monitor_sn': 0, 'pv1': {'manufacturer': 'man1','type': 'type1'},'pv2': {'manufacturer': 'man2','type': 'type2'},'pv3': {'manufacturer': 'man3','type': 'type3'}, 'suggested_area': ''}, 'Y170000000000001': {'monitor_sn': 2000000000, 'node_id': '', 'suggested_area': ''}}}
 
 def test_mininum_config():
     cnf = {'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 
@@ -61,9 +63,10 @@ def test_mininum_config():
 
     try:
         validated = Config.conf_schema.validate(cnf)
-    except Exception:
+        assert True
+    except:
         assert False
-    assert validated == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'node_id': '', 'modbus_polling': True, 'monitor_sn': 0, 'suggested_area': '', 'sensor_list': 688}}}
+    assert validated == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'node_id': '', 'monitor_sn': 0, 'suggested_area': ''}}}
 
 def test_read_empty():
     cnf = {}
@@ -71,7 +74,7 @@ def test_read_empty():
     err = TstConfig.read('app/config/')
     assert err == None
     cnf = TstConfig.get()
-    assert cnf == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'suggested_area': '', 'modbus_polling': False, 'monitor_sn': 0, 'node_id': '', 'sensor_list': 688}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'suggested_area': '', 'node_id': '', 'sensor_list': 688}}}
+    assert cnf == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'suggested_area': '', 'monitor_sn': 0, 'node_id': ''}, 'Y170000000000001': {'monitor_sn': 2000000000, 'suggested_area': '', 'node_id': ''}}}
     
     defcnf = TstConfig.def_config.get('solarman') 
     assert defcnf == {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 10000}
@@ -93,7 +96,7 @@ def test_read_cnf1():
     err = TstConfig.read('app/config/')
     assert err == None
     cnf = TstConfig.get()
-    assert cnf == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': False, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'suggested_area': '', 'modbus_polling': False, 'monitor_sn': 0, 'node_id': '', 'sensor_list': 688}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'suggested_area': '', 'node_id': '', 'sensor_list': 688}}}
+    assert cnf == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': False, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'suggested_area': '', 'monitor_sn': 0, 'node_id': ''}, 'Y170000000000001': {'monitor_sn': 2000000000, 'suggested_area': '', 'node_id': ''}}}
     cnf = TstConfig.get('solarman')
     assert cnf == {'enabled': False, 'host': 'iot.talent-monitoring.com', 'port': 10000}    
     defcnf = TstConfig.def_config.get('solarman') 
@@ -106,7 +109,7 @@ def test_read_cnf2():
     err = TstConfig.read('app/config/')
     assert err == None
     cnf = TstConfig.get()
-    assert cnf == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'suggested_area': '', 'modbus_polling': False, 'monitor_sn': 0, 'node_id': '', 'sensor_list': 688}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'suggested_area': '', 'node_id': '', 'sensor_list': 688}}}
+    assert cnf == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'suggested_area': '', 'monitor_sn': 0, 'node_id': ''}, 'Y170000000000001': {'monitor_sn': 2000000000, 'suggested_area': '', 'node_id': ''}}}
     assert True == TstConfig.is_default('solarman')
 
 def test_read_cnf3():
@@ -123,7 +126,7 @@ def test_read_cnf4():
     err = TstConfig.read('app/config/')
     assert err == None
     cnf = TstConfig.get()
-    assert cnf == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 5000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'suggested_area': '', 'modbus_polling': False, 'monitor_sn': 0, 'node_id': '', 'sensor_list': 688}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'suggested_area': '', 'node_id': '', 'sensor_list': 688}}}
+    assert cnf == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 5000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'suggested_area': '', 'monitor_sn': 0, 'node_id': ''}, 'Y170000000000001': {'monitor_sn': 2000000000, 'suggested_area': '', 'node_id': ''}}}
     assert False == TstConfig.is_default('solarman')
 
 def test_read_cnf5():

app/tests/test_infos.py

@@ -1,6 +1,6 @@
 # test_with_pytest.py
 import pytest
-import json, math
+import json
 import logging
 from app.src.infos import Register, ClrAtMidnight
 from app.src.infos import Infos
@@ -77,7 +77,7 @@ def test_table_definition():
 
 
     for d_json, comp, node_id, id in i.ha_proxy_confs(ha_prfx="tsun/", node_id = 'proxy/', snr = '456'):
-        pass  # sideeffect is calling generator i.ha_proxy_confs()
+        pass
 
     val = i.dev_value(Register.INTERNAL_ERROR)  # check internal error counter
     assert val == 0
@@ -123,30 +123,6 @@ def test_table_definition():
     val = i.dev_value(Register.INTERNAL_ERROR)  # check internal error counter
     assert val == 3
 
-def test_table_remove():
-    i = Infos()
-    i.static_init()                # initialize counter
-
-    val = i.dev_value(Register.INTERNAL_ERROR)  # check internal error counter
-    assert val == 0
-
-    # for d_json, comp, node_id, id in i.ha_confs(ha_prfx="tsun/", node_id="garagendach/", snr='123', sug_area = 'roof'):
-    #    pass
-    test = 0
-    for reg in Register:
-        res = i.ha_remove(reg, node_id="garagendach/", snr='123')  # noqa: E501
-        if reg == Register.INVERTER_STATUS:
-            test += 1
-            assert res == ('{}', 'sensor', 'garagendach/', 'inv_status_123')
-        elif reg == Register.COLLECT_INTERVAL:
-            test += 1
-            assert res == ('{}', 'sensor', 'garagendach/', 'data_collect_intval_123')
-
-    assert test == 2
-    val = i.dev_value(Register.INTERNAL_ERROR)  # check internal error counter
-    assert val == 0
-
-
 def test_clr_at_midnight():
     i = Infos()
     i.static_init()                # initialize counter
@@ -222,24 +198,24 @@ def test_get_value():
 
     i.set_db_def_value(Register.PV2_VOLTAGE, 30.3) 
     assert 30 == i.get_db_value(Register.PV1_VOLTAGE, None)
-    assert math.isclose(30.3,i.get_db_value(Register.PV2_VOLTAGE, None), rel_tol=1e-09, abs_tol=1e-09)
+    assert 30.3 == i.get_db_value(Register.PV2_VOLTAGE, None)
 
 def test_update_value():
     i = Infos()
     assert None == i.get_db_value(Register.PV1_VOLTAGE, None)
 
     keys = i.info_defs[Register.PV1_VOLTAGE]['name']
-    _, update = i.update_db(keys, True, 30) 
+    name, update = i.update_db(keys, True, 30) 
     assert update == True
     assert 30 == i.get_db_value(Register.PV1_VOLTAGE, None)
 
     keys = i.info_defs[Register.PV1_VOLTAGE]['name']
-    _, update = i.update_db(keys, True, 30) 
+    name, update = i.update_db(keys, True, 30) 
     assert update == False
     assert 30 == i.get_db_value(Register.PV1_VOLTAGE, None)
 
     keys = i.info_defs[Register.PV1_VOLTAGE]['name']
-    _, update = i.update_db(keys, False, 29) 
+    name, update = i.update_db(keys, False, 29) 
     assert update == True
     assert 29 == i.get_db_value(Register.PV1_VOLTAGE, None)
 

app/tests/test_infos_g3.py

@@ -4,7 +4,7 @@ from app.src.infos import Register, ClrAtMidnight
 from app.src.gen3.infos_g3 import InfosG3
 
 @pytest.fixture
-def contr_data_seq(): # Get Time Request message
+def ContrDataSeq(): # Get Time Request message
     msg =   b'\x00\x00\x00\x15\x00\x09\x2b\xa8\x54\x10\x52\x53\x57\x5f\x34\x30\x30\x5f\x56\x31\x2e\x30\x30\x2e\x30\x36\x00\x09\x27\xc0\x54\x06\x52\x61\x79\x6d\x6f'
     msg +=  b'\x6e\x00\x09\x2f\x90\x54\x0b\x52\x53\x57\x2d\x31\x2d\x31\x30\x30\x30\x31\x00\x09\x5a\x88\x54\x0f\x74\x2e\x72\x61\x79\x6d\x6f\x6e\x69\x6f\x74\x2e\x63\x6f\x6d\x00\x09\x5a\xec\x54'
     msg +=  b'\x1c\x6c\x6f\x67\x67\x65\x72\x2e\x74\x61\x6c\x65\x6e\x74\x2d\x6d\x6f\x6e\x69\x74\x6f\x72\x69\x6e\x67\x2e\x63\x6f\x6d\x00\x0d\x00\x20\x49\x00\x00\x00\x01\x00\x0c\x35\x00\x49\x00'
@@ -14,7 +14,7 @@ def contr_data_seq(): # Get Time Request message
     return msg
 
 @pytest.fixture
-def contr2_data_seq(): # Get Time Request message
+def Contr2DataSeq(): # Get Time Request message
     msg  =  b'\x00\x00\x00\x39\x00\x09\x2b\xa8\x54\x10\x52'
     msg +=  b'\x53\x57\x5f\x34\x30\x30\x5f\x56\x31\x2e\x30\x30\x2e\x32\x30\x00'
     msg +=  b'\x09\x27\xc0\x54\x06\x52\x61\x79\x6d\x6f\x6e\x00\x09\x2f\x90\x54'
@@ -94,19 +94,19 @@ def contr2_data_seq(): # Get Time Request message
     return msg
 
 @pytest.fixture
-def inv_data_seq(): # Data indication from the controller
+def InvDataSeq(): # Data indication from the controller
     msg =   b'\x00\x00\x00\x06\x00\x00\x00\x0a\x54\x08\x4d\x69\x63\x72\x6f\x69\x6e\x76\x00\x00\x00\x14\x54\x04\x54\x53\x55\x4e\x00\x00\x00\x1E\x54\x07\x56\x35\x2e\x30\x2e\x31\x31\x00\x00\x00\x28'
     msg +=  b'\x54\x10T170000000000001\x00\x00\x00\x32\x54\x0a\x54\x53\x4f\x4c\x2d\x4d\x53\x36\x30\x30\x00\x00\x00\x3c\x54\x05\x41\x2c\x42\x2c\x43'
     return msg
 
 @pytest.fixture
-def invalid_data_seq(): # Data indication from the controller
+def InvalidDataSeq(): # Data indication from the controller
     msg =   b'\x00\x00\x00\x06\x00\x00\x00\x0a\x54\x08\x4d\x69\x63\x72\x6f\x69\x6e\x76\x00\x00\x00\x14\x64\x04\x54\x53\x55\x4e\x00\x00\x00\x1E\x54\x07\x56\x35\x2e\x30\x2e\x31\x31\x00\x00\x00\x28'
     msg +=  b'\x54\x10T170000000000001\x00\x00\x00\x32\x54\x0a\x54\x53\x4f\x4c\x2d\x4d\x53\x36\x30\x30\x00\x00\x00\x3c\x54\x05\x41\x2c\x42\x2c\x43'
     return msg
 
 @pytest.fixture
-def inv_data_seq2(): # Data indication from the controller
+def InvDataSeq2(): # Data indication from the controller
     msg =   b'\x00\x00\x00\xa3\x00\x00\x00\x64\x53\x00\x01\x00\x00\x00\xc8\x53\x00\x02\x00\x00\x01\x2c\x53\x00\x00\x00\x00\x01\x90\x49\x00\x00\x00\x00\x00\x00\x01\x91\x53\x00\x00'
     msg +=  b'\x00\x00\x01\x92\x53\x00\x00\x00\x00\x01\x93\x53\x00\x00\x00\x00\x01\x94\x53\x00\x00\x00\x00\x01\x95\x53\x00\x00\x00\x00\x01\x96\x53\x00\x00\x00\x00\x01\x97\x53\x00'
     msg +=  b'\x00\x00\x00\x01\x98\x53\x00\x00\x00\x00\x01\x99\x53\x00\x00\x00\x00\x01\x9a\x53\x00\x00\x00\x00\x01\x9b\x53\x00\x00\x00\x00\x01\x9c\x53\x00\x00\x00\x00\x01\x9d\x53'
@@ -141,7 +141,7 @@ def inv_data_seq2(): # Data indication from the controller
     return msg
 
 @pytest.fixture
-def inv_data_new(): # Data indication from DSP V5.0.17
+def InvDataNew(): # Data indication from DSP V5.0.17
     msg  = b'\x00\x00\x00\xa3\x00\x00\x00\x00\x53\x00\x00'
     msg += b'\x00\x00\x00\x80\x53\x00\x00\x00\x00\x01\x04\x53\x00\x00\x00\x00'
     msg += b'\x01\x90\x41\x00\x00\x01\x91\x53\x00\x00\x00\x00\x01\x90\x53\x00'
@@ -217,7 +217,7 @@ def inv_data_new(): # Data indication from DSP V5.0.17
     return msg
 
 @pytest.fixture
-def inv_data_seq2_zero(): # Data indication from the controller
+def InvDataSeq2_Zero(): # Data indication from the controller
     msg =   b'\x00\x00\x00\xa3\x00\x00\x00\x64\x53\x00\x01\x00\x00\x00\xc8\x53\x00\x02\x00\x00\x01\x2c\x53\x00\x00\x00\x00\x01\x90\x49\x00\x00\x00\x00\x00\x00\x01\x91\x53\x00\x00'
     msg +=  b'\x00\x00\x01\x92\x53\x00\x00\x00\x00\x01\x93\x53\x00\x00\x00\x00\x01\x94\x53\x00\x00\x00\x00\x01\x95\x53\x00\x00\x00\x00\x01\x96\x53\x00\x00\x00\x00\x01\x97\x53\x00'
     msg +=  b'\x00\x00\x00\x01\x98\x53\x00\x00\x00\x00\x01\x99\x53\x00\x00\x00\x00\x01\x9a\x53\x00\x00\x00\x00\x01\x9b\x53\x00\x00\x00\x00\x01\x9c\x53\x00\x00\x00\x00\x01\x9d\x53'
@@ -252,37 +252,37 @@ def inv_data_seq2_zero(): # Data indication from the controller
     return msg
 
 
-def test_parse_control(contr_data_seq):
+def test_parse_control(ContrDataSeq):
     i = InfosG3()
-    for key, result in i.parse (contr_data_seq):
-        pass  # side effect in calling i.parse()
+    for key, result in i.parse (ContrDataSeq):
+        pass
 
     assert json.dumps(i.db) == json.dumps(
 {"collector": {"Collector_Fw_Version": "RSW_400_V1.00.06", "Chip_Type": "Raymon", "Chip_Model": "RSW-1-10001", "Trace_URL": "t.raymoniot.com", "Logger_URL": "logger.talent-monitoring.com"}, "controller": {"Collect_Interval": 1, "Signal_Strength": 100, "Power_On_Time": 29, "Communication_Type": 1, "Connect_Count": 1, "Data_Up_Interval": 300}})        
 
-def test_parse_control2(contr2_data_seq):
+def test_parse_control2(Contr2DataSeq):
     i = InfosG3()
-    for key, result in i.parse (contr2_data_seq):
-        pass  # side effect in calling i.parse()
+    for key, result in i.parse (Contr2DataSeq):
+        pass
 
     assert json.dumps(i.db) == json.dumps(
 {"collector": {"Collector_Fw_Version": "RSW_400_V1.00.20", "Chip_Type": "Raymon", "Chip_Model": "RSW-1-10001", "Trace_URL": "t.raymoniot.com", "Logger_URL": "logger.talent-monitoring.com"}, "controller": {"Collect_Interval": 1, "Signal_Strength": 16, "Power_On_Time": 334, "Communication_Type": 1, "Connect_Count": 1, "Data_Up_Interval": 300}})
 
-def test_parse_inverter(inv_data_seq):
+def test_parse_inverter(InvDataSeq):
     i = InfosG3()
-    for key, result in i.parse (inv_data_seq):
-        pass  # side effect in calling i.parse()
+    for key, result in i.parse (InvDataSeq):
+        pass
 
     assert json.dumps(i.db) == json.dumps(
 {"inverter": {"Product_Name": "Microinv", "Manufacturer": "TSUN", "Version": "V5.0.11", "Serial_Number": "T170000000000001", "Equipment_Model": "TSOL-MS600"}})
 
-def test_parse_cont_and_invert(contr_data_seq, inv_data_seq):
+def test_parse_cont_and_invert(ContrDataSeq, InvDataSeq):
     i = InfosG3()
-    for key, result in i.parse (contr_data_seq):
-        pass  # side effect in calling i.parse()
+    for key, result in i.parse (ContrDataSeq):
+        pass
 
-    for key, result in i.parse (inv_data_seq):
-        pass  # side effect in calling i.parse()
+    for key, result in i.parse (InvDataSeq):
+        pass
 
     assert json.dumps(i.db) == json.dumps(
     {
@@ -290,7 +290,7 @@ def test_parse_cont_and_invert(contr_data_seq, inv_data_seq):
 "inverter": {"Product_Name": "Microinv", "Manufacturer": "TSUN", "Version": "V5.0.11", "Serial_Number": "T170000000000001", "Equipment_Model": "TSOL-MS600"}})
 
 
-def test_build_ha_conf1(contr_data_seq):
+def test_build_ha_conf1(ContrDataSeq):
     i = InfosG3()
     i.static_init()                # initialize counter
 
@@ -325,11 +325,7 @@ def test_build_ha_conf1(contr_data_seq):
 
     assert tests==4
 
-def test_build_ha_conf2(contr_data_seq):
-    i = InfosG3()
-    i.static_init()                # initialize counter
 
-    tests = 0
     for d_json, comp, node_id, id in i.ha_proxy_confs(ha_prfx="tsun/", node_id = 'proxy/', snr = '456'):
 
         if id == 'out_power_123':
@@ -348,28 +344,28 @@ def test_build_ha_conf2(contr_data_seq):
             assert  d_json == json.dumps({"name": "Active Inverter Connections", "stat_t": "tsun/proxy/proxy", "dev_cla": None, "stat_cla": None, "uniq_id": "inv_count_456", "val_tpl": "{{value_json['Inverter_Cnt'] | int}}", "ic": "mdi:counter", "dev": {"name": "Proxy", "sa": "Proxy", "mdl": "proxy", "mf": "Stefan Allius", "sw": "unknown", "ids": ["proxy"]}, "o": {"name": "proxy", "sw": "unknown"}})
             tests +=1
 
-    assert tests==1
+    assert tests==5
 
-def test_build_ha_conf3(contr_data_seq, inv_data_seq, inv_data_seq2):
+def test_build_ha_conf2(ContrDataSeq, InvDataSeq, InvDataSeq2):
     i = InfosG3()
-    for key, result in i.parse (contr_data_seq):
-        pass  # side effect in calling i.parse()
-    for key, result in i.parse (inv_data_seq):
-        pass  # side effect in calling i.parse()
-    for key, result in i.parse (inv_data_seq2):
-        pass  # side effect in calling i.parse()
+    for key, result in i.parse (ContrDataSeq):
+        pass
+    for key, result in i.parse (InvDataSeq):
+        pass
+    for key, result in i.parse (InvDataSeq2):
+        pass
 
     tests = 0
     for d_json, comp, node_id, id in i.ha_confs(ha_prfx="tsun/", node_id="garagendach/", snr='123', sug_area = 'roof'):
 
         if id == 'out_power_123':
             assert comp == 'sensor'
-            assert  d_json == json.dumps({"name": "Power", "stat_t": "tsun/garagendach/grid", "dev_cla": "power", "stat_cla": "measurement", "uniq_id": "out_power_123", "val_tpl": "{{value_json['Output_Power'] | float}}", "unit_of_meas": "W", "dev": {"name": "Micro Inverter - roof", "sa": "Micro Inverter - roof", "via_device": "controller_123", "mdl": "TSOL-MS600", "mf": "TSUN", "sw": "V5.0.11", "sn": "T170000000000001", "ids": ["inverter_123"]}, "o": {"name": "proxy", "sw": "unknown"}})
+            assert  d_json == json.dumps({"name": "Power", "stat_t": "tsun/garagendach/grid", "dev_cla": "power", "stat_cla": "measurement", "uniq_id": "out_power_123", "val_tpl": "{{value_json['Output_Power'] | float}}", "unit_of_meas": "W", "dev": {"name": "Micro Inverter - roof", "sa": "Micro Inverter - roof", "via_device": "controller_123", "mdl": "TSOL-MS600", "mf": "TSUN", "sw": "V5.0.11", "ids": ["inverter_123"]}, "o": {"name": "proxy", "sw": "unknown"}})
             tests +=1
 
         if id == 'daily_gen_123':
             assert comp == 'sensor'
-            assert  d_json == json.dumps({"name": "Daily Generation", "stat_t": "tsun/garagendach/total", "dev_cla": "energy", "stat_cla": "total_increasing", "uniq_id": "daily_gen_123", "val_tpl": "{{value_json['Daily_Generation'] | float}}", "unit_of_meas": "kWh", "ic": "mdi:solar-power-variant", "dev": {"name": "Micro Inverter - roof", "sa": "Micro Inverter - roof", "via_device": "controller_123", "mdl": "TSOL-MS600", "mf": "TSUN", "sw": "V5.0.11", "sn": "T170000000000001", "ids": ["inverter_123"]}, "o": {"name": "proxy", "sw": "unknown"}})
+            assert  d_json == json.dumps({"name": "Daily Generation", "stat_t": "tsun/garagendach/total", "dev_cla": "energy", "stat_cla": "total_increasing", "uniq_id": "daily_gen_123", "val_tpl": "{{value_json['Daily_Generation'] | float}}", "unit_of_meas": "kWh", "ic": "mdi:solar-power-variant", "dev": {"name": "Micro Inverter - roof", "sa": "Micro Inverter - roof", "via_device": "controller_123", "mdl": "TSOL-MS600", "mf": "TSUN", "sw": "V5.0.11", "ids": ["inverter_123"]}, "o": {"name": "proxy", "sw": "unknown"}})
             tests +=1
 
         elif id == 'power_pv1_123':
@@ -388,36 +384,10 @@ def test_build_ha_conf3(contr_data_seq, inv_data_seq, inv_data_seq2):
             tests +=1
     assert tests==5
 
-def test_build_ha_conf4(contr_data_seq, inv_data_seq):
-    i = InfosG3()
-    for key, result in i.parse (contr_data_seq):
-        pass  # side effect in calling i.parse()
-    for key, result in i.parse (inv_data_seq):
-        pass  # side effect in calling i.parse()
-    i.set_db_def_value(Register.MAC_ADDR, "00a057123456")
-
-    tests = 0
-    for d_json, comp, node_id, id in i.ha_confs(ha_prfx="tsun/", node_id="garagendach/", snr='123', sug_area = 'roof'):
-        if id == 'signal_123':
-            assert comp == 'sensor'
-            assert  d_json == json.dumps({"name": "Signal Strength", "stat_t": "tsun/garagendach/controller", "dev_cla": None, "stat_cla": "measurement", "uniq_id": "signal_123", "val_tpl": "{{value_json[\'Signal_Strength\'] | int}}", "unit_of_meas": "%", "ic": "mdi:wifi", "dev": {"name": "Controller - roof", "sa": "Controller - roof", "via_device": "proxy", "mdl": "RSW-1-10001", "mf": "Raymon", "sw": "RSW_400_V1.00.06", "ids": ["controller_123"], "cns": [["mac", "00:a0:57:12:34:56"]]}, "o": {"name": "proxy", "sw": "unknown"}})
-            tests +=1
-    assert tests==1
-
-    i.set_db_def_value(Register.MAC_ADDR, "00:a0:57:12:34:57")
-
-    tests = 0
-    for d_json, comp, node_id, id in i.ha_confs(ha_prfx="tsun/", node_id="garagendach/", snr='123', sug_area = 'roof'):
-        if id == 'signal_123':
-            assert comp == 'sensor'
-            assert  d_json == json.dumps({"name": "Signal Strength", "stat_t": "tsun/garagendach/controller", "dev_cla": None, "stat_cla": "measurement", "uniq_id": "signal_123", "val_tpl": "{{value_json[\'Signal_Strength\'] | int}}", "unit_of_meas": "%", "ic": "mdi:wifi", "dev": {"name": "Controller - roof", "sa": "Controller - roof", "via_device": "proxy", "mdl": "RSW-1-10001", "mf": "Raymon", "sw": "RSW_400_V1.00.06", "ids": ["controller_123"], "cns": [["mac", "00:a0:57:12:34:57"]]}, "o": {"name": "proxy", "sw": "unknown"}})
-            tests +=1
-    assert tests==1
-
-def test_must_incr_total(inv_data_seq2, inv_data_seq2_zero):
+def test_must_incr_total(InvDataSeq2, InvDataSeq2_Zero):
     i = InfosG3()
     tests = 0
-    for key, update in i.parse (inv_data_seq2):
+    for key, update in i.parse (InvDataSeq2):
         if key == 'total' or key == 'inverter' or key == 'env':
             assert update == True
             tests +=1   
@@ -426,10 +396,13 @@ def test_must_incr_total(inv_data_seq2, inv_data_seq2_zero):
     assert json.dumps(i.db['input']) == json.dumps({"pv1": {"Voltage": 33.6, "Current": 1.91, "Power": 64.5, "Daily_Generation": 1.08, "Total_Generation": 9.74}, "pv2": {"Voltage": 33.5, "Current": 1.36, "Power": 45.7, "Daily_Generation": 0.62, "Total_Generation": 7.62}, "pv3": {"Voltage": 0.0, "Current": 0.0, "Power": 0.0}, "pv4": {"Voltage": 0.0, "Current": 0.0, "Power": 0.0}})
     assert json.dumps(i.db['env']) == json.dumps({"Inverter_Temp": 23})
     tests = 0
-    for key, update in i.parse (inv_data_seq2):
-        if key == 'total' or key == 'env':
+    for key, update in i.parse (InvDataSeq2):
+        if key == 'total':
             assert update == False
             tests +=1   
+        elif key == 'env':
+            assert update == False
+            tests +=1
 
     assert tests==3
     assert json.dumps(i.db['total']) == json.dumps({'Daily_Generation': 1.7, 'Total_Generation': 17.36})
@@ -438,7 +411,7 @@ def test_must_incr_total(inv_data_seq2, inv_data_seq2_zero):
     assert json.dumps(i.db['inverter']) == json.dumps({"Rated_Power": 600, "No_Inputs": 2})
         
     tests = 0
-    for key, update in i.parse (inv_data_seq2_zero):
+    for key, update in i.parse (InvDataSeq2_Zero):
         if key == 'total':
             assert update == False
             tests +=1   
@@ -451,10 +424,10 @@ def test_must_incr_total(inv_data_seq2, inv_data_seq2_zero):
     assert json.dumps(i.db['input']) == json.dumps({"pv1": {"Voltage": 33.6, "Current": 1.91, "Power": 0.0, "Daily_Generation": 1.08, "Total_Generation": 9.74}, "pv2": {"Voltage": 33.5, "Current": 1.36, "Power": 0.0, "Daily_Generation": 0.62, "Total_Generation": 7.62}, "pv3": {"Voltage": 0.0, "Current": 0.0, "Power": 0.0}, "pv4": {"Voltage": 0.0, "Current": 0.0, "Power": 0.0}})
     assert json.dumps(i.db['env']) == json.dumps({"Inverter_Temp": 0})
 
-def test_must_incr_total2(inv_data_seq2, inv_data_seq2_zero):
+def test_must_incr_total2(InvDataSeq2, InvDataSeq2_Zero):
     i = InfosG3()
     tests = 0
-    for key, update in i.parse (inv_data_seq2_zero):
+    for key, update in i.parse (InvDataSeq2_Zero):
         if key == 'total':
             assert update == False
             tests +=1   
@@ -468,10 +441,13 @@ def test_must_incr_total2(inv_data_seq2, inv_data_seq2_zero):
     assert json.dumps(i.db['env']) == json.dumps({"Inverter_Temp": 0})
     
     tests = 0
-    for key, update in i.parse (inv_data_seq2_zero):
-        if key == 'total' or key == 'env':
+    for key, update in i.parse (InvDataSeq2_Zero):
+        if key == 'total':
             assert update == False
             tests +=1   
+        elif key == 'env':
+            assert update == False
+            tests +=1
 
     assert tests==3
     assert json.dumps(i.db['total']) == json.dumps({})
@@ -479,19 +455,22 @@ def test_must_incr_total2(inv_data_seq2, inv_data_seq2_zero):
     assert json.dumps(i.db['env']) == json.dumps({"Inverter_Temp": 0})
 
     tests = 0
-    for key, update in i.parse (inv_data_seq2):
-        if key == 'total' or key == 'env':
+    for key, update in i.parse (InvDataSeq2):
+        if key == 'total':
             assert update == True
             tests +=1   
+        elif key == 'env':
+            assert update == True
+            tests +=1
 
     assert tests==3
     assert json.dumps(i.db['total']) == json.dumps({'Daily_Generation': 1.7, 'Total_Generation': 17.36})
     assert json.dumps(i.db['input']) == json.dumps({"pv1": {"Voltage": 33.6, "Current": 1.91, "Power": 64.5, "Daily_Generation": 1.08, "Total_Generation": 9.74}, "pv2": {"Voltage": 33.5, "Current": 1.36, "Power": 45.7, "Daily_Generation": 0.62, "Total_Generation": 7.62}, "pv3": {"Voltage": 0.0, "Current": 0.0, "Power": 0.0}, "pv4": {"Voltage": 0.0, "Current": 0.0, "Power": 0.0}})
    
-def test_new_data_types(inv_data_new):
+def test_new_data_types(InvDataNew):
     i = InfosG3()
     tests = 0
-    for key, update in i.parse (inv_data_new):
+    for key, update in i.parse (InvDataNew):
         if key == 'events':
             tests +=1
         elif key == 'inverter':
@@ -508,7 +487,7 @@ def test_new_data_types(inv_data_new):
     assert json.dumps(i.db['input']) == json.dumps({"pv1": {}})
     assert json.dumps(i.db['events']) == json.dumps({"401_": 0, "404_": 0, "405_": 0, "408_": 0, "409_No_Utility": 0, "406_": 0, "416_": 0})
 
-def test_invalid_data_type(invalid_data_seq):
+def test_invalid_data_type(InvalidDataSeq):
     i = InfosG3()
     i.static_init()                # initialize counter
 
@@ -516,8 +495,8 @@ def test_invalid_data_type(invalid_data_seq):
     assert val == 0
 
 
-    for key, result in i.parse (invalid_data_seq):
-        pass  # side effect in calling i.parse()
+    for key, result in i.parse (InvalidDataSeq):
+        pass
     assert json.dumps(i.db) == json.dumps({"inverter": {"Product_Name": "Microinv"}})
 
     val = i.dev_value(Register.INVALID_DATA_TYPE)  # check invalid data type counter

app/tests/test_infos_g3p.py

@@ -1,33 +1,18 @@
 
 # test_with_pytest.py
-import pytest, json, math, random
+import pytest, json
 from app.src.infos import Register
 from app.src.gen3plus.infos_g3p import InfosG3P
 from app.src.gen3plus.infos_g3p import RegisterMap
 
-@pytest.fixture(scope="session")
-def str_test_ip():
-    ip =  ".".join(str(random.randint(1, 254)) for _ in range(4))
-    print(f'random_ip: {ip}')
-    return ip
-
-@pytest.fixture(scope="session")
-def bytes_test_ip(str_test_ip):
-    ip =  bytes(str.encode(str_test_ip))
-    l = len(ip)
-    if l < 16:
-        ip = ip + bytearray(16-l)
-    print(f'random_ip: {ip}')
-    return ip
-
 @pytest.fixture
-def device_data(bytes_test_ip): # 0x4110 ftype: 0x02
+def DeviceData(): # 0x4110 ftype: 0x02
     msg  = b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xd2\x00\x00'
     msg += b'\x19\x00\x00\x00\x00\x00\x00\x00\x05\x3c\x78\x01\x64\x01\x4c\x53'
     msg += b'\x57\x35\x42\x4c\x45\x5f\x31\x37\x5f\x30\x32\x42\x30\x5f\x31\x2e'
     msg += b'\x30\x35\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x40\x2a\x8f\x4f\x51\x54' + bytes_test_ip
-    msg += b'\x0f\x00\x01\xb0'
+    msg += b'\x00\x00\x00\x00\x00\x00\x40\x2a\x8f\x4f\x51\x54\x31\x39\x32\x2e'
+    msg += b'\x31\x36\x38\x2e\x38\x30\x2e\x34\x39\x00\x00\x00\x0f\x00\x01\xb0'
     msg += b'\x02\x0f\x00\xff\x56\x31\x2e\x31\x2e\x30\x30\x2e\x30\x42\x00\x00'
     msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
     msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xfe\xfe\x00\x00'
@@ -39,7 +24,7 @@ def device_data(bytes_test_ip): # 0x4110 ftype: 0x02
     return msg
 
 @pytest.fixture
-def inverter_data():  # 0x4210 ftype: 0x01
+def InverterData():  # 0x4210 ftype: 0x01
     msg  = b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\xb0\x02\xbc\xc8'
     msg += b'\x24\x32\x6c\x1f\x00\x00\xa0\x47\xe4\x33\x01\x00\x03\x08\x00\x00'
     msg += b'\x59\x31\x37\x45\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x45'
@@ -71,34 +56,34 @@ def inverter_data():  # 0x4210 ftype: 0x01
 
 
 def test_default_db():
-    i = InfosG3P(client_mode=False)
+    i = InfosG3P()
     
     assert json.dumps(i.db) == json.dumps({
-        "inverter": {"Manufacturer": "TSUN", "Equipment_Model": "TSOL-MSxx00", "No_Inputs": 4}, 
+        "inverter": {"Manufacturer": "TSUN", "Equipment_Model": "TSOL-MSxx00"}, 
         "collector": {"Chip_Type": "IGEN TECH"},
         })
 
-def test_parse_4110(str_test_ip, device_data: bytes):
-    i = InfosG3P(client_mode=False)
+def test_parse_4110(DeviceData: bytes):
+    i = InfosG3P()
     i.db.clear()
-    for key, update in i.parse (device_data, 0x41, 2):
-        pass  # side effect is calling generator i.parse()
+    for key, update in i.parse (DeviceData, 0x41, 2):
+        pass
 
     assert json.dumps(i.db) == json.dumps({
-        'controller': {"Data_Up_Interval": 300, "Collect_Interval": 1, "Heartbeat_Interval": 120, "Signal_Strength": 100, "IP_Address": str_test_ip, "Sensor_List": "02b0"},
+        'controller': {"Data_Up_Interval": 300, "Collect_Interval": 1, "Heartbeat_Interval": 120, "Signal_Strength": 100, "IP_Address": "192.168.80.49"},
         'collector': {"Chip_Model": "LSW5BLE_17_02B0_1.05", "Collector_Fw_Version": "V1.1.00.0B"},
         })
 
-def test_parse_4210(inverter_data: bytes):
-    i = InfosG3P(client_mode=False)
+def test_parse_4210(InverterData: bytes):
+    i = InfosG3P()
     i.db.clear()
     
-    for key, update in i.parse (inverter_data, 0x42, 1):
-        pass  #  side effect is calling generator i.parse()
+    for key, update in i.parse (InverterData, 0x42, 1):
+        pass
 
     assert json.dumps(i.db) == json.dumps({
-         "controller": {"Sensor_List": "02b0", "Power_On_Time": 2051}, 
-         "inverter": {"Serial_Number": "Y17E00000000000E", "Version": "V4.0.10", "Rated_Power": 600, "Max_Designed_Power": 2000}, 
+         "controller": {"Power_On_Time": 2051}, 
+         "inverter": {"Serial_Number": "Y17E00000000000E", "Version": "V4.0.10", "Rated_Power": 600, "Max_Designed_Power": 2000, "No_Inputs": 4}, 
          "env": {"Inverter_Status": 1, "Inverter_Temp": 14}, 
          "grid": {"Voltage": 224.8, "Current": 0.73, "Frequency": 50.05, "Output_Power": 165.8}, 
          "input": {"pv1": {"Voltage": 35.3, "Current": 1.68, "Power": 59.6, "Daily_Generation": 0.04, "Total_Generation": 30.76}, 
@@ -109,7 +94,7 @@ def test_parse_4210(inverter_data: bytes):
         })
     
 def test_build_ha_conf1():
-    i = InfosG3P(client_mode=False)
+    i = InfosG3P()
     i.static_init()                # initialize counter
 
     tests = 0
@@ -131,19 +116,8 @@ def test_build_ha_conf1():
             tests +=1
 
         elif id == 'power_pv2_123':
-            assert comp == 'sensor'
-            assert  d_json == json.dumps({"name": "Power", "stat_t": "tsun/garagendach/input", "dev_cla": "power", "stat_cla": "measurement", "uniq_id": "power_pv2_123", "val_tpl": "{{ (value_json['pv2']['Power'] | float)}}", "unit_of_meas": "W", "dev": {"name": "Module PV2", "sa": "Module PV2", "via_device": "inverter_123", "ids": ["input_pv2_123"]}, "o": {"name": "proxy", "sw": "unknown"}})
-            tests +=1
+            assert False    # if we haven't received and parsed a control data msg, we don't know the number of inputs. In this case we only register the first one!!
 
-        elif id == 'power_pv3_123':
-            assert comp == 'sensor'
-            assert  d_json == json.dumps({"name": "Power", "stat_t": "tsun/garagendach/input", "dev_cla": "power", "stat_cla": "measurement", "uniq_id": "power_pv3_123", "val_tpl": "{{ (value_json['pv3']['Power'] | float)}}", "unit_of_meas": "W", "dev": {"name": "Module PV3", "sa": "Module PV3", "via_device": "inverter_123", "ids": ["input_pv3_123"]}, "o": {"name": "proxy", "sw": "unknown"}})
-            tests +=1
-
-        elif id == 'power_pv4_123':
-            assert comp == 'sensor'
-            assert  d_json == json.dumps({"name": "Power", "stat_t": "tsun/garagendach/input", "dev_cla": "power", "stat_cla": "measurement", "uniq_id": "power_pv4_123", "val_tpl": "{{ (value_json['pv4']['Power'] | float)}}", "unit_of_meas": "W", "dev": {"name": "Module PV4", "sa": "Module PV4", "via_device": "inverter_123", "ids": ["input_pv4_123"]}, "o": {"name": "proxy", "sw": "unknown"}})
-            tests +=1
 
         elif id == 'signal_123':
             assert comp == 'sensor'
@@ -152,13 +126,9 @@ def test_build_ha_conf1():
         elif id == 'inv_count_456':
             assert False
 
-    assert tests==7
+    assert tests==4
 
-def test_build_ha_conf2():
-    i = InfosG3P(client_mode=False)
-    i.static_init()                # initialize counter
 
-    tests = 0
     for d_json, comp, node_id, id in i.ha_proxy_confs(ha_prfx="tsun/", node_id = 'proxy/', snr = '456'):
 
         if id == 'out_power_123':
@@ -168,11 +138,8 @@ def test_build_ha_conf2():
         elif id == 'power_pv1_123':
             assert False
         elif id == 'power_pv2_123':
-            assert False
-        elif id == 'power_pv3_123':
-            assert False
-        elif id == 'power_pv4_123':
-            assert False
+            assert False    # if we haven't received and parsed a control data msg, we don't know the number of inputs. In this case we only register the first one!!
+
         elif id == 'signal_123':
             assert False
         elif id == 'inv_count_456':
@@ -180,103 +147,30 @@ def test_build_ha_conf2():
             assert  d_json == json.dumps({"name": "Active Inverter Connections", "stat_t": "tsun/proxy/proxy", "dev_cla": None, "stat_cla": None, "uniq_id": "inv_count_456", "val_tpl": "{{value_json['Inverter_Cnt'] | int}}", "ic": "mdi:counter", "dev": {"name": "Proxy", "sa": "Proxy", "mdl": "proxy", "mf": "Stefan Allius", "sw": "unknown", "ids": ["proxy"]}, "o": {"name": "proxy", "sw": "unknown"}})
             tests +=1
 
-    assert tests==1
+    assert tests==5
 
-def test_build_ha_conf3():
-    i = InfosG3P(client_mode=True)
-    i.static_init()                # initialize counter
-
-    tests = 0
-    for d_json, comp, node_id, id in i.ha_confs(ha_prfx="tsun/", node_id="garagendach/", snr='123'):
-
-        if id == 'out_power_123':
-            assert comp == 'sensor'
-            assert  d_json == json.dumps({"name": "Power", "stat_t": "tsun/garagendach/grid", "dev_cla": "power", "stat_cla": "measurement", "uniq_id": "out_power_123", "val_tpl": "{{value_json['Output_Power'] | float}}", "unit_of_meas": "W", "dev": {"name": "Micro Inverter", "sa": "Micro Inverter", "via_device": "controller_123", "mdl": "TSOL-MSxx00", "mf": "TSUN", "ids": ["inverter_123"]}, "o": {"name": "proxy", "sw": "unknown"}})
-            tests +=1
-
-        elif id == 'daily_gen_123':
-            assert comp == 'sensor'
-            assert  d_json == json.dumps({"name": "Daily Generation", "stat_t": "tsun/garagendach/total", "dev_cla": "energy", "stat_cla": "total_increasing", "uniq_id": "daily_gen_123", "val_tpl": "{{value_json['Daily_Generation'] | float}}", "unit_of_meas": "kWh", "ic": "mdi:solar-power-variant", "dev": {"name": "Micro Inverter", "sa": "Micro Inverter", "via_device": "controller_123", "mdl": "TSOL-MSxx00", "mf": "TSUN", "ids": ["inverter_123"]}, "o": {"name": "proxy", "sw": "unknown"}})
-            tests +=1
-
-        elif id == 'power_pv1_123':
-            assert comp == 'sensor'
-            assert  d_json == json.dumps({"name": "Power", "stat_t": "tsun/garagendach/input", "dev_cla": "power", "stat_cla": "measurement", "uniq_id": "power_pv1_123", "val_tpl": "{{ (value_json['pv1']['Power'] | float)}}", "unit_of_meas": "W", "dev": {"name": "Module PV1", "sa": "Module PV1", "via_device": "inverter_123", "ids": ["input_pv1_123"]}, "o": {"name": "proxy", "sw": "unknown"}})
-            tests +=1
-
-        elif id == 'power_pv2_123':
-            assert comp == 'sensor'
-            assert  d_json == json.dumps({"name": "Power", "stat_t": "tsun/garagendach/input", "dev_cla": "power", "stat_cla": "measurement", "uniq_id": "power_pv2_123", "val_tpl": "{{ (value_json['pv2']['Power'] | float)}}", "unit_of_meas": "W", "dev": {"name": "Module PV2", "sa": "Module PV2", "via_device": "inverter_123", "ids": ["input_pv2_123"]}, "o": {"name": "proxy", "sw": "unknown"}})
-            tests +=1
-
-        elif id == 'power_pv3_123':
-            assert comp == 'sensor'
-            assert  d_json == json.dumps({"name": "Power", "stat_t": "tsun/garagendach/input", "dev_cla": "power", "stat_cla": "measurement", "uniq_id": "power_pv3_123", "val_tpl": "{{ (value_json['pv3']['Power'] | float)}}", "unit_of_meas": "W", "dev": {"name": "Module PV3", "sa": "Module PV3", "via_device": "inverter_123", "ids": ["input_pv3_123"]}, "o": {"name": "proxy", "sw": "unknown"}})
-            tests +=1
-
-        elif id == 'power_pv4_123':
-            assert comp == 'sensor'
-            assert  d_json == json.dumps({"name": "Power", "stat_t": "tsun/garagendach/input", "dev_cla": "power", "stat_cla": "measurement", "uniq_id": "power_pv4_123", "val_tpl": "{{ (value_json['pv4']['Power'] | float)}}", "unit_of_meas": "W", "dev": {"name": "Module PV4", "sa": "Module PV4", "via_device": "inverter_123", "ids": ["input_pv4_123"]}, "o": {"name": "proxy", "sw": "unknown"}})
-            tests +=1
-
-        elif id == 'signal_123':
-            assert comp == 'sensor'
-            assert  d_json == json.dumps({})
-            tests +=1
-        elif id == 'inv_count_456':
-            assert False
-
-    assert tests==7
-
-def test_build_ha_conf4():
-    i = InfosG3P(client_mode=True)
-    i.static_init()                # initialize counter
-
-    tests = 0
-    for d_json, comp, node_id, id in i.ha_proxy_confs(ha_prfx="tsun/", node_id = 'proxy/', snr = '456'):
-
-        if id == 'out_power_123':
-            assert False
-        elif id == 'daily_gen_123':
-            assert False
-        elif id == 'power_pv1_123':
-            assert False
-        elif id == 'power_pv2_123':
-            assert False
-        elif id == 'power_pv3_123':
-            assert False
-        elif id == 'power_pv4_123':
-            assert False
-        elif id == 'signal_123':
-            assert False
-        elif id == 'inv_count_456':
-            assert comp == 'sensor'
-            assert  d_json == json.dumps({"name": "Active Inverter Connections", "stat_t": "tsun/proxy/proxy", "dev_cla": None, "stat_cla": None, "uniq_id": "inv_count_456", "val_tpl": "{{value_json['Inverter_Cnt'] | int}}", "ic": "mdi:counter", "dev": {"name": "Proxy", "sa": "Proxy", "mdl": "proxy", "mf": "Stefan Allius", "sw": "unknown", "ids": ["proxy"]}, "o": {"name": "proxy", "sw": "unknown"}})
-            tests +=1
-
-    assert tests==1
-
-def test_exception_and_eval(inverter_data: bytes):
+def test_exception_and_eval(InverterData: bytes):
 
     # add eval to convert temperature from °F to °C
     RegisterMap.map[0x420100d8]['eval'] =  '(result-32)/1.8'
     # map PV1_VOLTAGE to invalid register  
     RegisterMap.map[0x420100e0]['reg'] = Register.TEST_REG2
     # set invalid maping entry for OUTPUT_POWER (string instead of dict type) 
-    backup = RegisterMap.map[0x420100de]
+    Backup = RegisterMap.map[0x420100de]
     RegisterMap.map[0x420100de] = 'invalid_entry'
 
-    i = InfosG3P(client_mode=False)
+    i = InfosG3P()
     # i.db.clear()
     
-    for key, update in i.parse (inverter_data, 0x42, 1):
-        pass  #  side effect is calling generator i.parse()
-    assert math.isclose(12.2222, round (i.get_db_value(Register.INVERTER_TEMP, 0),4), rel_tol=1e-09, abs_tol=1e-09)
+    for key, update in i.parse (InverterData, 0x42, 1):
+        pass
+    assert 12.2222 == round (i.get_db_value(Register.INVERTER_TEMP, 0),4)
+    
     del RegisterMap.map[0x420100d8]['eval'] # remove eval
     RegisterMap.map[0x420100e0]['reg'] = Register.PV1_VOLTAGE # reset mapping
-    RegisterMap.map[0x420100de] = backup # reset mapping
+    RegisterMap.map[0x420100de] = Backup # reset mapping
     
-    for key, update in i.parse (inverter_data, 0x42, 1):
-        pass  #  side effect is calling generator i.parse()
+    for key, update in i.parse (InverterData, 0x42, 1):
+        pass
     assert 54 == i.get_db_value(Register.INVERTER_TEMP, 0)
  

app/tests/test_inverter.py

@@ -1,90 +0,0 @@
-# test_with_pytest.py
-import pytest
-import asyncio
-import aiomqtt
-import logging
-
-from mock import patch, Mock
-from app.src.singleton import Singleton
-from app.src.inverter import Inverter
-from app.src.mqtt import Mqtt
-from app.src.gen3plus.solarman_v5 import SolarmanV5
-from app.src.config import Config
-
-
-pytest_plugins = ('pytest_asyncio',)
-
-
-@pytest.fixture(scope="module", autouse=True)
-def module_init():
-    def new_init(cls, cb_mqtt_is_up):
-        cb_mqtt_is_up()
-
-    Singleton._instances.clear()
-    with patch.object(Mqtt, '__init__', new_init):
-        yield
-
-@pytest.fixture(scope="module")
-def test_port():
-    return 1883
-
-@pytest.fixture(scope="module")
-def test_hostname():
-    # if getenv("GITHUB_ACTIONS") == "true":
-    #     return 'mqtt'
-    # else:
-        return 'test.mosquitto.org'
-
-@pytest.fixture
-def config_conn(test_hostname, test_port):
-    Config.act_config = {
-                        'mqtt':{
-                            'host': test_hostname,
-                            'port': test_port,
-                            'user': '',
-                            'passwd': ''
-                        },
-                        'ha':{
-                            'auto_conf_prefix': 'homeassistant',
-                            'discovery_prefix': 'homeassistant', 
-                            'entity_prefix': 'tsun',
-                            'proxy_node_id': 'test_1',
-                            'proxy_unique_id': ''
-                        },
-                        'inverters': {
-                            'allow_all': True,
-                            "R170000000000001":{
-                                'node_id': 'inv_1'
-                            }
-                        }
-    }
-
-@pytest.mark.asyncio
-async def test_inverter_cb(config_conn):
-    _ = config_conn
-
-    with patch.object(Inverter, '_cb_mqtt_is_up', wraps=Inverter._cb_mqtt_is_up) as spy:
-        print('call Inverter.class_init')
-        Inverter.class_init()
-        assert 'homeassistant/' == Inverter.discovery_prfx
-        assert 'tsun/' == Inverter.entity_prfx
-        assert 'test_1/' == Inverter.proxy_node_id
-        spy.assert_called_once()
-
-@pytest.mark.asyncio
-async def test_mqtt_is_up(config_conn):
-    _ = config_conn
-
-    with patch.object(Mqtt, 'publish') as spy:
-        Inverter.class_init()
-        await Inverter._cb_mqtt_is_up()
-        spy.assert_called()
-
-@pytest.mark.asyncio
-async def test_mqtt_proxy_statt_invalid(config_conn):
-    _ = config_conn
-
-    with patch.object(Mqtt, 'publish') as spy:
-        Inverter.class_init()
-        await Inverter._async_publ_mqtt_proxy_stat('InValId_kEy')
-        spy.assert_not_called()

app/tests/test_modbus.py

@@ -5,6 +5,7 @@ from app.src.modbus import Modbus
 from app.src.infos import Infos, Register
 
 pytest_plugins = ('pytest_asyncio',)
+# pytestmark = pytest.mark.asyncio(scope="module")
 
 class ModbusTestHelper(Modbus):
     def __init__(self):
@@ -31,12 +32,7 @@ def test_modbus_crc():
     assert mb._Modbus__check_crc(b'\x01\x06\x20\x08\x00\x00\x03\xc8')
 
     assert 0x5c75 == mb._Modbus__calc_crc(b'\x01\x03\x08\x01\x2c\x00\x2c\x02\x2c\x2c\x46')
-    msg = b'\x01\x03\x28\x51'
-    msg += b'\x0e\x08\xd3\x00\x29\x13\x87\x00\x3e\x00\x00\x01\x2c\x03\xb4\x00'
-    msg += b'\x08\x00\x00\x00\x00\x01\x59\x01\x21\x03\xe6\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\xe6\xef'
-    assert 0 == mb._Modbus__calc_crc(msg)
-
+    
 def test_build_modbus_pdu():
     '''Check building and sending a MODBUS RTU'''
     mb = ModbusTestHelper()
@@ -75,8 +71,8 @@ def test_recv_resp_crc_err():
     mb.req_pend = True
     mb.last_addr = 1
     mb.last_fcode = 3   
-    mb.last_reg = 0x300e
-    mb.last_len = 2
+    mb.last_reg == 0x300e
+    mb.last_len == 2
     # check matching response, but with CRC error
     call = 0
     for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf3', 'test'):
@@ -95,8 +91,8 @@ def test_recv_resp_invalid_addr():
     # simulate a transmitted request
     mb.last_addr = 1
     mb.last_fcode = 3   
-    mb.last_reg = 0x300e
-    mb.last_len = 2
+    mb.last_reg == 0x300e
+    mb.last_len == 2
 
     # check not matching response, with wrong server addr
     call = 0
@@ -177,7 +173,7 @@ def test_parse_resp():
     assert mb.req_pend
 
     call = 0
-    exp_result = ['V0.0.2C', 4.4, 0.7, 0.7, 30]
+    exp_result = ['V0.0.212', 4.4, 0.7, 0.7, 30]
     for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x0c\x01\x2c\x00\x2c\x00\x2c\x00\x46\x00\x46\x00\x46\x32\xc8', 'test'):
         if key == 'grid':
             assert update == True
@@ -226,7 +222,7 @@ def test_queue2():
     assert mb.send_calls == 1
     assert mb.pdu == b'\x01\x030\x07\x00\x06{\t'
     call = 0
-    exp_result = ['V0.0.2C', 4.4, 0.7, 0.7, 30]
+    exp_result = ['V0.0.212', 4.4, 0.7, 0.7, 30]
     for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x0c\x01\x2c\x00\x2c\x00\x2c\x00\x46\x00\x46\x00\x46\x32\xc8', 'test'):
         if key == 'grid':
             assert update == True
@@ -246,7 +242,7 @@ def test_queue2():
     assert mb.pdu == b'\x01\x06\x20\x08\x00\x04\x02\x0b'
 
     for key, update, val in mb.recv_resp(mb.db, b'\x01\x06\x20\x08\x00\x04\x02\x0b', 'test'):
-        pass  # call generator mb.recv_resp()
+        pass
 
     assert mb.que.qsize() == 0
     assert mb.send_calls == 3
@@ -276,7 +272,7 @@ def test_queue3():
     assert mb.recv_responses == 0
 
     call = 0
-    exp_result = ['V0.0.2C', 4.4, 0.7, 0.7, 30]
+    exp_result = ['V0.0.212', 4.4, 0.7, 0.7, 30]
     for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x0c\x01\x2c\x00\x2c\x00\x2c\x00\x46\x00\x46\x00\x46\x32\xc8', 'test'):
         if key == 'grid':
             assert update == True
@@ -297,7 +293,7 @@ def test_queue3():
     assert mb.pdu == b'\x01\x06\x20\x08\x00\x04\x02\x0b'
 
     for key, update, val in mb.recv_resp(mb.db, b'\x01\x06\x20\x08\x00\x04\x02\x0b', 'test'):
-        pass  # no code in loop is OK; calling the generator is the purpose
+        pass
     assert 0 == mb.err
     assert mb.recv_responses == 2
 
@@ -363,11 +359,13 @@ async def test_timeout():
     assert mb.retry_cnt == 0
     assert mb.send_calls == 4
 
+    # assert mb.counter == {}
+
 def test_recv_unknown_data():
     '''Receive a response with an unknwon register'''
     mb = ModbusTestHelper()
-    assert 0x9000 not in mb.mb_reg_mapping
-    mb.mb_reg_mapping[0x9000] = {'reg': Register.TEST_REG1,   'fmt': '!H', 'ratio':  1}
+    assert 0x9000 not in mb.map
+    mb.map[0x9000] = {'reg': Register.TEST_REG1,   'fmt': '!H', 'ratio':  1}
 
     mb.build_msg(1,3,0x9000,2)
 
@@ -379,17 +377,4 @@ def test_recv_unknown_data():
     assert 0 == call
     assert not mb.req_pend
 
-    del mb.mb_reg_mapping[0x9000]
-
-def test_close():
-    '''Check queue handling for build_msg() calls'''
-    mb = ModbusTestHelper()
-    mb.build_msg(1,3,0x3007,6)
-    mb.build_msg(1,6,0x2008,4)
-    assert mb.que.qsize() == 1
-    mb.build_msg(1,3,0x3007,6)
-    assert mb.que.qsize() == 2
-    assert mb.que.empty() == False 
-    mb.close()
-    assert mb.que.qsize() == 0
-    assert mb.que.empty() == True 
+    del mb.map[0x9000]

app/tests/test_modbus_tcp.py

@@ -1,240 +0,0 @@
-# test_with_pytest.py
-import pytest
-import asyncio
-
-from mock import patch
-from enum import Enum
-from enum import Enum
-from app.src.singleton import Singleton
-from app.src.config import Config
-from app.src.infos import Infos
-from app.src.mqtt import Mqtt
-from app.src.messages import Message, State
-from app.src.inverter import Inverter
-from app.src.modbus_tcp import ModbusConn, ModbusTcp
-from app.src.mqtt import Mqtt
-from app.src.messages import Message, State
-from app.src.inverter import Inverter
-from app.src.modbus_tcp import ModbusConn, ModbusTcp
-
-
-pytest_plugins = ('pytest_asyncio',)
-
-# initialize the proxy statistics
-Infos.static_init()
-
-@pytest.fixture(scope="module", autouse=True)
-def module_init():
-    Singleton._instances.clear()
-    yield
-
-@pytest.fixture(scope="module")
-def test_port():
-    return 1883
-
-@pytest.fixture(scope="module")
-def test_hostname():
-    # if getenv("GITHUB_ACTIONS") == "true":
-    #     return 'mqtt'
-    # else:
-        return 'test.mosquitto.org'
-
-@pytest.fixture
-def config_conn(test_hostname, test_port):
-    Config.act_config = {
-                        'mqtt':{
-                            'host': test_hostname,
-                            'port': test_port,
-                            'user': '',
-                            'passwd': ''
-                        },
-                        'ha':{
-                            'auto_conf_prefix': 'homeassistant',
-                            'discovery_prefix': 'homeassistant', 
-                            'entity_prefix': 'tsun',
-                            'proxy_node_id': 'test_1',
-                            'proxy_unique_id': ''
-                        },
-                        'inverters':{
-                            'allow_all': True,
-                            "R170000000000001":{
-                                'node_id': 'inv_1'
-                            },
-                            "Y170000000000001":{
-                                'node_id': 'inv_2',
-                                'monitor_sn': 2000000000,
-                                'modbus_polling': True,
-                                'suggested_area': "",
-                                'sensor_list': 0x2b0,
-                                'client_mode':{
-                                    'host': '192.168.0.1', 
-                                    'port': 8899
-                                }  
-                            }
-                        }
-    }
-
-
-class TestType(Enum):
-    RD_TEST_0_BYTES = 1
-    RD_TEST_TIMEOUT = 2
-
-
-test  = TestType.RD_TEST_0_BYTES
-
-
-class FakeReader():
-    def __init__(self):
-        self.on_recv =  asyncio.Event()
-    async def read(self, max_len: int):
-        await self.on_recv.wait()
-        if test == TestType.RD_TEST_0_BYTES:
-            return b''
-        elif test == TestType.RD_TEST_TIMEOUT:
-            raise TimeoutError
-    def feed_eof(self):
-        return
-
-
-class FakeWriter():
-    def write(self, buf: bytes):
-        return
-    def get_extra_info(self, sel: str):
-        if sel == 'peername':
-            return 'remote.intern'
-        elif sel == 'sockname':
-            return 'sock:1234'
-        assert False
-    def is_closing(self):
-        return False
-    def close(self):
-        return
-    async def wait_closed(self):
-        return
-
-
-@pytest.fixture
-def patch_open():
-    async def new_conn(conn):
-        await asyncio.sleep(0)
-        return FakeReader(), FakeWriter()
-    
-    def new_open(host: str, port: int):
-        global test
-        if test == TestType.RD_TEST_TIMEOUT:
-            raise TimeoutError
-        return new_conn(None)
-
-    with patch.object(asyncio, 'open_connection', new_open) as conn:
-        yield conn
-
-@pytest.fixture
-def patch_no_mqtt():
-    with patch.object(Mqtt, 'publish') as conn:
-        yield conn
-
-@pytest.fixture
-def patch_no_mqtt():
-    with patch.object(Mqtt, 'publish') as conn:
-        yield conn
-
-
-@pytest.mark.asyncio
-async def test_modbus_conn(patch_open):
-    _ = patch_open
-    assert Infos.stat['proxy']['Inverter_Cnt'] == 0
-
-    async with ModbusConn('test.local', 1234) as stream:
-        assert stream.node_id == 'G3P'
-        assert stream.addr == ('test.local', 1234)
-        assert type(stream.reader) is FakeReader
-        assert type(stream.writer) is FakeWriter
-        assert Infos.stat['proxy']['Inverter_Cnt'] == 1
-    
-    assert Infos.stat['proxy']['Inverter_Cnt'] == 0
-
-@pytest.mark.asyncio
-async def test_modbus_no_cnf():
-    assert Infos.stat['proxy']['Inverter_Cnt'] == 0
-    loop = asyncio.get_event_loop()
-    ModbusTcp(loop)
-    assert Infos.stat['proxy']['Inverter_Cnt'] == 0
-
-@pytest.mark.asyncio
-async def test_modbus_cnf1(config_conn, patch_open):
-    _ = config_conn
-    _ = patch_open
-    global test
-    assert asyncio.get_running_loop()
-    Inverter.class_init()
-    test = TestType.RD_TEST_TIMEOUT
-
-    assert Infos.stat['proxy']['Inverter_Cnt'] == 0
-    loop = asyncio.get_event_loop()
-    ModbusTcp(loop)
-    await asyncio.sleep(0.01)
-    for m in Message:
-        if (m.node_id == 'inv_2'):
-            assert False
-        
-    await asyncio.sleep(0.01)
-    assert Infos.stat['proxy']['Inverter_Cnt'] == 0
-
-@pytest.mark.asyncio
-async def test_modbus_cnf2(config_conn, patch_no_mqtt, patch_open):
-    _ = config_conn
-    _ = patch_open
-    _ = patch_no_mqtt
-    global test
-    assert asyncio.get_running_loop()
-    Inverter.class_init()
-    test = TestType.RD_TEST_0_BYTES
-
-    assert Infos.stat['proxy']['Inverter_Cnt'] == 0
-    ModbusTcp(asyncio.get_event_loop())
-    await asyncio.sleep(0.01)
-    test = 0
-    for m in Message:
-        if (m.node_id == 'inv_2'):
-            test += 1
-            assert Infos.stat['proxy']['Inverter_Cnt'] == 1
-            m.shutdown_started = True
-            m.reader.on_recv.set()
-            del m
-        
-    assert 1 == test
-    await asyncio.sleep(0.01)
-    assert Infos.stat['proxy']['Inverter_Cnt'] == 0
-
-@pytest.mark.asyncio
-async def test_modbus_cnf3(config_conn, patch_no_mqtt, patch_open):
-    _ = config_conn
-    _ = patch_open
-    _ = patch_no_mqtt
-    global test
-    assert asyncio.get_running_loop()
-    Inverter.class_init()
-    test = TestType.RD_TEST_0_BYTES
-
-    assert Infos.stat['proxy']['Inverter_Cnt'] == 0
-    ModbusTcp(asyncio.get_event_loop(), tim_restart= 0)
-    await asyncio.sleep(0.01)
-    test = 0
-    for m in Message:
-        if (m.node_id == 'inv_2'):
-            assert Infos.stat['proxy']['Inverter_Cnt'] == 1
-            test += 1
-            if test == 1:
-                m.shutdown_started = False
-                m.reader.on_recv.set()
-                await asyncio.sleep(0.1)
-                assert m.state == State.closed
-                await asyncio.sleep(0.1)
-            else:
-                m.shutdown_started = True
-                m.reader.on_recv.set()
-                del m
-
-    assert 2 == test
-    await asyncio.sleep(0.01)
-    assert Infos.stat['proxy']['Inverter_Cnt'] == 0

app/tests/test_mqtt.py

@@ -1,254 +0,0 @@
-# test_with_pytest.py
-import pytest
-import asyncio
-import aiomqtt
-import logging
-
-from mock import patch, Mock
-from app.src.singleton import Singleton
-from app.src.mqtt import Mqtt
-from app.src.modbus import Modbus
-from app.src.gen3plus.solarman_v5 import SolarmanV5
-from app.src.config import Config
-
-
-pytest_plugins = ('pytest_asyncio',)
-
-@pytest.fixture(scope="module", autouse=True)
-def module_init():
-    Singleton._instances.clear()
-    yield
-
-@pytest.fixture(scope="module")
-def test_port():
-    return 1883
-
-@pytest.fixture(scope="module")
-def test_hostname():
-    # if getenv("GITHUB_ACTIONS") == "true":
-    #     return 'mqtt'
-    # else:
-        return 'test.mosquitto.org'
-
-@pytest.fixture
-def config_mqtt_conn(test_hostname, test_port):
-    Config.act_config = {'mqtt':{'host': test_hostname, 'port': test_port, 'user': '', 'passwd': ''},
-                         'ha':{'auto_conf_prefix': 'homeassistant','discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun'}
-                        }
-
-@pytest.fixture
-def config_no_conn(test_port):
-    Config.act_config = {'mqtt':{'host': "", 'port': test_port, 'user': '', 'passwd': ''},
-                         'ha':{'auto_conf_prefix': 'homeassistant','discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun'}
-                        }
-
-@pytest.fixture
-def spy_at_cmd():
-    conn = SolarmanV5(server_side=True, client_mode= False)
-    conn.node_id = 'inv_2/'
-    with patch.object(conn, 'send_at_cmd', wraps=conn.send_at_cmd) as wrapped_conn:
-        yield wrapped_conn
-    conn.close()
-
-@pytest.fixture
-def spy_modbus_cmd():
-    conn = SolarmanV5(server_side=True, client_mode= False)
-    conn.node_id = 'inv_1/'
-    with patch.object(conn, 'send_modbus_cmd', wraps=conn.send_modbus_cmd) as wrapped_conn:
-        yield wrapped_conn
-    conn.close()
-
-@pytest.fixture
-def spy_modbus_cmd_client():
-    conn = SolarmanV5(server_side=False, client_mode= False)
-    conn.node_id = 'inv_1/'
-    with patch.object(conn, 'send_modbus_cmd', wraps=conn.send_modbus_cmd) as wrapped_conn:
-        yield wrapped_conn
-    conn.close()
-
-def test_native_client(test_hostname, test_port):
-    """Sanity check: Make sure the paho-mqtt client can connect to the test
-    MQTT server.
-    """
-
-    import paho.mqtt.client as mqtt
-    import threading
-
-    c = mqtt.Client()
-    c.loop_start()
-    try:
-        # Just make sure the client connects successfully
-        on_connect = threading.Event()
-        c.on_connect = Mock(side_effect=lambda *_: on_connect.set())
-        c.connect_async(test_hostname, test_port)
-        assert on_connect.wait(5)
-    finally:
-        c.loop_stop()
-
-@pytest.mark.asyncio
-async def test_mqtt_no_config(config_no_conn):
-    _ = config_no_conn
-    assert asyncio.get_running_loop()
-
-    on_connect =  asyncio.Event()
-    async def cb():
-        on_connect.set()
-
-    try:
-        m = Mqtt(cb)
-        assert m.task
-        await asyncio.sleep(0)
-        assert not on_connect.is_set()
-        try:
-            await m.publish('homeassistant/status', 'online')
-            assert False
-        except Exception:
-            pass          
-    except TimeoutError:
-        assert False
-    finally:
-        await m.close()
-
-@pytest.mark.asyncio
-async def test_mqtt_connection(config_mqtt_conn):
-    _ = config_mqtt_conn
-    assert asyncio.get_running_loop()
-
-    on_connect =  asyncio.Event()
-    async def cb():
-        on_connect.set()
-
-    try:
-        m = Mqtt(cb)
-        assert m.task
-        assert await asyncio.wait_for(on_connect.wait(), 5)
-        # await asyncio.sleep(1)
-        assert 0 == m.ha_restarts
-        await m.publish('homeassistant/status', 'online')
-    except TimeoutError:
-        assert False
-    finally:
-        await m.close()
-        await m.publish('homeassistant/status', 'online')
-
-
-@pytest.mark.asyncio
-async def test_msg_dispatch(config_mqtt_conn, spy_modbus_cmd):
-    _ = config_mqtt_conn
-    spy = spy_modbus_cmd
-    try:
-        m = Mqtt(None)
-        msg = aiomqtt.Message(topic= 'tsun/inv_1/rated_load', payload= b'2', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        spy.assert_awaited_once_with(Modbus.WRITE_SINGLE_REG, 0x2008, 2, logging.INFO)
-        
-        spy.reset_mock()
-        msg = aiomqtt.Message(topic= 'tsun/inv_1/out_coeff', payload= b'100', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        spy.assert_awaited_once_with(Modbus.WRITE_SINGLE_REG, 0x202c, 1024, logging.INFO)
-        
-        spy.reset_mock()
-        msg = aiomqtt.Message(topic= 'tsun/inv_1/out_coeff', payload= b'50', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        spy.assert_awaited_once_with(Modbus.WRITE_SINGLE_REG, 0x202c, 512, logging.INFO)
-    
-        spy.reset_mock()
-        msg = aiomqtt.Message(topic= 'tsun/inv_1/modbus_read_regs', payload= b'0x3000, 10', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        spy.assert_awaited_once_with(Modbus.READ_REGS, 0x3000, 10, logging.INFO)
-
-        spy.reset_mock()
-        msg = aiomqtt.Message(topic= 'tsun/inv_1/modbus_read_inputs', payload= b'0x3000, 10', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        spy.assert_awaited_once_with(Modbus.READ_INPUTS, 0x3000, 10, logging.INFO)
-
-    finally:
-        await m.close()
-
-@pytest.mark.asyncio
-async def test_msg_dispatch_err(config_mqtt_conn, spy_modbus_cmd):
-    _ = config_mqtt_conn
-    spy = spy_modbus_cmd
-    try:
-        m = Mqtt(None)
-        # test out of range param
-        msg = aiomqtt.Message(topic= 'tsun/inv_1/out_coeff', payload= b'-1', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        spy.assert_not_called()
-
-        # test unknown node_id
-        spy.reset_mock()
-        msg = aiomqtt.Message(topic= 'tsun/inv_2/out_coeff', payload= b'2', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        spy.assert_not_called()
-
-        # test invalid fload param
-        spy.reset_mock()
-        msg = aiomqtt.Message(topic= 'tsun/inv_1/out_coeff', payload= b'2, 3', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        spy.assert_not_called()
-
-        spy.reset_mock()
-        msg = aiomqtt.Message(topic= 'tsun/inv_1/modbus_read_regs', payload= b'0x3000, 10, 7', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        spy.assert_not_called()
-    finally:
-        await m.close()
-
-@pytest.mark.asyncio
-async def test_msg_ignore_client_conn(config_mqtt_conn, spy_modbus_cmd_client):
-    '''don't call function if connnection is not in server mode'''
-    _ = config_mqtt_conn
-    spy = spy_modbus_cmd_client
-    try:
-        m = Mqtt(None)
-        msg = aiomqtt.Message(topic= 'tsun/inv_1/rated_load', payload= b'2', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        spy.assert_not_called()
-    finally:
-        await m.close()
-
-@pytest.mark.asyncio
-async def test_ha_reconnect(config_mqtt_conn):
-    _ = config_mqtt_conn
-    on_connect =  asyncio.Event()
-    async def cb():
-        on_connect.set()
-
-    try:
-        m = Mqtt(cb)
-        msg = aiomqtt.Message(topic= 'homeassistant/status', payload= b'offline', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        assert not on_connect.is_set()
-
-        msg = aiomqtt.Message(topic= 'homeassistant/status', payload= b'online', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        assert on_connect.is_set()
-
-    finally:
-        await m.close()
-
-@pytest.mark.asyncio
-async def test_ignore_unknown_func(config_mqtt_conn):
-    '''don't dispatch for unknwon function names'''
-    _ = config_mqtt_conn
-    try:
-        m = Mqtt(None)
-        msg = aiomqtt.Message(topic= 'tsun/inv_1/rated_load', payload= b'2', qos= 0, retain = False, mid= 0, properties= None)
-        for _ in m.each_inverter(msg, 'unkown_fnc'):
-            assert False
-    finally:
-        await m.close()
-
-@pytest.mark.asyncio
-async def test_at_cmd_dispatch(config_mqtt_conn, spy_at_cmd):
-    _ = config_mqtt_conn
-    spy = spy_at_cmd
-    try:
-        m = Mqtt(None)
-        msg = aiomqtt.Message(topic= 'tsun/inv_2/at_cmd', payload= b'AT+', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        spy.assert_awaited_once_with('AT+')
-        
-    finally:
-        await m.close()

app/tests/test_singleton.py

@@ -1,19 +0,0 @@
-# test_with_pytest.py
-import pytest
-from app.src.singleton import Singleton
-
-class Test(metaclass=Singleton):
-    def __init__(self):
-        pass  # is a dummy test class
-
-def test_singleton_metaclass():
-    Singleton._instances.clear()
-    a = Test()
-    assert 1 == len(Singleton._instances)
-    b = Test()
-    assert 1 == len(Singleton._instances)
-    assert a is  b
-    del a
-    assert 1 == len(Singleton._instances)
-    del b
-    assert 0 == len(Singleton._instances)

app/tests/timestamp_old.yuml

@@ -0,0 +1,26 @@
+// {type:sequence}
+// {generate:true}
+
+[Inverter]ContactInd>[Proxy] 
+[Proxy]-[note: store Contact Info in proxy{bg:cornsilk}]
+[Proxy]ContactRsp (Ok).>[Inverter]
+
+[Inverter]getTimeReq>[Proxy]
+[Proxy]ContactInd>[Cloud]
+[Cloud]ContactRsp (Ok).>[Proxy]
+[Proxy]getTimeReq>[Cloud]
+[Cloud]TimeRsp (time).>[Proxy]
+[Proxy]TimeRsp (time).>[Inverter]
+[Inverter]-[note: set clock in inverter{bg:cornsilk}]
+
+[Inverter]DataInd (ts:=time)>[Proxy] 
+[Proxy]DataRsp>[Inverter] 
+[Proxy]DataInd (ts)>>[Cloud] 
+[Proxy]DataInd>>[MQTT-Broker] 
+[Cloud]DataRsp>>[Proxy]
+
+[Inverter]DataInd (ts:=time)>[Proxy] 
+[Proxy]DataRsp>[Inverter] 
+[Proxy]DataInd (ts)>>[Cloud] 
+[Proxy]DataInd>>[MQTT-Broker] 
+[Cloud]DataRsp>>[Proxy] 

requirements-test.txt

@@ -1 +0,0 @@
--r ./app/requirements-test.txt

sonar-project.properties

@@ -1,26 +0,0 @@
-sonar.projectKey=s-allius_tsun-gen3-proxy
-sonar.organization=s-allius
-
-# This is the name and version displayed in the SonarCloud UI.
-sonar.projectName=tsun-gen3-proxy
-#sonar.projectVersion=1.0
-
-
-# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
-sonar.sources=app/src/
-
-# Encoding of the source code. Default is default system encoding
-#sonar.sourceEncoding=UTF-8
-
-sonar.python.version=3.12
-sonar.tests=system_tests/,app/tests/
-sonar.exclusions=**/.vscode/**/*
-# Name your criteria
-sonar.issue.ignore.multicriteria=e1,e2
-
-# python:S905  : Remove or refactor this statement; it has no side effects
-sonar.issue.ignore.multicriteria.e1.ruleKey=python:S905
-sonar.issue.ignore.multicriteria.e1.resourceKey=app/tests/*.py
-
-sonar.issue.ignore.multicriteria.e2.ruleKey=python:S905
-sonar.issue.ignore.multicriteria.e2.resourceKey=systems_tests/*.py

system_tests/test_tcp_socket.py

@@ -1,6 +1,8 @@
 # test_with_pytest.py and scapy
 #
 import pytest, socket, time
+#from scapy.all import *
+#from scapy.layers.inet import IP, TCP, TCP_client
 
 def get_sn() -> bytes:
     return b'R170000000000001'
@@ -13,31 +15,31 @@ def get_invalid_sn():
 
 
 @pytest.fixture
-def msg_contact_info(): # Contact Info message
+def MsgContactInfo(): # Contact Info message
     return b'\x00\x00\x00\x2c\x10'+get_sn()+b'\x91\x00\x08solarhub\x0fsolarhub\x40123456'
 
 @pytest.fixture
-def msg_contact_resp(): # Contact Response message
+def MsgContactResp(): # Contact Response message
     return b'\x00\x00\x00\x14\x10'+get_sn()+b'\x91\x00\x01'
 
 @pytest.fixture
-def msg_contact_info2(): # Contact Info message
+def MsgContactInfo2(): # Contact Info message
     return b'\x00\x00\x00\x2c\x10'+get_invalid_sn()+b'\x91\x00\x08solarhub\x0fsolarhub\x40123456'
 
 @pytest.fixture
-def msg_contact_resp2(): # Contact Response message
+def MsgContactResp2(): # Contact Response message
     return b'\x00\x00\x00\x14\x10'+get_invalid_sn()+b'\x91\x00\x01'
 
 @pytest.fixture
-def msg_timestamp_req(): # Get Time Request message
+def MsgTimeStampReq(): # Get Time Request message
     return b'\x00\x00\x00\x13\x10'+get_sn()+b'\x91\x22'           
 
 @pytest.fixture
-def msg_timestamp_resp(): # Get Time Resonse message
+def MsgTimeStampResp(): # Get Time Resonse message
     return b'\x00\x00\x00\x1b\x10'+get_sn()+b'\x99\x22\x00\x00\x01\x89\xc6\x63\x4d\x80'
 
 @pytest.fixture
-def msg_controller_ind(): # Data indication from the controller
+def MsgContollerInd(): # Data indication from the controller
     msg  =  b'\x00\x00\x01\x2f\x10'+ get_sn() + b'\x91\x71\x0e\x10\x00\x00\x10'+get_sn()
     msg +=  b'\x01\x00\x00\x01\x89\xc6\x63\x55\x50'
     msg +=  b'\x00\x00\x00\x15\x00\x09\x2b\xa8\x54\x10\x52\x53\x57\x5f\x34\x30\x30\x5f\x56\x31\x2e\x30\x30\x2e\x30\x36\x00\x09\x27\xc0\x54\x06\x52\x61\x79\x6d\x6f'
@@ -49,7 +51,7 @@ def msg_controller_ind(): # Data indication from the controller
     return msg
 
 @pytest.fixture
-def msg_inv_data(): # Data indication from the controller
+def MsgInvData(): # Data indication from the controller
     msg  =  b'\x00\x00\x00\x8b\x10'+ get_sn() + b'\x91\x04\x01\x90\x00\x01\x10'+get_inv_no()
     msg +=  b'\x01\x00\x00\x01\x89\xc6\x63\x61\x08'
     msg +=  b'\x00\x00\x00\x06\x00\x00\x00\x0a\x54\x08\x4d\x69\x63\x72\x6f\x69\x6e\x76\x00\x00\x00\x14\x54\x04\x54\x53\x55\x4e\x00\x00\x00\x1E\x54\x07\x56\x35\x2e\x30\x2e\x31\x31\x00\x00\x00\x28'
@@ -57,7 +59,7 @@ def msg_inv_data(): # Data indication from the controller
     return msg
 
 @pytest.fixture
-def msg_inverter_ind(): # Data indication from the inverter
+def MsgInverterInd(): # Data indication from the inverter
     msg  = b'\x00\x00\x05\x02\x10'+ get_sn() + b'\x91\x04\x01\x90\x00\x01\x10'+get_inv_no()
     msg +=  b'\x01\x00\x00\x01\x89\xc6\x63\x61\x08'
     msg +=  b'\x00\x00\x00\xa3\x00\x00\x00\x64\x53\x00\x01\x00\x00\x00\xc8\x53\x00\x02\x00\x00\x01\x2c\x53\x00\x00\x00\x00\x01\x90\x49\x00\x00\x00\x00\x00\x00\x01\x91\x53\x00\x00'
@@ -94,7 +96,7 @@ def msg_inverter_ind(): # Data indication from the inverter
     return msg
 
 @pytest.fixture
-def msg_ota_update_req(): # Over the air update request from talent cloud
+def MsgOtaUpdateReq(): # Over the air update request from talent cloud
     msg  = b'\x00\x00\x01\x16\x10'+ get_sn() + b'\x70\x13\x01\x02\x76\x35'
     msg += b'\x70\x68\x74\x74\x70'
     msg += b'\x3a\x2f\x2f\x77\x77\x77\x2e\x74\x61\x6c\x65\x6e\x74\x2d\x6d\x6f'
@@ -117,8 +119,10 @@ def msg_ota_update_req(): # Over the air update request from talent cloud
 
 
 @pytest.fixture(scope="session")
-def client_connection():
+def ClientConnection():
+    #host = '172.16.30.7'
     host = 'logger.talent-monitoring.com'
+    #host = '127.0.0.1'
     port = 5005
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         s.connect((host, port))
@@ -127,8 +131,10 @@ def client_connection():
         time.sleep(2.5)
         s.close()
 
-def tempclient_connection():
+def tempClientConnection():
+    #host = '172.16.30.7'
     host = 'logger.talent-monitoring.com'
+    #host = '127.0.0.1'
     port = 5005
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         s.connect((host, port))
@@ -138,99 +144,100 @@ def tempclient_connection():
 
 def test_open_close():
     try:
-        for _ in tempclient_connection():
-            pass  # test side effect of generator 
-    except Exception:
+        for s in tempClientConnection():
+            pass
+    except:
         assert False
+    assert True
 
-def test_send_contact_info1(client_connection, msg_contact_info, msg_contact_resp):
-    s = client_connection
+def test_send_contact_info1(ClientConnection, MsgContactInfo, MsgContactResp):
+    s = ClientConnection
     try:
-        s.sendall(msg_contact_info)
+        s.sendall(MsgContactInfo)
         data = s.recv(1024)
     except TimeoutError:
         pass
-    assert data == msg_contact_resp
+    assert data == MsgContactResp
 
 
-def test_send_contact_info2(client_connection, msg_contact_info2, msg_contact_info, msg_contact_resp):
-    s = client_connection  
+def test_send_contact_info2(ClientConnection, MsgContactInfo2, MsgContactInfo, MsgContactResp):
+    s = ClientConnection  
     try:
-        s.sendall(msg_contact_info2)
+        s.sendall(MsgContactInfo2)
         data = s.recv(1024)
     except TimeoutError:
-        pass
+        assert True
     else: 
         assert False
 
     try:
-        s.sendall(msg_contact_info)
+        s.sendall(MsgContactInfo)
         data = s.recv(1024)
     except TimeoutError:
         pass
-    assert data == msg_contact_resp
+    assert data == MsgContactResp
 
-def test_send_contact_info3(client_connection, msg_contact_info, msg_contact_resp, msg_timestamp_req):
-    s = client_connection
+def test_send_contact_info3(ClientConnection, MsgContactInfo, MsgContactResp, MsgTimeStampReq):
+    s = ClientConnection
     try:
-        s.sendall(msg_contact_info)
+        s.sendall(MsgContactInfo)
         data = s.recv(1024)
     except TimeoutError:
         pass
-    assert data == msg_contact_resp
+    assert data == MsgContactResp
     try:
-        s.sendall(msg_timestamp_req)
+        s.sendall(MsgTimeStampReq)
         data = s.recv(1024)
     except TimeoutError:
         pass
  
 
-def test_send_contact_resp(client_connection, msg_contact_resp):
-    s = client_connection  
+def test_send_contact_resp(ClientConnection, MsgContactResp):
+    s = ClientConnection  
     try:
-        s.sendall(msg_contact_resp)
+        s.sendall(MsgContactResp)
         data = s.recv(1024)
     except TimeoutError:
-        pass
+        assert True
     else:
         assert data == b''
 
-def test_send_ctrl_data(client_connection, msg_timestamp_req, msg_timestamp_resp, msg_controller_ind):
-    s = client_connection  
+def test_send_ctrl_data(ClientConnection, MsgTimeStampReq, MsgTimeStampResp, MsgContollerInd):
+    s = ClientConnection  
     try:
-        s.sendall(msg_timestamp_req)
-        _ = s.recv(1024)
+        s.sendall(MsgTimeStampReq)
+        data = s.recv(1024)
     except TimeoutError:
         pass
   #  time.sleep(2.5)
-  #  assert data == msg_timestamp_resp
+  #  assert data == MsgTimeStampResp
     try:
-        s.sendall(msg_controller_ind)
-        _ = s.recv(1024)
+        s.sendall(MsgContollerInd)
+        data = s.recv(1024)
     except TimeoutError:
         pass
 
-def test_send_inv_data(client_connection, msg_timestamp_req, msg_timestamp_resp, msg_inv_data, msg_inverter_ind):
-    s = client_connection  
+def test_send_inv_data(ClientConnection, MsgTimeStampReq, MsgTimeStampResp, MsgInvData, MsgInverterInd):
+    s = ClientConnection  
     try:
-        s.sendall(msg_timestamp_req)
-        _ = s.recv(1024)
+        s.sendall(MsgTimeStampReq)
+        data = s.recv(1024)
     except TimeoutError:
         pass
   #  time.sleep(32.5)
-  #  assert data == msg_timestamp_resp
+  #  assert data == MsgTimeStampResp
     try:
-        s.sendall(msg_inv_data)
-        _ = s.recv(1024)
-        s.sendall(msg_inverter_ind)
-        _ = s.recv(1024)
+        s.sendall(MsgInvData)
+        data = s.recv(1024)
+        s.sendall(MsgInverterInd)
+        data = s.recv(1024)
     except TimeoutError:
         pass
 
-def test_ota_req(client_connection, msg_ota_update_req):
-    s = client_connection  
+def test_ota_req(ClientConnection, MsgOtaUpdateReq):
+    s = ClientConnection  
     try:
-        s.sendall(msg_ota_update_req)
-        _ = s.recv(1024)
+        s.sendall(MsgOtaUpdateReq)
+        data = s.recv(1024)
     except TimeoutError:
         pass

system_tests/test_tcp_socket_v2.py

@@ -3,6 +3,9 @@
 import pytest, socket, time, os
 from dotenv import load_dotenv
 
+#from scapy.all import *
+#from scapy.layers.inet import IP, TCP, TCP_client
+
 load_dotenv()
 
 SOLARMAN_SNR = os.getenv('SOLARMAN_SNR', '00000080')
@@ -108,7 +111,10 @@ def MsgInvalidInfo(): # Contact Info message wrong start byte
 
 @pytest.fixture(scope="session")
 def ClientConnection():
+    #host = '172.16.30.7'
     host = 'logger.talent-monitoring.com'
+    #host = 'iot.talent-monitoring.com'
+    #host = '127.0.0.1'
     port = 10000
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         s.connect((host, port))
@@ -125,7 +131,10 @@ def checkResponse(data, Msg):
 
 
 def tempClientConnection():
+    #host = '172.16.30.7'
     host = 'logger.talent-monitoring.com'
+    #host = 'iot.talent-monitoring.com'
+    #host = '127.0.0.1'
     port = 10000
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         s.connect((host, port))
@@ -136,10 +145,11 @@ def tempClientConnection():
 
 def test_open_close():
     try:
-        for _ in tempClientConnection():
-            pass  # test generator tempClientConnection()
+        for s in tempClientConnection():
+            pass
     except:
         assert False
+    assert True
 
 def test_conn_msg(ClientConnection,MsgContactInfo, MsgContactResp):
     s = ClientConnection