From c0ae690a7ccb630b55dd6036ea96d1482df3b9b5 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Mon, 27 Mar 2017 09:46:06 +0200 Subject: [PATCH 1/3] boards/nucleo-common: include arduino pinmap in board definitions --- boards/nucleo-common/include/board_common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/boards/nucleo-common/include/board_common.h b/boards/nucleo-common/include/board_common.h index 85fe4ea721..d0f291ddf7 100644 --- a/boards/nucleo-common/include/board_common.h +++ b/boards/nucleo-common/include/board_common.h @@ -23,6 +23,7 @@ #include "cpu.h" #include "periph_conf.h" +#include "arduino_pinmap.h" #ifdef __cplusplus extern "C" { From 34dcc8e94768fdeebadeae6eb24cf20f2c22c951 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Mon, 27 Mar 2017 09:46:15 +0200 Subject: [PATCH 2/3] boards/nucleo32-common: include arduino pinmap in board definitions --- boards/nucleo32-common/include/board_common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/boards/nucleo32-common/include/board_common.h b/boards/nucleo32-common/include/board_common.h index a72092f038..ef71de382d 100644 --- a/boards/nucleo32-common/include/board_common.h +++ b/boards/nucleo32-common/include/board_common.h @@ -23,6 +23,7 @@ #include "cpu.h" #include "periph_conf.h" +#include "arduino_pinmap.h" #ifdef __cplusplus extern "C" { From 3798472ec98cada3380d5a95ae614bf11527579f Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Mon, 27 Mar 2017 13:10:53 +0200 Subject: [PATCH 3/3] boards/nucleo-f302: add arduino pinmap --- boards/nucleo-common/include/arduino_pinmap.h | 6 ++++ boards/nucleo-common/include/board_common.h | 6 +++- boards/nucleo-f302/include/board.h | 29 ++----------------- 3 files changed, 13 insertions(+), 28 deletions(-) diff --git a/boards/nucleo-common/include/arduino_pinmap.h b/boards/nucleo-common/include/arduino_pinmap.h index 16b6210632..3d1c98e528 100644 --- a/boards/nucleo-common/include/arduino_pinmap.h +++ b/boards/nucleo-common/include/arduino_pinmap.h @@ -44,9 +44,15 @@ extern "C" { #define ARDUINO_PIN_8 GPIO_PIN(PORT_A, 9) #define ARDUINO_PIN_9 GPIO_PIN(PORT_C, 7) #define ARDUINO_PIN_10 GPIO_PIN(PORT_B, 6) +#ifdef CPU_MODEL_STM32F302R8 +#define ARDUINO_PIN_11 GPIO_PIN(PORT_B, 15) +#define ARDUINO_PIN_12 GPIO_PIN(PORT_B, 14) +#define ARDUINO_PIN_13 GPIO_PIN(PORT_B, 13) /* on-board LED */ +#else #define ARDUINO_PIN_11 GPIO_PIN(PORT_A, 7) #define ARDUINO_PIN_12 GPIO_PIN(PORT_A, 6) #define ARDUINO_PIN_13 GPIO_PIN(PORT_A, 5) /* on-board LED */ +#endif #define ARDUINO_PIN_A0 GPIO_PIN(PORT_C, 0) #define ARDUINO_PIN_A1 GPIO_PIN(PORT_C, 1) diff --git a/boards/nucleo-common/include/board_common.h b/boards/nucleo-common/include/board_common.h index d0f291ddf7..2c5b62b3d0 100644 --- a/boards/nucleo-common/include/board_common.h +++ b/boards/nucleo-common/include/board_common.h @@ -33,9 +33,13 @@ extern "C" { * @brief LED pin definitions and handlers * @{ */ +#ifdef CPU_MODEL_STM32F302R8 +#define LED0_PIN GPIO_PIN(PORT_B, 13) +#define LED0_MASK (1 << 13) +#else #define LED0_PIN GPIO_PIN(PORT_A, 5) - #define LED0_MASK (1 << 5) +#endif #define LED0_ON (GPIOA->BSRR = LED0_MASK) #define LED0_OFF (GPIOA->BSRR = (LED0_MASK << 16)) diff --git a/boards/nucleo-f302/include/board.h b/boards/nucleo-f302/include/board.h index 2fde66d2d6..bac65240ba 100755 --- a/boards/nucleo-f302/include/board.h +++ b/boards/nucleo-f302/include/board.h @@ -27,35 +27,10 @@ #include "cpu.h" #include "periph_conf.h" +#include "board_common.h" #ifdef __cplusplus -extern "C" { -#endif - -/** - * @brief LED pin definitions and handlers - * @{ - */ -#define LED0_PIN GPIO_PIN(PORT_B, 13) -#define LED0_MASK (1 << 13) - -#define LED0_ON (GPIOB->BSRR = LED0_MASK) -#define LED0_OFF (GPIOB->BSRR = (LED0_MASK << 16)) -#define LED0_TOGGLE (GPIOB->ODR ^= LED0_MASK) -/** @} */ - -/** - * @brief User button - */ -#define BTN_B1_PIN GPIO_PIN(PORT_C, 13) - -/** - * @brief Initialize board specific hardware, including clock, LEDs and std-IO - */ -void board_init(void); - -#ifdef __cplusplus -} +extern "C" {} #endif #endif /* BOARD_H */