diff --git a/config_example/config.py b/config_example/config.py index 223bb2a..849fcb9 100644 --- a/config_example/config.py +++ b/config_example/config.py @@ -31,6 +31,7 @@ DEFAULT_TEMPERATURE = { TOPIC_FFW_SLEEP_HEATING_VALVE_ZIGBEE: 20.5, # FFE TOPIC_FFE_DININGROOM_HEATING_VALVE_ZIGBEE: 21.5, + TOPIC_FFE_KITCHEN_HEATING_VALVE_ZIGBEE: 20.5, TOPIC_FFE_LIVINGROOM_HEATING_VALVE_ZIGBEE: 21.5, TOPIC_FFE_SLEEP_HEATING_VALVE_ZIGBEE: 21.5 } diff --git a/function/first_floor_east.py b/function/first_floor_east.py index 31e15d0..1843deb 100644 --- a/function/first_floor_east.py +++ b/function/first_floor_east.py @@ -59,6 +59,8 @@ class first_floor_east_kitchen(room): # http://shelly1-e89f6d85a466/ # circulation pump self.circulation_pump_shelly = devices.shelly(mqtt_client, config.TOPIC_FFE_KITCHEN_CIRCULATION_PUMP_SHELLY) + # heating function + self.heating_valve = devices.brennenstuhl_heatingvalve(mqtt_client, config.TOPIC_FFE_KITCHEN_HEATING_VALVE_ZIGBEE) super().__init__(mqtt_client) @@ -68,6 +70,13 @@ class first_floor_east_kitchen(room): # circulation pump self.circulation_pump = timer_on_activation(self.circulation_pump_shelly, devices.shelly.KEY_OUTPUT_0, 10*60) self.circulation_pump_shelly.add_callback(devices.shelly.KEY_OUTPUT_0, True, self.main_light_shelly.flash_0_mcb, True) + # heating function + self.heating_function = heating_function( + self.heating_valve, + config.DEFAULT_TEMPERATURE[self.heating_valve.topic], + **get_radiator_data(self.heating_valve.topic) + ) + self.heating_function.add_callback(None, None, set_radiator_data, True) # # Virtual Device Interface @@ -83,6 +92,11 @@ class first_floor_east_kitchen(room): self.circulation_pump_shelly, devices.shelly.KEY_OUTPUT_0, self.circulation_pump, timer_on_activation.KEY_TIMER ) + # heating function + self.heating_function_videv = videv_heating( + mqtt_client, config.TOPIC_FFE_KITCHEN_HEATING_VALVE_ZIGBEE, + self.heating_function + ) class first_floor_east_dining(room): diff --git a/topics.py b/topics.py index f6c83a3..a0fdeb3 100644 --- a/topics.py +++ b/topics.py @@ -72,6 +72,8 @@ TOPIC_FFE_KITCHEN_MAIN_LIGHT_SHELLY = "shellies/ffe/kitchen/main_light" TOPIC_FFE_KITCHEN_MAIN_LIGHT_VIDEV = "videv/ffe/kitchen/main_light" TOPIC_FFE_KITCHEN_CIRCULATION_PUMP_SHELLY = "shellies/ffe/kitchen/circulation_pump" TOPIC_FFE_KITCHEN_CIRCULATION_PUMP_VIDEV = "videv/ffe/kitchen/circulation_pump" +TOPIC_FFE_KITCHEN_HEATING_VALVE_ZIGBEE = "zigbee/ffe/kitchen/heating_valve" +TOPIC_FFE_KITCHEN_HEATING_VALVE_VIDEV = "videv/ffe/kitchen/heating_valve" # diningroom TOPIC_FFE_DININGROOM_MAIN_LIGHT_SHELLY = "shellies/ffe/diningroom/main_light"