Don't try to interpret incoming data as AT command mode response. (#64)

* Update tests.
* Control handling of incoming data as AT responses.
Don't try to interpret incoming serial data as a AT command mode
response, unless specifically entered into command mode.

Author: Adminiuga

tests/test_uart.py

@@ -67,17 +67,17 @@ def test_close(gw):
 
 
 def test_data_received_chunk_frame(gw):
-    data = b"~\x00\x07\x8b\x0e\xff\xfd\x00$\x02D"
+    data = b"~\x00\r\x88\rID\x00\x00\x00\x00\x00\x00\x00\x00\x00\xdd"
     gw.frame_received = mock.MagicMock()
-    gw.data_received(data[:-4])
+    gw.data_received(data[:3])
     assert gw.frame_received.call_count == 0
-    gw.data_received(data[-4:])
+    gw.data_received(data[3:])
     assert gw.frame_received.call_count == 1
     assert gw.frame_received.call_args[0][0] == data[3:-1]
 
 
 def test_data_received_full_frame(gw):
-    data = b"~\x00\x07\x8b\x0e\xff\xfd\x00$\x02D"
+    data = b"~\x00\r\x88\rID\x00\x00\x00\x00\x00\x00\x00\x00\x00\xdd"
     gw.frame_received = mock.MagicMock()
     gw.data_received(data)
     assert gw.frame_received.call_count == 1
@@ -91,15 +91,29 @@ def test_data_received_incomplete_frame(gw):
     assert gw.frame_received.call_count == 0
 
 
-def test_data_received_at_response(gw):
+def test_data_received_at_response_non_cmd_mode(gw):
     data = b"OK\x0D"
     gw.frame_received = mock.MagicMock()
     gw.command_mode_rsp = mock.MagicMock()
 
+    gw.data_received(data)
+    assert gw.command_mode_rsp.call_count == 0
+
+
+def test_data_received_at_response_in_cmd_mode(gw):
+    data = b"OK\x0D"
+    gw.frame_received = mock.MagicMock()
+    gw.command_mode_rsp = mock.MagicMock()
+
+    gw.command_mode_send(b"")
     gw.data_received(data)
     assert gw.command_mode_rsp.call_count == 1
     assert gw.command_mode_rsp.call_args[0][0] == b"OK"
 
+    gw.reset_command_mode()
+    gw.data_received(data)
+    assert gw.command_mode_rsp.call_count == 1
+
 
 def test_extract(gw):
     gw._buffer = b"\x7E\x00\x02\x23\x7D\x31\xCBextra"

zigpy_xbee/api.py

@@ -449,11 +449,11 @@ async def api_mode_at_commands(self, baudrate):
             cmds.insert(0, bd)
 
         for cmd in cmds:
-            if await self.command_mode_at_cmd(cmd + "\r"):
-                LOGGER.debug("Successfuly sent %s cmd", cmd)
-            else:
+            if not await self.command_mode_at_cmd(cmd + "\r"):
                 LOGGER.debug("No response to %s cmd", cmd)
                 return None
+            LOGGER.debug("Successfuly sent %s cmd", cmd)
+        self._uart.reset_command_mode()
         return True
 
     async def init_api_mode(self):

zigpy_xbee/uart.py

@@ -19,6 +19,7 @@ def __init__(self, api, connected_future=None):
         self._buffer = b""
         self._connected_future = connected_future
         self._api = api
+        self._in_command_mode = False
 
     def send(self, data):
         """Send data, taking care of escaping and framing"""
@@ -64,6 +65,7 @@ def command_mode_rsp(self, data):
     def command_mode_send(self, data):
         """Send data in command mode."""
         LOGGER.debug("Command mode sending %s to uart", data)
+        self._in_command_mode = True
         self._transport.write(data)
 
     def data_received(self, data):
@@ -74,7 +76,7 @@ def data_received(self, data):
             if frame is None:
                 break
             self.frame_received(frame)
-        if self._buffer[-1:] == b"\r":
+        if self._in_command_mode and self._buffer[-1:] == b"\r":
             rsp, self._buffer = (self._buffer[:-1], b"")
             self.command_mode_rsp(rsp)
 
@@ -86,6 +88,10 @@ def frame_received(self, frame):
     def close(self):
         self._transport.close()
 
+    def reset_command_mode(self):
+        """Reset command mode and ignore \r character as command mode response."""
+        self._in_command_mode = False
+
     def _extract_frame(self):
         first_start = self._buffer.find(self.START)
         if first_start < 0: