From f5b654eb5e66fcc5e465b63a4cbaae69ef73de4e Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 27 Mar 2019 13:14:54 +0700 Subject: [PATCH 1/4] update changelog --- changelog.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changelog.md b/changelog.md index 26b0829..cc0dd64 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,11 @@ # Adafruit nRF52 Bootloader Changelog +## 0.2.10 + +- Fixed various FAT issues, thanks to @henrygab +- Added MakerDiary MDK nrf52840 USB dongle support, thanks to @gpshead +- Fixed incorrect button mapping for Feather nRF52840 + ## 0.2.9 - Fixed incomplete writes on Windows. Upated tinyusb to handle write10 completion, and use it for finalizing dfu process. Will prevent windows error message pop up. This will also give an extra time for flash writing to complete. From d3f5249a61ca458f5177e3ecc75e43196d78692e Mon Sep 17 00:00:00 2001 From: Spegs21 Date: Wed, 27 Mar 2019 22:37:35 -0400 Subject: [PATCH 2/4] Add detail for using UF2 --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index ca70bd0..07bafc4 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,20 @@ There is an adjacent ground pad. For other boards, please check the board definition for details. +### Making your own UF2 + +To create your own UF2 DFU update file simply use the [Python conversion script](https://github.com/Microsoft/uf2/blob/master/utils/uf2conv.py) on a .bin file or .hex file, specifying the family as **0xADA52840**. Be sure to compile your application to start at 0x26000 (152k). If using a .bin file with the conversion script you must specify this with the -b switch. + +To create a UF2 image from a .bin file: +``` +uf2conv.py firmware.bin -c -b 0x26000 -f 0xADA52840 +``` + +To create a UF2 image from a .hex file: +``` +uf2conv.py firmware.hex -c -f 0xADA52840 +``` + ## Burn & Upgrade with pre-built binaries You can burn and/or upgrade the bootloader with either a J-link or DFU (serial) to a specific pre-built binary version From 4653c07f06bc0f7d892756d1748bdc5670f5e9a1 Mon Sep 17 00:00:00 2001 From: Spegs21 Date: Wed, 27 Mar 2019 22:39:04 -0400 Subject: [PATCH 3/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 07bafc4..fba1c8e 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ For other boards, please check the board definition for details. ### Making your own UF2 -To create your own UF2 DFU update file simply use the [Python conversion script](https://github.com/Microsoft/uf2/blob/master/utils/uf2conv.py) on a .bin file or .hex file, specifying the family as **0xADA52840**. Be sure to compile your application to start at 0x26000 (152k). If using a .bin file with the conversion script you must specify this with the -b switch. +To create your own UF2 DFU update image, simply use the [Python conversion script](https://github.com/Microsoft/uf2/blob/master/utils/uf2conv.py) on a .bin file or .hex file, specifying the family as **0xADA52840**. Be sure to compile your application to start at 0x26000 (152k). If using a .bin file with the conversion script you must specify this with the -b switch. To create a UF2 image from a .bin file: ``` From 389c05b6433a591f4a5b6e0afca36534927b0176 Mon Sep 17 00:00:00 2001 From: Tavish Naruka Date: Fri, 12 Apr 2019 19:41:55 +0530 Subject: [PATCH 4/4] Add support for Electronut Labs Papyr Signed-off-by: Tavish Naruka --- README.md | 1 + src/boards/electronut_labs_papyr.h | 99 ++++++++++++++++++++++++++++++ src/usb/usb_desc.c | 43 +++++++------ src/usb/usb_desc.h | 8 +++ 4 files changed, 131 insertions(+), 20 deletions(-) create mode 100644 src/boards/electronut_labs_papyr.h diff --git a/README.md b/README.md index fba1c8e..6834ac0 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ This is a CDC/DFU/UF2 bootloader for nRF52 boards. - Particle Boron - Particle Xenon - MakerDiary MDK nRF52840 USB Dongle +- [Electronut Labs Papyr](https://docs.electronut.in/papyr/) UF2 is an easy-to-use bootloader that appears as a flash drive. You can just copy `.uf2`-format application images to the flash drive to load new firmware. diff --git a/src/boards/electronut_labs_papyr.h b/src/boards/electronut_labs_papyr.h new file mode 100644 index 0000000..8911584 --- /dev/null +++ b/src/boards/electronut_labs_papyr.h @@ -0,0 +1,99 @@ +/**************************************************************************/ +/*! + @file elelctronutlabs_papyr.h + @author Tavish Naruka + + @section LICENSE + + Software License Agreement (BSD License) + + Copyright (c) 2017, Adafruit Industries (adafruit.com) + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holders nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ +/**************************************************************************/ + +#ifndef PAPYR_H +#define PAPYR_H + +/*------------------------------------------------------------------*/ +/* LED + *------------------------------------------------------------------*/ +#define LEDS_NUMBER 2 +#define LED_PRIMARY_PIN 13 +#define LED_SECONDARY_PIN 14 +#define LED_STATE_ON 0 + +/*------------------------------------------------------------------*/ +/* BUTTON + *------------------------------------------------------------------*/ +// NOTE: USB UF2 bootloader can be triggered by double pressing RESET +// App can trigger OTA bootloader by writing DFU_MAGIC_OTA_APPJUM to +// GPREGRET register if softdevice is not initialized; or by +// writing DFU_MAGIC_OTA_RESET in case softdevice is initialized. +#define BUTTONS_NUMBER 2 +#define BUTTON_1 18 // RESET also by default +#define BUTTON_2 1 // P0.1 not exposed anywhere, FRST n/a +#define BUTTON_PULL NRF_GPIO_PIN_PULLUP + +/*------------------------------------------------------------------*/ +/* UART + *------------------------------------------------------------------*/ +#define RX_PIN_NUMBER 7 +#define TX_PIN_NUMBER 8 +#define CTS_PIN_NUMBER 0 +#define RTS_PIN_NUMBER 0 +#define HWFC false + +// Used as model string in OTA mode +#define DIS_MANUFACTURER "Electronut Labs" +#define DIS_MODEL "Papyr" + +#define BOARD_ID "Electronut Labs Papyr" +#define INDEX_URL "https://docs.electronut.in/papyr" + +#define USB_DESC_VID 0x239A +#define USB_DESC_UF2_PID 0x003B + +#define USB_STRING_DESCRIPTORS { \ + /* 0: is supported language = English */ \ + TUD_DESC_STRCONV(0x0409), \ + \ + /* 1: Manufacturer */ \ + TUD_DESC_STRCONV('E','l','e','c','t','r','o','n','u','t',' ','L','a','b','s'), \ + \ + /* 2: Product */ \ + TUD_DESC_STRCONV('P','a','p','y','r', ' ', 'D','F','U'), \ + \ + /* 3: Serials TODO use chip ID */ \ + usb_desc_str_serial, \ + \ + /* 4: CDC Interface */ \ + TUD_DESC_STRCONV('P','a','p','y','r',' ','S','e','r','i','a','l'), \ + \ + /* 5: MSC Interface */ \ + TUD_DESC_STRCONV('P','a','p','y','r',' ','U','F','2'), \ +} + +#endif // PPAPYR_H diff --git a/src/usb/usb_desc.c b/src/usb/usb_desc.c index 4e5f5a3..06fd089 100644 --- a/src/usb/usb_desc.c +++ b/src/usb/usb_desc.c @@ -79,30 +79,33 @@ enum { // STRING DESCRIPTORS //--------------------------------------------------------------------+ +#ifndef USB_STRING_DESCRIPTORS +#define USB_STRING_DESCRIPTORS { \ + /* 0: is supported language = English */ \ + TUD_DESC_STRCONV(0x0409), \ + \ + /* 1: Manufacturer */ \ + TUD_DESC_STRCONV('A','d','a','f','r','u','i','t',' ','I','n','d','u','s','t','r','i','e','s'), \ + \ + /* 2: Product */ \ + TUD_DESC_STRCONV('B','l','u','e','f','r','u','i','t',' ','n','R','F','5','2','8','4','0', ' ', 'D','F','U'), \ + \ + /* 3: Serials TODO use chip ID */ \ + usb_desc_str_serial, \ + \ + /* 4: CDC Interface */ \ + TUD_DESC_STRCONV('B','l','u','e','f','r','u','i','t',' ','S','e','r','i','a','l'), \ + \ + /* 5: MSC Interface */ \ + TUD_DESC_STRCONV('B','l','u','e','f','r','u','i','t',' ','U','F','2'), \ +} +#endif + // Serial is 64-bit DeviceID -> 16 chars len uint16_t usb_desc_str_serial[1+16] = { TUD_DESC_STR_HEADER(16) }; // array of pointer to string descriptors -uint16_t const * const string_desc_arr [] = -{ - // 0: is supported language = English - TUD_DESC_STRCONV(0x0409), - - // 1: Manufacturer - TUD_DESC_STRCONV('A','d','a','f','r','u','i','t',' ','I','n','d','u','s','t','r','i','e','s'), - - // 2: Product - TUD_DESC_STRCONV('B','l','u','e','f','r','u','i','t',' ','n','R','F','5','2','8','4','0', ' ', 'D','F','U'), - - // 3: Serials TODO use chip ID - usb_desc_str_serial, - - // 4: CDC Interface - TUD_DESC_STRCONV('B','l','u','e','f','r','u','i','t',' ','S','e','r','i','a','l'), - - // 5: MSC Interface - TUD_DESC_STRCONV('B','l','u','e','f','r','u','i','t',' ','U','F','2'), -}; +uint16_t const * const string_desc_arr [] = USB_STRING_DESCRIPTORS; //--------------------------------------------------------------------+ // Device Descriptor diff --git a/src/usb/usb_desc.h b/src/usb/usb_desc.h index b81946a..06d68ed 100644 --- a/src/usb/usb_desc.h +++ b/src/usb/usb_desc.h @@ -40,15 +40,23 @@ #define USB_DESC_H_ #include "tusb.h" +#include "boards.h" #ifdef __cplusplus extern "C" { #endif +#ifndef USB_DESC_VID #define USB_DESC_VID 0x239A +#endif +#ifndef USB_DESC_UF2_PID #define USB_DESC_UF2_PID 0x0029 +#endif + +#ifndef USB_DESC_SERIAL_ONLY_PID #define USB_DESC_SERIAL_ONLY_PID 0x002A +#endif /*------------- Configuration Descriptor -------------*/