diff --git a/devdi b/devdi index 0620158..2e66d0e 160000 --- a/devdi +++ b/devdi @@ -1 +1 @@ -Subproject commit 0620158064ab5bbb932c2afb9f557cf0b18b37e3 +Subproject commit 2e66d0e27416739a8e5c1fa096490882f1b9643c diff --git a/function/ground_floor_west.py b/function/ground_floor_west.py index fdd6133..a96d6ee 100644 --- a/function/ground_floor_west.py +++ b/function/ground_floor_west.py @@ -127,6 +127,7 @@ class ground_floor_west_dirk(room): self.remote_amplifier = pd.get(props.STG_MYA, loc, roo, props.FUN_RCA) self.spotify_state = pd.get(props.STG_MYA, loc, roo, props.FUN_ASS) self.mpd_state = pd.get(props.STG_MYA, loc, roo, props.FUN_ASM) + self.bt_state = pd.get(props.STG_MYA, loc, roo, props.FUN_ASB) # heating function self.heating_valve = pd.get(props.STG_ZGW, loc, roo, props.FUN_HEA) super().__init__(mqtt_client, pd, vd) @@ -158,11 +159,13 @@ class ground_floor_west_dirk(room): self.powerplug_common.add_callback(self.KEY_POWERPLUG_CD_PLAYER, None, self.powerplug_common.set_output_0_mcb, True) self.spotify_state.add_callback(self.spotify_state.KEY_STATE, None, self.powerplug_common.set_output_0_mcb, True) self.mpd_state.add_callback(self.mpd_state.KEY_STATE, None, self.powerplug_common.set_output_0_mcb, True) + self.bt_state.add_callback(self.bt_state.KEY_STATE, None, self.powerplug_common.set_output_0_mcb, True) # Mediaplayer - Audio source selection self.powerplug_common.add_callback(self.KEY_POWERPLUG_AMPLIFIER, True, self.audio_source_selector, True) self.powerplug_common.add_callback(self.KEY_POWERPLUG_CD_PLAYER, True, self.audio_source_selector, True) self.spotify_state.add_callback(self.spotify_state.KEY_STATE, True, self.audio_source_selector, True) self.mpd_state.add_callback(self.mpd_state.KEY_STATE, True, self.audio_source_selector, True) + self.bt_state.add_callback(self.bt_state.KEY_STATE, True, self.audio_source_selector, True) self.audio_source = self.AUDIO_SOURCE_PC # heating function @@ -210,7 +213,7 @@ class ground_floor_west_dirk(room): ) self.audio_player_videv = videv_audio_player( mqtt_client, config.TOPIC_GFW_DIRK_AUDIO_PLAYER_VIDEV, - self.spotify_state, self.mpd_state + self.spotify_state, self.mpd_state, self.bt_state ) # # Other stuff @@ -221,7 +224,7 @@ class ground_floor_west_dirk(room): if device == self.powerplug_common and key == self.KEY_POWERPLUG_CD_PLAYER: # switch on of cd player self.audio_source = self.AUDIO_SOURCE_CD - elif device in [self.spotify_state, self.mpd_state]: + elif device in [self.spotify_state, self.mpd_state, self.bt_state]: # switch on raspi-source self.audio_source = self.AUDIO_SOURCE_RASPI elif device == self.powerplug_common and key == self.KEY_POWERPLUG_AMPLIFIER: