From 1fb995b9155205ddb2b36fb687e171812ae6480a Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 25 Apr 2019 09:16:24 +0200 Subject: [PATCH] X12S fixes --- radio/src/targets/horus/CMakeLists.txt | 6 ++++-- radio/src/targets/horus/board.h | 2 ++ radio/src/targets/horus/pulses_driver.cpp | 16 ++++++++++++++++ radio/src/targets/taranis/CMakeLists.txt | 1 - 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt index ef12c59b4..d0c70b433 100644 --- a/radio/src/targets/horus/CMakeLists.txt +++ b/radio/src/targets/horus/CMakeLists.txt @@ -1,7 +1,9 @@ option(DISK_CACHE "Enable SD card disk cache" YES) option(UNEXPECTED_SHUTDOWN "Enable the Unexpected Shutdown screen" YES) -set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)") +option(PXX1 "PXX1 protocol support" ON) +option(PXX2 "PXX2 protocol support" ON) +set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)") set(CPU_TYPE STM32F4) set(HSE_VALUE 12000000) set(SDCARD YES) @@ -14,7 +16,7 @@ set(LINKER_SCRIPT targets/horus/stm32f4_flash.ld) set(RAMBACKUP YES) set(LUA YES) set(PPM_LIMITS_SYMETRICAL YES) -SET(USB_SERIAL ON CACHE BOOL "Enable USB serial (CDC)") +set(USB_SERIAL ON CACHE BOOL "Enable USB serial (CDC)") # for size report script set(CPU_TYPE_FULL STM32F429xI) diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h index 77b8e63cb..33b84fc43 100644 --- a/radio/src/targets/horus/board.h +++ b/radio/src/targets/horus/board.h @@ -222,7 +222,9 @@ void SDRAM_Init(void); void init_ppm(uint8_t module); void disable_ppm(uint8_t module); void init_pxx1_pulses(uint8_t module); +void init_pxx1_serial(uint8_t module); void disable_pxx1_pulses(uint8_t module); +void disable_pxx1_serial(uint8_t module); void init_pxx2(uint8_t module); void disable_pxx2(uint8_t module); void disable_serial(uint8_t module); diff --git a/radio/src/targets/horus/pulses_driver.cpp b/radio/src/targets/horus/pulses_driver.cpp index 4b2dfad6a..6a14b4046 100644 --- a/radio/src/targets/horus/pulses_driver.cpp +++ b/radio/src/targets/horus/pulses_driver.cpp @@ -58,6 +58,14 @@ void init_pxx1_pulses(uint8_t module) extmodulePxxStart(); } +void init_pxx1_serial(uint8_t module) +{ + if (module == INTERNAL_MODULE) + intmodulePxxStart(); + else + extmodulePxxStart(); +} + void disable_pxx1_pulses(uint8_t module) { if (module == INTERNAL_MODULE) @@ -66,6 +74,14 @@ void disable_pxx1_pulses(uint8_t module) extmoduleStop(); } +void disable_pxx1_serial(uint8_t module) +{ + if (module == INTERNAL_MODULE) + intmoduleStop(); + else + extmoduleStop(); +} + #if defined(DSM2) void disable_serial(uint8_t module) { diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index 3ac315e1b..0aa3ea081 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -6,7 +6,6 @@ option(MODULE_R9M_FULLSIZE "xlite option to use full size R9M instead of mini" O 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)") set(STICKS "STANDARD" CACHE STRING "Sticks type (STANDARD/HORUS)")