Add AVR-X2700H model and handle SVOFF video select

Author: balloob

src/denon_rs232/__init__.py

@@ -89,6 +89,7 @@ class InputSource(Enum):
     NET = "NET"
     BT = "BT"
     USB_IPOD = "USB/IPOD"
+    EIGHT_K = "8K"
 
     # Streaming / online services
     PANDORA = "PANDORA"
@@ -538,8 +539,11 @@ async def cancel_video_select(self) -> None:
         """Cancel video select (return to following input source)."""
         await self._send_command("SV", "SOURCE")
 
-    async def query_video_select(self) -> InputSource:
-        return InputSource(await self._query("SV"))
+    async def query_video_select(self) -> InputSource | None:
+        param = await self._query("SV")
+        if param in ("SOURCE", "OFF"):
+            return None
+        return InputSource(param)
 
     # -- Rec select commands --
 
@@ -847,7 +851,7 @@ def _process_message(self, message: str) -> None:
                 _LOGGER.warning("Unknown digital input mode: %s", param)
 
         elif prefix == "SV":
-            if param == "SOURCE":
+            if param in ("SOURCE", "OFF"):
                 self._state.video_select = None
                 changed = True
             else:

src/denon_rs232/models.py

@@ -239,7 +239,7 @@ class ReceiverModel:
 )
 
 
-# -- Modern era (~2012-2016) --
+# -- Modern era (~2012+) --
 
 AVR_X1000 = ReceiverModel(
     name="AVR-X1000 / AVR-E300",
@@ -342,6 +342,34 @@ class ReceiverModel:
     zone3_prefix="Z3",
 )
 
+AVR_X2700H = ReceiverModel(
+    name="AVR-X2700H",
+    input_sources=frozenset({
+        InputSource.PHONO,
+        InputSource.CD,
+        InputSource.TUNER,
+        InputSource.DVD,
+        InputSource.BD,
+        InputSource.TV,
+        InputSource.SAT_CBL,
+        InputSource.MPLAY,
+        InputSource.GAME,
+        InputSource.AUX1,
+        InputSource.AUX2,
+        InputSource.NET,
+        InputSource.BT,
+        InputSource.USB_IPOD,
+        InputSource.EIGHT_K,
+    }),
+    digital_inputs=_GEN3_DIGITAL,
+    surround_modes=(
+        *_MODERN_SURROUND,
+        "DOLBY ATMOS",
+        "DTS:X",
+        "DTS:X MSTR",
+    ),
+)
+
 # -- Other (unknown model) --
 
 OTHER = ReceiverModel(
@@ -390,6 +418,7 @@ class ReceiverModel:
     AVR_X1000,
     AVR_X4000,
     AVR_X4200W,
+    AVR_X2700H,
 )
 
 #: Models keyed by identifier string, for lookup. Includes "other".
@@ -404,5 +433,6 @@ class ReceiverModel:
     "avr_x1000": AVR_X1000,
     "avr_x4000": AVR_X4000,
     "avr_x4200w": AVR_X4200W,
+    "avr_x2700h": AVR_X2700H,
     "other": OTHER,
 }

tests/test_denon_rs232.py

@@ -637,6 +637,17 @@ async def respond():
     assert result == InputSource.DVD
 
 
+async def test_query_video_select_off_returns_none(receiver, mock_serial):
+    async def respond():
+        await asyncio.sleep(0.05)
+        mock_serial.inject_response("SVOFF")
+
+    task = asyncio.create_task(respond())
+    result = await receiver.query_video_select()
+    await task
+    assert result is None
+
+
 async def test_query_rec_select(receiver, mock_serial):
     async def respond():
         await asyncio.sleep(0.05)
@@ -885,6 +896,18 @@ async def test_video_select_source_event(receiver, mock_serial):
     assert states[-1].video_select is None
 
 
+async def test_video_select_off_event(receiver, mock_serial, caplog):
+    """SV OFF should clear video_select to None without warning."""
+    states: list[DenonState] = []
+    receiver.subscribe(lambda s: states.append(s))
+
+    mock_serial.inject_response("SVOFF")
+    await asyncio.sleep(0.1)
+
+    assert states[-1].video_select is None
+    assert "Unknown video source: OFF" not in caplog.text
+
+
 # -- Event tests: rec select --
 
 

tests/test_models.py

@@ -11,6 +11,7 @@
     AVR_4308CI,
     AVR_987,
     AVR_X1000,
+    AVR_X2700H,
     AVR_X4000,
     AVR_X4200W,
 )
@@ -157,14 +158,29 @@ def test_avr_x4200w_zone3():
     assert AVR_X4200W.zone3_prefix == "Z3"
 
 
+# -- AVR-X2700H (modern with 8K source) --
+
+
+def test_avr_x2700h_has_8k_and_modern_core_sources():
+    assert InputSource.EIGHT_K in AVR_X2700H.input_sources
+    assert InputSource.BD in AVR_X2700H.input_sources
+    assert InputSource.MPLAY in AVR_X2700H.input_sources
+    assert InputSource.NET in AVR_X2700H.input_sources
+
+
+def test_avr_x2700h_no_zone3():
+    assert AVR_X2700H.zone3_prefix is None
+
+
 # -- General model checks --
 
 
 def test_all_models_tuple():
     """ALL_MODELS should contain all defined models."""
-    assert len(ALL_MODELS) == 10
+    assert len(ALL_MODELS) == 11
     assert AVR_3805 in ALL_MODELS
     assert AVR_X4200W in ALL_MODELS
+    assert AVR_X2700H in ALL_MODELS
 
 
 def test_all_models_have_auto_digital():