aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Arming: add do_disarm_checks boolean to disarm call

Browse Source 
this creates symmetry between arming and disarming, at least as far as
the top-level arm() and disarm() calls are concerned.
This commit is contained in:
Peter Barker 2021-01-06 11:15:47 +11:00 committed by Randy Mackay
parent c9b906de17
commit b229c552e6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Arming/AP_Arming.cpp
View File

@ -1204,7 +1204,7 @@ bool AP_Arming::arm(AP_Arming::Method method, const bool do_arming_checks)
} }
//returns true if disarming occurred successfully //returns true if disarming occurred successfully
bool AP_Arming::disarm(const AP_Arming::Method method) bool AP_Arming::disarm(const AP_Arming::Method method, bool do_disarm_checks)
{ {
if (!armed) { // already disarmed if (!armed) { // already disarmed
return false; return false;

2
libraries/AP_Arming/AP_Arming.h
View File

@ -86,7 +86,7 @@ public:
// these functions should not be used by Copter which holds the armed state in the motors library // these functions should not be used by Copter which holds the armed state in the motors library
Required arming_required(); Required arming_required();
virtual bool arm(AP_Arming::Method method, bool do_arming_checks=true); virtual bool arm(AP_Arming::Method method, bool do_arming_checks=true);
virtual bool disarm(AP_Arming::Method method); virtual bool disarm(AP_Arming::Method method, bool do_disarm_checks=true);
bool is_armed(); bool is_armed();
// get bitmask of enabled checks // get bitmask of enabled checks