Increase the priority of entering boot mode via button press. (#15)

OneKeyHQ · Jan 31, 2024 · 495ba0e · 495ba0e
1 parent b7c405d
commit 495ba0e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/ble-firmware/components/libraries/bootloader/nrf_bootloader.c b/ble-firmware/components/libraries/bootloader/nrf_bootloader.c
@@ -354,19 +354,19 @@ static void dfu_enter_flags_clear(void)
  */
 static bool dfu_enter_check(void)
 {
-    if (!app_is_valid(crc_on_valid_app_required()))
-    {
-        NRF_LOG_DEBUG("DFU mode because app is not valid.");
-        return true;
-    }
-
     if (NRF_BL_DFU_ENTER_METHOD_BUTTON &&
        (nrf_gpio_pin_read(NRF_BL_DFU_ENTER_METHOD_BUTTON_PIN) == 0))
     {
         NRF_LOG_DEBUG("DFU mode requested via button.");
 			  button_dfu_flag = 1;
         return true;
     }
+
+    if (!app_is_valid(crc_on_valid_app_required()))
+    {
+        NRF_LOG_DEBUG("DFU mode because app is not valid.");
+        return true;
+    }
 
     if (NRF_BL_DFU_ENTER_METHOD_PINRESET &&
        (NRF_POWER->RESETREAS & POWER_RESETREAS_RESETPIN_Msk))