From 95a9010240c28690baf3ff83cdf33dd1ba1e24d5 Mon Sep 17 00:00:00 2001 From: Dirk Alders Date: Thu, 12 Jan 2023 06:46:20 +0100 Subject: [PATCH] ffe.sleep.bed_light_ma implemented --- __simulation__/rooms.py | 2 ++ function/first_floor_east.py | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/__simulation__/rooms.py b/__simulation__/rooms.py index cf82663..01cf8d2 100644 --- a/__simulation__/rooms.py +++ b/__simulation__/rooms.py @@ -162,6 +162,8 @@ class ffe_sleep(base): # self.gui_bed_light_di = gui_light(mqtt_client, config.TOPIC_FFE_SLEEP_BED_LIGHT_DI_GUI, True, True, False) self.bed_light_di_zigbee = tradfri_light(mqtt_client, config.TOPIC_FFE_SLEEP_BED_LIGHT_DI_ZIGBEE, True, True, False) + self.gui_bed_light_ma = gui_light(mqtt_client, config.TOPIC_FFE_SLEEP_BED_LIGHT_MA_GUI, True, False, False) + self.bed_light_ma_powerplug = silvercrest_powerplug(mqtt_client, config.TOPIC_FFE_SLEEP_BED_LIGHT_MA_POWERPLUG) # self.input_device = tradfri_button(mqtt_client, config.TOPIC_FFE_SLEEP_INPUT_DEVICE) self.led_array = gui_led_array(mqtt_client, config.TOPIC_FFE_SLEEP_DEVICE_CHOOSER_LED) diff --git a/function/first_floor_east.py b/function/first_floor_east.py index 7ade8a2..e526319 100644 --- a/function/first_floor_east.py +++ b/function/first_floor_east.py @@ -63,6 +63,8 @@ class first_floor_east_sleep(room_shelly_tradfri_light): # bed light self.bed_light_di_tradfri = devices.tradfri_light(mqtt_client, config.TOPIC_FFE_SLEEP_BED_LIGHT_DI_ZIGBEE) self.gui_bed_light_di = devices.nodered_gui_light(mqtt_client, config.TOPIC_FFE_SLEEP_BED_LIGHT_DI_GUI) + self.bed_light_ma_powerplug = devices.silvercrest_powerplug(mqtt_client, config.TOPIC_FFE_SLEEP_BED_LIGHT_MA_POWERPLUG) + self.gui_bed_light_ma = devices.nodered_gui_switch(mqtt_client, config.TOPIC_FFE_SLEEP_BED_LIGHT_MA_GUI) # self.button_tradfri = devices.tradfri_button(mqtt_client, config.TOPIC_FFE_SLEEP_INPUT_DEVICE) # button / brightness function @@ -80,11 +82,15 @@ class first_floor_east_sleep(room_shelly_tradfri_light): self.main_light_shelly.toggle_output_0_mcb) self.button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION, devices.tradfri_button.ACTION_LEFT, self.bed_light_di_tradfri.toggle_output_0_mcb) + self.button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION, devices.tradfri_button.ACTION_LEFT_LONG, + self.bed_light_ma_powerplug.toggle_output_0_mcb) # bed light # switch self.gui_bed_light_di.add_callback(devices.nodered_gui_light.KEY_STATE, None, self.bed_light_di_tradfri.set_output_0_mcb) self.bed_light_di_tradfri.add_callback(devices.tradfri_light.KEY_OUTPUT_0, None, self.gui_bed_light_di.set_state_mcb) + self.gui_bed_light_ma.add_callback(devices.nodered_gui_switch.KEY_STATE, None, self.bed_light_ma_powerplug.set_output_0_mcb) + self.bed_light_ma_powerplug.add_callback(devices.silvercrest_powerplug.KEY_OUTPUT_0, None, self.gui_bed_light_ma.set_state_mcb) # brightness and color temperature self.bed_light_di_tradfri.add_callback(devices.tradfri_light.KEY_OUTPUT_0, None, self.gui_bed_light_di.set_enable_mcb) self.gui_bed_light_di.add_callback(devices.nodered_gui_light.KEY_BRIGHTNESS, None, self.bed_light_di_tradfri.set_brightness_mcb)