Unknow/primadiag-pybash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimized boot mode

Browse Source
This commit is contained in:
Gino D
2023-01-08 15:42:12 +01:00
parent 0d49259fcd
commit 749bf7431e
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/picowatch.py
View File

@@ -191,6 +191,7 @@ class Telnet:
class Pyboard(object): class Pyboard(object):
i: int = 0 i: int = 0
boot_status: bool = False
serial: Union[Serial, Telnet] serial: Union[Serial, Telnet]
def __init__(self, device: str, baudrate: int = 115200, login: str = 'micro', password: str = 'python'): def __init__(self, device: str, baudrate: int = 115200, login: str = 'micro', password: str = 'python'):
@@ -231,6 +232,7 @@ class Pyboard(object):
self.serial.write(b'\x02') self.serial.write(b'\x02')
def send_ctrl_c(self) -> bytes: def send_ctrl_c(self) -> bytes:
self.boot_status = False
# Ctrl-C cancels any input, or interrupts the currently running code. # Ctrl-C cancels any input, or interrupts the currently running code.
for _ in range(0, 2): for _ in range(0, 2):
self.serial.write(b'\x03') self.serial.write(b'\x03')
@@ -251,14 +253,14 @@ class Pyboard(object):
def read_until(self, delimiter: bytes, stream_output: bool = False, show_status: bool = False) -> Optional[bytes]: def read_until(self, delimiter: bytes, stream_output: bool = False, show_status: bool = False) -> Optional[bytes]:
data = b'' data = b''
timeout = 0 timeout = 300
max_len = len(delimiter) max_len = len(delimiter)
while not timeout >= 1000: while timeout > 0:
if data.endswith(delimiter): if data.endswith(delimiter):
return data return data
elif self.serial.inWaiting() > 0: elif self.serial.inWaiting() > 0:
timeout = 0 timeout = 300
data += self.serial.read(1) data += self.serial.read(1)
if stream_output: if stream_output:
@@ -268,8 +270,8 @@ class Pyboard(object):
elif show_status: elif show_status:
self.transfer_status() self.transfer_status()
else: else:
timeout += 1 timeout -= 1
time.sleep(0.0001) time.sleep(0.01)
def boot(self): def boot(self):
data = b'' data = b''
@@ -280,13 +282,21 @@ class Pyboard(object):
if not self.read_until(self.send_ctrl_d()): if not self.read_until(self.send_ctrl_d()):
raise Exception('REPL: could not soft reboot') raise Exception('REPL: could not soft reboot')
while not data.endswith(b'\r\nMicroPython v') and not data.endswith(b'.\r\n>>>'): output_status = True
if self.serial.inWaiting(): self.boot_status = True
data = data[-15:] + self.serial.read(1)
sys.stdout.buffer.write(data[-1:])
sys.stdout.buffer.flush()
sys.stdout.buffer.write(b'\r' + b' ' * 20 + b'\r') while self.boot_status and output_status:
if self.serial.inWaiting():
sys.stdout.buffer.write((data := data[-15:] + self.serial.read(1))[-1:])
sys.stdout.buffer.flush()
output_status = not data.endswith(b'\r\nMicroPython v') and not data.endswith(b'.\r\n>>>')
if not output_status:
sys.stdout.buffer.write(b'\r<<< Program terminated\r\n')
elif not self.boot_status:
sys.stdout.buffer.write(b'\r<<< Program terminated with <KeyboardInterrupt> Exception\r\n')
self.boot_status = False
def __enter__(self): def __enter__(self):
self.send_ctrl_c() self.send_ctrl_c()
@@ -340,9 +350,9 @@ class Pyboard(object):
for call in traceback[1][:-2].split('\\r\\n'): for call in traceback[1][:-2].split('\\r\\n'):
reason += f'{call}\n' reason += f'{call}\n'
raise Exception('' + reason.strip()) raise Exception('\r' + reason.strip())
else: else:
raise Exception(exception) raise Exception('\r' + exception)
return data.strip() return data.strip()