xobs/simmel-bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feed wdt in bootloader if enabled. Since it is impossible to disable wdt

Browse Source
This commit is contained in:
hathach 2018-11-19 17:01:45 +07:00
parent 37690823ac
commit 94e23a928c
10 changed files with 6385 additions and 6375 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2626
bin/feather_nrf52832/6.1.1r0/feather_nrf52832_bootloader_s132_6.1.1r0.hex
View File

File diff suppressed because it is too large Load Diff

BIN
bin/feather_nrf52832/6.1.1r0/feather_nrf52832_bootloader_s132_6.1.1r0.zip
View File

Binary file not shown.

3378
bin/feather_nrf52840_express/6.1.1r0/feather_nrf52840_express_bootloader_s140_6.1.1r0.hex
View File

File diff suppressed because it is too large Load Diff

BIN
bin/feather_nrf52840_express/6.1.1r0/feather_nrf52840_express_bootloader_s140_6.1.1r0.zip
View File

Binary file not shown.

3372
bin/pca10056/6.1.1r0/pca10056_bootloader_s140_6.1.1r0.hex
View File

File diff suppressed because it is too large Load Diff

BIN
bin/pca10056/6.1.1r0/pca10056_bootloader_s140_6.1.1r0.zip
View File

Binary file not shown.

3370
bin/pca10059/6.1.1r0/pca10059_bootloader_s140_6.1.1r0.hex
View File

File diff suppressed because it is too large Load Diff

BIN
bin/pca10059/6.1.1r0/pca10059_bootloader_s140_6.1.1r0.zip
View File

Binary file not shown.

8
lib/sdk11/components/libraries/bootloader_dfu/bootloader.c
View File

@ -27,6 +27,7 @@
#include "app_scheduler.h" #include "app_scheduler.h"
#include "nrfx.h" #include "nrfx.h"
#include "nrf_wdt.h"
#include "app_timer.h" #include "app_timer.h"
#include "boards.h" #include "boards.h"
@ -116,6 +117,13 @@ static void wait_for_events(void)
// uint32_t err_code = sd_app_evt_wait(); // uint32_t err_code = sd_app_evt_wait();
// APP_ERROR_CHECK(err_code); // APP_ERROR_CHECK(err_code);
// Feed all Watchdog just in case application enable it
// WDT cannot be disabled once started. It even last through soft reset (NVIC Reset)
if ( nrf_wdt_started() )
{
for (uint8_t i=0; i<8; i++) nrf_wdt_reload_request_set(i);
}
// Event received. Process it from the scheduler. // Event received. Process it from the scheduler.
app_sched_execute(); app_sched_execute();

6
src/boards.c
View File

@ -68,12 +68,6 @@ void board_init(void)
NRF_CLOCK->LFCLKSRC = CLOCK_LFCLKSRC_SRC_RC; NRF_CLOCK->LFCLKSRC = CLOCK_LFCLKSRC_SRC_RC;
NRF_CLOCK->TASKS_LFCLKSTART = 1UL; NRF_CLOCK->TASKS_LFCLKSTART = 1UL;
// stop WDT if started by application, when jumping from application using BLE DFU
if ( NRF_WDT->RUNSTATUS )
{
NRF_WDT->TASKS_START = 0;
}
button_init(BUTTON_DFU); button_init(BUTTON_DFU);
button_init(BUTTON_FRESET); button_init(BUTTON_FRESET);
NRFX_DELAY_US(100); // wait for the pin state is stable NRFX_DELAY_US(100); // wait for the pin state is stable