From 22e36a361562cea33552c9001d5a98d3afb02eaa Mon Sep 17 00:00:00 2001 From: Dirk Alders Date: Thu, 22 Dec 2022 20:12:57 +0100 Subject: [PATCH] device chooser and brightness actions implemented --- devices/__init__.py | 78 +++++++++++++++++++++--- function/first_floor_east.py | 6 +- function/ground_floor_west.py | 110 +++++++++++++++++++++++++++++++--- 3 files changed, 175 insertions(+), 19 deletions(-) diff --git a/devices/__init__.py b/devices/__init__.py index 4016d4f..c06da9d 100644 --- a/devices/__init__.py +++ b/devices/__init__.py @@ -150,7 +150,8 @@ class base(dict): else: if type(data) not in [str, bytes]: data = json.dumps(data) - self.mqtt_client.send('/'.join([self.topic, key, self.TX_TOPIC]), data) + self.mqtt_client.send('/'.join([self.topic, key, self.TX_TOPIC] + if len(self.TX_TOPIC) > 0 else [self.topic, key]), data) else: logger.error( "Unknown tx toptic. Set TX_TOPIC of class to a known value") @@ -448,14 +449,14 @@ class tradfri_light(base): """brightness: [0, ..., 100]""" self.pack(self.KEY_BRIGHTNESS, brightness) - def brightness_inc(self, speed=40): + def default_inc(self, speed=40): self.pack(self.KEY_BRIGHTNESS_FADE, speed) - def brightness_dec(self, speed=-40): - self.brightness_inc(speed) + def default_dec(self, speed=-40): + self.default_inc(speed) - def brightness_stop(self): - self.brightness_inc(0) + def default_stop(self): + self.default_inc(0) def set_color_temp(self, color_temp): """color_temp: [0, ..., 100]""" @@ -587,8 +588,6 @@ class brennenstuhl_heatingvalve(base): KEY_WINDOW_DETECTION = "window_detection" # TX_TOPIC = 'set' - TX_VALUE = 0 - TX_DICT = 1 TX_TYPE = base.TX_DICT TX_FILTER_DATA_KEYS = [] # @@ -629,3 +628,66 @@ class brennenstuhl_heatingvalve(base): # def set_heating_setpoint(self, setpoint): self.pack(self.KEY_HEATING_SETPOINT, setpoint) + + +class remote(base): + KEY_CD = "CD" + KEY_LINE1 = "LINE1" + KEY_LINE3 = "LINE3" + KEY_MUTE = "MUTE" + KEY_POWER = "POWER" + KEY_VOLDOWN = "VOLDOWN" + KEY_VOLUP = "VOLUP" + # + TX_TOPIC = '' + TX_TYPE = base.TX_VALUE + TX_FILTER_DATA_KEYS = [] + + def set_cd(self): + """data: [True, False]""" + self.pack(self.KEY_CD, None) + + def set_line1(self): + """data: [True, False]""" + self.pack(self.KEY_LINE1, None) + + def set_line3(self): + """data: [True, False]""" + self.pack(self.KEY_LINE3, None) + + def set_mute(self): + """data: [True, False]""" + self.pack(self.KEY_MUTE, None) + + def set_power(self): + """data: [True, False]""" + self.pack(self.KEY_POWER, None) + + def set_volume_up(self, data=False): + """data: [True, False]""" + self.pack(self.KEY_VOLUP, data) + + def set_volume_down(self, data=False): + """data: [True, False]""" + self.pack(self.KEY_VOLDOWN, data) + + def default_inc(self): + self.set_volume_up(True) + + def default_dec(self): + self.set_volume_down(True) + + def default_stop(self): + self.set_volume_up(False) + + +class status(base): + KEY_STATE = "state" + # + TX_TOPIC = '' + TX_TYPE = base.TX_VALUE + TX_FILTER_DATA_KEYS = [] + + def set_state(self, num, data): + """data: [True, False]""" + self.pack(self.KEY_STATE + "/" + str(num), data) diff --git a/function/first_floor_east.py b/function/first_floor_east.py index b807d28..465da9a 100644 --- a/function/first_floor_east.py +++ b/function/first_floor_east.py @@ -164,13 +164,13 @@ class first_floor_east_sleep_madi(room_shelly_tradfri_light): return if (data == devices.tradfri_button.ACTION_BRIGHTNESS_UP_LONG): logger.info("Increasing brightness \"%s\" %s", type(self).__name__, target.topic) - target.brightness_inc() + target.default_inc() elif (data == devices.tradfri_button.ACTION_BRIGHTNESS_DOWN_LONG): logger.info("Decreasing brightness \"%s\" %s", type(self).__name__, target.topic) - target.brightness_dec() + target.default_dec() elif (data in [devices.tradfri_button.ACTION_BRIGHTNESS_UP_RELEASE, devices.tradfri_button.ACTION_BRIGHTNESS_DOWN_RELEASE]): logger.info("Stoping brightness change \"%s\" %s", type(self).__name__, target.topic) - target.brightness_stop() + target.default_stop() class first_floor_east_living(room_shelly_tradfri_light): diff --git a/function/ground_floor_west.py b/function/ground_floor_west.py index 571a95a..3cfb4c1 100644 --- a/function/ground_floor_west.py +++ b/function/ground_floor_west.py @@ -45,6 +45,11 @@ class ground_floor_west_marion(room_shelly): class ground_floor_west_dirk(room_shelly_tradfri_light): + STATE_ACTIVE_DEVICE_MAIN_LIGHT = 0 + STATE_ACTIVE_DEVICE_DESK_LIGHT = 1 + STATE_ACTIVE_DEVICE_AMPLIFIER = 2 + STATE_ACTIVE_DEVICE_MAX_VALUE = STATE_ACTIVE_DEVICE_AMPLIFIER + # https://shelly1l-3C6105E44F27 def __init__(self, mqtt_client): super().__init__(mqtt_client, "shellies/dirk", "gui/gfw_sw_dirk", @@ -54,7 +59,9 @@ class ground_floor_west_dirk(room_shelly_tradfri_light): self.desk_light_tradfri = devices.tradfri_light(mqtt_client, "zigbee_eg_w/light/dirk_desk") self.button_tradfri = devices.tradfri_button(mqtt_client, "zigbee_eg_w/input_device/dirk") # - self.powerplug_common.add_callback(None, None, self.powerplug_common_actions) + self.powerplug_common.add_callback(None, None, self.powerplug_gui_feedback_actions) + self.powerplug_common.add_callback(devices.my_powerplug.KEY_OUTPUT_2, None, + self.powerplug_amplifier_synchronisation) # self.gui_switch_desk_light = devices.nodered_gui(mqtt_client, "gui/gfw_sw_desk_light") self.gui_brightness_desk_light = devices.nodered_gui(mqtt_client, "gui/gfw_br_desk_light") @@ -68,6 +75,9 @@ class ground_floor_west_dirk(room_shelly_tradfri_light): self.gui_switch_cd_player = devices.nodered_gui(mqtt_client, "gui/gfw_sw_cd_player") self.gui_switch_pc_dock = devices.nodered_gui(mqtt_client, "gui/gfw_sw_pc_dock") # + self.remote_amplifier = devices.remote(mqtt_client, "hifi/remote/RAS5") + self.active_device_state_led = devices.status(mqtt_client, "gui/gfw_avtive_device_state") + # self.button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION, devices.tradfri_button.ACTION_TOGGLE, self.toggle_main_light) self.button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION, @@ -78,12 +88,13 @@ class ground_floor_west_dirk(room_shelly_tradfri_light): devices.tradfri_button.ACTION_RIGHT_LONG, self.cd_player_switch_action) self.button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION, devices.tradfri_button.ACTION_LEFT, self.pc_dock_switch_action) + self.button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION, None, self.brightness_action) # self.gui_switch_desk_light.add_callback(devices.nodered_gui.KEY_STATE, None, self.desk_light_switch_action) self.gui_brightness_desk_light.add_callback( - devices.nodered_gui.KEY_BRIGHTNESS, None, self.desk_light_set_params_action) + devices.nodered_gui.KEY_BRIGHTNESS, None, self.desk_light_set_action) self.gui_color_temp_desk_light.add_callback( - devices.nodered_gui.KEY_COLOR_TEMP, None, self.desk_light_set_params_action) + devices.nodered_gui.KEY_COLOR_TEMP, None, self.desk_light_set_action) self.desk_light_tradfri.add_callback(devices.tradfri_light.KEY_BRIGHTNESS, None, self.desk_light_set_gui_params_action) self.desk_light_tradfri.add_callback(devices.tradfri_light.KEY_COLOR_TEMP, @@ -93,13 +104,20 @@ class ground_floor_west_dirk(room_shelly_tradfri_light): self.gui_switch_cd_player.add_callback(devices.nodered_gui.KEY_STATE, None, self.cd_player_switch_action) self.gui_switch_pc_dock.add_callback(devices.nodered_gui.KEY_STATE, None, self.pc_dock_switch_action) # + self.main_light_shelly.add_callback(devices.shelly.KEY_OUTPUT_0, None, self.device_chooser_action) + self.powerplug_common.add_callback(None, None, self.device_chooser_action) + # self.last_cd_player_powerplug_state = None + self.last_main_light_state = None + self.last_desk_light_state = None + self.last_amplifier_state = None + self.active_device_state = None def all_off(self, device=None, key=None, data=None): super().all_off(device, key, data) self.powerplug_common.set_output_all(False) - def powerplug_common_actions(self, device, key, data): + def powerplug_gui_feedback_actions(self, device, key, data): if key == devices.my_powerplug.KEY_OUTPUT_0: self.gui_switch_amplifier.set_feedback(data) elif key == devices.my_powerplug.KEY_OUTPUT_1: @@ -114,16 +132,19 @@ class ground_floor_west_dirk(room_shelly_tradfri_light): self.gui_color_temp_desk_light.set_feedback(self.desk_light_tradfri.color_temp / 10) elif key == devices.my_powerplug.KEY_OUTPUT_2: self.gui_switch_cd_player.set_feedback(data) + elif key == devices.my_powerplug.KEY_OUTPUT_3: + self.gui_switch_pc_dock.set_feedback(data) + + def powerplug_amplifier_synchronisation(self, device, key, data): + if device == self.powerplug_common: if data != self.last_cd_player_powerplug_state: logger.info("Setting \"%s\" amplifier: %s", type(self).__name__, data) self.powerplug_common.set_output_0(data) self.last_cd_player_powerplug_state = data - elif key == devices.my_powerplug.KEY_OUTPUT_3: - self.gui_switch_pc_dock.set_feedback(data) def desk_light_switch_action(self, device, key, data): if device == self.button_tradfri: - logger.info("Toggeling \"%s\" desk_light to %s", type(self).__name__, not self.powerplug_common.output_1) + logger.info("Toggeling \"%s\" desk light to %s", type(self).__name__, not self.powerplug_common.output_1) self.powerplug_common.set_output_1("toggle") else: logger.info("Setting \"%s\" desk light: %s", type(self).__name__, data) @@ -135,7 +156,7 @@ class ground_floor_west_dirk(room_shelly_tradfri_light): elif key == devices.nodered_gui.KEY_COLOR_TEMP: self.gui_color_temp_desk_light.set_feedback(data / 10) - def desk_light_set_params_action(self, device, key, data): + def desk_light_set_action(self, device, key, data): if key == devices.nodered_gui.KEY_BRIGHTNESS: logger.info("Setting brightness \"%s\" desk light: %s", type(self).__name__, data) self.desk_light_tradfri.set_brightness(data) @@ -166,3 +187,76 @@ class ground_floor_west_dirk(room_shelly_tradfri_light): else: logger.info("Setting \"%s\" pc_dock: %s", type(self).__name__, data) self.powerplug_common.set_output_3(data) + + def device_chooser_action(self, device, key, data): + if device == self.main_light_shelly: + if self.last_main_light_state != data: + if data is True: + self.active_device_state = self.STATE_ACTIVE_DEVICE_MAIN_LIGHT + else: + self.choose_next_device() + self.last_main_light_state = data + elif device == self.powerplug_common and key == devices.my_powerplug.KEY_OUTPUT_1: + if self.last_desk_light_state != data: + if data is True: + self.active_device_state = self.STATE_ACTIVE_DEVICE_DESK_LIGHT + else: + self.choose_next_device() + self.last_desk_light_state = data + elif device == self.powerplug_common and key == devices.my_powerplug.KEY_OUTPUT_0: + if self.last_amplifier_state != data: + if data is True: + self.active_device_state = self.STATE_ACTIVE_DEVICE_AMPLIFIER + else: + self.choose_next_device() + self.last_amplifier_state = data + for num in range(0, self.STATE_ACTIVE_DEVICE_MAX_VALUE + 1): + self.active_device_state_led.set_state(num, self.active_device_state == num) + + def get_activity_state(self, state): + if state == self.STATE_ACTIVE_DEVICE_MAIN_LIGHT: + return self.main_light_shelly.output_0 + elif state == self.STATE_ACTIVE_DEVICE_DESK_LIGHT: + return self.powerplug_common.output_1 + elif state == self.STATE_ACTIVE_DEVICE_AMPLIFIER: + return self.powerplug_common.output_0 + + def choose_next_device(self, device=None, key=None, data=None): + if self.active_device_state is not None: + start_value = self.active_device_state + for i in range(0, self.STATE_ACTIVE_DEVICE_MAX_VALUE + 1): + target_state = (start_value + i + 1) % (self.STATE_ACTIVE_DEVICE_MAX_VALUE + 1) + if self.get_activity_state(target_state): + self.active_device_state = target_state + return + self.active_device_state = None + + def choose_prev_device(self, device=None, key=None, data=None): + if self.active_device_state is not None: + start_value = self.active_device_state + for i in range(0, self.STATE_ACTIVE_DEVICE_MAX_VALUE + 1): + target_state = (start_value - i - 1) % (self.STATE_ACTIVE_DEVICE_MAX_VALUE + 1) + if self.get_activity_state(target_state): + self.active_device_state = target_state + return + self.active_device_state = None + + def brightness_action(self, device, key, data): + if self.active_device_state is not None: + brightness_func = { + self.STATE_ACTIVE_DEVICE_MAIN_LIGHT: self.main_light_tradfri, + self.STATE_ACTIVE_DEVICE_DESK_LIGHT: self.desk_light_tradfri, + self.STATE_ACTIVE_DEVICE_AMPLIFIER: self.remote_amplifier + } + target = brightness_func[self.active_device_state] + if target is None: + logger.error("Not yet implemented") + return + if data == devices.tradfri_button.ACTION_BRIGHTNESS_UP_LONG: + logger.info("Increasing \"%s\" - %s", type(self).__name__, target.topic) + target.default_inc() + elif data == devices.tradfri_button.ACTION_BRIGHTNESS_DOWN_LONG: + logger.info("Decreasing \"%s\" - %s", type(self).__name__, target.topic) + target.default_dec() + elif data in [devices.tradfri_button.ACTION_BRIGHTNESS_UP_RELEASE, devices.tradfri_button.ACTION_BRIGHTNESS_DOWN_RELEASE]: + target.default_stop()