From eb7f8ee0fd491a0e2f432beded48e2ce5685a99d Mon Sep 17 00:00:00 2001 From: mituritsyn Date: Thu, 19 Sep 2024 22:17:49 +0200 Subject: [PATCH] Revert "Fix telemetry for Spektrum/SRXL (#13814)" This reverts commit 04fe4b446160a9b2fc4757b8ef0de96986d153b3. --- src/main/target/common_post.h | 6 +++--- src/main/target/common_pre.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/target/common_post.h b/src/main/target/common_post.h index ef6880de5f..fc901e3827 100644 --- a/src/main/target/common_post.h +++ b/src/main/target/common_post.h @@ -265,8 +265,8 @@ #undef USE_TELEMETRY_IBUS_EXTENDED #endif -// If USE_SERIALRX_SPEKTRUM or SERIALRX_SRXL2 was dropped by a target, drop all related options -#if !defined(USE_SERIALRX_SPEKTRUM) && !defined(USE_SERIALRX_SRXL2) +// If USE_SERIALRX_SPEKTRUM was dropped by a target, drop all related options +#ifndef USE_SERIALRX_SPEKTRUM #undef USE_SPEKTRUM_BIND #undef USE_SPEKTRUM_BIND_PLUG #undef USE_SPEKTRUM_REAL_RSSI @@ -275,7 +275,7 @@ #undef USE_SPEKTRUM_VTX_CONTROL #undef USE_SPEKTRUM_VTX_TELEMETRY #undef USE_TELEMETRY_SRXL -#endif // !defined(USE_SERIALRX_SPEKTRUM) && !defined(USE_SERIALRX_SRXL2) +#endif #if !defined(USE_CMS) || !defined(USE_TELEMETRY_SRXL) #undef USE_SPEKTRUM_CMS_TELEMETRY diff --git a/src/main/target/common_pre.h b/src/main/target/common_pre.h index 645999efe4..82ce31f7d3 100644 --- a/src/main/target/common_pre.h +++ b/src/main/target/common_pre.h @@ -331,7 +331,7 @@ #define USE_THRUST_LINEARIZATION #define USE_TPA_MODE -#if defined(USE_SERIALRX_SPEKTRUM) || defined(USE_SERIALRX_SRXL2) +#ifdef USE_SERIALRX_SPEKTRUM #define USE_SPEKTRUM_BIND #define USE_SPEKTRUM_BIND_PLUG #define USE_SPEKTRUM_REAL_RSSI @@ -340,7 +340,7 @@ #define USE_SPEKTRUM_VTX_CONTROL #define USE_SPEKTRUM_VTX_TELEMETRY #define USE_SPEKTRUM_CMS_TELEMETRY -#endif // defined(USE_SERIALRX_SPEKTRUM) || defined USE_SERIALRX_SRXL2 +#endif // USE_SERIALRX_SPEKTRUM #define USE_BOARD_INFO #define USE_RTC_TIME