From e080bfc483175f828e17ab9a9d1175e75f09d2bf Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 23 Apr 2019 13:13:39 +0200 Subject: [PATCH] Make pxx2 included by default unless explicitaly stated out --- radio/src/targets/taranis/CMakeLists.txt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index 84649ae05..3ac315e1b 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -3,6 +3,9 @@ option(LCD_DUAL_BUFFER "Dual LCD Buffer" OFF) option(TARANIS_INTERNAL_PPM "Taranis internal module hack to output PPM" OFF) option(USEHORUSBT "X9E BT module replaced by Horus BT module" OFF) option(MODULE_R9M_FULLSIZE "xlite option to use full size R9M instead of mini" OFF) +option(PXX1 "PXX1 protocol support" ON) +option(PXX2 "PXX2 protocol support" ON) + if(PCB STREQUAL X9E) set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)") @@ -156,12 +159,6 @@ if(PCB STREQUAL XLITES) endif() if(PCB STREQUAL XLITE OR PCB STREQUAL XLITES OR PCB STREQUAL X3) - option(PXX2 "PXX2 protocol support" ON) - if(FRSKY_RELEASE) - option(PXX1 "PXX1 protocol support" OFF) - else() - option(PXX1 "PXX1 protocol support" ON) - endif() add_definitions(-DINTERNAL_MODULE_SERIAL) if(PXX_FREQUENCY STREQUAL HIGH) add_definitions(-DPXX_FREQUENCY_HIGH) @@ -174,8 +171,6 @@ if(PCB STREQUAL XLITE OR PCB STREQUAL XLITES OR PCB STREQUAL X3) ../common/arm/stm32/intmodule_serial_driver.cpp ) else() - set(PXX1 YES) - option(PXX2 "PXX2 protocol support" ON) set(TARGET_SRC ${TARGET_SRC} intmodule_pulses_driver.cpp