yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

px_uploader: Minor code cleanup

Browse Source
This commit is contained in:
Johan Jansen
2015-01-08 16:30:47 +01:00
parent 2aa7b3038a
commit 1eda1f816b
1 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Tools/px_uploader.py
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
############################################################################ ############################################################################
# #
# Copyright (C) 2012, 2013 PX4 Development Team. All rights reserved. # Copyright (C) 2012-2015 PX4 Development Team. All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@@ -227,16 +227,21 @@ class uploader(object):
+ uploader.EOC) + uploader.EOC)
self.__getSync() self.__getSync()
# def __trySync(self): def __trySync(self):
# c = self.__recv() try:
# if (c != self.INSYNC): self.port.flush()
# #print("unexpected 0x%x instead of INSYNC" % ord(c)) if (self.__recv() != self.INSYNC):
# return False; #print("unexpected 0x%x instead of INSYNC" % ord(c))
# c = self.__recv() return False;
# if (c != self.OK):
# #print("unexpected 0x%x instead of OK" % ord(c)) if (self.__recv() != self.OK):
# return False #print("unexpected 0x%x instead of OK" % ord(c))
# return True return False
return True
except RuntimeError:
#timeout, no response yet
return False
# send the GET_DEVICE command and wait for an info parameter # send the GET_DEVICE command and wait for an info parameter
def __getInfo(self, param): def __getInfo(self, param):
@@ -275,26 +280,23 @@ class uploader(object):
def __erase(self): def __erase(self):
self.__send(uploader.CHIP_ERASE self.__send(uploader.CHIP_ERASE
+ uploader.EOC) + uploader.EOC)
# erase is very slow, give it 20s # erase is very slow, give it 20s
deadline = time.time() + 20 deadline = time.time() + 20.0
while time.time() < deadline: while time.time() < deadline:
#Draw progress bar (erase usually takes about 9 seconds to complete) #Draw progress bar (erase usually takes about 9 seconds to complete)
estimatedTimeRemaining = deadline-time.time()-11.0 estimatedTimeRemaining = deadline-time.time()
if estimatedTimeRemaining > 0: if estimatedTimeRemaining > 0:
self.__drawProgressBar(10.0-estimatedTimeRemaining, 10.0) self.__drawProgressBar(20.0-estimatedTimeRemaining, 9.0)
else: else:
self.__drawProgressBar(10.0, 10.0) self.__drawProgressBar(10.0, 10.0)
sys.stdout.write(" (timeout: %d seconds) " % int(time.time()-deadline) ) sys.stdout.write(" (timeout: %d seconds) " % int(time.time()-deadline) )
try: if self.__trySync():
self.__getSync() self.__drawProgressBar(10.0, 10.0)
self.__drawProgressBar(10.0, 10.0) sys.stdout.write("\nerase complete!\n")
sys.stdout.write("\nerase complete!\n") return;
return
except RuntimeError:
# we timed out, that's OK
continue
raise RuntimeError("timed out waiting for erase") raise RuntimeError("timed out waiting for erase")
@@ -464,8 +466,7 @@ class uploader(object):
self.__send(uploader.MAVLINK_REBOOT_ID0) self.__send(uploader.MAVLINK_REBOOT_ID0)
except: except:
return return
# Detect python version # Detect python version
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
@@ -508,7 +509,7 @@ while True:
for port in portlist: for port in portlist:
#print("Trying %s" % port) #print("Trying %s" % port)
# create an uploader attached to the port # create an uploader attached to the port
try: try:
if "linux" in _platform: if "linux" in _platform: