remove dfu timeout

Author: hathach

lib/sdk11/components/libraries/bootloader_dfu/bootloader.c

@@ -87,7 +87,8 @@ static void dfu_startup_timer_handler(void * p_context)
   }
 #endif
 
-  // No packets are received within timeout, terminal and DFU mode
+  // nRF52832 forced DFU on startup
+  // No packets are received within timeout, exit DFU mode
   // dfu_startup_packet_received is set by process_dfu_packet() in dfu_transport_serial.c
   if (!dfu_startup_packet_received)
   {
@@ -336,7 +337,9 @@ uint32_t bootloader_dfu_start(bool ota, uint32_t timeout_ms, bool cancel_timeout
       err_code = dfu_transport_ble_update_start();
     }else
     {
-      // timeout_ms > 0 is forced startup DFU
+      // DFU mode with timeout can be
+      // - Forced startup DFU for nRF52832 or
+      // - Makecode single tap reset but no enumerated (battery power)
       if ( timeout_ms )
       {
         dfu_startup_packet_received = false;

lib/sdk11/components/libraries/bootloader_dfu/dfu_bank_internal.h

@@ -40,8 +40,6 @@ typedef enum
     DFU_STATE_WAIT_4_ACTIVATE                                                       /**< State for: waiting for dfu_image_activate(). */
 } dfu_state_t;
 
-#define DFU_TIMEOUT_INTERVAL        APP_TIMER_TICKS(300000)    /**< DFU timeout interval in units of timer ticks. */
-
 #define IS_UPDATING_SD(START_PKT)   ((START_PKT).dfu_update_mode & DFU_UPDATE_SD)   /**< Macro for determining if a SoftDevice update is ongoing. */
 #define IS_UPDATING_BL(START_PKT)   ((START_PKT).dfu_update_mode & DFU_UPDATE_BL)   /**< Macro for determining if a Bootloader update is ongoing. */
 #define IS_UPDATING_APP(START_PKT)  ((START_PKT).dfu_update_mode & DFU_UPDATE_APP)  /**< Macro for determining if a Application update is ongoing. */

lib/sdk11/components/libraries/bootloader_dfu/dfu_single_bank.c

@@ -35,9 +35,6 @@ static uint8_t                      m_init_packet[64];          /**< Init packet
 static uint8_t                      m_init_packet_length;       /**< Length of init packet received. */
 static uint16_t                     m_image_crc;                /**< Calculated CRC of the image received. */
 
-APP_TIMER_DEF(m_dfu_timer_id);                                  /**< Application timer id. */
-static bool                         m_dfu_timed_out = false;    /**< Boolean flag value for tracking DFU timer timeout state. */
-
 static pstorage_handle_t            m_storage_handle_app;       /**< Pstorage handle for the application area (bank 0). Bank used when updating a SoftDevice w/wo bootloader. Handle also used when swapping received application from bank 1 to bank 0. */
 static pstorage_handle_t          * mp_storage_handle_active;   /**< Pointer to the pstorage handle for the active bank for receiving of data packets. */
 
@@ -83,47 +80,6 @@ static void pstorage_callback_handler(pstorage_handle_t * p_handle,
     APP_ERROR_CHECK(result);
 }
 
-
-/**@brief Function for handling the DFU timeout.
- *
- * @param[in] p_context The timeout context.
- */
-static void dfu_timeout_handler(void * p_context)
-{
-    UNUSED_PARAMETER(p_context);
-    dfu_update_status_t update_status;
-
-    m_dfu_timed_out           = true;
-    update_status.status_code = DFU_TIMEOUT;
-
-    bootloader_dfu_update_process(update_status);
-}
-
-
-/**@brief   Function for restarting the DFU Timer.
- *
- * @details This function will stop and restart the DFU timer. This function will be called by the
- *          functions handling any DFU packet received from the peer that is transferring a firmware
- *          image.
- */
-static uint32_t dfu_timer_restart(void)
-{
-    if (m_dfu_timed_out)
-    {
-        // The DFU timer had already timed out.
-        return NRF_ERROR_INVALID_STATE;
-    }
-
-    uint32_t err_code = app_timer_stop(m_dfu_timer_id);
-    APP_ERROR_CHECK(err_code);
-
-    err_code = app_timer_start(m_dfu_timer_id, DFU_TIMEOUT_INTERVAL, NULL);
-    APP_ERROR_CHECK(err_code);
-
-    return err_code;
-}
-
-
 /**@brief   Function for preparing of flash before receiving SoftDevice image.
  *
  * @details This function will erase current application area to ensure sufficient amount of
@@ -289,16 +245,6 @@ uint32_t dfu_init(void)
 
     m_storage_handle_app.block_id  = DFU_BANK_0_REGION_START;
 
-    // Create the timer to monitor the activity by the peer doing the firmware update.
-    err_code = app_timer_create(&m_dfu_timer_id,
-                                APP_TIMER_MODE_SINGLE_SHOT,
-                                dfu_timeout_handler);
-    APP_ERROR_CHECK(err_code);
-
-    // Start the DFU timer.
-    err_code = app_timer_start(m_dfu_timer_id, DFU_TIMEOUT_INTERVAL, NULL);
-    APP_ERROR_CHECK(err_code);
-
     m_data_received = 0;
     m_dfu_state     = DFU_STATE_IDLE;
 
@@ -370,11 +316,7 @@ uint32_t dfu_start_pkt_handle(dfu_update_packet_t * p_packet)
     switch (m_dfu_state)
     {
         case DFU_STATE_IDLE:
-            // Valid peer activity detected. Hence restart the DFU timer.
-            err_code = dfu_timer_restart();
-            VERIFY_SUCCESS(err_code);
             m_functions.prepare(m_image_size);
-
             break;
 
         default:
@@ -422,10 +364,6 @@ uint32_t dfu_data_pkt_handle(dfu_update_packet_t * p_packet)
                 return NRF_ERROR_DATA_SIZE;
             }
 
-            // Valid peer activity detected. Hence restart the DFU timer.
-            err_code = dfu_timer_restart();
-            VERIFY_SUCCESS(err_code);
-
             p_data = (uint32_t *)p_packet->params.data_packet.p_data_packet;
 
             if ( is_ota() )
@@ -511,10 +449,6 @@ uint32_t dfu_init_pkt_handle(dfu_update_packet_t * p_packet)
                 return NRF_ERROR_INVALID_STATE;
             }
 
-            // Valid peer activity detected. Hence restart the DFU timer.
-            err_code = dfu_timer_restart();
-            VERIFY_SUCCESS(err_code);
-
             length = p_packet->params.data_packet.packet_length * sizeof(uint32_t);
             if ((m_init_packet_length + length) > sizeof(m_init_packet))
             {
@@ -555,16 +489,9 @@ uint32_t dfu_image_validate()
             {
                 m_dfu_state = DFU_STATE_VALIDATE;
 
-                // Valid peer activity detected. Hence restart the DFU timer.
-                err_code = dfu_timer_restart();
-                if (err_code == NRF_SUCCESS)
-                {
-                    err_code = dfu_init_postvalidate((uint8_t *)mp_storage_handle_active->block_id,
-                                                     m_image_size);
-                    VERIFY_SUCCESS(err_code);
-
-                    m_dfu_state = DFU_STATE_WAIT_4_ACTIVATE;
-                }
+                err_code = dfu_init_postvalidate((uint8_t *)mp_storage_handle_active->block_id, m_image_size);
+                VERIFY_SUCCESS(err_code);
+                m_dfu_state = DFU_STATE_WAIT_4_ACTIVATE;
             }
             break;
 
@@ -584,11 +511,6 @@ uint32_t dfu_image_activate()
     switch (m_dfu_state)
     {
         case DFU_STATE_WAIT_4_ACTIVATE:
-
-            // Stop the DFU Timer because the peer activity need not be monitored any longer.
-            err_code = app_timer_stop(m_dfu_timer_id);
-            APP_ERROR_CHECK(err_code);
-
             err_code = m_functions.activate();
             break;
 

lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_serial.c

@@ -201,55 +201,55 @@ static void process_dfu_packet(void * p_event_data, uint16_t event_size)
     extern bool dfu_startup_packet_received;
     dfu_startup_packet_received = true;
 
-        while (false == DATA_QUEUE_EMPTY())
+    while (false == DATA_QUEUE_EMPTY())
+    {
+        // Fetch the element to be processed.
+        for (index = 0; index < MAX_BUFFERS ; index++)
         {
-            // Fetch the element to be processed.
-            for (index = 0; index < MAX_BUFFERS ; index++)
+            packet = &m_data_queue.data_packet[index];
+            if (INVALID_PACKET != packet->packet_type)
             {
-                packet = &m_data_queue.data_packet[index];
-                if (INVALID_PACKET != packet->packet_type)
+                switch (DATA_QUEUE_ELEMENT_GET_PTYPE(index))
                 {
-                    switch (DATA_QUEUE_ELEMENT_GET_PTYPE(index))
-                    {
-                        case DATA_PACKET:
-                            (void)dfu_data_pkt_handle(packet);
-                            break;
-
-                        case START_PACKET:
-                            packet->params.start_packet =
-                                (dfu_start_packet_t*)packet->params.data_packet.p_data_packet;
-                            retval = dfu_start_pkt_handle(packet);
-                            APP_ERROR_CHECK(retval);
-                            break;
-
-                        case INIT_PACKET:
-                            (void)dfu_init_pkt_handle(packet);
-                            retval = dfu_init_pkt_complete();
-                            APP_ERROR_CHECK(retval);
-
-                            led_state(STATE_WRITING_STARTED);
-                            break;
-
-                        case STOP_DATA_PACKET:
-                            (void)dfu_image_validate();
-                            (void)dfu_image_activate();
-
-                            led_state(STATE_WRITING_FINISHED);
-
-                            // Break the loop by returning.
-                            return;
-
-                        default:
-                            // No implementation needed.
-                            break;
-                    }
-
-                    // Free the processed element.
-                    retval = data_queue_element_free(index);
-                    APP_ERROR_CHECK(retval);
+                    case DATA_PACKET:
+                        (void)dfu_data_pkt_handle(packet);
+                        break;
+
+                    case START_PACKET:
+                        packet->params.start_packet =
+                            (dfu_start_packet_t*)packet->params.data_packet.p_data_packet;
+                        retval = dfu_start_pkt_handle(packet);
+                        APP_ERROR_CHECK(retval);
+                        break;
+
+                    case INIT_PACKET:
+                        (void)dfu_init_pkt_handle(packet);
+                        retval = dfu_init_pkt_complete();
+                        APP_ERROR_CHECK(retval);
+
+                        led_state(STATE_WRITING_STARTED);
+                        break;
+
+                    case STOP_DATA_PACKET:
+                        (void)dfu_image_validate();
+                        (void)dfu_image_activate();
+
+                        led_state(STATE_WRITING_FINISHED);
+
+                        // Break the loop by returning.
+                        return;
+
+                    default:
+                        // No implementation needed.
+                        break;
                 }
+
+                // Free the processed element.
+                retval = data_queue_element_free(index);
+                APP_ERROR_CHECK(retval);
             }
         }
+    }
 }