Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Plane: remove redundant calls to safety_state

This commit is contained in:
Tom Pittenger 2016-05-26 23:40:08 -07:00 committed by Andrew Tridgell
parent d3ac1dc161
commit 4785650c95
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduPlane/px4_mixer.cpp
View File

@ -276,7 +276,6 @@ bool Plane::setup_failsafe_mixing(void)
// it twice as there have been reports that this call can fail // it twice as there have been reports that this call can fail
// with a small probability // with a small probability
hal.rcout->force_safety_on(); hal.rcout->force_safety_on();
hal.rcout->force_safety_on();
/* reset any existing mixer in px4io. This shouldn't be needed, /* reset any existing mixer in px4io. This shouldn't be needed,
* but is good practice */ * but is good practice */
@ -392,7 +391,6 @@ failed:
// restore safety state if it was previously armed // restore safety state if it was previously armed
if (old_state == AP_HAL::Util::SAFETY_ARMED) { if (old_state == AP_HAL::Util::SAFETY_ARMED) {
hal.rcout->force_safety_off(); hal.rcout->force_safety_off();
hal.rcout->force_safety_off();
} }
return ret; return ret;
} }