heating valves removed, defect

This commit is contained in:
Dirk Alders 2023-10-15 19:04:16 +02:00
parent 926974f5e6
commit 348f4b1eea
3 changed files with 17 additions and 17 deletions

View File

@ -27,7 +27,7 @@ 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_JULIAN_HEATING_VALVE_ZIGBEE: 21.5,
TOPIC_FFW_SLEEP_HEATING_VALVE_ZIGBEE: 21.5,
# FFE
TOPIC_FFE_DININGROOM_HEATING_VALVE_ZIGBEE: 21.5,

View File

@ -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
@ -60,11 +60,11 @@ class first_floor_west_julian(room):
self.main_light_tradfri, devices.tradfri_light.KEY_BRIGHTNESS,
self.main_light_tradfri, devices.tradfri_light.KEY_COLOR_TEMP
)
# heating function
self.heating_function_videv = videv_heating(
mqtt_client, config.TOPIC_FFW_JULIAN_HEATING_VALVE_VIDEV,
self.heating_function
)
# # heating function
# self.heating_function_videv = videv_heating(
# mqtt_client, config.TOPIC_FFW_JULIAN_HEATING_VALVE_VIDEV,
# self.heating_function
# )
class first_floor_west_bath(room):

View File

@ -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"