More init fixes

This commit is contained in:
Kilrah
2020-04-20 13:29:30 +02:00
parent 368adfb422
commit 7b81f6f971
2 changed files with 25 additions and 2 deletions
+2 -2
View File
@@ -243,8 +243,8 @@
#define KEYS_GPIOG_PINS (SWITCHES_GPIO_PIN_D_L | SWITCHES_GPIO_PIN_G_H | SWITCHES_GPIO_PIN_G_L | SWITCHES_GPIO_PIN_H | TRIMS_GPIO_PIN_LVD)
#if defined(RADIO_TX16S)
#define KEYS_GPIOA_PINS (GPIO_Pin_6)
#define KEYS_GPIOC_PINS (GPIO_Pin_4)
#define KEYS_GPIOH_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_14 | GPIO_Pin_15)
#define KEYS_GPIOC_PINS (GPIO_Pin_4 | GPIO_Pin_13)
#define KEYS_GPIOH_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_14 | GPIO_Pin_15)
#else
#define KEYS_GPIOH_PINS (GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_14 | GPIO_Pin_15)
#endif
+23
View File
@@ -204,16 +204,39 @@ void keysInit()
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
#if defined(KEYS_GPIOA_PINS)
INIT_KEYS_PINS(GPIOA);
#endif
#if defined(KEYS_GPIOB_PINS)
INIT_KEYS_PINS(GPIOB);
#endif
#if defined(KEYS_GPIOC_PINS)
INIT_KEYS_PINS(GPIOC);
#endif
#if defined(KEYS_GPIOD_PINS)
INIT_KEYS_PINS(GPIOD);
#endif
#if defined(KEYS_GPIOE_PINS)
INIT_KEYS_PINS(GPIOE);
#endif
#if defined(KEYS_GPIOG_PINS)
INIT_KEYS_PINS(GPIOG);
#endif
#if defined(KEYS_GPIOH_PINS)
INIT_KEYS_PINS(GPIOH);
#endif
#if defined(KEYS_GPIOI_PINS)
INIT_KEYS_PINS(GPIOI);
#endif
#if defined(KEYS_GPIOJ_PINS)
INIT_KEYS_PINS(GPIOJ);
#endif
}