ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #27 from cho45/enter-dfu

Browse source 
Add `reset dfu` shell command and `CONFIG` → `DFU`  → `RESET AND ENTER DFU`
This commit is contained in:
TT 2019-09-07 09:04:25 +09:00 committed by GitHub
parent 496b41fa1c 73e0c19e8e
commit 5a5f298323
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 62 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
NANOVNA_STM32_F072/board.c
View file

@ -70,6 +70,21 @@ const PALConfig pal_default_config = {
* any other initialization.
*/
void __early_init(void) {
if ( *((unsigned long *)BOOT_FROM_SYTEM_MEMORY_MAGIC_ADDRESS) == BOOT_FROM_SYTEM_MEMORY_MAGIC ) {
// require irq
__enable_irq();
// reset magic bytes
*((unsigned long *)BOOT_FROM_SYTEM_MEMORY_MAGIC_ADDRESS) = 0;
// remap memory. unneeded for F072?
// RCC->APB2ENR |= RCC_APB2ENR_SYSCFGEN;
// SYSCFG->CFGR1 = 0x01;
// set msp for system memory
__set_MSP(SYSTEM_BOOT_MSP);
// jump to system memory
( (void (*)(void)) (*((uint32_t *)(STM32F072xB_SYSTEM_MEMORY+4))) )();
while (1);
}
//si5351_setup();
stm32_clock_init();
}

5
NANOVNA_STM32_F072/board.h
View file

@ -40,6 +40,11 @@
*/
#define STM32F072xB
#define STM32F072xB_SYSTEM_MEMORY 0x1FFFC800
#define BOOT_FROM_SYTEM_MEMORY_MAGIC_ADDRESS 0x20003FF0
#define BOOT_FROM_SYTEM_MEMORY_MAGIC 0xDEADBEEF
#define SYSTEM_BOOT_MSP 0x20002250
/*
* IO pins assignments
*/

8
main.c
View file

@ -120,6 +120,14 @@ static void cmd_reset(BaseSequentialStream *chp, int argc, char *argv[])
(void)argc;
(void)argv;
if (argc == 1) {
if (strcmp(argv[0], "dfu") == 0) {
chprintf(chp, "Performing reset to DFU mode\r\n");
enter_dfu();
return;
}
}
chprintf(chp, "Performing reset\r\n");
rccEnableWWDG(FALSE);

1
nanovna.h
View file

@ -339,6 +339,7 @@ void handle_touch_interrupt(void);
void touch_cal_exec(void);
void touch_draw_test(void);
void enter_dfu(void);
/*
* adc.c

33
ui.c
View file

@ -414,6 +414,23 @@ show_version(void)
touch_start_watchdog();
}
void
enter_dfu(void)
{
adc_stop(ADC1);
int x = 5, y = 5;
// leave a last message
ili9341_fill(0, 0, 320, 240, 0);
ili9341_drawstring_5x7("DFU: Device Firmware Update Mode", x, y += 10, 0xffff, 0x0000);
ili9341_drawstring_5x7("To exit DFU mode, please reset device yourself.", x, y += 10, 0xffff, 0x0000);
// see __early_init in ./NANOVNA_STM32_F072/board.c
*((unsigned long *)BOOT_FROM_SYTEM_MEMORY_MAGIC_ADDRESS) = BOOT_FROM_SYTEM_MEMORY_MAGIC;
NVIC_SystemReset();
}
// type of menu item
enum {
@ -528,6 +545,15 @@ menu_config_cb(int item)
}
}
static void
menu_dfu_cb(int item)
{
switch (item) {
case 0:
enter_dfu();
}
}
static void
menu_save_cb(int item)
{
@ -898,11 +924,18 @@ const menuitem_t menu_recall[] = {
{ MT_NONE, NULL, NULL } // sentinel
};
const menuitem_t menu_dfu[] = {
{ MT_CALLBACK, "\2RESET AND\0ENTER DFU", menu_dfu_cb },
{ MT_CANCEL, S_LARROW"CANCEL", NULL },
{ MT_NONE, NULL, NULL } // sentinel
};
const menuitem_t menu_config[] = {
{ MT_CALLBACK, "TOUCH CAL", menu_config_cb },
{ MT_CALLBACK, "TOUCH TEST", menu_config_cb },
{ MT_CALLBACK, "SAVE", menu_config_cb },
{ MT_CALLBACK, "VERSION", menu_config_cb },
{ MT_SUBMENU, S_RARROW"DFU", menu_dfu },
{ MT_CANCEL, S_LARROW" BACK", NULL },
{ MT_NONE, NULL, NULL } // sentinel
};