denonavr 1.1.1__py3-none-any.whl → 1.1.2__py3-none-any.whl

denonavr/__init__.py

@@ -17,7 +17,7 @@ from .ssdp import async_identify_denonavr_receivers
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 
 __title__ = "denonavr"
-__version__ = "1.1.1"
+__version__ = "1.1.2"
 
 
 async def async_discover():

denonavr/api.py

@@ -587,6 +587,7 @@ class DenonAVRTelnetApi:
             "PSSWL ?",
             "SSTTR ?",
             "MSQUICK ?",
+            "MSSMART ?",
             "STBY?",
             "SLP?",
             "VSAUDIO ?",

denonavr/const.py

@@ -90,6 +90,8 @@ ReceiverURLs = namedtuple(
         "command_hdmi_audio_decode",
         "command_quick_select_mode",
         "command_quick_select_memory",
+        "command_smart_select_mode",  # Marantz
+        "command_smart_select_memory",  # Marantz
         "command_auto_standby",
         "command_sleep",
         "command_center_spread",
@@ -183,6 +185,8 @@ TelnetCommands = namedtuple(
         "command_hdmi_audio_decode",
         "command_quick_select_mode",
         "command_quick_select_memory",
+        "command_smart_select_mode",  # Marantz
+        "command_smart_select_memory",  # Marantz
         "command_auto_standby",
         "command_sleep",
         "command_center_spread",
@@ -364,9 +368,13 @@ SOUND_MODE_MAPPING = {
         "DOLBY AUDIO - TRUEHD + NEURAL:X",
         "DOLBY AUDIO-DD",
         "DOLBY AUDIO-DD+ +DSUR",
+        # Added both variants as we don't know if type is intentional
+        "DOLBY AUDIO-DD+ +NERUAL:X",
         "DOLBY AUDIO-DD+ +NEURAL:X",
         "DOLBY AUDIO-DD+",
+        "DOLBY AUDIO-DD+",
         "DOLBY AUDIO-DD+DSUR",
+        "DOLBY AUDIO-DD+NEURAL:X",
         "DOLBY AUDIO-DSUR",
         "DOLBY AUDIO-TRUEHD",
         "DOLBY AUDIO-TRUEHD+DSUR",
@@ -391,16 +399,16 @@ SOUND_MODE_MAPPING = {
         "MULTI IN + NEURAL:X",
         "NEURAL",
         "STANDARD(DOLBY)",
-        "DOLBY AUDIO-DD+NEURAL:X",
-        "DOLBY AUDIO-DD+",
-        # Added both variants as we don't know if type is intentional
-        "DOLBY AUDIO-DD+ +NERUAL:X",
-        "DOLBY AUDIO-DD+ +NEURAL:X",
     ],
     "DTS SURROUND": [
         "DTS + DOLBY SURROUND",
         "DTS + NEURAL:X",
         "DTS + VIRTUAL:X",
+        "DTS HD MSTR",
+        "DTS HD",
+        "DTS HD+DSUR",
+        "DTS HD+NEURAL:X",
+        "DTS HD+VIRTUAL:X",
         "DTS NEURAL:X",
         "DTS SURROUND",
         "DTS VIRTUAL:X",
@@ -411,26 +419,22 @@ SOUND_MODE_MAPPING = {
         "DTS-HD",
         "DTS:X MSTR",
         "DTS:X",
-        "M CH IN+DSUR",
-        "MULTI CH IN",
-        "NEURAL:X",
-        "STANDARD(DTS)",
-        "VIRTUAL:X",
-        "IMAX DTS",
-        "IMAX DTS+NEURAL:X",
-        "MAX DTS+VIRTUAL:X",
+        "DTS:X+VIRTUAL:X",
         "DTS+DSUR",
         "DTS+NEURAL:X",
         "DTS+VIRTUAL:X",
-        "DTS HD",
-        "DTS HD+DSUR",
-        "DTS HD+NEURAL:X",
-        "DTS HD+VIRTUAL:X",
-        "DTS:X+VIRTUAL:X",
         "IMAX DTS:X",
         "IMAX DTS:X+VIRTUAL:X",
+        "IMAX DTS",
+        "IMAX DTS+NEURAL:X",
+        "M CH IN+DSUR",
         "M CH IN+NEURAL:X",
         "M CH IN+VIRTUAL:X",
+        "MAX DTS+VIRTUAL:X",
+        "MULTI CH IN",
+        "NEURAL:X",
+        "STANDARD(DTS)",
+        "VIRTUAL:X",
     ],
     "AURO3D": ["AURO-3D", "AURO3D"],
     "AURO2DSURR": ["AURO-2D SURROUND", "AURO2DSURR"],
@@ -541,7 +545,11 @@ COMMAND_DIALOG_ENHANCER = "/goform/formiPhoneAppDirect.xml?PSDEH%20{level}"
 COMMAND_HDMI_OUTPUT = "/goform/formiPhoneAppDirect.xml?VSMONI{output}"
 COMMAND_HDMI_AUDIO_DECODE = "/goform/formiPhoneAppDirect.xml?VSAUDIO%20{mode}"
 COMMAND_QUICK_SELECT_MODE = "/goform/formiPhoneAppDirect.xml?MSQUICK{number}"
-COMMAND_QUICK_SELECT_MEMORY = "/goform/formiPhoneAppDirect.xml?MSQUICK{number}"
+COMMAND_QUICK_SELECT_MEMORY = "/goform/formiPhoneAppDirect.xml?MSQUICK{number}%20MEMORY"
+COMMAND_SMART_SELECT_MODE = "/goform/formiPhoneAppDirect.xml?MSSMART{number}"  # Marantz
+COMMAND_SMART_SELECT_MEMORY = (
+    "/goform/formiPhoneAppDirect.xml?MSSMART{number}%20MEMORY"  # Marantz
+)
 COMMAND_AUTO_STANDBY = "/goform/formiPhoneAppDirect.xml?STBY{mode}"
 COMMAND_SLEEP = "/goform/formiPhoneAppDirect.xml?SLP{value}"
 COMMAND_CENTER_SPREAD = "/goform/formiPhoneAppDirect.xml?PSCES%20{mode}"
@@ -658,6 +666,8 @@ DENONAVR_URLS = ReceiverURLs(
     command_hdmi_audio_decode=COMMAND_HDMI_AUDIO_DECODE,
     command_quick_select_mode=COMMAND_QUICK_SELECT_MODE,
     command_quick_select_memory=COMMAND_QUICK_SELECT_MODE,
+    command_smart_select_mode=COMMAND_SMART_SELECT_MODE,  # Marantz
+    command_smart_select_memory=COMMAND_SMART_SELECT_MEMORY,  # Marantz
     command_auto_standby=COMMAND_AUTO_STANDBY,
     command_sleep=COMMAND_SLEEP,
     command_center_spread=COMMAND_CENTER_SPREAD,
@@ -751,6 +761,8 @@ ZONE2_URLS = ReceiverURLs(
     command_hdmi_audio_decode=COMMAND_HDMI_AUDIO_DECODE,
     command_quick_select_mode=COMMAND_QUICK_SELECT_MODE,
     command_quick_select_memory=COMMAND_QUICK_SELECT_MEMORY,
+    command_smart_select_mode=COMMAND_SMART_SELECT_MODE,  # Marantz
+    command_smart_select_memory=COMMAND_SMART_SELECT_MEMORY,  # Marantz
     command_auto_standby=COMMAND_AUTO_STANDBY,
     command_sleep=COMMAND_SLEEP,
     command_center_spread=COMMAND_CENTER_SPREAD,
@@ -844,6 +856,8 @@ ZONE3_URLS = ReceiverURLs(
     command_hdmi_audio_decode=COMMAND_HDMI_AUDIO_DECODE,
     command_quick_select_mode=COMMAND_QUICK_SELECT_MODE,
     command_quick_select_memory=COMMAND_QUICK_SELECT_MEMORY,
+    command_smart_select_mode=COMMAND_SMART_SELECT_MODE,  # Marantz
+    command_smart_select_memory=COMMAND_SMART_SELECT_MEMORY,  # Marantz
     command_auto_standby=COMMAND_AUTO_STANDBY,
     command_sleep=COMMAND_SLEEP,
     command_center_spread=COMMAND_CENTER_SPREAD,
@@ -992,6 +1006,8 @@ DENONAVR_TELNET_COMMANDS = TelnetCommands(
     command_hdmi_audio_decode="VSAUDIO {mode}",
     command_quick_select_mode="MSQUICK{number}",
     command_quick_select_memory="MSQUICK{number} MEMORY",
+    command_smart_select_mode="MSSMART{number}",  # Marantz
+    command_smart_select_memory="MSSMART{number} MEMORY",  # Marantz
     command_auto_standby="STBY{mode}",
     command_sleep="SLP{value}",
     command_center_spread="PSCES {mode}",
@@ -1083,6 +1099,8 @@ ZONE2_TELNET_COMMANDS = TelnetCommands(
     command_hdmi_audio_decode="VSAUDIO {mode}",
     command_quick_select_mode="MSQUICK{number}",
     command_quick_select_memory="MSQUICK{number} MEMORY",
+    command_smart_select_mode="MSSMART{number}",  # Marantz
+    command_smart_select_memory="MSSMART{number} MEMORY",  # Marantz
     command_auto_standby="STBY{mode}",
     command_sleep="SLP{value}",
     command_center_spread="PSCES {mode}",
@@ -1174,6 +1192,8 @@ ZONE3_TELNET_COMMANDS = TelnetCommands(
     command_hdmi_audio_decode="VSAUDIO {mode}",
     command_quick_select_mode="MSQUICK{number}",
     command_quick_select_memory="MSQUICK{number} MEMORY",
+    command_smart_select_mode="MSSMART{number}",  # Marantz
+    command_smart_select_memory="MSSMART{number} MEMORY",  # Marantz
     command_auto_standby="STBY{mode}",
     command_sleep="SLP{value}",
     command_center_spread="PSCES {mode}",

denonavr/dirac.py

@@ -8,7 +8,7 @@ This module implements the Audyssey settings of Denon AVR receivers.
 """
 
 import logging
-from typing import Optional
+from typing import Optional, get_args
 
 import attr
 
@@ -31,6 +31,7 @@ class DenonAVRDirac(DenonAVRFoundation):
     _dirac_filter: Optional[str] = attr.ib(
         converter=attr.converters.optional(str), default=None
     )
+    _dirac_filters = get_args(DiracFilters)
 
     def setup(self) -> None:
         """Ensure that the instance is initialized."""
@@ -66,7 +67,7 @@ class DenonAVRDirac(DenonAVRFoundation):
     ##########
     async def async_dirac_filter(self, dirac_filter: DiracFilters) -> None:
         """Set Dirac filter."""
-        if dirac_filter not in DiracFilters:
+        if dirac_filter not in self._dirac_filters:
             raise AvrCommandError("Invalid Dirac filter")
 
         mapped_filter = DIRAC_FILTER_MAP[dirac_filter]

denonavr/foundation.py

@@ -39,6 +39,7 @@ from .const import (
     DIMMER_MODE_MAP_LABELS,
     ECO_MODE_MAP,
     ECO_MODE_MAP_LABELS,
+    HDMI_OUTPUT_MAP,
     HDMI_OUTPUT_MAP_LABELS,
     MAIN_ZONE,
     POWER_STATES,
@@ -153,6 +154,7 @@ class DenonAVRDeviceInfo:
     _dimmer: Optional[str] = attr.ib(
         converter=attr.converters.optional(str), default=None
     )
+    _dimmer_modes = get_args(DimmerModes)
     _auto_standby: Optional[str] = attr.ib(
         converter=attr.converters.optional(str), default=None
     )
@@ -166,9 +168,11 @@ class DenonAVRDeviceInfo:
     _eco_mode: Optional[str] = attr.ib(
         converter=attr.converters.optional(str), default=None
     )
+    _eco_modes = get_args(EcoModes)
     _hdmi_output: Optional[str] = attr.ib(
         converter=attr.converters.optional(str), default=None
     )
+    _hdmi_outputs = get_args(HDMIOutputs)
     _hdmi_audio_decode: Optional[str] = attr.ib(
         converter=attr.converters.optional(str), default=None
     )
@@ -308,8 +312,8 @@ class DenonAVRDeviceInfo:
         self, zone: str, event: str, parameter: str
     ) -> None:
         """Handle a delay change event."""
-        if event == "PS" and parameter[0:3] == "DEL":
-            self._delay = int(parameter[4:])
+        if event == "PS" and parameter[0:5] == "DELAY":
+            self._delay = int(parameter[6:])
 
     async def _async_eco_mode_callback(
         self, zone: str, event: str, parameter: str
@@ -385,7 +389,8 @@ class DenonAVRDeviceInfo:
         self, zone: str, event: str, parameter: str
     ) -> None:
         """Handle a delay time change event."""
-        if event != "PS" or parameter[0:3] != "DEL":
+        # do not match "DELAY" as it's another event
+        if event != "PS" or parameter[0:3] != "DEL" or parameter[0:5] == "DELAY":
             return
 
         self._delay_time = int(parameter[4:])
@@ -1199,7 +1204,7 @@ class DenonAVRDeviceInfo:
 
     async def async_dimmer(self, mode: DimmerModes) -> None:
         """Set dimmer mode on receiver via HTTP get command."""
-        if mode not in DimmerModes:
+        if mode not in self._dimmer_modes:
             raise AvrCommandError("Invalid dimmer mode")
 
         mapped_mode = DIMMER_MODE_MAP[mode]
@@ -1397,15 +1402,19 @@ class DenonAVRDeviceInfo:
             raise AvrCommandError("Quick select number must be between 1 and 5")
 
         if self.telnet_available:
+            if "denon" in self.manufacturer.lower():
+                command = self.telnet_commands.command_quick_select_memory
+            else:
+                command = self.telnet_commands.command_smart_select_memory
             await self.telnet_api.async_send_commands(
-                self.telnet_commands.command_quick_select_mode.format(
-                    number=quick_select_number
-                )
+                command.format(number=quick_select_number)
             )
         else:
-            await self.api.async_get_command(
-                self.urls.command_quick_select_mode.format(number=quick_select_number)
-            )
+            if "denon" in self.manufacturer.lower():
+                command = self.urls.command_quick_select_mode
+            else:
+                command = self.urls.command_smart_select_mode
+            await self.api.async_get_command(command.format(number=quick_select_number))
 
     async def async_quick_select_memory(self, quick_select_number: int) -> None:
         """
@@ -1417,15 +1426,19 @@ class DenonAVRDeviceInfo:
             raise AvrCommandError("Quick select number must be between 1 and 5")
 
         if self.telnet_available:
+            if "denon" in self.manufacturer.lower():
+                command = self.telnet_commands.command_quick_select_mode
+            else:
+                command = self.telnet_commands.command_smart_select_mode
             await self.telnet_api.async_send_commands(
-                self.telnet_commands.command_quick_select_memory.format(
-                    number=quick_select_number
-                )
+                command.format(number=quick_select_number)
             )
         else:
-            await self.api.async_get_command(
-                self.urls.command_quick_select_memory.format(number=quick_select_number)
-            )
+            if "denon" in self.manufacturer.lower():
+                command = self.urls.command_quick_select_memory
+            else:
+                command = self.urls.command_smart_select_memory
+            await self.api.async_get_command(command.format(number=quick_select_number))
 
     async def async_delay_up(self) -> None:
         """Delay up on receiver via HTTP get command."""
@@ -1447,7 +1460,7 @@ class DenonAVRDeviceInfo:
 
     async def async_eco_mode(self, mode: EcoModes) -> None:
         """Set Eco mode."""
-        if mode not in EcoModes:
+        if mode not in self._eco_modes:
             raise AvrCommandError("Invalid Eco mode")
 
         mapped_mode = ECO_MODE_MAP[mode]
@@ -1462,10 +1475,10 @@ class DenonAVRDeviceInfo:
 
     async def async_hdmi_output(self, output: HDMIOutputs) -> None:
         """Set HDMI output."""
-        if output not in HDMIOutputs:
+        if output not in self._hdmi_outputs:
             raise AvrCommandError("Invalid HDMI output mode")
 
-        mapped_output = HDMIOutputs[output]
+        mapped_output = HDMI_OUTPUT_MAP[output]
         if self.telnet_available:
             await self.telnet_api.async_send_commands(
                 self.telnet_commands.command_hdmi_output.format(output=mapped_output)

denonavr/soundmode.py

@@ -229,8 +229,8 @@ class DenonAVRSoundMode(DenonAVRFoundation):
         if self._device.zone != zone:
             return
 
-        # QUICK is not a sound mode
-        if parameter.startswith("QUICK"):
+        # QUICK/SMART are not sound modes
+        if parameter.startswith("QUICK") or parameter.startswith("SMART"):
             return
 
         self._sound_mode_raw = parameter

{denonavr-1.1.1.dist-info → denonavr-1.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: denonavr
-Version: 1.1.1
+Version: 1.1.2
 Summary: Automation Library for Denon AVR receivers
 Author-email: Oliver Goetz <scarface@mywoh.de>
 License: MIT

denonavr-1.1.2.dist-info/RECORD

@@ -0,0 +1,20 @@
+denonavr/__init__.py,sha256=XIZmlMTDfp6bJzeFlhfUaTmfz0pNiyaNyjW9yzTfEbE,1325
+denonavr/api.py,sha256=5LknKLIXZVPuQ8EYqcf6vAxo4M8ll8wGkoDM40b0sZ4,32555
+denonavr/appcommand.py,sha256=H37VK4n-yW0ISvR1hfX8G4udQtGASoY44QNaXtLSidE,7784
+denonavr/audyssey.py,sha256=d7mSkRiMvrZMtCzQdixfJuLmkuZeSi1w1GgQ_1fm-j8,14655
+denonavr/const.py,sha256=l2WXqSIPxGAJwlP4tJ8ay3dZyPWXiT3_nhlApQY2hRE,55456
+denonavr/decorators.py,sha256=tLoVjGtDmN75fhwCgNREMGjbB6varDERnYlrhC6yIZ8,2733
+denonavr/denonavr.py,sha256=lN_xwG9sa1TYCZQi24FRq4p4jV6GaOuDefYGuLvvXGI,39823
+denonavr/dirac.py,sha256=bRAxdfHRCfYT7nw68ggegXbMsMpmaoqh2foz5qh_Ikw,2595
+denonavr/exceptions.py,sha256=naP7MCuNH98rv7y_lDdO7ayyvQGywnsfpHhW-o9tKeo,1725
+denonavr/foundation.py,sha256=rFYntu5VBJqJEv5da9bgC9W8pG_xyBBiO6IyVUlUmLc,73593
+denonavr/input.py,sha256=kbKPePkdFHQSHKzOvAYudeSyJiRrUh0PxIOkG38kDUo,43050
+denonavr/soundmode.py,sha256=ONMVzD4FPM8PvNrLIG_HjJeAaM5DNp4jvC2mGqXzEI8,44392
+denonavr/ssdp.py,sha256=4gyvN0yo9qSnJ7l6iJmSC_5qW45Fq2Tt2RACpxFMSqg,7839
+denonavr/tonecontrol.py,sha256=DfHzziEeLdYiyTbJKcGk5cCPTvKBgjMqQReYp0qoF0U,12474
+denonavr/volume.py,sha256=qnsYr4AWfCu8MQH9mdw1qsaLo3-Sq1mdzreYQDhaTXQ,22260
+denonavr-1.1.2.dist-info/licenses/LICENSE,sha256=hcKXAoZnRee1NRWnxTpKyjKCz4aHhw76sZUZoB3qPTw,1068
+denonavr-1.1.2.dist-info/METADATA,sha256=Y73wPSRIMHvVbx89acau-UY_hWDbgJiuTOH1Hl3hJE4,4707
+denonavr-1.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+denonavr-1.1.2.dist-info/top_level.txt,sha256=GKwe6bOaw_R68BR7x-C7VD3bDFKKNBf0pRkWywUZWIs,9
+denonavr-1.1.2.dist-info/RECORD,,

{denonavr-1.1.1.dist-info → denonavr-1.1.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

denonavr-1.1.1.dist-info/RECORD

@@ -1,20 +0,0 @@
-denonavr/__init__.py,sha256=NC9U9u1IB229tP7SjZIkMK2giRp32jsmJr-dU4WqwjU,1325
-denonavr/api.py,sha256=SaJls_9yQ8TyklzWwflubwy6oJki1NYIQGeeHNf-3ss,32530
-denonavr/appcommand.py,sha256=H37VK4n-yW0ISvR1hfX8G4udQtGASoY44QNaXtLSidE,7784
-denonavr/audyssey.py,sha256=d7mSkRiMvrZMtCzQdixfJuLmkuZeSi1w1GgQ_1fm-j8,14655
-denonavr/const.py,sha256=HwdM3x-Fa3DxOs1-Tpg28Z9LSCRpMoI8-pSOhdmhx64,54261
-denonavr/decorators.py,sha256=tLoVjGtDmN75fhwCgNREMGjbB6varDERnYlrhC6yIZ8,2733
-denonavr/denonavr.py,sha256=lN_xwG9sa1TYCZQi24FRq4p4jV6GaOuDefYGuLvvXGI,39823
-denonavr/dirac.py,sha256=my8E9r-t8u579chnyIhJb1afNme73bQGCxj3D3TQX8g,2534
-denonavr/exceptions.py,sha256=naP7MCuNH98rv7y_lDdO7ayyvQGywnsfpHhW-o9tKeo,1725
-denonavr/foundation.py,sha256=1_fpV9pA0Jz36Rnieowz4myqpAdaCaNwP74QTdMpSgk,72785
-denonavr/input.py,sha256=kbKPePkdFHQSHKzOvAYudeSyJiRrUh0PxIOkG38kDUo,43050
-denonavr/soundmode.py,sha256=NFNQhTqXLBfRHPmorRaWf49nCALotXOeCUK2pcjl9cU,44353
-denonavr/ssdp.py,sha256=4gyvN0yo9qSnJ7l6iJmSC_5qW45Fq2Tt2RACpxFMSqg,7839
-denonavr/tonecontrol.py,sha256=DfHzziEeLdYiyTbJKcGk5cCPTvKBgjMqQReYp0qoF0U,12474
-denonavr/volume.py,sha256=qnsYr4AWfCu8MQH9mdw1qsaLo3-Sq1mdzreYQDhaTXQ,22260
-denonavr-1.1.1.dist-info/licenses/LICENSE,sha256=hcKXAoZnRee1NRWnxTpKyjKCz4aHhw76sZUZoB3qPTw,1068
-denonavr-1.1.1.dist-info/METADATA,sha256=tWBGzpk-Q5Lhd_gEBsO2BFRDESPF9WkR7JvO4lR96Cc,4707
-denonavr-1.1.1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-denonavr-1.1.1.dist-info/top_level.txt,sha256=GKwe6bOaw_R68BR7x-C7VD3bDFKKNBf0pRkWywUZWIs,9
-denonavr-1.1.1.dist-info/RECORD,,