Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-11 17:13:56 -03:00
Code Issues Packages Projects Releases Wiki Activity

AP_Arming: change arm and disarm to account for Copter now using them

Browse Source
This commit is contained in:
Peter Barker 2019-05-06 11:36:11 +10:00 committed by Randy Mackay
parent 75ae6b59b0
commit 61a2be1470
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_Arming/AP_Arming.cpp
View File

@ -789,10 +789,6 @@ bool AP_Arming::arm_checks(AP_Arming::Method method)
//returns true if arming occurred successfully
bool AP_Arming::arm(AP_Arming::Method method, const bool do_arming_checks)
{
#if APM_BUILD_TYPE(APM_BUILD_ArduCopter)
// Copter should never use this function
return false;
#else
if (armed) { //already armed
return false;
}
@ -810,16 +806,11 @@ bool AP_Arming::arm(AP_Arming::Method method, const bool do_arming_checks)
}
return armed;
#endif
}
//returns true if disarming occurred successfully
bool AP_Arming::disarm()
{
#if APM_BUILD_TYPE(APM_BUILD_ArduCopter)
// Copter should never use this function
return false;
#else
if (!armed) { // already disarmed
return false;
}
@ -839,7 +830,6 @@ bool AP_Arming::disarm()
//Can't do this from this class until there is a unified logging library.
return true;
#endif
}
AP_Arming::Required AP_Arming::arming_required()