tradfri dock added for gfw/dirk

devdi

@@ -1 +1 @@
-Subproject commit 2e66d0e27416739a8e5c1fa096490882f1b9643c
+Subproject commit fc1f86ab5aa532373f628a27fd181a4fe627e718

function/ground_floor_west.py

@@ -116,9 +116,9 @@ class ground_floor_west_dirk(room):
         # powerplug
         self.powerplug_common = pd.get(props.STG_MYA, loc, roo, props.FUN_MPP)
         self.KEY_POWERPLUG_AMPLIFIER = self.powerplug_common.KEY_OUTPUT_0
-        self.KEY_POWERPLUG_DESK_LIGHT = self.powerplug_common.KEY_OUTPUT_1
         self.KEY_POWERPLUG_CD_PLAYER = self.powerplug_common.KEY_OUTPUT_2
-        self.KEY_POWERPLUG_PC_DOCK = self.powerplug_common.KEY_OUTPUT_3
+        # dock
+        self.dock_tradfri = pd.get(props.STG_ZGW, loc, roo, props.FUN_DCK)
         # desk light
         self.desk_light_tradfri = pd.get(props.STG_ZGW, loc, roo, props.FUN_DEL)
         # button
@@ -137,14 +137,14 @@ class ground_floor_west_dirk(room):
         # Button - Brightness functionality
         self.brightness_functions = brightness_choose_n_action(self.button_tradfri)
         self.brightness_functions.add(self.main_light_tradfri, self.main_light_shelly, self.main_light_shelly.KEY_OUTPUT_0)
-        self.brightness_functions.add(self.desk_light_tradfri, self.powerplug_common, self.KEY_POWERPLUG_DESK_LIGHT)
+        self.brightness_functions.add(self.desk_light_tradfri, self.desk_light_tradfri, self.desk_light_tradfri.KEY_OUTPUT_0)
         self.brightness_functions.add(self.remote_amplifier, self.powerplug_common, self.KEY_POWERPLUG_AMPLIFIER)
         # Button - Main light
         self.button_tradfri.add_callback(self.button_tradfri.KEY_ACTION, self.button_tradfri.ACTION_TOGGLE,
                                          self.main_light_shelly.toggle_output_0_mcb)
         # Button - Desk light
         self.button_tradfri.add_callback(self.button_tradfri.KEY_ACTION, self.button_tradfri.ACTION_RIGHT,
-                                         self.powerplug_common.toggle_output_1_mcb)
+                                         self.desk_light_tradfri.toggle_output_0_mcb)
         # Button - Amplifier
         self.button_tradfri.add_callback(self.button_tradfri.KEY_ACTION, self.button_tradfri.ACTION_LEFT_LONG,
                                          self.powerplug_common.toggle_output_0_mcb)
@@ -153,7 +153,7 @@ class ground_floor_west_dirk(room):
                                          self.powerplug_common.toggle_output_2_mcb)
         # Button - PC dock
         self.button_tradfri.add_callback(self.button_tradfri.KEY_ACTION, self.button_tradfri.ACTION_LEFT,
-                                         self.powerplug_common.toggle_output_3_mcb)
+                                         self.dock_tradfri.toggle_output_0_mcb)
 
         # Mediaplayer - Amplifier auto on
         self.powerplug_common.add_callback(self.KEY_POWERPLUG_CD_PLAYER, None, self.powerplug_common.set_output_0_mcb, True)
@@ -201,7 +201,7 @@ class ground_floor_west_dirk(room):
         )
         self.pc_dock_videv = videv_switching(
             mqtt_client, config.TOPIC_GFW_DIRK_PC_DOCK_VIDEV,
-            self.powerplug_common, self.KEY_POWERPLUG_PC_DOCK
+            self.dock_tradfri, self.dock_tradfri.KEY_OUTPUT_0
         )
         self.heating_function_videv = videv_heating(
             mqtt_client, config.TOPIC_GFW_DIRK_HEATING_VALVE_VIDEV,