From 18bf8c08a92f33dd832a931c2e3a84deeebc5de9 Mon Sep 17 00:00:00 2001 From: Alex Tsitsiura Date: Wed, 7 Feb 2024 15:34:18 +0200 Subject: [PATCH 1/4] [Telink] Add B95 (TLSR9258A) skeleton & Update builds to docker version 35 (#31762) * add the board of tlsr9253b and tlsr9253b_retention * riscv: telink: update board setting - update the tlsr9253b setting . Signed-off-by: Haiwen Xia * telink: b93: update the build sample and b93 platform - update the light-switch and lighting-app . - set the tlsr9253b and tlsr9253b_retention for the ci environment . Signed-off-by: Haiwen Xia * telink: b93: fix the build environment - set the tlsr9253b and tlsr9253b_retention for the ci environment . Signed-off-by: Haiwen Xia * telink: b93: loopback to remote version - change the github setting to telink . Signed-off-by: Haiwen Xia * [Telink] Add B93 to Readme files * [Telink] Fix CI builds * [Telink] Reduce number of builds * [Telink] Disable update Zephyr to specific revision * Update builds to docker version 34 * [Telink] remove duplicated code * revert k32w image update * [Telink] rename B93 into B95 * Update builds to docker version 35 * fix doc build --------- Signed-off-by: Haiwen Xia Co-authored-by: haiwen.xia --- .github/workflows/bloat_check.yaml | 2 +- .github/workflows/build.yaml | 10 +-- .github/workflows/chef.yaml | 10 +-- .github/workflows/cirque.yaml | 2 +- .github/workflows/doxygen.yaml | 2 +- .github/workflows/examples-ameba.yaml | 2 +- .github/workflows/examples-asr.yaml | 2 +- .github/workflows/examples-bouffalolab.yaml | 2 +- .../workflows/examples-cc13x2x7_26x2x7.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 +- .github/workflows/examples-mbed.yaml | 2 +- .github/workflows/examples-mw320.yaml | 2 +- .github/workflows/examples-nrfconnect.yaml | 2 +- .github/workflows/examples-openiotsdk.yaml | 2 +- .github/workflows/examples-qpg.yaml | 2 +- .github/workflows/examples-stm32.yaml | 2 +- .github/workflows/examples-telink.yaml | 23 +++--- .github/workflows/examples-tizen.yaml | 2 +- .github/workflows/full-android.yaml | 2 +- .github/workflows/fuzzing-build.yaml | 2 +- .github/workflows/issue-labeler.yaml | 2 +- .github/workflows/java-tests.yaml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/minimal-build.yaml | 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.defaults | 4 +- docs/examples/index.md | 4 - .../air-quality-sensor-app/telink/README.md | 4 +- examples/all-clusters-app/ameba/README.md | 4 +- .../telink/{Readme.md => README.md} | 4 +- .../all-clusters-minimal-app/ameba/README.md | 4 +- .../telink/{Readme.md => README.md} | 4 +- examples/bridge-app/telink/README.md | 4 +- examples/contact-sensor-app/telink/README.md | 4 +- examples/light-switch-app/ameba/README.md | 4 +- examples/light-switch-app/telink/README.md | 4 +- examples/lighting-app/ameba/README.md | 4 +- examples/lighting-app/telink/README.md | 4 +- examples/lock-app/telink/README.md | 4 +- examples/ota-requestor-app/ameba/README.md | 4 +- .../telink/{Readme.md => README.md} | 4 +- examples/pigweed-app/ameba/README.md | 4 +- examples/pump-app/telink/README.md | 4 +- examples/pump-controller-app/telink/README.md | 4 +- examples/shell/telink/README.md | 4 +- examples/smoke-co-alarm-app/telink/README.md | 4 +- .../telink/README.md | 4 +- .../telink/{Readme.md => README.md} | 4 +- examples/window-app/telink/README.md | 4 +- integrations/cloudbuild/build-all.yaml | 6 +- integrations/cloudbuild/chef.yaml | 6 +- integrations/cloudbuild/smoke-test.yaml | 14 ++-- scripts/build/build/targets.py | 2 + scripts/build/builders/telink.py | 6 ++ .../build/testdata/all_targets_linux_x64.txt | 2 +- scripts/tools/telink/update_zephyr.py | 3 + src/platform/telink/tlsr9258a.overlay | 79 +++++++++++++++++++ .../telink/tlsr9258a_retention.overlay | 55 +++++++++++++ src/test_driver/tizen/README.md | 4 +- 71 files changed, 265 insertions(+), 127 deletions(-) rename examples/all-clusters-app/telink/{Readme.md => README.md} (98%) rename examples/all-clusters-minimal-app/telink/{Readme.md => README.md} (98%) rename examples/ota-requestor-app/telink/{Readme.md => README.md} (98%) rename examples/thermostat/telink/{Readme.md => README.md} (98%) create mode 100644 src/platform/telink/tlsr9258a.overlay create mode 100644 src/platform/telink/tlsr9258a_retention.overlay diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml index eec8d0622bca5c..8f04e49f961498 100644 --- a/.github/workflows/bloat_check.yaml +++ b/.github/workflows/bloat_check.yaml @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 steps: - name: Checkout diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 30149e0fa5e4cf..23dd3d3eb0f309 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -40,7 +40,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -135,7 +135,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -283,7 +283,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/log_output:/tmp/test_logs" options: --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -343,7 +343,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/log_output:/tmp/test_logs" options: --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -451,7 +451,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml index df9c05f58c742f..3432fdc9a09779 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -33,7 +33,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 options: --user root steps: @@ -54,7 +54,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:32 + image: ghcr.io/project-chip/chip-build-esp32:35 options: --user root steps: @@ -75,7 +75,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-nrf-platform:32 + image: ghcr.io/project-chip/chip-build-nrf-platform:35 options: --user root steps: @@ -96,7 +96,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-telink:32 + image: ghcr.io/project-chip/chip-build-telink:35 options: --user root steps: @@ -108,7 +108,7 @@ jobs: platform: telink # - name: Update Zephyr to specific revision (for developers purpose) # shell: bash - # run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py e6a32f41ccec55c2233631406842b71ff270089d" + # run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py b5c8028ec94f3efa69decff3a09f0d6f8a21fd6d" - name: CI Examples Telink shell: bash run: | diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml index 77bbfcd9fedc80..e71ea876e5100a 100644 --- a/.github/workflows/cirque.yaml +++ b/.github/workflows/cirque.yaml @@ -40,7 +40,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: ghcr.io/project-chip/chip-build-cirque:32 + # image: ghcr.io/project-chip/chip-build-cirque:35 # volumes: # - "/tmp:/tmp" # - "/dev/pts:/dev/pts" diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml index 64d066f4c7fda6..13da9c2b4da1d6 100644 --- a/.github/workflows/doxygen.yaml +++ b/.github/workflows/doxygen.yaml @@ -81,7 +81,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-doxygen:32 + image: ghcr.io/project-chip/chip-build-doxygen:35 if: github.actor != 'restyled-io[bot]' diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml index 9ae90c82a1cf7e..a10f4a84ac7d69 100644 --- a/.github/workflows/examples-ameba.yaml +++ b/.github/workflows/examples-ameba.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ameba:32 + image: ghcr.io/project-chip/chip-build-ameba:35 options: --user root steps: diff --git a/.github/workflows/examples-asr.yaml b/.github/workflows/examples-asr.yaml index 50d833d00ee88e..092f911a233642 100644 --- a/.github/workflows/examples-asr.yaml +++ b/.github/workflows/examples-asr.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-asr:32 + image: ghcr.io/project-chip/chip-build-asr:35 options: --user root steps: diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml index 2a2121cdb6da97..ec90a39b26cf17 100644 --- a/.github/workflows/examples-bouffalolab.yaml +++ b/.github/workflows/examples-bouffalolab.yaml @@ -35,7 +35,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-bouffalolab:32 + image: ghcr.io/project-chip/chip-build-bouffalolab:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml index 6232831bba36c8..3c864525707a88 100644 --- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml +++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ti:32 + image: ghcr.io/project-chip/chip-build-ti:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml index 7b886423fcf450..73f463b167707b 100644 --- a/.github/workflows/examples-cc32xx.yaml +++ b/.github/workflows/examples-cc32xx.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-ti:32 + image: ghcr.io/project-chip/chip-build-ti:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index f3451e6bc9de43..36c490956d9ae8 100644 --- a/.github/workflows/examples-efr32.yaml +++ b/.github/workflows/examples-efr32.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-efr32:32 + image: ghcr.io/project-chip/chip-build-efr32:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml index 2e5432dd4ec03f..e24492d94e60a7 100644 --- a/.github/workflows/examples-esp32.yaml +++ b/.github/workflows/examples-esp32.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:32 + image: ghcr.io/project-chip/chip-build-esp32:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" @@ -130,7 +130,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32:32 + image: ghcr.io/project-chip/chip-build-esp32:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml index c9cfd0b15aac6b..ff6f2e91a906b5 100644 --- a/.github/workflows/examples-infineon.yaml +++ b/.github/workflows/examples-infineon.yaml @@ -35,7 +35,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-infineon:32 + image: ghcr.io/project-chip/chip-build-infineon:35 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 41c41f57a19c6b..a346bec097fa81 100644 --- a/.github/workflows/examples-linux-arm.yaml +++ b/.github/workflows/examples-linux-arm.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-crosscompile:32 + image: ghcr.io/project-chip/chip-build-crosscompile:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml index e065fd31d0d586..f6fee89fa966e4 100644 --- a/.github/workflows/examples-linux-imx.yaml +++ b/.github/workflows/examples-linux-imx.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-imx:32 + image: ghcr.io/project-chip/chip-build-imx:35 steps: - name: Checkout diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml index 951164ecd62fac..ad1dc349163c7b 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: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml index ae444f5cdfc806..54d33b9f91d3c2 100644 --- a/.github/workflows/examples-mbed.yaml +++ b/.github/workflows/examples-mbed.yaml @@ -40,7 +40,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-mbed-os:32 + image: ghcr.io/project-chip/chip-build-mbed-os:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml index 369eeb81114a52..d0e7ce3122c06b 100644 --- a/.github/workflows/examples-mw320.yaml +++ b/.github/workflows/examples-mw320.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml index 88c84d72e28080..64bb5a319eafa8 100644 --- a/.github/workflows/examples-nrfconnect.yaml +++ b/.github/workflows/examples-nrfconnect.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-nrf-platform:32 + image: ghcr.io/project-chip/chip-build-nrf-platform:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml index eb142015f5b4e7..254e5688d62435 100644 --- a/.github/workflows/examples-openiotsdk.yaml +++ b/.github/workflows/examples-openiotsdk.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-openiotsdk:32 + image: ghcr.io/project-chip/chip-build-openiotsdk:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" options: --privileged diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml index b5aadaf11c11bb..e012eb9b02d065 100644 --- a/.github/workflows/examples-qpg.yaml +++ b/.github/workflows/examples-qpg.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-stm32.yaml b/.github/workflows/examples-stm32.yaml index 2e261c6f1c9735..84442f85294d31 100644 --- a/.github/workflows/examples-stm32.yaml +++ b/.github/workflows/examples-stm32.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index a7b717d0890697..9131b3969df075 100644 --- a/.github/workflows/examples-telink.yaml +++ b/.github/workflows/examples-telink.yaml @@ -36,7 +36,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-telink:32 + image: ghcr.io/project-chip/chip-build-telink:35 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" @@ -55,7 +55,7 @@ jobs: gh-context: ${{ toJson(github) }} # - name: Update Zephyr to specific revision (for developers purpose) - # run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py e6a32f41ccec55c2233631406842b71ff270089d" + # run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py b5c8028ec94f3efa69decff3a09f0d6f8a21fd6d" - name: Build example Telink (B92 retention) Air Quality Sensor App run: | @@ -175,13 +175,13 @@ jobs: - name: clean out build output run: rm -rf ./out - - name: Build example Telink (B92) Pump App + - name: Build example Telink (B95 retention) Pump App run: | ./scripts/run_in_build_env.sh \ - "./scripts/build/build_examples.py --target 'telink-tlsr9528a-pump' build" + "./scripts/build/build_examples.py --target 'telink-tlsr9258a_retention-pump' build" .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - telink tlsr9528a pump-app \ - out/telink-tlsr9528a-pump/zephyr/zephyr.elf \ + telink tlsr9258a_retention pump-app \ + out/telink-tlsr9258a_retention-pump/zephyr/zephyr.elf \ /tmp/bloat_reports/ - name: clean out build output @@ -199,9 +199,6 @@ jobs: - name: clean out build output run: rm -rf ./out - - name: clean out build output - run: rm -rf ./out - - name: Build example Telink (B91) Shell App run: | ./scripts/run_in_build_env.sh \ @@ -250,13 +247,13 @@ jobs: - name: clean out build output run: rm -rf ./out - - name: Build example Telink (B91) Window Covering App + - name: Build example Telink (B95) Window Covering App run: | ./scripts/run_in_build_env.sh \ - "./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-window-covering' build" + "./scripts/build/build_examples.py --target 'telink-tlsr9258a-window-covering' build" .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - telink tlsr9518adk80d window-covering \ - out/telink-tlsr9518adk80d-window-covering/zephyr/zephyr.elf \ + telink tlsr9258a window-covering \ + out/telink-tlsr9258a-window-covering/zephyr/zephyr.elf \ /tmp/bloat_reports/ - name: clean out build output diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml index 55be230f764128..a289e159dc6318 100644 --- a/.github/workflows/examples-tizen.yaml +++ b/.github/workflows/examples-tizen.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-tizen:32 + image: ghcr.io/project-chip/chip-build-tizen:35 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 96f6652b56e768..f7a14d1f5d3d1b 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:32 + image: ghcr.io/project-chip/chip-build-android:35 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml index 7a628ca782378f..341097915cab4f 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:32 + image: ghcr.io/project-chip/chip-build:35 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/issue-labeler.yaml b/.github/workflows/issue-labeler.yaml index 8c3df4cdb40399..a92a4c212d187a 100644 --- a/.github/workflows/issue-labeler.yaml +++ b/.github/workflows/issue-labeler.yaml @@ -14,7 +14,7 @@ jobs: - uses: github/issue-labeler@v3.4 #May not be the latest version with: configuration-path: .github/issue-labeler.yml - not-before: 2020-01-15T02:54:32Z + not-before: 2020-01-15T02:54:34Z enable-versioned-regex: 0 sync-labels: 1 repo-token: ${{ github.token }} \ No newline at end of file diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml index 9d16e3fbe8d1ae..f19d451fbc2df6 100644 --- a/.github/workflows/java-tests.yaml +++ b/.github/workflows/java-tests.yaml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-java:32 + image: ghcr.io/project-chip/chip-build-java:35 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 3f02c2278caa17..29a3dc8624e491 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -29,7 +29,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 steps: - name: Checkout diff --git a/.github/workflows/minimal-build.yaml b/.github/workflows/minimal-build.yaml index d9c8c7536e14d0..189c8db3159951 100644 --- a/.github/workflows/minimal-build.yaml +++ b/.github/workflows/minimal-build.yaml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-minimal:32 + image: ghcr.io/project-chip/chip-build-minimal:35 steps: - name: Checkout diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml index 02810695164830..c4992953780911 100644 --- a/.github/workflows/qemu.yaml +++ b/.github/workflows/qemu.yaml @@ -38,7 +38,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-esp32-qemu:32 + image: ghcr.io/project-chip/chip-build-esp32-qemu:35 volumes: - "/tmp/log_output:/tmp/test_logs" @@ -76,7 +76,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-tizen-qemu:32 + image: ghcr.io/project-chip/chip-build-tizen-qemu:35 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml index 223a736ba0671c..c82e9f59a27674 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:32 + image: ghcr.io/project-chip/chip-build-esp32:35 steps: - name: Checkout @@ -68,7 +68,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-efr32:32 + image: ghcr.io/project-chip/chip-build-efr32:35 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index 2e585a703953fd..396fb3ae153a46 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-android:32 + image: ghcr.io/project-chip/chip-build-android:35 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 61db68f0233509..38d05c553e651b 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" @@ -422,7 +422,7 @@ jobs: TSAN_OPTIONS: "halt_on_error=1 suppressions=scripts/tests/chiptest/tsan-linux-suppressions.txt" if: github.actor != 'restyled-io[bot]' - runs-on: ubuntu-latest + runs-on: ubuntu-latest:35 container: image: ghcr.io/project-chip/chip-build:32 diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml index 4272777681a4ce..f1be1a194a1b46 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: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 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 302adc747694f1..a0ab3653d5ecb1 100644 --- a/.github/workflows/zap_regeneration.yaml +++ b/.github/workflows/zap_regeneration.yaml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 defaults: run: shell: sh diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml index 122ae0f742a27f..cb8bff6172a119 100644 --- a/.github/workflows/zap_templates.yaml +++ b/.github/workflows/zap_templates.yaml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: ghcr.io/project-chip/chip-build:32 + image: ghcr.io/project-chip/chip-build:35 defaults: run: shell: sh diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults index 0a71d5a53feaba..964b08547bb0b5 100644 --- a/config/telink/chip-module/Kconfig.defaults +++ b/config/telink/chip-module/Kconfig.defaults @@ -158,7 +158,7 @@ choice B9X_BLE_CTRL_MAC_TYPE endchoice # Board retention config -if BOARD_TLSR9528A_RETENTION || BOARD_TLSR9518ADK80D_RETENTION +if BOARD_TLSR9528A_RETENTION || BOARD_TLSR9258A_RETENTION || BOARD_TLSR9518ADK80D_RETENTION config BOARD_TLSR9X_NON_RETENTION_RAM_CODE default y if PM @@ -170,7 +170,7 @@ config PWM endif # Board non-retention config -if BOARD_TLSR9528A || BOARD_TLSR9518ADK80D +if BOARD_TLSR9528A || BOARD_TLSR9258A || BOARD_TLSR9518ADK80D config PWM default y endif diff --git a/docs/examples/index.md b/docs/examples/index.md index 0162a25afc149f..2c9a0a4659b3bc 100644 --- a/docs/examples/index.md +++ b/docs/examples/index.md @@ -19,7 +19,6 @@ air-quality-sensor-app/**/README :maxdepth: 1 all-clusters-app/**/README -all-clusters-app/**/Readme ``` ## All clusters minimal example @@ -29,7 +28,6 @@ all-clusters-app/**/Readme :maxdepth: 1 all-clusters-minimal-app/**/README -all-clusters-minimal-app/**/Readme ``` ## Bridge example @@ -178,7 +176,6 @@ ota-provider-app/**/README :maxdepth: 1 ota-requestor-app/**/README -ota-requestor-app/**/Readme ``` ## Persistent storage example @@ -282,7 +279,6 @@ temperature-measurement-app/**/README :maxdepth: 1 thermostat/**/README -thermostat/**/Readme thermostat/qpg/APPLICATION ``` diff --git a/examples/air-quality-sensor-app/telink/README.md b/examples/air-quality-sensor-app/telink/README.md index f91c701c00c527..015e613d40896f 100644 --- a/examples/air-quality-sensor-app/telink/README.md +++ b/examples/air-quality-sensor-app/telink/README.md @@ -25,14 +25,14 @@ You can use this example as a reference for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md index 34fe805281bc17..2689f97026093a 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:32 + $ docker pull ghcr.io/project-chip/chip-build-ameba:35 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35 - Setup build environment: diff --git a/examples/all-clusters-app/telink/Readme.md b/examples/all-clusters-app/telink/README.md similarity index 98% rename from examples/all-clusters-app/telink/Readme.md rename to examples/all-clusters-app/telink/README.md index b8f5b95d828893..a5532487fa67a2 100644 --- a/examples/all-clusters-app/telink/Readme.md +++ b/examples/all-clusters-app/telink/README.md @@ -27,14 +27,14 @@ creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/all-clusters-minimal-app/ameba/README.md b/examples/all-clusters-minimal-app/ameba/README.md index 27e2e0e239f8e3..693b06cbaa80e4 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:32 + $ docker pull ghcr.io/project-chip/chip-build-ameba:35 ``` - Run docker container: ``` - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35 ``` - Setup build environment: diff --git a/examples/all-clusters-minimal-app/telink/Readme.md b/examples/all-clusters-minimal-app/telink/README.md similarity index 98% rename from examples/all-clusters-minimal-app/telink/Readme.md rename to examples/all-clusters-minimal-app/telink/README.md index 601fc52ba40fef..8e18bf4b9419b0 100644 --- a/examples/all-clusters-minimal-app/telink/Readme.md +++ b/examples/all-clusters-minimal-app/telink/README.md @@ -27,14 +27,14 @@ for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/bridge-app/telink/README.md b/examples/bridge-app/telink/README.md index 1e24fc7fd92b2d..f23d2aeb4c6f85 100644 --- a/examples/bridge-app/telink/README.md +++ b/examples/bridge-app/telink/README.md @@ -104,14 +104,14 @@ defined: ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/contact-sensor-app/telink/README.md b/examples/contact-sensor-app/telink/README.md index 370ffbdee63a7f..9b6a59ba0c086f 100755 --- a/examples/contact-sensor-app/telink/README.md +++ b/examples/contact-sensor-app/telink/README.md @@ -25,14 +25,14 @@ You can use this example as a reference for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/light-switch-app/ameba/README.md b/examples/light-switch-app/ameba/README.md index a14e504b073292..3c38ac3fbb4a2a 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:32 + $ docker pull ghcr.io/project-chip/chip-build-ameba:35 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35 - Setup build environment: diff --git a/examples/light-switch-app/telink/README.md b/examples/light-switch-app/telink/README.md index 562be75144d584..d6ba4b34cd6351 100755 --- a/examples/light-switch-app/telink/README.md +++ b/examples/light-switch-app/telink/README.md @@ -30,14 +30,14 @@ creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/lighting-app/ameba/README.md b/examples/lighting-app/ameba/README.md index 61defcba4e7e2e..b7a1a2a0e120e1 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:32 + $ docker pull ghcr.io/project-chip/chip-build-ameba:35 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35 - Setup build environment: diff --git a/examples/lighting-app/telink/README.md b/examples/lighting-app/telink/README.md index 278dfad530a1b0..2f696170f3cca2 100644 --- a/examples/lighting-app/telink/README.md +++ b/examples/lighting-app/telink/README.md @@ -28,14 +28,14 @@ a reference for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/lock-app/telink/README.md b/examples/lock-app/telink/README.md index 4d20388ce4277a..27a95baffa0b6a 100755 --- a/examples/lock-app/telink/README.md +++ b/examples/lock-app/telink/README.md @@ -28,14 +28,14 @@ a reference for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/ota-requestor-app/ameba/README.md b/examples/ota-requestor-app/ameba/README.md index ae871c20ce882f..76560658a18be6 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:32 + $ docker pull ghcr.io/project-chip/chip-build-ameba:35 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35 - Setup build environment: diff --git a/examples/ota-requestor-app/telink/Readme.md b/examples/ota-requestor-app/telink/README.md similarity index 98% rename from examples/ota-requestor-app/telink/Readme.md rename to examples/ota-requestor-app/telink/README.md index bf58651ce0253a..81870b738f18df 100755 --- a/examples/ota-requestor-app/telink/Readme.md +++ b/examples/ota-requestor-app/telink/README.md @@ -21,14 +21,14 @@ ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/pigweed-app/ameba/README.md b/examples/pigweed-app/ameba/README.md index 55b600e64988b6..794db6bae306be 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:32 + $ docker pull ghcr.io/project-chip/chip-build-ameba:35 - Run docker container: - $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:32 + $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:35 - Setup build environment: diff --git a/examples/pump-app/telink/README.md b/examples/pump-app/telink/README.md index 4d67799bfd28f5..487833f4fb7d30 100755 --- a/examples/pump-app/telink/README.md +++ b/examples/pump-app/telink/README.md @@ -29,14 +29,14 @@ reference for creating your own pump application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/pump-controller-app/telink/README.md b/examples/pump-controller-app/telink/README.md index 6e3fa7ef3b0b88..5a9e95548f883a 100755 --- a/examples/pump-controller-app/telink/README.md +++ b/examples/pump-controller-app/telink/README.md @@ -30,14 +30,14 @@ your own pump application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/shell/telink/README.md b/examples/shell/telink/README.md index 744a0498a8f7d4..aa7023043e0b9f 100755 --- a/examples/shell/telink/README.md +++ b/examples/shell/telink/README.md @@ -25,14 +25,14 @@ You can use this example as a reference for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/smoke-co-alarm-app/telink/README.md b/examples/smoke-co-alarm-app/telink/README.md index 71fc7afd668a23..7f7138a7f14771 100755 --- a/examples/smoke-co-alarm-app/telink/README.md +++ b/examples/smoke-co-alarm-app/telink/README.md @@ -25,14 +25,14 @@ You can use this example as a reference for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/temperature-measurement-app/telink/README.md b/examples/temperature-measurement-app/telink/README.md index 77558a8968472a..6f147721149b19 100644 --- a/examples/temperature-measurement-app/telink/README.md +++ b/examples/temperature-measurement-app/telink/README.md @@ -29,14 +29,14 @@ creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/thermostat/telink/Readme.md b/examples/thermostat/telink/README.md similarity index 98% rename from examples/thermostat/telink/Readme.md rename to examples/thermostat/telink/README.md index ca93b6b1fb2fd3..85a98d8ce4862e 100755 --- a/examples/thermostat/telink/Readme.md +++ b/examples/thermostat/telink/README.md @@ -25,14 +25,14 @@ You can use this example as a reference for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/examples/window-app/telink/README.md b/examples/window-app/telink/README.md index 28dcc9aadd0ef6..c5500aa5c9cbd6 100644 --- a/examples/window-app/telink/README.md +++ b/examples/window-app/telink/README.md @@ -28,14 +28,14 @@ for creating your own application. ``` 3. In the example dir run (replace __ with your board name, for - example, `tlsr9518adk80d` or `tlsr9528a`): + example, `tlsr9518adk80d`, `tlsr9528a` or `tlsr9258a`): ```bash $ west build -b ``` Also use key `-DFLASH_SIZE`, if your board has memory size different from 2 - MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=1m`: + MB, for example, `-DFLASH_SIZE=1m` or `-DFLASH_SIZE=4m`: ```bash $ west build -b tlsr9518adk80d -- -DFLASH_SIZE=4m diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml index e2e46c0ba059b7..6590630957d902 100644 --- a/integrations/cloudbuild/build-all.yaml +++ b/integrations/cloudbuild/build-all.yaml @@ -6,7 +6,7 @@ steps: - "--init" - "--recursive" id: Submodules - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -21,7 +21,7 @@ steps: path: /pwenv timeout: 900s - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -85,7 +85,7 @@ steps: --target k32w-shell build --create-archives /workspace/artifacts/ - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" env: - PW_ENVIRONMENT_ROOT=/pwenv args: diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml index a29ddb18176ebc..432308a8bd695f 100644 --- a/integrations/cloudbuild/chef.yaml +++ b/integrations/cloudbuild/chef.yaml @@ -1,5 +1,5 @@ steps: - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -12,7 +12,7 @@ steps: path: /pwenv timeout: 2700s - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -27,7 +27,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" env: - PW_ENVIRONMENT_ROOT=/pwenv args: diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml index bae7c4b4c2c823..f05bbd0e369d2d 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:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" entrypoint: "bash" args: - "-c" @@ -7,7 +7,7 @@ steps: git config --global --add safe.directory "*" git submodule update --init --recursive id: Submodules - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -22,7 +22,7 @@ steps: path: /pwenv timeout: 900s - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" id: ESP32 env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -43,7 +43,7 @@ steps: volumes: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" id: NRFConnect env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -64,7 +64,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" id: EFR32 env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -86,7 +86,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" id: Linux env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -139,7 +139,7 @@ steps: - name: pwenv path: /pwenv - - name: "ghcr.io/project-chip/chip-build-vscode:32" + - name: "ghcr.io/project-chip/chip-build-vscode:35" id: Android env: - PW_ENVIRONMENT_ROOT=/pwenv diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py index e8241e0bfe5913..771c92b99cabef 100755 --- a/scripts/build/build/targets.py +++ b/scripts/build/build/targets.py @@ -715,6 +715,8 @@ def BuildTelinkTarget(): TargetPart('tlsr9518adk80d', board=TelinkBoard.TLSR9518ADK80D), TargetPart('tlsr9528a', board=TelinkBoard.TLSR9528A), TargetPart('tlsr9528a_retention', board=TelinkBoard.TLSR9528A_RETENTION), + TargetPart('tlsr9258a', board=TelinkBoard.TLSR9258A), + TargetPart('tlsr9258a_retention', board=TelinkBoard.TLSR9258A_RETENTION), ]) target.AppendFixedTargets([ diff --git a/scripts/build/builders/telink.py b/scripts/build/builders/telink.py index 4eb7b3f1ff4005..9160c044a2be57 100644 --- a/scripts/build/builders/telink.py +++ b/scripts/build/builders/telink.py @@ -117,6 +117,8 @@ class TelinkBoard(Enum): TLSR9518ADK80D = auto() TLSR9528A = auto() TLSR9528A_RETENTION = auto() + TLSR9258A = auto() + TLSR9258A_RETENTION = auto() def GnArgName(self): if self == TelinkBoard.TLSR9518ADK80D: @@ -125,6 +127,10 @@ def GnArgName(self): return 'tlsr9528a' elif self == TelinkBoard.TLSR9528A_RETENTION: return 'tlsr9528a_retention' + elif self == TelinkBoard.TLSR9258A: + return 'tlsr9258a' + elif self == TelinkBoard.TLSR9258A_RETENTION: + return 'tlsr9258a_retention' else: raise Exception('Unknown board type: %r' % self) diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt index c400af29ce138a..6a0b73362b8f5c 100644 --- a/scripts/build/testdata/all_targets_linux_x64.txt +++ b/scripts/build/testdata/all_targets_linux_x64.txt @@ -22,5 +22,5 @@ nrf-native-posix-64-tests qpg-qpg6105-{lock,light,shell,persistent-storage,light-switch,thermostat}[-updateimage] stm32-stm32wb5mm-dk-light tizen-arm-{all-clusters,all-clusters-minimal,chip-tool,light,tests}[-no-ble][-no-thread][-no-wifi][-asan][-ubsan][-with-ui] -telink-{tlsr9518adk80d,tlsr9528a,tlsr9528a_retention}-{air-quality-sensor,all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,shell,smoke-co-alarm,temperature-measurement,thermostat,window-covering}[-ota][-dfu][-shell][-rpc][-factory-data][-4mb][-mars] +telink-{tlsr9518adk80d,tlsr9528a,tlsr9528a_retention,tlsr9258a,tlsr9258a_retention}-{air-quality-sensor,all-clusters,all-clusters-minimal,bridge,contact-sensor,light,light-switch,lock,ota-requestor,pump,pump-controller,shell,smoke-co-alarm,temperature-measurement,thermostat,window-covering}[-ota][-dfu][-shell][-rpc][-factory-data][-4mb][-mars] openiotsdk-{shell,lock}[-mbedtls][-psa] diff --git a/scripts/tools/telink/update_zephyr.py b/scripts/tools/telink/update_zephyr.py index 5c133f0f8fbdf7..fe735df0ccaac4 100755 --- a/scripts/tools/telink/update_zephyr.py +++ b/scripts/tools/telink/update_zephyr.py @@ -39,6 +39,9 @@ def main(): args = parser.parse_args() + command = ['git', '-C', zephyr_base, 'fetch'] + subprocess.run(command, check=True) + command = ['git', '-C', zephyr_base, 'reset', args.hash, '--hard'] subprocess.run(command, check=True) diff --git a/src/platform/telink/tlsr9258a.overlay b/src/platform/telink/tlsr9258a.overlay new file mode 100644 index 00000000000000..b300411d6da621 --- /dev/null +++ b/src/platform/telink/tlsr9258a.overlay @@ -0,0 +1,79 @@ +/ { + aliases { + system-state-led = &led_red; + pwm-led0 = &pwm_led0; + pwm-led1 = &pwm_led1; + pwm-led2 = &pwm_led2; + pwm-led3 = &pwm_led3; + }; + + pwm_leds { + /delete-node/ pwm_led_0; + pwm_led0: pwm_led_0 { + pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; + label = "PWM LED Blue"; + }; + pwm_led1: pwm_led_1 { + pwms = <&pwm0 3 PWM_MSEC(20) PWM_POLARITY_NORMAL>; + label = "PWM LED Green"; + }; + pwm_led2: pwm_led_2 { + pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>; + label = "PWM LED Red"; + }; + pwm_led3: pwm_led_3 { + pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>; + label = "PWM IDENTIFY LED Green"; + }; + }; + + keys { + /delete-node/ button_1; + /delete-node/ button_3; + compatible = "gpio-keys"; + key_1: button_1 { + gpios = <&gpiod 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + key_2: button_2 { + gpios = <&gpiod 7 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + key_3: button_3 { + gpios = <&gpiod 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + key_4: button_4 { + gpios = <&gpiof 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + + key_matrix_col1: key_matrix_col1 { + gpios = <&gpiod 6 GPIO_ACTIVE_HIGH>; + }; + key_matrix_col2: key_matrix_col2 { + gpios = <&gpiof 6 GPIO_ACTIVE_HIGH>; + }; + key_matrix_row1: key_matrix_row1 { + gpios = <&gpiod 2 GPIO_PULL_DOWN>; + }; + key_matrix_row2: key_matrix_row2 { + gpios = <&gpiod 7 GPIO_PULL_DOWN>; + }; + }; +}; + +&pinctrl { + pwm_ch0_pd0_default: pwm_ch0_pd0_default { + pinmux = ; + }; + pwm_ch1_pd1_default: pwm_ch1_pd1_default { + pinmux = ; + }; + pwm_ch2_pe2_default: pwm_ch2_pe2_default { + pinmux = ; + }; + pwm_ch3_pe0_default: pwm_ch3_pe0_default { + pinmux = ; + }; +}; + +&pwm0 { + pinctrl-0 = <&pwm_ch0_pd0_default &pwm_ch1_pd1_default &pwm_ch2_pe2_default &pwm_ch3_pe0_default>; +}; diff --git a/src/platform/telink/tlsr9258a_retention.overlay b/src/platform/telink/tlsr9258a_retention.overlay new file mode 100644 index 00000000000000..98a0e5af508f32 --- /dev/null +++ b/src/platform/telink/tlsr9258a_retention.overlay @@ -0,0 +1,55 @@ +/ { + /* + * There is no way to keep GPIOs + * during deep-sleep mode so output GPIOs + * and PWM's are useless. + */ + + aliases { + /delete-property/ led0; + /delete-property/ led1; + /delete-property/ led2; + /delete-property/ led3; + /delete-property/ mcuboot-led0; + /delete-property/ pwm-led0; + /delete-property/ pwm-0; + }; + + /delete-node/ leds; + /delete-node/ pwm_leds; + + keys { + /delete-node/ button_1; + /delete-node/ button_3; + compatible = "gpio-keys"; + key_1: button_1 { + gpios = <&gpiod 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + key_2: button_2 { + gpios = <&gpiod 7 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + key_3: button_3 { + gpios = <&gpiod 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + key_4: button_4 { + gpios = <&gpiof 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; + }; + + key_matrix_col1: key_matrix_col1 { + gpios = <&gpiod 6 GPIO_ACTIVE_HIGH>; + }; + key_matrix_col2: key_matrix_col2 { + gpios = <&gpiof 6 GPIO_ACTIVE_HIGH>; + }; + key_matrix_row1: key_matrix_row1 { + gpios = <&gpiod 2 GPIO_PULL_DOWN>; + }; + key_matrix_row2: key_matrix_row2 { + gpios = <&gpiod 7 GPIO_PULL_DOWN>; + }; + }; +}; + +&pwm0 { + status = "disabled"; +}; diff --git a/src/test_driver/tizen/README.md b/src/test_driver/tizen/README.md index 1c6ad4ebbdd636..559b75699c0995 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:32 +docker pull ghcr.io/project-chip/chip-build-tizen-qemu:35 ``` ## 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:32 /bin/bash + ghcr.io/project-chip/chip-build-tizen-qemu:35 /bin/bash ``` ### Clone the connectedhomeip repository From 22ffcf0365d383e03eb7d9330d9e82d70e6ff119 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Wed, 7 Feb 2024 10:42:05 -0500 Subject: [PATCH 2/4] Enforce that files in the `src` directory are referenced from BUILD.gn (#31960) * Start creating a script * Have much more functionality * Restyle * Add some doc comments ... this starts being usable * Add workflow to validate that gn knows about files * Remove controller from known exceptions: we fixed that one * Fix flake8 * Add more known failures * Better error reporting for gn reachability * Remove the platform specific orphan file listing * Force the "not failures anymore" to be fatal --------- Co-authored-by: Andrei Litvin --- .github/workflows/lint.yml | 160 +++++++++++++++++++++++++++ scripts/tools/not_known_to_gn.py | 182 +++++++++++++++++++++++++++++++ 2 files changed, 342 insertions(+) create mode 100755 scripts/tools/not_known_to_gn.py diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 29a3dc8624e491..2924edff45419d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -42,6 +42,166 @@ jobs: with: platform: linux + - name: Check for orphaned gn files + if: always() + # We should enforce that ALL new files are referenced in our build scripts. + # Several things do not have a clear fix path: + # - various platform implementations (including darwin-specific files as they + # are not using GN) + # - app/clusters (they are fetched dynamically - this should probably be fixed) + # + # All the rest of the exceptions should be driven down to 0: chip should fully + # be defined in build rules. + # + # This check enforces that for any newly added file, it must be part of some + # BUILD.gn file + run: | + ./scripts/run_in_build_env.sh "./scripts/tools/not_known_to_gn.py \ + src \ + --skip-dir app/clusters \ + --skip-dir darwin \ + --skip-dir include \ + --skip-dir platform/Ameba \ + --skip-dir platform/android \ + --skip-dir platform/ASR \ + --skip-dir platform/Beken \ + --skip-dir platform/bouffalolab \ + --skip-dir platform/cc13xx_26xx \ + --skip-dir platform/cc32xx \ + --skip-dir platform/Darwin \ + --skip-dir platform/ESP32 \ + --skip-dir platform/fake \ + --skip-dir platform/FreeRTOS \ + --skip-dir platform/Infineon \ + --skip-dir platform/Linux \ + --skip-dir platform/mbed \ + --skip-dir platform/mt793x \ + --skip-dir platform/nxp \ + --skip-dir platform/OpenThread \ + --skip-dir platform/qpg \ + --skip-dir platform/silabs \ + --skip-dir platform/telink \ + --skip-dir platform/webos \ + --skip-dir platform/Zephyr \ + --skip-dir test_driver \ + --known-failure app/app-platform/ContentApp.cpp \ + --known-failure app/app-platform/ContentApp.h \ + --known-failure app/app-platform/ContentAppPlatform.cpp \ + --known-failure app/app-platform/ContentAppPlatform.h \ + --known-failure controller/ExamplePersistentStorage.cpp \ + --known-failure controller/ExamplePersistentStorage.h \ + --known-failure controller/java/GroupDeviceProxy.h \ + --known-failure controller/java/CHIPEventTLVValueDecoder.h \ + --known-failure controller/python/chip/credentials/cert.h \ + --known-failure controller/python/chip/server/Options.h \ + --known-failure controller/python/chip/crypto/p256keypair.h \ + --known-failure controller/python/chip/commissioning/PlaceholderOperationalCredentialsIssuer.h \ + --known-failure controller/python/chip/native/PyChipError.h \ + --known-failure app/AttributeAccessInterface.h \ + --known-failure app/AttributeAccessToken.h \ + --known-failure app/att-storage.h \ + --known-failure app/BufferedReadCallback.h \ + --known-failure app/CommandHandler.h \ + --known-failure app/CommandHandlerInterface.h \ + --known-failure app/CommandPathParams.h \ + --known-failure app/CommandPathRegistry.h \ + --known-failure app/CommandResponseSender.h \ + --known-failure app/CommandSender.h \ + --known-failure app/CommandSenderLegacyCallback.h \ + --known-failure app/CompatEnumNames.h \ + --known-failure app/ConcreteAttributePath.h \ + --known-failure app/ConcreteCommandPath.h \ + --known-failure app/data-model/ListLargeSystemExtensions.h \ + --known-failure app/EventHeader.h \ + --known-failure app/EventLoggingDelegate.h \ + --known-failure app/EventLogging.h \ + --known-failure app/EventLoggingTypes.h \ + --known-failure app/EventManagement.h \ + --known-failure app/InteractionModelHelper.h \ + --known-failure app/MessageDef/ArrayBuilder.h \ + --known-failure app/MessageDef/ArrayParser.h \ + --known-failure app/MessageDef/CommandDataIB.h \ + --known-failure app/MessageDef/CommandPathIB.h \ + --known-failure app/MessageDef/CommandStatusIB.h \ + --known-failure app/MessageDef/EventFilterIB.h \ + --known-failure app/MessageDef/EventFilterIBs.h \ + --known-failure app/MessageDef/InvokeRequestMessage.h \ + --known-failure app/MessageDef/InvokeRequests.h \ + --known-failure app/MessageDef/InvokeResponseIB.h \ + --known-failure app/MessageDef/InvokeResponseIBs.h \ + --known-failure app/MessageDef/InvokeResponseMessage.h \ + --known-failure app/MessageDef/ListBuilder.h \ + --known-failure app/MessageDef/ListParser.h \ + --known-failure app/MessageDef/StatusResponseMessage.h \ + --known-failure app/MessageDef/StructBuilder.h \ + --known-failure app/MessageDef/StructParser.h \ + --known-failure app/MessageDef/SubscribeRequestMessage.h \ + --known-failure app/MessageDef/SubscribeResponseMessage.h \ + --known-failure app/MessageDef/TimedRequestMessage.h \ + --known-failure app/MessageDef/WriteRequestMessage.h \ + --known-failure app/MessageDef/WriteResponseMessage.h \ + --known-failure app/ObjectList.h \ + --known-failure app/ReadClient.h \ + --known-failure app/ReadHandler.h \ + --known-failure app/ReadPrepareParams.h \ + --known-failure app/reporting/tests/MockReportScheduler.cpp \ + --known-failure app/reporting/tests/MockReportScheduler.h \ + --known-failure app/server/AppDelegate.h \ + --known-failure app/TestEventTriggerDelegate.h \ + --known-failure app/tests/integration/common.h \ + --known-failure app/tests/integration/MockEvents.h \ + --known-failure app/tests/suites/credentials/TestHarnessDACProvider.h \ + --known-failure app/tests/TestOperationalDeviceProxy.cpp \ + --known-failure app/util/af-enums.h \ + --known-failure app/util/af.h \ + --known-failure app/util/af-types.h \ + --known-failure app/util/attribute-metadata.h \ + --known-failure app/util/attribute-storage.cpp \ + --known-failure app/util/attribute-storage.h \ + --known-failure app/util/attribute-storage-null-handling.h \ + --known-failure app/util/attribute-table.cpp \ + --known-failure app/util/attribute-table.h \ + --known-failure app/util/binding-table.cpp \ + --known-failure app/util/binding-table.h \ + --known-failure app/util/common.h \ + --known-failure app/util/config.h \ + --known-failure app/util/DataModelHandler.cpp \ + --known-failure app/util/DataModelHandler.h \ + --known-failure app/util/ember-compatibility-functions.cpp \ + --known-failure app/util/endpoint-config-api.h \ + --known-failure app/util/endpoint-config-defines.h \ + --known-failure app/util/error-mapping.h \ + --known-failure app/util/generic-callbacks.h \ + --known-failure app/util/generic-callback-stubs.cpp \ + --known-failure app/util/im-client-callbacks.h \ + --known-failure app/util/MatterCallbacks.h \ + --known-failure app/util/message.cpp \ + --known-failure app/util/mock/Constants.h \ + --known-failure app/util/mock/Functions.h \ + --known-failure app/util/mock/MockNodeConfig.h \ + --known-failure app/util/odd-sized-integers.h \ + --known-failure app/util/types_stub.h \ + --known-failure app/util/util.cpp \ + --known-failure app/util/util.h \ + --known-failure app/WriteClient.h \ + --known-failure app/WriteHandler.h \ + --known-failure inet/tests/TestInetLayerCommon.hpp \ + --known-failure lib/core/CHIPVendorIdentifiers.hpp \ + --known-failure lib/dnssd/Constants.h \ + --known-failure lib/dnssd/minimal_mdns/core/FlatAllocatedQName.h \ + --known-failure lib/dnssd/minimal_mdns/core/HeapQName.h \ + --known-failure lib/dnssd/minimal_mdns/ListenIterator.h \ + --known-failure lib/dnssd/minimal_mdns/tests/CheckOnlyServer.h \ + --known-failure lib/dnssd/platform/DnssdBrowseDelegate.h \ + --known-failure lib/support/CHIPArgParser.hpp \ + --known-failure messaging/tests/echo/common.h \ + --known-failure platform/DeviceSafeQueue.cpp \ + --known-failure platform/DeviceSafeQueue.h \ + --known-failure platform/GLibTypeDeleter.h \ + --known-failure platform/SingletonConfigurationManager.cpp \ + --known-failure transport/retransmit/tests/TestCacheDriver.cpp \ + " + - name: Check for matter lint errors if: always() run: | diff --git a/scripts/tools/not_known_to_gn.py b/scripts/tools/not_known_to_gn.py new file mode 100755 index 00000000000000..613f8a23ecb707 --- /dev/null +++ b/scripts/tools/not_known_to_gn.py @@ -0,0 +1,182 @@ +#!/usr/bin/env python3 +# +# Copyright (c) 2024 Project CHIP Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +""" +Lists files specific files from a source tree and ensures +they are covered by GN in some way. + +'Covered' is very loosely and it just tries to see if the GN text +contains that word without trying to validate if this is a +comment or some actual 'source' element. + +It is intended as a failsafe to not foget adding source files +to gn. +""" +import logging +import os +import sys +from pathlib import Path, PurePath +from typing import Dict, Set + +import click +import coloredlogs + +__LOG_LEVELS__ = { + 'debug': logging.DEBUG, + 'info': logging.INFO, + 'warn': logging.WARN, + 'fatal': logging.FATAL, +} + + +class OrphanChecker: + def __init__(self): + self.gn_data: Dict[str, str] = {} + self.known_failures: Set[str] = set() + self.fatal_failures = 0 + self.failures = 0 + self.found_failures: Set[str] = set() + + def AppendGnData(self, gn: PurePath): + """Adds a GN file to the list of internally known GN data. + + Will read the entire content of the GN file in memory for future reference. + """ + logging.debug(f'Adding GN {gn!s} for {gn.parent!s}') + self.gn_data[str(gn.parent)] = gn.read_text('utf-8') + + def AddKnownFailure(self, k: str): + self.known_failures.add(k) + + def _IsKnownFailure(self, path: str) -> bool: + """check if failing on the given path is a known/acceptable failure""" + for k in self.known_failures: + if path == k or path.endswith(os.path.sep + k): + # mark some found failures to report if something is supposed + # to be known but it is not + self.found_failures.add(k) + return True + return False + + def Check(self, top_dir: str, file: PurePath): + """ + Validates that the given path is somehow referenced in GN files in any + of the parent sub-directories of the file. + + `file` must be relative to `top_dir`. Top_dir is used to resolve relative + paths in error reports and known failure checks. + """ + # Check logic: + # - ensure the file name is included in some GN file inside this or + # upper directory (although upper directory is not ideal) + for p in file.parents: + data = self.gn_data.get(str(p), None) + if not data: + continue + + if file.name in data: + logging.debug("%s found in BUILD.gn for %s", file, p) + return + + path = str(file.relative_to(top_dir)) + if not self._IsKnownFailure(path): + logging.error("UNKNOWN to gn: %s", path) + self.fatal_failures += 1 + else: + logging.warning("UNKNOWN to gn: %s (known error)", path) + + self.failures += 1 + + +@click.command() +@click.option( + '--log-level', + default='INFO', + type=click.Choice(list(__LOG_LEVELS__.keys()), case_sensitive=False), + help='Determines the verbosity of script output', +) +@click.option( + '--extensions', + default=["cpp", "cc", "c", "h", "hpp"], + type=str, multiple=True, + help='What file extensions to consider', +) +@click.option( + '--known-failure', + type=str, multiple=True, + help='What paths are known to fail', +) +@click.option( + '--skip-dir', + type=str, + multiple=True, + help='Skip a specific sub-directory from checks', +) +@click.argument('dirs', + type=click.Path(exists=True, file_okay=False, resolve_path=True), nargs=-1) +def main(log_level, extensions, dirs, known_failure, skip_dir): + coloredlogs.install(level=__LOG_LEVELS__[log_level], + fmt='%(asctime)s %(levelname)-7s %(message)s') + + if not dirs: + logging.error("Please provide at least one directory to scan") + sys.exit(1) + + if not extensions: + logging.error("Need at least one extension") + sys.exit(1) + + checker = OrphanChecker() + for k in known_failure: + checker.AddKnownFailure(k) + + # ensure all GN data is loaded + for directory in dirs: + for name in Path(directory).rglob("BUILD.gn"): + checker.AppendGnData(name) + + skip_dir = set(skip_dir) + + # Go through all files and check for orphaned (if any) + extensions = set(extensions) + for directory in dirs: + for path, dirnames, filenames in os.walk(directory): + if any([s in path for s in skip_dir]): + continue + for f in filenames: + full_path = Path(os.path.join(path, f)) + if not full_path.suffix or full_path.suffix[1:] not in extensions: + continue + checker.Check(directory, full_path) + + if checker.failures: + logging.warning("%d files not known to GN (%d fatal)", checker.failures, checker.fatal_failures) + + if checker.known_failures != checker.found_failures: + not_failing = checker.known_failures - checker.found_failures + logging.warning("NOTE: %d failures are not found anymore:", len(not_failing)) + for name in not_failing: + logging.warning(" - %s", name) + # Assume this is fatal - remove some of the "known-failing" should be easy. + # This forces scripts to always be correct and not accumulate bad input. + sys.exit(1) + + if checker.fatal_failures > 0: + sys.exit(1) + + +if __name__ == '__main__': + main(auto_envvar_prefix='CHIP') From 0f96b3a876f8c7344e58b7d91839760177cbd443 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Wed, 7 Feb 2024 11:03:37 -0500 Subject: [PATCH 3/4] Fix linter error: messagedef files are now covered by gn (#31995) --- .github/workflows/lint.yml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2924edff45419d..a3f2937276d4a9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -118,28 +118,6 @@ jobs: --known-failure app/EventLoggingTypes.h \ --known-failure app/EventManagement.h \ --known-failure app/InteractionModelHelper.h \ - --known-failure app/MessageDef/ArrayBuilder.h \ - --known-failure app/MessageDef/ArrayParser.h \ - --known-failure app/MessageDef/CommandDataIB.h \ - --known-failure app/MessageDef/CommandPathIB.h \ - --known-failure app/MessageDef/CommandStatusIB.h \ - --known-failure app/MessageDef/EventFilterIB.h \ - --known-failure app/MessageDef/EventFilterIBs.h \ - --known-failure app/MessageDef/InvokeRequestMessage.h \ - --known-failure app/MessageDef/InvokeRequests.h \ - --known-failure app/MessageDef/InvokeResponseIB.h \ - --known-failure app/MessageDef/InvokeResponseIBs.h \ - --known-failure app/MessageDef/InvokeResponseMessage.h \ - --known-failure app/MessageDef/ListBuilder.h \ - --known-failure app/MessageDef/ListParser.h \ - --known-failure app/MessageDef/StatusResponseMessage.h \ - --known-failure app/MessageDef/StructBuilder.h \ - --known-failure app/MessageDef/StructParser.h \ - --known-failure app/MessageDef/SubscribeRequestMessage.h \ - --known-failure app/MessageDef/SubscribeResponseMessage.h \ - --known-failure app/MessageDef/TimedRequestMessage.h \ - --known-failure app/MessageDef/WriteRequestMessage.h \ - --known-failure app/MessageDef/WriteResponseMessage.h \ --known-failure app/ObjectList.h \ --known-failure app/ReadClient.h \ --known-failure app/ReadHandler.h \ From d7a792826725c37711bfafb2b40325305a8c6828 Mon Sep 17 00:00:00 2001 From: William Date: Wed, 7 Feb 2024 16:09:24 +0000 Subject: [PATCH 4/4] Rvc op state delegate dummy start stop handlers (#31764) * Added dummy implementations of the start and stop handler methods to the RvcOperationalState::Delegate class. * Removed the start and stop handler methods defined in the all-clusters-app RvcOperationalStateDelegate. * Removed the start and stop handler methods defined in the rvc-app RvcOperationalStateDelegate. * Restyled by clang-format * Apply typo fixes from code review Co-authored-by: Petru Lauric <81822411+plauric@users.noreply.github.com> --------- Co-authored-by: Restyled.io Co-authored-by: Petru Lauric <81822411+plauric@users.noreply.github.com> --- .../rvc-operational-state-delegate-impl.h | 12 -------- .../rvc-operational-state-delegate-impl.cpp | 28 ------------------- .../include/rvc-operational-state-delegate.h | 16 ----------- .../operational-state-server.h | 22 +++++++++++++++ 4 files changed, 22 insertions(+), 56 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/include/rvc-operational-state-delegate-impl.h b/examples/all-clusters-app/all-clusters-common/include/rvc-operational-state-delegate-impl.h index 89a3e69c5b8bed..4417f9f5a3ab4a 100644 --- a/examples/all-clusters-app/all-clusters-common/include/rvc-operational-state-delegate-impl.h +++ b/examples/all-clusters-app/all-clusters-common/include/rvc-operational-state-delegate-impl.h @@ -90,18 +90,6 @@ class RvcOperationalStateDelegate : public Delegate */ void HandleResumeStateCallback(OperationalState::GenericOperationalError & err) override; - /** - * Handle Command Callback in application: Start - * @param[out] get operational error after callback. - */ - void HandleStartStateCallback(OperationalState::GenericOperationalError & err) override; - - /** - * Handle Command Callback in application: Stop - * @param[out] get operational error after callback. - */ - void HandleStopStateCallback(OperationalState::GenericOperationalError & err) override; - /** * Handle the GoHome command. * @param err diff --git a/examples/all-clusters-app/all-clusters-common/src/rvc-operational-state-delegate-impl.cpp b/examples/all-clusters-app/all-clusters-common/src/rvc-operational-state-delegate-impl.cpp index 946110bb18906c..e41ae2b863fa54 100644 --- a/examples/all-clusters-app/all-clusters-common/src/rvc-operational-state-delegate-impl.cpp +++ b/examples/all-clusters-app/all-clusters-common/src/rvc-operational-state-delegate-impl.cpp @@ -70,34 +70,6 @@ void RvcOperationalStateDelegate::HandleResumeStateCallback(OperationalState::Ge } } -void RvcOperationalStateDelegate::HandleStartStateCallback(OperationalState::GenericOperationalError & err) -{ - // placeholder implementation - auto error = GetInstance()->SetOperationalState(to_underlying(OperationalState::OperationalStateEnum::kRunning)); - if (error == CHIP_NO_ERROR) - { - err.Set(to_underlying(OperationalState::ErrorStateEnum::kNoError)); - } - else - { - err.Set(to_underlying(OperationalState::ErrorStateEnum::kUnableToCompleteOperation)); - } -} - -void RvcOperationalStateDelegate::HandleStopStateCallback(OperationalState::GenericOperationalError & err) -{ - // placeholder implementation - auto error = GetInstance()->SetOperationalState(to_underlying(OperationalState::OperationalStateEnum::kStopped)); - if (error == CHIP_NO_ERROR) - { - err.Set(to_underlying(OperationalState::ErrorStateEnum::kNoError)); - } - else - { - err.Set(to_underlying(OperationalState::ErrorStateEnum::kUnableToCompleteOperation)); - } -} - void RvcOperationalStateDelegate::HandleGoHomeCommandCallback(OperationalState::GenericOperationalError & err) { // placeholder implementation diff --git a/examples/rvc-app/rvc-common/include/rvc-operational-state-delegate.h b/examples/rvc-app/rvc-common/include/rvc-operational-state-delegate.h index 400dfd67910234..e40ba64fbf7f3a 100644 --- a/examples/rvc-app/rvc-common/include/rvc-operational-state-delegate.h +++ b/examples/rvc-app/rvc-common/include/rvc-operational-state-delegate.h @@ -99,22 +99,6 @@ class RvcOperationalStateDelegate : public RvcOperationalState::Delegate */ void HandleResumeStateCallback(Clusters::OperationalState::GenericOperationalError & err) override; - /** - * Handle Command Callback in application: Start - * @param[out] get operational error after callback. - */ - void HandleStartStateCallback(Clusters::OperationalState::GenericOperationalError & err) override{ - // This command in not supported. - }; - - /** - * Handle Command Callback in application: Stop - * @param[out] get operational error after callback. - */ - void HandleStopStateCallback(Clusters::OperationalState::GenericOperationalError & err) override{ - // This command in not supported. - }; - void SetPauseCallback(HandleOpStateCommand aCallback, RvcDevice * aInstance) { mPauseCallback = aCallback; diff --git a/src/app/clusters/operational-state-server/operational-state-server.h b/src/app/clusters/operational-state-server/operational-state-server.h index e4ab6d981ca75a..5a461c272177ba 100644 --- a/src/app/clusters/operational-state-server/operational-state-server.h +++ b/src/app/clusters/operational-state-server/operational-state-server.h @@ -341,10 +341,32 @@ namespace RvcOperationalState { class Delegate : public OperationalState::Delegate { public: + /** + * Handle Command Callback in application: GoHome + * @param[out] err operational error after callback. + */ virtual void HandleGoHomeCommandCallback(OperationalState::GenericOperationalError & err) { err.Set(to_underlying(OperationalState::ErrorStateEnum::kUnknownEnumValue)); }; + + /** + * The start command is not supported by the RvcOperationalState cluster hence this method should never be called. + * This is a dummy implementation of the handler method so the consumer of this class does not need to define it. + */ + void HandleStartStateCallback(OperationalState::GenericOperationalError & err) override + { + err.Set(to_underlying(OperationalState::ErrorStateEnum::kUnknownEnumValue)); + }; + + /** + * The stop command is not supported by the RvcOperationalState cluster hence this method should never be called. + * This is a dummy implementation of the handler method so the consumer of this class does not need to define it. + */ + void HandleStopStateCallback(OperationalState::GenericOperationalError & err) override + { + err.Set(to_underlying(OperationalState::ErrorStateEnum::kUnknownEnumValue)); + }; }; class Instance : public OperationalState::Instance