From e02145efa04e9b59b9a1d795e0bff7752c3e2fd4 Mon Sep 17 00:00:00 2001 From: Michael du Breuil Date: Mon, 18 May 2020 10:27:47 -0700 Subject: [PATCH] AP_Arming: Use control_in rather then in_trim_dz() to cope with override only vehicles --- libraries/AP_Arming/AP_Arming.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/AP_Arming/AP_Arming.cpp b/libraries/AP_Arming/AP_Arming.cpp index f7d56a10a1..b354317fae 100644 --- a/libraries/AP_Arming/AP_Arming.cpp +++ b/libraries/AP_Arming/AP_Arming.cpp @@ -567,7 +567,7 @@ bool AP_Arming::rc_arm_checks(AP_Arming::Method method) if (c == nullptr) { continue; } - if (!c->in_trim_dz()) { + if (c->get_control_in() != 0) { if ((method != Method::RUDDER) || (c != rc().get_arming_channel())) { // ignore the yaw input channel if rudder arming check_failed(ARMING_CHECK_RC, true, "%s (RC%d) is not neutral", names[i], channels[i]); check_passed = false;