Skip to content

Commit

Permalink
Merge branch 'master' into bugfix/removing_password_logs
Browse files Browse the repository at this point in the history
  • Loading branch information
arun-silabs authored Feb 19, 2024
2 parents c1b6952 + 73d827c commit cc52243
Show file tree
Hide file tree
Showing 278 changed files with 9,969 additions and 2,306 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cherry-picks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
(github.event.pull_request.merged == true)
&& (
(contains(github.event.pull_request.labels.*.name, 'sve'))
|| (contains(github.event.pull_request.labels.*.name, 'spec'))
|| (contains(github.event.pull_request.labels.*.name, 'request sve'))
|| (contains(github.event.pull_request.labels.*.name, 'cert blocker'))
)
Expand All @@ -27,11 +26,12 @@ jobs:
uses: carloscastrojumo/[email protected]
with:
token: ${{ secrets.MATTER_PAT }}
branch: sve-2
branch: 1.3-sve
labels: |
sve cherry pick
reviewers: |
woody-apple
andy31415
raju-apple
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-efr32:35
image: ghcr.io/project-chip/chip-build-efr32:36
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/project-chip/chip-build-efr32:35
image: ghcr.io/project-chip/chip-build-efr32:36
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,7 @@ jobs:
scripts/run_in_python_env.sh out/venv './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-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_IDM_1_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './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-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_IDM_1_4.py" --script-args "--hex-arg PIXIT.DGGEN.TEST_EVENT_TRIGGER_KEY:000102030405060708090a0b0c0d0e0f --storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './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-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_IDM_4_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './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-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_PWRTL_2_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './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-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_RR_1_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './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-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_RVCCLEANM_1_2.py" --script-args "--int-arg PIXIT_ENDPOINT:1 --storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './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-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_RVCRUNM_1_2.py" --script-args "--int-arg PIXIT_ENDPOINT:1 --storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
[submodule "third_party/silabs/gecko_sdk"]
path = third_party/silabs/gecko_sdk
url = https://github.com/SiliconLabs/gecko_sdk.git
branch = v4.4.0
branch = v4.4.1
platforms = silabs
[submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
path = third_party/silabs/wiseconnect-wifi-bt-sdk
Expand All @@ -249,7 +249,7 @@
[submodule "third_party/silabs/wifi_sdk"]
path = third_party/silabs/wifi_sdk
url = https://github.com/SiliconLabs/wiseconnect.git
branch = v3.1.1
branch = v3.1.3
platforms = silabs
[submodule "editline"]
path = third_party/editline/repo
Expand Down
2 changes: 1 addition & 1 deletion data_model/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ update the spec XML files, however this is not done automatically.
You will require access to the following tools locally:

- `scraper`. A binary copy generally available
[here](https://github.com/csa-data-model/projects/tree/main/DM-Editor/bin/1.2.0/scrape)
[here](https://github.com/csa-data-model/projects/tree/main/DM-Editor/bin/scrape)
- Specification repository checkout from
https://github.com/CHIP-Specifications/connectedhomeip-spec

Expand Down
25 changes: 16 additions & 9 deletions data_model/clusters/ACL-Cluster.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,13 @@ Connectivity Standards Alliance
508 Second Street, Suite 206
Davis, CA 95616, USA
-->
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001F" name="AccessControl" revision="1">
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001F" name="Access Control" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
<clusterIds>
<clusterId id="0x001F" name="AccessControl"/>
</clusterIds>
<classification hierarchy="base" role="utility" picsCode="ACL" scope="Node"/>
<dataTypes>
<enum name="AccessControlEntryAuthModeEnum">
Expand Down Expand Up @@ -112,25 +115,27 @@ Davis, CA 95616, USA
<access fabricSensitive="true"/>
<mandatoryConform/>
</field>
<field id="3" name="Subjects" type="ref_DataTypeList[SubjectID]">
<field id="3" name="Subjects" type="list">
<entry type="SubjectID"/>
<access fabricSensitive="true"/>
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="max" value="SubjectsPerAccessControlEntry"/>
<constraint type="maxCount" value="SubjectsPerAccessControlEntry"/>
</field>
<field id="4" name="Targets" type="ref_DataTypeList[AccessControlTargetStruct Type]">
<field id="4" name="Targets" type="list">
<entry type="AccessControlTargetStruct"/>
<access fabricSensitive="true"/>
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="max" value="TargetsPerAccessControlEntry"/>
<constraint type="maxCount" value="TargetsPerAccessControlEntry"/>
</field>
<access fabricScoped="true"/>
</struct>
<struct name="AccessControlExtensionStruct">
<field id="1" name="Data" type="ref_DataTypeOctstr">
<field id="1" name="Data" type="octstr">
<access fabricSensitive="true"/>
<mandatoryConform/>
<constraint type="max" value="128"/>
<constraint type="maxLength" value="128"/>
</field>
<access fabricScoped="true"/>
</struct>
Expand All @@ -150,12 +155,14 @@ Davis, CA 95616, USA
</struct>
</dataTypes>
<attributes>
<attribute id="0x0000" name="ACL" type="ref_DataTypeList[AccessControlEntryStruct Type]" default="desc">
<attribute id="0x0000" name="ACL" type="list" default="desc">
<entry type="AccessControlEntryStruct"/>
<access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
<mandatoryConform/>
<constraint type="desc"/>
</attribute>
<attribute id="0x0001" name="Extension" type="ref_DataTypeList[AccessControlExtensionStruct Type]" default="desc">
<attribute id="0x0001" name="Extension" type="list" default="desc">
<entry type="AccessControlExtensionStruct"/>
<access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
<optionalConform/>
<constraint type="desc"/>
Expand Down
33 changes: 27 additions & 6 deletions data_model/clusters/AccountLogin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,20 @@ This notice and disclaimer must be included on all copies of this document.
Connectivity Standards Alliance
508 Second Street, Suite 206
Davis, CA 95616, USA
:xrefstyle: basic
-->
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050E" name="Account Login" revision="1">
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050E" name="Account Login" revision="2">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
<revision revision="2" summary="Add support for 8 character PIN code, Add Node to Login, Logout commands. Add LoggedOut event."/>
</revisionHistory>
<clusterIds>
<clusterId id="0x050E" name="Account Login"/>
</clusterIds>
<classification hierarchy="base" role="application" picsCode="ALOGIN" scope="Endpoint"/>
<commands>
<command id="0x00" name="GetSetupPIN" response="GetSetupPINResponse">
<command id="0x00" name="GetSetupPIN" direction="commandToServer" response="GetSetupPINResponse">
<access invokePrivilege="admin" fabricScoped="true" timed="true"/>
<mandatoryConform/>
<field id="0" name="TempAccountIdentifier" type="string">
Expand All @@ -70,14 +76,14 @@ Davis, CA 95616, USA
</field>
</command>
<command id="0x01" name="GetSetupPINResponse" direction="responseFromServer">
<access invokePrivilege="operate" fabricScoped="true"/>
<access fabricScoped="true"/>
<mandatoryConform/>
<field id="0" name="SetupPIN" type="string">
<mandatoryConform/>
<constraint type="desc"/>
</field>
</command>
<command id="0x02" name="Login" response="Y">
<command id="0x02" name="Login" direction="commandToServer" response="Y">
<access invokePrivilege="admin" fabricScoped="true" timed="true"/>
<mandatoryConform/>
<field id="0" name="TempAccountIdentifier" type="string">
Expand All @@ -86,12 +92,27 @@ Davis, CA 95616, USA
</field>
<field id="1" name="SetupPIN" type="string">
<mandatoryConform/>
<constraint type="minLength" value="11"/>
<constraint type="minLength" value="8"/>
</field>
<field id="2" name="Node" type="node-id">
<optionalConform/>
</field>
</command>
<command id="0x03" name="Logout" response="Y">
<command id="0x03" name="Logout" direction="commandToServer" response="Y">
<access invokePrivilege="operate" fabricScoped="true" timed="true"/>
<mandatoryConform/>
<field id="0" name="Node" type="node-id">
<optionalConform/>
</field>
</command>
</commands>
<events>
<event id="0x00" name="LoggedOut" priority="critical">
<access readPrivilege="admin" fabricSensitive="true"/>
<optionalConform/>
<field id="0" name="Node" type="node-id">
<optionalConform/>
</field>
</event>
</events>
</cluster>
19 changes: 10 additions & 9 deletions data_model/clusters/AdminCommissioningCluster.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0"?>
<!--
link:../matter-defines.adoc[]
Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
The information within this document is the property of the Connectivity
Standards Alliance and its use and disclosure are restricted, except as
Expand Down Expand Up @@ -61,6 +59,9 @@ Davis, CA 95616, USA
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
<clusterIds>
<clusterId id="0x003C" name="Administrator Commissioning"/>
</clusterIds>
<classification hierarchy="base" role="utility" picsCode="CADMIN" scope="Node"/>
<features>
<feature bit="0" code="BC" name="Basic" summary="Node supports Basic Commissioning Method.">
Expand Down Expand Up @@ -93,21 +94,21 @@ Davis, CA 95616, USA
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<mandatoryConform/>
</attribute>
<attribute id="0x0002" name="AdminVendorId" type="ref_DataTypeVendorId">
<attribute id="0x0002" name="AdminVendorId" type="vendor-id">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<mandatoryConform/>
</attribute>
</attributes>
<commands>
<command id="0x00" name="OpenCommissioningWindow" response="Y">
<command id="0x00" name="OpenCommissioningWindow" direction="commandToServer" response="Y">
<access invokePrivilege="admin" timed="true"/>
<mandatoryConform/>
<field id="0" name="CommissioningTimeout" type="uint16">
<mandatoryConform/>
<constraint type="desc"/>
</field>
<field id="1" name="PAKEPasscodeVerifier" type="ref_DataTypeOctstr">
<field id="1" name="PAKEPasscodeVerifier" type="octstr">
<mandatoryConform/>
</field>
<field id="2" name="Discriminator" type="uint16">
Expand All @@ -118,12 +119,12 @@ Davis, CA 95616, USA
<mandatoryConform/>
<constraint type="between" from="1000" to="100000"/>
</field>
<field id="4" name="Salt" type="ref_DataTypeOctstr">
<field id="4" name="Salt" type="octstr">
<mandatoryConform/>
<constraint type="between" from="16" to="32"/>
<constraint type="lengthBetween" from="16" to="32"/>
</field>
</command>
<command id="0x01" name="OpenBasicCommissioningWindow" response="Y">
<command id="0x01" name="OpenBasicCommissioningWindow" direction="commandToServer" response="Y">
<access invokePrivilege="admin" timed="true"/>
<mandatoryConform>
<feature name="BC"/>
Expand All @@ -133,7 +134,7 @@ Davis, CA 95616, USA
<constraint type="desc"/>
</field>
</command>
<command id="0x02" name="RevokeCommissioning" response="Y">
<command id="0x02" name="RevokeCommissioning" direction="commandToServer" response="Y">
<access invokePrivilege="admin" timed="true"/>
<mandatoryConform/>
</command>
Expand Down
5 changes: 5 additions & 0 deletions data_model/clusters/AirQuality.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,16 @@ This notice and disclaimer must be included on all copies of this document.
Connectivity Standards Alliance
508 Second Street, Suite 206
Davis, CA 95616, USA
:xrefstyle: basic
-->
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005B" name="Air Quality" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial version of the Air Quality cluster"/>
</revisionHistory>
<clusterIds>
<clusterId id="0x005B" name="Air Quality"/>
</clusterIds>
<classification hierarchy="base" role="application" picsCode="AIRQUAL" scope="Endpoint"/>
<features>
<feature bit="0" code="FAIR" name="Fair" summary="Cluster supports the Fair air quality level">
Expand Down
9 changes: 7 additions & 2 deletions data_model/clusters/AlarmBase.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,16 @@ This notice and disclaimer must be included on all copies of this document.
Connectivity Standards Alliance
508 Second Street, Suite 206
Davis, CA 95616, USA
:xrefstyle: basic
-->
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Alarm Base" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial revision"/>
</revisionHistory>
<clusterIds>
<clusterId name="Alarm Base"/>
</clusterIds>
<classification hierarchy="base" role="application" picsCode="ALARM" scope="Endpoint"/>
<features>
<feature bit="0" code="RESET" name="Reset" summary="Supports the ability to reset alarms">
Expand Down Expand Up @@ -91,7 +96,7 @@ Davis, CA 95616, USA
</attribute>
</attributes>
<commands>
<command id="0x00" name="Reset" response="Y">
<command id="0x00" name="Reset" direction="commandToServer" response="Y">
<access invokePrivilege="operate"/>
<mandatoryConform>
<feature name="RESET"/>
Expand All @@ -100,7 +105,7 @@ Davis, CA 95616, USA
<mandatoryConform/>
</field>
</command>
<command id="0x01" name="ModifyEnabledAlarms" response="Y">
<command id="0x01" name="ModifyEnabledAlarms" direction="commandToServer" response="Y">
<access invokePrivilege="operate"/>
<optionalConform/>
<field id="0" name="Mask" type="AlarmBitmap" default="0">
Expand Down
5 changes: 5 additions & 0 deletions data_model/clusters/ApplicationBasic.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,16 @@ This notice and disclaimer must be included on all copies of this document.
Connectivity Standards Alliance
508 Second Street, Suite 206
Davis, CA 95616, USA
:xrefstyle: basic
-->
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050D" name="Application Basic" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
<clusterIds>
<clusterId id="0x050D" name="Application Basic"/>
</clusterIds>
<classification hierarchy="base" role="application" picsCode="APBSC" scope="Endpoint"/>
<dataTypes>
<enum name="ApplicationStatusEnum">
Expand Down
Loading

0 comments on commit cc52243

Please sign in to comment.