fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-16 15:17:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ros

Browse Source 
Conflicts:
	src/platforms/px4_middleware.h
This commit is contained in:
Thomas Gubler
2015-01-15 12:42:28 +01:00
parent e60c1a842c e62bd37e73
commit 96db9e8188
26 changed files with 351 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/px_uploader.py
+3 -2
View File
@@ -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)