diff --git a/ArduSub/AP_Arming_Sub.cpp b/ArduSub/AP_Arming_Sub.cpp index 7b4a4e3399..40c49a2f57 100644 --- a/ArduSub/AP_Arming_Sub.cpp +++ b/ArduSub/AP_Arming_Sub.cpp @@ -152,14 +152,14 @@ bool AP_Arming_Sub::arm(AP_Arming::Method method, bool do_arming_checks) return true; } -bool AP_Arming_Sub::disarm(const AP_Arming::Method method) +bool AP_Arming_Sub::disarm(const AP_Arming::Method method, bool do_disarm_checks) { // return immediately if we are already disarmed if (!sub.motors.armed()) { return false; } - if (!AP_Arming::disarm(method)) { + if (!AP_Arming::disarm(method, do_disarm_checks)) { return false; } diff --git a/ArduSub/AP_Arming_Sub.h b/ArduSub/AP_Arming_Sub.h index 5906b67aa0..dadae3805f 100644 --- a/ArduSub/AP_Arming_Sub.h +++ b/ArduSub/AP_Arming_Sub.h @@ -15,7 +15,7 @@ public: bool pre_arm_checks(bool display_failure) override; bool has_disarm_function() const; - bool disarm(AP_Arming::Method method) override; + bool disarm(AP_Arming::Method method, bool do_disarm_checks=true) override; bool arm(AP_Arming::Method method, bool do_arming_checks=true) override; protected: