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

Fixes #153

.github/workflows/python-app.yml

@@ -36,18 +36,9 @@ jobs:
         timezoneLinux: "Europe/Berlin"
         timezoneMacos: "Europe/Berlin"
         timezoneWindows: "Europe/Berlin"
-    # - name: Start Mosquitto
-    #  uses: namoshek/mosquitto-github-action@v1
-    #  with:
-    #    version: '1.6'
-    #    ports: '1883:1883 8883:8883'
-        # certificates: ${{ github.workspace }}/.ci/tls-certificates
-        # config: ${{ github.workspace }}/.ci/mosquitto.conf
-        # password-file: ${{ github.workspace}}/.ci/mosquitto.passwd
-    #    container-name: 'mqtt'
     - uses: actions/checkout@v4
       with:
-        fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+        fetch-depth: 0           # Fetch all history for all tags and branches
     - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:
@@ -55,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@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

.vscode/settings.json

@@ -15,8 +15,5 @@
     "sonarlint.connectedMode.project": {
         "connectionId": "s-allius",
         "projectKey": "s-allius_tsun-gen3-proxy"
-    },
-    "files.exclude": {
-        "**/*.pyi": true
     }
 }

CHANGELOG.md

@@ -7,9 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
-- 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)

README.md

@@ -9,13 +9,7 @@
     <a href="https://www.python.org/downloads/release/python-3120/"><img alt="Supported Python versions" src="https://img.shields.io/badge/python-3.12-blue.svg"></a>
     <a href="https://sbtinstruments.github.io/aiomqtt/introduction.html"><img alt="Supported aiomqtt versions" src="https://img.shields.io/badge/aiomqtt-2.2.0-lightblue.svg"></a>
     <a href="https://libraries.io/pypi/aiocron"><img alt="Supported aiocron versions" src="https://img.shields.io/badge/aiocron-1.8-lightblue.svg"></a>
-    <a href="https://toml.io/en/v1.0.0"><img alt="Supported toml versions" src="https://img.shields.io/badge/toml-1.0.0-lightblue.svg"></a>   
-    <br>
-    <a href="https://sonarcloud.io/component_measures?id=s-allius_tsun-gen3-proxy&metric=alert_status"><img src="https://sonarcloud.io/api/project_badges/measure?project=s-allius_tsun-gen3-proxy&metric=alert_status"></a>
-    <a href="https://sonarcloud.io/component_measures?id=s-allius_tsun-gen3-proxy&metric=bugs"><img src="https://sonarcloud.io/api/project_badges/measure?project=s-allius_tsun-gen3-proxy&metric=bugs"></a>
-    <a href="https://sonarcloud.io/component_measures?id=s-allius_tsun-gen3-proxy&metric=code_smells"><img src="https://sonarcloud.io/api/project_badges/measure?project=s-allius_tsun-gen3-proxy&metric=code_smells"></a>
-    <br>
-    <a href="https://sonarcloud.io/component_measures?id=s-allius_tsun-gen3-proxy&metric=coverage"><img src="https://sonarcloud.io/api/project_badges/measure?project=s-allius_tsun-gen3-proxy&metric=coverage"></a>
+    <a href="https://toml.io/en/v1.0.0"><img alt="Supported toml versions" src="https://img.shields.io/badge/toml-1.0.0-lightblue.svg"></a>
 </p>
 
 # Overview
@@ -158,14 +152,12 @@ inverters.allow_all = false   # True: allow inverters, even if we have no invert
 [inverters."R17xxxxxxxxxxxx1"]
 node_id = 'inv1'              # Optional, MQTT replacement for inverters serial number  
 suggested_area = 'roof'       # Optional, suggested installation area for home-assistant
-modbus_polling = false        # Disable optional MODBUS polling for GEN3 inverter
 pv1 = {type = 'RSM40-8-395M', manufacturer = 'Risen'}   # Optional, PV module descr
 pv2 = {type = 'RSM40-8-395M', manufacturer = 'Risen'}   # Optional, PV module descr
 
 [inverters."R17xxxxxxxxxxxx2"]
 node_id = 'inv2'              # Optional, MQTT replacement for inverters serial number  
 suggested_area = 'balcony'    # Optional, suggested installation area for home-assistant
-modbus_polling = false        # Disable optional MODBUS polling for GEN3 inverter
 pv1 = {type = 'RSM40-8-405M', manufacturer = 'Risen'}   # Optional, PV module descr
 pv2 = {type = 'RSM40-8-405M', manufacturer = 'Risen'}   # Optional, PV module descr
 
@@ -173,7 +165,6 @@ pv2 = {type = 'RSM40-8-405M', manufacturer = 'Risen'}   # Optional, PV module de
 monitor_sn = 2000000000       # The "Monitoring SN:" can be found on a sticker enclosed with the inverter
 node_id = 'inv_3'             # MQTT replacement for inverters serial number  
 suggested_area = 'garage'     # suggested installation place for home-assistant
-modbus_polling = false        # Enable optional MODBUS polling for GEN3PLUS inverter
 # if your inverter supports SSL connections you must use the client_mode. Pls, uncomment
 # the next line and configure the fixed IP of your inverter
 #client_mode = {host = '192.168.0.1', port = 8899}       
@@ -200,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.
 

app/Dockerfile

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

app/build.sh

@@ -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

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}:dev", "${IMAGE}:${VERSION}"]
-}
-
-target "rc" {
-  inherits = ["_common", "_prod"]
-  tags = ["${IMAGE}:rc", "${IMAGE}:${VERSION}"]
-}
-
-target "rel" {
-  inherits = ["_common", "_prod"]
-  tags = ["${IMAGE}:latest", "${IMAGE}:${MAJOR}", "${IMAGE}:${VERSION}"]
-  no-cache = true
-}

app/entrypoint.sh

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

app/requirements-test.txt

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

app/src/async_stream.py

@@ -3,15 +3,10 @@ import logging
 import traceback
 import time
 from asyncio import StreamReader, StreamWriter
+from messages import hex_dump_memory, State
 from typing import Self
 from itertools import count
 
-if __name__ == "app.src.async_stream":
-    from app.src.messages import hex_dump_memory, State
-else:  # pragma: no cover
-    from messages import hex_dump_memory, State
-
-
 import gc
 logger = logging.getLogger('conn')
 
@@ -147,7 +142,6 @@ class AsyncStream():
                 logger.error(
                     f"Exception for {self.addr}:\n"
                     f"{traceback.format_exc()}")
-            await asyncio.sleep(0)  # be cooperative to other task
 
     async def async_write(self, headline: str = 'Transmit to ') -> None:
         """Async write handler to transmit the send_buffer"""

app/src/config.py

@@ -12,84 +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('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
@@ -149,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
 
@@ -169,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)

app/src/gen3/connection_g3.py

@@ -25,10 +25,10 @@ class ConnectionG3(AsyncStream, Talent):
         # logger.info(f'AsyncStream refs: {gc.get_referrers(self)}')
 
     async def async_create_remote(self) -> None:
-        pass  # virtual interface # pragma: no cover
+        pass  # virtual interface
 
     async def async_publ_mqtt(self) -> None:
-        pass  # virtual interface # pragma: no cover
+        pass  # virtual interface
 
     def healthy(self) -> bool:
         logger.debug('ConnectionG3 healthy()')

app/src/gen3/infos_g3.py

@@ -139,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
@@ -170,17 +171,17 @@ class InfosG3(Infos):
                               " not supported")
                 return
 
-            yield from self.__store_result(addr, result, info_id, node_id)
-            i += 1
+            keys, level, unit, must_incr = self._key_obj(info_id)
 
-    def __store_result(self, addr, result, info_id, node_id):
-        keys, level, unit, must_incr = self._key_obj(info_id)
-        if keys:
-            name, update = self.update_db(keys, must_incr, result)
-            yield keys[0], update
-        else:
-            update = False
-            name = str(f'info-id.0x{addr:x}')
-        if update:
-            self.tracer.log(level, f'[{node_id}] GEN3: {name} :'
-                                   f' {result}{unit}')
+            if keys:
+                name, update = self.update_db(keys, must_incr, result)
+                yield keys[0], update
+            else:
+                update = False
+                name = str(f'info-id.0x{addr:x}')
+
+            if update:
+                self.tracer.log(level, f'[{node_id}] GEN3: {name} :'
+                                       f' {result}{unit}')
+
+            i += 1

app/src/gen3/talent.py

@@ -1,6 +1,6 @@
 import struct
 import logging
-from zoneinfo import ZoneInfo
+import pytz
 from datetime import datetime
 from tzlocal import get_localzone
 
@@ -42,7 +42,6 @@ class Control:
 class Talent(Message):
     MB_START_TIMEOUT = 40
     MB_REGULAR_TIMEOUT = 60
-    TXT_UNKNOWN_CTRL = 'Unknown Ctrl'
 
     def __init__(self, server_side: bool, id_str=b''):
         super().__init__(server_side, self.send_modbus_cb, mb_timeout=15)
@@ -76,7 +75,7 @@ class Talent(Message):
         self.node_id = 'G3'     # will be overwritten in __set_serial_no
         self.mb_timer = Timer(self.mb_timout_cb, self.node_id)
         self.mb_timeout = self.MB_REGULAR_TIMEOUT
-        self.mb_first_timeout = self.MB_START_TIMEOUT
+        self.mb_start_timeout = self.MB_START_TIMEOUT
         self.modbus_polling = False
 
     '''
@@ -177,7 +176,7 @@ class Talent(Message):
             return
 
         self.__build_header(0x70, 0x77)
-        self._send_buffer += b'\x00\x01\xa3\x28'   # magic ?
+        self._send_buffer += b'\x00\x01\xa3\x28'   # fixme
         self._send_buffer += struct.pack('!B', len(modbus_pdu))
         self._send_buffer += modbus_pdu
         self.__finish_send_msg()
@@ -247,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()
 
@@ -294,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._recv_buffer = bytearray()
-            return
 
         hdr_len = 5+id_len+2
 
@@ -362,7 +354,7 @@ class Talent(Message):
             else:
                 self.forward()
         else:
-            logger.warning(self.TXT_UNKNOWN_CTRL)
+            logger.warning('Unknown Ctrl')
             self.inc_counter('Unknown_Ctrl')
             self.forward()
 
@@ -405,7 +397,7 @@ class Talent(Message):
                              f'  offset: {self.ts_offset}')
                 return  # ignore received response
         else:
-            logger.warning(self.TXT_UNKNOWN_CTRL)
+            logger.warning('Unknown Ctrl')
             self.inc_counter('Unknown_Ctrl')
 
         self.forward()
@@ -439,7 +431,7 @@ class Talent(Message):
         elif self.ctrl.is_resp():
             return  # ignore received response
         else:
-            logger.warning(self.TXT_UNKNOWN_CTRL)
+            logger.warning('Unknown Ctrl')
             self.inc_counter('Unknown_Ctrl')
 
         self.forward()
@@ -452,14 +444,14 @@ class Talent(Message):
             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()
@@ -479,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()
 
@@ -527,7 +519,7 @@ class Talent(Message):
                     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()
 

app/src/gen3plus/connection_g3p.py

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

app/src/gen3plus/infos_g3p.py

@@ -20,11 +20,9 @@ class RegisterMap:
         0x4102001c: {'reg': Register.SIGNAL_STRENGTH,      'fmt': '<B', 'ratio':    1, 'dep': ProxyMode.SERVER},  # noqa: E501
         0x4102001e: {'reg': Register.CHIP_MODEL,           'fmt': '!40s'},               # noqa: E501
         0x4102004c: {'reg': Register.IP_ADDRESS,           'fmt': '!16s'},               # noqa: E501
-        0x4102005f: {'reg': Register.SENSOR_LIST,          'fmt': '<H', 'eval': "f'{result:04x}'"},                 # noqa: E501
         0x41020064: {'reg': Register.COLLECTOR_FW_VERSION, 'fmt': '!40s'},               # noqa: E501
 
-        0x4201000c: {'reg': Register.SENSOR_LIST,          'fmt': '<H', 'eval': "f'{result:04x}'"},                 # noqa: E501
-        0x4201001c: {'reg': Register.POWER_ON_TIME,        'fmt': '<H', 'ratio':    1, 'dep': ProxyMode.SERVER},  # noqa: E501, or packet number
+        0x4201001c: {'reg': Register.POWER_ON_TIME,        'fmt': '<H', 'ratio':    1, 'dep': ProxyMode.SERVER},  # noqa: E501
         0x42010020: {'reg': Register.SERIAL_NUMBER,        'fmt': '!16s'},               # noqa: E501
         0x420100c0: {'reg': Register.INVERTER_STATUS,      'fmt': '!H'},                 # noqa: E501
         0x420100d0: {'reg': Register.VERSION,              'fmt': '!H', 'eval': "f'V{(result>>12)}.{(result>>8)&0xf}.{(result>>4)&0xf}{result&0xf}'"},  # noqa: E501
@@ -120,7 +118,15 @@ class InfosG3P(Infos):
             if not isinstance(row, dict):
                 continue
             info_id = row['reg']
-            result = self.__get_value(buf, addr, row)
+            fmt = row['fmt']
+            res = struct.unpack_from(fmt, buf, addr)
+            result = res[0]
+            if isinstance(result, (bytearray, bytes)):
+                result = result.decode().split('\x00')[0]
+            if 'eval' in row:
+                result = eval(row['eval'])
+            if 'ratio' in row:
+                result = round(result * row['ratio'], 2)
 
             keys, level, unit, must_incr = self._key_obj(info_id)
 
@@ -134,16 +140,3 @@ class InfosG3P(Infos):
             if update:
                 self.tracer.log(level, f'[{node_id}] GEN3PLUS: {name}'
                                        f' : {result}{unit}')
-
-    def __get_value(self, buf, idx, row):
-        '''Get a value from buf and interpret as in row'''
-        fmt = row['fmt']
-        res = struct.unpack_from(fmt, buf, idx)
-        result = res[0]
-        if isinstance(result, (bytearray, bytes)):
-            result = result.decode().split('\x00')[0]
-        if 'eval' in row:
-            result = eval(row['eval'])
-        if 'ratio' in row:
-            result = round(result * row['ratio'], 2)
-        return result

app/src/gen3plus/inverter_g3p.py

@@ -3,18 +3,11 @@ import traceback
 import json
 import asyncio
 from asyncio import StreamReader, StreamWriter
+from config import Config
+from inverter import Inverter
+from gen3plus.connection_g3p import ConnectionG3P
 from aiomqtt import MqttCodeError
-
-if __name__ == "app.src.gen3plus.inverter_g3p":
-    from app.src.config import Config
-    from app.src.inverter import Inverter
-    from app.src.gen3plus.connection_g3p import ConnectionG3P
-    from app.src.infos import Infos
-else:  # pragma: no cover
-    from config import Config
-    from inverter import Inverter
-    from gen3plus.connection_g3p import ConnectionG3P
-    from infos import Infos
+from infos import Infos
 
 
 logger_mqtt = logging.getLogger('mqtt')

app/src/gen3plus/solarman_v5.py

@@ -57,11 +57,9 @@ class SolarmanV5(Message):
     '''regular Modbus polling time in server mode'''
     MB_CLIENT_DATA_UP = 30
     '''Data up time in client mode'''
-    HDR_FMT = '<BLLL'
-    '''format string for packing of the header'''
 
     def __init__(self, server_side: bool, client_mode: bool):
-        super().__init__(server_side, self.send_modbus_cb, mb_timeout=8)
+        super().__init__(server_side, self.send_modbus_cb, mb_timeout=5)
 
         self.header_len = 11  # overwrite construcor in class Message
         self.control = 0
@@ -135,10 +133,9 @@ class SolarmanV5(Message):
         self.node_id = 'G3P'  # will be overwritten in __set_serial_no
         self.mb_timer = Timer(self.mb_timout_cb, self.node_id)
         self.mb_timeout = self.MB_REGULAR_TIMEOUT
-        self.mb_first_timeout = self.MB_START_TIMEOUT
+        self.mb_start_timeout = self.MB_START_TIMEOUT
         '''timer value for next Modbus polling request'''
         self.modbus_polling = False
-        self.sensor_list = 0x0000
 
     '''
     Our puplic methods
@@ -172,7 +169,7 @@ class SolarmanV5(Message):
         self.db.set_db_def_value(Register.POLLING_INTERVAL,
                                  self.mb_timeout)
         self.db.set_db_def_value(Register.HEARTBEAT_INTERVAL,
-                                 120)
+                                 120)  # fixme
         self.new_data['controller'] = True
 
         self.state = State.up
@@ -183,23 +180,16 @@ class SolarmanV5(Message):
         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 __set_config_parms(self, inv: dict):
-        '''init connection with params from the configuration'''
-        self.node_id = inv['node_id']
-        self.sug_area = inv['suggested_area']
-        self.modbus_polling = inv['modbus_polling']
-        self.sensor_list = inv['sensor_list']
-
     def __set_serial_no(self, snr: int):
-        '''check the serial number and configure the inverter connection'''
         serial_no = str(snr)
         if self.unique_id == serial_no:
             logger.debug(f'SerialNo: {serial_no}')
         else:
+            found = False
             inverters = Config.get('inverters')
             # logger.debug(f'Inverters: {inverters}')
 
@@ -207,11 +197,14 @@ class SolarmanV5(Message):
                 # 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
-                    break
-            else:
+                    self.db.set_pv_module_details(inv)
+
+            if not found:
                 self.node_id = ''
                 self.sug_area = ''
                 if 'allow_all' not in inverters or not inverters['allow_all']:
@@ -219,7 +212,7 @@ class SolarmanV5(Message):
                     self.unique_id = None
                     logger.warning(f'ignore message from unknow inverter! (SerialNo: {serial_no})')  # noqa: E501
                     return
-                logger.warning(f'SerialNo {serial_no} not known but accepted!')
+                logger.debug(f'SerialNo {serial_no} not known but accepted!')
 
             self.unique_id = serial_no
 
@@ -232,25 +225,23 @@ class SolarmanV5(Message):
 
             if self.header_valid and len(self._recv_buffer) >= \
                (self.header_len + self.data_len+2):
-                self.__process_complete_received_msg()
+                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 __process_complete_received_msg(self):
-        log_lvl = self.log_lvl.get(self.control, logging.WARNING)
-        if callable(log_lvl):
-            log_lvl = log_lvl()
-        hex_dump_memory(log_lvl, f'Received from {self.addr}:',
-                        self._recv_buffer, self.header_len +
-                        self.data_len+2)
-        if self.__trailer_is_ok(self._recv_buffer, self.header_len
-                                + self.data_len + 2):
-            if self.state == State.init:
-                self.state = State.received
-            self.__set_serial_no(self.snr)
-            self.__dispatch_msg()
-
     def forward(self, buffer, buflen) -> None:
         '''add the actual receive msg to the forwarding queue'''
         if self.no_forwarding:
@@ -410,7 +401,7 @@ class SolarmanV5(Message):
             return
         self.__build_header(0x4510)
         self._send_buffer += struct.pack('<BHLLL', self.MB_RTU_CMD,
-                                         self.sensor_list, 0, 0, 0)
+                                         0x2b0, 0, 0, 0)
         self._send_buffer += pdu
         self.__finish_send_msg()
         hex_dump_memory(log_lvl, f'Send Modbus {state}:{self.addr}:',
@@ -459,8 +450,8 @@ class SolarmanV5(Message):
         self.forward_at_cmd_resp = False
         self.__build_header(0x4510)
         self._send_buffer += struct.pack(f'<BHLLL{len(at_cmd)}sc', self.AT_CMD,
-                                         0x0002, 0, 0, 0,
-                                         at_cmd.encode('utf-8'), b'\r')
+                                         2, 0, 0, 0, at_cmd.encode('utf-8'),
+                                         b'\r')
         self.__finish_send_msg()
         try:
             await self.async_write('Send AT Command:')
@@ -509,7 +500,7 @@ class SolarmanV5(Message):
 
     def msg_dev_ind(self):
         data = self._recv_buffer[self.header_len:]
-        result = struct.unpack_from(self.HDR_FMT, data, 0)
+        result = struct.unpack_from('<BLLL', data, 0)
         ftype = result[0]  # always 2
         total = result[1]
         tim = result[2]
@@ -523,8 +514,6 @@ class SolarmanV5(Message):
         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)
 
@@ -532,16 +521,12 @@ class SolarmanV5(Message):
         data = self._recv_buffer
         result = struct.unpack_from('<BHLLLHL', data, self.header_len)
         ftype = result[0]  # 1 or 0x81
-        sensor = result[1]
         total = result[2]
         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:
@@ -558,7 +543,7 @@ class SolarmanV5(Message):
 
     def msg_sync_start(self):
         data = self._recv_buffer[self.header_len:]
-        result = struct.unpack_from(self.HDR_FMT, data, 0)
+        result = struct.unpack_from('<BLLL', data, 0)
         ftype = result[0]
         total = result[1]
         self.time_ofs = result[3]
@@ -623,30 +608,28 @@ class SolarmanV5(Message):
                 self.publish_mqtt(f'{self.entity_prfx}{node_id}{key}', data_json)  # noqa: E501
                 return
         elif ftype == self.MB_RTU_CMD:
-            self.__modbus_command_rsp(data)
+            valid = data[1]
+            modbus_msg_len = self.data_len - 14
+            # logger.debug(f'modbus_len:{modbus_msg_len} accepted:{valid}')
+            if valid == 1 and modbus_msg_len > 4:
+                # logger.info(f'first byte modbus:{data[14]}')
+                inv_update = False
+                self.modbus_elms = 0
+
+                for key, update, _ in self.mb.recv_resp(self.db, data[14:],
+                                                        self.node_id):
+                    self.modbus_elms += 1
+                    if update:
+                        if key == 'inverter':
+                            inv_update = True
+                        self._set_mqtt_timestamp(key, self._timestamp())
+                        self.new_data[key] = True
+
+                if inv_update:
+                    self.__build_model_name()
             return
         self.__forward_msg()
 
-    def __modbus_command_rsp(self, data):
-        '''precess MODBUS RTU response'''
-        valid = data[1]
-        modbus_msg_len = self.data_len - 14
-        # logger.debug(f'modbus_len:{modbus_msg_len} accepted:{valid}')
-        if valid == 1 and modbus_msg_len > 4:
-            # logger.info(f'first byte modbus:{data[14]}')
-            inv_update = False
-            self.modbus_elms = 0
-            for key, update, _ in self.mb.recv_resp(self.db, data[14:],
-                                                    self.node_id):
-                self.modbus_elms += 1
-                if update:
-                    if key == 'inverter':
-                        inv_update = True
-                    self._set_mqtt_timestamp(key, self._timestamp())
-                    self.new_data[key] = True
-            if inv_update:
-                self.__build_model_name()
-
     def msg_hbeat_ind(self):
         data = self._recv_buffer[self.header_len:]
         result = struct.unpack_from('<B', data, 0)
@@ -658,7 +641,7 @@ class SolarmanV5(Message):
 
     def msg_sync_end(self):
         data = self._recv_buffer[self.header_len:]
-        result = struct.unpack_from(self.HDR_FMT, data, 0)
+        result = struct.unpack_from('<BLLL', data, 0)
         ftype = result[0]
         total = result[1]
         self.time_ofs = result[3]

app/src/infos.py

@@ -96,7 +96,6 @@ class Register(Enum):
     HEARTBEAT_INTERVAL = 406
     IP_ADDRESS = 407
     POLLING_INTERVAL = 408
-    SENSOR_LIST = 409
     EVENT_401 = 500
     EVENT_402 = 501
     EVENT_403 = 502
@@ -150,21 +149,10 @@ class ClrAtMidnight:
 
 
 class Infos:
-    LIGHTNING = 'mdi:lightning-bolt'
-    COUNTER = 'mdi:counter'
-    GAUGE = 'mdi:gauge'
-    SOLAR_POWER_VAR = 'mdi:solar-power-variant'
-    SOLAR_POWER = 'mdi:solar-power'
-    WIFI = 'mdi:wifi'
-    UPDATE = 'mdi:update'
-    DAILY_GEN = 'Daily Generation'
-    TOTAL_GEN = 'Total Generation'
-    FMT_INT = '| int'
-    FMT_FLOAT = '| float'
-    FMT_STRING_SEC = '| string + " s"'
     stat = {}
     app_name = os.getenv('SERVICE_NAME', 'proxy')
     version = os.getenv('VERSION', 'unknown')
+
     new_stat_data = {}
 
     @classmethod
@@ -230,9 +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.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
@@ -247,19 +235,19 @@ class Infos:
         Register.PV6_MODEL:        {'name': ['inverter', 'PV6_Model'],             'level': logging.DEBUG, 'unit': ''},  # noqa: E501
 
         # proxy:
-        Register.INVERTER_CNT:       {'name': ['proxy', 'Inverter_Cnt'],       'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_count_',     'fmt': FMT_INT, 'name': 'Active Inverter Connections',    'icon': COUNTER}},  # noqa: E501
-        Register.UNKNOWN_SNR:        {'name': ['proxy', 'Unknown_SNR'],        'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'unknown_snr_',   'fmt': FMT_INT, 'name': 'Unknown Serial No',    'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.UNKNOWN_MSG:        {'name': ['proxy', 'Unknown_Msg'],        'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'unknown_msg_',   'fmt': FMT_INT, 'name': 'Unknown Msg Type',     'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.INVALID_DATA_TYPE:  {'name': ['proxy', 'Invalid_Data_Type'],  'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_data_type_', 'fmt': FMT_INT, 'name': 'Invalid Data Type',    'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.INTERNAL_ERROR:     {'name': ['proxy', 'Internal_Error'],     'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'intern_err_',    'fmt': FMT_INT, 'name': 'Internal Error',       'icon': COUNTER, 'ent_cat': 'diagnostic', 'en': False}},  # noqa: E501
-        Register.UNKNOWN_CTRL:       {'name': ['proxy', 'Unknown_Ctrl'],       'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'unknown_ctrl_',  'fmt': FMT_INT, 'name': 'Unknown Control Type', 'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.OTA_START_MSG:      {'name': ['proxy', 'OTA_Start_Msg'],      'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'ota_start_cmd_', 'fmt': FMT_INT, 'name': 'OTA Start Cmd',        'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.SW_EXCEPTION:       {'name': ['proxy', 'SW_Exception'],       'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'sw_exception_',  'fmt': FMT_INT, 'name': 'Internal SW Exception', 'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.INVALID_MSG_FMT:    {'name': ['proxy', 'Invalid_Msg_Format'], 'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_msg_fmt_',   'fmt': FMT_INT, 'name': 'Invalid Message Format', 'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.AT_COMMAND:         {'name': ['proxy', 'AT_Command'],         'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'at_cmd_',        'fmt': FMT_INT, 'name': 'AT Command',           'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.AT_COMMAND_BLOCKED: {'name': ['proxy', 'AT_Command_Blocked'], 'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'at_cmd_blocked_', 'fmt': FMT_INT, 'name': 'AT Command Blocked',   'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.MODBUS_COMMAND:     {'name': ['proxy', 'Modbus_Command'],     'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'modbus_cmd_',    'fmt': FMT_INT, 'name': 'Modbus Command',       'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        # 0xffffff03:  {'name':['proxy', 'Voltage'],                        'level': logging.DEBUG, 'unit': 'V',    'ha':{'dev':'proxy', 'dev_cla': 'voltage',     'stat_cla': 'measurement', 'id':'proxy_volt_',  'fmt':FMT_FLOAT,'name': 'Grid Voltage'}},  # noqa: E501
+        Register.INVERTER_CNT:       {'name': ['proxy', 'Inverter_Cnt'],       'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_count_',     'fmt': '| int', 'name': 'Active Inverter Connections',    'icon': 'mdi:counter'}},  # noqa: E501
+        Register.UNKNOWN_SNR:        {'name': ['proxy', 'Unknown_SNR'],        'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'unknown_snr_',   'fmt': '| int', 'name': 'Unknown Serial No',    'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.UNKNOWN_MSG:        {'name': ['proxy', 'Unknown_Msg'],        'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'unknown_msg_',   'fmt': '| int', 'name': 'Unknown Msg Type',     'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.INVALID_DATA_TYPE:  {'name': ['proxy', 'Invalid_Data_Type'],  'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_data_type_', 'fmt': '| int', 'name': 'Invalid Data Type',    'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.INTERNAL_ERROR:     {'name': ['proxy', 'Internal_Error'],     'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'intern_err_',    'fmt': '| int', 'name': 'Internal Error',       'icon': 'mdi:counter', 'ent_cat': 'diagnostic', 'en': False}},  # noqa: E501
+        Register.UNKNOWN_CTRL:       {'name': ['proxy', 'Unknown_Ctrl'],       'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'unknown_ctrl_',  'fmt': '| int', 'name': 'Unknown Control Type', 'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.OTA_START_MSG:      {'name': ['proxy', 'OTA_Start_Msg'],      'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'ota_start_cmd_', 'fmt': '| int', 'name': 'OTA Start Cmd',        'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.SW_EXCEPTION:       {'name': ['proxy', 'SW_Exception'],       'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'sw_exception_',  'fmt': '| int', 'name': 'Internal SW Exception', 'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.INVALID_MSG_FMT:    {'name': ['proxy', 'Invalid_Msg_Format'], 'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_msg_fmt_',   'fmt': '| int', 'name': 'Invalid Message Format', 'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.AT_COMMAND:         {'name': ['proxy', 'AT_Command'],         'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'at_cmd_',        'fmt': '| int', 'name': 'AT Command',           'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.AT_COMMAND_BLOCKED: {'name': ['proxy', 'AT_Command_Blocked'], 'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'at_cmd_blocked_', 'fmt': '| int', 'name': 'AT Command Blocked',   'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.MODBUS_COMMAND:     {'name': ['proxy', 'Modbus_Command'],     'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'modbus_cmd_',    'fmt': '| int', 'name': 'Modbus Command',       'icon': 'mdi:counter', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        # 0xffffff03:  {'name':['proxy', 'Voltage'],                        'level': logging.DEBUG, 'unit': 'V',    'ha':{'dev':'proxy', 'dev_cla': 'voltage',     'stat_cla': 'measurement', 'id':'proxy_volt_',  'fmt':'| float','name': 'Grid Voltage'}},  # noqa: E501
 
         # events
         Register.EVENT_401:  {'name': ['events', '401_'],                          'level': logging.DEBUG, 'unit': ''},  # noqa: E501
@@ -281,61 +269,60 @@ class Infos:
 
         # 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
 
         # input measures:
         Register.TS_INPUT:     {'name': ['input', 'Timestamp'],                    'level': logging.INFO,  'unit': ''},  # noqa: E501
-        Register.PV1_VOLTAGE:  {'name': ['input', 'pv1', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv1', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv1_',  'val_tpl': "{{ (value_json['pv1']['Voltage'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.PV1_CURRENT:  {'name': ['input', 'pv1', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv1', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv1_',   'val_tpl': "{{ (value_json['pv1']['Current'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV1_VOLTAGE:  {'name': ['input', 'pv1', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv1', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv1_',  'val_tpl': "{{ (value_json['pv1']['Voltage'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV1_CURRENT:  {'name': ['input', 'pv1', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv1', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv1_',   'val_tpl': "{{ (value_json['pv1']['Current'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.PV1_POWER:    {'name': ['input', 'pv1', 'Power'],                 'level': logging.DEBUG, 'unit': 'W',    'ha': {'dev': 'input_pv1', 'dev_cla': 'power',   'stat_cla': 'measurement', 'id': 'power_pv1_', 'val_tpl': "{{ (value_json['pv1']['Power'] | float)}}"}},  # noqa: E501
-        Register.PV2_VOLTAGE:  {'name': ['input', 'pv2', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv2', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv2_',  'val_tpl': "{{ (value_json['pv2']['Voltage'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.PV2_CURRENT:  {'name': ['input', 'pv2', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv2', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv2_',   'val_tpl': "{{ (value_json['pv2']['Current'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV2_VOLTAGE:  {'name': ['input', 'pv2', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv2', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv2_',  'val_tpl': "{{ (value_json['pv2']['Voltage'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV2_CURRENT:  {'name': ['input', 'pv2', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv2', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv2_',   'val_tpl': "{{ (value_json['pv2']['Current'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.PV2_POWER:    {'name': ['input', 'pv2', 'Power'],                 'level': logging.DEBUG, 'unit': 'W',    'ha': {'dev': 'input_pv2', 'dev_cla': 'power',   'stat_cla': 'measurement', 'id': 'power_pv2_', 'val_tpl': "{{ (value_json['pv2']['Power'] | float)}}"}},  # noqa: E501
-        Register.PV3_VOLTAGE:  {'name': ['input', 'pv3', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv3', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv3_',  'val_tpl': "{{ (value_json['pv3']['Voltage'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.PV3_CURRENT:  {'name': ['input', 'pv3', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv3', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv3_',   'val_tpl': "{{ (value_json['pv3']['Current'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV3_VOLTAGE:  {'name': ['input', 'pv3', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv3', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv3_',  'val_tpl': "{{ (value_json['pv3']['Voltage'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV3_CURRENT:  {'name': ['input', 'pv3', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv3', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv3_',   'val_tpl': "{{ (value_json['pv3']['Current'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.PV3_POWER:    {'name': ['input', 'pv3', 'Power'],                 'level': logging.DEBUG, 'unit': 'W',    'ha': {'dev': 'input_pv3', 'dev_cla': 'power',   'stat_cla': 'measurement', 'id': 'power_pv3_', 'val_tpl': "{{ (value_json['pv3']['Power'] | float)}}"}},  # noqa: E501
-        Register.PV4_VOLTAGE:  {'name': ['input', 'pv4', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv4', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv4_',  'val_tpl': "{{ (value_json['pv4']['Voltage'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.PV4_CURRENT:  {'name': ['input', 'pv4', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv4', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv4_',   'val_tpl': "{{ (value_json['pv4']['Current'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV4_VOLTAGE:  {'name': ['input', 'pv4', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv4', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv4_',  'val_tpl': "{{ (value_json['pv4']['Voltage'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV4_CURRENT:  {'name': ['input', 'pv4', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv4', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv4_',   'val_tpl': "{{ (value_json['pv4']['Current'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.PV4_POWER:    {'name': ['input', 'pv4', 'Power'],                 'level': logging.DEBUG, 'unit': 'W',    'ha': {'dev': 'input_pv4', 'dev_cla': 'power',   'stat_cla': 'measurement', 'id': 'power_pv4_', 'val_tpl': "{{ (value_json['pv4']['Power'] | float)}}"}},  # noqa: E501
-        Register.PV5_VOLTAGE:  {'name': ['input', 'pv5', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv5', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv5_',  'val_tpl': "{{ (value_json['pv5']['Voltage'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.PV5_CURRENT:  {'name': ['input', 'pv5', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv5', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv5_',   'val_tpl': "{{ (value_json['pv5']['Current'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV5_VOLTAGE:  {'name': ['input', 'pv5', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv5', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv5_',  'val_tpl': "{{ (value_json['pv5']['Voltage'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV5_CURRENT:  {'name': ['input', 'pv5', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv5', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv5_',   'val_tpl': "{{ (value_json['pv5']['Current'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.PV5_POWER:    {'name': ['input', 'pv5', 'Power'],                 'level': logging.DEBUG, 'unit': 'W',    'ha': {'dev': 'input_pv5', 'dev_cla': 'power',   'stat_cla': 'measurement', 'id': 'power_pv5_', 'val_tpl': "{{ (value_json['pv5']['Power'] | float)}}"}},  # noqa: E501
-        Register.PV6_VOLTAGE:  {'name': ['input', 'pv6', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv6', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv6_',  'val_tpl': "{{ (value_json['pv6']['Voltage'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.PV6_CURRENT:  {'name': ['input', 'pv6', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv6', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv6_',   'val_tpl': "{{ (value_json['pv6']['Current'] | float)}}", 'icon': GAUGE, 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV6_VOLTAGE:  {'name': ['input', 'pv6', 'Voltage'],               'level': logging.DEBUG, 'unit': 'V',    'ha': {'dev': 'input_pv6', 'dev_cla': 'voltage', 'stat_cla': 'measurement', 'id': 'volt_pv6_',  'val_tpl': "{{ (value_json['pv6']['Voltage'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.PV6_CURRENT:  {'name': ['input', 'pv6', 'Current'],               'level': logging.DEBUG, 'unit': 'A',    'ha': {'dev': 'input_pv6', 'dev_cla': 'current', 'stat_cla': 'measurement', 'id': 'cur_pv6_',   'val_tpl': "{{ (value_json['pv6']['Current'] | float)}}", 'icon': 'mdi:gauge', 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.PV6_POWER:    {'name': ['input', 'pv6', 'Power'],                 'level': logging.DEBUG, 'unit': 'W',    'ha': {'dev': 'input_pv6', 'dev_cla': 'power',   'stat_cla': 'measurement', 'id': 'power_pv6_', 'val_tpl': "{{ (value_json['pv6']['Power'] | float)}}"}},  # noqa: E501
-        Register.PV1_DAILY_GENERATION:  {'name': ['input', 'pv1', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv1', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv1_', 'name': DAILY_GEN, 'val_tpl': "{{ (value_json['pv1']['Daily_Generation'] | float)}}", 'icon': SOLAR_POWER_VAR, 'must_incr': True}},  # noqa: E501
-        Register.PV1_TOTAL_GENERATION:  {'name': ['input', 'pv1', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv1', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv1_', 'name': TOTAL_GEN, 'val_tpl': "{{ (value_json['pv1']['Total_Generation'] | float)}}", 'icon': SOLAR_POWER, 'must_incr': True}},  # noqa: E501
-        Register.PV2_DAILY_GENERATION:  {'name': ['input', 'pv2', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv2', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv2_', 'name': DAILY_GEN, 'val_tpl': "{{ (value_json['pv2']['Daily_Generation'] | float)}}", 'icon': SOLAR_POWER_VAR, 'must_incr': True}},  # noqa: E501
-        Register.PV2_TOTAL_GENERATION:  {'name': ['input', 'pv2', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv2', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv2_', 'name': TOTAL_GEN, 'val_tpl': "{{ (value_json['pv2']['Total_Generation'] | float)}}", 'icon': SOLAR_POWER, 'must_incr': True}},  # noqa: E501
-        Register.PV3_DAILY_GENERATION:  {'name': ['input', 'pv3', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv3', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv3_', 'name': DAILY_GEN, 'val_tpl': "{{ (value_json['pv3']['Daily_Generation'] | float)}}", 'icon': SOLAR_POWER_VAR, 'must_incr': True}},  # noqa: E501
-        Register.PV3_TOTAL_GENERATION:  {'name': ['input', 'pv3', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv3', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv3_', 'name': TOTAL_GEN, 'val_tpl': "{{ (value_json['pv3']['Total_Generation'] | float)}}", 'icon': SOLAR_POWER, 'must_incr': True}},  # noqa: E501
-        Register.PV4_DAILY_GENERATION:  {'name': ['input', 'pv4', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv4', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv4_', 'name': DAILY_GEN, 'val_tpl': "{{ (value_json['pv4']['Daily_Generation'] | float)}}", 'icon': SOLAR_POWER_VAR, 'must_incr': True}},  # noqa: E501
-        Register.PV4_TOTAL_GENERATION:  {'name': ['input', 'pv4', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv4', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv4_', 'name': TOTAL_GEN, 'val_tpl': "{{ (value_json['pv4']['Total_Generation'] | float)}}", 'icon': SOLAR_POWER, 'must_incr': True}},  # noqa: E501
-        Register.PV5_DAILY_GENERATION:  {'name': ['input', 'pv5', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv5', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv5_', 'name': DAILY_GEN, 'val_tpl': "{{ (value_json['pv5']['Daily_Generation'] | float)}}", 'icon': SOLAR_POWER_VAR, 'must_incr': True}},  # noqa: E501
-        Register.PV5_TOTAL_GENERATION:  {'name': ['input', 'pv5', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv5', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv5_', 'name': TOTAL_GEN, 'val_tpl': "{{ (value_json['pv5']['Total_Generation'] | float)}}", 'icon': SOLAR_POWER, 'must_incr': True}},  # noqa: E501
-        Register.PV6_DAILY_GENERATION:  {'name': ['input', 'pv6', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv6', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv6_', 'name': DAILY_GEN, 'val_tpl': "{{ (value_json['pv6']['Daily_Generation'] | float)}}", 'icon': SOLAR_POWER_VAR, 'must_incr': True}},  # noqa: E501
-        Register.PV6_TOTAL_GENERATION:  {'name': ['input', 'pv6', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv6', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv6_', 'name': TOTAL_GEN, 'val_tpl': "{{ (value_json['pv6']['Total_Generation'] | float)}}", 'icon': SOLAR_POWER, 'must_incr': True}},  # noqa: E501
+        Register.PV1_DAILY_GENERATION:  {'name': ['input', 'pv1', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv1', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv1_', 'name': 'Daily Generation', 'val_tpl': "{{ (value_json['pv1']['Daily_Generation'] | float)}}", 'icon': 'mdi:solar-power-variant', 'must_incr': True}},  # noqa: E501
+        Register.PV1_TOTAL_GENERATION:  {'name': ['input', 'pv1', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv1', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv1_', 'name': 'Total Generation', 'val_tpl': "{{ (value_json['pv1']['Total_Generation'] | float)}}", 'icon': 'mdi:solar-power', 'must_incr': True}},  # noqa: E501
+        Register.PV2_DAILY_GENERATION:  {'name': ['input', 'pv2', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv2', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv2_', 'name': 'Daily Generation', 'val_tpl': "{{ (value_json['pv2']['Daily_Generation'] | float)}}", 'icon': 'mdi:solar-power-variant', 'must_incr': True}},  # noqa: E501
+        Register.PV2_TOTAL_GENERATION:  {'name': ['input', 'pv2', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv2', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv2_', 'name': 'Total Generation', 'val_tpl': "{{ (value_json['pv2']['Total_Generation'] | float)}}", 'icon': 'mdi:solar-power', 'must_incr': True}},  # noqa: E501
+        Register.PV3_DAILY_GENERATION:  {'name': ['input', 'pv3', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv3', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv3_', 'name': 'Daily Generation', 'val_tpl': "{{ (value_json['pv3']['Daily_Generation'] | float)}}", 'icon': 'mdi:solar-power-variant', 'must_incr': True}},  # noqa: E501
+        Register.PV3_TOTAL_GENERATION:  {'name': ['input', 'pv3', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv3', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv3_', 'name': 'Total Generation', 'val_tpl': "{{ (value_json['pv3']['Total_Generation'] | float)}}", 'icon': 'mdi:solar-power', 'must_incr': True}},  # noqa: E501
+        Register.PV4_DAILY_GENERATION:  {'name': ['input', 'pv4', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv4', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv4_', 'name': 'Daily Generation', 'val_tpl': "{{ (value_json['pv4']['Daily_Generation'] | float)}}", 'icon': 'mdi:solar-power-variant', 'must_incr': True}},  # noqa: E501
+        Register.PV4_TOTAL_GENERATION:  {'name': ['input', 'pv4', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv4', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv4_', 'name': 'Total Generation', 'val_tpl': "{{ (value_json['pv4']['Total_Generation'] | float)}}", 'icon': 'mdi:solar-power', 'must_incr': True}},  # noqa: E501
+        Register.PV5_DAILY_GENERATION:  {'name': ['input', 'pv5', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv5', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv5_', 'name': 'Daily Generation', 'val_tpl': "{{ (value_json['pv5']['Daily_Generation'] | float)}}", 'icon': 'mdi:solar-power-variant', 'must_incr': True}},  # noqa: E501
+        Register.PV5_TOTAL_GENERATION:  {'name': ['input', 'pv5', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv5', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv5_', 'name': 'Total Generation', 'val_tpl': "{{ (value_json['pv5']['Total_Generation'] | float)}}", 'icon': 'mdi:solar-power', 'must_incr': True}},  # noqa: E501
+        Register.PV6_DAILY_GENERATION:  {'name': ['input', 'pv6', 'Daily_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv6', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_pv6_', 'name': 'Daily Generation', 'val_tpl': "{{ (value_json['pv6']['Daily_Generation'] | float)}}", 'icon': 'mdi:solar-power-variant', 'must_incr': True}},  # noqa: E501
+        Register.PV6_TOTAL_GENERATION:  {'name': ['input', 'pv6', 'Total_Generation'],        'level': logging.DEBUG, 'unit': 'kWh',  'ha': {'dev': 'input_pv6', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_pv6_', 'name': 'Total Generation', 'val_tpl': "{{ (value_json['pv6']['Total_Generation'] | float)}}", 'icon': 'mdi:solar-power', 'must_incr': True}},  # noqa: E501
         # total:
         Register.TS_TOTAL:          {'name': ['total', 'Timestamp'],               'level': logging.INFO,  'unit': ''},  # noqa: E501
-        Register.DAILY_GENERATION:  {'name': ['total', 'Daily_Generation'],        'level': logging.INFO,  'unit': 'kWh',  'ha': {'dev': 'inverter', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_', 'fmt': FMT_FLOAT, 'name': DAILY_GEN, 'icon': SOLAR_POWER_VAR, 'must_incr': True}},  # noqa: E501
-        Register.TOTAL_GENERATION:  {'name': ['total', 'Total_Generation'],        'level': logging.INFO,  'unit': 'kWh',  'ha': {'dev': 'inverter', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_', 'fmt': FMT_FLOAT, 'name': TOTAL_GEN, 'icon': SOLAR_POWER, 'must_incr': True}},  # noqa: E501
+        Register.DAILY_GENERATION:  {'name': ['total', 'Daily_Generation'],        'level': logging.INFO,  'unit': 'kWh',  'ha': {'dev': 'inverter', 'dev_cla': 'energy', 'stat_cla': 'total_increasing', 'id': 'daily_gen_', 'fmt': '| float', 'name': 'Daily Generation', 'icon': 'mdi:solar-power-variant', 'must_incr': True}},  # noqa: E501
+        Register.TOTAL_GENERATION:  {'name': ['total', 'Total_Generation'],        'level': logging.INFO,  'unit': 'kWh',  'ha': {'dev': 'inverter', 'dev_cla': 'energy', 'stat_cla': 'total',            'id': 'total_gen_', 'fmt': '| float', 'name': 'Total Generation', 'icon': 'mdi:solar-power', 'must_incr': True}},  # noqa: E501
 
         # controller:
-        Register.SIGNAL_STRENGTH:    {'name': ['controller', 'Signal_Strength'],    'level': logging.DEBUG, 'unit': '%',    'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': 'measurement', 'id': 'signal_',              'fmt': FMT_INT,           'name': 'Signal Strength', 'icon': WIFI}},  # noqa: E501
-        Register.POWER_ON_TIME:      {'name': ['controller', 'Power_On_Time'],      'level': logging.DEBUG, 'unit': 's',    'ha': {'dev': 'controller', 'dev_cla': 'duration', 'stat_cla': 'measurement', 'id': 'power_on_time_',       'fmt': FMT_INT,           'name': 'Power on Time', 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.COLLECT_INTERVAL:   {'name': ['controller', 'Collect_Interval'],   'level': logging.DEBUG, 'unit': 'min',  'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'data_collect_intval_', 'fmt': '| string + " min"', 'name': 'Data Collect Interval', 'icon': UPDATE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.CONNECT_COUNT:      {'name': ['controller', 'Connect_Count'],      'level': logging.DEBUG, 'unit': '',     'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'connect_count_',       'fmt': FMT_INT,           'name': 'Connect Count',    'icon': COUNTER, 'comp': 'sensor', 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.COMMUNICATION_TYPE: {'name': ['controller', 'Communication_Type'], 'level': logging.DEBUG, 'unit': '',     'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'comm_type_',           'name': 'Communication Type', 'val_tpl': __comm_type_val_tpl, 'comp': 'sensor', 'icon': WIFI}},  # noqa: E501
-        Register.DATA_UP_INTERVAL:   {'name': ['controller', 'Data_Up_Interval'],   'level': logging.DEBUG, 'unit': 's',    'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'data_up_intval_', 'fmt': FMT_STRING_SEC, 'name': 'Data Up Interval', 'icon': UPDATE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.HEARTBEAT_INTERVAL: {'name': ['controller', 'Heartbeat_Interval'], 'level': logging.DEBUG, 'unit': 's',    'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'heartbeat_intval_',    'fmt': FMT_STRING_SEC, 'name': 'Heartbeat Interval', 'icon': UPDATE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.IP_ADDRESS:         {'name': ['controller', 'IP_Address'],         'level': logging.DEBUG, 'unit': '',     'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'ip_address_',           'fmt': '| string',        'name': 'IP Address', 'icon': WIFI, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.POLLING_INTERVAL:   {'name': ['controller', 'Polling_Interval'],   'level': logging.DEBUG, 'unit': 's',    'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'polling_intval_', 'fmt': FMT_STRING_SEC, 'name': 'Polling Interval', 'icon': UPDATE, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.SENSOR_LIST:        {'name': ['controller', 'Sensor_List'],        'level': logging.INFO,  'unit': ''},  # noqa: E501
+        Register.SIGNAL_STRENGTH:    {'name': ['controller', 'Signal_Strength'],    'level': logging.DEBUG, 'unit': '%',    'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': 'measurement', 'id': 'signal_',              'fmt': '| int',           'name': 'Signal Strength', 'icon': 'mdi:wifi'}},  # noqa: E501
+        Register.POWER_ON_TIME:      {'name': ['controller', 'Power_On_Time'],      'level': logging.DEBUG, 'unit': 's',    'ha': {'dev': 'controller', 'dev_cla': 'duration', 'stat_cla': 'measurement', 'id': 'power_on_time_',       'fmt': '| int',           'name': 'Power on Time', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.COLLECT_INTERVAL:   {'name': ['controller', 'Collect_Interval'],   'level': logging.DEBUG, 'unit': 'min',  'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'data_collect_intval_', 'fmt': '| string + " min"', 'name': 'Data Collect Interval', 'icon': 'mdi:update', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.CONNECT_COUNT:      {'name': ['controller', 'Connect_Count'],      'level': logging.DEBUG, 'unit': '',     'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'connect_count_',       'fmt': '| int',           'name': 'Connect Count',    'icon': 'mdi:counter', 'comp': 'sensor', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.COMMUNICATION_TYPE: {'name': ['controller', 'Communication_Type'], 'level': logging.DEBUG, 'unit': '',     'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'comm_type_',           'name': 'Communication Type', 'val_tpl': __comm_type_val_tpl, 'comp': 'sensor', 'icon': 'mdi:wifi'}},  # noqa: E501
+        Register.DATA_UP_INTERVAL:   {'name': ['controller', 'Data_Up_Interval'],   'level': logging.DEBUG, 'unit': 's',    'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'data_up_intval_', 'fmt': '| string + " s"', 'name': 'Data Up Interval', 'icon': 'mdi:update', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.HEARTBEAT_INTERVAL: {'name': ['controller', 'Heartbeat_Interval'], 'level': logging.DEBUG, 'unit': 's',    'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'heartbeat_intval_',    'fmt': '| string + " s"', 'name': 'Heartbeat Interval', 'icon': 'mdi:update', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        Register.IP_ADDRESS:         {'name': ['controller', 'IP_Address'],         'level': logging.DEBUG, 'unit': '',     'ha': {'dev': 'controller', 'dev_cla': None,       'stat_cla': None,          'id': 'ip_address_',           'fmt': '| string',        'name': 'IP Address', 'icon': 'mdi:wifi', 'ent_cat': 'diagnostic'}},  # noqa: E501
+        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
@@ -427,119 +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'):      # 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}"]
-        return dev
-
-    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

app/src/inverter.py

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

app/src/messages.py

@@ -14,25 +14,6 @@ else:  # pragma: no cover
 logger = logging.getLogger('msg')
 
 
-def __hex_val(n, data, data_len):
-    line = ''
-    for j in range(n-16, n):
-        if j >= data_len:
-            break
-        line += '%02x ' % abs(data[j])
-    return line
-
-
-def __asc_val(n, data, data_len):
-    line = ''
-    for j in range(n-16, n):
-        if j >= data_len:
-            break
-        c = data[j] if not (data[j] < 0x20 or data[j] > 0x7e) else '.'
-        line += '%c' % c
-    return line
-
-
 def hex_dump_memory(level, info, data, data_len):
     n = 0
     lines = []
@@ -45,9 +26,20 @@ def hex_dump_memory(level, info, data, data_len):
         line = '  '
         line += '%04x | ' % (i)
         n += 16
-        line += __hex_val(n, data, data_len)
+
+        for j in range(n-16, n):
+            if j >= data_len:
+                break
+            line += '%02x ' % abs(data[j])
+
         line += ' ' * (3 * 16 + 9 - len(line)) + ' | '
-        line += __asc_val(n, data, data_len)
+
+        for j in range(n-16, n):
+            if j >= 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))

app/src/modbus.py

@@ -39,7 +39,7 @@ class Modbus():
     '''Modbus function code: Write Single Register'''
 
     __crc_tab = []
-    mb_reg_mapping = {
+    map = {
         0x2007: {'reg': Register.MAX_DESIGNED_POWER,   'fmt': '!H', 'ratio':  1},  # noqa: E501
         0x202c: {'reg': Register.OUTPUT_COEFFICIENT,   'fmt': '!H', 'ratio':  100/1024},  # noqa: E501
 
@@ -139,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
 
@@ -164,7 +164,7 @@ class Modbus():
 
         return True
 
-    def recv_resp(self, info_db, buf: bytes, node_id: str) -> \
+    def recv_resp(self, info_db, buf: bytearray, node_id: str) -> \
             Generator[tuple[str, bool, int | float | str], None, None]:
         """Generator which check and parse a received MODBUS response.
 
@@ -183,18 +183,58 @@ class Modbus():
         # logging.info(f'recv_resp: first byte modbus:{buf[0]} len:{len(buf)}')
         self.node_id = node_id
 
-        fcode = buf[1]
-        data_available = self.last_addr == self.INV_ADDR and \
-            (fcode == 3 or fcode == 4)
-
-        if self.__resp_error_check(buf, data_available):
+        if not self.req_pend:
+            self.err = 5
             return
-
-        if data_available:
+        if not self.__check_crc(buf):
+            logger.error(f'[{node_id}] Modbus resp: CRC error')
+            self.err = 1
+            return
+        if buf[0] != self.last_addr:
+            logger.info(f'[{node_id}] Modbus resp: Wrong addr {buf[0]}')
+            self.err = 2
+            return
+        fcode = buf[1]
+        if fcode != self.last_fcode:
+            logger.info(f'[{node_id}] Modbus: Wrong fcode {fcode}'
+                        f' != {self.last_fcode}')
+            self.err = 3
+            return
+        if self.last_addr == self.INV_ADDR and \
+                (fcode == 3 or fcode == 4):
             elmlen = buf[2] >> 1
+            if elmlen != self.last_len:
+                logger.info(f'[{node_id}] Modbus: len error {elmlen}'
+                            f' != {self.last_len}')
+                self.err = 4
+                return
             first_reg = self.last_reg  # save last_reg before sending next pdu
             self.__stop_timer()          # stop timer and send next pdu
-            yield from self.__process_data(info_db, buf, first_reg, elmlen)
+
+            for i in range(0, elmlen):
+                addr = first_reg+i
+                if addr in self.map:
+                    row = self.map[addr]
+                    info_id = row['reg']
+                    fmt = row['fmt']
+                    val = struct.unpack_from(fmt, buf, 3+2*i)
+                    result = val[0]
+
+                    if 'eval' in row:
+                        result = eval(row['eval'])
+                    if 'ratio' in row:
+                        result = round(result * row['ratio'], 2)
+
+                    keys, level, unit, must_incr = info_db._key_obj(info_id)
+
+                    if keys:
+                        name, update = info_db.update_db(keys, must_incr,
+                                                         result)
+                        yield keys[0], update, result
+                        if update:
+                            info_db.tracer.log(level,
+                                               f'[{node_id}] MODBUS: {name}'
+                                               f' : {result}{unit}')
         else:
             self.__stop_timer()
 
@@ -203,64 +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 __get_value(self, buf: bytes, idx: int, row: dict):
-        '''get a value from the received buffer'''
-        val = struct.unpack_from(row['fmt'], buf, idx)
-        result = val[0]
-
-        if 'eval' in row:
-            result = eval(row['eval'])
-        if 'ratio' in row:
-            result = round(result * row['ratio'], 2)
-        return result
-
-    def __process_data(self, info_db, buf: bytes, first_reg, elmlen):
-        '''Generator over received registers, updates the db'''
-        for i in range(0, elmlen):
-            addr = first_reg+i
-            if addr in self.mb_reg_mapping:
-                row = self.mb_reg_mapping[addr]
-                info_id = row['reg']
-                keys, level, unit, must_incr = info_db._key_obj(info_id)
-                if keys:
-                    result = self.__get_value(buf, 3+2*i, row)
-                    name, update = info_db.update_db(keys, must_incr,
-                                                     result)
-                    yield keys[0], update, result
-                    if update:
-                        info_db.tracer.log(level,
-                                           f'[{self.node_id}] MODBUS: {name}'
-                                           f' : {result}{unit}')
-
     '''
     MODBUS response timer
     '''
@@ -320,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
 

app/src/modbus_tcp.py

@@ -1,13 +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
-else:  # pragma: no cover
-    from config import Config
-    from gen3plus.inverter_g3p import InverterG3P
+# import gc
+from gen3plus.inverter_g3p import InverterG3P
 
 logger = logging.getLogger('conn')
 
@@ -38,9 +35,7 @@ class ModbusConn():
 
 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}')
 
@@ -71,14 +66,11 @@ class ModbusTcp():
                 logging.debug(f'Inv-conn:{error}')
 
             except OSError as error:
-                if error.errno == 113:
-                    logging.debug(f'os-error:{error}')
-                else:
-                    logging.info(f'os-error: {error}')
+                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)

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
@@ -63,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"]}')
@@ -72,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'):
@@ -113,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")

app/src/singleton.py

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

app/tests/test_config.py

@@ -7,11 +7,11 @@ class TstConfig(Config):
 
     @classmethod
     def set(cls, cnf):
-        cls.act_config = cnf
+        cls.config = cnf
 
     @classmethod
     def _read_config_file(cls) -> dict:
-        return cls.act_config
+        return cls.config
 
 
 def test_empty_config():
@@ -30,7 +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': True, 'R170000000000001': {'node_id': '', 'modbus_polling': False, 'monitor_sn': 0, 'suggested_area': '', 'sensor_list': 688}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'node_id': '', 'suggested_area': '', 'sensor_list': 688}}}
+    assert validated == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'node_id': '', '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}, 
@@ -40,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}, 
@@ -63,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 = {}
@@ -71,7 +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': True, 'R170000000000001': {'suggested_area': '', 'modbus_polling': False, 'monitor_sn': 0, 'node_id': '', 'sensor_list': 688}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'suggested_area': '', 'node_id': '', 'sensor_list': 688}}}
+    assert cnf == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'suggested_area': '', '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}
@@ -93,7 +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': True, 'R170000000000001': {'suggested_area': '', 'modbus_polling': False, 'monitor_sn': 0, 'node_id': '', 'sensor_list': 688}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'suggested_area': '', 'node_id': '', 'sensor_list': 688}}}
+    assert cnf == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': False, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'suggested_area': '', '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') 
@@ -106,7 +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': True, 'R170000000000001': {'suggested_area': '', 'modbus_polling': False, 'monitor_sn': 0, 'node_id': '', 'sensor_list': 688}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'suggested_area': '', 'node_id': '', 'sensor_list': 688}}}
+    assert cnf == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 10000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'suggested_area': '', '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():
@@ -123,7 +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': True, 'R170000000000001': {'suggested_area': '', 'modbus_polling': False, 'monitor_sn': 0, 'node_id': '', 'sensor_list': 688}, 'Y170000000000001': {'modbus_polling': True, 'monitor_sn': 2000000000, 'suggested_area': '', 'node_id': '', 'sensor_list': 688}}}
+    assert cnf == {'gen3plus': {'at_acl': {'mqtt': {'allow': ['AT+'], 'block': []}, 'tsun': {'allow': ['AT+Z', 'AT+UPURL', 'AT+SUPDATE'], 'block': []}}}, 'tsun': {'enabled': True, 'host': 'logger.talent-monitoring.com', 'port': 5005}, 'solarman': {'enabled': True, 'host': 'iot.talent-monitoring.com', 'port': 5000}, 'mqtt': {'host': 'mqtt', 'port': 1883, 'user': None, 'passwd': None}, 'ha': {'auto_conf_prefix': 'homeassistant', 'discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun', 'proxy_node_id': 'proxy', 'proxy_unique_id': 'P170000000000001'}, 'inverters': {'allow_all': True, 'R170000000000001': {'suggested_area': '', '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():

app/tests/test_infos_g3.py

@@ -4,7 +4,7 @@ from app.src.infos import Register, ClrAtMidnight
 from app.src.gen3.infos_g3 import InfosG3
 
 @pytest.fixture
-def contr_data_seq(): # Get Time Request message
+def ContrDataSeq(): # Get Time Request message
     msg =   b'\x00\x00\x00\x15\x00\x09\x2b\xa8\x54\x10\x52\x53\x57\x5f\x34\x30\x30\x5f\x56\x31\x2e\x30\x30\x2e\x30\x36\x00\x09\x27\xc0\x54\x06\x52\x61\x79\x6d\x6f'
     msg +=  b'\x6e\x00\x09\x2f\x90\x54\x0b\x52\x53\x57\x2d\x31\x2d\x31\x30\x30\x30\x31\x00\x09\x5a\x88\x54\x0f\x74\x2e\x72\x61\x79\x6d\x6f\x6e\x69\x6f\x74\x2e\x63\x6f\x6d\x00\x09\x5a\xec\x54'
     msg +=  b'\x1c\x6c\x6f\x67\x67\x65\x72\x2e\x74\x61\x6c\x65\x6e\x74\x2d\x6d\x6f\x6e\x69\x74\x6f\x72\x69\x6e\x67\x2e\x63\x6f\x6d\x00\x0d\x00\x20\x49\x00\x00\x00\x01\x00\x0c\x35\x00\x49\x00'
@@ -14,7 +14,7 @@ def contr_data_seq(): # Get Time Request message
     return msg
 
 @pytest.fixture
-def contr2_data_seq(): # Get Time Request message
+def Contr2DataSeq(): # Get Time Request message
     msg  =  b'\x00\x00\x00\x39\x00\x09\x2b\xa8\x54\x10\x52'
     msg +=  b'\x53\x57\x5f\x34\x30\x30\x5f\x56\x31\x2e\x30\x30\x2e\x32\x30\x00'
     msg +=  b'\x09\x27\xc0\x54\x06\x52\x61\x79\x6d\x6f\x6e\x00\x09\x2f\x90\x54'
@@ -94,19 +94,19 @@ def contr2_data_seq(): # Get Time Request message
     return msg
 
 @pytest.fixture
-def inv_data_seq(): # Data indication from the controller
+def InvDataSeq(): # Data indication from the controller
     msg =   b'\x00\x00\x00\x06\x00\x00\x00\x0a\x54\x08\x4d\x69\x63\x72\x6f\x69\x6e\x76\x00\x00\x00\x14\x54\x04\x54\x53\x55\x4e\x00\x00\x00\x1E\x54\x07\x56\x35\x2e\x30\x2e\x31\x31\x00\x00\x00\x28'
     msg +=  b'\x54\x10T170000000000001\x00\x00\x00\x32\x54\x0a\x54\x53\x4f\x4c\x2d\x4d\x53\x36\x30\x30\x00\x00\x00\x3c\x54\x05\x41\x2c\x42\x2c\x43'
     return msg
 
 @pytest.fixture
-def invalid_data_seq(): # Data indication from the controller
+def InvalidDataSeq(): # Data indication from the controller
     msg =   b'\x00\x00\x00\x06\x00\x00\x00\x0a\x54\x08\x4d\x69\x63\x72\x6f\x69\x6e\x76\x00\x00\x00\x14\x64\x04\x54\x53\x55\x4e\x00\x00\x00\x1E\x54\x07\x56\x35\x2e\x30\x2e\x31\x31\x00\x00\x00\x28'
     msg +=  b'\x54\x10T170000000000001\x00\x00\x00\x32\x54\x0a\x54\x53\x4f\x4c\x2d\x4d\x53\x36\x30\x30\x00\x00\x00\x3c\x54\x05\x41\x2c\x42\x2c\x43'
     return msg
 
 @pytest.fixture
-def inv_data_seq2(): # Data indication from the controller
+def InvDataSeq2(): # Data indication from the controller
     msg =   b'\x00\x00\x00\xa3\x00\x00\x00\x64\x53\x00\x01\x00\x00\x00\xc8\x53\x00\x02\x00\x00\x01\x2c\x53\x00\x00\x00\x00\x01\x90\x49\x00\x00\x00\x00\x00\x00\x01\x91\x53\x00\x00'
     msg +=  b'\x00\x00\x01\x92\x53\x00\x00\x00\x00\x01\x93\x53\x00\x00\x00\x00\x01\x94\x53\x00\x00\x00\x00\x01\x95\x53\x00\x00\x00\x00\x01\x96\x53\x00\x00\x00\x00\x01\x97\x53\x00'
     msg +=  b'\x00\x00\x00\x01\x98\x53\x00\x00\x00\x00\x01\x99\x53\x00\x00\x00\x00\x01\x9a\x53\x00\x00\x00\x00\x01\x9b\x53\x00\x00\x00\x00\x01\x9c\x53\x00\x00\x00\x00\x01\x9d\x53'
@@ -141,7 +141,7 @@ def inv_data_seq2(): # Data indication from the controller
     return msg
 
 @pytest.fixture
-def inv_data_new(): # Data indication from DSP V5.0.17
+def InvDataNew(): # Data indication from DSP V5.0.17
     msg  = b'\x00\x00\x00\xa3\x00\x00\x00\x00\x53\x00\x00'
     msg += b'\x00\x00\x00\x80\x53\x00\x00\x00\x00\x01\x04\x53\x00\x00\x00\x00'
     msg += b'\x01\x90\x41\x00\x00\x01\x91\x53\x00\x00\x00\x00\x01\x90\x53\x00'
@@ -217,7 +217,7 @@ def inv_data_new(): # Data indication from DSP V5.0.17
     return msg
 
 @pytest.fixture
-def inv_data_seq2_zero(): # Data indication from the controller
+def InvDataSeq2_Zero(): # Data indication from the controller
     msg =   b'\x00\x00\x00\xa3\x00\x00\x00\x64\x53\x00\x01\x00\x00\x00\xc8\x53\x00\x02\x00\x00\x01\x2c\x53\x00\x00\x00\x00\x01\x90\x49\x00\x00\x00\x00\x00\x00\x01\x91\x53\x00\x00'
     msg +=  b'\x00\x00\x01\x92\x53\x00\x00\x00\x00\x01\x93\x53\x00\x00\x00\x00\x01\x94\x53\x00\x00\x00\x00\x01\x95\x53\x00\x00\x00\x00\x01\x96\x53\x00\x00\x00\x00\x01\x97\x53\x00'
     msg +=  b'\x00\x00\x00\x01\x98\x53\x00\x00\x00\x00\x01\x99\x53\x00\x00\x00\x00\x01\x9a\x53\x00\x00\x00\x00\x01\x9b\x53\x00\x00\x00\x00\x01\x9c\x53\x00\x00\x00\x00\x01\x9d\x53'
@@ -252,37 +252,37 @@ def inv_data_seq2_zero(): # Data indication from the controller
     return msg
 
 
-def test_parse_control(contr_data_seq):
+def test_parse_control(ContrDataSeq):
     i = InfosG3()
-    for key, result in i.parse (contr_data_seq):
-        pass  # side effect in calling i.parse()
+    for key, result in i.parse (ContrDataSeq):
+        pass
 
     assert json.dumps(i.db) == json.dumps(
 {"collector": {"Collector_Fw_Version": "RSW_400_V1.00.06", "Chip_Type": "Raymon", "Chip_Model": "RSW-1-10001", "Trace_URL": "t.raymoniot.com", "Logger_URL": "logger.talent-monitoring.com"}, "controller": {"Collect_Interval": 1, "Signal_Strength": 100, "Power_On_Time": 29, "Communication_Type": 1, "Connect_Count": 1, "Data_Up_Interval": 300}})        
 
-def test_parse_control2(contr2_data_seq):
+def test_parse_control2(Contr2DataSeq):
     i = InfosG3()
-    for key, result in i.parse (contr2_data_seq):
-        pass  # side effect in calling i.parse()
+    for key, result in i.parse (Contr2DataSeq):
+        pass
 
     assert json.dumps(i.db) == json.dumps(
 {"collector": {"Collector_Fw_Version": "RSW_400_V1.00.20", "Chip_Type": "Raymon", "Chip_Model": "RSW-1-10001", "Trace_URL": "t.raymoniot.com", "Logger_URL": "logger.talent-monitoring.com"}, "controller": {"Collect_Interval": 1, "Signal_Strength": 16, "Power_On_Time": 334, "Communication_Type": 1, "Connect_Count": 1, "Data_Up_Interval": 300}})
 
-def test_parse_inverter(inv_data_seq):
+def test_parse_inverter(InvDataSeq):
     i = InfosG3()
-    for key, result in i.parse (inv_data_seq):
-        pass  # side effect in calling i.parse()
+    for key, result in i.parse (InvDataSeq):
+        pass
 
     assert json.dumps(i.db) == json.dumps(
 {"inverter": {"Product_Name": "Microinv", "Manufacturer": "TSUN", "Version": "V5.0.11", "Serial_Number": "T170000000000001", "Equipment_Model": "TSOL-MS600"}})
 
-def test_parse_cont_and_invert(contr_data_seq, inv_data_seq):
+def test_parse_cont_and_invert(ContrDataSeq, InvDataSeq):
     i = InfosG3()
-    for key, result in i.parse (contr_data_seq):
-        pass  # side effect in calling i.parse()
+    for key, result in i.parse (ContrDataSeq):
+        pass
 
-    for key, result in i.parse (inv_data_seq):
-        pass  # side effect in calling i.parse()
+    for key, result in i.parse (InvDataSeq):
+        pass
 
     assert json.dumps(i.db) == json.dumps(
     {
@@ -290,7 +290,7 @@ def test_parse_cont_and_invert(contr_data_seq, inv_data_seq):
 "inverter": {"Product_Name": "Microinv", "Manufacturer": "TSUN", "Version": "V5.0.11", "Serial_Number": "T170000000000001", "Equipment_Model": "TSOL-MS600"}})
 
 
-def test_build_ha_conf1(contr_data_seq):
+def test_build_ha_conf1(ContrDataSeq):
     i = InfosG3()
     i.static_init()                # initialize counter
 
@@ -325,11 +325,7 @@ def test_build_ha_conf1(contr_data_seq):
 
     assert tests==4
 
-def test_build_ha_conf2(contr_data_seq):
-    i = InfosG3()
-    i.static_init()                # initialize counter
 
-    tests = 0
     for d_json, comp, node_id, id in i.ha_proxy_confs(ha_prfx="tsun/", node_id = 'proxy/', snr = '456'):
 
         if id == 'out_power_123':
@@ -348,16 +344,16 @@ 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'):
@@ -388,10 +384,10 @@ def test_build_ha_conf3(contr_data_seq, inv_data_seq, inv_data_seq2):
             tests +=1
     assert tests==5
 
-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   
@@ -400,10 +396,13 @@ def test_must_incr_total(inv_data_seq2, inv_data_seq2_zero):
     assert json.dumps(i.db['input']) == json.dumps({"pv1": {"Voltage": 33.6, "Current": 1.91, "Power": 64.5, "Daily_Generation": 1.08, "Total_Generation": 9.74}, "pv2": {"Voltage": 33.5, "Current": 1.36, "Power": 45.7, "Daily_Generation": 0.62, "Total_Generation": 7.62}, "pv3": {"Voltage": 0.0, "Current": 0.0, "Power": 0.0}, "pv4": {"Voltage": 0.0, "Current": 0.0, "Power": 0.0}})
     assert json.dumps(i.db['env']) == json.dumps({"Inverter_Temp": 23})
     tests = 0
-    for key, update in i.parse (inv_data_seq2):
-        if key == 'total' or key == 'env':
+    for key, update in i.parse (InvDataSeq2):
+        if key == 'total':
             assert update == False
             tests +=1   
+        elif key == 'env':
+            assert update == False
+            tests +=1
 
     assert tests==3
     assert json.dumps(i.db['total']) == json.dumps({'Daily_Generation': 1.7, 'Total_Generation': 17.36})
@@ -412,7 +411,7 @@ def test_must_incr_total(inv_data_seq2, inv_data_seq2_zero):
     assert json.dumps(i.db['inverter']) == json.dumps({"Rated_Power": 600, "No_Inputs": 2})
         
     tests = 0
-    for key, update in i.parse (inv_data_seq2_zero):
+    for key, update in i.parse (InvDataSeq2_Zero):
         if key == 'total':
             assert update == False
             tests +=1   
@@ -425,10 +424,10 @@ def test_must_incr_total(inv_data_seq2, inv_data_seq2_zero):
     assert json.dumps(i.db['input']) == json.dumps({"pv1": {"Voltage": 33.6, "Current": 1.91, "Power": 0.0, "Daily_Generation": 1.08, "Total_Generation": 9.74}, "pv2": {"Voltage": 33.5, "Current": 1.36, "Power": 0.0, "Daily_Generation": 0.62, "Total_Generation": 7.62}, "pv3": {"Voltage": 0.0, "Current": 0.0, "Power": 0.0}, "pv4": {"Voltage": 0.0, "Current": 0.0, "Power": 0.0}})
     assert json.dumps(i.db['env']) == json.dumps({"Inverter_Temp": 0})
 
-def test_must_incr_total2(inv_data_seq2, inv_data_seq2_zero):
+def test_must_incr_total2(InvDataSeq2, InvDataSeq2_Zero):
     i = InfosG3()
     tests = 0
-    for key, update in i.parse (inv_data_seq2_zero):
+    for key, update in i.parse (InvDataSeq2_Zero):
         if key == 'total':
             assert update == False
             tests +=1   
@@ -442,10 +441,13 @@ def test_must_incr_total2(inv_data_seq2, inv_data_seq2_zero):
     assert json.dumps(i.db['env']) == json.dumps({"Inverter_Temp": 0})
     
     tests = 0
-    for key, update in i.parse (inv_data_seq2_zero):
-        if key == 'total' or key == 'env':
+    for key, update in i.parse (InvDataSeq2_Zero):
+        if key == 'total':
             assert update == False
             tests +=1   
+        elif key == 'env':
+            assert update == False
+            tests +=1
 
     assert tests==3
     assert json.dumps(i.db['total']) == json.dumps({})
@@ -453,19 +455,22 @@ def test_must_incr_total2(inv_data_seq2, inv_data_seq2_zero):
     assert json.dumps(i.db['env']) == json.dumps({"Inverter_Temp": 0})
 
     tests = 0
-    for key, update in i.parse (inv_data_seq2):
-        if key == 'total' or key == 'env':
+    for key, update in i.parse (InvDataSeq2):
+        if key == 'total':
             assert update == True
             tests +=1   
+        elif key == 'env':
+            assert update == True
+            tests +=1
 
     assert tests==3
     assert json.dumps(i.db['total']) == json.dumps({'Daily_Generation': 1.7, 'Total_Generation': 17.36})
     assert json.dumps(i.db['input']) == json.dumps({"pv1": {"Voltage": 33.6, "Current": 1.91, "Power": 64.5, "Daily_Generation": 1.08, "Total_Generation": 9.74}, "pv2": {"Voltage": 33.5, "Current": 1.36, "Power": 45.7, "Daily_Generation": 0.62, "Total_Generation": 7.62}, "pv3": {"Voltage": 0.0, "Current": 0.0, "Power": 0.0}, "pv4": {"Voltage": 0.0, "Current": 0.0, "Power": 0.0}})
    
-def test_new_data_types(inv_data_new):
+def test_new_data_types(InvDataNew):
     i = InfosG3()
     tests = 0
-    for key, update in i.parse (inv_data_new):
+    for key, update in i.parse (InvDataNew):
         if key == 'events':
             tests +=1
         elif key == 'inverter':
@@ -482,7 +487,7 @@ def test_new_data_types(inv_data_new):
     assert json.dumps(i.db['input']) == json.dumps({"pv1": {}})
     assert json.dumps(i.db['events']) == json.dumps({"401_": 0, "404_": 0, "405_": 0, "408_": 0, "409_No_Utility": 0, "406_": 0, "416_": 0})
 
-def test_invalid_data_type(invalid_data_seq):
+def test_invalid_data_type(InvalidDataSeq):
     i = InfosG3()
     i.static_init()                # initialize counter
 
@@ -490,8 +495,8 @@ def test_invalid_data_type(invalid_data_seq):
     assert val == 0
 
 
-    for key, result in i.parse (invalid_data_seq):
-        pass  # side effect in calling i.parse()
+    for key, result in i.parse (InvalidDataSeq):
+        pass
     assert json.dumps(i.db) == json.dumps({"inverter": {"Product_Name": "Microinv"}})
 
     val = i.dev_value(Register.INVALID_DATA_TYPE)  # check invalid data type counter

app/tests/test_infos_g3p.py

@@ -1,33 +1,18 @@
 
 # test_with_pytest.py
-import pytest, json, math, random
+import pytest, json, 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'
@@ -78,14 +63,14 @@ 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"},
+        '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"},
         })
 
@@ -97,7 +82,7 @@ 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}, 
+         "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}, 
@@ -154,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':
@@ -180,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
 
@@ -228,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':
@@ -254,7 +231,7 @@ 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_eval(inverter_data: bytes):
 

app/tests/test_inverter.py

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

app/tests/test_modbus.py

@@ -366,8 +366,8 @@ 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)
 
@@ -379,7 +379,7 @@ def test_recv_unknown_data():
     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'''

app/tests/test_modbus_tcp.py

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

app/tests/test_mqtt.py

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

app/tests/test_singleton.py

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

app/tests/test_solarman.py

@@ -3,13 +3,11 @@ import struct
 import time
 import asyncio
 import logging
-import random
-from math import isclose
 from app.src.gen3plus.solarman_v5 import SolarmanV5
 from app.src.config import Config
 from app.src.infos import Infos, Register
 from app.src.modbus import Modbus
-from app.src.messages import State, Message
+from app.src.messages import State
 
 
 pytest_plugins = ('pytest_asyncio',)
@@ -43,7 +41,7 @@ class MemoryStream(SolarmanV5):
         super().__init__(server_side, client_mode=False)
         if server_side:
             self.mb.timeout = 0.4   # overwrite for faster testing
-        self.mb_first_timeout = 0.5
+        self.mb_start_timeout = 0.5
         self.mb_timeout = 0.5
         self.writer = Writer()
         self.mqtt = Mqtt()
@@ -149,12 +147,6 @@ def incorrect_checksum(buf):
     checksum = (sum(buf[1:])+1) & 0xff
     return checksum.to_bytes(length=1)
 
-@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
 def device_ind_msg(): # 0x4110
     msg  = b'\xa5\xd4\x00\x10\x41\x00\x01' +get_sn()  +b'\x02\xba\xd2\x00\x00'
@@ -640,15 +632,15 @@ def msg_unknown_cmd_rsp():  # 0x1510
 
 @pytest.fixture
 def config_tsun_allow_all():
-    Config.act_config = {'solarman':{'enabled': True}, 'inverters':{'allow_all':True}}
+    Config.config = {'solarman':{'enabled': True}, 'inverters':{'allow_all':True}}
 
 @pytest.fixture
 def config_no_tsun_inv1():
-    Config.act_config = {'solarman':{'enabled': False},'inverters':{'Y170000000000001':{'monitor_sn': 2070233889, 'node_id':'inv1', 'modbus_polling': True, 'suggested_area':'roof', 'sensor_list': 688}}}
+    Config.config = {'solarman':{'enabled': False},'inverters':{'Y170000000000001':{'monitor_sn': 2070233889, 'node_id':'inv1', 'modbus_polling': True, 'suggested_area':'roof'}}}
 
 @pytest.fixture
 def config_tsun_inv1():
-    Config.act_config = {'solarman':{'enabled': True},'inverters':{'Y170000000000001':{'monitor_sn': 2070233889, 'node_id':'inv1', 'modbus_polling': True, 'suggested_area':'roof', 'sensor_list': 688}}}
+    Config.config = {'solarman':{'enabled': True},'inverters':{'Y170000000000001':{'monitor_sn': 2070233889, 'node_id':'inv1', 'modbus_polling': True, 'suggested_area':'roof'}}}
 
 def test_read_message(device_ind_msg):
     m = MemoryStream(device_ind_msg, (0,))
@@ -780,7 +772,7 @@ def test_invalid_checksum(invalid_checksum, device_ind_msg):
     m.close()
 
 def test_read_message_twice(config_no_tsun_inv1, device_ind_msg, device_rsp_msg):
-    _ = config_no_tsun_inv1
+    config_no_tsun_inv1
     m = MemoryStream(device_ind_msg, (0,))
     m.append_msg(device_ind_msg)
     m.read()         # read complete msg, and dispatch msg
@@ -822,7 +814,7 @@ def test_read_message_in_chunks(device_ind_msg):
     m.close()
 
 def test_read_message_in_chunks2(config_tsun_inv1, device_ind_msg):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(device_ind_msg, (4,10,0))
     m.read()        # read 4 bytes, header incomplere
     assert not m.header_valid
@@ -847,10 +839,10 @@ def test_read_message_in_chunks2(config_tsun_inv1, device_ind_msg):
     m.close()
 
 def test_read_two_messages(config_tsun_allow_all, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg):
-    _ = config_tsun_allow_all
+    config_tsun_allow_all
     m = MemoryStream(device_ind_msg, (0,))
     m.append_msg(inverter_ind_msg)
-    assert 0 == m.sensor_list
+
     m._init_new_client_conn()
     m.read()         # read complete msg, and dispatch msg
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
@@ -865,8 +857,6 @@ def test_read_two_messages(config_tsun_allow_all, device_ind_msg, device_rsp_msg
     assert m.msg_recvd[1]['control']==0x4210
     assert m.msg_recvd[1]['seq']=='02:02'
     assert m.msg_recvd[1]['data_len']==0x199
-    assert '02b0' == m.db.get_db_value(Register.SENSOR_LIST, None)
-    assert 0x02b0 == m.sensor_list
     assert m._forward_buffer==device_ind_msg+inverter_ind_msg
     assert m._send_buffer==device_rsp_msg+inverter_rsp_msg
 
@@ -876,7 +866,7 @@ def test_read_two_messages(config_tsun_allow_all, device_ind_msg, device_rsp_msg
     m.close()
 
 def test_read_two_messages2(config_tsun_allow_all, inverter_ind_msg, inverter_ind_msg_81, inverter_rsp_msg, inverter_rsp_msg_81):
-    _ = config_tsun_allow_all
+    config_tsun_allow_all
     m = MemoryStream(inverter_ind_msg, (0,))
     m.append_msg(inverter_ind_msg_81)
     m.read()         # read complete msg, and dispatch msg
@@ -902,7 +892,7 @@ def test_read_two_messages2(config_tsun_allow_all, inverter_ind_msg, inverter_in
     m.close()
 
 def test_unkown_message(config_tsun_inv1, unknown_msg):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(unknown_msg, (0,))
     m.read()         # read complete msg, and dispatch msg
     assert not m.header_valid  # must be invalid, since msg was handled and buffer flushed
@@ -920,7 +910,7 @@ def test_unkown_message(config_tsun_inv1, unknown_msg):
     m.close()
 
 def test_device_rsp(config_tsun_inv1, device_rsp_msg):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(device_rsp_msg, (0,), False)
     m.read()         # read complete msg, and dispatch msg
     assert not m.header_valid  # must be invalid, since msg was handled and buffer flushed
@@ -938,7 +928,7 @@ def test_device_rsp(config_tsun_inv1, device_rsp_msg):
     m.close()
 
 def test_inverter_rsp(config_tsun_inv1, inverter_rsp_msg):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(inverter_rsp_msg, (0,), False)
     m.read()         # read complete msg, and dispatch msg
     assert not m.header_valid  # must be invalid, since msg was handled and buffer flushed
@@ -956,7 +946,7 @@ def test_inverter_rsp(config_tsun_inv1, inverter_rsp_msg):
     m.close()
 
 def test_heartbeat_ind(config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(heartbeat_ind_msg, (0,))
     m.read()         # read complete msg, and dispatch msg
     assert not m.header_valid  # must be invalid, since msg was handled and buffer flushed
@@ -973,7 +963,7 @@ def test_heartbeat_ind(config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
     m.close()
 
 def test_heartbeat_ind2(config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(heartbeat_ind_msg, (0,))
     m.no_forwarding = True
     m.read()         # read complete msg, and dispatch msg
@@ -991,7 +981,7 @@ def test_heartbeat_ind2(config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
     m.close()
 
 def test_heartbeat_rsp(config_tsun_inv1, heartbeat_rsp_msg):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(heartbeat_rsp_msg, (0,), False)
     m.read()         # read complete msg, and dispatch msg
     assert not m.header_valid  # must be invalid, since msg was handled and buffer flushed
@@ -1009,7 +999,7 @@ def test_heartbeat_rsp(config_tsun_inv1, heartbeat_rsp_msg):
     m.close()
 
 def test_sync_start_ind(config_tsun_inv1, sync_start_ind_msg, sync_start_rsp_msg, sync_start_fwd_msg):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(sync_start_ind_msg, (0,))
     m.read()         # read complete msg, and dispatch msg
     assert not m.header_valid  # must be invalid, since msg was handled and buffer flushed
@@ -1032,7 +1022,7 @@ def test_sync_start_ind(config_tsun_inv1, sync_start_ind_msg, sync_start_rsp_msg
     m.close()
 
 def test_sync_start_rsp(config_tsun_inv1, sync_start_rsp_msg):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(sync_start_rsp_msg, (0,), False)
     m.read()         # read complete msg, and dispatch msg
     assert not m.header_valid  # must be invalid, since msg was handled and buffer flushed
@@ -1050,7 +1040,7 @@ def test_sync_start_rsp(config_tsun_inv1, sync_start_rsp_msg):
     m.close()
 
 def test_sync_end_ind(config_tsun_inv1, sync_end_ind_msg, sync_end_rsp_msg):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(sync_end_ind_msg, (0,))
     m.read()         # read complete msg, and dispatch msg
     assert not m.header_valid  # must be invalid, since msg was handled and buffer flushed
@@ -1067,7 +1057,7 @@ def test_sync_end_ind(config_tsun_inv1, sync_end_ind_msg, sync_end_rsp_msg):
     m.close()
 
 def test_sync_end_rsp(config_tsun_inv1, sync_end_rsp_msg):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(sync_end_rsp_msg, (0,), False)
     m.read()         # read complete msg, and dispatch msg
     assert not m.header_valid  # must be invalid, since msg was handled and buffer flushed
@@ -1085,9 +1075,8 @@ def test_sync_end_rsp(config_tsun_inv1, sync_end_rsp_msg):
     m.close()
 
 def test_build_modell_600(config_tsun_allow_all, inverter_ind_msg):
-    _ = config_tsun_allow_all
+    config_tsun_allow_all
     m = MemoryStream(inverter_ind_msg, (0,))
-    assert 0 == m.sensor_list
     assert 0 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert None == m.db.get_db_value(Register.RATED_POWER, None)
     assert None == m.db.get_db_value(Register.INVERTER_TEMP, None)
@@ -1095,8 +1084,6 @@ def test_build_modell_600(config_tsun_allow_all, inverter_ind_msg):
     assert 2000 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert 600 == m.db.get_db_value(Register.RATED_POWER, 0)
     assert 'TSOL-MS2000(600)' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
-    assert '02b0' == m.db.get_db_value(Register.SENSOR_LIST, None)
-    assert 0 == m.sensor_list   # must not been set by an inverter data ind
 
     m._send_buffer = bytearray(0) # clear send buffer for next test    
     m._init_new_client_conn()
@@ -1104,7 +1091,7 @@ def test_build_modell_600(config_tsun_allow_all, inverter_ind_msg):
     m.close()
 
 def test_build_modell_1600(config_tsun_allow_all, inverter_ind_msg1600):
-    _ = config_tsun_allow_all
+    config_tsun_allow_all
     m = MemoryStream(inverter_ind_msg1600, (0,))
     assert 0 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert None == m.db.get_db_value(Register.RATED_POWER, None)
@@ -1116,7 +1103,7 @@ def test_build_modell_1600(config_tsun_allow_all, inverter_ind_msg1600):
     m.close()
 
 def test_build_modell_1800(config_tsun_allow_all, inverter_ind_msg1800):
-    _ = config_tsun_allow_all
+    config_tsun_allow_all
     m = MemoryStream(inverter_ind_msg1800, (0,))
     assert 0 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert None == m.db.get_db_value(Register.RATED_POWER, None)
@@ -1128,7 +1115,7 @@ def test_build_modell_1800(config_tsun_allow_all, inverter_ind_msg1800):
     m.close()
 
 def test_build_modell_2000(config_tsun_allow_all, inverter_ind_msg2000):
-    _ = config_tsun_allow_all
+    config_tsun_allow_all
     m = MemoryStream(inverter_ind_msg2000, (0,))
     assert 0 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert None == m.db.get_db_value(Register.RATED_POWER, None)
@@ -1140,7 +1127,7 @@ def test_build_modell_2000(config_tsun_allow_all, inverter_ind_msg2000):
     m.close()
 
 def test_build_modell_800(config_tsun_allow_all, inverter_ind_msg800):
-    _ = config_tsun_allow_all
+    config_tsun_allow_all
     m = MemoryStream(inverter_ind_msg800, (0,))
     assert 0 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert None == m.db.get_db_value(Register.RATED_POWER, None)
@@ -1152,7 +1139,7 @@ def test_build_modell_800(config_tsun_allow_all, inverter_ind_msg800):
     m.close()
 
 def test_build_logger_modell(config_tsun_allow_all, device_ind_msg):
-    _ = config_tsun_allow_all
+    config_tsun_allow_all
     m = MemoryStream(device_ind_msg, (0,))
     assert 0 == m.db.get_db_value(Register.COLLECTOR_FW_VERSION, 0)
     assert 'IGEN TECH' == m.db.get_db_value(Register.CHIP_TYPE, None)
@@ -1163,7 +1150,6 @@ def test_build_logger_modell(config_tsun_allow_all, device_ind_msg):
     m.close()
 
 def test_msg_iterator():
-    Message._registry.clear()
     m1 = SolarmanV5(server_side=True, client_mode=False)
     m2 = SolarmanV5(server_side=True, client_mode=False)
     m3 = SolarmanV5(server_side=True, client_mode=False)
@@ -1203,7 +1189,7 @@ def test_proxy_counter():
 
 @pytest.mark.asyncio
 async def test_msg_build_modbus_req(config_tsun_inv1, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg, msg_modbus_cmd):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(device_ind_msg, (0,), True)
     m.read()
     assert m.control == 0x4110
@@ -1249,7 +1235,7 @@ async def test_msg_build_modbus_req(config_tsun_inv1, device_ind_msg, device_rsp
 
 @pytest.mark.asyncio
 async def test_at_cmd(config_tsun_allow_all, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg, at_command_ind_msg, at_command_rsp_msg):
-    _ = config_tsun_allow_all
+    config_tsun_allow_all
     m = MemoryStream(device_ind_msg, (0,), True)
     m.read()   # read device ind
     assert m.control == 0x4110
@@ -1306,7 +1292,7 @@ async def test_at_cmd(config_tsun_allow_all, device_ind_msg, device_rsp_msg, inv
 
 @pytest.mark.asyncio
 async def test_at_cmd_blocked(config_tsun_allow_all, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg, at_command_ind_msg):
-    _ = config_tsun_allow_all
+    config_tsun_allow_all
     m = MemoryStream(device_ind_msg, (0,), True)
     m.read()
     assert m.control == 0x4110
@@ -1344,7 +1330,7 @@ async def test_at_cmd_blocked(config_tsun_allow_all, device_ind_msg, device_rsp_
     m.close()
 
 def test_at_cmd_ind(config_tsun_inv1, at_command_ind_msg):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(at_command_ind_msg, (0,), False)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.db.stat['proxy']['AT_Command'] = 0
@@ -1368,7 +1354,7 @@ def test_at_cmd_ind(config_tsun_inv1, at_command_ind_msg):
     m.close()
 
 def test_at_cmd_ind_block(config_tsun_inv1, at_command_ind_msg_block):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(at_command_ind_msg_block, (0,), False)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.db.stat['proxy']['AT_Command'] = 0
@@ -1392,7 +1378,7 @@ def test_at_cmd_ind_block(config_tsun_inv1, at_command_ind_msg_block):
     m.close()
 
 def test_msg_at_command_rsp1(config_tsun_inv1, at_command_rsp_msg):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(at_command_rsp_msg)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.db.stat['proxy']['Modbus_Command'] = 0
@@ -1411,7 +1397,7 @@ def test_msg_at_command_rsp1(config_tsun_inv1, at_command_rsp_msg):
     m.close()
 
 def test_msg_at_command_rsp2(config_tsun_inv1, at_command_rsp_msg):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(at_command_rsp_msg)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.db.stat['proxy']['Modbus_Command'] = 0
@@ -1430,10 +1416,9 @@ def test_msg_at_command_rsp2(config_tsun_inv1, at_command_rsp_msg):
     m.close()
 
 def test_msg_modbus_req(config_tsun_inv1, msg_modbus_cmd, msg_modbus_cmd_fwd):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(b'')
     m.snr = get_sn_int()
-    m.sensor_list = 0x2b0
     m.state = State.up
     c = m.createClientStream(msg_modbus_cmd)
 
@@ -1458,7 +1443,7 @@ def test_msg_modbus_req(config_tsun_inv1, msg_modbus_cmd, msg_modbus_cmd_fwd):
     m.close()
 
 def test_msg_modbus_req2(config_tsun_inv1, msg_modbus_cmd_crc_err):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(b'')
     m.snr = get_sn_int()
     m.state = State.up
@@ -1485,7 +1470,7 @@ def test_msg_modbus_req2(config_tsun_inv1, msg_modbus_cmd_crc_err):
     m.close()
 
 def test_msg_unknown_cmd_req(config_tsun_inv1, msg_unknown_cmd):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_unknown_cmd, (0,), False)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.db.stat['proxy']['AT_Command'] = 0
@@ -1508,7 +1493,7 @@ def test_msg_unknown_cmd_req(config_tsun_inv1, msg_unknown_cmd):
 
 def test_msg_modbus_rsp1(config_tsun_inv1, msg_modbus_rsp):
     '''Modbus response without a valid Modbus request must be dropped'''
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_modbus_rsp)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.db.stat['proxy']['Modbus_Command'] = 0
@@ -1527,7 +1512,7 @@ def test_msg_modbus_rsp1(config_tsun_inv1, msg_modbus_rsp):
 
 def test_msg_modbus_rsp2(config_tsun_inv1, msg_modbus_rsp):
     '''Modbus response with a valid Modbus request must be forwarded'''
-    _ = config_tsun_inv1  # setup config structure
+    config_tsun_inv1  # setup config structure
     m = MemoryStream(msg_modbus_rsp)
 
     m.mb.rsp_handler = m._SolarmanV5__forward_msg
@@ -1565,7 +1550,7 @@ def test_msg_modbus_rsp2(config_tsun_inv1, msg_modbus_rsp):
 
 def test_msg_modbus_rsp3(config_tsun_inv1, msg_modbus_rsp):
     '''Modbus response with a valid Modbus request must be forwarded'''
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_modbus_rsp)
 
     m.mb.rsp_handler = m._SolarmanV5__forward_msg
@@ -1601,7 +1586,7 @@ def test_msg_modbus_rsp3(config_tsun_inv1, msg_modbus_rsp):
     m.close()
 
 def test_msg_unknown_rsp(config_tsun_inv1, msg_unknown_cmd_rsp):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_unknown_cmd_rsp)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.db.stat['proxy']['Modbus_Command'] = 0
@@ -1619,7 +1604,7 @@ def test_msg_unknown_rsp(config_tsun_inv1, msg_unknown_cmd_rsp):
     m.close()
 
 def test_msg_modbus_invalid(config_tsun_inv1, msg_modbus_invalid):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_modbus_invalid, (0,), False)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.db.stat['proxy']['Modbus_Command'] = 0
@@ -1633,7 +1618,7 @@ def test_msg_modbus_invalid(config_tsun_inv1, msg_modbus_invalid):
     m.close()
 
 def test_msg_modbus_fragment(config_tsun_inv1, msg_modbus_rsp):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     # receive more bytes than expected (7 bytes from the next msg)
     m = MemoryStream(msg_modbus_rsp+b'\x00\x00\x00\x45\x10\x52\x31', (0,))
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -1659,7 +1644,7 @@ def test_msg_modbus_fragment(config_tsun_inv1, msg_modbus_rsp):
 
 @pytest.mark.asyncio
 async def test_modbus_polling(config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     assert asyncio.get_running_loop()
     m = MemoryStream(heartbeat_ind_msg, (0,))
     assert asyncio.get_running_loop() == m.mb_timer.loop
@@ -1680,7 +1665,7 @@ async def test_modbus_polling(config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp
 
     m._send_buffer = bytearray(0) # clear send buffer for next test
     assert m.state == State.up
-    assert isclose(m.mb_timeout, 0.5)
+    assert m.mb_timeout == 0.5
     assert next(m.mb_timer.exp_count) == 0
     
     await asyncio.sleep(0.5)
@@ -1699,25 +1684,25 @@ async def test_modbus_polling(config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp
     m.close()
 
 @pytest.mark.asyncio
-async def test_start_client_mode(config_tsun_inv1, str_test_ip):
-    _ = config_tsun_inv1
+async def test_start_client_mode(config_tsun_inv1):
+    config_tsun_inv1
     assert asyncio.get_running_loop()
     m = MemoryStream(b'')
     assert m.state == State.init
     assert m.no_forwarding == False
     assert m.mb_timer.tim == None
     assert asyncio.get_running_loop() == m.mb_timer.loop
-    await m.send_start_cmd(get_sn_int(), str_test_ip, m.mb_first_timeout)
+    await m.send_start_cmd(get_sn_int(), '192.168.1.1', m.mb_start_timeout)
     assert m.writer.sent_pdu==bytearray(b'\xa5\x17\x00\x10E\x01\x00!Ce{\x02\xb0\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x030\x00\x000J\xde\xf1\x15')
-    assert m.db.get_db_value(Register.IP_ADDRESS) == str_test_ip
-    assert isclose(m.db.get_db_value(Register.POLLING_INTERVAL), 0.5)
+    assert m.db.get_db_value(Register.IP_ADDRESS) == '192.168.1.1'
+    assert m.db.get_db_value(Register.POLLING_INTERVAL) == 0.5
     assert m.db.get_db_value(Register.HEARTBEAT_INTERVAL) == 120
 
     assert m.state == State.up
     assert m.no_forwarding == True
 
     assert m._send_buffer==b''
-    assert isclose(m.mb_timeout, 0.5)
+    assert m.mb_timeout == 0.5
     assert next(m.mb_timer.exp_count) == 0
     
     await asyncio.sleep(0.5)

app/tests/test_talent.py

@@ -1,6 +1,5 @@
 # test_with_pytest.py
 import pytest, logging, asyncio
-from math import isclose
 from app.src.gen3.talent import Talent, Control
 from app.src.config import Config
 from app.src.infos import Infos, Register
@@ -28,7 +27,7 @@ class MemoryStream(Talent):
         super().__init__(server_side)
         if server_side:
             self.mb.timeout = 0.4   # overwrite for faster testing
-        self.mb_first_timeout = 0.5
+        self.mb_start_timeout = 0.5
         self.mb_timeout = 0.5
         self.writer = Writer()
         self.__msg = msg
@@ -98,12 +97,12 @@ class MemoryStream(Talent):
 
 @pytest.fixture
 def msg_contact_info(): # Contact Info message
-    Config.act_config = {'tsun':{'enabled': True}}
+    Config.config = {'tsun':{'enabled': True}}
     return b'\x00\x00\x00\x2c\x10R170000000000001\x91\x00\x08solarhub\x0fsolarhub\x40123456'
 
 @pytest.fixture
 def msg_contact_info_long_id():  # Contact Info message with longer ID
-    Config.act_config = {'tsun':{'enabled': True}}
+    Config.config = {'tsun':{'enabled': True}}
     return b'\x00\x00\x00\x2d\x11R1700000000000011\x91\x00\x08solarhub\x0fsolarhub\x40123456'
 
 @pytest.fixture
@@ -353,19 +352,19 @@ def msg_unknown(): # Get Time Request message
 
 @pytest.fixture
 def config_tsun_allow_all():
-    Config.act_config = {'tsun':{'enabled': True}, 'inverters':{'allow_all':True}}
+    Config.config = {'tsun':{'enabled': True}, 'inverters':{'allow_all':True}}
 
 @pytest.fixture
 def config_no_tsun_inv1():
-    Config.act_config = {'tsun':{'enabled': False},'inverters':{'R170000000000001':{'node_id':'inv1', 'modbus_polling': True, 'suggested_area':'roof'}}}
+    Config.config = {'tsun':{'enabled': False},'inverters':{'R170000000000001':{'node_id':'inv1', 'modbus_polling': True, 'suggested_area':'roof'}}}
 
 @pytest.fixture
 def config_tsun_inv1():
-    Config.act_config = {'tsun':{'enabled': True},'inverters':{'R170000000000001':{'node_id':'inv1', 'modbus_polling': True, 'suggested_area':'roof'}}}
+    Config.config = {'tsun':{'enabled': True},'inverters':{'R170000000000001':{'node_id':'inv1', 'modbus_polling': True, 'suggested_area':'roof'}}}
 
 @pytest.fixture
 def config_no_modbus_poll():
-    Config.act_config = {'tsun':{'enabled': True},'inverters':{'R170000000000001':{'node_id':'inv1', 'modbus_polling': False, 'suggested_area':'roof'}}}
+    Config.config = {'tsun':{'enabled': True},'inverters':{'R170000000000001':{'node_id':'inv1', 'modbus_polling': False, 'suggested_area':'roof'}}}
 
 @pytest.fixture
 def msg_ota_req(): # Over the air update request from tsun cloud
@@ -526,166 +525,6 @@ def broken_recv_buf(): # There are two message in the buffer, but the second has
     msg += b'\x08\x00\x00\x00\x00\x31'
     return msg
 
-@pytest.fixture
-def multiple_recv_buf(): # There are three message in the buffer, but the second has overwritten the first partly
-    msg  = b'\x00\x00\x05\x02\x10R170000000000001\x91\x04\x01\x90\x00\x01\x10R170000000000001'
-    msg += b'\x01\x00\x00\x01\x89\xc6\x63\x61\x08'
-    msg += b'\x00\x00\x00\xa3\x00\x00\x00\x64\x53\x00\x01'
-    msg += b'\x00\x00\x00\xc8\x53\x00\x00\x00\x00\x01\x2c\x53\x00\x02\x00\x00'  #  | ....S.....,S....
-    msg += b'\x01\x90\x49\x00\x00\x00\x00\x00\x00\x01\x91\x53\x00\x00\x00\x00'  #  | ..I........S....
-    msg += b'\x13\x10\x52\x31\x37\x45\x37\x33\x30\x37\x30\x32\x31\x44\x30\x30'  #  | ..R17E7307021D00
-    msg += b'\x36\x41\x91\x22\x00\x00\x03\xbf\x10\x52\x31\x37\x45\x37\x33\x30'  #  | 6A.".....R17E730
-    msg += b'\x37\x30\x32\x31\x44\x30\x30\x36\x41\x91\x71\x0e\x10\x00\x00\x10'  #  | 7021D006A.q.....
-    msg += b'\x52\x31\x37\x45\x37\x33\x30\x37\x30\x32\x31\x44\x30\x30\x36\x41'  #  | R17E7307021D006A
-    msg += b'\x01\x00\x00\x01\x91\xa3\xfe\xaf\x98\x00\x00\x00\x35\x00\x09\x2b'  #  | ............5..+
-    msg += b'\xa8\x54\x10\x52\x53\x57\x5f\x34\x30\x30\x5f\x56\x31\x2e\x30\x30'  #  | .T.RSW_400_V1.00
-    msg += b'\x2e\x31\x37\x00\x09\x27\xc0\x54\x06\x52\x61\x79\x6d\x6f\x6e\x00'  #  | .17..'.T.Raymon.
-    msg += b'\x09\x2f\x90\x54\x0b\x52\x53\x57\x2d\x31\x2d\x31\x30\x30\x30\x31'  #  | ./.T.RSW-1-10001
-    msg += b'\x00\x09\x5a\x88\x54\x0f\x74\x2e\x72\x61\x79\x6d\x6f\x6e\x69\x6f'  #  | ..Z.T.t.raymonio
-    msg += b'\x74\x2e\x63\x6f\x6d\x00\x09\x5a\xec\x54\x1c\x6c\x6f\x67\x67\x65'  #  | t.com..Z.T.logge
-    msg += b'\x72\x2e\x74\x61\x6c\x65\x6e\x74\x2d\x6d\x6f\x6e\x69\x74\x6f\x72'  #  | r.talent-monitor
-    msg += b'\x69\x6e\x67\x2e\x63\x6f\x6d\x00\x0d\x2f\x00\x54\x10\xff\xff\xff'  #  | ing.com../.T....
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x0d\x32'  #  | ...............2
-    msg += b'\xe8\x54\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'  #  | .T..............
-    msg += b'\xff\xff\xff\x00\x0d\x36\xd0\x54\x10\xff\xff\xff\xff\xff\xff\xff'  #  | .....6.T........
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x0d\x3a\xb8\x54\x10\xff'  #  | ...........:.T..
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00'  #  | ................
-    msg += b'\x0d\x3e\xa0\x54\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'  #  | .>.T............
-    msg += b'\xff\xff\xff\xff\xff\x00\x0d\x42\x88\x54\x10\xff\xff\xff\xff\xff'  #  | .......B.T......
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x0d\x46\x70\x54'  #  | .............FpT
-    msg += b'\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'  #  | ................
-    msg += b'\xff\x00\x0d\x4a\x58\x54\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff'  #  | ...JXT..........
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\x00\x0d\x4e\x40\x54\x10\xff\xff\xff'  #  | .........N@T....
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x0d\x52'  #  | ...............R
-    msg += b'\x28\x54\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'  #  | (T..............
-    msg += b'\xff\xff\xff\x00\x0d\x56\x10\x54\x10\xff\xff\xff\xff\xff\xff\xff'  #  | .....V.T........
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x0d\x59\xf8\x54\x10\xff'  #  | ...........Y.T..
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00'  #  | ................
-    msg += b'\x0d\x5d\xe0\x54\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'  #  | .].T............
-    msg += b'\xff\xff\xff\xff\xff\x00\x0d\x61\xc8\x54\x10\xff\xff\xff\xff\xff'  #  | .......a.T......
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x0d\x65\xb0\x54'  #  | .............e.T
-    msg += b'\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'  #  | ................
-    msg += b'\xff\x00\x0d\x69\x98\x54\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff'  #  | ...i.T..........
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\x00\x0d\x6d\x80\x54\x10\xff\xff\xff'  #  | .........m.T....
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x0d\x71'  #  | ...............q
-    msg += b'\x68\x54\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'  #  | hT..............
-    msg += b'\xff\xff\xff\x00\x0d\x75\x50\x54\x10\xff\xff\xff\xff\xff\xff\xff'  #  | .....uPT........
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x0d\x79\x38\x54\x10\xff'  #  | ...........y8T..
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00'  #  | ................
-    msg += b'\x0d\x7d\x20\x54\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'  #  | .} T............
-    msg += b'\xff\xff\xff\xff\xff\x00\x0d\x81\x08\x54\x10\xff\xff\xff\xff\xff'  #  | .........T......
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x0d\x84\xf0\x54'  #  | ...............T
-    msg += b'\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'  #  | ................
-    msg += b'\xff\x00\x0d\x88\xd8\x54\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff'  #  | .....T..........
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\x00\x0d\x8c\xc0\x54\x10\xff\xff\xff'  #  | ...........T....
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x0d\x90'  #  | ................
-    msg += b'\xa8\x54\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff'  #  | .T..............
-    msg += b'\xff\xff\xff\x00\x0d\x94\x90\x54\x10\xff\xff\xff\xff\xff\xff\xff'  #  | .......T........
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x0d\x98\x78\x54\x10\xff'  #  | ............xT..
-    msg += b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00'  #  | ................
-    msg += b'\x0d\x00\x20\x49\x00\x00\x00\x01\x00\x0c\x35\x00\x49\x00\x00\x00'  #  | .. I......5.I...
-    msg += b'\x28\x00\x0c\x96\xa8\x49\x00\x00\x01\x69\x00\x0c\x7f\x38\x49\x00'  #  | (....I...i...8I.
-    msg += b'\x00\x00\x01\x00\x0c\xfc\x38\x49\x00\x00\x00\x01\x00\x0c\xf8\x50'  #  | ......8I.......P
-    msg += b'\x49\x00\x00\x01\x2c\x00\x0c\x63\xe0\x49\x00\x00\x00\x00\x00\x0c'  #  | I...,..c.I......
-    msg += b'\x67\xc8\x49\x00\x00\x00\x00\x00\x0c\x50\x58\x49\x00\x00\x00\x01'  #  | g.I......PXI....
-    msg += b'\x00\x09\x5e\x70\x49\x00\x00\x13\x8d\x00\x09\x5e\xd4\x49\x00\x00'  #  | ..^pI......^.I..
-    msg += b'\x13\x8d\x00\x09\x5b\x50\x49\x00\x00\x00\x02\x00\x0d\x04\x08\x49'  #  | ....[PI........I
-    msg += b'\x00\x00\x00\x00\x00\x07\xa1\x84\x49\x00\x00\x00\x01\x00\x0c\x50'  #  | ........I......P
-    msg += b'\x59\x49\x00\x00\x00\x3e\x00\x0d\x1f\x60\x49\x00\x00\x00\x00\x00'  #  | YI...>...`I.....
-    msg += b'\x0d\x23\x48\x49\xff\xff\xff\xff\x00\x0d\x27\x30\x49\xff\xff\xff'  #  | .#HI......'0I...
-    msg += b'\xff\x00\x0d\x2b\x18\x4c\x00\x00\x00\x00\xff\xff\xff\xff\x00\x0c'  #  | ...+.L..........
-    msg += b'\xa2\x60\x49\x00\x00\x00\x00\x00\x00\x05\x02\x10\x52\x31\x37\x45'  #  | .`I.........R17E
-    msg += b'\x37\x33\x30\x37\x30\x32\x31\x44\x30\x30\x36\x41\x91\x04\x01\x90'  #  | 7307021D006A....
-    msg += b'\x00\x01\x10\x54\x31\x37\x45\x37\x33\x30\x37\x30\x32\x31\x44\x30'  #  | ...T17E7307021D0
-    msg += b'\x30\x36\x41\x01\x00\x00\x01\x91\xa3\xfe\xb3\x80\x00\x00\x00\xa3'  #  | 06A.............
-    msg += b'\x00\x00\x00\x64\x53\x00\x01\x00\x00\x00\xc8\x53\x00\x00\x00\x00'  #  | ...dS......S....
-    msg += b'\x01\x2c\x53\x00\x02\x00\x00\x01\x90\x49\x00\x00\x00\x00\x00\x00'  #  | .,S......I......
-    msg += b'\x01\x91\x53\x00\x00\x00\x00\x01\x92\x53\x00\x00\x00\x00\x01\x93'  #  | ..S......S......
-    msg += b'\x53\x00\x00\x00\x00\x01\x94\x53\x00\x00\x00\x00\x01\x95\x53\x00'  #  | S......S......S.
-    msg += b'\x00\x00\x00\x01\x96\x53\x00\x00\x00\x00\x01\x97\x53\x00\x00\x00'  #  | .....S......S...
-    msg += b'\x00\x01\x98\x53\x00\x00\x00\x00\x01\x99\x53\x00\x00\x00\x00\x01'  #  | ...S......S.....
-    msg += b'\x9a\x53\x00\x00\x00\x00\x01\x9b\x53\x00\x00\x00\x00\x01\x9c\x53'  #  | .S......S......S
-    msg += b'\x00\x00\x00\x00\x01\x9d\x53\x00\x00\x00\x00\x01\x9e\x53\x00\x00'  #  | ......S......S..
-    msg += b'\x00\x00\x01\x9f\x53\x00\x00\x00\x00\x01\xa0\x53\x00\x00\x00\x00'  #  | ....S......S....
-    msg += b'\x01\xf4\x49\x00\x00\x00\x00\x00\x00\x01\xf5\x53\x00\x00\x00\x00'  #  | ..I........S....
-    msg += b'\x01\xf6\x53\x00\x00\x00\x00\x01\xf7\x53\x00\x00\x00\x00\x01\xf8'  #  | ..S......S......
-    msg += b'\x53\x00\x00\x00\x00\x01\xf9\x53\x00\x00\x00\x00\x01\xfa\x53\x00'  #  | S......S......S.
-    msg += b'\x00\x00\x00\x01\xfb\x53\x00\x00\x00\x00\x01\xfc\x53\x00\x00\x00'  #  | .....S......S...
-    msg += b'\x00\x01\xfd\x53\x00\x00\x00\x00\x01\xfe\x53\x00\x00\x00\x00\x01'  #  | ...S......S.....
-    msg += b'\xff\x53\x00\x00\x00\x00\x02\x00\x53\x00\x00\x00\x00\x02\x01\x53'  #  | .S......S......S
-    msg += b'\x00\x00\x00\x00\x02\x02\x53\x00\x00\x00\x00\x02\x03\x53\x00\x00'  #  | ......S......S..
-    msg += b'\x00\x00\x02\x04\x53\x00\x00\x00\x00\x02\x58\x49\x00\x00\x00\x00'  #  | ....S.....XI....
-    msg += b'\x00\x00\x02\x59\x53\x00\x00\x00\x00\x02\x5a\x53\x00\x00\x00\x00'  #  | ...YS.....ZS....
-    msg += b'\x02\x5b\x53\x00\x00\x00\x00\x02\x5c\x53\x00\x00\x00\x00\x02\x5d'  #  | .[S.....\S.....]
-    msg += b'\x53\x00\x00\x00\x00\x02\x5e\x53\x00\x00\x00\x00\x02\x5f\x53\x00'  #  | S.....^S....._S.
-    msg += b'\x00\x00\x00\x02\x60\x53\x00\x00\x00\x00\x02\x61\x53\x00\x00\x00'  #  | ....`S.....aS...
-    msg += b'\x00\x02\x62\x53\x00\x00\x00\x00\x02\x63\x53\x00\x00\x00\x00\x02'  #  | ..bS.....cS.....
-    msg += b'\x64\x53\x00\x00\x00\x00\x02\x65\x53\x00\x00\x00\x00\x02\x66\x53'  #  | dS.....eS.....fS
-    msg += b'\x00\x00\x00\x00\x02\x67\x53\x00\x00\x00\x00\x02\x68\x53\x00\x00'  #  | .....gS.....hS..
-    msg += b'\x00\x00\x02\xbc\x49\x00\x00\x00\x00\x00\x00\x02\xbd\x53\x00\x00'  #  | ....I........S..
-    msg += b'\x00\x00\x02\xbe\x53\x00\x00\x00\x00\x02\xbf\x53\x00\x00\x00\x00'  #  | ....S......S....
-    msg += b'\x02\xc0\x53\x00\x00\x00\x00\x02\xc1\x53\x00\x00\x00\x00\x02\xc2'  #  | ..S......S......
-    msg += b'\x53\x00\x00\x00\x00\x02\xc3\x53\x00\x00\x00\x00\x02\xc4\x53\x00'  #  | S......S......S.
-    msg += b'\x00\x00\x00\x02\xc5\x53\x00\x00\x00\x00\x02\xc6\x53\x00\x00\x00'  #  | .....S......S...
-    msg += b'\x00\x02\xc7\x53\x00\x00\x00\x00\x02\xc8\x53\x00\x00\x00\x00\x02'  #  | ...S......S.....
-    msg += b'\xc9\x53\x00\x00\x00\x00\x02\xca\x53\x00\x00\x00\x00\x02\xcb\x53'  #  | .S......S......S
-    msg += b'\x00\x00\x00\x00\x02\xcc\x53\x00\x00\x00\x00\x03\x20\x53\x00\x00'  #  | ......S..... S..
-    msg += b'\x00\x00\x03\x84\x53\x51\x09\x00\x00\x03\xe8\x46\x43\x65\x99\x9a'  #  | ....SQ.....FCe..
-    msg += b'\x00\x00\x04\x4c\x46\x3e\xd7\x0a\x3d\x00\x00\x04\xb0\x46\x42\x48'  #  | ...LF>..=....FBH
-    msg += b'\x28\xf6\x00\x00\x05\x14\x53\x00\x1f\x00\x00\x05\x78\x53\x00\x00'  #  | (.....S.....xS..
-    msg += b'\x00\x00\x05\xdc\x53\x02\x58\x00\x00\x06\x40\x46\x42\xc1\x33\x33'  #  | ....S.X...@FB.33
-    msg += b'\x00\x00\x06\xa4\x46\x3f\x33\x33\x33\x00\x00\x07\x08\x46\x00\x00'  #  | ....F?333....F..
-    msg += b'\x00\x00\x00\x00\x07\x6c\x46\x00\x00\x00\x00\x00\x00\x07\xd0\x46'  #  | .....lF........F
-    msg += b'\x42\x05\x99\x9a\x00\x00\x08\x34\x46\x40\x41\xeb\x85\x00\x00\x08'  #  | B......4F@A.....
-    msg += b'\x98\x46\x42\xcb\x66\x66\x00\x00\x08\xfc\x46\x00\x00\x00\x00\x00'  #  | .FB.ff....F.....
-    msg += b'\x00\x09\x60\x46\x00\x00\x00\x00\x00\x00\x09\xc4\x46\x00\x00\x00'  #  | ..`F........F...
-    msg += b'\x00\x00\x00\x0a\x28\x46\x00\x00\x00\x00\x00\x00\x0a\x8c\x46\x00'  #  | ....(F........F.
-    msg += b'\x00\x00\x00\x00\x00\x0a\xf0\x46\x00\x00\x00\x00\x00\x00\x0b\x54'  #  | .......F.......T
-    msg += b'\x46\x3f\x19\x99\x9a\x00\x00\x0b\xb8\x46\x43\xf3\x95\xc3\x00\x00'  #  | F?.......FC.....
-    msg += b'\x0c\x1c\x46\x00\x00\x00\x00\x00\x00\x0c\x80\x46\x43\x04\x4a\x3d'  #  | ..F........FC.J=
-    msg += b'\x00\x00\x0c\xe4\x46\x3f\x23\xd7\x0a\x00\x00\x0d\x48\x46\x43\xbf'  #  | ....F?#.....HFC.
-    msg += b'\x9e\xb8\x00\x00\x0d\xac\x46\x00\x00\x00\x00\x00\x00\x0e\x10\x46'  #  | ......F........F
-    msg += b'\x00\x00\x00\x00\x00\x00\x0e\x74\x46\x00\x00\x00\x00\x00\x00\x0e'  #  | .......tF.......
-    msg += b'\xd8\x46\x00\x00\x00\x00\x00\x00\x0f\x3c\x53\x00\x00\x00\x00\x0f'  #  | .F.......<S.....
-    msg += b'\xa0\x53\x00\x00\x00\x00\x10\x04\x53\x55\xaa\x00\x00\x10\x68\x53'  #  | .S......SU....hS
-    msg += b'\x00\x00\x00\x00\x10\xcc\x53\x00\x00\x00\x00\x11\x30\x53\x00\x00'  #  | ......S.....0S..
-    msg += b'\x00\x00\x11\x94\x53\x00\x00\x00\x00\x11\xf8\x53\xff\xff\x00\x00'  #  | ....S......S....
-    msg += b'\x12\x5c\x53\x03\x20\x00\x00\x12\xc0\x53\x00\x02\x00\x00\x13\x24'  #  | .\S. ....S.....$
-    msg += b'\x53\x04\x00\x00\x00\x13\x88\x53\x04\x00\x00\x00\x13\xec\x53\x04'  #  | S......S......S.
-    msg += b'\x00\x00\x00\x14\x50\x53\x04\x00\x00\x00\x14\xb4\x53\x00\x01\x00'  #  | ....PS......S...
-    msg += b'\x00\x15\x18\x53\x08\x1e\x00\x00\x15\x7c\x53\x00\x00\x00\x00\x27'  #  | ...S.....|S....'
-    msg += b'\x10\x53\x00\x02\x00\x00\x27\x74\x53\x00\x3c\x00\x00\x27\xd8\x53'  #  | .S....'tS.<..'.S
-    msg += b'\x00\x68\x00\x00\x28\x3c\x53\x05\x00\x00\x00\x28\xa0\x46\x43\x79'  #  | .h..(<S....(.FCy
-    msg += b'\x00\x00\x00\x00\x29\x04\x46\x43\x48\x00\x00\x00\x00\x29\x68\x46'  #  | ....).FCH....)hF
-    msg += b'\x42\x48\x33\x33\x00\x00\x29\xcc\x46\x42\x3e\x3d\x71\x00\x00\x2a'  #  | BH33..).FB>=q..*
-    msg += b'\x30\x53\x00\x01\x00\x00\x2a\x94\x46\x43\x37\x00\x00\x00\x00\x2a'  #  | 0S....*.FC7....*
-    msg += b'\xf8\x46\x42\xce\x00\x00\x00\x00\x2b\x5c\x53\x00\x96\x00\x00\x2b'  #  | .FB.....+\S....+
-    msg += b'\xc0\x53\x00\x10\x00\x00\x2c\x24\x46\x43\x90\x00\x00\x00\x00\x2c'  #  | .S....,$FC.....,
-    msg += b'\x88\x46\x43\x95\x00\x00\x00\x00\x2c\xec\x53\x00\x06\x00\x00\x2d'  #  | .FC.....,.S....-
-    msg += b'\x50\x53\x00\x06\x00\x00\x2d\xb4\x46\x43\x7d\x00\x00\x00\x00\x2e'  #  | PS....-.FC}.....
-    msg += b'\x18\x46\x42\x3d\xeb\x85\x00\x00\x2e\x7c\x46\x42\x3d\xeb\x85\x00'  #  | .FB=.....|FB=...
-    msg += b'\x00\x2e\xe0\x53\x00\x03\x00\x00\x2f\x44\x53\x00\x03\x00\x00\x2f'  #  | ...S..../DS..../
-    msg += b'\xa8\x46\x42\x4d\xeb\x85\x00\x00\x30\x0c\x46\x42\x4d\xeb\x85\x00'  #  | .FBM....0.FBM...
-    msg += b'\x00\x30\x70\x53\x00\x03\x00\x00\x30\xd4\x53\x00\x03\x00\x00\x31'  #  | .0pS....0.S....1
-    msg += b'\x38\x46\x42\x08\x00\x00\x00\x00\x31\x9c\x53\x00\x05\x00\x00\x32'  #  | 8FB.....1.S....2
-    msg += b'\x00\x53\x01\x61\x00\x00\x32\x64\x53\x00\x01\x00\x00\x32\xc8\x53'  #  | .S.a..2dS....2.S
-    msg += b'\x13\x9c\x00\x00\x33\x2c\x53\x0f\xa0\x00\x00\x33\x90\x53\x00\x4f'  #  | ....3,S....3.S.O
-    msg += b'\x00\x00\x33\xf4\x53\x00\x66\x00\x00\x34\x58\x53\x03\xe8\x00\x00'  #  | ..3.S.f..4XS....
-    msg += b'\x34\xbc\x53\x04\x00\x00\x00\x35\x20\x53\x09\xc4\x00\x00\x35\x84'  #  | 4.S....5 S....5.
-    msg += b'\x53\x07\xc6\x00\x00\x35\xe8\x53\x13\x8c\x00\x00\x36\x4c\x53\x12'  #  | S....5.S....6LS.
-    msg += b'\x94\x00\x01\x38\x80\x53\x00\x02\x00\x01\x38\x81\x53\x00\x01\x00'  #  | ...8.S....8.S...
-    msg += b'\x01\x38\x82\x53\x00\x01\x00\x01\x38\x83\x53\x00\x00\x00\x00\x00'  #  | .8.S....8.S.....
-    msg += b'\x8b\x10\x52\x31\x37\x45\x37\x33\x30\x37\x30\x32\x31\x44\x30\x30'  #  | ..R17E7307021D00
-    msg += b'\x36\x41\x91\x04\x01\x90\x00\x01\x10\x54\x31\x37\x45\x37\x33\x30'  #  | 6A.......T17E730
-    msg += b'\x37\x30\x32\x31\x44\x30\x30\x36\x41\x01\x00\x00\x01\x91\xa3\xfe'  #  | 7021D006A.......
-    msg += b'\xb3\x80\x00\x00\x00\x06\x00\x00\x00\x0a\x54\x08\x4d\x69\x63\x72'  #  | ..........T.Micr
-    msg += b'\x6f\x69\x6e\x76\x00\x00\x00\x14\x54\x04\x54\x53\x55\x4e\x00\x00'  #  | oinv....T.TSUN..
-    msg += b'\x00\x1e\x54\x07\x56\x35\x2e\x31\x2e\x30\x39\x00\x00\x00\x28\x54'  #  | ..T.V5.1.09...(T
-    msg += b'\x10\x54\x31\x37\x45\x37\x33\x30\x37\x30\x32\x31\x44\x30\x30\x36'  #  | .T17E7307021D006
-    msg += b'\x41\x00\x00\x00\x32\x54\x0a\x54\x53\x4f\x4c\x2d\x4d\x53\x36\x30'  #  | A...2T.TSOL-MS60
-    msg += b'\x30\x00\x00\x00\x3c\x54\x05\x41\x2c\x42\x2c\x43'                  #  | 0...<T.A,B,C'
-    return msg
-
 def test_read_message(msg_contact_info):
     m = MemoryStream(msg_contact_info, (0,))
     m.read()         # read complete msg, and dispatch msg
@@ -701,7 +540,7 @@ def test_read_message(msg_contact_info):
     m.close()
 
 def test_read_message_twice(config_no_tsun_inv1, msg_inverter_ind):
-    _ = config_no_tsun_inv1
+    config_no_tsun_inv1
     m = MemoryStream(msg_inverter_ind, (0,))
     m.append_msg(msg_inverter_ind)
     m.read()         # read complete msg, and dispatch msg
@@ -782,7 +621,7 @@ def test_read_message_in_chunks2(msg_contact_info):
     m.close()
 
 def test_read_two_messages(config_tsun_allow_all, msg2_contact_info,msg_contact_rsp,msg_contact_rsp2):
-    _ = config_tsun_allow_all
+    config_tsun_allow_all
     m = MemoryStream(msg2_contact_info, (0,))
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.read()         # read complete msg, and dispatch msg
@@ -812,7 +651,7 @@ def test_read_two_messages(config_tsun_allow_all, msg2_contact_info,msg_contact_
     m.close()
 
 def test_msg_contact_resp(config_tsun_inv1, msg_contact_rsp):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_contact_rsp, (0,), False)
     m.await_conn_resp_cnt = 1
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -832,7 +671,7 @@ def test_msg_contact_resp(config_tsun_inv1, msg_contact_rsp):
     m.close()
 
 def test_msg_contact_resp_2(config_tsun_inv1, msg_contact_rsp):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_contact_rsp, (0,), False)
     m.await_conn_resp_cnt = 0
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -852,7 +691,7 @@ def test_msg_contact_resp_2(config_tsun_inv1, msg_contact_rsp):
     m.close()
 
 def test_msg_contact_resp_3(config_tsun_inv1, msg_contact_rsp):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_contact_rsp, (0,), True)
     m.await_conn_resp_cnt = 0
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -872,7 +711,7 @@ def test_msg_contact_resp_3(config_tsun_inv1, msg_contact_rsp):
     m.close()
 
 def test_msg_contact_invalid(config_tsun_inv1, msg_contact_invalid):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_contact_invalid, (0,))
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.read()         # read complete msg, and dispatch msg
@@ -890,7 +729,7 @@ def test_msg_contact_invalid(config_tsun_inv1, msg_contact_invalid):
     m.close()
 
 def test_msg_get_time(config_tsun_inv1, msg_get_time):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_get_time, (0,))
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.read()         # read complete msg, and dispatch msg
@@ -909,7 +748,7 @@ def test_msg_get_time(config_tsun_inv1, msg_get_time):
     m.close()
 
 def test_msg_get_time_autark(config_no_tsun_inv1, msg_get_time):
-    _ = config_no_tsun_inv1
+    config_no_tsun_inv1
     m = MemoryStream(msg_get_time, (0,))
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.read()         # read complete msg, and dispatch msg
@@ -928,7 +767,7 @@ def test_msg_get_time_autark(config_no_tsun_inv1, msg_get_time):
     m.close()
 
 def test_msg_time_resp(config_tsun_inv1, msg_time_rsp):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_time_rsp, (0,), False)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.read()         # read complete msg, and dispatch msg
@@ -947,7 +786,7 @@ def test_msg_time_resp(config_tsun_inv1, msg_time_rsp):
     m.close()
 
 def test_msg_time_resp_autark(config_no_tsun_inv1, msg_time_rsp):
-    _ = config_no_tsun_inv1
+    config_no_tsun_inv1
     m = MemoryStream(msg_time_rsp, (0,), False)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.read()         # read complete msg, and dispatch msg
@@ -966,7 +805,7 @@ def test_msg_time_resp_autark(config_no_tsun_inv1, msg_time_rsp):
     m.close()
 
 def test_msg_time_inv_resp(config_tsun_inv1, msg_time_rsp_inv):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_time_rsp_inv, (0,), False)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.read()         # read complete msg, and dispatch msg
@@ -985,7 +824,7 @@ def test_msg_time_inv_resp(config_tsun_inv1, msg_time_rsp_inv):
     m.close()
 
 def test_msg_time_invalid(config_tsun_inv1, msg_time_invalid):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_time_invalid, (0,), False)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.read()         # read complete msg, and dispatch msg
@@ -1004,7 +843,7 @@ def test_msg_time_invalid(config_tsun_inv1, msg_time_invalid):
     m.close()
 
 def test_msg_time_invalid_autark(config_no_tsun_inv1, msg_time_invalid):
-    _ = config_no_tsun_inv1
+    config_no_tsun_inv1
     m = MemoryStream(msg_time_invalid, (0,), False)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.read()         # read complete msg, and dispatch msg
@@ -1023,7 +862,7 @@ def test_msg_time_invalid_autark(config_no_tsun_inv1, msg_time_invalid):
     m.close()
 
 def test_msg_cntrl_ind(config_tsun_inv1, msg_controller_ind, msg_controller_ind_ts_offs, msg_controller_ack):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_controller_ind, (0,))
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.read()         # read complete msg, and dispatch msg
@@ -1046,7 +885,7 @@ def test_msg_cntrl_ind(config_tsun_inv1, msg_controller_ind, msg_controller_ind_
     m.close()
 
 def test_msg_cntrl_ack(config_tsun_inv1, msg_controller_ack):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_controller_ack, (0,), False)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.read()         # read complete msg, and dispatch msg
@@ -1064,7 +903,7 @@ def test_msg_cntrl_ack(config_tsun_inv1, msg_controller_ack):
     m.close()
 
 def test_msg_cntrl_invalid(config_tsun_inv1, msg_controller_invalid):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_controller_invalid, (0,))
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.read()         # read complete msg, and dispatch msg
@@ -1087,7 +926,7 @@ def test_msg_cntrl_invalid(config_tsun_inv1, msg_controller_invalid):
     m.close()
 
 def test_msg_inv_ind(config_tsun_inv1, msg_inverter_ind, msg_inverter_ind_ts_offs, msg_inverter_ack):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     tracer.setLevel(logging.DEBUG)
     m = MemoryStream(msg_inverter_ind, (0,))
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -1111,7 +950,7 @@ def test_msg_inv_ind(config_tsun_inv1, msg_inverter_ind, msg_inverter_ind_ts_off
     m.close()
 
 def test_msg_inv_ind1(config_tsun_inv1, msg_inverter_ind2, msg_inverter_ind_ts_offs, msg_inverter_ack):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     tracer.setLevel(logging.DEBUG)
     m = MemoryStream(msg_inverter_ind2, (0,))
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -1135,7 +974,7 @@ def test_msg_inv_ind1(config_tsun_inv1, msg_inverter_ind2, msg_inverter_ind_ts_o
     m.close()
 
 def test_msg_inv_ind2(config_tsun_inv1, msg_inverter_ind_new, msg_inverter_ind_ts_offs, msg_inverter_ack):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     tracer.setLevel(logging.DEBUG)
     m = MemoryStream(msg_inverter_ind_new, (0,))
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -1163,7 +1002,7 @@ def test_msg_inv_ind2(config_tsun_inv1, msg_inverter_ind_new, msg_inverter_ind_t
 
 def test_msg_inv_ind3(config_tsun_inv1, msg_inverter_ind_0w, msg_inverter_ack):
     '''test that after close the invert_status will be resetted if the grid power is <2W'''
-    _ = config_tsun_inv1
+    config_tsun_inv1
     tracer.setLevel(logging.DEBUG)
     m = MemoryStream(msg_inverter_ind_0w, (0,))
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -1184,13 +1023,13 @@ def test_msg_inv_ind3(config_tsun_inv1, msg_inverter_ind_0w, msg_inverter_ack):
     assert m._forward_buffer==msg_inverter_ind_0w
     assert m._send_buffer==msg_inverter_ack
     assert m.db.get_db_value(Register.INVERTER_STATUS) == None
-    assert isclose(m.db.db['grid']['Output_Power'], 0.5)
+    assert m.db.db['grid']['Output_Power'] == 0.5
     m.close()
     assert m.db.get_db_value(Register.INVERTER_STATUS) == 0
 
 
 def test_msg_inv_ack(config_tsun_inv1, msg_inverter_ack):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     tracer.setLevel(logging.ERROR)
 
     m = MemoryStream(msg_inverter_ack, (0,), False)
@@ -1210,7 +1049,7 @@ def test_msg_inv_ack(config_tsun_inv1, msg_inverter_ack):
     m.close()
 
 def test_msg_inv_invalid(config_tsun_inv1, msg_inverter_invalid):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_inverter_invalid, (0,), False)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.read()         # read complete msg, and dispatch msg
@@ -1233,7 +1072,7 @@ def test_msg_inv_invalid(config_tsun_inv1, msg_inverter_invalid):
     m.close()
 
 def test_msg_ota_req(config_tsun_inv1, msg_ota_req):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_ota_req, (0,), False)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.db.stat['proxy']['OTA_Start_Msg'] = 0
@@ -1258,7 +1097,7 @@ def test_msg_ota_req(config_tsun_inv1, msg_ota_req):
     m.close()
 
 def test_msg_ota_ack(config_tsun_inv1, msg_ota_ack):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     tracer.setLevel(logging.ERROR)
 
     m = MemoryStream(msg_ota_ack, (0,), False)
@@ -1285,7 +1124,7 @@ def test_msg_ota_ack(config_tsun_inv1, msg_ota_ack):
     m.close()
 
 def test_msg_ota_invalid(config_tsun_inv1, msg_ota_invalid):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_ota_invalid, (0,), False)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.db.stat['proxy']['OTA_Start_Msg'] = 0
@@ -1310,7 +1149,7 @@ def test_msg_ota_invalid(config_tsun_inv1, msg_ota_invalid):
     m.close()
 
 def test_msg_unknown(config_tsun_inv1, msg_unknown):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_unknown, (0,), False)
     m.db.stat['proxy']['Unknown_Msg'] = 0
     m.read()         # read complete msg, and dispatch msg
@@ -1367,15 +1206,15 @@ def test_timestamp_cnv():
     m = MemoryStream(b'')
     ts = 1722645998453    # Saturday, 3. August 2024 00:46:38.453 (GMT+2:00)
     utc =1722638798.453   # GMT: Friday, 2. August 2024 22:46:38.453
-    assert isclose(utc, m._utcfromts(ts))
+    assert utc == m._utcfromts(ts)
 
     ts = 1691246944000    # Saturday, 5. August 2023 14:49:04 (GMT+2:00)
     utc =1691239744.0     # GMT: Saturday, 5. August 2023 12:49:04
-    assert isclose(utc, m._utcfromts(ts))
+    assert utc == m._utcfromts(ts)
 
     ts = 1704152544000    # Monday, 1. January 2024 23:42:24 (GMT+1:00)
     utc =1704148944.0     # GMT: Monday, 1. January 2024 22:42:24
-    assert isclose(utc, m._utcfromts(ts))
+    assert utc == m._utcfromts(ts)
 
     m.close()
 
@@ -1428,7 +1267,7 @@ def test_proxy_counter():
     m.close()
 
 def test_msg_modbus_req(config_tsun_inv1, msg_modbus_cmd):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(b'')
     m.id_str = b"R170000000000001" 
     m.state = State.up
@@ -1459,7 +1298,7 @@ def test_msg_modbus_req(config_tsun_inv1, msg_modbus_cmd):
     m.close()
 
 def test_msg_modbus_req2(config_tsun_inv1, msg_modbus_cmd):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(b'')
     m.id_str = b"R170000000000001" 
 
@@ -1489,7 +1328,7 @@ def test_msg_modbus_req2(config_tsun_inv1, msg_modbus_cmd):
     m.close()
 
 def test_msg_modbus_req3(config_tsun_inv1, msg_modbus_cmd_crc_err):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(b'')
     m.id_str = b"R170000000000001" 
     c = m.createClientStream(msg_modbus_cmd_crc_err)
@@ -1518,7 +1357,7 @@ def test_msg_modbus_req3(config_tsun_inv1, msg_modbus_cmd_crc_err):
 
 def test_msg_modbus_rsp1(config_tsun_inv1, msg_modbus_rsp):
     '''Modbus response without a valid Modbus request must be dropped'''
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_modbus_rsp)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.db.stat['proxy']['Modbus_Command'] = 0
@@ -1539,7 +1378,7 @@ def test_msg_modbus_rsp1(config_tsun_inv1, msg_modbus_rsp):
 
 def test_msg_modbus_cloud_rsp(config_tsun_inv1, msg_modbus_rsp):
     '''Modbus response from TSUN without a valid Modbus request must be dropped'''
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_modbus_rsp, (0,), False)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.db.stat['proxy']['Unknown_Msg'] = 0
@@ -1562,7 +1401,7 @@ def test_msg_modbus_cloud_rsp(config_tsun_inv1, msg_modbus_rsp):
 
 def test_msg_modbus_rsp2(config_tsun_inv1, msg_modbus_rsp20):
     '''Modbus response with a valid Modbus request must be forwarded'''
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_modbus_rsp20)
     m.append_msg(msg_modbus_rsp20)
 
@@ -1592,7 +1431,7 @@ def test_msg_modbus_rsp2(config_tsun_inv1, msg_modbus_rsp20):
 
 def test_msg_modbus_rsp3(config_tsun_inv1, msg_modbus_rsp21):
     '''Modbus response with a valid Modbus request must be forwarded'''
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_modbus_rsp21)
     m.append_msg(msg_modbus_rsp21)
 
@@ -1621,7 +1460,7 @@ def test_msg_modbus_rsp3(config_tsun_inv1, msg_modbus_rsp21):
     m.close()
 
 def test_msg_modbus_invalid(config_tsun_inv1, msg_modbus_inv):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(msg_modbus_inv, (0,), False)
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.db.stat['proxy']['Modbus_Command'] = 0
@@ -1641,7 +1480,7 @@ def test_msg_modbus_invalid(config_tsun_inv1, msg_modbus_inv):
     m.close()
 
 def test_msg_modbus_fragment(config_tsun_inv1, msg_modbus_rsp20):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     # receive more bytes than expected (7 bytes from the next msg)
     m = MemoryStream(msg_modbus_rsp20+b'\x00\x00\x00\x45\x10\x52\x31', (0,))
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
@@ -1673,7 +1512,7 @@ def test_msg_modbus_fragment(config_tsun_inv1, msg_modbus_rsp20):
 
 @pytest.mark.asyncio
 async def test_msg_build_modbus_req(config_tsun_inv1, msg_modbus_cmd):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     m = MemoryStream(b'', (0,), True)
     m.id_str = b"R170000000000001" 
     await m.send_modbus_cmd(Modbus.WRITE_SINGLE_REG, 0x2008, 0, logging.DEBUG)
@@ -1699,7 +1538,7 @@ async def test_msg_build_modbus_req(config_tsun_inv1, msg_modbus_cmd):
     m.close()
 
 def test_modbus_no_polling(config_no_modbus_poll, msg_get_time):
-    _ = config_no_modbus_poll
+    config_no_modbus_poll
     m = MemoryStream(msg_get_time, (0,))
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     m.modbus_polling = False
@@ -1720,7 +1559,7 @@ def test_modbus_no_polling(config_no_modbus_poll, msg_get_time):
 
 @pytest.mark.asyncio
 async def test_modbus_polling(config_tsun_inv1, msg_inverter_ind):
-    _ = config_tsun_inv1
+    config_tsun_inv1
     assert asyncio.get_running_loop()
 
     m = MemoryStream(msg_inverter_ind, (0,))
@@ -1742,7 +1581,7 @@ async def test_modbus_polling(config_tsun_inv1, msg_inverter_ind):
     assert m.db.stat['proxy']['Unknown_Ctrl'] == 0
 
     m._send_buffer = bytearray(0) # clear send buffer for next test
-    assert isclose(m.mb_timeout, 0.5)
+    assert m.mb_timeout == 0.5
     assert next(m.mb_timer.exp_count) == 0
     
     await asyncio.sleep(0.5)
@@ -1760,7 +1599,7 @@ async def test_modbus_polling(config_tsun_inv1, msg_inverter_ind):
     m.close()
 
 def test_broken_recv_buf(config_tsun_allow_all, broken_recv_buf):
-    _ = config_tsun_allow_all
+    config_tsun_allow_all
     m = MemoryStream(broken_recv_buf, (0,))
     m.db.stat['proxy']['Unknown_Ctrl'] = 0
     assert m.db.stat['proxy']['Invalid_Data_Type'] == 0
@@ -1777,24 +1616,3 @@ def test_broken_recv_buf(config_tsun_allow_all, broken_recv_buf):
     assert m.db.stat['proxy']['Invalid_Data_Type'] == 1
 
     m.close()
-
-def test_multiiple_recv_buf(config_tsun_allow_all, multiple_recv_buf):
-    _ = config_tsun_allow_all
-    m = MemoryStream(multiple_recv_buf, (0,))
-    m.db.stat['proxy']['Unknown_Ctrl'] = 0
-    m.db.stat['proxy']['Invalid_Msg_Format'] = 0
-    m.db.stat['proxy']['Invalid_Data_Type'] = 0
-    m.read()         # read complete msg, and dispatch msg
-    assert not m.header_valid  # must be invalid, since msg was handled and buffer flushed
-    assert m.msg_count == 1
-    assert m.id_str == b"R170000000000001" 
-    assert m.unique_id == 'R170000000000001'
-    assert m.msg_recvd[0]['ctrl']==145
-    assert m.msg_recvd[0]['msg_id']==4
-    assert m.msg_recvd[0]['header_len']==23
-    assert m.msg_recvd[0]['data_len']==1263
-    assert m.db.stat['proxy']['Unknown_Ctrl'] == 0
-    assert m.db.stat['proxy']['Invalid_Msg_Format'] == 1
-    assert m.db.stat['proxy']['Invalid_Data_Type'] == 1
-
-    m.close()

requirements-test.txt

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

sonar-project.properties

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

system_tests/test_tcp_socket.py

@@ -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