Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker

2021-06-29 21:10:36 +02:00
parent 660a8597f6 f317d54218
commit 4f21748aa2
8 changed files with 95 additions and 19 deletions
--- a/src/components/ble/DfuService.cpp
+++ b/src/components/ble/DfuService.cpp
@@ -121,6 +121,11 @@ int DfuService::WritePacketHandler(uint16_t connectionHandle, os_mbuf* om) {
      NRF_LOG_INFO(
        "[DFU] -> Start data received : SD size : %d, BT size : %d, app size : %d", softdeviceSize, bootloaderSize, applicationSize);

+      // wait until SystemTask has finished waking up all devices
+      while (systemTask.IsSleeping()) {
+        vTaskDelay(50); // 50ms
+      }
+
      dfuImage.Erase();

      uint8_t data[] {16, 1, 1};