topic and parameters moved to config

devices/__init__.py

@@ -215,6 +215,12 @@ class shelly(base):
     def __init__(self, mqtt_client, topic):
         super().__init__(mqtt_client, topic)
 
+    def add_on_off_callback_0(self, callback):
+        self.add_callback(self.KEY_OUTPUT_0, None, callback, True)
+
+    def add_on_off_callback_1(self, callback):
+        self.add_callback(self.KEY_OUTPUT_1, None, callback, True)
+
     #
     # WARNING CALL
     #
@@ -307,6 +313,9 @@ class silvercrest_powerplug(base):
     def __init__(self, mqtt_client, topic):
         super().__init__(mqtt_client, topic)
 
+    def add_default_on_off_callback(self, callback):
+        self.add_callback(self.KEY_OUTPUT_0, None, callback, True)
+
     #
     # RX
     #
@@ -380,6 +389,18 @@ class my_powerplug(base):
     def __init__(self, mqtt_client, topic):
         super().__init__(mqtt_client, topic)
 
+    def add_on_off_callback_0(self, callback):
+        self.add_callback(self.KEY_OUTPUT_0, None, callback, True)
+
+    def add_on_off_callback_1(self, callback):
+        self.add_callback(self.KEY_OUTPUT_1, None, callback, True)
+
+    def add_on_off_callback_2(self, callback):
+        self.add_callback(self.KEY_OUTPUT_2, None, callback, True)
+
+    def add_on_off_callback_3(self, callback):
+        self.add_callback(self.KEY_OUTPUT_3, None, callback, True)
+
     #
     # RX
     #
@@ -490,6 +511,9 @@ class tradfri_light(base):
     def __init__(self, mqtt_client, topic):
         super().__init__(mqtt_client, topic)
 
+    def add_on_off_callback_0(self, callback):
+        self.add_callback(self.KEY_OUTPUT_0, None, callback, True)
+
     def unpack_filter(self, key):
         if key == self.KEY_BRIGHTNESS:
             self[key] = (self[key] - 1) * 100 / 254

function/__init__.py

@@ -15,7 +15,7 @@ except ImportError:
     ROOT_LOGGER_NAME = 'root'
 logger = logging.getLogger(ROOT_LOGGER_NAME).getChild(__name__)
 
-# TODO: usage of implementation strategy from gfw_dirk for ffe_sleep
+# TODO: topics and parameters -> config.py
 # TODO: implement devices.nodered_gui_timer (for circulation pump)
 #       implement devices.nodered_gui_heatvalve incl. setpoint, boost, ... and functions from funtion.module
 #       improve devices.brennenstuhl_heatvalve

function/first_floor_east.py

@@ -4,7 +4,7 @@
 
 import config
 import devices
-import json
+from function.modules import brightness_choose_n_action
 import logging
 from function.rooms import room_shelly, room_shelly_motion_sensor, room_shelly_tradfri_light
 try:
@@ -17,24 +17,25 @@ logger = logging.getLogger(ROOT_LOGGER_NAME).getChild(__name__)
 class first_floor_east_floor(room_shelly_motion_sensor):
     def __init__(self, mqtt_client):
         # http://shelly1l-3C6105E4E629
-        super().__init__(mqtt_client, "shellies/ffe/floor/main_light", "gui/ffe/floor/main_light/switch", "zigbee/ffe/floor/motion_sensor")
+        super().__init__(mqtt_client, config.TOPIC_FFE_FLOOR_MAIN_LIGHT_SHELLY,
+                         config.TOPIC_FFE_FLOOR_MAIN_LIGHT_GUI_SWITCH, config.TOPIC_FFE_FLOOR_MAIN_LIGHT_MOTION_SENSOR)
 
 
 class first_floor_east_kitchen(room_shelly):
     def __init__(self, mqtt_client):
         # http://shelly1l-8CAAB5616C01
-        super().__init__(mqtt_client, "shellies/ffe/kitchen/main_light", "gui/ffe/kitchen/main_light/switch")
+        super().__init__(mqtt_client, config.TOPIC_FFE_KITCHEN_MAIN_LIGHT_SHELLY, config.TOPIC_FFE_KITCHEN_MAIN_LIGHT_GUI_SWITCH)
 
 
 class first_floor_east_dining(room_shelly):
     def __init__(self, mqtt_client):
         # http://shelly1l-84CCA8ADD055
-        super().__init__(mqtt_client, "shellies/ffe/diningroom/main_light", "gui/ffe/diningroom/main_light/switch")
-        self.floorlamp_powerplug = devices.silvercrest_powerplug(mqtt_client, "zigbee/ffe/dinigroom/powerplug_floorlamp")
+        super().__init__(mqtt_client, config.TOPIC_FFE_DININGROOM_MAIN_LIGHT_SHELLY, config.TOPIC_FFE_DININGROOM_MAIN_LIGHT_GUI_SWITCH)
+        self.floorlamp_powerplug = devices.silvercrest_powerplug(mqtt_client, config.TOPIC_FFE_DININGROOM_FLOOR_LAMP_POWERPLUG)
         if config.CHRISTMAS:
-            self.garland_powerplug = devices.silvercrest_powerplug(mqtt_client, topic="zigbee/ffe/dinigroom/garland")
+            self.garland_powerplug = devices.silvercrest_powerplug(mqtt_client, config.TOPIC_FFE_DININGROOM_GARLAND_POWERPLUG)
         #
-        self.gui_switch_floorlamp = devices.nodered_gui_switch(mqtt_client, topic="gui/ffe/diningroom/floorlamp/switch")
+        self.gui_switch_floorlamp = devices.nodered_gui_switch(mqtt_client, config.TOPIC_FFE_DININGROOM_FLOOR_LAMP_GUI_SWITCH)
         #
         # Callback initialisation
         #
@@ -52,27 +53,27 @@ class first_floor_east_dining(room_shelly):
 class first_floor_east_sleep(room_shelly_tradfri_light):
     def __init__(self, mqtt_client):
         # http://shelly1l-E8DB84A254C7
-        super().__init__(mqtt_client, "shellies/ffe/sleep/main_light", "gui/ffe/sleep/main_light/switch",
-                         "zigbee/ffe/sleep/main_light", "gui/ffe/sleep/main_light/br_ct")
+        super().__init__(mqtt_client, config.TOPIC_FFE_SLEEP_MAIN_LIGHT_SHELLY, config.TOPIC_FFE_SLEEP_MAIN_LIGHT_GUI_SWITCH,
+                         config.TOPIC_FFE_SLEEP_MAIN_LIGHT_ZIGBEE, config.TOPIC_FFE_SLEEP_MAIN_LIGHT_GUI_BR_CT)
         #
-        self.bed_light_di_tradfri = devices.tradfri_light(mqtt_client, "zigbee/ffe/sleep/bed_light_di")
+        self.bed_light_di_tradfri = devices.tradfri_light(mqtt_client, config.TOPIC_FFE_SLEEP_BED_LIGHT_DI_ZIGBEE)
         #
-        self.gui_switch_bed_light_di = devices.nodered_gui_switch(mqtt_client, "gui/ffe/sleep/bed_light_di/switch")
-        self.gui_br_ct_bed_light_di = devices.nodered_gui_brightness_color_temp(mqtt_client, "gui/ffe/sleep/bed_light_di/br_ct")
-        self.gui_led_active_device = devices.nodered_gui_leds(mqtt_client, "gui/ffe/sleep/active_device_state/led")
+        self.gui_switch_bed_light_di = devices.nodered_gui_switch(mqtt_client, config.TOPIC_FFE_SLEEP_BED_LIGHT_DI_GUI_SWITCH)
+        self.gui_br_ct_bed_light_di = devices.nodered_gui_brightness_color_temp(mqtt_client, config.TOPIC_FFE_SLEEP_BED_LIGHT_DI_GUI_BR_CT)
         #
-        self.button_tradfri = devices.tradfri_button(mqtt_client, "zigbee/ffe/sleep/input_device")
+        self.button_tradfri = devices.tradfri_button(mqtt_client, config.TOPIC_FFE_SLEEP_INPUT_DEVICE)
+        #
+        self.brightness_functions = brightness_choose_n_action(mqtt_client, self.button_tradfri, config.TOPIC_FFE_SLEEP_DEVICE_CHOOSER_LED)
+        self.brightness_functions.add(self.main_light_tradfri, self.main_light_shelly.add_on_off_callback_0)
+        self.brightness_functions.add(self.bed_light_di_tradfri, self.bed_light_di_tradfri.add_on_off_callback_0)
         #
         # Callback initialisation
         #
-        # button
+        # on/off with button
         self.button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION, devices.tradfri_button.ACTION_TOGGLE,
                                          self.main_light_shelly.toggle_output_0_mcb)
-        self.button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION, devices.tradfri_button.ACTION_BRIGHTNESS_UP,
+        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_BRIGHTNESS_DOWN,
-                                         self.bed_light_di_tradfri.toggle_output_0_mcb)
-        self.button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION, None, self.fade_light)
 
         # bed light
         # switch
@@ -85,63 +86,28 @@ class first_floor_east_sleep(room_shelly_tradfri_light):
         self.bed_light_di_tradfri.add_callback(devices.tradfri_light.KEY_OUTPUT_0, None, self.gui_br_ct_bed_light_di.set_enable_mcb)
         self.bed_light_di_tradfri.add_callback(devices.tradfri_light.KEY_BRIGHTNESS, None, self.gui_br_ct_bed_light_di.set_brightness_mcb)
 
-        # fade function
-        self.main_light_shelly.add_callback(devices.shelly.KEY_OUTPUT_0, None, self.state_machine_last_activated_device)
-        self.bed_light_di_tradfri.add_callback(devices.tradfri_light.KEY_OUTPUT_0, None, self.state_machine_last_activated_device)
-        self.last_activated_device = None
-
     def all_off(self, device=None, key=None, data=None):
         super().all_off(device, key, data)
         self.bed_light_di_tradfri.set_output_0(False)
 
-    def state_machine_last_activated_device(self, device, topic, data):
-        if data is True:
-            self.last_activated_device = device.topic
-        elif data is False:
-            if device.topic == self.main_light_shelly.topic and self.bed_light_di_tradfri.output_0:
-                self.last_activated_device = self.bed_light_di_tradfri.topic
-            elif device.topic == self.bed_light_di_tradfri.topic and self.main_light_shelly.output_0:
-                self.last_activated_device = self.main_light_shelly.topic
-            else:
-                self.last_activated_device = None
-        self.gui_led_active_device.set_led(devices.nodered_gui_leds.KEY_LED_0, self.last_activated_device == self.main_light_shelly.topic)
-        self.gui_led_active_device.set_led(devices.nodered_gui_leds.KEY_LED_1, self.last_activated_device == self.bed_light_di_tradfri.topic)
-
-    def fade_light(self, device, topic, data):
-        if self.last_activated_device == self.main_light_shelly.topic:
-            target = self.main_light_tradfri
-        elif self.last_activated_device == self.bed_light_di_tradfri.topic:
-            target = self.bed_light_di_tradfri
-        else:
-            return
-        if (data == devices.tradfri_button.ACTION_BRIGHTNESS_UP_LONG):
-            logger.info("Increasing brightness \"%s\" %s", type(self).__name__, target.topic)
-            target.default_inc()
-        elif (data == devices.tradfri_button.ACTION_BRIGHTNESS_DOWN_LONG):
-            logger.info("Decreasing brightness \"%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]):
-            logger.info("Stoping brightness change \"%s\" %s", type(self).__name__, target.topic)
-            target.default_stop()
-
 
 class first_floor_east_living(room_shelly_tradfri_light):
     def __init__(self, mqtt_client):
         # http://shelly1l-3C6105E3F910
-        super().__init__(mqtt_client, "shellies/ffe/livingroom/main_light", "gui/ffe/livingroom/main_light/switch",
-                         "zigbee/ffe/livingroom/main_light", "gui/ffe/livingroom/main_light/br_ct")
+        super().__init__(mqtt_client, config.TOPIC_FFE_LIVINGROOM_MAIN_LIGHT_SHELLY, config.TOPIC_FFE_LIVINGROOM_MAIN_LIGHT_GUI_SWITCH,
+                         config.TOPIC_FFE_LIVINGROOM_MAIN_LIGHT_ZIGBEE, config.TOPIC_FFE_LIVINGROOM_MAIN_LIGHT_GUI_BR_CT)
         for i in range(1, 7):
-            setattr(self, 'floorlamp_tradfri_%d' % i, devices.tradfri_light(mqtt_client, "zigbee/ffe/livingroom/floorlamp_%d" % i))
+            setattr(self, 'floorlamp_tradfri_%d' % i, devices.tradfri_light(mqtt_client, config.TOPIC_FFE_LIVINGROOM_FLOOR_LAMP_ZIGBEE % i))
         #
         if config.CHRISTMAS:
-            self.powerplug_xmas_tree = devices.silvercrest_powerplug(mqtt_client, "zigbee/ffe/livingroom/powerplug_xmas-tree")
-            self.powerplug_xmas_star = devices.silvercrest_powerplug(mqtt_client, "zigbee/ffe/livingroom/powerplug_xmas-star")
+            self.powerplug_xmas_tree = devices.silvercrest_powerplug(mqtt_client, config.TOPIC_FFE_LIVINGROOM_XMAS_TREE_POWERPLUG)
+            self.powerplug_xmas_star = devices.silvercrest_powerplug(mqtt_client, config.TOPIC_FFE_LIVINGROOM_XMAS_STAR_POWERPLUG)
         #
-        self.gui_switch_floorlamp = devices.nodered_gui_switch(mqtt_client, "gui/ffe/livingroom/floorlamp/switch")
-        self.gui_br_ct_floorlamp = devices.nodered_gui_brightness_color_temp(mqtt_client, "gui/ffe/livingroom/floorlamp/br_ct")
+        self.gui_switch_floorlamp = devices.nodered_gui_switch(mqtt_client, config.TOPIC_FFE_LIVINGROOM_FLOOR_LAMP_GUI_SWITCH)
+        self.gui_br_ct_floorlamp = devices.nodered_gui_brightness_color_temp(mqtt_client, config.TOPIC_FFE_LIVINGROOM_FLOOR_LAMP_GUI_BR_CT)
         #
         if config.CHRISTMAS:
-            self.gui_switch_xmas_tree = devices.nodered_gui_switch(mqtt_client, "gui/ffe/livingroom/xmas_tree/switch")
+            self.gui_switch_xmas_tree = devices.nodered_gui_switch(mqtt_client, config.TOPIC_FFE_LIVINGROOM_XMAS_TREE_GUI_SWITCH)
         #
         # Callback initialisation
         #

function/first_floor_west.py

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 
+import config
 import logging
 from function.rooms import room_shelly, room_shelly_tradfri_light
 
@@ -15,11 +16,11 @@ logger = logging.getLogger(ROOT_LOGGER_NAME).getChild(__name__)
 class first_floor_west_julian(room_shelly_tradfri_light):
     # http://shelly1l-3C6105E43452
     def __init__(self, mqtt_client):
-        super().__init__(mqtt_client, "shellies/ffw/julian/main_light", "gui/ffw/julian/main_light/switch",
-                         "zigbee/ffe/julian/main_light", "gui/ffw/julian/main_light/br_ct")
+        super().__init__(mqtt_client, config.TOPIC_FFW_JULIAN_MAIN_LIGHT_SHELLY, config.TOPIC_FFW_JULIAN_MAIN_LIGHT_GUI_SWITCH,
+                         config.TOPIC_FFW_JULIAN_MAIN_LIGHT_ZIGBEE, config.TOPIC_FFW_JULIAN_MAIN_LIGHT_GUI_BR_CT)
 
 
 class first_floor_west_living(room_shelly):
     # http://shelly1l-84CCA8ACE6A1
     def __init__(self, mqtt_client):
-        super().__init__(mqtt_client, "shellies/ffw/livingroom/main_light", "gui/ffw/livingroom/main_light/switch")
+        super().__init__(mqtt_client, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_SHELLY, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_GUI_SWITCH)

function/ground_floor_west.py

@@ -2,7 +2,9 @@
 # -*- coding: utf-8 -*-
 #
 
+import config
 import devices
+from function.modules import brightness_choose_n_action
 import logging
 from function.rooms import room_shelly, room_shelly_tradfri_light, room_shelly_silvercrest_light
 import task
@@ -17,12 +19,12 @@ logger = logging.getLogger(ROOT_LOGGER_NAME).getChild(__name__)
 class ground_floor_west_floor(room_shelly_silvercrest_light):
     # http://shelly1l-84CCA8AD1148
     def __init__(self, mqtt_client):
-        super().__init__(mqtt_client, "shellies/gfw/floor/main_light", "gui/gfw/floor/main_light/switch",
-                         "zigbee/gfw/floor/main_light/a", "gui/gfw/floor/main_light/br_ct")
+        super().__init__(mqtt_client, config.TOPIC_GFW_FLOOR_MAIN_LIGHT_SHELLY, config.TOPIC_GFW_FLOOR_MAIN_LIGHT_GUI_SWITCH,
+                         config.TOPIC_GFW_FLOOR_MAIN_LIGHT_A_ZIGBEE, config.TOPIC_GFW_FLOOR_MAIN_LIGHT_GUI_BR_CT)
         #
         # Callback initialisation
         #
-        self.main_light_tradfri_2 = devices.tradfri_light(mqtt_client, "zigbee/gfw/floor/main_light/b")
+        self.main_light_tradfri_2 = devices.tradfri_light(mqtt_client, config.TOPIC_GFW_FLOOR_MAIN_LIGHT_B_ZIGBEE)
         self.main_light_tradfri.add_callback(devices.tradfri_light.KEY_BRIGHTNESS, None, self.main_light_tradfri_2.set_brightness_mcb)
         self.main_light_tradfri.add_callback(devices.tradfri_light.KEY_COLOR_TEMP, None, self.main_light_tradfri_2.set_color_temp_mcb)
 
@@ -34,7 +36,7 @@ class ground_floor_west_floor(room_shelly_silvercrest_light):
 class ground_floor_west_marion(room_shelly):
     # http://shelly1l-E8DB84A1E067
     def __init__(self, mqtt_client):
-        super().__init__(mqtt_client, "shellies/gfw/marion/main_light", "gui/gfw/marion/main_light/switch")
+        super().__init__(mqtt_client, config.TOPIC_GFW_MARION_MAIN_LIGHT_SHELLY, config.TOPIC_GFW_MARION_MAIN_LIGHT_GUI_SWITCH)
 
 
 class ground_floor_west_dirk(room_shelly_tradfri_light):
@@ -58,24 +60,29 @@ class ground_floor_west_dirk(room_shelly_tradfri_light):
 
     # http://shelly1l-3C6105E44F27
     def __init__(self, mqtt_client):
-        super().__init__(mqtt_client, "shellies/gfw/dirk/main_light", "gui/gfw/dirk/main_light/switch", "zigbee/gfw/dirk/main_light", "gui/gfw/dirk/main_light/br_ct")
+        super().__init__(mqtt_client, config.TOPIC_GFW_DIRK_MAIN_LIGHT_SHELLY, config.TOPIC_GFW_DIRK_MAIN_LIGHT_GUI_SWITCH,
+                         config.TOPIC_GFW_DIRK_MAIN_LIGHT_ZIGBEE, config.TOPIC_GFW_DIRK_MAIN_LIGHT_GUI_BR_CT)
         #
-        self.powerplug_common = devices.my_powerplug(mqtt_client, "my_apps/gfw/dirk/powerplug")
-        self.desk_light_tradfri = devices.tradfri_light(mqtt_client, "zigbee/gfw/dirk/desk_light")
-        self.button_tradfri = devices.tradfri_button(mqtt_client, "zigbee/gfw/dirk/input_device")
+        self.powerplug_common = devices.my_powerplug(mqtt_client, config.TOPIC_GFW_DIRK_POWERPLUG)
+        self.desk_light_tradfri = devices.tradfri_light(mqtt_client, config.TOPIC_GFW_DIRK_DESK_LIGHT_ZIGBEE)
+        self.button_tradfri = devices.tradfri_button(mqtt_client, config.TOPIC_GFW_DIRK_INPUT_DEVICE)
         #
-        self.gui_switch_desk_light = devices.nodered_gui_switch(mqtt_client, "gui/gfw/dirk/desk_light/switch")
-        self.gui_br_cr_desk_light = devices.nodered_gui_brightness_color_temp(mqtt_client, "gui/gfw/dirk/desk_light/br_ct")
+        self.gui_switch_desk_light = devices.nodered_gui_switch(mqtt_client, config.TOPIC_GFW_DIRK_DESK_LIGHT_GUI_SWITCH)
+        self.gui_br_cr_desk_light = devices.nodered_gui_brightness_color_temp(mqtt_client, config.TOPIC_GFW_DIRK_DESK_LIGHT_GUI_BR_CT)
         #
-        self.gui_switch_amplifier = devices.nodered_gui_switch(mqtt_client, "gui/gfw/dirk/amplifier/switch")
-        self.gui_switch_cd_player = devices.nodered_gui_switch(mqtt_client, "gui/gfw/dirk/cd_player/switch")
-        self.gui_switch_pc_dock = devices.nodered_gui_switch(mqtt_client, "gui/gfw/dirk/pc_dock/switch")
+        self.gui_switch_amplifier = devices.nodered_gui_switch(mqtt_client, config.TOPIC_GFW_DIRK_AMPLIFIER_GUI_SWITCH)
+        self.gui_switch_cd_player = devices.nodered_gui_switch(mqtt_client, config.TOPIC_GFW_DIRK_CD_PLAYER_GUI_SWITCH)
+        self.gui_switch_pc_dock = devices.nodered_gui_switch(mqtt_client, config.TOPIC_GFW_DIRK_PC_DOCK_GUI_SWITCH)
         #
-        self.remote_amplifier = devices.remote(mqtt_client, "my_apps/gfw/dirk/remote/RAS5")
-        self.gui_led_active_device = devices.nodered_gui_leds(mqtt_client, "gui/gfw/dirk/active_device_state/led")
+        self.remote_amplifier = devices.remote(mqtt_client, config.TOPIC_GFW_DIRK_AMPLIFIER_REMOTE)
         #
-        self.spotify_state = devices.audio_status(mqtt_client, "my_apps/gfw/dirk/hifi/spotify")
-        self.mpd_state = devices.audio_status(mqtt_client, "my_apps/gfw/dirk/hifi/mpd")
+        self.brightness_functions = brightness_choose_n_action(mqtt_client, self.button_tradfri, config.TOPIC_GFW_DIRK_DEVICE_CHOOSER_LED)
+        self.brightness_functions.add(self.main_light_tradfri, self.main_light_shelly.add_on_off_callback_0)
+        self.brightness_functions.add(self.desk_light_tradfri, self.powerplug_common.add_on_off_callback_1)
+        self.brightness_functions.add(self.remote_amplifier, self.powerplug_common.add_on_off_callback_0)
+        #
+        self.spotify_state = devices.audio_status(mqtt_client, config.TOPIC_GFW_DIRK_SPOTIFY)
+        self.mpd_state = devices.audio_status(mqtt_client, config.TOPIC_GFW_DIRK_MPD)
         #
         self.delayed_task = task.delayed(1.0, self.send_audio_source)
         #
@@ -129,15 +136,6 @@ class ground_floor_west_dirk(room_shelly_tradfri_light):
         self.gui_switch_pc_dock.add_callback(devices.nodered_gui_switch.KEY_STATE, None, self.powerplug_common.set_output_3_mcb)
         self.powerplug_common.add_callback(self.KEY_POWERPLUG_PC_DOCK, None, self.gui_switch_pc_dock.set_state_mcb)
 
-        # brightness
-        self.button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION, None, self.brightness_action)
-        self.main_light_shelly.add_callback(devices.shelly.KEY_OUTPUT_0, None, self.device_chooser_action, True)
-        self.powerplug_common.add_callback(None, None, self.device_chooser_action, True)
-        self.button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION, devices.tradfri_button.ACTION_BRIGHTNESS_UP, self.choose_next_device)
-        self.button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION, devices.tradfri_button.ACTION_BRIGHTNESS_DOWN, self.choose_prev_device)
-        self.active_device_state = None
-        self.update_active_device_led()
-
     def all_off(self, device=None, key=None, data=None):
         super().all_off(device, key, data)
         self.powerplug_common.set_output_all(False)
@@ -150,83 +148,6 @@ class ground_floor_west_dirk(room_shelly_tradfri_light):
         logger.info("Syncing \"%s\" amplifier with raspi player: %s", type(self).__name__, data)
         self.powerplug_common.set_output(self.KEY_POWERPLUG_AMPLIFIER, data)
 
-    def device_chooser_action(self, device, key, data):
-        if device == self.main_light_shelly:
-            if data is True:
-                self.active_device_state = self.STATE_ACTIVE_DEVICE_MAIN_LIGHT
-                self.update_active_device_led()
-            else:
-                self.choose_next_device()
-        elif device == self.powerplug_common and key == self.KEY_POWERPLUG_DESK_LIGHT:
-            if data is True:
-                self.active_device_state = self.STATE_ACTIVE_DEVICE_DESK_LIGHT
-                self.update_active_device_led()
-            else:
-                self.choose_next_device()
-        elif device == self.powerplug_common and key == self.KEY_POWERPLUG_AMPLIFIER:
-            if data is True:
-                self.active_device_state = self.STATE_ACTIVE_DEVICE_AMPLIFIER
-                self.update_active_device_led()
-            else:
-                self.choose_next_device()
-
-    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.get(self.KEY_POWERPLUG_DESK_LIGHT)
-        elif state == self.STATE_ACTIVE_DEVICE_AMPLIFIER:
-            return self.powerplug_common.get(self.KEY_POWERPLUG_AMPLIFIER)
-
-    def update_active_device_led(self):
-        self.gui_led_active_device.set_led(self.LED_ACTIVE_DEVICE_AMPLIFIER, self.active_device_state == self.STATE_ACTIVE_DEVICE_AMPLIFIER)
-        self.gui_led_active_device.set_led(self.LED_ACTIVE_DEVICE_MAIN_LIGHT, self.active_device_state == self.STATE_ACTIVE_DEVICE_MAIN_LIGHT)
-        self.gui_led_active_device.set_led(self.LED_ACTIVE_DEVICE_DESK_LIGHT, self.active_device_state == self.STATE_ACTIVE_DEVICE_DESK_LIGHT)
-
-    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
-                    self.update_active_device_led()
-                    return
-        self.active_device_state = None
-        self.update_active_device_led()
-
-    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
-                    self.update_active_device_led()
-                    return
-        self.active_device_state = None
-        self.update_active_device_led()
-
-    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()
-
     def audio_source_selector(self, device, key, data):
         if device == self.powerplug_common and key == self.KEY_POWERPLUG_CD_PLAYER:
             # switch on of cd player

function/modules.py

@@ -13,6 +13,93 @@ except ImportError:
 logger = logging.getLogger(ROOT_LOGGER_NAME).getChild(__name__)
 
 
+class brightness_choose_n_action(object):
+    def __init__(self, mqtt_client, button_tradfri, topic_led):
+        self.gui_led_active_device = devices.nodered_gui_leds(mqtt_client, topic_led)
+        # brightness change
+        button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION,
+                                    devices.tradfri_button.ACTION_BRIGHTNESS_DOWN_LONG, self.brightness_action)
+        button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION, devices.tradfri_button.ACTION_BRIGHTNESS_UP_LONG, self.brightness_action)
+        button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION,
+                                    devices.tradfri_button.ACTION_BRIGHTNESS_DOWN_RELEASE, self.brightness_action)
+        button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION,
+                                    devices.tradfri_button.ACTION_BRIGHTNESS_UP_RELEASE, self.brightness_action)
+        # device change
+        button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION, devices.tradfri_button.ACTION_BRIGHTNESS_UP, self.choose_next_device)
+        button_tradfri.add_callback(devices.tradfri_button.KEY_ACTION, devices.tradfri_button.ACTION_BRIGHTNESS_DOWN, self.choose_prev_device)
+        #
+        self.device_list = []
+        self.callback_device_list = []
+        self.device_states = []
+        self.active_device_state = None
+        self.update_active_device_led()
+
+    def add(self, device, add_callback):
+        """
+        device: A device for brightness function needs to have the following methods:
+        * .default_inc()
+        * .default_dec()
+        * .default_stop()
+        add_callback: A on/off callback which tages the <function_to_be_executed> as argument and
+            - which calls the callback only on changes
+            - which calls with the following arguments: device, key, data
+        """
+        if len(self.device_list) >= len(devices.nodered_gui_leds.RX_KEYS):
+            raise ValueError("Number of devices is limited by number of leds in devices.nodered_gui_leds.")
+        self.device_list.append(device)
+        self.callback_device_list.append(add_callback.__self__)
+        self.device_states.append(False)
+        add_callback(self.device_state_action)
+
+    def device_state_action(self, device, key, data):
+        self.device_states[self.callback_device_list.index(device)] = data
+        if data is True:
+            self.active_device_state = self.callback_device_list.index(device)
+            self.update_active_device_led()
+        else:
+            self.choose_next_device()
+
+    def update_active_device_led(self):
+        for i in range(0, len(self.device_list)):
+            self.gui_led_active_device.set_led(devices.nodered_gui_leds.RX_KEYS[i], self.active_device_state == i)
+
+    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, len(self.device_list)):
+                target_state = (start_value - i - 1) % (len(self.device_list))
+                if self.device_states[target_state]:
+                    self.active_device_state = target_state
+                    self.update_active_device_led()
+                    return
+        self.active_device_state = None
+        self.update_active_device_led()
+
+    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, len(self.device_list)):
+                target_state = (start_value + i + 1) % (len(self.device_list))
+                if self.device_states[target_state]:
+                    self.active_device_state = target_state
+                    self.update_active_device_led()
+                    return
+        self.active_device_state = None
+        self.update_active_device_led()
+
+    def brightness_action(self, device, key, data):
+        if self.active_device_state is not None:
+            target = self.device_list[self.active_device_state]
+            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()
+
+
 class heating_function_brennenstuhl(object):
     RETURN_TO_DEFAULT_TIME = 45 * 60
     BOOST_TEMP_OFFSET = 5

function/rooms.py

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 
+import config
 import devices
 from function.helpers import now, sunset_time, sunrise_time
 import logging
@@ -58,7 +59,7 @@ class room_shelly(room):
 
 
 class room_shelly_motion_sensor(room_shelly):
-    def __init__(self, mqtt_client, topic_shelly, topic_gui_switch, topic_motion_sensor_1, topic_motion_sensor_2=None, timer_value=30):
+    def __init__(self, mqtt_client, topic_shelly, topic_gui_switch, topic_motion_sensor_1, topic_motion_sensor_2=None, timer_value=config.DEFAULT_ON_TIME_LIGHT):
         super().__init__(mqtt_client, topic_shelly, topic_gui_switch)
         self.timer_value = timer_value
         #