diff --git a/radio/src/options.h b/radio/src/options.h index 36ee644b9..a1346ba8c 100644 --- a/radio/src/options.h +++ b/radio/src/options.h @@ -100,6 +100,12 @@ static const char * const options[] = { #endif #if defined(BIND_KEY) "bindkey", +#endif +#if defined(CLI) + "cli", +#endif +#if defined(ENABLE_SERIAL_PASSTHROUGH) + "passthrough", #endif nullptr //sentinel }; diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index 2dad9fe67..fe7257680 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -172,6 +172,8 @@ elseif(PCB STREQUAL X7) add_definitions(-DRADIO_FAMILY_JUMPER_T12) 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 TX12) set(DEFAULT_INTERNAL_MODULE MULTIMODULE 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 9878c7de7..704a62941 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -907,7 +907,9 @@ #define KEYS_GPIOG_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7) #elif defined(RADIO_FAMILY_JUMPER_T12) #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE) +#if !defined(RADIO_TLITE) #define KEYS_GPIOA_PINS GPIO_Pin_5 +#endif #define KEYS_GPIOC_PINS (GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3) #define KEYS_GPIOD_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15) #define KEYS_GPIOE_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_13 | GPIO_Pin_14 | GPIO_Pin_15) @@ -1476,6 +1478,11 @@ #define INTMODULE_DMA NULL #define INTMODULE_DMA_CHANNEL 0 #define INTMODULE_DMA_STREAM 0 +#if defined(RADIO_TLITE) + #define INTMODULE_BOOTCMD_GPIO GPIOA + #define INTMODULE_BOOTCMD_GPIO_PIN GPIO_Pin_5 // PA.05 + #define INIT_INTMODULE_BOOTCMD_PIN() GPIO_ResetBits(INTMODULE_BOOTCMD_GPIO, INTMODULE_BOOTCMD_GPIO_PIN); +#endif #else #define INTMODULE_PULSES #define INTMODULE_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_DMA2)