djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/pyboard.py: Add "soft_reset" option to Pyboard.enter_raw_repl().

Browse Source 
Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2021-05-29 11:21:19 +10:00
parent 4982d0920e
commit e4ba57c5cd
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/pyboard.py
View File

@ -322,7 +322,7 @@ class Pyboard:
time.sleep(0.01) time.sleep(0.01)
return data return data
def enter_raw_repl(self): def enter_raw_repl(self, soft_reset=True):
self.serial.write(b"\r\x03\x03") # ctrl-C twice: interrupt any running program self.serial.write(b"\r\x03\x03") # ctrl-C twice: interrupt any running program
# flush input (without relying on serial.flushInput()) # flush input (without relying on serial.flushInput())
@ -332,18 +332,23 @@ class Pyboard:
n = self.serial.inWaiting() n = self.serial.inWaiting()
self.serial.write(b"\r\x01") # ctrl-A: enter raw REPL self.serial.write(b"\r\x01") # ctrl-A: enter raw REPL
data = self.read_until(1, b"raw REPL; CTRL-B to exit\r\n>")
if not data.endswith(b"raw REPL; CTRL-B to exit\r\n>"):
print(data)
raise PyboardError("could not enter raw repl")
self.serial.write(b"\x04") # ctrl-D: soft reset if soft_reset:
data = self.read_until(1, b"soft reboot\r\n") data = self.read_until(1, b"raw REPL; CTRL-B to exit\r\n>")
if not data.endswith(b"soft reboot\r\n"): if not data.endswith(b"raw REPL; CTRL-B to exit\r\n>"):
print(data) print(data)
raise PyboardError("could not enter raw repl") raise PyboardError("could not enter raw repl")
# By splitting this into 2 reads, it allows boot.py to print stuff,
# which will show up after the soft reboot and before the raw REPL. self.serial.write(b"\x04") # ctrl-D: soft reset
# Waiting for "soft reboot" independently to "raw REPL" (done below)
# allows boot.py to print, which will show up after "soft reboot"
# and before "raw REPL".
data = self.read_until(1, b"soft reboot\r\n")
if not data.endswith(b"soft reboot\r\n"):
print(data)
raise PyboardError("could not enter raw repl")
data = self.read_until(1, b"raw REPL; CTRL-B to exit\r\n") data = self.read_until(1, b"raw REPL; CTRL-B to exit\r\n")
if not data.endswith(b"raw REPL; CTRL-B to exit\r\n"): if not data.endswith(b"raw REPL; CTRL-B to exit\r\n"):
print(data) print(data)