Skip to content

Customize dfu bootloader descriptor string according to key presence #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 28, 2022
Merged

Customize dfu bootloader descriptor string according to key presence #21

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d257915
Customize dfu flash operations according to key presence
pennam Nov 21, 2022
d04eb7b
Restore full list of dfu operations
pennam Nov 23, 2022
089917d
Align dfu BOOTLOADER_DESC_STR
pennam Nov 23, 2022
7a7b9e4
Simplify logic and update file flash size according key presence
pennam Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/dfu/usbd_dfu_flash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#define FLASH_DESC_STR "@Internal Flash 2MB /0x08000000/01*128Ka,15*128Kg"
//#define BOOTLOADER_DESC_STR "@Option Bits /0x52002000/01*1Ka"
#define QSPI_FLASH_DESC_STR "@Ext RAW Flash 16MB /0x90000000/4096*4Kg"
#define FILE_FLASH_DESC_STR "@Ext File Flash 16MB /0xA0000000/4096*4Kg"

#define FLASH_ERASE_TIME (uint16_t)0
#define FLASH_PROGRAM_TIME (uint16_t)0
Expand All @@ -43,6 +42,7 @@
/* Private variables --------------------------------------------------------- */
/* Private function prototypes ----------------------------------------------- */
char BOOTLOADER_DESC_STR[48];
char FILE_FLASH_DESC_STR[48] = "@Ext File Flash 16MB /0xA0000000/4096*4Kg";


/* Extern function prototypes ------------------------------------------------ */
Expand Down Expand Up @@ -82,8 +82,11 @@ void init_Memories() {
qspi_flash->init();
if (dfu_secondary_bd != nullptr) {
dfu_secondary_bd->init();
}
snprintf(BOOTLOADER_DESC_STR, sizeof(BOOTLOADER_DESC_STR), "@MCUBoot version %d /0x00000000/0*4Kg", BOOTLOADER_VERSION);
snprintf(BOOTLOADER_DESC_STR, sizeof(BOOTLOADER_DESC_STR), "@MCUboot v.%02d /0x00000000/0*4Kg", BOOTLOADER_VERSION);
} else {
snprintf(BOOTLOADER_DESC_STR, sizeof(BOOTLOADER_DESC_STR), "@Arduino boot v.%02d /0x00000000/0*4Kg", BOOTLOADER_VERSION);
snprintf(FILE_FLASH_DESC_STR, sizeof(FILE_FLASH_DESC_STR), "@Ext File Flash 0MB /0x00000000/0*4Kg");
}
}

Thread writeThread(osPriorityHigh);
Expand Down