From 5061d8dcc0f1e51a9b885fe5412c1905f2749d63 Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 21 Dec 2023 10:21:55 +0100 Subject: [PATCH] feat(MT12): Enable AUX Serial when BT not defined (#4431) --- radio/src/targets/taranis/CMakeLists.txt | 4 +++- radio/src/targets/taranis/hal.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index 5d9596b72..567ab6fdf 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -235,7 +235,6 @@ elseif(PCB STREQUAL X7) set(ROTARY_ENCODER YES) set(BLUETOOTH NO) set(USB_CHARGER YES) - set(AUX_SERIAL NO) set(HELI NO) add_definitions(-DRADIO_MT12) add_definitions(-DMANUFACTURER_RADIOMASTER) @@ -243,6 +242,9 @@ elseif(PCB STREQUAL X7) set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough") set(LUA_MIXER YES) set(FLEXSW "2" CACHE STRING "Max flex inputs usable as switches") + if (NOT BLUETOOTH) + set(AUX_SERIAL ON) + endif() elseif(PCBREV STREQUAL BOXER) set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module") set(INTERNAL_MODULE_SERIAL YES) diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index d1408e2c2..8943c4035 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -2171,7 +2171,7 @@ #endif // Serial Port -#if (defined(PCBX7) && !defined(RADIO_ZORRO) && !defined(RADIO_TX12MK2)) && !defined(RADIO_BOXER) && !defined(RADIO_POCKET) || defined(PCBXLITE) || defined(PCBX9LITE) || defined(RADIO_X9DP2019) +#if (defined(PCBX7) && !defined(AUX_SERIAL)) || defined(PCBXLITE) || defined(PCBX9LITE) || defined(RADIO_X9DP2019) #else #define HARDWARE_TRAINER_AUX_SERIAL #define AUX_SERIAL_GPIO GPIOB