smarthome/smart_brain
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Heatingvalves added

Browse Source
This commit is contained in:
Dirk Alders 2024-02-11 15:17:34 +01:00
parent 6e6d27685f
commit e0408bf5f6
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devdi

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

30
function/first_floor_west.py
View File

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

1
topics.py
View File

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