Browse Source

Heating valve ffe/kitchen added

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

+ 1
- 0
config_example/config.py View File

31
     TOPIC_FFW_SLEEP_HEATING_VALVE_ZIGBEE: 20.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_KITCHEN_HEATING_VALVE_ZIGBEE: 20.5,
34
     TOPIC_FFE_LIVINGROOM_HEATING_VALVE_ZIGBEE: 21.5,
35
     TOPIC_FFE_LIVINGROOM_HEATING_VALVE_ZIGBEE: 21.5,
35
     TOPIC_FFE_SLEEP_HEATING_VALVE_ZIGBEE: 21.5
36
     TOPIC_FFE_SLEEP_HEATING_VALVE_ZIGBEE: 21.5
36
 }
37
 }

+ 14
- 0
function/first_floor_east.py View File

59
         # http://shelly1-e89f6d85a466/
59
         # http://shelly1-e89f6d85a466/
60
         # circulation pump
60
         # circulation pump
61
         self.circulation_pump_shelly = devices.shelly(mqtt_client, config.TOPIC_FFE_KITCHEN_CIRCULATION_PUMP_SHELLY)
61
         self.circulation_pump_shelly = devices.shelly(mqtt_client, config.TOPIC_FFE_KITCHEN_CIRCULATION_PUMP_SHELLY)
62
+        # heating function
63
+        self.heating_valve = devices.brennenstuhl_heatingvalve(mqtt_client, config.TOPIC_FFE_KITCHEN_HEATING_VALVE_ZIGBEE)
62
 
64
 
63
         super().__init__(mqtt_client)
65
         super().__init__(mqtt_client)
64
 
66
 
68
         # circulation pump
70
         # circulation pump
69
         self.circulation_pump = timer_on_activation(self.circulation_pump_shelly, devices.shelly.KEY_OUTPUT_0, 10*60)
71
         self.circulation_pump = timer_on_activation(self.circulation_pump_shelly, devices.shelly.KEY_OUTPUT_0, 10*60)
70
         self.circulation_pump_shelly.add_callback(devices.shelly.KEY_OUTPUT_0, True, self.main_light_shelly.flash_0_mcb, True)
72
         self.circulation_pump_shelly.add_callback(devices.shelly.KEY_OUTPUT_0, True, self.main_light_shelly.flash_0_mcb, True)
73
+        # heating function
74
+        self.heating_function = heating_function(
75
+            self.heating_valve,
76
+            config.DEFAULT_TEMPERATURE[self.heating_valve.topic],
77
+            **get_radiator_data(self.heating_valve.topic)
78
+        )
79
+        self.heating_function.add_callback(None, None, set_radiator_data, True)
71
 
80
 
72
         #
81
         #
73
         # Virtual Device Interface
82
         # Virtual Device Interface
83
             self.circulation_pump_shelly, devices.shelly.KEY_OUTPUT_0,
92
             self.circulation_pump_shelly, devices.shelly.KEY_OUTPUT_0,
84
             self.circulation_pump, timer_on_activation.KEY_TIMER
93
             self.circulation_pump, timer_on_activation.KEY_TIMER
85
         )
94
         )
95
+        # heating function
96
+        self.heating_function_videv = videv_heating(
97
+            mqtt_client, config.TOPIC_FFE_KITCHEN_HEATING_VALVE_ZIGBEE,
98
+            self.heating_function
99
+        )
86
 
100
 
87
 
101
 
88
 class first_floor_east_dining(room):
102
 class first_floor_east_dining(room):

+ 2
- 0
topics.py View File

72
 TOPIC_FFE_KITCHEN_MAIN_LIGHT_VIDEV = "videv/ffe/kitchen/main_light"
72
 TOPIC_FFE_KITCHEN_MAIN_LIGHT_VIDEV = "videv/ffe/kitchen/main_light"
73
 TOPIC_FFE_KITCHEN_CIRCULATION_PUMP_SHELLY = "shellies/ffe/kitchen/circulation_pump"
73
 TOPIC_FFE_KITCHEN_CIRCULATION_PUMP_SHELLY = "shellies/ffe/kitchen/circulation_pump"
74
 TOPIC_FFE_KITCHEN_CIRCULATION_PUMP_VIDEV = "videv/ffe/kitchen/circulation_pump"
74
 TOPIC_FFE_KITCHEN_CIRCULATION_PUMP_VIDEV = "videv/ffe/kitchen/circulation_pump"
75
+TOPIC_FFE_KITCHEN_HEATING_VALVE_ZIGBEE = "zigbee/ffe/kitchen/heating_valve"
76
+TOPIC_FFE_KITCHEN_HEATING_VALVE_VIDEV = "videv/ffe/kitchen/heating_valve"
75
 
77
 
76
 # diningroom
78
 # diningroom
77
 TOPIC_FFE_DININGROOM_MAIN_LIGHT_SHELLY = "shellies/ffe/diningroom/main_light"
79
 TOPIC_FFE_DININGROOM_MAIN_LIGHT_SHELLY = "shellies/ffe/diningroom/main_light"

Loading…
Cancel
Save