Skip to content

Commit 24bbdf4

Browse files
DejinChenDejinChen
authored
Added secondary network interface device type (project-chip#33682)
1 parent ca33a40 commit 24bbdf4

File tree

10 files changed

+53
-48
lines changed

10 files changed

+53
-48
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -9211,7 +9211,7 @@ endpoint 2 {
92119211
}
92129212
}
92139213
endpoint 65534 {
9214-
device type ma_secondary_network_commissioning = 4293984258, version 1;
9214+
device type ma_secondary_network_interface = 25, version 1;
92159215

92169216

92179217
server cluster Descriptor {

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 100,
3+
"featureLevel": 102,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -24779,27 +24779,27 @@
2477924779
"id": 4,
2478024780
"name": "Anonymous Endpoint Type",
2478124781
"deviceTypeRef": {
24782-
"code": 4293984258,
24782+
"code": 25,
2478324783
"profileId": 259,
24784-
"label": "MA-secondary-network-commissioning",
24785-
"name": "MA-secondary-network-commissioning"
24784+
"label": "MA-secondary-network-interface",
24785+
"name": "MA-secondary-network-interface"
2478624786
},
2478724787
"deviceTypes": [
2478824788
{
24789-
"code": 4293984258,
24789+
"code": 25,
2479024790
"profileId": 259,
24791-
"label": "MA-secondary-network-commissioning",
24792-
"name": "MA-secondary-network-commissioning"
24791+
"label": "MA-secondary-network-interface",
24792+
"name": "MA-secondary-network-interface"
2479324793
}
2479424794
],
2479524795
"deviceVersions": [
2479624796
1
2479724797
],
2479824798
"deviceIdentifiers": [
24799-
4293984258
24799+
25
2480024800
],
24801-
"deviceTypeName": "MA-secondary-network-commissioning",
24802-
"deviceTypeCode": 4293984258,
24801+
"deviceTypeName": "MA-secondary-network-interface",
24802+
"deviceTypeCode": 25,
2480324803
"deviceTypeProfileId": 259,
2480424804
"clusters": [
2480524805
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6920,7 +6920,7 @@ endpoint 2 {
69206920
}
69216921
}
69226922
endpoint 65534 {
6923-
device type ma_secondary_network_commissioning = 4293984258, version 1;
6923+
device type ma_secondary_network_interface = 25, version 1;
69246924

69256925

69266926
server cluster Descriptor {

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 100,
3+
"featureLevel": 102,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -11837,27 +11837,27 @@
1183711837
"id": 4,
1183811838
"name": "Anonymous Endpoint Type",
1183911839
"deviceTypeRef": {
11840-
"code": 4293984258,
11840+
"code": 25,
1184111841
"profileId": 259,
11842-
"label": "MA-secondary-network-commissioning",
11843-
"name": "MA-secondary-network-commissioning"
11842+
"label": "MA-secondary-network-interface",
11843+
"name": "MA-secondary-network-interface"
1184411844
},
1184511845
"deviceTypes": [
1184611846
{
11847-
"code": 4293984258,
11847+
"code": 25,
1184811848
"profileId": 259,
11849-
"label": "MA-secondary-network-commissioning",
11850-
"name": "MA-secondary-network-commissioning"
11849+
"label": "MA-secondary-network-interface",
11850+
"name": "MA-secondary-network-interface"
1185111851
}
1185211852
],
1185311853
"deviceVersions": [
1185411854
1
1185511855
],
1185611856
"deviceIdentifiers": [
11857-
4293984258
11857+
25
1185811858
],
11859-
"deviceTypeName": "MA-secondary-network-commissioning",
11860-
"deviceTypeCode": 4293984258,
11859+
"deviceTypeName": "MA-secondary-network-interface",
11860+
"deviceTypeCode": 25,
1186111861
"deviceTypeProfileId": 259,
1186211862
"clusters": [
1186311863
{

‎examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1560,7 +1560,7 @@ endpoint 1 {
15601560
}
15611561
}
15621562
endpoint 65534 {
1563-
device type ma_secondary_network_commissioning = 4293984258, version 1;
1563+
device type ma_secondary_network_interface = 25, version 1;
15641564

15651565

15661566
server cluster Descriptor {

‎examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 100,
3+
"featureLevel": 102,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -2946,27 +2946,27 @@
29462946
"id": 3,
29472947
"name": "Anonymous Endpoint Type",
29482948
"deviceTypeRef": {
2949-
"code": 4293984258,
2949+
"code": 25,
29502950
"profileId": 259,
2951-
"label": "MA-secondary-network-commissioning",
2952-
"name": "MA-secondary-network-commissioning"
2951+
"label": "MA-secondary-network-interface",
2952+
"name": "MA-secondary-network-interface"
29532953
},
29542954
"deviceTypes": [
29552955
{
2956-
"code": 4293984258,
2956+
"code": 25,
29572957
"profileId": 259,
2958-
"label": "MA-secondary-network-commissioning",
2959-
"name": "MA-secondary-network-commissioning"
2958+
"label": "MA-secondary-network-interface",
2959+
"name": "MA-secondary-network-interface"
29602960
}
29612961
],
29622962
"deviceVersions": [
29632963
1
29642964
],
29652965
"deviceIdentifiers": [
2966-
4293984258
2966+
25
29672967
],
2968-
"deviceTypeName": "MA-secondary-network-commissioning",
2969-
"deviceTypeCode": 4293984258,
2968+
"deviceTypeName": "MA-secondary-network-interface",
2969+
"deviceTypeCode": 25,
29702970
"deviceTypeProfileId": 259,
29712971
"clusters": [
29722972
{

‎scripts/tools/zap/tests/inputs/all-clusters-app.zap

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"fileFormat": 2,
3-
"featureLevel": 100,
3+
"featureLevel": 102,
44
"creator": "zap",
55
"keyValuePairs": [
66
{
@@ -16043,27 +16043,27 @@
1604316043
"id": 4,
1604416044
"name": "Anonymous Endpoint Type",
1604516045
"deviceTypeRef": {
16046-
"code": 4293984258,
16046+
"code": 25,
1604716047
"profileId": 259,
16048-
"label": "MA-secondary-network-commissioning",
16049-
"name": "MA-secondary-network-commissioning"
16048+
"label": "MA-secondary-network-interface",
16049+
"name": "MA-secondary-network-interface"
1605016050
},
1605116051
"deviceTypes": [
1605216052
{
16053-
"code": 4293984258,
16053+
"code": 25,
1605416054
"profileId": 259,
16055-
"label": "MA-secondary-network-commissioning",
16056-
"name": "MA-secondary-network-commissioning"
16055+
"label": "MA-secondary-network-interface",
16056+
"name": "MA-secondary-network-interface"
1605716057
}
1605816058
],
1605916059
"deviceVersions": [
1606016060
1
1606116061
],
1606216062
"deviceIdentifiers": [
16063-
4293984258
16063+
25
1606416064
],
16065-
"deviceTypeName": "MA-secondary-network-commissioning",
16066-
"deviceTypeCode": 4293984258,
16065+
"deviceTypeName": "MA-secondary-network-interface",
16066+
"deviceTypeCode": 25,
1606716067
"deviceTypeProfileId": 259,
1606816068
"clusters": [
1606916069
{

‎scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3047,7 +3047,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
30473047
{ \
30483048
{ 0x00000011, 1 }, { 0x00000016, 1 }, { 0x00000100, 1 }, { 0x00000011, 1 }, { 0x00000100, 1 }, { 0x00000011, 1 }, \
30493049
{ \
3050-
0xFFF10002, 1 \
3050+
0x00000019, 1 \
30513051
} \
30523052
}
30533053

‎src/app/zap-templates/zcl/data-model/chip/matter-devices.xml

+8-3
Original file line numberDiff line numberDiff line change
@@ -2590,11 +2590,13 @@ limitations under the License.
25902590
</clusters>
25912591
</deviceType>
25922592
<deviceType>
2593-
<name>MA-secondary-network-commissioning</name>
2593+
<name>MA-secondary-network-interface</name>
25942594
<domain>CHIP</domain>
2595-
<typeName>Matter Secondary Network Commissioning Device Type</typeName>
2595+
<typeName>Matter Secondary Network Interface Device Type</typeName>
25962596
<profileId editable="false">0x0103</profileId>
2597-
<deviceId editable="false">0xFFF10002</deviceId>
2597+
<deviceId editable="false">0x0019</deviceId>
2598+
<class>Utility</class>
2599+
<scope>Endpoint</scope>
25982600
<clusters lockOthers="true">
25992601
<include cluster="Network Commissioning" client="false" server="true" clientLocked="true" serverLocked="true"></include>
26002602
<include cluster="Descriptor" client="false" server="true" clientLocked="true" serverLocked="true">
@@ -2603,6 +2605,9 @@ limitations under the License.
26032605
<requireAttribute>CLIENT_LIST</requireAttribute>
26042606
<requireAttribute>PARTS_LIST</requireAttribute>
26052607
</include>
2608+
<include cluster="Ethernet Network Diagnostics" client="false" server="false" clientLocked="true" serverLocked="false"></include>
2609+
<include cluster="WiFi Network Diagnostics" client="false" server="false" clientLocked="true" serverLocked="false"></include>
2610+
<include cluster="Thread Network Diagnostics" client="false" server="false" clientLocked="true" serverLocked="false"></include>
26062611
</clusters>
26072612
</deviceType>
26082613
<deviceType>

‎src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)