From f80e5cb747a562d445f489e43e0b949886da71f7 Mon Sep 17 00:00:00 2001
From: Firmware Batman <firmware@comma.ai>
Date: Tue, 22 Aug 2017 14:17:59 -0700
Subject: [PATCH] refactor ESP flasher to use panda lib

---
 boardesp/__init__.py       |  0
 boardesp/tools/__init__.py |  0
 boardesp/tools/esptool.py  | 35 ++++++++++++++---------------------
 panda/__init__.py          |  6 +++++-
 4 files changed, 19 insertions(+), 22 deletions(-)
 create mode 100644 boardesp/__init__.py
 create mode 100644 boardesp/tools/__init__.py

diff --git a/boardesp/__init__.py b/boardesp/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/boardesp/tools/__init__.py b/boardesp/tools/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/boardesp/tools/esptool.py b/boardesp/tools/esptool.py
index 18cb423..e698cf1 100755
--- a/boardesp/tools/esptool.py
+++ b/boardesp/tools/esptool.py
@@ -30,20 +30,14 @@ import sys
 import tempfile
 import time
 import traceback
-
+from panda import Panda
 
 __version__ = "1.2"
 
 import usb1
 class FakePort(object):
-  def __init__(self):
-    context = usb1.USBContext()
-
-    for device in context.getDeviceList(skip_on_error=True):
-      if device.getVendorID() == 0xbbaa and device.getProductID() == 0xddcc:
-        print "found device"
-        self.handle = device.open()
-        self.handle.claimInterface(0)
+  def __init__(self, serial=None):
+    self.panda = Panda(serial)
 
     # will only work on new st, old ones will stay @ 921600
     self.baudrate = 230400
@@ -55,30 +49,29 @@ class FakePort(object):
   @baudrate.setter
   def baudrate(self, x):
     print "set baud to", x
-    self.handle.controlWrite(usb1.TYPE_VENDOR | usb1.RECIPIENT_DEVICE, 0xe4, 1, x/300, '')
+    self.panda.set_uart_baud(1, x)
 
   def write(self, buf):
     SEND_STEP = 0x20
     for i in range(0, len(buf), SEND_STEP):
-      self.handle.bulkWrite(2, "\x01" + buf[i:i+SEND_STEP])
+      self.panda.serial_write(1, buf[i:i+SEND_STEP])
 
   def flushInput(self):
-    while self.handle.controlRead(usb1.TYPE_VENDOR | usb1.RECIPIENT_DEVICE, 0xe0, 1, 0, 0x40) != "":
-      pass
+    self.panda.serial_clear(1)
 
   def flushOutput(self):
-    pass
+    self.panda.serial_clear(1)
 
   def read(self, llen):
-    ret = self.handle.controlRead(usb1.TYPE_VENDOR | usb1.RECIPIENT_DEVICE, 0xe0, 1, 0, 1)
+    ret = self.panda._handle.controlRead(usb1.TYPE_VENDOR | usb1.RECIPIENT_DEVICE, 0xe0, 1, 0, 1)
     if ret == '':
+      print "sleep"
       time.sleep(0.1)
-      ret = self.handle.controlRead(usb1.TYPE_VENDOR | usb1.RECIPIENT_DEVICE, 0xe0, 1, 0, 1)
+      ret = self.panda._handle.controlRead(usb1.TYPE_VENDOR | usb1.RECIPIENT_DEVICE, 0xe0, 1, 0, 1)
     return str(ret)
 
   def reset(self):
-    self.handle.controlWrite(usb1.TYPE_VENDOR | usb1.RECIPIENT_DEVICE, 0xda, 1, 0, '')
-    time.sleep(0.2)
+    self.panda.esp_reset(1)
 
   def inWaiting(self):
     return False
@@ -116,8 +109,8 @@ class ESPROM(object):
     # Flash sector size, minimum unit of erase.
     ESP_FLASH_SECTOR = 0x1000
 
-    def __init__(self, port=0, baud=ESP_ROM_BAUD):
-        self._port = FakePort()
+    def __init__(self, port=None, baud=ESP_ROM_BAUD):
+        self._port = FakePort(port)
         self._slip_reader = slip_reader(self._port)
 
     """ Read a SLIP packet from the serial port """
@@ -1087,7 +1080,7 @@ def main():
     parser.add_argument(
         '--port', '-p',
         help='Serial port device',
-        default=os.environ.get('ESPTOOL_PORT', '/dev/ttyUSB0'))
+        default=os.environ.get('ESPTOOL_PORT', None))
 
     parser.add_argument(
         '--baud', '-b',
diff --git a/panda/__init__.py b/panda/__init__.py
index 4cb8e6a..2d04ded 100644
--- a/panda/__init__.py
+++ b/panda/__init__.py
@@ -361,6 +361,10 @@ class Panda(object):
   def set_esp_power(self, on):
     self._handle.controlWrite(Panda.REQUEST_OUT, 0xd9, int(on), 0, b'')
 
+  def esp_reset(self, bootmode=0):
+    self._handle.controlWrite(Panda.REQUEST_OUT, 0xda, int(bootmode), 0, b'')
+    time.sleep(0.2)
+
   def set_safety_mode(self, mode=SAFETY_NOOUTPUT):
     self._handle.controlWrite(Panda.REQUEST_OUT, 0xdc, mode, 0, b'')
 
@@ -382,7 +386,7 @@ class Panda(object):
     self._handle.controlWrite(Panda.REQUEST_OUT, 0xde, bus, int(speed*10), b'')
 
   def set_uart_baud(self, uart, rate):
-    self._handle.controlWrite(Panda.REQUEST_OUT, 0xe1, uart, rate, b'')
+    self._handle.controlWrite(Panda.REQUEST_OUT, 0xe4, uart, rate/300, b'')
 
   def set_uart_parity(self, uart, parity):
     # parity, 0=off, 1=even, 2=odd