From 90c856e9bfa97a2aa3b7a6dcee9055df455a56fc Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 13 Jul 2022 12:11:01 +0700 Subject: [PATCH] fix build with 832 --- src/main.c | 3 +-- src/usb/uf2/uf2cfg.h | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main.c b/src/main.c index 47d290e..47386ca 100644 --- a/src/main.c +++ b/src/main.c @@ -61,15 +61,14 @@ #include "nrf_error.h" #include "boards.h" -#include "uf2/uf2.h" #include "pstorage_platform.h" #include "nrf_mbr.h" #include "pstorage.h" #include "nrfx_nvmc.h" - #ifdef NRF_USBD +#include "uf2/uf2.h" #include "nrf_usbd.h" #include "tusb.h" diff --git a/src/usb/uf2/uf2cfg.h b/src/usb/uf2/uf2cfg.h index a6382e3..e5a6398 100644 --- a/src/usb/uf2/uf2cfg.h +++ b/src/usb/uf2/uf2cfg.h @@ -13,12 +13,12 @@ #endif // Family ID and size for updating generic Application -#if defined(NRF52833_XXAA) - #define CFG_UF2_FAMILY_APP_ID 0x621E937A - #define CFG_UF2_FLASH_SIZE (512*1024) // 512 kB -#elif defined(NRF52840_XXAA) +#if defined(NRF52840_XXAA) #define CFG_UF2_FAMILY_APP_ID 0xADA52840 #define CFG_UF2_FLASH_SIZE (1024*1024) // 1 MB +#elif defined(NRF52833_XXAA) + #define CFG_UF2_FAMILY_APP_ID 0x621E937A + #define CFG_UF2_FLASH_SIZE (512*1024) // 512 kB #endif // Application Address Space