Merge branch 'main' of https://github.com/s-allius/tsun-gen3-proxy in…

…to dev-0.13
s-allius · Jan 16, 2025 · 01ad8ef · 01ad8ef
2 parents f5d760e + 53c76e7
commit 01ad8ef
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - fix the path handling for logging.ini and default_config.toml [#180](https://github.com/s-allius/tsun-gen3-proxy/issues/180)
 
+## [0.12.1] - 2025-01-13
+
+- addon: bump base image version to v17.1.0
+- addon: add syntax check to config parameters
+- addon: bump base image version to v17.0.2
+
 ## [0.12.0] - 2024-12-22
 
 - add hadolint configuration

diff --git a/ha_addons/Makefile b/ha_addons/Makefile
@@ -109,7 +109,7 @@ repro_files = DOCS.md icon.png logo.png translations/de.yaml translations/en.yam
 repro_root = CHANGELOG.md 
 repro_templates = config.yaml
 repro_subdirs = translations rootfs
-repro_vers = debug dev rel
+repro_vers = debug dev rc rel
 
 repro_all_files := $(foreach dir,$(repro_vers), $(foreach file,$(repro_files),$(INST_BASE)/ha_addon_$(dir)/$(file)))
 repro_root_files := $(foreach dir,$(repro_vers), $(foreach file,$(repro_root),$(INST_BASE)/ha_addon_$(dir)/$(file)))
@@ -131,6 +131,8 @@ $(filter $(INST_BASE)/ha_addon_debug/%,$(repro_all_files)) : $(INST_BASE)/ha_add
 	cp $< $@
 $(filter $(INST_BASE)/ha_addon_dev/%,$(repro_all_files)) : $(INST_BASE)/ha_addon_dev/% : ha_addon/%
 	cp $< $@
+$(filter $(INST_BASE)/ha_addon_rc/%,$(repro_all_files)) : $(INST_BASE)/ha_addon_rc/% : ha_addon/%
+	cp $< $@
 $(filter $(INST_BASE)/ha_addon_rel/%,$(repro_all_files)) : $(INST_BASE)/ha_addon_rel/% : ha_addon/%
 	cp $< $@
 

diff --git a/ha_addons/ha_addon/DOCS.md b/ha_addons/ha_addon/DOCS.md
@@ -67,7 +67,7 @@ Example add-on configuration for GEN3PLUS inverters:
 ```yaml
 inverters:
   - serial: Y17000000000000
-    monitor_sn: '2000000000'
+    monitor_sn: 2000000000
     node_id: PV-Garage
     suggested_area: Garage
     modbus_polling: true
@@ -159,4 +159,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-details
+[configdetails]: https://github.com/s-allius/tsun-gen3-proxy/wiki/Configuration-toml
diff --git a/ha_addons/ha_addon/Dockerfile b/ha_addons/ha_addon/Dockerfile
@@ -13,7 +13,7 @@
 # 1 Build Base Image #
 ######################
 
-ARG BUILD_FROM="ghcr.io/hassio-addons/base:17.0.1"
+ARG BUILD_FROM="ghcr.io/hassio-addons/base:17.1.0"
 # hadolint ignore=DL3006
 FROM $BUILD_FROM AS base
 

diff --git a/ha_addons/templates/config.jinja b/ha_addons/templates/config.jinja
@@ -31,16 +31,16 @@ ports:
 # parameters are available within the container as /data/options.json
 # and should become picked up by the proxy - current workaround as a transfer script
 # TODO: check again for multi hierarchie parameters
-# TODO: implement direct reading of the configuration file
+
 schema:
   inverters:
-    - serial: str
+    - serial: match(^(R17|Y17|Y47).{13}$)
       monitor_sn: int?
       node_id: str
       suggested_area: str
       modbus_polling: bool
-      client_mode.host: str?
-      client_mode.port: int?
+      client_mode.host: match(\b((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\b)?
+      client_mode.port: port?
       client_mode.forward: bool?
       #strings: # leider funktioniert es nicht die folgenden 3 parameter im schema aufzulisten. möglicherweise wird die verschachtelung nicht unterstützt.
       #  - string: str
@@ -62,10 +62,11 @@ schema:
   tsun.enabled: bool
   solarman.enabled: bool
   inverters.allow_all: bool
+
   # optionale parameter
-  # TODO besser strukturieren und vervollständigen
+
   mqtt.host: str?
-  mqtt.port: int?
+  mqtt.port: port?
   mqtt.user: str?
   mqtt.passwd: password?
   ha.auto_conf_prefix: str? # suggeriert optionale konfigurationsoption -> es darf jedoch kein default unter "options" angegeben werden

diff --git a/ha_addons/templates/rc_data.json b/ha_addons/templates/rc_data.json
@@ -0,0 +1,10 @@
+
+{
+    "name": "TSUN-Proxy (Release Candidate)",
+    "description": "MQTT Proxy for TSUN Photovoltaic Inverters",
+    "version": "rc",
+    "image": "ghcr.io/s-allius/tsun-gen3-addon",
+    "slug": "tsun-proxy-rc",
+    "advanced": true,
+    "stage": "experimental"
+}