Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Arming: move check for ARMING_CHECK_NONE back into relevant vehicles

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

9
libraries/AP_Arming/AP_Arming.cpp
View File

@ -797,14 +797,7 @@ bool AP_Arming::arm(AP_Arming::Method method, const bool do_arming_checks)
return false;
}
//are arming checks disabled?
if (!do_arming_checks || checks_to_perform == ARMING_CHECK_NONE) {
armed = true;
gcs().send_text(MAV_SEVERITY_INFO, "Throttle armed");
return true;
}
if (pre_arm_checks(true) && arm_checks(method)) {
if (!do_arming_checks || (pre_arm_checks(true) && arm_checks(method))) {
armed = true;
gcs().send_text(MAV_SEVERITY_INFO, "Throttle armed");