Skip to content

Commit cc52243

Browse files
arun-silabsarun-silabs
authored
Merge branch 'master' into bugfix/removing_password_logs
2 parents c1b6952 + 73d827c commit cc52243

File tree

278 files changed

+9969
-2306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+9969
-2306
lines changed

‎.github/workflows/cherry-picks.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
(github.event.pull_request.merged == true)
1515
&& (
1616
(contains(github.event.pull_request.labels.*.name, 'sve'))
17-
|| (contains(github.event.pull_request.labels.*.name, 'spec'))
1817
|| (contains(github.event.pull_request.labels.*.name, 'request sve'))
1918
|| (contains(github.event.pull_request.labels.*.name, 'cert blocker'))
2019
)
@@ -27,11 +26,12 @@ jobs:
2726
uses: carloscastrojumo/github-cherry-pick-action@v1.0.9
2827
with:
2928
token: ${{ secrets.MATTER_PAT }}
30-
branch: sve-2
29+
branch: 1.3-sve
3130
labels: |
3231
sve cherry pick
3332
reviewers: |
3433
woody-apple
3534
andy31415
35+
raju-apple
3636
env:
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/examples-efr32.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-efr32:35
41+
image: ghcr.io/project-chip/chip-build-efr32:36
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

‎.github/workflows/release_artifacts.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
runs-on: ubuntu-latest
6969

7070
container:
71-
image: ghcr.io/project-chip/chip-build-efr32:35
71+
image: ghcr.io/project-chip/chip-build-efr32:36
7272
steps:
7373
- name: Checkout
7474
uses: actions/checkout@v4

‎.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,7 @@ jobs:
502502
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"'
503503
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"'
504504
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"'
505+
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"'
505506
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"'
506507
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"'
507508
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"'

‎.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
[submodule "third_party/silabs/gecko_sdk"]
240240
path = third_party/silabs/gecko_sdk
241241
url = https://github.com/SiliconLabs/gecko_sdk.git
242-
branch = v4.4.0
242+
branch = v4.4.1
243243
platforms = silabs
244244
[submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
245245
path = third_party/silabs/wiseconnect-wifi-bt-sdk
@@ -249,7 +249,7 @@
249249
[submodule "third_party/silabs/wifi_sdk"]
250250
path = third_party/silabs/wifi_sdk
251251
url = https://github.com/SiliconLabs/wiseconnect.git
252-
branch = v3.1.1
252+
branch = v3.1.3
253253
platforms = silabs
254254
[submodule "editline"]
255255
path = third_party/editline/repo

‎data_model/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ update the spec XML files, however this is not done automatically.
1717
You will require access to the following tools locally:
1818

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

‎data_model/clusters/ACL-Cluster.xml

+16-9
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,13 @@ Connectivity Standards Alliance
5555
508 Second Street, Suite 206
5656
Davis, CA 95616, USA
5757
-->
58-
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001F" name="AccessControl" revision="1">
58+
<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">
5959
<revisionHistory>
6060
<revision revision="1" summary="Initial Release"/>
6161
</revisionHistory>
62+
<clusterIds>
63+
<clusterId id="0x001F" name="AccessControl"/>
64+
</clusterIds>
6265
<classification hierarchy="base" role="utility" picsCode="ACL" scope="Node"/>
6366
<dataTypes>
6467
<enum name="AccessControlEntryAuthModeEnum">
@@ -112,25 +115,27 @@ Davis, CA 95616, USA
112115
<access fabricSensitive="true"/>
113116
<mandatoryConform/>
114117
</field>
115-
<field id="3" name="Subjects" type="ref_DataTypeList[SubjectID]">
118+
<field id="3" name="Subjects" type="list">
119+
<entry type="SubjectID"/>
116120
<access fabricSensitive="true"/>
117121
<quality nullable="true"/>
118122
<mandatoryConform/>
119-
<constraint type="max" value="SubjectsPerAccessControlEntry"/>
123+
<constraint type="maxCount" value="SubjectsPerAccessControlEntry"/>
120124
</field>
121-
<field id="4" name="Targets" type="ref_DataTypeList[AccessControlTargetStruct Type]">
125+
<field id="4" name="Targets" type="list">
126+
<entry type="AccessControlTargetStruct"/>
122127
<access fabricSensitive="true"/>
123128
<quality nullable="true"/>
124129
<mandatoryConform/>
125-
<constraint type="max" value="TargetsPerAccessControlEntry"/>
130+
<constraint type="maxCount" value="TargetsPerAccessControlEntry"/>
126131
</field>
127132
<access fabricScoped="true"/>
128133
</struct>
129134
<struct name="AccessControlExtensionStruct">
130-
<field id="1" name="Data" type="ref_DataTypeOctstr">
135+
<field id="1" name="Data" type="octstr">
131136
<access fabricSensitive="true"/>
132137
<mandatoryConform/>
133-
<constraint type="max" value="128"/>
138+
<constraint type="maxLength" value="128"/>
134139
</field>
135140
<access fabricScoped="true"/>
136141
</struct>
@@ -150,12 +155,14 @@ Davis, CA 95616, USA
150155
</struct>
151156
</dataTypes>
152157
<attributes>
153-
<attribute id="0x0000" name="ACL" type="ref_DataTypeList[AccessControlEntryStruct Type]" default="desc">
158+
<attribute id="0x0000" name="ACL" type="list" default="desc">
159+
<entry type="AccessControlEntryStruct"/>
154160
<access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
155161
<mandatoryConform/>
156162
<constraint type="desc"/>
157163
</attribute>
158-
<attribute id="0x0001" name="Extension" type="ref_DataTypeList[AccessControlExtensionStruct Type]" default="desc">
164+
<attribute id="0x0001" name="Extension" type="list" default="desc">
165+
<entry type="AccessControlExtensionStruct"/>
159166
<access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
160167
<optionalConform/>
161168
<constraint type="desc"/>

‎data_model/clusters/AccountLogin.xml

+27-6
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,20 @@ This notice and disclaimer must be included on all copies of this document.
5454
Connectivity Standards Alliance
5555
508 Second Street, Suite 206
5656
Davis, CA 95616, USA
57+
58+
:xrefstyle: basic
5759
-->
58-
<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">
60+
<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">
5961
<revisionHistory>
6062
<revision revision="1" summary="Initial Release"/>
63+
<revision revision="2" summary="Add support for 8 character PIN code, Add Node to Login, Logout commands. Add LoggedOut event."/>
6164
</revisionHistory>
65+
<clusterIds>
66+
<clusterId id="0x050E" name="Account Login"/>
67+
</clusterIds>
6268
<classification hierarchy="base" role="application" picsCode="ALOGIN" scope="Endpoint"/>
6369
<commands>
64-
<command id="0x00" name="GetSetupPIN" response="GetSetupPINResponse">
70+
<command id="0x00" name="GetSetupPIN" direction="commandToServer" response="GetSetupPINResponse">
6571
<access invokePrivilege="admin" fabricScoped="true" timed="true"/>
6672
<mandatoryConform/>
6773
<field id="0" name="TempAccountIdentifier" type="string">
@@ -70,14 +76,14 @@ Davis, CA 95616, USA
7076
</field>
7177
</command>
7278
<command id="0x01" name="GetSetupPINResponse" direction="responseFromServer">
73-
<access invokePrivilege="operate" fabricScoped="true"/>
79+
<access fabricScoped="true"/>
7480
<mandatoryConform/>
7581
<field id="0" name="SetupPIN" type="string">
7682
<mandatoryConform/>
7783
<constraint type="desc"/>
7884
</field>
7985
</command>
80-
<command id="0x02" name="Login" response="Y">
86+
<command id="0x02" name="Login" direction="commandToServer" response="Y">
8187
<access invokePrivilege="admin" fabricScoped="true" timed="true"/>
8288
<mandatoryConform/>
8389
<field id="0" name="TempAccountIdentifier" type="string">
@@ -86,12 +92,27 @@ Davis, CA 95616, USA
8692
</field>
8793
<field id="1" name="SetupPIN" type="string">
8894
<mandatoryConform/>
89-
<constraint type="minLength" value="11"/>
95+
<constraint type="minLength" value="8"/>
96+
</field>
97+
<field id="2" name="Node" type="node-id">
98+
<optionalConform/>
9099
</field>
91100
</command>
92-
<command id="0x03" name="Logout" response="Y">
101+
<command id="0x03" name="Logout" direction="commandToServer" response="Y">
93102
<access invokePrivilege="operate" fabricScoped="true" timed="true"/>
94103
<mandatoryConform/>
104+
<field id="0" name="Node" type="node-id">
105+
<optionalConform/>
106+
</field>
95107
</command>
96108
</commands>
109+
<events>
110+
<event id="0x00" name="LoggedOut" priority="critical">
111+
<access readPrivilege="admin" fabricSensitive="true"/>
112+
<optionalConform/>
113+
<field id="0" name="Node" type="node-id">
114+
<optionalConform/>
115+
</field>
116+
</event>
117+
</events>
97118
</cluster>

‎data_model/clusters/AdminCommissioningCluster.xml

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0"?>
22
<!--
3-
link:../matter-defines.adoc[]
4-
53
Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
64
The information within this document is the property of the Connectivity
75
Standards Alliance and its use and disclosure are restricted, except as
@@ -61,6 +59,9 @@ Davis, CA 95616, USA
6159
<revisionHistory>
6260
<revision revision="1" summary="Initial Release"/>
6361
</revisionHistory>
62+
<clusterIds>
63+
<clusterId id="0x003C" name="Administrator Commissioning"/>
64+
</clusterIds>
6465
<classification hierarchy="base" role="utility" picsCode="CADMIN" scope="Node"/>
6566
<features>
6667
<feature bit="0" code="BC" name="Basic" summary="Node supports Basic Commissioning Method.">
@@ -93,21 +94,21 @@ Davis, CA 95616, USA
9394
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
9495
<mandatoryConform/>
9596
</attribute>
96-
<attribute id="0x0002" name="AdminVendorId" type="ref_DataTypeVendorId">
97+
<attribute id="0x0002" name="AdminVendorId" type="vendor-id">
9798
<access read="true" readPrivilege="view"/>
9899
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
99100
<mandatoryConform/>
100101
</attribute>
101102
</attributes>
102103
<commands>
103-
<command id="0x00" name="OpenCommissioningWindow" response="Y">
104+
<command id="0x00" name="OpenCommissioningWindow" direction="commandToServer" response="Y">
104105
<access invokePrivilege="admin" timed="true"/>
105106
<mandatoryConform/>
106107
<field id="0" name="CommissioningTimeout" type="uint16">
107108
<mandatoryConform/>
108109
<constraint type="desc"/>
109110
</field>
110-
<field id="1" name="PAKEPasscodeVerifier" type="ref_DataTypeOctstr">
111+
<field id="1" name="PAKEPasscodeVerifier" type="octstr">
111112
<mandatoryConform/>
112113
</field>
113114
<field id="2" name="Discriminator" type="uint16">
@@ -118,12 +119,12 @@ Davis, CA 95616, USA
118119
<mandatoryConform/>
119120
<constraint type="between" from="1000" to="100000"/>
120121
</field>
121-
<field id="4" name="Salt" type="ref_DataTypeOctstr">
122+
<field id="4" name="Salt" type="octstr">
122123
<mandatoryConform/>
123-
<constraint type="between" from="16" to="32"/>
124+
<constraint type="lengthBetween" from="16" to="32"/>
124125
</field>
125126
</command>
126-
<command id="0x01" name="OpenBasicCommissioningWindow" response="Y">
127+
<command id="0x01" name="OpenBasicCommissioningWindow" direction="commandToServer" response="Y">
127128
<access invokePrivilege="admin" timed="true"/>
128129
<mandatoryConform>
129130
<feature name="BC"/>
@@ -133,7 +134,7 @@ Davis, CA 95616, USA
133134
<constraint type="desc"/>
134135
</field>
135136
</command>
136-
<command id="0x02" name="RevokeCommissioning" response="Y">
137+
<command id="0x02" name="RevokeCommissioning" direction="commandToServer" response="Y">
137138
<access invokePrivilege="admin" timed="true"/>
138139
<mandatoryConform/>
139140
</command>

‎data_model/clusters/AirQuality.xml

+5
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,16 @@ This notice and disclaimer must be included on all copies of this document.
5454
Connectivity Standards Alliance
5555
508 Second Street, Suite 206
5656
Davis, CA 95616, USA
57+
58+
:xrefstyle: basic
5759
-->
5860
<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">
5961
<revisionHistory>
6062
<revision revision="1" summary="Initial version of the Air Quality cluster"/>
6163
</revisionHistory>
64+
<clusterIds>
65+
<clusterId id="0x005B" name="Air Quality"/>
66+
</clusterIds>
6267
<classification hierarchy="base" role="application" picsCode="AIRQUAL" scope="Endpoint"/>
6368
<features>
6469
<feature bit="0" code="FAIR" name="Fair" summary="Cluster supports the Fair air quality level">

‎data_model/clusters/AlarmBase.xml

+7-2
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,16 @@ This notice and disclaimer must be included on all copies of this document.
5454
Connectivity Standards Alliance
5555
508 Second Street, Suite 206
5656
Davis, CA 95616, USA
57+
58+
:xrefstyle: basic
5759
-->
5860
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Alarm Base" revision="1">
5961
<revisionHistory>
6062
<revision revision="1" summary="Initial revision"/>
6163
</revisionHistory>
64+
<clusterIds>
65+
<clusterId name="Alarm Base"/>
66+
</clusterIds>
6267
<classification hierarchy="base" role="application" picsCode="ALARM" scope="Endpoint"/>
6368
<features>
6469
<feature bit="0" code="RESET" name="Reset" summary="Supports the ability to reset alarms">
@@ -91,7 +96,7 @@ Davis, CA 95616, USA
9196
</attribute>
9297
</attributes>
9398
<commands>
94-
<command id="0x00" name="Reset" response="Y">
99+
<command id="0x00" name="Reset" direction="commandToServer" response="Y">
95100
<access invokePrivilege="operate"/>
96101
<mandatoryConform>
97102
<feature name="RESET"/>
@@ -100,7 +105,7 @@ Davis, CA 95616, USA
100105
<mandatoryConform/>
101106
</field>
102107
</command>
103-
<command id="0x01" name="ModifyEnabledAlarms" response="Y">
108+
<command id="0x01" name="ModifyEnabledAlarms" direction="commandToServer" response="Y">
104109
<access invokePrivilege="operate"/>
105110
<optionalConform/>
106111
<field id="0" name="Mask" type="AlarmBitmap" default="0">

‎data_model/clusters/ApplicationBasic.xml

+5
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,16 @@ This notice and disclaimer must be included on all copies of this document.
5454
Connectivity Standards Alliance
5555
508 Second Street, Suite 206
5656
Davis, CA 95616, USA
57+
58+
:xrefstyle: basic
5759
-->
5860
<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">
5961
<revisionHistory>
6062
<revision revision="1" summary="Initial Release"/>
6163
</revisionHistory>
64+
<clusterIds>
65+
<clusterId id="0x050D" name="Application Basic"/>
66+
</clusterIds>
6267
<classification hierarchy="base" role="application" picsCode="APBSC" scope="Endpoint"/>
6368
<dataTypes>
6469
<enum name="ApplicationStatusEnum">

0 commit comments

Comments
 (0)