From 9027359cec40e8d32e42153b86554b0e26ffedb9 Mon Sep 17 00:00:00 2001 From: Patrick Cook Date: Sun, 8 Sep 2024 17:11:05 -0400 Subject: [PATCH 1/5] add support for promicro/supermini nrf52 boards --- src/boards/promicro_nrf52840/board.h | 66 ++++++++++++++++++++++++ src/boards/promicro_nrf52840/board.mk | 2 + src/boards/promicro_nrf52840/pinconfig.c | 19 +++++++ 3 files changed, 87 insertions(+) create mode 100644 src/boards/promicro_nrf52840/board.h create mode 100644 src/boards/promicro_nrf52840/board.mk create mode 100644 src/boards/promicro_nrf52840/pinconfig.c diff --git a/src/boards/promicro_nrf52840/board.h b/src/boards/promicro_nrf52840/board.h new file mode 100644 index 00000000..01f882fa --- /dev/null +++ b/src/boards/promicro_nrf52840/board.h @@ -0,0 +1,66 @@ +/* + * 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 _PROMICRO_NRF52840 +#define _PROMICRO_NRF52840 + +#define _PINNUM(port, pin) ((port)*32 + (pin)) + +/*------------------------------------------------------------------*/ +/* LED + *------------------------------------------------------------------*/ +#define LEDS_NUMBER 1 +#define LED_PRIMARY_PIN _PINNUM(0, 15) +#define LED_STATE_ON 1 // State when LED is lit (active HIGH) + +#define NEOPIXELS_NUMBER 0 + +/*------------------------------------------------------------------*/ +/* BUTTON + *------------------------------------------------------------------*/ +#define BUTTONS_NUMBER 2 +#define BUTTON_1 _PINNUM(0, 14) // RESET +#define BUTTON_2 _PINNUM(0, 3) // NC +#define BUTTON_PULL NRF_GPIO_PIN_PULLUP + +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ +#define BLEDIS_MANUFACTURER "ProMicro" +#define BLEDIS_MODEL "ProMicro nRF52840" + +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ +#define USB_DESC_VID 0x1209 +#define USB_DESC_UF2_PID 0x0064 +#define USB_DESC_CDC_ONLY_PID 0x0064 + +//------------- UF2 -------------// +#define UF2_PRODUCT_NAME "ProMicro nRF52840" +#define UF2_VOLUME_LABEL "PROMICRO" +#define UF2_BOARD_ID "ProMicro-nRF52840" +#define UF2_INDEX_URL "https://github.com/joric/nrfmicro/wiki" + +#endif // _PROMICRO_NRF52840 diff --git a/src/boards/promicro_nrf52840/board.mk b/src/boards/promicro_nrf52840/board.mk new file mode 100644 index 00000000..8a77053b --- /dev/null +++ b/src/boards/promicro_nrf52840/board.mk @@ -0,0 +1,2 @@ +MCU_SUB_VARIANT = nrf52840 +SD_VERSION = 7.3.0 \ No newline at end of file diff --git a/src/boards/promicro_nrf52840/pinconfig.c b/src/boards/promicro_nrf52840/pinconfig.c new file mode 100644 index 00000000..2a592df9 --- /dev/null +++ b/src/boards/promicro_nrf52840/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, 0x100000, // FLASH_BYTES = 0x100000 + 205, 0x40000, // RAM_BYTES = 0x40000 + 208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2 + 209, 0xada52840, // UF2_FAMILY = 0xada52840 + 210, 0x20, // PINS_PORT_SIZE = PA_32 + + 0, 0, 0, 0, 0, 0, 0, 0 + /* CF2 END */ +}; \ No newline at end of file From 4786a4a251951558f30850025bb6d484c797eebe Mon Sep 17 00:00:00 2001 From: Patrick Cook Date: Sun, 8 Sep 2024 17:14:35 -0400 Subject: [PATCH 2/5] fixed board-id to conform to standards --- src/boards/promicro_nrf52840/board.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/boards/promicro_nrf52840/board.h b/src/boards/promicro_nrf52840/board.h index 01f882fa..c13b3320 100644 --- a/src/boards/promicro_nrf52840/board.h +++ b/src/boards/promicro_nrf52840/board.h @@ -59,8 +59,8 @@ //------------- UF2 -------------// #define UF2_PRODUCT_NAME "ProMicro nRF52840" -#define UF2_VOLUME_LABEL "PROMICRO" -#define UF2_BOARD_ID "ProMicro-nRF52840" +#define UF2_VOLUME_LABEL "PROMICRO-BOOT" +#define UF2_BOARD_ID "nRF52840-ProMicro-v0" #define UF2_INDEX_URL "https://github.com/joric/nrfmicro/wiki" #endif // _PROMICRO_NRF52840 From 6940c5b73ea49613bcbe2434b7261e98e885af5e Mon Sep 17 00:00:00 2001 From: Patrick Cook Date: Sun, 8 Sep 2024 18:29:19 -0400 Subject: [PATCH 3/5] rename promicro->nrfmicro --- .../{promicro_nrf52840 => nrfmicro}/board.h | 16 ++++++++-------- .../{promicro_nrf52840 => nrfmicro}/board.mk | 0 .../{promicro_nrf52840 => nrfmicro}/pinconfig.c | 0 3 files changed, 8 insertions(+), 8 deletions(-) rename src/boards/{promicro_nrf52840 => nrfmicro}/board.h (86%) rename src/boards/{promicro_nrf52840 => nrfmicro}/board.mk (100%) rename src/boards/{promicro_nrf52840 => nrfmicro}/pinconfig.c (100%) diff --git a/src/boards/promicro_nrf52840/board.h b/src/boards/nrfmicro/board.h similarity index 86% rename from src/boards/promicro_nrf52840/board.h rename to src/boards/nrfmicro/board.h index c13b3320..6f88b64b 100644 --- a/src/boards/promicro_nrf52840/board.h +++ b/src/boards/nrfmicro/board.h @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#ifndef _PROMICRO_NRF52840 -#define _PROMICRO_NRF52840 +#ifndef _NRFMICRO_NRF52840 +#define _NRFMICRO_NRF52840 #define _PINNUM(port, pin) ((port)*32 + (pin)) @@ -47,8 +47,8 @@ //--------------------------------------------------------------------+ // BLE OTA //--------------------------------------------------------------------+ -#define BLEDIS_MANUFACTURER "ProMicro" -#define BLEDIS_MODEL "ProMicro nRF52840" +#define BLEDIS_MANUFACTURER "nRFMicro" +#define BLEDIS_MODEL "nRFMicro nRF52840" //--------------------------------------------------------------------+ // USB @@ -58,9 +58,9 @@ #define USB_DESC_CDC_ONLY_PID 0x0064 //------------- UF2 -------------// -#define UF2_PRODUCT_NAME "ProMicro nRF52840" -#define UF2_VOLUME_LABEL "PROMICRO-BOOT" -#define UF2_BOARD_ID "nRF52840-ProMicro-v0" +#define UF2_PRODUCT_NAME "nRFMicro nRF52840" +#define UF2_VOLUME_LABEL "NRFMICRO-BOOT" +#define UF2_BOARD_ID "nRF52840-nRFMicro-v0" #define UF2_INDEX_URL "https://github.com/joric/nrfmicro/wiki" -#endif // _PROMICRO_NRF52840 +#endif // _NRFMICRO_NRF52840 diff --git a/src/boards/promicro_nrf52840/board.mk b/src/boards/nrfmicro/board.mk similarity index 100% rename from src/boards/promicro_nrf52840/board.mk rename to src/boards/nrfmicro/board.mk diff --git a/src/boards/promicro_nrf52840/pinconfig.c b/src/boards/nrfmicro/pinconfig.c similarity index 100% rename from src/boards/promicro_nrf52840/pinconfig.c rename to src/boards/nrfmicro/pinconfig.c From f3b3a0de40e0f89e5e4808ec53f160fc82723a97 Mon Sep 17 00:00:00 2001 From: Patrick Cook Date: Sun, 8 Sep 2024 18:31:25 -0400 Subject: [PATCH 4/5] reduced number of chars, updated potential PID --- src/boards/nrfmicro/board.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/boards/nrfmicro/board.h b/src/boards/nrfmicro/board.h index 6f88b64b..3f471498 100644 --- a/src/boards/nrfmicro/board.h +++ b/src/boards/nrfmicro/board.h @@ -54,12 +54,12 @@ // USB //--------------------------------------------------------------------+ #define USB_DESC_VID 0x1209 -#define USB_DESC_UF2_PID 0x0064 -#define USB_DESC_CDC_ONLY_PID 0x0064 +#define USB_DESC_UF2_PID 0x5284 +#define USB_DESC_CDC_ONLY_PID 0x5284 //------------- UF2 -------------// -#define UF2_PRODUCT_NAME "nRFMicro nRF52840" -#define UF2_VOLUME_LABEL "NRFMICRO-BOOT" +#define UF2_PRODUCT_NAME "nRFMicro" +#define UF2_VOLUME_LABEL "NRFMICRO" #define UF2_BOARD_ID "nRF52840-nRFMicro-v0" #define UF2_INDEX_URL "https://github.com/joric/nrfmicro/wiki" From 5a96435322d5f15dea512d9baf0180cd9939e135 Mon Sep 17 00:00:00 2001 From: Patrick Cook Date: Wed, 11 Sep 2024 23:19:40 -0400 Subject: [PATCH 5/5] commit correct file for nRFMicro --- src/boards/nrfmicro/board.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/boards/nrfmicro/board.h b/src/boards/nrfmicro/board.h index 3f471498..c6b25288 100644 --- a/src/boards/nrfmicro/board.h +++ b/src/boards/nrfmicro/board.h @@ -31,7 +31,7 @@ /* LED *------------------------------------------------------------------*/ #define LEDS_NUMBER 1 -#define LED_PRIMARY_PIN _PINNUM(0, 15) +#define LED_PRIMARY_PIN _PINNUM(1, 10) #define LED_STATE_ON 1 // State when LED is lit (active HIGH) #define NEOPIXELS_NUMBER 0 @@ -40,8 +40,8 @@ /* BUTTON *------------------------------------------------------------------*/ #define BUTTONS_NUMBER 2 -#define BUTTON_1 _PINNUM(0, 14) // RESET -#define BUTTON_2 _PINNUM(0, 3) // NC +#define BUTTON_1 _PINNUM(1, 2) // DFU +#define BUTTON_2 _PINNUM(0, 12) // FRST #define BUTTON_PULL NRF_GPIO_PIN_PULLUP //--------------------------------------------------------------------+