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

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",
@@ -112,6 +114,14 @@ ReceiverURLs = namedtuple(
         "command_panel_and_volume_lock",
         "command_graphic_eq",
         "command_headphone_eq",
+        "command_denon_hdmi_cec_on",
+        "command_denon_hdmi_cec_off",
+        "command_marantz_hdmi_cec_on",
+        "command_marantz_hdmi_cec_off",
+        "command_mdax",  # Marantz Only
+        "command_dac_filter",  # Marantz Only
+        "command_illumination",  # Marantz Only
+        "command_auto_lip_sync",  # Marantz Only
     ],
 )
 TelnetCommands = namedtuple(
@@ -183,6 +193,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",
@@ -205,6 +217,14 @@ TelnetCommands = namedtuple(
         "command_panel_and_volume_lock",
         "command_graphic_eq",
         "command_headphone_eq",
+        "command_denon_hdmi_cec_on",
+        "command_denon_hdmi_cec_off",
+        "command_marantz_hdmi_cec_on",
+        "command_marantz_hdmi_cec_off",
+        "command_mdax",  # Marantz Only
+        "command_dac_filter",  # Marantz Only
+        "command_illumination",  # Marantz Only
+        "command_auto_lip_sync",  # Marantz Only
     ],
 )
 
@@ -364,9 +384,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 +415,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 +435,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 +561,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}"
@@ -564,6 +588,16 @@ COMMAND_PANEL_LOCK = "/goform/formiPhoneAppDirect.xml?SYPANEL%20LOCK%20{mode}"
 COMMAND_PANEL_AND_VOLUME_LOCK = "/goform/formiPhoneAppDirect.xml?SYPANEL+V%20LOCK%20ON"
 COMMAND_GRAPHIC_EQ = "/goform/formiPhoneAppDirect.xml?PSGEQ%20{mode}"
 COMMAND_HEADPHONE_EQ = "/goform/formiPhoneAppDirect.xml?PSHEQ%20{mode}"
+COMMAND_DENON_HDMI_CEC_ON = "/goform/formiPhoneAppDirect.xml?RCKSK0410826"
+COMMAND_DENON_HDMI_CEC_OFF = "/goform/formiPhoneAppDirect.xml?RCKSK0410827"
+COMMAND_MARANTZ_HDMI_CEC_ON = "/goform/formiPhoneAppDirect.xml?RCRC51608408"
+COMMAND_MARANTZ_HDMI_CEC_OFF = "/goform/formiPhoneAppDirect.xml?RCRC51608409"
+COMMAND_MDAX = "/goform/formiPhoneAppDirect.xml?PSMDAX%20{mode}"  # Marantz Only
+COMMAND_DAC_FILTER = "/goform/formiPhoneAppDirect.xml?PSDACFIL%20{mode}"  # Marantz Only
+COMMAND_ILLUMINATION = "/goform/formiPhoneAppDirect.xml?ILB%20{mode}"  # Marantz Only
+COMMAND_AUTO_LIP_SYNC = (
+    "/goform/formiPhoneAppDirect.xml?SSHOSALS%20{mode}"  # Marantz Only
+)
 
 # Zone 2 URLs
 STATUS_Z2_URL = "/goform/formZone2_Zone2XmlStatus.xml"
@@ -658,6 +692,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,
@@ -680,6 +716,14 @@ DENONAVR_URLS = ReceiverURLs(
     command_panel_and_volume_lock=COMMAND_PANEL_AND_VOLUME_LOCK,
     command_graphic_eq=COMMAND_GRAPHIC_EQ,
     command_headphone_eq=COMMAND_HEADPHONE_EQ,
+    command_denon_hdmi_cec_on=COMMAND_DENON_HDMI_CEC_ON,
+    command_denon_hdmi_cec_off=COMMAND_DENON_HDMI_CEC_OFF,
+    command_marantz_hdmi_cec_on=COMMAND_MARANTZ_HDMI_CEC_ON,
+    command_marantz_hdmi_cec_off=COMMAND_MARANTZ_HDMI_CEC_OFF,
+    command_mdax=COMMAND_MDAX,  # Marantz Only
+    command_dac_filter=COMMAND_DAC_FILTER,  # Marantz Only
+    command_illumination=COMMAND_ILLUMINATION,  # Marantz Only
+    command_auto_lip_sync=COMMAND_AUTO_LIP_SYNC,  # Marantz Only
 )
 
 ZONE2_URLS = ReceiverURLs(
@@ -751,6 +795,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,
@@ -773,6 +819,14 @@ ZONE2_URLS = ReceiverURLs(
     command_panel_and_volume_lock=COMMAND_PANEL_AND_VOLUME_LOCK,
     command_graphic_eq=COMMAND_GRAPHIC_EQ,
     command_headphone_eq=COMMAND_HEADPHONE_EQ,
+    command_denon_hdmi_cec_on=COMMAND_DENON_HDMI_CEC_ON,
+    command_denon_hdmi_cec_off=COMMAND_DENON_HDMI_CEC_OFF,
+    command_marantz_hdmi_cec_on=COMMAND_MARANTZ_HDMI_CEC_ON,
+    command_marantz_hdmi_cec_off=COMMAND_MARANTZ_HDMI_CEC_OFF,
+    command_mdax=COMMAND_MDAX,  # Marantz Only
+    command_dac_filter=COMMAND_DAC_FILTER,  # Marantz Only
+    command_illumination=COMMAND_ILLUMINATION,  # Marantz Only
+    command_auto_lip_sync=COMMAND_AUTO_LIP_SYNC,  # Marantz Only
 )
 
 ZONE3_URLS = ReceiverURLs(
@@ -844,6 +898,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,
@@ -866,6 +922,14 @@ ZONE3_URLS = ReceiverURLs(
     command_panel_and_volume_lock=COMMAND_PANEL_AND_VOLUME_LOCK,
     command_graphic_eq=COMMAND_GRAPHIC_EQ,
     command_headphone_eq=COMMAND_HEADPHONE_EQ,
+    command_denon_hdmi_cec_on=COMMAND_DENON_HDMI_CEC_ON,
+    command_denon_hdmi_cec_off=COMMAND_DENON_HDMI_CEC_OFF,
+    command_marantz_hdmi_cec_on=COMMAND_MARANTZ_HDMI_CEC_ON,
+    command_marantz_hdmi_cec_off=COMMAND_MARANTZ_HDMI_CEC_OFF,
+    command_mdax=COMMAND_MDAX,  # Marantz Only
+    command_dac_filter=COMMAND_DAC_FILTER,  # Marantz Only
+    command_illumination=COMMAND_ILLUMINATION,  # Marantz Only
+    command_auto_lip_sync=COMMAND_AUTO_LIP_SYNC,  # Marantz Only
 )
 
 # Telnet Events
@@ -877,6 +941,7 @@ TELNET_EVENTS = {
     "DIM",
     "ECO",
     "HD",
+    "ILB",  # Marantz Only
     "MN",
     "MS",
     "MU",
@@ -992,6 +1057,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}",
@@ -1014,6 +1081,14 @@ DENONAVR_TELNET_COMMANDS = TelnetCommands(
     command_panel_and_volume_lock="SYPANEL+V LOCK ON",
     command_graphic_eq="PSGEQ {mode}",
     command_headphone_eq="PSHEQ {mode}",
+    command_denon_hdmi_cec_on="RCKSK0410826",
+    command_denon_hdmi_cec_off="RCKSK0410827",
+    command_marantz_hdmi_cec_on="RCRC51608408",
+    command_marantz_hdmi_cec_off="RCRC51608409",
+    command_mdax="PSMDAX {mode}",  # Marantz Only
+    command_dac_filter="PSDACFIL {mode}",  # Marantz Only
+    command_illumination="ILB {mode}",  # Marantz Only
+    command_auto_lip_sync="SSHOSALS {mode}",  # Marantz Only
 )
 
 ZONE2_TELNET_COMMANDS = TelnetCommands(
@@ -1083,6 +1158,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}",
@@ -1105,6 +1182,14 @@ ZONE2_TELNET_COMMANDS = TelnetCommands(
     command_panel_and_volume_lock="SYPANEL+V LOCK ON",
     command_graphic_eq="PSGEQ {mode}",
     command_headphone_eq="PSHEQ {mode}",
+    command_denon_hdmi_cec_on="RCKSK0410826",
+    command_denon_hdmi_cec_off="RCKSK0410827",
+    command_marantz_hdmi_cec_on="RCRC51608408",
+    command_marantz_hdmi_cec_off="RCRC51608409",
+    command_mdax="PSMDAX {mode}",  # Marantz Only
+    command_dac_filter="PSDACFIL {mode}",  # Marantz Only
+    command_illumination="ILB {mode}",  # Marantz Only
+    command_auto_lip_sync="SSHOSALS {mode}",  # Marantz Only
 )
 
 ZONE3_TELNET_COMMANDS = TelnetCommands(
@@ -1174,6 +1259,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}",
@@ -1196,6 +1283,14 @@ ZONE3_TELNET_COMMANDS = TelnetCommands(
     command_panel_and_volume_lock="SYPANEL+V LOCK ON",
     command_graphic_eq="PSGEQ {mode}",
     command_headphone_eq="PSHEQ {mode}",
+    command_denon_hdmi_cec_on="RCKSK0410826",
+    command_denon_hdmi_cec_off="RCKSK0410827",
+    command_marantz_hdmi_cec_on="RCRC51608408",
+    command_marantz_hdmi_cec_off="RCRC51608409",
+    command_mdax="PSMDAX {mode}",  # Marantz Only
+    command_dac_filter="PSDACFIL {mode}",  # Marantz Only
+    command_illumination="ILB {mode}",  # Marantz Only
+    command_auto_lip_sync="SSHOSALS {mode}",  # Marantz Only
 )
 
 # States
@@ -1604,3 +1699,37 @@ VIDEO_PROCESSING_MODES_MAP = {
 VIDEO_PROCESSING_MODES_MAP_LABELS = {
     value: key for key, value in VIDEO_PROCESSING_MODES_MAP.items()
 }
+
+MDAXs = Literal["Off", "Low", "Medium", "High"]
+"""M-DAX Modes."""
+
+MDAX_MAP = {
+    "Off": "OFF",
+    "Low": "LOW",
+    "Medium": "MED",
+    "High": "HI",
+}
+MDAX_MAP_LABELS = {value: key for key, value in MDAX_MAP.items()}
+
+DACFilters = Literal["Mode 1", "Mode 2"]
+"""DAC Filter Modes."""
+
+DAC_FILTERS_MAP = {
+    "Mode 1": "MODE1",
+    "Mode 2": "MODE2",
+}
+
+DAC_FILTERS_MAP_LABELS = {value: key for key, value in DAC_FILTERS_MAP.items()}
+
+Illuminations = Literal["Auto", "Bright", "Dim", "Dark", "Off"]
+"""Illumination Modes."""
+
+ILLUMINATION_MAP = {
+    "Auto": "AUTO",
+    "Bright": "BRI",
+    "Dim": "DIM",
+    "Dark": "DAR",
+    "Off": "OFF",
+}
+
+ILLUMINATION_MAP_LABELS = {value: key for key, value in ILLUMINATION_MAP.items()}

denonavr/denonavr.py

@@ -10,7 +10,7 @@ This module implements the interface to Denon AVR receivers.
 import asyncio
 import logging
 import time
-from typing import Awaitable, Callable, Dict, List, Literal, Optional, Union
+from typing import Callable, Dict, List, Literal, Optional, Union
 
 import attr
 import httpx
@@ -27,6 +27,7 @@ from .const import (
     EcoModes,
     HDMIAudioDecodes,
     HDMIOutputs,
+    Illuminations,
     PanelLocks,
     RoomSizes,
     TransducerLPFs,
@@ -232,14 +233,12 @@ class DenonAVR(DenonAVRFoundation):
         """Send telnet commands to the receiver."""
         self._device.telnet_api.send_commands(*commands)
 
-    def register_callback(
-        self, event: str, callback: Callable[[str, str, str], Awaitable[None]]
-    ):
+    def register_callback(self, event: str, callback: Callable[[str, str, str], None]):
         """Register a callback for telnet events."""
         self._device.telnet_api.register_callback(event, callback=callback)
 
     def unregister_callback(
-        self, event: str, callback: Callable[[str, str, str], Awaitable[None]]
+        self, event: str, callback: Callable[[str, str, str], None]
     ):
         """Unregister a callback for telnet events."""
         self._device.telnet_api.unregister_callback(event, callback=callback)
@@ -738,6 +737,26 @@ class DenonAVR(DenonAVRFoundation):
         """
         return self._device.headphone_eq
 
+    @property
+    def illumination(self) -> Optional[str]:
+        """
+        Return the illumination status for the device.
+
+        Only available on Marantz devices and when using Telnet.
+
+        Possible values are: "Auto", "Bright", "Dim", "Dark", "Off"
+        """
+        return self.illumination
+
+    @property
+    def auto_lip_sync(self) -> Optional[bool]:
+        """
+        Return the auto lip sync status for the device.
+
+        Only available on Marantz devices and when using Telnet.
+        """
+        return self.auto_lip_sync
+
     ##########
     # Getter #
     ##########
@@ -1210,3 +1229,43 @@ class DenonAVR(DenonAVRFoundation):
         :param quick_select_number: Quick select number to set. Valid values are 1-5.
         """
         await self._device.async_quick_select_memory(quick_select_number)
+
+    async def async_hdmi_cec_on(self) -> None:
+        """Turn on HDMI CEC on receiver via HTTP get command."""
+        await self._device.async_hdmi_cec_on()
+
+    async def async_hdmi_cec_off(self) -> None:
+        """Turn off HDMI CEC on receiver via HTTP get command."""
+        await self._device.async_hdmi_cec_off()
+
+    async def async_illumination(self, mode: Illuminations):
+        """
+        Set illumination mode on receiver via HTTP get command.
+
+        Only available for Marantz devices.
+        """
+        await self._device.async_illumination(mode)
+
+    async def async_auto_lip_sync_on(self) -> None:
+        """
+        Turn on auto lip sync on receiver via HTTP get command.
+
+        Only available on Marantz devices.
+        """
+        await self._device.async_auto_lip_sync_on()
+
+    async def async_auto_lip_sync_off(self) -> None:
+        """
+        Turn off auto lip sync on receiver via HTTP get command.
+
+        Only available on Marantz devices.
+        """
+        await self._device.async_auto_lip_sync_off()
+
+    async def async_auto_lip_sync_toggle(self) -> None:
+        """
+        Toggle auto lip sync on receiver via HTTP get command.
+
+        Only available on Marantz devices and when using Telnet.
+        """
+        await self._device.async_auto_lip_sync_toggle()

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,17 +31,14 @@ 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."""
-        self._device.telnet_api.register_callback(
-            "PS", self._async_dirac_filter_callback
-        )
+        self._device.telnet_api.register_callback("PS", self._dirac_filter_callback)
         self._is_setup = True
 
-    async def _async_dirac_filter_callback(
-        self, zone: str, event: str, parameter: str
-    ) -> None:
+    def _dirac_filter_callback(self, zone: str, event: str, parameter: str) -> None:
         """Handle Dirac filter change event."""
         if event == "PS" and parameter[0:5] == "DIRAC":
             self._dirac_filter = DIRAC_FILTER_MAP_LABELS[parameter[6:]]
@@ -66,7 +63,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]