From d6743ea8a1fdbde432766f3816b6cabadc9601fa Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Thu, 25 Nov 2021 14:10:50 +0200 Subject: [PATCH 1/4] Add files via upload Add Board support for Raytac MDBT50Q Demo Board 40 --- src/boards/raytac_mdbt50q_db_40/board.h | 75 +++++++++++++++++++++ src/boards/raytac_mdbt50q_db_40/board.mk | 1 + src/boards/raytac_mdbt50q_db_40/pinconfig.c | 19 ++++++ 3 files changed, 95 insertions(+) create mode 100644 src/boards/raytac_mdbt50q_db_40/board.h create mode 100644 src/boards/raytac_mdbt50q_db_40/board.mk create mode 100644 src/boards/raytac_mdbt50q_db_40/pinconfig.c diff --git a/src/boards/raytac_mdbt50q_db_40/board.h b/src/boards/raytac_mdbt50q_db_40/board.h new file mode 100644 index 00000000..4d57eadf --- /dev/null +++ b/src/boards/raytac_mdbt50q_db_40/board.h @@ -0,0 +1,75 @@ +/* + * 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 RAYTAC_MDBT50Q_DB_40_H +#define RAYTAC_MDBT50Q_DB_40_H + +#define _PINNUM(port, pin) ((port)*32 + (pin)) + +/*------------------------------------------------------------------*/ +/* LED + *------------------------------------------------------------------*/ +#define LEDS_NUMBER 3 +/* This is the Green led marked D1 on the board */ +#define LED_PRIMARY_PIN _PINNUM(1, 13) +/* This is the Red led marked D2 on the board */ +#define LED_SECONDARY_PIN _PINNUM(1, 14) +/* This is the Blue led marked D3 on the board */ +#define LED_TERTIARY_PIN _PINNUM(1, 15) +/* There are one more unpopulated LEDs, but for the purposes of bootloader that + * doesn't matter. */ +#define LED_STATE_ON 0 + +/*------------------------------------------------------------------*/ +/* BUTTON + *------------------------------------------------------------------*/ +#define BUTTONS_NUMBER 4 + +#define BUTTON_1 _PINNUM(0, 11) +#define BUTTON_2 _PINNUM(0, 12) +#define BUTTON_3 _PINNUM(0, 24) +#define BUTTON_4 _PINNUM(0, 25) +#define BUTTON_PULL NRF_GPIO_PIN_PULLUP + +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ +#define BLEDIS_MANUFACTURER "Raytac" +#define BLEDIS_MODEL "MDBT50Q-DB-40" + +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ + +#define USB_DESC_VID 0x239A +#define USB_DESC_UF2_PID 0x010C +#define USB_DESC_CDC_ONLY_PID 0x010C + +//------------- UF2 -------------// +#define UF2_PRODUCT_NAME "Raytac MDBT50Q Demo Board 40" +#define UF2_VOLUME_LABEL "MDBT50QDBBOOT" +#define UF2_BOARD_ID "RAYTAC-MDBT50Q-DB-40" +#define UF2_INDEX_URL "https://www.raytac.com/product/ins.php?index_id=81" + +#endif // RAYTAC_MDBT50Q_DB_40_H diff --git a/src/boards/raytac_mdbt50q_db_40/board.mk b/src/boards/raytac_mdbt50q_db_40/board.mk new file mode 100644 index 00000000..9d29ac69 --- /dev/null +++ b/src/boards/raytac_mdbt50q_db_40/board.mk @@ -0,0 +1 @@ +MCU_SUB_VARIANT = nrf52840 diff --git a/src/boards/raytac_mdbt50q_db_40/pinconfig.c b/src/boards/raytac_mdbt50q_db_40/pinconfig.c new file mode 100644 index 00000000..a983e4ab --- /dev/null +++ b/src/boards/raytac_mdbt50q_db_40/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 4946c0388f598ccee0a3874fa4122ddffc21a1dc Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Thu, 25 Nov 2021 14:29:34 +0200 Subject: [PATCH 2/4] error: initializer-string for array of 'unsigned char' is too long Fix UF2_VOLUME_LABEL too long --- src/boards/raytac_mdbt50q_db_40/board.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/boards/raytac_mdbt50q_db_40/board.h b/src/boards/raytac_mdbt50q_db_40/board.h index 4d57eadf..3301a83a 100644 --- a/src/boards/raytac_mdbt50q_db_40/board.h +++ b/src/boards/raytac_mdbt50q_db_40/board.h @@ -68,7 +68,7 @@ //------------- UF2 -------------// #define UF2_PRODUCT_NAME "Raytac MDBT50Q Demo Board 40" -#define UF2_VOLUME_LABEL "MDBT50QDBBOOT" +#define UF2_VOLUME_LABEL "MDBT50QBOOT" #define UF2_BOARD_ID "RAYTAC-MDBT50Q-DB-40" #define UF2_INDEX_URL "https://www.raytac.com/product/ins.php?index_id=81" From 569e64f5042dc5059775c80a0616499703150478 Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Fri, 26 Nov 2021 10:37:37 +0200 Subject: [PATCH 3/4] Update PID Changed PID taken from https://github.com/adafruit/circuitpython/issues/3128#issuecomment-655077754 --- src/boards/raytac_mdbt50q_db_40/board.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/boards/raytac_mdbt50q_db_40/board.h b/src/boards/raytac_mdbt50q_db_40/board.h index 3301a83a..efc0edb1 100644 --- a/src/boards/raytac_mdbt50q_db_40/board.h +++ b/src/boards/raytac_mdbt50q_db_40/board.h @@ -63,8 +63,8 @@ //--------------------------------------------------------------------+ #define USB_DESC_VID 0x239A -#define USB_DESC_UF2_PID 0x010C -#define USB_DESC_CDC_ONLY_PID 0x010C +#define USB_DESC_UF2_PID 0x00BB +#define USB_DESC_CDC_ONLY_PID 0x00BB //------------- UF2 -------------// #define UF2_PRODUCT_NAME "Raytac MDBT50Q Demo Board 40" From 993ac762ca15c2f9adc71e954009d6413add93dd Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Tue, 30 Nov 2021 09:14:37 +0200 Subject: [PATCH 4/4] Changes as requested to UF2_BOARD_ID from https://github.com/microsoft/uf2#files-exposed-by-bootloaders The Board-ID field is machine-readable and consists of a number of dash-separated tokens. The first token is the CPU type, second is the board type, and third is the board revision. More tokens can be also added. --- src/boards/raytac_mdbt50q_db_40/board.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/boards/raytac_mdbt50q_db_40/board.h b/src/boards/raytac_mdbt50q_db_40/board.h index efc0edb1..81e07dba 100644 --- a/src/boards/raytac_mdbt50q_db_40/board.h +++ b/src/boards/raytac_mdbt50q_db_40/board.h @@ -69,7 +69,7 @@ //------------- UF2 -------------// #define UF2_PRODUCT_NAME "Raytac MDBT50Q Demo Board 40" #define UF2_VOLUME_LABEL "MDBT50QBOOT" -#define UF2_BOARD_ID "RAYTAC-MDBT50Q-DB-40" +#define UF2_BOARD_ID "nRF52840-MDBT50Q-1MV2" #define UF2_INDEX_URL "https://www.raytac.com/product/ins.php?index_id=81" #endif // RAYTAC_MDBT50Q_DB_40_H