From dbeaafa7b509b50f497f7d2e751aaa5bfcae19ea Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 13 Jul 2022 01:04:54 +0700 Subject: [PATCH] added feather 833 --- .github/workflows/githubci.yml | 1 + Makefile | 3 +- linker/nrf52833.ld | 9 ++- src/boards/feather_nrf52833_express/board.h | 69 +++++++++++++++++++ src/boards/feather_nrf52833_express/board.mk | 2 + .../feather_nrf52833_express/pinconfig.c | 19 +++++ src/boards/feather_nrf52840_express/board.h | 2 +- 7 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 src/boards/feather_nrf52833_express/board.h create mode 100644 src/boards/feather_nrf52833_express/board.mk create mode 100644 src/boards/feather_nrf52833_express/pinconfig.c diff --git a/.github/workflows/githubci.yml b/.github/workflows/githubci.yml index 338c5ccb..7644c7c8 100644 --- a/.github/workflows/githubci.yml +++ b/.github/workflows/githubci.yml @@ -19,6 +19,7 @@ jobs: - 'circuitplayground_nrf52840' - 'clue_nrf52840' - 'feather_nrf52832' + - 'feather_nrf52833_express' - 'feather_nrf52840_express' - 'feather_nrf52840_sense' - 'itsybitsy_nrf52840_express' diff --git a/Makefile b/Makefile index d680e6bd..63d5556d 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,9 @@ TUSB_PATH = lib/tinyusb/src NRFX_PATH = lib/nrfx SD_PATH = lib/softdevice/$(SD_FILENAME) +# SD_VERSION can be overwritten by board.mk ifndef SD_VERSION - SD_VERSION = 6.1.1 +SD_VERSION = 6.1.1 endif SD_FILENAME = $(SD_NAME)_nrf52_$(SD_VERSION) diff --git a/linker/nrf52833.ld b/linker/nrf52833.ld index 46a23dca..49d8350f 100644 --- a/linker/nrf52833.ld +++ b/linker/nrf52833.ld @@ -11,7 +11,9 @@ MEMORY * those values do not match. The check is performed in main.c, see * APP_ERROR_CHECK_BOOL(*((uint32_t *)NRF_UICR_BOOT_START_ADDRESS) == BOOTLOADER_REGION_START); */ - FLASH (rx) : ORIGIN = 0x74000, LENGTH = 0x7E000-0x74000 /* 40 KB */ + FLASH (rx) : ORIGIN = 0x74000, LENGTH = 0x7E000-0x74000-2K /* 38 KB */ + + BOOTLOADER_CONFIG (r): ORIGIN = 0x7E000 - 2K, LENGTH = 2K /** Location of mbr params page in flash. */ MBR_PARAMS_PAGE (rw) : ORIGIN = 0x0007E000, LENGTH = 0x1000 @@ -50,6 +52,11 @@ SECTIONS PROVIDE( __stop_fs_data = .); } = 0 + .bootloaderConfig : + { + KEEP(*(.bootloaderConfig)) + } > BOOTLOADER_CONFIG + /* Place the bootloader settings page in flash. */ .bootloaderSettings(NOLOAD) : { diff --git a/src/boards/feather_nrf52833_express/board.h b/src/boards/feather_nrf52833_express/board.h new file mode 100644 index 00000000..af0e1ec4 --- /dev/null +++ b/src/boards/feather_nrf52833_express/board.h @@ -0,0 +1,69 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2018 Ha Thach 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. + */ + +#ifndef _FEATHER_NRF52833_H +#define _FEATHER_NRF52833_H + +#define _PINNUM(port, pin) ((port)*32 + (pin)) + +/*------------------------------------------------------------------*/ +/* LED + *------------------------------------------------------------------*/ +#define LEDS_NUMBER 2 +#define LED_PRIMARY_PIN _PINNUM(1, 15) +#define LED_SECONDARY_PIN _PINNUM(1, 10) +#define LED_STATE_ON 1 + +#define LED_NEOPIXEL _PINNUM(0, 16) +#define NEOPIXELS_NUMBER 1 +#define BOARD_RGB_BRIGHTNESS 0x040404 + +/*------------------------------------------------------------------*/ +/* BUTTON + *------------------------------------------------------------------*/ +#define BUTTONS_NUMBER 2 +#define BUTTON_1 _PINNUM(1, 02) +#define BUTTON_2 _PINNUM(0, 10) +#define BUTTON_PULL NRF_GPIO_PIN_PULLUP + +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ +#define BLEDIS_MANUFACTURER "Adafruit Industries" +#define BLEDIS_MODEL "Feather nRF52833 Express" + +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ +#define USB_DESC_VID 0x239A +#define USB_DESC_UF2_PID 0x0029 // TODO change later +#define USB_DESC_CDC_ONLY_PID 0x002A // TODO change later + +//------------- UF2 -------------// +#define UF2_PRODUCT_NAME "Adafruit Feather nRF52833 Express" +#define UF2_VOLUME_LABEL "FTHR833BOOT" +#define UF2_BOARD_ID "nRF52833-Feather-revD" +#define UF2_INDEX_URL "https://www.adafruit.com/product/4062" // TODO change later + +#endif diff --git a/src/boards/feather_nrf52833_express/board.mk b/src/boards/feather_nrf52833_express/board.mk new file mode 100644 index 00000000..3c43fdfc --- /dev/null +++ b/src/boards/feather_nrf52833_express/board.mk @@ -0,0 +1,2 @@ +MCU_SUB_VARIANT = nrf52833 +SD_VERSION = 7.2.0 \ No newline at end of file diff --git a/src/boards/feather_nrf52833_express/pinconfig.c b/src/boards/feather_nrf52833_express/pinconfig.c new file mode 100644 index 00000000..72308c4a --- /dev/null +++ b/src/boards/feather_nrf52833_express/pinconfig.c @@ -0,0 +1,19 @@ +#include "boards.h" +#include "uf2/configkeys.h" + +__attribute__((used, section(".bootloaderConfig"))) +const uint32_t bootloaderConfig[] = +{ + /* CF2 START */ + CFG_MAGIC0, CFG_MAGIC1, // magic + 5, 100, // used entries, total entries + + 204, 0x80000, // FLASH_BYTES + 205, 0x20000, // RAM_BYTES + 208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2 + 209, 0x621e937a, // UF2_FAMILY + 210, 0x20, // PINS_PORT_SIZE = PA_32 + + 0, 0, 0, 0, 0, 0, 0, 0 + /* CF2 END */ +}; diff --git a/src/boards/feather_nrf52840_express/board.h b/src/boards/feather_nrf52840_express/board.h index 2477ea4e..3be5593b 100644 --- a/src/boards/feather_nrf52840_express/board.h +++ b/src/boards/feather_nrf52840_express/board.h @@ -35,7 +35,7 @@ #define LED_SECONDARY_PIN _PINNUM(1, 10) #define LED_STATE_ON 1 -#define LED_NEOPIXEL _PINNUM(0, 16) +#define LED_NEOPIXEL _PINNUM(0, 16) #define NEOPIXELS_NUMBER 1 #define BOARD_RGB_BRIGHTNESS 0x040404