Skip to content

Commit af15d74

Browse files
authored
Merge pull request #256 from slicemk/uf2-family-nrf52833
Use separate UF2_FAMILY for nRF52833
2 parents 8d4e89f + 4d25d35 commit af15d74

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/boards/bluemicro_nrf52833/pinconfig.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const uint32_t bootloaderConfig[] =
1111
204, 0x80000, // FLASH_BYTES
1212
205, 0x20000, // RAM_BYTES
1313
208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
14-
209, 0xada52840, // UF2_FAMILY = 0xada52840
14+
209, 0x621e937a, // UF2_FAMILY = 0x621e937a
1515
210, 0x20, // PINS_PORT_SIZE = PA_32
1616

1717
0, 0, 0, 0, 0, 0, 0, 0

src/boards/pca10100/pinconfig.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const uint32_t bootloaderConfig[] =
1111
204, 0x80000, // FLASH_BYTES
1212
205, 0x20000, // RAM_BYTES
1313
208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
14-
209, 0xada52840, // UF2_FAMILY = 0xada52840
14+
209, 0x621e937a, // UF2_FAMILY = 0x621e937a
1515
210, 0x20, // PINS_PORT_SIZE = PA_32
1616

1717
0, 0, 0, 0, 0, 0, 0, 0

src/usb/uf2/uf2cfg.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
#include "dfu_types.h"
33

44
// Family ID for updating generic Application
5-
#define CFG_UF2_FAMILY_APP_ID 0xADA52840
5+
#if defined(NRF52833_XXAA)
6+
#define CFG_UF2_FAMILY_APP_ID 0x621E937A
7+
#else
8+
#define CFG_UF2_FAMILY_APP_ID 0xADA52840
9+
#endif
610

711
// Board-specific ID for board-specific Application
812
#if defined(USB_DESC_VID) && defined(USB_DESC_UF2_PID) && USB_DESC_VID && USB_DESC_UF2_PID

0 commit comments

Comments
 (0)