From 9b0d3a25c40652f88c1cd119c427fe4b9e76e307 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Wed, 27 Sep 2023 09:00:44 +0200 Subject: [PATCH] fix: Align BT defines for Zorro on other radios (#4117) Co-authored-by: Peter Feerick --- radio/src/targets/taranis/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index 84a4957f4..0934bbb06 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -250,14 +250,15 @@ elseif(PCB STREQUAL X7) set(NAVIGATION_TYPE x7) set(CPU_TYPE_FULL STM32F407xE) set(ROTARY_ENCODER YES) - set(BLUETOOTH NO) set(USB_CHARGER YES) - set(AUX_SERIAL ON) add_definitions(-DRADIO_ZORRO) add_definitions(-DEEPROM_VARIANT=0x4006) add_definitions(-DMANUFACTURER_RADIOMASTER) set(PXX2 ON) set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough") + if (NOT BLUETOOTH) + set(AUX_SERIAL ON) + endif() elseif(PCBREV STREQUAL POCKET) set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module") set(INTERNAL_MODULE_SERIAL YES) @@ -266,13 +267,14 @@ elseif(PCB STREQUAL X7) set(NAVIGATION_TYPE x7) set(CPU_TYPE_FULL STM32F407xE) set(ROTARY_ENCODER YES) - set(BLUETOOTH NO) set(USB_CHARGER YES) - set(AUX_SERIAL YES) add_definitions(-DRADIO_POCKET) add_definitions(-DMANUFACTURER_RADIOMASTER) set(PXX2 ON) set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough") + if (NOT BLUETOOTH) + set(AUX_SERIAL ON) + endif() elseif(PCBREV STREQUAL T8) set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module") set(INTERNAL_MODULE_SERIAL YES)