diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-13 14:56:13 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-13 14:56:13 +0200 |
| commit | b3fb2bf85042b8038dabcef770855145674743e9 (patch) | |
| tree | da01f6e2a83f55c306ad774630428f6e1bda73aa /Tools | |
| parent | 5671df0af4e258ef0a83377cdbd50e59734aa00b (diff) | |
| parent | 0cadc5d14a7d3186902fc6d04cd97d55e213db6a (diff) | |
| download | px4-firmware-b3fb2bf85042b8038dabcef770855145674743e9.tar.gz px4-firmware-b3fb2bf85042b8038dabcef770855145674743e9.tar.bz2 px4-firmware-b3fb2bf85042b8038dabcef770855145674743e9.zip | |
Merge branch 'master' of github.com:PX4/Firmware into mixer_testing
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/px_uploader.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/px_uploader.py b/Tools/px_uploader.py index 64af672a3..a2d7d371d 100755 --- a/Tools/px_uploader.py +++ b/Tools/px_uploader.py @@ -430,7 +430,7 @@ while True: # Windows, don't open POSIX ports if not "/" in port: up = uploader(port, args.baud) - except: + except Exception: # open failed, rate-limit our attempts time.sleep(0.05) @@ -443,7 +443,7 @@ while True: up.identify() print("Found board %x,%x bootloader rev %x on %s" % (up.board_type, up.board_rev, up.bl_rev, port)) - except: + except Exception: # most probably a timeout talking to the port, no bootloader, try to reboot the board print("attempting reboot on %s..." % port) up.send_reboot() |