Added missing water entites

LarsK1 · Oct 9, 2024 · 1741056 · 1741056
1 parent ec61ed5
commit 1741056
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 1 deletion.
diff --git a/custom_components/solvis_control/const.py b/custom_components/solvis_control/const.py
@@ -5,6 +5,7 @@
 CONF_NAME = "name"
 CONF_HOST = "host"
 CONF_PORT = "port"
+
 # Option attributes to make certain values configurable
 CONF_OPTION_1 = "HKR2"  # HKR 2
 CONF_OPTION_2 = "HKR3"  # HKR 3
@@ -41,7 +42,7 @@ class ModbusFieldConfig:
     conf_option: int = 0
 
     # Configuration for which state class a register belongs to
-    # Possibilites:
+    # Possibilities:
     # sensor (0), select (1), number (2), switch (3)
     input_type: int = 0
 
@@ -92,6 +93,16 @@ class ModbusFieldConfig:
         device_class="temperature",
         state_class="measurement",
     ),
+    ModbusFieldConfig(  # Warmwasser Nachheizung Start
+        name="domestic_water_reheat_start",
+        address=2328,
+        unit="",
+        device_class="",
+        state_class="measurement",
+        multiplier=1,
+        input_type=3,
+        register=2,
+    ),
     ModbusFieldConfig(
         name="solar_water_temp",
         address=33030,
@@ -253,6 +264,16 @@ class ModbusFieldConfig:
         options=("2", "3", "4", "5", "6", "7"),
         input_type=1,
     ),
+    ModbusFieldConfig(  # HKR1 Warmwasser Vorrang
+        name="hkr1_warmwasser_vorrang",
+        address=2817,
+        unit="",
+        device_class=None,
+        state_class=None,
+        register=2,
+        multiplier=1,
+        input_type=3,
+    ),
     ModbusFieldConfig(  # HKR1 Vorlaufart
         name="hkr1_vorlaufart",
         address=2819,
@@ -262,6 +283,7 @@ class ModbusFieldConfig:
         register=2,
         multiplier=1,
         input_type=1,
+        enabled_by_default=False,
     ),
     ModbusFieldConfig(  # HKR1 Fix Vorlauf Tag
         name="hkr1_fix_vorlauf_tag",
@@ -379,6 +401,17 @@ class ModbusFieldConfig:
         multiplier=1,
         input_type=1,
         conf_option=1,
+        enabled_by_default=False,
+    ),
+    ModbusFieldConfig(  # HKR2 Warmwasser Vorrang
+        name="hkr2_warmwasser_vorrang",
+        address=3073,
+        unit="",
+        device_class=None,
+        state_class=None,
+        register=2,
+        multiplier=1,
+        input_type=3,
     ),
     ModbusFieldConfig(  # HKR2 Fix Vorlauf Tag
         name="hkr2_fix_vorlauf_tag",
@@ -505,6 +538,17 @@ class ModbusFieldConfig:
         multiplier=1,
         input_type=1,
         conf_option=2,
+        enabled_by_default=False,
+    ),
+    ModbusFieldConfig(  # HKR3 Warmwasser Vorrang
+        name="hkr3_warmwasser_vorrang",
+        address=3329,
+        unit="",
+        device_class=None,
+        state_class=None,
+        register=2,
+        multiplier=1,
+        input_type=3,
     ),
     ModbusFieldConfig(  # HKR3 Fix Vorlauf Tag
         name="hkr3_fix_vorlauf_tag",

diff --git a/custom_components/solvis_control/strings.json b/custom_components/solvis_control/strings.json
@@ -286,6 +286,18 @@
 			},
 			"waermepumpe_leistung":{
 				"name":"Leistung Wärmepumpe"
+			},
+			"domestic_water_reheat_start":{
+				"name":"Warmwasser Nachheizung Start"
+			},
+			"hkr1_warmwasser_vorrang":{
+				"name":"HKR1 Warmwasser Vorrang"
+			},
+			"hkr2_warmwasser_vorrang":{
+				"name":"HKR2 Warmwasser Vorrang"
+			},
+			"hkr3_warmwasser_vorrang":{
+				"name":"HKR3 Warmwasser Vorrang"
 			}
 		}
 	}

diff --git a/custom_components/solvis_control/translations/de.json b/custom_components/solvis_control/translations/de.json
@@ -286,6 +286,18 @@
 			},
 			"waermepumpe_leistung":{
 				"name":"Leistung Wärmepumpe"
+			},
+			"domestic_water_reheat_start":{
+				"name":"Warmwasser Nachheizung Start"
+			},
+			"hkr1_warmwasser_vorrang":{
+				"name":"HKR1 Warmwasser Vorrang"
+			},
+			"hkr2_warmwasser_vorrang":{
+				"name":"HKR2 Warmwasser Vorrang"
+			},
+			"hkr3_warmwasser_vorrang":{
+				"name":"HKR3 Warmwasser Vorrang"
 			}
 		}
 	}