b4d785fa20
This commit just takes the necessary parts of pyboard.py and merges them with pyboardextended.py to make a new transport_serial.py, and updates the rest of mpremote to use this instead. It is difficult to continue to add features to mpremote (which usually requires modification to pyboard.py) while also maintaining backwards compatibility for pyboard.py. The idea is that this provides a starting point for further refactoring of mpremote to allow different transports (webrepl, BLE, etc). This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
101 lines
3.7 KiB
Python
101 lines
3.7 KiB
Python
from .console import Console, ConsolePosix
|
|
|
|
from .transport import TransportError
|
|
|
|
|
|
def do_repl_main_loop(
|
|
state, console_in, console_out_write, *, escape_non_printable, code_to_inject, file_to_inject
|
|
):
|
|
while True:
|
|
console_in.waitchar(state.transport.serial)
|
|
c = console_in.readchar()
|
|
if c:
|
|
if c in (b"\x1d", b"\x18"): # ctrl-] or ctrl-x, quit
|
|
break
|
|
elif c == b"\x04": # ctrl-D
|
|
# special handling needed for ctrl-D if filesystem is mounted
|
|
state.transport.write_ctrl_d(console_out_write)
|
|
elif c == b"\x0a" and code_to_inject is not None: # ctrl-j, inject code
|
|
state.transport.serial.write(code_to_inject)
|
|
elif c == b"\x0b" and file_to_inject is not None: # ctrl-k, inject script
|
|
console_out_write(bytes("Injecting %s\r\n" % file_to_inject, "utf8"))
|
|
state.transport.enter_raw_repl(soft_reset=False)
|
|
with open(file_to_inject, "rb") as f:
|
|
pyfile = f.read()
|
|
try:
|
|
state.transport.exec_raw_no_follow(pyfile)
|
|
except TransportError as er:
|
|
console_out_write(b"Error:\r\n")
|
|
console_out_write(er)
|
|
state.transport.exit_raw_repl()
|
|
else:
|
|
state.transport.serial.write(c)
|
|
|
|
try:
|
|
n = state.transport.serial.inWaiting()
|
|
except OSError as er:
|
|
if er.args[0] == 5: # IO error, device disappeared
|
|
print("device disconnected")
|
|
break
|
|
|
|
if n > 0:
|
|
dev_data_in = state.transport.serial.read(n)
|
|
if dev_data_in is not None:
|
|
if escape_non_printable:
|
|
# Pass data through to the console, with escaping of non-printables.
|
|
console_data_out = bytearray()
|
|
for c in dev_data_in:
|
|
if c in (8, 9, 10, 13, 27) or 32 <= c <= 126:
|
|
console_data_out.append(c)
|
|
else:
|
|
console_data_out.extend(b"[%02x]" % c)
|
|
else:
|
|
console_data_out = dev_data_in
|
|
console_out_write(console_data_out)
|
|
|
|
|
|
def do_repl(state, args):
|
|
state.ensure_friendly_repl()
|
|
state.did_action()
|
|
|
|
escape_non_printable = args.escape_non_printable
|
|
capture_file = args.capture
|
|
code_to_inject = args.inject_code
|
|
file_to_inject = args.inject_file
|
|
|
|
print("Connected to MicroPython at %s" % state.transport.device_name)
|
|
print("Use Ctrl-] or Ctrl-x to exit this shell")
|
|
if escape_non_printable:
|
|
print("Escaping non-printable bytes/characters by printing their hex code")
|
|
if capture_file is not None:
|
|
print('Capturing session to file "%s"' % capture_file)
|
|
capture_file = open(capture_file, "wb")
|
|
if code_to_inject is not None:
|
|
code_to_inject = bytes(code_to_inject.replace("\\n", "\r\n"), "utf8")
|
|
print("Use Ctrl-J to inject", code_to_inject)
|
|
if file_to_inject is not None:
|
|
print('Use Ctrl-K to inject file "%s"' % file_to_inject)
|
|
|
|
console = Console()
|
|
console.enter()
|
|
|
|
def console_out_write(b):
|
|
console.write(b)
|
|
if capture_file is not None:
|
|
capture_file.write(b)
|
|
capture_file.flush()
|
|
|
|
try:
|
|
do_repl_main_loop(
|
|
state,
|
|
console,
|
|
console_out_write,
|
|
escape_non_printable=escape_non_printable,
|
|
code_to_inject=code_to_inject,
|
|
file_to_inject=file_to_inject,
|
|
)
|
|
finally:
|
|
console.exit()
|
|
if capture_file is not None:
|
|
capture_file.close()
|