Merge branch 'main' of https://github.com/s-allius/tsun-gen3-proxy into dev-0.10

Version 0.10.0 no longer displays the version string (#154 )
Fixes #153
2024-08-10 14:15:19 +02:00 · 2024-08-10 14:01:09 +02:00 · 2024-08-09 23:08:12 +02:00 · 2024-08-09 23:01:16 +02:00 · 2024-08-09 23:01:02 +02:00 · 2024-08-09 22:59:47 +02:00
64 changed files with 2603 additions and 7869 deletions
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -24,18 +24,21 @@ permissions:
  contents: read
  pull-requests: read # allows SonarCloud to decorate PRs with analysis results

-env:
-  TZ: "Europe/Berlin"
-
 jobs:
  build:

    runs-on: ubuntu-latest

    steps:
+    - name: Set timezone
+      uses: szenius/set-timezone@v2.0
+      with:
+        timezoneLinux: "Europe/Berlin"
+        timezoneMacos: "Europe/Berlin"
+        timezoneWindows: "Europe/Berlin"
    - uses: actions/checkout@v4
      with:
-        fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+        fetch-depth: 0           # Fetch all history for all tags and branches
    - name: Set up Python 3.12
      uses: actions/setup-python@v5
      with:
@@ -43,28 +46,29 @@ 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: |
+        pip install pytest pytest-cov
+        #pytest app --doctest-modules --junitxml=junit/test-results.xml --cov=com --cov-report=xml --cov-report=html
        python -m pytest app --cov=app/src --cov-report=xml
-        coverage report
    - name: Analyze with SonarCloud
-      uses: SonarSource/sonarcloud-github-action@v3.1.0
+      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.organization=s-allius
+          -Dsonar.python.version=3.12
          -Dsonar.python.coverage.reportPaths=coverage.xml
-          -Dsonar.python.flake8.reportPaths=output_flake.txt
-          # -Dsonar.docker.hadolint.reportPaths=
-  
+          -Dsonar.tests=system_tests,app/tests
+          -Dsonar.source=app/src
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -15,8 +15,5 @@
    "sonarlint.connectedMode.project": {
        "connectionId": "s-allius",
        "projectKey": "s-allius_tsun-gen3-proxy"
-    },
-    "files.exclude": {
-        "**/*.pyi": true
    }
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,19 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [unreleased]

- add SolarmanV5 messages builder
- report inverter alarms and faults per MQTT [#7](https://github.com/s-allius/tsun-gen3-proxy/issues/7)
-
-## [0.11.0] - 2024-10-13
-
- fix healthcheck on infrastructure with IPv6 support [#196](https://github.com/s-allius/tsun-gen3-proxy/issues/196)
- refactoring: cleaner architecture, increase test coverage
- Parse more values in Server Mode [#186](https://github.com/s-allius/tsun-gen3-proxy/issues/186)
- GEN3: add support for new messages of version 3 firmwares [#182](https://github.com/s-allius/tsun-gen3-proxy/issues/182)
- 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)
--- a/README.md
+++ b/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.3.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.2.0-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
@@ -121,63 +115,26 @@ The proxy can be configured via the file 'config.toml'. When the proxy is starte
 The configration uses the TOML format, which aims to be easy to read due to obvious semantics.
 You find more details here: <https://toml.io/en/v1.0.0>

-<details>
-<summary>Here is an example of a <b>config.toml</b> file</summary>
-
 ```toml
-##########################################################################################
-###
-###          T S U N  -  G E N 3  -   P R O X Y
-### 
-###                from   Stefan Allius
-###
-##########################################################################################
-###
-###   The readme will give you an overview of the project:
-###   https://s-allius.github.io/tsun-gen3-proxy/
-###
-###   The proxy supports different operation modes. Select the proper mode 
-###   which depends on your inverter type and you inverter firmware. 
-###   Please read: 
-###   https://github.com/s-allius/tsun-gen3-proxy/wiki/Operation-Modes-Overview
-###
-###   Here you will find a description of all configuration options:
-###   https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-details
-###
-###   The configration uses the TOML format, which aims to be easy to read due to 
-###   obvious semantics. You find more details here: https://toml.io/en/v1.0.0
-###
-##########################################################################################
+# configuration for tsun cloud for 'GEN3' inverters
+tsun.enabled = true   # false: disables connecting to the tsun cloud, and avoids updates
+tsun.host    = 'logger.talent-monitoring.com'
+tsun.port    = 5005
+
+# configuration for solarman cloud  for 'GEN3 PLUS' inverters
+solarman.enabled = true   # false: disables connecting to the tsun cloud, and avoids updates
+solarman.host    = 'iot.talent-monitoring.com'
+solarman.port    = 10000


-##########################################################################################
-##
-## MQTT broker configuration
-##
-## In this block, you must configure the connection to your MQTT broker and specify the
-## required credentials. As the proxy does not currently support an encrypted connection
-## to the MQTT broker, it is strongly recommended that you do not use a public broker.
-##
-## https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-details#mqtt-broker-account
-##
-
+# mqtt broker configuration
 mqtt.host    = 'mqtt'   # URL or IP address of the mqtt broker
 mqtt.port    = 1883
 mqtt.user    = ''
 mqtt.passwd  = ''


-##########################################################################################
-##
-## HOME ASSISTANT
-##
-## The proxy supports the MQTT autoconfiguration of Home Assistant (HA). The default 
-## values match the HA default configuration. If you need to change these or want to use
-## a different MQTT client, you can adjust the prefixes of the MQTT topics below.
-##
-## https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-details#home-assistant
-##
-
+# home-assistant
 ha.auto_conf_prefix = 'homeassistant'       # MQTT prefix for subscribing for homeassistant status updates
 ha.discovery_prefix = 'homeassistant'       # MQTT prefix for discovery topic 
 ha.entity_prefix    = 'tsun'                # MQTT topic prefix for publishing inverter values
@@ -185,115 +142,37 @@ ha.proxy_node_id    = 'proxy'               # MQTT node id, for the proxy_node_i
 ha.proxy_unique_id  = 'P170000000000001'    # MQTT unique id, to identify a proxy instance


-##########################################################################################
-##
-## GEN3 Proxy Mode Configuration
-##
-## In this block, you can configure an optional connection to the TSUN cloud for GEN3
-## inverters. This connection is only required if you want send data to the TSUN cloud
-## to use the TSUN APPs or receive firmware updates.  
-##
-## https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-details#tsun-cloud-for-gen3-inverter-only
-##
+# microinverters
+inverters.allow_all = false   # True: allow inverters, even if we have no inverter mapping

-tsun.enabled = true   # false: disables connecting to the tsun cloud, and avoids updates
-tsun.host    = 'logger.talent-monitoring.com'
-tsun.port    = 5005
-
-
-##########################################################################################
-##
-## GEN3PLUS Proxy Mode Configuration
-##
-## In this block, you can configure an optional connection to the TSUN cloud for GEN3PLUS
-## inverters. This connection is only required if you want send data to the TSUN cloud
-## to use the TSUN APPs or receive firmware updates.  
-##
-## https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-details#solarman-cloud-for-gen3plus-inverter-only
-##
-solarman.enabled = true   # false: disables connecting to the tsun cloud, and avoids updates
-solarman.host    = 'iot.talent-monitoring.com'
-solarman.port    = 10000
-
-
-##########################################################################################
-###
-### Inverter Definitions
-###
-### The proxy supports the simultaneous operation of several inverters, even of different
-### types. A configuration block must be defined for each inverter, in which all necessary
-### parameters must be specified. These depend on the operation mode used and also differ
-### slightly depending on the inverter type.
-###
-### In addition, the PV modules can be defined at the individual inputs for documentation
-### purposes, whereby these are displayed in Home Assistant.
-###
-### The proxy only accepts connections from known inverters. This can be switched off for
-### test purposes and unknown serial numbers are also accepted. 
-###
-
-inverters.allow_all = false   # only allow known inverters
-
-
-##########################################################################################
-##
-## For each GEN3 inverter, the serial number of the inverter must be mapped to an MQTT
-## definition. To do this, the corresponding configuration block is started with
-## `[Inverter.“<16-digit serial number>”]` so that all subsequent parameters are assigned
-## to this inverter. Further inverter-specific parameters (e.g. polling mode) can be set
-## in the configuration block
-##
-## The serial numbers of all GEN3 inverters start with `R17`!
-##
+# inverter mapping, maps a `serial_no* to a `node_id` and defines an optional `suggested_area` for `home-assistant`
+#
+# for each inverter add a block starting with [inverters."<16-digit serial numbeer>"]

 [inverters."R17xxxxxxxxxxxx1"]
-node_id = 'inv_1'            # MQTT replacement for inverters serial number  
-suggested_area = 'roof'      # suggested installation place for home-assistant
-modbus_polling = false       # Disable optional MODBUS polling for GEN3 inverter
+node_id = 'inv1'              # Optional, MQTT replacement for inverters serial number  
+suggested_area = 'roof'       # Optional, suggested installation area for home-assistant
 pv1 = {type = 'RSM40-8-395M', manufacturer = 'Risen'}   # Optional, PV module descr
 pv2 = {type = 'RSM40-8-395M', manufacturer = 'Risen'}   # Optional, PV module descr

-
-##########################################################################################
-##
-## For each GEN3PLUS inverter, the serial number of the inverter must be mapped to an MQTT
-## definition. To do this, the corresponding configuration block is started with
-## `[Inverter.“<16-digit serial number>”]` so that all subsequent parameters are assigned
-## to this inverter. Further inverter-specific parameters (e.g. polling mode, client mode)
-## can be set in the configuration block
-## 
-## The serial numbers of all GEN3PLUS inverters start with `Y17` or Y47! Each GEN3PLUS
-## inverter is supplied with a “Monitoring SN:”. This can be found on a sticker enclosed
-## with the inverter.
-##
+[inverters."R17xxxxxxxxxxxx2"]
+node_id = 'inv2'              # Optional, MQTT replacement for inverters serial number  
+suggested_area = 'balcony'    # Optional, suggested installation area for home-assistant
+pv1 = {type = 'RSM40-8-405M', manufacturer = 'Risen'}   # Optional, PV module descr
+pv2 = {type = 'RSM40-8-405M', manufacturer = 'Risen'}   # Optional, PV module descr

 [inverters."Y17xxxxxxxxxxxx1"]  # This block is also for inverters with a Y47 serial no
-monitor_sn = 2000000000      # The GEN3PLUS "Monitoring SN:"
-node_id = 'inv_2'            # MQTT replacement for inverters serial number  
-suggested_area = 'garage'    # suggested installation place for home-assistant
-modbus_polling = true        # Enable optional MODBUS polling
-
+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
 # 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
 pv4 = {type = 'RSM40-8-410M', manufacturer = 'Risen'}   # Optional, PV module descr

-
-##########################################################################################
-###
-### If the proxy mode is configured, commands from TSUN can be sent to the inverter via
-### this connection or parameters (e.g. network credentials) can be queried. Filters can
-### then be configured for the AT+ commands from the TSUN Cloud so that only certain
-### accesses are permitted.
-###
-### An overview of all known AT+ commands can be found here:
-### https://github.com/s-allius/tsun-gen3-proxy/wiki/AT--commands
-###
-
 [gen3plus.at_acl]
 tsun.allow = ['AT+Z', 'AT+UPURL', 'AT+SUPDATE']   # allow this for TSUN access
 tsun.block = []                                   
@@ -302,8 +181,6 @@ mqtt.block = []

 ```

-</details>
-
 ## Inverter Configuration

 GEN3PLUS inverters offer a web interface that can be used to configure the inverter. This is very practical for sending the data directly to the proxy. On the one hand, the inverter broadcasts its own SSID on 2.4GHz. This can be recognized because it is broadcast with `AP_<Montoring SN>`. You will find the `Monitor SN` and the password for the WLAN connection on a small sticker enclosed with the inverter.
@@ -314,12 +191,7 @@ 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 the IP port is set to 10443 in the inverter configuration, you probably have a firmware with SSL support. In this case, you must use the client-mode configuration.

 If access to the web interface does not work, it can also be redirected via DNS redirection, as is necessary for the GEN3 inverters.

--- a/app/Dockerfile
+++ b/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"
--- a/app/build.sh
+++ b/app/build.sh
@@ -17,7 +17,6 @@ VERSION="${VERSION:1}"
 arr=(${VERSION//./ })
 MAJOR=${arr[0]}
 IMAGE=tsun-gen3-proxy
-
 GREEN='\033[0;32m'
 BLUE='\033[0;34m'
 NC='\033[0m'
@@ -27,22 +26,44 @@ IMAGE=docker.io/sallius/${IMAGE}
 VERSION=${VERSION}+$1
 elif [[ $1 == rc ]] || [[ $1 == rel ]] || [[ $1 == preview ]] ;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]'
 exit 1
 fi

-export IMAGE
-export VERSION
-export BUILD_DATE
-export BRANCH
-export MAJOR
+if [[ $1 == debug ]] ;then
+BUILD_ENV="dev"
+else
+BUILD_ENV="production"
+fi
+
+BUILD_CMD="buildx build --push --build-arg VERSION=${VERSION} --build-arg environment=${BUILD_ENV} --attest type=provenance,mode=max --attest type=sbom,generator=docker/scout-sbom-indexer:latest"
+ARCH="--platform linux/amd64,linux/arm64,linux/arm/v7"
+LABELS="--label org.opencontainers.image.created=${BUILD_DATE} --label org.opencontainers.image.version=${VERSION} --label org.opencontainers.image.revision=${BRANCH}"

 echo version: $VERSION  build-date: $BUILD_DATE   image: $IMAGE
-docker buildx bake -f app/docker-bake.hcl $1
+if [[ $1 == debug ]];then
+docker ${BUILD_CMD} ${ARCH} ${LABELS} --build-arg "LOG_LVL=DEBUG" -t ${IMAGE}:debug  app
+
+elif [[ $1 == dev ]];then
+docker ${BUILD_CMD} ${ARCH} ${LABELS} -t ${IMAGE}:dev app
+
+elif [[ $1 == preview ]];then
+echo 'login to ghcr.io'    
+echo $GHCR_TOKEN | docker login ghcr.io -u s-allius --password-stdin
+docker ${BUILD_CMD} ${ARCH} ${LABELS} -t ${IMAGE}:preview -t ${IMAGE}:${VERSION} app
+
+elif [[ $1 == rc ]];then
+echo 'login to ghcr.io'    
+echo $GHCR_TOKEN | docker login ghcr.io -u s-allius --password-stdin
+docker ${BUILD_CMD} ${ARCH} ${LABELS} -t ${IMAGE}:rc -t ${IMAGE}:${VERSION} app
+
+elif [[ $1 == rel ]];then
+echo 'login to ghcr.io'    
+echo $GHCR_TOKEN | docker login ghcr.io -u s-allius --password-stdin
+docker ${BUILD_CMD} ${ARCH} ${LABELS} --no-cache -t ${IMAGE}:latest -t ${IMAGE}:${MAJOR} -t ${IMAGE}:${VERSION} app
+fi

 echo -e "${BLUE} => checking docker-compose.yaml file${NC}"
 docker-compose config -q
--- a/app/config/default_config.toml
+++ b/app/config/default_config.toml
@@ -1,177 +1,64 @@
-##########################################################################################
-###
-###          T S U N  -  G E N 3  -   P R O X Y
-### 
-###                from   Stefan Allius
-###
-##########################################################################################
-###
-###   The readme will give you an overview of the project:
-###   https://s-allius.github.io/tsun-gen3-proxy/
-###
-###   The proxy supports different operation modes. Select the proper mode 
-###   which depends on your inverter type and you inverter firmware. 
-###   Please read: 
-###   https://github.com/s-allius/tsun-gen3-proxy/wiki/Operation-Modes-Overview
-###
-###   Here you will find a description of all configuration options:
-###   https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-details
-###
-###   The configration uses the TOML format, which aims to be easy to read due to 
-###   obvious semantics. You find more details here: https://toml.io/en/v1.0.0
-###
-##########################################################################################
+# configuration to reach tsun cloud
+tsun.enabled = true   # false: disables connecting to the tsun cloud, and avoids updates
+tsun.host    = 'logger.talent-monitoring.com'
+tsun.port    = 5005

+# configuration to reach the new tsun cloud for G3 Plus inverters
+solarman.enabled = true   # false: disables connecting to the tsun cloud, and avoids updates
+solarman.host    = 'iot.talent-monitoring.com'
+solarman.port    = 10000

-##########################################################################################
-##
-## MQTT broker configuration
-##
-## In this block, you must configure the connection to your MQTT broker and specify the
-## required credentials. As the proxy does not currently support an encrypted connection
-## to the MQTT broker, it is strongly recommended that you do not use a public broker.
-##
-## https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-details#mqtt-broker-account
-##
-
+# mqtt broker configuration
 mqtt.host    = 'mqtt'   # URL or IP address of the mqtt broker
 mqtt.port    = 1883
 mqtt.user    = ''
 mqtt.passwd  = ''


-##########################################################################################
-##
-## HOME ASSISTANT
-##
-## The proxy supports the MQTT autoconfiguration of Home Assistant (HA). The default 
-## values match the HA default configuration. If you need to change these or want to use
-## a different MQTT client, you can adjust the prefixes of the MQTT topics below.
-##
-## https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-details#home-assistant
-##
-
+# home-assistant
 ha.auto_conf_prefix = 'homeassistant'       # MQTT prefix for subscribing for homeassistant status updates
 ha.discovery_prefix = 'homeassistant'       # MQTT prefix for discovery topic 
 ha.entity_prefix    = 'tsun'                # MQTT topic prefix for publishing inverter values
 ha.proxy_node_id    = 'proxy'               # MQTT node id, for the proxy_node_id
 ha.proxy_unique_id  = 'P170000000000001'    # MQTT unique id, to identify a proxy instance

+# microinverters
+inverters.allow_all = true   # allow inverters, even if we have no inverter mapping

-##########################################################################################
-##
-## GEN3 Proxy Mode Configuration
-##
-## In this block, you can configure an optional connection to the TSUN cloud for GEN3
-## inverters. This connection is only required if you want send data to the TSUN cloud
-## to use the TSUN APPs or receive firmware updates.  
-##
-## https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-details#tsun-cloud-for-gen3-inverter-only
-##
-
-tsun.enabled = true   # false: disables connecting to the tsun cloud, and avoids updates
-tsun.host    = 'logger.talent-monitoring.com'
-tsun.port    = 5005
-
-
-##########################################################################################
-##
-## GEN3PLUS Proxy Mode Configuration
-##
-## In this block, you can configure an optional connection to the TSUN cloud for GEN3PLUS
-## inverters. This connection is only required if you want send data to the TSUN cloud
-## to use the TSUN APPs or receive firmware updates.  
-##
-## https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-details#solarman-cloud-for-gen3plus-inverter-only
-##
-
-solarman.enabled = true   # false: disables connecting to the tsun cloud, and avoids updates
-solarman.host    = 'iot.talent-monitoring.com'
-solarman.port    = 10000
-
-
-##########################################################################################
-###
-### Inverter Definitions
-###
-### The proxy supports the simultaneous operation of several inverters, even of different
-### types. A configuration block must be defined for each inverter, in which all necessary
-### parameters must be specified. These depend on the operation mode used and also differ
-### slightly depending on the inverter type.
-###
-### In addition, the PV modules can be defined at the individual inputs for documentation
-### purposes, whereby these are displayed in Home Assistant.
-###
-### The proxy only accepts connections from known inverters. This can be switched off for
-### test purposes and unknown serial numbers are also accepted. 
-###
-
-inverters.allow_all = false   # only allow known inverters
-
-
-##########################################################################################
-##
-## For each GEN3 inverter, the serial number of the inverter must be mapped to an MQTT
-## definition. To do this, the corresponding configuration block is started with
-## `[Inverter.“<16-digit serial number>”]` so that all subsequent parameters are assigned
-## to this inverter. Further inverter-specific parameters (e.g. polling mode) can be set
-## in the configuration block
-##
-## The serial numbers of all GEN3 inverters start with `R17`!
-##
-
+# inverter mapping, maps a `serial_no* to a `mqtt_id` and defines an optional `suggested_place` for `home-assistant`
+#
+# for each inverter add a block starting with [inverters."<16-digit serial numbeer>"]
 [inverters."R170000000000001"]
-node_id = ''                 # MQTT replacement for inverters serial number  
-suggested_area = ''          # 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
+#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

-
-##########################################################################################
-##
-## For each GEN3PLUS inverter, the serial number of the inverter must be mapped to an MQTT
-## definition. To do this, the corresponding configuration block is started with
-## `[Inverter.“<16-digit serial number>”]` so that all subsequent parameters are assigned
-## to this inverter. Further inverter-specific parameters (e.g. polling mode, client mode)
-## can be set in the configuration block
-## 
-## The serial numbers of all GEN3PLUS inverters start with `Y17` or Y47! Each GEN3PLUS
-## inverter is supplied with a “Monitoring SN:”. This can be found on a sticker enclosed
-## with the inverter.
-##
+#[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

 [inverters."Y170000000000001"]
-monitor_sn = 2000000000      # The GEN3PLUS "Monitoring SN:"
-node_id = ''                 # MQTT replacement for inverters serial number  
-suggested_area = ''          # suggested installation place for home-assistant
-modbus_polling = true        # Enable 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
-pv4 = {type = 'RSM40-8-410M', manufacturer = 'Risen'}   # Optional, PV module descr
-
-
-##########################################################################################
-###
-### If the proxy mode is configured, commands from TSUN can be sent to the inverter via
-### this connection or parameters (e.g. network credentials) can be queried. Filters can
-### then be configured for the AT+ commands from the TSUN Cloud so that only certain
-### accesses are permitted.
-###
-### An overview of all known AT+ commands can be found here:
-### https://github.com/s-allius/tsun-gen3-proxy/wiki/AT--commands
-###
+#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
+#pv4 = {type = 'RSM40-8-410M', manufacturer = 'Risen'}   # Optional, PV module descr

 [gen3plus.at_acl]
-# filter for received commands from the internet
 tsun.allow = ['AT+Z', 'AT+UPURL', 'AT+SUPDATE']
 tsun.block = []
-# filter for received commands from the MQTT broker
 mqtt.allow = ['AT+']
 mqtt.block = []
--- a/app/docker-bake.hcl
+++ b/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
-}
--- a/app/entrypoint.sh
+++ b/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"
--- a/app/proxy.svg
+++ b/app/proxy.svg
@@ -4,257 +4,408 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
 -->
 <!-- Title: G Pages: 1 -->
-<svg width="626pt" height="966pt"
- viewBox="0.00 0.00 625.50 966.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 962)">
+<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)">
 <title>G</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-962 621.5,-962 621.5,4 -4,4"/>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1356 715.5,-1356 715.5,4 -4,4"/>
 <!-- A0 -->
 <g id="node1" class="node">
 <title>A0</title>
-<polygon fill="#fff8dc" stroke="#000000" points="191.6964,-934 83.3036,-934 83.3036,-898 197.6964,-898 197.6964,-928 191.6964,-934"/>
-<polyline fill="none" stroke="#000000" points="191.6964,-934 191.6964,-928 "/>
-<polyline fill="none" stroke="#000000" points="197.6964,-928 191.6964,-928 "/>
-<text text-anchor="middle" x="140.5" y="-919" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">You can stick notes</text>
-<text text-anchor="middle" x="140.5" y="-907" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">on diagrams too!</text>
+<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>
 </g>
 <!-- A1 -->
 <g id="node2" class="node">
 <title>A1</title>
-<polygon fill="none" stroke="#000000" points="215.5,-926 215.5,-958 331.5,-958 331.5,-926 215.5,-926"/>
-<text text-anchor="start" x="225.149" y="-939" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;&lt;AbstractIterMeta&gt;&gt;</text>
-<polygon fill="none" stroke="#000000" points="215.5,-906 215.5,-926 331.5,-926 331.5,-906 215.5,-906"/>
-<polygon fill="none" stroke="#000000" points="215.5,-874 215.5,-906 331.5,-906 331.5,-874 215.5,-874"/>
-<text text-anchor="start" x="252.11" y="-887" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__iter__()</text>
-</g>
-<!-- A4 -->
-<g id="node5" class="node">
-<title>A4</title>
-<polygon fill="none" stroke="#000000" points="178.5,-726 178.5,-758 369.5,-758 369.5,-726 178.5,-726"/>
-<text text-anchor="start" x="240.0965" y="-739" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;&lt;InverterIfc&gt;&gt;</text>
-<polygon fill="none" stroke="#000000" points="178.5,-706 178.5,-726 369.5,-726 369.5,-706 178.5,-706"/>
-<polygon fill="none" stroke="#000000" points="178.5,-650 178.5,-706 369.5,-706 369.5,-650 178.5,-650"/>
-<text text-anchor="start" x="240.522" y="-687" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">healthy()&#45;&gt;bool</text>
-<text text-anchor="start" x="188.2835" y="-675" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;disc(shutdown_started=False)</text>
-<text text-anchor="start" x="219.544" y="-663" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;create_remote()</text>
-</g>
-<!-- A1&#45;&gt;A4 -->
-<g id="edge1" class="edge">
-<title>A1&#45;&gt;A4</title>
-<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M273.5,-863.7744C273.5,-831.6663 273.5,-790.6041 273.5,-758.1476"/>
-<polygon fill="none" stroke="#000000" points="270.0001,-863.8621 273.5,-873.8622 277.0001,-863.8622 270.0001,-863.8621"/>
+<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>
 </g>
 <!-- A2 -->
 <g id="node3" class="node">
 <title>A2</title>
-<polygon fill="none" stroke="#000000" points="441.5,-454 441.5,-498 563.5,-498 563.5,-454 441.5,-454"/>
-<text text-anchor="start" x="492.777" y="-479" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Mqtt</text>
-<text text-anchor="start" x="469.9815" y="-467" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;&lt;Singleton&gt;&gt;</text>
-<polygon fill="none" stroke="#000000" points="441.5,-398 441.5,-454 563.5,-454 563.5,-398 441.5,-398"/>
-<text text-anchor="start" x="459.9875" y="-435" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;static&gt;ha_restarts</text>
-<text text-anchor="start" x="467.7665" y="-423" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;static&gt;__client</text>
-<text text-anchor="start" x="451.3735" y="-411" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;static&gt;__cb_MqttIsUp</text>
-<polygon fill="none" stroke="#000000" points="441.5,-354 441.5,-398 563.5,-398 563.5,-354 441.5,-354"/>
-<text text-anchor="start" x="464.436" y="-379" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;publish()</text>
-<text text-anchor="start" x="468.6045" y="-367" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;close()</text>
+<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>
 </g>
-<!-- A3 -->
-<g id="node4" class="node">
-<title>A3</title>
-<polygon fill="none" stroke="#000000" points="387.5,-792 387.5,-824 617.5,-824 617.5,-792 387.5,-792"/>
-<text text-anchor="start" x="489.7215" y="-805" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Proxy</text>
-<polygon fill="none" stroke="#000000" points="387.5,-676 387.5,-792 617.5,-792 617.5,-676 387.5,-676"/>
-<text text-anchor="start" x="474.1545" y="-773" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;cls&gt;db_stat</text>
-<text text-anchor="start" x="467.491" y="-761" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;cls&gt;entity_prfx</text>
-<text text-anchor="start" x="458.326" y="-749" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;cls&gt;discovery_prfx</text>
-<text text-anchor="start" x="457.762" y="-737" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;cls&gt;proxy_node_id</text>
-<text text-anchor="start" x="453.873" y="-725" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;cls&gt;proxy_unique_id</text>
-<text text-anchor="start" x="469.716" y="-713" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;cls&gt;mqtt:Mqtt</text>
-<text text-anchor="start" x="471.9355" y="-689" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__ha_restarts</text>
-<polygon fill="none" stroke="#000000" points="387.5,-584 387.5,-676 617.5,-676 617.5,-584 387.5,-584"/>
-<text text-anchor="start" x="478.6145" y="-657" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">class_init()</text>
-<text text-anchor="start" x="473.334" y="-645" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">class_close()</text>
-<text text-anchor="start" x="444.984" y="-621" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;_cb_mqtt_is_up()</text>
-<text text-anchor="start" x="397.197" y="-609" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;_register_proxy_stat_home_assistant()</text>
-<text text-anchor="start" x="406.084" y="-597" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;_async_publ_mqtt_proxy_stat(key)</text>
-</g>
-<!-- A3&#45;&gt;A2 -->
-<g id="edge9" class="edge">
-<title>A3&#45;&gt;A2</title>
-<path fill="none" stroke="#000000" d="M502.5,-571.373C502.5,-549.9571 502.5,-528.339 502.5,-508.5579"/>
-<polygon fill="#000000" stroke="#000000" points="502.5001,-571.682 506.5,-577.6821 502.5,-583.682 498.5,-577.682 502.5001,-571.682"/>
-<polygon fill="#000000" stroke="#000000" points="502.5,-498.392 507.0001,-508.3919 502.5,-503.392 502.5001,-508.392 502.5001,-508.392 502.5001,-508.392 502.5,-503.392 498.0001,-508.392 502.5,-498.392 502.5,-498.392"/>
-</g>
-<!-- A5 -->
-<g id="node6" class="node">
-<title>A5</title>
-<polygon fill="none" stroke="#000000" points="205.5,-502 205.5,-534 396.5,-534 396.5,-502 205.5,-502"/>
-<text text-anchor="start" x="272.66" y="-515" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">InverterBase</text>
-<polygon fill="none" stroke="#000000" points="205.5,-386 205.5,-502 396.5,-502 396.5,-386 205.5,-386"/>
-<text text-anchor="start" x="281.8335" y="-483" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_registry</text>
-<text text-anchor="start" x="270.4355" y="-471" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__ha_restarts</text>
-<text text-anchor="start" x="290.997" y="-447" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">addr</text>
-<text text-anchor="start" x="274.0505" y="-435" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">config_id:str</text>
-<text text-anchor="start" x="247.3785" y="-423" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">prot_class:MessageProt</text>
-<text text-anchor="start" x="261.553" y="-411" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">remote:StreamPtr</text>
-<text text-anchor="start" x="266.832" y="-399" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">local:StreamPtr</text>
-<polygon fill="none" stroke="#000000" points="205.5,-318 205.5,-386 396.5,-386 396.5,-318 205.5,-318"/>
-<text text-anchor="start" x="267.522" y="-367" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">healthy()&#45;&gt;bool</text>
-<text text-anchor="start" x="215.2835" y="-355" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;disc(shutdown_started=False)</text>
-<text text-anchor="start" x="246.544" y="-343" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;create_remote()</text>
-<text text-anchor="start" x="240.984" y="-331" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;async_publ_mqtt()</text>
-</g>
-<!-- A3&#45;&gt;A5 -->
-<g id="edge7" class="edge">
-<title>A3&#45;&gt;A5</title>
-<path fill="none" stroke="#000000" d="M409.1791,-575.5683C399.1409,-561.7533 389.0008,-547.7982 379.1588,-534.2532"/>
-<polygon fill="none" stroke="#000000" points="406.3649,-577.6495 415.0747,-583.682 412.0279,-573.5347 406.3649,-577.6495"/>
-</g>
-<!-- A4&#45;&gt;A5 -->
-<g id="edge2" class="edge">
-<title>A4&#45;&gt;A5</title>
-<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M279.7719,-639.4228C282.8086,-608.1559 286.5373,-569.7639 289.991,-534.2034"/>
-<polygon fill="none" stroke="#000000" points="276.2531,-639.4473 278.77,-649.7389 283.2203,-640.1241 276.2531,-639.4473"/>
-</g>
-<!-- A6 -->
-<g id="node7" class="node">
-<title>A6</title>
-<polygon fill="none" stroke="#000000" points="356.5,-236 356.5,-268 456.5,-268 456.5,-236 356.5,-236"/>
-<text text-anchor="start" x="383.9995" y="-249" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">StreamPtr</text>
-<polygon fill="none" stroke="#000000" points="356.5,-216 356.5,-236 456.5,-236 456.5,-216 356.5,-216"/>
-<polygon fill="none" stroke="#000000" points="356.5,-172 356.5,-216 456.5,-216 456.5,-172 356.5,-172"/>
-<text text-anchor="start" x="366.2175" y="-197" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">stream:ProtocolIfc</text>
-<text text-anchor="start" x="381.2185" y="-185" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ifc:AsyncIfc</text>
-</g>
-<!-- A5&#45;&gt;A6 -->
-<g id="edge8" class="edge">
-<title>A5&#45;&gt;A6</title>
-<path fill="none" stroke="#000000" d="M356.1387,-317.872C363.3786,-303.802 370.5526,-289.86 377.1187,-277.0995"/>
-<polygon fill="#000000" stroke="#000000" points="381.7846,-268.0318 381.2105,-278.9826 379.4969,-272.4777 377.2091,-276.9237 377.2091,-276.9237 377.2091,-276.9237 379.4969,-272.4777 373.2078,-274.8647 381.7846,-268.0318 381.7846,-268.0318"/>
-<text text-anchor="middle" x="381.0069" y="-285.0166" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">2</text>
-</g>
-<!-- A7 -->
-<g id="node8" class="node">
-<title>A7</title>
-<polygon fill="none" stroke="#000000" points="338.2314,-238 262.7686,-238 262.7686,-202 338.2314,-202 338.2314,-238"/>
-<text text-anchor="middle" x="300.5" y="-217" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">InverterG3</text>
-</g>
-<!-- A5&#45;&gt;A7 -->
-<g id="edge5" class="edge">
-<title>A5&#45;&gt;A7</title>
-<path fill="none" stroke="#000000" d="M300.5,-307.7729C300.5,-280.5002 300.5,-254.684 300.5,-238.2013"/>
-<polygon fill="none" stroke="#000000" points="297.0001,-307.872 300.5,-317.872 304.0001,-307.872 297.0001,-307.872"/>
-</g>
-<!-- A9 -->
-<g id="node10" class="node">
-<title>A9</title>
-<polygon fill="none" stroke="#000000" points="94.4001,-238 12.5999,-238 12.5999,-202 94.4001,-202 94.4001,-238"/>
-<text text-anchor="middle" x="53.5" y="-217" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">InverterG3P</text>
-</g>
-<!-- A5&#45;&gt;A9 -->
-<g id="edge6" class="edge">
-<title>A5&#45;&gt;A9</title>
-<path fill="none" stroke="#000000" d="M196.7667,-346.4637C165.8973,-321.9347 132.3582,-294.4156 102.5,-268 91.7971,-258.5312 80.3616,-247.3925 71.232,-238.23"/>
-<polygon fill="none" stroke="#000000" points="194.962,-349.4991 204.9739,-352.965 199.3086,-344.0121 194.962,-349.4991"/>
+<!-- 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"/>
 </g>
 <!-- A11 -->
 <g id="node12" class="node">
 <title>A11</title>
-<polygon fill="none" stroke="#000000" points="450.1421,-36 360.8579,-36 360.8579,0 450.1421,0 450.1421,-36"/>
-<text text-anchor="middle" x="405.5" y="-15" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;&lt;AsyncIfc&gt;&gt;</text>
+<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"/>
 </g>
-<!-- A6&#45;&gt;A11 -->
-<g id="edge11" class="edge">
-<title>A6&#45;&gt;A11</title>
-<path fill="none" stroke="#000000" d="M392.6633,-171.974C386.9982,-146.4565 382.5868,-114.547 386.5,-86 388.3468,-72.5276 392.161,-57.9618 395.8907,-45.7804"/>
-<polygon fill="#000000" stroke="#000000" points="398.9587,-36.1851 400.1994,-47.0805 397.4359,-40.9476 395.9131,-45.71 395.9131,-45.71 395.9131,-45.71 397.4359,-40.9476 391.6269,-44.3395 398.9587,-36.1851 398.9587,-36.1851"/>
-<text text-anchor="middle" x="401.4892" y="-53.0243" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">1</text>
+<!-- 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"/>
 </g>
-<!-- A12 -->
-<g id="node13" class="node">
-<title>A12</title>
-<polygon fill="none" stroke="#000000" points="493.5879,-122 395.4121,-122 395.4121,-86 493.5879,-86 493.5879,-122"/>
-<text text-anchor="middle" x="444.5" y="-101" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;&lt;ProtocolIfc&gt;&gt;</text>
+<!-- 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>
 </g>
-<!-- A6&#45;&gt;A12 -->
-<g id="edge10" class="edge">
-<title>A6&#45;&gt;A12</title>
-<path fill="none" stroke="#000000" d="M422.2853,-171.8133C426.7329,-158.2365 431.4225,-143.9208 435.3408,-131.9595"/>
-<polygon fill="#000000" stroke="#000000" points="438.5602,-122.132 439.7235,-133.036 437.0036,-126.8835 435.4471,-131.6351 435.4471,-131.6351 435.4471,-131.6351 437.0036,-126.8835 431.1707,-130.2341 438.5602,-122.132 438.5602,-122.132"/>
-<text text-anchor="middle" x="440.9498" y="-138.9887" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">1</text>
+<!-- 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>
+</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>
+</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"/>
+</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>
+</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"/>
+</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>
+</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"/>
+</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>
 </g>
 <!-- A8 -->
 <g id="node9" class="node">
 <title>A8</title>
-<polygon fill="#fff8dc" stroke="#000000" points="574.906,-248 474.094,-248 474.094,-192 580.906,-192 580.906,-242 574.906,-248"/>
-<polyline fill="none" stroke="#000000" points="574.906,-248 574.906,-242 "/>
-<polyline fill="none" stroke="#000000" points="580.906,-242 574.906,-242 "/>
-<text text-anchor="middle" x="527.5" y="-235" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Creates an GEN3</text>
-<text text-anchor="middle" x="527.5" y="-223" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">inverter instance</text>
-<text text-anchor="middle" x="527.5" y="-211" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">with</text>
-<text text-anchor="middle" x="527.5" y="-199" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">prot_class:Talent</text>
+<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>
 </g>
-<!-- A7&#45;&gt;A8 -->
-<g id="edge3" class="edge">
-<title>A7&#45;&gt;A8</title>
-<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M308.5491,-238.3283C317.4345,-256.0056 333.5793,-281.6949 356.5,-293 396.3598,-312.6598 415.5578,-310.2929 456.5,-293 478.1607,-283.8511 496.4784,-264.5049 509.0802,-248.0264"/>
+<!-- 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"/>
 </g>
-<!-- A10 -->
-<g id="node11" class="node">
-<title>A10</title>
-<polygon fill="#fff8dc" stroke="#000000" points="239.022,-248 111.978,-248 111.978,-192 245.022,-192 245.022,-242 239.022,-248"/>
-<polyline fill="none" stroke="#000000" points="239.022,-248 239.022,-242 "/>
-<polyline fill="none" stroke="#000000" points="245.022,-242 239.022,-242 "/>
-<text text-anchor="middle" x="178.5" y="-235" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Creates an GEN3PLUS</text>
-<text text-anchor="middle" x="178.5" y="-223" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">inverter instance</text>
-<text text-anchor="middle" x="178.5" y="-211" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">with</text>
-<text text-anchor="middle" x="178.5" y="-199" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">prot_class:SolarmanV5</text>
+<!-- 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>
 </g>
-<!-- A9&#45;&gt;A10 -->
-<g id="edge4" class="edge">
-<title>A9&#45;&gt;A10</title>
-<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M94.5156,-220C100.3114,-220 106.1072,-220 111.903,-220"/>
+<!-- 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>
 </g>
-<!-- A12&#45;&gt;A11 -->
-<g id="edge12" class="edge">
-<title>A12&#45;&gt;A11</title>
-<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M436.2291,-85.7616C430.9033,-74.0176 423.8824,-58.5355 417.896,-45.3349"/>
-<polygon fill="#000000" stroke="#000000" points="413.759,-36.2121 421.9874,-43.4608 415.824,-40.7657 417.8891,-45.3194 417.8891,-45.3194 417.8891,-45.3194 415.824,-40.7657 413.7908,-47.1779 413.759,-36.2121 413.759,-36.2121"/>
-<text text-anchor="middle" x="421.0451" y="-69.7445" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">use</text>
+<!-- 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"/>
+</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>
+</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>
+</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"/>
+</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>
 </g>
 <!-- A13 -->
 <g id="node14" class="node">
 <title>A13</title>
-<polygon fill="none" stroke="#000000" points=".5,-454 .5,-486 107.5,-486 107.5,-454 .5,-454"/>
-<text text-anchor="start" x="24.2695" y="-467" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ModbusConn</text>
-<polygon fill="none" stroke="#000000" points=".5,-386 .5,-454 107.5,-454 107.5,-386 .5,-386"/>
-<text text-anchor="start" x="44.5515" y="-435" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">host</text>
-<text text-anchor="start" x="45.387" y="-423" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">port</text>
-<text text-anchor="start" x="43.997" y="-411" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">addr</text>
-<text text-anchor="start" x="10.383" y="-399" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">stream:InverterG3P</text>
-<polygon fill="none" stroke="#000000" points=".5,-366 .5,-386 107.5,-386 107.5,-366 .5,-366"/>
+<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>
 </g>
-<!-- A13&#45;&gt;A9 -->
-<g id="edge13" class="edge">
-<title>A13&#45;&gt;A9</title>
-<path fill="none" stroke="#000000" d="M53.5,-365.8625C53.5,-327.1513 53.5,-278.6088 53.5,-248.4442"/>
-<polygon fill="#000000" stroke="#000000" points="53.5,-238.2147 58.0001,-248.2147 53.5,-243.2147 53.5001,-248.2147 53.5001,-248.2147 53.5001,-248.2147 53.5,-243.2147 49.0001,-248.2148 53.5,-238.2147 53.5,-238.2147"/>
-<text text-anchor="middle" x="61.9524" y="-253.3409" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">1</text>
-<text text-anchor="middle" x="45.0476" y="-344.7363" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">has</text>
+<!-- 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"/>
+</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>
+</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"/>
+</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"/>
+</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"/>
+</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"/>
 </g>
 <!-- A14 -->
 <g id="node15" class="node">
 <title>A14</title>
-<polygon fill="none" stroke="#000000" points="93.7333,-722 13.2667,-722 13.2667,-686 93.7333,-686 93.7333,-722"/>
-<text text-anchor="middle" x="53.5" y="-701" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ModbusTcp</text>
+<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>
 </g>
-<!-- A14&#45;&gt;A13 -->
-<g id="edge14" class="edge">
-<title>A14&#45;&gt;A13</title>
-<path fill="none" stroke="#000000" d="M53.5,-685.7596C53.5,-647.9991 53.5,-559.5189 53.5,-496.3277"/>
-<polygon fill="#000000" stroke="#000000" points="53.5,-486.0223 58.0001,-496.0223 53.5,-491.0223 53.5001,-496.0223 53.5001,-496.0223 53.5001,-496.0223 53.5,-491.0223 49.0001,-496.0224 53.5,-486.0223 53.5,-486.0223"/>
-<text text-anchor="middle" x="61.9524" y="-501.1485" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">*</text>
-<text text-anchor="middle" x="45.0476" y="-664.6335" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">creates</text>
+<!-- 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>
+</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"/>
+</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>
+</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"/>
+</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"/>
+</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>
 </g>
 </g>
 </svg>
--- a/app/proxy.yuml
+++ b/app/proxy.yuml
@@ -3,34 +3,28 @@
 // {generate:true}

 [note: You can stick notes on diagrams too!{bg:cornsilk}]
-[<<AbstractIterMeta>>||__iter__()]
-
-[Mqtt;<<Singleton>>|<static>ha_restarts;<static>__client;<static>__cb_MqttIsUp|<async>publish();<async>close()]
-[Proxy|<cls>db_stat;<cls>entity_prfx;<cls>discovery_prfx;<cls>proxy_node_id;<cls>proxy_unique_id;<cls>mqtt:Mqtt;;__ha_restarts|class_init();class_close();;<async>_cb_mqtt_is_up();<async>_register_proxy_stat_home_assistant();<async>_async_publ_mqtt_proxy_stat(key)]
-
-[<<InverterIfc>>||healthy()->bool;<async>disc(shutdown_started=False);<async>create_remote();]
-[<<AbstractIterMeta>>]^-.-[<<InverterIfc>>]
-[InverterBase|_registry;__ha_restarts;;addr;config_id:str;prot_class:MessageProt;remote:StreamPtr;local:StreamPtr;|healthy()->bool;<async>disc(shutdown_started=False);<async>create_remote();<async>async_publ_mqtt()]
-[StreamPtr||stream:ProtocolIfc;ifc:AsyncIfc]
-[<<InverterIfc>>]^-.-[InverterBase]
-[InverterG3]-[note: Creates an GEN3 inverter instance with prot_class:Talent{bg:cornsilk}]
-[InverterG3P]-[note: Creates an GEN3PLUS inverter instance with prot_class:SolarmanV5{bg:cornsilk}]
-[InverterBase]^[InverterG3]
-[InverterBase]^[InverterG3P]
-[Proxy]^[InverterBase]
-[InverterBase]-2>[StreamPtr]
-[Proxy]++->[Mqtt;<<Singleton>>]
-
-[<<AsyncIfc>>]
-
-
-[StreamPtr]-1>[<<ProtocolIfc>>]
-[StreamPtr]-1>[<<AsyncIfc>>]
-
-
-[<<ProtocolIfc>>]use-.->[<<AsyncIfc>>]
-
+[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()]
+[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]has-1>[Modbus]
+[SolarmanV5]^[ConnectionG3P|remote_stream:ConnectionG3P|healthy();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()]
+[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]^[InfosG3P||ha_confs();parse()]
+[InfosG3P]->[SolarmanV5]
+[InfosG3]->[Talent]
 [ModbusConn|host;port;addr;stream:InverterG3P;|]has-1>[InverterG3P]
-[ModbusTcp]creates-*>[ModbusConn]

--- a/app/proxy_2.svg
+++ b/app/proxy_2.svg
@@ -1,371 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: G Pages: 1 -->
-<svg width="539pt" height="2000pt"
- viewBox="0.00 0.00 538.57 2000.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 1996)">
-<title>G</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1996 534.566,-1996 534.566,4 -4,4"/>
-<!-- A0 -->
-<g id="node1" class="node">
-<title>A0</title>
-<polygon fill="#fff8dc" stroke="#000000" points="98.1981,-1972 -.0661,-1972 -.0661,-1928 104.1981,-1928 104.1981,-1966 98.1981,-1972"/>
-<polyline fill="none" stroke="#000000" points="98.1981,-1972 98.1981,-1966 "/>
-<polyline fill="none" stroke="#000000" points="104.1981,-1966 98.1981,-1966 "/>
-<text text-anchor="middle" x="52.066" y="-1959" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Example of</text>
-<text text-anchor="middle" x="52.066" y="-1947" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">instantiation for a</text>
-<text text-anchor="middle" x="52.066" y="-1935" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">GEN3 inverter!</text>
-</g>
-<!-- A1 -->
-<g id="node2" class="node">
-<title>A1</title>
-<polygon fill="none" stroke="#000000" points="122.066,-1960 122.066,-1992 238.066,-1992 238.066,-1960 122.066,-1960"/>
-<text text-anchor="start" x="131.715" y="-1973" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;&lt;AbstractIterMeta&gt;&gt;</text>
-<polygon fill="none" stroke="#000000" points="122.066,-1940 122.066,-1960 238.066,-1960 238.066,-1940 122.066,-1940"/>
-<polygon fill="none" stroke="#000000" points="122.066,-1908 122.066,-1940 238.066,-1940 238.066,-1908 122.066,-1908"/>
-<text text-anchor="start" x="158.676" y="-1921" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__iter__()</text>
-</g>
-<!-- A14 -->
-<g id="node15" class="node">
-<title>A14</title>
-<polygon fill="none" stroke="#000000" points="135.066,-1748 135.066,-1780 225.066,-1780 225.066,-1748 135.066,-1748"/>
-<text text-anchor="start" x="144.7725" y="-1761" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;&lt;ProtocolIfc&gt;&gt;</text>
-<polygon fill="none" stroke="#000000" points="135.066,-1716 135.066,-1748 225.066,-1748 225.066,-1716 135.066,-1716"/>
-<text text-anchor="start" x="160.8995" y="-1729" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_registry</text>
-<polygon fill="none" stroke="#000000" points="135.066,-1684 135.066,-1716 225.066,-1716 225.066,-1684 135.066,-1684"/>
-<text text-anchor="start" x="165.0685" y="-1697" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
-</g>
-<!-- A1&#45;&gt;A14 -->
-<g id="edge14" class="edge">
-<title>A1&#45;&gt;A14</title>
-<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M180.066,-1897.756C180.066,-1862.0883 180.066,-1815.1755 180.066,-1780.3644"/>
-<polygon fill="none" stroke="#000000" points="176.5661,-1897.9674 180.066,-1907.9674 183.5661,-1897.9674 176.5661,-1897.9674"/>
-</g>
-<!-- A2 -->
-<g id="node3" class="node">
-<title>A2</title>
-<polygon fill="none" stroke="#000000" points="179.066,-662 179.066,-694 277.066,-694 277.066,-662 179.066,-662"/>
-<text text-anchor="start" x="204.4505" y="-675" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">InverterG3</text>
-<polygon fill="none" stroke="#000000" points="179.066,-606 179.066,-662 277.066,-662 277.066,-606 179.066,-606"/>
-<text text-anchor="start" x="218.063" y="-643" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">addr</text>
-<text text-anchor="start" x="188.619" y="-631" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">remote:StreamPtr</text>
-<text text-anchor="start" x="193.898" y="-619" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">local:StreamPtr</text>
-<polygon fill="none" stroke="#000000" points="179.066,-550 179.066,-606 277.066,-606 277.066,-550 179.066,-550"/>
-<text text-anchor="start" x="192.508" y="-587" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">create_remote()</text>
-<text text-anchor="start" x="213.0685" y="-563" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
-</g>
-<!-- A3 -->
-<g id="node4" class="node">
-<title>A3</title>
-<polygon fill="none" stroke="#000000" points="400.4026,-320 303.7294,-320 303.7294,-284 400.4026,-284 400.4026,-320"/>
-<text text-anchor="middle" x="352.066" y="-299" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">local:StreamPtr</text>
-</g>
-<!-- A2&#45;&gt;A3 -->
-<g id="edge1" class="edge">
-<title>A2&#45;&gt;A3</title>
-<path fill="none" stroke="#000000" d="M260.3657,-538.4062C268.7304,-516.7744 277.7293,-493.5168 286.066,-472 305.502,-421.8362 328.2143,-363.368 341.2906,-329.7205"/>
-<polygon fill="#000000" stroke="#000000" points="260.2523,-538.6998 261.8194,-545.7386 255.9247,-549.8923 254.3577,-542.8536 260.2523,-538.6998"/>
-<polygon fill="#000000" stroke="#000000" points="345.0251,-320.1117 345.5968,-331.0627 343.2138,-324.7721 341.4024,-329.4325 341.4024,-329.4325 341.4024,-329.4325 343.2138,-324.7721 337.2081,-327.8023 345.0251,-320.1117 345.0251,-320.1117"/>
-</g>
-<!-- A4 -->
-<g id="node5" class="node">
-<title>A4</title>
-<polygon fill="none" stroke="#000000" points="285.4601,-320 178.6719,-320 178.6719,-284 285.4601,-284 285.4601,-320"/>
-<text text-anchor="middle" x="232.066" y="-299" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">remote:StreamPtr</text>
-</g>
-<!-- A2&#45;&gt;A4 -->
-<g id="edge2" class="edge">
-<title>A2&#45;&gt;A4</title>
-<path fill="none" stroke="#000000" d="M229.12,-537.6831C229.9778,-469.0527 231.1375,-376.283 231.7124,-330.2853"/>
-<polygon fill="#000000" stroke="#000000" points="229.1188,-537.7877 233.0434,-543.8372 228.9687,-549.7868 225.044,-543.7372 229.1188,-537.7877"/>
-<polygon fill="#000000" stroke="#000000" points="231.839,-320.1609 236.2135,-330.2164 231.7764,-325.1605 231.7139,-330.1601 231.7139,-330.1601 231.7139,-330.1601 231.7764,-325.1605 227.2143,-330.1038 231.839,-320.1609 231.839,-320.1609"/>
-</g>
-<!-- A8 -->
-<g id="node9" class="node">
-<title>A8</title>
-<polygon fill="none" stroke="#000000" points="246.066,-100 246.066,-132 424.066,-132 424.066,-100 246.066,-100"/>
-<text text-anchor="start" x="290.6175" y="-113" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">AsyncStreamServer</text>
-<polygon fill="none" stroke="#000000" points="246.066,-68 246.066,-100 424.066,-100 424.066,-68 246.066,-68"/>
-<text text-anchor="start" x="302.837" y="-81" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">create_remote</text>
-<polygon fill="none" stroke="#000000" points="246.066,0 246.066,-68 424.066,-68 424.066,0 246.066,0"/>
-<text text-anchor="start" x="286.7235" y="-49" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;server_loop()</text>
-<text text-anchor="start" x="277.5545" y="-37" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;_async_forward()</text>
-<text text-anchor="start" x="255.875" y="-25" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;publish_outstanding_mqtt()</text>
-<text text-anchor="start" x="320.0685" y="-13" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
-</g>
-<!-- A3&#45;&gt;A8 -->
-<g id="edge8" class="edge">
-<title>A3&#45;&gt;A8</title>
-<path fill="none" stroke="#000000" d="M349.8809,-271.6651C347.5364,-239.1181 343.722,-186.1658 340.5509,-142.1431"/>
-<polygon fill="#000000" stroke="#000000" points="349.898,-271.9044 354.3188,-277.6014 350.7603,-283.8733 346.3395,-278.1763 349.898,-271.9044"/>
-<polygon fill="#000000" stroke="#000000" points="339.8226,-132.0321 345.0295,-141.6829 340.1818,-137.0192 340.5411,-142.0063 340.5411,-142.0063 340.5411,-142.0063 340.1818,-137.0192 336.0527,-142.3296 339.8226,-132.0321 339.8226,-132.0321"/>
-</g>
-<!-- A9 -->
-<g id="node10" class="node">
-<title>A9</title>
-<polygon fill="none" stroke="#000000" points="74.066,-82 74.066,-114 212.066,-114 212.066,-82 74.066,-82"/>
-<text text-anchor="start" x="100.563" y="-95" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">AsyncStreamClient</text>
-<polygon fill="none" stroke="#000000" points="74.066,-62 74.066,-82 212.066,-82 212.066,-62 74.066,-62"/>
-<polygon fill="none" stroke="#000000" points="74.066,-18 74.066,-62 212.066,-62 212.066,-18 74.066,-18"/>
-<text text-anchor="start" x="96.944" y="-43" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;client_loop()</text>
-<text text-anchor="start" x="83.89" y="-31" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;_async_forward())</text>
-</g>
-<!-- A4&#45;&gt;A9 -->
-<g id="edge10" class="edge">
-<title>A4&#45;&gt;A9</title>
-<path fill="none" stroke="#000000" d="M225.2301,-283.8733C212.4699,-250.0372 184.5329,-175.9573 164.7878,-123.5994"/>
-<polygon fill="#000000" stroke="#000000" points="161.2018,-114.0904 168.941,-121.8593 162.9661,-118.7688 164.7305,-123.4472 164.7305,-123.4472 164.7305,-123.4472 162.9661,-118.7688 160.5199,-125.0351 161.2018,-114.0904 161.2018,-114.0904"/>
-<text text-anchor="middle" x="210.9254" y="-266.8956" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">0..1</text>
-</g>
-<!-- A5 -->
-<g id="node6" class="node">
-<title>A5</title>
-<polygon fill="none" stroke="#000000" points="129.066,-1114 129.066,-1146 246.066,-1146 246.066,-1114 129.066,-1114"/>
-<text text-anchor="start" x="156.995" y="-1127" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;&lt;AsyncIfc&gt;&gt;</text>
-<polygon fill="none" stroke="#000000" points="129.066,-1094 129.066,-1114 246.066,-1114 246.066,-1094 129.066,-1094"/>
-<polygon fill="none" stroke="#000000" points="129.066,-822 129.066,-1094 246.066,-1094 246.066,-822 129.066,-822"/>
-<text text-anchor="start" x="157.002" y="-1075" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">set_node_id()</text>
-<text text-anchor="start" x="155.332" y="-1063" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">get_conn_no()</text>
-<text text-anchor="start" x="169.2295" y="-1039" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_add()</text>
-<text text-anchor="start" x="167.01" y="-1027" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_flush()</text>
-<text text-anchor="start" x="170.6195" y="-1015" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_get()</text>
-<text text-anchor="start" x="166.7295" y="-1003" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_peek()</text>
-<text text-anchor="start" x="170.8995" y="-991" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_log()</text>
-<text text-anchor="start" x="166.735" y="-979" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_clear()</text>
-<text text-anchor="start" x="170.8995" y="-967" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_len()</text>
-<text text-anchor="start" x="165.3405" y="-943" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">fwd_add()</text>
-<text text-anchor="start" x="167.0105" y="-931" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">fwd_log()</text>
-<text text-anchor="start" x="170.3445" y="-919" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rx_get()</text>
-<text text-anchor="start" x="166.4545" y="-907" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rx_peek()</text>
-<text text-anchor="start" x="170.6245" y="-895" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rx_log()</text>
-<text text-anchor="start" x="166.46" y="-883" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rx_clear()</text>
-<text text-anchor="start" x="170.6245" y="-871" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rx_len()</text>
-<text text-anchor="start" x="162.565" y="-859" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rx_set_cb()</text>
-<text text-anchor="start" x="138.9455" y="-835" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">prot_set_timeout_cb()</text>
-</g>
-<!-- A6 -->
-<g id="node7" class="node">
-<title>A6</title>
-<polygon fill="none" stroke="#000000" points="66.066,-652 66.066,-684 159.066,-684 159.066,-652 66.066,-652"/>
-<text text-anchor="start" x="84.23" y="-665" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">AsyncIfcImpl</text>
-<polygon fill="none" stroke="#000000" points="66.066,-560 66.066,-652 159.066,-652 159.066,-560 66.066,-560"/>
-<text text-anchor="start" x="75.614" y="-633" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">fwd_fifo:ByteFifo</text>
-<text text-anchor="start" x="79.503" y="-621" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_fifo:ByteFifo</text>
-<text text-anchor="start" x="79.228" y="-609" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rx_fifo:ByteFifo</text>
-<text text-anchor="start" x="78.662" y="-597" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">conn_no:Count</text>
-<text text-anchor="start" x="94.7795" y="-585" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">node_id</text>
-<text text-anchor="start" x="88.1155" y="-573" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">timeout_cb</text>
-</g>
-<!-- A5&#45;&gt;A6 -->
-<g id="edge3" class="edge">
-<title>A5&#45;&gt;A6</title>
-<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M151.3775,-811.7434C141.9017,-766.0069 132.2713,-719.5241 124.914,-684.013"/>
-<polygon fill="none" stroke="#000000" points="148.0039,-812.7126 153.4599,-821.7945 154.8583,-811.2924 148.0039,-812.7126"/>
-</g>
-<!-- A7 -->
-<g id="node8" class="node">
-<title>A7</title>
-<polygon fill="none" stroke="#000000" points="59.066,-390 59.066,-422 161.066,-422 161.066,-390 59.066,-390"/>
-<text text-anchor="start" x="80.34" y="-403" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">AsyncStream</text>
-<polygon fill="none" stroke="#000000" points="59.066,-310 59.066,-390 161.066,-390 161.066,-310 59.066,-310"/>
-<text text-anchor="start" x="95.619" y="-371" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">reader</text>
-<text text-anchor="start" x="97.849" y="-359" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">writer</text>
-<text text-anchor="start" x="100.063" y="-347" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">addr</text>
-<text text-anchor="start" x="95.619" y="-335" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">r_addr</text>
-<text text-anchor="start" x="96.174" y="-323" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">l_addr</text>
-<polygon fill="none" stroke="#000000" points="59.066,-182 59.066,-310 161.066,-310 161.066,-182 59.066,-182"/>
-<text text-anchor="start" x="81.72" y="-279" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;loop</text>
-<text text-anchor="start" x="97.848" y="-267" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">disc()</text>
-<text text-anchor="start" x="95.0685" y="-255" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
-<text text-anchor="start" x="90.62" y="-243" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">healthy()</text>
-<text text-anchor="start" x="75.3365" y="-219" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__async_read()</text>
-<text text-anchor="start" x="74.787" y="-207" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__async_write()</text>
-<text text-anchor="start" x="68.673" y="-195" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__async_forward()</text>
-</g>
-<!-- A6&#45;&gt;A7 -->
-<g id="edge4" class="edge">
-<title>A6&#45;&gt;A7</title>
-<path fill="none" stroke="#000000" d="M111.6134,-549.5774C111.3784,-511.9877 111.0852,-465.0771 110.8174,-422.2295"/>
-<polygon fill="none" stroke="#000000" points="108.1155,-549.9435 111.678,-559.9214 115.1153,-549.8996 108.1155,-549.9435"/>
-</g>
-<!-- A7&#45;&gt;A8 -->
-<g id="edge5" class="edge">
-<title>A7&#45;&gt;A8</title>
-<path fill="none" stroke="#000000" d="M167.5272,-185.0204C168.3649,-184.0001 169.2111,-182.9929 170.066,-182 191.4283,-157.1889 219.1964,-135.0276 245.8416,-116.8901"/>
-<polygon fill="none" stroke="#000000" points="164.637,-183.0361 161.2751,-193.0834 170.1688,-187.3255 164.637,-183.0361"/>
-</g>
-<!-- A7&#45;&gt;A9 -->
-<g id="edge6" class="edge">
-<title>A7&#45;&gt;A9</title>
-<path fill="none" stroke="#000000" d="M128.2709,-171.8077C131.1447,-151.2556 133.9487,-131.2022 136.3294,-114.1772"/>
-<polygon fill="none" stroke="#000000" points="124.7747,-171.5375 126.856,-181.9259 131.7072,-172.5069 124.7747,-171.5375"/>
-</g>
-<!-- A10 -->
-<g id="node11" class="node">
-<title>A10</title>
-<polygon fill="none" stroke="#000000" points="295.066,-740 295.066,-772 409.066,-772 409.066,-740 295.066,-740"/>
-<text text-anchor="start" x="338.174" y="-753" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Talent</text>
-<polygon fill="none" stroke="#000000" points="295.066,-600 295.066,-740 409.066,-740 409.066,-600 295.066,-600"/>
-<text text-anchor="start" x="332.889" y="-721" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">conn_no</text>
-<text text-anchor="start" x="342.063" y="-709" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">addr</text>
-<text text-anchor="start" x="304.829" y="-685" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">await_conn_resp_cnt</text>
-<text text-anchor="start" x="339.8435" y="-673" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">id_str</text>
-<text text-anchor="start" x="320.666" y="-661" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">contact_name</text>
-<text text-anchor="start" x="324.006" y="-649" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">contact_mail</text>
-<text text-anchor="start" x="327.6105" y="-637" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">db:InfosG3</text>
-<text text-anchor="start" x="325.95" y="-625" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">mb:Modbus</text>
-<text text-anchor="start" x="338.178" y="-613" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">switch</text>
-<polygon fill="none" stroke="#000000" points="295.066,-472 295.066,-600 409.066,-600 409.066,-472 295.066,-472"/>
-<text text-anchor="start" x="309.5585" y="-581" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_contact_info()</text>
-<text text-anchor="start" x="311.4985" y="-569" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_ota_update()</text>
-<text text-anchor="start" x="317.3425" y="-557" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_get_time()</text>
-<text text-anchor="start" x="305.3945" y="-545" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_collector_data()</text>
-<text text-anchor="start" x="307.3395" y="-533" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_inverter_data()</text>
-<text text-anchor="start" x="316.5065" y="-521" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_unknown()</text>
-<text text-anchor="start" x="332.62" y="-497" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">healthy()</text>
-<text text-anchor="start" x="337.0685" y="-485" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
-</g>
-<!-- A10&#45;&gt;A3 -->
-<g id="edge7" class="edge">
-<title>A10&#45;&gt;A3</title>
-<path fill="none" stroke="#000000" d="M352.066,-461.6172C352.066,-412.1611 352.066,-362.7538 352.066,-332.2961"/>
-<polygon fill="#000000" stroke="#000000" points="352.066,-471.8382 347.5661,-461.8382 352.066,-466.8382 352.0661,-461.8382 352.0661,-461.8382 352.0661,-461.8382 352.066,-466.8382 356.5661,-461.8383 352.066,-471.8382 352.066,-471.8382"/>
-<polygon fill="#000000" stroke="#000000" points="352.0661,-332.0807 348.066,-326.0808 352.066,-320.0807 356.066,-326.0807 352.0661,-332.0807"/>
-</g>
-<!-- A10&#45;&gt;A4 -->
-<g id="edge9" class="edge">
-<title>A10&#45;&gt;A4</title>
-<path fill="none" stroke="#000000" d="M292.1869,-462.3225C270.8082,-405.3126 249.4091,-348.2482 238.8463,-320.0807"/>
-<polygon fill="#000000" stroke="#000000" points="295.7553,-471.8382 288.0306,-464.055 293.9997,-467.1566 292.244,-462.4749 292.244,-462.4749 292.244,-462.4749 293.9997,-467.1566 296.4575,-460.8948 295.7553,-471.8382 295.7553,-471.8382"/>
-<text text-anchor="middle" x="253.125" y="-331.0849" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">0..1</text>
-</g>
-<!-- A12 -->
-<g id="node13" class="node">
-<title>A12</title>
-<polygon fill="none" stroke="#000000" points="432.066,-318 432.066,-350 499.066,-350 499.066,-318 432.066,-318"/>
-<text text-anchor="start" x="448.059" y="-331" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">InfosG3</text>
-<polygon fill="none" stroke="#000000" points="432.066,-298 432.066,-318 499.066,-318 499.066,-298 432.066,-298"/>
-<polygon fill="none" stroke="#000000" points="432.066,-254 432.066,-298 499.066,-298 499.066,-254 432.066,-254"/>
-<text text-anchor="start" x="441.95" y="-279" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_confs()</text>
-<text text-anchor="start" x="449.734" y="-267" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">parse()</text>
-</g>
-<!-- A10&#45;&gt;A12 -->
-<g id="edge12" class="edge">
-<title>A10&#45;&gt;A12</title>
-<path fill="none" stroke="#000000" d="M405.0919,-471.8382C419.1748,-431.9575 433.5466,-391.2585 444.6898,-359.7024"/>
-<polygon fill="#000000" stroke="#000000" points="448.0405,-350.2137 448.9539,-361.1415 446.3756,-354.9284 444.7107,-359.6431 444.7107,-359.6431 444.7107,-359.6431 446.3756,-354.9284 440.4675,-358.1447 448.0405,-350.2137 448.0405,-350.2137"/>
-</g>
-<!-- A11 -->
-<g id="node12" class="node">
-<title>A11</title>
-<polygon fill="none" stroke="#000000" points="428.066,-710 428.066,-742 531.066,-742 531.066,-710 428.066,-710"/>
-<text text-anchor="start" x="468.728" y="-723" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Infos</text>
-<polygon fill="none" stroke="#000000" points="428.066,-654 428.066,-710 531.066,-710 531.066,-654 428.066,-654"/>
-<text text-anchor="start" x="471.5075" y="-691" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">stat</text>
-<text text-anchor="start" x="447.052" y="-679" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">new_stat_data</text>
-<text text-anchor="start" x="460.6695" y="-667" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">info_dev</text>
-<polygon fill="none" stroke="#000000" points="428.066,-502 428.066,-654 531.066,-654 531.066,-502 428.066,-502"/>
-<text text-anchor="start" x="455.4015" y="-635" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">static_init()</text>
-<text text-anchor="start" x="453.4505" y="-623" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">dev_value()</text>
-<text text-anchor="start" x="450.3965" y="-611" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">inc_counter()</text>
-<text text-anchor="start" x="448.7265" y="-599" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">dec_counter()</text>
-<text text-anchor="start" x="446.776" y="-587" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_proxy_conf</text>
-<text text-anchor="start" x="461.779" y="-575" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_conf</text>
-<text text-anchor="start" x="454.56" y="-563" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_remove</text>
-<text text-anchor="start" x="455.9405" y="-551" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">update_db</text>
-<text text-anchor="start" x="440.103" y="-539" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">set_db_def_value</text>
-<text text-anchor="start" x="449.5515" y="-527" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">get_db_value</text>
-<text text-anchor="start" x="437.8885" y="-515" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ignore_this_device</text>
-</g>
-<!-- A11&#45;&gt;A12 -->
-<g id="edge11" class="edge">
-<title>A11&#45;&gt;A12</title>
-<path fill="none" stroke="#000000" d="M473.3644,-491.6786C471.1803,-441.7544 468.8213,-387.8351 467.1788,-350.293"/>
-<polygon fill="none" stroke="#000000" points="469.8793,-492.0959 473.8131,-501.9334 476.8726,-491.7899 469.8793,-492.0959"/>
-</g>
-<!-- A13 -->
-<g id="node14" class="node">
-<title>A13</title>
-<polygon fill="none" stroke="#000000" points="156.066,-1524 156.066,-1556 305.066,-1556 305.066,-1524 156.066,-1524"/>
-<text text-anchor="start" x="210.2835" y="-1537" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Message</text>
-<polygon fill="none" stroke="#000000" points="156.066,-1300 156.066,-1524 305.066,-1524 305.066,-1300 156.066,-1300"/>
-<text text-anchor="start" x="193.8925" y="-1505" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">server_side:bool</text>
-<text text-anchor="start" x="204.45" y="-1493" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">mb:Modbus</text>
-<text text-anchor="start" x="205.2845" y="-1481" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ifc:AsyncIfc</text>
-<text text-anchor="start" x="212.7795" y="-1469" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">node_id</text>
-<text text-anchor="start" x="191.109" y="-1457" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">header_valid:bool</text>
-<text text-anchor="start" x="205.556" y="-1445" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">header_len</text>
-<text text-anchor="start" x="211.39" y="-1433" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">data_len</text>
-<text text-anchor="start" x="208.8905" y="-1421" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">unique_id</text>
-<text text-anchor="start" x="202.781" y="-1409" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">sug_area:str</text>
-<text text-anchor="start" x="199.722" y="-1397" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">new_data:dict</text>
-<text text-anchor="start" x="206.666" y="-1385" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">state:State</text>
-<text text-anchor="start" x="180.2705" y="-1373" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">shutdown_started:bool</text>
-<text text-anchor="start" x="199.4505" y="-1361" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">modbus_elms</text>
-<text text-anchor="start" x="195.573" y="-1349" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">mb_timer:Timer</text>
-<text text-anchor="start" x="204.451" y="-1337" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">mb_timeout</text>
-<text text-anchor="start" x="193.6185" y="-1325" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">mb_first_timeout</text>
-<text text-anchor="start" x="184.72" y="-1313" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">modbus_polling:bool</text>
-<polygon fill="none" stroke="#000000" points="156.066,-1196 156.066,-1300 305.066,-1300 305.066,-1196 156.066,-1196"/>
-<text text-anchor="start" x="179.4505" y="-1281" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_set_mqtt_timestamp()</text>
-<text text-anchor="start" x="208.066" y="-1269" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_timeout()</text>
-<text text-anchor="start" x="180.8335" y="-1257" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_send_modbus_cmd()</text>
-<text text-anchor="start" x="165.8255" y="-1245" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt; end_modbus_cmd()</text>
-<text text-anchor="start" x="215.5685" y="-1233" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
-<text text-anchor="start" x="201.3965" y="-1221" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">inc_counter()</text>
-<text text-anchor="start" x="199.7265" y="-1209" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">dec_counter()</text>
-</g>
-<!-- A13&#45;&gt;A5 -->
-<g id="edge13" class="edge">
-<title>A13&#45;&gt;A5</title>
-<path fill="none" stroke="#000000" d="M210.2965,-1195.7758C208.8462,-1182.5547 207.3854,-1169.2373 205.9406,-1156.0662"/>
-<polygon fill="#000000" stroke="#000000" points="204.8393,-1146.0268 210.403,-1155.4764 205.3846,-1150.997 205.9298,-1155.9672 205.9298,-1155.9672 205.9298,-1155.9672 205.3846,-1150.997 201.4567,-1156.4579 204.8393,-1146.0268 204.8393,-1146.0268"/>
-<text text-anchor="middle" x="199.9181" y="-1175.6794" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">use</text>
-</g>
-<!-- A13&#45;&gt;A10 -->
-<g id="edge16" class="edge">
-<title>A13&#45;&gt;A10</title>
-<path fill="none" stroke="#000000" d="M260.8183,-1185.9405C281.556,-1057.7747 308.5382,-891.0162 327.7708,-772.1524"/>
-<polygon fill="none" stroke="#000000" points="257.3528,-1185.4467 259.2105,-1195.8774 264.2629,-1186.5648 257.3528,-1185.4467"/>
-</g>
-<!-- A14&#45;&gt;A13 -->
-<g id="edge15" class="edge">
-<title>A14&#45;&gt;A13</title>
-<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M188.2401,-1673.8004C192.8037,-1641.3079 198.7631,-1598.8764 204.747,-1556.2713"/>
-<polygon fill="none" stroke="#000000" points="184.7342,-1673.5986 186.8092,-1683.9883 191.6661,-1674.5723 184.7342,-1673.5986"/>
-</g>
-<!-- A15 -->
-<g id="node16" class="node">
-<title>A15</title>
-<polygon fill="none" stroke="#000000" points="244.066,-1826 244.066,-1858 319.066,-1858 319.066,-1826 244.066,-1826"/>
-<text text-anchor="start" x="263.7835" y="-1839" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Modbus</text>
-<polygon fill="none" stroke="#000000" points="244.066,-1674 244.066,-1826 319.066,-1826 319.066,-1674 244.066,-1674"/>
-<text text-anchor="start" x="273.2275" y="-1807" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">que</text>
-<text text-anchor="start" x="254.056" y="-1783" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">snd_handler</text>
-<text text-anchor="start" x="255.171" y="-1771" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rsp_handler</text>
-<text text-anchor="start" x="265.1745" y="-1759" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">timeout</text>
-<text text-anchor="start" x="255.4555" y="-1747" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">max_retires</text>
-<text text-anchor="start" x="263.508" y="-1735" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">last_xxx</text>
-<text text-anchor="start" x="275.4575" y="-1723" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">err</text>
-<text text-anchor="start" x="262.1195" y="-1711" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">retry_cnt</text>
-<text text-anchor="start" x="260.445" y="-1699" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">req_pend</text>
-<text text-anchor="start" x="274.9025" y="-1687" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tim</text>
-<polygon fill="none" stroke="#000000" points="244.066,-1606 244.066,-1674 319.066,-1674 319.066,-1606 244.066,-1606"/>
-<text text-anchor="start" x="255.456" y="-1655" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">build_msg()</text>
-<text text-anchor="start" x="258.79" y="-1643" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">recv_req()</text>
-<text text-anchor="start" x="256.29" y="-1631" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">recv_resp()</text>
-<text text-anchor="start" x="266.5685" y="-1619" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
-</g>
-<!-- A15&#45;&gt;A13 -->
-<g id="edge17" class="edge">
-<title>A15&#45;&gt;A13</title>
-<path fill="none" stroke="#000000" d="M261.5887,-1596.041C259.7128,-1582.9463 257.7908,-1569.5297 255.8664,-1556.0971"/>
-<polygon fill="#000000" stroke="#000000" points="263.0135,-1605.9867 257.1408,-1596.726 262.3044,-1601.0373 261.5953,-1596.0878 261.5953,-1596.0878 261.5953,-1596.0878 262.3044,-1601.0373 266.0499,-1595.4496 263.0135,-1605.9867 263.0135,-1605.9867"/>
-<text text-anchor="middle" x="266.8039" y="-1569.8414" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">has</text>
-<text text-anchor="middle" x="252.0761" y="-1586.2424" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">0..1</text>
-</g>
-</g>
-</svg>
--- a/app/proxy_2.yuml
+++ b/app/proxy_2.yuml
@@ -1,43 +0,0 @@
-// {type:class}
-// {direction:topDown}
-// {generate:true}
-
-[note: Example of instantiation for a GEN3 inverter!{bg:cornsilk}]
-[<<AbstractIterMeta>>||__iter__()]
-
-[InverterG3|addr;remote:StreamPtr;local:StreamPtr|create_remote();;close()]
-[InverterG3]++->[local:StreamPtr]
-[InverterG3]++->[remote:StreamPtr]
-
-[<<AsyncIfc>>||set_node_id();get_conn_no();;tx_add();tx_flush();tx_get();tx_peek();tx_log();tx_clear();tx_len();;fwd_add();fwd_log();rx_get();rx_peek();rx_log();rx_clear();rx_len();rx_set_cb();;prot_set_timeout_cb()]
-[AsyncIfcImpl|fwd_fifo:ByteFifo;tx_fifo:ByteFifo;rx_fifo:ByteFifo;conn_no:Count;node_id;timeout_cb]
-[AsyncStream|reader;writer;addr;r_addr;l_addr|;<async>loop;disc();close();healthy();;__async_read();__async_write();__async_forward()]
-[AsyncStreamServer|create_remote|<async>server_loop();<async>_async_forward();<async>publish_outstanding_mqtt();close()]
-[AsyncStreamClient||<async>client_loop();<async>_async_forward())]
-[<<AsyncIfc>>]^-.-[AsyncIfcImpl]
-[AsyncIfcImpl]^[AsyncStream]
-[AsyncStream]^[AsyncStreamServer]
-[AsyncStream]^[AsyncStreamClient]
-
-
-[Talent|conn_no;addr;;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();;healthy();close()]
-[Talent]<-++[local:StreamPtr]
-[local:StreamPtr]++->[AsyncStreamServer]
-[Talent]<-0..1[remote:StreamPtr]
-[remote:StreamPtr]0..1->[AsyncStreamClient]
-
-[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]
-[Infos]^[InfosG3||ha_confs();parse()]
-
-[Talent]->[InfosG3]
-
-[Message|server_side:bool;mb:Modbus;ifc:AsyncIfc;node_id;header_valid:bool;header_len;data_len;unique_id;sug_area:str;new_data:dict;state:State;shutdown_started:bool;modbus_elms;mb_timer:Timer;mb_timeout;mb_first_timeout;modbus_polling:bool|_set_mqtt_timestamp();_timeout();_send_modbus_cmd();<async> end_modbus_cmd();close();inc_counter();dec_counter()]
-[Message]use->[<<AsyncIfc>>]
-
-[<<ProtocolIfc>>|_registry|close()]
-[<<AbstractIterMeta>>]^-.-[<<ProtocolIfc>>]
-[<<ProtocolIfc>>]^-.-[Message]
-[Message]^[Talent]
-
-[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]<0..1-has[Message]
--- a/app/proxy_3.svg
+++ b/app/proxy_3.svg
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.40.1 (20161225.0304)
- -->
-<!-- Title: G Pages: 1 -->
-<svg width="539pt" height="1940pt"
- viewBox="0.00 0.00 538.62 1940.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 1936)">
-<title>G</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1936 534.6165,-1936 534.6165,4 -4,4"/>
-<!-- A0 -->
-<g id="node1" class="node">
-<title>A0</title>
-<polygon fill="#fff8dc" stroke="#000000" points="114.3497,-1912 -.1167,-1912 -.1167,-1868 120.3497,-1868 120.3497,-1906 114.3497,-1912"/>
-<polyline fill="none" stroke="#000000" points="114.3497,-1912 114.3497,-1906 "/>
-<polyline fill="none" stroke="#000000" points="120.3497,-1906 114.3497,-1906 "/>
-<text text-anchor="middle" x="60.1165" y="-1899" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Example of</text>
-<text text-anchor="middle" x="60.1165" y="-1887" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">instantiation for a</text>
-<text text-anchor="middle" x="60.1165" y="-1875" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">GEN3PLUS inverter!</text>
-</g>
-<!-- A1 -->
-<g id="node2" class="node">
-<title>A1</title>
-<polygon fill="none" stroke="#000000" points="138.1165,-1900 138.1165,-1932 254.1165,-1932 254.1165,-1900 138.1165,-1900"/>
-<text text-anchor="start" x="147.7655" y="-1913" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;&lt;AbstractIterMeta&gt;&gt;</text>
-<polygon fill="none" stroke="#000000" points="138.1165,-1880 138.1165,-1900 254.1165,-1900 254.1165,-1880 138.1165,-1880"/>
-<polygon fill="none" stroke="#000000" points="138.1165,-1848 138.1165,-1880 254.1165,-1880 254.1165,-1848 138.1165,-1848"/>
-<text text-anchor="start" x="174.7265" y="-1861" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__iter__()</text>
-</g>
-<!-- A14 -->
-<g id="node15" class="node">
-<title>A14</title>
-<polygon fill="none" stroke="#000000" points="151.1165,-1688 151.1165,-1720 241.1165,-1720 241.1165,-1688 151.1165,-1688"/>
-<text text-anchor="start" x="160.823" y="-1701" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;&lt;ProtocolIfc&gt;&gt;</text>
-<polygon fill="none" stroke="#000000" points="151.1165,-1656 151.1165,-1688 241.1165,-1688 241.1165,-1656 151.1165,-1656"/>
-<text text-anchor="start" x="176.95" y="-1669" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_registry</text>
-<polygon fill="none" stroke="#000000" points="151.1165,-1624 151.1165,-1656 241.1165,-1656 241.1165,-1624 151.1165,-1624"/>
-<text text-anchor="start" x="181.119" y="-1637" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
-</g>
-<!-- A1&#45;&gt;A14 -->
-<g id="edge14" class="edge">
-<title>A1&#45;&gt;A14</title>
-<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M196.1165,-1837.756C196.1165,-1802.0883 196.1165,-1755.1755 196.1165,-1720.3644"/>
-<polygon fill="none" stroke="#000000" points="192.6166,-1837.9674 196.1165,-1847.9674 199.6166,-1837.9674 192.6166,-1837.9674"/>
-</g>
-<!-- A2 -->
-<g id="node3" class="node">
-<title>A2</title>
-<polygon fill="none" stroke="#000000" points="202.1165,-632 202.1165,-664 300.1165,-664 300.1165,-632 202.1165,-632"/>
-<text text-anchor="start" x="224.1665" y="-645" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">InverterG3P</text>
-<polygon fill="none" stroke="#000000" points="202.1165,-576 202.1165,-632 300.1165,-632 300.1165,-576 202.1165,-576"/>
-<text text-anchor="start" x="241.1135" y="-613" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">addr</text>
-<text text-anchor="start" x="211.6695" y="-601" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">remote:StreamPtr</text>
-<text text-anchor="start" x="216.9485" y="-589" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">local:StreamPtr</text>
-<polygon fill="none" stroke="#000000" points="202.1165,-520 202.1165,-576 300.1165,-576 300.1165,-520 202.1165,-520"/>
-<text text-anchor="start" x="215.5585" y="-557" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">create_remote()</text>
-<text text-anchor="start" x="236.119" y="-533" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
-</g>
-<!-- A3 -->
-<g id="node4" class="node">
-<title>A3</title>
-<polygon fill="none" stroke="#000000" points="419.4531,-320 322.7799,-320 322.7799,-284 419.4531,-284 419.4531,-320"/>
-<text text-anchor="middle" x="371.1165" y="-299" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">local:StreamPtr</text>
-</g>
-<!-- A2&#45;&gt;A3 -->
-<g id="edge1" class="edge">
-<title>A2&#45;&gt;A3</title>
-<path fill="none" stroke="#000000" d="M285.5402,-508.8093C310.5478,-448.3743 342.848,-370.3156 359.7149,-329.5539"/>
-<polygon fill="#000000" stroke="#000000" points="285.5219,-508.8538 286.9238,-515.9273 280.9336,-519.942 279.5317,-512.8685 285.5219,-508.8538"/>
-<polygon fill="#000000" stroke="#000000" points="363.5595,-320.2627 363.894,-331.2235 361.6477,-324.8828 359.7359,-329.5029 359.7359,-329.5029 359.7359,-329.5029 361.6477,-324.8828 355.5779,-327.7823 363.5595,-320.2627 363.5595,-320.2627"/>
-</g>
-<!-- A4 -->
-<g id="node5" class="node">
-<title>A4</title>
-<polygon fill="none" stroke="#000000" points="304.5106,-320 197.7224,-320 197.7224,-284 304.5106,-284 304.5106,-320"/>
-<text text-anchor="middle" x="251.1165" y="-299" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">remote:StreamPtr</text>
-</g>
-<!-- A2&#45;&gt;A4 -->
-<g id="edge2" class="edge">
-<title>A2&#45;&gt;A4</title>
-<path fill="none" stroke="#000000" d="M251.1165,-507.5905C251.1165,-447.68 251.1165,-370.9429 251.1165,-330.266"/>
-<polygon fill="#000000" stroke="#000000" points="251.1166,-507.942 255.1165,-513.942 251.1165,-519.942 247.1165,-513.942 251.1166,-507.942"/>
-<polygon fill="#000000" stroke="#000000" points="251.1165,-320.2627 255.6166,-330.2626 251.1165,-325.2627 251.1166,-330.2627 251.1166,-330.2627 251.1166,-330.2627 251.1165,-325.2627 246.6166,-330.2627 251.1165,-320.2627 251.1165,-320.2627"/>
-</g>
-<!-- A8 -->
-<g id="node9" class="node">
-<title>A8</title>
-<polygon fill="none" stroke="#000000" points="265.1165,-100 265.1165,-132 443.1165,-132 443.1165,-100 265.1165,-100"/>
-<text text-anchor="start" x="309.668" y="-113" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">AsyncStreamServer</text>
-<polygon fill="none" stroke="#000000" points="265.1165,-68 265.1165,-100 443.1165,-100 443.1165,-68 265.1165,-68"/>
-<text text-anchor="start" x="321.8875" y="-81" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">create_remote</text>
-<polygon fill="none" stroke="#000000" points="265.1165,0 265.1165,-68 443.1165,-68 443.1165,0 265.1165,0"/>
-<text text-anchor="start" x="305.774" y="-49" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;server_loop()</text>
-<text text-anchor="start" x="296.605" y="-37" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;_async_forward()</text>
-<text text-anchor="start" x="274.9255" y="-25" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;publish_outstanding_mqtt()</text>
-<text text-anchor="start" x="339.119" y="-13" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
-</g>
-<!-- A3&#45;&gt;A8 -->
-<g id="edge8" class="edge">
-<title>A3&#45;&gt;A8</title>
-<path fill="none" stroke="#000000" d="M368.9314,-271.6651C366.5869,-239.1181 362.7725,-186.1658 359.6014,-142.1431"/>
-<polygon fill="#000000" stroke="#000000" points="368.9485,-271.9044 373.3693,-277.6014 369.8108,-283.8733 365.39,-278.1763 368.9485,-271.9044"/>
-<polygon fill="#000000" stroke="#000000" points="358.8731,-132.0321 364.08,-141.6829 359.2323,-137.0192 359.5916,-142.0063 359.5916,-142.0063 359.5916,-142.0063 359.2323,-137.0192 355.1032,-142.3296 358.8731,-132.0321 358.8731,-132.0321"/>
-</g>
-<!-- A9 -->
-<g id="node10" class="node">
-<title>A9</title>
-<polygon fill="none" stroke="#000000" points="93.1165,-82 93.1165,-114 231.1165,-114 231.1165,-82 93.1165,-82"/>
-<text text-anchor="start" x="119.6135" y="-95" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">AsyncStreamClient</text>
-<polygon fill="none" stroke="#000000" points="93.1165,-62 93.1165,-82 231.1165,-82 231.1165,-62 93.1165,-62"/>
-<polygon fill="none" stroke="#000000" points="93.1165,-18 93.1165,-62 231.1165,-62 231.1165,-18 93.1165,-18"/>
-<text text-anchor="start" x="115.9945" y="-43" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;client_loop()</text>
-<text text-anchor="start" x="102.9405" y="-31" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;_async_forward())</text>
-</g>
-<!-- A4&#45;&gt;A9 -->
-<g id="edge10" class="edge">
-<title>A4&#45;&gt;A9</title>
-<path fill="none" stroke="#000000" d="M244.2806,-283.8733C231.5204,-250.0372 203.5834,-175.9573 183.8383,-123.5994"/>
-<polygon fill="#000000" stroke="#000000" points="180.2523,-114.0904 187.9915,-121.8593 182.0166,-118.7688 183.781,-123.4472 183.781,-123.4472 183.781,-123.4472 182.0166,-118.7688 179.5704,-125.0351 180.2523,-114.0904 180.2523,-114.0904"/>
-<text text-anchor="middle" x="229.9759" y="-266.8956" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">0..1</text>
-</g>
-<!-- A5 -->
-<g id="node6" class="node">
-<title>A5</title>
-<polygon fill="none" stroke="#000000" points="145.1165,-1054 145.1165,-1086 262.1165,-1086 262.1165,-1054 145.1165,-1054"/>
-<text text-anchor="start" x="173.0455" y="-1067" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;&lt;AsyncIfc&gt;&gt;</text>
-<polygon fill="none" stroke="#000000" points="145.1165,-1034 145.1165,-1054 262.1165,-1054 262.1165,-1034 145.1165,-1034"/>
-<polygon fill="none" stroke="#000000" points="145.1165,-762 145.1165,-1034 262.1165,-1034 262.1165,-762 145.1165,-762"/>
-<text text-anchor="start" x="173.0525" y="-1015" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">set_node_id()</text>
-<text text-anchor="start" x="171.3825" y="-1003" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">get_conn_no()</text>
-<text text-anchor="start" x="185.28" y="-979" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_add()</text>
-<text text-anchor="start" x="183.0605" y="-967" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_flush()</text>
-<text text-anchor="start" x="186.67" y="-955" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_get()</text>
-<text text-anchor="start" x="182.78" y="-943" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_peek()</text>
-<text text-anchor="start" x="186.95" y="-931" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_log()</text>
-<text text-anchor="start" x="182.7855" y="-919" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_clear()</text>
-<text text-anchor="start" x="186.95" y="-907" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_len()</text>
-<text text-anchor="start" x="181.391" y="-883" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">fwd_add()</text>
-<text text-anchor="start" x="183.061" y="-871" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">fwd_log()</text>
-<text text-anchor="start" x="186.395" y="-859" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rx_get()</text>
-<text text-anchor="start" x="182.505" y="-847" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rx_peek()</text>
-<text text-anchor="start" x="186.675" y="-835" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rx_log()</text>
-<text text-anchor="start" x="182.5105" y="-823" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rx_clear()</text>
-<text text-anchor="start" x="186.675" y="-811" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rx_len()</text>
-<text text-anchor="start" x="178.6155" y="-799" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rx_set_cb()</text>
-<text text-anchor="start" x="154.996" y="-775" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">prot_set_timeout_cb()</text>
-</g>
-<!-- A6 -->
-<g id="node7" class="node">
-<title>A6</title>
-<polygon fill="none" stroke="#000000" points="87.1165,-622 87.1165,-654 180.1165,-654 180.1165,-622 87.1165,-622"/>
-<text text-anchor="start" x="105.2805" y="-635" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">AsyncIfcImpl</text>
-<polygon fill="none" stroke="#000000" points="87.1165,-530 87.1165,-622 180.1165,-622 180.1165,-530 87.1165,-530"/>
-<text text-anchor="start" x="96.6645" y="-603" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">fwd_fifo:ByteFifo</text>
-<text text-anchor="start" x="100.5535" y="-591" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tx_fifo:ByteFifo</text>
-<text text-anchor="start" x="100.2785" y="-579" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rx_fifo:ByteFifo</text>
-<text text-anchor="start" x="99.7125" y="-567" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">conn_no:Count</text>
-<text text-anchor="start" x="115.83" y="-555" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">node_id</text>
-<text text-anchor="start" x="109.166" y="-543" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">timeout_cb</text>
-</g>
-<!-- A5&#45;&gt;A6 -->
-<g id="edge3" class="edge">
-<title>A5&#45;&gt;A6</title>
-<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M166.8518,-752.0017C159.4629,-716.9571 152.1492,-682.2694 146.2303,-654.1971"/>
-<polygon fill="none" stroke="#000000" points="163.4489,-752.8275 168.9367,-761.8903 170.2983,-751.3833 163.4489,-752.8275"/>
-</g>
-<!-- A7 -->
-<g id="node8" class="node">
-<title>A7</title>
-<polygon fill="none" stroke="#000000" points="78.1165,-390 78.1165,-422 180.1165,-422 180.1165,-390 78.1165,-390"/>
-<text text-anchor="start" x="99.3905" y="-403" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">AsyncStream</text>
-<polygon fill="none" stroke="#000000" points="78.1165,-310 78.1165,-390 180.1165,-390 180.1165,-310 78.1165,-310"/>
-<text text-anchor="start" x="114.6695" y="-371" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">reader</text>
-<text text-anchor="start" x="116.8995" y="-359" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">writer</text>
-<text text-anchor="start" x="119.1135" y="-347" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">addr</text>
-<text text-anchor="start" x="114.6695" y="-335" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">r_addr</text>
-<text text-anchor="start" x="115.2245" y="-323" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">l_addr</text>
-<polygon fill="none" stroke="#000000" points="78.1165,-182 78.1165,-310 180.1165,-310 180.1165,-182 78.1165,-182"/>
-<text text-anchor="start" x="100.7705" y="-279" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt;loop</text>
-<text text-anchor="start" x="116.8985" y="-267" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">disc()</text>
-<text text-anchor="start" x="114.119" y="-255" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
-<text text-anchor="start" x="109.6705" y="-243" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">healthy()</text>
-<text text-anchor="start" x="94.387" y="-219" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__async_read()</text>
-<text text-anchor="start" x="93.8375" y="-207" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__async_write()</text>
-<text text-anchor="start" x="87.7235" y="-195" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">__async_forward()</text>
-</g>
-<!-- A6&#45;&gt;A7 -->
-<g id="edge4" class="edge">
-<title>A6&#45;&gt;A7</title>
-<path fill="none" stroke="#000000" d="M132.1177,-519.5861C131.7106,-490.0737 131.229,-455.1552 130.7721,-422.0295"/>
-<polygon fill="none" stroke="#000000" points="128.6207,-519.837 132.2584,-529.7877 135.6201,-519.7404 128.6207,-519.837"/>
-</g>
-<!-- A7&#45;&gt;A8 -->
-<g id="edge5" class="edge">
-<title>A7&#45;&gt;A8</title>
-<path fill="none" stroke="#000000" d="M186.5777,-185.0204C187.4154,-184.0001 188.2616,-182.9929 189.1165,-182 210.4788,-157.1889 238.2469,-135.0276 264.8921,-116.8901"/>
-<polygon fill="none" stroke="#000000" points="183.6875,-183.0361 180.3256,-193.0834 189.2193,-187.3255 183.6875,-183.0361"/>
-</g>
-<!-- A7&#45;&gt;A9 -->
-<g id="edge6" class="edge">
-<title>A7&#45;&gt;A9</title>
-<path fill="none" stroke="#000000" d="M147.3214,-171.8077C150.1952,-151.2556 152.9992,-131.2022 155.3799,-114.1772"/>
-<polygon fill="none" stroke="#000000" points="143.8252,-171.5375 145.9065,-181.9259 150.7577,-172.5069 143.8252,-171.5375"/>
-</g>
-<!-- A10 -->
-<g id="node11" class="node">
-<title>A10</title>
-<polygon fill="none" stroke="#000000" points="319.1165,-668 319.1165,-700 410.1165,-700 410.1165,-668 319.1165,-668"/>
-<text text-anchor="start" x="337.1115" y="-681" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">SolarmanV5</text>
-<polygon fill="none" stroke="#000000" points="319.1165,-552 319.1165,-668 410.1165,-668 410.1165,-552 319.1165,-552"/>
-<text text-anchor="start" x="345.4395" y="-649" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">conn_no</text>
-<text text-anchor="start" x="354.6135" y="-637" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">addr</text>
-<text text-anchor="start" x="349.6145" y="-613" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">control</text>
-<text text-anchor="start" x="352.674" y="-601" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">serial</text>
-<text text-anchor="start" x="357.6725" y="-589" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">snr</text>
-<text text-anchor="start" x="336.8265" y="-577" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">db:InfosG3P</text>
-<text text-anchor="start" x="350.7285" y="-565" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">switch</text>
-<polygon fill="none" stroke="#000000" points="319.1165,-484 319.1165,-552 410.1165,-552 410.1165,-484 319.1165,-484"/>
-<text text-anchor="start" x="329.057" y="-533" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">msg_unknown()</text>
-<text text-anchor="start" x="345.1705" y="-509" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">healthy()</text>
-<text text-anchor="start" x="349.619" y="-497" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
-</g>
-<!-- A10&#45;&gt;A3 -->
-<g id="edge7" class="edge">
-<title>A10&#45;&gt;A3</title>
-<path fill="none" stroke="#000000" d="M366.9763,-473.5237C368.222,-421.9136 369.5798,-365.6622 370.389,-332.138"/>
-<polygon fill="#000000" stroke="#000000" points="366.733,-483.6023 362.4757,-473.4966 366.8537,-478.6038 366.9744,-473.6052 366.9744,-473.6052 366.9744,-473.6052 366.8537,-478.6038 371.4731,-473.7139 366.733,-483.6023 366.733,-483.6023"/>
-<polygon fill="#000000" stroke="#000000" points="370.3911,-332.0495 366.5371,-325.9547 370.6807,-320.053 374.5347,-326.1478 370.3911,-332.0495"/>
-</g>
-<!-- A10&#45;&gt;A4 -->
-<g id="edge9" class="edge">
-<title>A10&#45;&gt;A4</title>
-<path fill="none" stroke="#000000" d="M318.2339,-474.2481C295.3796,-415.5956 270.1211,-350.7729 258.151,-320.053"/>
-<polygon fill="#000000" stroke="#000000" points="321.8788,-483.6023 314.0551,-475.9185 320.0634,-478.9435 318.2481,-474.2847 318.2481,-474.2847 318.2481,-474.2847 320.0634,-478.9435 322.441,-472.6508 321.8788,-483.6023 321.8788,-483.6023"/>
-<text text-anchor="middle" x="272.6076" y="-330.8736" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">0..1</text>
-</g>
-<!-- A12 -->
-<g id="node13" class="node">
-<title>A12</title>
-<polygon fill="none" stroke="#000000" points="442.1165,-318 442.1165,-350 509.1165,-350 509.1165,-318 442.1165,-318"/>
-<text text-anchor="start" x="454.775" y="-331" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">InfosG3P</text>
-<polygon fill="none" stroke="#000000" points="442.1165,-298 442.1165,-318 509.1165,-318 509.1165,-298 442.1165,-298"/>
-<polygon fill="none" stroke="#000000" points="442.1165,-254 442.1165,-298 509.1165,-298 509.1165,-254 442.1165,-254"/>
-<text text-anchor="start" x="452.0005" y="-279" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_confs()</text>
-<text text-anchor="start" x="459.7845" y="-267" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">parse()</text>
-</g>
-<!-- A10&#45;&gt;A12 -->
-<g id="edge12" class="edge">
-<title>A10&#45;&gt;A12</title>
-<path fill="none" stroke="#000000" d="M405.6067,-483.6023C421.7045,-441.5449 439.4849,-395.0916 453.0329,-359.6958"/>
-<polygon fill="#000000" stroke="#000000" points="456.737,-350.0185 457.3649,-360.9664 454.9496,-354.6881 453.1623,-359.3577 453.1623,-359.3577 453.1623,-359.3577 454.9496,-354.6881 448.9596,-357.7491 456.737,-350.0185 456.737,-350.0185"/>
-</g>
-<!-- A11 -->
-<g id="node12" class="node">
-<title>A11</title>
-<polygon fill="none" stroke="#000000" points="428.1165,-680 428.1165,-712 531.1165,-712 531.1165,-680 428.1165,-680"/>
-<text text-anchor="start" x="468.7785" y="-693" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Infos</text>
-<polygon fill="none" stroke="#000000" points="428.1165,-624 428.1165,-680 531.1165,-680 531.1165,-624 428.1165,-624"/>
-<text text-anchor="start" x="471.558" y="-661" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">stat</text>
-<text text-anchor="start" x="447.1025" y="-649" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">new_stat_data</text>
-<text text-anchor="start" x="460.72" y="-637" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">info_dev</text>
-<polygon fill="none" stroke="#000000" points="428.1165,-472 428.1165,-624 531.1165,-624 531.1165,-472 428.1165,-472"/>
-<text text-anchor="start" x="455.452" y="-605" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">static_init()</text>
-<text text-anchor="start" x="453.501" y="-593" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">dev_value()</text>
-<text text-anchor="start" x="450.447" y="-581" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">inc_counter()</text>
-<text text-anchor="start" x="448.777" y="-569" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">dec_counter()</text>
-<text text-anchor="start" x="446.8265" y="-557" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_proxy_conf</text>
-<text text-anchor="start" x="461.8295" y="-545" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_conf</text>
-<text text-anchor="start" x="454.6105" y="-533" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ha_remove</text>
-<text text-anchor="start" x="455.991" y="-521" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">update_db</text>
-<text text-anchor="start" x="440.1535" y="-509" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">set_db_def_value</text>
-<text text-anchor="start" x="449.602" y="-497" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">get_db_value</text>
-<text text-anchor="start" x="437.939" y="-485" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ignore_this_device</text>
-</g>
-<!-- A11&#45;&gt;A12 -->
-<g id="edge11" class="edge">
-<title>A11&#45;&gt;A12</title>
-<path fill="none" stroke="#000000" d="M477.322,-461.8987C476.7744,-422.1971 476.206,-380.9898 475.7834,-350.352"/>
-<polygon fill="none" stroke="#000000" points="473.823,-462.0018 477.4607,-471.9525 480.8223,-461.9052 473.823,-462.0018"/>
-</g>
-<!-- A13 -->
-<g id="node14" class="node">
-<title>A13</title>
-<polygon fill="none" stroke="#000000" points="172.1165,-1464 172.1165,-1496 321.1165,-1496 321.1165,-1464 172.1165,-1464"/>
-<text text-anchor="start" x="226.334" y="-1477" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Message</text>
-<polygon fill="none" stroke="#000000" points="172.1165,-1240 172.1165,-1464 321.1165,-1464 321.1165,-1240 172.1165,-1240"/>
-<text text-anchor="start" x="209.943" y="-1445" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">server_side:bool</text>
-<text text-anchor="start" x="220.5005" y="-1433" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">mb:Modbus</text>
-<text text-anchor="start" x="221.335" y="-1421" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">ifc:AsyncIfc</text>
-<text text-anchor="start" x="228.83" y="-1409" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">node_id</text>
-<text text-anchor="start" x="207.1595" y="-1397" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">header_valid:bool</text>
-<text text-anchor="start" x="221.6065" y="-1385" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">header_len</text>
-<text text-anchor="start" x="227.4405" y="-1373" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">data_len</text>
-<text text-anchor="start" x="224.941" y="-1361" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">unique_id</text>
-<text text-anchor="start" x="218.8315" y="-1349" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">sug_area:str</text>
-<text text-anchor="start" x="215.7725" y="-1337" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">new_data:dict</text>
-<text text-anchor="start" x="222.7165" y="-1325" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">state:State</text>
-<text text-anchor="start" x="196.321" y="-1313" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">shutdown_started:bool</text>
-<text text-anchor="start" x="215.501" y="-1301" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">modbus_elms</text>
-<text text-anchor="start" x="211.6235" y="-1289" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">mb_timer:Timer</text>
-<text text-anchor="start" x="220.5015" y="-1277" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">mb_timeout</text>
-<text text-anchor="start" x="209.669" y="-1265" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">mb_first_timeout</text>
-<text text-anchor="start" x="200.7705" y="-1253" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">modbus_polling:bool</text>
-<polygon fill="none" stroke="#000000" points="172.1165,-1136 172.1165,-1240 321.1165,-1240 321.1165,-1136 172.1165,-1136"/>
-<text text-anchor="start" x="195.501" y="-1221" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_set_mqtt_timestamp()</text>
-<text text-anchor="start" x="224.1165" y="-1209" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_timeout()</text>
-<text text-anchor="start" x="196.884" y="-1197" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">_send_modbus_cmd()</text>
-<text text-anchor="start" x="181.876" y="-1185" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">&lt;async&gt; end_modbus_cmd()</text>
-<text text-anchor="start" x="231.619" y="-1173" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
-<text text-anchor="start" x="217.447" y="-1161" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">inc_counter()</text>
-<text text-anchor="start" x="215.777" y="-1149" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">dec_counter()</text>
-</g>
-<!-- A13&#45;&gt;A5 -->
-<g id="edge13" class="edge">
-<title>A13&#45;&gt;A5</title>
-<path fill="none" stroke="#000000" d="M226.347,-1135.7758C224.8967,-1122.5547 223.4359,-1109.2373 221.9911,-1096.0662"/>
-<polygon fill="#000000" stroke="#000000" points="220.8898,-1086.0268 226.4535,-1095.4764 221.4351,-1090.997 221.9803,-1095.9672 221.9803,-1095.9672 221.9803,-1095.9672 221.4351,-1090.997 217.5072,-1096.4579 220.8898,-1086.0268 220.8898,-1086.0268"/>
-<text text-anchor="middle" x="215.9686" y="-1115.6794" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">use</text>
-</g>
-<!-- A13&#45;&gt;A10 -->
-<g id="edge16" class="edge">
-<title>A13&#45;&gt;A10</title>
-<path fill="none" stroke="#000000" d="M277.1595,-1125.5329C299.2708,-989.8666 328.1962,-812.3923 346.4719,-700.2604"/>
-<polygon fill="none" stroke="#000000" points="273.6668,-1125.205 275.5125,-1135.6378 280.5757,-1126.3311 273.6668,-1125.205"/>
-</g>
-<!-- A14&#45;&gt;A13 -->
-<g id="edge15" class="edge">
-<title>A14&#45;&gt;A13</title>
-<path fill="none" stroke="#000000" stroke-dasharray="5,2" d="M204.2906,-1613.8004C208.8542,-1581.3079 214.8136,-1538.8764 220.7975,-1496.2713"/>
-<polygon fill="none" stroke="#000000" points="200.7847,-1613.5986 202.8597,-1623.9883 207.7166,-1614.5723 200.7847,-1613.5986"/>
-</g>
-<!-- A15 -->
-<g id="node16" class="node">
-<title>A15</title>
-<polygon fill="none" stroke="#000000" points="260.1165,-1766 260.1165,-1798 335.1165,-1798 335.1165,-1766 260.1165,-1766"/>
-<text text-anchor="start" x="279.834" y="-1779" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">Modbus</text>
-<polygon fill="none" stroke="#000000" points="260.1165,-1614 260.1165,-1766 335.1165,-1766 335.1165,-1614 260.1165,-1614"/>
-<text text-anchor="start" x="289.278" y="-1747" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">que</text>
-<text text-anchor="start" x="270.1065" y="-1723" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">snd_handler</text>
-<text text-anchor="start" x="271.2215" y="-1711" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">rsp_handler</text>
-<text text-anchor="start" x="281.225" y="-1699" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">timeout</text>
-<text text-anchor="start" x="271.506" y="-1687" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">max_retires</text>
-<text text-anchor="start" x="279.5585" y="-1675" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">last_xxx</text>
-<text text-anchor="start" x="291.508" y="-1663" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">err</text>
-<text text-anchor="start" x="278.17" y="-1651" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">retry_cnt</text>
-<text text-anchor="start" x="276.4955" y="-1639" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">req_pend</text>
-<text text-anchor="start" x="290.953" y="-1627" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">tim</text>
-<polygon fill="none" stroke="#000000" points="260.1165,-1546 260.1165,-1614 335.1165,-1614 335.1165,-1546 260.1165,-1546"/>
-<text text-anchor="start" x="271.5065" y="-1595" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">build_msg()</text>
-<text text-anchor="start" x="274.8405" y="-1583" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">recv_req()</text>
-<text text-anchor="start" x="272.3405" y="-1571" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">recv_resp()</text>
-<text text-anchor="start" x="282.619" y="-1559" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">close()</text>
-</g>
-<!-- A15&#45;&gt;A13 -->
-<g id="edge17" class="edge">
-<title>A15&#45;&gt;A13</title>
-<path fill="none" stroke="#000000" d="M277.6392,-1536.041C275.7633,-1522.9463 273.8413,-1509.5297 271.9169,-1496.0971"/>
-<polygon fill="#000000" stroke="#000000" points="279.064,-1545.9867 273.1913,-1536.726 278.3549,-1541.0373 277.6458,-1536.0878 277.6458,-1536.0878 277.6458,-1536.0878 278.3549,-1541.0373 282.1004,-1535.4496 279.064,-1545.9867 279.064,-1545.9867"/>
-<text text-anchor="middle" x="282.8544" y="-1509.8414" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">has</text>
-<text text-anchor="middle" x="268.1266" y="-1526.2424" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">0..1</text>
-</g>
-</g>
-</svg>
--- a/app/proxy_3.yuml
+++ b/app/proxy_3.yuml
@@ -1,42 +0,0 @@
-// {type:class}
-// {direction:topDown}
-// {generate:true}
-
-[note: Example of instantiation for a GEN3PLUS inverter!{bg:cornsilk}]
-[<<AbstractIterMeta>>||__iter__()]
-
-[InverterG3P|addr;remote:StreamPtr;local:StreamPtr|create_remote();;close()]
-[InverterG3P]++->[local:StreamPtr]
-[InverterG3P]++->[remote:StreamPtr]
-
-[<<AsyncIfc>>||set_node_id();get_conn_no();;tx_add();tx_flush();tx_get();tx_peek();tx_log();tx_clear();tx_len();;fwd_add();fwd_log();rx_get();rx_peek();rx_log();rx_clear();rx_len();rx_set_cb();;prot_set_timeout_cb()]
-[AsyncIfcImpl|fwd_fifo:ByteFifo;tx_fifo:ByteFifo;rx_fifo:ByteFifo;conn_no:Count;node_id;timeout_cb]
-[AsyncStream|reader;writer;addr;r_addr;l_addr|;<async>loop;disc();close();healthy();;__async_read();__async_write();__async_forward()]
-[AsyncStreamServer|create_remote|<async>server_loop();<async>_async_forward();<async>publish_outstanding_mqtt();close()]
-[AsyncStreamClient||<async>client_loop();<async>_async_forward())]
-[<<AsyncIfc>>]^-.-[AsyncIfcImpl]
-[AsyncIfcImpl]^[AsyncStream]
-[AsyncStream]^[AsyncStreamServer]
-[AsyncStream]^[AsyncStreamClient]
-
-[SolarmanV5|conn_no;addr;;control;serial;snr;db:InfosG3P;switch|msg_unknown();;healthy();close()]
-[SolarmanV5]<-++[local:StreamPtr]
-[local:StreamPtr]++->[AsyncStreamServer]
-[SolarmanV5]<-0..1[remote:StreamPtr]
-[remote:StreamPtr]0..1->[AsyncStreamClient]
-
-[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]
-[Infos]^[InfosG3P||ha_confs();parse()]
-
-[SolarmanV5]->[InfosG3P]
-
-[Message|server_side:bool;mb:Modbus;ifc:AsyncIfc;node_id;header_valid:bool;header_len;data_len;unique_id;sug_area:str;new_data:dict;state:State;shutdown_started:bool;modbus_elms;mb_timer:Timer;mb_timeout;mb_first_timeout;modbus_polling:bool|_set_mqtt_timestamp();_timeout();_send_modbus_cmd();<async> end_modbus_cmd();close();inc_counter();dec_counter()]
-[Message]use->[<<AsyncIfc>>]
-
-[<<ProtocolIfc>>|_registry|close()]
-[<<AbstractIterMeta>>]^-.-[<<ProtocolIfc>>]
-[<<ProtocolIfc>>]^-.-[Message]
-[Message]^[SolarmanV5]
-
-[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]<0..1-has[Message]
--- a/app/requirements-test.txt
+++ b/app/requirements-test.txt
@@ -1,6 +0,0 @@
-    flake8
-    pytest
-    pytest-asyncio
-    pytest-cov
-    mock
-    coverage
--- a/app/requirements.txt
+++ b/app/requirements.txt
@@ -1,4 +1,4 @@
-    aiomqtt==2.3.0
+    aiomqtt==2.2.0
    schema==0.7.7
    aiocron==1.8
-    aiohttp==3.10.5
+    aiohttp==3.10.2
--- a/app/src/async_ifc.py
+++ b/app/src/async_ifc.py
@@ -1,104 +0,0 @@
-from abc import ABC, abstractmethod
-
-
-class AsyncIfc(ABC):
-    @abstractmethod
-    def get_conn_no(self):
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def set_node_id(self, value: str):
-        pass  # pragma: no cover
-
-    #
-    #  TX - QUEUE
-    #
-    @abstractmethod
-    def tx_add(self, data: bytearray):
-        ''' add data to transmit queue'''
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def tx_flush(self):
-        ''' send transmit queue and clears it'''
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def tx_peek(self, size: int = None) -> bytearray:
-        '''returns size numbers of byte without removing them'''
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def tx_log(self, level, info):
-        ''' log the transmit queue'''
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def tx_clear(self):
-        ''' clear transmit queue'''
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def tx_len(self):
-        ''' get numner of bytes in the transmit queue'''
-        pass  # pragma: no cover
-
-    #
-    #  FORWARD - QUEUE
-    #
-    @abstractmethod
-    def fwd_add(self, data: bytearray):
-        ''' add data to forward queue'''
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def fwd_log(self, level, info):
-        ''' log the forward queue'''
-        pass  # pragma: no cover
-
-    #
-    #  RX - QUEUE
-    #
-    @abstractmethod
-    def rx_get(self, size: int = None) -> bytearray:
-        '''removes size numbers of bytes and return them'''
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def rx_peek(self, size: int = None) -> bytearray:
-        '''returns size numbers of byte without removing them'''
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def rx_log(self, level, info):
-        ''' logs the receive queue'''
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def rx_clear(self):
-        ''' clear receive queue'''
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def rx_len(self):
-        ''' get numner of bytes in the receive queue'''
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def rx_set_cb(self, callback):
-        pass  # pragma: no cover
-
-    #
-    #  Protocol Callbacks
-    #
-    @abstractmethod
-    def prot_set_timeout_cb(self, callback):
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def prot_set_init_new_client_conn_cb(self, callback):
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def prot_set_update_header_cb(self, callback):
-        pass  # pragma: no cover
--- a/app/src/async_stream.py
+++ b/app/src/async_stream.py
@@ -3,140 +3,16 @@ 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.proxy import Proxy
-    from app.src.byte_fifo import ByteFifo
-    from app.src.async_ifc import AsyncIfc
-    from app.src.infos import Infos
-else:  # pragma: no cover
-    from proxy import Proxy
-    from byte_fifo import ByteFifo
-    from async_ifc import AsyncIfc
-    from infos import Infos
-
-
 import gc
 logger = logging.getLogger('conn')


-class AsyncIfcImpl(AsyncIfc):
+class AsyncStream():
    _ids = count(0)
-
-    def __init__(self) -> None:
-        logger.debug('AsyncIfcImpl.__init__')
-        self.fwd_fifo = ByteFifo()
-        self.tx_fifo = ByteFifo()
-        self.rx_fifo = ByteFifo()
-        self.conn_no = next(self._ids)
-        self.node_id = ''
-        self.timeout_cb = None
-        self.init_new_client_conn_cb = None
-        self.update_header_cb = None
-
-    def close(self):
-        self.timeout_cb = None
-        self.fwd_fifo.reg_trigger(None)
-        self.tx_fifo.reg_trigger(None)
-        self.rx_fifo.reg_trigger(None)
-
-    def set_node_id(self, value: str):
-        self.node_id = value
-
-    def get_conn_no(self):
-        return self.conn_no
-
-    def tx_add(self, data: bytearray):
-        ''' add data to transmit queue'''
-        self.tx_fifo += data
-
-    def tx_flush(self):
-        ''' send transmit queue and clears it'''
-        self.tx_fifo()
-
-    def tx_peek(self, size: int = None) -> bytearray:
-        '''returns size numbers of byte without removing them'''
-        return self.tx_fifo.peek(size)
-
-    def tx_log(self, level, info):
-        ''' log the transmit queue'''
-        self.tx_fifo.logging(level, info)
-
-    def tx_clear(self):
-        ''' clear transmit queue'''
-        self.tx_fifo.clear()
-
-    def tx_len(self):
-        ''' get numner of bytes in the transmit queue'''
-        return len(self.tx_fifo)
-
-    def fwd_add(self, data: bytearray):
-        ''' add data to forward queue'''
-        self.fwd_fifo += data
-
-    def fwd_log(self, level, info):
-        ''' log the forward queue'''
-        self.fwd_fifo.logging(level, info)
-
-    def rx_get(self, size: int = None) -> bytearray:
-        '''removes size numbers of bytes and return them'''
-        return self.rx_fifo.get(size)
-
-    def rx_peek(self, size: int = None) -> bytearray:
-        '''returns size numbers of byte without removing them'''
-        return self.rx_fifo.peek(size)
-
-    def rx_log(self, level, info):
-        ''' logs the receive queue'''
-        self.rx_fifo.logging(level, info)
-
-    def rx_clear(self):
-        ''' clear receive queue'''
-        self.rx_fifo.clear()
-
-    def rx_len(self):
-        ''' get numner of bytes in the receive queue'''
-        return len(self.rx_fifo)
-
-    def rx_set_cb(self, callback):
-        self.rx_fifo.reg_trigger(callback)
-
-    def prot_set_timeout_cb(self, callback):
-        self.timeout_cb = callback
-
-    def prot_set_init_new_client_conn_cb(self, callback):
-        self.init_new_client_conn_cb = callback
-
-    def prot_set_update_header_cb(self, callback):
-        self.update_header_cb = callback
-
-
-class StreamPtr():
-    '''Descr StreamPtr'''
-    def __init__(self, _stream, _ifc=None):
-        self.stream = _stream
-        self.ifc = _ifc
-
-    @property
-    def ifc(self):
-        return self._ifc
-
-    @ifc.setter
-    def ifc(self, value):
-        self._ifc = value
-
-    @property
-    def stream(self):
-        return self._stream
-
-    @stream.setter
-    def stream(self, value):
-        self._stream = value
-
-
-class AsyncStream(AsyncIfcImpl):
    MAX_PROC_TIME = 2
    '''maximum processing time for a received msg in sec'''
    MAX_START_TIME = 400
@@ -147,42 +23,95 @@ class AsyncStream(AsyncIfcImpl):
    '''maximum default time without a received msg in sec'''

    def __init__(self, reader: StreamReader, writer: StreamWriter,
-                 rstream: "StreamPtr") -> None:
-        AsyncIfcImpl.__init__(self)
-
+                 addr) -> None:
        logger.debug('AsyncStream.__init__')
-
-        self.remote = rstream
-        self.tx_fifo.reg_trigger(self.__write_cb)
-        self._reader = reader
-        self._writer = writer
-        self.r_addr = writer.get_extra_info('peername')
-        self.l_addr = writer.get_extra_info('sockname')
+        self.reader = reader
+        self.writer = writer
+        self.addr = addr
+        self.r_addr = ''
+        self.l_addr = ''
+        self.conn_no = next(self._ids)
        self.proc_start = None  # start processing start timestamp
        self.proc_max = 0
-        self.async_publ_mqtt = None  # will be set AsyncStreamServer only
-
-    def __write_cb(self):
-        self._writer.write(self.tx_fifo.get())

    def __timeout(self) -> int:
-        if self.timeout_cb:
-            return self.timeout_cb()
-        return 360
+        if self.state == State.init or self.state == State.received:
+            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
+        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:
+            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()
+
+    async def client_loop(self, _: 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}] '
+                    'Client loop stopped for'
+                    f' l{client_stream.l_addr}')
+
+        # if the client connection closes, we don't touch the server
+        # connection. Instead we erase the client connection stream,
+        # thus on the next received packet from the inverter, we can
+        # establish a new connection to the TSUN cloud
+
+        # erase backlink to inverter
+        client_stream.remote_stream = None
+
+        if self.remote_stream == client_stream:
+            # logging.debug(f'Client l{client_stream.l_addr} refs:'
+            #               f' {gc.get_referrers(client_stream)}')
+            # than erase client connection
+            self.remote_stream = None

    async def loop(self) -> Self:
        """Async loop handler for precessing all received messages"""
+        self.r_addr = self.writer.get_extra_info('peername')
+        self.l_addr = self.writer.get_extra_info('sockname')
        self.proc_start = time.time()
        while True:
            try:
-                self.__calc_proc_time()
+                proc = time.time() - self.proc_start
+                if proc > self.proc_max:
+                    self.proc_max = proc
+                self.proc_start = None
                dead_conn_to = self.__timeout()
                await asyncio.wait_for(self.__async_read(),
                                       dead_conn_to)

-                await self.__async_write()
-                await self.__async_forward()
-                if self.async_publ_mqtt:
+                if self.unique_id:
+                    await self.async_write()
+                    await self.__async_forward()
                    await self.async_publ_mqtt()

            except asyncio.TimeoutError:
@@ -190,6 +119,7 @@ class AsyncStream(AsyncIfcImpl):
                               f'connection timeout ({dead_conn_to}s) '
                               f'for {self.l_addr}')
                await self.disc()
+                self.close()
                return self

            except OSError as error:
@@ -197,53 +127,55 @@ class AsyncStream(AsyncIfcImpl):
                             f'{error} for l{self.l_addr} | '
                             f'r{self.r_addr}')
                await self.disc()
+                self.close()
                return self

            except RuntimeError as error:
                logger.info(f'[{self.node_id}:{self.conn_no}] '
                            f'{error} for {self.l_addr}')
                await self.disc()
+                self.close()
                return self

            except Exception:
-                Infos.inc_counter('SW_Exception')
+                self.inc_counter('SW_Exception')
                logger.error(
-                    f"Exception for {self.r_addr}:\n"
+                    f"Exception for {self.addr}:\n"
                    f"{traceback.format_exc()}")
-            await asyncio.sleep(0)  # be cooperative to other task

-    def __calc_proc_time(self):
-        if self.proc_start:
-            proc = time.time() - self.proc_start
-            if proc > self.proc_max:
-                self.proc_max = proc
-            self.proc_start = None
+    async def async_write(self, headline: str = 'Transmit to ') -> None:
+        """Async write handler to transmit the send_buffer"""
+        if self._send_buffer:
+            hex_dump_memory(logging.INFO, f'{headline}{self.addr}:',
+                            self._send_buffer, len(self._send_buffer))
+            self.writer.write(self._send_buffer)
+            await self.writer.drain()
+            self._send_buffer = bytearray(0)  # self._send_buffer[sent:]

    async def disc(self) -> None:
        """Async disc handler for graceful disconnect"""
-        if self._writer.is_closing():
+        if self.writer.is_closing():
            return
        logger.debug(f'AsyncStream.disc() l{self.l_addr} | r{self.r_addr}')
-        self._writer.close()
-        await self._writer.wait_closed()
+        self.writer.close()
+        await self.writer.wait_closed()

    def close(self) -> None:
-        logging.debug(f'AsyncStream.close() l{self.l_addr} | r{self.r_addr}')
        """close handler for a no waiting disconnect

           hint: must be called before releasing the connection instance
        """
-        super().close()
-        self._reader.feed_eof()          # abort awaited read
-        if self._writer.is_closing():
+        self.reader.feed_eof()          # abort awaited read
+        if self.writer.is_closing():
            return
-        self._writer.close()
+        logger.debug(f'AsyncStream.close() l{self.l_addr} | r{self.r_addr}')
+        self.writer.close()

    def healthy(self) -> bool:
        elapsed = 0
        if self.proc_start is not None:
            elapsed = time.time() - self.proc_start
-        if elapsed > self.MAX_PROC_TIME:
+        if self.state == State.closed or elapsed > self.MAX_PROC_TIME:
            logging.debug(f'[{self.node_id}:{self.conn_no}:'
                          f'{type(self).__name__}]'
                          f' act:{round(1000*elapsed)}ms'
@@ -256,148 +188,61 @@ class AsyncStream(AsyncIfcImpl):
    '''
    async def __async_read(self) -> None:
        """Async read handler to read received data from TCP stream"""
-        data = await self._reader.read(4096)
+        data = await self.reader.read(4096)
        if data:
            self.proc_start = time.time()
-            self.rx_fifo += data
-            wait = self.rx_fifo()                # call read in parent class
-            if wait and wait > 0:
+            self._recv_buffer += data
+            wait = self.read()                # call read in parent class
+            if wait > 0:
                await asyncio.sleep(wait)
        else:
            raise RuntimeError("Peer closed.")

-    async def __async_write(self, headline: str = 'Transmit to ') -> None:
-        """Async write handler to transmit the send_buffer"""
-        if len(self.tx_fifo) > 0:
-            self.tx_fifo.logging(logging.INFO, f'{headline}{self.r_addr}:')
-            self._writer.write(self.tx_fifo.get())
-            await self._writer.drain()
-
    async def __async_forward(self) -> None:
        """forward handler transmits data over the remote connection"""
-        if len(self.fwd_fifo) == 0:
+        if not self._forward_buffer:
            return
        try:
-            await self._async_forward()
+            if not self.remote_stream:
+                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.remote_stream:
+                self.remote_stream._update_header(self._forward_buffer)
+                hex_dump_memory(logging.INFO,
+                                f'Forward to {self.remote_stream.addr}:',
+                                self._forward_buffer,
+                                len(self._forward_buffer))
+                self.remote_stream.writer.write(self._forward_buffer)
+                await self.remote_stream.writer.drain()
+                self._forward_buffer = bytearray(0)

        except OSError as error:
-            if self.remote.stream:
-                rmt = self.remote
-                logger.error(f'[{rmt.stream.node_id}:{rmt.stream.conn_no}] '
-                             f'Fwd: {error} for '
-                             f'l{rmt.ifc.l_addr} | r{rmt.ifc.r_addr}')
-                await rmt.ifc.disc()
-                if rmt.ifc.close_cb:
-                    rmt.ifc.close_cb()
+            if self.remote_stream:
+                rmt = self.remote_stream
+                self.remote_stream = 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
-                logger.info(f'[{rmt.stream.node_id}:{rmt.stream.conn_no}] '
-                            f'Fwd: {error} for {rmt.ifc.l_addr}')
-                await rmt.ifc.disc()
-                if rmt.ifc.close_cb:
-                    rmt.ifc.close_cb()
+            if self.remote_stream:
+                rmt = self.remote_stream
+                self.remote_stream = None
+                logger.info(f'[{rmt.node_id}:{rmt.conn_no}] '
+                            f'Fwd: {error} for {rmt.l_addr}')
+                await rmt.disc()
+                rmt.close()

        except Exception:
-            Infos.inc_counter('SW_Exception')
+            self.inc_counter('SW_Exception')
            logger.error(
-                f"Fwd Exception for {self.r_addr}:\n"
+                f"Fwd Exception for {self.addr}:\n"
                f"{traceback.format_exc()}")

-    async def publish_outstanding_mqtt(self):
-        '''Publish all outstanding MQTT topics'''
-        try:
-            await self.async_publ_mqtt()
-            await Proxy._async_publ_mqtt_proxy_stat('proxy')
-        except Exception:
-            pass
-
-
-class AsyncStreamServer(AsyncStream):
-    def __init__(self, reader: StreamReader, writer: StreamWriter,
-                 async_publ_mqtt, create_remote,
-                 rstream: "StreamPtr") -> None:
-        AsyncStream.__init__(self, reader, writer, rstream)
-        self.create_remote = create_remote
-        self.async_publ_mqtt = async_publ_mqtt
-
-    def close(self) -> None:
-        logging.debug('AsyncStreamServer.close()')
-        self.create_remote = None
-        self.async_publ_mqtt = None
-        super().close()
-
-    async def server_loop(self) -> None:
-        '''Loop for receiving messages from the inverter (server-side)'''
-        logger.info(f'[{self.node_id}:{self.conn_no}] '
-                    f'Accept connection from {self.r_addr}')
-        Infos.inc_counter('Inverter_Cnt')
-        await self.publish_outstanding_mqtt()
-        await self.loop()
-        Infos.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 and self.remote.stream:
-            logger.info(f'[{self.node_id}:{self.conn_no}] disc client '
-                        f'connection: [{self.remote.ifc.node_id}:'
-                        f'{self.remote.ifc.conn_no}]')
-            await self.remote.ifc.disc()
-
-    async def _async_forward(self) -> None:
-        """forward handler transmits data over the remote connection"""
-        if not self.remote.stream:
-            await self.create_remote()
-            if self.remote.stream and \
-               self.remote.ifc.init_new_client_conn_cb():
-                await self.remote.ifc._AsyncStream__async_write()
-        if self.remote.stream:
-            self.remote.ifc.update_header_cb(self.fwd_fifo.peek())
-            self.fwd_fifo.logging(logging.INFO, 'Forward to '
-                                  f'{self.remote.ifc.r_addr}:')
-            self.remote.ifc._writer.write(self.fwd_fifo.get())
-            await self.remote.ifc._writer.drain()
-
-
-class AsyncStreamClient(AsyncStream):
-    def __init__(self, reader: StreamReader, writer: StreamWriter,
-                 rstream: "StreamPtr", close_cb) -> None:
-        AsyncStream.__init__(self, reader, writer, rstream)
-        self.close_cb = close_cb
-
-    async def disc(self) -> None:
-        logging.debug('AsyncStreamClient.disc()')
-        self.remote = None
-        await super().disc()
-
-    def close(self) -> None:
-        logging.debug('AsyncStreamClient.close()')
-        self.close_cb = None
-        super().close()
-
-    async def client_loop(self, _: str) -> None:
-        '''Loop for receiving messages from the TSUN cloud (client-side)'''
-        Infos.inc_counter('Cloud_Conn_Cnt')
-        await self.publish_outstanding_mqtt()
-        await self.loop()
-        Infos.dec_counter('Cloud_Conn_Cnt')
-        await self.publish_outstanding_mqtt()
-        logger.info(f'[{self.node_id}:{self.conn_no}] '
-                    'Client loop stopped for'
-                    f' l{self.l_addr}')
-
-        if self.close_cb:
-            self.close_cb()
-
-    async def _async_forward(self) -> None:
-        """forward handler transmits data over the remote connection"""
-        if self.remote.stream:
-            self.remote.ifc.update_header_cb(self.fwd_fifo.peek())
-            self.fwd_fifo.logging(logging.INFO, 'Forward to '
-                                  f'{self.remote.ifc.r_addr}:')
-            self.remote.ifc._writer.write(self.fwd_fifo.get())
-            await self.remote.ifc._writer.drain()
+    def __del__(self):
+        logger.debug(
+            f"AsyncStream.__del__  l{self.l_addr} | r{self.r_addr}")
--- a/app/src/byte_fifo.py
+++ b/app/src/byte_fifo.py
@@ -1,56 +0,0 @@
-
-if __name__ == "app.src.byte_fifo":
-    from app.src.messages import hex_dump_str, hex_dump_memory
-else:  # pragma: no cover
-    from messages import hex_dump_str, hex_dump_memory
-
-
-class ByteFifo:
-    """ a byte FIFO buffer with trigger callback """
-    __slots__ = ('__buf', '__trigger_cb')
-
-    def __init__(self):
-        self.__buf = bytearray()
-        self.__trigger_cb = None
-
-    def reg_trigger(self, cb) -> None:
-        self.__trigger_cb = cb
-
-    def __iadd__(self, data):
-        self.__buf.extend(data)
-        return self
-
-    def __call__(self):
-        '''triggers the observer'''
-        if callable(self.__trigger_cb):
-            return self.__trigger_cb()
-        return None
-
-    def get(self, size: int = None) -> bytearray:
-        '''removes size numbers of byte and return them'''
-        if not size:
-            data = self.__buf
-            self.clear()
-        else:
-            data = self.__buf[:size]
-            # The fast delete syntax
-            self.__buf[:size] = b''
-        return data
-
-    def peek(self, size: int = None) -> bytearray:
-        '''returns size numbers of byte without removing them'''
-        if not size:
-            return self.__buf
-        return self.__buf[:size]
-
-    def clear(self):
-        self.__buf = bytearray()
-
-    def __len__(self) -> int:
-        return len(self.__buf)
-
-    def __str__(self) -> str:
-        return hex_dump_str(self.__buf, self.__len__())
-
-    def logging(self, level, info):
-        hex_dump_memory(level, info, self.__buf, self.__len__())
--- a/app/src/config.py
+++ b/app/src/config.py
@@ -12,85 +12,81 @@ 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)),
+                                                         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('forward', default=False): Use(bool),
-                },
+                        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),
+                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
@@ -150,17 +146,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

@@ -170,12 +166,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)
--- a/app/src/gen3/connection_g3.py
+++ b/app/src/gen3/connection_g3.py
@@ -0,0 +1,41 @@
+import logging
+from asyncio import StreamReader, StreamWriter
+from async_stream import AsyncStream
+from gen3.talent import Talent
+
+logger = logging.getLogger('conn')
+
+
+class ConnectionG3(AsyncStream, Talent):
+
+    def __init__(self, reader: StreamReader, writer: StreamWriter,
+                 addr, remote_stream: 'ConnectionG3', server_side: bool,
+                 id_str=b'') -> None:
+        AsyncStream.__init__(self, reader, writer, addr)
+        Talent.__init__(self, server_side, id_str)
+
+        self.remote_stream: 'ConnectionG3' = remote_stream
+
+    '''
+    Our puplic methods
+    '''
+    def close(self):
+        AsyncStream.close(self)
+        Talent.close(self)
+        # logger.info(f'AsyncStream refs: {gc.get_referrers(self)}')
+
+    async def async_create_remote(self) -> None:
+        pass  # virtual interface
+
+    async def async_publ_mqtt(self) -> None:
+        pass  # virtual interface
+
+    def healthy(self) -> bool:
+        logger.debug('ConnectionG3 healthy()')
+        return AsyncStream.healthy(self)
+
+    '''
+    Our private methods
+    '''
+    def __del__(self):
+        super().__del__()
--- a/app/src/gen3/infos_g3.py
+++ b/app/src/gen3/infos_g3.py
@@ -10,86 +10,86 @@ else:  # pragma: no cover


 class RegisterMap:
-    __slots__ = ()
-
    map = {
-        0x00092ba8: {'reg': Register.COLLECTOR_FW_VERSION},
-        0x000927c0: {'reg': Register.CHIP_TYPE},
-        0x00092f90: {'reg': Register.CHIP_MODEL},
-        0x00094ae8: {'reg': Register.MAC_ADDR},
-        0x00095a88: {'reg': Register.TRACE_URL},
-        0x00095aec: {'reg': Register.LOGGER_URL},
-        0x0000000a: {'reg': Register.PRODUCT_NAME},
-        0x00000014: {'reg': Register.MANUFACTURER},
-        0x0000001e: {'reg': Register.VERSION},
-        0x00000028: {'reg': Register.SERIAL_NUMBER},
-        0x00000032: {'reg': Register.EQUIPMENT_MODEL},
-        0x00013880: {'reg': Register.NO_INPUTS},
-        0xffffff00: {'reg': Register.INVERTER_CNT},
-        0xffffff01: {'reg': Register.UNKNOWN_SNR},
-        0xffffff02: {'reg': Register.UNKNOWN_MSG},
-        0xffffff03: {'reg': Register.INVALID_DATA_TYPE},
-        0xffffff04: {'reg': Register.INTERNAL_ERROR},
-        0xffffff05: {'reg': Register.UNKNOWN_CTRL},
-        0xffffff06: {'reg': Register.OTA_START_MSG},
-        0xffffff07: {'reg': Register.SW_EXCEPTION},
-        0xffffff08: {'reg': Register.POLLING_INTERVAL},
-        0xfffffffe: {'reg': Register.TEST_REG1},
-        0xffffffff: {'reg': Register.TEST_REG2},
-        0x00000640: {'reg': Register.OUTPUT_POWER},
-        0x000005dc: {'reg': Register.RATED_POWER},
-        0x00000514: {'reg': Register.INVERTER_TEMP},
-        0x000006a4: {'reg': Register.PV1_VOLTAGE},
-        0x00000708: {'reg': Register.PV1_CURRENT},
-        0x0000076c: {'reg': Register.PV1_POWER},
-        0x000007d0: {'reg': Register.PV2_VOLTAGE},
-        0x00000834: {'reg': Register.PV2_CURRENT},
-        0x00000898: {'reg': Register.PV2_POWER},
-        0x000008fc: {'reg': Register.PV3_VOLTAGE},
-        0x00000960: {'reg': Register.PV3_CURRENT},
-        0x000009c4: {'reg': Register.PV3_POWER},
-        0x00000a28: {'reg': Register.PV4_VOLTAGE},
-        0x00000a8c: {'reg': Register.PV4_CURRENT},
-        0x00000af0: {'reg': Register.PV4_POWER},
-        0x00000c1c: {'reg': Register.PV1_DAILY_GENERATION},
-        0x00000c80: {'reg': Register.PV1_TOTAL_GENERATION},
-        0x00000ce4: {'reg': Register.PV2_DAILY_GENERATION},
-        0x00000d48: {'reg': Register.PV2_TOTAL_GENERATION},
-        0x00000dac: {'reg': Register.PV3_DAILY_GENERATION},
-        0x00000e10: {'reg': Register.PV3_TOTAL_GENERATION},
-        0x00000e74: {'reg': Register.PV4_DAILY_GENERATION},
-        0x00000ed8: {'reg': Register.PV4_TOTAL_GENERATION},
-        0x00000b54: {'reg': Register.DAILY_GENERATION},
-        0x00000bb8: {'reg': Register.TOTAL_GENERATION},
-        0x000003e8: {'reg': Register.GRID_VOLTAGE},
-        0x0000044c: {'reg': Register.GRID_CURRENT},
-        0x000004b0: {'reg': Register.GRID_FREQUENCY},
-        0x000cfc38: {'reg': Register.CONNECT_COUNT},
-        0x000c3500: {'reg': Register.SIGNAL_STRENGTH},
-        0x000c96a8: {'reg': Register.POWER_ON_TIME},
-        0x000d0020: {'reg': Register.COLLECT_INTERVAL},
-        0x000cf850: {'reg': Register.DATA_UP_INTERVAL},
-        0x000c7f38: {'reg': Register.COMMUNICATION_TYPE},
-        0x00000190: {'reg': Register.EVENT_ALARM},
-        0x000001f4: {'reg': Register.EVENT_FAULT},
-        0x00000258: {'reg': Register.EVENT_BF1},
-        0x000002bc: {'reg': Register.EVENT_BF2},
-        0x00000064: {'reg': Register.INVERTER_STATUS},
-
-        0x00000fa0: {'reg': Register.BOOT_STATUS},
-        0x00001004: {'reg': Register.DSP_STATUS},
-        0x000010cc: {'reg': Register.WORK_MODE},
-        0x000011f8: {'reg': Register.OUTPUT_SHUTDOWN},
-        0x0000125c: {'reg': Register.MAX_DESIGNED_POWER},
-        0x000012c0: {'reg': Register.RATED_LEVEL},
-        0x00001324: {'reg': Register.INPUT_COEFFICIENT, 'ratio':  100/1024},
-        0x00001388: {'reg': Register.GRID_VOLT_CAL_COEF},
-        0x00003200: {'reg': Register.OUTPUT_COEFFICIENT, 'ratio':  100/1024},
+        0x00092ba8: Register.COLLECTOR_FW_VERSION,
+        0x000927c0: Register.CHIP_TYPE,
+        0x00092f90: Register.CHIP_MODEL,
+        0x00095a88: Register.TRACE_URL,
+        0x00095aec: Register.LOGGER_URL,
+        0x0000000a: Register.PRODUCT_NAME,
+        0x00000014: Register.MANUFACTURER,
+        0x0000001e: Register.VERSION,
+        0x00000028: Register.SERIAL_NUMBER,
+        0x00000032: Register.EQUIPMENT_MODEL,
+        0x00013880: Register.NO_INPUTS,
+        0xffffff00: Register.INVERTER_CNT,
+        0xffffff01: Register.UNKNOWN_SNR,
+        0xffffff02: Register.UNKNOWN_MSG,
+        0xffffff03: Register.INVALID_DATA_TYPE,
+        0xffffff04: Register.INTERNAL_ERROR,
+        0xffffff05: Register.UNKNOWN_CTRL,
+        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,
+        0x000005dc: Register.RATED_POWER,
+        0x00000514: Register.INVERTER_TEMP,
+        0x000006a4: Register.PV1_VOLTAGE,
+        0x00000708: Register.PV1_CURRENT,
+        0x0000076c: Register.PV1_POWER,
+        0x000007d0: Register.PV2_VOLTAGE,
+        0x00000834: Register.PV2_CURRENT,
+        0x00000898: Register.PV2_POWER,
+        0x000008fc: Register.PV3_VOLTAGE,
+        0x00000960: Register.PV3_CURRENT,
+        0x000009c4: Register.PV3_POWER,
+        0x00000a28: Register.PV4_VOLTAGE,
+        0x00000a8c: Register.PV4_CURRENT,
+        0x00000af0: Register.PV4_POWER,
+        0x00000c1c: Register.PV1_DAILY_GENERATION,
+        0x00000c80: Register.PV1_TOTAL_GENERATION,
+        0x00000ce4: Register.PV2_DAILY_GENERATION,
+        0x00000d48: Register.PV2_TOTAL_GENERATION,
+        0x00000dac: Register.PV3_DAILY_GENERATION,
+        0x00000e10: Register.PV3_TOTAL_GENERATION,
+        0x00000e74: Register.PV4_DAILY_GENERATION,
+        0x00000ed8: Register.PV4_TOTAL_GENERATION,
+        0x00000b54: Register.DAILY_GENERATION,
+        0x00000bb8: Register.TOTAL_GENERATION,
+        0x000003e8: Register.GRID_VOLTAGE,
+        0x0000044c: Register.GRID_CURRENT,
+        0x000004b0: Register.GRID_FREQUENCY,
+        0x000cfc38: Register.CONNECT_COUNT,
+        0x000c3500: Register.SIGNAL_STRENGTH,
+        0x000c96a8: Register.POWER_ON_TIME,
+        0x000d0020: Register.COLLECT_INTERVAL,
+        0x000cf850: Register.DATA_UP_INTERVAL,
+        0x000c7f38: Register.COMMUNICATION_TYPE,
+        0x00000191: Register.EVENT_401,
+        0x00000192: Register.EVENT_402,
+        0x00000193: Register.EVENT_403,
+        0x00000194: Register.EVENT_404,
+        0x00000195: Register.EVENT_405,
+        0x00000196: Register.EVENT_406,
+        0x00000197: Register.EVENT_407,
+        0x00000198: Register.EVENT_408,
+        0x00000199: Register.EVENT_409,
+        0x0000019a: Register.EVENT_410,
+        0x0000019b: Register.EVENT_411,
+        0x0000019c: Register.EVENT_412,
+        0x0000019d: Register.EVENT_413,
+        0x0000019e: Register.EVENT_414,
+        0x0000019f: Register.EVENT_415,
+        0x000001a0: Register.EVENT_416,
    }


 class InfosG3(Infos):
-    __slots__ = ()

    def ha_confs(self, ha_prfx: str, node_id: str, snr: str,
                 sug_area: str = '') \
@@ -103,8 +103,7 @@ class InfosG3(Infos):
                         entity strings
        sug_area:str ==> suggested area string from the config file'''
        # iterate over RegisterMap.map and get the register values
-        for row in RegisterMap.map.values():
-            reg = row['reg']
+        for reg in RegisterMap.map.values():
            res = self.ha_conf(reg, ha_prfx, node_id, snr, False, sug_area)  # noqa: E501
            if res:
                yield res
@@ -123,11 +122,9 @@ class InfosG3(Infos):
            result = struct.unpack_from('!lB', buf, ind)
            addr = result[0]
            if addr not in RegisterMap.map:
-                row = None
                info_id = -1
            else:
-                row = RegisterMap.map[addr]
-                info_id = row['reg']
+                info_id = RegisterMap.map[addr]
            data_type = result[1]
            ind += 5

@@ -142,6 +139,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
@@ -173,24 +171,17 @@ class InfosG3(Infos):
                              " not supported")
                return

-            result = self.__modify_val(row, result)
+            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}')

-            yield from self.__store_result(addr, result, info_id, node_id)
            i += 1
-
-    def __modify_val(self, row, result):
-        if row and 'ratio' in row:
-            result = round(result * row['ratio'], 2)
-        return result
-
-    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}')
--- a/app/src/gen3/inverter_g3.py
+++ b/app/src/gen3/inverter_g3.py
@@ -1,12 +1,130 @@
+import logging
+import traceback
+import json
+import asyncio
 from asyncio import StreamReader, StreamWriter
-if __name__ == "app.src.gen3.inverter_g3":
-    from app.src.inverter_base import InverterBase
-    from app.src.gen3.talent import Talent
-else:  # pragma: no cover
-    from inverter_base import InverterBase
-    from gen3.talent import Talent
+from config import Config
+from inverter import Inverter
+from gen3.connection_g3 import ConnectionG3
+from aiomqtt import MqttCodeError
+from infos import Infos


-class InverterG3(InverterBase):
-    def __init__(self, reader: StreamReader, writer: StreamWriter):
-        super().__init__(reader, writer, 'tsun', Talent)
+logger_mqtt = logging.getLogger('mqtt')
+
+
+class InverterG3(Inverter, ConnectionG3):
+    '''class Inverter is a derivation of an Async_Stream
+
+    The class has some class method for managing common resources like a
+    connection to the MQTT broker or proxy error counter which are common
+    for all inverter connection
+
+    Instances of the class are connections to an inverter and can have an
+    optional link to an remote connection to the TSUN cloud. A remote
+    connection dies with the inverter connection.
+
+    class methods:
+        class_init():  initialize the common resources of the proxy (MQTT
+                       broker, Proxy DB, etc). Must be called before the
+                       first inverter instance can be created
+        class_close(): release the common resources of the proxy. Should not
+                       be called before any instances of the class are
+                       destroyed
+
+    methods:
+        server_loop(addr): Async loop method for receiving messages from the
+                           inverter (server-side)
+        client_loop(addr): Async loop method for receiving messages from the
+                           TSUN cloud (client-side)
+        async_create_remote(): Establish a client connection to the TSUN cloud
+        async_publ_mqtt(): Publish data to MQTT broker
+        close(): Release method which must be called before a instance can be
+                 destroyed
+    '''
+
+    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:
+        '''Establish a client connection to the TSUN cloud'''
+        tsun = Config.get('tsun')
+        host = tsun['host']
+        port = tsun['port']
+        addr = (host, port)
+
+        try:
+            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}] '
+                         f'Connected to {addr}')
+            asyncio.create_task(self.client_loop(addr))
+
+        except (ConnectionRefusedError, TimeoutError) as error:
+            logging.info(f'{error}')
+        except Exception:
+            self.inc_counter('SW_Exception')
+            logging.error(
+                f"Inverter: Exception for {addr}:\n"
+                f"{traceback.format_exc()}")
+
+    async def async_publ_mqtt(self) -> None:
+        '''publish data to MQTT broker'''
+        # check if new inverter or collector infos are available or when the
+        #  home assistant has changed the status back to online
+        try:
+            if (('inverter' in self.new_data and self.new_data['inverter'])
+                    or ('collector' in self.new_data and
+                        self.new_data['collector'])
+                    or self.mqtt.ha_restarts != self.__ha_restarts):
+                await self._register_proxy_stat_home_assistant()
+                await self.__register_home_assistant()
+                self.__ha_restarts = self.mqtt.ha_restarts
+
+            for key in self.new_data:
+                await self.__async_publ_mqtt_packet(key)
+            for key in Infos.new_stat_data:
+                await self._async_publ_mqtt_proxy_stat(key)
+
+        except MqttCodeError as error:
+            logging.error(f'Mqtt except: {error}')
+        except Exception:
+            self.inc_counter('SW_Exception')
+            logging.error(
+                f"Inverter: Exception:\n"
+                f"{traceback.format_exc()}")
+
+    async def __async_publ_mqtt_packet(self, key):
+        db = self.db.db
+        if key in db and self.new_data[key]:
+            data_json = json.dumps(db[key])
+            node_id = self.node_id
+            logger_mqtt.debug(f'{key}: {data_json}')
+            await self.mqtt.publish(f'{self.entity_prfx}{node_id}{key}', data_json)  # noqa: E501
+            self.new_data[key] = False
+
+    async def __register_home_assistant(self) -> None:
+        '''register all our topics at home assistant'''
+        for data_json, component, node_id, id in self.db.ha_confs(
+                self.entity_prfx, self.node_id, self.unique_id,
+                self.sug_area):
+            logger_mqtt.debug(f"MQTT Register: cmp:'{component}'"
+                              f" node_id:'{node_id}' {data_json}")
+            await self.mqtt.publish(f"{self.discovery_prfx}{component}"
+                                    f"/{node_id}{id}/config", data_json)
+
+        self.db.reg_clr_at_midnight(f'{self.entity_prfx}{self.node_id}')
+
+    def close(self) -> None:
+        logging.debug(f'InverterG3.close() l{self.l_addr} | r{self.r_addr}')
+        super().close()         # call close handler in the parent class
+#         logging.info(f'Inverter refs: {gc.get_referrers(self)}')
+
+    def __del__(self):
+        logging.debug("InverterG3.__del__")
+        super().__del__()
--- a/app/src/gen3/talent.py
+++ b/app/src/gen3/talent.py
@@ -1,20 +1,20 @@
 import struct
 import logging
-from zoneinfo import ZoneInfo
+import pytz
 from datetime import datetime
 from tzlocal import get_localzone

 if __name__ == "app.src.gen3.talent":
-    from app.src.async_ifc import AsyncIfc
-    from app.src.messages import Message, State
+    from app.src.messages import hex_dump_memory, Message, State
    from app.src.modbus import Modbus
+    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 async_ifc import AsyncIfc
-    from messages import Message, State
+    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
@@ -40,19 +40,11 @@ class Control:


 class Talent(Message):
-    TXT_UNKNOWN_CTRL = 'Unknown Ctrl'
+    MB_START_TIMEOUT = 40
+    MB_REGULAR_TIMEOUT = 60

-    def __init__(self, addr, ifc: "AsyncIfc", server_side: bool,
-                 client_mode: bool = False, id_str=b''):
-        super().__init__('G3', ifc, server_side, self.send_modbus_cb,
-                         mb_timeout=15)
-        ifc.rx_set_cb(self.read)
-        ifc.prot_set_timeout_cb(self._timeout)
-        ifc.prot_set_init_new_client_conn_cb(self._init_new_client_conn)
-        ifc.prot_set_update_header_cb(self._update_header)
-
-        self.addr = addr
-        self.conn_no = ifc.get_conn_no()
+    def __init__(self, server_side: bool, id_str=b''):
+        super().__init__(server_side, self.send_modbus_cb, mb_timeout=15)
        self.await_conn_resp_cnt = 0
        self.id_str = id_str
        self.contact_name = b''
@@ -63,37 +55,49 @@ class Talent(Message):
            0x00: self.msg_contact_info,
            0x13: self.msg_ota_update,
            0x22: self.msg_get_time,
-            0x99: self.msg_heartbeat,
            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_start_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
        self.switch.clear()
        self.log_lvl.clear()
+        self.state = State.closed
+        self.mb_timer.close()
        super().close()

    def __set_serial_no(self, serial_no: str):
@@ -111,8 +115,6 @@ class Talent(Message):
                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)
-                if self.mb:
-                    self.mb.set_node_id(self.node_id)
            else:
                self.node_id = ''
                self.sug_area = ''
@@ -124,17 +126,16 @@ 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.ifc.rx_peek(), self.ifc.rx_len())
+                self.__parse_header(self._recv_buffer, len(self._recv_buffer))

            if self.header_valid and \
-               self.ifc.rx_len() >= (self.header_len + self.data_len):
+               len(self._recv_buffer) >= (self.header_len + self.data_len):
                if self.state == State.init:
                    self.state = State.received     # received 1st package

@@ -142,10 +143,11 @@ class Talent(Message):
                if callable(log_lvl):
                    log_lvl = log_lvl()

-                self.ifc.rx_log(log_lvl, f'Received from {self.addr}:'
-                                f' BufLen: {self.ifc.rx_len()}'
+                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}')
+                                f' DtaLen: {self.data_len}',
+                                self._recv_buffer, len(self._recv_buffer))

                self.__set_serial_no(self.id_str.decode("utf-8"))
                self.__dispatch_msg()
@@ -157,10 +159,11 @@ class Talent(Message):
        '''add the actual receive msg to the forwarding queue'''
        tsun = Config.get('tsun')
        if tsun['enabled']:
+            buffer = self._recv_buffer
            buflen = self.header_len+self.data_len
-            buffer = self.ifc.rx_peek(buflen)
-            self.ifc.fwd_add(buffer)
-            self.ifc.fwd_log(logging.DEBUG, 'Store for forwarding:')
+            self._forward_buffer += buffer[:buflen]
+            hex_dump_memory(logging.DEBUG, 'Store for forwarding:',
+                            buffer, buflen)

            fnc = self.switch.get(self.msg_id, self.msg_unknown)
            logger.info(self.__flow_str(self.server_side, 'forwrd') +
@@ -173,24 +176,34 @@ class Talent(Message):
            return

        self.__build_header(0x70, 0x77)
-        self.ifc.tx_add(b'\x00\x01\xa3\x28')   # magic ?
-        self.ifc.tx_add(struct.pack('!B', len(modbus_pdu)))
-        self.ifc.tx_add(modbus_pdu)
+        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()

-        self.ifc.tx_log(log_lvl, f'Send Modbus {state}:{self.addr}:')
-        self.ifc.tx_flush()
+        hex_dump_memory(log_lvl, f'Send Modbus {state}:{self.addr}:',
+                        self._send_buffer, len(self._send_buffer))
+        self.writer.write(self._send_buffer)
+        self._send_buffer = bytearray(0)  # self._send_buffer[sent:]
+
+    def _send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
+        if self.state != State.up:
+            logger.log(log_lvl, f'[{self.node_id}] ignore MODBUS cmd,'
+                       ' as the state is not UP')
+            return
+        self.mb.build_msg(Modbus.INV_ADDR, func, addr, val, log_lvl)
+
+    async def send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
+        self._send_modbus_cmd(func, addr, val, log_lvl)

    def mb_timout_cb(self, exp_cnt):
        self.mb_timer.start(self.mb_timeout)

        if 2 == (exp_cnt % 30):
            # logging.info("Regular Modbus Status request")
-            self._send_modbus_cmd(Modbus.INV_ADDR, Modbus.READ_REGS, 0x2000,
-                                  96, logging.DEBUG)
+            self._send_modbus_cmd(Modbus.READ_REGS, 0x2000, 96, logging.DEBUG)
        else:
-            self._send_modbus_cmd(Modbus.INV_ADDR, Modbus.READ_REGS, 0x3000,
-                                  48, logging.DEBUG)
+            self._send_modbus_cmd(Modbus.READ_REGS, 0x3000, 48, logging.DEBUG)

    def _init_new_client_conn(self) -> bool:
        contact_name = self.contact_name
@@ -199,9 +212,9 @@ class Talent(Message):
        self.msg_id = 0
        self.await_conn_resp_cnt += 1
        self.__build_header(0x91)
-        self.ifc.tx_add(struct.pack(f'!{len(contact_name)+1}p'
-                                    f'{len(contact_mail)+1}p',
-                                    contact_name, contact_mail))
+        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 True
@@ -233,7 +246,7 @@ class Talent(Message):

    def _utcfromts(self, ts: float):
        '''converts inverter timestamp into unix time (epoche)'''
-        dt = datetime.fromtimestamp(ts/1000, tz=ZoneInfo("UTC")). \
+        dt = datetime.fromtimestamp(ts/1000, pytz.UTC). \
            replace(tzinfo=get_localzone())
        return dt.timestamp()

@@ -280,13 +293,6 @@ class Talent(Message):
        result = struct.unpack_from('!lB', buf, 0)
        msg_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.ifc.rx_clear()
-            return

        hdr_len = 5+id_len+2

@@ -306,17 +312,16 @@ class Talent(Message):
    def __build_header(self, ctrl, msg_id=None) -> None:
        if not msg_id:
            msg_id = self.msg_id
-        self.send_msg_ofs = self.ifc.tx_len()
-        self.ifc.tx_add(struct.pack(f'!l{len(self.id_str)+1}pBB',
-                                    0, self.id_str, ctrl, msg_id))
+        self.send_msg_ofs = len(self._send_buffer)
+        self._send_buffer += struct.pack(f'!l{len(self.id_str)+1}pBB',
+                                         0, self.id_str, ctrl, msg_id)
        fnc = self.switch.get(msg_id, self.msg_unknown)
        logger.info(self.__flow_str(self.server_side, 'tx') +
                    f' Ctl: {int(ctrl):#02x} Msg: {fnc.__name__!r}')

    def __finish_send_msg(self) -> None:
-        _len = self.ifc.tx_len() - self.send_msg_ofs
-        struct.pack_into('!l', self.ifc.tx_peek(), self.send_msg_ofs,
-                         _len-4)
+        _len = len(self._send_buffer) - self.send_msg_ofs
+        struct.pack_into('!l', self._send_buffer, self.send_msg_ofs, _len-4)

    def __dispatch_msg(self) -> None:
        fnc = self.switch.get(self.msg_id, self.msg_unknown)
@@ -330,7 +335,7 @@ class Talent(Message):
                        f' Ctl: {int(self.ctrl):#02x} Msg: {fnc.__name__!r}')

    def __flush_recv_msg(self) -> None:
-        self.ifc.rx_get(self.header_len+self.data_len)
+        self._recv_buffer = self._recv_buffer[(self.header_len+self.data_len):]
        self.header_valid = False

    '''
@@ -340,7 +345,7 @@ class Talent(Message):
        if self.ctrl.is_ind():
            if self.server_side and self.__process_contact_info():
                self.__build_header(0x91)
-                self.ifc.tx_add(b'\x01')
+                self._send_buffer += b'\x01'
                self.__finish_send_msg()
            # don't forward this contact info here, we will build one
            # when the remote connection is established
@@ -349,26 +354,24 @@ class Talent(Message):
            else:
                self.forward()
        else:
-            logger.warning(self.TXT_UNKNOWN_CTRL)
+            logger.warning('Unknown Ctrl')
            self.inc_counter('Unknown_Ctrl')
            self.forward()

    def __process_contact_info(self) -> bool:
-        buf = self.ifc.rx_peek()
-        result = struct.unpack_from('!B', buf, self.header_len)
+        result = struct.unpack_from('!B', self._recv_buffer, self.header_len)
        name_len = result[0]
-        if self.data_len == 1:  # this is a response withone status byte
+        if self.data_len < name_len+2:
            return False
-        if self.data_len >= name_len+2:
-            result = struct.unpack_from(f'!{name_len+1}pB', buf,
-                                        self.header_len)
-            self.contact_name = result[0]
-            mail_len = result[1]
-            logger.info(f'name: {self.contact_name}')
+        result = struct.unpack_from(f'!{name_len+1}pB', self._recv_buffer,
+                                    self.header_len)
+        self.contact_name = result[0]
+        mail_len = result[1]
+        logger.info(f'name: {self.contact_name}')

-            result = struct.unpack_from(f'!{mail_len+1}p', buf,
-                                        self.header_len+name_len+1)
-            self.contact_mail = result[0]
+        result = struct.unpack_from(f'!{mail_len+1}p', self._recv_buffer,
+                                    self.header_len+name_len+1)
+        self.contact_mail = result[0]
        logger.info(f'mail: {self.contact_mail}')
        return True

@@ -381,62 +384,26 @@ class Talent(Message):
                ts = self._timestamp()
                logger.debug(f'time: {ts:08x}')
                self.__build_header(0x91)
-                self.ifc.tx_add(struct.pack('!q', ts))
+                self._send_buffer += struct.pack('!q', ts)
                self.__finish_send_msg()

            elif self.data_len >= 8:
                ts = self._timestamp()
-                result = struct.unpack_from('!q', self.ifc.rx_peek(),
+                result = struct.unpack_from('!q', self._recv_buffer,
                                            self.header_len)
                self.ts_offset = result[0]-ts
-                if self.ifc.remote.stream:
-                    self.ifc.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)
-            self.inc_counter('Unknown_Ctrl')
-
-        self.forward()
-
-    def msg_heartbeat(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.ifc.tx_add(b'\x02')
-                self.__finish_send_msg()
-
-                result = struct.unpack_from('!Bq', self.ifc.rx_peek(),
-                                            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}')
-                struct.pack_into('!Bq', self.ifc.rx_peek(),
-                                 self.header_len, resp_code, ts)
-        elif self.ctrl.is_resp():
-            result = struct.unpack_from('!B', self.ifc.rx_peek(),
-                                        self.header_len)
-            resp_code = result[0]
-            logging.debug(f'Heartbeat-RespCode: {resp_code}')
-            return
-        else:
-            logger.warning(self.TXT_UNKNOWN_CTRL)
+            logger.warning('Unknown Ctrl')
            self.inc_counter('Unknown_Ctrl')

        self.forward()

    def parse_msg_header(self):
-        result = struct.unpack_from('!lB', self.ifc.rx_peek(),
-                                    self.header_len)
+        result = struct.unpack_from('!lB', self._recv_buffer, self.header_len)

        data_id = result[0]    # len of complete message
        id_len = result[1]     # len of variable id string
@@ -444,7 +411,7 @@ class Talent(Message):

        msg_hdr_len = 5+id_len+9

-        result = struct.unpack_from(f'!{id_len+1}pBq', self.ifc.rx_peek(),
+        result = struct.unpack_from(f'!{id_len+1}pBq', self._recv_buffer,
                                    self.header_len + 4)

        timestamp = result[2]
@@ -457,14 +424,14 @@ class Talent(Message):
    def msg_collector_data(self):
        if self.ctrl.is_ind():
            self.__build_header(0x99)
-            self.ifc.tx_add(b'\x01')
+            self._send_buffer += b'\x01'
            self.__finish_send_msg()
            self.__process_data()

        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()
@@ -472,19 +439,19 @@ class Talent(Message):
    def msg_inverter_data(self):
        if self.ctrl.is_ind():
            self.__build_header(0x99)
-            self.ifc.tx_add(b'\x01')
+            self._send_buffer += b'\x01'
            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.mb_timer.start(self.mb_start_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()
@@ -492,7 +459,7 @@ class Talent(Message):
    def __process_data(self):
        msg_hdr_len, ts = self.parse_msg_header()

-        for key, update in self.db.parse(self.ifc.rx_peek(), self.header_len
+        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))
@@ -504,7 +471,7 @@ class Talent(Message):
        elif self.ctrl.is_ind():
            pass  # Ok, nothing to do
        else:
-            logger.warning(self.TXT_UNKNOWN_CTRL)
+            logger.warning('Unknown Ctrl')
            self.inc_counter('Unknown_Ctrl')
        self.forward()

@@ -512,20 +479,11 @@ class Talent(Message):

        msg_hdr_len = 5

-        result = struct.unpack_from('!lBB', self.ifc.rx_peek(),
+        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.ifc.rx_peek(),
-                                    self.header_len)
-        modbus_len = result[2]
-        return msg_hdr_len, modbus_len
-
    def get_modbus_log_lvl(self) -> int:
        if self.ctrl.is_req():
            return logging.INFO
@@ -535,19 +493,13 @@ class Talent(Message):

    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):
-        data = self.ifc.rx_peek()[self.header_len:
-                                  self.header_len+self.data_len]
+        data = self._recv_buffer[self.header_len:
+                                 self.header_len+self.data_len]

        if self.ctrl.is_req():
-            rstream = self.ifc.remote.stream
-            if rstream.mb.recv_req(data[hdr_len:], rstream.msg_forward):
+            if self.remote_stream.mb.recv_req(data[hdr_len:],
+                                              self.remote_stream.
+                                              msg_forward):
                self.inc_counter('Modbus_Command')
            else:
                self.inc_counter('Invalid_Msg_Format')
@@ -560,13 +512,14 @@ class Talent(Message):
                return

            for key, update, _ in self.mb.recv_resp(self.db, data[
-                    hdr_len:]):
+                    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()

--- a/app/src/gen3plus/connection_g3p.py
+++ b/app/src/gen3plus/connection_g3p.py
@@ -0,0 +1,42 @@
+import logging
+from asyncio import StreamReader, StreamWriter
+from async_stream import AsyncStream
+from gen3plus.solarman_v5 import SolarmanV5
+
+logger = logging.getLogger('conn')
+
+
+class ConnectionG3P(AsyncStream, SolarmanV5):
+
+    def __init__(self, reader: StreamReader, writer: StreamWriter,
+                 addr, remote_stream: 'ConnectionG3P',
+                 server_side: bool,
+                 client_mode: bool) -> None:
+        AsyncStream.__init__(self, reader, writer, addr)
+        SolarmanV5.__init__(self, server_side, client_mode)
+
+        self.remote_stream: 'ConnectionG3P' = remote_stream
+
+    '''
+    Our puplic methods
+    '''
+    def close(self):
+        AsyncStream.close(self)
+        SolarmanV5.close(self)
+        #  logger.info(f'AsyncStream refs: {gc.get_referrers(self)}')
+
+    async def async_create_remote(self) -> None:
+        pass  # virtual interface
+
+    async def async_publ_mqtt(self) -> None:
+        pass  # virtual interface
+
+    def healthy(self) -> bool:
+        logger.debug('ConnectionG3P healthy()')
+        return AsyncStream.healthy(self)
+
+    '''
+    Our private methods
+    '''
+    def __del__(self):
+        super().__del__()
--- a/app/src/gen3plus/infos_g3p.py
+++ b/app/src/gen3plus/infos_g3p.py
@@ -1,58 +1,36 @@

+import struct
 from typing import Generator

 if __name__ == "app.src.gen3plus.infos_g3p":
-    from app.src.infos import Infos, Register, ProxyMode, Fmt
+    from app.src.infos import Infos, Register, ProxyMode
 else:  # pragma: no cover
-    from infos import Infos, Register, ProxyMode, Fmt
+    from infos import Infos, Register, ProxyMode


 class RegisterMap:
    # make the class read/only by using __slots__
+
    __slots__ = ()
-
-    FMT_2_16BIT_VAL = '!HH'
-    FMT_3_16BIT_VAL = '!HHH'
-    FMT_4_16BIT_VAL = '!HHHH'
-
    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', 'quotient': 60, 'dep': ProxyMode.SERVER},  # 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
        0x4102001a: {'reg': Register.HEARTBEAT_INTERVAL,   'fmt': '<B', 'ratio':    1},  # noqa: E501
-        0x4102001b: {'reg': None,                          'fmt': '<B', 'const':    1},  # noqa: E501 Max No Of Connected Devices
        0x4102001c: {'reg': Register.SIGNAL_STRENGTH,      'fmt': '<B', 'ratio':    1, 'dep': ProxyMode.SERVER},  # noqa: E501
-        0x4102001d: {'reg': None,                          'fmt': '<B', 'const':    1},  # noqa: E501
        0x4102001e: {'reg': Register.CHIP_MODEL,           'fmt': '!40s'},               # noqa: E501
-        0x41020046: {'reg': Register.MAC_ADDR,             'fmt': '!6B', 'func': Fmt.mac},  # noqa: E501
        0x4102004c: {'reg': Register.IP_ADDRESS,           'fmt': '!16s'},               # noqa: E501
-        0x4102005c: {'reg': None,                          'fmt': '<B', 'const':   15},  # noqa: E501
-        0x4102005e: {'reg': None,                          'fmt': '<B', 'const':    1},  # noqa: E501 No Of Sensors (ListLen)
-        0x4102005f: {'reg': Register.SENSOR_LIST,          'fmt': '<H', 'func': Fmt.hex4},   # noqa: E501
-        0x41020061: {'reg': None,                          'fmt': '<BBB', 'const':  (15, 0, 255)},  # noqa: E501
        0x41020064: {'reg': Register.COLLECTOR_FW_VERSION, 'fmt': '!40s'},               # noqa: E501
-        0x4102008c: {'reg': None,                          'fmt': '<BB', 'const':    (254, 254)},  # noqa: E501
-        0x410200b7: {'reg': Register.SSID,                 'fmt': '!40s'},               # noqa: E501

-        0x4201000c: {'reg': Register.SENSOR_LIST,          'fmt': '<H', 'func': Fmt.hex4},   # 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, 'dep': ProxyMode.SERVER},  # noqa: E501
        0x42010020: {'reg': Register.SERIAL_NUMBER,        'fmt': '!16s'},               # noqa: E501
-
-        # Start MODBUS Block: 0x3000 (R/O Measurements)
        0x420100c0: {'reg': Register.INVERTER_STATUS,      'fmt': '!H'},                 # noqa: E501
-        0x420100c2: {'reg': Register.DETECT_STATUS_1,      'fmt': '!H'},                 # noqa: E501
-        0x420100c4: {'reg': Register.DETECT_STATUS_2,      'fmt': '!H'},                 # noqa: E501
-        0x420100c6: {'reg': Register.EVENT_ALARM,          'fmt': '!H'},                 # noqa: E501
-        0x420100c8: {'reg': Register.EVENT_FAULT,          'fmt': '!H'},                 # noqa: E501
-        0x420100ca: {'reg': Register.EVENT_BF1,            'fmt': '!H'},                 # noqa: E501
-        0x420100cc: {'reg': Register.EVENT_BF2,            'fmt': '!H'},                 # noqa: E501
-        # 0x420100ce
-        0x420100d0: {'reg': Register.VERSION,              'fmt': '!H', 'func': Fmt.version},  # noqa: E501
+        0x420100d0: {'reg': Register.VERSION,              'fmt': '!H', 'eval': "f'V{(result>>12)}.{(result>>8)&0xf}.{(result>>4)&0xf}{result&0xf}'"},  # noqa: E501
        0x420100d2: {'reg': Register.GRID_VOLTAGE,         'fmt': '!H', 'ratio':  0.1},  # noqa: E501
        0x420100d4: {'reg': Register.GRID_CURRENT,         'fmt': '!H', 'ratio': 0.01},  # noqa: E501
        0x420100d6: {'reg': Register.GRID_FREQUENCY,       'fmt': '!H', 'ratio': 0.01},  # noqa: E501
-        0x420100d8: {'reg': Register.INVERTER_TEMP,        'fmt': '!H', 'offset': -40},  # noqa: E501
-        # 0x420100da
+        0x420100d8: {'reg': Register.INVERTER_TEMP,        'fmt': '!H', 'eval': 'result-40'},  # noqa: E501
+        # 0x420100d8: {'reg': Register.INVERTER_TEMP,        'fmt': '!H'},                 # noqa: E501
        0x420100dc: {'reg': Register.RATED_POWER,          'fmt': '!H', 'ratio':    1},  # noqa: E501
        0x420100de: {'reg': Register.OUTPUT_POWER,         'fmt': '!H', 'ratio':  0.1},  # noqa: E501
        0x420100e0: {'reg': Register.PV1_VOLTAGE,          'fmt': '!H', 'ratio':  0.1},  # noqa: E501
@@ -77,44 +55,16 @@ class RegisterMap:
        0x4201010c: {'reg': Register.PV3_TOTAL_GENERATION, 'fmt': '!L', 'ratio': 0.01},  # noqa: E501
        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
-        0x42010116: {'reg': Register.INV_UNKNOWN_1,        'fmt': '!H'},                 # noqa: E501
-
-        # Start MODBUS Block: 0x2000 (R/W Config Paramaneters)
-        0x42010118: {'reg': Register.BOOT_STATUS,          'fmt': '!H'},
-        0x4201011a: {'reg': Register.DSP_STATUS,           'fmt': '!H'},
-        0x4201011c: {'reg': None,                          'fmt': '!H', 'const':    1},  # noqa: E501
-        0x4201011e: {'reg': Register.WORK_MODE,            'fmt': '!H'},
-        0x42010124: {'reg': Register.OUTPUT_SHUTDOWN,      'fmt': '!H'},
-        0x42010126: {'reg': Register.MAX_DESIGNED_POWER,   'fmt': '!H'},
-        0x42010128: {'reg': Register.RATED_LEVEL,          'fmt': '!H'},
-        0x4201012a: {'reg': Register.INPUT_COEFFICIENT,    'fmt': '!H', 'ratio':  100/1024},  # noqa: E501
-        0x4201012c: {'reg': Register.GRID_VOLT_CAL_COEF,   'fmt': '!H'},
-        0x4201012e: {'reg': None,                          'fmt': '!H', 'const':   1024},  # noqa: E501
-        0x42010130: {'reg': None,                          'fmt': FMT_4_16BIT_VAL, 'const': (1024, 1, 0xffff, 1)},  # noqa: E501
-        0x42010138: {'reg': None,                          'fmt': FMT_4_16BIT_VAL, 'const': (6, 0x68, 0x68, 0x500)},  # noqa: E501
-        0x42010140: {'reg': None,                          'fmt': FMT_4_16BIT_VAL, 'const': (0x9cd, 0x7b6, 0x139c, 0x1324)},  # noqa: E501
-        0x42010148: {'reg': None,                          'fmt': FMT_4_16BIT_VAL, 'const': (1, 0x7ae, 0x40f, 0x41)},  # noqa: E501
-        0x42010150: {'reg': None,                          'fmt': FMT_4_16BIT_VAL, 'const': (0xf, 0xa64, 0xa64, 0x6)},  # noqa: E501
-        0x42010158: {'reg': None,                          'fmt': FMT_4_16BIT_VAL, 'const': (0x6, 0x9f6, 0x128c, 0x128c)},  # noqa: E501
-        0x42010160: {'reg': None,                          'fmt': FMT_4_16BIT_VAL, 'const': (0x10, 0x10, 0x1452, 0x1452)},  # noqa: E501
-        0x42010168: {'reg': None,                          'fmt': FMT_4_16BIT_VAL, 'const': (0x10, 0x10, 0x151, 0x5)},  # noqa: E501
-        0x42010170: {'reg': Register.OUTPUT_COEFFICIENT,   'fmt': '!H', 'ratio':  100/1024},  # noqa: E501
-        0x42010172: {'reg': None,                          'fmt': FMT_3_16BIT_VAL, 'const':  (0x1, 0x139c, 0xfa0)},  # noqa: E501
-        0x42010178: {'reg': None,                          'fmt': FMT_4_16BIT_VAL, 'const': (0x4e, 0x66, 0x3e8, 0x400)},  # noqa: E501
-        0x42010180: {'reg': None,                          'fmt': FMT_4_16BIT_VAL, 'const': (0x9ce, 0x7a8, 0x139c, 0x1326)},  # noqa: E501
-        0x42010188: {'reg': None,                          'fmt': FMT_4_16BIT_VAL, 'const': (0x0, 0x0, 0x0, 0)},  # noqa: E501
-        0x42010190: {'reg': None,                          'fmt': FMT_4_16BIT_VAL, 'const': (0x0, 0x0, 1024, 1024)},  # noqa: E501
-        0x42010198: {'reg': None,                          'fmt': FMT_4_16BIT_VAL, 'const': (0, 0, 0xffff, 0)},  # noqa: E501
-        0x420101a0: {'reg': None,                          'fmt': FMT_2_16BIT_VAL, 'const': (0x0, 0x0)},  # noqa: E501
+        0x42010126: {'reg': Register.MAX_DESIGNED_POWER,   'fmt': '!H', 'ratio':    1},  # 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):
-    __slots__ = ('client_mode', )
-
    def __init__(self, client_mode: bool):
        super().__init__()
        self.client_mode = client_mode
@@ -168,7 +118,15 @@ class InfosG3P(Infos):
            if not isinstance(row, dict):
                continue
            info_id = row['reg']
-            result = Fmt.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)

@@ -182,23 +140,3 @@ class InfosG3P(Infos):
            if update:
                self.tracer.log(level, f'[{node_id}] GEN3PLUS: {name}'
                                       f' : {result}{unit}')
-
-    def build(self, len, msg_type: int, rcv_ftype: int):
-        buf = bytearray(len)
-        for idx, row in RegisterMap.map.items():
-            addr = idx & 0xffff
-            ftype = (idx >> 16) & 0xff
-            mtype = (idx >> 24) & 0xff
-            if ftype != rcv_ftype or mtype != msg_type:
-                continue
-            if not isinstance(row, dict):
-                continue
-            if 'const' in row:
-                val = row['const']
-            else:
-                info_id = row['reg']
-                val = self.get_db_value(info_id)
-            if not val:
-                continue
-            Fmt.set_value(buf, addr, row, val)
-        return buf
--- a/app/src/gen3plus/inverter_g3p.py
+++ b/app/src/gen3plus/inverter_g3p.py
@@ -1,20 +1,133 @@
+import logging
+import traceback
+import json
+import asyncio
 from asyncio import StreamReader, StreamWriter
-
-if __name__ == "app.src.gen3plus.inverter_g3p":
-    from app.src.inverter_base import InverterBase
-    from app.src.gen3plus.solarman_v5 import SolarmanV5
-    from app.src.gen3plus.solarman_emu import SolarmanEmu
-else:  # pragma: no cover
-    from inverter_base import InverterBase
-    from gen3plus.solarman_v5 import SolarmanV5
-    from gen3plus.solarman_emu import SolarmanEmu
+from config import Config
+from inverter import Inverter
+from gen3plus.connection_g3p import ConnectionG3P
+from aiomqtt import MqttCodeError
+from infos import Infos


-class InverterG3P(InverterBase):
-    def __init__(self, reader: StreamReader, writer: StreamWriter,
+logger_mqtt = logging.getLogger('mqtt')
+
+
+class InverterG3P(Inverter, ConnectionG3P):
+    '''class Inverter is a derivation of an Async_Stream
+
+    The class has some class method for managing common resources like a
+    connection to the MQTT broker or proxy error counter which are common
+    for all inverter connection
+
+    Instances of the class are connections to an inverter and can have an
+    optional link to an remote connection to the TSUN cloud. A remote
+    connection dies with the inverter connection.
+
+    class methods:
+        class_init():  initialize the common resources of the proxy (MQTT
+                       broker, Proxy DB, etc). Must be called before the
+                       first inverter instance can be created
+        class_close(): release the common resources of the proxy. Should not
+                       be called before any instances of the class are
+                       destroyed
+
+    methods:
+        server_loop(addr): Async loop method for receiving messages from the
+                           inverter (server-side)
+        client_loop(addr): Async loop method for receiving messages from the
+                           TSUN cloud (client-side)
+        async_create_remote(): Establish a client connection to the TSUN cloud
+        async_publ_mqtt(): Publish data to MQTT broker
+        close(): Release method which must be called before a instance can be
+                 destroyed
+    '''
+
+    def __init__(self, reader: StreamReader, writer: StreamWriter, addr,
                 client_mode: bool = False):
-        remote_prot = None
-        if client_mode:
-            remote_prot = SolarmanEmu
-        super().__init__(reader, writer, 'solarman',
-                         SolarmanV5, client_mode, remote_prot)
+        super().__init__(reader, writer, addr, None,
+                         server_side=True, client_mode=client_mode)
+        self.__ha_restarts = -1
+
+    async def async_create_remote(self) -> None:
+        '''Establish a client connection to the TSUN cloud'''
+        tsun = Config.get('solarman')
+        host = tsun['host']
+        port = tsun['port']
+        addr = (host, port)
+
+        try:
+            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}] '
+                         f'Connected to {addr}')
+            asyncio.create_task(self.client_loop(addr))
+
+        except (ConnectionRefusedError, TimeoutError) as error:
+            logging.info(f'{error}')
+        except Exception:
+            self.inc_counter('SW_Exception')
+            logging.error(
+                f"Inverter: Exception for {addr}:\n"
+                f"{traceback.format_exc()}")
+
+    async def async_publ_mqtt(self) -> None:
+        '''publish data to MQTT broker'''
+        # check if new inverter or collector infos are available or when the
+        #  home assistant has changed the status back to online
+        try:
+            if (('inverter' in self.new_data and self.new_data['inverter'])
+                    or ('collector' in self.new_data and
+                        self.new_data['collector'])
+                    or self.mqtt.ha_restarts != self.__ha_restarts):
+                await self._register_proxy_stat_home_assistant()
+                await self.__register_home_assistant()
+                self.__ha_restarts = self.mqtt.ha_restarts
+
+            for key in self.new_data:
+                await self.__async_publ_mqtt_packet(key)
+            for key in Infos.new_stat_data:
+                await self._async_publ_mqtt_proxy_stat(key)
+
+        except MqttCodeError as error:
+            logging.error(f'Mqtt except: {error}')
+        except Exception:
+            self.inc_counter('SW_Exception')
+            logging.error(
+                f"Inverter: Exception:\n"
+                f"{traceback.format_exc()}")
+
+    async def __async_publ_mqtt_packet(self, key):
+        db = self.db.db
+        if key in db and self.new_data[key]:
+            data_json = json.dumps(db[key])
+            node_id = self.node_id
+            logger_mqtt.debug(f'{key}: {data_json}')
+            await self.mqtt.publish(f'{self.entity_prfx}{node_id}{key}', data_json)  # noqa: E501
+            self.new_data[key] = False
+
+    async def __register_home_assistant(self) -> None:
+        '''register all our topics at home assistant'''
+        for data_json, component, node_id, id in self.db.ha_confs(
+                self.entity_prfx, self.node_id, self.unique_id,
+                self.sug_area):
+            logger_mqtt.debug(f"MQTT Register: cmp:'{component}'"
+                              f" node_id:'{node_id}' {data_json}")
+            await self.mqtt.publish(f"{self.discovery_prfx}{component}"
+                                    f"/{node_id}{id}/config", data_json)
+
+        self.db.reg_clr_at_midnight(f'{self.entity_prfx}{self.node_id}')
+
+    def close(self) -> None:
+        logging.debug(f'InverterG3P.close() l{self.l_addr} | r{self.r_addr}')
+        super().close()         # call close handler in the parent class
+#        logger.debug (f'Inverter refs: {gc.get_referrers(self)}')
+
+    def __del__(self):
+        logging.debug("InverterG3P.__del__")
+        super().__del__()
--- a/app/src/gen3plus/solarman_emu.py
+++ b/app/src/gen3plus/solarman_emu.py
@@ -1,144 +0,0 @@
-import logging
-import struct
-
-if __name__ == "app.src.gen3plus.solarman_emu":
-    from app.src.async_ifc import AsyncIfc
-    from app.src.gen3plus.solarman_v5 import SolarmanBase
-    from app.src.my_timer import Timer
-    from app.src.infos import Register
-else:  # pragma: no cover
-    from async_ifc import AsyncIfc
-    from gen3plus.solarman_v5 import SolarmanBase
-    from my_timer import Timer
-    from infos import Register
-
-logger = logging.getLogger('msg')
-
-
-class SolarmanEmu(SolarmanBase):
-    def __init__(self, addr, ifc: "AsyncIfc",
-                 server_side: bool, client_mode: bool):
-        super().__init__(addr, ifc, server_side=False,
-                         _send_modbus_cb=None,
-                         mb_timeout=8)
-        logging.debug('SolarmanEmu.init()')
-        self.db = ifc.remote.stream.db
-        self.snr = ifc.remote.stream.snr
-        self.hb_timeout = 60
-        '''actual heatbeat timeout from the last response message'''
-        self.data_up_inv = self.db.get_db_value(Register.DATA_UP_INTERVAL)
-        '''time interval for getting new MQTT data messages'''
-        self.hb_timer = Timer(self.send_heartbeat_cb, self.node_id)
-        self.data_timer = Timer(self.send_data_cb, self.node_id)
-        self.last_sync = self._emu_timestamp()
-        '''timestamp when we send the last sync message (4110)'''
-        self.pkt_cnt = 0
-        '''last sent packet number'''
-
-        self.switch = {
-
-            0x4210: 'msg_data_ind',      # real time data
-            0x1210: self.msg_response,   # at least every 5 minutes
-
-            0x4710: 'msg_hbeat_ind',     # heatbeat
-            0x1710: self.msg_response,   # every 2 minutes
-
-            0x4110: 'msg_dev_ind',        # device data, sync start
-            0x1110: self.msg_response,    # every 3 hours
-
-        }
-
-        self.log_lvl = {
-
-            0x4110: logging.INFO,   # device data, sync start
-            0x1110: logging.INFO,   # every 3 hours
-
-            0x4210: logging.INFO,   # real time data
-            0x1210: logging.INFO,   # at least every 5 minutes
-
-            0x4710: logging.DEBUG,  # heatbeat
-            0x1710: logging.DEBUG,  # every 2 minutes
-
-        }
-
-    '''
-    Our puplic methods
-    '''
-    def close(self) -> None:
-        logging.info('SolarmanEmu.close()')
-        # 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
-        self.switch.clear()
-        self.log_lvl.clear()
-        self.hb_timer.close()
-        self.data_timer.close()
-        self.db = None
-        super().close()
-
-    def _set_serial_no(self, snr: int):
-        logging.debug(f'SolarmanEmu._set_serial_no, snr: {snr}')
-        self.unique_id = str(snr)
-
-    def _init_new_client_conn(self) -> bool:
-        logging.debug('SolarmanEmu.init_new()')
-        self.data_timer.start(self.data_up_inv)
-        return False
-
-    def next_pkt_cnt(self):
-        '''get the next packet number'''
-        self.pkt_cnt = (self.pkt_cnt + 1) & 0xffffffff
-        return self.pkt_cnt
-
-    def seconds_since_last_sync(self):
-        '''get seconds since last 0x4110 message was sent'''
-        return self._emu_timestamp() - self.last_sync
-
-    def send_heartbeat_cb(self, exp_cnt):
-        '''send a heartbeat to the TSUN cloud'''
-        self._build_header(0x4710)
-        self.ifc.tx_add(struct.pack('<B', 0))
-        self._finish_send_msg()
-        log_lvl = self.log_lvl.get(0x4710, logging.WARNING)
-        self.ifc.tx_log(log_lvl, 'Send heartbeat:')
-        self.ifc.tx_flush()
-
-    def send_data_cb(self, exp_cnt):
-        '''send a inverter data message to the TSUN cloud'''
-        self.hb_timer.start(self.hb_timeout)
-        self.data_timer.start(self.data_up_inv)
-        _len = 420
-        ftype = 1
-        build_msg = self.db.build(_len, 0x42, ftype)
-
-        self._build_header(0x4210)
-        self.ifc.tx_add(
-            struct.pack(
-                '<BHLLLHL', ftype, 0x02b0,
-                self._emu_timestamp(),
-                self.seconds_since_last_sync(),
-                self.time_ofs,
-                1,  # offset 0x1a
-                self.next_pkt_cnt()))
-        self.ifc.tx_add(build_msg[0x20:])
-        self._finish_send_msg()
-        log_lvl = self.log_lvl.get(0x4210, logging.WARNING)
-        self.ifc.tx_log(log_lvl, 'Send inv-data:')
-        self.ifc.tx_flush()
-
-    '''
-    Message handler methods
-    '''
-    def msg_response(self):
-        '''handle a received response from the TSUN cloud'''
-        logger.debug("EMU received rsp:")
-        _, _, ts, hb = super().msg_response()
-        logger.debug(f"EMU ts:{ts} hb:{hb}")
-        self.hb_timeout = hb
-        self.time_ofs = ts - self._emu_timestamp()
-        self.hb_timer.start(self.hb_timeout)
-
-    def msg_unknown(self):
-        '''counts a unknown or unexpected message from the TSUN cloud'''
-        logger.warning(f"EMU Unknow Msg: ID:{int(self.control):#04x}")
-        self.inc_counter('Unknown_Msg')
--- a/app/src/gen3plus/solarman_v5.py
+++ b/app/src/gen3plus/solarman_v5.py
@@ -5,19 +5,19 @@ import asyncio
 from datetime import datetime

 if __name__ == "app.src.gen3plus.solarman_v5":
-    from app.src.async_ifc import AsyncIfc
    from app.src.messages import hex_dump_memory, Message, State
    from app.src.modbus import Modbus
+    from app.src.my_timer import Timer
    from app.src.config import Config
    from app.src.gen3plus.infos_g3p import InfosG3P
-    from app.src.infos import Register, Fmt
+    from app.src.infos import Register
 else:  # pragma: no cover
-    from async_ifc import AsyncIfc
    from messages import hex_dump_memory, Message, State
    from config import Config
    from modbus import Modbus
+    from my_timer import Timer
    from gen3plus.infos_g3p import InfosG3P
-    from infos import Register, Fmt
+    from infos import Register

 logger = logging.getLogger('msg')

@@ -48,228 +48,28 @@ class Sequence():
        return f'{self.rcv_idx:02x}:{self.snd_idx:02x}'


-class SolarmanBase(Message):
-    def __init__(self, addr, ifc: "AsyncIfc", server_side: bool,
-                 _send_modbus_cb, mb_timeout: int):
-        super().__init__('G3P', ifc, server_side, _send_modbus_cb,
-                         mb_timeout)
-        ifc.rx_set_cb(self.read)
-        ifc.prot_set_timeout_cb(self._timeout)
-        ifc.prot_set_init_new_client_conn_cb(self._init_new_client_conn)
-        ifc.prot_set_update_header_cb(self.__update_header)
-        self.addr = addr
-        self.conn_no = ifc.get_conn_no()
+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'''
+
+    def __init__(self, server_side: bool, client_mode: 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.time_ofs = 0
-
-    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.ifc.rx_peek(),
-                                    self.ifc.rx_len())
-
-            if self.header_valid and self.ifc.rx_len() >= \
-               (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
-    '''
-    Our public methods
-    '''
-    def _flow_str(self, server_side: bool, type: str):  # noqa: F821
-        switch = {
-            'rx':      '  <',
-            'tx':      '  >',
-            'forwrd':  '<< ',
-            'drop':    ' xx',
-            'rxS':     '>  ',
-            'txS':     '<  ',
-            'forwrdS': ' >>',
-            'dropS':   'xx ',
-        }
-        if server_side:
-            type += 'S'
-        return switch.get(type, '???')
-
-    def get_fnc_handler(self, ctrl):
-        fnc = self.switch.get(ctrl, self.msg_unknown)
-        if callable(fnc):
-            return fnc, repr(fnc.__name__)
-        else:
-            return self.msg_unknown, repr(fnc)
-
-    def _build_header(self, ctrl) -> None:
-        '''build header for new transmit message'''
-        self.send_msg_ofs = self.ifc.tx_len()
-
-        self.ifc.tx_add(struct.pack(
-            '<BHHHL', 0xA5, 0, ctrl, self.seq.get_send(), self.snr))
-        _fnc, _str = self.get_fnc_handler(ctrl)
-        logger.info(self._flow_str(self.server_side, 'tx') +
-                    f' Ctl: {int(ctrl):#04x} Msg: {_str}')
-
-    def _finish_send_msg(self) -> None:
-        '''finish the transmit message, set lenght and checksum'''
-        _len = self.ifc.tx_len() - self.send_msg_ofs
-        struct.pack_into('<H', self.ifc.tx_peek(), self.send_msg_ofs+1,
-                         _len-11)
-        check = sum(self.ifc.tx_peek()[
-            self.send_msg_ofs+1:self.send_msg_ofs + _len]) & 0xff
-        self.ifc.tx_add(struct.pack('<BB', check, 0x15))    # crc & stop
-
-    def _timestamp(self):
-        # utc as epoche
-        return int(time.time())    # pragma: no cover
-
-    def _emu_timestamp(self):
-        '''timestamp for an emulated inverter (realtime - 1 day)'''
-        one_day = 24*60*60
-        return self._timestamp()-one_day
-
-    '''
-    Our private methods
-    '''
-    def __update_header(self, _forward_buffer):
-        '''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, 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)
-
-    def __process_complete_received_msg(self):
-        log_lvl = self.log_lvl.get(self.control, logging.WARNING)
-        if callable(log_lvl):
-            log_lvl = log_lvl()
-        self.ifc.rx_log(log_lvl, f'Received from {self.addr}:')
-        # self._recv_buffer, self.header_len +
-        # self.data_len+2)
-        if self.__trailer_is_ok(self.ifc.rx_peek(), 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()
-
-    def __parse_header(self, buf: bytes, buf_len: int) -> None:
-
-        if (buf_len < self.header_len):  # enough bytes for complete header?
-            return
-
-        result = struct.unpack_from('<BHHHL', buf, 0)
-
-        # store parsed header values in the class
-        start = result[0]            # start byte
-        self.data_len = result[1]    # len of variable id string
-        self.control = result[2]
-        self.seq.set_recv(result[3])
-        self.snr = result[4]
-
-        if start != 0xA5:
-            hex_dump_memory(logging.ERROR,
-                            'Drop packet w invalid start byte from'
-                            f' {self.addr}:', buf, buf_len)
-
-            self.inc_counter('Invalid_Msg_Format')
-            # erase broken recv buffer
-            self.ifc.rx_clear()
-            return
-        self.header_valid = True
-
-    def __trailer_is_ok(self, buf: bytes, buf_len: int) -> bool:
-        crc = buf[self.data_len+11]
-        stop = buf[self.data_len+12]
-        if stop != 0x15:
-            hex_dump_memory(logging.ERROR,
-                            'Drop packet w invalid stop byte from '
-                            f'{self.addr}:', buf, buf_len)
-            self.inc_counter('Invalid_Msg_Format')
-            if self.ifc.rx_len() > (self.data_len+13):
-                next_start = buf[self.data_len+13]
-                if next_start != 0xa5:
-                    # erase broken recv buffer
-                    self.ifc.rx_clear()
-
-            return False
-
-        check = sum(buf[1:buf_len-2]) & 0xff
-        if check != crc:
-            self.inc_counter('Invalid_Msg_Format')
-            logger.debug(f'CRC {int(crc):#02x} {int(check):#08x}'
-                         f' Stop:{int(stop):#02x}')
-            # start & stop byte are valid, discard only this message
-            return False
-
-        return True
-
-    def __flush_recv_msg(self) -> None:
-        self.ifc.rx_get(self.header_len + self.data_len+2)
-        self.header_valid = False
-
-    def __dispatch_msg(self) -> None:
-        _fnc, _str = self.get_fnc_handler(self.control)
-        if self.unique_id:
-            logger.info(self._flow_str(self.server_side, 'rx') +
-                        f' Ctl: {int(self.control):#04x}' +
-                        f' Msg: {_str}')
-            _fnc()
-        else:
-            logger.info(self._flow_str(self.server_side, 'drop') +
-                        f' Ctl: {int(self.control):#04x}' +
-                        f' Msg: {_str}')
-
-    '''
-    Message handler methods
-    '''
-    def msg_response(self):
-        data = self.ifc.rx_peek()[self.header_len:]
-        result = struct.unpack_from('<BBLL', data, 0)
-        ftype = result[0]  # always 2
-        valid = result[1] == 1  # status
-        ts = result[2]
-        set_hb = result[3]  # always 60 or 120
-        logger.debug(f'ftype:{ftype} accepted:{valid}'
-                     f' ts:{ts:08x}  nextHeartbeat: {set_hb}s')
-
-        dt = datetime.fromtimestamp(ts)
-        logger.debug(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}')
-        return ftype, valid, ts, set_hb
-
-
-class SolarmanV5(SolarmanBase):
-    AT_CMD = 1
-    MB_RTU_CMD = 2
-    '''regular Modbus polling time in server mode'''
-    MB_CLIENT_DATA_UP = 10
-    '''Data up time in client mode'''
-    HDR_FMT = '<BLLL'
-    '''format string for packing of the header'''
-
-    def __init__(self, addr, ifc: "AsyncIfc",
-                 server_side: bool, client_mode: bool):
-        super().__init__(addr, ifc, server_side, self.send_modbus_cb,
-                         mb_timeout=8)
-
        self.db = InfosG3P(client_mode)
+        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.establish_inv_emu = False
-        '''create an Solarman EMU instance to send data to the TSUN cloud'''
        self.switch = {

            0x4210: self.msg_data_ind,   # real time data
@@ -324,117 +124,87 @@ class SolarmanV5(SolarmanBase):
            0x4510: logging.INFO,  # from server
            0x1510: self.get_cmd_rsp_log_lvl,
        }
+        self.modbus_elms = 0    # for unit tests
        g3p_cnf = Config.get('gen3plus')

        if 'at_acl' in g3p_cnf:  # pragma: no cover
            self.at_acl = g3p_cnf['at_acl']

-        self.sensor_list = 0x0000
-        self.mb_start_reg = 0x0001    # 0x7001
-        self.mb_incr_reg = 0x100      # 4
-        self.mb_inv_no = 144           # 3
-        self.mb_scan_len = 4
+        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_start_timeout = self.MB_START_TIMEOUT
+        '''timer value for next Modbus polling request'''
+        self.modbus_polling = False

    '''
    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
        self.switch.clear()
        self.log_lvl.clear()
+        self.state = State.closed
+        self.mb_timer.close()
        super().close()

    async def send_start_cmd(self, snr: int, host: str,
-                             forward: bool,
                             start_timeout=MB_CLIENT_DATA_UP):
        self.no_forwarding = True
-        self.establish_inv_emu = forward
        self.snr = snr
-        self._set_serial_no(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.DATA_UP_INTERVAL,
-                                 300)
-        self.db.set_db_def_value(Register.COLLECT_INTERVAL,
-                                 1)
        self.db.set_db_def_value(Register.HEARTBEAT_INTERVAL,
-                                 120)
-        self.db.set_db_def_value(Register.SENSOR_LIST,
-                                 Fmt.hex4((self.sensor_list, )))
+                                 120)  # fixme
        self.new_data['controller'] = True

        self.state = State.up
-        # self.__build_header(0x1710)
-        # self.ifc.write += struct.pack('<B', 0)
-        # self.__finish_send_msg()
-        # hex_dump_memory(logging.INFO, f'Send StartCmd:{self.addr}:',
-        #                 self.ifc.write, len(self.ifc.write))
-        # self.writer.write(self.ifc.write)
-        # self.ifc.write = bytearray(0)  # self.ifc.write[sent:]
-
-        if self.sensor_list != 0x02b0:
-            self._send_modbus_cmd(self.mb_inv_no, Modbus.READ_REGS,
-                                  self.mb_start_reg, self.mb_scan_len,
-                                  logging.INFO)
-        else:
-            self.mb_inv_no = Modbus.INV_ADDR
-            self._send_modbus_cmd(self.mb_inv_no, Modbus.READ_REGS, 0x3000,
-                                  48, logging.DEBUG)
-
+        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.mb_timer.start(self.mb_start_timeout)
                self.db.set_db_def_value(Register.POLLING_INTERVAL,
                                         self.mb_timeout)

-    def establish_emu(self):
-        _len = 223
-        build_msg = self.db.build(_len, 0x41, 2)
-        struct.pack_into(
-            '<BHHHLBL', build_msg, 0, 0xA5, _len-11, 0x4110,
-            0, self.snr, 2, self._emu_timestamp())
-        self.ifc.fwd_add(build_msg)
-        self.ifc.fwd_add(struct.pack('<BB', 0, 0x15))    # crc & stop
-
-    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']
-        if self.mb:
-            self.mb.set_node_id(self.node_id)
-
-    def _set_serial_no(self, snr: int):
-        '''check the serial number and configure the inverter connection'''
+    def __set_serial_no(self, snr: int):
        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']
+                    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)

-                    self.db.set_db_def_value(Register.COLLECTOR_SNR, snr)
-                    self.db.set_db_def_value(Register.SERIAL_NUMBER, key)
-                    break
-            else:
+            if not found:
                self.node_id = ''
                self.sug_area = ''
                if 'allow_all' not in inverters or not inverters['allow_all']:
@@ -442,75 +212,221 @@ class SolarmanV5(SolarmanBase):
                    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):
+                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()
+            else:
+                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.ifc.fwd_add(buffer[:buflen])
-            self.ifc.fwd_log(logging.DEBUG, 'Store for forwarding:')
+            self._forward_buffer += buffer[:buflen]
+            hex_dump_memory(logging.DEBUG, 'Store for forwarding:',
+                            buffer, buflen)

-            _, _str = self.get_fnc_handler(self.control)
-            logger.info(self._flow_str(self.server_side, 'forwrd') +
+            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: {_str}')
+                        f' Msg: {fnc.__name__!r}')

    def _init_new_client_conn(self) -> bool:
        return False

+    '''
+    Our private methods
+    '''
+    def __flow_str(self, server_side: bool, type: str):  # noqa: F821
+        switch = {
+            'rx':      '  <',
+            'tx':      '  >',
+            'forwrd':  '<< ',
+            'drop':    ' xx',
+            'rxS':     '>  ',
+            'txS':     '<  ',
+            'forwrdS': ' >>',
+            'dropS':   'xx ',
+        }
+        if server_side:
+            type += 'S'
+        return switch.get(type, '???')
+
+    def _timestamp(self):
+        # utc as epoche
+        return int(time.time())    # pragma: no cover
+
    def _heartbeat(self) -> int:
        return 60                  # pragma: no cover

+    def __parse_header(self, buf: bytes, buf_len: int) -> None:
+
+        if (buf_len < self.header_len):  # enough bytes for complete header?
+            return
+
+        result = struct.unpack_from('<BHHHL', buf, 0)
+
+        # store parsed header values in the class
+        start = result[0]            # start byte
+        self.data_len = result[1]    # len of variable id string
+        self.control = result[2]
+        self.seq.set_recv(result[3])
+        self.snr = result[4]
+
+        if start != 0xA5:
+            hex_dump_memory(logging.ERROR,
+                            'Drop packet w invalid start byte from'
+                            f' {self.addr}:', buf, buf_len)
+
+            self.inc_counter('Invalid_Msg_Format')
+            # erase broken recv buffer
+            self._recv_buffer = bytearray()
+            return
+        self.header_valid = True
+
+    def __trailer_is_ok(self, buf: bytes, buf_len: int) -> bool:
+        crc = buf[self.data_len+11]
+        stop = buf[self.data_len+12]
+        if stop != 0x15:
+            hex_dump_memory(logging.ERROR,
+                            'Drop packet w invalid stop byte from '
+                            f'{self.addr}:', buf, buf_len)
+            self.inc_counter('Invalid_Msg_Format')
+            if len(self._recv_buffer) > (self.data_len+13):
+                next_start = buf[self.data_len+13]
+                if next_start != 0xa5:
+                    # erase broken recv buffer
+                    self._recv_buffer = bytearray()
+
+            return False
+
+        check = sum(buf[1:buf_len-2]) & 0xff
+        if check != crc:
+            self.inc_counter('Invalid_Msg_Format')
+            logger.debug(f'CRC {int(crc):#02x} {int(check):#08x}'
+                         f' Stop:{int(stop):#02x}')
+            # start & stop byte are valid, discard only this message
+            return False
+
+        return True
+
+    def __build_header(self, ctrl) -> None:
+        '''build header for new transmit message'''
+        self.send_msg_ofs = len(self._send_buffer)
+
+        self._send_buffer += struct.pack(
+            '<BHHHL', 0xA5, 0, ctrl, self.seq.get_send(), self.snr)
+        fnc = self.switch.get(ctrl, self.msg_unknown)
+        logger.info(self.__flow_str(self.server_side, 'tx') +
+                    f' Ctl: {int(ctrl):#04x} Msg: {fnc.__name__!r}')
+
+    def __finish_send_msg(self) -> None:
+        '''finish the transmit message, set lenght and checksum'''
+        _len = len(self._send_buffer) - self.send_msg_ofs
+        struct.pack_into('<H', self._send_buffer, self.send_msg_ofs+1, _len-11)
+        check = sum(self._send_buffer[self.send_msg_ofs+1:self.send_msg_ofs +
+                                      _len]) & 0xff
+        self._send_buffer += struct.pack('<BB', check, 0x15)    # crc & stop
+
+    def _update_header(self, _forward_buffer):
+        '''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, 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)
+
+    def __dispatch_msg(self) -> None:
+        fnc = self.switch.get(self.control, self.msg_unknown)
+        if self.unique_id:
+            logger.info(self.__flow_str(self.server_side, 'rx') +
+                        f' Ctl: {int(self.control):#04x}' +
+                        f' Msg: {fnc.__name__!r}')
+            fnc()
+        else:
+            logger.info(self.__flow_str(self.server_side, 'drop') +
+                        f' Ctl: {int(self.control):#04x}' +
+                        f' Msg: {fnc.__name__!r}')
+
+    def __flush_recv_msg(self) -> None:
+        self._recv_buffer = self._recv_buffer[(self.header_len +
+                                               self.data_len+2):]
+        self.header_valid = False
+
    def __send_ack_rsp(self, msgtype, ftype, ack=1):
-        self._build_header(msgtype)
-        self.ifc.tx_add(struct.pack('<BBLL', ftype, ack,
-                                    self._timestamp(),
-                                    self._heartbeat()))
-        self._finish_send_msg()
+        self.__build_header(msgtype)
+        self._send_buffer += struct.pack('<BBLL', ftype, ack,
+                                         self._timestamp(),
+                                         self._heartbeat())
+        self.__finish_send_msg()

    def send_modbus_cb(self, pdu: bytearray, log_lvl: int, state: str):
        if self.state != State.up:
            logger.warning(f'[{self.node_id}] ignore MODBUS cmd,'
                           ' cause the state is not UP anymore')
            return
-        self._build_header(0x4510)
-        self.ifc.tx_add(struct.pack('<BHLLL', self.MB_RTU_CMD,
-                                    self.sensor_list, 0, 0, 0))
-        self.ifc.tx_add(pdu)
-        self._finish_send_msg()
-        self.ifc.tx_log(log_lvl, f'Send Modbus {state}:{self.addr}:')
-        self.ifc.tx_flush()
+        self.__build_header(0x4510)
+        self._send_buffer += struct.pack('<BHLLL', self.MB_RTU_CMD,
+                                         0x2b0, 0, 0, 0)
+        self._send_buffer += pdu
+        self.__finish_send_msg()
+        hex_dump_memory(log_lvl, f'Send Modbus {state}:{self.addr}:',
+                        self._send_buffer, len(self._send_buffer))
+        self.writer.write(self._send_buffer)
+        self._send_buffer = bytearray(0)  # self._send_buffer[sent:]
+
+    def _send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
+        if self.state != State.up:
+            logger.log(log_lvl, f'[{self.node_id}] ignore MODBUS cmd,'
+                       ' as the state is not UP')
+            return
+        self.mb.build_msg(Modbus.INV_ADDR, func, addr, val, log_lvl)
+
+    async def send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
+        self._send_modbus_cmd(func, addr, val, log_lvl)

    def mb_timout_cb(self, exp_cnt):
        self.mb_timer.start(self.mb_timeout)
-        if self.sensor_list != 0x02b0:
-            self.mb_start_reg += self.mb_incr_reg
-            if self.mb_start_reg > 0xffff:
-                self.mb_start_reg = self.mb_start_reg & 0xffff
-                self.mb_inv_no += 1
-                logging.info(f"Next Round: inv:{self.mb_inv_no}"
-                             f" reg:{self.mb_start_reg:04x}")
-            if (self.mb_start_reg & 0xfffc) % 0x80 == 0:
-                logging.info(f"Scan info: inv:{self.mb_inv_no}"
-                             f" reg:{self.mb_start_reg:04x}")
-            self._send_modbus_cmd(self.mb_inv_no, Modbus.READ_REGS,
-                                  self.mb_start_reg, self.mb_scan_len,
-                                  logging.INFO)
-        else:
-            self._send_modbus_cmd(Modbus.INV_ADDR, Modbus.READ_REGS, 0x3000,
-                                  48, logging.DEBUG)

-            if 1 == (exp_cnt % 30):
-                # logging.info("Regular Modbus Status request")
-                self._send_modbus_cmd(Modbus.INV_ADDR, Modbus.READ_REGS,
-                                      0x5000, 8, logging.DEBUG)
-                self._send_modbus_cmd(Modbus.INV_ADDR, Modbus.READ_REGS,
-                                      0x2000, 96, logging.DEBUG)
+        self._send_modbus_cmd(Modbus.READ_REGS, 0x3000, 48, logging.DEBUG)
+
+        if 1 == (exp_cnt % 30):
+            # logging.info("Regular Modbus Status request")
+            self._send_modbus_cmd(Modbus.READ_REGS, 0x2000, 96, logging.DEBUG)

    def at_cmd_forbidden(self, cmd: str, connection: str) -> bool:
        return not cmd.startswith(tuple(self.at_acl[connection]['allow'])) or \
@@ -532,19 +448,18 @@ class SolarmanV5(SolarmanBase):
            return

        self.forward_at_cmd_resp = False
-        self._build_header(0x4510)
-        self.ifc.tx_add(struct.pack(f'<BHLLL{len(at_cmd)}sc', self.AT_CMD,
-                                    0x0002, 0, 0, 0,
-                                    at_cmd.encode('utf-8'), b'\r'))
-        self._finish_send_msg()
-        self.ifc.tx_log(logging.INFO, 'Send AT Command:')
+        self.__build_header(0x4510)
+        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:
-            self.ifc.tx_flush()
+            await self.async_write('Send AT Command:')
        except Exception:
-            self.ifc.tx_clear()
+            self._send_buffer = bytearray(0)

    def __forward_msg(self):
-        self.forward(self.ifc.rx_peek(), self.header_len+self.data_len+2)
+        self.forward(self._recv_buffer, self.header_len+self.data_len+2)

    def __build_model_name(self):
        db = self.db
@@ -565,7 +480,7 @@ class SolarmanV5(SolarmanBase):
    def __process_data(self, ftype, ts):
        inv_update = False
        msg_type = self.control >> 8
-        for key, update in self.db.parse(self.ifc.rx_peek(), msg_type, ftype,
+        for key, update in self.db.parse(self._recv_buffer, msg_type, ftype,
                                         self.node_id):
            if update:
                if key == 'inverter':
@@ -584,8 +499,8 @@ class SolarmanV5(SolarmanBase):
        self.__forward_msg()

    def msg_dev_ind(self):
-        data = self.ifc.rx_peek()[self.header_len:]
-        result = struct.unpack_from(self.HDR_FMT, data, 0)
+        data = self._recv_buffer[self.header_len:]
+        result = struct.unpack_from('<BLLL', data, 0)
        ftype = result[0]  # always 2
        total = result[1]
        tim = result[2]
@@ -599,25 +514,19 @@ class SolarmanV5(SolarmanBase):
        else:
            ts = None
        self.__process_data(ftype, ts)
-        self.sensor_list = int(self.db.get_db_value(Register.SENSOR_LIST, 0),
-                               16)
        self.__forward_msg()
        self.__send_ack_rsp(0x1110, ftype)

    def msg_data_ind(self):
-        data = self.ifc.rx_peek()
+        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]
        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:
@@ -633,8 +542,8 @@ class SolarmanV5(SolarmanBase):
        self.new_state_up()

    def msg_sync_start(self):
-        data = self.ifc.rx_peek()[self.header_len:]
-        result = struct.unpack_from(self.HDR_FMT, data, 0)
+        data = self._recv_buffer[self.header_len:]
+        result = struct.unpack_from('<BLLL', data, 0)
        ftype = result[0]
        total = result[1]
        self.time_ofs = result[3]
@@ -646,8 +555,8 @@ class SolarmanV5(SolarmanBase):
        self.__send_ack_rsp(0x1310, ftype)

    def msg_command_req(self):
-        data = self.ifc.rx_peek()[self.header_len:
-                                  self.header_len+self.data_len]
+        data = self._recv_buffer[self.header_len:
+                                 self.header_len+self.data_len]
        result = struct.unpack_from('<B', data, 0)
        ftype = result[0]
        if ftype == self.AT_CMD:
@@ -659,9 +568,9 @@ class SolarmanV5(SolarmanBase):
            self.forward_at_cmd_resp = True

        elif ftype == self.MB_RTU_CMD:
-            rstream = self.ifc.remote.stream
-            if rstream.mb.recv_req(data[15:],
-                                   rstream.__forward_msg):
+            if self.remote_stream.mb.recv_req(data[15:],
+                                              self.remote_stream.
+                                              __forward_msg):
                self.inc_counter('Modbus_Command')
            else:
                logger.error('Invalid Modbus Msg')
@@ -675,7 +584,7 @@ class SolarmanV5(SolarmanBase):
            self.mqtt.publish(key, data))

    def get_cmd_rsp_log_lvl(self) -> int:
-        ftype = self.ifc.rx_peek()[self.header_len]
+        ftype = self._recv_buffer[self.header_len]
        if ftype == self.AT_CMD:
            if self.forward_at_cmd_resp:
                return logging.INFO
@@ -687,8 +596,8 @@ class SolarmanV5(SolarmanBase):
        return logging.WARNING

    def msg_command_rsp(self):
-        data = self.ifc.rx_peek()[self.header_len:
-                                  self.header_len+self.data_len]
+        data = self._recv_buffer[self.header_len:
+                                 self.header_len+self.data_len]
        ftype = data[0]
        if ftype == self.AT_CMD:
            if not self.forward_at_cmd_resp:
@@ -699,53 +608,30 @@ class SolarmanV5(SolarmanBase):
                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._set_mqtt_timestamp(key, self._timestamp())
+                        self.new_data[key] = True
+
+                if inv_update:
+                    self.__build_model_name()
            return
        self.__forward_msg()

-    def __parse_modbus_rsp(self, data):
-        inv_update = False
-        self.modbus_elms = 0
-        for key, update, _ in self.mb.recv_resp(self.db, data[14:]):
-            self.modbus_elms += 1
-            if update:
-                if key == 'inverter':
-                    inv_update = True
-                self._set_mqtt_timestamp(key, self._timestamp())
-                self.new_data[key] = True
-        return inv_update
-
-    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 = self.__parse_modbus_rsp(data)
-            self.modbus_elms = 0
-            if (self.sensor_list != 0x02b0 and data[15] != 0):
-                logging.info('Valid MODBUS data '
-                             f'(inv:{self.mb_inv_no} '
-                             f'reg: 0x{self.mb.last_reg:04x}):')
-                hex_dump_memory(logging.INFO, 'Valid MODBUS data '
-                                f'(reg: 0x{self.mb.last_reg:04x}):',
-                                data[14:], modbus_msg_len)
-            for key, update, _ in self.mb.recv_resp(self.db, data[14:]):
-                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()
-
-            if self.establish_inv_emu and not self.ifc.remote.stream:
-                self.establish_emu()
-
    def msg_hbeat_ind(self):
-        data = self.ifc.rx_peek()[self.header_len:]
+        data = self._recv_buffer[self.header_len:]
        result = struct.unpack_from('<B', data, 0)
        ftype = result[0]

@@ -754,8 +640,8 @@ class SolarmanV5(SolarmanBase):
        self.new_state_up()

    def msg_sync_end(self):
-        data = self.ifc.rx_peek()[self.header_len:]
-        result = struct.unpack_from(self.HDR_FMT, data, 0)
+        data = self._recv_buffer[self.header_len:]
+        result = struct.unpack_from('<BLLL', data, 0)
        ftype = result[0]
        total = result[1]
        self.time_ofs = result[3]
@@ -765,3 +651,16 @@ class SolarmanV5(SolarmanBase):

        self.__forward_msg()
        self.__send_ack_rsp(0x1810, ftype)
+
+    def msg_response(self):
+        data = self._recv_buffer[self.header_len:]
+        result = struct.unpack_from('<BBLL', data, 0)
+        ftype = result[0]  # always 2
+        valid = result[1] == 1  # status
+        ts = result[2]
+        set_hb = result[3]  # always 60 or 120
+        logger.debug(f'ftype:{ftype} accepted:{valid}'
+                     f' ts:{ts:08x}  nextHeartbeat: {set_hb}s')
+
+        dt = datetime.fromtimestamp(ts)
+        logger.debug(f'ts: {dt.strftime("%Y-%m-%d %H:%M:%S")}')
--- a/app/src/infos.py
+++ b/app/src/infos.py
@@ -1,6 +1,5 @@
 import logging
 import json
-import struct
 import os
 from enum import Enum
 from typing import Generator
@@ -17,8 +16,6 @@ class Register(Enum):
    CHIP_MODEL = 3
    TRACE_URL = 4
    LOGGER_URL = 5
-    MAC_ADDR = 6
-    COLLECTOR_SNR = 7
    PRODUCT_NAME = 20
    MANUFACTURER = 21
    VERSION = 22
@@ -26,10 +23,7 @@ class Register(Enum):
    EQUIPMENT_MODEL = 24
    NO_INPUTS = 25
    MAX_DESIGNED_POWER = 26
-    RATED_LEVEL = 27
-    INPUT_COEFFICIENT = 28
-    GRID_VOLT_CAL_COEF = 29
-    OUTPUT_COEFFICIENT = 30
+    OUTPUT_COEFFICIENT = 27
    INVERTER_CNT = 50
    UNKNOWN_SNR = 51
    UNKNOWN_MSG = 52
@@ -42,13 +36,10 @@ class Register(Enum):
    AT_COMMAND = 59
    MODBUS_COMMAND = 60
    AT_COMMAND_BLOCKED = 61
-    CLOUD_CONN_CNT = 62
    OUTPUT_POWER = 83
    RATED_POWER = 84
    INVERTER_TEMP = 85
    INVERTER_STATUS = 86
-    DETECT_STATUS_1 = 87
-    DETECT_STATUS_2 = 88
    PV1_VOLTAGE = 100
    PV1_CURRENT = 101
    PV1_POWER = 102
@@ -91,12 +82,6 @@ class Register(Enum):
    PV5_TOTAL_GENERATION = 241
    PV6_DAILY_GENERATION = 250
    PV6_TOTAL_GENERATION = 251
-    INV_UNKNOWN_1 = 252
-    BOOT_STATUS = 253
-    DSP_STATUS = 254
-    WORK_MODE = 255
-    OUTPUT_SHUTDOWN = 256
-
    GRID_VOLTAGE = 300
    GRID_CURRENT = 301
    GRID_FREQUENCY = 302
@@ -111,12 +96,22 @@ class Register(Enum):
    HEARTBEAT_INTERVAL = 406
    IP_ADDRESS = 407
    POLLING_INTERVAL = 408
-    SENSOR_LIST = 409
-    SSID = 410
-    EVENT_ALARM = 500
-    EVENT_FAULT = 501
-    EVENT_BF1 = 502
-    EVENT_BF2 = 503
+    EVENT_401 = 500
+    EVENT_402 = 501
+    EVENT_403 = 502
+    EVENT_404 = 503
+    EVENT_405 = 504
+    EVENT_406 = 505
+    EVENT_407 = 506
+    EVENT_408 = 507
+    EVENT_409 = 508
+    EVENT_410 = 509
+    EVENT_411 = 510
+    EVENT_412 = 511
+    EVENT_413 = 512
+    EVENT_414 = 513
+    EVENT_415 = 514
+    EVENT_416 = 515
    TS_INPUT = 600
    TS_GRID = 601
    TS_TOTAL = 602
@@ -125,76 +120,6 @@ class Register(Enum):
    TEST_REG2 = 10001


-class Fmt:
-    @staticmethod
-    def get_value(buf: bytes, idx: int, row: dict):
-        '''Get a value from buf and interpret as in row defined'''
-        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 'func' in row:
-            result = row['func'](res)
-        if 'ratio' in row:
-            result = round(result * row['ratio'], 2)
-        if 'quotient' in row:
-            result = round(result/row['quotient'])
-        if 'offset' in row:
-            result = result + row['offset']
-        return result
-
-    @staticmethod
-    def hex4(val: tuple | str, reverse=False) -> str | int:
-        if not reverse:
-            return f'{val[0]:04x}'
-        else:
-            return int(val, 16)
-
-    @staticmethod
-    def mac(val: tuple | str, reverse=False) -> str | tuple:
-        if not reverse:
-            return "%02x:%02x:%02x:%02x:%02x:%02x" % val
-        else:
-            return (
-                int(val[0:2], 16), int(val[3:5], 16),
-                int(val[6:8], 16), int(val[9:11], 16),
-                int(val[12:14], 16), int(val[15:], 16))
-
-    @staticmethod
-    def version(val: tuple | str, reverse=False) -> str | int:
-        if not reverse:
-            x = val[0]
-            return f'V{(x >> 12)}.{(x >> 8) & 0xf}' \
-                f'.{(x >> 4) & 0xf}{x & 0xf:1X}'
-        else:
-            arr = val[1:].split('.')
-            return int(arr[0], 10) << 12 | \
-                int(arr[1], 10) << 8 | \
-                int(arr[2][:-1], 10) << 4 | \
-                int(arr[2][-1:], 16)
-
-    @staticmethod
-    def set_value(buf: bytearray, idx: int, row: dict, val):
-        '''Get a value from buf and interpret as in row defined'''
-        fmt = row['fmt']
-        if 'offset' in row:
-            val = val - row['offset']
-        if 'quotient' in row:
-            val = round(val * row['quotient'])
-        if 'ratio' in row:
-            val = round(val / row['ratio'])
-        if 'func' in row:
-            val = row['func'](val, reverse=True)
-        if isinstance(val, str):
-            val = bytes(val, 'UTF8')
-
-        if isinstance(val, tuple):
-            struct.pack_into(fmt, buf, idx, *val)
-        else:
-            struct.pack_into(fmt, buf, idx, val)
-
-
 class ClrAtMidnight:
    __clr_at_midnight = [Register.PV1_DAILY_GENERATION, Register.PV2_DAILY_GENERATION, Register.PV3_DAILY_GENERATION, Register.PV4_DAILY_GENERATION, Register.PV5_DAILY_GENERATION, Register.PV6_DAILY_GENERATION, Register.DAILY_GENERATION]   # noqa: E501
    db = {}
@@ -224,23 +149,10 @@ class ClrAtMidnight:


 class Infos:
-    __slots__ = ('db', 'tracer', )
-
-    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
@@ -264,8 +176,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
@@ -275,7 +187,6 @@ 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
-    __work_mode_val_tpl = "{%set mode = ['Normal-Mode', 'Aging-Mode', 'ATE-Mode', 'Shielding GFDI', 'DTU-Mode'] %}{{mode[value_json['Work_Mode']|int(0)]|default(value_json['Work_Mode'])}}"    # 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 = '''
@@ -290,100 +201,6 @@ class Infos:
  {{ this.state }}
 {% endif %}
 '''
-    __inv_alarm_val_tpl = '''
-{% if 'Inverter_Alarm' in value_json and
-      value_json['Inverter_Alarm'] != None %}
-  {% set val_int = value_json['Inverter_Alarm'] | int %}
-  {% if val_int == 0 %}
-    {% set result = 'noAlarm'%}
-  {%else%}
-    {% set result = '' %}
-    {% if val_int | bitwise_and(1)%}{% set result = result + 'Bit1, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(2)%}{% set result = result + 'Bit2, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(3)%}{% set result = result + 'Bit3, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(4)%}{% set result = result + 'Bit4, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(5)%}{% set result = result + 'Bit5, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(6)%}{% set result = result + 'Bit6, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(7)%}{% set result = result + 'Bit7, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(8)%}{% set result = result + 'Bit8, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(9)%}{% set result = result + 'noUtility, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(10)%}{% set result = result + 'Bit10, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(11)%}{% set result = result + 'Bit11, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(12)%}{% set result = result + 'Bit12, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(13)%}{% set result = result + 'Bit13, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(14)%}{% set result = result + 'Bit14, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(15)%}{% set result = result + 'Bit15, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(16)%}{% set result = result + 'Bit16, '%}
-    {% endif %}
-  {% endif %}
-  {{ result }}
-{% else %}
-  {{ this.state }}
-{% endif %}
-'''
-    __inv_fault_val_tpl = '''
-{% if 'Inverter_Fault' in value_json and
-      value_json['Inverter_Fault'] != None %}
-  {% set val_int = value_json['Inverter_Fault'] | int %}
-  {% if val_int == 0 %}
-    {% set result = 'noFault'%}
-  {%else%}
-    {% set result = '' %}
-    {% if val_int | bitwise_and(1)%}{% set result = result + 'Bit1, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(2)%}{% set result = result + 'Bit2, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(3)%}{% set result = result + 'Bit3, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(4)%}{% set result = result + 'Bit4, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(5)%}{% set result = result + 'Bit5, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(6)%}{% set result = result + 'Bit6, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(7)%}{% set result = result + 'Bit7, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(8)%}{% set result = result + 'Bit8, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(9)%}{% set result = result + 'Bit9, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(10)%}{% set result = result + 'Bit10, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(11)%}{% set result = result + 'Bit11, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(12)%}{% set result = result + 'Bit12, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(13)%}{% set result = result + 'Bit13, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(14)%}{% set result = result + 'Bit14, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(15)%}{% set result = result + 'Bit15, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(16)%}{% set result = result + 'Bit16, '%}
-    {% endif %}
-  {% endif %}
-  {{ result }}
-{% else %}
-  {{ this.state }}
-{% endif %}
-'''
-
-    __input_coef_val_tpl = "{% if 'Output_Coefficient' in value_json and value_json['Input_Coefficient'] != None %}{{value_json['Input_Coefficient']|string() +' %'}}{% else %}{{ this.state }}{% endif %}"  # noqa: E501
    __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

    __info_defs = {
@@ -393,9 +210,6 @@ class Infos:
        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
-

        # inverter values used for device registration:
        Register.PRODUCT_NAME:    {'name': ['inverter', 'Product_Name'],           'level': logging.DEBUG, 'unit': ''},  # noqa: E501
@@ -404,11 +218,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.WORK_MODE:          {'name': ['inverter',  'Work_Mode'],          'level': logging.DEBUG, 'unit': '',     'ha': {'dev': 'inverter', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'work_mode_', 'name': 'Work Mode', 'val_tpl': __work_mode_val_tpl,  'icon': 'mdi:power', 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.INPUT_COEFFICIENT:  {'name': ['inverter',  'Input_Coefficient'],  'level': logging.DEBUG, 'unit': '%',    'ha': {'dev': 'inverter', 'dev_cla': None, 'stat_cla': None, 'id': 'input_coef_',    'val_tpl': __input_coef_val_tpl,    'name': 'Input Coefficient', '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_', 'val_tpl': __designed_power_val_tpl, '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_',    'val_tpl': __rated_power_val_tpl,    'name': 'Rated Power',        'icon': 'mdi:lightning-bolt', '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': '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
@@ -421,98 +233,96 @@ class Infos:
        Register.PV5_MODEL:        {'name': ['inverter', 'PV5_Model'],             'level': logging.DEBUG, 'unit': ''},  # noqa: E501
        Register.PV6_MANUFACTURER: {'name': ['inverter', 'PV6_Manufacturer'],      'level': logging.DEBUG, 'unit': ''},  # noqa: E501
        Register.PV6_MODEL:        {'name': ['inverter', 'PV6_Model'],             'level': logging.DEBUG, 'unit': ''},  # noqa: E501
-        Register.BOOT_STATUS:      {'name': ['inverter', 'BOOT_STATUS'],           'level': logging.DEBUG, 'unit': ''},  # noqa: E501
-        Register.DSP_STATUS:       {'name': ['inverter', 'DSP_STATUS'],            '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.CLOUD_CONN_CNT:     {'name': ['proxy', 'Cloud_Conn_Cnt'],     'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'cloud_conn_count_', 'fmt': FMT_INT, 'name': 'Active Cloud 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_ALARM:  {'name': ['events', 'Inverter_Alarm'],              'level': logging.INFO, 'unit': '', 'ha': {'dev': 'inverter', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_alarm_', 'name': 'Inverter Alarm', 'val_tpl': __inv_alarm_val_tpl, 'icon': 'mdi:alarm-light'}},  # noqa: E501
-        Register.EVENT_FAULT:  {'name': ['events', 'Inverter_Fault'],              'level': logging.INFO, 'unit': '', 'ha': {'dev': 'inverter', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_fault_', 'name': 'Inverter Fault', 'val_tpl': __inv_fault_val_tpl, 'icon': 'mdi:alarm-light'}},  # noqa: E501
-        Register.EVENT_BF1:    {'name': ['events', 'Inverter_Bitfield_1'],         'level': logging.INFO, 'unit': ''},  # noqa: E501
-        Register.EVENT_BF2:    {'name': ['events', 'Inverter_bitfield_2'],         'level': logging.INFO, 'unit': ''},  # noqa: E501
-        # Register.EVENT_409:  {'name': ['events', '409_No_Utility'],                'level': logging.DEBUG, 'unit': ''},  # noqa: E501
-        # Register.EVENT_415:  {'name': ['events', '415_GridFreqOverRating'],        'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.EVENT_401:  {'name': ['events', '401_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.EVENT_402:  {'name': ['events', '402_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.EVENT_403:  {'name': ['events', '403_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.EVENT_404:  {'name': ['events', '404_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.EVENT_405:  {'name': ['events', '405_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.EVENT_406:  {'name': ['events', '406_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.EVENT_407:  {'name': ['events', '407_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.EVENT_408:  {'name': ['events', '408_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.EVENT_409:  {'name': ['events', '409_No_Utility'],                'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.EVENT_410:  {'name': ['events', '410_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.EVENT_411:  {'name': ['events', '411_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.EVENT_412:  {'name': ['events', '412_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.EVENT_413:  {'name': ['events', '413_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.EVENT_414:  {'name': ['events', '414_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        Register.EVENT_415:  {'name': ['events', '415_GridFreqOverRating'],        'level': logging.DEBUG, 'unit': ''},  # noqa: E501
+        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.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:power'}},  # noqa: E501
-        Register.DETECT_STATUS_1: {'name': ['env',  'Detect_Status_1'],            'level': logging.DEBUG, 'unit': ''},  # noqa: E501
-        Register.DETECT_STATUS_2: {'name': ['env',  'Detect_Status_2'],            'level': logging.DEBUG, 'unit': ''},  # 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.SSID:               {'name': ['controller', 'WiFi_SSID'],          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
-
-        Register.OUTPUT_SHUTDOWN:    {'name': ['other', 'Output_Shutdown'],         'level': logging.DEBUG, 'unit': ''},  # noqa: E501
-        Register.RATED_LEVEL:        {'name': ['other', 'Rated_Level'],             'level': logging.DEBUG, 'unit': ''},  # noqa: E501
-        Register.GRID_VOLT_CAL_COEF: {'name': ['other', 'Grid_Volt_Cal_Coef'],      'level': logging.DEBUG, 'unit': ''},  # noqa: E501
-        Register.INV_UNKNOWN_1:      {'name': ['inv_unknown', 'Unknown_1'],         'level': logging.DEBUG, '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
+        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': '| string + " s"', 'name': 'Polling Interval', 'icon': 'mdi:update', 'ent_cat': 'diagnostic'}},  # noqa: E501
    }

    @property
@@ -550,19 +360,15 @@ class Infos:

        return None                  # unknwon idx, not in info_defs

-    @classmethod
-    def inc_counter(cls, counter: str) -> None:
+    def inc_counter(self, counter: str) -> None:
        '''inc proxy statistic counter'''
-        db_dict = cls.stat['proxy']
+        db_dict = self.stat['proxy']
        db_dict[counter] += 1
-        cls.new_stat_data['proxy'] = True

-    @classmethod
-    def dec_counter(cls, counter: str) -> None:
+    def dec_counter(self, counter: str) -> None:
        '''dec proxy statistic counter'''
-        db_dict = cls.stat['proxy']
+        db_dict = self.stat['proxy']
        db_dict[counter] -= 1
-        cls.new_stat_data['proxy'] = True

    def ha_proxy_confs(self, ha_prfx: str, node_id: str, snr: str) \
            -> Generator[tuple[str, str, str, str], None, None]:
@@ -608,128 +414,99 @@ class Infos:
                return None
        elif singleton:
            return None
+        prfx = ha_prfx + node_id

        # 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}"
+            ha = row['ha']
+            if 'comp' in ha:
+                component = ha['comp']
+            else:
+                component = 'sensor'
+            attr = {}
+            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 "
-                              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
+                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 ha_remove(self, key, node_id, snr) -> tuple[str, str, str, str] | None:
        '''Method to build json unregister struct for home-assistant
@@ -822,8 +599,6 @@ class Infos:

    def get_db_value(self, id: Register, not_found_result: any = None):
        '''get database value'''
-        if id not in self.info_defs:
-            return not_found_result
        row = self.info_defs[id]
        if isinstance(row, dict):
            keys = row['name']
--- a/app/src/inverter.py
+++ b/app/src/inverter.py
@@ -1,45 +1,18 @@
 import asyncio
 import logging
 import json
+from config import Config
+from mqtt import Mqtt
+from infos import Infos

-if __name__ == "app.src.proxy":
-    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
-
+# logger = logging.getLogger('conn')
 logger_mqtt = logging.getLogger('mqtt')


-class Proxy():
-    '''class Proxy is a baseclass
-
-    The class has some class method for managing common resources like a
-    connection to the MQTT broker or proxy error counter which are common
-    for all inverter connection
-
-    Instances of the class are connections to an inverter and can have an
-    optional link to an remote connection to the TSUN cloud. A remote
-    connection dies with the inverter connection.
-
-    class methods:
-        class_init():  initialize the common resources of the proxy (MQTT
-                       broker, Proxy DB, etc). Must be called before the
-                       first inverter instance can be created
-        class_close(): release the common resources of the proxy. Should not
-                       be called before any instances of the class are
-                       destroyed
-
-    methods:
-        create_remote(): Establish a client connection to the TSUN cloud
-        async_publ_mqtt(): Publish data to MQTT broker
-    '''
+class Inverter():
    @classmethod
    def class_init(cls) -> None:
-        logging.debug('Proxy.class_init')
+        logging.debug('Inverter.class_init')
        # initialize the proxy statistics
        Infos.static_init()
        cls.db_stat = Infos()
@@ -61,7 +34,7 @@ class Proxy():
        # reset at midnight when you restart the proxy just before
        # midnight!
        inverters = Config.get('inverters')
-        # logger.debug(f'Proxys: {inverters}')
+        # logger.debug(f'Inverters: {inverters}')
        for inv in inverters.values():
            if (type(inv) is dict):
                node_id = inv['node_id']
@@ -99,8 +72,8 @@ class Proxy():
            Infos.new_stat_data[key] = False

    @classmethod
-    def class_close(cls, loop) -> None:   # pragma: no cover
-        logging.debug('Proxy.class_close')
+    def class_close(cls, loop) -> None:
+        logging.debug('Inverter.class_close')
        logging.info('Close MQTT Task')
        loop.run_until_complete(cls.mqtt.close())
        cls.mqtt = None
--- a/app/src/inverter_base.py
+++ b/app/src/inverter_base.py
@@ -1,187 +0,0 @@
-import weakref
-import asyncio
-import logging
-import traceback
-import json
-import gc
-from aiomqtt import MqttCodeError
-from asyncio import StreamReader, StreamWriter
-
-if __name__ == "app.src.inverter_base":
-    from app.src.inverter_ifc import InverterIfc
-    from app.src.proxy import Proxy
-    from app.src.async_stream import StreamPtr
-    from app.src.async_stream import AsyncStreamClient
-    from app.src.async_stream import AsyncStreamServer
-    from app.src.config import Config
-    from app.src.infos import Infos
-else:  # pragma: no cover
-    from inverter_ifc import InverterIfc
-    from proxy import Proxy
-    from async_stream import StreamPtr
-    from async_stream import AsyncStreamClient
-    from async_stream import AsyncStreamServer
-    from config import Config
-    from infos import Infos
-
-logger_mqtt = logging.getLogger('mqtt')
-
-
-class InverterBase(InverterIfc, Proxy):
-
-    def __init__(self, reader: StreamReader, writer: StreamWriter,
-                 config_id: str, prot_class,
-                 client_mode: bool = False,
-                 remote_prot_class=None):
-        Proxy.__init__(self)
-        self._registry.append(weakref.ref(self))
-        self.addr = writer.get_extra_info('peername')
-        self.config_id = config_id
-        if remote_prot_class:
-            self.prot_class = remote_prot_class
-        else:
-            self.prot_class = prot_class
-        self.__ha_restarts = -1
-        self.remote = StreamPtr(None)
-        ifc = AsyncStreamServer(reader, writer,
-                                self.async_publ_mqtt,
-                                self.create_remote,
-                                self.remote)
-
-        self.local = StreamPtr(
-            prot_class(self.addr, ifc, True, client_mode), ifc
-        )
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc, tb) -> None:
-        logging.debug(f'InverterBase.__exit__() {self.addr}')
-        self.__del_remote()
-
-        self.local.stream.close()
-        self.local.stream = None
-        self.local.ifc.close()
-        self.local.ifc = None
-
-        # now explicitly call garbage collector to release unreachable objects
-        unreachable_obj = gc.collect()
-        logging.debug(
-            f'InverterBase.__exit: freed unreachable obj: {unreachable_obj}')
-
-    def __del_remote(self):
-        if self.remote.stream:
-            self.remote.stream.close()
-            self.remote.stream = None
-
-        if self.remote.ifc:
-            self.remote.ifc.close()
-            self.remote.ifc = None
-
-    async def disc(self, shutdown_started=False) -> None:
-        if self.remote.stream:
-            self.remote.stream.shutdown_started = shutdown_started
-        if self.remote.ifc:
-            await self.remote.ifc.disc()
-        if self.local.stream:
-            self.local.stream.shutdown_started = shutdown_started
-        if self.local.ifc:
-            await self.local.ifc.disc()
-
-    def healthy(self) -> bool:
-        logging.debug('InverterBase healthy()')
-
-        if self.local.ifc and not self.local.ifc.healthy():
-            return False
-        if self.remote.ifc and not self.remote.ifc.healthy():
-            return False
-        return True
-
-    async def create_remote(self) -> None:
-        '''Establish a client connection to the TSUN cloud'''
-
-        tsun = Config.get(self.config_id)
-        host = tsun['host']
-        port = tsun['port']
-        addr = (host, port)
-        stream = self.local.stream
-
-        try:
-            logging.info(f'[{stream.node_id}] Connect to {addr}')
-            connect = asyncio.open_connection(host, port)
-            reader, writer = await connect
-            ifc = AsyncStreamClient(
-                reader, writer, self.local, self.__del_remote)
-
-            self.remote.ifc = ifc
-            if hasattr(stream, 'id_str'):
-                self.remote.stream = self.prot_class(
-                    addr, ifc, server_side=False,
-                    client_mode=False, id_str=stream.id_str)
-            else:
-                self.remote.stream = self.prot_class(
-                    addr, ifc, server_side=False,
-                    client_mode=False)
-
-            logging.info(f'[{self.remote.stream.node_id}:'
-                         f'{self.remote.stream.conn_no}] '
-                         f'Connected to {addr}')
-            asyncio.create_task(self.remote.ifc.client_loop(addr))
-
-        except (ConnectionRefusedError, TimeoutError) as error:
-            logging.info(f'{error}')
-        except Exception:
-            Infos.inc_counter('SW_Exception')
-            logging.error(
-                f"Inverter: Exception for {addr}:\n"
-                f"{traceback.format_exc()}")
-
-    async def async_publ_mqtt(self) -> None:
-        '''publish data to MQTT broker'''
-        stream = self.local.stream
-        if not stream or not stream.unique_id:
-            return
-        # check if new inverter or collector infos are available or when the
-        #  home assistant has changed the status back to online
-        try:
-            if (('inverter' in stream.new_data and stream.new_data['inverter'])
-                    or ('collector' in stream.new_data and
-                        stream.new_data['collector'])
-                    or self.mqtt.ha_restarts != self.__ha_restarts):
-                await self._register_proxy_stat_home_assistant()
-                await self.__register_home_assistant(stream)
-                self.__ha_restarts = self.mqtt.ha_restarts
-
-            for key in stream.new_data:
-                await self.__async_publ_mqtt_packet(stream, key)
-            for key in Infos.new_stat_data:
-                await Proxy._async_publ_mqtt_proxy_stat(key)
-
-        except MqttCodeError as error:
-            logging.error(f'Mqtt except: {error}')
-        except Exception:
-            Infos.inc_counter('SW_Exception')
-            logging.error(
-                f"Inverter: Exception:\n"
-                f"{traceback.format_exc()}")
-
-    async def __async_publ_mqtt_packet(self, stream, key):
-        db = stream.db.db
-        if key in db and stream.new_data[key]:
-            data_json = json.dumps(db[key])
-            node_id = stream.node_id
-            logger_mqtt.debug(f'{key}: {data_json}')
-            await self.mqtt.publish(f'{self.entity_prfx}{node_id}{key}', data_json)  # noqa: E501
-            stream.new_data[key] = False
-
-    async def __register_home_assistant(self, stream) -> None:
-        '''register all our topics at home assistant'''
-        for data_json, component, node_id, id in stream.db.ha_confs(
-                self.entity_prfx, stream.node_id, stream.unique_id,
-                stream.sug_area):
-            logger_mqtt.debug(f"MQTT Register: cmp:'{component}'"
-                              f" node_id:'{node_id}' {data_json}")
-            await self.mqtt.publish(f"{self.discovery_prfx}{component}"
-                                    f"/{node_id}{id}/config", data_json)
-
-        stream.db.reg_clr_at_midnight(f'{self.entity_prfx}{stream.node_id}')
--- a/app/src/inverter_ifc.py
+++ b/app/src/inverter_ifc.py
@@ -1,40 +0,0 @@
-from abc import abstractmethod
-import logging
-from asyncio import StreamReader, StreamWriter
-
-if __name__ == "app.src.inverter_ifc":
-    from app.src.iter_registry import AbstractIterMeta
-else:  # pragma: no cover
-    from iter_registry import AbstractIterMeta
-
-logger_mqtt = logging.getLogger('mqtt')
-
-
-class InverterIfc(metaclass=AbstractIterMeta):
-    _registry = []
-
-    @abstractmethod
-    def __init__(self, reader: StreamReader, writer: StreamWriter,
-                 config_id: str, prot_class,
-                 client_mode: bool):
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def __enter__(self):
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def __exit__(self, exc_type, exc, tb):
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def healthy(self) -> bool:
-        pass  # pragma: no cover
-
-    @abstractmethod
-    async def disc(self, shutdown_started=False) -> None:
-        pass  # pragma: no cover
-
-    @abstractmethod
-    async def create_remote(self) -> None:
-        pass  # pragma: no cover
--- a/app/src/iter_registry.py
+++ b/app/src/iter_registry.py
@@ -1,9 +0,0 @@
-from abc import ABCMeta
-
-
-class AbstractIterMeta(ABCMeta):
-    def __iter__(cls):
-        for ref in cls._registry:
-            obj = ref()
-            if obj is not None:
-                yield obj
--- a/app/src/messages.py
+++ b/app/src/messages.py
@@ -1,77 +1,58 @@
 import logging
 import weakref
-from typing import Callable
+from typing import Callable, Generator
 from enum import Enum


 if __name__ == "app.src.messages":
-    from app.src.async_ifc import AsyncIfc
-    from app.src.protocol_ifc import ProtocolIfc
    from app.src.infos import Infos, Register
    from app.src.modbus import Modbus
-    from app.src.my_timer import Timer
 else:  # pragma: no cover
-    from async_ifc import AsyncIfc
-    from protocol_ifc import ProtocolIfc
    from infos import Infos, Register
    from modbus import Modbus
-    from my_timer import Timer

 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(data, data_len) -> list:
-    n = 0
-    lines = []
-
-    for i in range(0, data_len, 16):
-        line = '  '
-        line += '%04x | ' % (i)
-        n += 16
-        line += __hex_val(n, data, data_len)
-        line += ' ' * (3 * 16 + 9 - len(line)) + ' | '
-        line += __asc_val(n, data, data_len)
-        lines.append(line)
-
-    return lines
-
-
-def hex_dump_str(data, data_len):
-    lines = hex_dump(data, data_len)
-    return '\n'.join(lines)
-
-
 def hex_dump_memory(level, info, data, data_len):
+    n = 0
    lines = []
    lines.append(info)
    tracer = logging.getLogger('tracer')
    if not tracer.isEnabledFor(level):
        return

-    lines += hex_dump(data, data_len)
+    for i in range(0, data_len, 16):
+        line = '  '
+        line += '%04x | ' % (i)
+        n += 16
+
+        for j in range(n-16, n):
+            if j >= data_len:
+                break
+            line += '%02x ' % abs(data[j])
+
+        line += ' ' * (3 * 16 + 9 - 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
+
+        lines.append(line)

    tracer.log(level, '\n'.join(lines))


+class IterRegistry(type):
+    def __iter__(cls) -> Generator['Message', None, None]:
+        for ref in cls._registry:
+            obj = ref()
+            if obj is not None:
+                yield obj
+
+
 class State(Enum):
    '''state of the logical connection'''
    init = 0
@@ -86,54 +67,31 @@ class State(Enum):
    '''connection closed'''


-class Message(ProtocolIfc):
-    MAX_START_TIME = 400
-    '''maximum time without a received msg in sec'''
-    MAX_INV_IDLE_TIME = 120
-    '''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'''
-    MB_START_TIMEOUT = 40
-    '''start delay for Modbus polling in server mode'''
-    MB_REGULAR_TIMEOUT = 20
-    '''regular Modbus polling time in server mode'''
+class Message(metaclass=IterRegistry):
+    _registry = []

-    def __init__(self, node_id, ifc: "AsyncIfc", server_side: bool,
-                 send_modbus_cb: Callable[[bytes, int, str], None],
-                 mb_timeout: int):
+    def __init__(self, server_side: bool, send_modbus_cb:
+                 Callable[[bytes, int, str], None], mb_timeout: int):
        self._registry.append(weakref.ref(self))

        self.server_side = server_side
-        self.ifc = ifc
-        self.node_id = node_id
        if server_side:
            self.mb = Modbus(send_modbus_cb, mb_timeout)
-            self.mb_timer = Timer(self.mb_timout_cb, self.node_id)
        else:
            self.mb = None
-            self.mb_timer = None
+
        self.header_valid = False
        self.header_len = 0
        self.data_len = 0
        self.unique_id = 0
+        self.node_id = ''  # will be overwritten in the child class's __init__
        self.sug_area = ''
+        self._recv_buffer = bytearray(0)
+        self._send_buffer = bytearray(0)
+        self._forward_buffer = bytearray(0)
        self.new_data = {}
        self.state = State.init
        self.shutdown_started = False
-        self.modbus_elms = 0    # for unit tests
-        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
-
-    @property
-    def node_id(self):
-        return self._node_id
-
-    @node_id.setter
-    def node_id(self, value):
-        self._node_id = value
-        self.ifc.set_node_id(value)

    '''
    Empty methods, that have to be implemented in any child class which
@@ -143,6 +101,10 @@ class Message(ProtocolIfc):
        # to our _recv_buffer
        return  # pragma: no cover

+    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]:
@@ -158,45 +120,10 @@ class Message(ProtocolIfc):
            # logger.info(f'update: key: {key} ts:{tstr}'
            self.db.set_db_def_value(info_id, round(ts))

-    def _timeout(self) -> int:
-        if self.state == State.init or self.state == State.received:
-            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
-        return to
-
-    def _send_modbus_cmd(self, mb_no, func, addr, val, log_lvl) -> None:
-        if self.state != State.up:
-            logger.log(log_lvl, f'[{self.node_id}] ignore MODBUS cmd,'
-                       ' as the state is not UP')
-            return
-        self.mb.build_msg(mb_no, func, addr, val, log_lvl)
-
-    async def send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
-        self._send_modbus_cmd(Modbus.INV_ADDR, func, addr, val, log_lvl)
-
    '''
    Our puplic methods
    '''
    def close(self) -> None:
-        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
-            self.mb_timer.close()
-        self.state = State.closed
-        self.ifc.rx_set_cb(None)
-        self.ifc.prot_set_timeout_cb(None)
-        self.ifc.prot_set_init_new_client_conn_cb(None)
-        self.ifc.prot_set_update_header_cb(None)
-        self.ifc = None
-
        if self.mb:
            self.mb.close()
            self.mb = None
--- a/app/src/modbus.py
+++ b/app/src/modbus.py
@@ -17,9 +17,9 @@ import asyncio
 from typing import Generator, Callable

 if __name__ == "app.src.modbus":
-    from app.src.infos import Register, Fmt
+    from app.src.infos import Register
 else:  # pragma: no cover
-    from infos import Register, Fmt
+    from infos import Register

 logger = logging.getLogger('data')

@@ -39,31 +39,16 @@ class Modbus():
    '''Modbus function code: Write Single Register'''

    __crc_tab = []
-    mb_reg_mapping = {
-        0x2000: {'reg': Register.BOOT_STATUS,          'fmt': '!H'},                 # noqa: E501
-        0x2001: {'reg': Register.DSP_STATUS,           'fmt': '!H'},                 # noqa: E501
-        0x2003: {'reg': Register.WORK_MODE,            'fmt': '!H'},
-        0x2006: {'reg': Register.OUTPUT_SHUTDOWN,      'fmt': '!H'},
+    map = {
        0x2007: {'reg': Register.MAX_DESIGNED_POWER,   'fmt': '!H', 'ratio':  1},  # noqa: E501
-        0x2008: {'reg': Register.RATED_LEVEL,          'fmt': '!H'},
-        0x2009: {'reg': Register.INPUT_COEFFICIENT,    'fmt': '!H', 'ratio':  100/1024},  # noqa: E501
-        0x200a: {'reg': Register.GRID_VOLT_CAL_COEF,   'fmt': '!H'},
-
        0x202c: {'reg': Register.OUTPUT_COEFFICIENT,   'fmt': '!H', 'ratio':  100/1024},  # noqa: E501

        0x3000: {'reg': Register.INVERTER_STATUS,      'fmt': '!H'},                 # noqa: E501
-        0x3001: {'reg': Register.DETECT_STATUS_1,      'fmt': '!H'},                 # noqa: E501
-        0x3002: {'reg': Register.DETECT_STATUS_2,      'fmt': '!H'},                 # noqa: E501
-        0x3003: {'reg': Register.EVENT_ALARM,          'fmt': '!H'},                 # noqa: E501
-        0x3004: {'reg': Register.EVENT_FAULT,          'fmt': '!H'},                 # noqa: E501
-        0x3005: {'reg': Register.EVENT_BF1,            'fmt': '!H'},                 # noqa: E501
-        0x3006: {'reg': Register.EVENT_BF2,            'fmt': '!H'},                 # noqa: E501
-
-        0x3008: {'reg': Register.VERSION,              'fmt': '!H', 'func': Fmt.version},  # noqa: E501
+        0x3008: {'reg': Register.VERSION,              'fmt': '!H', 'eval': "f'V{(result>>12)}.{(result>>8)&0xf}.{(result>>4)&0xf}{result&0xf:1X}'"},  # 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
-        0x300c: {'reg': Register.INVERTER_TEMP,        'fmt': '!H', 'offset': -40},  # noqa: E501
+        0x300c: {'reg': Register.INVERTER_TEMP,        'fmt': '!H', 'eval': 'result-40'},  # noqa: E501
        # 0x300d
        0x300e: {'reg': Register.RATED_POWER,          'fmt': '!H', 'ratio':    1},  # noqa: E501
        0x300f: {'reg': Register.OUTPUT_POWER,         'fmt': '!H', 'ratio':  0.1},  # noqa: E501
@@ -89,7 +74,6 @@ class Modbus():
        0x3026: {'reg': Register.PV3_TOTAL_GENERATION, 'fmt': '!L', 'ratio': 0.01},  # noqa: E501
        0x3028: {'reg': Register.PV4_DAILY_GENERATION, 'fmt': '!H', 'ratio': 0.01},  # noqa: E501
        0x3029: {'reg': Register.PV4_TOTAL_GENERATION, 'fmt': '!L', 'ratio': 0.01},  # noqa: E501
-        # 0x302a
    }

    def __init__(self, snd_handler: Callable[[bytes, int, str], None],
@@ -103,8 +87,8 @@ class Modbus():
        '''Response handler to forward the response'''
        self.timeout = timeout
        '''MODBUS response timeout in seconds'''
-        self.max_retries = 0
-        '''Max retransmit for MODBU requests'''
+        self.max_retries = 1
+        '''Max retransmit for MODBUS requests'''
        self.retry_cnt = 0
        self.last_req = b''
        self.counter = {}
@@ -133,8 +117,9 @@ class Modbus():
        while not self.que.empty():
            self.que.get_nowait()

-    def set_node_id(self, node_id: str):
-        self.node_id = node_id
+    def __del__(self):
+        """log statistics on the deleting of a MODBUS instance"""
+        logging.debug(f'Modbus __del__:\n {self.counter}')

    def build_msg(self, addr: int, func: int, reg: int, val: int,
                  log_lvl=logging.DEBUG) -> None:
@@ -154,7 +139,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

@@ -179,13 +164,14 @@ class Modbus():

        return True

-    def recv_resp(self, info_db, buf: bytes) -> \
+    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.

        Keyword arguments:
            info_db: database for info lockups
            buf: received Modbus RTU response frame
+            node_id: string for logging which identifies the slave

        Returns on error and set Self.err to:
            1: CRC error
@@ -195,19 +181,60 @@ 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()

@@ -216,53 +243,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 __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 = Fmt.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
    '''
@@ -322,11 +302,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

--- a/app/src/modbus_tcp.py
+++ b/app/src/modbus_tcp.py
@@ -1,15 +1,10 @@
 import logging
 import traceback
 import asyncio
+from config import Config

-if __name__ == "app.src.modbus_tcp":
-    from app.src.config import Config
-    from app.src.gen3plus.inverter_g3p import InverterG3P
-    from app.src.infos import Infos
-else:  # pragma: no cover
-    from config import Config
-    from gen3plus.inverter_g3p import InverterG3P
-    from infos import Infos
+# import gc
+from gen3plus.inverter_g3p import InverterG3P

 logger = logging.getLogger('conn')

@@ -19,33 +14,28 @@ class ModbusConn():
        self.host = host
        self.port = port
        self.addr = (host, port)
-        self.inverter = None
+        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.inverter = InverterG3P(reader, writer,
-                                    client_mode=True)
-        self.inverter.__enter__()
-        stream = self.inverter.local.stream
-        logging.info(f'[{stream.node_id}:{stream.conn_no}] '
+        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}')
-        Infos.inc_counter('Inverter_Cnt')
-        await self.inverter.local.ifc.publish_outstanding_mqtt()
-        return self.inverter
+        self.stream.inc_counter('Inverter_Cnt')
+        await self.stream.publish_outstanding_mqtt()
+        return self.stream

    async def __aexit__(self, exc_type, exc, tb):
-        Infos.dec_counter('Inverter_Cnt')
-        await self.inverter.local.ifc.publish_outstanding_mqtt()
-        self.inverter.__exit__(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
-
+    def __init__(self, loop) -> None:
        inverters = Config.get('inverters')
        # logging.info(f'Inverters: {inverters}')

@@ -57,37 +47,30 @@ class ModbusTcp():
                # 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'],
-                                                  client['forward']))
+                                                  inv['monitor_sn']))

-    async def modbus_loop(self, host, port,
-                          snr: int, forward: bool) -> None:
+    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 inverter:
-                    stream = inverter.local.stream
-                    await stream.send_start_cmd(snr, host, forward)
-                    await stream.ifc.loop()
+                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
-                del inverter  # decrease ref counter after the with block

            except (ConnectionRefusedError, TimeoutError) as error:
                logging.debug(f'Inv-conn:{error}')

            except OSError as error:
-                if error.errno == 113:  # pragma: no cover
-                    logging.debug(f'os-error:{error}')
-                else:
-                    logging.info(f'os-error: {error}')
+                logging.info(f'os-error: {error}')

            except Exception:
                logging.error(
-                    f"ModbusTcpCreate: Exception for {(host, port)}:\n"
+                    f"ModbusTcpCreate: Exception for {(host,port)}:\n"
                    f"{traceback.format_exc()}")

-            await asyncio.sleep(self.tim_restart)
+            await asyncio.sleep(10)
--- a/app/src/mqtt.py
+++ b/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
@@ -44,6 +30,9 @@ class Mqtt(metaclass=Singleton):
    def ha_restarts(self, value):
        self._ha_restarts = value

+    def __del__(self):
+        logger_mqtt.debug('MQTT: __del__')
+
    async def close(self) -> None:
        logger_mqtt.debug('MQTT: close')
        self.task.cancel()
@@ -60,6 +49,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"]}')
@@ -69,24 +59,66 @@ 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_out_coeff_topic = "tsun/+/out_coeff"  # 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_out_coeff_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_out_coeff_topic):
+                            payload = message.payload.decode("UTF-8")
+                            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)
+
+                        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'):
@@ -110,76 +142,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 > 0 and 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")
--- a/app/src/protocol_ifc.py
+++ b/app/src/protocol_ifc.py
@@ -1,21 +0,0 @@
-from abc import abstractmethod
-
-if __name__ == "app.src.protocol_ifc":
-    from app.src.iter_registry import AbstractIterMeta
-    from app.src.async_ifc import AsyncIfc
-else:  # pragma: no cover
-    from iter_registry import AbstractIterMeta
-    from async_ifc import AsyncIfc
-
-
-class ProtocolIfc(metaclass=AbstractIterMeta):
-    _registry = []
-
-    @abstractmethod
-    def __init__(self, addr, ifc: "AsyncIfc", server_side: bool,
-                 client_mode: bool = False, id_str=b''):
-        pass  # pragma: no cover
-
-    @abstractmethod
-    def close(self):
-        pass  # pragma: no cover
--- a/app/src/server.py
+++ b/app/src/server.py
@@ -5,8 +5,8 @@ import os
 from asyncio import StreamReader, StreamWriter
 from aiohttp import web
 from logging import config  # noqa F401
-from proxy import Proxy
-from inverter_ifc import InverterIfc
+from messages import Message
+from inverter import Inverter
 from gen3.inverter_g3 import InverterG3
 from gen3plus.inverter_g3p import InverterG3P
 from scheduler import Schedule
@@ -38,9 +38,9 @@ async def healthy(request):

    if proxy_is_up:
        # logging.info('web reqeust healthy()')
-        for inverter in InverterIfc:
+        for stream in Message:
            try:
-                res = inverter.healthy()
+                res = stream.healthy()
                if not res:
                    return web.Response(status=503, text="I have a problem")
            except Exception as err:
@@ -70,11 +70,18 @@ async def webserver(addr, port):
        logging.debug('HTTP cleanup done')


-async def handle_client(reader: StreamReader, writer: StreamWriter, inv_class):
+async def handle_client(reader: StreamReader, writer: StreamWriter):
    '''Handles a new incoming connection and starts an async loop'''

-    with inv_class(reader, writer) as inv:
-        await inv.local.ifc.server_loop()
+    addr = writer.get_extra_info('peername')
+    await InverterG3(reader, writer, addr).server_loop(addr)
+
+
+async def handle_client_v2(reader: StreamReader, writer: StreamWriter):
+    '''Handles a new incoming connection and starts an async loop'''
+
+    addr = writer.get_extra_info('peername')
+    await InverterG3P(reader, writer, addr).server_loop(addr)


 async def handle_shutdown(web_task):
@@ -87,13 +94,25 @@ async def handle_shutdown(web_task):
    #
    # first, disc all open TCP connections gracefully
    #
-    for inverter in InverterIfc:
-        await inverter.disc(True)
-
+    for stream in Message:
+        stream.shutdown_started = True
+        try:
+            await asyncio.wait_for(stream.disc(), 2)
+        except Exception:
+            pass
    logging.info('Proxy disconnecting done')

    #
-    # second, cancel the web server
+    # second, close all open TCP connections
+    #
+    for stream in Message:
+        stream.close()
+
+    await asyncio.sleep(0.1)  # give time for closing
+    logging.info('Proxy closing done')
+
+    #
+    # third, cancel the web server
    #
    web_task.cancel()
    await web_task
@@ -152,19 +171,17 @@ if __name__ == "__main__":
    ConfigErr = Config.class_init()
    if ConfigErr is not None:
        logging.info(f'ConfigErr: {ConfigErr}')
-    Proxy.class_init()
+    Inverter.class_init()
    Schedule.start()
-    ModbusTcp(loop)
+    mb_tcp = ModbusTcp(loop)

    #
    # Create tasks for our listening servers. These must be tasks! If we call
    # start_server directly out of our main task, the eventloop will be blocked
    # and we can't receive and handle the UNIX signals!
    #
-    for inv_class, port in [(InverterG3, 5005), (InverterG3P, 10000)]:
-        loop.create_task(asyncio.start_server(lambda r, w, i=inv_class:
-                                              handle_client(r, w, i),
-                                              '0.0.0.0', port))
+    loop.create_task(asyncio.start_server(handle_client, '0.0.0.0', 5005))
+    loop.create_task(asyncio.start_server(handle_client_v2, '0.0.0.0', 10000))
    web_task = loop.create_task(webserver('0.0.0.0', 8127))

    #
@@ -185,7 +202,7 @@ if __name__ == "__main__":
        pass
    finally:
        logging.info("Event loop is stopped")
-        Proxy.class_close(loop)
+        Inverter.class_close(loop)
        logging.debug('Close event loop')
        loop.close()
        logging.info(f'Finally, exit Server "{serv_name}"')
--- a/app/src/singleton.py
+++ b/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]
--- a/app/tests/test_async_stream.py
+++ b/app/tests/test_async_stream.py
@@ -1,572 +0,0 @@
-# test_with_pytest.py
-import pytest
-import asyncio
-import gc
-import time
-
-from app.src.infos import Infos
-from app.src.inverter_base import InverterBase
-from app.src.async_stream import AsyncStreamServer, AsyncStreamClient, StreamPtr
-from app.src.messages import Message
-from app.tests.test_modbus_tcp import FakeReader, FakeWriter
-from app.tests.test_inverter_base import config_conn, patch_open_connection
-
-pytest_plugins = ('pytest_asyncio',)
-
-# initialize the proxy statistics
-Infos.static_init()
-
-class FakeProto(Message):
-    def __init__(self, ifc, server_side):
-        super().__init__('G3F', ifc, server_side, None, 10)
-        self.conn_no = 0
-
-    def mb_timout_cb(self, exp_cnt):
-        pass  # empty callback
-
-def fake_reader_fwd():
-    reader = FakeReader()
-    reader.test  = FakeReader.RD_TEST_13_BYTES
-    reader.on_recv.set()
-    return reader
-
-def test_timeout_cb():
-    reader = FakeReader()
-    writer =  FakeWriter()
-    def timeout():
-        return 13
-    
-    ifc =  AsyncStreamClient(reader, writer, None, None)
-    assert 360 == ifc._AsyncStream__timeout()
-    ifc.prot_set_timeout_cb(timeout)
-    assert 13 == ifc._AsyncStream__timeout()
-    ifc.prot_set_timeout_cb(None)
-    assert 360 == ifc._AsyncStream__timeout()
-
-    # call healthy outside the contexter manager (__exit__() was called)
-    assert ifc.healthy()
-    del ifc
-
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-def test_health():
-    reader = FakeReader()
-    writer =  FakeWriter()
-    
-    ifc =  AsyncStreamClient(reader, writer, None, None)
-    ifc.proc_start = time.time()
-    assert ifc.healthy()
-    ifc.proc_start = time.time() -10
-    assert not ifc.healthy()
-    ifc.proc_start = None
-    assert ifc.healthy()
-
-    del ifc
-
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-@pytest.mark.asyncio
-async def test_close_cb():
-    assert asyncio.get_running_loop()
-    reader = FakeReader()
-    writer =  FakeWriter()
-    cnt = 0
-    def timeout():
-        return 0.1
-    def closed():
-        nonlocal cnt
-        nonlocal ifc
-        ifc.close()  # clears the closed callback
-        cnt += 1
-    
-    cnt = 0
-    ifc =  AsyncStreamClient(reader, writer, None, closed)
-    ifc.prot_set_timeout_cb(timeout)
-    await ifc.client_loop('')
-    assert cnt == 1
-    ifc.prot_set_timeout_cb(timeout)
-    await ifc.client_loop('')
-    assert cnt == 1         # check that the closed method would not be called 
-    del ifc
-
-    cnt = 0
-    ifc =  AsyncStreamClient(reader, writer, None, None)
-    ifc.prot_set_timeout_cb(timeout)
-    await ifc.client_loop('')
-    assert cnt == 0
-    del ifc
-
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-@pytest.mark.asyncio
-async def test_read():
-    global test
-    assert asyncio.get_running_loop()
-    reader = FakeReader()
-    reader.test  = FakeReader.RD_TEST_13_BYTES
-    reader.on_recv.set()
-    writer =  FakeWriter()
-    cnt = 0
-    def timeout():
-        return 1
-    def closed():
-        nonlocal cnt
-        nonlocal ifc
-        ifc.close()  # clears the closed callback
-        cnt += 1
-    def app_read():
-        nonlocal ifc
-        ifc.proc_start -= 3
-        return 0.01  # async wait of 0.01 
-    cnt = 0
-    ifc =  AsyncStreamClient(reader, writer, None, closed)
-    ifc.proc_max = 0
-    ifc.prot_set_timeout_cb(timeout)
-    ifc.rx_set_cb(app_read)
-    await ifc.client_loop('')
-    print('End loop')
-    assert ifc.proc_max >= 3
-    assert 13 == ifc.rx_len()
-    assert cnt == 1
-    del ifc
-
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-@pytest.mark.asyncio
-async def test_write():
-    global test
-    assert asyncio.get_running_loop()
-    reader = FakeReader()
-    reader.test  = FakeReader.RD_TEST_13_BYTES
-    reader.on_recv.set()
-    writer =  FakeWriter()
-    cnt = 0
-    def timeout():
-        return 1
-    def closed():
-        nonlocal cnt
-        nonlocal ifc
-        ifc.close()  # clears the closed callback
-        cnt += 1
-    def app_read():
-        nonlocal ifc
-        ifc.proc_start -= 3
-        return 0.01  # async wait of 0.01 
-    
-    cnt = 0
-    ifc =  AsyncStreamClient(reader, writer, None, closed)
-    ifc.proc_max = 10
-    ifc.prot_set_timeout_cb(timeout)
-    ifc.rx_set_cb(app_read)
-    ifc.tx_add(b'test-data-resp')
-    assert 14 == ifc.tx_len()
-    await ifc.client_loop('')
-    print('End loop')
-    assert ifc.proc_max >= 3
-    assert 13 == ifc.rx_len()
-    assert 0 == ifc.tx_len()
-    assert cnt == 1
-    del ifc
-
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-@pytest.mark.asyncio
-async def test_publ_mqtt_cb():
-    assert asyncio.get_running_loop()
-    reader = FakeReader()
-    reader.test  = FakeReader.RD_TEST_13_BYTES
-    reader.on_recv.set()
-    writer =  FakeWriter()
-    cnt = 0
-    def timeout():
-        return 0.1
-    async def publ_mqtt():
-        nonlocal cnt
-        nonlocal ifc
-        cnt += 1
-    
-    cnt = 0
-    ifc =  AsyncStreamServer(reader, writer, publ_mqtt, None, None)
-    assert ifc.async_publ_mqtt
-    ifc.prot_set_timeout_cb(timeout)
-    await ifc.server_loop()
-    assert cnt == 3     # 2 calls in server_loop() and 1 in loop()
-    assert ifc.async_publ_mqtt
-    ifc.close()  # clears the closed callback
-    assert not ifc.async_publ_mqtt
-    del ifc
-
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-@pytest.mark.asyncio
-async def test_create_remote_cb():
-    assert asyncio.get_running_loop()
-    reader = FakeReader()
-    writer =  FakeWriter()
-    cnt = 0
-    def timeout():
-        return 0.1
-    async def create_remote():
-        nonlocal cnt
-        nonlocal ifc
-        ifc.close()  # clears the closed callback
-        cnt += 1
-    
-    cnt = 0
-    ifc =  AsyncStreamServer(reader, writer, None, create_remote, None)
-    assert ifc.create_remote
-    await ifc.create_remote()
-    assert cnt == 1
-    ifc.prot_set_timeout_cb(timeout)
-    await ifc.server_loop()
-    assert not ifc.create_remote
-    del ifc
-
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-@pytest.mark.asyncio
-async def test_sw_exception():
-    global test
-    assert asyncio.get_running_loop()
-    reader = FakeReader()
-    reader.test  = FakeReader.RD_TEST_SW_EXCEPT
-    reader.on_recv.set()
-    writer =  FakeWriter()
-    cnt = 0
-    def timeout():
-        return 1
-    def closed():
-        nonlocal cnt
-        nonlocal ifc
-        ifc.close()  # clears the closed callback
-        cnt += 1
-    cnt = 0
-    ifc =  AsyncStreamClient(reader, writer, None, closed)
-    ifc.prot_set_timeout_cb(timeout)
-    await ifc.client_loop('')
-    print('End loop')
-    assert cnt == 1
-    del ifc
-
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-@pytest.mark.asyncio
-async def test_os_error():
-    global test
-    assert asyncio.get_running_loop()
-    reader = FakeReader()
-    reader.test  = FakeReader.RD_TEST_OS_ERROR
-
-    reader.on_recv.set()
-    writer =  FakeWriter()
-    cnt = 0
-    def timeout():
-        return 1
-    def closed():
-        nonlocal cnt
-        nonlocal ifc
-        ifc.close()  # clears the closed callback
-        cnt += 1
-    cnt = 0
-    ifc =  AsyncStreamClient(reader, writer, None, closed)
-    ifc.prot_set_timeout_cb(timeout)
-    await ifc.client_loop('')
-    print('End loop')
-    assert cnt == 1
-    del ifc
-
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-class TestType():
-    FWD_NO_EXCPT = 1
-    FWD_SW_EXCPT = 2
-    FWD_TIMEOUT = 3
-    FWD_OS_ERROR = 4
-    FWD_OS_ERROR_NO_STREAM = 5
-    FWD_RUNTIME_ERROR = 6
-    FWD_RUNTIME_ERROR_NO_STREAM = 7
-
-def create_remote(remote, test_type, with_close_hdr:bool = False):
-    def update_hdr(buf):
-        return
-    def callback():
-        if test_type == TestType.FWD_SW_EXCPT:
-            remote.unknown_var += 1    
-        elif test_type == TestType.FWD_TIMEOUT:
-            raise TimeoutError
-        elif test_type == TestType.FWD_OS_ERROR:
-            raise ConnectionRefusedError
-        elif test_type == TestType.FWD_OS_ERROR_NO_STREAM:
-            remote.stream = None
-            raise ConnectionRefusedError
-        elif test_type == TestType.FWD_RUNTIME_ERROR:
-            raise RuntimeError("Peer closed")
-        elif test_type == TestType.FWD_RUNTIME_ERROR_NO_STREAM:
-            remote.stream = None
-            raise RuntimeError("Peer closed")
-        return True
-
-    def close():
-        return
-    if with_close_hdr:
-        close_hndl = close
-    else:
-        close_hndl = None
-    
-    remote.ifc = AsyncStreamClient(
-        FakeReader(), FakeWriter(), StreamPtr(None), close_hndl)
-    remote.ifc.prot_set_update_header_cb(update_hdr)
-    remote.ifc.prot_set_init_new_client_conn_cb(callback)
-    remote.stream = FakeProto(remote.ifc, False)
-
-@pytest.mark.asyncio
-async def test_forward():
-    assert asyncio.get_running_loop()
-    remote = StreamPtr(None)
-    cnt = 0
-
-    async def _create_remote():
-        nonlocal cnt, remote, ifc
-        create_remote(remote, TestType.FWD_NO_EXCPT)
-        ifc.fwd_add(b'test-forward_msg2 ')
-        cnt += 1
-    
-    cnt = 0
-    ifc =  AsyncStreamServer(fake_reader_fwd(), FakeWriter(), None, _create_remote, remote)
-    ifc.fwd_add(b'test-forward_msg')
-    await ifc.server_loop()
-    assert cnt == 1
-    del ifc
-
-@pytest.mark.asyncio
-async def test_forward_with_conn():
-    assert asyncio.get_running_loop()
-    remote = StreamPtr(None)
-    cnt = 0
-
-    async def _create_remote():
-        nonlocal cnt, remote, ifc
-        cnt += 1
-    
-    cnt = 0
-    ifc =  AsyncStreamServer(fake_reader_fwd(), FakeWriter(), None, _create_remote, remote)
-    create_remote(remote, TestType.FWD_NO_EXCPT)
-    ifc.fwd_add(b'test-forward_msg')
-    await ifc.server_loop()
-    assert cnt == 0
-    del ifc
-
-@pytest.mark.asyncio
-async def test_forward_no_conn():
-    assert asyncio.get_running_loop()
-    remote = StreamPtr(None)
-    cnt = 0
-
-    async def _create_remote():
-        nonlocal cnt
-        cnt += 1
-    
-    cnt = 0
-    ifc =  AsyncStreamServer(fake_reader_fwd(), FakeWriter(), None, _create_remote, remote)
-    ifc.fwd_add(b'test-forward_msg')
-    await ifc.server_loop()
-    assert cnt == 1
-    del ifc
-
-@pytest.mark.asyncio
-async def test_forward_sw_except():
-    assert asyncio.get_running_loop()
-    remote = StreamPtr(None)
-    cnt = 0
-
-    async def _create_remote():
-        nonlocal cnt, remote
-        create_remote(remote, TestType.FWD_SW_EXCPT)
-        cnt += 1
-    
-    cnt = 0
-    ifc =  AsyncStreamServer(fake_reader_fwd(), FakeWriter(), None, _create_remote, remote)
-    ifc.fwd_add(b'test-forward_msg')
-    await ifc.server_loop()
-    assert cnt == 1
-    del ifc
-
-@pytest.mark.asyncio
-async def test_forward_os_error():
-    assert asyncio.get_running_loop()
-    remote = StreamPtr(None)
-    cnt = 0
-
-    async def _create_remote():
-        nonlocal cnt, remote
-        create_remote(remote, TestType.FWD_OS_ERROR)
-        cnt += 1
-    
-    cnt = 0
-    ifc =  AsyncStreamServer(fake_reader_fwd(), FakeWriter(), None, _create_remote, remote)
-    ifc.fwd_add(b'test-forward_msg')
-    await ifc.server_loop()
-    assert cnt == 1
-    del ifc
-
-@pytest.mark.asyncio
-async def test_forward_os_error2():
-    assert asyncio.get_running_loop()
-    remote = StreamPtr(None)
-    cnt = 0
-
-    async def _create_remote():
-        nonlocal cnt, remote
-        create_remote(remote, TestType.FWD_OS_ERROR, True)
-        cnt += 1
-    
-    cnt = 0
-    ifc =  AsyncStreamServer(fake_reader_fwd(), FakeWriter(), None, _create_remote, remote)
-    ifc.fwd_add(b'test-forward_msg')
-    await ifc.server_loop()
-    assert cnt == 1
-    del ifc
-
-@pytest.mark.asyncio
-async def test_forward_os_error3():
-    assert asyncio.get_running_loop()
-    remote = StreamPtr(None)
-    cnt = 0
-
-    async def _create_remote():
-        nonlocal cnt, remote
-        create_remote(remote, TestType.FWD_OS_ERROR_NO_STREAM)
-        cnt += 1
-    
-    cnt = 0
-    ifc =  AsyncStreamServer(fake_reader_fwd(), FakeWriter(), None, _create_remote, remote)
-    ifc.fwd_add(b'test-forward_msg')
-    await ifc.server_loop()
-    assert cnt == 1
-    del ifc
-
-@pytest.mark.asyncio
-async def test_forward_runtime_error():
-    assert asyncio.get_running_loop()
-    remote = StreamPtr(None)
-    cnt = 0
-
-    async def _create_remote():
-        nonlocal cnt, remote
-        create_remote(remote, TestType.FWD_RUNTIME_ERROR)
-        cnt += 1
-    
-    cnt = 0
-    ifc =  AsyncStreamServer(fake_reader_fwd(), FakeWriter(), None, _create_remote, remote)
-    ifc.fwd_add(b'test-forward_msg')
-    await ifc.server_loop()
-    assert cnt == 1
-    del ifc
-
-@pytest.mark.asyncio
-async def test_forward_runtime_error2():
-    assert asyncio.get_running_loop()
-    remote = StreamPtr(None)
-    cnt = 0
-
-    async def _create_remote():
-        nonlocal cnt, remote
-        create_remote(remote, TestType.FWD_RUNTIME_ERROR, True)
-        cnt += 1
-    
-    cnt = 0
-    ifc =  AsyncStreamServer(fake_reader_fwd(), FakeWriter(), None, _create_remote, remote)
-    ifc.fwd_add(b'test-forward_msg')
-    await ifc.server_loop()
-    assert cnt == 1
-    del ifc
-
-@pytest.mark.asyncio
-async def test_forward_runtime_error3():
-    assert asyncio.get_running_loop()
-    remote = StreamPtr(None)
-    cnt = 0
-
-    async def _create_remote():
-        nonlocal cnt, remote
-        create_remote(remote, TestType.FWD_RUNTIME_ERROR_NO_STREAM, True)
-        cnt += 1
-    
-    cnt = 0
-    ifc =  AsyncStreamServer(fake_reader_fwd(), FakeWriter(), None, _create_remote, remote)
-    ifc.fwd_add(b'test-forward_msg')
-    await ifc.server_loop()
-    assert cnt == 1
-    del ifc
-
-@pytest.mark.asyncio
-async def test_forward_resp():
-    assert asyncio.get_running_loop()
-    remote = StreamPtr(None)
-    cnt = 0
-
-    async def _close_cb():
-        nonlocal cnt, remote, ifc
-        cnt += 1
-    
-    cnt = 0
-    ifc =  AsyncStreamClient(fake_reader_fwd(), FakeWriter(), remote, _close_cb)
-    create_remote(remote, TestType.FWD_NO_EXCPT)
-    ifc.fwd_add(b'test-forward_msg')
-    await ifc.client_loop('')
-    assert cnt == 0
-    del ifc
-
-@pytest.mark.asyncio
-async def test_forward_resp2():
-    assert asyncio.get_running_loop()
-    remote = StreamPtr(None)
-    cnt = 0
-
-    async def _close_cb():
-        nonlocal cnt, remote, ifc
-        cnt += 1
-    
-    cnt = 0
-    ifc =  AsyncStreamClient(fake_reader_fwd(), FakeWriter(), None, _close_cb)
-    create_remote(remote, TestType.FWD_NO_EXCPT)
-    ifc.fwd_add(b'test-forward_msg')
-    await ifc.client_loop('')
-    assert cnt == 0
-    del ifc
--- a/app/tests/test_byte_fifo.py
+++ b/app/tests/test_byte_fifo.py
@@ -1,43 +0,0 @@
-# test_with_pytest.py
-
-from app.src.byte_fifo import ByteFifo
-
-def test_fifo():
-    read = ByteFifo()
-    assert 0 == len(read)
-    read += b'12'
-    assert 2 == len(read)
-    read += bytearray("34", encoding='UTF8')
-    assert 4 == len(read)
-    assert b'12' == read.peek(2)
-    assert 4 == len(read)
-    assert b'1234' == read.peek()
-    assert 4 == len(read)
-    assert b'12' == read.get(2)
-    assert 2 == len(read)
-    assert b'34' == read.get()
-    assert 0 == len(read)
-
-def test_fifo_fmt():
-    read = ByteFifo()
-    read += b'1234'
-    assert b'1234' == read.peek()
-    assert "  0000 | 31 32 33 34                                      | 1234" == f'{read}'
-
-def test_fifo_observer():
-    read = ByteFifo()
-
-    def _read():
-        assert b'1234' == read.get(4)
-
-    read += b'12'
-    assert 2 == len(read)
-    read()
-    read.reg_trigger(_read)
-    read += b'34'
-    assert 4 == len(read)
-    read()
-    assert 0 == len(read)
-    assert b'' == read.peek(2)
-    assert b'' == read.get(2)
-    assert 0 == len(read)
--- a/app/tests/test_config.py
+++ b/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():
@@ -30,33 +30,7 @@ def test_default_config():
        validated = Config.conf_schema.validate(cnf)
    except Exception:
        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': False, 
-                             'R170000000000001': {
-                                 'node_id': '', 
-                                 'pv1': {'manufacturer': 'Risen',
-                                         'type': 'RSM40-8-395M'},
-                                 'pv2': {'manufacturer': 'Risen',
-                                         'type': 'RSM40-8-395M'},
-                                 'modbus_polling': False,
-                                 'monitor_sn': 0, 
-                                 'suggested_area': '', 
-                                 'sensor_list': 688}, 
-                             'Y170000000000001': {
-                                 'modbus_polling': True, 
-                                 'monitor_sn': 2000000000, 
-                                 'node_id': '',
-                                 'pv1': {'manufacturer': 'Risen',
-                                         'type': 'RSM40-8-410M'},
-                                 'pv2': {'manufacturer': 'Risen',
-                                         'type': 'RSM40-8-410M'},
-                                 'pv3': {'manufacturer': 'Risen',
-                                         'type': 'RSM40-8-410M'},
-                                 'pv4': {'manufacturer': 'Risen',
-                                         'type': 'RSM40-8-410M'},
-                                 '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': '', 'modbus_polling': False, 'monitor_sn': 0, 'suggested_area': ''}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'node_id': '', 'suggested_area': ''}}}

 def test_full_config():
    cnf = {'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 
@@ -66,13 +40,13 @@ 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': {'modbus_polling': True, 'node_id': '', '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': '', 'suggested_area': ''}}}
    try:
        validated = Config.conf_schema.validate(cnf)
    except Exception:
        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': '', 'modbus_polling': True, 'monitor_sn': 0, 'pv1': {'manufacturer': 'man1','type': 'type1'},'pv2': {'manufacturer': 'man2','type': 'type2'},'pv3': {'manufacturer': 'man3','type': 'type3'}, 'suggested_area': ''}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'node_id': '', 'suggested_area': ''}}}

 def test_mininum_config():
    cnf = {'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 
@@ -89,7 +63,7 @@ def test_mininum_config():
        validated = Config.conf_schema.validate(cnf)
    except Exception:
        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': '', 'modbus_polling': True, 'monitor_sn': 0, 'suggested_area': ''}}}

 def test_read_empty():
    cnf = {}
@@ -97,37 +71,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': False,
-                       'R170000000000001': {
-                           'suggested_area': '', 
-                           'modbus_polling': False, 
-                           'monitor_sn': 0, 
-                           'node_id': '', 
-                           'pv1': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-395M'},
-                           'pv2': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-395M'},
-                           'sensor_list': 688
-                       }, 
-                       'Y170000000000001': {
-                           'modbus_polling': True, 
-                           'monitor_sn': 2000000000, 
-                           'suggested_area': '', 
-                           'node_id': '', 
-                           'pv1': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           'pv2': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           'pv3': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           'pv4': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           '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': '', 'modbus_polling': False, 'monitor_sn': 0, 'node_id': ''}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'suggested_area': '', 'node_id': ''}}}
    
    defcnf = TstConfig.def_config.get('solarman') 
    assert defcnf == {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 10000}
@@ -149,37 +93,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': False,
-                       'R170000000000001': {
-                           'suggested_area': '', 
-                           'modbus_polling': False, 
-                           'monitor_sn': 0, 
-                           'node_id': '', 
-                           'pv1': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-395M'},
-                           'pv2': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-395M'},
-                           'sensor_list': 688
-                       }, 
-                       'Y170000000000001': {
-                           'modbus_polling': True, 
-                           'monitor_sn': 2000000000, 
-                           'suggested_area': '', 
-                           'node_id': '', 
-                           'pv1': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           'pv2': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           'pv3': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           'pv4': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           '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': '', 'modbus_polling': False, 'monitor_sn': 0, 'node_id': ''}, 'Y170000000000001': {'modbus_polling': True, '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') 
@@ -192,37 +106,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': False,
-                       'R170000000000001': {
-                           'suggested_area': '', 
-                           'modbus_polling': False, 
-                           'monitor_sn': 0, 
-                           'node_id': '', 
-                           'pv1': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-395M'},
-                           'pv2': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-395M'},
-                           'sensor_list': 688
-                       }, 
-                       'Y170000000000001': {
-                           'modbus_polling': True, 
-                           'monitor_sn': 2000000000, 
-                           'suggested_area': '', 
-                           'node_id': '', 
-                           'pv1': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           'pv2': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           'pv3': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           'pv4': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           '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': '', 'modbus_polling': False, 'monitor_sn': 0, 'node_id': ''}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'suggested_area': '', 'node_id': ''}}}
    assert True == TstConfig.is_default('solarman')

 def test_read_cnf3():
@@ -239,37 +123,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': False,
-                       'R170000000000001': {
-                           'suggested_area': '', 
-                           'modbus_polling': False, 
-                           'monitor_sn': 0, 
-                           'node_id': '', 
-                           'pv1': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-395M'},
-                           'pv2': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-395M'},
-                           'sensor_list': 688
-                       }, 
-                       'Y170000000000001': {
-                           'modbus_polling': True, 
-                           'monitor_sn': 2000000000, 
-                           'suggested_area': '', 
-                           'node_id': '', 
-                           'pv1': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           'pv2': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           'pv3': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           'pv4': {'manufacturer': 'Risen',
-                                   'type': 'RSM40-8-410M'},
-                           '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': '', 'modbus_polling': False, 'monitor_sn': 0, 'node_id': ''}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'suggested_area': '', 'node_id': ''}}}
    assert False == TstConfig.is_default('solarman')

 def test_read_cnf5():
--- a/app/tests/test_infos.py
+++ b/app/tests/test_infos.py
@@ -3,7 +3,7 @@ import pytest
 import json, math
 import logging
 from app.src.infos import Register, ClrAtMidnight
-from app.src.infos import Infos, Fmt
+from app.src.infos import Infos

 def test_statistic_counter():
    i = Infos()
@@ -17,13 +17,13 @@ def test_statistic_counter():
    assert val == None or val == 0

    i.static_init()                # initialize counter
-    assert json.dumps(i.stat) == json.dumps({"proxy": {"Inverter_Cnt": 0, "Cloud_Conn_Cnt": 0, "Unknown_SNR": 0, "Unknown_Msg": 0, "Invalid_Data_Type": 0, "Internal_Error": 0,"Unknown_Ctrl": 0, "OTA_Start_Msg": 0, "SW_Exception": 0, "Invalid_Msg_Format": 0, "AT_Command": 0, "AT_Command_Blocked": 0, "Modbus_Command": 0}})
+    assert json.dumps(i.stat) == json.dumps({"proxy": {"Inverter_Cnt": 0, "Unknown_SNR": 0, "Unknown_Msg": 0, "Invalid_Data_Type": 0, "Internal_Error": 0,"Unknown_Ctrl": 0, "OTA_Start_Msg": 0, "SW_Exception": 0, "Invalid_Msg_Format": 0, "AT_Command": 0, "AT_Command_Blocked": 0, "Modbus_Command": 0}})
                                            
    val = i.dev_value(Register.INVERTER_CNT)  # valid and initiliazed addr
    assert val == 0

    i.inc_counter('Inverter_Cnt')
-    assert json.dumps(i.stat) == json.dumps({"proxy": {"Inverter_Cnt": 1, "Cloud_Conn_Cnt": 0, "Unknown_SNR": 0, "Unknown_Msg": 0, "Invalid_Data_Type": 0, "Internal_Error": 0,"Unknown_Ctrl": 0, "OTA_Start_Msg": 0, "SW_Exception": 0, "Invalid_Msg_Format": 0, "AT_Command": 0, "AT_Command_Blocked": 0, "Modbus_Command": 0}})
+    assert json.dumps(i.stat) == json.dumps({"proxy": {"Inverter_Cnt": 1, "Unknown_SNR": 0, "Unknown_Msg": 0, "Invalid_Data_Type": 0, "Internal_Error": 0,"Unknown_Ctrl": 0, "OTA_Start_Msg": 0, "SW_Exception": 0, "Invalid_Msg_Format": 0, "AT_Command": 0, "AT_Command_Blocked": 0, "Modbus_Command": 0}})
    val = i.dev_value(Register.INVERTER_CNT)
    assert val == 1

@@ -256,24 +256,3 @@ def test_key_obj():
    assert level == logging.DEBUG
    assert unit == 'kWh'
    assert must_incr == True
-
-def test_hex4_cnv():
-    tst_val = (0x12ef, )
-    string = Fmt.hex4(tst_val)
-    assert string == '12ef'
-    val = Fmt.hex4(string, reverse=True)
-    assert val == tst_val[0]
-
-def test_mac_cnv():
-    tst_val = (0x12, 0x34,  0x67, 0x89, 0xcd, 0xef)
-    string = Fmt.mac(tst_val)
-    assert string == '12:34:67:89:cd:ef'
-    val = Fmt.mac(string, reverse=True)
-    assert val == tst_val
-
-def test_version_cnv():
-    tst_val = (0x123f, )
-    string = Fmt.version(tst_val)
-    assert string == 'V1.2.3F'
-    val = Fmt.version(string, reverse=True)
-    assert val == tst_val[0]
--- a/app/tests/test_infos_g3.py
+++ b/app/tests/test_infos_g3.py
@@ -1,10 +1,10 @@
 # test_with_pytest.py
-import pytest, json, math
-from app.src.infos import Register
-from app.src.gen3.infos_g3 import InfosG3, RegisterMap
+import pytest, json
+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,72 +384,50 @@ 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   
-    assert tests==12
+    assert tests==5
    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}})
-    assert json.dumps(i.db['env']) == json.dumps({"Inverter_Status": 1, "Inverter_Temp": 23})
+    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':
-            assert update == False
-            tests +=1   
-
-    assert tests==4
-    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}})
-    assert json.dumps(i.db['env']) == json.dumps({"Inverter_Status": 1, "Inverter_Temp": 23})
-    assert json.dumps(i.db['inverter']) == json.dumps({"Rated_Power": 600, "BOOT_STATUS": 0, "DSP_STATUS": 21930, "Work_Mode": 0, "Max_Designed_Power": -1, "Input_Coefficient": -0.1, "Output_Coefficient": 100.0, "No_Inputs": 2})
-        
-    tests = 0
-    for key, update in i.parse (inv_data_seq2_zero):
+    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})
+    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})
+    assert json.dumps(i.db['inverter']) == json.dumps({"Rated_Power": 600, "No_Inputs": 2})
+        
+    tests = 0
+    for key, update in i.parse (InvDataSeq2_Zero):
+        if key == 'total':
+            assert update == False
+            tests +=1   
+        elif key == 'env':
+            assert update == True
            tests +=1   

-    assert tests==4
+    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": 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_Status": 1, "Inverter_Temp": 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   
@@ -461,35 +435,42 @@ def test_must_incr_total2(inv_data_seq2, inv_data_seq2_zero):
            assert update == True
            tests +=1

-    assert tests==4
+    assert tests==3
    assert json.dumps(i.db['total']) == json.dumps({})
    assert json.dumps(i.db['input']) == json.dumps({"pv1": {"Voltage": 33.6, "Current": 1.91, "Power": 0.0}, "pv2": {"Voltage": 33.5, "Current": 1.36, "Power": 0.0}, "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_Status": 1, "Inverter_Temp": 0})
+    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==4
+    assert tests==3
    assert json.dumps(i.db['total']) == json.dumps({})
    assert json.dumps(i.db['input']) == json.dumps({"pv1": {"Voltage": 33.6, "Current": 1.91, "Power": 0.0}, "pv2": {"Voltage": 33.5, "Current": 1.36, "Power": 0.0}, "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_Status": 1, "Inverter_Temp": 0})
+    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==4
+    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':
@@ -501,12 +482,12 @@ def test_new_data_types(inv_data_new):
        else:
            assert False

-    assert tests==7
-    assert json.dumps(i.db['inverter']) == json.dumps({"Manufacturer": 0, "DSP_STATUS": 0})
+    assert tests==15
+    assert json.dumps(i.db['inverter']) == json.dumps({"Manufacturer": 0})
    assert json.dumps(i.db['input']) == json.dumps({"pv1": {}})
-    assert json.dumps(i.db['events']) == json.dumps({"Inverter_Alarm": 0, "Inverter_Fault": 0})
+    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

@@ -514,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
--- a/app/tests/test_infos_g3p.py
+++ b/app/tests/test_infos_g3p.py
@@ -1,33 +1,18 @@

 # test_with_pytest.py
-import pytest, json, math, random
+import pytest, json, math
 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 device_data(): # 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'
@@ -57,7 +42,6 @@ def inverter_data():  # 0x4210 ftype: 0x01
    msg += b'\x01\x61\x00\xa8\x02\x54\x01\x5a\x00\x8a\x01\xe4\x01\x5a\x00\xbd'
    msg += b'\x02\x8f\x00\x11\x00\x01\x00\x00\x00\x0b\x00\x00\x27\x98\x00\x04'
    msg += b'\x00\x00\x0c\x04\x00\x03\x00\x00\x0a\xe7\x00\x05\x00\x00\x0c\x75'
-    
    msg += b'\x00\x00\x00\x00\x06\x16\x02\x00\x00\x00\x55\xaa\x00\x01\x00\x00'
    msg += b'\x00\x00\x00\x00\xff\xff\x07\xd0\x00\x03\x04\x00\x04\x00\x04\x00'
    msg += b'\x04\x00\x00\x01\xff\xff\x00\x01\x00\x06\x00\x68\x00\x68\x05\x00'
@@ -79,28 +63,17 @@ def test_default_db():
        "collector": {"Chip_Type": "IGEN TECH"},
        })

-def test_parse_4110(str_test_ip, device_data: bytes):
+def test_parse_4110(device_data: bytes):
    i = InfosG3P(client_mode=False)
    i.db.clear()
    for key, update in i.parse (device_data, 0x41, 2):
        pass  # side effect is calling generator i.parse()

    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", "WiFi_SSID": "Allius-Home"},
-        'collector': {"Chip_Model": "LSW5BLE_17_02B0_1.05", "MAC-Addr": "40:2a:8f:4f:51:54", "Collector_Fw_Version": "V1.1.00.0B"},
+        '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_build_4110(str_test_ip, device_data: bytes):
-    i = InfosG3P(client_mode=False)
-    i.db.clear()
-    for key, update in i.parse (device_data, 0x41, 2):
-        pass  # side effect is calling generator i.parse()
-
-    build_msg = i.build(len(device_data), 0x41, 2)
-    for i in range(11, 20):
-        build_msg[i] = device_data[i]
-    assert device_data == build_msg    
-
 def test_parse_4210(inverter_data: bytes):
    i = InfosG3P(client_mode=False)
    i.db.clear()
@@ -109,32 +82,17 @@ def test_parse_4210(inverter_data: bytes):
        pass  #  side effect is calling generator i.parse()

    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, "BOOT_STATUS": 0, "DSP_STATUS": 21930, "Work_Mode": 0, "Max_Designed_Power": 2000, "Input_Coefficient": 100.0, "Output_Coefficient": 100.0}, 
-         "env": {"Inverter_Status": 1, "Detect_Status_1": 2, "Detect_Status_2": 0, "Inverter_Temp": 14}, 
-         "events": {"Inverter_Alarm": 0, "Inverter_Fault": 0, "Inverter_Bitfield_1": 0, "Inverter_bitfield_2": 0},
+         "controller": {"Power_On_Time": 2051}, 
+         "inverter": {"Serial_Number": "Y17E00000000000E", "Version": "V4.0.10", "Rated_Power": 600, "Max_Designed_Power": 2000}, 
+         "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}, 
                   "pv2": {"Voltage": 34.6, "Current": 1.38, "Power": 48.4, "Daily_Generation": 0.03, "Total_Generation": 27.91}, 
                   "pv3": {"Voltage": 34.6, "Current": 1.89, "Power": 65.5, "Daily_Generation": 0.05, "Total_Generation": 31.89}, 
                   "pv4": {"Voltage": 1.7, "Current": 0.01, "Power": 0.0, "Total_Generation": 15.58}}, 
-         "total": {"Daily_Generation": 0.11, "Total_Generation": 101.36},
-         "inv_unknown": {"Unknown_1": 512},
-         "other": {"Output_Shutdown": 65535, "Rated_Level": 3, "Grid_Volt_Cal_Coef": 1024}
+         "total": {"Daily_Generation": 0.11, "Total_Generation": 101.36}
        })
-
-def test_build_4210(inverter_data: bytes):
-    i = InfosG3P(client_mode=False)
-    i.db.clear()
    
-    for key, update in i.parse (inverter_data, 0x42, 1):
-        pass  #  side effect is calling generator i.parse()
-
-    build_msg = i.build(len(inverter_data), 0x42, 1)
-    for i in range(11, 31):
-        build_msg[i] = inverter_data[i]
-    assert inverter_data == build_msg    
-
 def test_build_ha_conf1():
    i = InfosG3P(client_mode=False)
    i.static_init()                # initialize counter
@@ -181,11 +139,7 @@ def test_build_ha_conf1():

    assert tests==7

-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':
@@ -207,9 +161,9 @@ 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==8

-def test_build_ha_conf3():
+def test_build_ha_conf2():
    i = InfosG3P(client_mode=True)
    i.static_init()                # initialize counter

@@ -255,11 +209,7 @@ def test_build_ha_conf3():

    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':
@@ -281,14 +231,12 @@ def test_build_ha_conf4():
            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==8

-def test_exception_and_calc(inverter_data: bytes):
+def test_exception_and_eval(inverter_data: bytes):

-    # patch table to convert temperature from °F to °C
-    ofs =     RegisterMap.map[0x420100d8]['offset']
-    RegisterMap.map[0x420100d8]['quotient'] =  1.8
-    RegisterMap.map[0x420100d8]['offset'] =  -32/1.8
+    # 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) 
@@ -296,43 +244,16 @@ def test_exception_and_calc(inverter_data: bytes):
    RegisterMap.map[0x420100de] = 'invalid_entry'

    i = InfosG3P(client_mode=False)
-    i.db.clear()
+    # 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)
-    
-    build_msg = i.build(len(inverter_data), 0x42, 1)
-    assert build_msg[32:0xde] == inverter_data[32:0xde]
-    assert build_msg[0xde:0xe2] == b'\x00\x00\x00\x00'
-    assert build_msg[0xe2:-1] == inverter_data[0xe2:-1]
-
-
-    # remove a table entry and test parsing and building
-    del RegisterMap.map[0x420100d8]['quotient']
-    del RegisterMap.map[0x420100d8]['offset']
-
-    i.db.clear()
+    del RegisterMap.map[0x420100d8]['eval'] # remove eval
+    RegisterMap.map[0x420100e0]['reg'] = Register.PV1_VOLTAGE # 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()
    assert 54 == i.get_db_value(Register.INVERTER_TEMP, 0)
-
-    build_msg = i.build(len(inverter_data), 0x42, 1)
-    assert build_msg[32:0xd8] == inverter_data[32:0xd8]
-    assert build_msg[0xd8:0xe2] == b'\x006\x00\x00\x02X\x00\x00\x00\x00'
-    assert build_msg[0xe2:-1] == inverter_data[0xe2:-1]
-
-    # test restore table 
-    RegisterMap.map[0x420100d8]['offset'] = ofs
-    RegisterMap.map[0x420100e0]['reg'] = Register.PV1_VOLTAGE # reset mapping
-    RegisterMap.map[0x420100de] = backup # reset mapping
-
-    # test orginial table 
-    i.db.clear()    
-    for key, update in i.parse (inverter_data, 0x42, 1):
-        pass  #  side effect is calling generator i.parse()
-    assert 14 == i.get_db_value(Register.INVERTER_TEMP, 0)
-
-    build_msg = i.build(len(inverter_data), 0x42, 1)
-    assert build_msg[32:-1] == inverter_data[32:-1]
+ 
--- a/app/tests/test_inverter_base.py
+++ b/app/tests/test_inverter_base.py
@@ -1,304 +0,0 @@
-# test_with_pytest.py
-import pytest
-import asyncio
-import gc
-
-from mock import patch
-from enum import Enum
-from app.src.infos import Infos
-from app.src.config import Config
-from app.src.gen3.talent import Talent
-from app.src.inverter_base import InverterBase
-from app.src.singleton import Singleton
-from app.src.async_stream import AsyncStream, AsyncStreamClient
-
-from app.tests.test_modbus_tcp import patch_mqtt_err, patch_mqtt_except, test_port, test_hostname
-
-pytest_plugins = ('pytest_asyncio',)
-
-# initialize the proxy statistics
-Infos.static_init()
-
-@pytest.fixture
-def config_conn():
-    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': ''
-        },
-        'tsun':{'enabled': True, 'host': 'test_cloud.local', 'port': 1234}, 'inverters':{'allow_all':True}
-    }
-
-@pytest.fixture(scope="module", autouse=True)
-def module_init():
-    Singleton._instances.clear()
-    yield
-
-class FakeReader():
-    def __init__(self):
-        self.on_recv =  asyncio.Event()
-    async def read(self, max_len: int):
-        await self.on_recv.wait()
-        return b''
-    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
-
-class TestType(Enum):
-    RD_TEST_0_BYTES = 1
-    RD_TEST_TIMEOUT = 2
-    RD_TEST_EXCEPT = 3
-
-
-test  = TestType.RD_TEST_0_BYTES
-
-@pytest.fixture
-def patch_open_connection():
-    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 ConnectionRefusedError
-        elif test == TestType.RD_TEST_EXCEPT:
-            raise ValueError("Value cannot be negative") # Compliant
-        return new_conn(None)
-
-    with patch.object(asyncio, 'open_connection', new_open) as conn:
-        yield conn
-
-
-@pytest.fixture
-def patch_healthy():
-    with patch.object(AsyncStream, 'healthy') as conn:
-        yield conn
-
-@pytest.fixture
-def patch_unhealthy():
-    def new_healthy(self):
-        return False
-    with patch.object(AsyncStream, 'healthy', new_healthy) as conn:
-        yield conn
-@pytest.fixture
-def patch_unhealthy_remote():
-    def new_healthy(self):
-        return False
-    with patch.object(AsyncStreamClient, 'healthy', new_healthy) as conn:
-        yield conn
-
-def test_inverter_iter():
-    InverterBase._registry.clear()
-    cnt = 0
-    reader = FakeReader()
-    writer =  FakeWriter()
-
-    with InverterBase(reader, writer, 'tsun', Talent) as inverter:
-        for inv in InverterBase:
-            assert inv == inverter
-            cnt += 1
-            del inv
-    del inverter
-    assert cnt == 1
-    
-    for inv in InverterBase:
-        assert False
-
-def test_method_calls(patch_healthy):
-    spy = patch_healthy
-    InverterBase._registry.clear()
-    reader = FakeReader()
-    writer =  FakeWriter()
-
-    with InverterBase(reader, writer, 'tsun', Talent) as inverter:
-        assert inverter.local.stream
-        assert inverter.local.ifc
-        # call healthy inside the contexter manager
-        for inv in InverterBase:
-            assert inv.healthy() 
-            del inv
-        spy.assert_called_once()
-
-    # outside context manager the health function of AsyncStream is not reachable
-    cnt = 0
-    for inv in InverterBase:
-        assert inv.healthy()
-        cnt += 1
-        del inv
-    assert cnt == 1
-    spy.assert_called_once() # counter don't increase and keep one!
-
-    del inverter
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-def test_unhealthy(patch_unhealthy):
-    _ = patch_unhealthy
-    InverterBase._registry.clear()
-    reader = FakeReader()
-    writer =  FakeWriter()
-
-    with InverterBase(reader, writer, 'tsun', Talent) as inverter:
-        assert inverter.local.stream
-        assert inverter.local.ifc
-        # call healthy inside the contexter manager
-        assert not inverter.healthy()
-
-    # outside context manager the unhealth AsyncStream is released
-    cnt = 0
-    for inv in InverterBase:
-        assert inv.healthy()  # inverter is healthy again (without the unhealty AsyncStream)
-        cnt += 1
-        del inv
-    assert cnt == 1
-
-    del inverter
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-def test_unhealthy_remote(patch_unhealthy_remote):
-    _ = patch_unhealthy
-    InverterBase._registry.clear()
-    reader = FakeReader()
-    writer =  FakeWriter()
-
-    with InverterBase(reader, writer, 'tsun', Talent) as inverter:
-        assert inverter.local.stream
-        assert inverter.local.ifc
-        # call healthy inside the contexter manager
-        assert not inverter.healthy()
-
-    # outside context manager the unhealth AsyncStream is released
-    cnt = 0
-    for inv in InverterBase:
-        assert inv.healthy()  # inverter is healthy again (without the unhealty AsyncStream)
-        cnt += 1
-        del inv
-    assert cnt == 1
-
-    del inverter
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-@pytest.mark.asyncio
-async def test_remote_conn(config_conn, patch_open_connection):
-    _ = config_conn
-    _ = patch_open_connection
-    assert asyncio.get_running_loop()
-    reader = FakeReader()
-    writer =  FakeWriter()
-
-    with InverterBase(reader, writer, 'tsun', Talent) as inverter:
-        await inverter.create_remote()
-        await asyncio.sleep(0)
-        assert inverter.remote.stream
-        assert inverter.remote.ifc
-        # call healthy inside the contexter manager
-        assert inverter.healthy()
-
-    # call healthy outside the contexter manager (__exit__() was called)
-    assert inverter.healthy()
-    del inverter
-
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-@pytest.mark.asyncio
-async def test_unhealthy_remote(config_conn, patch_open_connection, patch_unhealthy_remote):
-    _ = config_conn
-    _ = patch_open_connection
-    _ = patch_unhealthy_remote
-    assert asyncio.get_running_loop()
-    InverterBase._registry.clear()
-    reader = FakeReader()
-    writer =  FakeWriter()
-
-    with InverterBase(reader, writer, 'tsun', Talent) as inverter:
-        assert inverter.local.stream
-        assert inverter.local.ifc
-        await inverter.create_remote()
-        await asyncio.sleep(0)
-        assert inverter.remote.stream
-        assert inverter.remote.ifc
-        assert inverter.local.ifc.healthy()
-        assert not inverter.remote.ifc.healthy()
-        # call healthy inside the contexter manager
-        assert not inverter.healthy()
-
-    # outside context manager the unhealth AsyncStream is released
-    cnt = 0
-    for inv in InverterBase:
-        assert inv.healthy()  # inverter is healthy again (without the unhealty AsyncStream)
-        cnt += 1
-        del inv
-    assert cnt == 1
-
-    del inverter
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-@pytest.mark.asyncio
-async def test_remote_disc(config_conn, patch_open_connection):
-    _ = config_conn
-    _ = patch_open_connection
-    assert asyncio.get_running_loop()
-    reader = FakeReader()
-    writer =  FakeWriter()
-
-    with InverterBase(reader, writer, 'tsun', Talent) as inverter:
-        await inverter.create_remote()
-        await asyncio.sleep(0)
-        assert inverter.remote.stream
-        # call disc inside the contexter manager
-        await inverter.disc()
-        
-    # call disc outside the contexter manager (__exit__() was called)
-    await inverter.disc()
-    del inverter
-
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
--- a/app/tests/test_inverter_g3.py
+++ b/app/tests/test_inverter_g3.py
@@ -1,226 +0,0 @@
-# test_with_pytest.py
-import pytest
-import asyncio
-import sys,gc
-
-from mock import patch
-from enum import Enum
-from app.src.infos import Infos
-from app.src.config import Config
-from app.src.proxy import Proxy
-from app.src.inverter_base import InverterBase
-from app.src.singleton import Singleton
-from app.src.gen3.inverter_g3 import InverterG3
-from app.src.async_stream import AsyncStream
-
-from app.tests.test_modbus_tcp import patch_mqtt_err, patch_mqtt_except, test_port, test_hostname
-
-pytest_plugins = ('pytest_asyncio',)
-
-# initialize the proxy statistics
-Infos.static_init()
-
-@pytest.fixture
-def config_conn():
-    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': ''
-        },
-        'tsun':{'enabled': True, 'host': 'test_cloud.local', 'port': 1234}, 'inverters':{'allow_all':True}
-    }
-
-@pytest.fixture(scope="module", autouse=True)
-def module_init():
-    Singleton._instances.clear()
-    yield
-
-class FakeReader():
-    def __init__(self):
-        self.on_recv =  asyncio.Event()
-    async def read(self, max_len: int):
-        await self.on_recv.wait()
-        return b''
-    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
-
-class TestType(Enum):
-    RD_TEST_0_BYTES = 1
-    RD_TEST_TIMEOUT = 2
-    RD_TEST_EXCEPT = 3
-
-
-test  = TestType.RD_TEST_0_BYTES
-
-@pytest.fixture
-def patch_open_connection():
-    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 ConnectionRefusedError
-        elif test == TestType.RD_TEST_EXCEPT:
-            raise ValueError("Value cannot be negative") # Compliant
-        return new_conn(None)
-
-    with patch.object(asyncio, 'open_connection', new_open) as conn:
-        yield conn
-
-@pytest.fixture
-def patch_healthy():
-    with patch.object(AsyncStream, 'healthy') as conn:
-        yield conn
-
-def test_method_calls(patch_healthy):
-    spy = patch_healthy
-    reader = FakeReader()
-    writer =  FakeWriter()
-    InverterBase._registry.clear()
-
-    with InverterG3(reader, writer) as inverter:
-        assert inverter.local.stream
-        assert inverter.local.ifc
-        for inv in InverterBase:
-            inv.healthy()
-            del inv
-        spy.assert_called_once()
-    del inverter
-    cnt = 0
-    for inv in InverterBase:
-        cnt += 1
-    assert cnt == 0
-
-@pytest.mark.asyncio
-async def test_remote_conn(config_conn, patch_open_connection):
-    _ = config_conn
-    _ = patch_open_connection
-    assert asyncio.get_running_loop()
-
-    with InverterG3(FakeReader(), FakeWriter()) as inverter:
-        await inverter.create_remote()
-        await asyncio.sleep(0)
-        assert inverter.remote.stream
-    del inverter
-
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-@pytest.mark.asyncio
-async def test_remote_except(config_conn, patch_open_connection):
-    _ = config_conn
-    _ = patch_open_connection
-    assert asyncio.get_running_loop()
-
-    global test
-    test  = TestType.RD_TEST_TIMEOUT
-
-    with InverterG3(FakeReader(), FakeWriter()) as inverter:
-        await inverter.create_remote()
-        await asyncio.sleep(0)
-        assert inverter.remote.stream==None
-
-        test  = TestType.RD_TEST_EXCEPT
-        await inverter.create_remote()
-        await asyncio.sleep(0)
-        assert inverter.remote.stream==None
-    del inverter
-
-    cnt = 0
-    for inv in InverterBase:
-        print(f'InverterBase refs:{gc.get_referrers(inv)}')
-        cnt += 1
-    assert cnt == 0
-
-@pytest.mark.asyncio
-async def test_mqtt_publish(config_conn, patch_open_connection):
-    _ = config_conn
-    _ = patch_open_connection
-    assert asyncio.get_running_loop()
-
-    Proxy.class_init()
-
-    with InverterG3(FakeReader(), FakeWriter()) as inverter:
-        stream = inverter.local.stream
-        await inverter.async_publ_mqtt()  # check call with invalid unique_id
-        stream._Talent__set_serial_no(serial_no= "123344")
-
-        stream.new_data['inverter'] = True
-        stream.db.db['inverter'] = {}
-        await inverter.async_publ_mqtt()
-        assert stream.new_data['inverter'] == False
-
-        stream.new_data['env'] = True
-        stream.db.db['env'] = {}
-        await inverter.async_publ_mqtt()
-        assert stream.new_data['env'] == False
-
-        Infos.new_stat_data['proxy'] = True
-        await inverter.async_publ_mqtt()
-        assert Infos.new_stat_data['proxy'] == False
-
-@pytest.mark.asyncio
-async def test_mqtt_err(config_conn, patch_open_connection, patch_mqtt_err):
-    _ = config_conn
-    _ = patch_open_connection
-    _ = patch_mqtt_err
-    assert asyncio.get_running_loop()
-
-    Proxy.class_init()
-
-    with InverterG3(FakeReader(), FakeWriter()) as inverter:
-        stream = inverter.local.stream
-        stream._Talent__set_serial_no(serial_no= "123344")
-        stream.new_data['inverter'] = True
-        stream.db.db['inverter'] = {}
-        await inverter.async_publ_mqtt()
-        assert stream.new_data['inverter'] == True
-
-@pytest.mark.asyncio
-async def test_mqtt_except(config_conn, patch_open_connection, patch_mqtt_except):
-    _ = config_conn
-    _ = patch_open_connection
-    _ = patch_mqtt_except
-    assert asyncio.get_running_loop()
-
-    Proxy.class_init()
-
-    with InverterG3(FakeReader(), FakeWriter()) as inverter:
-        stream = inverter.local.stream
-        stream._Talent__set_serial_no(serial_no= "123344")
-
-        stream.new_data['inverter'] = True
-        stream.db.db['inverter'] = {}
-        await inverter.async_publ_mqtt()
-        assert stream.new_data['inverter'] == True
--- a/app/tests/test_inverter_g3p.py
+++ b/app/tests/test_inverter_g3p.py
@@ -1,196 +0,0 @@
-# test_with_pytest.py
-import pytest
-import asyncio
-
-from mock import patch
-from enum import Enum
-from app.src.infos import Infos
-from app.src.config import Config
-from app.src.proxy import Proxy
-from app.src.inverter_base import InverterBase
-from app.src.singleton import Singleton
-from app.src.gen3plus.inverter_g3p import InverterG3P
-
-from app.tests.test_modbus_tcp import patch_mqtt_err, patch_mqtt_except, test_port, test_hostname
-
-
-pytest_plugins = ('pytest_asyncio',)
-
-# initialize the proxy statistics
-Infos.static_init()
-
-@pytest.fixture
-def config_conn():
-    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': ''
-        },
-        'solarman':{'enabled': True, 'host': 'test_cloud.local', 'port': 1234}, 'inverters':{'allow_all':True}
-    }
-
-@pytest.fixture(scope="module", autouse=True)
-def module_init():
-    Singleton._instances.clear()
-    yield
-
-class FakeReader():
-    def __init__(self):
-        self.on_recv =  asyncio.Event()
-    async def read(self, max_len: int):
-        await self.on_recv.wait()
-        return b''
-    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
-
-class TestType(Enum):
-    RD_TEST_0_BYTES = 1
-    RD_TEST_TIMEOUT = 2
-    RD_TEST_EXCEPT = 3
-
-
-test  = TestType.RD_TEST_0_BYTES
-
-@pytest.fixture
-def patch_open_connection():
-    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 ConnectionRefusedError
-        elif test == TestType.RD_TEST_EXCEPT:
-            raise ValueError("Value cannot be negative") # Compliant
-        return new_conn(None)
-
-    with patch.object(asyncio, 'open_connection', new_open) as conn:
-        yield conn
-
-def test_method_calls():
-    reader = FakeReader()
-    writer =  FakeWriter()
-    InverterBase._registry.clear()
-
-    with InverterG3P(reader, writer, client_mode=False) as inverter:
-        assert inverter.local.stream
-        assert inverter.local.ifc
-
-@pytest.mark.asyncio
-async def test_remote_conn(config_conn, patch_open_connection):
-    _ = config_conn
-    _ = patch_open_connection
-    assert asyncio.get_running_loop()
-
-    with InverterG3P(FakeReader(), FakeWriter(), client_mode=False) as inverter:
-        await inverter.create_remote()
-        await asyncio.sleep(0)
-        assert inverter.remote.stream
-
-@pytest.mark.asyncio
-async def test_remote_except(config_conn, patch_open_connection):
-    _ = config_conn
-    _ = patch_open_connection
-    assert asyncio.get_running_loop()
-    
-    global test
-    test  = TestType.RD_TEST_TIMEOUT
-
-    with InverterG3P(FakeReader(), FakeWriter(), client_mode=False) as inverter:
-        await inverter.create_remote()
-        await asyncio.sleep(0)
-        assert inverter.remote.stream==None
-
-        test  = TestType.RD_TEST_EXCEPT
-        await inverter.create_remote()
-        await asyncio.sleep(0)
-        assert inverter.remote.stream==None
-
-@pytest.mark.asyncio
-async def test_mqtt_publish(config_conn, patch_open_connection):
-    _ = config_conn
-    _ = patch_open_connection
-    assert asyncio.get_running_loop()
-
-    Proxy.class_init()
-
-    with InverterG3P(FakeReader(), FakeWriter(), client_mode=False) as inverter:
-        stream = inverter.local.stream
-        await inverter.async_publ_mqtt()  # check call with invalid unique_id   
-        stream._set_serial_no(snr= 123344)
-
-        stream.new_data['inverter'] = True
-        stream.db.db['inverter'] = {}
-        await inverter.async_publ_mqtt()
-        assert stream.new_data['inverter'] == False
-
-        stream.new_data['env'] = True
-        stream.db.db['env'] = {}
-        await inverter.async_publ_mqtt()
-        assert stream.new_data['env'] == False
-
-        Infos.new_stat_data['proxy'] = True
-        await inverter.async_publ_mqtt()
-        assert Infos.new_stat_data['proxy'] == False
-
-@pytest.mark.asyncio
-async def test_mqtt_err(config_conn, patch_open_connection, patch_mqtt_err):
-    _ = config_conn
-    _ = patch_open_connection
-    _ = patch_mqtt_err
-    assert asyncio.get_running_loop()
-
-    Proxy.class_init()
-
-    with InverterG3P(FakeReader(), FakeWriter(), client_mode=False) as inverter:
-        stream = inverter.local.stream
-        stream._set_serial_no(snr= 123344)    
-        stream.new_data['inverter'] = True
-        stream.db.db['inverter'] = {}
-        await inverter.async_publ_mqtt()
-        assert stream.new_data['inverter'] == True
-
-@pytest.mark.asyncio
-async def test_mqtt_except(config_conn, patch_open_connection, patch_mqtt_except):
-    _ = config_conn
-    _ = patch_open_connection
-    _ = patch_mqtt_except
-    assert asyncio.get_running_loop()
-
-    Proxy.class_init()
-
-    with InverterG3P(FakeReader(), FakeWriter(), client_mode=False) as inverter:
-        stream = inverter.local.stream
-        stream._set_serial_no(snr= 123344)
-
-        stream.new_data['inverter'] = True
-        stream.db.db['inverter'] = {}
-        await inverter.async_publ_mqtt()
-        assert stream.new_data['inverter'] == True
--- a/app/tests/test_modbus.py
+++ b/app/tests/test_modbus.py
@@ -77,10 +77,9 @@ def test_recv_resp_crc_err():
    mb.last_fcode = 3   
    mb.last_reg = 0x300e
    mb.last_len = 2
-    mb.set_node_id('test')
    # 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'):
+    for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf3', 'test'):
        call += 1
    assert mb.err == 1
    assert 0 == call
@@ -98,11 +97,10 @@ def test_recv_resp_invalid_addr():
    mb.last_fcode = 3   
    mb.last_reg = 0x300e
    mb.last_len = 2
-    mb.set_node_id('test')

    # check not matching response, with wrong server addr
    call = 0
-    for key, update in mb.recv_resp(mb.db, b'\x02\x03\x04\x01\x2c\x00\x46\x88\xf4'):
+    for key, update in mb.recv_resp(mb.db, b'\x02\x03\x04\x01\x2c\x00\x46\x88\xf4', 'test'):
        call += 1
    assert mb.err == 2
    assert 0 == call
@@ -122,8 +120,7 @@ def test_recv_recv_fcode():
   
    # check not matching response, with wrong function code
    call = 0
-    mb.set_node_id('test')
-    for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4'):
+    for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4', 'test'):
        call += 1

    assert mb.err == 3
@@ -145,8 +142,7 @@ def test_recv_resp_len():

    # check not matching response, with wrong data length
    call = 0
-    mb.set_node_id('test')
-    for key, update, _ in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4'):
+    for key, update, _ in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4', 'test'):
        call += 1

    assert mb.err == 4
@@ -165,8 +161,7 @@ def test_recv_unexpect_resp():
   
    # check unexpected response, which must be dropped
    call = 0
-    mb.set_node_id('test')
-    for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4'):
+    for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4', 'test'):
        call += 1

    assert mb.err == 5
@@ -182,9 +177,8 @@ def test_parse_resp():
    assert mb.req_pend

    call = 0
-    mb.set_node_id('test')
    exp_result = ['V0.0.2C', 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'):
+    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
        elif key == 'inverter':
@@ -232,9 +226,8 @@ def test_queue2():
    assert mb.send_calls == 1
    assert mb.pdu == b'\x01\x030\x07\x00\x06{\t'
    call = 0
-    mb.set_node_id('test')
    exp_result = ['V0.0.2C', 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'):
+    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
        elif key == 'inverter':
@@ -252,14 +245,14 @@ def test_queue2():
    assert mb.send_calls == 2
    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'):
+    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()

    assert mb.que.qsize() == 0
    assert mb.send_calls == 3
    assert mb.pdu == b'\x01\x030\x07\x00\x06{\t'
    call = 0
-    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'):
+    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'):
        call += 1
    assert 0 == mb.err
    assert 5 == call
@@ -283,9 +276,8 @@ def test_queue3():
    assert mb.recv_responses == 0

    call = 0
-    mb.set_node_id('test')
    exp_result = ['V0.0.2C', 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'):
+    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
        elif key == 'inverter':
@@ -304,7 +296,7 @@ def test_queue3():
    assert mb.send_calls == 2
    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'):
+    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
    assert 0 == mb.err
    assert mb.recv_responses == 2
@@ -313,7 +305,7 @@ def test_queue3():
    assert mb.send_calls == 3
    assert mb.pdu == b'\x01\x030\x07\x00\x06{\t'
    call = 0
-    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'):
+    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'):
        call += 1
    assert 0 == mb.err
    assert mb.recv_responses == 2
@@ -374,21 +366,20 @@ async def test_timeout():
 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)

    # check matching response, but with CRC error
    call = 0
-    mb.set_node_id('test')
-    for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4'):
+    for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4', 'test'):
        call += 1
    assert mb.err == 0
    assert 0 == call
    assert not mb.req_pend

-    del mb.mb_reg_mapping[0x9000]
+    del mb.map[0x9000]

 def test_close():
    '''Check queue handling for build_msg() calls'''
--- a/app/tests/test_modbus_tcp.py
+++ b/app/tests/test_modbus_tcp.py
@@ -1,386 +0,0 @@
-# test_with_pytest.py
-import pytest
-import asyncio
-from aiomqtt import MqttCodeError
-
-from mock import patch
-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.inverter_base import InverterBase
-from app.src.messages import Message, State
-from app.src.proxy import Proxy
-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': ''
-                        },
-                        'solarman':{
-                            'host': 'access1.solarmanpv.com',
-                            'port': 10000
-                        },
-                        '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,
-                                    'forward': True
-                                }  
-                            }
-                        }
-    }
-
-
-class FakeReader():
-    RD_TEST_0_BYTES = 1
-    RD_TEST_TIMEOUT = 2
-    RD_TEST_13_BYTES = 3
-    RD_TEST_SW_EXCEPT = 4
-    RD_TEST_OS_ERROR = 5
-
-    def __init__(self):
-        self.on_recv =  asyncio.Event()
-        self.test  = self.RD_TEST_0_BYTES
-
-    async def read(self, max_len: int):
-        print(f'fakeReader test: {self.test}')
-        await self.on_recv.wait()
-        if self.test == self.RD_TEST_0_BYTES:
-            return b''
-        elif self.test == self.RD_TEST_13_BYTES:
-            print('fakeReader return 13 bytes')
-            self.test = self.RD_TEST_0_BYTES
-            return b'test-data-req'
-        elif self.test == self.RD_TEST_TIMEOUT:
-            raise TimeoutError
-        elif self.test == self.RD_TEST_SW_EXCEPT:
-            self.test = self.RD_TEST_0_BYTES
-            self.unknown_var += 1    
-        elif self.test == self.RD_TEST_OS_ERROR:
-            self.test = self.RD_TEST_0_BYTES
-            raise ConnectionRefusedError
-
-    def feed_eof(self):
-        return
-
-
-class FakeWriter():
-    def __init__(self, conn='remote.intern'):
-        self.conn = conn
-        self.closing = False
-    def write(self, buf: bytes):
-        return
-    async def drain(self):
-        await asyncio.sleep(0)
-    def get_extra_info(self, sel: str):
-        if sel == 'peername':
-            return self.conn
-        elif sel == 'sockname':
-            return 'sock:1234'
-        assert False
-    def is_closing(self):
-        return self.closing
-    def close(self):
-        self.closing = True
-    async def wait_closed(self):
-        await asyncio.sleep(0)
-
-
-@pytest.fixture
-def patch_open():
-    async def new_conn(conn):
-        await asyncio.sleep(0)
-        return FakeReader(), FakeWriter(conn)
-    
-    def new_open(host: str, port: int):
-        return new_conn(f'{host}:{port}')
-
-    with patch.object(asyncio, 'open_connection', new_open) as conn:
-        yield conn
-
-@pytest.fixture
-def patch_open_timeout():
-    def new_open(host: str, port: int):
-        raise TimeoutError
-
-    with patch.object(asyncio, 'open_connection', new_open) as conn:
-        yield conn
-
-@pytest.fixture
-def patch_open_value_error():
-    def new_open(host: str, port: int):
-        raise ValueError
-
-    with patch.object(asyncio, 'open_connection', new_open) as conn:
-        yield conn
-
-@pytest.fixture
-def patch_open_conn_abort():
-    def new_open(host: str, port: int):
-        raise ConnectionAbortedError
-
-    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_mqtt_err():
-    def new_publish(self, key, data):
-        raise MqttCodeError(None)
-
-    with patch.object(Mqtt, 'publish', new_publish) as conn:
-        yield conn
-
-@pytest.fixture
-def patch_mqtt_except():
-    def new_publish(self, key, data):
-        raise ValueError("Test")
-
-    with patch.object(Mqtt, 'publish', new_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 inverter:
-        stream = inverter.local.stream
-        assert stream.node_id == 'G3P'
-        assert stream.addr == ('test.local:1234')
-        assert type(stream.ifc._reader) is FakeReader
-        assert type(stream.ifc._writer) is FakeWriter
-        assert Infos.stat['proxy']['Inverter_Cnt'] == 1
-        del inverter
-
-    for _ in InverterBase:
-        assert False
-
-    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_timeout(config_conn, patch_open_timeout):
-    _ = config_conn
-    _ = patch_open_timeout
-    assert asyncio.get_running_loop()
-    Proxy.class_init()
-
-    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_value_err(config_conn, patch_open_value_error):
-    _ = config_conn
-    _ = patch_open_value_error
-    assert asyncio.get_running_loop()
-    Proxy.class_init()
-
-    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_conn_abort(config_conn, patch_open_conn_abort):
-    _ = config_conn
-    _ = patch_open_conn_abort
-    assert asyncio.get_running_loop()
-    Proxy.class_init()
-
-    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
-    assert asyncio.get_running_loop()
-    Proxy.class_init()
-
-    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.ifc._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
-    assert asyncio.get_running_loop()
-    Proxy.class_init()
-
-    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.ifc._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.ifc._reader.on_recv.set()
-                del m
-
-    assert 2 == test
-    await asyncio.sleep(0.01)
-    assert Infos.stat['proxy']['Inverter_Cnt'] == 0
-
-@pytest.mark.asyncio
-async def test_mqtt_err(config_conn, patch_mqtt_err, patch_open):
-    _ = config_conn
-    _ = patch_open
-    _ = patch_mqtt_err
-    assert asyncio.get_running_loop()
-    Proxy.class_init()
-
-    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.ifc._reader.on_recv.set()
-                await asyncio.sleep(0.1)
-                assert m.state == State.closed
-                await asyncio.sleep(0.1)
-                await asyncio.sleep(0.1)
-            else:
-                m.shutdown_started = True
-                m.ifc._reader.on_recv.set()
-                del m
-
-    await asyncio.sleep(0.01)
-    assert Infos.stat['proxy']['Inverter_Cnt'] == 0
-
-@pytest.mark.asyncio
-async def test_mqtt_except(config_conn, patch_mqtt_except, patch_open):
-    _ = config_conn
-    _ = patch_open
-    _ = patch_mqtt_except
-    assert asyncio.get_running_loop()
-    Proxy.class_init()
-
-    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.ifc._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.ifc._reader.on_recv.set()
-                del m
-
-    await asyncio.sleep(0.01)
-    assert Infos.stat['proxy']['Inverter_Cnt'] == 0
--- a/app/tests/test_mqtt.py
+++ b/app/tests/test_mqtt.py
@@ -1,255 +0,0 @@
-# test_with_pytest.py
-import pytest
-import asyncio
-import aiomqtt
-import logging
-
-from mock import patch, Mock
-from app.src.async_stream import AsyncIfcImpl
-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(('test.local', 1234), server_side=True, client_mode= False, ifc=AsyncIfcImpl())
-    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(('test.local', 1234), server_side=True, client_mode= False, ifc=AsyncIfcImpl())
-    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(('test.local', 1234), server_side=False, client_mode= False, ifc=AsyncIfcImpl())
-    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()
--- a/app/tests/test_proxy.py
+++ b/app/tests/test_proxy.py
@@ -1,91 +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.proxy import Proxy
-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):
-        pass  # empty test methos
-
-    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(Proxy, '_cb_mqtt_is_up', wraps=Proxy._cb_mqtt_is_up) as spy:
-        print('call Proxy.class_init')
-        Proxy.class_init()
-        assert 'homeassistant/' == Proxy.discovery_prfx
-        assert 'tsun/' == Proxy.entity_prfx
-        assert 'test_1/' == Proxy.proxy_node_id
-        await Proxy._cb_mqtt_is_up()
-        spy.assert_called_once()
-
-@pytest.mark.asyncio
-async def test_mqtt_is_up(config_conn):
-    _ = config_conn
-
-    with patch.object(Mqtt, 'publish') as spy:
-        Proxy.class_init()
-        await Proxy._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:
-        Proxy.class_init()
-        await Proxy._async_publ_mqtt_proxy_stat('InValId_kEy')
-        spy.assert_not_called()
--- a/app/tests/test_singleton.py
+++ b/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)
--- a/app/tests/test_solarman.py
+++ b/app/tests/test_solarman.py
--- a/app/tests/test_solarman_emu.py
+++ b/app/tests/test_solarman_emu.py
@@ -1,230 +0,0 @@
-import pytest
-import asyncio
-from app.src.async_stream import AsyncIfcImpl, StreamPtr
-from app.src.gen3plus.solarman_v5 import SolarmanV5, SolarmanBase
-from app.src.gen3plus.solarman_emu import SolarmanEmu
-from app.src.infos import Infos, Register
-from app.tests.test_solarman import FakeIfc, MemoryStream, get_sn_int, get_sn, correct_checksum, config_tsun_inv1, msg_modbus_rsp
-from app.tests.test_infos_g3p import str_test_ip, bytes_test_ip
-
-timestamp = 0x3224c8bc
-
-class InvStream(MemoryStream):
-    def __init__(self, msg=b''):
-        super().__init__(msg)
-
-    def _emu_timestamp(self):
-        return timestamp
-
-class CldStream(SolarmanEmu):
-    def __init__(self, inv: InvStream):
-        _ifc = FakeIfc()
-        _ifc.remote.stream = inv
-        super().__init__(('test.local', 1234), _ifc, server_side=False, client_mode=False)
-        self.__msg = b''
-        self.__msg_len = 0
-        self.__offs = 0
-        self.msg_count = 0
-        self.msg_recvd = []
-
-    def _emu_timestamp(self):
-        return timestamp
-    
-    def append_msg(self, msg):
-        self.__msg += msg
-        self.__msg_len += len(msg)    
-
-    def _read(self) -> int:
-        copied_bytes = 0
-        try:    
-            if (self.__offs < self.__msg_len):
-                self.ifc.rx_fifo += self.__msg[self.__offs:]
-                copied_bytes = self.__msg_len - self.__offs
-                self.__offs = self.__msg_len
-        except Exception:
-            pass   # ignore exceptions here
-        return copied_bytes
-
-    def _SolarmanBase__flush_recv_msg(self) -> None:
-        self.msg_recvd.append(
-            {
-                'control': self.control,
-                'seq': str(self.seq),
-                'data_len': self.data_len
-            }
-        )
-        super()._SolarmanBase__flush_recv_msg()
-        self.msg_count += 1
-
-@pytest.fixture
-def device_ind_msg(bytes_test_ip): # 0x4110
-    msg  = b'\xa5\xd4\x00\x10\x41\x00\x01' +get_sn()  +b'\x02\xbc\xc8\x24\x32'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x05\x3c\x78\x01\x00\x01\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\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' + bytes_test_ip
-    msg += b'\x0f\x00\x01\xb0'
-    msg += b'\x02\x0f\x00\xff\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\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xfe\xfe\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\x00\x00\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\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += correct_checksum(msg)
-    msg += b'\x15'
-    return msg
-
-@pytest.fixture
-def inverter_ind_msg():  # 0x4210
-    msg  = b'\xa5\x99\x01\x10\x42\x00\x01' +get_sn()  +b'\x01\xb0\x02\xbc\xc8'
-    msg += b'\x24\x32\x3c\x00\x00\x00\xa0\x47\xe4\x33\x01\x00\x03\x08\x00\x00'
-    msg += b'\x59\x31\x37\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x30\x31'
-    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\x00\x00\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\x00\x00\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\x00\x00\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\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x01\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x40\x10\x08\xc8\x00\x49\x13\x8d\x00\x00\x00\x00\x00\x00\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\x00\x00\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\x00\x01\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00'
-    msg += b'\x04\x00\x00\x01\xff\xff\x00\x01\x00\x06\x00\x68\x00\x68\x05\x00'
-    msg += b'\x09\xcd\x07\xb6\x13\x9c\x13\x24\x00\x01\x07\xae\x04\x0f\x00\x41'
-    msg += b'\x00\x0f\x0a\x64\x0a\x64\x00\x06\x00\x06\x09\xf6\x12\x8c\x12\x8c'
-    msg += b'\x00\x10\x00\x10\x14\x52\x14\x52\x00\x10\x00\x10\x01\x51\x00\x05'
-    msg += b'\x00\x00\x00\x01\x13\x9c\x0f\xa0\x00\x4e\x00\x66\x03\xe8\x04\x00'
-    msg += b'\x09\xce\x07\xa8\x13\x9c\x13\x26\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x04\x00\x04\x00\x00\x00\x00\x00\xff\xff\x00\x00'
-    msg += b'\x00\x00\x00\x00'
-    msg += correct_checksum(msg)
-    msg += b'\x15'
-    return msg
-
-@pytest.fixture
-def inverter_rsp_msg():  # 0x1210
-    msg  = b'\xa5\x0a\x00\x10\x12\x02\02' +get_sn()  +b'\x01\x01'
-    msg += b'\x00\x00\x00\x00'
-    msg += b'\x3c\x00\x00\x00'
-    msg += correct_checksum(msg)
-    msg += b'\x15'
-    return msg
-
-@pytest.fixture
-def heartbeat_ind():
-    msg  = b'\xa5\x01\x00\x10G\x00\x01\x00\x00\x00\x00\x00Y\x15'
-    return msg
-
-def test_emu_init_close():
-    # received a message with wrong start byte plus an valid message
-    # the complete receive buffer must be cleared to 
-    # find the next valid message
-    inv = InvStream()
-    cld = CldStream(inv)
-    cld.close()
-
-
-@pytest.mark.asyncio
-async def test_emu_start(config_tsun_inv1, msg_modbus_rsp, str_test_ip, device_ind_msg):
-    _ = config_tsun_inv1
-    assert asyncio.get_running_loop()
-    inv = InvStream(msg_modbus_rsp)
-
-    assert asyncio.get_running_loop() == inv.mb_timer.loop
-    await inv.send_start_cmd(get_sn_int(), str_test_ip, True, inv.mb_first_timeout)
-    inv.read()         # read complete msg, and dispatch msg
-    assert not inv.header_valid  # must be invalid, since msg was handled and buffer flushed
-    assert inv.msg_count == 1
-    assert inv.control == 0x1510
-
-    cld = CldStream(inv)
-    cld.ifc.update_header_cb(inv.ifc.fwd_fifo.peek())
-    assert inv.ifc.fwd_fifo.peek() == device_ind_msg
-    cld.close()
-
-def test_snd_hb(config_tsun_inv1, heartbeat_ind):
-    _ = config_tsun_inv1
-    inv = InvStream()
-    cld = CldStream(inv)
-
-    # await inv.send_start_cmd(get_sn_int(), str_test_ip, False, inv.mb_first_timeout)
-    cld.send_heartbeat_cb(0)
-    assert cld.ifc.tx_fifo.peek() == heartbeat_ind
-    cld.close()
-
-@pytest.mark.asyncio
-async def test_snd_inv_data(config_tsun_inv1, inverter_ind_msg, inverter_rsp_msg):
-    _ = config_tsun_inv1
-    inv = InvStream()
-    inv.db.set_db_def_value(Register.INVERTER_STATUS, 1)
-    inv.db.set_db_def_value(Register.DETECT_STATUS_1, 2)
-    inv.db.set_db_def_value(Register.VERSION, 'V4.0.10')
-    inv.db.set_db_def_value(Register.GRID_VOLTAGE, 224.8)
-    inv.db.set_db_def_value(Register.GRID_CURRENT, 0.73)
-    inv.db.set_db_def_value(Register.GRID_FREQUENCY, 50.05)
-    assert asyncio.get_running_loop() == inv.mb_timer.loop
-    await inv.send_start_cmd(get_sn_int(), str_test_ip, False, inv.mb_first_timeout)
-    inv.db.set_db_def_value(Register.DATA_UP_INTERVAL, 17)  # set test value
-
-    cld = CldStream(inv)
-    cld.time_ofs = 0x33e447a0
-    cld.last_sync = cld._emu_timestamp() - 60
-    cld.pkt_cnt = 0x802
-    assert cld.data_up_inv == 17  # check test value
-    cld.data_up_inv = 0.1         # speedup test first data msg
-    cld._init_new_client_conn()
-    cld.data_up_inv = 0.5         # timeout for second data msg
-    await asyncio.sleep(0.2)
-    assert cld.ifc.tx_fifo.get() == inverter_ind_msg
-
-    cld.append_msg(inverter_rsp_msg)
-    cld.read()         # read complete msg, and dispatch msg
-
-    assert not cld.header_valid  # must be invalid, since msg was handled and buffer flushed
-    assert cld.msg_count == 1
-    assert cld.header_len==11
-    assert cld.snr == 2070233889
-    assert cld.unique_id == '2070233889'
-    assert cld.msg_recvd[0]['control']==0x1210
-    assert cld.msg_recvd[0]['seq']=='02:02'
-    assert cld.msg_recvd[0]['data_len']==0x0a
-    assert '02b0' == cld.db.get_db_value(Register.SENSOR_LIST, None)
-    assert cld.db.stat['proxy']['Unknown_Msg'] == 0
-
-    cld.close()
-
-@pytest.mark.asyncio
-async def test_rcv_invalid(config_tsun_inv1, inverter_ind_msg, inverter_rsp_msg):
-    _ = config_tsun_inv1
-    inv = InvStream()
-    assert asyncio.get_running_loop() == inv.mb_timer.loop
-    await inv.send_start_cmd(get_sn_int(), str_test_ip, False, inv.mb_first_timeout)
-    inv.db.set_db_def_value(Register.DATA_UP_INTERVAL, 17)  # set test value
-
-    cld = CldStream(inv)
-    cld._init_new_client_conn()
-
-    cld.append_msg(inverter_ind_msg)
-    cld.read()         # read complete msg, and dispatch msg
-
-    assert not cld.header_valid  # must be invalid, since msg was handled and buffer flushed
-    assert cld.msg_count == 1
-    assert cld.header_len==11
-    assert cld.snr == 2070233889
-    assert cld.unique_id == '2070233889'
-    assert cld.msg_recvd[0]['control']==0x4210
-    assert cld.msg_recvd[0]['seq']=='00:01'
-    assert cld.msg_recvd[0]['data_len']==0x199
-    assert '02b0' == cld.db.get_db_value(Register.SENSOR_LIST, None)
-    assert cld.db.stat['proxy']['Unknown_Msg'] == 1
-
-
-    cld.close()
--- a/app/tests/test_talent.py
+++ b/app/tests/test_talent.py
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -83,7 +83,7 @@ services:
      - ${PROJECT_DIR:-./}tsun-proxy/log:/home/tsun-proxy/log 
      - ${PROJECT_DIR:-./}tsun-proxy/config:/home/tsun-proxy/config 
    healthcheck:
-      test: wget --no-verbose --tries=1 --spider  http://127.0.0.1:8127/-/healthy || exit 1
+      test: wget --no-verbose --tries=1 --spider  http://localhost:8127/-/healthy || exit 1
      interval: 10s
      timeout: 3s    
    networks:
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1 +0,0 @@
-r ./app/requirements-test.txt
--- a/sonar-project.properties
+++ b/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
--- a/system_tests/test_tcp_socket.py
+++ b/system_tests/test_tcp_socket.py
@@ -13,31 +13,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 +49,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 +57,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 +94,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,7 +117,7 @@ def msg_ota_update_req(): # Over the air update request from talent cloud


@pytest.fixture(scope="session")
-def client_connection():
+def ClientConnection():
    host = 'logger.talent-monitoring.com'
    port = 5005
    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
@@ -127,7 +127,7 @@ def client_connection():
        time.sleep(2.5)
        s.close()

-def tempclient_connection():
+def tempClientConnection():
    host = 'logger.talent-monitoring.com'
    port = 5005
    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
@@ -138,25 +138,25 @@ 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

-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
@@ -164,73 +164,73 @@ def test_send_contact_info2(client_connection, msg_contact_info2, msg_contact_in
        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
    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
--- a/tsun.code-workspace
+++ b/tsun.code-workspace
@@ -1,11 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "."
-		},
-		{
-			"path": "../wiki"
-		}
-	],
-	"settings": {}
-}
Author	SHA1	Message	Date
Stefan Allius	b752144e94	Merge branch 'main' of https://github.com/s-allius/tsun-gen3-proxy into dev-0.10	2024-08-10 14:15:19 +02:00
Stefan Allius	e56aa5d709	Version 0.10.0 no longer displays the version string (#154 ) Fixes #153	2024-08-10 14:01:09 +02:00
Stefan Allius	416fe16609	Fetch all history for all tags and branches	2024-08-09 23:08:12 +02:00
Stefan Allius	d8aee5f789	code cleanup	2024-08-09 23:01:16 +02:00
Stefan Allius	04ec8ac8a7	bump aiohttp to version 3.10.2	2024-08-09 23:01:02 +02:00
Stefan Allius	39577b2415	disable MODBUS_POLLING for GEN§PLUS in example config	2024-08-09 22:59:47 +02:00
Stefan Allius	8fc1e83b42	prepare release 0.10.0	2024-08-09 22:14:20 +02:00
Stefan Allius	13f9febb47	Do no build on *.yml changes	2024-08-09 22:12:17 +02:00
Stefan Allius	d891e486e7	Code coverage for SonarCloud (#150 ) * cleanup code and unit tests * add test coverage for SonarCloud * configure SonarCloud * update changelog	2024-08-09 17:45:53 +02:00
Stefan Allius	155b6d4e67	Make test code more clean (#149 ) * cleanup	2024-08-09 00:02:01 +02:00
Stefan Allius	24ece4fece	make test code more clean (#148 )	2024-08-08 20:27:39 +02:00
Stefan Allius	a779c90965	don't send MODBUS request when state is not up (#147 ) * adapt timings * don't send MODBUS request when state is note up * adapt unit test	2024-08-08 19:46:27 +02:00
Stefan Allius	e33153fc1f	build multi arch images with sboms (#146 )	2024-08-08 18:55:17 +02:00
Stefan Allius	2a5e3b6507	Update sonarcloud.yml	2024-08-08 00:57:52 +02:00
Stefan Allius	6c6ce3e0a8	Update sonarcloud.yml	2024-08-08 00:46:31 +02:00
Stefan Allius	83a33efa18	Update sonarcloud.yml	2024-08-08 00:42:36 +02:00
Stefan Allius	25e55e4286	Update sonarcloud.yml	2024-08-08 00:40:14 +02:00
Stefan Allius	b3f1d97c3d	Update sonarcloud.yml	2024-08-08 00:27:35 +02:00
Stefan Allius	4d1a5fbd21	Create sonarcloud.yml (#143 )	2024-08-08 00:16:39 +02:00
Stefan Allius	6dbd9bc85f	print coloured logs	2024-08-06 20:08:22 +02:00
Stefan Allius	47f7580184	MQTT timestamps and protocol improvements (#140 ) * add TS_INPUT, TS_GRID and TS_TOTAL * prepare MQTT timestamps - add _set_mqtt_timestamp method - fix hexdump printing * push dev and debug images to docker.io * add unix epoche timestamp for MQTT pakets * set timezone for unit tests * set name für setting timezone step * trigger new action * GEN3 and GEN3PLUS: handle multiple message - read: iterate over the receive buffer - forward: append messages to the forward buffer - _update_header: iterate over the forward buffer * GEN3: optimize timeout handling - longer timeout in state init and reveived - got to state pending only from state up * update changelog * cleanup	2024-08-04 19:43:09 +02:00
Stefan Allius	b8e44b7379	bump aiomqtt and schema to latest release (#137 )	2024-07-27 20:36:17 +02:00
Stefan Allius	95954fa84e	S allius/issue134 (#135 ) * add polling invertval and method ha_remove() * add client_mode arg to constructors - add PollingInvervall * hide some topics in client mode - we hide topics in HA by sending an empty register MQTT topic during HA auto configuration * add client_mode value * update class diagram * fix modbus close handler - fix empty call and cleanup que - add unit test * don't sent an initial 1710 msg in client mode * change HA icon for inverter status * increase test coverage * accelerate timer tests	2024-07-27 19:37:40 +02:00
Stefan Allius	3c656e8c63	Merge branch 'dev-0.10' of https://github.com/s-allius/tsun-gen3-proxy into dev-0.10	2024-07-24 22:37:09 +02:00
Stefan Allius	387c014763	reset inverter state on close - workaround which reset the inverter status to offline when the inverter has a very low output power on connection close	2024-07-24 22:36:51 +02:00
Stefan Allius	19916453f2	Update README.md (#133 )	2024-07-23 23:38:48 +02:00
Stefan Allius	7f81799dd9	S allius/issue131 (#132 ) * Make __publish_outstanding_mqtt public * update proxy counter - on client mode connection establishment or disconnecting update tje counection counter	2024-07-23 21:54:01 +02:00
Stefan Allius	dc4728122e	S allius/issue128 (#130 ) * set Register.NO_INPUTS fix to 4 for GEN3PLUS * don't set Register.NO_INPUTS per MODBUS * fix unit tests * register OUTPUT_COEFFICIENT at HA * update changelog * - Home Assistant: improve inverter status value texts * - GEN3: add inverter status * on closing send outstanding MQTT data to the broker * force MQTT publish on every conn open and close * reset inverter state on close - workaround which reset the inverter status to offline when the inverter has a very low output power on connection close * improve client modified - reduce the polling cadence to 30s - set controller statistics for HA * client mode set controller IP for HA	2024-07-22 23:27:17 +02:00
Stefan Allius	6f35c47254	S allius/issue125 (#127 ) * fix linter warning * move sequence diagramm to wiki * catch asyncio.CancelledError	2024-07-15 21:45:45 +02:00
Stefan Allius	92a5fd22b8	S allius/issue120 (#126 ) * add config option to disable the modbus polling * read more modbus regs in polling mode * extend connection timeouts if polling mode is disabled * update changelog	2024-07-14 17:04:05 +02:00
Stefan Allius	f3dd87e03c	make the maximum output coefficient configurable (#124 )	2024-07-11 19:31:30 +02:00
Stefan Allius	112c7e66f2	S allius/issue117 (#122 ) * add shutdown flag * add more register definitions * add start commando for client side connections * add first support for port 8899 * fix shutdown * add client_mode configuration * read client_mode config to setup inverter connections * add client_mode connections over port 8899 * add preview build * add documentation for client_mode * catch os error and log thme with DEBUG level * update changelog	2024-07-10 20:43:03 +02:00
Stefan Allius	c7a33b4a35	MODBUS: the last digit of the inverter version is a hexadecimal number (#121 )	2024-07-10 20:28:12 +02:00
Stefan Allius	da8f39c401	Update README.md describe the new client-mode over port 8899 for GEN3PLUS	2024-07-08 20:31:36 +02:00
Stefan Allius	e4ff17e600	S allius/issue117 (#118 ) * add shutdown flag * add more register definitions * add start commando for client side connections * add first support for port 8899 * fix shutdown * add client_mode configuration * read client_mode config to setup inverter connections * add client_mode connections over port 8899 * add preview build	2024-07-08 19:08:58 +02:00