[Taranis X9E] Changes on SWO and SWP

This commit is contained in:
Bertrand Songis
2015-06-12 06:58:42 +02:00
parent 744b3139b8
commit f4659a55ba
+9 -9
View File
@@ -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)