From 333206ac45809a9f3784fc61fabbe8e7e88f6909 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Mon, 10 Apr 2017 09:38:37 +0200 Subject: [PATCH] boards/arduino-mkr-common: factorize arduino-mkr boards to common place --- boards/arduino-mkr-common/Makefile | 3 + boards/arduino-mkr-common/Makefile.dep | 3 + boards/arduino-mkr-common/Makefile.features | 14 ++ boards/arduino-mkr-common/Makefile.include | 21 ++ .../board.c | 6 +- .../include/arduino_board.h | 8 +- .../include/arduino_pinmap.h | 4 +- .../arduino-mkr-common/include/board_common.h | 52 ++++ .../include/gpio_params.h | 4 +- .../include/periph_conf_common.h | 230 ++++++++++++++++++ 10 files changed, 332 insertions(+), 13 deletions(-) create mode 100644 boards/arduino-mkr-common/Makefile create mode 100644 boards/arduino-mkr-common/Makefile.dep create mode 100644 boards/arduino-mkr-common/Makefile.features create mode 100644 boards/arduino-mkr-common/Makefile.include rename boards/{arduino-mkrzero => arduino-mkr-common}/board.c (72%) rename boards/{arduino-mkrzero => arduino-mkr-common}/include/arduino_board.h (86%) rename boards/{arduino-mkrzero => arduino-mkr-common}/include/arduino_pinmap.h (96%) create mode 100644 boards/arduino-mkr-common/include/board_common.h rename boards/{arduino-mkrzero => arduino-mkr-common}/include/gpio_params.h (91%) create mode 100644 boards/arduino-mkr-common/include/periph_conf_common.h diff --git a/boards/arduino-mkr-common/Makefile b/boards/arduino-mkr-common/Makefile new file mode 100644 index 0000000000..8caef4864e --- /dev/null +++ b/boards/arduino-mkr-common/Makefile @@ -0,0 +1,3 @@ +MODULE = arduino-mkr-common + +include $(RIOTBASE)/Makefile.base diff --git a/boards/arduino-mkr-common/Makefile.dep b/boards/arduino-mkr-common/Makefile.dep new file mode 100644 index 0000000000..5472bf8b8d --- /dev/null +++ b/boards/arduino-mkr-common/Makefile.dep @@ -0,0 +1,3 @@ +ifneq (,$(filter saul_default,$(USEMODULE))) + USEMODULE += saul_gpio +endif diff --git a/boards/arduino-mkr-common/Makefile.features b/boards/arduino-mkr-common/Makefile.features new file mode 100644 index 0000000000..9e10c5ba07 --- /dev/null +++ b/boards/arduino-mkr-common/Makefile.features @@ -0,0 +1,14 @@ +# Put defined MCU peripherals here (in alphabetical order) +FEATURES_PROVIDED += periph_cpuid +FEATURES_PROVIDED += periph_gpio +FEATURES_PROVIDED += periph_i2c +FEATURES_PROVIDED += periph_spi +FEATURES_PROVIDED += periph_timer +FEATURES_PROVIDED += periph_uart + +# Various other features (if any) +FEATURES_PROVIDED += cpp +FEATURES_PROVIDED += arduino + +# The board MPU family (used for grouping by the CI system) +FEATURES_MCU_GROUP = cortex_m0_2 diff --git a/boards/arduino-mkr-common/Makefile.include b/boards/arduino-mkr-common/Makefile.include new file mode 100644 index 0000000000..696d57917b --- /dev/null +++ b/boards/arduino-mkr-common/Makefile.include @@ -0,0 +1,21 @@ +# define the cpu used by Arduino/Genuino MKR boards +export CPU = samd21 +export CPU_MODEL = samd21g18a_mkr +export CFLAGS += -D__SAMD21G18A__ + +# set default port depending on operating system +PORT_LINUX ?= /dev/ttyACM0 +PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) + +# define board specific flasher options +export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh +export OFLAGS = -O binary + +# setup the boards dependencies +include $(RIOTBOARD)/$(BOARD)/Makefile.dep + +# setup serial terminal +include $(RIOTMAKE)/tools/serial.inc.mk + +# add arduino-mkr-common include path +INCLUDES += -I$(RIOTBOARD)/arduino-mkr-common/include diff --git a/boards/arduino-mkrzero/board.c b/boards/arduino-mkr-common/board.c similarity index 72% rename from boards/arduino-mkrzero/board.c rename to boards/arduino-mkr-common/board.c index 9cc76bc07e..b63e66ad8a 100644 --- a/boards/arduino-mkrzero/board.c +++ b/boards/arduino-mkr-common/board.c @@ -7,10 +7,10 @@ */ /** - * @ingroup boards_arduino-mkrzero + * @ingroup boards_arduino-mkr-common * * @file - * @brief Board specific implementations for the Arduino MKRZERO board + * @brief Board common implementations for the Arduino MKR boards * * @author Alexandre Abadie * @@ -25,6 +25,6 @@ void board_init(void) { /* initialize the CPU */ cpu_init(); - /* initialize the on-board Amber "L" LED on pin PA17 */ + /* initialize the on-board Amber "L" LED */ gpio_init(LED0_PIN, GPIO_OUT); } diff --git a/boards/arduino-mkrzero/include/arduino_board.h b/boards/arduino-mkr-common/include/arduino_board.h similarity index 86% rename from boards/arduino-mkrzero/include/arduino_board.h rename to boards/arduino-mkr-common/include/arduino_board.h index 8f1f952985..6360c70133 100644 --- a/boards/arduino-mkrzero/include/arduino_board.h +++ b/boards/arduino-mkr-common/include/arduino_board.h @@ -7,7 +7,7 @@ */ /** - * @ingroup boards_arduino-mkzero + * @ingroup boards_arduino-mkr-common * @{ * * @file @@ -19,17 +19,13 @@ #ifndef ARDUINO_BOARD_H #define ARDUINO_BOARD_H +#include "board.h" #include "arduino_pinmap.h" #ifdef __cplusplus extern "C" { #endif -/** - * @brief The on-board LED is connected to pin 6 on this board - */ -#define ARDUINO_LED (6) - /** * @brief Look-up table for the Arduino's digital pins */ diff --git a/boards/arduino-mkrzero/include/arduino_pinmap.h b/boards/arduino-mkr-common/include/arduino_pinmap.h similarity index 96% rename from boards/arduino-mkrzero/include/arduino_pinmap.h rename to boards/arduino-mkr-common/include/arduino_pinmap.h index 849ac9f7ff..caddca117e 100644 --- a/boards/arduino-mkrzero/include/arduino_pinmap.h +++ b/boards/arduino-mkr-common/include/arduino_pinmap.h @@ -7,7 +7,7 @@ */ /** - * @ingroup boards_arduino-mkrzero + * @ingroup boards_arduino-mkr-common * @{ * * @file @@ -38,7 +38,7 @@ extern "C" { #define ARDUINO_PIN_3 GPIO_PIN(PA, 11) #define ARDUINO_PIN_4 GPIO_PIN(PB, 10) #define ARDUINO_PIN_5 GPIO_PIN(PB, 11) -#define ARDUINO_PIN_6 GPIO_PIN(PA, 20) /* on-board LED */ +#define ARDUINO_PIN_6 GPIO_PIN(PA, 20) /* on-board LED for MKR1000*/ #define ARDUINO_PIN_7 GPIO_PIN(PA, 21) #define ARDUINO_PIN_A0 GPIO_PIN(PA, 2) diff --git a/boards/arduino-mkr-common/include/board_common.h b/boards/arduino-mkr-common/include/board_common.h new file mode 100644 index 0000000000..47b5f2616e --- /dev/null +++ b/boards/arduino-mkr-common/include/board_common.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2017 Inria + * + * 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 + * directory for more details. + */ + +/** + * @defgroup boards_arduino-mkr-common Arduino MKR Common + * @ingroup boards + * @brief Support for the Arduino MKR boards type. + * @{ + * + * @file + * @brief Board specific definitions for the Arduino MKR + * board + * + * @author Alexandre Abadie + */ + +#ifndef BOARD_COMMON_H +#define BOARD_COMMON_H + +#include "cpu.h" +#include "periph_conf.h" +#include "periph_conf_common.h" +#include "arduino_pinmap.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @name xtimer configuration + * @{ + */ +#define XTIMER TIMER_0 +#define XTIMER_CHAN (0) +/** @} */ + +/** + * @brief Initialize board specific hardware, including clock, LEDs and std-IO + */ +void board_init(void); + +#ifdef __cplusplus +} +#endif + +#endif /* BOARD_COMMON_H */ +/** @} */ diff --git a/boards/arduino-mkrzero/include/gpio_params.h b/boards/arduino-mkr-common/include/gpio_params.h similarity index 91% rename from boards/arduino-mkrzero/include/gpio_params.h rename to boards/arduino-mkr-common/include/gpio_params.h index 87dd6dc3e4..c88d2545a2 100644 --- a/boards/arduino-mkrzero/include/gpio_params.h +++ b/boards/arduino-mkr-common/include/gpio_params.h @@ -7,7 +7,7 @@ */ /** - * @ingroup boards_arduino-mkrzero + * @ingroup boards_arduino-mkr-common * @{ * * @file @@ -32,7 +32,7 @@ extern "C" { static const saul_gpio_params_t saul_gpio_params[] = { { - .name = "LED(orange)", + .name = "LED(Green)", .pin = LED0_PIN, .mode = GPIO_OUT }, diff --git a/boards/arduino-mkr-common/include/periph_conf_common.h b/boards/arduino-mkr-common/include/periph_conf_common.h new file mode 100644 index 0000000000..5a8cb5fe35 --- /dev/null +++ b/boards/arduino-mkr-common/include/periph_conf_common.h @@ -0,0 +1,230 @@ +/* + * Copyright (C) 2016 Freie Universität Berlin + * 2017 Inria + * + * 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 + * directory for more details. + */ + +/** + * @ingroup boards_arduino-mkr-common + * @{ + * + * @file + * @brief Configuration of CPU peripherals for Arduino MKR boards + * + * @author Thomas Eichinger + * @author Hauke Petersen + * @author Peter Kietzmann + * @author Alexandre Abadie + */ + +#ifndef PERIPH_CONF_COMMON_H +#define PERIPH_CONF_COMMON_H + +#include "periph_cpu.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @name External oscillator and clock configuration + * + * For selection of the used CORECLOCK, we have implemented two choices: + * + * - usage of the PLL fed by the internal 8MHz oscillator divided by 8 + * - usage of the internal 8MHz oscillator directly, divided by N if needed + * + * + * The PLL option allows for the usage of a wider frequency range and a more + * stable clock with less jitter. This is why we use this option as default. + * + * The target frequency is computed from the PLL multiplier and the PLL divisor. + * Use the following formula to compute your values: + * + * CORECLOCK = ((PLL_MUL + 1) * 1MHz) / PLL_DIV + * + * NOTE: The PLL circuit does not run with less than 32MHz while the maximum PLL + * frequency is 96MHz. So PLL_MULL must be between 31 and 95! + * + * + * The internal Oscillator used directly can lead to a slightly better power + * efficiency to the cost of a less stable clock. Use this option when you know + * what you are doing! The actual core frequency is adjusted as follows: + * + * CORECLOCK = 8MHz / DIV + * + * NOTE: A core clock frequency below 1MHz is not recommended + * + * @{ + */ +#define CLOCK_USE_PLL (1) + +#if CLOCK_USE_PLL +/* edit these values to adjust the PLL output frequency */ +#define CLOCK_PLL_MUL (47U) /* must be >= 31 & <= 95 */ +#define CLOCK_PLL_DIV (1U) /* adjust to your needs */ +/* generate the actual used core clock frequency */ +#define CLOCK_CORECLOCK (((CLOCK_PLL_MUL + 1) * 1000000U) / CLOCK_PLL_DIV) +#else +/* edit this value to your needs */ +#define CLOCK_DIV (1U) +/* generate the actual core clock frequency */ +#define CLOCK_CORECLOCK (8000000 / CLOCK_DIV) +#endif +/** @} */ + +/** + * @name Timer peripheral configuration + * @{ + */ +#define TIMER_NUMOF (2U) +#define TIMER_0_EN 1 +#define TIMER_1_EN 1 + +/* Timer 0 configuration */ +#define TIMER_0_DEV TC3->COUNT16 +#define TIMER_0_CHANNELS 2 +#define TIMER_0_MAX_VALUE (0xffff) +#define TIMER_0_ISR isr_tc3 + +/* Timer 1 configuration */ +#define TIMER_1_DEV TC4->COUNT32 +#define TIMER_1_CHANNELS 2 +#define TIMER_1_MAX_VALUE (0xffffffff) +#define TIMER_1_ISR isr_tc4 +/** @} */ + +/** + * @name UART configuration + * @{ + */ +static const uart_conf_t uart_config[] = { + { + .dev = &SERCOM5->USART, + .rx_pin = GPIO_PIN(PB,23), + .tx_pin = GPIO_PIN(PB,22), + .mux = GPIO_MUX_D, + .rx_pad = UART_PAD_RX_3, + .tx_pad = UART_PAD_TX_2 + } +}; + +/* interrupt function name mapping */ +#define UART_0_ISR isr_sercom5 + +#define UART_NUMOF (sizeof(uart_config) / sizeof(uart_config[0])) +/** @} */ + +/** + * @name PWM configuration + * @{ + */ +#define PWM_0_EN 1 +#define PWM_1_EN 1 +#define PWM_MAX_CHANNELS 2 +/* for compatibility with test application */ +#define PWM_0_CHANNELS PWM_MAX_CHANNELS +#define PWM_1_CHANNELS PWM_MAX_CHANNELS + +/* PWM device configuration */ +static const pwm_conf_t pwm_config[] = { +#if PWM_0_EN + {TCC0, { + /* GPIO pin, MUX value, TCC channel */ + { GPIO_PIN(PA, 8), GPIO_MUX_E, 0 }, + { GPIO_PIN(PA, 9), GPIO_MUX_E, 1 }, + }}, +#endif +#if PWM_1_EN + {TCC1, { + /* GPIO pin, MUX value, TCC channel */ + { GPIO_PIN(PA, 6), GPIO_MUX_E, 0 }, + { GPIO_PIN(PA, 7), GPIO_MUX_E, 1 }, + }}, +#endif +}; + +/* number of devices that are actually defined */ +#define PWM_NUMOF (2U) +/** @} */ + +/** + * @name ADC configuration + * @{ + */ +#define ADC_CONFIG { \ + { GPIO_PIN(PA, 2), 0, 0 }, \ + { GPIO_PIN(PB, 2), 0, 2 }, \ + { GPIO_PIN(PB, 3), 0, 3 }, \ + { GPIO_PIN(PA, 4), 0, 4 }, \ + { GPIO_PIN(PA, 5), 0, 5 }, \ + { GPIO_PIN(PA, 6), 0, 10 }, \ + { GPIO_PIN(PA, 7), 0, 10 }} + +#define ADC_NUMOF (6) +/** @} */ + +/** + * @name SPI configuration + * @{ + */ +static const spi_conf_t spi_config[] = { + { + .dev = &SERCOM1->SPI, + .miso_pin = GPIO_PIN(PA, 19), + .mosi_pin = GPIO_PIN(PB, 16), + .clk_pin = GPIO_PIN(PB, 17), + .miso_mux = GPIO_MUX_D, + .mosi_mux = GPIO_MUX_D, + .clk_mux = GPIO_MUX_D, + .miso_pad = SPI_PAD_MISO_3, + .mosi_pad = SPI_PAD_MOSI_0_SCK_1 + }, + { + .dev = &SERCOM2->SPI, + .miso_pin = GPIO_PIN(PA, 15), + .mosi_pin = GPIO_PIN(PA, 12), + .clk_pin = GPIO_PIN(PA, 13), + .miso_mux = GPIO_MUX_D, + .mosi_mux = GPIO_MUX_D, + .clk_mux = GPIO_MUX_D, + .miso_pad = SPI_PAD_MISO_3, + .mosi_pad = SPI_PAD_MOSI_2_SCK_3 + } +}; + +#define SPI_NUMOF (sizeof(spi_config) / sizeof(spi_config[0])) +/** @} */ + +/** + * @name I2C configuration + * @{ + */ +#define I2C_NUMOF (1U) +#define I2C_0_EN 1 +#define I2C_1_EN 0 +#define I2C_2_EN 0 +#define I2C_3_EN 0 +#define I2C_IRQ_PRIO 1 + +#define I2C_0_DEV SERCOM0->I2CM +#define I2C_0_IRQ SERCOM0_IRQn +#define I2C_0_ISR isr_sercom0 +/* I2C 0 GCLK */ +#define I2C_0_GCLK_ID SERCOM0_GCLK_ID_CORE +#define I2C_0_GCLK_ID_SLOW SERCOM0_GCLK_ID_SLOW +/* I2C 0 pin configuration */ +#define I2C_0_SDA GPIO_PIN(PA, 8) +#define I2C_0_SCL GPIO_PIN(PA, 9) +#define I2C_0_MUX GPIO_MUX_C +/** @} */ + +#ifdef __cplusplus +} +#endif + +#endif /* PERIPH_CONF_COMMON_H */ +/** @} */