From f4659a55baed1bc22f35ff8fb879a6d3fcd1885a Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 12 Jun 2015 06:58:42 +0200 Subject: [PATCH] [Taranis X9E] Changes on SWO and SWP --- radio/src/targets/taranis/hal.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index f2480fb63..f7674f749 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -182,13 +182,13 @@ #define SWITCHES_GPIO_REG_N_L GPIOB->IDR #define SWITCHES_GPIO_PIN_N_L GPIO_Pin_4 // PB.04 #define SWITCHES_GPIO_REG_O_H GPIOF->IDR - #define SWITCHES_GPIO_PIN_O_H GPIO_Pin_11 // PF.11 - #define SWITCHES_GPIO_REG_O_L GPIOF->IDR - #define SWITCHES_GPIO_PIN_O_L GPIO_Pin_12 // PF.12 - #define SWITCHES_GPIO_REG_P_H GPIOE->IDR - #define SWITCHES_GPIO_PIN_P_H GPIO_Pin_1 // PE.01 - #define SWITCHES_GPIO_REG_P_L GPIOE->IDR - #define SWITCHES_GPIO_PIN_P_L GPIO_Pin_2 // PE.02 + #define SWITCHES_GPIO_PIN_O_H GPIO_Pin_7 // PF.07 + #define SWITCHES_GPIO_REG_O_L GPIOE->IDR + #define SWITCHES_GPIO_PIN_O_L GPIO_Pin_10 // PE.10 + #define SWITCHES_GPIO_REG_P_H GPIOF->IDR + #define SWITCHES_GPIO_PIN_P_H GPIO_Pin_11 // PF.11 + #define SWITCHES_GPIO_REG_P_L GPIOF->IDR + #define SWITCHES_GPIO_PIN_P_L GPIO_Pin_12 // PF.12 #define SWITCHES_GPIO_REG_Q_H GPIOF->IDR #define SWITCHES_GPIO_PIN_Q_H GPIO_Pin_5 // PF.05 #define SWITCHES_GPIO_REG_Q_L GPIOF->IDR @@ -205,8 +205,8 @@ #define KEYS_GPIOB_PINS (SWITCHES_GPIO_PIN_N_H | SWITCHES_GPIO_PIN_N_L | SWITCHES_GPIO_PIN_R_H) #define KEYS_GPIOC_PINS (TRIMS_GPIO_PIN_RVD | TRIMS_GPIO_PIN_RVU | TRIMS_GPIO_PIN_RHL | TRIMS_GPIO_PIN_RHR) #define KEYS_GPIOD_PINS (KEYS_GPIO_PIN_MENU | KEYS_GPIO_PIN_EXIT | KEYS_GPIO_PIN_PAGE | SWITCHES_GPIO_PIN_B_H | SWITCHES_GPIO_PIN_B_L) - #define KEYS_GPIOE_PINS (TRIMS_GPIO_PIN_LHR | TRIMS_GPIO_PIN_LHL | SWITCHES_GPIO_PIN_A_H | SWITCHES_GPIO_REG_A_L | SWITCHES_GPIO_PIN_D | SWITCHES_GPIO_PIN_F_L | SWITCHES_GPIO_PIN_F_H | SWITCHES_GPIO_PIN_I_L | SWITCHES_GPIO_PIN_L_H | SWITCHES_GPIO_PIN_L_L | SWITCHES_GPIO_PIN_M_H | SWITCHES_GPIO_PIN_P_H | SWITCHES_GPIO_PIN_P_L | SWITCHES_GPIO_PIN_R_L) - #define KEYS_GPIOF_PINS (KEYS_GPIO_PIN_ENTER | SWITCHES_GPIO_PIN_E_H | SWITCHES_GPIO_PIN_E_L | SWITCHES_GPIO_PIN_G_H | SWITCHES_GPIO_PIN_G_L | SWITCHES_GPIO_PIN_H | SWITCHES_GPIO_PIN_I_H | SWITCHES_GPIO_PIN_O_H | SWITCHES_GPIO_PIN_O_L | SWITCHES_GPIO_PIN_Q_H | SWITCHES_GPIO_PIN_Q_L) + #define KEYS_GPIOE_PINS (TRIMS_GPIO_PIN_LHR | TRIMS_GPIO_PIN_LHL | SWITCHES_GPIO_PIN_A_H | SWITCHES_GPIO_REG_A_L | SWITCHES_GPIO_PIN_D | SWITCHES_GPIO_PIN_F_L | SWITCHES_GPIO_PIN_F_H | SWITCHES_GPIO_PIN_I_L | SWITCHES_GPIO_PIN_L_H | SWITCHES_GPIO_PIN_L_L | SWITCHES_GPIO_PIN_M_H | SWITCHES_GPIO_PIN_O_L | SWITCHES_GPIO_PIN_R_L) + #define KEYS_GPIOF_PINS (KEYS_GPIO_PIN_ENTER | SWITCHES_GPIO_PIN_E_H | SWITCHES_GPIO_PIN_E_L | SWITCHES_GPIO_PIN_G_H | SWITCHES_GPIO_PIN_G_L | SWITCHES_GPIO_PIN_H | SWITCHES_GPIO_PIN_I_H | SWITCHES_GPIO_PIN_O_H | SWITCHES_GPIO_PIN_P_H | SWITCHES_GPIO_PIN_P_L | SWITCHES_GPIO_PIN_Q_H | SWITCHES_GPIO_PIN_Q_L) #define KEYS_GPIOG_PINS (TRIMS_GPIO_PIN_LVD | TRIMS_GPIO_PIN_LVU | SWITCHES_GPIO_PIN_C_H | SWITCHES_GPIO_PIN_C_L | SWITCHES_GPIO_PIN_J_H | SWITCHES_GPIO_PIN_J_L | SWITCHES_GPIO_PIN_K_H | SWITCHES_GPIO_PIN_K_L) #elif defined(REVPLUS) #define KEYS_RCC_AHB1Periph_GPIO (RCC_AHB1Periph_GPIOA|RCC_AHB1Periph_GPIOB|RCC_AHB1Periph_GPIOC|RCC_AHB1Periph_GPIOD|RCC_AHB1Periph_GPIOE)