remove obsolete if statement

- Batterie Status calculated from the batt current
- Power Supply State calc from the out Power

CHANGELOG.md

@@ -7,11 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
-- add web UI to add-on
-- allow `Y00` serial numbers for GEN3PLUS devices
-
-## [0.13.0] - 2025-04-13
-
 - update dependency python to 3.13
 - add initial support for TSUN MS-3000
 - add initial apparmor support [#293](https://github.com/s-allius/tsun-gen3-proxy/issues/293)

README.md

@@ -141,7 +141,7 @@ No special configuration is required for the Docker container if it is built and
 
 On the host, two directories (for log files and for config files) must be mapped. If necessary, the UID of the proxy process can be adjusted, which is also the owner of the log and configuration files.
 
-A description of the configuration parameters can be found [here](https://github.com/s-allius/tsun-gen3-proxy/wiki/configuration-env#docker-compose-environment-variables)
+A description of the configuration parameters can be found [here](https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-toml#docker-compose-environment-variables).
 
 ## Proxy Configuration
 

app/.version

@@ -1 +1 @@
-0.14.0
+0.13.0

app/Makefile

@@ -22,16 +22,7 @@ dev debug:
 	export IMAGE=$(PRIVAT_CONTAINER_REGISTRY)$(IMAGE) && \
 	docker buildx bake -f docker-bake.hcl $@
 
-rc:
+preview rc rel:
-	@[ "${RC}" ] || ( echo ">> RC is not set"; exit 1 )
-	@echo version: $(VERSION)  build-date: $(BUILD_DATE)   image: $(PUBLIC_CONTAINER_REGISTRY)$(IMAGE)
-	@echo login at $(PUBLIC_URL) as $(PUBLIC_USER)
-	@DO_LOGIN="$(shell echo $(PUBLIC_CR_KEY) | docker login $(PUBLIC_URL) -u $(PUBLIC_USER) --password-stdin)"
-	export VERSION=$(VERSION)-$@$(RC) && \
-	export IMAGE=$(PUBLIC_CONTAINER_REGISTRY)$(IMAGE) && \
-	docker buildx bake -f docker-bake.hcl $@
-
-preview rel:
 	@echo version: $(VERSION)  build-date: $(BUILD_DATE)   image: $(PUBLIC_CONTAINER_REGISTRY)$(IMAGE)
 	@echo login at $(PUBLIC_URL) as $(PUBLIC_USER)
 	@DO_LOGIN="$(shell echo $(PUBLIC_CR_KEY) | docker login $(PUBLIC_URL) -u $(PUBLIC_USER) --password-stdin)"

app/requirements-test.txt

@@ -1,7 +1,7 @@
     flake8==7.2.0
     pytest==8.3.5
     pytest-asyncio==0.26.0
-    pytest-cov==6.1.1
+    pytest-cov==6.1.0
     python-dotenv==1.1.0
     mock==5.2.0
     coverage==7.8.0

app/requirements.txt

@@ -1,4 +1,4 @@
-    aiomqtt==2.3.2
+    aiomqtt==2.3.1
     schema==0.7.7
     aiocron==2.1
-    quart==0.20
+    aiohttp==3.11.16

app/src/gen3plus/infos_g3p.py

@@ -149,8 +149,8 @@ class RegisterMap:
         0x42010034: {'reg': Register.BATT_PV2_VOLT,        'fmt': '!H', 'ratio': 0.01},  # noqa: E501, DC Voltage PV2
         0x42010036: {'reg': Register.BATT_PV2_CUR,         'fmt': '!H', 'ratio': 0.01},  # noqa: E501, DC Current PV2
         0x42010038: {'reg': Register.BATT_TOTAL_CHARG,     'fmt': '!L', 'ratio': 0.01},  # noqa: E501
-        0x4201003c: {'reg': Register.BATT_PV1_STATUS,      'fmt': '!H'},                 # noqa: E501 MPTT-1 Operating Status: 0(Standby), 1(Work)
+        0x4201003c: {'reg': Register.BATT_PV1_STATUS,        'fmt': '!H'},                 # noqa: E501 MPTT-1 Operating Status: 0(Standby), 1(Work)
-        0x4201003e: {'reg': Register.BATT_PV2_STATUS,      'fmt': '!H'},                 # noqa: E501 MPTT-2 Operating Status: 0(Standby), 1(Work)
+        0x4201003e: {'reg': Register.BATT_PV2_STATUS,        'fmt': '!H'},                 # noqa: E501 MPTT-2 Operating Status: 0(Standby), 1(Work)
         0x42010040: {'reg': Register.BATT_VOLT,            'fmt': '!h', 'ratio': 0.01},  # noqa: E501
         0x42010042: {'reg': Register.BATT_CUR,             'fmt': '!h', 'ratio': 0.01},  # noqa: E501 => Batterie Status: <0(Discharging), 0(Static), 0>(Loading)
         0x42010044: {'reg': Register.BATT_SOC,             'fmt': '!H', 'ratio': 0.01},  # noqa: E501, state of charge (SOC) in percent
@@ -177,7 +177,7 @@ class RegisterMap:
         0x4201006e: {'reg': Register.BATT_OUT_CUR,         'fmt': '!H', 'ratio': 0.01},  # noqa: E501 Output Current
         0x42010070: {'reg': Register.BATT_OUT_STATUS,      'fmt': '!H'},                 # noqa: E501 Output Working Status: 0(Standby), 1(Work)
         0x42010072: {'reg': Register.BATT_TEMP_4,          'fmt': '!h'},                 # noqa: E50, Environment temp
-        0x42010074: {'reg': Register.BATT_ALARM,           'fmt': '!H'},                 # noqa: E501 Warning Alarmcode 1, Bit 0..15
+        0x42010074: {'reg': Register.BATT_74,              'fmt': '!H'},                 # noqa: E501 Warning Alarmcode 1, Bit 0..15
         0x42010076: {'reg': Register.BATT_HW_VERS,         'fmt': '!h'},                 # noqa: E501 hardware version
         0x42010078: {'reg': Register.BATT_SW_VERS,         'fmt': '!h'},                 # noqa: E501 software main version
         'calc': {

app/src/infos.py

@@ -154,7 +154,7 @@ class Register(Enum):
     BATT_OUT_CUR = 1033
     BATT_OUT_STATUS = 1034
     BATT_TEMP_4 = 1035
-    BATT_ALARM = 1036
+    BATT_74 = 1036
     BATT_HW_VERS = 1037
     BATT_SW_VERS = 1038
     BATT_PV_PWR = 1040
@@ -326,7 +326,6 @@ class Infos:
     SOLAR_POWER_VAR = 'mdi:solar-power-variant'
     SOLAR_POWER = 'mdi:solar-power'
     WIFI = 'mdi:wifi'
-    ALARM_LIGHT = 'mdi:alarm-light'
     UPDATE = 'mdi:update'
     DAILY_GEN = 'Daily Generation'
     TOTAL_GEN = 'Total Generation'
@@ -382,7 +381,7 @@ class Infos:
     __mppt2_status_type_val_tpl = "{%set mppt_status = ['Standby', 'On', 'Off'] %}{{mppt_status[value_json['pv2']['MPPT-Status']|int(0)]|default(value_json['pv2']['MPPT-Status'])}}"    # noqa: E501
     __supply_status_type_val_tpl = "{%set supply_status = ['Idle', 'Power-Supply'] %}{{supply_status[value_json['out']['Suppl_State']|int(0)]|default(value_json['out']['Suppl_State'])}}"    # noqa: E501
     __batt_status_type_val_tpl = "{%set batt_status = ['Discharging', 'Static', 'Loading'] %}{{batt_status[value_json['batt']['Batt_State']|int(0)]|default(value_json['batt']['Batt_State'])}}"    # noqa: E501
-    __out_status_type_val_tpl = "{%set out_status = ['Standby', 'On', 'Off'] %}{{out_status[value_json['out']['Out_Status']|int(0)]|default(value_json['out']['Out_Status'])}}"    # noqa: E501
+    __out_status_type_val_tpl = "{%set out_status = ['Standby', 'On'] %}{{out_status[value_json['out']['Out_Status']|int(0)]|default(value_json['out']['Out_Status'])}}"    # noqa: E501
     __rated_power_val_tpl = "{% if 'Rated_Power' in value_json and value_json['Rated_Power'] != None %}{{value_json['Rated_Power']|string() +' W'}}{% else %}{{ this.state }}{% endif %}"  # noqa: E501
     __designed_power_val_tpl = '''
 {% if 'Max_Designed_Power' in value_json and
@@ -404,52 +403,52 @@ class Infos:
     {% set result = 'noAlarm'%}
   {%else%}
     {% set result = '' %}
-    {% if val_int | bitwise_and(0x0001)%}
+    {% if val_int | bitwise_and(1)%}
         {% set result = result + 'HBridgeFault, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0002)%}
+    {% if val_int | bitwise_and(2)%}
         {% set result = result + 'DriVoltageFault, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0004)%}
+    {% if val_int | bitwise_and(3)%}
         {% set result = result + 'GFDI-Fault, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0008)%}
+    {% if val_int | bitwise_and(4)%}
         {% set result = result + 'OverTemp, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0010)%}
+    {% if val_int | bitwise_and(5)%}
         {% set result = result + 'CommLose, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0020)%}
+    {% if val_int | bitwise_and(6)%}
         {% set result = result + 'Bit6, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0040)%}
+    {% if val_int | bitwise_and(7)%}
         {% set result = result + 'Bit7, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0080)%}
+    {% if val_int | bitwise_and(8)%}
         {% set result = result + 'EEPROM-Fault, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0100)%}
+    {% if val_int | bitwise_and(9)%}
         {% set result = result + 'NoUtility, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0200)%}
+    {% if val_int | bitwise_and(10)%}
         {% set result = result + 'VG_Offset, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0400)%}
+    {% if val_int | bitwise_and(11)%}
         {% set result = result + 'Relais_Open, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0800)%}
+    {% if val_int | bitwise_and(12)%}
         {% set result = result + 'Relais_Short, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x1000)%}
+    {% if val_int | bitwise_and(13)%}
         {% set result = result + 'GridVoltOverRating, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x2000)%}
+    {% if val_int | bitwise_and(14)%}
         {% set result = result + 'GridVoltUnderRating, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x4000)%}
+    {% if val_int | bitwise_and(15)%}
         {% set result = result + 'GridFreqOverRating, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x8000)%}
+    {% if val_int | bitwise_and(16)%}
         {% set result = result + 'GridFreqUnderRating, '%}
     {% endif %}
   {% endif %}
@@ -466,104 +465,42 @@ class Infos:
     {% set result = 'noFault'%}
   {%else%}
     {% set result = '' %}
-    {% if val_int | bitwise_and(0x0001)%}
+    {% if val_int | bitwise_and(1)%}
         {% set result = result + 'PVOV-Fault (PV OverVolt), '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0002)%}
+    {% if val_int | bitwise_and(2)%}
         {% set result = result + 'PVLV-Fault (PV LowVolt), '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0004)%}
+    {% if val_int | bitwise_and(3)%}
         {% set result = result + 'PV OI-Fault (PV OverCurrent), '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0008)%}
+    {% if val_int | bitwise_and(4)%}
         {% set result = result + 'PV OFV-Fault, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0010)%}
+    {% if val_int | bitwise_and(5)%}
         {% set result = result + 'DC ShortCircuitFault, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0020)%}{% set result = result + 'Bit6, '%}
+    {% if val_int | bitwise_and(6)%}{% set result = result + 'Bit6, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0040)%}{% set result = result + 'Bit7, '%}
+    {% if val_int | bitwise_and(7)%}{% set result = result + 'Bit7, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0080)%}{% set result = result + 'Bit8, '%}
+    {% if val_int | bitwise_and(8)%}{% set result = result + 'Bit8, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0100)%}{% set result = result + 'Bit9, '%}
+    {% if val_int | bitwise_and(9)%}{% set result = result + 'Bit9, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0200)%}{% set result = result + 'Bit10, '%}
+    {% if val_int | bitwise_and(10)%}{% set result = result + 'Bit10, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0400)%}{% set result = result + 'Bit11, '%}
+    {% if val_int | bitwise_and(11)%}{% set result = result + 'Bit11, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x0800)%}{% set result = result + 'Bit12, '%}
+    {% if val_int | bitwise_and(12)%}{% set result = result + 'Bit12, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x1000)%}{% set result = result + 'Bit13, '%}
+    {% if val_int | bitwise_and(13)%}{% set result = result + 'Bit13, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x2000)%}{% set result = result + 'Bit14, '%}
+    {% if val_int | bitwise_and(14)%}{% set result = result + 'Bit14, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x4000)%}{% set result = result + 'Bit15, '%}
+    {% if val_int | bitwise_and(15)%}{% set result = result + 'Bit15, '%}
     {% endif %}
-    {% if val_int | bitwise_and(0x8000)%}{% set result = result + 'Bit16, '%}
+    {% if val_int | bitwise_and(16)%}{% set result = result + 'Bit16, '%}
-    {% endif %}
-  {% endif %}
-  {{ result }}
-{% else %}
-  {{ this.state }}
-{% endif %}
-'''
-    __batt_alarm_val_tpl = '''
-{% if 'Batterie_Alarm' in value_json and
-      value_json['Batterie_Alarm'] != None %}
-  {% set val_int = value_json['Batterie_Alarm'] | int %}
-  {% if val_int == 0 %}
-    {% set result = 'noAlarm'%}
-  {%else%}
-    {% set result = '' %}
-    {% if val_int | bitwise_and(0x0001)%}
-        {% set result = result + 'PV1-OverVoltage, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(0x0002)%}
-        {% set result = result + 'PV2-OverVoltage, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(0x0004)%}
-        {% set result = result + 'EquipmentOverheating, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(0x0008)%}
-        {% set result = result + 'EquipmentLowTemp, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(0x0010)%}
-        {% set result = result + 'BMS-CommFailed, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(0x0020)%}
-        {% set result = result + 'UnderVoltageProt, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(0x0040)%}
-        {% set result = result + 'ChargingHighTemp, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(0x0080)%}
-        {% set result = result + 'ChargingLowTemp, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(0x0100)%}
-        {% set result = result + 'DischargeHighTemp, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(0x0200)%}
-        {% set result = result + 'DischargeLowTemp, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(0x0400)%}
-        {% set result = result + 'BatterieOverVoltage, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(0x0800)%}
-        {% set result = result + 'SingleCorePressureDifferenceIsTooLarge, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(0x1000)%}
-        {% set result = result + 'Bit-12, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(0x2000)%}
-        {% set result = result + 'Bit-13, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(0x4000)%}
-        {% set result = result + 'Bit-14, '%}
-    {% endif %}
-    {% if val_int | bitwise_and(0x8000)%}
-        {% set result = result + 'Bit-15, '%}
     {% endif %}
   {% endif %}
   {{ result }}
@@ -629,8 +566,8 @@ class Infos:
         # 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
 
         # events
-        Register.EVENT_ALARM:  {'name': ['events', 'Inverter_Alarm'],              'level': logging.INFO, 'unit': '', 'ha': {'dev': 'inverter', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_alarm_', 'name': 'Inverter Alarm', 'val_tpl': __inv_alarm_val_tpl, 'icon': ALARM_LIGHT}},  # noqa: E501
+        Register.EVENT_ALARM:  {'name': ['events', 'Inverter_Alarm'],              'level': logging.INFO, 'unit': '', 'ha': {'dev': 'inverter', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_alarm_', 'name': 'Inverter Alarm', 'val_tpl': __inv_alarm_val_tpl, 'icon': 'mdi:alarm-light'}},  # noqa: E501
-        Register.EVENT_FAULT:  {'name': ['events', 'Inverter_Fault'],              'level': logging.INFO, 'unit': '', 'ha': {'dev': 'inverter', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_fault_', 'name': 'Inverter Fault', 'val_tpl': __inv_fault_val_tpl, 'icon': ALARM_LIGHT}},  # noqa: E501
+        Register.EVENT_FAULT:  {'name': ['events', 'Inverter_Fault'],              'level': logging.INFO, 'unit': '', 'ha': {'dev': 'inverter', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_fault_', 'name': 'Inverter Fault', 'val_tpl': __inv_fault_val_tpl, 'icon': 'mdi:alarm-light'}},  # noqa: E501
         Register.EVENT_BF1:    {'name': ['events', 'Inverter_Bitfield_1'],         'level': logging.INFO, 'unit': ''},  # noqa: E501
         Register.EVENT_BF2:    {'name': ['events', 'Inverter_bitfield_2'],         'level': logging.INFO, 'unit': ''},  # noqa: E501
         # Register.EVENT_409:  {'name': ['events', '409_No_Utility'],                'level': logging.DEBUG, 'unit': ''},  # noqa: E501
@@ -747,7 +684,7 @@ class Infos:
         Register.BATT_TEMP_2:        {'name': ['batterie', 'cell', 'Temp_2'],       'level': logging.INFO, 'unit': '°C',   'ha': {'dev': 'batterie', 'dev_cla': 'temperature', 'stat_cla': 'measurement', 'id': 'temp_2_', 'val_tpl': "{{ (value_json['cell']['Temp_2'] | int)}}", 'name': 'Cell Temp-2', 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.BATT_TEMP_3:        {'name': ['batterie', 'cell', 'Temp_3'],       'level': logging.INFO, 'unit': '°C',   'ha': {'dev': 'batterie', 'dev_cla': 'temperature', 'stat_cla': 'measurement', 'id': 'temp_3_', 'val_tpl': "{{ (value_json['cell']['Temp_3'] | int)}}", 'name': 'Cell Temp-3', 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.BATT_TEMP_4:        {'name': ['batterie', 'Controller_Temp'],      'level': logging.INFO, 'unit': '°C',   'ha': {'dev': 'batterie', 'dev_cla': 'temperature', 'stat_cla': 'measurement', 'id': 'temp_4_', 'fmt': FMT_INT, 'name': 'Temperature'}},  # noqa: E501
-        Register.BATT_ALARM:         {'name': ['batterie', 'Batterie_Alarm'],       'level': logging.INFO, 'unit': '',     'ha': {'dev': 'batterie', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'batt_alarm_', 'name': 'Batterie Alarm', 'val_tpl': __batt_alarm_val_tpl, 'icon': ALARM_LIGHT}},  # noqa: E501
+        Register.BATT_74:            {'name': ['batterie', 'Reg_74'],               'level': logging.INFO, 'unit': '',     'ha': {'dev': 'batterie', 'dev_cla': 'power',   'stat_cla': 'measurement', 'id': 'batt_74_', 'fmt': FMT_INT, 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.BATT_HW_VERS:       {'name': ['batterie', 'Hardware_Version'],     'level': logging.INFO, 'unit': ''},  # noqa: E501
         Register.BATT_SW_VERS:       {'name': ['batterie', 'Software_Version'],     'level': logging.INFO, 'unit': ''},  # noqa: E501
 

app/src/modbus.py

@@ -43,8 +43,8 @@ class Modbus():
         0x000a: {'reg': Register.BATT_PV2_VOLT,        'fmt': '!H', 'ratio': 0.01},  # noqa: E501, PV2 voltage
         0x000b: {'reg': Register.BATT_PV2_CUR,         'fmt': '!H', 'ratio': 0.01},  # noqa: E501, PV2 current
         0x000c: {'reg': Register.BATT_TOTAL_CHARG,     'fmt': '!L', 'ratio': 0.01},  # noqa: E501
-        0x000e: {'reg': Register.BATT_PV1_STATUS,      'fmt': '!H'},                 # noqa: E501
+        0x000e: {'reg': Register.BATT_PV1_STATUS,        'fmt': '!H'},                 # noqa: E501
-        0x000f: {'reg': Register.BATT_PV2_STATUS,      'fmt': '!H'},                 # noqa: E501
+        0x000f: {'reg': Register.BATT_PV2_STATUS,        'fmt': '!H'},                 # noqa: E501
         0x0010: {'reg': Register.BATT_VOLT,            'fmt': '!h', 'ratio': 0.01},  # noqa: E501
         0x0011: {'reg': Register.BATT_CUR,             'fmt': '!h', 'ratio': 0.01},  # noqa: E501
         0x0012: {'reg': Register.BATT_SOC,             'fmt': '!H', 'ratio': 0.01},  # noqa: E501, state of charge (SOC) in percent
@@ -71,7 +71,7 @@ class Modbus():
         0x0027: {'reg': Register.BATT_OUT_CUR,         'fmt': '!H', 'ratio': 0.01},  # noqa: E501
         0x0028: {'reg': Register.BATT_OUT_STATUS,      'fmt': '!H'},                 # noqa: E501
         0x0029: {'reg': Register.BATT_TEMP_4,          'fmt': '!h'},                 # noqa: E501
-        0x002a: {'reg': Register.BATT_ALARM,           'fmt': '!h'},                 # noqa: E501
+        0x002a: {'reg': Register.BATT_74,              'fmt': '!h'},                 # noqa: E501
         0x002b: {'reg': Register.BATT_HW_VERS,         'fmt': '!h'},                 # noqa: E501
         0x002c: {'reg': Register.BATT_SW_VERS,         'fmt': '!h'},                 # noqa: E501
 

app/src/proxy.py

@@ -96,8 +96,8 @@ class Proxy():
             Infos.new_stat_data[key] = False
 
     @classmethod
-    async def class_close(cls, loop) -> None:   # pragma: no cover
+    def class_close(cls, loop) -> None:   # pragma: no cover
         logging.debug('Proxy.class_close')
         logging.info('Close MQTT Task')
-        await cls.mqtt.close()
+        loop.run_until_complete(cls.mqtt.close())
         cls.mqtt = None

app/src/server.py

@@ -1,10 +1,11 @@
 import logging
 import asyncio
 import logging.handlers
+import signal
 import os
 import argparse
 from asyncio import StreamReader, StreamWriter
-from quart import Quart, Response
+from aiohttp import web
 from logging import config  # noqa F401
 from proxy import Proxy
 from inverter_ifc import InverterIfc
@@ -15,51 +16,63 @@ from cnf.config import Config
 from cnf.config_read_env import ConfigReadEnv
 from cnf.config_read_toml import ConfigReadToml
 from cnf.config_read_json import ConfigReadJson
-from web.routes import web_routes
 from modbus_tcp import ModbusTcp
 
-
+routes = web.RouteTableDef()
-class ProxyState:
+proxy_is_up = False
-    _is_up = False
-
-    @staticmethod
-    def is_up() -> bool:
-        return ProxyState._is_up
-
-    @staticmethod
-    def set_up(value: bool):
-        ProxyState._is_up = value
 
 
-app = Quart(__name__)
+@routes.get('/')
-app.register_blueprint(web_routes)
+async def hello(request):
+    return web.Response(text="Hello, world")
 
 
-@app.route('/-/ready')
+@routes.get('/-/ready')
-async def ready():
+async def ready(request):
-    if ProxyState.is_up():
+    if proxy_is_up:
         status = 200
         text = 'Is ready'
     else:
         status = 503
         text = 'Not ready'
-    return Response(status=status, response=text)
+    return web.Response(status=status, text=text)
 
 
-@app.route('/-/healthy')
+@routes.get('/-/healthy')
-async def healthy():
+async def healthy(request):
 
-    if ProxyState.is_up():
+    if proxy_is_up:
         # logging.info('web reqeust healthy()')
         for inverter in InverterIfc:
             try:
                 res = inverter.healthy()
                 if not res:
-                    return Response(status=503, response="I have a problem")
+                    return web.Response(status=503, text="I have a problem")
             except Exception as err:
                 logging.info(f'Exception:{err}')
 
-    return Response(status=200, response="I'm fine")
+    return web.Response(status=200, text="I'm fine")
+
+
+async def webserver(addr, port):
+    '''coro running our webserver'''
+    app = web.Application()
+    app.add_routes(routes)
+    runner = web.AppRunner(app)
+
+    await runner.setup()
+    site = web.TCPSite(runner, addr, port)
+    await site.start()
+    logging.info(f'HTTP server listen on port: {port}')
+
+    try:
+        # Normal interaction with aiohttp
+        while True:
+            await asyncio.sleep(3600)  # sleep forever
+    except asyncio.CancelledError:
+        logging.info('HTTP server cancelled')
+        await runner.cleanup()
+        logging.debug('HTTP cleanup done')
 
 
 async def handle_client(reader: StreamReader, writer: StreamWriter, inv_class):
@@ -69,13 +82,12 @@ async def handle_client(reader: StreamReader, writer: StreamWriter, inv_class):
         await inv.local.ifc.server_loop()
 
 
-@app.after_serving
+async def handle_shutdown(loop, web_task):
-async def handle_shutdown():   # pragma: no cover
     '''Close all TCP connections and stop the event loop'''
 
     logging.info('Shutdown due to SIGTERM')
-    loop = asyncio.get_event_loop()
+    global proxy_is_up
-    ProxyState.set_up(False)
+    proxy_is_up = False
 
     #
     # first, disc all open TCP connections gracefully
@@ -85,16 +97,24 @@ async def handle_shutdown():   # pragma: no cover
 
     logging.info('Proxy disconnecting done')
 
+    #
+    # second, cancel the web server
+    #
+    web_task.cancel()
+    await web_task
+
     #
     # now cancel all remaining (pending) tasks
     #
-    for task in asyncio.all_tasks():
+    pending = asyncio.all_tasks()
-        if task == asyncio.current_task():
+    for task in pending:
-            continue
         task.cancel()
-    logging.info('Proxy cancelling done')
 
-    await Proxy.class_close(loop)
+    #
+    # at last, start a coro for stopping the loop
+    #
+    logging.debug("Stop event loop")
+    loop.stop()
 
 
 def get_log_level() -> int | None:
@@ -194,20 +214,27 @@ def main():   # pragma: no cover
         loop.create_task(asyncio.start_server(lambda r, w, i=inv_class:
                                               handle_client(r, w, i),
                                               '0.0.0.0', port))
+    web_task = loop.create_task(webserver('0.0.0.0', 8127))
+
+    #
+    # Register some UNIX Signal handler for a gracefully server shutdown
+    # on Docker restart and stop
+    #
+    for signame in ('SIGINT', 'SIGTERM'):
+        loop.add_signal_handler(getattr(signal, signame),
+                                lambda loop=loop: asyncio.create_task(
+                                    handle_shutdown(loop, web_task)))
 
     loop.set_debug(log_level == logging.DEBUG)
     try:
-        ProxyState.set_up(True)
+        global proxy_is_up
-        logging.info("Start Quart")
+        proxy_is_up = True
-        app.run(host='0.0.0.0', port=8127, use_reloader=False, loop=loop)
+        loop.run_forever()
-        logging.info("Quart stopped")
-
     except KeyboardInterrupt:
         pass
-    except asyncio.exceptions.CancelledError:
-        logging.info("Quart cancelled")
-
     finally:
+        logging.info("Event loop is stopped")
+        Proxy.class_close(loop)
         logging.debug('Close event loop')
         loop.close()
         logging.info(f'Finally, exit Server "{serv_name}"')

app/src/web/routes.py

@@ -1,9 +0,0 @@
-from quart import Blueprint
-from quart import Response
-
-web_routes = Blueprint('web_routes', __name__)
-
-
-@web_routes.route('/')
-async def hello():
-    return Response(response="Hello, world")

app/tests/test_infos_g3.py

@@ -221,7 +221,7 @@ def inv_data_seq2(): # Data indication from the controller
     return msg
 
 @pytest.fixture
-def inv_data_seq3(): # Inverter indication from MS-3000
+def inv_data_seq3(): # Inverter indication from MS-2000
 
     msg  =  b'\x00\x00\x01\x2c\x00\x00\x00\x64\x53\x00\x00'                      #  | ..^.....,...dS..
     msg +=  b'\x00\x00\x00\xc8\x53\x44\x00\x00\x00\x01\x2c\x53\x00\x00\x00\x00'  #  | ....SD....,S....

app/tests/test_infos_g3p.py

@@ -172,7 +172,7 @@ def test_parse_4210_3026(batterie_data: bytes):
                       "batt": {"Total_Charging": 20.8, "Voltage": 51.34, "Current": -0.02, "SOC": 10.0, "Power": -1.0268000000000002, 'Batt_State': 0},
                       "cell": {"Volt1": 3.21, "Volt2": 3.21, "Volt3": 3.21, "Volt4": 3.21, "Volt5": 3.21, "Volt6": 3.21, "Volt7": 3.21, "Volt8": 3.21, "Volt9": 3.21, "Volt10": 3.21, "Volt11": 3.21, "Volt12": 3.21, "Volt13": 3.21, "Volt14": 3.21, "Volt15": 3.21, "Volt16": 3.21, "Temp_1": 15, "Temp_2": 15,  "Temp_3": 15}, 
                       "out": {"Voltage": 0.14, "Current": 0.0, "Out_Status": 0, "Power": 0.0, "Suppl_State": 0},
-                      "Controller_Temp": 15, "Batterie_Alarm": 0, "Hardware_Version": 517, "Software_Version": 513, 
+                      "Controller_Temp": 15, "Reg_74": 0, "Hardware_Version": 517, "Software_Version": 513, 
                       "PV_Power": 37.9232},
         })
 
@@ -191,7 +191,7 @@ def test_parse_4210_3026_prod(batterie_data1: bytes):
                       "batt": {"Total_Charging": 20.8, "Voltage": 2.56, "Current": 0.0, "SOC": 10.0, "Power": 0.0, 'Batt_State': 1},
                       "cell": {"Volt1": 3.21, "Volt2": 3.21, "Volt3": 3.21, "Volt4": 3.21, "Volt5": 3.21, "Volt6": 3.21, "Volt7": 3.21, "Volt8": 3.21, "Volt9": 3.21, "Volt10": 3.21, "Volt11": 3.21, "Volt12": 3.21, "Volt13": 3.21, "Volt14": 3.21, "Volt15": 3.21, "Volt16": 3.21, "Temp_1": 15, "Temp_2": 15,  "Temp_3": 15}, 
                       "out": {"Voltage": 30.86, "Current": 2.56, "Out_Status": 0, "Power": 79.0016, "Suppl_State": 1},
-                      "Controller_Temp": 15, "Batterie_Alarm": 0, "Hardware_Version": 517, "Software_Version": 513, 
+                      "Controller_Temp": 15, "Reg_74": 0, "Hardware_Version": 517, "Software_Version": 513, 
                       "PV_Power": 37.9232},
         })
 
@@ -210,7 +210,7 @@ def test_parse_4210_3026_incomplete(batterie_data2: bytes):
                       "batt": {"Total_Charging": 20.8, "Voltage": 51.34, "Current": 7.66, "SOC": 10.0, "Power": 393.2644, 'Batt_State': 2},
                       "cell": {"Volt1": 3.21, "Volt2": 3.21, "Volt3": 3.21, "Volt4": 3.21, "Volt5": 3.21, "Volt6": 3.21, "Volt7": 3.21, "Volt8": 3.21, "Volt9": 3.21, "Volt10": 3.21, "Volt11": 3.21, "Volt12": 3.21, "Volt13": 3.21, "Volt14": 3.21, "Volt15": 3.21, "Volt16": 3.21, "Temp_1": 15, "Temp_2": 15,  "Temp_3": 15}, 
                       "out": {"Voltage": 0.14, "Current": None, "Out_Status": None, "Power": None, "Suppl_State": None},
-                      "Controller_Temp": None, "Batterie_Alarm": None, "Hardware_Version": None, "Software_Version": None, 
+                      "Controller_Temp": None, "Reg_74": None, "Hardware_Version": None, "Software_Version": None, 
                       "PV_Power": 37.9232},
          })
 

app/tests/test_server.py

@@ -3,9 +3,7 @@ import pytest
 import logging
 import os
 from mock import patch
-from server import get_log_level, app, ProxyState
+from server import get_log_level
-
-pytest_plugins = ('pytest_asyncio',)
 
 def test_get_log_level():
 
@@ -32,37 +30,3 @@ def test_get_log_level():
     with patch.dict(os.environ, {'LOG_LVL': 'UNKNOWN'}):
         log_lvl = get_log_level()
         assert log_lvl == None
-
-@pytest.mark.asyncio
-async def test_ready():
-    """Test the ready route."""
-
-    ProxyState.set_up(False)
-    client = app.test_client()
-    response = await client.get('/-/ready')
-    assert response.status_code == 503
-    result = await response.get_data()
-    assert result == b"Not ready"
-
-    ProxyState.set_up(True)
-    response = await client.get('/-/ready')
-    assert response.status_code == 200
-    result = await response.get_data()
-    assert result == b"Is ready"
-
-@pytest.mark.asyncio
-async def test_healthy():
-    """Test the healthy route."""
-
-    ProxyState.set_up(False)
-    client = app.test_client()
-    response = await client.get('/-/healthy')
-    assert response.status_code == 200
-    result = await response.get_data()
-    assert result == b"I'm fine"
-
-    ProxyState.set_up(True)
-    response = await client.get('/-/healthy')
-    assert response.status_code == 200
-    result = await response.get_data()
-    assert result == b"I'm fine"

app/tests/test_web_route.py

@@ -1,15 +0,0 @@
-# test_with_pytest.py
-import pytest
-from server import app
-
-pytest_plugins = ('pytest_asyncio',)
-
-
-@pytest.mark.asyncio
-async def test_home():
-    """Test the home route."""
-    client = app.test_client()
-    response = await client.get('/')
-    assert response.status_code == 200
-    result = await response.get_data()
-    assert result == b"Hello, world"

ha_addons/Makefile

@@ -32,7 +32,7 @@ rel : STAGE=rel
 
 
 export BUILD_DATE := ${shell date -Iminutes}
-debug dev : BUILD_ID := ${shell date +'%y%m%d%H%M'}
+BUILD_ID := ${shell date +'%y%m%d%H%M'}
 VERSION := $(shell cat $(SRC)/.version)
 export MAJOR  := $(shell echo $(VERSION) | cut -f1 -d.)
 
@@ -47,16 +47,7 @@ dev debug: local_add_on
 	export IMAGE=$(PRIVAT_CONTAINER_REGISTRY)$(IMAGE) && \
 	docker buildx bake -f docker-bake.hcl $@
 
-rc: local_add_on
+rc rel: local_add_on
-	@[ "${RC}" ] || ( echo ">> RC is not set"; exit 1 )
-	@echo version: $(VERSION)  build-date: $(BUILD_DATE)   image: $(PUBLIC_CONTAINER_REGISTRY)$(IMAGE)
-	@echo login at $(PUBLIC_URL) as $(PUBLIC_USER)
-	@DO_LOGIN="$(shell echo $(PUBLIC_CR_KEY) | docker login $(PUBLIC_URL) -u $(PUBLIC_USER) --password-stdin)"
-	export VERSION=$(VERSION)-$@$(RC) && \
-	export IMAGE=$(PUBLIC_CONTAINER_REGISTRY)$(IMAGE) && \
-	docker buildx bake -f docker-bake.hcl $@
-
-rel: local_add_on
 	@echo version: $(VERSION)  build-date: $(BUILD_DATE)   image: $(PUBLIC_CONTAINER_REGISTRY)$(IMAGE)
 	@echo login at $(PUBLIC_URL) as $(PUBLIC_USER)
 	@DO_LOGIN="$(shell echo $(PUBLIC_CR_KEY) | docker login $(PUBLIC_URL) -u $(PUBLIC_USER) --password-stdin)"
@@ -83,8 +74,7 @@ SRC_FILES := $(wildcard $(SRC_PROXY)/*.py)\
  $(wildcard $(SRC_PROXY)/cnf/*.py)\
  $(wildcard $(SRC_PROXY)/cnf/*.toml)\
  $(wildcard $(SRC_PROXY)/gen3/*.py)\
- $(wildcard $(SRC_PROXY)/gen3plus/*.py)\
+ $(wildcard $(SRC_PROXY)/gen3plus/*.py)
- $(wildcard $(SRC_PROXY)/web/*.py)
 CNF_FILES := $(wildcard $(CNF_PROXY)/*.toml)
 
 # determine destination files

ha_addons/docker-bake.hcl

@@ -90,7 +90,6 @@ target "preview" {
 target "rc" {
   inherits = ["_common", "_prod"]
   tags = ["${IMAGE}:rc", "${IMAGE}:${VERSION}"]
-  no-cache = true
 }
 
 target "rel" {

ha_addons/ha_addon/DOCS.md

@@ -50,7 +50,7 @@ Example add-on configuration after installation:
 
 ```yaml
 inverters:
-  - serial: R17E000000000000
+  - serial: R17E760702080400
     node_id: PV-Garage
     suggested_area: Garage
     modbus_polling: false
@@ -89,7 +89,7 @@ Example add-on configuration for GEN3PLUS energie storages:
 ```yaml
 batteries:
   - serial: 4100000000000000
-    monitor_sn: 3000000000
+    monitor_sn: 2300000000
     node_id: bat_1
     suggested_area: Garage
     modbus_polling: false
@@ -174,4 +174,4 @@ SOFTWARE.
 [AdGuard]: https://github.com/hassio-addons/addon-adguard-home
 [repository-badge]: https://img.shields.io/badge/Add%20repository%20to%20my-Home%20Assistant-41BDF5?logo=home-assistant&style=for-the-badge
 [repository-url]: https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Fs-allius%2Fha-addons
-[configdetails]: https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-addon
+[configdetails]: https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-toml

ha_addons/ha_addon/Dockerfile

@@ -13,12 +13,12 @@
 # 1 Build Base Image #
 ######################
 
-ARG BUILD_FROM="ghcr.io/hassio-addons/base:17.2.4"
+ARG BUILD_FROM="ghcr.io/hassio-addons/base:17.2.3"
 # hadolint ignore=DL3006
 FROM $BUILD_FROM AS base
 
 # Installiere Python, pip und virtuelle Umgebungstools
-RUN apk add --no-cache python3=3.12.10-r0 py3-pip=24.3.1-r0 && \
+RUN apk add --no-cache python3=3.12.9-r0 py3-pip=24.3.1-r0 && \
     python -m venv /opt/venv && \
     . /opt/venv/bin/activate
 

ha_addons/ha_addon/translations/de.yaml

@@ -10,8 +10,8 @@ configuration:
       Weitere wechselrichterspezifische Parameter (z.B. Polling Mode) können im 
       Konfigurationsblock gesetzt werden.
 
-      Die Seriennummer der GEN3 Wechselrichter beginnen mit 'R17' oder 'R47' und die der GEN3PLUS
+      Die Seriennummer der GEN3 Wechselrichter beginnen mit `R17` oder `R47` und die der GEN3PLUS
-      Wechselrichter mit 'Y00', 'Y17' oder 'Y47'!
+      Wechselrichter mit `Y17`oder `Y47`!
 
       Siehe Beispielkonfiguration im Dokumentations-Tab
   batteries:
@@ -106,4 +106,3 @@ configuration:
 network:
   5005/tcp: listening Port für TSUN GEN3 Wechselrichter
   10000/tcp: listening Port für TSUN GEN3PLUS Wechselrichter
-  8127/tcp: Port für das TSUN-Proxy Dashboard

ha_addons/ha_addon/translations/en.yaml

@@ -10,7 +10,7 @@ configuration:
       in the configuration block.
 
       The serial numbers of all GEN3 inverters start with `R17` or `R47` and that of the GEN3PLUS
-      inverters with 'Y00', ‘Y17’ or ‘Y47’!
+      inverters with ‘Y17’ or ‘Y47’!
       
       For reference see example configuration in Documentation Tab
 
@@ -107,4 +107,3 @@ configuration:
 network:
   5005/tcp: listening Port for TSUN GEN3 Devices
   10000/tcp: listening Port for TSUN GEN3PLUS Devices
-  8127/tcp: Port for the TSUN-Proxy Dashboard

ha_addons/templates/config.jinja

@@ -23,11 +23,8 @@ services:
 ports:
   5005/tcp: 5005
   10000/tcp: 10000
-  8127/tcp: 8127
+
-webui: "http://[HOST]:[PORT:8127]/"
 watchdog: "http://[HOST]:[PORT:8127]/-/healthy"
-ingress: true
-ingress_port: 8127
 
 # Definition of parameters in the configuration tab of the addon
 # parameters are available within the container as /data/options.json
@@ -35,7 +32,7 @@ ingress_port: 8127
 
 schema:
   inverters:
-    - serial: match(^(R17|R47|Y00|Y17|Y47).{13}$)
+    - serial: match(^(R17|R47|Y17|Y47).{13}$)
       monitor_sn: int?
       node_id: str
       suggested_area: str

ha_addons/templates/rel_data.json

@@ -6,6 +6,6 @@
     "slug": "tsun-proxy",
     "advanced": false,
     "stage": "stable",
-    "readme_descr": "Integrates TSUN inverters (e.g. TSOL MS800, MS2000, MS3000) and batteries (TSOL DC1000) into Home Assistant.\n\nIt is based on the [TSUN Proxy][tsunproxy] and enables a reliable connection between TSUN devices and an MQTT broker.\n\nWith the Add-on, you can easily retrieve real-time values such as power, current and daily energy and integrate the inverter into Home Assistant.\nThis works even without an internet connection.\n\nThe optional connection to the TSUN Cloud can be disabled!",
+    "readme_dsecr": "Integrates TSUN inverters (e.g. TSOL MS800, MS2000, MS3000) and batteries (TSOL DC1000) into Home Assistant.\n\nIt is based on the [TSUN Proxy][tsunproxy] and enables a reliable connection between TSUN devices and an MQTT broker.\n\nWith the Add-on, you can easily retrieve real-time values such as power, current and daily energy and integrate the inverter into Home Assistant.\nThis works even without an internet connection.\n\nThe optional connection to the TSUN Cloud can be disabled!",
     "readme_links": "\n[tsunproxy]: https://github.com/s-allius/tsun-gen3-proxy\n"
 }