From 43b8ee361bfa630788bfb3ae3d7ae82e3b24335e Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 26 Feb 2016 13:55:09 +0100 Subject: [PATCH] [X9E] Option added to allow the usage of HORUS sticks --- radio/src/CMakeLists.txt | 4 ++++ radio/src/targets/taranis/adc_driver.cpp | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 09a64d50e..65a190966 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -113,6 +113,7 @@ elseif(PCB STREQUAL TARANIS) option(LCD_DUAL_BUFFER "Dual LCD Buffer" OFF) option(TARANIS_INTERNAL_PPM "Taranis internal module hack to output PPM" OFF) if(PCBREV STREQUAL REV9E) + option(STICKS "Sticks type" STANDARD) set(CPU_TYPE STM32F4) set(LINKER_SCRIPT targets/taranis/stm32f4_flash.ld) set(HAPTIC YES) @@ -121,6 +122,9 @@ elseif(PCB STREQUAL TARANIS) add_definitions(-DSTM32F40_41xxx -DREVPLUS -DREV9E) add_definitions(-DEEPROM_VARIANT=32768) set(FIRMWARE_TARGET_SRC ${FIRMWARE_TARGET_SRC} top_lcd_driver.cpp bluetooth_driver.cpp) + if(STICKS STREQUAL HORUS) + add_definitions(-DHORUS_STICKS) + endif() elseif(PCBREV STREQUAL REVPLUS) set(CPU_TYPE STM32F2) set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld) diff --git a/radio/src/targets/taranis/adc_driver.cpp b/radio/src/targets/taranis/adc_driver.cpp index f88deb4bb..2b3ca7f75 100644 --- a/radio/src/targets/taranis/adc_driver.cpp +++ b/radio/src/targets/taranis/adc_driver.cpp @@ -29,7 +29,9 @@ #define SAMPTIME 2 // sample time = 28 cycles #define SAMPTIME_LONG 3 // sample time = 56 cycles -#if defined(REV9E) +#if defined(REV9E) && defined(HORUS_STICKS) + const int8_t ana_direction[NUMBER_ANALOG] = {1,-1,1,-1, -1,-1,-1,1, -1,1,1,1, -1}; +#elif defined(REV9E) const int8_t ana_direction[NUMBER_ANALOG] = {1,1,-1,-1, -1,-1,-1,1, -1,1,1,1, -1}; #elif defined(REVPLUS) const int8_t ana_direction[NUMBER_ANALOG] = {1,-1,1,-1, -1,1,-1, -1,1, 1};