Merge remote-tracking branch 'origin/main'

LarsK1 · Oct 22, 2024 · 9968a84 · 9968a84
2 parents ad30fca + 87a9cf8
commit 9968a84
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 1 deletion.
diff --git a/custom_components/solvis_control/const.py b/custom_components/solvis_control/const.py
@@ -327,6 +327,16 @@ class ModbusFieldConfig:
         multiplier=1,
         conf_option=3,
     ),
+    ModbusFieldConfig(  # Solarleistung
+        name="solar_leistung",
+        address=33543,
+        unit="kW",
+        device_class="power",
+        state_class="measurement",
+        register=2,
+        edit=False,
+        conf_option=3,
+    ),
     ModbusFieldConfig(  # Durchfluss Warmwasserzirkualation
         name="domestic_water_flow",
         address=33041,

diff --git a/custom_components/solvis_control/strings.json b/custom_components/solvis_control/strings.json
@@ -218,6 +218,9 @@
 			"solar_heat_exchanger_out_water_temp":{
 				"name":"Solarwärmetauschertemperatur Out"
 			},
+			"solar_leistung":{
+				"name":"Leistung Solarthermie"
+			},
 			"tank_layer1_water_temp":{
 				"name":"Speicherreferenztemperatur"
 			},

diff --git a/custom_components/solvis_control/translations/de.json b/custom_components/solvis_control/translations/de.json
@@ -218,6 +218,9 @@
 			"solar_heat_exchanger_out_water_temp":{
 				"name":"Solarwärmetauschertemperatur Out"
 			},
+			"solar_leistung":{
+				"name":"Leistung Solarthermie"
+			},
 			"tank_layer1_water_temp":{
 				"name":"Speicherreferenztemperatur"
 			},

diff --git a/custom_components/solvis_control/translations/en.json b/custom_components/solvis_control/translations/en.json
@@ -218,6 +218,9 @@
 			"solar_heat_exchanger_out_water_temp":{
 				"name":"solar heat exchanger temperature out"
 			},
+			"solar_leistung":{
+				"name":"Leistung Solarthermie"
+			},
 			"tank_layer1_water_temp":{
 				"name":"storage tank reference temperature"
 			},

diff --git a/supported-entites.md b/supported-entites.md
@@ -115,7 +115,7 @@
 
 # Holding Register
 | Adresse | Sovlis Beschreibung               | Unterstützt seit V | Sensortyp | Conf.-Option | Bemerkung                           | Min  | Max   | Einheit  |
-| ------- | --------------------------------- | ------------------ | --------- | ------------ | ----------------------------------- | ---- | ----- | -------- |
+|---------|-----------------------------------|--------------------|-----------|--------------|-------------------------------------|------|-------|----------|
 | 1542    | Solar primär Drehzahl max         |                    |           |              |                                     | 0    | 100   | %        |
 | 1543    | Solar primär Drehzahl min         |                    |           |              |                                     | 0    | 100   | %        |
 | 1798    | Solar sekundär Drehzahl max       |                    |           |              |                                     | 0    | 100   | %        |
@@ -177,6 +177,7 @@
 | 3393    | HKR3 Urlaub auswärts bis Tag      |                    |           |              |                                     | 1    | 31    | Tag      |
 | 3394    | HKR3 Urlaub auswärts bis Monat    |                    |           |              |                                     | 1    | 12    | Monat    |
 | 3395    | HKR3 Urlaub auswärts bis Jahr     |                    |           |              |                                     | 2006 | 2099  | Jahr     |
+| 33543   | Leistung Solarthermie             | 1.1.3              | 0         | 3            | not in Solvis Documentation         | 0    |       | kW       |
 | 33544   | Wärmepumpe Leistung               | 0.9                | 0         | 4            | not in Solvis Documentation         |      |       | kW       |
 | 33545   | Elektrische Wärmepumpenleistung   | 0.9                | 0         | 4            | not in Solvis Documentation         |      |       | kW       |
 | 34048   | Wochenplan HK 1 Tag 1 Start 0     |                    |           |              |                                     | 0    | 95    | 0,25h    |