From 073683cc696bb209f3471a29cf11da7d2a43bbd8 Mon Sep 17 00:00:00 2001 From: Tatsuya Yamaguchi Date: Tue, 26 Apr 2022 13:19:36 +0900 Subject: [PATCH] AP_Arming: remove ARMING_CHECK_ALL bit check from disarm_switch_checks --- libraries/AP_Arming/AP_Arming.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/AP_Arming/AP_Arming.cpp b/libraries/AP_Arming/AP_Arming.cpp index 49e3e6f7e3..5f54c7ad13 100644 --- a/libraries/AP_Arming/AP_Arming.cpp +++ b/libraries/AP_Arming/AP_Arming.cpp @@ -1523,8 +1523,7 @@ bool AP_Arming::disarm_switch_checks(bool display_failure) const { const RC_Channel *chan = rc().find_channel_for_option(RC_Channel::AUX_FUNC::DISARM); if (chan != nullptr && - chan->get_aux_switch_pos() == RC_Channel::AuxSwitchPos::HIGH && - (checks_to_perform & ARMING_CHECK_ALL)) { + chan->get_aux_switch_pos() == RC_Channel::AuxSwitchPos::HIGH) { check_failed(display_failure, "Disarm Switch on"); return false; }