blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 17:19:09 -04:00
Code Issues Projects Releases Wiki Activity

esptool.py: Set higher baud rates on ESP32

Browse Source
This commit is contained in:
Angus Gratton 2016-08-22 18:31:44 +08:00
parent eeb0811088
commit 550c7a4446
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/esptool.py
View File

@ -196,6 +196,10 @@ class ESPROM(object):
else: # otherwise, just return the 'val' field which comes from the reply header (this is used by read_reg) else: # otherwise, just return the 'val' field which comes from the reply header (this is used by read_reg)
return val return val
def flush_input(self):
self._port.flushInput()
self._slip_reader = slip_reader(self._port)
def sync(self): def sync(self):
""" Perform a connection test """ """ Perform a connection test """
self.command(ESPROM.ESP_SYNC, '\x07\x07\x12\x20' + 32 * '\x55') self.command(ESPROM.ESP_SYNC, '\x07\x07\x12\x20' + 32 * '\x55')
@ -223,8 +227,7 @@ class ESPROM(object):
last_exception = None last_exception = None
for _ in xrange(4): for _ in xrange(4):
try: try:
self._port.flushInput() self.flush_input()
self._slip_reader = slip_reader(self._port)
self._port.flushOutput() self._port.flushOutput()
self.sync() self.sync()
self._port.timeout = 5 self._port.timeout = 5
@ -377,6 +380,9 @@ class ESP8266ROM(ESPROM):
'4MB-c1':0x60, '4MB-c1':0x60,
'4MB-c2':0x70} '4MB-c2':0x70}
def change_baud(self, baud):
pass # no change baud command on ESP8266 ROM
def chip_id(self): def chip_id(self):
""" Read Chip ID from OTP ROM - see http://esp8266-re.foogod.com/wiki/System_get_chip_id_%28IoT_RTOS_SDK_0.9.9%29 """ """ Read Chip ID from OTP ROM - see http://esp8266-re.foogod.com/wiki/System_get_chip_id_%28IoT_RTOS_SDK_0.9.9%29 """
id0 = self.read_reg(self.ESP_OTP_MAC0) id0 = self.read_reg(self.ESP_OTP_MAC0)
@ -523,13 +529,13 @@ class ESP32ROM(ESP31ROM):
# the MD5 command is special ( # the MD5 command is special (
return self.check_command('calculate md5sum', self.ESP_SPI_FLASH_MD5, struct.pack('<IIII', addr, size, 0, 0)) return self.check_command('calculate md5sum', self.ESP_SPI_FLASH_MD5, struct.pack('<IIII', addr, size, 0, 0))
def changebaud(self, baud): def change_baud(self, baud):
print "Changing baud rate to %d" % baud print "Changing baud rate to %d" % baud
self.command(self.ESP_CHANGE_BAUDRATE, struct.pack('<II', baud, 0)) self.command(self.ESP_CHANGE_BAUDRATE, struct.pack('<II', baud, 0))
print "Changed." print "Changed."
time.sleep(0.05) # get rid of crap sent during baud rate change
self._port.flushInput()
self._port.baudrate = baud self._port.baudrate = baud
time.sleep(0.05) # get rid of crap sent during baud rate change
self.flush_input()
def flash_spi_attach_req(self,ucIsHspi,ucIsLegacy): def flash_spi_attach_req(self,ucIsHspi,ucIsLegacy):
"""Send SPI attach command """Send SPI attach command
@ -1672,6 +1678,10 @@ def main():
'esp32': ESP32ROM, 'esp32': ESP32ROM,
}[args.chip] }[args.chip]
esp = chip_constructor_fun(args.port, initial_baud) esp = chip_constructor_fun(args.port, initial_baud)
# try to set a higher baud, this is a no-op if we need to
# wait for the flasher stub to kick in before doing this.
esp.change_baud(args.baud)
operation_func(esp, args) operation_func(esp, args)
else: else:
operation_func(args) operation_func(args)