From a76d419c34fb9b7478af58623f2b3f590148988b Mon Sep 17 00:00:00 2001 From: hathach Date: Mon, 2 Feb 2026 14:30:32 +0700 Subject: [PATCH] minor clean up --- .../libraries/bootloader_dfu/bootloader.c | 13 +++++++------ .../libraries/bootloader_dfu/dfu_single_bank.c | 5 +++-- src/main.c | 8 ++++---- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/sdk11/components/libraries/bootloader_dfu/bootloader.c b/lib/sdk11/components/libraries/bootloader_dfu/bootloader.c index 9a8e55e..bd9b8cc 100644 --- a/lib/sdk11/components/libraries/bootloader_dfu/bootloader.c +++ b/lib/sdk11/components/libraries/bootloader_dfu/bootloader.c @@ -140,7 +140,7 @@ static void wait_for_events(void) (m_update_status == BOOTLOADER_SYS_RESET) || (m_update_status == BOOTLOADER_RESET_TO_SELF)) { - // When update has completed or a timeout/reset occured we will return. + // When update has completed or a timeout/reset occurred we will return. return; } } @@ -191,8 +191,9 @@ static void bootloader_settings_save(bootloader_settings_t * p_settings) uint32_t err_code; while(1) { err_code = pstorage_clear(&m_bootsettings_handle, sizeof(bootloader_settings_t)); - if (err_code != NRF_ERROR_NO_MEM) + if (err_code != NRF_ERROR_NO_MEM) { break; + } // This means the write/erase queue of commands was completely full - Should not // happen, but better safe than sorry, wait until space becomes available - // the pstorage event handler is only run from the main loop, and we are also @@ -209,8 +210,9 @@ static void bootloader_settings_save(bootloader_settings_t * p_settings) while(1) { err_code = pstorage_store(&m_bootsettings_handle, (uint8_t *) p_settings, sizeof(bootloader_settings_t), 0); - if (err_code != NRF_ERROR_NO_MEM) + if (err_code != NRF_ERROR_NO_MEM) { break; + } // No space, wait until an entry in the queue is freed while (NRF_ERROR_NOT_FOUND != proc_soc()) { // nothing @@ -322,9 +324,8 @@ void bootloader_dfu_update_process(dfu_update_status_t update_status) } else if (update_status.status_code == DFU_RESET) { - m_update_status = update_status.restart_into_bootloader == false - ? BOOTLOADER_SYS_RESET - : BOOTLOADER_RESET_TO_SELF; + m_update_status = + (update_status.restart_into_bootloader == false ? BOOTLOADER_SYS_RESET : BOOTLOADER_RESET_TO_SELF); } else { diff --git a/lib/sdk11/components/libraries/bootloader_dfu/dfu_single_bank.c b/lib/sdk11/components/libraries/bootloader_dfu/dfu_single_bank.c index b53bf95..114a57c 100644 --- a/lib/sdk11/components/libraries/bootloader_dfu/dfu_single_bank.c +++ b/lib/sdk11/components/libraries/bootloader_dfu/dfu_single_bank.c @@ -789,8 +789,9 @@ uint32_t dfu_bl_image_validate(void) sd_mbr_cmd_1.params.compare.len = bootloader_settings.bl_image_size / sizeof(uint32_t); uint32_t err_code = sd_mbr_command(&sd_mbr_cmd_1); - if (err_code == NRF_SUCCESS) - return NRF_SUCCESS; + if (err_code == NRF_SUCCESS) { + return NRF_SUCCESS; + } uint32_t bl_image_start_2 = (bootloader_settings.sd_image_size == 0) ? DFU_BANK_1_REGION_START : diff --git a/src/main.c b/src/main.c index cccb097..f9a95d8 100644 --- a/src/main.c +++ b/src/main.c @@ -134,7 +134,7 @@ uint32_t* dbl_reset_mem = ((uint32_t*) DFU_DBL_RESET_MEM); // true if ble, false if serial bool _ota_dfu = false; bool _ota_connected = false; -bool _ota_was_active = false; +bool _ota_was_connected = false; bool _sd_inited = false; bool is_ota(void) { @@ -231,7 +231,7 @@ int main(void) { // Reset the system with the OTA DFU update in case we were in it, // to allow completion of FLASHING, otherwise, default to normal reset - if (_ota_was_active) { + if (_ota_was_connected) { NRF_POWER->GPREGRET = DFU_MAGIC_OTA_RESET; } @@ -526,8 +526,8 @@ uint32_t proc_ble(void) { _ota_connected = true; - // Remember someone connected to BLE - _ota_was_active = true; + // Remember someone connected to BLE + _ota_was_connected = true; led_state(STATE_BLE_CONNECTED); break; }