Browse Source

Heating valve ffe/julian added

tags/v1.3.0
Dirk Alders 1 year ago
parent
commit
dc259c5447
3 changed files with 13 additions and 13 deletions
  1. 2
    2
      config_example/config.py
  2. 9
    9
      function/first_floor_west.py
  3. 2
    2
      topics.py

+ 2
- 2
config_example/config.py View File

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,
31
-    TOPIC_FFW_SLEEP_HEATING_VALVE_ZIGBEE: 21.5,
30
+    TOPIC_FFW_JULIAN_HEATING_VALVE_ZIGBEE: 21.5,
31
+    TOPIC_FFW_SLEEP_HEATING_VALVE_ZIGBEE: 20.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_LIVINGROOM_HEATING_VALVE_ZIGBEE: 21.5,

+ 9
- 9
function/first_floor_west.py View File

36
         # main light
36
         # main light
37
         self.main_light_shelly = devices.shelly(mqtt_client, config.TOPIC_FFW_JULIAN_MAIN_LIGHT_SHELLY)
37
         self.main_light_shelly = devices.shelly(mqtt_client, config.TOPIC_FFW_JULIAN_MAIN_LIGHT_SHELLY)
38
         self.main_light_tradfri = devices.tradfri_light(mqtt_client, config.TOPIC_FFW_JULIAN_MAIN_LIGHT_ZIGBEE)
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
         super().__init__(mqtt_client)
41
         super().__init__(mqtt_client)
42
         #
42
         #
43
         # Functionality initialisation
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
         # Virtual Device Interface
54
         # Virtual Device Interface

+ 2
- 2
topics.py View File

40
 TOPIC_FFW_JULIAN_MAIN_LIGHT_SHELLY = "shellies/ffw/julian/main_light"
40
 TOPIC_FFW_JULIAN_MAIN_LIGHT_SHELLY = "shellies/ffw/julian/main_light"
41
 TOPIC_FFW_JULIAN_MAIN_LIGHT_VIDEV = "videv/ffw/julian/main_light"
41
 TOPIC_FFW_JULIAN_MAIN_LIGHT_VIDEV = "videv/ffw/julian/main_light"
42
 TOPIC_FFW_JULIAN_MAIN_LIGHT_ZIGBEE = "zigbee/ffw/julian/main_light"
42
 TOPIC_FFW_JULIAN_MAIN_LIGHT_ZIGBEE = "zigbee/ffw/julian/main_light"
43
-# TOPIC_FFW_JULIAN_HEATING_VALVE_ZIGBEE = "zigbee/ffw/julian/heating_valve"
44
-# TOPIC_FFW_JULIAN_HEATING_VALVE_VIDEV = "videv/ffw/julian/heating_valve"
43
+TOPIC_FFW_JULIAN_HEATING_VALVE_ZIGBEE = "zigbee/ffw/julian/heating_valve"
44
+TOPIC_FFW_JULIAN_HEATING_VALVE_VIDEV = "videv/ffw/julian/heating_valve"
45
 
45
 
46
 # bath
46
 # bath
47
 TOPIC_FFW_BATH_HEATING_VALVE_ZIGBEE = "zigbee/ffw/bath/heating_valve"
47
 TOPIC_FFW_BATH_HEATING_VALVE_ZIGBEE = "zigbee/ffw/bath/heating_valve"

Loading…
Cancel
Save