Deal with spurious resets better

Author: puddly

bellows/ash.py

@@ -562,6 +562,7 @@ def rstack_frame_received(self, frame: RStackFrame) -> None:
 
         self._tx_seq = 0
         self._rx_seq = 0
+        self._cancel_pending_data_frames(NcpFailure(code=frame.reset_code))
         self._change_ack_timeout(T_RX_ACK_INIT)
         self._ezsp_protocol.reset_received(frame.reset_code)
 
@@ -586,7 +587,7 @@ def error_frame_received(self, frame: ErrorFrame) -> None:
     def _enter_failed_state(self, reset_code: t.NcpResetCode) -> None:
         self._ncp_state = NcpState.FAILED
         self._cancel_pending_data_frames(NcpFailure(code=reset_code))
-        self._ezsp_protocol.reset_received(reset_code)
+        self._ezsp_protocol.error_received(reset_code)
 
     def _write_frame(
         self,

bellows/uart.py

@@ -38,6 +38,8 @@ def data_received(self, data):
 
     def reset_received(self, code: t.NcpResetCode) -> None:
         """Reset acknowledgement frame receive handler"""
+        LOGGER.debug("Received reset: %r", code)
+
         if self._reset_future and not self._reset_future.done():
             self._reset_future.set_result(True)
         elif self._startup_reset_future and not self._startup_reset_future.done():
@@ -48,7 +50,10 @@ def reset_received(self, code: t.NcpResetCode) -> None:
 
     def error_received(self, code: t.NcpResetCode) -> None:
         """Error frame receive handler."""
-        self._api.enter_failed_state(code)
+        if self._reset_future is not None or self._startup_reset_future is not None:
+            LOGGER.debug("Ignoring spurious error during reset: %r", code)
+        else:
+            self._api.enter_failed_state(code)
 
     async def wait_for_startup_reset(self) -> None:
         """Wait for the first reset frame on startup."""