Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-12 19:03:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: uploader.py tidy port list code

Browse Source
This commit is contained in:
Peter Barker 2019-02-27 18:39:17 +11:00 committed by Peter Barker
parent 47d8435cd6
commit 36109cae65
1 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Tools/scripts/uploader.py
View File

@ -612,6 +612,35 @@ class uploader(object):
return True return True
def ports_to_try(args):
portlist = []
if args.port is None:
patterns = default_ports
else:
patterns = args.port.split(",")
# use glob to support wildcard ports. This allows the use of
# /dev/serial/by-id/usb-ArduPilot on Linux, which prevents the
# upload from causing modem hangups etc
if "linux" in _platform or "darwin" in _platform or "cygwin" in _platform:
import glob
for pattern in patterns:
portlist += glob.glob(pattern)
else:
portlist = patterns
# filter ports based on platform:
if "cygwin" in _platform:
# Cygwin, don't open MAC OS and Win ports, we are more like
# Linux. Cygwin needs to be before Windows test
pass
elif "win" in _platform:
# Windows, don't open POSIX ports
portlist = [port for port in portlist if "/" not in port]
elif "darwin" in _platform:
# OS X, don't open Windows and Linux ports
portlist = [port for port in portlist if "COM" not in port and "ACM" not in port]
return portlist
def main(): def main():
@ -641,44 +670,21 @@ def main():
# Spin waiting for a device to show up # Spin waiting for a device to show up
try: try:
while True: while True:
portlist = []
if args.port is None:
patterns = default_ports
else:
patterns = args.port.split(",")
# on unix-like platforms use glob to support wildcard ports. This allows
# the use of /dev/serial/by-id/usb-3D_Robotics on Linux, which prevents the upload from
# causing modem hangups etc
if "linux" in _platform or "darwin" in _platform or "cygwin" in _platform:
import glob
for pattern in patterns:
portlist += glob.glob(pattern)
else:
portlist = patterns
baud_flightstack = [int(x) for x in args.baud_flightstack.split(',')] baud_flightstack = [int(x) for x in args.baud_flightstack.split(',')]
for port in portlist: for port in ports_to_try(args):
# print("Trying %s" % port) # print("Trying %s" % port)
# create an uploader attached to the port # create an uploader attached to the port
try: try:
if "linux" in _platform: up = uploader(port,
# Linux, don't open Mac OS and Win ports args.baud_bootloader,
up = uploader(port, args.baud_bootloader, baud_flightstack, args.baud_bootloader_flash) baud_flightstack,
elif "darwin" in _platform: args.baud_bootloader_flash)
# OS X, don't open Windows and Linux ports
if "COM" not in port and "ACM" not in port: except Exception as e:
up = uploader(port, args.baud_bootloader, baud_flightstack, args.baud_bootloader_flash) print("Exception creating uploader: %s" % str(e))
elif "cygwin" in _platform:
# Cygwin, don't open MAC OS and Win ports, we are more like Linux. Cygwin needs to be before Windows test
up = uploader(port, args.baud_bootloader, baud_flightstack, args.baud_bootloader_flash)
elif "win" in _platform:
# Windows, don't open POSIX ports
if "/" not in port:
up = uploader(port, args.baud_bootloader, baud_flightstack, args.baud_bootloader_flash)
except Exception:
# open failed, rate-limit our attempts # open failed, rate-limit our attempts
time.sleep(0.05) time.sleep(0.05)