diff options
| author | Andrew Tridgell <tridge@samba.org> | 2013-09-12 08:30:00 +1000 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-12 00:47:08 +0200 |
| commit | 1f19a27e3cd5d0686dd65ecad6a171d025058b7c (patch) | |
| tree | 86962b14be921d053bbed31fa087492404e164fd /Tools | |
| parent | 0308f399d98f53a634206705c57eed208f5ad8a3 (diff) | |
| download | px4-firmware-1f19a27e3cd5d0686dd65ecad6a171d025058b7c.tar.gz px4-firmware-1f19a27e3cd5d0686dd65ecad6a171d025058b7c.tar.bz2 px4-firmware-1f19a27e3cd5d0686dd65ecad6a171d025058b7c.zip | |
make upload on Linux much more reliable
Upload on Linux now only tries usb-3D_Robotics boards. This should
also make it handle more ports on MacOS
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/px_uploader.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Tools/px_uploader.py b/Tools/px_uploader.py index 52d089360..64af672a3 100755 --- a/Tools/px_uploader.py +++ b/Tools/px_uploader.py @@ -400,7 +400,19 @@ print("Loaded firmware for %x,%x, waiting for the bootloader..." % (fw.property( # Spin waiting for a device to show up while True: - for port in args.port.split(","): + portlist = [] + 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: + import glob + for pattern in patterns: + portlist += glob.glob(pattern) + else: + portlist = patterns + + for port in portlist: #print("Trying %s" % port) |