From 6d38a232d3c20ebd66ea1c8c797ab93dec274326 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Thu, 23 Jan 2020 17:38:06 +0100 Subject: [PATCH] boards/arduino-nano-33-ble: initial support --- boards/arduino-nano-33-ble/Makefile | 3 + boards/arduino-nano-33-ble/Makefile.dep | 17 ++++ boards/arduino-nano-33-ble/Makefile.features | 13 +++ boards/arduino-nano-33-ble/Makefile.include | 32 +++++++ boards/arduino-nano-33-ble/board.c | 41 +++++++++ boards/arduino-nano-33-ble/doc.txt | 34 +++++++ boards/arduino-nano-33-ble/include/board.h | 69 ++++++++++++++ .../arduino-nano-33-ble/include/gpio_params.h | 69 ++++++++++++++ .../arduino-nano-33-ble/include/periph_conf.h | 90 +++++++++++++++++++ boards/arduino-nano-33-ble/reset.c | 39 ++++++++ 10 files changed, 407 insertions(+) create mode 100644 boards/arduino-nano-33-ble/Makefile create mode 100644 boards/arduino-nano-33-ble/Makefile.dep create mode 100644 boards/arduino-nano-33-ble/Makefile.features create mode 100644 boards/arduino-nano-33-ble/Makefile.include create mode 100644 boards/arduino-nano-33-ble/board.c create mode 100644 boards/arduino-nano-33-ble/doc.txt create mode 100644 boards/arduino-nano-33-ble/include/board.h create mode 100644 boards/arduino-nano-33-ble/include/gpio_params.h create mode 100644 boards/arduino-nano-33-ble/include/periph_conf.h create mode 100644 boards/arduino-nano-33-ble/reset.c diff --git a/boards/arduino-nano-33-ble/Makefile b/boards/arduino-nano-33-ble/Makefile new file mode 100644 index 0000000000..f8fcbb53a0 --- /dev/null +++ b/boards/arduino-nano-33-ble/Makefile @@ -0,0 +1,3 @@ +MODULE = board + +include $(RIOTBASE)/Makefile.base diff --git a/boards/arduino-nano-33-ble/Makefile.dep b/boards/arduino-nano-33-ble/Makefile.dep new file mode 100644 index 0000000000..f13bbd3c9b --- /dev/null +++ b/boards/arduino-nano-33-ble/Makefile.dep @@ -0,0 +1,17 @@ +ifneq (,$(filter saul_default,$(USEMODULE))) + USEMODULE += saul_gpio +endif + +# use arduino-bootloader only if no other stdio_% other than stdio_cdc_acm +# is requested +ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE)))) + # Provide stdio over USB by default + USEMODULE += stdio_cdc_acm + + # This board requires support for Arduino bootloader. + FEATURES_REQUIRED += bootloader_arduino + USEMODULE += usb_board_reset +endif + +# include common nrf52 dependencies +include $(RIOTBOARD)/common/nrf52/Makefile.dep diff --git a/boards/arduino-nano-33-ble/Makefile.features b/boards/arduino-nano-33-ble/Makefile.features new file mode 100644 index 0000000000..8d495923b6 --- /dev/null +++ b/boards/arduino-nano-33-ble/Makefile.features @@ -0,0 +1,13 @@ +CPU_MODEL = nrf52840xxaa + +# Put defined MCU peripherals here (in alphabetical order) +FEATURES_PROVIDED += periph_i2c +FEATURES_PROVIDED += periph_spi +FEATURES_PROVIDED += periph_uart +FEATURES_PROVIDED += periph_usbdev + +# Various other features (if any) +FEATURES_PROVIDED += radio_nrf802154 +FEATURES_PROVIDED += bootloader_arduino + +include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/arduino-nano-33-ble/Makefile.include b/boards/arduino-nano-33-ble/Makefile.include new file mode 100644 index 0000000000..460e23b2bb --- /dev/null +++ b/boards/arduino-nano-33-ble/Makefile.include @@ -0,0 +1,32 @@ +# Bossa is the default programmer +PROGRAMMER ?= bossa + +ifeq ($(PROGRAMMER),bossa) + # The preinstalled Arduino bootloader must also be taken into account so + # ROM_OFFSET skips the space taken by such bootloader. + ROM_OFFSET ?= 0x10000 + + # This board requires a BOSSA version from arduino's fork and adapted to + # nrf52. + BOSSA_VERSION = nrf52 + BOSSA_ARDUINO_PREFLASH = yes + PREFLASH_DELAY = 1 + + ifneq (,$(filter reset flash flash-only, $(MAKECMDGOALS))) + # Add 2 seconds delay before opening terminal: this is required when opening + # the terminal right after flashing. In this case, the stdio over USB needs + # some time after reset before being ready. + TERM_DELAY = 2 + TERMDEPS += term-delay + endif + + include $(RIOTMAKE)/tools/bossa.inc.mk +endif + +term-delay: + sleep $(TERM_DELAY) + +TESTRUNNER_CONNECT_DELAY ?= 2 +$(call target-export-variables,test,TESTRUNNER_CONNECT_DELAY) + +include $(RIOTBOARD)/common/nrf52/Makefile.include diff --git a/boards/arduino-nano-33-ble/board.c b/boards/arduino-nano-33-ble/board.c new file mode 100644 index 0000000000..20cfa6e11d --- /dev/null +++ b/boards/arduino-nano-33-ble/board.c @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2020 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-nano-33-ble + * @{ + * + * @file + * @brief Board initialization for the Arduino Nano 33 BLE + * + * @author Alexandre Abadie + * + * @} + */ + +#include "cpu.h" +#include "board.h" + +#include "periph/gpio.h" + +void board_init(void) +{ + /* initialize the CPU */ + cpu_init(); + + /* initialize the boards LEDs */ + gpio_init(LED0_PIN, GPIO_OUT); /* Orange LED */ + gpio_init(LED1_PIN, GPIO_OUT); /* Red LED */ + gpio_set(LED1_PIN); + gpio_init(LED2_PIN, GPIO_OUT); /* Green LED */ + gpio_set(LED2_PIN); + gpio_init(LED3_PIN, GPIO_OUT); /* Blue LED */ + gpio_set(LED3_PIN); + gpio_init(LED4_PIN, GPIO_OUT); /* PWR LED */ + gpio_clear(LED4_PIN); +} diff --git a/boards/arduino-nano-33-ble/doc.txt b/boards/arduino-nano-33-ble/doc.txt new file mode 100644 index 0000000000..e6a10deb89 --- /dev/null +++ b/boards/arduino-nano-33-ble/doc.txt @@ -0,0 +1,34 @@ +/** +@defgroup boards_arduino-nano-33-ble Arduino Nano 33 BLE +@ingroup boards +@brief Support for the Arduino Nano 33 BLE + +### General information + +The [Arduino Nano 33 BLE](https://store.arduino.cc/arduino-nano-33-ble) board +is an opensource, micro development kit using the nRF52840 SoC. +This board provides 802.15.4 and BLE connectivity. + +### Pinout + +pinout + +### Flash the board + +Use `BOARD=arduino-nano-33-ble` with the `make` command.
+Example with `hello-world` application: +``` + make BOARD=arduino-nano-33-ble -C examples/hello-world flash +``` + +### Accessing STDIO via UART + +The STDIO is directly accessible via the USB port. On a Linux host, it's +generally mapped to `/dev/ttyACM0`. + +Use the `term` target to connect to the board serial port
+``` + make BOARD=arduino-nano-33-ble -C examples/hello-world term +``` + */ diff --git a/boards/arduino-nano-33-ble/include/board.h b/boards/arduino-nano-33-ble/include/board.h new file mode 100644 index 0000000000..a02bd3e873 --- /dev/null +++ b/boards/arduino-nano-33-ble/include/board.h @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2020 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-nano-33-ble + * @{ + * + * @file + * @brief Board specific configuration for the Arduino Nano 33 BLE + * + * @author Alexandre Abadie + */ + +#ifndef BOARD_H +#define BOARD_H + +#include "cpu.h" +#include "board_common.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @name LEDs pin configuration + * @{ + */ +#define LED0_PIN GPIO_PIN(0, 13) +#define LED0_MASK (1 << 13) +#define LED0_ON (NRF_P0->OUTCLR = LED0_MASK) +#define LED0_OFF (NRF_P0->OUTSET = LED0_MASK) +#define LED0_TOGGLE (NRF_P0->OUT ^= LED0_MASK) + +#define LED1_PIN GPIO_PIN(0, 24) +#define LED1_MASK (1 << 24) +#define LED1_ON (NRF_P0->OUTCLR = LED1_MASK) +#define LED1_OFF (NRF_P0->OUTSET = LED1_MASK) +#define LED1_TOGGLE (NRF_P0->OUT ^= LED1_MASK) + +#define LED2_PIN GPIO_PIN(0, 16) +#define LED2_MASK (1 << 16) +#define LED2_ON (NRF_P0->OUTCLR = LED2_MASK) +#define LED2_OFF (NRF_P0->OUTSET = LED2_MASK) +#define LED2_TOGGLE (NRF_P0->OUT ^= LED2_MASK) + +#define LED3_PIN GPIO_PIN(0, 6) +#define LED3_MASK (1 << 6) +#define LED3_ON (NRF_P0->OUTCLR = LED3_MASK) +#define LED3_OFF (NRF_P0->OUTSET = LED3_MASK) +#define LED3_TOGGLE (NRF_P0->OUT ^= LED3_MASK) + +#define LED4_PIN GPIO_PIN(1, 9) +#define LED4_MASK (1 << 9) +#define LED4_ON (NRF_P1->OUTCLR = LED4_MASK) +#define LED4_OFF (NRF_P1->OUTSET = LED4_MASK) +#define LED4_TOGGLE (NRF_P1->OUT ^= LED4_MASK) +/** @} */ + +#ifdef __cplusplus +} +#endif + +#endif /* BOARD_H */ +/** @} */ diff --git a/boards/arduino-nano-33-ble/include/gpio_params.h b/boards/arduino-nano-33-ble/include/gpio_params.h new file mode 100644 index 0000000000..3ee2a13f41 --- /dev/null +++ b/boards/arduino-nano-33-ble/include/gpio_params.h @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2020 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-nano-33-ble + * @{ + * + * @file + * @brief Configuration of SAUL mapped GPIO pins + * + * @author Alexandre Abadie + */ + +#ifndef GPIO_PARAMS_H +#define GPIO_PARAMS_H + +#include "board.h" +#include "saul/periph.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief LED configuration + */ +static const saul_gpio_params_t saul_gpio_params[] = +{ + { + .name = "LED0 (Orange)", + .pin = LED0_PIN, + .mode = GPIO_OUT, + }, + { + .name = "LED1 (RED)", + .pin = LED1_PIN, + .mode = GPIO_OUT, + .flags = (SAUL_GPIO_INVERTED | SAUL_GPIO_INIT_CLEAR), + }, + { + .name = "LED2 (GREEN)", + .pin = LED2_PIN, + .mode = GPIO_OUT, + .flags = (SAUL_GPIO_INVERTED | SAUL_GPIO_INIT_CLEAR), + }, + { + .name = "LED3 (BLUE)", + .pin = LED3_PIN, + .mode = GPIO_OUT, + .flags = (SAUL_GPIO_INVERTED | SAUL_GPIO_INIT_CLEAR), + }, + { + .name = "LED4 (PWR)", + .pin = LED4_PIN, + .mode = GPIO_OUT, + }, +}; + +#ifdef __cplusplus +} +#endif + +#endif /* GPIO_PARAMS_H */ +/** @} */ diff --git a/boards/arduino-nano-33-ble/include/periph_conf.h b/boards/arduino-nano-33-ble/include/periph_conf.h new file mode 100644 index 0000000000..3ec669150a --- /dev/null +++ b/boards/arduino-nano-33-ble/include/periph_conf.h @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2020 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-nano-33-ble + * @{ + * + * @file + * @brief Peripheral configuration for the Arduino Nano 33 BLE + * + * @author Alexandre Abadie + * + */ + +#ifndef PERIPH_CONF_H +#define PERIPH_CONF_H + +#include "periph_cpu.h" +#include "cfg_clock_32_1.h" +#include "cfg_rtt_default.h" +#include "cfg_timer_default.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @name UART configuration + * @{ + */ +static const uart_conf_t uart_config[] = { + { + .dev = NRF_UARTE0, + .rx_pin = GPIO_PIN(1, 10), + .tx_pin = GPIO_PIN(1, 3), +#ifdef MODULE_PERIPH_UART_HW_FC + .rts_pin = GPIO_UNDEF, + .cts_pin = GPIO_UNDEF, +#endif + .irqn = UARTE0_UART0_IRQn, + }, +}; + +#define UART_0_ISR (isr_uart0) + +#define UART_NUMOF ARRAY_SIZE(uart_config) +/** @} */ + +/** + * @name I2C configuration + * @{ + */ +static const i2c_conf_t i2c_config[] = { + { + .dev = NRF_TWIM0, + .scl = GPIO_PIN(0, 2), + .sda = GPIO_PIN(0, 31), + .speed = I2C_SPEED_NORMAL + }, +}; + +#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0])) +/** @} */ + +/** + * @name SPI configuration + * @{ + */ +static const spi_conf_t spi_config[] = { + { + .dev = NRF_SPI0, + .sclk = GPIO_PIN(0, 13), + .mosi = GPIO_PIN(1, 1), + .miso = GPIO_PIN(1, 8), + } +}; + +#define SPI_NUMOF ARRAY_SIZE(spi_config) +/** @} */ + +#ifdef __cplusplus +} +#endif + +#endif /* PERIPH_CONF_H */ diff --git a/boards/arduino-nano-33-ble/reset.c b/boards/arduino-nano-33-ble/reset.c new file mode 100644 index 0000000000..4773410c0c --- /dev/null +++ b/boards/arduino-nano-33-ble/reset.c @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2020 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-nano-33-ble + * @{ + * @file + * @brief Implementation for managing the Arduino bootloader + * + * @author Alexandre Abadie + * + * @} + */ + +#ifdef MODULE_USB_BOARD_RESET + +#define USB_H_USER_IS_RIOT_INTERNAL + +#include "usb_board_reset.h" + +/* Set the value used by the bootloader to select between boot in + application and boot in bootloader mode. */ +#define NRF52_DOUBLE_TAP_MAGIC_NUMBER (0xb0) + +void usb_board_reset_in_bootloader(void) +{ + NRF_POWER->GPREGRET = NRF52_DOUBLE_TAP_MAGIC_NUMBER; + + usb_board_reset_in_application(); +} + +#else +typedef int dont_be_pedantic; +#endif /* MODULE_USB_BOARD_RESET */