aboutsummaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
authorJulian Oes <julian@oes.ch>2013-12-02 23:07:36 +0100
committerJulian Oes <julian@oes.ch>2013-12-02 23:07:36 +0100
commitdcfd5bdbe7d999db70e3d4e3e08320e03cc3840a (patch)
tree004129caa5f04d55d4f34c720da47aea675878ba /Tools
parent0d30fe31a7fac8ab819fe45485e7714fc209940d (diff)
downloadpx4-firmware-dcfd5bdbe7d999db70e3d4e3e08320e03cc3840a.tar.gz
px4-firmware-dcfd5bdbe7d999db70e3d4e3e08320e03cc3840a.tar.bz2
px4-firmware-dcfd5bdbe7d999db70e3d4e3e08320e03cc3840a.zip
Python uploader: Ignore exceptions when sending reboot tries
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/px_uploader.py19
1 files changed, 11 insertions, 8 deletions
diff --git a/Tools/px_uploader.py b/Tools/px_uploader.py
index a2d7d371d..cce5e5e54 100755
--- a/Tools/px_uploader.py
+++ b/Tools/px_uploader.py
@@ -370,14 +370,17 @@ class uploader(object):
self.port.close()
def send_reboot(self):
- # try reboot via NSH first
- self.__send(uploader.NSH_INIT)
- self.__send(uploader.NSH_REBOOT_BL)
- self.__send(uploader.NSH_INIT)
- self.__send(uploader.NSH_REBOOT)
- # then try MAVLINK command
- self.__send(uploader.MAVLINK_REBOOT_ID1)
- self.__send(uploader.MAVLINK_REBOOT_ID0)
+ try:
+ # try reboot via NSH first
+ self.__send(uploader.NSH_INIT)
+ self.__send(uploader.NSH_REBOOT_BL)
+ self.__send(uploader.NSH_INIT)
+ self.__send(uploader.NSH_REBOOT)
+ # then try MAVLINK command
+ self.__send(uploader.MAVLINK_REBOOT_ID1)
+ self.__send(uploader.MAVLINK_REBOOT_ID0)
+ except:
+ return