Browse Source

heating valves moved from ffw->ffe

tags/v1.3.0
Dirk Alders 1 year ago
parent
commit
926974f5e6
4 changed files with 34 additions and 17 deletions
  1. 2
    1
      config_example/config.py
  2. 14
    0
      function/first_floor_east.py
  3. 14
    14
      function/first_floor_west.py
  4. 4
    2
      topics.py

+ 2
- 1
config_example/config.py View File

26
     TOPIC_GFW_MARION_HEATING_VALVE_ZIGBEE: 21.5,
26
     TOPIC_GFW_MARION_HEATING_VALVE_ZIGBEE: 21.5,
27
     # FFW
27
     # FFW
28
     TOPIC_FFW_BATH_HEATING_VALVE_ZIGBEE: 21.5,
28
     TOPIC_FFW_BATH_HEATING_VALVE_ZIGBEE: 21.5,
29
-    TOPIC_FFW_LIVINGROOM_HEATING_VALVE_ZIGBEE: 21.5,
29
+    # TOPIC_FFW_LIVINGROOM_HEATING_VALVE_ZIGBEE: 21.5,
30
     TOPIC_FFW_JULIAN_HEATING_VALVE_ZIGBEE: 21.5,
30
     TOPIC_FFW_JULIAN_HEATING_VALVE_ZIGBEE: 21.5,
31
     TOPIC_FFW_SLEEP_HEATING_VALVE_ZIGBEE: 21.5,
31
     TOPIC_FFW_SLEEP_HEATING_VALVE_ZIGBEE: 21.5,
32
     # FFE
32
     # FFE
33
     TOPIC_FFE_DININGROOM_HEATING_VALVE_ZIGBEE: 21.5,
33
     TOPIC_FFE_DININGROOM_HEATING_VALVE_ZIGBEE: 21.5,
34
+    TOPIC_FFE_LIVINGROOM_HEATING_VALVE_ZIGBEE: 21.5,
34
     TOPIC_FFE_SLEEP_HEATING_VALVE_ZIGBEE: 21.5
35
     TOPIC_FFE_SLEEP_HEATING_VALVE_ZIGBEE: 21.5
35
 }
36
 }
36
 
37
 

+ 14
- 0
function/first_floor_east.py View File

241
         # floor lamp
241
         # floor lamp
242
         self.floorlamp_tradfri = devices.group(
242
         self.floorlamp_tradfri = devices.group(
243
             *[devices.tradfri_light(mqtt_client, config.TOPIC_FFE_LIVINGROOM_FLOOR_LAMP_ZIGBEE % i) for i in range(1, 7)])
243
             *[devices.tradfri_light(mqtt_client, config.TOPIC_FFE_LIVINGROOM_FLOOR_LAMP_ZIGBEE % i) for i in range(1, 7)])
244
+        # heating function
245
+        self.heating_valve = devices.brennenstuhl_heatingvalve(mqtt_client, config.TOPIC_FFE_LIVINGROOM_HEATING_VALVE_ZIGBEE)
244
         # xmas tree
246
         # xmas tree
245
         if config.CHRISTMAS:
247
         if config.CHRISTMAS:
246
             self.powerplug_xmas_tree = devices.silvercrest_powerplug(mqtt_client, config.TOPIC_FFE_LIVINGROOM_XMAS_TREE_POWERPLUG)
248
             self.powerplug_xmas_tree = devices.silvercrest_powerplug(mqtt_client, config.TOPIC_FFE_LIVINGROOM_XMAS_TREE_POWERPLUG)
253
         #
255
         #
254
         # floor lamp synchronisation with main_light
256
         # floor lamp synchronisation with main_light
255
         self.main_light_shelly.add_callback(devices.shelly.KEY_OUTPUT_0, None, self.floorlamp_tradfri.set_output_0_mcb, True)
257
         self.main_light_shelly.add_callback(devices.shelly.KEY_OUTPUT_0, None, self.floorlamp_tradfri.set_output_0_mcb, True)
258
+        # heating function
259
+        self.heating_function = heating_function(
260
+            self.heating_valve,
261
+            config.DEFAULT_TEMPERATURE[self.heating_valve.topic],
262
+            **get_radiator_data(self.heating_valve.topic)
263
+        )
264
+        self.heating_function.add_callback(None, None, set_radiator_data, True)
256
 
265
 
257
         #
266
         #
258
         # Virtual Device Interface
267
         # Virtual Device Interface
271
             self.floorlamp_tradfri, devices.tradfri_light.KEY_BRIGHTNESS,
280
             self.floorlamp_tradfri, devices.tradfri_light.KEY_BRIGHTNESS,
272
             self.floorlamp_tradfri, devices.tradfri_light.KEY_COLOR_TEMP
281
             self.floorlamp_tradfri, devices.tradfri_light.KEY_COLOR_TEMP
273
         )
282
         )
283
+        # heating function
284
+        self.heating_function_videv = videv_heating(
285
+            mqtt_client, config.TOPIC_FFE_LIVINGROOM_HEATING_VALVE_VIDEV,
286
+            self.heating_function
287
+        )
274
         # xmas tree
288
         # xmas tree
275
         if config.CHRISTMAS:
289
         if config.CHRISTMAS:
276
             self.xmas_tree_videv = videv_switching(
290
             self.xmas_tree_videv = videv_switching(

+ 14
- 14
function/first_floor_west.py View File

106
         # main light
106
         # main light
107
         self.main_light_shelly = devices.shelly(mqtt_client, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_SHELLY)
107
         self.main_light_shelly = devices.shelly(mqtt_client, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_SHELLY)
108
         self.main_light_tradfri = devices.tradfri_light(mqtt_client, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_ZIGBEE)
108
         self.main_light_tradfri = devices.tradfri_light(mqtt_client, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_ZIGBEE)
109
-        # heating function
110
-        self.heating_valve = devices.brennenstuhl_heatingvalve(mqtt_client, config.TOPIC_FFW_LIVINGROOM_HEATING_VALVE_ZIGBEE)
109
+        # # heating function
110
+        # self.heating_valve = devices.brennenstuhl_heatingvalve(mqtt_client, config.TOPIC_FFW_LIVINGROOM_HEATING_VALVE_ZIGBEE)
111
         super().__init__(mqtt_client)
111
         super().__init__(mqtt_client)
112
 
112
 
113
         #
113
         #
114
         # Functionality initialisation
114
         # Functionality initialisation
115
         #
115
         #
116
-        # heating function
117
-        self.heating_function = heating_function(
118
-            self.heating_valve,
119
-            config.DEFAULT_TEMPERATURE[self.heating_valve.topic],
120
-            **get_radiator_data(self.heating_valve.topic)
121
-        )
122
-        self.heating_function.add_callback(None, None, set_radiator_data, True)
116
+        # # heating function
117
+        # self.heating_function = heating_function(
118
+        #     self.heating_valve,
119
+        #     config.DEFAULT_TEMPERATURE[self.heating_valve.topic],
120
+        #     **get_radiator_data(self.heating_valve.topic)
121
+        # )
122
+        # self.heating_function.add_callback(None, None, set_radiator_data, True)
123
 
123
 
124
         #
124
         #
125
         # Virtual Device Interface
125
         # Virtual Device Interface
131
             self.main_light_tradfri, devices.tradfri_light.KEY_BRIGHTNESS,
131
             self.main_light_tradfri, devices.tradfri_light.KEY_BRIGHTNESS,
132
             self.main_light_tradfri, devices.tradfri_light.KEY_COLOR_TEMP
132
             self.main_light_tradfri, devices.tradfri_light.KEY_COLOR_TEMP
133
         )
133
         )
134
-        # heating function
135
-        self.heating_function_videv = videv_heating(
136
-            mqtt_client, config.TOPIC_FFW_LIVINGROOM_HEATING_VALVE_VIDEV,
137
-            self.heating_function
138
-        )
134
+        # # heating function
135
+        # self.heating_function_videv = videv_heating(
136
+        #     mqtt_client, config.TOPIC_FFW_LIVINGROOM_HEATING_VALVE_VIDEV,
137
+        #     self.heating_function
138
+        # )
139
 
139
 
140
 
140
 
141
 class first_floor_west_sleep(room):
141
 class first_floor_west_sleep(room):

+ 4
- 2
topics.py View File

51
 TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_SHELLY = "shellies/ffw/livingroom/main_light"
51
 TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_SHELLY = "shellies/ffw/livingroom/main_light"
52
 TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_VIDEV = "videv/ffw/livingroom/main_light"
52
 TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_VIDEV = "videv/ffw/livingroom/main_light"
53
 TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_ZIGBEE = "zigbee/ffw/livingroom/main_light"
53
 TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_ZIGBEE = "zigbee/ffw/livingroom/main_light"
54
-TOPIC_FFW_LIVINGROOM_HEATING_VALVE_ZIGBEE = "zigbee/ffw/livingroom/heating_valve"
55
-TOPIC_FFW_LIVINGROOM_HEATING_VALVE_VIDEV = "videv/ffw/livingroom/heating_valve"
54
+# TOPIC_FFW_LIVINGROOM_HEATING_VALVE_ZIGBEE = "zigbee/ffw/livingroom/heating_valve"
55
+# TOPIC_FFW_LIVINGROOM_HEATING_VALVE_VIDEV = "videv/ffw/livingroom/heating_valve"
56
 
56
 
57
 # sleep
57
 # sleep
58
 TOPIC_FFW_SLEEP_MAIN_LIGHT_SHELLY = "shellies/ffw/sleep/main_light"
58
 TOPIC_FFW_SLEEP_MAIN_LIGHT_SHELLY = "shellies/ffw/sleep/main_light"
105
 TOPIC_FFE_LIVINGROOM_XMAS_TREE_POWERPLUG = "zigbee/ffe/livingroom/powerplug_xmas-tree"
105
 TOPIC_FFE_LIVINGROOM_XMAS_TREE_POWERPLUG = "zigbee/ffe/livingroom/powerplug_xmas-tree"
106
 TOPIC_FFE_LIVINGROOM_XMAS_TREE_VIDEV = "videv/ffe/livingroom/xmas_tree"
106
 TOPIC_FFE_LIVINGROOM_XMAS_TREE_VIDEV = "videv/ffe/livingroom/xmas_tree"
107
 TOPIC_FFE_LIVINGROOM_XMAS_STAR_POWERPLUG = "zigbee/ffe/livingroom/powerplug_xmas-star"
107
 TOPIC_FFE_LIVINGROOM_XMAS_STAR_POWERPLUG = "zigbee/ffe/livingroom/powerplug_xmas-star"
108
+TOPIC_FFE_LIVINGROOM_HEATING_VALVE_ZIGBEE = "zigbee/ffe/livingroom/heating_valve"
109
+TOPIC_FFE_LIVINGROOM_HEATING_VALVE_VIDEV = "videv/ffe/livingroom/heating_valve"
108
 
110
 
109
 
111
 
110
 # first floor east
112
 # first floor east

Loading…
Cancel
Save