diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-12 08:22:05 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-12 08:22:05 +0200 |
| commit | 32e1bd15b834da1f9d6a23688f893b98dc414f38 (patch) | |
| tree | 7f98ca9e4225ba4127337a08572ec8289b5278cd | |
| parent | 467e67e7e7b89d6ddd408f56b625ab2362e17d4d (diff) | |
| parent | 3f4aef60c88b1e570dd30bc47a13d5340073e9a9 (diff) | |
| download | px4-firmware-32e1bd15b834da1f9d6a23688f893b98dc414f38.tar.gz px4-firmware-32e1bd15b834da1f9d6a23688f893b98dc414f38.tar.bz2 px4-firmware-32e1bd15b834da1f9d6a23688f893b98dc414f38.zip | |
Merge branch 'master' into test_bottle_drop_paul
| -rwxr-xr-x | Tools/px_uploader.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/px_uploader.py b/Tools/px_uploader.py index cd7884f6d..d8f4884bc 100755 --- a/Tools/px_uploader.py +++ b/Tools/px_uploader.py @@ -180,7 +180,7 @@ class uploader(object): def __init__(self, portname, baudrate): # open the port, keep the default timeout short so we can poll quickly - self.port = serial.Serial(portname, baudrate, timeout=0.5) + self.port = serial.Serial(portname, baudrate, timeout=2.0) self.otp = b'' self.sn = b'' |