From 2617c2de99a5086a6954cbe69047b1f81e6f6a8b Mon Sep 17 00:00:00 2001 From: Henry Wurzburg Date: Fri, 21 Oct 2022 13:50:45 -0500 Subject: [PATCH] AP_SerialManager: move multiple RC input error to pre-arm failure --- libraries/AP_SerialManager/AP_SerialManager.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/AP_SerialManager/AP_SerialManager.cpp b/libraries/AP_SerialManager/AP_SerialManager.cpp index 0754886993..1b04c6d0b5 100644 --- a/libraries/AP_SerialManager/AP_SerialManager.cpp +++ b/libraries/AP_SerialManager/AP_SerialManager.cpp @@ -543,11 +543,10 @@ void AP_SerialManager::init() #ifndef HAL_BUILD_AP_PERIPH case SerialProtocol_RCIN: - if (AP::RC().has_uart()) { - GCS_SEND_TEXT(MAV_SEVERITY_WARNING, "Duplicate RCIN configured on SERIAL%u", i); - } else { + if (!AP::RC().has_uart()) { AP::RC().add_uart(uart); } + break; #endif