Skip to content
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

Minor fixes #200

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Minor fixes #200

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7895246
Remove commented debug prints
friebel Sep 25, 2022
f75c85f
Print buffer size only in debug mode
friebel Sep 25, 2022
9d0c799
Harmonize connection log messages
friebel Sep 25, 2022
dd06a39
Only add directories to root dir list
friebel Sep 25, 2022
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
18 changes: 12 additions & 6 deletions rshell/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,13 @@ def listdir(dirname):
return os.listdir(dirname)


def list_root_dirs():
"""Returns a list of filenames contained in the named directory."""
import os
S_IFDIR = 0o40000
return [entry for entry in os.listdir('/') if os.stat('/' + entry)[0] & S_IFDIR]


def listdir_matches(match):
"""Returns a list of filenames contained in the named directory.
Only filenames which start with `match` will be returned.
Expand Down Expand Up @@ -1388,11 +1395,9 @@ def connect(port, baud=115200, user='micro', password='python', wait=0):
"""Tries to connect automagically via network or serial."""
try:
ip_address = socket.gethostbyname(port)
#print('Connecting to ip', ip_address)
connect_telnet(port, ip_address, user=user, password=password)
except (socket.gaierror, ValueError):
# Doesn't look like a hostname or IP-address, assume its a serial port
#print('connecting to serial', port)
connect_serial(port, baud=baud, wait=wait)


Expand All @@ -1415,7 +1420,7 @@ def connect_telnet(name, ip_address=None, user='micro', password='python'):
def connect_serial(port, baud=115200, wait=0):
"""Connect to a MicroPython board via a serial port."""
if not QUIET:
print('Connecting to %s (buffer-size %d)...' % (port, BUFFER_SIZE))
print('Connecting to %s (buffer-size %d) ...' % (port, BUFFER_SIZE))
try:
dev = DeviceSerial(port, baud, wait)
except DeviceError as err:
Expand Down Expand Up @@ -1514,7 +1519,7 @@ def __init__(self, pyb):
if not unhexlify_exists:
raise ShellError('rshell needs MicroPython firmware with ubinascii.unhexlify')
QUIET or print('Retrieving root directories ... ', end='', flush=True)
self.root_dirs = ['/{}/'.format(dir) for dir in self.remote_eval(listdir, '/')]
self.root_dirs = ['/{}/'.format(dir) for dir in self.remote_eval(list_root_dirs)]
QUIET or print(' '.join(self.root_dirs))
QUIET or print('Setting time ... ', end='', flush=True)
now = self.sync_time()
Expand Down Expand Up @@ -1731,7 +1736,7 @@ def __init__(self, port, baud, wait):
QUIET or sys.stdout.write('\n')

# Send Control-C followed by CR until we get a >>> prompt
QUIET or print('Trying to connect to REPL ', end='', flush=True)
QUIET or print('Trying to connect to REPL ...', end='', flush=True)
connected = False
for _ in range(20):
pyb.serial.write(b'\x03\r')
Expand Down Expand Up @@ -3048,7 +3053,8 @@ def real_main():
BUFFER_SIZE = USB_BUFFER_SIZE
else:
BUFFER_SIZE = UART_BUFFER_SIZE
QUIET or print('Using buffer-size of', BUFFER_SIZE)
if DEBUG:
print('Using buffer-size of', BUFFER_SIZE)
try:
connect(args.port, baud=args.baud, wait=args.wait, user=args.user, password=args.password)
except DeviceError as err:
Expand Down