Skip to content

Commit f8b35c2

Browse files
jamesharrowjamesharrow
committed
Merge branch 'upstream-master' into Update_Energy_Cluster_XML_For_1_4
2 parents dfb81db + b194ca5 commit f8b35c2

File tree

143 files changed

+8944
-811
lines changed

Some content is hidden

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

143 files changed

+8944
-811
lines changed

‎.clang-tidy

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Checks: >
1212
readability-redundant-string-init,
1313
-bugprone-assignment-in-if-condition,
1414
-bugprone-branch-clone,
15+
-bugprone-casting-through-void, #TODO remove this after fixing issues in source code, issue 34008
1516
-bugprone-copy-constructor-init,
1617
-bugprone-easily-swappable-parameters,
1718
-bugprone-forward-declaration-namespace,

‎.gitmodules

+1
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@
252252
[submodule "third_party/boringssl/repo/src"]
253253
path = third_party/boringssl/repo/src
254254
url = https://github.com/google/boringssl.git
255+
branch = master
255256
[submodule "third_party/mt793x_sdk/filogic"]
256257
path = third_party/mt793x_sdk/filogic
257258
url = https://github.com/MediaTek-Labs/genio-matter-bsp.git

‎credentials/development/gen_commissioner_dut_test_plan_table.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ def main():
8686
with open(path, 'r') as f:
8787
j = json.loads(f.read())
8888
success_expected = j['is_success_case'].lower() == 'true'
89-
pid = 177 if 'fallback_encoding' in p else 32768
90-
desc = TestInfo(desc=j['description'], dir=p, pid=pid)
89+
desc = TestInfo(desc=j['description'], dir=p, pid=int(j['basic_info_pid']))
9190
if success_expected:
9291
success_cases.append(desc)
9392
else:

‎docs/testing/yaml.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,16 @@ NOTE: use the target appropriate to your system
349349

350350
[chiptool.py](https://github.com/project-chip/connectedhomeip/blob/master/scripts/tests/chipyaml/chiptool.py)
351351
can be used to run tests against a commissioned DUT (commissioned by chip-tool).
352-
This will start an interactive instance of chip-tool automatically.
352+
To commission a DUT using chip-tool use the pairing command. For example:
353+
354+
```
355+
./out/linux-x64-chip-tool/chip-tool pairing code 0x12344321 MT:-24J0AFN00KA0648G00
356+
```
357+
358+
In this example, 0x12344321 is the node ID (0x12344321 is the test default) and
359+
MT:-24J0AFN00KA0648G00 is the QR code.
360+
361+
The chiptool.py tool can then be used to run the tests. For example:
353362

354363
```
355364
./scripts/tests/chipyaml/chiptool.py tests Test_TC_OO_2_1 --server_path ./out/linux-x64-chip-tool/chip-tool

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.zap

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 100,
3+
"featureLevel": 103,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -29,6 +29,7 @@
2929
"pathRelativity": "relativeToZap",
3030
"path": "../../../src/app/zap-templates/app-templates.json",
3131
"type": "gen-templates-json",
32+
"category": "matter",
3233
"version": "chip-v1"
3334
}
3435
],

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.zap

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 100,
3+
"featureLevel": 103,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -29,6 +29,7 @@
2929
"pathRelativity": "relativeToZap",
3030
"path": "../../../src/app/zap-templates/app-templates.json",
3131
"type": "gen-templates-json",
32+
"category": "matter",
3233
"version": "chip-v1"
3334
}
3435
],

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 102,
3+
"featureLevel": 103,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -29,6 +29,7 @@
2929
"pathRelativity": "relativeToZap",
3030
"path": "../../../src/app/zap-templates/app-templates.json",
3131
"type": "gen-templates-json",
32+
"category": "matter",
3233
"version": "chip-v1"
3334
}
3435
],

‎examples/bridge-app/bridge-common/bridge-app.zap

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 100,
3+
"featureLevel": 103,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -29,6 +29,7 @@
2929
"pathRelativity": "relativeToZap",
3030
"path": "../../../src/app/zap-templates/app-templates.json",
3131
"type": "gen-templates-json",
32+
"category": "matter",
3233
"version": "chip-v1"
3334
}
3435
],

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 100,
3+
"featureLevel": 103,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -29,6 +29,7 @@
2929
"pathRelativity": "relativeToZap",
3030
"path": "../../../src/app/zap-templates/app-templates.json",
3131
"type": "gen-templates-json",
32+
"category": "matter",
3233
"version": "chip-v1"
3334
}
3435
],

‎examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 102,
3+
"featureLevel": 103,
44
"creator": "zap",
55
"keyValuePairs": [
66
{

‎examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 100,
3+
"featureLevel": 103,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -29,6 +29,7 @@
2929
"pathRelativity": "relativeToZap",
3030
"path": "../../../src/app/zap-templates/app-templates.json",
3131
"type": "gen-templates-json",
32+
"category": "matter",
3233
"version": "chip-v1"
3334
}
3435
],

‎examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 102,
3+
"featureLevel": 103,
44
"creator": "zap",
55
"keyValuePairs": [
66
{

‎examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 100,
3+
"featureLevel": 103,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -29,6 +29,7 @@
2929
"pathRelativity": "relativeToZap",
3030
"path": "../../../src/app/zap-templates/app-templates.json",
3131
"type": "gen-templates-json",
32+
"category": "matter",
3233
"version": "chip-v1"
3334
}
3435
],

‎examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 100,
3+
"featureLevel": 103,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -29,6 +29,7 @@
2929
"pathRelativity": "relativeToZap",
3030
"path": "../../../src/app/zap-templates/app-templates.json",
3131
"type": "gen-templates-json",
32+
"category": "matter",
3233
"version": "chip-v1"
3334
}
3435
],

‎examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 100,
3+
"featureLevel": 103,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -29,6 +29,7 @@
2929
"pathRelativity": "relativeToZap",
3030
"path": "../../../src/app/zap-templates/app-templates.json",
3131
"type": "gen-templates-json",
32+
"category": "matter",
3233
"version": "chip-v1"
3334
}
3435
],

‎examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 100,
3+
"featureLevel": 103,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -29,6 +29,7 @@
2929
"pathRelativity": "relativeToZap",
3030
"path": "../../../src/app/zap-templates/app-templates.json",
3131
"type": "gen-templates-json",
32+
"category": "matter",
3233
"version": "chip-v1"
3334
}
3435
],

‎examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 100,
3+
"featureLevel": 103,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -29,6 +29,7 @@
2929
"pathRelativity": "relativeToZap",
3030
"path": "../../../src/app/zap-templates/app-templates.json",
3131
"type": "gen-templates-json",
32+
"category": "matter",
3233
"version": "chip-v1"
3334
}
3435
],

0 commit comments

Comments
 (0)