mirrors/micropython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/mpremote: Correctly manage mounted flag during soft-reset.

Browse Source
This commit is contained in:
Andrew Leech 2022-02-01 11:59:59 +11:00 committed by Damien George
parent b1519845f5
commit 203ec8ca7f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/mpremote/mpremote/pyboardextended.py
View File

@ -614,10 +614,10 @@ class PyboardExtended(Pyboard):
def mount_local(self, path): def mount_local(self, path):
fout = self.serial fout = self.serial
self.mounted = True
if self.eval('"RemoteFS" in globals()') == b"False": if self.eval('"RemoteFS" in globals()') == b"False":
self.exec_(fs_hook_code) self.exec_(fs_hook_code)
self.exec_("__mount()") self.exec_("__mount()")
self.mounted = True
self.cmd = PyboardCommand(self.serial, fout, path) self.cmd = PyboardCommand(self.serial, fout, path)
self.serial = SerialIntercept(self.serial, self.cmd) self.serial = SerialIntercept(self.serial, self.cmd)
@ -626,6 +626,9 @@ class PyboardExtended(Pyboard):
if not self.mounted: if not self.mounted:
return return
# Clear flag while board reboots, it will be re-set once mounted.
self.mounted = False
# Wait for a response to the soft-reset command. # Wait for a response to the soft-reset command.
for i in range(10): for i in range(10):
if self.serial.inWaiting(): if self.serial.inWaiting():
@ -646,6 +649,7 @@ class PyboardExtended(Pyboard):
self.serial.write(b"\x01") self.serial.write(b"\x01")
self.exec_(fs_hook_code) self.exec_(fs_hook_code)
self.exec_("__mount()") self.exec_("__mount()")
self.mounted = True
self.exit_raw_repl() self.exit_raw_repl()
self.read_until(4, b">>> ") self.read_until(4, b">>> ")
self.serial = SerialIntercept(self.serial, self.cmd) self.serial = SerialIntercept(self.serial, self.cmd)