From 4263c8ff79c9c5a36125d42936e6abe282844518 Mon Sep 17 00:00:00 2001 From: nitz Date: Tue, 4 Aug 2020 18:35:15 -0400 Subject: [PATCH 1/7] Add MakerDiary nRF52840 M.2 Module board. --- src/boards/nrf52840_m2/board.h | 70 ++++++++++++++++++++++++++++++ src/boards/nrf52840_m2/board.mk | 2 + src/boards/nrf52840_m2/pinconfig.c | 19 ++++++++ 3 files changed, 91 insertions(+) create mode 100644 src/boards/nrf52840_m2/board.h create mode 100644 src/boards/nrf52840_m2/board.mk create mode 100644 src/boards/nrf52840_m2/pinconfig.c diff --git a/src/boards/nrf52840_m2/board.h b/src/boards/nrf52840_m2/board.h new file mode 100644 index 0000000..8f495c0 --- /dev/null +++ b/src/boards/nrf52840_m2/board.h @@ -0,0 +1,70 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2020 Yihui Xiong for Makerdiary + * + * 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 _M2_H_ +#define _M2_H_ + +#define _PINNUM(port, pin) ((port)*32 + (pin)) + +/*------------------------------------------------------------------*/ +/* LED + *------------------------------------------------------------------*/ +#define LEDS_NUMBER 1 +#define LED_PRIMARY_PIN _PINNUM(0, 30) // Red +#define LED_DOCK_GREEN_PIN _PINNUM(1, 7) // Only available on the M.2 Dock +#define LED_STATE_ON 0 + +#define LED_RGB_RED_PIN _PINNUM(0, 30) +#define LED_RGB_GREEN_PIN _PINNUM(0, 29) +#define LED_RGB_BLUE_PIN _PINNUM(0, 31) +#define BOARD_RGB_BRIGHTNESS 0x404040 +/*------------------------------------------------------------------*/ +/* BUTTON + *------------------------------------------------------------------*/ +#define BUTTONS_NUMBER 2 +#define BUTTON_1 _PINNUM(0, 19) +#define BUTTON_2 _PINNUM(1, 7) +#define BUTTON_PULL NRF_GPIO_PIN_PULLUP + +//--------------------------------------------------------------------+ +// BLE OTA +//--------------------------------------------------------------------+ +#define BLEDIS_MANUFACTURER "cmd.wtf" +#define BLEDIS_MODEL "PowerOverwhelmiing" + +//--------------------------------------------------------------------+ +// USB +//--------------------------------------------------------------------+ +#define USB_DESC_VID 0x1915 +#define USB_DESC_UF2_PID 0x0029 +#define USB_DESC_CDC_ONLY_PID 0x002A + +//------------- UF2 -------------// +#define UF2_PRODUCT_NAME "Power Overwhelmiing by cmd.wtf" +#define UF2_VOLUME_LABEL "POWBOOT" +#define UF2_BOARD_ID "Power Overwhelmiing" +#define UF2_INDEX_URL "https://cmd.wtf" + + +#endif /* _M2_H_ */ diff --git a/src/boards/nrf52840_m2/board.mk b/src/boards/nrf52840_m2/board.mk new file mode 100644 index 0000000..745166e --- /dev/null +++ b/src/boards/nrf52840_m2/board.mk @@ -0,0 +1,2 @@ +MCU_SUB_VARIANT = nrf52840 +CFLAGS += -UCONFIG_NFCT_PINS_AS_GPIOS -USOFTDEVICE_PRESENT diff --git a/src/boards/nrf52840_m2/pinconfig.c b/src/boards/nrf52840_m2/pinconfig.c new file mode 100644 index 0000000..a983e4a --- /dev/null +++ b/src/boards/nrf52840_m2/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 75c89998c65f87c7c1cde8eafa5609a51276768e Mon Sep 17 00:00:00 2001 From: nitz Date: Tue, 4 Aug 2020 18:55:55 -0400 Subject: [PATCH 2/7] Support for skipping the NFCT as GPIO & SD defines nrf52840_m2 makes use of these skips. --- Makefile | 13 +++++++++++-- src/boards/nrf52840_m2/board.mk | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6567677..142052d 100644 --- a/Makefile +++ b/Makefile @@ -257,8 +257,17 @@ CFLAGS += -Wno-cast-function-type # Defined Symbol (MACROS) CFLAGS += -D__HEAP_SIZE=0 CFLAGS += -DCONFIG_GPIO_AS_PINRESET -CFLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS -CFLAGS += -DSOFTDEVICE_PRESENT + +# Skip defining CONFIG_NFCT_PINS_AS_GPIOS if the device uses the NFCT. +ifneq ($(USES_NFCT),yes) + CFLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS +endif + +# Skip defining SOFTDEVICE_PRESENT if the device doesn't use a soft device. +ifneq ($(NO_SOFT_DEVICE),yes) + CFLAGS += -DSOFTDEVICE_PRESENT +endif + CFLAGS += -DDFU_APP_DATA_RESERVED=7*4096 CFLAGS += -DUF2_VERSION='"$(GIT_VERSION) $(GIT_SUBMODULE_VERSIONS)"' diff --git a/src/boards/nrf52840_m2/board.mk b/src/boards/nrf52840_m2/board.mk index 745166e..dde7410 100644 --- a/src/boards/nrf52840_m2/board.mk +++ b/src/boards/nrf52840_m2/board.mk @@ -1,2 +1,3 @@ MCU_SUB_VARIANT = nrf52840 -CFLAGS += -UCONFIG_NFCT_PINS_AS_GPIOS -USOFTDEVICE_PRESENT +USES_NFCT = yes +NO_SOFT_DEVICE = yes From 307125255b0359349babf67f7633b2ba6a720877 Mon Sep 17 00:00:00 2001 From: nitz Date: Wed, 5 Aug 2020 08:09:33 -0400 Subject: [PATCH 3/7] Rename `USES_NFCT` to `USE_NFCT` --- Makefile | 2 +- src/boards/nrf52840_m2/board.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 142052d..c62917a 100644 --- a/Makefile +++ b/Makefile @@ -259,7 +259,7 @@ CFLAGS += -D__HEAP_SIZE=0 CFLAGS += -DCONFIG_GPIO_AS_PINRESET # Skip defining CONFIG_NFCT_PINS_AS_GPIOS if the device uses the NFCT. -ifneq ($(USES_NFCT),yes) +ifneq ($(USE_NFCT),yes) CFLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS endif diff --git a/src/boards/nrf52840_m2/board.mk b/src/boards/nrf52840_m2/board.mk index dde7410..8a74ae1 100644 --- a/src/boards/nrf52840_m2/board.mk +++ b/src/boards/nrf52840_m2/board.mk @@ -1,3 +1,3 @@ MCU_SUB_VARIANT = nrf52840 -USES_NFCT = yes +USE_NFCT = yes NO_SOFT_DEVICE = yes From 86a66227242323795c718184a2a54711adaab35e Mon Sep 17 00:00:00 2001 From: nitz Date: Wed, 5 Aug 2020 08:46:24 -0400 Subject: [PATCH 4/7] Revert NO_SOFT_DEVICE change. Will be more work, will work on it in it's own feature branch. --- Makefile | 6 +----- src/boards/nrf52840_m2/board.mk | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c62917a..a49192e 100644 --- a/Makefile +++ b/Makefile @@ -263,11 +263,7 @@ ifneq ($(USE_NFCT),yes) CFLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS endif -# Skip defining SOFTDEVICE_PRESENT if the device doesn't use a soft device. -ifneq ($(NO_SOFT_DEVICE),yes) - CFLAGS += -DSOFTDEVICE_PRESENT -endif - +CFLAGS += -DSOFTDEVICE_PRESENT CFLAGS += -DDFU_APP_DATA_RESERVED=7*4096 CFLAGS += -DUF2_VERSION='"$(GIT_VERSION) $(GIT_SUBMODULE_VERSIONS)"' diff --git a/src/boards/nrf52840_m2/board.mk b/src/boards/nrf52840_m2/board.mk index 8a74ae1..bea74cc 100644 --- a/src/boards/nrf52840_m2/board.mk +++ b/src/boards/nrf52840_m2/board.mk @@ -1,3 +1,2 @@ MCU_SUB_VARIANT = nrf52840 USE_NFCT = yes -NO_SOFT_DEVICE = yes From 43cfc4c0f076752f5840726d6d0f5df732fb80b8 Mon Sep 17 00:00:00 2001 From: nitz Date: Wed, 5 Aug 2020 09:41:34 -0400 Subject: [PATCH 5/7] Add M.2 board to README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0a86a9d..bb71ad5 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,8 @@ This is a CDC/DFU/UF2 bootloader for nRF52 boards. - [Adafruit ItsyBitsy nRF52840 Express](https://www.adafruit.com/product/4481) - Adafruit Metro nRF52840 Express - [Electronut Labs Papyr](https://docs.electronut.in/papyr/) -- MakerDiary MDK nRF52840 USB Dongle +- [MakerDiary MDK nRF52840 USB Dongle](https://makerdiary.com/products/nrf52840-mdk-usb-dongle) +- [MakerDiary nRF52840 M.2 Module](https://makerdiary.com/products/nrf52840-m2-module) - [Nordic nRF52840DK PCA10056](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-DK) - [Nordic nRF52840DK PCA10059 ("Dongle")](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-Dongle) - Particle Argon From 8ab7a41fab0940be722b235e8c3521c61c0cf429 Mon Sep 17 00:00:00 2001 From: nitz Date: Wed, 5 Aug 2020 20:10:41 -0400 Subject: [PATCH 6/7] Fix strings to be MakerDiary Not sure how I managed to mix my branches up. --- src/boards/nrf52840_m2/board.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/boards/nrf52840_m2/board.h b/src/boards/nrf52840_m2/board.h index 8f495c0..a0c8159 100644 --- a/src/boards/nrf52840_m2/board.h +++ b/src/boards/nrf52840_m2/board.h @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#ifndef _M2_H_ -#define _M2_H_ +#ifndef _MAKERDIARY_NRF52840_M2_H_ +#define _MAKERDIARY_NRF52840_M2_H_ #define _PINNUM(port, pin) ((port)*32 + (pin)) @@ -50,8 +50,8 @@ //--------------------------------------------------------------------+ // BLE OTA //--------------------------------------------------------------------+ -#define BLEDIS_MANUFACTURER "cmd.wtf" -#define BLEDIS_MODEL "PowerOverwhelmiing" +#define BLEDIS_MANUFACTURER "Makerdiary" +#define BLEDIS_MODEL "nRF52840 M.2" //--------------------------------------------------------------------+ // USB @@ -60,11 +60,13 @@ #define USB_DESC_UF2_PID 0x0029 #define USB_DESC_CDC_ONLY_PID 0x002A -//------------- UF2 -------------// -#define UF2_PRODUCT_NAME "Power Overwhelmiing by cmd.wtf" -#define UF2_VOLUME_LABEL "POWBOOT" -#define UF2_BOARD_ID "Power Overwhelmiing" -#define UF2_INDEX_URL "https://cmd.wtf" +//--------------------------------------------------------------------+ +// UF2 +//--------------------------------------------------------------------+ +#define UF2_PRODUCT_NAME "MakerDiary nRF52840 M.2 Module" +#define UF2_VOLUME_LABEL "nRF52840M2" +#define UF2_BOARD_ID "nRF52840M2" +#define UF2_INDEX_URL "https://wiki.makerdiary.com/nrf52840-m2" -#endif /* _M2_H_ */ +#endif /* _MAKERDIARY_NRF52840_M2_H_ */ From a5b78ff4103b16f71ffdb3a0981292be4786b332 Mon Sep 17 00:00:00 2001 From: nitz Date: Thu, 6 Aug 2020 11:11:31 -0400 Subject: [PATCH 7/7] Updated with @xiongyhui's VID/PID from Seeed --- src/boards/nrf52840_m2/board.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/boards/nrf52840_m2/board.h b/src/boards/nrf52840_m2/board.h index a0c8159..57265ab 100644 --- a/src/boards/nrf52840_m2/board.h +++ b/src/boards/nrf52840_m2/board.h @@ -56,9 +56,9 @@ //--------------------------------------------------------------------+ // USB //--------------------------------------------------------------------+ -#define USB_DESC_VID 0x1915 -#define USB_DESC_UF2_PID 0x0029 -#define USB_DESC_CDC_ONLY_PID 0x002A +#define USB_DESC_VID 0x2886 +#define USB_DESC_UF2_PID 0xF00F +#define USB_DESC_CDC_ONLY_PID 0xF00F //--------------------------------------------------------------------+ // UF2