From 4d595ad36e581b7d1cf75e455fb160f4b030879f Mon Sep 17 00:00:00 2001 From: Vincent Dupont Date: Wed, 8 Feb 2017 17:21:45 +0100 Subject: [PATCH 1/3] boards: rename nucleo-f207 -> nucleo144-f207 --- boards/{nucleo-f207 => nucleo144-f207}/Makefile | 0 boards/{nucleo-f207 => nucleo144-f207}/Makefile.dep | 0 boards/{nucleo-f207 => nucleo144-f207}/Makefile.features | 0 boards/{nucleo-f207 => nucleo144-f207}/Makefile.include | 0 boards/{nucleo-f207 => nucleo144-f207}/board.c | 6 +++--- boards/{nucleo-f207 => nucleo144-f207}/dist/openocd.cfg | 0 boards/{nucleo-f207 => nucleo144-f207}/include/board.h | 8 ++++---- .../{nucleo-f207 => nucleo144-f207}/include/periph_conf.h | 6 +++--- 8 files changed, 10 insertions(+), 10 deletions(-) rename boards/{nucleo-f207 => nucleo144-f207}/Makefile (100%) rename boards/{nucleo-f207 => nucleo144-f207}/Makefile.dep (100%) rename boards/{nucleo-f207 => nucleo144-f207}/Makefile.features (100%) rename boards/{nucleo-f207 => nucleo144-f207}/Makefile.include (100%) rename boards/{nucleo-f207 => nucleo144-f207}/board.c (77%) rename boards/{nucleo-f207 => nucleo144-f207}/dist/openocd.cfg (100%) rename boards/{nucleo-f207 => nucleo144-f207}/include/board.h (86%) rename boards/{nucleo-f207 => nucleo144-f207}/include/periph_conf.h (97%) diff --git a/boards/nucleo-f207/Makefile b/boards/nucleo144-f207/Makefile similarity index 100% rename from boards/nucleo-f207/Makefile rename to boards/nucleo144-f207/Makefile diff --git a/boards/nucleo-f207/Makefile.dep b/boards/nucleo144-f207/Makefile.dep similarity index 100% rename from boards/nucleo-f207/Makefile.dep rename to boards/nucleo144-f207/Makefile.dep diff --git a/boards/nucleo-f207/Makefile.features b/boards/nucleo144-f207/Makefile.features similarity index 100% rename from boards/nucleo-f207/Makefile.features rename to boards/nucleo144-f207/Makefile.features diff --git a/boards/nucleo-f207/Makefile.include b/boards/nucleo144-f207/Makefile.include similarity index 100% rename from boards/nucleo-f207/Makefile.include rename to boards/nucleo144-f207/Makefile.include diff --git a/boards/nucleo-f207/board.c b/boards/nucleo144-f207/board.c similarity index 77% rename from boards/nucleo-f207/board.c rename to boards/nucleo144-f207/board.c index f4c74581aa..68853f5417 100644 --- a/boards/nucleo-f207/board.c +++ b/boards/nucleo144-f207/board.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 OTA keys S.A. + * Copyright (C) 2016-2017 OTA keys S.A. * * This file is subject to the terms and conditions of the GNU Lesser * General Public License v2.1. See the file LICENSE in the top level @@ -7,11 +7,11 @@ */ /** - * @ingroup boards_nucleo-f207 + * @ingroup boards_nucleo144-f207 * @{ * * @file - * @brief Board specific implementations for the nucleo-f207 board + * @brief Board specific implementations for the nucleo144-f207 board * * @author Vincent Dupont * diff --git a/boards/nucleo-f207/dist/openocd.cfg b/boards/nucleo144-f207/dist/openocd.cfg similarity index 100% rename from boards/nucleo-f207/dist/openocd.cfg rename to boards/nucleo144-f207/dist/openocd.cfg diff --git a/boards/nucleo-f207/include/board.h b/boards/nucleo144-f207/include/board.h similarity index 86% rename from boards/nucleo-f207/include/board.h rename to boards/nucleo144-f207/include/board.h index 0d59473102..ceae863cff 100644 --- a/boards/nucleo-f207/include/board.h +++ b/boards/nucleo144-f207/include/board.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 OTA keys S.A. + * Copyright (C) 2016-2017 OTA keys S.A. * * This file is subject to the terms and conditions of the GNU Lesser * General Public License v2.1. See the file LICENSE in the top level @@ -7,13 +7,13 @@ */ /** - * @defgroup boards_nucleo-f207 Nucleo-F207 + * @defgroup boards_nucleo144-f207 Nucleo144-F207 * @ingroup boards - * @brief Board specific files for the nucleo-f207 board + * @brief Board specific files for the nucleo144-f207 board * @{ * * @file - * @brief Board specific definitions for the nucleo-f207 board + * @brief Board specific definitions for the nucleo144-f207 board * * @author Vincent Dupont diff --git a/boards/nucleo-f207/include/periph_conf.h b/boards/nucleo144-f207/include/periph_conf.h similarity index 97% rename from boards/nucleo-f207/include/periph_conf.h rename to boards/nucleo144-f207/include/periph_conf.h index da5699bb34..693252d694 100644 --- a/boards/nucleo-f207/include/periph_conf.h +++ b/boards/nucleo144-f207/include/periph_conf.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 OTA keys S.A. + * Copyright (C) 2016-2017 OTA keys S.A. * * This file is subject to the terms and conditions of the GNU Lesser * General Public License v2.1. See the file LICENSE in the top level @@ -7,11 +7,11 @@ */ /** - * @ingroup boards_nucleo-f207 + * @ingroup boards_nucleo144-f207 * @{ * * @file - * @name Peripheral MCU configuration for the nucleo-f207 board + * @name Peripheral MCU configuration for the nucleo144-f207 board * * @author Vincent Dupont * @author Aurelien Gonce From 4ced9421b294b30db792f4587ac78cff3f9cdf0e Mon Sep 17 00:00:00 2001 From: Vincent Dupont Date: Wed, 8 Feb 2017 17:23:28 +0100 Subject: [PATCH 2/3] boards/nucleo144-f207: clean up board.h --- boards/nucleo144-f207/include/board.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/boards/nucleo144-f207/include/board.h b/boards/nucleo144-f207/include/board.h index ceae863cff..d6cf6b0927 100644 --- a/boards/nucleo144-f207/include/board.h +++ b/boards/nucleo144-f207/include/board.h @@ -22,8 +22,6 @@ #ifndef BOARD_H #define BOARD_H -#include "board_common.h" - #ifdef __cplusplus extern "C" { #endif @@ -32,12 +30,6 @@ extern "C" { * @brief LED pin definitions and handlers * @{ */ -#undef LED0_PIN -#undef LED0_MASK -#undef LED0_ON -#undef LED0_OFF -#undef LED0_TOGGLE - #define LED0_PIN GPIO_PIN(PORT_B, 0) #define LED0_MASK (1 << 0) #define LED0_ON (GPIOB->BSRR = LED0_MASK) @@ -57,6 +49,11 @@ extern "C" { #define LED2_TOGGLE (GPIOB->ODR ^= LED2_MASK) /** @} */ +/** + * @brief User button + */ +#define BTN_B1_PIN GPIO_PIN(PORT_C, 13) + /** * @brief Initialize board specific hardware, including clock, LEDs and std-IO */ From 2490b8ed2d910028e89d4b48d53cb2be1f6c2164 Mon Sep 17 00:00:00 2001 From: Vincent Dupont Date: Wed, 8 Feb 2017 17:23:51 +0100 Subject: [PATCH 3/3] boards/nucleo144-f207: fix ADC config --- boards/nucleo144-f207/include/periph_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/nucleo144-f207/include/periph_conf.h b/boards/nucleo144-f207/include/periph_conf.h index 693252d694..311aacafad 100644 --- a/boards/nucleo144-f207/include/periph_conf.h +++ b/boards/nucleo144-f207/include/periph_conf.h @@ -254,7 +254,7 @@ static const spi_conf_t spi_config[] = { * @{ */ #define ADC_CONFIG { \ - {GPIO_PIN(PORT_A, 4), 0, 0}, \ + {GPIO_PIN(PORT_A, 3), 0, 3}, \ {GPIO_PIN(PORT_C, 0), 1, 0} \ } #define ADC_NUMOF (2)