From dc259c544768f7a986273b4b5ec06d663850c902 Mon Sep 17 00:00:00 2001 From: Dirk Alders Date: Fri, 20 Oct 2023 17:14:49 +0200 Subject: [PATCH] Heating valve ffe/julian added --- config_example/config.py | 4 ++-- function/first_floor_west.py | 18 +++++++++--------- topics.py | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config_example/config.py b/config_example/config.py index c0ba117..223bb2a 100644 --- a/config_example/config.py +++ b/config_example/config.py @@ -27,8 +27,8 @@ DEFAULT_TEMPERATURE = { # FFW TOPIC_FFW_BATH_HEATING_VALVE_ZIGBEE: 21.5, # TOPIC_FFW_LIVINGROOM_HEATING_VALVE_ZIGBEE: 21.5, - # TOPIC_FFW_JULIAN_HEATING_VALVE_ZIGBEE: 21.5, - TOPIC_FFW_SLEEP_HEATING_VALVE_ZIGBEE: 21.5, + TOPIC_FFW_JULIAN_HEATING_VALVE_ZIGBEE: 21.5, + TOPIC_FFW_SLEEP_HEATING_VALVE_ZIGBEE: 20.5, # FFE TOPIC_FFE_DININGROOM_HEATING_VALVE_ZIGBEE: 21.5, TOPIC_FFE_LIVINGROOM_HEATING_VALVE_ZIGBEE: 21.5, diff --git a/function/first_floor_west.py b/function/first_floor_west.py index 9bd2034..df3b646 100644 --- a/function/first_floor_west.py +++ b/function/first_floor_west.py @@ -36,19 +36,19 @@ class first_floor_west_julian(room): # main light self.main_light_shelly = devices.shelly(mqtt_client, config.TOPIC_FFW_JULIAN_MAIN_LIGHT_SHELLY) self.main_light_tradfri = devices.tradfri_light(mqtt_client, config.TOPIC_FFW_JULIAN_MAIN_LIGHT_ZIGBEE) - # # heating function - # self.heating_valve = devices.brennenstuhl_heatingvalve(mqtt_client, config.TOPIC_FFW_JULIAN_HEATING_VALVE_ZIGBEE) + # heating function + self.heating_valve = devices.brennenstuhl_heatingvalve(mqtt_client, config.TOPIC_FFW_JULIAN_HEATING_VALVE_ZIGBEE) super().__init__(mqtt_client) # # 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[self.heating_valve.topic], + **get_radiator_data(self.heating_valve.topic) + ) + self.heating_function.add_callback(None, None, set_radiator_data, True) # # Virtual Device Interface diff --git a/topics.py b/topics.py index db297a8..f6c83a3 100644 --- a/topics.py +++ b/topics.py @@ -40,8 +40,8 @@ TOPIC_GFW_DIRK_HEATING_VALVE_VIDEV = "videv/gfw/dirk/heating_valve" TOPIC_FFW_JULIAN_MAIN_LIGHT_SHELLY = "shellies/ffw/julian/main_light" TOPIC_FFW_JULIAN_MAIN_LIGHT_VIDEV = "videv/ffw/julian/main_light" TOPIC_FFW_JULIAN_MAIN_LIGHT_ZIGBEE = "zigbee/ffw/julian/main_light" -# TOPIC_FFW_JULIAN_HEATING_VALVE_ZIGBEE = "zigbee/ffw/julian/heating_valve" -# TOPIC_FFW_JULIAN_HEATING_VALVE_VIDEV = "videv/ffw/julian/heating_valve" +TOPIC_FFW_JULIAN_HEATING_VALVE_ZIGBEE = "zigbee/ffw/julian/heating_valve" +TOPIC_FFW_JULIAN_HEATING_VALVE_VIDEV = "videv/ffw/julian/heating_valve" # bath TOPIC_FFW_BATH_HEATING_VALVE_ZIGBEE = "zigbee/ffw/bath/heating_valve"