jeans/nodemcu-pyflasher
jeans/nodemcu-pyflasher
1
0
Fork 0
mirror of https://github.com/marcelstoer/nodemcu-pyflasher.git synced 2025-07-22 10:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve esptool command assembler to support " " in file paths

Browse Source
This commit is contained in:
Marcel Stör 2019-02-17 15:00:00 +01:00
parent 9dc749d768
commit 29b7193fcf
1 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Main.py
View File

@ -74,20 +74,24 @@ class FlashingThread(threading.Thread):
def run(self): def run(self):
try: try:
command = "" command = []
if not self._config.port.startswith(__auto_select__): if not self._config.port.startswith(__auto_select__):
command += "--port %s " % self._config.port command.append("--port")
command.append(self._config.port)
command += "--baud %s --after no_reset write_flash --flash_mode %s 0x00000 %s" % \ command.extend(["--baud", str(self._config.baud),
(self._config.baud, self._config.mode, self._config.firmware_path) "--after", "no_reset",
"write_flash",
"--flash_mode", self._config.mode,
"0x00000", self._config.firmware_path])
if self._config.erase_before_flash: if self._config.erase_before_flash:
command += " --erase-all" command.append("--erase-all")
print("Command: esptool.py %s\n" % command) print("Command: esptool.py %s\n" % " ".join(command))
esptool.main(command.split(" ")) esptool.main(command)
# The last line printed by esptool is "Staying in bootloader." -> some indication that the process is # The last line printed by esptool is "Staying in bootloader." -> some indication that the process is
# done is needed # done is needed
@ -97,25 +101,6 @@ class FlashingThread(threading.Thread):
self._parent.report_error(e.strerror) self._parent.report_error(e.strerror)
raise e raise e
@staticmethod
def connect_to_esp(initial_baud):
# stripped down version of esptool.py:2537
ser_list = sorted(ports.device for ports in list_ports.comports())
print("Found %d serial ports" % len(ser_list))
esp = None
for each_port in reversed(ser_list):
print("Testing serial port %s" % each_port)
try:
esp = ESPLoader.detect_chip(each_port, initial_baud)
break # on the first detected Espressif device
except (FatalError, OSError) as err:
print("%s failed to connect: %s" % (each_port, err))
esp = None
if esp is None:
print("\nAll of the %d available serial ports could not connect to a Espressif device." % len(ser_list))
raise FatalError('No serial port with ESP')
return esp
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------