From 178ae9e0c118a765a1794d51e4b9f0a8d2245e13 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 20 Dec 2021 15:35:43 +1100 Subject: [PATCH] AP_RCTelemetry: use have_serial when detecting avoid find_serial() as it changes port options --- libraries/AP_RCTelemetry/AP_CRSF_Telem.cpp | 4 ++-- libraries/AP_RCTelemetry/AP_Spektrum_Telem.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_RCTelemetry/AP_CRSF_Telem.cpp b/libraries/AP_RCTelemetry/AP_CRSF_Telem.cpp index 2be4d9640f..9d9ac6eec0 100644 --- a/libraries/AP_RCTelemetry/AP_CRSF_Telem.cpp +++ b/libraries/AP_RCTelemetry/AP_CRSF_Telem.cpp @@ -55,8 +55,8 @@ AP_CRSF_Telem::~AP_CRSF_Telem(void) bool AP_CRSF_Telem::init(void) { // sanity check that we are using a UART for RC input - if (!AP::serialmanager().find_serial(AP_SerialManager::SerialProtocol_RCIN, 0) - && !AP::serialmanager().find_serial(AP_SerialManager::SerialProtocol_CRSF, 0)) { + if (!AP::serialmanager().have_serial(AP_SerialManager::SerialProtocol_RCIN, 0) + && !AP::serialmanager().have_serial(AP_SerialManager::SerialProtocol_CRSF, 0)) { return false; } return AP_RCTelemetry::init(); diff --git a/libraries/AP_RCTelemetry/AP_Spektrum_Telem.cpp b/libraries/AP_RCTelemetry/AP_Spektrum_Telem.cpp index c6a1668a0f..d6f22489a7 100644 --- a/libraries/AP_RCTelemetry/AP_Spektrum_Telem.cpp +++ b/libraries/AP_RCTelemetry/AP_Spektrum_Telem.cpp @@ -66,7 +66,7 @@ AP_Spektrum_Telem::~AP_Spektrum_Telem(void) bool AP_Spektrum_Telem::init(void) { // sanity check that we are using a UART for RC input - if (!AP::serialmanager().find_serial(AP_SerialManager::SerialProtocol_RCIN, 0)) { + if (!AP::serialmanager().have_serial(AP_SerialManager::SerialProtocol_RCIN, 0)) { return false; } return AP_RCTelemetry::init();