From 3e0e807c967b9564cc892d36b7487d23359788b1 Mon Sep 17 00:00:00 2001 From: ichbinsteffen Date: Fri, 9 May 2025 15:53:37 +0200 Subject: [PATCH] Add control bus mode selector to Cambridge Audio (#139131) * [CambridgeAudio Integration] Add switch to enable Control Bus Mode * remove load_fn * Add import for ControlBusMode * Add strings for control_bus_mode * Add icons for control_bus_mode * Add test case for the select ControlBusMode.Amplifier * Change the set of icons * Fix the usage of the wrong property name * Fix test * Fix test 2 * add new snapshot * fix test name * Fix --------- Co-authored-by: Joost Lekkerkerker --- .../components/cambridge_audio/icons.json | 7 +++ .../cambridge_audio/media_player.py | 3 + .../components/cambridge_audio/select.py | 16 ++++- .../components/cambridge_audio/strings.json | 8 +++ .../snapshots/test_select.ambr | 58 +++++++++++++++++++ .../cambridge_audio/test_media_player.py | 24 ++++++++ 6 files changed, 115 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/cambridge_audio/icons.json b/homeassistant/components/cambridge_audio/icons.json index b4346a7fe8e..dda7d71e506 100644 --- a/homeassistant/components/cambridge_audio/icons.json +++ b/homeassistant/components/cambridge_audio/icons.json @@ -11,6 +11,13 @@ }, "audio_output": { "default": "mdi:audio-input-stereo-minijack" + }, + "control_bus_mode": { + "default": "mdi:audio-video-off", + "state": { + "amplifier": "mdi:speaker", + "receiver": "mdi:audio-video" + } } }, "switch": { diff --git a/homeassistant/components/cambridge_audio/media_player.py b/homeassistant/components/cambridge_audio/media_player.py index 5322ae7d9a2..e8f92c0b25c 100644 --- a/homeassistant/components/cambridge_audio/media_player.py +++ b/homeassistant/components/cambridge_audio/media_player.py @@ -11,6 +11,7 @@ from aiostreammagic import ( StreamMagicClient, TransportControl, ) +from aiostreammagic.models import ControlBusMode from homeassistant.components.media_player import ( BrowseMedia, @@ -91,6 +92,8 @@ class CambridgeAudioDevice(CambridgeAudioEntity, MediaPlayerEntity): features = BASE_FEATURES if self.client.state.pre_amp_mode: features |= PREAMP_FEATURES + if self.client.state.control_bus == ControlBusMode.AMPLIFIER: + features |= MediaPlayerEntityFeature.VOLUME_STEP if TransportControl.PLAY_PAUSE in controls: features |= MediaPlayerEntityFeature.PLAY | MediaPlayerEntityFeature.PAUSE for control in controls: diff --git a/homeassistant/components/cambridge_audio/select.py b/homeassistant/components/cambridge_audio/select.py index e7d9136711f..cdc163f555d 100644 --- a/homeassistant/components/cambridge_audio/select.py +++ b/homeassistant/components/cambridge_audio/select.py @@ -4,7 +4,7 @@ from collections.abc import Awaitable, Callable from dataclasses import dataclass, field from aiostreammagic import StreamMagicClient -from aiostreammagic.models import DisplayBrightness +from aiostreammagic.models import ControlBusMode, DisplayBrightness from homeassistant.components.select import SelectEntity, SelectEntityDescription from homeassistant.const import EntityCategory @@ -76,6 +76,20 @@ CONTROL_ENTITIES: tuple[CambridgeAudioSelectEntityDescription, ...] = ( value_fn=_audio_output_value_fn, set_value_fn=_audio_output_set_value_fn, ), + CambridgeAudioSelectEntityDescription( + key="control_bus_mode", + translation_key="control_bus_mode", + options=[ + ControlBusMode.AMPLIFIER.value, + ControlBusMode.RECEIVER.value, + ControlBusMode.OFF.value, + ], + entity_category=EntityCategory.CONFIG, + value_fn=lambda client: client.state.control_bus, + set_value_fn=lambda client, value: client.set_control_bus_mode( + ControlBusMode(value) + ), + ), ) diff --git a/homeassistant/components/cambridge_audio/strings.json b/homeassistant/components/cambridge_audio/strings.json index 6041232fe65..e2c89bcbbb0 100644 --- a/homeassistant/components/cambridge_audio/strings.json +++ b/homeassistant/components/cambridge_audio/strings.json @@ -46,6 +46,14 @@ }, "audio_output": { "name": "Audio output" + }, + "control_bus_mode": { + "name": "Control Bus mode", + "state": { + "amplifier": "Amplifier", + "receiver": "Receiver", + "off": "[%key:common::state::off%]" + } } }, "switch": { diff --git a/tests/components/cambridge_audio/snapshots/test_select.ambr b/tests/components/cambridge_audio/snapshots/test_select.ambr index 8c9801b101b..c83e101f363 100644 --- a/tests/components/cambridge_audio/snapshots/test_select.ambr +++ b/tests/components/cambridge_audio/snapshots/test_select.ambr @@ -57,6 +57,64 @@ 'state': 'unknown', }) # --- +# name: test_all_entities[select.cambridge_audio_cxnv2_control_bus_mode-entry] + EntityRegistryEntrySnapshot({ + 'aliases': set({ + }), + 'area_id': None, + 'capabilities': dict({ + 'options': list([ + 'amplifier', + 'receiver', + 'off', + ]), + }), + 'config_entry_id': , + 'config_subentry_id': , + 'device_class': None, + 'device_id': , + 'disabled_by': None, + 'domain': 'select', + 'entity_category': , + 'entity_id': 'select.cambridge_audio_cxnv2_control_bus_mode', + 'has_entity_name': True, + 'hidden_by': None, + 'icon': None, + 'id': , + 'labels': set({ + }), + 'name': None, + 'options': dict({ + }), + 'original_device_class': None, + 'original_icon': None, + 'original_name': 'Control Bus mode', + 'platform': 'cambridge_audio', + 'previous_unique_id': None, + 'supported_features': 0, + 'translation_key': 'control_bus_mode', + 'unique_id': '0020c2d8-control_bus_mode', + 'unit_of_measurement': None, + }) +# --- +# name: test_all_entities[select.cambridge_audio_cxnv2_control_bus_mode-state] + StateSnapshot({ + 'attributes': ReadOnlyDict({ + 'friendly_name': 'Cambridge Audio CXNv2 Control Bus mode', + 'options': list([ + 'amplifier', + 'receiver', + 'off', + ]), + }), + 'context': , + 'entity_id': 'select.cambridge_audio_cxnv2_control_bus_mode', + 'last_changed': , + 'last_reported': , + 'last_updated': , + 'state': 'off', + }) +# --- # name: test_all_entities[select.cambridge_audio_cxnv2_display_brightness-entry] EntityRegistryEntrySnapshot({ 'aliases': set({ diff --git a/tests/components/cambridge_audio/test_media_player.py b/tests/components/cambridge_audio/test_media_player.py index ef7e911fbba..10e9311c4b0 100644 --- a/tests/components/cambridge_audio/test_media_player.py +++ b/tests/components/cambridge_audio/test_media_player.py @@ -3,6 +3,7 @@ from unittest.mock import AsyncMock from aiostreammagic import ( + ControlBusMode, RepeatMode as CambridgeRepeatMode, ShuffleMode, TransportControl, @@ -129,6 +130,29 @@ async def test_entity_supported_features( ) +async def test_entity_supported_features_with_control_bus( + hass: HomeAssistant, + mock_stream_magic_client: AsyncMock, + mock_config_entry: MockConfigEntry, +) -> None: + """Test entity attributes with control bus state.""" + await setup_integration(hass, mock_config_entry) + + mock_stream_magic_client.state.pre_amp_mode = False + mock_stream_magic_client.state.control_bus = ControlBusMode.AMPLIFIER + + await mock_state_update(mock_stream_magic_client) + await hass.async_block_till_done() + + state = hass.states.get(ENTITY_ID) + attrs = state.attributes + assert MediaPlayerEntityFeature.VOLUME_STEP in attrs[ATTR_SUPPORTED_FEATURES] + assert ( + MediaPlayerEntityFeature.VOLUME_SET | MediaPlayerEntityFeature.VOLUME_MUTE + not in attrs[ATTR_SUPPORTED_FEATURES] + ) + + @pytest.mark.parametrize( ("power_state", "play_state", "media_player_state"), [