From a4fd03bd7f12d53193041b60f1f8016895dc445b Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Wed, 31 May 2023 13:29:45 +1000 Subject: [PATCH] fix: Remove double `cli` option text (#3620) * fix: Remove double `cli` option Seems like it was incorrectly added in #2123 * chore: Implcit CLI on ENABLE_SERIAL_PASSTHROUGH * fix: Not really a conditional * fix: Opt handled higher up --- radio/src/options.h | 1 - radio/src/targets/taranis/CMakeLists.txt | 11 ++++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/radio/src/options.h b/radio/src/options.h index fe7cd4f2893..4c76f0990cf 100644 --- a/radio/src/options.h +++ b/radio/src/options.h @@ -106,7 +106,6 @@ static const char * const options[] = { #endif #if defined(ENABLE_SERIAL_PASSTHROUGH) "passthrough", - "cli", #endif nullptr //sentinel }; diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index fd259a03e08..52bab732ac0 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -154,7 +154,6 @@ elseif(PCB STREQUAL X7) add_definitions(-DEEPROM_VARIANT=0x4005) add_definitions(-DMANUFACTURER_JUMPER) set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough") - set(CLI ON CACHE BOOL "Enable CLI") elseif(PCBREV STREQUAL TLITE) set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module") set(INTERNAL_MODULE_SERIAL YES) @@ -170,7 +169,6 @@ elseif(PCB STREQUAL X7) add_definitions(-DEEPROM_VARIANT=0x4003) add_definitions(-DMANUFACTURER_JUMPER) set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough") - set(CLI ON CACHE BOOL "Enable CLI") elseif(PCBREV STREQUAL TLITEF4) set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module") set(INTERNAL_MODULE_SERIAL YES) @@ -187,7 +185,6 @@ elseif(PCB STREQUAL X7) add_definitions(-DEEPROM_VARIANT=0x4003) add_definitions(-DMANUFACTURER_JUMPER) set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough") - set(CLI ON CACHE BOOL "Enable CLI") elseif(PCBREV STREQUAL LR3PRO) set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module") set(INTERNAL_MODULE_SERIAL YES) @@ -202,7 +199,6 @@ elseif(PCB STREQUAL X7) add_definitions(-DRADIO_FAMILY_JUMPER_T12) add_definitions(-DMANUFACTURER_BETAFPV) set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough") - set(CLI ON CACHE BOOL "Enable CLI") elseif(PCBREV STREQUAL TX12) set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module") set(INTERNAL_MODULE_SERIAL YES) @@ -240,7 +236,6 @@ elseif(PCB STREQUAL X7) add_definitions(-DMANUFACTURER_RADIOMASTER) set(PXX2 ON) set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough") - set(CLI ON CACHE BOOL "Enable CLI") elseif(PCBREV STREQUAL BOXER) set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module") set(INTERNAL_MODULE_SERIAL YES) @@ -258,7 +253,6 @@ elseif(PCB STREQUAL X7) add_definitions(-DMANUFACTURER_RADIOMASTER) set(PXX2 ON) set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough") - set(CLI ON CACHE BOOL "Enable CLI") set(FLYSKY_GIMBAL ON) if (NOT BLUETOOTH) set(AUX_SERIAL ON) @@ -283,7 +277,6 @@ elseif(PCB STREQUAL X7) add_definitions(-DMANUFACTURER_RADIOMASTER) set(PXX2 ON) set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough") - set(CLI ON CACHE BOOL "Enable CLI") elseif(PCBREV STREQUAL T8) set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module") set(INTERNAL_MODULE_SERIAL YES) @@ -480,6 +473,10 @@ if(NOT PCB STREQUAL PCBXLITE) add_definitions(-DHARDWARE_TRAINER_JACK) endif() +if(ENABLE_SERIAL_PASSTHROUGH) + set(CLI ON "Enable CLI") +endif() + if(INTERNAL_MODULE_SERIAL) if("${PCBREV}" STREQUAL 2019 OR "${PCBREV}" STREQUAL ACCESS)