retropilot
/
panda
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor ESP flasher to use panda lib

master
Firmware Batman 2017-08-22 14:17:59 -07:00
parent ae895da21e
commit f80e5cb747
4 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
boardesp/__init__.py 100644
View File

0
boardesp/tools/__init__.py 100644
View File

35
boardesp/tools/esptool.py
View File

@ -30,20 +30,14 @@ import sys
import tempfile import tempfile
import time import time
import traceback import traceback
from panda import Panda
__version__ = "1.2" __version__ = "1.2"
import usb1 import usb1
class FakePort(object): class FakePort(object):
def __init__(self): def __init__(self, serial=None):
context = usb1.USBContext() self.panda = Panda(serial)
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)
# will only work on new st, old ones will stay @ 921600 # will only work on new st, old ones will stay @ 921600
self.baudrate = 230400 self.baudrate = 230400
@ -55,30 +49,29 @@ class FakePort(object):
@baudrate.setter @baudrate.setter
def baudrate(self, x): def baudrate(self, x):
print "set baud to", 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): def write(self, buf):
SEND_STEP = 0x20 SEND_STEP = 0x20
for i in range(0, len(buf), SEND_STEP): 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): def flushInput(self):
while self.handle.controlRead(usb1.TYPE_VENDOR | usb1.RECIPIENT_DEVICE, 0xe0, 1, 0, 0x40) != "": self.panda.serial_clear(1)
pass
def flushOutput(self): def flushOutput(self):
pass self.panda.serial_clear(1)
def read(self, llen): 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 == '': if ret == '':
print "sleep"
time.sleep(0.1) 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) return str(ret)
def reset(self): def reset(self):
self.handle.controlWrite(usb1.TYPE_VENDOR | usb1.RECIPIENT_DEVICE, 0xda, 1, 0, '') self.panda.esp_reset(1)
time.sleep(0.2)
def inWaiting(self): def inWaiting(self):
return False return False
@ -116,8 +109,8 @@ class ESPROM(object):
# Flash sector size, minimum unit of erase. # Flash sector size, minimum unit of erase.
ESP_FLASH_SECTOR = 0x1000 ESP_FLASH_SECTOR = 0x1000
def __init__(self, port=0, baud=ESP_ROM_BAUD): def __init__(self, port=None, baud=ESP_ROM_BAUD):
self._port = FakePort() self._port = FakePort(port)
self._slip_reader = slip_reader(self._port) self._slip_reader = slip_reader(self._port)
""" Read a SLIP packet from the serial port """ """ Read a SLIP packet from the serial port """
@ -1087,7 +1080,7 @@ def main():
parser.add_argument( parser.add_argument(
'--port', '-p', '--port', '-p',
help='Serial port device', help='Serial port device',
default=os.environ.get('ESPTOOL_PORT', '/dev/ttyUSB0')) default=os.environ.get('ESPTOOL_PORT', None))
parser.add_argument( parser.add_argument(
'--baud', '-b', '--baud', '-b',

6
panda/__init__.py
View File

@ -361,6 +361,10 @@ class Panda(object):
def set_esp_power(self, on): def set_esp_power(self, on):
self._handle.controlWrite(Panda.REQUEST_OUT, 0xd9, int(on), 0, b'') 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): def set_safety_mode(self, mode=SAFETY_NOOUTPUT):
self._handle.controlWrite(Panda.REQUEST_OUT, 0xdc, mode, 0, b'') 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'') self._handle.controlWrite(Panda.REQUEST_OUT, 0xde, bus, int(speed*10), b'')
def set_uart_baud(self, uart, rate): 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): def set_uart_parity(self, uart, parity):
# parity, 0=off, 1=even, 2=odd # parity, 0=off, 1=even, 2=odd