denonavr 0.11.6__py3-none-any.whl → 1.0.0__py3-none-any.whl

denonavr/__init__.py

@@ -10,8 +10,6 @@ Automation Library for Denon AVR receivers.
 # Set default logging handler to avoid "No handler found" warnings.
 import logging
 
-from .decorators import run_async_synchronously
-
 # Import denonavr module
 from .denonavr import DenonAVR
 from .ssdp import async_identify_denonavr_receivers
@@ -19,7 +17,7 @@ from .ssdp import async_identify_denonavr_receivers
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 
 __title__ = "denonavr"
-__version__ = "0.11.6"
+__version__ = "1.0.0"
 
 
 async def async_discover():
@@ -33,17 +31,6 @@ async def async_discover():
     return await async_identify_denonavr_receivers()
 
 
-@run_async_synchronously(async_func=async_discover)
-def discover():
-    """
-    Discover all Denon AVR devices in LAN zone.
-
-    Returns a list of dictionaries which includes all discovered Denon AVR
-    devices with keys "host", "modelName", "friendlyName", "presentationURL".
-    By default SSDP broadcasts are sent once with a 2 seconds timeout.
-    """
-
-
 async def async_init_all_receivers():
     """
     Initialize all discovered Denon AVR receivers in LAN zone.
@@ -58,13 +45,3 @@ async def async_init_all_receivers():
         init_receiver = DenonAVR(receiver["host"])
         init_receivers.append(init_receiver)
     return init_receivers
-
-
-@run_async_synchronously(async_func=async_init_all_receivers)
-def init_all_receivers():
-    """
-    Initialize all discovered Denon AVR receivers in LAN zone.
-
-    Returns a list of created Denon AVR instances.
-    By default SSDP broadcasts are sent up to 3 times with a 2 seconds timeout.
-    """

denonavr/api.py

@@ -401,9 +401,9 @@ class DenonAVRTelnetProtocol(asyncio.Protocol):
 
     def connection_lost(self, exc: Optional[Exception]) -> None:
         """Handle connection lost."""
-        self.transport = None
         self._on_connection_lost()
-        return super().connection_lost(exc)
+        super().connection_lost(exc)
+        self.transport = None
 
 
 @attr.s(auto_attribs=True, hash=False, on_setattr=DENON_ATTR_SETATTR)
@@ -413,9 +413,6 @@ class DenonAVRTelnetApi:
     host: str = attr.ib(converter=str, default="localhost")
     timeout: float = attr.ib(converter=float, default=2.0)
     _connection_enabled: bool = attr.ib(default=False)
-    _healthy: Optional[bool] = attr.ib(
-        converter=attr.converters.optional(bool), default=None
-    )
     _last_message_time: float = attr.ib(default=-1.0)
     _connect_lock: asyncio.Lock = attr.ib(default=attr.Factory(asyncio.Lock))
     _reconnect_task: asyncio.Task = attr.ib(default=None)
@@ -474,17 +471,17 @@ class DenonAVRTelnetApi:
             raise AvrTimoutError(f"TimeoutException: {err}", "telnet connect") from err
         except ConnectionRefusedError as err:
             _LOGGER.debug(
-                "%s: Connection refused on telnet connect", self.host, exc_info=True
+                "%s: Connection refused on telnet connect: %s", self.host, err
             )
             raise AvrNetworkError(
                 f"ConnectionRefusedError: {err}", "telnet connect"
             ) from err
         except (OSError, IOError) as err:
             _LOGGER.debug(
-                "%s: Connection failed on telnet reconnect", self.host, exc_info=True
+                "%s: Connection failed on telnet reconnect: %s", self.host, err
             )
             raise AvrNetworkError(f"OSError: {err}", "telnet connect") from err
-        _LOGGER.debug("%s: telnet connection complete", self.host)
+        _LOGGER.debug("%s: telnet connection established", self.host)
         self._protocol = cast(DenonAVRTelnetProtocol, transport_protocol[1])
         self._connection_enabled = True
         self._last_message_time = time.monotonic()
@@ -507,6 +504,7 @@ class DenonAVRTelnetApi:
             "PSREFLEV ?",
             "PSDYNVOL ?",
             "MS?",
+            skip_confirmation=True,
         )
 
     def _schedule_monitor(self) -> None:
@@ -527,8 +525,6 @@ class DenonAVRTelnetApi:
             _LOGGER.info(
                 "%s: Keep alive failed, disconnecting and reconnecting", self.host
             )
-            if self._protocol is not None:
-                self._protocol.close()
             self._handle_disconnected()
             return
 
@@ -540,8 +536,10 @@ class DenonAVRTelnetApi:
 
     def _handle_disconnected(self) -> None:
         """Handle disconnected."""
-        _LOGGER.debug("%s: disconnected", self.host)
-        self._protocol = None
+        _LOGGER.debug("%s: handle disconnected", self.host)
+        if self._protocol is not None:
+            self._protocol.close()
+            self._protocol = None
         self._stop_monitor()
         if not self._connection_enabled:
             return
@@ -550,6 +548,7 @@ class DenonAVRTelnetApi:
     async def async_disconnect(self) -> None:
         """Close the connection to the receiver asynchronously."""
         async with self._connect_lock:
+            _LOGGER.debug("%s: telnet disconnecting", self.host)
             self._connection_enabled = False
             self._stop_monitor()
             reconnect_task = self._reconnect_task
@@ -565,6 +564,7 @@ class DenonAVRTelnetApi:
                     await reconnect_task
                 except asyncio.CancelledError:
                     pass
+            _LOGGER.debug("%s: telnet disconnected", self.host)
 
     async def _async_reconnect(self) -> None:
         """Reconnect to the receiver asynchronously."""
@@ -572,19 +572,20 @@ class DenonAVRTelnetApi:
 
         while self._connection_enabled and not self.healthy:
             async with self._connect_lock:
+                _LOGGER.debug("%s: Telnet reconnecting", self.host)
                 try:
                     await self._async_establish_connection()
                 except AvrTimoutError:
                     _LOGGER.debug(
                         "%s: Timeout exception on telnet reconnect", self.host
                     )
-                except AvrNetworkError as ex:
-                    _LOGGER.debug("%s: %s", self.host, ex, exc_info=True)
-                except Exception:  # pylint: disable=broad-except
+                except AvrNetworkError as err:
+                    _LOGGER.debug("%s: %s", self.host, err)
+                except Exception as err:  # pylint: disable=broad-except
                     _LOGGER.error(
                         "%s: Unexpected exception on telnet reconnect",
                         self.host,
-                        exc_info=True,
+                        exc_info=err,
                     )
                 else:
                     _LOGGER.info("%s: Telnet reconnected", self.host)
@@ -682,7 +683,7 @@ class DenonAVRTelnetApi:
                 # We don't want a single bad callback to trip up the
                 # whole system and prevent further execution
                 _LOGGER.error(
-                    "%s: Raw callback caused an unhandled exception %s",
+                    "%s: Raw callback caused an unhandled exception: %s",
                     self.host,
                     err,
                 )
@@ -695,7 +696,7 @@ class DenonAVRTelnetApi:
                     # We don't want a single bad callback to trip up the
                     # whole system and prevent further execution
                     _LOGGER.error(
-                        "%s: Event callback caused an unhandled exception %s",
+                        "%s: Event callback caused an unhandled exception: %s",
                         self.host,
                         err,
                     )
@@ -708,7 +709,7 @@ class DenonAVRTelnetApi:
                     # We don't want a single bad callback to trip up the
                     # whole system and prevent further execution
                     _LOGGER.error(
-                        "%s: Event callback caused an unhandled exception %s",
+                        "%s: Event callback caused an unhandled exception: %s",
                         self.host,
                         err,
                     )
@@ -731,35 +732,45 @@ class DenonAVRTelnetApi:
             self._send_confirmation_event.set()
             _LOGGER.debug("Command %s confirmed", command)
 
-    async def _async_send_command(self, command: str) -> None:
+    async def _async_send_command(
+        self, command: str, skip_confirmation: bool = False
+    ) -> None:
         """Send one telnet command to the receiver."""
         async with self._send_lock:
-            self._send_confirmation_command = command
-            self._send_confirmation_event.clear()
+            if not skip_confirmation:
+                self._send_confirmation_command = command
+                self._send_confirmation_event.clear()
             if not self.connected or not self.healthy:
                 raise AvrProcessingError(
                     f"Error sending command {command}. Telnet connected: "
                     f"{self.connected}, Connection healthy: {self.healthy}"
                 )
             self._protocol.write(f"{command}\r")
-            try:
-                await asyncio.wait_for(
-                    self._send_confirmation_event.wait(),
-                    self._send_confirmation_timeout,
-                )
-            except asyncio.TimeoutError:
-                _LOGGER.info("Timeout waiting for confirmation of command: %s", command)
-            finally:
-                self._send_confirmation_command = ""
+            if not skip_confirmation:
+                try:
+                    await asyncio.wait_for(
+                        self._send_confirmation_event.wait(),
+                        self._send_confirmation_timeout,
+                    )
+                except asyncio.TimeoutError:
+                    _LOGGER.info(
+                        "Timeout waiting for confirmation of command: %s", command
+                    )
+                finally:
+                    self._send_confirmation_command = ""
 
-    async def async_send_commands(self, *commands: str) -> None:
+    async def async_send_commands(
+        self, *commands: str, skip_confirmation: bool = False
+    ) -> None:
         """Send telnet commands to the receiver."""
         for command in commands:
-            await self._async_send_command(command)
+            await self._async_send_command(command, skip_confirmation=skip_confirmation)
 
-    def send_commands(self, *commands: str) -> None:
+    def send_commands(self, *commands: str, skip_confirmation: bool = False) -> None:
         """Send telnet commands to the receiver."""
-        task = asyncio.create_task(self.async_send_commands(*commands))
+        task = asyncio.create_task(
+            self.async_send_commands(*commands, skip_confirmation=skip_confirmation)
+        )
         self._send_tasks.add(task)
         task.add_done_callback(self._send_tasks.discard)
 

denonavr/audyssey.py

@@ -99,12 +99,14 @@ class DenonAVRAudyssey(DenonAVRFoundation):
         self, global_update: bool = False, cache_id: Optional[Hashable] = None
     ) -> None:
         """Update Audyssey asynchronously."""
+        _LOGGER.debug("Starting Audyssey update")
         # Ensure instance is setup before updating
         if not self._is_setup:
             self.setup()
 
         # Update state
         await self.async_update_audyssey(global_update=global_update, cache_id=cache_id)
+        _LOGGER.debug("Finished Audyssey update")
 
     async def async_update_audyssey(
         self, global_update: bool = False, cache_id: Optional[Hashable] = None
@@ -117,13 +119,16 @@ class DenonAVRAudyssey(DenonAVRFoundation):
 
         # Audyssey is only available for avr 2016 update
         if self._device.use_avr_2016_update:
-            await self.async_update_attrs_appcommand(
-                self.appcommand0300_attrs,
-                appcommand0300=True,
-                global_update=global_update,
-                cache_id=cache_id,
-                ignore_missing_response=True,
-            )
+            try:
+                await self.async_update_attrs_appcommand(
+                    self.appcommand0300_attrs,
+                    appcommand0300=True,
+                    global_update=global_update,
+                    cache_id=cache_id,
+                )
+            except AvrProcessingError as err:
+                # Don't raise an error here, because not all devices support it
+                _LOGGER.debug("Updating Audyssey failed: %s", err)
 
     async def _async_set_audyssey(self, cmd: AppCommandCmd) -> None:
         """Set Audyssey parameter."""

denonavr/const.py

@@ -43,6 +43,17 @@ ReceiverURLs = namedtuple(
         "command_set_all_zone_stereo",
         "command_pause",
         "command_play",
+        "command_cusor_up",
+        "command_cusor_down",
+        "command_cusor_left",
+        "command_cusor_right",
+        "command_cusor_enter",
+        "command_back",
+        "command_info",
+        "command_options",
+        "command_setup_open",
+        "command_setup_close",
+        "command_setup_query",
     ],
 )
 TelnetCommands = namedtuple(
@@ -68,6 +79,17 @@ TelnetCommands = namedtuple(
         "command_tonecontrol",
         "command_bass",
         "command_treble",
+        "command_cusor_up",
+        "command_cusor_down",
+        "command_cusor_left",
+        "command_cusor_right",
+        "command_cusor_enter",
+        "command_back",
+        "command_info",
+        "command_options",
+        "command_setup_open",
+        "command_setup_close",
+        "command_setup_query",
     ],
 )
 
@@ -168,40 +190,40 @@ ALL_ZONE_STEREO = "ALL ZONE STEREO"
 
 SOUND_MODE_MAPPING = {
     "MUSIC": [
-        "PLII MUSIC",
-        "DTS NEO:6 MUSIC",
+        "DOLBY D +NEO:X M",
+        "DOLBY PL2 M",
+        "DOLBY PL2 MUSIC",
+        "DOLBY PL2 X MUSIC",
         "DTS NEO:6 M",
+        "DTS NEO:6 MUSIC",
         "DTS NEO:X M",
-        "DOLBY D +NEO:X M",
         "DTS NEO:X MUSIC",
-        "DOLBY PL2 MUSIC",
-        "DOLBY PL2 M",
+        "PLII MUSIC",
         "PLIIX MUSIC",
-        "DOLBY PL2 X MUSIC",
     ],
     "MOVIE": [
-        "PLII MOVIE",
-        "PLII CINEMA",
-        "DTS NEO:X CINEMA",
-        "DTS NEO:X C",
-        "DTS NEO:6 CINEMA",
-        "DTS NEO:6 C",
         "DOLBY D +NEO:X C",
-        "PLIIX CINEMA",
-        "DOLBY PLII MOVIE",
-        "MULTI IN + VIRTUAL:X",
-        "DOLBY PL2 CINEMA",
         "DOLBY PL2 C",
-        "DOLBY PL2 X MOVIE",
+        "DOLBY PL2 CINEMA",
         "DOLBY PL2 MOVIE",
+        "DOLBY PL2 X MOVIE",
+        "DOLBY PLII MOVIE",
+        "DTS NEO:6 C",
+        "DTS NEO:6 CINEMA",
+        "DTS NEO:X C",
+        "DTS NEO:X CINEMA",
+        "MULTI IN + VIRTUAL:X",
+        "PLII CINEMA",
+        "PLII MOVIE",
+        "PLIIX CINEMA",
     ],
     "GAME": [
-        "PLII GAME",
         "DOLBY D +NEO:X G",
-        "DOLBY PL2 GAME",
         "DOLBY PL2 G",
+        "DOLBY PL2 GAME",
         "DOLBY PL2 X GAME",
         "DOLBY PLII GAME",
+        "PLII GAME",
     ],
     "AUTO": ["None"],
     "STANDARD": ["None2"],
@@ -214,64 +236,74 @@ SOUND_MODE_MAPPING = {
     "DIRECT": ["DIRECT"],
     "PURE DIRECT": ["PURE_DIRECT", "PURE DIRECT"],
     "DOLBY DIGITAL": [
-        "DOLBY DIGITAL",
-        "DOLBY D + DOLBY SURROUND",
-        "DOLBY D+DS",
-        "DOLBY D+ +DS",
-        "DOLBY DIGITAL +",
-        "STANDARD(DOLBY)",
-        "DOLBY SURROUND",
-        "DOLBY D + +DOLBY SURROUND",
-        "NEURAL",
-        "NEURAL:X",
-        "DOLBY HD",
-        "DOLBY HD + DOLBY SURROUND",
-        "MULTI IN + DSUR",
-        "MULTI IN + NEURAL:X",
-        "MULTI IN + DOLBY SURROUND",
-        "DOLBY D + NEURAL:X",
-        "DOLBY DIGITAL + NEURAL:X",
-        "DOLBY DIGITAL + + NEURAL:X",
         "DOLBY ATMOS",
-        "DOLBY AUDIO - DOLBY SURROUND",
-        "DOLBY TRUEHD",
+        "DOLBY AUDIO - DD + DSUR",
+        "DOLBY AUDIO - DD + NEURAL:X",
+        "DOLBY AUDIO - DD+   + DSUR",
+        "DOLBY AUDIO - DD+   + NEURAL:X",
         "DOLBY AUDIO - DOLBY DIGITAL PLUS",
-        "DOLBY AUDIO - TRUEHD + DSUR",
+        "DOLBY AUDIO - DOLBY DIGITAL",
+        "DOLBY AUDIO - DOLBY SURROUND",
         "DOLBY AUDIO - DOLBY TRUEHD",
+        "DOLBY AUDIO - TRUEHD + DSUR",
         "DOLBY AUDIO - TRUEHD + NEURAL:X",
-        "DOLBY AUDIO - DD + NEURAL:X",
-        "DOLBY AUDIO - DD + DSUR",
-        "DOLBY AUDIO - DD+   + NEURAL:X",
-        "DOLBY AUDIO - DD+   + DSUR",
+        "DOLBY AUDIO-DD",
         "DOLBY AUDIO-DD+ +DSUR",
-        "DOLBY AUDIO - DOLBY DIGITAL",
-        "DOLBY AUDIO-DSUR",
+        "DOLBY AUDIO-DD+ +NEURAL:X",
+        "DOLBY AUDIO-DD+",
         "DOLBY AUDIO-DD+DSUR",
+        "DOLBY AUDIO-DSUR",
+        "DOLBY AUDIO-TRUEHD",
+        "DOLBY AUDIO-TRUEHD+DSUR",
+        "DOLBY AUDIO-TRUEHD+NEURAL:X",
+        "DOLBY D + +DOLBY SURROUND",
+        "DOLBY D + DOLBY SURROUND",
+        "DOLBY D + NEURAL:X",
+        "DOLBY D+ +DS",
+        "DOLBY D+",
+        "DOLBY D+DS",
+        "DOLBY DIGITAL + + NEURAL:X",
+        "DOLBY DIGITAL + NEURAL:X",
+        "DOLBY DIGITAL +",
+        "DOLBY DIGITAL",
+        "DOLBY HD + DOLBY SURROUND",
+        "DOLBY HD",
         "DOLBY PRO LOGIC",
+        "DOLBY SURROUND",
+        "DOLBY TRUEHD",
+        "MULTI IN + DOLBY SURROUND",
+        "MULTI IN + DSUR",
+        "MULTI IN + NEURAL:X",
+        "NEURAL:X",
+        "NEURAL",
+        "STANDARD(DOLBY)",
     ],
     "DTS SURROUND": [
-        "DTS SURROUND",
-        "DTS NEURAL:X",
-        "STANDARD(DTS)",
+        "DTS + DOLBY SURROUND",
         "DTS + NEURAL:X",
-        "MULTI CH IN",
-        "DTS-HD MSTR",
-        "DTS VIRTUAL:X",
-        "DTS-HD + NEURAL:X",
-        "DTS-HD",
         "DTS + VIRTUAL:X",
-        "DTS + DOLBY SURROUND",
+        "DTS NEURAL:X",
+        "DTS SURROUND",
+        "DTS VIRTUAL:X",
         "DTS-HD + DOLBY SURROUND",
         "DTS-HD + DSUR",
+        "DTS-HD + NEURAL:X",
+        "DTS-HD MSTR",
+        "DTS-HD",
         "DTS:X MSTR",
+        "DTS:X",
+        "M CH IN+DSUR",
+        "MULTI CH IN",
+        "STANDARD(DTS)",
+        "VIRTUAL:X",
     ],
-    "AURO3D": ["AURO-3D"],
-    "AURO2DSURR": ["AURO-2D SURROUND"],
+    "AURO3D": ["AURO-3D", "AURO3D"],
+    "AURO2DSURR": ["AURO-2D SURROUND", "AURO2DSURR"],
     "MCH STEREO": [
-        "MULTI CH STEREO",
-        "MULTI_CH_STEREO",
         "MCH STEREO",
         "MULTI CH IN 7.1",
+        "MULTI CH STEREO",
+        "MULTI_CH_STEREO",
     ],
     "STEREO": ["STEREO"],
     ALL_ZONE_STEREO: ["ALL ZONE STEREO"],
@@ -327,6 +359,17 @@ COMMAND_MUTE_ON_URL = "/goform/formiPhoneAppMute.xml?1+MuteOn"
 COMMAND_MUTE_OFF_URL = "/goform/formiPhoneAppMute.xml?1+MuteOff"
 COMMAND_SEL_SM_URL = "/goform/formiPhoneAppDirect.xml?MS"
 COMMAND_SET_ZST_URL = "/goform/formiPhoneAppDirect.xml?MN"
+COMMAND_CURSOR_UP = "/goform/formiPhoneAppDirect.xml?MNCUP"
+COMMAND_CURSOR_DOWN = "/goform/formiPhoneAppDirect.xml?MNCDN"
+COMMAND_CURSOR_LEFT = "/goform/formiPhoneAppDirect.xml?MNCLT"
+COMMAND_CURSOR_RIGHT = "/goform/formiPhoneAppDirect.xml?MNCRT"
+COMMAND_CURSOR_ENTER = "/goform/formiPhoneAppDirect.xml?MNENT"
+COMMAND_BACK = "/goform/formiPhoneAppDirect.xml?MNRTN"
+COMMAND_INFO = "/goform/formiPhoneAppDirect.xml?MNINF"
+COMMAND_OPTIONS = "/goform/formiPhoneAppDirect.xml?MNOPT"
+COMMAND_SETUP_OPEN = "/goform/formiPhoneAppDirect.xml?MNMEN%20ON"
+COMMAND_SETUP_CLOSE = "/goform/formiPhoneAppDirect.xml?MNMEN%20OFF"
+COMMAND_SETUP_QUERY = "/goform/formiPhoneAppDirect.xml?MNMEN?"
 
 # Zone 2 URLs
 STATUS_Z2_URL = "/goform/formZone2_Zone2XmlStatus.xml"
@@ -375,6 +418,17 @@ DENONAVR_URLS = ReceiverURLs(
     command_set_all_zone_stereo=COMMAND_SET_ZST_URL,
     command_pause=COMMAND_PAUSE,
     command_play=COMMAND_PLAY,
+    command_cusor_up=COMMAND_CURSOR_UP,
+    command_cusor_down=COMMAND_CURSOR_DOWN,
+    command_cusor_left=COMMAND_CURSOR_LEFT,
+    command_cusor_right=COMMAND_CURSOR_RIGHT,
+    command_cusor_enter=COMMAND_CURSOR_ENTER,
+    command_back=COMMAND_BACK,
+    command_info=COMMAND_INFO,
+    command_options=COMMAND_OPTIONS,
+    command_setup_open=COMMAND_SETUP_OPEN,
+    command_setup_close=COMMAND_SETUP_CLOSE,
+    command_setup_query=COMMAND_SETUP_QUERY,
 )
 
 ZONE2_URLS = ReceiverURLs(
@@ -400,6 +454,17 @@ ZONE2_URLS = ReceiverURLs(
     command_set_all_zone_stereo=COMMAND_SET_ZST_URL,
     command_pause=COMMAND_PAUSE,
     command_play=COMMAND_PLAY,
+    command_cusor_up=COMMAND_CURSOR_UP,
+    command_cusor_down=COMMAND_CURSOR_DOWN,
+    command_cusor_left=COMMAND_CURSOR_LEFT,
+    command_cusor_right=COMMAND_CURSOR_RIGHT,
+    command_cusor_enter=COMMAND_CURSOR_ENTER,
+    command_back=COMMAND_BACK,
+    command_info=COMMAND_INFO,
+    command_options=COMMAND_OPTIONS,
+    command_setup_open=COMMAND_SETUP_OPEN,
+    command_setup_close=COMMAND_SETUP_CLOSE,
+    command_setup_query=COMMAND_SETUP_QUERY,
 )
 
 ZONE3_URLS = ReceiverURLs(
@@ -425,6 +490,17 @@ ZONE3_URLS = ReceiverURLs(
     command_set_all_zone_stereo=COMMAND_SET_ZST_URL,
     command_pause=COMMAND_PAUSE,
     command_play=COMMAND_PLAY,
+    command_cusor_up=COMMAND_CURSOR_UP,
+    command_cusor_down=COMMAND_CURSOR_DOWN,
+    command_cusor_left=COMMAND_CURSOR_LEFT,
+    command_cusor_right=COMMAND_CURSOR_RIGHT,
+    command_cusor_enter=COMMAND_CURSOR_ENTER,
+    command_back=COMMAND_BACK,
+    command_info=COMMAND_INFO,
+    command_options=COMMAND_OPTIONS,
+    command_setup_open=COMMAND_SETUP_OPEN,
+    command_setup_close=COMMAND_SETUP_CLOSE,
+    command_setup_query=COMMAND_SETUP_QUERY,
 )
 
 # Telnet Events
@@ -503,6 +579,17 @@ DENONAVR_TELNET_COMMANDS = TelnetCommands(
     command_tonecontrol="PSTONE CTRL ",
     command_bass="PSBAS ",
     command_treble="PSTRE ",
+    command_cusor_up="MNCUP",
+    command_cusor_down="MNCDN",
+    command_cusor_left="MNCLT",
+    command_cusor_right="MNCRT",
+    command_cusor_enter="MNENT",
+    command_back="MNRTN",
+    command_info="MNINF",
+    command_options="MNOPT",
+    command_setup_open="MNMEN ON",
+    command_setup_close="MNMEN OFF",
+    command_setup_query="MNMEN?",
 )
 
 ZONE2_TELNET_COMMANDS = TelnetCommands(
@@ -526,6 +613,17 @@ ZONE2_TELNET_COMMANDS = TelnetCommands(
     command_tonecontrol="PSTONE CTRL ",
     command_bass="PSBAS ",
     command_treble="PSTRE ",
+    command_cusor_up="MNCUP",
+    command_cusor_down="MNCDN",
+    command_cusor_left="MNCLT",
+    command_cusor_right="MNCRT",
+    command_cusor_enter="MNENT",
+    command_back="MNRTN",
+    command_info="MNINF",
+    command_options="MNOPT",
+    command_setup_open="MNMEN ON",
+    command_setup_close="MNMEN OFF",
+    command_setup_query="MNMEN?",
 )
 
 ZONE3_TELNET_COMMANDS = TelnetCommands(
@@ -549,6 +647,17 @@ ZONE3_TELNET_COMMANDS = TelnetCommands(
     command_tonecontrol="PSTONE CTRL ",
     command_bass="PSBAS ",
     command_treble="PSTRE ",
+    command_cusor_up="MNCUP",
+    command_cusor_down="MNCDN",
+    command_cusor_left="MNCLT",
+    command_cusor_right="MNCRT",
+    command_cusor_enter="MNENT",
+    command_back="MNRTN",
+    command_info="MNINF",
+    command_options="MNOPT",
+    command_setup_open="MNMEN ON",
+    command_setup_close="MNMEN OFF",
+    command_setup_query="MNMEN?",
 )
 
 # States