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

Plane: move check for ARMING_CHECK_NONE back into Plane 

Plane allows all prearm and arm checks to be bypassed with
ARMING_CHECK_NONE.  Not all vehicles allow this, so move this bypass
back into Plane.
This commit is contained in:
Peter Barker 2019-05-06 11:16:41 +10:00 committed by Randy Mackay
parent def3bb374f
commit 92ce75517c
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ArduPlane/AP_Arming.cpp
View File

@ -19,6 +19,10 @@ const AP_Param::GroupInfo AP_Arming_Plane::var_info[] = {
*/ */
bool AP_Arming_Plane::pre_arm_checks(bool display_failure) bool AP_Arming_Plane::pre_arm_checks(bool display_failure)
{ {
//are arming checks disabled?
if (checks_to_perform == ARMING_CHECK_NONE) {
return true;
}
if (hal.util->was_watchdog_armed()) { if (hal.util->was_watchdog_armed()) {
// on watchdog reset bypass arming checks to allow for // on watchdog reset bypass arming checks to allow for
// in-flight arming if we were armed before the reset. This // in-flight arming if we were armed before the reset. This
@ -128,6 +132,11 @@ bool AP_Arming_Plane::ins_checks(bool display_failure)
bool AP_Arming_Plane::arm_checks(AP_Arming::Method method) bool AP_Arming_Plane::arm_checks(AP_Arming::Method method)
{ {
//are arming checks disabled?
if (checks_to_perform == ARMING_CHECK_NONE) {
return true;
}
if (hal.util->was_watchdog_armed()) { if (hal.util->was_watchdog_armed()) {
// on watchdog reset bypass arming checks to allow for // on watchdog reset bypass arming checks to allow for
// in-flight arming if we were armed before the reset. This // in-flight arming if we were armed before the reset. This