From 22d052b71123097d11202cf2fc626ac25c072400 Mon Sep 17 00:00:00 2001 From: mmk0102 Date: Wed, 27 May 2020 22:04:00 +0300 Subject: [PATCH] AP_Arming: check for duplicate auxswitch options --- libraries/AP_Arming/AP_Arming.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libraries/AP_Arming/AP_Arming.cpp b/libraries/AP_Arming/AP_Arming.cpp index 87dbb584b7..0a74248504 100644 --- a/libraries/AP_Arming/AP_Arming.cpp +++ b/libraries/AP_Arming/AP_Arming.cpp @@ -552,6 +552,11 @@ bool AP_Arming::rc_arm_checks(AP_Arming::Method method) } bool check_passed = true; + // ensure all rc channels have different functions + if (rc().duplicate_options_exist()) { + check_failed(ARMING_CHECK_PARAMETERS, true, "Duplicate Aux Switch Options"); + check_passed = false; + } const RCMapper * rcmap = AP::rcmap(); if (rcmap != nullptr) { if (!rc().arming_skip_checks_rpy()) {