diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-12-13 08:08:40 -0800 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-12-13 08:08:40 -0800 |
| commit | e8bc6cdd62504a0146281218e525c3612901e157 (patch) | |
| tree | dfcb22ae1954d47e831aacd3ea8ccb6dc6e3eafa | |
| parent | a91a8aeea868985e4989f05903e793b413bd9a9e (diff) | |
| parent | dcfd5bdbe7d999db70e3d4e3e08320e03cc3840a (diff) | |
| download | px4-firmware-e8bc6cdd62504a0146281218e525c3612901e157.tar.gz px4-firmware-e8bc6cdd62504a0146281218e525c3612901e157.tar.bz2 px4-firmware-e8bc6cdd62504a0146281218e525c3612901e157.zip | |
Merge pull request #547 from julianoes/fix_py_uploader
Python uploader: Ignore exceptions when sending reboot tries
| -rwxr-xr-x | Tools/px_uploader.py | 19 |
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 |