From f07a6ee7c55163c16197c7768c8eb6ee80b7e1e0 Mon Sep 17 00:00:00 2001
From: Willem Melching <willem.melching@gmail.com>
Date: Mon, 13 Apr 2020 15:12:06 -0700
Subject: [PATCH] panda recover should go through bootstub first (#498)

---
 python/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/__init__.py b/python/__init__.py
index 500e2b3b76d082..dc4e5b1420d6e9 100644
--- a/python/__init__.py
+++ b/python/__init__.py
@@ -297,6 +297,7 @@ def flash(self, fn=None, code=None, reconnect=True):
       self.reconnect()
 
   def recover(self, timeout=None):
+    self.reset(enter_bootstub=True)
     self.reset(enter_bootloader=True)
     t_start = time.time()
     while len(PandaDFU.list()) == 0:
@@ -477,7 +478,7 @@ def set_uart_callback(self, uart, install):
 
   # ******************* can *******************
 
-  # The panda will NAK CAN writes when there is CAN congestion. 
+  # The panda will NAK CAN writes when there is CAN congestion.
   # libusb will try to send it again, with a max timeout.
   # Timeout is in ms. If set to 0, the timeout is infinite.
   CAN_SEND_TIMEOUT_MS = 10