Skip to content

added fixes for connecting to micropython if it doesn't jump into REPL after boot #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
YesterKo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added fixes for connecting to micropython if it doesn't jump into REPL after boot #209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions rshell/pyboard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,15 @@ def __init__(self, device, baudrate=115200, user='micro', password='python', wai
def close(self):
self.serial.close()

def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
data = self.serial.read(min_num_bytes)
def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None, hard_timeout=3):
if self.serial.inWaiting() > 0:
data = self.serial.read(min_num_bytes)
else:
data = b''
if data_consumer:
data_consumer(data)
timeout_count = 0
hard_timeout_count = 0
while True:
if data.endswith(ending):
break
Expand All @@ -176,8 +180,11 @@ def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
timeout_count = 0
else:
timeout_count += 1
hard_timeout_count += 1
if timeout is not None and timeout_count >= 100 * timeout:
break
if hard_timeout is not None and hard_timeout_count >= 100 * hard_timeout:
break
time.sleep(0.01)
return data

Expand All @@ -203,7 +210,11 @@ def enter_raw_repl(self):
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.
data = self.read_until(1, b'raw REPL; CTRL-B to exit\r\n')
for _ in range(2):
data = self.read_until(1, b'raw REPL; CTRL-B to exit\r\n')
if data.endswith(b'raw REPL; CTRL-B to exit\r\n'):
break
self.serial.write(b'\x03') # ctrl-C: stop running program
if not data.endswith(b'raw REPL; CTRL-B to exit\r\n'):
print(data)
raise PyboardError('could not enter raw repl')
Expand Down