|
@@ -111,20 +111,20 @@ class first_floor_west_living(room):
|
111
|
111
|
# main light
|
112
|
112
|
self.main_light_shelly = pd.get(props.STG_SHE, loc, roo, props.FUN_MAL)
|
113
|
113
|
self.main_light_tradfri = pd.get(props.STG_ZFW, loc, roo, props.FUN_MAL)
|
114
|
|
- # # heating function
|
115
|
|
- # self.heating_valve = pd.get(props.STG_ZFW, loc, roo, props.FUN_HEA)
|
|
114
|
+ # heating function
|
|
115
|
+ self.heating_valve = pd.get(props.STG_ZFW, loc, roo, props.FUN_HEA)
|
116
|
116
|
super().__init__(mqtt_client, pd, vd)
|
117
|
117
|
|
118
|
118
|
#
|
119
|
119
|
# Functionality initialisation
|
120
|
120
|
#
|
121
|
|
- # # heating function
|
122
|
|
- # self.heating_function = heating_function(
|
123
|
|
- # self.heating_valve,
|
124
|
|
- # config.DEFAULT_TEMPERATURE[self.heating_valve.topic],
|
125
|
|
- # **get_radiator_data(self.heating_valve.topic)
|
126
|
|
- # )
|
127
|
|
- # self.heating_function.add_callback(None, None, set_radiator_data, True)
|
|
121
|
+ # heating function
|
|
122
|
+ self.heating_function = heating_function(
|
|
123
|
+ self.heating_valve,
|
|
124
|
+ config.DEFAULT_TEMPERATURE,
|
|
125
|
+ **get_radiator_data(self.heating_valve.topic)
|
|
126
|
+ )
|
|
127
|
+ self.heating_function.add_callback(None, None, set_radiator_data, True)
|
128
|
128
|
|
129
|
129
|
#
|
130
|
130
|
# Virtual Device Interface
|
|
@@ -136,11 +136,11 @@ class first_floor_west_living(room):
|
136
|
136
|
self.main_light_tradfri, self.main_light_tradfri.KEY_BRIGHTNESS,
|
137
|
137
|
self.main_light_tradfri, self.main_light_tradfri.KEY_COLOR_TEMP
|
138
|
138
|
)
|
139
|
|
- # # heating function
|
140
|
|
- # self.heating_function_videv = videv_heating(
|
141
|
|
- # mqtt_client, config.TOPIC_FFW_LIVINGROOM_HEATING_VALVE_VIDEV,
|
142
|
|
- # self.heating_function
|
143
|
|
- # )
|
|
139
|
+ # heating function
|
|
140
|
+ self.heating_function_videv = videv_heating(
|
|
141
|
+ mqtt_client, config.TOPIC_FFW_LIVINGROOM_HEATING_VALVE_VIDEV,
|
|
142
|
+ self.heating_function
|
|
143
|
+ )
|
144
|
144
|
|
145
|
145
|
|
146
|
146
|
class first_floor_west_sleep(room):
|
|
@@ -157,7 +157,7 @@ class first_floor_west_sleep(room):
|
157
|
157
|
self.heating_valve = pd.get(props.STG_ZFW, loc, roo, props.FUN_HEA)
|
158
|
158
|
super().__init__(mqtt_client, pd, vd)
|
159
|
159
|
|
160
|
|
- #
|
|
160
|
+ #
|
161
|
161
|
# Functionality initialisation
|
162
|
162
|
#
|
163
|
163
|
# heating function
|