Pull in upstream fixes for getting board into flash mode.
This commit is contained in:
parent
125d2173d6
commit
8394333cab
|
@ -128,38 +128,32 @@ class ESPROM:
|
||||||
def connect(self):
|
def connect(self):
|
||||||
print 'Connecting...'
|
print 'Connecting...'
|
||||||
|
|
||||||
# RTS = CH_PD (i.e reset)
|
for _ in xrange(4):
|
||||||
# DTR = GPIO0
|
# issue reset-to-bootloader:
|
||||||
# self._port.setRTS(True)
|
# RTS = either CH_PD or nRESET (both active low = chip in reset)
|
||||||
# self._port.setDTR(True)
|
# DTR = GPIO0 (active low = boot to flasher)
|
||||||
# self._port.setRTS(False)
|
self._port.setDTR(False)
|
||||||
# time.sleep(0.1)
|
self._port.setRTS(True)
|
||||||
# self._port.setDTR(False)
|
time.sleep(0.05)
|
||||||
|
self._port.setDTR(True)
|
||||||
|
self._port.setRTS(False)
|
||||||
|
time.sleep(0.05)
|
||||||
|
self._port.setDTR(False)
|
||||||
|
|
||||||
# NodeMCU devkit
|
self._port.timeout = 0.3 # worst-case latency timer should be 255ms (probably <20ms)
|
||||||
self._port.setRTS(True)
|
for _ in xrange(4):
|
||||||
self._port.setDTR(True)
|
try:
|
||||||
time.sleep(0.1)
|
self._port.flushInput()
|
||||||
self._port.setRTS(False)
|
self._port.flushOutput()
|
||||||
self._port.setDTR(False)
|
self.sync()
|
||||||
time.sleep(0.1)
|
self._port.timeout = 5
|
||||||
self._port.setRTS(True)
|
return
|
||||||
time.sleep(0.1)
|
except:
|
||||||
self._port.setDTR(True)
|
time.sleep(0.05)
|
||||||
self._port.setRTS(False)
|
# this is a workaround for the CH340 serial driver on current versions of Linux,
|
||||||
time.sleep(0.3)
|
# which seems to sometimes set the serial port up with wrong parameters
|
||||||
self._port.setDTR(True)
|
self._port.close()
|
||||||
|
self._port.open()
|
||||||
self._port.timeout = 0.5
|
|
||||||
for i in xrange(10):
|
|
||||||
try:
|
|
||||||
self._port.flushInput()
|
|
||||||
self._port.flushOutput()
|
|
||||||
self.sync()
|
|
||||||
self._port.timeout = 5
|
|
||||||
return
|
|
||||||
except:
|
|
||||||
time.sleep(0.1)
|
|
||||||
raise Exception('Failed to connect')
|
raise Exception('Failed to connect')
|
||||||
|
|
||||||
""" Read memory address in target """
|
""" Read memory address in target """
|
||||||
|
|
Loading…
Reference in New Issue