[nrfconnect] Fix OTA initialization order

Recent OTA changes impose an assumption that OTA Requestor must be initialized prior to the OTA Requestor driver.
project-chip · Mar 24, 2022 · 484a64a · 484a64a
1 parent 07fc8cd
commit 484a64a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
@@ -111,7 +111,7 @@ jobs:
  /tmp/bloat_reports/
  - name: Build example nRF Connect SDK Lighting App on nRF52840 DK with RPC
  if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
- timeout-minutes: 10
+ timeout-minutes: 20
  run: |
  scripts/examples/nrfconnect_example.sh lighting-app nrf52840dk_nrf52840 -DOVERLAY_CONFIG=rpc.overlay
  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \

diff --git a/examples/all-clusters-app/nrfconnect/main/AppTask.cpp b/examples/all-clusters-app/nrfconnect/main/AppTask.cpp
@@ -149,9 +149,9 @@ void AppTask::InitOTARequestor()
 #if CONFIG_CHIP_OTA_REQUESTOR
  mOTAImageProcessor.SetOTADownloader(&mBDXDownloader);
  mBDXDownloader.SetImageProcessorDelegate(&mOTAImageProcessor);
- mOTARequestorDriver.Init(&mOTARequestor, &mOTAImageProcessor);
  mOTARequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
  mOTARequestor.Init(chip::Server::GetInstance(), mOTARequestorStorage, mOTARequestorDriver, mBDXDownloader);
+ mOTARequestorDriver.Init(&mOTARequestor, &mOTAImageProcessor);
  chip::SetRequestorInstance(&mOTARequestor);
 #endif
 }

diff --git a/examples/lighting-app/nrfconnect/main/AppTask.cpp b/examples/lighting-app/nrfconnect/main/AppTask.cpp
@@ -204,9 +204,9 @@ void AppTask::InitOTARequestor()
 #if CONFIG_CHIP_OTA_REQUESTOR
  sOTAImageProcessor.SetOTADownloader(&sBDXDownloader);
  sBDXDownloader.SetImageProcessorDelegate(&sOTAImageProcessor);
- sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
  sRequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
  sOTARequestor.Init(Server::GetInstance(), sRequestorStorage, sOTARequestorDriver, sBDXDownloader);
+ sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
  chip::SetRequestorInstance(&sOTARequestor);
 #endif
 }

diff --git a/examples/lock-app/nrfconnect/main/AppTask.cpp b/examples/lock-app/nrfconnect/main/AppTask.cpp
@@ -185,9 +185,9 @@ void AppTask::InitOTARequestor()
 #if CONFIG_CHIP_OTA_REQUESTOR
  sOTAImageProcessor.SetOTADownloader(&sBDXDownloader);
  sBDXDownloader.SetImageProcessorDelegate(&sOTAImageProcessor);
- sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
  sRequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
  sOTARequestor.Init(Server::GetInstance(), sRequestorStorage, sOTARequestorDriver, sBDXDownloader);
+ sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
  chip::SetRequestorInstance(&sOTARequestor);
 #endif
 }

diff --git a/examples/pump-app/nrfconnect/main/AppTask.cpp b/examples/pump-app/nrfconnect/main/AppTask.cpp
@@ -182,9 +182,9 @@ void AppTask::InitOTARequestor()
 #if CONFIG_CHIP_OTA_REQUESTOR
  sOTAImageProcessor.SetOTADownloader(&sBDXDownloader);
  sBDXDownloader.SetImageProcessorDelegate(&sOTAImageProcessor);
- sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
  sRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
  sOTARequestor.Init(chip::Server::GetInstance(), sRequestorStorage, sOTARequestorDriver, sBDXDownloader);
+ sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
  chip::SetRequestorInstance(&sOTARequestor);
 #endif
 }

diff --git a/examples/pump-controller-app/nrfconnect/main/AppTask.cpp b/examples/pump-controller-app/nrfconnect/main/AppTask.cpp
@@ -179,9 +179,9 @@ void AppTask::InitOTARequestor()
 #if CONFIG_CHIP_OTA_REQUESTOR
  sOTAImageProcessor.SetOTADownloader(&sBDXDownloader);
  sBDXDownloader.SetImageProcessorDelegate(&sOTAImageProcessor);
- sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
  sRequestorStorage.Init(chip::Server::GetInstance().GetPersistentStorage());
  sOTARequestor.Init(chip::Server::GetInstance(), sRequestorStorage, sOTARequestorDriver, sBDXDownloader);
+ sOTARequestorDriver.Init(&sOTARequestor, &sOTAImageProcessor);
  chip::SetRequestorInstance(&sOTARequestor);
 #endif
 }