From c0ff6489e3bc53d316c95c927f01187eb2cdcfe8 Mon Sep 17 00:00:00 2001 From: Nguyen Hoan Hoang Date: Mon, 19 May 2025 10:06:43 -0400 Subject: [PATCH 1/5] Add I-SYST BLYST-NANO-DK & IBK-NRF52840 boards --- src/boards/blyst-nano-dk_nRF52832/board.h | 74 ++++++++++++++++++++++ src/boards/blyst-nano-dk_nRF52832/board.mk | 1 + src/boards/ibk-nrf52840/board.h | 65 +++++++++++++++++++ src/boards/ibk-nrf52840/board.mk | 1 + src/boards/ibk-nrf52840/pinconfig.c | 19 ++++++ 5 files changed, 160 insertions(+) create mode 100644 src/boards/blyst-nano-dk_nRF52832/board.h create mode 100644 src/boards/blyst-nano-dk_nRF52832/board.mk create mode 100644 src/boards/ibk-nrf52840/board.h create mode 100644 src/boards/ibk-nrf52840/board.mk create mode 100644 src/boards/ibk-nrf52840/pinconfig.c diff --git a/src/boards/blyst-nano-dk_nRF52832/board.h b/src/boards/blyst-nano-dk_nRF52832/board.h new file mode 100644 index 00000000..339149de --- /dev/null +++ b/src/boards/blyst-nano-dk_nRF52832/board.h @@ -0,0 +1,74 @@ +/* + * 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 _BLYST_NANO_DK_H +#define _BLYST_NANO_DK_H + +#define _PINNUM(port, pin) ((port)*32 + (pin)) + +/*------------------------------------------------------------------*/ +/* LED + *------------------------------------------------------------------*/ +#define LEDS_NUMBER 2 // LED3 +#define LED_PRIMARY_PIN _PINNUM(0, 28) // LED2 Red +#define LED_SECONDARY_PIN _PINNUM(0, 29) // LED2 Green +#define LED_STATE_ON 0 + +/*------------------------------------------------------------------*/ +/* BUTTON + *------------------------------------------------------------------*/ +#define BUTTONS_NUMBER 2 +#define BUTTON_1 _PINNUM(0, 2) // S1 switch +#define BUTTON_2 _PINNUM(0, 13) // S2 switch +#define BUTTON_PULL NRF_GPIO_PIN_PULLUP + +/*------------------------------------------------------------------*/ +/* UART (only used by nRF52832) + *------------------------------------------------------------------*/ +#define RX_PIN_NUMBER 8 +#define TX_PIN_NUMBER 7 +#define CTS_PIN_NUMBER 12 +#define RTS_PIN_NUMBER 11 +#define HWFC false // leaving it false to make GPIO available + +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ +#define BLEDIS_MANUFACTURER "I-SYST INC" +#define BLEDIS_MODEL "BLYST-NANO-DK" + +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ +#define USB_DESC_VID 0x239A +#define USB_DESC_UF2_PID 0x0063 +#define USB_DESC_CDC_ONLY_PID 0x0064 + +//------------- UF2 -------------// +#define UF2_PRODUCT_NAME "BLYST-NANO DevKit" +#define UF2_VOLUME_LABEL "BLYSTNANO_UF2BOOT" +#define UF2_BOARD_ID "BLYST-NANO" +#define UF2_INDEX_URL "https://www.i-syst.com/products/blyst-nano" + +#endif // _BLYST_NANO_DK_H diff --git a/src/boards/blyst-nano-dk_nRF52832/board.mk b/src/boards/blyst-nano-dk_nRF52832/board.mk new file mode 100644 index 00000000..882452c0 --- /dev/null +++ b/src/boards/blyst-nano-dk_nRF52832/board.mk @@ -0,0 +1 @@ +MCU_SUB_VARIANT = nrf52 diff --git a/src/boards/ibk-nrf52840/board.h b/src/boards/ibk-nrf52840/board.h new file mode 100644 index 00000000..12cf99ab --- /dev/null +++ b/src/boards/ibk-nrf52840/board.h @@ -0,0 +1,65 @@ +/* + * 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 _IBK_NRF52840_H +#define _IBK_NRF52840_H + +#define _PINNUM(port, pin) ((port)*32 + (pin)) + +/*------------------------------------------------------------------*/ +/* LED + *------------------------------------------------------------------*/ +#define LEDS_NUMBER 2 // +#define LED_PRIMARY_PIN _PINNUM(1, 9) // LED3 +#define LED_SECONDARY_PIN _PINNUM(1, 8) // LED2 +#define LED_STATE_ON 1 + +/*------------------------------------------------------------------*/ +/* BUTTON + *------------------------------------------------------------------*/ +#define BUTTONS_NUMBER 2 +#define BUTTON_1 _PINNUM(0, 13) // S1 switch +#define BUTTON_2 _PINNUM(0, 4) // S2 switch +#define BUTTON_PULL NRF_GPIO_PIN_PULLUP + +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ +#define BLEDIS_MANUFACTURER "I-SYST INC" +#define BLEDIS_MODEL "IBK-NRF52840" + +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ +#define USB_DESC_VID 0x239A +#define USB_DESC_UF2_PID 0x0063 +#define USB_DESC_CDC_ONLY_PID 0x0064 + +//------------- UF2 -------------// +#define UF2_PRODUCT_NAME "BLYST840 Breakout board" +#define UF2_VOLUME_LABEL "IBK840_UF2BOOT" +#define UF2_BOARD_ID "IBK-NRF52840" +#define UF2_INDEX_URL "https://www.i-syst.com/products/blyst840" + +#endif // _IBK_NRF52840_H diff --git a/src/boards/ibk-nrf52840/board.mk b/src/boards/ibk-nrf52840/board.mk new file mode 100644 index 00000000..9d29ac69 --- /dev/null +++ b/src/boards/ibk-nrf52840/board.mk @@ -0,0 +1 @@ +MCU_SUB_VARIANT = nrf52840 diff --git a/src/boards/ibk-nrf52840/pinconfig.c b/src/boards/ibk-nrf52840/pinconfig.c new file mode 100644 index 00000000..a983e4ab --- /dev/null +++ b/src/boards/ibk-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 */ +}; From 8e40bbaafc4d0bcd24166b72ccfb825a4e9aad35 Mon Sep 17 00:00:00 2001 From: Nguyen Hoan Hoang Date: Mon, 19 May 2025 10:14:38 -0400 Subject: [PATCH 2/5] Update board id name --- src/boards/blyst-nano-dk_nRF52832/board.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/boards/blyst-nano-dk_nRF52832/board.h b/src/boards/blyst-nano-dk_nRF52832/board.h index 339149de..ade968b8 100644 --- a/src/boards/blyst-nano-dk_nRF52832/board.h +++ b/src/boards/blyst-nano-dk_nRF52832/board.h @@ -68,7 +68,7 @@ //------------- UF2 -------------// #define UF2_PRODUCT_NAME "BLYST-NANO DevKit" #define UF2_VOLUME_LABEL "BLYSTNANO_UF2BOOT" -#define UF2_BOARD_ID "BLYST-NANO" +#define UF2_BOARD_ID "BLYST-NANO-DK" #define UF2_INDEX_URL "https://www.i-syst.com/products/blyst-nano" #endif // _BLYST_NANO_DK_H From f14a65d4169a4ff21a69daf320d996c6440927f6 Mon Sep 17 00:00:00 2001 From: Nguyen Hoan Hoang Date: Mon, 19 May 2025 10:23:25 -0400 Subject: [PATCH 3/5] Change board id naming according to microsoft uf2 format --- src/boards/blyst-nano-dk_nRF52832/board.h | 4 ++-- src/boards/ibk-nrf52840/board.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/boards/blyst-nano-dk_nRF52832/board.h b/src/boards/blyst-nano-dk_nRF52832/board.h index ade968b8..64d02a1b 100644 --- a/src/boards/blyst-nano-dk_nRF52832/board.h +++ b/src/boards/blyst-nano-dk_nRF52832/board.h @@ -67,8 +67,8 @@ //------------- UF2 -------------// #define UF2_PRODUCT_NAME "BLYST-NANO DevKit" -#define UF2_VOLUME_LABEL "BLYSTNANO_UF2BOOT" -#define UF2_BOARD_ID "BLYST-NANO-DK" +#define UF2_VOLUME_LABEL "BLYSTNANODK_UF2BOOT" +#define UF2_BOARD_ID "nRF52832-BLYST-NANO-DK-V0" #define UF2_INDEX_URL "https://www.i-syst.com/products/blyst-nano" #endif // _BLYST_NANO_DK_H diff --git a/src/boards/ibk-nrf52840/board.h b/src/boards/ibk-nrf52840/board.h index 12cf99ab..0e6e9cb4 100644 --- a/src/boards/ibk-nrf52840/board.h +++ b/src/boards/ibk-nrf52840/board.h @@ -59,7 +59,7 @@ //------------- UF2 -------------// #define UF2_PRODUCT_NAME "BLYST840 Breakout board" #define UF2_VOLUME_LABEL "IBK840_UF2BOOT" -#define UF2_BOARD_ID "IBK-NRF52840" +#define UF2_BOARD_ID "nRF52840-IBK-NRF52840-V0" #define UF2_INDEX_URL "https://www.i-syst.com/products/blyst840" #endif // _IBK_NRF52840_H From 4be6e65755f0720c1d8acb61c2838b6fc0081c79 Mon Sep 17 00:00:00 2001 From: Nguyen Hoan Hoang Date: Mon, 19 May 2025 10:30:51 -0400 Subject: [PATCH 4/5] Add IBK-BLYST-NANO breakout board --- src/boards/ibk-blyst-nano_nRF52832/board.h | 74 +++++++++++++++++++++ src/boards/ibk-blyst-nano_nRF52832/board.mk | 1 + 2 files changed, 75 insertions(+) create mode 100644 src/boards/ibk-blyst-nano_nRF52832/board.h create mode 100644 src/boards/ibk-blyst-nano_nRF52832/board.mk diff --git a/src/boards/ibk-blyst-nano_nRF52832/board.h b/src/boards/ibk-blyst-nano_nRF52832/board.h new file mode 100644 index 00000000..0c318c77 --- /dev/null +++ b/src/boards/ibk-blyst-nano_nRF52832/board.h @@ -0,0 +1,74 @@ +/* + * 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 _IBK_BLYST_NANO_H +#define _IBK_BLYST_NANO_H + +#define _PINNUM(port, pin) ((port)*32 + (pin)) + +/*------------------------------------------------------------------*/ +/* LED + *------------------------------------------------------------------*/ +#define LEDS_NUMBER 2 // LED3 +#define LED_PRIMARY_PIN _PINNUM(0, 28) // LED3 Red +#define LED_SECONDARY_PIN _PINNUM(0, 29) // LED2 Green +#define LED_STATE_ON 0 + +/*------------------------------------------------------------------*/ +/* BUTTON + *------------------------------------------------------------------*/ +#define BUTTONS_NUMBER 2 +#define BUTTON_1 _PINNUM(0, 2) // S1 switch +#define BUTTON_2 _PINNUM(0, 13) // S2 switch +#define BUTTON_PULL NRF_GPIO_PIN_PULLUP + +/*------------------------------------------------------------------*/ +/* UART (only used by nRF52832) + *------------------------------------------------------------------*/ +#define RX_PIN_NUMBER 8 +#define TX_PIN_NUMBER 7 +#define CTS_PIN_NUMBER 12 +#define RTS_PIN_NUMBER 11 +#define HWFC false // leaving it false to make GPIO available + +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ +#define BLEDIS_MANUFACTURER "I-SYST INC" +#define BLEDIS_MODEL "IBK-BLYST-NANO" + +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ +#define USB_DESC_VID 0x239A +#define USB_DESC_UF2_PID 0x0063 +#define USB_DESC_CDC_ONLY_PID 0x0064 + +//------------- UF2 -------------// +#define UF2_PRODUCT_NAME "BLYST-NANO Breakout board" +#define UF2_VOLUME_LABEL "IBK832_UF2BOOT" +#define UF2_BOARD_ID "nRF52832-IBK-BLYST-NANO-V0" +#define UF2_INDEX_URL "https://www.i-syst.com/products/blyst-nano" + +#endif // _IBK_BLYST_NANO_H diff --git a/src/boards/ibk-blyst-nano_nRF52832/board.mk b/src/boards/ibk-blyst-nano_nRF52832/board.mk new file mode 100644 index 00000000..882452c0 --- /dev/null +++ b/src/boards/ibk-blyst-nano_nRF52832/board.mk @@ -0,0 +1 @@ +MCU_SUB_VARIANT = nrf52 From 8b9cd105fdc8e344cde1b47d5e0ace4960dc0b0d Mon Sep 17 00:00:00 2001 From: Nguyen Hoan Hoang Date: Mon, 19 May 2025 11:16:42 -0400 Subject: [PATCH 5/5] Fixed volume label overflow --- src/boards/blyst-nano-dk_nRF52832/board.h | 2 +- src/boards/ibk-blyst-nano_nRF52832/board.h | 2 +- src/boards/ibk-nrf52840/board.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/boards/blyst-nano-dk_nRF52832/board.h b/src/boards/blyst-nano-dk_nRF52832/board.h index 64d02a1b..3575ee77 100644 --- a/src/boards/blyst-nano-dk_nRF52832/board.h +++ b/src/boards/blyst-nano-dk_nRF52832/board.h @@ -67,7 +67,7 @@ //------------- UF2 -------------// #define UF2_PRODUCT_NAME "BLYST-NANO DevKit" -#define UF2_VOLUME_LABEL "BLYSTNANODK_UF2BOOT" +#define UF2_VOLUME_LABEL "NANODK_UF2" #define UF2_BOARD_ID "nRF52832-BLYST-NANO-DK-V0" #define UF2_INDEX_URL "https://www.i-syst.com/products/blyst-nano" diff --git a/src/boards/ibk-blyst-nano_nRF52832/board.h b/src/boards/ibk-blyst-nano_nRF52832/board.h index 0c318c77..8152f299 100644 --- a/src/boards/ibk-blyst-nano_nRF52832/board.h +++ b/src/boards/ibk-blyst-nano_nRF52832/board.h @@ -67,7 +67,7 @@ //------------- UF2 -------------// #define UF2_PRODUCT_NAME "BLYST-NANO Breakout board" -#define UF2_VOLUME_LABEL "IBK832_UF2BOOT" +#define UF2_VOLUME_LABEL "IBK832_UF2" #define UF2_BOARD_ID "nRF52832-IBK-BLYST-NANO-V0" #define UF2_INDEX_URL "https://www.i-syst.com/products/blyst-nano" diff --git a/src/boards/ibk-nrf52840/board.h b/src/boards/ibk-nrf52840/board.h index 0e6e9cb4..3143da12 100644 --- a/src/boards/ibk-nrf52840/board.h +++ b/src/boards/ibk-nrf52840/board.h @@ -58,7 +58,7 @@ //------------- UF2 -------------// #define UF2_PRODUCT_NAME "BLYST840 Breakout board" -#define UF2_VOLUME_LABEL "IBK840_UF2BOOT" +#define UF2_VOLUME_LABEL "IBK840_UF2" #define UF2_BOARD_ID "nRF52840-IBK-NRF52840-V0" #define UF2_INDEX_URL "https://www.i-syst.com/products/blyst840"