diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-13 21:07:27 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-13 21:07:27 +0100 |
| commit | c3cbaf5deb00577efa9198f246ebc6011284ff34 (patch) | |
| tree | 8f40fef6a2230cf6be262443ac520807cc66aba2 /Tools | |
| parent | 54e739926d3414e29b13d2aa14ebb94fd8ffd4f4 (diff) | |
| parent | 0b9b68f0d96f59c9cd406547ee52fb52617a298f (diff) | |
| download | px4-firmware-c3cbaf5deb00577efa9198f246ebc6011284ff34.tar.gz px4-firmware-c3cbaf5deb00577efa9198f246ebc6011284ff34.tar.bz2 px4-firmware-c3cbaf5deb00577efa9198f246ebc6011284ff34.zip | |
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
src/drivers/px4io/px4io.cpp
Diffstat (limited to 'Tools')
| -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 |