|
@@ -36,19 +36,19 @@ class first_floor_west_julian(room):
|
36
|
36
|
# main light
|
37
|
37
|
self.main_light_shelly = devices.shelly(mqtt_client, config.TOPIC_FFW_JULIAN_MAIN_LIGHT_SHELLY)
|
38
|
38
|
self.main_light_tradfri = devices.tradfri_light(mqtt_client, config.TOPIC_FFW_JULIAN_MAIN_LIGHT_ZIGBEE)
|
39
|
|
- # heating function
|
40
|
|
- self.heating_valve = devices.brennenstuhl_heatingvalve(mqtt_client, config.TOPIC_FFW_JULIAN_HEATING_VALVE_ZIGBEE)
|
|
39
|
+ # # heating function
|
|
40
|
+ # self.heating_valve = devices.brennenstuhl_heatingvalve(mqtt_client, config.TOPIC_FFW_JULIAN_HEATING_VALVE_ZIGBEE)
|
41
|
41
|
super().__init__(mqtt_client)
|
42
|
42
|
#
|
43
|
43
|
# Functionality initialisation
|
44
|
44
|
#
|
45
|
|
- # heating function
|
46
|
|
- self.heating_function = heating_function(
|
47
|
|
- self.heating_valve,
|
48
|
|
- config.DEFAULT_TEMPERATURE[self.heating_valve.topic],
|
49
|
|
- **get_radiator_data(self.heating_valve.topic)
|
50
|
|
- )
|
51
|
|
- self.heating_function.add_callback(None, None, set_radiator_data, True)
|
|
45
|
+ # # heating function
|
|
46
|
+ # self.heating_function = heating_function(
|
|
47
|
+ # self.heating_valve,
|
|
48
|
+ # config.DEFAULT_TEMPERATURE[self.heating_valve.topic],
|
|
49
|
+ # **get_radiator_data(self.heating_valve.topic)
|
|
50
|
+ # )
|
|
51
|
+ # self.heating_function.add_callback(None, None, set_radiator_data, True)
|
52
|
52
|
|
53
|
53
|
#
|
54
|
54
|
# Virtual Device Interface
|
|
@@ -60,11 +60,11 @@ class first_floor_west_julian(room):
|
60
|
60
|
self.main_light_tradfri, devices.tradfri_light.KEY_BRIGHTNESS,
|
61
|
61
|
self.main_light_tradfri, devices.tradfri_light.KEY_COLOR_TEMP
|
62
|
62
|
)
|
63
|
|
- # heating function
|
64
|
|
- self.heating_function_videv = videv_heating(
|
65
|
|
- mqtt_client, config.TOPIC_FFW_JULIAN_HEATING_VALVE_VIDEV,
|
66
|
|
- self.heating_function
|
67
|
|
- )
|
|
63
|
+ # # heating function
|
|
64
|
+ # self.heating_function_videv = videv_heating(
|
|
65
|
+ # mqtt_client, config.TOPIC_FFW_JULIAN_HEATING_VALVE_VIDEV,
|
|
66
|
+ # self.heating_function
|
|
67
|
+ # )
|
68
|
68
|
|
69
|
69
|
|
70
|
70
|
class first_floor_west_bath(room):
|