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
This commit is contained in:
@@ -106,7 +106,6 @@ static const char * const options[] = {
|
|||||||
#endif
|
#endif
|
||||||
#if defined(ENABLE_SERIAL_PASSTHROUGH)
|
#if defined(ENABLE_SERIAL_PASSTHROUGH)
|
||||||
"passthrough",
|
"passthrough",
|
||||||
"cli",
|
|
||||||
#endif
|
#endif
|
||||||
nullptr //sentinel
|
nullptr //sentinel
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -154,7 +154,6 @@ elseif(PCB STREQUAL X7)
|
|||||||
add_definitions(-DEEPROM_VARIANT=0x4005)
|
add_definitions(-DEEPROM_VARIANT=0x4005)
|
||||||
add_definitions(-DMANUFACTURER_JUMPER)
|
add_definitions(-DMANUFACTURER_JUMPER)
|
||||||
set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
|
set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
|
||||||
set(CLI ON CACHE BOOL "Enable CLI")
|
|
||||||
elseif(PCBREV STREQUAL TLITE)
|
elseif(PCBREV STREQUAL TLITE)
|
||||||
set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
|
set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
|
||||||
set(INTERNAL_MODULE_SERIAL YES)
|
set(INTERNAL_MODULE_SERIAL YES)
|
||||||
@@ -170,7 +169,6 @@ elseif(PCB STREQUAL X7)
|
|||||||
add_definitions(-DEEPROM_VARIANT=0x4003)
|
add_definitions(-DEEPROM_VARIANT=0x4003)
|
||||||
add_definitions(-DMANUFACTURER_JUMPER)
|
add_definitions(-DMANUFACTURER_JUMPER)
|
||||||
set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
|
set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
|
||||||
set(CLI ON CACHE BOOL "Enable CLI")
|
|
||||||
elseif(PCBREV STREQUAL TLITEF4)
|
elseif(PCBREV STREQUAL TLITEF4)
|
||||||
set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
|
set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
|
||||||
set(INTERNAL_MODULE_SERIAL YES)
|
set(INTERNAL_MODULE_SERIAL YES)
|
||||||
@@ -187,7 +185,6 @@ elseif(PCB STREQUAL X7)
|
|||||||
add_definitions(-DEEPROM_VARIANT=0x4003)
|
add_definitions(-DEEPROM_VARIANT=0x4003)
|
||||||
add_definitions(-DMANUFACTURER_JUMPER)
|
add_definitions(-DMANUFACTURER_JUMPER)
|
||||||
set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
|
set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
|
||||||
set(CLI ON CACHE BOOL "Enable CLI")
|
|
||||||
elseif(PCBREV STREQUAL LR3PRO)
|
elseif(PCBREV STREQUAL LR3PRO)
|
||||||
set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module")
|
set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module")
|
||||||
set(INTERNAL_MODULE_SERIAL YES)
|
set(INTERNAL_MODULE_SERIAL YES)
|
||||||
@@ -202,7 +199,6 @@ elseif(PCB STREQUAL X7)
|
|||||||
add_definitions(-DRADIO_FAMILY_JUMPER_T12)
|
add_definitions(-DRADIO_FAMILY_JUMPER_T12)
|
||||||
add_definitions(-DMANUFACTURER_BETAFPV)
|
add_definitions(-DMANUFACTURER_BETAFPV)
|
||||||
set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
|
set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
|
||||||
set(CLI ON CACHE BOOL "Enable CLI")
|
|
||||||
elseif(PCBREV STREQUAL TX12)
|
elseif(PCBREV STREQUAL TX12)
|
||||||
set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
|
set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
|
||||||
set(INTERNAL_MODULE_SERIAL YES)
|
set(INTERNAL_MODULE_SERIAL YES)
|
||||||
@@ -240,7 +236,6 @@ elseif(PCB STREQUAL X7)
|
|||||||
add_definitions(-DMANUFACTURER_RADIOMASTER)
|
add_definitions(-DMANUFACTURER_RADIOMASTER)
|
||||||
set(PXX2 ON)
|
set(PXX2 ON)
|
||||||
set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
|
set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
|
||||||
set(CLI ON CACHE BOOL "Enable CLI")
|
|
||||||
elseif(PCBREV STREQUAL BOXER)
|
elseif(PCBREV STREQUAL BOXER)
|
||||||
set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module")
|
set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module")
|
||||||
set(INTERNAL_MODULE_SERIAL YES)
|
set(INTERNAL_MODULE_SERIAL YES)
|
||||||
@@ -258,7 +253,6 @@ elseif(PCB STREQUAL X7)
|
|||||||
add_definitions(-DMANUFACTURER_RADIOMASTER)
|
add_definitions(-DMANUFACTURER_RADIOMASTER)
|
||||||
set(PXX2 ON)
|
set(PXX2 ON)
|
||||||
set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
|
set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
|
||||||
set(CLI ON CACHE BOOL "Enable CLI")
|
|
||||||
set(FLYSKY_GIMBAL ON)
|
set(FLYSKY_GIMBAL ON)
|
||||||
if (NOT BLUETOOTH)
|
if (NOT BLUETOOTH)
|
||||||
set(AUX_SERIAL ON)
|
set(AUX_SERIAL ON)
|
||||||
@@ -283,7 +277,6 @@ elseif(PCB STREQUAL X7)
|
|||||||
add_definitions(-DMANUFACTURER_RADIOMASTER)
|
add_definitions(-DMANUFACTURER_RADIOMASTER)
|
||||||
set(PXX2 ON)
|
set(PXX2 ON)
|
||||||
set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
|
set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
|
||||||
set(CLI ON CACHE BOOL "Enable CLI")
|
|
||||||
elseif(PCBREV STREQUAL T8)
|
elseif(PCBREV STREQUAL T8)
|
||||||
set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
|
set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
|
||||||
set(INTERNAL_MODULE_SERIAL YES)
|
set(INTERNAL_MODULE_SERIAL YES)
|
||||||
@@ -480,6 +473,10 @@ if(NOT PCB STREQUAL PCBXLITE)
|
|||||||
add_definitions(-DHARDWARE_TRAINER_JACK)
|
add_definitions(-DHARDWARE_TRAINER_JACK)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(ENABLE_SERIAL_PASSTHROUGH)
|
||||||
|
set(CLI ON "Enable CLI")
|
||||||
|
endif()
|
||||||
|
|
||||||
if(INTERNAL_MODULE_SERIAL)
|
if(INTERNAL_MODULE_SERIAL)
|
||||||
|
|
||||||
if("${PCBREV}" STREQUAL 2019 OR "${PCBREV}" STREQUAL ACCESS)
|
if("${PCBREV}" STREQUAL 2019 OR "${PCBREV}" STREQUAL ACCESS)
|
||||||
|
|||||||
Reference in New Issue
Block a user