From 758a9f969354cfe3edbf334c0705d063a8afcd11 Mon Sep 17 00:00:00 2001 From: kbladewht Date: Fri, 16 Aug 2024 22:45:41 +0800 Subject: [PATCH 1/4] add feather_nrf52833_pivot board boot loader --- src/boards/feather_nrf52833_pivot/board.h | 69 +++++++++++++++++++ src/boards/feather_nrf52833_pivot/board.mk | 1 + src/boards/feather_nrf52833_pivot/pinconfig.c | 19 +++++ 3 files changed, 89 insertions(+) create mode 100644 src/boards/feather_nrf52833_pivot/board.h create mode 100644 src/boards/feather_nrf52833_pivot/board.mk create mode 100644 src/boards/feather_nrf52833_pivot/pinconfig.c diff --git a/src/boards/feather_nrf52833_pivot/board.h b/src/boards/feather_nrf52833_pivot/board.h new file mode 100644 index 00000000..07b5d2e2 --- /dev/null +++ b/src/boards/feather_nrf52833_pivot/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 "Adafruit PIVOT BOOT" + +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ +#define USB_DESC_VID 0x259A +#define USB_DESC_UF2_PID 0x0833 // TODO change later +#define USB_DESC_CDC_ONLY_PID 0x003A // TODO change later + +//------------- UF2 -------------// +#define UF2_PRODUCT_NAME "Adafruit nRF52833 PIVOT" +#define UF2_VOLUME_LABEL "PIVOT_BOOT" +#define UF2_BOARD_ID "PIVOT_BOOT-revD" +#define UF2_INDEX_URL "https://www.adafruit.com/product/4062" // TODO change later + +#endif diff --git a/src/boards/feather_nrf52833_pivot/board.mk b/src/boards/feather_nrf52833_pivot/board.mk new file mode 100644 index 00000000..d60ac481 --- /dev/null +++ b/src/boards/feather_nrf52833_pivot/board.mk @@ -0,0 +1 @@ +MCU_SUB_VARIANT = nrf52833 diff --git a/src/boards/feather_nrf52833_pivot/pinconfig.c b/src/boards/feather_nrf52833_pivot/pinconfig.c new file mode 100644 index 00000000..72308c4a --- /dev/null +++ b/src/boards/feather_nrf52833_pivot/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 */ +}; From 916531c72d462686b76674c57f22e6b08b92b8ef Mon Sep 17 00:00:00 2001 From: kbladewht Date: Fri, 6 Sep 2024 16:41:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20board.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit correct board name to pivot only ,this is a boot for keyboard firmware update purpose --- src/boards/feather_nrf52833_pivot/board.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/boards/feather_nrf52833_pivot/board.h b/src/boards/feather_nrf52833_pivot/board.h index 07b5d2e2..23cf4641 100644 --- a/src/boards/feather_nrf52833_pivot/board.h +++ b/src/boards/feather_nrf52833_pivot/board.h @@ -50,8 +50,8 @@ //--------------------------------------------------------------------+ // BLE OTA //--------------------------------------------------------------------+ -#define BLEDIS_MANUFACTURER "Adafruit Industries" -#define BLEDIS_MODEL "Adafruit PIVOT BOOT" +#define BLEDIS_MANUFACTURER "PIVOT Industries" +#define BLEDIS_MODEL "PIVOT BOOT" //--------------------------------------------------------------------+ // USB @@ -61,9 +61,8 @@ #define USB_DESC_CDC_ONLY_PID 0x003A // TODO change later //------------- UF2 -------------// -#define UF2_PRODUCT_NAME "Adafruit nRF52833 PIVOT" +#define UF2_PRODUCT_NAME "nrf52833 boot PIVOT" #define UF2_VOLUME_LABEL "PIVOT_BOOT" #define UF2_BOARD_ID "PIVOT_BOOT-revD" -#define UF2_INDEX_URL "https://www.adafruit.com/product/4062" // TODO change later #endif From 2dc4359d789488aad7677801cb90338d440f2f85 Mon Sep 17 00:00:00 2001 From: kbladewht Date: Fri, 6 Sep 2024 16:54:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20board.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/boards/feather_nrf52833_pivot/board.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/boards/feather_nrf52833_pivot/board.h b/src/boards/feather_nrf52833_pivot/board.h index 23cf4641..63d11fa6 100644 --- a/src/boards/feather_nrf52833_pivot/board.h +++ b/src/boards/feather_nrf52833_pivot/board.h @@ -65,4 +65,3 @@ #define UF2_VOLUME_LABEL "PIVOT_BOOT" #define UF2_BOARD_ID "PIVOT_BOOT-revD" -#endif From 750465f79239e20566b14a78bc79b3dd34c2c2d2 Mon Sep 17 00:00:00 2001 From: kbladewht Date: Fri, 6 Sep 2024 19:40:28 +0800 Subject: [PATCH 4/4] adjust board name to pivot --- src/boards/{feather_nrf52833_pivot => pivot_nrf52833}/board.h | 3 +++ src/boards/{feather_nrf52833_pivot => pivot_nrf52833}/board.mk | 0 .../{feather_nrf52833_pivot => pivot_nrf52833}/pinconfig.c | 0 3 files changed, 3 insertions(+) rename src/boards/{feather_nrf52833_pivot => pivot_nrf52833}/board.h (96%) rename src/boards/{feather_nrf52833_pivot => pivot_nrf52833}/board.mk (100%) rename src/boards/{feather_nrf52833_pivot => pivot_nrf52833}/pinconfig.c (100%) diff --git a/src/boards/feather_nrf52833_pivot/board.h b/src/boards/pivot_nrf52833/board.h similarity index 96% rename from src/boards/feather_nrf52833_pivot/board.h rename to src/boards/pivot_nrf52833/board.h index 63d11fa6..222779da 100644 --- a/src/boards/feather_nrf52833_pivot/board.h +++ b/src/boards/pivot_nrf52833/board.h @@ -64,4 +64,7 @@ #define UF2_PRODUCT_NAME "nrf52833 boot PIVOT" #define UF2_VOLUME_LABEL "PIVOT_BOOT" #define UF2_BOARD_ID "PIVOT_BOOT-revD" +#define UF2_INDEX_URL "https://www.pivot.com/product/4062" // TODO change later + +#endif diff --git a/src/boards/feather_nrf52833_pivot/board.mk b/src/boards/pivot_nrf52833/board.mk similarity index 100% rename from src/boards/feather_nrf52833_pivot/board.mk rename to src/boards/pivot_nrf52833/board.mk diff --git a/src/boards/feather_nrf52833_pivot/pinconfig.c b/src/boards/pivot_nrf52833/pinconfig.c similarity index 100% rename from src/boards/feather_nrf52833_pivot/pinconfig.c rename to src/boards/pivot_nrf52833/pinconfig.c