From cf5cb10d6fbc4c08c183f94e11d3a4adceb3a69c Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 21 May 2019 13:13:14 +0200 Subject: [PATCH] Taranis X9D REV4a support removed (didn't compile since 2.2) --- radio/src/targets/common/arm/stm32/adc_driver.cpp | 2 -- radio/src/targets/taranis/board.h | 6 +----- radio/src/targets/taranis/hal.h | 6 +----- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/radio/src/targets/common/arm/stm32/adc_driver.cpp b/radio/src/targets/common/arm/stm32/adc_driver.cpp index 6424037d1..3e8d83fdf 100644 --- a/radio/src/targets/common/arm/stm32/adc_driver.cpp +++ b/radio/src/targets/common/arm/stm32/adc_driver.cpp @@ -42,8 +42,6 @@ const int8_t ana_direction[NUM_ANALOGS] = {-1,1,-1,1, 1,1}; #elif defined(PCBXLITE) const int8_t ana_direction[NUM_ANALOGS] = {1,-1,-1,1, -1,1, 1}; -#elif defined(REV4a) - const int8_t ana_direction[NUM_ANALOGS] = {1,-1,1,-1, 1,-1,0, 1,1, 1}; #else const int8_t ana_direction[NUM_ANALOGS] = {1,-1,1,-1, 1,1,0, 1,1, 1}; #endif diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h index 1ef61a5c2..b91b64378 100644 --- a/radio/src/targets/taranis/board.h +++ b/radio/src/targets/taranis/board.h @@ -639,11 +639,7 @@ uint8_t isBacklightEnabled(void); #endif // I2C driver: EEPROM + Audio Volume -#if defined(REV4a) - #define EEPROM_SIZE (64*1024) -#else - #define EEPROM_SIZE (32*1024) -#endif +#define EEPROM_SIZE (32*1024) void i2cInit(void); void eepromReadBlock(uint8_t * buffer, size_t address, size_t size); diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 0dee931ca..2b8dddd0a 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -1215,11 +1215,7 @@ #define I2C_SCL_GPIO_PinSource GPIO_PinSource6 #define I2C_SDA_GPIO_PinSource GPIO_PinSource7 #endif -#if defined(REV4a) - #define I2C_SPEED 100000 -#else - #define I2C_SPEED 400000 -#endif +#define I2C_SPEED 400000 #define I2C_ADDRESS_EEPROM 0xA2 #define I2C_ADDRESS_VOLUME 0x5C #define I2C_FLASH_PAGESIZE 64