diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-15 12:42:28 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-15 12:42:28 +0100 |
| commit | 96db9e81883ab0e3438e8ffdce8e8dce47d204ce (patch) | |
| tree | 2d41d99f2837630219cc56699b27d2a2190374aa /Tools | |
| parent | e60c1a842c856e1a19fcdc1b169dfdbc813e9ce2 (diff) | |
| parent | e62bd37e73139c77f0d60cd91fe3443ed23df074 (diff) | |
| download | px4-firmware-96db9e81883ab0e3438e8ffdce8e8dce47d204ce.tar.gz px4-firmware-96db9e81883ab0e3438e8ffdce8e8dce47d204ce.tar.bz2 px4-firmware-96db9e81883ab0e3438e8ffdce8e8dce47d204ce.zip | |
Merge remote-tracking branch 'upstream/master' into ros
Conflicts:
src/platforms/px4_middleware.h
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/px_uploader.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Tools/px_uploader.py b/Tools/px_uploader.py index 272080619..c46f6bede 100755 --- a/Tools/px_uploader.py +++ b/Tools/px_uploader.py @@ -287,11 +287,12 @@ class uploader(object): #Draw progress bar (erase usually takes about 9 seconds to complete) estimatedTimeRemaining = deadline-time.time() - if estimatedTimeRemaining > 0: + if estimatedTimeRemaining >= 9.0: self.__drawProgressBar(20.0-estimatedTimeRemaining, 9.0) else: self.__drawProgressBar(10.0, 10.0) - sys.stdout.write(" (timeout: %d seconds) " % int(time.time()-deadline) ) + sys.stdout.write(" (timeout: %d seconds) " % int(deadline-time.time()) ) + sys.stdout.flush() if self.__trySync(): self.__drawProgressBar(10.0, 10.0) |