diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 7ab674139d3c77..c2659148b81655 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -17,7 +17,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
- "BUILD_VERSION": "0.7.2"
+ "BUILD_VERSION": "0.7.3"
}
},
"remoteUser": "vscode",
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
index 2e809977c1dc1a..d77e05b4f26c58 100644
--- a/.github/.wordlist.txt
+++ b/.github/.wordlist.txt
@@ -606,6 +606,7 @@ GroupKeyManagement
groupKeySecurityPolicy
groupKeySetID
groupsettings
+gsdk
gtk
GUA
Gv
diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
index 24c6b0420dfe9c..99d279c20970c6 100644
--- a/.github/workflows/bloat_check.yaml
+++ b/.github/workflows/bloat_check.yaml
@@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest
container:
- image: connectedhomeip/chip-build:0.7.2
+ image: connectedhomeip/chip-build:0.7.3
steps:
- uses: Wandalen/wretry.action@v1.0.36
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f189d5045c3da0..f659f10b5a76e8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build:0.7.2
+ image: connectedhomeip/chip-build:0.7.3
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -148,7 +148,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build:0.7.2
+ image: connectedhomeip/chip-build:0.7.3
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -320,7 +320,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build:0.7.2
+ image: connectedhomeip/chip-build:0.7.3
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -487,7 +487,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build:0.7.2
+ image: connectedhomeip/chip-build:0.7.3
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 7d8ea2f394b9d0..f6f8c4c6076986 100644
--- a/.github/workflows/chef.yaml
+++ b/.github/workflows/chef.yaml
@@ -30,7 +30,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build:0.7.2
+ image: connectedhomeip/chip-build:0.7.3
options: --user root
steps:
@@ -66,7 +66,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-esp32:0.7.2
+ image: connectedhomeip/chip-build-esp32:0.7.3
options: --user root
steps:
@@ -102,7 +102,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-nrf-platform:0.7.2
+ image: connectedhomeip/chip-build-nrf-platform:0.7.3
options: --user root
steps:
diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
index 945a73300713aa..6b2dfa7372ed6b 100644
--- a/.github/workflows/cirque.yaml
+++ b/.github/workflows/cirque.yaml
@@ -30,7 +30,7 @@ jobs:
timeout-minutes: 90
env:
- DOCKER_RUN_VERSION: 0.7.2
+ DOCKER_RUN_VERSION: 0.7.3
GITHUB_CACHE_PATH: /tmp/cirque-cache
runs-on: ubuntu-latest
@@ -39,7 +39,7 @@ jobs:
# need to run with privilege, which isn't supported by job.XXX.contaner
# https://github.com/actions/container-action/issues/2
# container:
- # image: connectedhomeip/chip-build-cirque:0.7.2
+ # image: connectedhomeip/chip-build-cirque:0.7.3
# volumes:
# - "/tmp:/tmp"
# - "/dev/pts:/dev/pts"
diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml
index 169606644a9e19..00c669eb81a4ce 100644
--- a/.github/workflows/darwin.yaml
+++ b/.github/workflows/darwin.yaml
@@ -145,7 +145,9 @@ jobs:
# And a different port from the test harness too; the test harness uses port 5541.
../../../out/debug/chip-ota-requestor-app --interface-id -1 --secured-device-port 5542 --discriminator 1111 --KVS /tmp/chip-ota-requestor-kvs1 --otaDownloadPath /tmp/chip-ota-requestor-downloaded-image1 --autoApplyImage > >(tee /tmp/darwin/framework-tests/ota-requestor-app-1.log) 2> >(tee /tmp/darwin/framework-tests/ota-requestor-app-err-1.log >&2) &
../../../out/debug/chip-ota-requestor-app --interface-id -1 --secured-device-port 5543 --discriminator 1112 --KVS /tmp/chip-ota-requestor-kvs2 --otaDownloadPath /tmp/chip-ota-requestor-downloaded-image2 --autoApplyImage > >(tee /tmp/darwin/framework-tests/ota-requestor-app-2.log) 2> >(tee /tmp/darwin/framework-tests/ota-requestor-app-err-2.log >&2) &
- xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-incomplete-umbrella -Wno-unguarded-availability-new' > >(tee /tmp/darwin/framework-tests/darwin-tests.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-err.log >&2)
+ # UndefinedBehaviorSanitizer is enabled in the Xcode scheme, so the code in Matter.framework gets instrumented,
+ # but to instrument the code in the underlying libCHIP we need to pass CHIP_IS_UBSAN=YES
+ xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-incomplete-umbrella -Wno-unguarded-availability-new' CHIP_IS_UBSAN=YES > >(tee /tmp/darwin/framework-tests/darwin-tests.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-err.log >&2)
working-directory: src/darwin/Framework
- name: Uploading log files
uses: actions/upload-artifact@v3
diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml
index 0e6ac209210838..3a0dc4a9d9f8b1 100644
--- a/.github/workflows/doxygen.yaml
+++ b/.github/workflows/doxygen.yaml
@@ -82,7 +82,7 @@ jobs:
runs-on: ubuntu-latest
container:
- image: connectedhomeip/chip-build-doxygen:0.7.2
+ image: connectedhomeip/chip-build-doxygen:0.7.3
if: github.actor != 'restyled-io[bot]'
diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
index 329d2c47dd29bb..438df5c863a991 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: connectedhomeip/chip-build-ameba:0.7.2
+ image: connectedhomeip/chip-build-ameba:0.7.3
options: --user root
steps:
diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml
index d3a47d11cfb1c6..b0216522bde2c0 100644
--- a/.github/workflows/examples-bouffalolab.yaml
+++ b/.github/workflows/examples-bouffalolab.yaml
@@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-bouffalolab:0.7.2
+ image: connectedhomeip/chip-build-bouffalolab:0.7.3
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 e0a14620e850f6..ee76323463763b 100644
--- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml
+++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml
@@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-ti:0.7.2
+ image: connectedhomeip/chip-build-ti:0.7.3
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml
index a0581ba63a90f4..c2b86972a294ae 100644
--- a/.github/workflows/examples-cc32xx.yaml
+++ b/.github/workflows/examples-cc32xx.yaml
@@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-ti:0.7.2
+ image: connectedhomeip/chip-build-ti:0.7.3
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
index cde592dee78c8e..4954d9c9af8930 100644
--- a/.github/workflows/examples-efr32.yaml
+++ b/.github/workflows/examples-efr32.yaml
@@ -39,7 +39,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-efr32:0.7.2
+ image: connectedhomeip/chip-build-efr32:0.7.3
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index e91b33c8dfbd05..67872b2f186a79 100644
--- a/.github/workflows/examples-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-esp32:0.7.2
+ image: connectedhomeip/chip-build-esp32:0.7.3
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
@@ -160,7 +160,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-esp32:0.7.2
+ image: connectedhomeip/chip-build-esp32:0.7.3
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
index 9cb27d40fbf5f9..f270017b796cdf 100644
--- a/.github/workflows/examples-infineon.yaml
+++ b/.github/workflows/examples-infineon.yaml
@@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-infineon:0.7.2
+ image: connectedhomeip/chip-build-infineon:0.7.3
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
index 130f37bc2d5529..cea556dbb51dc2 100644
--- a/.github/workflows/examples-k32w.yaml
+++ b/.github/workflows/examples-k32w.yaml
@@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-k32w:0.7.2
+ image: connectedhomeip/chip-build-k32w:0.7.3
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 fb72d2db3a1129..17e9562baecb31 100644
--- a/.github/workflows/examples-linux-arm.yaml
+++ b/.github/workflows/examples-linux-arm.yaml
@@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-crosscompile:0.7.2
+ image: connectedhomeip/chip-build-crosscompile:0.7.3
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml
index 6bb97f378cfac0..2f9d0a26a297aa 100644
--- a/.github/workflows/examples-linux-imx.yaml
+++ b/.github/workflows/examples-linux-imx.yaml
@@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-imx:0.7.2
+ image: connectedhomeip/chip-build-imx:0.7.3
steps:
- uses: Wandalen/wretry.action@v1.0.36
diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
index 2d76468d96e3fa..6a18a1ab872ff2 100644
--- a/.github/workflows/examples-linux-standalone.yaml
+++ b/.github/workflows/examples-linux-standalone.yaml
@@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build:0.7.2
+ image: connectedhomeip/chip-build:0.7.3
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
index a0ee16f9396385..a00d7d3a463f97 100644
--- a/.github/workflows/examples-mbed.yaml
+++ b/.github/workflows/examples-mbed.yaml
@@ -41,7 +41,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-mbed-os:0.7.2
+ image: connectedhomeip/chip-build-mbed-os:0.7.3
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml
index 4ce562711fbbed..8d7c59bbdc0408 100755
--- a/.github/workflows/examples-mw320.yaml
+++ b/.github/workflows/examples-mw320.yaml
@@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build:0.7.2
+ image: connectedhomeip/chip-build:0.7.3
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
index 4ca9d323f7e941..df8204cb89903e 100644
--- a/.github/workflows/examples-nrfconnect.yaml
+++ b/.github/workflows/examples-nrfconnect.yaml
@@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-nrf-platform:0.7.2
+ image: connectedhomeip/chip-build-nrf-platform:0.7.3
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml
index d137c949c984fa..91503e37be7e41 100644
--- a/.github/workflows/examples-openiotsdk.yaml
+++ b/.github/workflows/examples-openiotsdk.yaml
@@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-openiotsdk:0.7.2
+ image: connectedhomeip/chip-build-openiotsdk:0.7.3
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
options: --privileged
diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
index d37dc2ac4e8cc2..b61da7a91ce0e7 100644
--- a/.github/workflows/examples-qpg.yaml
+++ b/.github/workflows/examples-qpg.yaml
@@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build:0.7.2
+ image: connectedhomeip/chip-build:0.7.3
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
index b28d0b38e65a5e..f5f1b58a5fbe5b 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: connectedhomeip/chip-build-telink:0.7.2
+ image: connectedhomeip/chip-build-telink:0.7.3
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml
index b66a47963b0413..5f254879850215 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: connectedhomeip/chip-build-tizen:0.7.2
+ image: connectedhomeip/chip-build-tizen:0.7.3
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 71e558a070b7f2..6b79e4fa1917a9 100644
--- a/.github/workflows/full-android.yaml
+++ b/.github/workflows/full-android.yaml
@@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-android:0.7.2
+ image: connectedhomeip/chip-build-android:0.7.3
volumes:
- "/tmp/log_output:/tmp/test_logs"
diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml
index 1884e3809489d2..9e7b4a4ba76a45 100644
--- a/.github/workflows/fuzzing-build.yaml
+++ b/.github/workflows/fuzzing-build.yaml
@@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build:0.7.2
+ image: connectedhomeip/chip-build:0.7.3
volumes:
- "/tmp/log_output:/tmp/test_logs"
diff --git a/.github/workflows/minimal-build.yaml b/.github/workflows/minimal-build.yaml
index e6215890be1dda..67d9bbfdd642f8 100644
--- a/.github/workflows/minimal-build.yaml
+++ b/.github/workflows/minimal-build.yaml
@@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
container:
- image: connectedhomeip/chip-build-minimal:0.7.2
+ image: connectedhomeip/chip-build-minimal:0.7.3
steps:
- name: Checkout
diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
index 5a795f295fd038..2be27598801d6a 100644
--- a/.github/workflows/qemu.yaml
+++ b/.github/workflows/qemu.yaml
@@ -39,7 +39,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-esp32-qemu:0.7.2
+ image: connectedhomeip/chip-build-esp32-qemu:0.7.3
volumes:
- "/tmp/log_output:/tmp/test_logs"
@@ -103,7 +103,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-tizen-qemu:0.7.2
+ image: connectedhomeip/chip-build-tizen-qemu:0.7.3
volumes:
- "/tmp/log_output:/tmp/test_logs"
diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
index cd8d67e42302fa..c19ccaca595ff5 100644
--- a/.github/workflows/release_artifacts.yaml
+++ b/.github/workflows/release_artifacts.yaml
@@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
container:
- image: connectedhomeip/chip-build-esp32:0.7.2
+ image: connectedhomeip/chip-build-esp32:0.7.3
steps:
- uses: Wandalen/wretry.action@v1.0.36
@@ -85,7 +85,7 @@ jobs:
runs-on: ubuntu-latest
container:
- image: connectedhomeip/chip-build-efr32:0.7.2
+ image: connectedhomeip/chip-build-efr32:0.7.3
steps:
- uses: Wandalen/wretry.action@v1.0.36
name: Checkout
diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml
index 54b9e4b00bf5c0..c962d705f29627 100644
--- a/.github/workflows/smoketest-android.yaml
+++ b/.github/workflows/smoketest-android.yaml
@@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'
container:
- image: connectedhomeip/chip-build-android:0.7.2
+ image: connectedhomeip/chip-build-android:0.7.3
volumes:
- "/tmp/log_output:/tmp/test_logs"
diff --git a/.github/workflows/smoketest-darwin.yaml b/.github/workflows/smoketest-darwin.yaml
index 7cefedeca044b0..55271cdef05c53 100644
--- a/.github/workflows/smoketest-darwin.yaml
+++ b/.github/workflows/smoketest-darwin.yaml
@@ -66,7 +66,7 @@ jobs:
.environment/gn_out/.ninja_log
.environment/pigweed-venv/*.log
- name: Build Matter TV Casting Bridge
- timeout-minutes: 20
+ timeout-minutes: 45
run: |
xcodebuild -target "MatterTvCastingBridge" -sdk iphoneos
working-directory: examples/tv-casting-app/darwin/MatterTvCastingBridge
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 6b21bc56a32961..b882cce8330dff 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -48,7 +48,7 @@ jobs:
runs-on: ubuntu-latest
container:
- image: connectedhomeip/chip-build:0.7.2
+ image: connectedhomeip/chip-build:0.7.3
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
@@ -442,7 +442,7 @@ jobs:
runs-on: ubuntu-latest
container:
- image: connectedhomeip/chip-build:0.7.2
+ image: connectedhomeip/chip-build:0.7.3
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
@@ -500,6 +500,7 @@ jobs:
scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_ACE_1_4.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --int-arg PIXIT.ACE.APPENDPOINT:1 PIXIT.ACE.APPDEVTYPEID:0x0100 --string-arg PIXIT.ACE.APPCLUSTER:OnOff PIXIT.ACE.APPATTRIBUTE:OnOff"'
scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_ACE_1_3.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021"'
scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_CGEN_2_4.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021"'
+ scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --script "src/python_testing/TestMatterTestingSupport.py"'
- name: Uploading core files
uses: actions/upload-artifact@v3
if: ${{ failure() && !env.ACT }}
@@ -529,7 +530,7 @@ jobs:
runs-on: ubuntu-latest
container:
- image: connectedhomeip/chip-build-java:0.7.2
+ image: connectedhomeip/chip-build-java:0.7.3
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml
index af90a200a59cc5..c42595e1c98129 100644
--- a/.github/workflows/unit_integration_test.yaml
+++ b/.github/workflows/unit_integration_test.yaml
@@ -38,7 +38,7 @@ jobs:
runs-on: ubuntu-latest
container:
- image: connectedhomeip/chip-build:0.7.2
+ image: connectedhomeip/chip-build:0.7.3
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 add42097b68648..4be57110756b43 100644
--- a/.github/workflows/zap_regeneration.yaml
+++ b/.github/workflows/zap_regeneration.yaml
@@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-20.04
container:
- image: connectedhomeip/chip-build:0.7.2
+ image: connectedhomeip/chip-build:0.7.3
defaults:
run:
shell: sh
diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
index 67eb4483f4e33f..9eb38e03a8a7e0 100644
--- a/.github/workflows/zap_templates.yaml
+++ b/.github/workflows/zap_templates.yaml
@@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-20.04
container:
- image: connectedhomeip/chip-build:0.7.2
+ image: connectedhomeip/chip-build:0.7.3
defaults:
run:
shell: sh
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 5a8cfbce9c8682..e68b78cbd4e57a 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -432,7 +432,7 @@
"request": "launch",
"cwd": "${workspaceRoot}/examples/${input:openiotsdkApp}/openiotsdk",
"executable": "./build/chip-openiotsdk-${input:openiotsdkApp}-example.elf",
- "armToolchainPath": "${env:ARM_GCC_TOOLCHAIN_PATH}/bin",
+ "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/",
"servertype": "external",
"gdbTarget": "${input:openiotsdkRemoteHost}:31627", //GDBserver port on FVP
"overrideLaunchCommands": [
@@ -452,7 +452,7 @@
"request": "launch",
"cwd": "${workspaceRoot}/src/test_driver/openiotsdk/unit-tests",
"executable": "./build/${input:openiotsdkUnittest}.elf",
- "armToolchainPath": "${env:ARM_GCC_TOOLCHAIN_PATH}/bin",
+ "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/",
"servertype": "external",
"gdbTarget": ":31627", //GDBserver port on FVP
"overrideLaunchCommands": ["-enable-pretty-printing"],
diff --git a/BUILD.gn b/BUILD.gn
index d9c68de527c0aa..dfe6cbbf4850f3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -677,10 +677,14 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
if (enable_tizen_builds) {
group("check:tizen") {
testonly = true
- deps = [ "${chip_root}/src/test_driver/tizen/integration-tests:check" ]
+ deps = [ "${chip_root}/src/test_driver/tizen:check(${chip_root}/build/toolchain/tizen:tizen_arm)" ]
}
- extra_check_deps += [ ":check:tizen" ]
+ # Include Tizen check target only if BLE is not enabled, since
+ # currently, QEMU-based Tizen does not support Bluetooth.
+ if (!chip_config_network_layer_ble) {
+ extra_check_deps += [ ":check:tizen" ]
+ }
}
if (enable_mw320_shell_build) {
diff --git a/docs/guides/android_building.md b/docs/guides/android_building.md
index 6f693e38efa5e3..8bc480568e2230 100644
--- a/docs/guides/android_building.md
+++ b/docs/guides/android_building.md
@@ -42,7 +42,7 @@ directory.
## Requirements for building
-You need Android SDK 21 & NDK 21.4.7075529 downloaded to your machine. Set the
+You need Android SDK 26 & NDK 23.2.8568313 downloaded to your machine. Set the
`$ANDROID_HOME` environment variable to where the SDK is downloaded and the
`$ANDROID_NDK_HOME` environment variable to point to where the NDK package is
downloaded. The build also requires `kotlinc` to be in your `$PATH`.
@@ -51,15 +51,15 @@ downloaded. The build also requires `kotlinc` to be in your `$PATH`.
2. Install NDK:
1. Tools -> SDK Manager -> SDK Tools Tab
2. Click [x] Show Package Details
- 3. Select NDK (Side by Side) -> 21.4.7075529
+ 3. Select NDK (Side by Side) -> 23.2.8568313
4. Apply
3. Install Command Line Tools:
1. Tools -> SDK Manager -> SDK Tools Tab -> Android SDK Command Line Tools
(latest)
2. Apply
-4. Install SDK 21:
- 1. Tools -> SDK Manager -> SDK Platforms Tab -> Android 5.0 (Lollipop) SDK
- Level 21
+4. Install SDK 26:
+ 1. Tools -> SDK Manager -> SDK Platforms Tab -> Android 8.0 (Oreo) SDK Level
+ 26
2. Apply
5. Install Emulator:
1. Tools -> Device Manager -> Create device -> Pixel 5 -> Android S API 31
@@ -69,14 +69,14 @@ downloaded. The build also requires `kotlinc` to be in your `$PATH`.
```
export ANDROID_HOME=~/Android/Sdk
-export ANDROID_NDK_HOME=~/Android/Sdk/ndk/21.4.7075529
+export ANDROID_NDK_HOME=~/Android/Sdk/ndk/23.2.8568313
```
### MacOS
```
export ANDROID_HOME=~/Library/Android/sdk
-export ANDROID_NDK_HOME=~/Library/Android/sdk/ndk/21.4.7075529
+export ANDROID_NDK_HOME=~/Library/Android/sdk/ndk/23.2.8568313
```
@@ -108,6 +108,7 @@ Android Studio Dolphin and below:
```shell
export JAVA_HOME=/Applications/Android\ Studio.app/Contents/jre/Contents/Home/
```
+
Android Studio Electric Eel 2022.1.1 and above:
```shell
diff --git a/docs/guides/esp32/ota.md b/docs/guides/esp32/ota.md
index 0217514523efd0..ab079250250b40 100644
--- a/docs/guides/esp32/ota.md
+++ b/docs/guides/esp32/ota.md
@@ -35,11 +35,24 @@ control list.
### Using Console
-After commissioning is successful, press Enter in requestor device console and
-type below query.
+After commissioning is successful, read the default-ota-providers list of
+requestor using the command below.
```
->matter ota query 1 0
+./out/debug/chip-tool otasoftwareupdaterequestor read default-otaproviders 0
+```
+
+If the list does not have your provider, write into default-ota-providers list
+of requestor using the command below.
+
+```
+./out/debug/chip-tool otasoftwareupdaterequestor write default-otaproviders '[{"fabricIndex": 1, "providerNodeID": , "endpoint": 0}, {"fabricIndex": 1, "providerNodeID": , "endpoint": 0}]' 0
+```
+
+Press Enter in requestor device console and type below query.
+
+```
+>matter ota query
```
Once the transfer is complete, OTA requestor sends ApplyUpdateRequest command to
diff --git a/examples/android/CHIPTool/app/src/main/AndroidManifest.xml b/examples/android/CHIPTool/app/src/main/AndroidManifest.xml
index 0d7401fea46066..0526dc5a78160d 100644
--- a/examples/android/CHIPTool/app/src/main/AndroidManifest.xml
+++ b/examples/android/CHIPTool/app/src/main/AndroidManifest.xml
@@ -3,6 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.google.chip.chiptool">
+
+
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt
index 3d130f835de459..add408b7af9693 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/ChipClient.kt
@@ -33,7 +33,7 @@ import chip.platform.PreferencesKeyValueStoreManager
import com.google.chip.chiptool.attestation.ExampleAttestationTrustStoreDelegate
import kotlin.coroutines.resume
import kotlin.coroutines.resumeWithException
-import kotlin.coroutines.suspendCoroutine
+import kotlinx.coroutines.suspendCancellableCoroutine
/** Lazily instantiates [ChipDeviceController] and holds a reference to it. */
object ChipClient {
@@ -75,7 +75,7 @@ object ChipClient {
// once we are done with the returned device pointer. Memory leak was introduced since the refactor
// that introduced it was very large in order to fix a use after free, which was considered to be
// worse than the memory leak that was introduced.
- return suspendCoroutine { continuation ->
+ return suspendCancellableCoroutine { continuation ->
getDeviceController(context).getConnectedDevicePointer(
nodeId,
object : GetConnectedDeviceCallback {
diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/endpointItem.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointItem.kt
similarity index 100%
rename from examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/endpointItem.kt
rename to examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointItem.kt
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
index 6a4d8ddd2f6e67..71b16a0f2d6fef 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -455,7 +455,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1571,7 +1570,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
index bb927e9cdc822d..3b9dacec8cd93b 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 95,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1493,7 +1493,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -2271,7 +2271,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
index d3e2e4f1d767a7..7f83d419ed05bb 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -454,7 +454,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1552,7 +1551,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
index 1b151c0c6d7910..add54ac827902b 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 92,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -8169,5 +8169,6 @@
"endpointVersion": 1,
"deviceIdentifier": 268
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
index b22e383af2ad27..ded5178c5ee201 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -306,7 +306,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1262,7 +1261,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
index 1d9fd78706cee2..c89f444b22f4e1 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
@@ -1041,7 +1041,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1057,7 +1057,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1073,7 +1073,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1493,7 +1493,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -2271,7 +2271,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
index b02fd871ece659..8f64d3a3c765dc 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -455,7 +455,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1437,7 +1436,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
index 67b075fe349bf9..427d91f778d64d 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 95,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1041,7 +1041,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1057,7 +1057,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1073,7 +1073,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1121,7 +1121,7 @@
"side": "server",
"type": "array",
"included": 0,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1508,7 +1508,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1541,7 +1541,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -2319,7 +2319,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
index 140935ef9ee206..7b8f60cf3d3c8d 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -306,7 +306,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1730,7 +1729,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
index d3a89febeb0b44..070614d2552400 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 92,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1041,7 +1041,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1057,7 +1057,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1073,7 +1073,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1493,7 +1493,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1885,13 +1885,13 @@
"enabled": 1,
"attributes": [
{
- "name": "SupportedLocales",
- "code": 1,
+ "name": "ActiveLocale",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "char_string",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1901,13 +1901,13 @@
"reportableChange": 0
},
{
- "name": "ActiveLocale",
- "code": 0,
+ "name": "SupportedLocales",
+ "code": 1,
"mfgCode": null,
"side": "server",
- "type": "char_string",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2271,7 +2271,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
@@ -4622,16 +4622,16 @@
"enabled": 1,
"attributes": [
{
- "name": "FeatureMap",
- "code": 65532,
+ "name": "NumberOfPositions",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap32",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4654,16 +4654,16 @@
"reportableChange": 0
},
{
- "name": "NumberOfPositions",
- "code": 0,
+ "name": "FeatureMap",
+ "code": 65532,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -9312,5 +9312,6 @@
"endpointVersion": 1,
"deviceIdentifier": 10
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
index 05c3478971017c..0d59a951762910 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -455,7 +455,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1664,7 +1663,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
index 1dad6a1f0af97d..23a361e271368b 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
index 0184f55ea7dc1d..806546549a9f6f 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
@@ -293,7 +293,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1297,7 +1296,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
index 56a127c5012700..41ab37e804b286 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 92,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -6387,5 +6387,6 @@
"endpointVersion": 1,
"deviceIdentifier": 43
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
index 7cfc2fabca5579..86996b5ed6e777 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
@@ -377,7 +377,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1332,7 +1331,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
index a875091a1cb1c5..5e2eb092ff701d 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 92,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1041,7 +1041,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1057,7 +1057,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1073,7 +1073,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1493,7 +1493,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1885,13 +1885,13 @@
"enabled": 1,
"attributes": [
{
- "name": "SupportedLocales",
- "code": 1,
+ "name": "ActiveLocale",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "char_string",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1901,13 +1901,13 @@
"reportableChange": 0
},
{
- "name": "ActiveLocale",
- "code": 0,
+ "name": "SupportedLocales",
+ "code": 1,
"mfgCode": null,
"side": "server",
- "type": "char_string",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2271,7 +2271,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
@@ -4622,16 +4622,16 @@
"enabled": 1,
"attributes": [
{
- "name": "FeatureMap",
- "code": 65532,
+ "name": "NumberOfPositions",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap32",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4654,16 +4654,16 @@
"reportableChange": 0
},
{
- "name": "NumberOfPositions",
- "code": 0,
+ "name": "FeatureMap",
+ "code": 65532,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -6367,5 +6367,6 @@
"endpointVersion": 1,
"deviceIdentifier": 774
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
index 790801e6d0dc21..1d6715ca7bf6f9 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -449,7 +449,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1605,7 +1604,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
index abc314d2429fdf..b34ca684831211 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
index 061546fcd14fe4..8dc61f017adcea 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -377,7 +377,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1332,7 +1331,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
index 28a3bda1f0cbed..269c850874557d 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 92,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1041,7 +1041,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1057,7 +1057,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1073,7 +1073,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1493,7 +1493,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1885,13 +1885,13 @@
"enabled": 1,
"attributes": [
{
- "name": "SupportedLocales",
- "code": 1,
+ "name": "ActiveLocale",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "char_string",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1901,13 +1901,13 @@
"reportableChange": 0
},
{
- "name": "ActiveLocale",
- "code": 0,
+ "name": "SupportedLocales",
+ "code": 1,
"mfgCode": null,
"side": "server",
- "type": "char_string",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2271,7 +2271,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
@@ -4622,16 +4622,16 @@
"enabled": 1,
"attributes": [
{
- "name": "FeatureMap",
- "code": 65532,
+ "name": "NumberOfPositions",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap32",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4654,16 +4654,16 @@
"reportableChange": 0
},
{
- "name": "NumberOfPositions",
- "code": 0,
+ "name": "FeatureMap",
+ "code": 65532,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -6367,5 +6367,6 @@
"endpointVersion": 1,
"deviceIdentifier": 775
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
index ab408221539d94..1eabc4a86d3d96 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
@@ -377,7 +377,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1337,7 +1336,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
index fce7f9bc5ad74e..68b146d451d158 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
@@ -1041,7 +1041,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1057,7 +1057,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1073,7 +1073,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1493,7 +1493,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1885,13 +1885,13 @@
"enabled": 1,
"attributes": [
{
- "name": "SupportedLocales",
- "code": 1,
+ "name": "ActiveLocale",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "char_string",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1901,13 +1901,13 @@
"reportableChange": 0
},
{
- "name": "ActiveLocale",
- "code": 0,
+ "name": "SupportedLocales",
+ "code": 1,
"mfgCode": null,
"side": "server",
- "type": "char_string",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2271,7 +2271,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
@@ -4622,16 +4622,16 @@
"enabled": 1,
"attributes": [
{
- "name": "FeatureMap",
- "code": 65532,
+ "name": "NumberOfPositions",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap32",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4654,16 +4654,16 @@
"reportableChange": 0
},
{
- "name": "NumberOfPositions",
- "code": 0,
+ "name": "FeatureMap",
+ "code": 65532,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
index ed687a8a792a4a..bb44cd84394001 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -377,7 +377,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1348,7 +1347,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
index fa7b7e97eb5004..d35ed962806f8a 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 92,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1041,7 +1041,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1057,7 +1057,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1073,7 +1073,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1493,7 +1493,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1885,13 +1885,13 @@
"enabled": 1,
"attributes": [
{
- "name": "SupportedLocales",
- "code": 1,
+ "name": "ActiveLocale",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "char_string",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1901,13 +1901,13 @@
"reportableChange": 0
},
{
- "name": "ActiveLocale",
- "code": 0,
+ "name": "SupportedLocales",
+ "code": 1,
"mfgCode": null,
"side": "server",
- "type": "char_string",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2271,7 +2271,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
@@ -4622,16 +4622,16 @@
"enabled": 1,
"attributes": [
{
- "name": "FeatureMap",
- "code": 65532,
+ "name": "NumberOfPositions",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap32",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4654,16 +4654,16 @@
"reportableChange": 0
},
{
- "name": "NumberOfPositions",
- "code": 0,
+ "name": "FeatureMap",
+ "code": 65532,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -6495,5 +6495,6 @@
"endpointVersion": 1,
"deviceIdentifier": 263
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
index 61151ed87e3264..549e69d48576e0 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -455,7 +455,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1396,7 +1395,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
index 6cda946228e3c2..982dacd48f8766 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 92,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1041,7 +1041,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1057,7 +1057,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1073,7 +1073,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1493,7 +1493,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1885,13 +1885,13 @@
"enabled": 1,
"attributes": [
{
- "name": "SupportedLocales",
- "code": 1,
+ "name": "ActiveLocale",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "char_string",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1901,13 +1901,13 @@
"reportableChange": 0
},
{
- "name": "ActiveLocale",
- "code": 0,
+ "name": "SupportedLocales",
+ "code": 1,
"mfgCode": null,
"side": "server",
- "type": "char_string",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2271,7 +2271,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
@@ -4622,16 +4622,16 @@
"enabled": 1,
"attributes": [
{
- "name": "FeatureMap",
- "code": 65532,
+ "name": "NumberOfPositions",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap32",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4654,16 +4654,16 @@
"reportableChange": 0
},
{
- "name": "NumberOfPositions",
- "code": 0,
+ "name": "FeatureMap",
+ "code": 65532,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -7491,5 +7491,6 @@
"endpointVersion": 1,
"deviceIdentifier": 256
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
index d610effe96b829..4a0f3b6496df09 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -418,7 +418,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1359,7 +1358,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
index d7f5c1531329cc..0b7369a8c68c0e 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 92,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1041,7 +1041,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1057,7 +1057,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1073,7 +1073,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1493,7 +1493,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1885,13 +1885,13 @@
"enabled": 1,
"attributes": [
{
- "name": "SupportedLocales",
- "code": 1,
+ "name": "ActiveLocale",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "char_string",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1901,13 +1901,13 @@
"reportableChange": 0
},
{
- "name": "ActiveLocale",
- "code": 0,
+ "name": "SupportedLocales",
+ "code": 1,
"mfgCode": null,
"side": "server",
- "type": "char_string",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2271,7 +2271,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
@@ -4622,16 +4622,16 @@
"enabled": 1,
"attributes": [
{
- "name": "FeatureMap",
- "code": 65532,
+ "name": "NumberOfPositions",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap32",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4654,16 +4654,16 @@
"reportableChange": 0
},
{
- "name": "NumberOfPositions",
- "code": 0,
+ "name": "FeatureMap",
+ "code": 65532,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -7491,5 +7491,6 @@
"endpointVersion": 1,
"deviceIdentifier": 259
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
index cb20eb0010bef2..abed57a9256e33 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -354,7 +354,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1295,7 +1294,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
index fae71f853ca6a0..f3d05fcf91c01e 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 92,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1041,7 +1041,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1057,7 +1057,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1073,7 +1073,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1493,7 +1493,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1885,13 +1885,13 @@
"enabled": 1,
"attributes": [
{
- "name": "SupportedLocales",
- "code": 1,
+ "name": "ActiveLocale",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "char_string",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1901,13 +1901,13 @@
"reportableChange": 0
},
{
- "name": "ActiveLocale",
- "code": 0,
+ "name": "SupportedLocales",
+ "code": 1,
"mfgCode": null,
"side": "server",
- "type": "char_string",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2271,7 +2271,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
@@ -4622,16 +4622,16 @@
"enabled": 1,
"attributes": [
{
- "name": "FeatureMap",
- "code": 65532,
+ "name": "NumberOfPositions",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap32",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4654,16 +4654,16 @@
"reportableChange": 0
},
{
- "name": "NumberOfPositions",
- "code": 0,
+ "name": "FeatureMap",
+ "code": 65532,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -7167,5 +7167,6 @@
"endpointVersion": 1,
"deviceIdentifier": 266
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
index e6a48ec1d33c99..dba7298c1a33d8 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -377,7 +377,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1351,7 +1350,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
index e1542aea915884..76a26d5b0c3404 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 92,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1041,7 +1041,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1057,7 +1057,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1073,7 +1073,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1493,7 +1493,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1885,13 +1885,13 @@
"enabled": 1,
"attributes": [
{
- "name": "SupportedLocales",
- "code": 1,
+ "name": "ActiveLocale",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "char_string",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1901,13 +1901,13 @@
"reportableChange": 0
},
{
- "name": "ActiveLocale",
- "code": 0,
+ "name": "SupportedLocales",
+ "code": 1,
"mfgCode": null,
"side": "server",
- "type": "char_string",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2271,7 +2271,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
@@ -4622,16 +4622,16 @@
"enabled": 1,
"attributes": [
{
- "name": "FeatureMap",
- "code": 65532,
+ "name": "NumberOfPositions",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap32",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4654,16 +4654,16 @@
"reportableChange": 0
},
{
- "name": "NumberOfPositions",
- "code": 0,
+ "name": "FeatureMap",
+ "code": 65532,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -6447,5 +6447,6 @@
"endpointVersion": 1,
"deviceIdentifier": 773
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
index 570a451d306239..b4842483068952 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -449,7 +449,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1390,7 +1389,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
index 3536614448a94d..a8142c637b0d93 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 92,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1041,7 +1041,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1057,7 +1057,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1073,7 +1073,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1493,7 +1493,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1885,13 +1885,13 @@
"enabled": 1,
"attributes": [
{
- "name": "SupportedLocales",
- "code": 1,
+ "name": "ActiveLocale",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "char_string",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1901,13 +1901,13 @@
"reportableChange": 0
},
{
- "name": "ActiveLocale",
- "code": 0,
+ "name": "SupportedLocales",
+ "code": 1,
"mfgCode": null,
"side": "server",
- "type": "char_string",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2271,7 +2271,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
@@ -4622,16 +4622,16 @@
"enabled": 1,
"attributes": [
{
- "name": "FeatureMap",
- "code": 65532,
+ "name": "NumberOfPositions",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap32",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4654,16 +4654,16 @@
"reportableChange": 0
},
{
- "name": "NumberOfPositions",
- "code": 0,
+ "name": "FeatureMap",
+ "code": 65532,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -6599,5 +6599,6 @@
"endpointVersion": 1,
"deviceIdentifier": 34
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
index bcf4f5fe127047..5a608865b67404 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
@@ -377,7 +377,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1331,7 +1330,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
index 7c76328fad7416..b336f9aa8c81b5 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 92,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1041,7 +1041,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1057,7 +1057,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1073,7 +1073,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1493,7 +1493,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1885,13 +1885,13 @@
"enabled": 1,
"attributes": [
{
- "name": "SupportedLocales",
- "code": 1,
+ "name": "ActiveLocale",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "char_string",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1901,13 +1901,13 @@
"reportableChange": 0
},
{
- "name": "ActiveLocale",
- "code": 0,
+ "name": "SupportedLocales",
+ "code": 1,
"mfgCode": null,
"side": "server",
- "type": "char_string",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2271,7 +2271,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
@@ -4622,16 +4622,16 @@
"enabled": 1,
"attributes": [
{
- "name": "FeatureMap",
- "code": 65532,
+ "name": "NumberOfPositions",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap32",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4654,16 +4654,16 @@
"reportableChange": 0
},
{
- "name": "NumberOfPositions",
- "code": 0,
+ "name": "FeatureMap",
+ "code": 65532,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -6367,5 +6367,6 @@
"endpointVersion": 1,
"deviceIdentifier": 770
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index c7f90bd36eee7b..661c82ffcda78f 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -306,7 +306,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1497,7 +1496,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
index b77fce2b8d2475..41db456660bdf0 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 92,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1041,7 +1041,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1057,7 +1057,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1073,7 +1073,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1493,7 +1493,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1885,13 +1885,13 @@
"enabled": 1,
"attributes": [
{
- "name": "SupportedLocales",
- "code": 1,
+ "name": "ActiveLocale",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "char_string",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1901,13 +1901,13 @@
"reportableChange": 0
},
{
- "name": "ActiveLocale",
- "code": 0,
+ "name": "SupportedLocales",
+ "code": 1,
"mfgCode": null,
"side": "server",
- "type": "char_string",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2271,7 +2271,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
@@ -4670,16 +4670,16 @@
"enabled": 1,
"attributes": [
{
- "name": "FeatureMap",
- "code": 65532,
+ "name": "NumberOfPositions",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap32",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4702,16 +4702,16 @@
"reportableChange": 0
},
{
- "name": "NumberOfPositions",
- "code": 0,
+ "name": "FeatureMap",
+ "code": 65532,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -7847,5 +7847,6 @@
"endpointVersion": 1,
"deviceIdentifier": 769
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
index ab5184084acaf1..753344467092fb 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
@@ -306,7 +306,6 @@ server cluster BasicInformation = 40 {
readonly attribute char_string<64> productLabel = 14;
readonly attribute char_string<32> serialNumber = 15;
attribute access(write: manage) boolean localConfigDisabled = 16;
- readonly attribute boolean reachable = 17;
readonly attribute char_string<32> uniqueID = 18;
readonly attribute CapabilityMinimaStruct capabilityMinima = 19;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -1391,7 +1390,6 @@ endpoint 0 {
callback attribute productLabel;
callback attribute serialNumber;
persist attribute localConfigDisabled default = 0;
- ram attribute reachable default = 1;
callback attribute uniqueID;
callback attribute capabilityMinima;
ram attribute featureMap default = 0;
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
index b78cd6315182a1..8a900bc80d1b16 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 92,
+ "featureLevel": 96,
"creator": "zap",
"keyValuePairs": [
{
@@ -1041,7 +1041,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1057,7 +1057,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1073,7 +1073,7 @@
"side": "server",
"type": "int16u",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1460,7 +1460,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
- "included": 1,
+ "included": 0,
"storageOption": "RAM",
"singleton": 1,
"bounded": 0,
@@ -1493,7 +1493,7 @@
"side": "server",
"type": "CapabilityMinimaStruct",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 1,
"bounded": 0,
"defaultValue": "",
@@ -1885,13 +1885,13 @@
"enabled": 1,
"attributes": [
{
- "name": "SupportedLocales",
- "code": 1,
+ "name": "ActiveLocale",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "array",
+ "type": "char_string",
"included": 1,
- "storageOption": "External",
+ "storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -1901,13 +1901,13 @@
"reportableChange": 0
},
{
- "name": "ActiveLocale",
- "code": 0,
+ "name": "SupportedLocales",
+ "code": 1,
"mfgCode": null,
"side": "server",
- "type": "char_string",
+ "type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2271,7 +2271,7 @@
"side": "server",
"type": "boolean",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
@@ -4622,16 +4622,16 @@
"enabled": 1,
"attributes": [
{
- "name": "FeatureMap",
- "code": 65532,
+ "name": "NumberOfPositions",
+ "code": 0,
"mfgCode": null,
"side": "server",
- "type": "bitmap32",
+ "type": "int8u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "0",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -4654,16 +4654,16 @@
"reportableChange": 0
},
{
- "name": "NumberOfPositions",
- "code": 0,
+ "name": "FeatureMap",
+ "code": 65532,
"mfgCode": null,
"side": "server",
- "type": "int8u",
+ "type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -7049,5 +7049,6 @@
"endpointVersion": 1,
"deviceIdentifier": 514
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/chip-tool/BUILD.gn b/examples/chip-tool/BUILD.gn
index 85f1c56e2d8266..e1e92d94b62ec3 100644
--- a/examples/chip-tool/BUILD.gn
+++ b/examples/chip-tool/BUILD.gn
@@ -70,8 +70,6 @@ static_library("chip-tool-utils") {
"commands/discover/DiscoverCommand.cpp",
"commands/discover/DiscoverCommissionablesCommand.cpp",
"commands/discover/DiscoverCommissionersCommand.cpp",
- "commands/pairing/CloseSessionCommand.cpp",
- "commands/pairing/CloseSessionCommand.h",
"commands/pairing/OpenCommissioningWindowCommand.cpp",
"commands/pairing/OpenCommissioningWindowCommand.h",
"commands/pairing/PairingCommand.cpp",
@@ -80,6 +78,8 @@ static_library("chip-tool-utils") {
"commands/payload/SetupPayloadGenerateCommand.cpp",
"commands/payload/SetupPayloadParseCommand.cpp",
"commands/payload/SetupPayloadVerhoeff.cpp",
+ "commands/session-management/CloseSessionCommand.cpp",
+ "commands/session-management/CloseSessionCommand.h",
"commands/storage/StorageManagementCommand.cpp",
]
diff --git a/examples/chip-tool/commands/common/CHIPCommand.cpp b/examples/chip-tool/commands/common/CHIPCommand.cpp
index d64db23eb072b2..ecf97505c331fe 100644
--- a/examples/chip-tool/commands/common/CHIPCommand.cpp
+++ b/examples/chip-tool/commands/common/CHIPCommand.cpp
@@ -93,7 +93,7 @@ CHIP_ERROR CHIPCommand::MaybeSetUpStack()
ReturnLogErrorOnFailure(chip::DeviceLayer::Internal::BLEMgrImpl().ConfigureBle(mBleAdapterId.ValueOr(0), true));
#endif
- ReturnLogErrorOnFailure(mDefaultStorage.Init());
+ ReturnLogErrorOnFailure(mDefaultStorage.Init(nullptr, GetStorageDirectory().ValueOr(nullptr)));
ReturnLogErrorOnFailure(mOperationalKeystore.Init(&mDefaultStorage));
ReturnLogErrorOnFailure(mOpCertStore.Init(&mDefaultStorage));
@@ -326,7 +326,7 @@ CHIP_ERROR CHIPCommand::GetIdentityNodeId(std::string identity, chip::NodeId * n
return CHIP_NO_ERROR;
}
- ReturnLogErrorOnFailure(mCommissionerStorage.Init(identity.c_str()));
+ ReturnLogErrorOnFailure(mCommissionerStorage.Init(identity.c_str(), GetStorageDirectory().ValueOr(nullptr)));
*nodeId = mCommissionerStorage.GetLocalNodeId();
@@ -419,7 +419,7 @@ CHIP_ERROR CHIPCommand::InitializeCommissioner(CommissionerIdentity & identity,
// TODO - OpCreds should only be generated for pairing command
// store the credentials in persistent storage, and
// generate when not available in the storage.
- ReturnLogErrorOnFailure(mCommissionerStorage.Init(identity.mName.c_str()));
+ ReturnLogErrorOnFailure(mCommissionerStorage.Init(identity.mName.c_str(), GetStorageDirectory().ValueOr(nullptr)));
if (mUseMaxSizedCerts.HasValue())
{
auto option = CredentialIssuerCommands::CredentialIssuerOptions::kMaximizeCertificateSizes;
diff --git a/examples/chip-tool/commands/common/CHIPCommand.h b/examples/chip-tool/commands/common/CHIPCommand.h
index 3f16ff95c4cd36..da0183aed04d89 100644
--- a/examples/chip-tool/commands/common/CHIPCommand.h
+++ b/examples/chip-tool/commands/common/CHIPCommand.h
@@ -86,6 +86,8 @@ class CHIPCommand : public Command
AddArgument("trace_decode", 0, 1, &mTraceDecode);
#endif // CHIP_CONFIG_TRANSPORT_TRACE_ENABLED
AddArgument("ble-adapter", 0, UINT16_MAX, &mBleAdapterId);
+ AddArgument("storage-directory", &mStorageDirectory,
+ "Directory to place chip-tool's storage files in. Defaults to $TMPDIR, with fallback to /tmp");
}
/////////// Command Interface /////////
diff --git a/examples/chip-tool/commands/common/Command.h b/examples/chip-tool/commands/common/Command.h
index 39d59dfb1d6a44..c3c59f41f99477 100644
--- a/examples/chip-tool/commands/common/Command.h
+++ b/examples/chip-tool/commands/common/Command.h
@@ -260,12 +260,19 @@ class Command
bool IsInteractive() { return mIsInteractive; }
- CHIP_ERROR RunAsInteractive()
+ CHIP_ERROR RunAsInteractive(const chip::Optional & interactiveStorageDirectory)
{
- mIsInteractive = true;
+ mStorageDirectory = interactiveStorageDirectory;
+ mIsInteractive = true;
return Run();
}
+ const chip::Optional & GetStorageDirectory() const { return mStorageDirectory; }
+
+protected:
+ // mStorageDirectory lives here so we can just set it in RunAsInteractive.
+ chip::Optional mStorageDirectory;
+
private:
bool InitArgument(size_t argIndex, char * argValue);
size_t AddArgument(const char * name, int64_t min, uint64_t max, void * out, ArgumentType type, const char * desc,
diff --git a/examples/chip-tool/commands/common/Commands.cpp b/examples/chip-tool/commands/common/Commands.cpp
index b59aaf0ff47d59..eef7d8ccb39174 100644
--- a/examples/chip-tool/commands/common/Commands.cpp
+++ b/examples/chip-tool/commands/common/Commands.cpp
@@ -149,7 +149,7 @@ int Commands::Run(int argc, char ** argv)
return (err == CHIP_NO_ERROR) ? EXIT_SUCCESS : EXIT_FAILURE;
}
-int Commands::RunInteractive(const char * command)
+int Commands::RunInteractive(const char * command, const chip::Optional & storageDirectory)
{
std::vector arguments;
VerifyOrReturnValue(DecodeArgumentsFromInteractiveMode(command, arguments), EXIT_FAILURE);
@@ -174,7 +174,7 @@ int Commands::RunInteractive(const char * command)
}
ChipLogProgress(chipTool, "Command: %s", commandStr.c_str());
- auto err = RunCommand(argc, argv, true);
+ auto err = RunCommand(argc, argv, true, storageDirectory);
// Do not delete arg[0]
for (auto i = 1; i < argc; i++)
@@ -185,7 +185,8 @@ int Commands::RunInteractive(const char * command)
return (err == CHIP_NO_ERROR) ? EXIT_SUCCESS : EXIT_FAILURE;
}
-CHIP_ERROR Commands::RunCommand(int argc, char ** argv, bool interactive)
+CHIP_ERROR Commands::RunCommand(int argc, char ** argv, bool interactive,
+ const chip::Optional & interactiveStorageDirectory)
{
Command * command = nullptr;
@@ -271,7 +272,25 @@ CHIP_ERROR Commands::RunCommand(int argc, char ** argv, bool interactive)
return CHIP_ERROR_INVALID_ARGUMENT;
}
- return interactive ? command->RunAsInteractive() : command->Run();
+ if (interactive)
+ {
+ return command->RunAsInteractive(interactiveStorageDirectory);
+ }
+
+ // Now that the command is initialized, get our storage from it as needed
+ // and set up our loging level.
+#ifdef CONFIG_USE_LOCAL_STORAGE
+ CHIP_ERROR err = mStorage.Init(nullptr, command->GetStorageDirectory().ValueOr(nullptr));
+ if (err != CHIP_NO_ERROR)
+ {
+ ChipLogError(Controller, "Init Storage failure: %s", chip::ErrorStr(err));
+ return err;
+ }
+
+ chip::Logging::SetLogFilter(mStorage.GetLoggingLevel());
+#endif // CONFIG_USE_LOCAL_STORAGE
+
+ return command->Run();
}
Commands::ClusterMap::iterator Commands::GetCluster(std::string clusterName)
diff --git a/examples/chip-tool/commands/common/Commands.h b/examples/chip-tool/commands/common/Commands.h
index eae7946e84c5ef..f9ba9f739ae140 100644
--- a/examples/chip-tool/commands/common/Commands.h
+++ b/examples/chip-tool/commands/common/Commands.h
@@ -32,12 +32,13 @@ class Commands
void Register(const char * clusterName, commands_list commandsList, const char * helpText = nullptr);
int Run(int argc, char ** argv);
- int RunInteractive(const char * command);
+ int RunInteractive(const char * command, const chip::Optional & storageDirectory = chip::NullOptional);
private:
using ClusterMap = std::map>;
- CHIP_ERROR RunCommand(int argc, char ** argv, bool interactive = false);
+ CHIP_ERROR RunCommand(int argc, char ** argv, bool interactive = false,
+ const chip::Optional & interactiveStorageDirectory = chip::NullOptional);
ClusterMap::iterator GetCluster(std::string clusterName);
Command * GetCommand(CommandsVector & commands, std::string commandName);
diff --git a/examples/chip-tool/commands/interactive/InteractiveCommands.cpp b/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
index fc895d4eb69eb1..84e543afada9ba 100644
--- a/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
+++ b/examples/chip-tool/commands/interactive/InteractiveCommands.cpp
@@ -319,7 +319,7 @@ bool InteractiveCommand::ParseCommand(char * command, int * status)
ClearLine();
- *status = mHandler->RunInteractive(command);
+ *status = mHandler->RunInteractive(command, GetStorageDirectory());
return true;
}
diff --git a/examples/chip-tool/commands/pairing/Commands.h b/examples/chip-tool/commands/pairing/Commands.h
index 4f4f445d929a8c..213c9e3ceb58f5 100644
--- a/examples/chip-tool/commands/pairing/Commands.h
+++ b/examples/chip-tool/commands/pairing/Commands.h
@@ -19,7 +19,6 @@
#pragma once
#include "commands/common/Commands.h"
-#include "commands/pairing/CloseSessionCommand.h"
#include "commands/pairing/GetCommissionerNodeIdCommand.h"
#include "commands/pairing/GetCommissionerRootCertificateCommand.h"
#include "commands/pairing/IssueNOCChainCommand.h"
@@ -241,7 +240,6 @@ void registerCommandsPairing(Commands & commands, CredentialIssuerCommands * cre
// make_unique(),
make_unique(credsIssuerConfig),
make_unique(credsIssuerConfig),
- make_unique(credsIssuerConfig),
make_unique(credsIssuerConfig),
make_unique(credsIssuerConfig),
make_unique(credsIssuerConfig),
diff --git a/examples/chip-tool/commands/pairing/CloseSessionCommand.cpp b/examples/chip-tool/commands/session-management/CloseSessionCommand.cpp
similarity index 72%
rename from examples/chip-tool/commands/pairing/CloseSessionCommand.cpp
rename to examples/chip-tool/commands/session-management/CloseSessionCommand.cpp
index 7f0a8bfef4d34a..ba38bca90d5dbb 100644
--- a/examples/chip-tool/commands/pairing/CloseSessionCommand.cpp
+++ b/examples/chip-tool/commands/session-management/CloseSessionCommand.cpp
@@ -23,20 +23,20 @@
using namespace chip;
using namespace chip::Protocols;
-CHIP_ERROR CloseSessionCommand::RunCommand()
+CHIP_ERROR SendCloseSessionCommand::RunCommand()
{
CommissioneeDeviceProxy * commissioneeDeviceProxy = nullptr;
- if (CHIP_NO_ERROR == CurrentCommissioner().GetDeviceBeingCommissioned(mDestinationId, &commissioneeDeviceProxy))
+ if (CHIP_NO_ERROR == CurrentCommissioner().GetDeviceBeingCommissioned(mDestinationNodeId, &commissioneeDeviceProxy))
{
VerifyOrReturnError(commissioneeDeviceProxy->GetSecureSession().HasValue(), CHIP_ERROR_INCORRECT_STATE);
return CloseSession(*commissioneeDeviceProxy->GetExchangeManager(), commissioneeDeviceProxy->GetSecureSession().Value());
}
- return CurrentCommissioner().GetConnectedDevice(mDestinationId, &mOnDeviceConnectedCallback,
+ return CurrentCommissioner().GetConnectedDevice(mDestinationNodeId, &mOnDeviceConnectedCallback,
&mOnDeviceConnectionFailureCallback);
}
-CHIP_ERROR CloseSessionCommand::CloseSession(Messaging::ExchangeManager & exchangeMgr, const SessionHandle & sessionHandle)
+CHIP_ERROR SendCloseSessionCommand::CloseSession(Messaging::ExchangeManager & exchangeMgr, const SessionHandle & sessionHandle)
{
// TODO perhaps factor out this code into something on StatusReport that
// takes an exchange and maybe a SendMessageFlags?
@@ -60,6 +60,10 @@ CHIP_ERROR CloseSessionCommand::CloseSession(Messaging::ExchangeManager & exchan
exchange->SendMessage(SecureChannel::MsgType::StatusReport, std::move(msg), Messaging::SendMessageFlags::kNoAutoRequestAck);
if (err == CHIP_NO_ERROR)
{
+ if (mEvictLocalSession.ValueOr(true))
+ {
+ sessionHandle->AsSecureSession()->MarkForEviction();
+ }
SetCommandExitStatus(CHIP_NO_ERROR);
}
else
@@ -70,21 +74,32 @@ CHIP_ERROR CloseSessionCommand::CloseSession(Messaging::ExchangeManager & exchan
return err;
}
-void CloseSessionCommand::OnDeviceConnectedFn(void * context, Messaging::ExchangeManager & exchangeMgr,
- const SessionHandle & sessionHandle)
+void SendCloseSessionCommand::OnDeviceConnectedFn(void * context, Messaging::ExchangeManager & exchangeMgr,
+ const SessionHandle & sessionHandle)
{
- auto * command = reinterpret_cast(context);
+ auto * command = reinterpret_cast(context);
VerifyOrReturn(command != nullptr, ChipLogError(chipTool, "OnDeviceConnectedFn: context is null"));
CHIP_ERROR err = command->CloseSession(exchangeMgr, sessionHandle);
VerifyOrReturn(CHIP_NO_ERROR == err, command->SetCommandExitStatus(err));
}
-void CloseSessionCommand::OnDeviceConnectionFailureFn(void * context, const chip::ScopedNodeId & peerId, CHIP_ERROR err)
+void SendCloseSessionCommand::OnDeviceConnectionFailureFn(void * context, const chip::ScopedNodeId & peerId, CHIP_ERROR err)
{
LogErrorOnFailure(err);
- auto * command = reinterpret_cast(context);
+ auto * command = reinterpret_cast(context);
VerifyOrReturn(command != nullptr, ChipLogError(chipTool, "OnDeviceConnectionFailureFn: context is null"));
command->SetCommandExitStatus(err);
}
+
+CHIP_ERROR EvictLocalCASESessionsCommand::RunCommand()
+{
+ auto & controller = CurrentCommissioner();
+ auto sessionManager = controller.SessionMgr();
+
+ sessionManager->ExpireAllSessions(ScopedNodeId(mDestinationNodeId, controller.GetFabricIndex()));
+
+ SetCommandExitStatus(CHIP_NO_ERROR);
+ return CHIP_NO_ERROR;
+}
diff --git a/examples/chip-tool/commands/pairing/CloseSessionCommand.h b/examples/chip-tool/commands/session-management/CloseSessionCommand.h
similarity index 53%
rename from examples/chip-tool/commands/pairing/CloseSessionCommand.h
rename to examples/chip-tool/commands/session-management/CloseSessionCommand.h
index edbcb82b094d5d..b51934a9390a92 100644
--- a/examples/chip-tool/commands/pairing/CloseSessionCommand.h
+++ b/examples/chip-tool/commands/session-management/CloseSessionCommand.h
@@ -23,16 +23,35 @@
#include
#include
-class CloseSessionCommand : public CHIPCommand
+namespace detail {
+
+class SessionManagementCommand : public CHIPCommand
+{
+public:
+ SessionManagementCommand(const char * commandName, CredentialIssuerCommands * credIssuerCommands, const char * helpText) :
+ CHIPCommand(commandName, credIssuerCommands, helpText)
+ {
+ AddArgument("node-id", 0, UINT64_MAX, &mDestinationNodeId);
+ }
+
+protected:
+ chip::NodeId mDestinationNodeId;
+};
+
+} // namespace detail
+
+class SendCloseSessionCommand : public detail::SessionManagementCommand
{
public:
- CloseSessionCommand(CredentialIssuerCommands * credIssuerCommands) :
- CHIPCommand("close-session", credIssuerCommands, "Sends a CloseSession message to the given destination node id."),
+ SendCloseSessionCommand(CredentialIssuerCommands * credIssuerCommands) :
+ detail::SessionManagementCommand("send-close-session", credIssuerCommands,
+ "Sends a CloseSession message to the given node id."),
mOnDeviceConnectedCallback(OnDeviceConnectedFn, this), mOnDeviceConnectionFailureCallback(OnDeviceConnectionFailureFn, this)
{
- AddArgument("destination-id", 0, UINT64_MAX, &mDestinationId);
AddArgument("timeout", 0, UINT64_MAX, &mTimeoutSecs,
"Time, in seconds, before this command is considered to have timed out.");
+ AddArgument("evict-local-session", 0, 1, &mEvictLocalSession,
+ "If true, evicts the local session after sending the message. If false, leaves it around. Defaults to true.");
}
/////////// CHIPCommand Interface /////////
@@ -43,16 +62,33 @@ class CloseSessionCommand : public CHIPCommand
}
private:
- chip::NodeId mDestinationId;
chip::Optional mTimeoutSecs;
+ chip::Optional mEvictLocalSession;
static void OnDeviceConnectedFn(void * context, chip::Messaging::ExchangeManager & exchangeMgr,
const chip::SessionHandle & sessionHandle);
static void OnDeviceConnectionFailureFn(void * context, const chip::ScopedNodeId & peerId, CHIP_ERROR error);
- // Try to send the action CloseSession status report.
+ // Try to send the CloseSession status report.
CHIP_ERROR CloseSession(chip::Messaging::ExchangeManager & exchangeMgr, const chip::SessionHandle & sessionHandle);
chip::Callback::Callback mOnDeviceConnectedCallback;
chip::Callback::Callback mOnDeviceConnectionFailureCallback;
};
+
+class EvictLocalCASESessionsCommand : public detail::SessionManagementCommand
+{
+public:
+ EvictLocalCASESessionsCommand(CredentialIssuerCommands * credIssuerCommands) :
+ detail::SessionManagementCommand("expire-case-sessions", credIssuerCommands,
+ "Expires (evicts) all local CASE sessions to the given node id.")
+ {}
+
+ /////////// CHIPCommand Interface /////////
+ CHIP_ERROR RunCommand() override;
+ chip::System::Clock::Timeout GetWaitDuration() const override
+ {
+ // This command does all its work synchronously, so it really does not matter too much.
+ return chip::System::Clock::Seconds16(5);
+ }
+};
diff --git a/examples/chip-tool/commands/session-management/Commands.h b/examples/chip-tool/commands/session-management/Commands.h
new file mode 100644
index 00000000000000..7c75be2065f13d
--- /dev/null
+++ b/examples/chip-tool/commands/session-management/Commands.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 Project CHIP Authors
+ * All rights reserved.
+ *
+ * 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.
+ *
+ */
+
+#pragma once
+
+#include "commands/common/Commands.h"
+#include "commands/session-management/CloseSessionCommand.h"
+
+void registerCommandsSessionManagement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+ const char * clusterName = "SessionManagement";
+
+ commands_list clusterCommands = {
+ make_unique(credsIssuerConfig),
+ make_unique(credsIssuerConfig),
+ };
+
+ commands.Register(clusterName, clusterCommands, "Commands for managing CASE and PASE session state");
+}
diff --git a/examples/chip-tool/main.cpp b/examples/chip-tool/main.cpp
index c45998a8c8e337..17bb7f13a57e80 100644
--- a/examples/chip-tool/main.cpp
+++ b/examples/chip-tool/main.cpp
@@ -26,6 +26,7 @@
#include "commands/interactive/Commands.h"
#include "commands/pairing/Commands.h"
#include "commands/payload/Commands.h"
+#include "commands/session-management/Commands.h"
#include "commands/storage/Commands.h"
#include
@@ -48,6 +49,7 @@ int main(int argc, char * argv[])
registerClusters(commands, &credIssuerCommands);
registerCommandsSubscriptions(commands, &credIssuerCommands);
registerCommandsStorage(commands);
+ registerCommandsSessionManagement(commands, &credIssuerCommands);
return commands.Run(argc, argv);
}
diff --git a/examples/light-switch-app/silabs/efr32/README.md b/examples/light-switch-app/silabs/efr32/README.md
index bf18af9f03c0b2..6b7239ff263550 100644
--- a/examples/light-switch-app/silabs/efr32/README.md
+++ b/examples/light-switch-app/silabs/efr32/README.md
@@ -169,7 +169,12 @@ arguments
All EFR32 boards require a bootloader, see Silicon Labs documentation for more
info. Pre-built bootloader binaries are available in the Assets section of the
Releases page on
-[Silabs Matter Github](https://github.com/SiliconLabs/matter/releases) .
+[Silabs Matter Github](https://github.com/SiliconLabs/matter/releases).
+
+- On the command line:
+
+
+ $ commander flash bootloader_binaries/bootloader-storage-internal-single-512k-BRD4187C-gsdk4.1.s37
## Viewing Logging Output
@@ -211,10 +216,16 @@ combination with JLinkRTTClient as follows:
$ JLinkExe -device EFR32MG12PXXXF1024 -if JTAG -speed 4000 -autoconnect 1
+
For MG21 use:
$ JLinkExe -device EFR32MG21AXXXF1024 -if SWD -speed 4000 -autoconnect 1
+
+ For MG24 use:
+
+ $ JLinkExe -device EFR32MG24AXXXF1536 -if SWD -speed 4000 -autoconnect 1
+
- In a second terminal, run the JLinkRTTClient to view logs:
$ JLinkRTTClient
diff --git a/examples/lighting-app/qpg/BUILD.gn b/examples/lighting-app/qpg/BUILD.gn
index 57d8d449f8ff46..b165b116a84473 100644
--- a/examples/lighting-app/qpg/BUILD.gn
+++ b/examples/lighting-app/qpg/BUILD.gn
@@ -64,7 +64,6 @@ qpg_executable("lighting_app") {
]
deps = [
- ":factorydata_lib",
":sdk",
"${chip_root}/examples/lighting-app/lighting-common:color-format",
"${chip_root}/examples/lighting-app/qpg/zap/",
@@ -73,6 +72,7 @@ qpg_executable("lighting_app") {
"${chip_root}/src/setup_payload",
"${chip_root}/third_party/openthread/platforms:libopenthread-platform",
"${chip_root}/third_party/openthread/platforms:libopenthread-platform-utils",
+ "${chip_root}/third_party/qpg_sdk:qpg_light_factorydata_lib",
]
if (chip_openthread_ftd) {
@@ -156,15 +156,3 @@ group("qpg") {
group("default") {
deps = [ ":qpg" ]
}
-
-static_library("factorydata_lib") {
- libs = [ "${qpg_sdk_root}/Binaries/FactoryData/FactoryData_example/FactoryData_example.a" ]
- public_configs = [ ":qpg_retain_factorydata" ]
-}
-
-config("qpg_retain_factorydata") {
- ldflags = [
- "-Wl,-u_binary_factory_data_bin_start",
- "-Wl,-u_binary_factory_data_start",
- ]
-}
diff --git a/examples/lock-app/qpg/BUILD.gn b/examples/lock-app/qpg/BUILD.gn
index aaaea081a65b56..03d657ac5a0023 100644
--- a/examples/lock-app/qpg/BUILD.gn
+++ b/examples/lock-app/qpg/BUILD.gn
@@ -62,7 +62,6 @@ qpg_executable("lock_app") {
]
deps = [
- ":factorydata_lib",
":sdk",
"${chip_root}/examples/lock-app/qpg/zap/",
"${chip_root}/examples/providers:device_info_provider",
@@ -70,6 +69,7 @@ qpg_executable("lock_app") {
"${chip_root}/src/setup_payload",
"${chip_root}/third_party/openthread/platforms:libopenthread-platform",
"${chip_root}/third_party/openthread/platforms:libopenthread-platform-utils",
+ "${chip_root}/third_party/qpg_sdk:qpg_lock_factorydata_lib",
]
if (chip_openthread_ftd) {
@@ -153,15 +153,3 @@ group("qpg") {
group("default") {
deps = [ ":qpg" ]
}
-
-static_library("factorydata_lib") {
- libs = [ "${qpg_sdk_root}/Binaries/FactoryData/FactoryData_example/FactoryData_example.a" ]
- public_configs = [ ":qpg_retain_factorydata" ]
-}
-
-config("qpg_retain_factorydata") {
- ldflags = [
- "-Wl,-u_binary_factory_data_bin_start",
- "-Wl,-u_binary_factory_data_start",
- ]
-}
diff --git a/examples/platform/ameba/shell/launch_shell.cpp b/examples/platform/ameba/shell/launch_shell.cpp
index d6feddb7dadf59..435966b27e89fa 100644
--- a/examples/platform/ameba/shell/launch_shell.cpp
+++ b/examples/platform/ameba/shell/launch_shell.cpp
@@ -21,6 +21,7 @@
#include "task.h"
#include
+#include
namespace {
@@ -35,7 +36,11 @@ namespace chip {
void LaunchShell()
{
- chip::Shell::Engine::Root().Init();
+ if (chip::Shell::Engine::Root().Init() < 0)
+ {
+ ChipLogError(DeviceLayer, "Failed to initialize shell engine!");
+ return;
+ }
xTaskCreate(MatterShellTask, "matter_shell", 2048, NULL, tskIDLE_PRIORITY + 1, NULL);
}
diff --git a/examples/platform/nxp/se05x/linux/AppMain.cpp b/examples/platform/nxp/se05x/linux/AppMain.cpp
index 2f38e784dd395c..1ecf8052100a54 100644
--- a/examples/platform/nxp/se05x/linux/AppMain.cpp
+++ b/examples/platform/nxp/se05x/linux/AppMain.cpp
@@ -299,7 +299,7 @@ struct CommonCaseDeviceServerInitParams_Se05x : public CommonCaseDeviceServerIni
static chip::PersistentStorageOperationalKeystoreHSM sPersistentStorageOperationalKeystore;
static chip::Credentials::PersistentStorageOpCertStore sPersistentStorageOpCertStore;
static chip::Credentials::GroupDataProviderImpl sGroupDataProvider;
- static IgnoreCertificateValidityPolicy sDefaultCertValidityPolicy;
+ static Credentials::IgnoreCertificateValidityPeriodPolicy sDefaultCertValidityPolicy;
static chip::Crypto::DefaultSessionKeystore sSessionKeystore;
#if CHIP_CONFIG_ENABLE_SESSION_RESUMPTION
diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
index 5bafe90943b898..55162c7260f86d 100644
--- a/integrations/cloudbuild/build-all.yaml
+++ b/integrations/cloudbuild/build-all.yaml
@@ -6,7 +6,7 @@ steps:
- "--init"
- "--recursive"
id: Submodules
- - name: "connectedhomeip/chip-build-vscode:0.7.2"
+ - name: "connectedhomeip/chip-build-vscode:0.7.3"
env:
- PW_ENVIRONMENT_ROOT=/pwenv
args:
@@ -21,7 +21,7 @@ steps:
path: /pwenv
timeout: 900s
- - name: "connectedhomeip/chip-build-vscode:0.7.2"
+ - name: "connectedhomeip/chip-build-vscode:0.7.3"
env:
- PW_ENVIRONMENT_ROOT=/pwenv
args:
@@ -76,7 +76,7 @@ steps:
--target k32w-shell
build
--create-archives /workspace/artifacts/
- - name: "connectedhomeip/chip-build-vscode:0.7.2"
+ - name: "connectedhomeip/chip-build-vscode:0.7.3"
env:
- PW_ENVIRONMENT_ROOT=/pwenv
args:
diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml
index c0e166c9d26b1a..4db1c7afb05b2e 100644
--- a/integrations/cloudbuild/chef.yaml
+++ b/integrations/cloudbuild/chef.yaml
@@ -1,5 +1,5 @@
steps:
- - name: "connectedhomeip/chip-build-vscode:0.7.2"
+ - name: "connectedhomeip/chip-build-vscode:0.7.3"
env:
- PW_ENVIRONMENT_ROOT=/pwenv
args:
@@ -12,7 +12,7 @@ steps:
path: /pwenv
timeout: 2700s
- - name: "connectedhomeip/chip-build-vscode:0.7.2"
+ - name: "connectedhomeip/chip-build-vscode:0.7.3"
env:
- PW_ENVIRONMENT_ROOT=/pwenv
args:
@@ -26,7 +26,7 @@ steps:
- name: pwenv
path: /pwenv
- - name: "connectedhomeip/chip-build-vscode:0.7.2"
+ - name: "connectedhomeip/chip-build-vscode:0.7.3"
env:
- PW_ENVIRONMENT_ROOT=/pwenv
args:
diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
index 7b760749482f4d..411ae1825f67a5 100644
--- a/integrations/cloudbuild/smoke-test.yaml
+++ b/integrations/cloudbuild/smoke-test.yaml
@@ -1,5 +1,5 @@
steps:
- - name: "connectedhomeip/chip-build-vscode:0.7.2"
+ - name: "connectedhomeip/chip-build-vscode:0.7.3"
entrypoint: "bash"
args:
- "-c"
@@ -7,7 +7,7 @@ steps:
git config --global --add safe.directory "*"
git submodule update --init --recursive
id: Submodules
- - name: "connectedhomeip/chip-build-vscode:0.7.2"
+ - name: "connectedhomeip/chip-build-vscode:0.7.3"
env:
- PW_ENVIRONMENT_ROOT=/pwenv
args:
@@ -22,7 +22,7 @@ steps:
path: /pwenv
timeout: 900s
- - name: "connectedhomeip/chip-build-vscode:0.7.2"
+ - name: "connectedhomeip/chip-build-vscode:0.7.3"
id: ESP32
env:
- PW_ENVIRONMENT_ROOT=/pwenv
@@ -41,7 +41,7 @@ steps:
volumes:
- name: pwenv
path: /pwenv
- - name: "connectedhomeip/chip-build-vscode:0.7.2"
+ - name: "connectedhomeip/chip-build-vscode:0.7.3"
id: NRFConnect
env:
- PW_ENVIRONMENT_ROOT=/pwenv
@@ -62,7 +62,7 @@ steps:
- name: pwenv
path: /pwenv
- - name: "connectedhomeip/chip-build-vscode:0.7.2"
+ - name: "connectedhomeip/chip-build-vscode:0.7.3"
id: EFR32
env:
- PW_ENVIRONMENT_ROOT=/pwenv
@@ -84,7 +84,7 @@ steps:
- name: pwenv
path: /pwenv
- - name: "connectedhomeip/chip-build-vscode:0.7.2"
+ - name: "connectedhomeip/chip-build-vscode:0.7.3"
id: Linux
env:
- PW_ENVIRONMENT_ROOT=/pwenv
@@ -144,7 +144,7 @@ steps:
- name: pwenv
path: /pwenv
- - name: "connectedhomeip/chip-build-vscode:0.7.2"
+ - name: "connectedhomeip/chip-build-vscode:0.7.3"
id: Android
env:
- PW_ENVIRONMENT_ROOT=/pwenv
diff --git a/integrations/docker/images/chip-build-k32w/Dockerfile b/integrations/docker/images/chip-build-k32w/Dockerfile
index 8d0e7ea9cce4ab..41e779c8fdd613 100644
--- a/integrations/docker/images/chip-build-k32w/Dockerfile
+++ b/integrations/docker/images/chip-build-k32w/Dockerfile
@@ -12,9 +12,9 @@ RUN set -x \
WORKDIR /opt/sdk
# Setup the K32W SDK
RUN set -x \
- && wget https://cache.nxp.com/lgfiles/bsps/SDK_2_6_10_K32W061DK6.zip \
- && unzip SDK_2_6_10_K32W061DK6.zip \
- && rm -rf SDK_2_6_10_K32W061DK6.zip \
+ && wget https://cache.nxp.com/lgfiles/bsps/SDK_2_6_11_K32W061DK6.zip \
+ && unzip SDK_2_6_11_K32W061DK6.zip \
+ && rm -rf SDK_2_6_11_K32W061DK6.zip \
&& : # last line
FROM connectedhomeip/chip-build:${VERSION}
diff --git a/integrations/docker/images/chip-build-openiotsdk/Dockerfile b/integrations/docker/images/chip-build-openiotsdk/Dockerfile
index d3daf90439b5d3..2759f7e34c20e2 100644
--- a/integrations/docker/images/chip-build-openiotsdk/Dockerfile
+++ b/integrations/docker/images/chip-build-openiotsdk/Dockerfile
@@ -11,14 +11,6 @@ RUN set -x \
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-# ------------------------------------------------------------------------------
-# Download ARM GCC toolchain 10.3-2021.10
-RUN set -x \
- && wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 \
- && tar -xjf gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 -C /opt \
- && rm -r gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 \
- && : # last line
-
# ------------------------------------------------------------------------------
# Install FVP Corstone 300
RUN set -x \
@@ -30,7 +22,6 @@ RUN set -x \
FROM connectedhomeip/chip-build:${VERSION}
-COPY --from=build /opt/gcc-arm-none-eabi-10.3-2021.10/ /opt/gcc-arm-none-eabi-10.3-2021.10/
COPY --from=build /opt/FVP_Corstone_SSE-300/ /opt/FVP_Corstone_SSE-300/
# Required packages for building, running and testing
@@ -47,6 +38,5 @@ RUN set -x \
# ------------------------------------------------------------------------------
# Configure environment variables
ENV FVP_CORSTONE_300_PATH=/opt/FVP_Corstone_SSE-300
-ENV ARM_GCC_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-10.3-2021.10
-ENV PATH="${PATH}:${FVP_CORSTONE_300_PATH}/models/Linux64_GCC-6.4:${ARM_GCC_TOOLCHAIN_PATH}/bin"
+ENV PATH="${PATH}:${FVP_CORSTONE_300_PATH}/models/Linux64_GCC-6.4"
diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
index 7e4186dd7d3254..d0e45d41b41b75 100644
--- a/integrations/docker/images/chip-build-vscode/Dockerfile
+++ b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -115,5 +115,4 @@ ENV TIZEN_SDK_TOOLCHAIN $TIZEN_SDK_ROOT/tools/arm-linux-gnueabi-gcc-9.2
ENV TIZEN_SDK_SYSROOT $TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/mobile/rootstraps/mobile-$TIZEN_VERSION-device.core
ENV FVP_CORSTONE_300_PATH=/opt/FVP_Corstone_SSE-300
-ENV ARM_GCC_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-10.3-2021.10
ENV BOUFFALOLAB_SDK_ROOT=/opt/bouffalolab_sdk
diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
index 87721f4184776e..4930e0379db757 100644
--- a/integrations/docker/images/chip-build/version
+++ b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.7.3 Version bump reason: [Ameba] Matter shell Update
+0.7.5 Version bump reason: [OIS] Remove GCC toolchain
diff --git a/scripts/configure b/scripts/configure
index 84203e71043b3e..da5b1852086dbd 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -33,23 +33,31 @@
# the build directory, but an external directory can be specified using the
# --build-env-dir option. The build environment directory can be shared by any
# number of build directories, independently of target / tool chain.
-#
-# Project options can be passed in the usual GNU configure style (--enable-foo,
-# --foo-bar=value) and are translated into GN build arguments. By default,
-# configure will override the toolchain for the GN build using a 'custom'
-# toolchain assembled from the usual environment variables (CC, CXX, AR, CFLAGS,
-# CXXFLAGS, ...).
-function usage() {
+set -o pipefail
+shopt -s extglob
+
+function usage() { # status
info "Usage: $0 [OPTIONS] [--project=... [PROJECT OPTIONS]]"
info "Options:"
- info " --build-env-dir=DIR Directory to create (host) build environment in"
- info " --project=DIR Sub-directory to build, e.g. examples/lighting-app/linux"
- exit 0
+ info " --build-env-dir=DIR Directory to create (host) build environment in"
+ info " --project=DIR Sub-directory to build, eg examples/lighting-app/linux"
+ info ""
+ info "Project options (mapped to GN build args):"
+ info " --enable-[=no] Enables (or disables with '=no') a bool build arg"
+ info " --= Sets a (non-bool) build arg to the given value"
+ info " GN argument names can be specified with '-' instead of '_' and prefixes"
+ info " like 'chip_' can be ommitted from names. For the full list of available"
+ info " build arguments, see the generated args.configured file."
+ info ""
+ info " By default, the toolchain for the GN build will be configured from the usual"
+ info " environment variables (CC, CXX, AR, CFLAGS, CXXFLAGS, ...), falling back to"
+ info " default tool names (CC=cc, ...). When using this script within an external"
+ info " build system, toolchain environment variables should be populated."
+ exit "$1"
}
function main() { # ...
- set -o pipefail
CHIP_ROOT=$(cd "$(dirname "$0")/.." && pwd)
BUILD_ENV_DEPS=(
"${CHIP_ROOT}/scripts/setup/requirements.build.txt"
@@ -57,29 +65,27 @@ function main() { # ...
"${CHIP_ROOT}/scripts/setup/zap.version"
)
- if [[ "$PWD" == "$CHIP_ROOT" ]]; then
- BUILD_DIR="out/configured"
- BUILD_ROOT="${CHIP_ROOT}/${BUILD_DIR}"
- BUILD_ENV_DIR=".venv"
- info "Configuring in-tree, will build in $BUILD_DIR using environment $BUILD_ENV_DIR"
- else
- BUILD_DIR="."
- BUILD_ROOT="$PWD"
- BUILD_ENV_DIR="build-env"
- fi
+ # Parse global options, process VAR=VALUE style arguments, and collect project options
+ BUILD_ENV_DIR=
PROJECT=
-
- # Parse main options but leave project options in $@
- while [[ $# -gt 0 && -z "$PROJECT" ]]; do
+ PROJECT_ARGS=()
+ while [[ $# -gt 0 ]]; do
case "$1" in
- --help) usage ;;
+ --help) usage 0 ;;
--build-env-dir=*) BUILD_ENV_DIR="${1#*=}" ;;
--project=*) PROJECT="${1#*=}" ;;
- *) fail "Invalid argument: '$1'" ;;
+ +([A-Z_])=*) export "$1" ;;
+ *)
+ [[ -n "$PROJECT" ]] || fail "Invalid argument: '$1'"
+ PROJECT_ARGS+=("$1")
+ ;;
esac
shift
done
+ # Ensure we have something to do
+ [[ -n "$PROJECT" || -n "$BUILD_ENV_DIR" ]] || usage 1
+
if [[ -n "$PROJECT" ]]; then
local subdir="$(cd "${CHIP_ROOT}/${PROJECT}" 2>/dev/null && pwd)"
[[ -n "$subdir" && -r "${subdir}/.gn" ]] || fail "Invalid project '${PROJECT}'"
@@ -89,7 +95,28 @@ function main() { # ...
check_binary gn GN
check_binary ninja NINJA
- if ! activate_build_env; then
+
+ # Work out build and environment directories
+ if [[ "$PWD" == "$CHIP_ROOT" ]]; then
+ BUILD_DIR="out/configured"
+ NINJA_HINT="ninja -C ${BUILD_DIR}"
+ else
+ BUILD_DIR="."
+ NINJA_HINT="ninja"
+ fi
+
+ if [[ -n "$BUILD_ENV_DIR" ]]; then
+ mkdir -p "$BUILD_ENV_DIR"
+ BUILD_ENV_PATH="$(cd "$BUILD_ENV_DIR" && pwd)"
+ [[ -n "$BUILD_ENV_PATH" ]] || fail "Invalid build-env-dir '${BUILD_ENV_DIR}'"
+ BUILD_ENV_DIR="$BUILD_ENV_PATH" # absolute
+ else
+ BUILD_ENV_DIR="build-env" # relative to BUILD_DIR
+ BUILD_ENV_PATH="${BUILD_DIR}/${BUILD_ENV_DIR}"
+ fi
+
+ # Create the build environment if necessary
+ if ! check_build_env; then
check_python
configure_python_env
if ! check_binary zap-cli; then
@@ -98,15 +125,19 @@ function main() { # ...
finalize_build_env
fi
+ # Configure the project (if requested)
if [[ -z "$PROJECT" ]]; then
info "Build environment created. (Specify --project=DIR to configure a build.)"
return
fi
+ [[ "$BUILD_DIR" != "." ]] && info "Configuring in-tree, will build in ${BUILD_DIR}"
+
create_empty_pw_env
- gn_generate "$@"
+ guess_toolchain
+ gn_generate "${PROJECT_ARGS[@]}"
create_ninja_wrapper
- info "You can now run ./ninja-build"
+ info "You can now run ./ninja-build (or $NINJA_HINT)"
}
function create_empty_pw_env() {
@@ -123,61 +154,90 @@ function create_empty_pw_env() {
fi
}
+function guess_toolchain() {
+ # There is no widely used standard command for the C++ compiler (analogous to
+ # `cc` for the C compiler), so if neither CC nor CXX are defined try to guess.
+ if [[ -z "$CC" && -z "$CXX" ]] && have_binary cc; then
+ local probe="$(cc -E - <<<'gnu=__GNUC__ clang=__clang__' 2>/dev/null)"
+ # Check for clang first because it also defines __GNUC__
+ if [[ "$probe" =~ clang=[1-9] ]] && have_binary clang && have_binary clang++; then
+ info "Guessing CC=clang CXX=clang++ because cc appears to be clang"
+ export CC=clang CXX=clang++
+ elif [[ "$probe" =~ gnu=[1-9] ]] && have_binary gcc && have_binary g++; then
+ info "Guessing CC=gcc CXX=g++ because cc appears to be gcc"
+ export CC=gcc CXX=g++
+ else
+ info "Unable to guess c++ compiler: $probe"
+ fi
+ fi
+}
+
function gn_generate() { # [project options]
- mkdir -p "${BUILD_ROOT}"
- ensure_no_clobber "${BUILD_ROOT}/args.gn"
- (
- cd "${CHIP_ROOT}/${PROJECT}" # --root= doesn't work for gn args!
-
- # Run gn gen with an empty args.gn first so we can list all arguments
- info "Configuring gn build arguments (see $BUILD_DIR/args.configured for full list)"
- echo "# ${CONFIGURE_MARKER}" >"${BUILD_ROOT}/args.gn"
- gn -q gen "$BUILD_ROOT"
-
- # Use the argument list to drive the mapping of our command line options to GN args
- call_impl process_project_args <(gn args "$BUILD_ROOT" --list --json) "$@" >>"${BUILD_ROOT}/args.gn"
- gn args "$BUILD_ROOT" --list >"${BUILD_ROOT}/args.configured"
-
- # Now gn gen with the arguments we have configured.
- info "Running gn gen to generate ninja files"
- gn -q gen "$BUILD_ROOT"
- )
+ mkdir -p "${BUILD_DIR}"
+ ensure_no_clobber "${BUILD_DIR}/args.gn"
+
+ # Pass --script-executable to all `gn` calls so scripts run in our venv
+ local gn=(gn --script-executable="${BUILD_ENV_DIR}/bin/python" --root="${CHIP_ROOT}/${PROJECT}")
+
+ # Run gn gen with an empty args.gn first so we can list all arguments
+ info "Configuring gn build arguments (see $BUILD_DIR/args.configured for full list)"
+ {
+ echo "# ${CONFIGURE_MARKER}"
+ echo "# project root: ${PROJECT}"
+ } >"${BUILD_DIR}/args.gn"
+ "${gn[@]}" -q gen "$BUILD_DIR"
+
+ # Use the argument list to drive the mapping of our command line options to GN args
+ call_impl process_project_args <("${gn[@]}" args "$BUILD_DIR" --list --json) "$@" >>"${BUILD_DIR}/args.gn"
+ "${gn[@]}" args "$BUILD_DIR" --list >"${BUILD_DIR}/args.configured"
+
+ # Now gn gen with the arguments we have configured.
+ info "Running gn gen to generate ninja files"
+ "${gn[@]}" -q gen "$BUILD_DIR"
}
function create_ninja_wrapper() {
- # Note: "." != $BUILD_DIR for in-tree builds
local wrapper="ninja-build"
ensure_no_clobber "$wrapper"
- cat >"$wrapper" <"$wrapper"
chmod a+x "$wrapper"
}
-function activate_build_env() {
+function check_build_env() {
generate_build_env_cksum # re-used by finalize_build_env
- [[ -r "${BUILD_ENV_DIR}/.cksum" ]] || return 1
- read -r <"${BUILD_ENV_DIR}/.cksum" || true
+ [[ -r "${BUILD_ENV_PATH}/.cksum" ]] || return 1
+ read -r <"${BUILD_ENV_PATH}/.cksum" || true
[[ "$REPLY" == "$CURRENT_ENV_CKSUM" ]] || return 1
- [[ -r "${BUILD_ENV_DIR}/bin/activate" ]] || return 1
- info "Using existing build environment: ${BUILD_ENV_DIR}"
- source "${BUILD_ENV_DIR}/bin/activate"
- PYTHON="python"
+ [[ -r "${BUILD_ENV_PATH}/bin/activate" ]] || return 1
+ info "Using existing build environment: ${BUILD_ENV_PATH}"
+ PYTHON="${BUILD_ENV_PATH}/bin/python"
}
function configure_python_env() {
progress "Setting up Python venv"
- "$PYTHON" -m venv "$BUILD_ENV_DIR"
- info "ok"
+ "$PYTHON" -m venv --clear "$BUILD_ENV_PATH"
+ info "$BUILD_ENV_PATH"
+
+ # Install our auto-loading venvactivate module so that running scripts via
+ # the venv python has the side-effect of fully activating the environment.
+ local sitepkgs=("${BUILD_ENV_PATH}/lib/python"*"/site-packages")
+ [[ -d "$sitepkgs" ]] || fail "Failed to locate venv site-packages"
+ cp "${CHIP_ROOT}/scripts/configure.venv/venvactivate".{pth,py} "${sitepkgs}/"
progress "Installing Python build dependencies"
- "${BUILD_ENV_DIR}/bin/pip" install --require-virtualenv --quiet --upgrade pip wheel
- "${BUILD_ENV_DIR}/bin/pip" install --require-virtualenv --quiet \
+ "${BUILD_ENV_PATH}/bin/pip" install --require-virtualenv --quiet --upgrade pip wheel
+ "${BUILD_ENV_PATH}/bin/pip" install --require-virtualenv --quiet \
-r "${CHIP_ROOT}/scripts/setup/requirements.build.txt" \
-c "${CHIP_ROOT}/scripts/setup/constraints.txt"
info "ok"
@@ -190,9 +250,7 @@ function generate_build_env_cksum() {
}
function finalize_build_env() {
- echo "$CURRENT_ENV_CKSUM" >"${BUILD_ENV_DIR}/.cksum"
- source "${BUILD_ENV_DIR}/bin/activate"
- PYTHON="python"
+ echo "$CURRENT_ENV_CKSUM" >"${BUILD_ENV_PATH}/.cksum"
}
function download_zap() {
@@ -206,8 +264,8 @@ function download_zap() {
local url="https://github.com/project-chip/zap/releases/download/${version}/zap-${platform}.zip"
progress "Installing zap-cli from $url"
- call_impl download_and_extract_zip "$url" "${BUILD_ENV_DIR}/bin" zap-cli
- chmod a+x "${BUILD_ENV_DIR}/bin/zap-cli" # ZipFile.extract() does not handle permissions
+ call_impl download_and_extract_zip "$url" "${BUILD_ENV_PATH}/bin" zap-cli
+ chmod a+x "${BUILD_ENV_PATH}/bin/zap-cli" # ZipFile.extract() does not handle permissions
info "ok"
}
diff --git a/scripts/configure.venv/venvactivate.pth b/scripts/configure.venv/venvactivate.pth
new file mode 100644
index 00000000000000..2f8f31d7042d68
--- /dev/null
+++ b/scripts/configure.venv/venvactivate.pth
@@ -0,0 +1 @@
+import venvactivate
diff --git a/scripts/configure.venv/venvactivate.py b/scripts/configure.venv/venvactivate.py
new file mode 100644
index 00000000000000..cfd0731fc95b3c
--- /dev/null
+++ b/scripts/configure.venv/venvactivate.py
@@ -0,0 +1,11 @@
+# Activates the current venv as if the activate script had been sourced
+import collections
+import os
+import sys
+
+# Prepend the venv bin to PATH (without introducing duplicate entries)
+path = [os.path.join(sys.prefix, 'bin')] + os.environ['PATH'].split(':')
+os.environ['PATH'] = ':'.join(collections.OrderedDict.fromkeys(path).keys())
+
+# Set VIRTUAL_ENV to the venv directory
+os.environ['VIRTUAL_ENV'] = sys.prefix
diff --git a/scripts/py_matter_idl/matter_idl/test_xml_parser.py b/scripts/py_matter_idl/matter_idl/test_xml_parser.py
index d3ff819b37d9c7..7828c4219694fd 100755
--- a/scripts/py_matter_idl/matter_idl/test_xml_parser.py
+++ b/scripts/py_matter_idl/matter_idl/test_xml_parser.py
@@ -18,9 +18,6 @@
from typing import List, Union
try:
- from matter_idl.matter_idl_types import (AccessPrivilege, Attribute, AttributeQuality, Bitmap, Cluster, ClusterSide, Command,
- ConstantEntry, DataType, Event, EventPriority, EventQuality, Field, FieldQuality, Idl,
- Struct, StructQuality, StructTag)
from matter_idl.zapxml import ParseSource, ParseXmls
except ImportError:
import os
@@ -28,12 +25,12 @@
sys.path.append(os.path.abspath(
os.path.join(os.path.dirname(__file__), '..')))
-
- from matter_idl.matter_idl_types import (AccessPrivilege, Attribute, AttributeQuality, Bitmap, Cluster, ClusterSide, Command,
- ConstantEntry, DataType, Event, EventPriority, EventQuality, Field, FieldQuality, Idl,
- Struct, StructQuality, StructTag)
from matter_idl.zapxml import ParseSource, ParseXmls
+from matter_idl.matter_idl_types import (AccessPrivilege, Attribute, AttributeQuality, Bitmap, Cluster, ClusterSide, Command,
+ ConstantEntry, DataType, Enum, Event, EventPriority, EventQuality, Field, FieldQuality,
+ Idl, Struct, StructQuality, StructTag)
+
def XmlToIdl(what: Union[str, List[str]]) -> Idl:
if not isinstance(what, list):
@@ -223,6 +220,62 @@ def testFabricScopedAndSensitive(self):
qualities=StructQuality.FABRIC_SCOPED)],
)]))
+ def testEnum(self):
+ idl = XmlToIdl('''
+
+ Test110
+ Test220
+
+
+