riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14575 from gschorcht/cpu/stm32/fix_gpio_definition

Browse Source 
cpu/stm32: GPIO ports definition fix
This commit is contained in:
Alexandre Abadie 2020-07-23 12:24:44 +02:00 committed by GitHub
commit 107356ec5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boards/common/nucleo32/include/arduino_pinmap.h
View File

@ -39,7 +39,8 @@ extern "C" {
#define ARDUINO_PIN_4 GPIO_PIN(PORT_B, 7) #define ARDUINO_PIN_4 GPIO_PIN(PORT_B, 7)
#define ARDUINO_PIN_5 GPIO_PIN(PORT_B, 6) #define ARDUINO_PIN_5 GPIO_PIN(PORT_B, 6)
#define ARDUINO_PIN_6 GPIO_PIN(PORT_B, 1) #define ARDUINO_PIN_6 GPIO_PIN(PORT_B, 1)
#if defined(CPU_MODEL_STM32L031K6) || defined(CPU_MODEL_STM32L432KC) #if defined(CPU_MODEL_STM32L031K6) || defined(CPU_MODEL_STM32L432KC) || \
defined(CPU_MODEL_STM32L412KB)
#define ARDUINO_PIN_7 GPIO_PIN(PORT_C, 14) #define ARDUINO_PIN_7 GPIO_PIN(PORT_C, 14)
#define ARDUINO_PIN_8 GPIO_PIN(PORT_C, 15) #define ARDUINO_PIN_8 GPIO_PIN(PORT_C, 15)
#else #else

31
cpu/stm32/include/periph_cpu.h
View File

@ -217,32 +217,37 @@ typedef uint32_t gpio_t;
* @brief Available GPIO ports * @brief Available GPIO ports
*/ */
enum { enum {
#ifdef GPIOA
PORT_A = 0, /**< port A */ PORT_A = 0, /**< port A */
#endif
#ifdef GPIOB
PORT_B = 1, /**< port B */ PORT_B = 1, /**< port B */
#endif
#ifdef GPIOC
PORT_C = 2, /**< port C */ PORT_C = 2, /**< port C */
#endif
#ifdef GPIOD
PORT_D = 3, /**< port D */ PORT_D = 3, /**< port D */
#endif
#ifdef GPIOE
PORT_E = 4, /**< port E */ PORT_E = 4, /**< port E */
#endif
#ifdef GPIOF
PORT_F = 5, /**< port F */ PORT_F = 5, /**< port F */
#if defined(CPU_FAM_STM32F1) || defined(CPU_FAM_STM32F2) || \ #endif
defined(CPU_FAM_STM32F3) || defined(CPU_FAM_STM32F4) || \ #ifdef GPIOG
defined(CPU_FAM_STM32F7) || defined(CPU_FAM_STM32L1) || \
defined(CPU_FAM_STM32L4) || defined(CPU_FAM_STM32G4)
PORT_G = 6, /**< port G */ PORT_G = 6, /**< port G */
#endif #endif
#if defined(CPU_FAM_STM32F2) || defined(CPU_FAM_STM32F3) || \ #ifdef GPIOH
defined(CPU_FAM_STM32F4) || defined(CPU_FAM_STM32F7) || \
defined(CPU_FAM_STM32L0) || defined(CPU_FAM_STM32L1) || \
defined(CPU_FAM_STM32L4) || defined(CPU_FAM_STM32WB) || \
defined(CPU_FAM_STM32G4)
PORT_H = 7, /**< port H */ PORT_H = 7, /**< port H */
#endif #endif
#if defined(CPU_FAM_STM32F2) || defined(CPU_FAM_STM32F4) || \ #ifdef GPIOI
defined(CPU_FAM_STM32F7) || defined(CPU_FAM_STM32L4) || \
defined(CPU_FAM_STM32G4)
PORT_I = 8, /**< port I */ PORT_I = 8, /**< port I */
#endif #endif
#if defined(CPU_FAM_STM32F7) #ifdef GPIOJ
PORT_J = 9, /**< port J */ PORT_J = 9, /**< port J */
#endif
#ifdef GPIOK
PORT_K = 10, /**< port K */ PORT_K = 10, /**< port K */
#endif #endif
}; };