From 0e139fd0d67b93bb0e047ddefec13f652ef4c648 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 12 Aug 2017 16:15:40 +0200 Subject: [PATCH] X10 HAL update - ADC OK --- .../targets/common/arm/stm32/adc_driver.cpp | 2 +- radio/src/targets/horus/hal.h | 42 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/radio/src/targets/common/arm/stm32/adc_driver.cpp b/radio/src/targets/common/arm/stm32/adc_driver.cpp index 99721ac2b..b61fa9901 100644 --- a/radio/src/targets/common/arm/stm32/adc_driver.cpp +++ b/radio/src/targets/common/arm/stm32/adc_driver.cpp @@ -23,7 +23,7 @@ #if defined(SIMU) // not needed #elif defined(PCBX10) - const int8_t ana_direction[NUM_ANALOGS] = {1,-1,1,-1, -1,-1,-1, -1,1,1,1, -1}; + const int8_t ana_direction[NUM_ANALOGS] = {1,-1,1,-1, -1,1,-1, 1,-1, -1, 1,1}; #elif defined(PCBX9E) #if defined(HORUS_STICKS) const int8_t ana_direction[NUM_ANALOGS] = {1,-1,1,-1, -1,-1,-1,1, -1,1,1,1, -1}; diff --git a/radio/src/targets/horus/hal.h b/radio/src/targets/horus/hal.h index b5eb40e86..de37e7c31 100644 --- a/radio/src/targets/horus/hal.h +++ b/radio/src/targets/horus/hal.h @@ -199,33 +199,33 @@ #elif defined(PCBX10) #define ADC_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOF | RCC_AHB1Periph_DMA2) #define ADC_RCC_APB2Periph (RCC_APB2Periph_ADC3) - #define ADC_GPIO_PIN_STICK_LH GPIO_Pin_0 // PC.00 - #define ADC_GPIO_PIN_STICK_LV GPIO_Pin_1 // PC.01 - #define ADC_GPIO_PIN_STICK_RH GPIO_Pin_2 // PC.02 - #define ADC_GPIO_PIN_STICK_RV GPIO_Pin_3 // PC.03 + #define ADC_GPIO_PIN_STICK_LH GPIO_Pin_0 // PA.00 + #define ADC_GPIO_PIN_STICK_LV GPIO_Pin_1 // PA.01 + #define ADC_GPIO_PIN_STICK_RH GPIO_Pin_2 // PA.02 + #define ADC_GPIO_PIN_STICK_RV GPIO_Pin_3 // PA.03 + #define ADC_GPIO_PIN_POT1 GPIO_Pin_0 // PC.00 + #define ADC_GPIO_PIN_POT2 GPIO_Pin_1 // PC.01 + #define ADC_GPIO_PIN_POT3 GPIO_Pin_2 // PC.02 #define ADC_GPIO_PIN_SLIDER1 GPIO_Pin_6 // PF.06 - #define ADC_GPIO_PIN_SLIDER2 GPIO_Pin_3 // PA.03 + #define ADC_GPIO_PIN_SLIDER2 GPIO_Pin_3 // PC.03 #define ADC_GPIO_PIN_BATT GPIO_Pin_7 // PF.07 - #define ADC_GPIO_PIN_POT3 GPIO_Pin_0 // PA.00 - #define ADC_GPIO_PIN_POT1 GPIO_Pin_2 // PA.02 - #define ADC_GPIO_PIN_POT2 GPIO_Pin_1 // PA.01 #define ADC_GPIO_PIN_EXT1 GPIO_Pin_8 // PF.08 #define ADC_GPIO_PIN_EXT2 GPIO_Pin_9 // PF.09 #define ADC_GPIOA_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3) #define ADC_GPIOC_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3) - #define ADC_GPIOF_PINS (GPIO_Pin_6 | GPIO_Pin_7 | GPIO_Pin_8 | GPIO_Pin_9) - #define ADC_CHANNEL_STICK_LH ADC_Channel_10 // ADC1_IN10 - #define ADC_CHANNEL_STICK_LV ADC_Channel_11 // ADC1_IN11 - #define ADC_CHANNEL_STICK_RH ADC_Channel_12 // ADC1_IN12 - #define ADC_CHANNEL_STICK_RV ADC_Channel_13 // ADC1_IN13 - #define ADC_CHANNEL_SLIDER1 ADC_Channel_4 // ADC1_IN4 - #define ADC_CHANNEL_SLIDER2 ADC_Channel_3 // ADC1_IN3 - #define ADC_CHANNEL_BATT ADC_Channel_5 // ADC1_IN5 - #define ADC_CHANNEL_POT3 ADC_Channel_0 // ADC1_IN0 - #define ADC_CHANNEL_POT1 ADC_Channel_2 // ADC1_IN2 - #define ADC_CHANNEL_POT2 ADC_Channel_1 // ADC1_IN1 - #define ADC_CHANNEL_EXT1 ADC_Channel_6 // ADC1_IN6 - #define ADC_CHANNEL_EXT2 ADC_Channel_7 // ADC1_IN7 + #define ADC_GPIOF_PINS (GPIO_Pin_6 | GPIO_Pin_7) // | GPIO_Pin_8 | GPIO_Pin_9) + #define ADC_CHANNEL_STICK_LH ADC_Channel_0 // ADC3_IN0 + #define ADC_CHANNEL_STICK_LV ADC_Channel_1 // ADC3_IN1 + #define ADC_CHANNEL_STICK_RH ADC_Channel_2 // ADC3_IN2 + #define ADC_CHANNEL_STICK_RV ADC_Channel_3 // ADC3_IN3 + #define ADC_CHANNEL_POT1 ADC_Channel_10 // ADC3_IN10 + #define ADC_CHANNEL_POT2 ADC_Channel_11 // ADC3_IN11 + #define ADC_CHANNEL_POT3 ADC_Channel_12 // ADC3_IN12 + #define ADC_CHANNEL_SLIDER1 ADC_Channel_4 // ADC3_IN13 + #define ADC_CHANNEL_SLIDER2 ADC_Channel_13 // ADC3_IN13 + #define ADC_CHANNEL_BATT ADC_Channel_5 // ADC3_IN5 + #define ADC_CHANNEL_EXT1 ADC_Channel_6 // ADC3_IN6 + #define ADC_CHANNEL_EXT2 ADC_Channel_7 // ADC3_IN7 #define ADC_MAIN ADC3 #define ADC_SAMPTIME 3 #define ADC_DMA DMA2