From a6757810cfbb4f30ba71e3e1e58e2f682d093706 Mon Sep 17 00:00:00 2001 From: Serhii Salamakha Date: Wed, 22 Oct 2025 18:47:45 +0300 Subject: [PATCH 1/2] [Telink] Update configuration for W91 in PM & Update builds to docker version 174 --- .github/workflows/bloat_check.yaml | 2 +- .github/workflows/build.yaml | 10 ++-- .github/workflows/chef.yaml | 10 ++-- .github/workflows/doxygen.yaml | 2 +- .github/workflows/examples-ameba.yaml | 2 +- .github/workflows/examples-asr.yaml | 2 +- .github/workflows/examples-bouffalolab.yaml | 2 +- .github/workflows/examples-cc13xx_26xx.yaml | 2 +- .github/workflows/examples-cc32xx.yaml | 2 +- .github/workflows/examples-efr32.yaml | 2 +- .github/workflows/examples-esp32.yaml | 4 +- .github/workflows/examples-infineon.yaml | 2 +- .github/workflows/examples-linux-arm.yaml | 2 +- .github/workflows/examples-linux-imx.yaml | 2 +- .../workflows/examples-linux-standalone.yaml | 2 +- .../examples-linux-tv-casting-app.yaml | 2 +- .github/workflows/examples-nrfconnect.yaml | 2 +- .github/workflows/examples-nuttx.yaml | 2 +- .github/workflows/examples-nxp.yaml | 4 +- .github/workflows/examples-qpg.yaml | 2 +- .github/workflows/examples-realtek.yaml | 2 +- .github/workflows/examples-stm32.yaml | 2 +- .github/workflows/examples-telink.yaml | 16 +++---- .github/workflows/examples-tizen.yaml | 2 +- .github/workflows/full-android.yaml | 2 +- .github/workflows/fuzzing-build.yaml | 2 +- .github/workflows/java-tests.yaml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/minimal-build.yaml | 4 +- .github/workflows/mypy-validation.yml | 2 +- .github/workflows/qemu.yaml | 4 +- .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 +- config/telink/chip-module/Kconfig | 3 +- config/telink/chip-module/Kconfig.defaults | 8 ++-- examples/all-clusters-app/ameba/README.md | 4 +- .../all-clusters-minimal-app/ameba/README.md | 4 +- examples/camera-app/linux/README.md | 4 +- examples/camera-controller/README.md | 4 +- examples/chef/tests/README.md | 2 +- examples/fabric-admin/README.md | 4 +- examples/fabric-bridge-app/linux/README.md | 4 +- examples/fabric-sync/README.md | 4 +- examples/light-switch-app/ameba/README.md | 4 +- examples/lighting-app/ameba/README.md | 4 +- .../lighting-app/realtek/zephyr/README.md | 4 +- examples/ota-requestor-app/ameba/README.md | 4 +- examples/pigweed-app/ameba/README.md | 4 +- integrations/cloudbuild/chef.yaml | 10 ++-- integrations/cloudbuild/smoke-test.yaml | 14 +++--- scripts/tests/local.py | 2 +- src/platform/telink/BLEManagerImpl.cpp | 46 ++++++++++--------- src/test_driver/tizen/README.md | 4 +- 57 files changed, 129 insertions(+), 124 deletions(-) diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml index a12998a2dcea6b..2d91448d49ef9c 100644 --- a/.github/workflows/bloat_check.yaml +++ b/.github/workflows/bloat_check.yaml @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 steps: - name: Checkout diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 27184a1323dd1c..aecdbce7b91f92 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -43,7 +43,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 volumes: - "/:/runner-root-volume" - "/tmp/log_output:/tmp/test_logs" @@ -153,7 +153,7 @@ jobs: if: github.actor != 'restyled-io[bot]' && inputs.run-codeql != true container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 volumes: - "/:/runner-root-volume" - "/tmp/log_output:/tmp/test_logs" @@ -326,7 +326,7 @@ jobs: if: github.actor != 'restyled-io[bot]' && inputs.run-codeql != true container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 volumes: - "/:/runner-root-volume" - "/tmp/log_output:/tmp/test_logs" @@ -389,7 +389,7 @@ jobs: if: github.actor != 'restyled-io[bot]' && inputs.run-codeql != true container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 volumes: - "/:/runner-root-volume" - "/tmp/log_output:/tmp/test_logs" @@ -513,7 +513,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 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/chef.yaml b/.github/workflows/chef.yaml index 12cbf379895213..aa6f62d8917b10 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 options: --user root steps: @@ -58,7 +58,7 @@ jobs: timeout-minutes: 90 runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 options: >- --privileged --sysctl net.ipv6.conf.all.disable_ipv6=0 @@ -96,7 +96,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:172 + image: ghcr.io/project-chip/chip-build-esp32:174 options: --user root steps: @@ -117,7 +117,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-nrf-platform:172 + image: ghcr.io/project-chip/chip-build-nrf-platform:174 options: --user root steps: @@ -138,7 +138,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-telink:172 + image: ghcr.io/project-chip/chip-build-telink:174 options: --user root steps: diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml index 426d90c9d849c8..36af5ca3dbcb7a 100644 --- a/.github/workflows/doxygen.yaml +++ b/.github/workflows/doxygen.yaml @@ -84,7 +84,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-doxygen:172 + image: ghcr.io/project-chip/chip-build-doxygen:174 if: github.actor != 'restyled-io[bot]' diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml index 3b8ac491b910e2..eaacccc39b9206 100644 --- a/.github/workflows/examples-ameba.yaml +++ b/.github/workflows/examples-ameba.yaml @@ -39,7 +39,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ameba:172 + image: ghcr.io/project-chip/chip-build-ameba:174 options: --user root steps: diff --git a/.github/workflows/examples-asr.yaml b/.github/workflows/examples-asr.yaml index 7162397f4776d5..22220946ac2c58 100644 --- a/.github/workflows/examples-asr.yaml +++ b/.github/workflows/examples-asr.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-asr:172 + image: ghcr.io/project-chip/chip-build-asr:174 options: --user root steps: diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml index e41b0aeca53a38..4bcf1e30a156bb 100644 --- a/.github/workflows/examples-bouffalolab.yaml +++ b/.github/workflows/examples-bouffalolab.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-bouffalolab:172 + image: ghcr.io/project-chip/chip-build-bouffalolab:174 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-cc13xx_26xx.yaml b/.github/workflows/examples-cc13xx_26xx.yaml index dde46bfb2e3ec6..92ad84002d0480 100644 --- a/.github/workflows/examples-cc13xx_26xx.yaml +++ b/.github/workflows/examples-cc13xx_26xx.yaml @@ -42,7 +42,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ti:172 + image: ghcr.io/project-chip/chip-build-ti:174 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml index bba4f627e06dc8..28e7defac9231b 100644 --- a/.github/workflows/examples-cc32xx.yaml +++ b/.github/workflows/examples-cc32xx.yaml @@ -41,7 +41,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ti:172 + image: ghcr.io/project-chip/chip-build-ti:174 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index dbfd3c5d7cfe9f..158cdc0e9aaf6f 100644 --- a/.github/workflows/examples-efr32.yaml +++ b/.github/workflows/examples-efr32.yaml @@ -41,7 +41,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-efr32:172 + image: ghcr.io/project-chip/chip-build-efr32:174 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml index 691039a040984d..e8c79f943fbd6d 100644 --- a/.github/workflows/examples-esp32.yaml +++ b/.github/workflows/examples-esp32.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:172 + image: ghcr.io/project-chip/chip-build-esp32:174 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" @@ -166,7 +166,7 @@ jobs: if: github.actor != 'restyled-io[bot]' && github.repository_owner == 'espressif' container: - image: ghcr.io/project-chip/chip-build-esp32:172 + image: ghcr.io/project-chip/chip-build-esp32:174 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml index 1c52d9ee70bf52..3acc45bb58b993 100644 --- a/.github/workflows/examples-infineon.yaml +++ b/.github/workflows/examples-infineon.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-infineon:172 + image: ghcr.io/project-chip/chip-build-infineon:174 env: # TODO: this should probably be part of the dockerfile itself CY_TOOLS_PATHS: /opt/Tools/ModusToolbox/tools_3.2 diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml index 41ee6aa51c2e28..42d447b69f08c8 100644 --- a/.github/workflows/examples-linux-arm.yaml +++ b/.github/workflows/examples-linux-arm.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-crosscompile:172 + image: ghcr.io/project-chip/chip-build-crosscompile:174 steps: - name: Checkout diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml index 6dce5ec9a83cf6..aeebd47bb505ca 100644 --- a/.github/workflows/examples-linux-imx.yaml +++ b/.github/workflows/examples-linux-imx.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-imx:172 + image: ghcr.io/project-chip/chip-build-imx:174 steps: - name: Checkout diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml index e50a9295f89a85..8ae775a64b3b5e 100644 --- a/.github/workflows/examples-linux-standalone.yaml +++ b/.github/workflows/examples-linux-standalone.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 steps: - name: Checkout diff --git a/.github/workflows/examples-linux-tv-casting-app.yaml b/.github/workflows/examples-linux-tv-casting-app.yaml index 286c846004ad10..e6a10f371d29e6 100644 --- a/.github/workflows/examples-linux-tv-casting-app.yaml +++ b/.github/workflows/examples-linux-tv-casting-app.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 steps: - name: Checkout diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml index 0989b00fe7ef78..d0c08c789e81f6 100644 --- a/.github/workflows/examples-nrfconnect.yaml +++ b/.github/workflows/examples-nrfconnect.yaml @@ -40,7 +40,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-nrf-platform:172 + image: ghcr.io/project-chip/chip-build-nrf-platform:174 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-nuttx.yaml b/.github/workflows/examples-nuttx.yaml index f1a33a40eeff49..b20e92ed27452c 100644 --- a/.github/workflows/examples-nuttx.yaml +++ b/.github/workflows/examples-nuttx.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-nuttx:172 + image: ghcr.io/project-chip/chip-build-nuttx:174 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-nxp.yaml b/.github/workflows/examples-nxp.yaml index 17887d1e86f6b3..59276e9728ed9d 100644 --- a/.github/workflows/examples-nxp.yaml +++ b/.github/workflows/examples-nxp.yaml @@ -43,7 +43,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-nxp:172 + image: ghcr.io/project-chip/chip-build-nxp:174 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: @@ -202,7 +202,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-nxp-zephyr:172 + image: ghcr.io/project-chip/chip-build-nxp-zephyr:174 steps: - name: Checkout diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml index d9c67a7e6da1e7..97a408e20b9e38 100644 --- a/.github/workflows/examples-qpg.yaml +++ b/.github/workflows/examples-qpg.yaml @@ -40,7 +40,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-realtek.yaml b/.github/workflows/examples-realtek.yaml index b5878a0f9b11b9..0e2e76a0a9f0b6 100644 --- a/.github/workflows/examples-realtek.yaml +++ b/.github/workflows/examples-realtek.yaml @@ -40,7 +40,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-stm32.yaml b/.github/workflows/examples-stm32.yaml index 0839bba92746be..a1afbdf3f462ba 100644 --- a/.github/workflows/examples-stm32.yaml +++ b/.github/workflows/examples-stm32.yaml @@ -41,7 +41,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index 63e665e2e1768c..8973deb047eb9d 100644 --- a/.github/workflows/examples-telink.yaml +++ b/.github/workflows/examples-telink.yaml @@ -39,7 +39,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-telink:172 + image: ghcr.io/project-chip/chip-build-telink:174 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" @@ -343,15 +343,15 @@ jobs: - name: clean out build output (keep tools) run: rm -rf ./out/telink* - - name: Build example Telink (B91) Thermostat App + - name: Build example Telink (W91) Thermostat App # Run test for master and s07641069 PRs if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip' run: | ./scripts/run_in_build_env.sh \ - "./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-thermostat' build" + "./scripts/build/build_examples.py --target 'telink-tlsr9118bdk40d-thermostat' build" .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - telink tlsr9518adk80d thermostat \ - out/telink-tlsr9518adk80d-thermostat/zephyr/zephyr.elf \ + telink tlsr9118bdk40d thermostat \ + out/telink-tlsr9118bdk40d-thermostat/zephyr/zephyr.elf \ /tmp/bloat_reports/ - name: clean out build output (keep tools) @@ -386,7 +386,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-telink-zephyr_3_3:172 + image: ghcr.io/project-chip/chip-build-telink-zephyr_3_3:174 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" @@ -610,12 +610,12 @@ jobs: - name: clean out build output (keep tools) run: rm -rf ./out/telink* - - name: Build example Telink (B91) Thermostat App + - name: Build example Telink (w91) Thermostat App # Run test for master and s07641069 PRs if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip' run: | ./scripts/run_in_build_env.sh \ - "./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-thermostat' build" + "./scripts/build/build_examples.py --target 'telink-tlsr9118bdk40d-thermostat' build" - name: clean out build output (keep tools) run: rm -rf ./out/telink* diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml index 3969d23bab14db..b3d31e97069f7f 100644 --- a/.github/workflows/examples-tizen.yaml +++ b/.github/workflows/examples-tizen.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-tizen:172 + image: ghcr.io/project-chip/chip-build-tizen:174 options: --user root steps: diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index 493d9439a53c84..3016696a7e4273 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-android:172 + image: ghcr.io/project-chip/chip-build-android:174 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml index 75430a4604c48a..17aa34330f42a8 100644 --- a/.github/workflows/fuzzing-build.yaml +++ b/.github/workflows/fuzzing-build.yaml @@ -33,7 +33,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml index 192ff98133771e..f2586694fcd048 100644 --- a/.github/workflows/java-tests.yaml +++ b/.github/workflows/java-tests.yaml @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-java:172 + image: ghcr.io/project-chip/chip-build-java:174 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/lint.yml b/.github/workflows/lint.yml index 36028db1f3c882..e9544d880beda9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 steps: - name: Checkout diff --git a/.github/workflows/minimal-build.yaml b/.github/workflows/minimal-build.yaml index 7e2ce8c4580ed9..f63da2a88c3960 100644 --- a/.github/workflows/minimal-build.yaml +++ b/.github/workflows/minimal-build.yaml @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-minimal:172 + image: ghcr.io/project-chip/chip-build-minimal:174 steps: - name: Checkout @@ -56,7 +56,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-minimal:172 + image: ghcr.io/project-chip/chip-build-minimal:174 steps: - name: Checkout diff --git a/.github/workflows/mypy-validation.yml b/.github/workflows/mypy-validation.yml index ea6eb7673746d9..84af07360cdf5c 100644 --- a/.github/workflows/mypy-validation.yml +++ b/.github/workflows/mypy-validation.yml @@ -31,7 +31,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" steps: diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml index a3958b48fabf8d..32e5204797b709 100644 --- a/.github/workflows/qemu.yaml +++ b/.github/workflows/qemu.yaml @@ -41,7 +41,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32-qemu:172 + image: ghcr.io/project-chip/chip-build-esp32-qemu:174 volumes: - "/tmp/log_output:/tmp/test_logs" @@ -79,7 +79,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-tizen-qemu:172 + image: ghcr.io/project-chip/chip-build-tizen-qemu:174 options: --user root volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml index 18b0a33b9e0b7b..e17e72b8e85472 100644 --- a/.github/workflows/release_artifacts.yaml +++ b/.github/workflows/release_artifacts.yaml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-esp32:172 + image: ghcr.io/project-chip/chip-build-esp32:174 steps: - name: Checkout @@ -64,7 +64,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-efr32:172 + image: ghcr.io/project-chip/chip-build-efr32:174 steps: - name: Checkout uses: actions/checkout@v5 diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index 6e68b5dc9b451d..549aae44028c1f 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: ghcr.io/project-chip/chip-build-android:172 + image: ghcr.io/project-chip/chip-build-android:174 volumes: - "/:/runner-root-volume" - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 67d47e2c9cda1b..532ee2c21995d5 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -62,7 +62,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 options: >- --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" @@ -596,7 +596,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 options: >- --privileged --sysctl net.ipv6.conf.all.disable_ipv6=0 diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml index 23df6f220ee19d..87af4de796285f 100644 --- a/.github/workflows/unit_integration_test.yaml +++ b/.github/workflows/unit_integration_test.yaml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 volumes: - "/:/runner-root-volume" - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml index 11f522d8f339e4..c0d3759df69c92 100644 --- a/.github/workflows/zap_regeneration.yaml +++ b/.github/workflows/zap_regeneration.yaml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 defaults: run: shell: sh diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml index f1f85a108e86cc..a45d761843eece 100644 --- a/.github/workflows/zap_templates.yaml +++ b/.github/workflows/zap_templates.yaml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:172 + image: ghcr.io/project-chip/chip-build:174 defaults: run: shell: sh diff --git a/config/telink/chip-module/Kconfig b/config/telink/chip-module/Kconfig index 56cf0f06c3b2da..6cd2496c1c79f8 100644 --- a/config/telink/chip-module/Kconfig +++ b/config/telink/chip-module/Kconfig @@ -229,6 +229,7 @@ config CHIP_ENABLE_APPLICATION_STATUS_LED config CHIP_ENABLE_PM_DURING_BLE bool "Enable PM during BLE operation" + default n if SOC_RISCV_TELINK_W91 default PM help Enable PM during BLE operation. @@ -247,7 +248,7 @@ config CHIP_ENABLE_POWER_ON_FACTORY_RESET config CHIP_TASK_STACK_SIZE int default 6192 if SOC_RISCV_TELINK_TL321X - default 5480 if PM + default 5480 if PM && !SOC_RISCV_TELINK_W91 default 8448 config CHIP_USE_MARS_SENSOR diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults index ccdf1ef80e066e..273ccfa5ebdb7d 100644 --- a/config/telink/chip-module/Kconfig.defaults +++ b/config/telink/chip-module/Kconfig.defaults @@ -68,8 +68,8 @@ config POSIX_MAX_FDS # Application stack size config MAIN_STACK_SIZE + default 4864 if SOC_RISCV_TELINK_W91 default 3240 if PM || SOC_RISCV_TELINK_TL321X - default 4608 if SOC_RISCV_TELINK_W91 && !ZEPHYR_VERSION_3_3 default 4096 config INIT_STACKS @@ -82,7 +82,7 @@ config ISR_STACK_SIZE default 800 if PM || SOC_RISCV_TELINK_TL321X || SOC_RISCV_TELINK_W91 config SYSTEM_WORKQUEUE_STACK_SIZE - default 664 if PM + default 664 if PM && !SOC_RISCV_TELINK_W91 config HEAP_MEM_POOL_SIZE default 256 if ZEPHYR_VERSION_3_3 @@ -269,7 +269,7 @@ config NVS_LOOKUP_CACHE config NVS_LOOKUP_CACHE_SIZE default 400 if SOC_RISCV_TELINK_TL321X - default 2048 if !PM + default 2048 if !PM || SOC_RISCV_TELINK_W91 # Set multiplicator of Name Value Storage (NVS) as 1 to reach NVS sector size 4KB # nvs_sector_size = flash_page_size * mult = 4KB * 1 = 4KB @@ -344,9 +344,11 @@ config OPENTHREAD_IP6_MAX_EXT_MCAST_ADDRS endif # NET_L2_OPENTHREAD config NET_TX_STACK_SIZE + default 1200 if SOC_RISCV_TELINK_W91 default 600 if PM || SOC_RISCV_TELINK_TL321X config NET_RX_STACK_SIZE + default 2048 if SOC_RISCV_TELINK_W91 default 664 if PM || SOC_RISCV_TELINK_TL321X # Disable certain parts of Zephyr IPv6 stack diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md index b7940e47b7baa7..42ef50ca6ac93c 100644 --- a/examples/all-clusters-app/ameba/README.md +++ b/examples/all-clusters-app/ameba/README.md @@ -27,11 +27,11 @@ The CHIP demo application is supported on - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:172 + $ docker pull ghcr.io/project-chip/chip-build-ameba:174 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:172 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:174 - Setup build environment: diff --git a/examples/all-clusters-minimal-app/ameba/README.md b/examples/all-clusters-minimal-app/ameba/README.md index e9c47ae438aa5c..ee756517de205b 100644 --- a/examples/all-clusters-minimal-app/ameba/README.md +++ b/examples/all-clusters-minimal-app/ameba/README.md @@ -27,13 +27,13 @@ The CHIP demo application is supported on - Pull docker image: ``` - $ docker pull ghcr.io/project-chip/chip-build-ameba:172 + $ docker pull ghcr.io/project-chip/chip-build-ameba:174 ``` - Run docker container: ``` - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:172 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:174 ``` - Setup build environment: diff --git a/examples/camera-app/linux/README.md b/examples/camera-app/linux/README.md index 8847fadcc61e8f..5291dc18e2d327 100644 --- a/examples/camera-app/linux/README.md +++ b/examples/camera-app/linux/README.md @@ -78,7 +78,7 @@ environment to ensure all dependencies are correct. 1. Pull the Cross-Compilation Docker Image ``` -docker pull ghcr.io/project-chip/chip-build-crosscompile:172 +docker pull ghcr.io/project-chip/chip-build-crosscompile:174 ``` 2. Run the Docker Container This command starts an interactive shell inside the @@ -86,7 +86,7 @@ docker pull ghcr.io/project-chip/chip-build-crosscompile:172 container's /var/connectedhomeip directory. ``` -docker run -it -v ~/connectedhomeip:/var/connectedhomeip ghcr.io/project-chip/chip-build-crosscompile:172 /bin/bash +docker run -it -v ~/connectedhomeip:/var/connectedhomeip ghcr.io/project-chip/chip-build-crosscompile:174 /bin/bash ``` 3. Build Inside the Container From within the Docker container's shell, execute diff --git a/examples/camera-controller/README.md b/examples/camera-controller/README.md index 96402e20392416..d5ab86f290dbc5 100644 --- a/examples/camera-controller/README.md +++ b/examples/camera-controller/README.md @@ -95,7 +95,7 @@ environment to ensure all dependencies are correct. 1. Pull the Cross-Compilation Docker Image ``` -docker pull ghcr.io/project-chip/chip-build-crosscompile:172 +docker pull ghcr.io/project-chip/chip-build-crosscompile:174 ``` 2. Run the Docker Container This command starts an interactive shell inside the @@ -103,7 +103,7 @@ docker pull ghcr.io/project-chip/chip-build-crosscompile:172 container's /var/connectedhomeip directory. ``` -docker run -it -v ~/connectedhomeip:/var/connectedhomeip ghcr.io/project-chip/chip-build-crosscompile:172 /bin/bash +docker run -it -v ~/connectedhomeip:/var/connectedhomeip ghcr.io/project-chip/chip-build-crosscompile:174 /bin/bash ``` 3. Build Inside the Container From within the Docker container's shell, execute diff --git a/examples/chef/tests/README.md b/examples/chef/tests/README.md index ed2f4599e8aacd..f745cac4be643f 100644 --- a/examples/chef/tests/README.md +++ b/examples/chef/tests/README.md @@ -22,7 +22,7 @@ shows all chef tests run in CI. container. ``` -docker run -it --rm ghcr.io/project-chip/chip-build:172 /bin/bash +docker run -it --rm ghcr.io/project-chip/chip-build:174 /bin/bash ``` Run the remaining commands inside the container. diff --git a/examples/fabric-admin/README.md b/examples/fabric-admin/README.md index 06f6a8d8c9a8e2..65a9dba09bcd45 100644 --- a/examples/fabric-admin/README.md +++ b/examples/fabric-admin/README.md @@ -23,13 +23,13 @@ For Raspberry Pi 4 example: ### Pull Docker Images ``` -docker pull ghcr.io/project-chip/chip-build-crosscompile:172 +docker pull ghcr.io/project-chip/chip-build-crosscompile:174 ``` ### Run docker ``` -docker run -it -v ~/connectedhomeip:/var/connectedhomeip ghcr.io/project-chip/chip-build-crosscompile:172 /bin/bash +docker run -it -v ~/connectedhomeip:/var/connectedhomeip ghcr.io/project-chip/chip-build-crosscompile:174 /bin/bash ``` ### Build diff --git a/examples/fabric-bridge-app/linux/README.md b/examples/fabric-bridge-app/linux/README.md index 64e8fc6867eaa2..c4ec86f94eca98 100644 --- a/examples/fabric-bridge-app/linux/README.md +++ b/examples/fabric-bridge-app/linux/README.md @@ -100,13 +100,13 @@ defined: Pull Docker Images ``` - docker pull ghcr.io/project-chip/chip-build-crosscompile:172 + docker pull ghcr.io/project-chip/chip-build-crosscompile:174 ``` Run docker ``` - docker run -it -v ~/connectedhomeip:/var/connectedhomeip ghcr.io/project-chip/chip-build-crosscompile:172 /bin/bash + docker run -it -v ~/connectedhomeip:/var/connectedhomeip ghcr.io/project-chip/chip-build-crosscompile:174 /bin/bash ``` Build diff --git a/examples/fabric-sync/README.md b/examples/fabric-sync/README.md index ea925271963985..03c28fa5808c98 100644 --- a/examples/fabric-sync/README.md +++ b/examples/fabric-sync/README.md @@ -92,13 +92,13 @@ defined: Pull Docker Images ```sh - docker pull ghcr.io/project-chip/chip-build-crosscompile:172 + docker pull ghcr.io/project-chip/chip-build-crosscompile:174 ``` Run docker ```sh - docker run -it -v ~/connectedhomeip:/var/connectedhomeip ghcr.io/project-chip/chip-build-crosscompile:172 /bin/bash + docker run -it -v ~/connectedhomeip:/var/connectedhomeip ghcr.io/project-chip/chip-build-crosscompile:174 /bin/bash ``` Build diff --git a/examples/light-switch-app/ameba/README.md b/examples/light-switch-app/ameba/README.md index 824e7178c0f05f..d1330703c6bc2c 100644 --- a/examples/light-switch-app/ameba/README.md +++ b/examples/light-switch-app/ameba/README.md @@ -26,11 +26,11 @@ The CHIP demo application is supported on - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:172 + $ docker pull ghcr.io/project-chip/chip-build-ameba:174 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:172 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:174 - Setup build environment: diff --git a/examples/lighting-app/ameba/README.md b/examples/lighting-app/ameba/README.md index 6cd0b8a5591188..f2d1c23d5579cf 100644 --- a/examples/lighting-app/ameba/README.md +++ b/examples/lighting-app/ameba/README.md @@ -23,11 +23,11 @@ The CHIP demo application is supported on - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:172 + $ docker pull ghcr.io/project-chip/chip-build-ameba:174 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:172 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:174 - Setup build environment: diff --git a/examples/lighting-app/realtek/zephyr/README.md b/examples/lighting-app/realtek/zephyr/README.md index 8e2e3da6f3540b..c6755395b2d8a8 100755 --- a/examples/lighting-app/realtek/zephyr/README.md +++ b/examples/lighting-app/realtek/zephyr/README.md @@ -49,13 +49,13 @@ sudo apt-get install git gcc g++ pkg-config libssl-dev libdbus-1-dev libglib2.0- - Step 1: Pull docker image ```bash - $ docker pull ghcr.io/project-chip/chip-build-realtek-zephyr:172 + $ docker pull ghcr.io/project-chip/chip-build-realtek-zephyr:174 ``` - Step 2: Run docker container: ```bash - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-realtek-zephyr:172 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-realtek-zephyr:174 ``` - Step 3: Activate build environment diff --git a/examples/ota-requestor-app/ameba/README.md b/examples/ota-requestor-app/ameba/README.md index d7ed6d871c3505..1033e5fa51b3fc 100644 --- a/examples/ota-requestor-app/ameba/README.md +++ b/examples/ota-requestor-app/ameba/README.md @@ -6,11 +6,11 @@ A prototype application that demonstrates OTA Requestor capabilities. - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:172 + $ docker pull ghcr.io/project-chip/chip-build-ameba:174 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:172 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:174 - Setup build environment: diff --git a/examples/pigweed-app/ameba/README.md b/examples/pigweed-app/ameba/README.md index f55edad5704fe6..eb360e9ccec462 100644 --- a/examples/pigweed-app/ameba/README.md +++ b/examples/pigweed-app/ameba/README.md @@ -31,11 +31,11 @@ following features are available: - Pull docker image: - $ docker pull ghcr.io/project-chip/chip-build-ameba:172 + $ docker pull ghcr.io/project-chip/chip-build-ameba:174 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:172 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:174 - Setup build environment: diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml index ebe736d39da32d..080b22c3a60654 100644 --- a/integrations/cloudbuild/chef.yaml +++ b/integrations/cloudbuild/chef.yaml @@ -1,5 +1,5 @@ steps: - - name: "ghcr.io/project-chip/chip-build-vscode:169" + - name: "ghcr.io/project-chip/chip-build-vscode:174" entrypoint: "bash" args: - "-c" @@ -7,7 +7,7 @@ steps: git config --global --add safe.directory "*" python scripts/checkout_submodules.py --shallow --recursive --platform esp32 nrfconnect silabs linux android id: Submodules - - name: "ghcr.io/project-chip/chip-build-vscode:169" + - name: "ghcr.io/project-chip/chip-build-vscode:174" # NOTE: silabs boostrap is NOT done with the rest as it requests a conflicting # jinja2 version (asks for 3.1.3 when constraints.txt asks for 3.0.3) env: @@ -23,7 +23,7 @@ steps: - name: pwenv path: /pwenv timeout: 900s - - name: "ghcr.io/project-chip/chip-build-vscode:169" + - name: "ghcr.io/project-chip/chip-build-vscode:174" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -38,7 +38,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:169" + - name: "ghcr.io/project-chip/chip-build-vscode:174" # ICD device is currently not supported for ESP32 and NRF targets. New rule to compile only ICD # linux binary. env: @@ -53,7 +53,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:169" + - name: "ghcr.io/project-chip/chip-build-vscode:174" env: - PW_ENVIRONMENT_ROOT=/pwenv args: diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml index 0611aa7d7fbbb3..cf78771dc71595 100644 --- a/integrations/cloudbuild/smoke-test.yaml +++ b/integrations/cloudbuild/smoke-test.yaml @@ -1,5 +1,5 @@ steps: - - name: "ghcr.io/project-chip/chip-build-vscode:169" + - name: "ghcr.io/project-chip/chip-build-vscode:174" entrypoint: "bash" args: - "-c" @@ -7,7 +7,7 @@ steps: git config --global --add safe.directory "*" python scripts/checkout_submodules.py --shallow --recursive --platform esp32 nrfconnect silabs linux android id: Submodules - - name: "ghcr.io/project-chip/chip-build-vscode:169" + - name: "ghcr.io/project-chip/chip-build-vscode:174" # NOTE: silabs boostrap is NOT done with the rest as it requests a conflicting # jinja2 version (asks for 3.1.3 when constraints.txt asks for 3.0.3) env: @@ -24,7 +24,7 @@ steps: path: /pwenv timeout: 900s - - name: "ghcr.io/project-chip/chip-build-vscode:169" + - name: "ghcr.io/project-chip/chip-build-vscode:174" id: ESP32 env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -44,7 +44,7 @@ steps: volumes: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:169" + - name: "ghcr.io/project-chip/chip-build-vscode:174" id: NRFConnect env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -65,7 +65,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:169" + - name: "ghcr.io/project-chip/chip-build-vscode:174" id: EFR32 env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -86,7 +86,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:169" + - name: "ghcr.io/project-chip/chip-build-vscode:174" id: Linux env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -139,7 +139,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:169" + - name: "ghcr.io/project-chip/chip-build-vscode:174" id: Android env: - PW_ENVIRONMENT_ROOT=/pwenv diff --git a/scripts/tests/local.py b/scripts/tests/local.py index 6cb1215adaf451..72e0383a5ec6e6 100755 --- a/scripts/tests/local.py +++ b/scripts/tests/local.py @@ -1142,7 +1142,7 @@ def chip_tool_tests( # This likely should be run in docker to not allow breaking things # run as: # - # docker run --rm -it -v ~/devel/connectedhomeip:/workspace --privileged ghcr.io/project-chip/chip-build-vscode:168 + # docker run --rm -it -v ~/devel/connectedhomeip:/workspace --privileged ghcr.io/project-chip/chip-build-vscode:174 runner = __RUNNERS__[runner] # make sure we are fully aware if running with or without coverage diff --git a/src/platform/telink/BLEManagerImpl.cpp b/src/platform/telink/BLEManagerImpl.cpp index e2851da9d38cb8..5fd7a4afe1ccdc 100644 --- a/src/platform/telink/BLEManagerImpl.cpp +++ b/src/platform/telink/BLEManagerImpl.cpp @@ -683,15 +683,15 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event) err = HandleTXCharComplete(event); break; + case DeviceEventType::kCHIPoBLEConnectionClosed: + err = HandleBleConnectionClosed(event); + break; + #if CHIP_DEVICE_CONFIG_ENABLE_THREAD case DeviceEventType::kThreadStateChange: err = HandleThreadStateChange(event); break; - case DeviceEventType::kCHIPoBLEConnectionClosed: - err = HandleBleConnectionClosed(event); - break; - case DeviceEventType::kOperationalNetworkEnabled: err = HandleOperationalNetworkEnabled(event); break; @@ -920,6 +920,26 @@ ssize_t BLEManagerImpl::HandleC3Read(struct bt_conn * conId, const struct bt_gat } #endif +CHIP_ERROR BLEManagerImpl::HandleBleConnectionClosed(const ChipDeviceEvent * event) +{ + // Deinit BLE + bt_disable(); + mBLERadioInitialized = false; + +#if defined(CONFIG_PM) && !defined(CONFIG_CHIP_ENABLE_PM_DURING_BLE) + pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES); +#endif + +#if CHIP_DEVICE_CONFIG_ENABLE_THREAD + if (ThreadStackMgrImpl().IsReadyToAttach()) + { + SwitchToIeee802154(); + } +#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD + + return CHIP_NO_ERROR; +} + #if CHIP_DEVICE_CONFIG_ENABLE_THREAD CHIP_ERROR BLEManagerImpl::HandleOperationalNetworkEnabled(const ChipDeviceEvent * event) { @@ -976,28 +996,10 @@ CHIP_ERROR BLEManagerImpl::HandleThreadStateChange(const ChipDeviceEvent * event return error; } -CHIP_ERROR BLEManagerImpl::HandleBleConnectionClosed(const ChipDeviceEvent * event) -{ - if (ThreadStackMgrImpl().IsReadyToAttach()) - { - SwitchToIeee802154(); - } - - return CHIP_NO_ERROR; -} - void BLEManagerImpl::SwitchToIeee802154(void) { ChipLogProgress(DeviceLayer, "Switch context from BLE to Thread"); - // Deinit BLE - bt_disable(); - mBLERadioInitialized = false; - -#if defined(CONFIG_PM) && !defined(CONFIG_CHIP_ENABLE_PM_DURING_BLE) - pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES); -#endif - // Init Thread ThreadStackMgrImpl().SetRadioBlocked(false); ThreadStackMgrImpl().SetThreadEnabled(true); diff --git a/src/test_driver/tizen/README.md b/src/test_driver/tizen/README.md index df818d7808880d..a4ced5ef5f2b5f 100644 --- a/src/test_driver/tizen/README.md +++ b/src/test_driver/tizen/README.md @@ -12,7 +12,7 @@ image from hub.docker.com or build it locally using the provided Dockerfile in ```sh # Pull the image from hub.docker.com -docker pull ghcr.io/project-chip/chip-build-tizen-qemu:172 +docker pull ghcr.io/project-chip/chip-build-tizen-qemu:174 ``` ## Building and Running Tests on QEMU @@ -21,7 +21,7 @@ All steps described below should be done inside the docker container. ```sh docker run -it --rm --name chip-tizen-qemu \ - ghcr.io/project-chip/chip-build-tizen-qemu:172 /bin/bash + ghcr.io/project-chip/chip-build-tizen-qemu:174 /bin/bash ``` ### Clone the connectedhomeip repository From 7fd2e4ced67c7311c8e4fa6899984ca94b51cd53 Mon Sep 17 00:00:00 2001 From: Alex Tsitsiura Date: Thu, 23 Oct 2025 01:52:48 +0000 Subject: [PATCH 2/2] Keep [ESP32] image on version 172 --- .github/workflows/chef.yaml | 2 +- .github/workflows/qemu.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml index aa6f62d8917b10..b527dc119a394b 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -96,7 +96,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:174 + image: ghcr.io/project-chip/chip-build-esp32:172 options: --user root steps: diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml index 32e5204797b709..ebba9024f5a217 100644 --- a/.github/workflows/qemu.yaml +++ b/.github/workflows/qemu.yaml @@ -41,7 +41,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32-qemu:174 + image: ghcr.io/project-chip/chip-build-esp32-qemu:172 volumes: - "/tmp/log_output:/tmp/test_logs"