From b229c552e63200344a28a6bee223a5c9a98a182f Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 6 Jan 2021 11:15:47 +1100 Subject: [PATCH] AP_Arming: add do_disarm_checks boolean to disarm call this creates symmetry between arming and disarming, at least as far as the top-level arm() and disarm() calls are concerned. --- libraries/AP_Arming/AP_Arming.cpp | 2 +- libraries/AP_Arming/AP_Arming.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_Arming/AP_Arming.cpp b/libraries/AP_Arming/AP_Arming.cpp index 971084295c..54625891eb 100644 --- a/libraries/AP_Arming/AP_Arming.cpp +++ b/libraries/AP_Arming/AP_Arming.cpp @@ -1204,7 +1204,7 @@ bool AP_Arming::arm(AP_Arming::Method method, const bool do_arming_checks) } //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 return false; diff --git a/libraries/AP_Arming/AP_Arming.h b/libraries/AP_Arming/AP_Arming.h index 26ce235bc5..6237a0aec0 100644 --- a/libraries/AP_Arming/AP_Arming.h +++ b/libraries/AP_Arming/AP_Arming.h @@ -86,7 +86,7 @@ public: // these functions should not be used by Copter which holds the armed state in the motors library Required arming_required(); 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(); // get bitmask of enabled checks