From 25764570ece58d9913d260b8e4c8169d0d46274d Mon Sep 17 00:00:00 2001 From: Kamil Kasperczyk <66371704+kkasperczyk-no@users.noreply.github.com> Date: Fri, 28 Oct 2022 00:42:27 +0200 Subject: [PATCH] [nrfconnect] Switched to using nRF Connect SDK 2.1.1 version (#23333) Changed recommended nRF Connect SDK revision to 2.1.1 and did some necessary alignments: * nRF platform - Added support for SPI NOR external flash - Enabled entering QSPI NOR deep sleep mode for nRF52 family * nRF examples - Removed flash controller configuration from examples DTS - Aligned DFUOverSMP callback API and optimized power consumption by disabling QSPI NOR - Fixed emitting leave event at factory reset in window-app - Moved OTARequestor initialization to kDnssdPlatformInitialized event handler to avoid race condition (sending NotifyUpdateApplied if SRP client is not yet fully initialized) - Changed MRP local active retry interval for lighting-app to avoid packet stall while switching from Thread child to router --- .github/workflows/bloat_check.yaml | 2 +- .github/workflows/build.yaml | 6 +-- .github/workflows/chef.yaml | 6 +-- .github/workflows/cirque.yaml | 4 +- .github/workflows/doxygen.yaml | 2 +- .github/workflows/examples-ameba.yaml | 2 +- .../workflows/examples-cc13x2x7_26x2x7.yaml | 2 +- .github/workflows/examples-efr32.yaml | 2 +- .github/workflows/examples-esp32.yaml | 4 +- .github/workflows/examples-infineon.yaml | 2 +- .github/workflows/examples-k32w.yaml | 2 +- .github/workflows/examples-linux-arm.yaml | 2 +- .github/workflows/examples-linux-imx.yaml | 2 +- .../workflows/examples-linux-standalone.yaml | 2 +- .github/workflows/examples-mbed.yaml | 2 +- .github/workflows/examples-mw320.yaml | 2 +- .github/workflows/examples-nrfconnect.yaml | 2 +- .github/workflows/examples-qpg.yaml | 2 +- .github/workflows/examples-telink.yaml | 2 +- .github/workflows/examples-tizen.yaml | 2 +- .github/workflows/full-android.yaml | 2 +- .github/workflows/fuzzing-build.yaml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/qemu.yaml | 2 +- .github/workflows/release_artifacts.yaml | 4 +- .github/workflows/smoketest-android.yaml | 2 +- .github/workflows/tests.yaml | 4 +- .github/workflows/unit_integration_test.yaml | 2 +- .github/workflows/zap_regeneration.yaml | 2 +- .github/workflows/zap_templates.yaml | 2 +- .../.nrfconnect-recommended-revision | 2 +- .../nrfconnect/chip-module/Kconfig.defaults | 15 +++++++ .../nrfconnect/chip-module/Kconfig.features | 21 ++++++++- .../chip-module/Kconfig.mcuboot.defaults | 34 ++++++++++++++ .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 44 ------------------- .../nrfconnect/main/AppTask.cpp | 7 +-- .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 44 ------------------- .../nrfconnect/main/AppTask.cpp | 9 ++-- .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 44 ------------------- .../nrfconnect/main/AppTask.cpp | 7 +-- .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 44 ------------------- .../lighting-app/nrfconnect/main/AppTask.cpp | 7 +-- .../main/include/CHIPProjectConfig.h | 5 +++ .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 44 ------------------- examples/lock-app/nrfconnect/main/AppTask.cpp | 7 +-- .../platform/nrfconnect/util/DFUOverSMP.cpp | 37 ++++++++-------- .../nrfconnect/util/include/DFUOverSMP.h | 5 +-- .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 44 ------------------- examples/pump-app/nrfconnect/main/AppTask.cpp | 7 +-- .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 44 ------------------- .../nrfconnect/main/AppTask.cpp | 7 +-- .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 43 ------------------ .../window-app/nrfconnect/main/AppTask.cpp | 10 ++--- integrations/cloudbuild/build-all.yaml | 4 +- integrations/cloudbuild/chef.yaml | 6 +-- integrations/cloudbuild/smoke-test.yaml | 14 +++--- .../nrfconnect/OTAImageProcessorImpl.cpp | 2 +- 57 files changed, 167 insertions(+), 466 deletions(-) diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml index 0ade2ba36e3ceb..4849a8df42021b 100644 --- a/.github/workflows/bloat_check.yaml +++ b/.github/workflows/bloat_check.yaml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build:0.6.03 + image: connectedhomeip/chip-build:0.6.05 steps: - uses: Wandalen/wretry.action@v1.0.15 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1773ffc4f07ea4..750506bbf62a7c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -32,7 +32,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.6.03 + image: connectedhomeip/chip-build:0.6.05 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -133,7 +133,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.6.03 + image: connectedhomeip/chip-build:0.6.05 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -287,7 +287,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.6.03 + image: connectedhomeip/chip-build:0.6.05 volumes: - "/tmp/log_output:/tmp/test_logs" options: --sysctl "net.ipv6.conf.all.disable_ipv6=0 diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml index bfc8bf691493d0..9484e01243754b 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -29,7 +29,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.6.03 + image: connectedhomeip/chip-build:0.6.05 options: --user root steps: @@ -57,7 +57,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-esp32:0.6.03 + image: connectedhomeip/chip-build-esp32:0.6.05 options: --user root steps: @@ -85,7 +85,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-nrf-platform:0.6.03 + image: connectedhomeip/chip-build-nrf-platform:0.6.05 options: --user root steps: diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml index 7df21a6813176e..78d501293a33ad 100644 --- a/.github/workflows/cirque.yaml +++ b/.github/workflows/cirque.yaml @@ -29,7 +29,7 @@ jobs: timeout-minutes: 90 env: - DOCKER_RUN_VERSION: 0.6.03 + DOCKER_RUN_VERSION: 0.6.05 GITHUB_CACHE_PATH: /tmp/cirque-cache/ runs-on: ubuntu-latest @@ -38,7 +38,7 @@ jobs: # need to run with privilege, which isn't supported by job.XXX.contaner # https://github.com/actions/container-action/issues/2 # container: - # image: connectedhomeip/chip-build-cirque:0.6.03 + # image: connectedhomeip/chip-build-cirque:0.6.05 # volumes: # - "/tmp:/tmp" # - "/dev/pts:/dev/pts" diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml index b04119919a8f98..075154910b4e2a 100644 --- a/.github/workflows/doxygen.yaml +++ b/.github/workflows/doxygen.yaml @@ -82,7 +82,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: connectedhomeip/chip-build-doxygen:0.6.03 + image: connectedhomeip/chip-build-doxygen:0.6.05 if: github.actor != 'restyled-io[bot]' diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml index dfeaaeb8189e93..0f22ae0b5b73ad 100644 --- a/.github/workflows/examples-ameba.yaml +++ b/.github/workflows/examples-ameba.yaml @@ -32,7 +32,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-ameba:0.6.03 + image: connectedhomeip/chip-build-ameba:0.6.05 options: --user root steps: diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml index 2fea339a3071bd..26a35488aa620f 100644 --- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml +++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-ti:0.6.03 + image: connectedhomeip/chip-build-ti:0.6.05 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index dc9e4fe1281e1e..5bf7067b231077 100644 --- a/.github/workflows/examples-efr32.yaml +++ b/.github/workflows/examples-efr32.yaml @@ -35,7 +35,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-efr32:0.6.03 + image: connectedhomeip/chip-build-efr32:0.6.05 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml index 028459c92f035c..0da3c73d34794d 100644 --- a/.github/workflows/examples-esp32.yaml +++ b/.github/workflows/examples-esp32.yaml @@ -31,7 +31,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-esp32:0.6.03 + image: connectedhomeip/chip-build-esp32:0.6.05 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" @@ -119,7 +119,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-esp32:0.6.03 + image: connectedhomeip/chip-build-esp32:0.6.05 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml index c407e819fa4125..3bd67ff377bb2f 100644 --- a/.github/workflows/examples-infineon.yaml +++ b/.github/workflows/examples-infineon.yaml @@ -32,7 +32,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-infineon:0.6.03 + image: connectedhomeip/chip-build-infineon:0.6.05 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml index d1a5760e53b012..f62da3a00e23d2 100644 --- a/.github/workflows/examples-k32w.yaml +++ b/.github/workflows/examples-k32w.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-k32w:0.6.03 + image: connectedhomeip/chip-build-k32w:0.6.05 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml index b8b47b379a97aa..51fae3f86e6e37 100644 --- a/.github/workflows/examples-linux-arm.yaml +++ b/.github/workflows/examples-linux-arm.yaml @@ -31,7 +31,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-crosscompile:0.6.03 + image: connectedhomeip/chip-build-crosscompile:0.6.05 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml index d2b447799a0d48..81d8d60537ea90 100644 --- a/.github/workflows/examples-linux-imx.yaml +++ b/.github/workflows/examples-linux-imx.yaml @@ -31,7 +31,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-imx:0.6.03 + image: connectedhomeip/chip-build-imx:0.6.05 steps: - uses: Wandalen/wretry.action@v1.0.15 diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml index 3418a8e35be7c6..38438ecfea0b8a 100644 --- a/.github/workflows/examples-linux-standalone.yaml +++ b/.github/workflows/examples-linux-standalone.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.6.03 + image: connectedhomeip/chip-build:0.6.05 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml index af9e87d29d8cb9..f7a69bd3de3054 100644 --- a/.github/workflows/examples-mbed.yaml +++ b/.github/workflows/examples-mbed.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-mbed-os:0.6.03 + image: connectedhomeip/chip-build-mbed-os:0.6.05 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml index 8e1199eaea7282..93c2327ba3ad74 100755 --- a/.github/workflows/examples-mw320.yaml +++ b/.github/workflows/examples-mw320.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.6.03 + image: connectedhomeip/chip-build:0.6.05 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml index 1764bf7f295bd4..c6b729f3776855 100644 --- a/.github/workflows/examples-nrfconnect.yaml +++ b/.github/workflows/examples-nrfconnect.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-nrf-platform:0.6.03 + image: connectedhomeip/chip-build-nrf-platform:0.6.05 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml index b6e49846e718dc..56656a645da7cd 100644 --- a/.github/workflows/examples-qpg.yaml +++ b/.github/workflows/examples-qpg.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.6.03 + image: connectedhomeip/chip-build:0.6.05 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index 9220b9be01afeb..19d9bc36ce911e 100644 --- a/.github/workflows/examples-telink.yaml +++ b/.github/workflows/examples-telink.yaml @@ -32,7 +32,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-telink:0.6.03 + image: connectedhomeip/chip-build-telink:0.6.05 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml index 5740b3e129b2d3..47c9e880deae69 100644 --- a/.github/workflows/examples-tizen.yaml +++ b/.github/workflows/examples-tizen.yaml @@ -32,7 +32,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-tizen:0.6.03 + image: connectedhomeip/chip-build-tizen:0.6.05 options: --user root volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index dcfb52b16260b9..176f2ac65a1d81 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-android:0.6.03 + image: connectedhomeip/chip-build-android:0.6.05 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml index 5a350aeecfd0f0..b9267d9a5e9afc 100644 --- a/.github/workflows/fuzzing-build.yaml +++ b/.github/workflows/fuzzing-build.yaml @@ -31,7 +31,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.6.03 + image: connectedhomeip/chip-build:0.6.05 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9eebd41beb3384..2b4fe4a91150d4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -28,7 +28,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.6.02 + image: connectedhomeip/chip-build:0.6.05 steps: - uses: Wandalen/wretry.action@v1.0.15 diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml index 5d59c41e6f5b92..eb083791dd2a93 100644 --- a/.github/workflows/qemu.yaml +++ b/.github/workflows/qemu.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-esp32-qemu:0.6.03 + image: connectedhomeip/chip-build-esp32-qemu:0.6.05 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml index 93c20b4bac5edd..6bc9abad9d117f 100644 --- a/.github/workflows/release_artifacts.yaml +++ b/.github/workflows/release_artifacts.yaml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build-esp32:0.6.03 + image: connectedhomeip/chip-build-esp32:0.6.05 steps: - uses: Wandalen/wretry.action@v1.0.15 @@ -75,7 +75,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build-efr32:0.6.03 + image: connectedhomeip/chip-build-efr32:0.6.05 steps: - uses: Wandalen/wretry.action@v1.0.15 name: Checkout diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index 2e556fdd6f3d4d..af5c8c7d565482 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-android:0.6.03 + image: connectedhomeip/chip-build-android:0.6.05 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index f58cc0c69ecce7..0e88bb57277978 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build:0.6.03 + image: connectedhomeip/chip-build:0.6.05 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" @@ -347,7 +347,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build:0.6.03 + image: connectedhomeip/chip-build:0.6.05 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0" diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml index 67799e71ebf6e7..c2875c49d52538 100644 --- a/.github/workflows/unit_integration_test.yaml +++ b/.github/workflows/unit_integration_test.yaml @@ -37,7 +37,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build:0.6.03 + image: connectedhomeip/chip-build:0.6.05 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml index fd370fddd92b54..9f76f042d7f136 100644 --- a/.github/workflows/zap_regeneration.yaml +++ b/.github/workflows/zap_regeneration.yaml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: connectedhomeip/chip-build-zap:0.6.03 + image: connectedhomeip/chip-build-zap:0.6.05 defaults: run: shell: sh diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml index e0494318eb3264..0a16f8e6ede8e7 100644 --- a/.github/workflows/zap_templates.yaml +++ b/.github/workflows/zap_templates.yaml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: connectedhomeip/chip-build-zap:0.6.03 + image: connectedhomeip/chip-build-zap:0.6.05 defaults: run: shell: sh diff --git a/config/nrfconnect/.nrfconnect-recommended-revision b/config/nrfconnect/.nrfconnect-recommended-revision index f3b15f3f8ee753..826e1424638453 100644 --- a/config/nrfconnect/.nrfconnect-recommended-revision +++ b/config/nrfconnect/.nrfconnect-recommended-revision @@ -1 +1 @@ -v2.0.2 +v2.1.1 diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults index 2a251ccb038402..228dbaeb478089 100644 --- a/config/nrfconnect/chip-module/Kconfig.defaults +++ b/config/nrfconnect/chip-module/Kconfig.defaults @@ -181,10 +181,25 @@ config CHIP_OTA_REQUESTOR bool default y +# All boards besides nRF7002DK use QSPI NOR external flash +if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840 + config CHIP_QSPI_NOR bool default y +endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840 + +# nRF7002DK uses SPI NOR external flash + +if BOARD_NRF7002DK_NRF5340_CPUAPP + +config CHIP_SPI_NOR + bool + default y + +endif # BOARD_NRF7002DK_NRF5340_CPUAPP + # Enable extended discovery config CHIP_EXTENDED_DISCOVERY bool diff --git a/config/nrfconnect/chip-module/Kconfig.features b/config/nrfconnect/chip-module/Kconfig.features index b63983a11e9e3f..1f12053658f23e 100644 --- a/config/nrfconnect/chip-module/Kconfig.features +++ b/config/nrfconnect/chip-module/Kconfig.features @@ -37,9 +37,28 @@ config NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE endif # CHIP_QSPI_NOR +config CHIP_SPI_NOR + bool "Enable SPI NOR feature set" + imply SPI + imply SPI_NOR + imply MULTITHREADING + imply PM_OVERRIDE_EXTERNAL_DRIVER_CHECK + help + Enables SPI NOR with the set of options + configuring pages and buffer sizes. + +if CHIP_SPI_NOR + +config SPI_NOR_FLASH_LAYOUT_PAGE_SIZE + int + default 4096 + +endif # CHIP_SPI_NOR + config CHIP_DFU_OVER_BT_SMP bool "Enable DFU over Bluetooth LE SMP feature set" - imply CHIP_QSPI_NOR + imply CHIP_QSPI_NOR if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840 + imply CHIP_SPI_NOR if BOARD_NRF7002DK_NRF5340_CPUAPP imply BOOTLOADER_MCUBOOT help Enables Device Firmware Upgrade over Bluetoot LE with SMP diff --git a/config/nrfconnect/chip-module/Kconfig.mcuboot.defaults b/config/nrfconnect/chip-module/Kconfig.mcuboot.defaults index 2e2ea5b0f23241..b9c6dce1982fb7 100644 --- a/config/nrfconnect/chip-module/Kconfig.mcuboot.defaults +++ b/config/nrfconnect/chip-module/Kconfig.mcuboot.defaults @@ -52,6 +52,38 @@ config FPROTECT bool default y +# nRF7002DK uses SPI NOR external flash +if BOARD_NRF7002DK_NRF5340_CPUAPP + +config SPI + bool + default y + +config SPI_NOR + bool + default y + +choice SPI_NOR_SFDP + default SPI_NOR_SFDP_DEVICETREE +endchoice + +config SPI_NOR_FLASH_LAYOUT_PAGE_SIZE + int + default 4096 + +config MULTITHREADING + bool + default y + +config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK + bool + default y + +endif + +# All boards beside nRF7002DK use QSPI NOR external flash +if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF52840DK_NRF52840 + config NORDIC_QSPI_NOR bool default y @@ -64,6 +96,8 @@ config NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE int default 16 +endif + config BOOT_MAX_IMG_SECTORS int default 256 diff --git a/examples/all-clusters-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/all-clusters-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay index 5be8b8fd5f736f..b8030f42c1def9 100644 --- a/examples/all-clusters-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/examples/all-clusters-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -19,50 +19,6 @@ nordic,pm-ext-flash = &mx25r64; }; - soc { - /* Add a flash controller which has the compatible - * 'zephyr,sim-flash'. This will ensure that the flash - * simulator can use it. None of the other properties in this - * node is used for anything. - */ - nordic_ram_flash_controller: nordic_ram-flash-controller@0 { - compatible = "zephyr,sim-flash"; - reg = <0x00000000 DT_SIZE_K(40)>; - #address-cells = <1>; - #size-cells = <1>; - erase-value = <0xff>; - label = "nordic_ram_flash_flash_controller"; - - /* This node label must match that used in the flash - * simulator. - */ - flash_sim0: flash_sim@0 { - status = "okay"; - compatible = "soc-nv-flash"; - label = "simulated_flash"; - erase-block-size = <4096>; - write-block-size = <4>; - reg = <0x00000000 DT_SIZE_K(256)>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* This partition must be defined for - * MCUboot to find the partition ID - * of the primary slot for image 1, - * which is stored in this partition. - */ - slot2_partition: partition@0 { - label = "image-2"; - reg = <0x00000000 0x00000A000>; - }; - }; - }; - }; - }; - }; /* Disable unused peripherals to reduce power consumption */ diff --git a/examples/all-clusters-app/nrfconnect/main/AppTask.cpp b/examples/all-clusters-app/nrfconnect/main/AppTask.cpp index be4a44dc8a2985..60519e928c6632 100644 --- a/examples/all-clusters-app/nrfconnect/main/AppTask.cpp +++ b/examples/all-clusters-app/nrfconnect/main/AppTask.cpp @@ -432,12 +432,9 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * aEvent, intptr_t /* aArg Instance().mIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); UpdateStatusLED(); break; - case DeviceEventType::kThreadConnectivityChange: + case DeviceEventType::kDnssdPlatformInitialized: #if CONFIG_CHIP_OTA_REQUESTOR - if (aEvent->ThreadConnectivityChange.Result == kConnectivity_Established) - { - InitBasicOTARequestor(); - } + InitBasicOTARequestor(); #endif break; default: diff --git a/examples/all-clusters-minimal-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/all-clusters-minimal-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay index 5be8b8fd5f736f..b8030f42c1def9 100644 --- a/examples/all-clusters-minimal-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/examples/all-clusters-minimal-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -19,50 +19,6 @@ nordic,pm-ext-flash = &mx25r64; }; - soc { - /* Add a flash controller which has the compatible - * 'zephyr,sim-flash'. This will ensure that the flash - * simulator can use it. None of the other properties in this - * node is used for anything. - */ - nordic_ram_flash_controller: nordic_ram-flash-controller@0 { - compatible = "zephyr,sim-flash"; - reg = <0x00000000 DT_SIZE_K(40)>; - #address-cells = <1>; - #size-cells = <1>; - erase-value = <0xff>; - label = "nordic_ram_flash_flash_controller"; - - /* This node label must match that used in the flash - * simulator. - */ - flash_sim0: flash_sim@0 { - status = "okay"; - compatible = "soc-nv-flash"; - label = "simulated_flash"; - erase-block-size = <4096>; - write-block-size = <4>; - reg = <0x00000000 DT_SIZE_K(256)>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* This partition must be defined for - * MCUboot to find the partition ID - * of the primary slot for image 1, - * which is stored in this partition. - */ - slot2_partition: partition@0 { - label = "image-2"; - reg = <0x00000000 0x00000A000>; - }; - }; - }; - }; - }; - }; /* Disable unused peripherals to reduce power consumption */ diff --git a/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp b/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp index ff778d944c6c76..b78d291f1b74c0 100644 --- a/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp +++ b/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp @@ -149,9 +149,7 @@ CHIP_ERROR AppTask::Init() static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams)); -#if CONFIG_CHIP_OTA_REQUESTOR - InitBasicOTARequestor(); -#endif + // We only have network commissioning on endpoint 0. emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false); ConfigurationMgr().LogDeviceConfig(); @@ -372,6 +370,11 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * aEvent, intptr_t /* aArg Instance().mIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); UpdateStatusLED(); break; + case DeviceEventType::kDnssdPlatformInitialized: +#if CONFIG_CHIP_OTA_REQUESTOR + InitBasicOTARequestor(); +#endif + break; default: break; } diff --git a/examples/light-switch-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/light-switch-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay index 16973a1b1570ee..cf300f82ba0a4a 100644 --- a/examples/light-switch-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/examples/light-switch-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -19,48 +19,4 @@ nordic,pm-ext-flash = &mx25r64; }; - soc { - /* Add a flash controller which has the compatible - * 'zephyr,sim-flash'. This will ensure that the flash - * simulator can use it. None of the other properties in this - * node is used for anything. - */ - nordic_ram_flash_controller: nordic_ram-flash-controller@0 { - compatible = "zephyr,sim-flash"; - reg = <0x00000000 DT_SIZE_K(40)>; - #address-cells = <1>; - #size-cells = <1>; - erase-value = <0xff>; - label = "nordic_ram_flash_flash_controller"; - - /* This node label must match that used in the flash - * simulator. - */ - flash_sim0: flash_sim@0 { - status = "okay"; - compatible = "soc-nv-flash"; - label = "simulated_flash"; - erase-block-size = <4096>; - write-block-size = <4>; - reg = <0x00000000 DT_SIZE_K(256)>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* This partition must be defined for - * MCUboot to find the partition ID - * of the primary slot for image 1, - * which is stored in this partition. - */ - slot2_partition: partition@0 { - label = "image-2"; - reg = <0x00000000 0x00000A000>; - }; - }; - }; - }; - }; - }; diff --git a/examples/light-switch-app/nrfconnect/main/AppTask.cpp b/examples/light-switch-app/nrfconnect/main/AppTask.cpp index f45ee45cc6c855..dd388276964660 100644 --- a/examples/light-switch-app/nrfconnect/main/AppTask.cpp +++ b/examples/light-switch-app/nrfconnect/main/AppTask.cpp @@ -417,12 +417,9 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * aEvent, intptr_t /* arg * sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); UpdateStatusLED(); break; - case DeviceEventType::kThreadConnectivityChange: + case DeviceEventType::kDnssdPlatformInitialized: #if CONFIG_CHIP_OTA_REQUESTOR - if (aEvent->ThreadConnectivityChange.Result == kConnectivity_Established) - { - InitBasicOTARequestor(); - } + InitBasicOTARequestor(); #endif break; default: diff --git a/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay index 1e1fc11fa67052..d900ac5d9861e4 100644 --- a/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/examples/lighting-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -35,50 +35,6 @@ }; }; - soc { - /* Add a flash controller which has the compatible - * 'zephyr,sim-flash'. This will ensure that the flash - * simulator can use it. None of the other properties in this - * node is used for anything. - */ - nordic_ram_flash_controller: nordic_ram-flash-controller@0 { - compatible = "zephyr,sim-flash"; - reg = <0x00000000 DT_SIZE_K(40)>; - #address-cells = <1>; - #size-cells = <1>; - erase-value = <0xff>; - label = "nordic_ram_flash_flash_controller"; - - /* This node label must match that used in the flash - * simulator. - */ - flash_sim0: flash_sim@0 { - status = "okay"; - compatible = "soc-nv-flash"; - label = "simulated_flash"; - erase-block-size = <4096>; - write-block-size = <4>; - reg = <0x00000000 DT_SIZE_K(256)>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* This partition must be defined for - * MCUboot to find the partition ID - * of the primary slot for image 1, - * which is stored in this partition. - */ - slot2_partition: partition@0 { - label = "image-2"; - reg = <0x00000000 0x00000A000>; - }; - }; - }; - }; - }; - }; &pwm0 { diff --git a/examples/lighting-app/nrfconnect/main/AppTask.cpp b/examples/lighting-app/nrfconnect/main/AppTask.cpp index e7081a5392340d..bd2375e3d02001 100644 --- a/examples/lighting-app/nrfconnect/main/AppTask.cpp +++ b/examples/lighting-app/nrfconnect/main/AppTask.cpp @@ -481,12 +481,9 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */ sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); UpdateStatusLED(); break; - case DeviceEventType::kThreadConnectivityChange: + case DeviceEventType::kDnssdPlatformInitialized: #if CONFIG_CHIP_OTA_REQUESTOR - if (event->ThreadConnectivityChange.Result == kConnectivity_Established) - { - InitBasicOTARequestor(); - } + InitBasicOTARequestor(); #endif break; default: diff --git a/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h b/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h index 7f6a313e145f87..1e94e5a3995898 100644 --- a/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h +++ b/examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h @@ -30,3 +30,8 @@ // Use a default pairing code if one hasn't been provisioned in flash. #define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021 #define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00 + +// Switching from Thread child to router may cause a few second packet stall. +// Until this is improved in OpenThread we need to increase the retransmission +// interval to survive the stall. +#define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (1000_ms32) diff --git a/examples/lock-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/lock-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay index 330f40f03f8f29..5ae48f5ba4b0da 100644 --- a/examples/lock-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/examples/lock-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -19,50 +19,6 @@ nordic,pm-ext-flash = &mx25r64; }; - soc { - /* Add a flash controller which has the compatible - * 'zephyr,sim-flash'. This will ensure that the flash - * simulator can use it. None of the other properties in this - * node is used for anything. - */ - nordic_ram_flash_controller: nordic_ram-flash-controller@0 { - compatible = "zephyr,sim-flash"; - reg = <0x00000000 DT_SIZE_K(40)>; - #address-cells = <1>; - #size-cells = <1>; - erase-value = <0xff>; - label = "nordic_ram_flash_flash_controller"; - - /* This node label must match that used in the flash - * simulator. - */ - flash_sim0: flash_sim@0 { - status = "okay"; - compatible = "soc-nv-flash"; - label = "simulated_flash"; - erase-block-size = <4096>; - write-block-size = <4>; - reg = <0x00000000 DT_SIZE_K(256)>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* This partition must be defined for - * MCUboot to find the partition ID - * of the primary slot for image 1, - * which is stored in this partition. - */ - slot2_partition: partition@0 { - label = "image-2"; - reg = <0x00000000 0x00000A000>; - }; - }; - }; - }; - }; - }; /* Disable unused peripherals to reduce power consumption */ diff --git a/examples/lock-app/nrfconnect/main/AppTask.cpp b/examples/lock-app/nrfconnect/main/AppTask.cpp index 1ba1bd52fcdaef..cb46530b93df85 100644 --- a/examples/lock-app/nrfconnect/main/AppTask.cpp +++ b/examples/lock-app/nrfconnect/main/AppTask.cpp @@ -457,12 +457,9 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */ sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); UpdateStatusLED(); break; - case DeviceEventType::kThreadConnectivityChange: + case DeviceEventType::kDnssdPlatformInitialized: #if CONFIG_CHIP_OTA_REQUESTOR - if (event->ThreadConnectivityChange.Result == kConnectivity_Established) - { - InitBasicOTARequestor(); - } + InitBasicOTARequestor(); #endif break; default: diff --git a/examples/platform/nrfconnect/util/DFUOverSMP.cpp b/examples/platform/nrfconnect/util/DFUOverSMP.cpp index c4b496d575fc26..e58638342948a2 100644 --- a/examples/platform/nrfconnect/util/DFUOverSMP.cpp +++ b/examples/platform/nrfconnect/util/DFUOverSMP.cpp @@ -43,16 +43,27 @@ void DFUOverSMP::Init(DFUOverSMPRestartAdvertisingHandler startAdvertisingCb) { os_mgmt_register_group(); img_mgmt_register_group(); - img_mgmt_set_upload_cb(UploadConfirmHandler, NULL); + img_mgmt_set_upload_cb(UploadConfirmHandler); memset(&mBleConnCallbacks, 0, sizeof(mBleConnCallbacks)); - mBleConnCallbacks.connected = OnBleConnect; + mBleConnCallbacks.connected = nullptr; mBleConnCallbacks.disconnected = OnBleDisconnect; bt_conn_cb_register(&mBleConnCallbacks); - k_work_init(&mFlashSleepWork, [](k_work *) { GetFlashHandler().DoAction(FlashHandler::Action::SLEEP); }); - k_work_init(&mFlashWakeUpWork, [](k_work *) { GetFlashHandler().DoAction(FlashHandler::Action::WAKE_UP); }); + mgmt_register_evt_cb([](uint8_t opcode, uint16_t group, uint8_t id, void * arg) { + switch (opcode) + { + case MGMT_EVT_OP_CMD_RECV: + GetFlashHandler().DoAction(FlashHandler::Action::WAKE_UP); + break; + case MGMT_EVT_OP_CMD_DONE: + GetFlashHandler().DoAction(FlashHandler::Action::SLEEP); + break; + default: + break; + } + }); restartAdvertisingCallback = startAdvertisingCb; @@ -76,10 +87,11 @@ void DFUOverSMP::ConfirmNewImage() } } -int DFUOverSMP::UploadConfirmHandler(uint32_t offset, uint32_t size, void * arg) +int DFUOverSMP::UploadConfirmHandler(const struct img_mgmt_upload_req req, const struct img_mgmt_upload_action action) { // For now just print update progress and confirm data chunk without any additional checks. - ChipLogProgress(DeviceLayer, "Software update progress %d B / %d B", offset, size); + ChipLogProgress(DeviceLayer, "Software update progress of image %u: %u B / %u B", static_cast(req.image), + static_cast(req.off), static_cast(action.size)); return 0; } @@ -136,21 +148,8 @@ void DFUOverSMP::StartBLEAdvertising() } } -void DFUOverSMP::OnBleConnect(bt_conn * conn, uint8_t err) -{ - if (GetDFUOverSMP().IsEnabled()) - { - (void) k_work_submit(&sDFUOverSMP.mFlashWakeUpWork); - } -} - void DFUOverSMP::OnBleDisconnect(struct bt_conn * conId, uint8_t reason) { - if (GetDFUOverSMP().IsEnabled()) - { - (void) k_work_submit(&sDFUOverSMP.mFlashSleepWork); - } - PlatformMgr().LockChipStack(); // After BLE disconnect SMP advertising needs to be restarted. Before making it ensure that BLE disconnect was not triggered diff --git a/examples/platform/nrfconnect/util/include/DFUOverSMP.h b/examples/platform/nrfconnect/util/include/DFUOverSMP.h index c6c04b474b8f68..cf839cf166911f 100644 --- a/examples/platform/nrfconnect/util/include/DFUOverSMP.h +++ b/examples/platform/nrfconnect/util/include/DFUOverSMP.h @@ -41,16 +41,13 @@ class DFUOverSMP private: friend DFUOverSMP & GetDFUOverSMP(void); - static int UploadConfirmHandler(uint32_t offset, uint32_t size, void * arg); - static void OnBleConnect(bt_conn * conn, uint8_t err); + static int UploadConfirmHandler(const struct img_mgmt_upload_req req, const struct img_mgmt_upload_action action); static void OnBleDisconnect(bt_conn * conn, uint8_t reason); static void ChipEventHandler(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg); bool mIsEnabled; bool mIsAdvertisingEnabled; bt_conn_cb mBleConnCallbacks; - k_work mFlashSleepWork; - k_work mFlashWakeUpWork; DFUOverSMPRestartAdvertisingHandler restartAdvertisingCallback; static DFUOverSMP sDFUOverSMP; diff --git a/examples/pump-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/pump-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay index 0d142802009fe3..76031564db7950 100644 --- a/examples/pump-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/examples/pump-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -19,48 +19,4 @@ nordic,pm-ext-flash = &mx25r64; }; - soc { - /* Add a flash controller which has the compatible - * 'zephyr,sim-flash'. This will ensure that the flash - * simulator can use it. None of the other properties in this - * node is used for anything. - */ - nordic_ram_flash_controller: nordic_ram-flash-controller@0 { - compatible = "zephyr,sim-flash"; - reg = <0x00000000 DT_SIZE_K(40)>; - #address-cells = <1>; - #size-cells = <1>; - erase-value = <0xff>; - label = "nordic_ram_flash_flash_controller"; - - /* This node label must match that used in the flash - * simulator. - */ - flash_sim0: flash_sim@0 { - status = "okay"; - compatible = "soc-nv-flash"; - label = "simulated_flash"; - erase-block-size = <4096>; - write-block-size = <4>; - reg = <0x00000000 DT_SIZE_K(256)>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* This partition must be defined for - * MCUboot to find the partition ID - * of the primary slot for image 1, - * which is stored in this partition. - */ - slot2_partition: partition@0 { - label = "image-2"; - reg = <0x00000000 0x00000A000>; - }; - }; - }; - }; - }; - }; diff --git a/examples/pump-app/nrfconnect/main/AppTask.cpp b/examples/pump-app/nrfconnect/main/AppTask.cpp index e5edb5cf815f00..7ab470249da53b 100644 --- a/examples/pump-app/nrfconnect/main/AppTask.cpp +++ b/examples/pump-app/nrfconnect/main/AppTask.cpp @@ -466,12 +466,9 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */ sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); UpdateStatusLED(); break; - case DeviceEventType::kThreadConnectivityChange: + case DeviceEventType::kDnssdPlatformInitialized: #if CONFIG_CHIP_OTA_REQUESTOR - if (event->ThreadConnectivityChange.Result == kConnectivity_Established) - { - InitBasicOTARequestor(); - } + InitBasicOTARequestor(); #endif break; default: diff --git a/examples/pump-controller-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/pump-controller-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay index 0d142802009fe3..76031564db7950 100644 --- a/examples/pump-controller-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/examples/pump-controller-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -19,48 +19,4 @@ nordic,pm-ext-flash = &mx25r64; }; - soc { - /* Add a flash controller which has the compatible - * 'zephyr,sim-flash'. This will ensure that the flash - * simulator can use it. None of the other properties in this - * node is used for anything. - */ - nordic_ram_flash_controller: nordic_ram-flash-controller@0 { - compatible = "zephyr,sim-flash"; - reg = <0x00000000 DT_SIZE_K(40)>; - #address-cells = <1>; - #size-cells = <1>; - erase-value = <0xff>; - label = "nordic_ram_flash_flash_controller"; - - /* This node label must match that used in the flash - * simulator. - */ - flash_sim0: flash_sim@0 { - status = "okay"; - compatible = "soc-nv-flash"; - label = "simulated_flash"; - erase-block-size = <4096>; - write-block-size = <4>; - reg = <0x00000000 DT_SIZE_K(256)>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* This partition must be defined for - * MCUboot to find the partition ID - * of the primary slot for image 1, - * which is stored in this partition. - */ - slot2_partition: partition@0 { - label = "image-2"; - reg = <0x00000000 0x00000A000>; - }; - }; - }; - }; - }; - }; diff --git a/examples/pump-controller-app/nrfconnect/main/AppTask.cpp b/examples/pump-controller-app/nrfconnect/main/AppTask.cpp index 5a95b5268f65b0..f473d0fa94534e 100644 --- a/examples/pump-controller-app/nrfconnect/main/AppTask.cpp +++ b/examples/pump-controller-app/nrfconnect/main/AppTask.cpp @@ -462,12 +462,9 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * event, intptr_t /* arg */ sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); UpdateStatusLED(); break; - case DeviceEventType::kThreadConnectivityChange: + case DeviceEventType::kDnssdPlatformInitialized: #if CONFIG_CHIP_OTA_REQUESTOR - if (event->ThreadConnectivityChange.Result == kConnectivity_Established) - { - InitBasicOTARequestor(); - } + InitBasicOTARequestor(); #endif break; default: diff --git a/examples/window-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay b/examples/window-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay index 4b450586a3baa5..5310e26238da64 100644 --- a/examples/window-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/examples/window-app/nrfconnect/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -38,49 +38,6 @@ }; }; - soc { - /* Add a flash controller which has the compatible - * 'zephyr,sim-flash'. This will ensure that the flash - * simulator can use it. None of the other properties in this - * node is used for anything. - */ - nordic_ram_flash_controller: nordic_ram-flash-controller@0 { - compatible = "zephyr,sim-flash"; - reg = <0x00000000 DT_SIZE_K(40)>; - #address-cells = <1>; - #size-cells = <1>; - erase-value = <0xff>; - label = "nordic_ram_flash_flash_controller"; - - /* This node label must match that used in the flash - * simulator. - */ - flash_sim0: flash_sim@0 { - status = "okay"; - compatible = "soc-nv-flash"; - label = "simulated_flash"; - erase-block-size = <4096>; - write-block-size = <4>; - reg = <0x00000000 DT_SIZE_K(256)>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* This partition must be defined for - * MCUboot to find the partition ID - * of the primary slot for image 1, - * which is stored in this partition. - */ - slot2_partition: partition@0 { - label = "image-2"; - reg = <0x00000000 0x00000A000>; - }; - }; - }; - }; - }; }; diff --git a/examples/window-app/nrfconnect/main/AppTask.cpp b/examples/window-app/nrfconnect/main/AppTask.cpp index 65b6b3f6857212..77ab1af1a4960c 100644 --- a/examples/window-app/nrfconnect/main/AppTask.cpp +++ b/examples/window-app/nrfconnect/main/AppTask.cpp @@ -304,7 +304,8 @@ void AppTask::FunctionTimerEventHandler(AppEvent * aEvent) { // Actually trigger Factory Reset Instance().mMode = OperatingMode::Normal; - ConfigurationMgr().InitiateFactoryReset(); + LOG_INF("Factory Reset triggered"); + chip::Server::GetInstance().ScheduleFactoryReset(); } } @@ -528,12 +529,9 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * aEvent, intptr_t) Instance().mIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); UpdateStatusLED(); break; - case DeviceEventType::kThreadConnectivityChange: + case DeviceEventType::kDnssdPlatformInitialized: #if CONFIG_CHIP_OTA_REQUESTOR - if (aEvent->ThreadConnectivityChange.Result == kConnectivity_Established) - { - InitBasicOTARequestor(); - } + InitBasicOTARequestor(); #endif break; default: diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml index 0071bcb413d320..17c343b0b0b2b2 100644 --- a/integrations/cloudbuild/build-all.yaml +++ b/integrations/cloudbuild/build-all.yaml @@ -6,7 +6,7 @@ steps: - "--init" - "--recursive" id: Submodules - - name: "connectedhomeip/chip-build-vscode:0.6.03" + - name: "connectedhomeip/chip-build-vscode:0.6.05" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -21,7 +21,7 @@ steps: path: /pwenv timeout: 900s - - name: "connectedhomeip/chip-build-vscode:0.6.03" + - name: "connectedhomeip/chip-build-vscode:0.6.05" env: - PW_ENVIRONMENT_ROOT=/pwenv args: diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml index 4cf80ecbd23313..d8cf8c82655b3b 100644 --- a/integrations/cloudbuild/chef.yaml +++ b/integrations/cloudbuild/chef.yaml @@ -1,5 +1,5 @@ steps: - - name: "connectedhomeip/chip-build-vscode:0.6.03" + - name: "connectedhomeip/chip-build-vscode:0.6.05" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -12,7 +12,7 @@ steps: path: /pwenv timeout: 2700s - - name: "connectedhomeip/chip-build-vscode:0.6.03" + - name: "connectedhomeip/chip-build-vscode:0.6.05" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -26,7 +26,7 @@ steps: - name: pwenv path: /pwenv - - name: "connectedhomeip/chip-build-vscode:0.6.03" + - name: "connectedhomeip/chip-build-vscode:0.6.05" env: - PW_ENVIRONMENT_ROOT=/pwenv args: diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml index bc2e751f4bbce6..23cec5dec9f84a 100644 --- a/integrations/cloudbuild/smoke-test.yaml +++ b/integrations/cloudbuild/smoke-test.yaml @@ -1,5 +1,5 @@ steps: - - name: "connectedhomeip/chip-build-vscode:0.6.02" + - name: "connectedhomeip/chip-build-vscode:0.6.05" entrypoint: "bash" args: - "-c" @@ -7,7 +7,7 @@ steps: git config --global --add safe.directory "*" git submodule update --init --recursive id: Submodules - - name: "connectedhomeip/chip-build-vscode:0.6.03" + - name: "connectedhomeip/chip-build-vscode:0.6.05" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -22,7 +22,7 @@ steps: path: /pwenv timeout: 900s - - name: "connectedhomeip/chip-build-vscode:0.6.03" + - name: "connectedhomeip/chip-build-vscode:0.6.05" id: ESP32 env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -41,7 +41,7 @@ steps: - name: pwenv path: /pwenv - - name: "connectedhomeip/chip-build-vscode:0.6.03" + - name: "connectedhomeip/chip-build-vscode:0.6.05" id: NRFConnect env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -62,7 +62,7 @@ steps: - name: pwenv path: /pwenv - - name: "connectedhomeip/chip-build-vscode:0.6.03" + - name: "connectedhomeip/chip-build-vscode:0.6.05" id: EFR32 env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -84,7 +84,7 @@ steps: - name: pwenv path: /pwenv - - name: "connectedhomeip/chip-build-vscode:0.6.03" + - name: "connectedhomeip/chip-build-vscode:0.6.05" id: Linux env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -142,7 +142,7 @@ steps: - name: pwenv path: /pwenv - - name: "connectedhomeip/chip-build-vscode:0.6.03" + - name: "connectedhomeip/chip-build-vscode:0.6.05" id: Android env: - PW_ENVIRONMENT_ROOT=/pwenv diff --git a/src/platform/nrfconnect/OTAImageProcessorImpl.cpp b/src/platform/nrfconnect/OTAImageProcessorImpl.cpp index f1866fc83fb8e5..96c2fe22a55b36 100644 --- a/src/platform/nrfconnect/OTAImageProcessorImpl.cpp +++ b/src/platform/nrfconnect/OTAImageProcessorImpl.cpp @@ -211,7 +211,7 @@ void OTAImageProcessorImpl::TriggerFlashAction(FlashHandler::Action action) // external flash power consumption optimization void FlashHandler::DoAction(Action aAction) { -#if CONFIG_PM_DEVICE && CONFIG_NORDIC_QSPI_NOR && !CONFIG_SOC_NRF52840 // nRF52 is optimized per default +#if CONFIG_PM_DEVICE && CONFIG_NORDIC_QSPI_NOR // utilize the QSPI driver sleep power mode const auto * qspi_dev = DEVICE_DT_GET(DT_INST(0, nordic_qspi_nor)); if (device_is_ready(qspi_dev))