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

heating valves moved from ffw->ffe

Browse Source
This commit is contained in:
Dirk Alders 2023-10-15 16:35:08 +02:00
parent dacabbdde5
commit 926974f5e6
4 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config_example/config.py
View File

@ -26,11 +26,12 @@ DEFAULT_TEMPERATURE = {
TOPIC_GFW_MARION_HEATING_VALVE_ZIGBEE: 21.5, TOPIC_GFW_MARION_HEATING_VALVE_ZIGBEE: 21.5,
# FFW # FFW
TOPIC_FFW_BATH_HEATING_VALVE_ZIGBEE: 21.5, TOPIC_FFW_BATH_HEATING_VALVE_ZIGBEE: 21.5,
TOPIC_FFW_LIVINGROOM_HEATING_VALVE_ZIGBEE: 21.5, # TOPIC_FFW_LIVINGROOM_HEATING_VALVE_ZIGBEE: 21.5,
TOPIC_FFW_JULIAN_HEATING_VALVE_ZIGBEE: 21.5, TOPIC_FFW_JULIAN_HEATING_VALVE_ZIGBEE: 21.5,
TOPIC_FFW_SLEEP_HEATING_VALVE_ZIGBEE: 21.5, TOPIC_FFW_SLEEP_HEATING_VALVE_ZIGBEE: 21.5,
# FFE # FFE
TOPIC_FFE_DININGROOM_HEATING_VALVE_ZIGBEE: 21.5, TOPIC_FFE_DININGROOM_HEATING_VALVE_ZIGBEE: 21.5,
TOPIC_FFE_LIVINGROOM_HEATING_VALVE_ZIGBEE: 21.5,
TOPIC_FFE_SLEEP_HEATING_VALVE_ZIGBEE: 21.5 TOPIC_FFE_SLEEP_HEATING_VALVE_ZIGBEE: 21.5
} }

14
function/first_floor_east.py
View File

@ -241,6 +241,8 @@ class first_floor_east_living(room):
# floor lamp # floor lamp
self.floorlamp_tradfri = devices.group( self.floorlamp_tradfri = devices.group(
*[devices.tradfri_light(mqtt_client, config.TOPIC_FFE_LIVINGROOM_FLOOR_LAMP_ZIGBEE % i) for i in range(1, 7)]) *[devices.tradfri_light(mqtt_client, config.TOPIC_FFE_LIVINGROOM_FLOOR_LAMP_ZIGBEE % i) for i in range(1, 7)])
# heating function
self.heating_valve = devices.brennenstuhl_heatingvalve(mqtt_client, config.TOPIC_FFE_LIVINGROOM_HEATING_VALVE_ZIGBEE)
# xmas tree # xmas tree
if config.CHRISTMAS: if config.CHRISTMAS:
self.powerplug_xmas_tree = devices.silvercrest_powerplug(mqtt_client, config.TOPIC_FFE_LIVINGROOM_XMAS_TREE_POWERPLUG) self.powerplug_xmas_tree = devices.silvercrest_powerplug(mqtt_client, config.TOPIC_FFE_LIVINGROOM_XMAS_TREE_POWERPLUG)
@ -253,6 +255,13 @@ class first_floor_east_living(room):
# #
# floor lamp synchronisation with main_light # floor lamp synchronisation with main_light
self.main_light_shelly.add_callback(devices.shelly.KEY_OUTPUT_0, None, self.floorlamp_tradfri.set_output_0_mcb, True) self.main_light_shelly.add_callback(devices.shelly.KEY_OUTPUT_0, None, self.floorlamp_tradfri.set_output_0_mcb, 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 # Virtual Device Interface
@ -271,6 +280,11 @@ class first_floor_east_living(room):
self.floorlamp_tradfri, devices.tradfri_light.KEY_BRIGHTNESS, self.floorlamp_tradfri, devices.tradfri_light.KEY_BRIGHTNESS,
self.floorlamp_tradfri, devices.tradfri_light.KEY_COLOR_TEMP self.floorlamp_tradfri, devices.tradfri_light.KEY_COLOR_TEMP
) )
# heating function
self.heating_function_videv = videv_heating(
mqtt_client, config.TOPIC_FFE_LIVINGROOM_HEATING_VALVE_VIDEV,
self.heating_function
)
# xmas tree # xmas tree
if config.CHRISTMAS: if config.CHRISTMAS:
self.xmas_tree_videv = videv_switching( self.xmas_tree_videv = videv_switching(

28
function/first_floor_west.py
View File

@ -106,20 +106,20 @@ class first_floor_west_living(room):
# main light # main light
self.main_light_shelly = devices.shelly(mqtt_client, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_SHELLY) self.main_light_shelly = devices.shelly(mqtt_client, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_SHELLY)
self.main_light_tradfri = devices.tradfri_light(mqtt_client, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_ZIGBEE) self.main_light_tradfri = devices.tradfri_light(mqtt_client, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_ZIGBEE)
# heating function # # heating function
self.heating_valve = devices.brennenstuhl_heatingvalve(mqtt_client, config.TOPIC_FFW_LIVINGROOM_HEATING_VALVE_ZIGBEE) # self.heating_valve = devices.brennenstuhl_heatingvalve(mqtt_client, config.TOPIC_FFW_LIVINGROOM_HEATING_VALVE_ZIGBEE)
super().__init__(mqtt_client) super().__init__(mqtt_client)
# #
# 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[self.heating_valve.topic],
**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
@ -131,11 +131,11 @@ class first_floor_west_living(room):
self.main_light_tradfri, devices.tradfri_light.KEY_BRIGHTNESS, self.main_light_tradfri, devices.tradfri_light.KEY_BRIGHTNESS,
self.main_light_tradfri, devices.tradfri_light.KEY_COLOR_TEMP self.main_light_tradfri, devices.tradfri_light.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):

6
topics.py
View File

@ -51,8 +51,8 @@ TOPIC_FFW_BATH_HEATING_VALVE_VIDEV = "videv/ffw/bath/heating_valve"
TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_SHELLY = "shellies/ffw/livingroom/main_light" TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_SHELLY = "shellies/ffw/livingroom/main_light"
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_MAIN_LIGHT_ZIGBEE = "zigbee/ffw/livingroom/main_light" TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_ZIGBEE = "zigbee/ffw/livingroom/main_light"
TOPIC_FFW_LIVINGROOM_HEATING_VALVE_ZIGBEE = "zigbee/ffw/livingroom/heating_valve" # TOPIC_FFW_LIVINGROOM_HEATING_VALVE_ZIGBEE = "zigbee/ffw/livingroom/heating_valve"
TOPIC_FFW_LIVINGROOM_HEATING_VALVE_VIDEV = "videv/ffw/livingroom/heating_valve" # TOPIC_FFW_LIVINGROOM_HEATING_VALVE_VIDEV = "videv/ffw/livingroom/heating_valve"
# sleep # sleep
TOPIC_FFW_SLEEP_MAIN_LIGHT_SHELLY = "shellies/ffw/sleep/main_light" TOPIC_FFW_SLEEP_MAIN_LIGHT_SHELLY = "shellies/ffw/sleep/main_light"
@ -105,6 +105,8 @@ TOPIC_FFE_LIVINGROOM_FLOOR_LAMP_VIDEV = "videv/ffe/livingroom/floorlamp"
TOPIC_FFE_LIVINGROOM_XMAS_TREE_POWERPLUG = "zigbee/ffe/livingroom/powerplug_xmas-tree" TOPIC_FFE_LIVINGROOM_XMAS_TREE_POWERPLUG = "zigbee/ffe/livingroom/powerplug_xmas-tree"
TOPIC_FFE_LIVINGROOM_XMAS_TREE_VIDEV = "videv/ffe/livingroom/xmas_tree" TOPIC_FFE_LIVINGROOM_XMAS_TREE_VIDEV = "videv/ffe/livingroom/xmas_tree"
TOPIC_FFE_LIVINGROOM_XMAS_STAR_POWERPLUG = "zigbee/ffe/livingroom/powerplug_xmas-star" TOPIC_FFE_LIVINGROOM_XMAS_STAR_POWERPLUG = "zigbee/ffe/livingroom/powerplug_xmas-star"
TOPIC_FFE_LIVINGROOM_HEATING_VALVE_ZIGBEE = "zigbee/ffe/livingroom/heating_valve"
TOPIC_FFE_LIVINGROOM_HEATING_VALVE_VIDEV = "videv/ffe/livingroom/heating_valve"
# first floor east # first floor east