From ab2c5870e9c1bb3d9510c9101ee45acdbc45f73d Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 13 Mar 2019 11:45:59 +0100 Subject: [PATCH] [X3] Fixes --- radio/src/targets/taranis/hal.h | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 5d8f2fdde..7feb82e9e 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -191,7 +191,7 @@ #define SWITCHES_GPIO_PIN_A_H GPIO_Pin_10 // PD.10 #define SWITCHES_GPIO_REG_A_L GPIOD->IDR #define SWITCHES_GPIO_PIN_A_L GPIO_Pin_14 // PD.14 -#elif defined(PCBXLITE) +#elif defined(PCBXLITE) || defined(PCBX3) #define SWITCHES_GPIO_REG_A_H GPIOE->IDR #define SWITCHES_GPIO_PIN_A_H GPIO_Pin_1 // PE.01 #define SWITCHES_GPIO_REG_A_L GPIOE->IDR @@ -201,16 +201,11 @@ #define SWITCHES_GPIO_PIN_A_L GPIO_Pin_7 // PE.07 #define SWITCHES_GPIO_REG_A_H GPIOE->IDR #define SWITCHES_GPIO_PIN_A_H GPIO_Pin_13 // PE.13 -#elif defined(PCBX3) - #define SWITCHES_GPIO_REG_A_L GPIOE->IDR - #define SWITCHES_GPIO_PIN_A_L GPIO_Pin_7 // PE.07 - #define SWITCHES_GPIO_REG_A_H GPIOE->IDR - #define SWITCHES_GPIO_PIN_A_H GPIO_Pin_13 // PE.13 #else - #define SWITCHES_GPIO_REG_A_H GPIOE->IDR - #define SWITCHES_GPIO_PIN_A_H GPIO_Pin_0 // PE.00 + #define SWITCHES_GPIO_REG_A_H GPIOB->IDR + #define SWITCHES_GPIO_PIN_A_H GPIO_Pin_5 // PB.05 #define SWITCHES_GPIO_REG_A_L GPIOE->IDR - #define SWITCHES_GPIO_PIN_A_L GPIO_Pin_1 // PE.01 + #define SWITCHES_GPIO_PIN_A_L GPIO_Pin_0 // PE.00 #endif #if defined(PCBX9E) @@ -245,7 +240,7 @@ #define SWITCHES_GPIO_PIN_C_H GPIO_Pin_13 // PF.13 #define SWITCHES_GPIO_REG_C_L GPIOF->IDR #define SWITCHES_GPIO_PIN_C_L GPIO_Pin_14 // PF.14 -#elif defined(PCBXLITE) +#elif defined(PCBXLITE) || defined(PCBX3) #define SWITCHES_GPIO_REG_C_L GPIOE->IDR #define SWITCHES_GPIO_PIN_C_L GPIO_Pin_2 // PE.02 #define SWITCHES_GPIO_REG_C_H GPIOE->IDR @@ -255,11 +250,6 @@ #define SWITCHES_GPIO_PIN_C_L GPIO_Pin_11 // PD.11 #define SWITCHES_GPIO_REG_C_H GPIOE->IDR #define SWITCHES_GPIO_PIN_C_H GPIO_Pin_0 // PE.00 -#elif defined(PCBX3) - #define SWITCHES_GPIO_REG_C_L GPIOE->IDR - #define SWITCHES_GPIO_PIN_C_L GPIO_Pin_2 // PE.02 - #define SWITCHES_GPIO_REG_C_H GPIOE->IDR - #define SWITCHES_GPIO_PIN_C_H GPIO_Pin_3 // PE.03 #else #define SWITCHES_GPIO_REG_C_H GPIOE->IDR #define SWITCHES_GPIO_PIN_C_H GPIO_Pin_15 // PE.15