Heatingvalves added

devdi

@@ -1 +1 @@
-Subproject commit 5a94efbc8c4ca7e1a7ef6f40df53177717bb7c16
+Subproject commit 0620158064ab5bbb932c2afb9f557cf0b18b37e3

function/first_floor_west.py

@@ -111,20 +111,20 @@ class first_floor_west_living(room):
         # main light
         self.main_light_shelly = pd.get(props.STG_SHE, loc, roo, props.FUN_MAL)
         self.main_light_tradfri = pd.get(props.STG_ZFW, loc, roo, props.FUN_MAL)
-        # # heating function
-        # self.heating_valve = pd.get(props.STG_ZFW, loc, roo, props.FUN_HEA)
+        # heating function
+        self.heating_valve = pd.get(props.STG_ZFW, loc, roo, props.FUN_HEA)
         super().__init__(mqtt_client, pd, vd)
 
         #
         # Functionality initialisation
         #
-        # # heating function
-        # self.heating_function = heating_function(
-        #     self.heating_valve,
-        #     config.DEFAULT_TEMPERATURE[self.heating_valve.topic],
-        #     **get_radiator_data(self.heating_valve.topic)
-        # )
-        # self.heating_function.add_callback(None, None, set_radiator_data, True)
+        # heating function
+        self.heating_function = heating_function(
+            self.heating_valve,
+            config.DEFAULT_TEMPERATURE,
+            **get_radiator_data(self.heating_valve.topic)
+        )
+        self.heating_function.add_callback(None, None, set_radiator_data, True)
 
         #
         # Virtual Device Interface
@@ -136,11 +136,11 @@ class first_floor_west_living(room):
             self.main_light_tradfri, self.main_light_tradfri.KEY_BRIGHTNESS,
             self.main_light_tradfri, self.main_light_tradfri.KEY_COLOR_TEMP
         )
-        # # heating function
-        # self.heating_function_videv = videv_heating(
-        #     mqtt_client, config.TOPIC_FFW_LIVINGROOM_HEATING_VALVE_VIDEV,
-        #     self.heating_function
-        # )
+        # heating function
+        self.heating_function_videv = videv_heating(
+            mqtt_client, config.TOPIC_FFW_LIVINGROOM_HEATING_VALVE_VIDEV,
+            self.heating_function
+        )
 
 
 class first_floor_west_sleep(room):
@@ -157,7 +157,7 @@ class first_floor_west_sleep(room):
         self.heating_valve = pd.get(props.STG_ZFW, loc, roo, props.FUN_HEA)
         super().__init__(mqtt_client, pd, vd)
 
-        #
+        #  
         # Functionality initialisation
         #
         # heating function

topics.py

@@ -32,6 +32,7 @@ TOPIC_FFW_BATH_HEATING_VALVE_VIDEV = "videv/ffw/bath/heating_valve"
 
 # livingroom
 TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_VIDEV = "videv/ffw/livingroom/main_light"
+TOPIC_FFW_LIVINGROOM_HEATING_VALVE_VIDEV = "videv/ffw/livingroom/heating_valve"
 
 # sleep
 TOPIC_FFW_SLEEP_MAIN_LIGHT_VIDEV = "videv/ffw/sleep/main_light"