Merge pull request #2244 from dhalbert/itsybitsy_nrf52840_express
Initial Itsy nRF52840 defn
This commit is contained in:
commit
1103490223
|
@ -110,6 +110,7 @@ jobs:
|
|||
- "hallowing_m4_express"
|
||||
- "itsybitsy_m0_express"
|
||||
- "itsybitsy_m4_express"
|
||||
- "itsybitsy_nrf52840_express"
|
||||
- "kicksat-sprite"
|
||||
- "makerdiary_nrf52840_mdk"
|
||||
- "makerdiary_nrf52840_mdk_usb_dongle"
|
||||
|
|
|
@ -0,0 +1,38 @@
|
|||
/*
|
||||
* This file is part of the MicroPython project, http://micropython.org/
|
||||
*
|
||||
* The MIT License (MIT)
|
||||
*
|
||||
* Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "boards/board.h"
|
||||
|
||||
void board_init(void) {
|
||||
}
|
||||
|
||||
bool board_requests_safe_mode(void) {
|
||||
return false;
|
||||
}
|
||||
|
||||
void reset_board(void) {
|
||||
|
||||
}
|
|
@ -0,0 +1,47 @@
|
|||
#include "nrfx/hal/nrf_gpio.h"
|
||||
|
||||
#define MICROPY_HW_BOARD_NAME "Adafruit ItsyBitsy nRF52840 Express"
|
||||
#define MICROPY_HW_MCU_NAME "nRF52840"
|
||||
#define MICROPY_PY_SYS_PLATFORM "ItsyBitsy52840Express"
|
||||
|
||||
#define FLASH_SIZE (0x100000)
|
||||
#define FLASH_PAGE_SIZE (4096)
|
||||
|
||||
#define MICROPY_HW_LED_STATUS (&pin_P0_06)
|
||||
|
||||
#define MICROPY_HW_APA102_MOSI (&pin_P0_08)
|
||||
#define MICROPY_HW_APA102_SCK (&pin_P1_09)
|
||||
|
||||
#if QSPI_FLASH_FILESYSTEM
|
||||
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(0, 21)
|
||||
#define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(0, 22)
|
||||
#define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(1, 00)
|
||||
#define MICROPY_QSPI_DATA3 NRF_GPIO_PIN_MAP(0, 17)
|
||||
#define MICROPY_QSPI_SCK NRF_GPIO_PIN_MAP(0, 19)
|
||||
#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(0, 23)
|
||||
#endif
|
||||
|
||||
#if SPI_FLASH_FILESYSTEM
|
||||
#define SPI_FLASH_MOSI_PIN &pin_P0_21
|
||||
#define SPI_FLASH_MISO_PIN &pin_P0_22
|
||||
#define SPI_FLASH_SCK_PIN &pin_P0_19
|
||||
#define SPI_FLASH_CS_PIN &pin_P0_23
|
||||
#endif
|
||||
|
||||
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
|
||||
|
||||
#define CIRCUITPY_INTERNAL_NVM_SIZE (4096)
|
||||
|
||||
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
|
||||
|
||||
#define BOARD_HAS_CRYSTAL 1
|
||||
|
||||
#define DEFAULT_I2C_BUS_SCL (&pin_P0_14)
|
||||
#define DEFAULT_I2C_BUS_SDA (&pin_P0_16)
|
||||
|
||||
#define DEFAULT_SPI_BUS_SCK (&pin_P0_13)
|
||||
#define DEFAULT_SPI_BUS_MOSI (&pin_P0_15)
|
||||
#define DEFAULT_SPI_BUS_MISO (&pin_P0_20)
|
||||
|
||||
#define DEFAULT_UART_BUS_RX (&pin_P0_25)
|
||||
#define DEFAULT_UART_BUS_TX (&pin_P0_24)
|
|
@ -0,0 +1,29 @@
|
|||
USB_VID = 0x239A
|
||||
USB_PID = 0x8052
|
||||
USB_PRODUCT = "ItsyBitsy nRF52840 Express"
|
||||
USB_MANUFACTURER = "Adafruit Industries LLC"
|
||||
|
||||
MCU_SERIES = m4
|
||||
MCU_VARIANT = nrf52
|
||||
MCU_SUB_VARIANT = nrf52840
|
||||
MCU_CHIP = nrf52840
|
||||
SD ?= s140
|
||||
SOFTDEV_VERSION ?= 6.1.0
|
||||
|
||||
BOOT_SETTING_ADDR = 0xFF000
|
||||
|
||||
ifeq ($(SD),)
|
||||
LD_FILE = boards/nrf52840_1M_256k.ld
|
||||
else
|
||||
LD_FILE = boards/adafruit_$(MCU_SUB_VARIANT)_$(SD_LOWER)_v$(firstword $(subst ., ,$(SOFTDEV_VERSION))).ld
|
||||
CIRCUITPY_BLEIO = 1
|
||||
endif
|
||||
|
||||
NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
|
||||
|
||||
# Don't use up a hardware SPI peripheral for the status DotStar: we only have one or two.
|
||||
CIRCUITPY_BITBANG_APA102 = 1
|
||||
|
||||
QSPI_FLASH_FILESYSTEM = 1
|
||||
EXTERNAL_FLASH_DEVICE_COUNT = 1
|
||||
EXTERNAL_FLASH_DEVICES = "GD25Q16C"
|
|
@ -0,0 +1,46 @@
|
|||
#include "shared-bindings/board/__init__.h"
|
||||
|
||||
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
|
||||
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_04) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_P0_30) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_P0_28) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_P0_31) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_P0_02) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_P0_03) },
|
||||
|
||||
{ MP_ROM_QSTR(MP_QSTR_SWITCH), MP_ROM_PTR(&pin_P0_29) },
|
||||
|
||||
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_P0_25) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_P0_25) },
|
||||
|
||||
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_P0_24) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_P0_24) },
|
||||
|
||||
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_P1_02) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_P0_27) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_P1_08) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_P0_07) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_P0_05) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_P0_26) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_P0_11) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_P0_12) },
|
||||
|
||||
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_P0_14) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_P0_16) },
|
||||
|
||||
{ MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_P0_08) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_P1_09) },
|
||||
|
||||
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_P0_13) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_P0_15) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_P0_20) },
|
||||
|
||||
{ MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_P0_06) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_BLUE_LED), MP_ROM_PTR(&pin_P0_06) },
|
||||
|
||||
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
|
||||
};
|
||||
|
||||
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
|
|
@ -91,8 +91,8 @@ void reset_pin_number(uint8_t pin_number) {
|
|||
}
|
||||
#endif
|
||||
#ifdef MICROPY_HW_APA102_MOSI
|
||||
if (pin == MICROPY_HW_APA102_MOSI->number ||
|
||||
pin == MICROPY_HW_APA102_SCK->number) {
|
||||
if (pin_number == MICROPY_HW_APA102_MOSI->number ||
|
||||
pin_number == MICROPY_HW_APA102_SCK->number) {
|
||||
apa102_mosi_in_use = apa102_mosi_in_use && pin_number != MICROPY_HW_APA102_MOSI->number;
|
||||
apa102_sck_in_use = apa102_sck_in_use && pin_number != MICROPY_HW_APA102_SCK->number;
|
||||
if (!apa102_sck_in_use && !apa102_mosi_in_use) {
|
||||
|
|
|
@ -43,6 +43,8 @@ void shared_module_bitbangio_spi_construct(bitbangio_spi_obj_t *self,
|
|||
if (result != DIGITALINOUT_OK) {
|
||||
mp_raise_ValueError(translate("Clock pin init failed."));
|
||||
}
|
||||
common_hal_digitalio_digitalinout_switch_to_output(&self->clock, self->polarity == 1, DRIVE_MODE_PUSH_PULL);
|
||||
|
||||
if (mosi != mp_const_none) {
|
||||
result = common_hal_digitalio_digitalinout_construct(&self->mosi, mosi);
|
||||
if (result != DIGITALINOUT_OK) {
|
||||
|
@ -50,8 +52,11 @@ void shared_module_bitbangio_spi_construct(bitbangio_spi_obj_t *self,
|
|||
mp_raise_ValueError(translate("MOSI pin init failed."));
|
||||
}
|
||||
self->has_mosi = true;
|
||||
common_hal_digitalio_digitalinout_switch_to_output(&self->mosi, false, DRIVE_MODE_PUSH_PULL);
|
||||
}
|
||||
|
||||
if (miso != mp_const_none) {
|
||||
// Starts out as input by default, no need to change.
|
||||
result = common_hal_digitalio_digitalinout_construct(&self->miso, miso);
|
||||
if (result != DIGITALINOUT_OK) {
|
||||
common_hal_digitalio_digitalinout_deinit(&self->clock);
|
||||
|
|
|
@ -46,10 +46,18 @@ static uint8_t status_apa102_color[APA102_BUFFER_LENGTH] = {0, 0, 0, 0, 0xff, 0,
|
|||
#if CIRCUITPY_BITBANG_APA102
|
||||
#include "shared-bindings/bitbangio/SPI.h"
|
||||
#include "shared-module/bitbangio/types.h"
|
||||
static bitbangio_spi_obj_t status_apa102;
|
||||
static bitbangio_spi_obj_t status_apa102 = {
|
||||
.base = {
|
||||
.type = &bitbangio_spi_type,
|
||||
},
|
||||
};
|
||||
#else
|
||||
#include "shared-bindings/busio/SPI.h"
|
||||
busio_spi_obj_t status_apa102;
|
||||
busio_spi_obj_t status_apa102 = {
|
||||
.base = {
|
||||
.type = &busio_spi_type,
|
||||
},
|
||||
};
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
@ -59,9 +67,21 @@ busio_spi_obj_t status_apa102;
|
|||
#include "shared-bindings/pulseio/PWMOut.h"
|
||||
#include "shared-bindings/microcontroller/Pin.h"
|
||||
|
||||
pulseio_pwmout_obj_t rgb_status_r;
|
||||
pulseio_pwmout_obj_t rgb_status_g;
|
||||
pulseio_pwmout_obj_t rgb_status_b;
|
||||
pulseio_pwmout_obj_t rgb_status_r = {
|
||||
.base = {
|
||||
.type = &pulseio_pwmout_type,
|
||||
},
|
||||
};
|
||||
pulseio_pwmout_obj_t rgb_status_g = {
|
||||
.base = {
|
||||
.type = &pulseio_pwmout_type,
|
||||
},
|
||||
};
|
||||
pulseio_pwmout_obj_t rgb_status_b = {
|
||||
.base = {
|
||||
.type = &pulseio_pwmout_type,
|
||||
},
|
||||
};
|
||||
|
||||
uint8_t rgb_status_brightness = 0xFF;
|
||||
|
||||
|
@ -74,8 +94,14 @@ uint16_t status_rgb_color[3] = {
|
|||
static uint32_t current_status_color = 0;
|
||||
#endif
|
||||
|
||||
|
||||
static bool rgb_led_status_init_in_progress = false;
|
||||
void rgb_led_status_init() {
|
||||
if (rgb_led_status_init_in_progress) {
|
||||
// Avoid recursion.
|
||||
return;
|
||||
}
|
||||
rgb_led_status_init_in_progress = true;
|
||||
|
||||
#ifdef MICROPY_HW_NEOPIXEL
|
||||
common_hal_digitalio_digitalinout_construct(&status_neopixel, MICROPY_HW_NEOPIXEL);
|
||||
// Pretend we aren't using the pins. digitalio.DigitalInOut
|
||||
|
@ -91,15 +117,15 @@ void rgb_led_status_init() {
|
|||
mp_const_none);
|
||||
#else
|
||||
if (!common_hal_busio_spi_deinited(&status_apa102)) {
|
||||
// Don't use spi_deinit because that leads to infinite
|
||||
// recursion because reset_pin_number may call
|
||||
// rgb_led_status_init.
|
||||
spi_m_sync_disable(&status_apa102.spi_desc);
|
||||
// This may call us recursively if reset_pin_number() is called,
|
||||
// The rgb_led_status_init_in_progress guard will prevent further recursion.
|
||||
common_hal_busio_spi_deinit(&status_apa102);
|
||||
}
|
||||
common_hal_busio_spi_construct(&status_apa102,
|
||||
MICROPY_HW_APA102_SCK,
|
||||
MICROPY_HW_APA102_MOSI,
|
||||
mp_const_none);
|
||||
common_hal_busio_spi_never_reset(&status_apa102);
|
||||
#endif
|
||||
// Pretend we aren't using the pins. bitbangio.SPI will
|
||||
// mark them as used.
|
||||
|
@ -149,6 +175,8 @@ void rgb_led_status_init() {
|
|||
current_status_color = 0x1000000; // Not a valid color
|
||||
new_status_color(rgb);
|
||||
#endif
|
||||
|
||||
rgb_led_status_init_in_progress = false;
|
||||
}
|
||||
|
||||
void reset_status_led() {
|
||||
|
|
Loading…
Reference in New Issue