Skip to content

Commit 9de3c6b

Browse files
tcarmelveilleuxyunhanw-google
tcarmelveilleux
and
yunhanw-google
authored
Remove illegal Identify clusters from examples (#35575)
* Remove illegal Identify clusters from examples Problem: - Many examples have the Identify cluster on endpoint 0 and this is not useful or legal. The Identify cluster has to be on a simple endpoint. This PR: - Removes the identify clusters in the wrong places (verified they are elsewhere where required) - Adds a lint rule that EP0 can't have Identify - Fixes YAML test that expected Identify on EP0 to use EP1 available in all examples. Testing done: - Integration tests still pass - New lint rule failed before PR, passes now * Fix CI * Update PairOnNetworkLongImInvokeCommand.kt * Update PairOnNetworkLongImInvokeCommand.kt * Update PairOnNetworkLongImInvokeCommand.kt * Update PairOnNetworkLongImInvokeCommand.kt * fix java/kotlin style --------- Co-authored-by: yunhanw-google <yunhanw@google.com>
1 parent ba9faf2 commit 9de3c6b

File tree

37 files changed

+317
-2034
lines changed

37 files changed

+317
-2034
lines changed

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

-10
Original file line numberDiff line numberDiff line change
@@ -7798,16 +7798,6 @@ endpoint 0 {
77987798

77997799
binding cluster OtaSoftwareUpdateProvider;
78007800

7801-
server cluster Identify {
7802-
ram attribute identifyTime default = 0x0000;
7803-
ram attribute identifyType default = 0x0;
7804-
ram attribute featureMap default = 0;
7805-
ram attribute clusterRevision default = 4;
7806-
7807-
handle command Identify;
7808-
handle command TriggerEffect;
7809-
}
7810-
78117801
server cluster Groups {
78127802
ram attribute nameSupport;
78137803
ram attribute featureMap default = 0;

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

-92
Original file line numberDiff line numberDiff line change
@@ -69,98 +69,6 @@
6969
"deviceTypeCode": 17,
7070
"deviceTypeProfileId": 259,
7171
"clusters": [
72-
{
73-
"name": "Identify",
74-
"code": 3,
75-
"mfgCode": null,
76-
"define": "IDENTIFY_CLUSTER",
77-
"side": "server",
78-
"enabled": 1,
79-
"commands": [
80-
{
81-
"name": "Identify",
82-
"code": 0,
83-
"mfgCode": null,
84-
"source": "client",
85-
"isIncoming": 1,
86-
"isEnabled": 1
87-
},
88-
{
89-
"name": "TriggerEffect",
90-
"code": 64,
91-
"mfgCode": null,
92-
"source": "client",
93-
"isIncoming": 1,
94-
"isEnabled": 1
95-
}
96-
],
97-
"attributes": [
98-
{
99-
"name": "IdentifyTime",
100-
"code": 0,
101-
"mfgCode": null,
102-
"side": "server",
103-
"type": "int16u",
104-
"included": 1,
105-
"storageOption": "RAM",
106-
"singleton": 0,
107-
"bounded": 0,
108-
"defaultValue": "0x0000",
109-
"reportable": 1,
110-
"minInterval": 0,
111-
"maxInterval": 65344,
112-
"reportableChange": 0
113-
},
114-
{
115-
"name": "IdentifyType",
116-
"code": 1,
117-
"mfgCode": null,
118-
"side": "server",
119-
"type": "IdentifyTypeEnum",
120-
"included": 1,
121-
"storageOption": "RAM",
122-
"singleton": 0,
123-
"bounded": 0,
124-
"defaultValue": "0x0",
125-
"reportable": 1,
126-
"minInterval": 0,
127-
"maxInterval": 65344,
128-
"reportableChange": 0
129-
},
130-
{
131-
"name": "FeatureMap",
132-
"code": 65532,
133-
"mfgCode": null,
134-
"side": "server",
135-
"type": "bitmap32",
136-
"included": 1,
137-
"storageOption": "RAM",
138-
"singleton": 0,
139-
"bounded": 0,
140-
"defaultValue": "0",
141-
"reportable": 1,
142-
"minInterval": 1,
143-
"maxInterval": 65534,
144-
"reportableChange": 0
145-
},
146-
{
147-
"name": "ClusterRevision",
148-
"code": 65533,
149-
"mfgCode": null,
150-
"side": "server",
151-
"type": "int16u",
152-
"included": 1,
153-
"storageOption": "RAM",
154-
"singleton": 0,
155-
"bounded": 0,
156-
"defaultValue": "4",
157-
"reportable": 1,
158-
"minInterval": 0,
159-
"maxInterval": 65344,
160-
"reportableChange": 0
161-
}
162-
]
163-
},
16472
{
16573
"name": "Groups",
16674
"code": 4,

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

-9
Original file line numberDiff line numberDiff line change
@@ -6242,15 +6242,6 @@ endpoint 0 {
62426242

62436243
binding cluster OtaSoftwareUpdateProvider;
62446244

6245-
server cluster Identify {
6246-
ram attribute identifyTime default = 0x0000;
6247-
ram attribute identifyType default = 0x0;
6248-
ram attribute featureMap default = 0;
6249-
ram attribute clusterRevision default = 4;
6250-
6251-
handle command Identify;
6252-
}
6253-
62546245
server cluster Groups {
62556246
ram attribute nameSupport;
62566247
ram attribute featureMap default = 0;

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

-84
Original file line numberDiff line numberDiff line change
@@ -69,90 +69,6 @@
6969
"deviceTypeCode": 17,
7070
"deviceTypeProfileId": 259,
7171
"clusters": [
72-
{
73-
"name": "Identify",
74-
"code": 3,
75-
"mfgCode": null,
76-
"define": "IDENTIFY_CLUSTER",
77-
"side": "server",
78-
"enabled": 1,
79-
"commands": [
80-
{
81-
"name": "Identify",
82-
"code": 0,
83-
"mfgCode": null,
84-
"source": "client",
85-
"isIncoming": 1,
86-
"isEnabled": 1
87-
}
88-
],
89-
"attributes": [
90-
{
91-
"name": "IdentifyTime",
92-
"code": 0,
93-
"mfgCode": null,
94-
"side": "server",
95-
"type": "int16u",
96-
"included": 1,
97-
"storageOption": "RAM",
98-
"singleton": 0,
99-
"bounded": 0,
100-
"defaultValue": "0x0000",
101-
"reportable": 1,
102-
"minInterval": 0,
103-
"maxInterval": 65344,
104-
"reportableChange": 0
105-
},
106-
{
107-
"name": "IdentifyType",
108-
"code": 1,
109-
"mfgCode": null,
110-
"side": "server",
111-
"type": "IdentifyTypeEnum",
112-
"included": 1,
113-
"storageOption": "RAM",
114-
"singleton": 0,
115-
"bounded": 0,
116-
"defaultValue": "0x0",
117-
"reportable": 1,
118-
"minInterval": 0,
119-
"maxInterval": 65344,
120-
"reportableChange": 0
121-
},
122-
{
123-
"name": "FeatureMap",
124-
"code": 65532,
125-
"mfgCode": null,
126-
"side": "server",
127-
"type": "bitmap32",
128-
"included": 1,
129-
"storageOption": "RAM",
130-
"singleton": 0,
131-
"bounded": 0,
132-
"defaultValue": "0",
133-
"reportable": 1,
134-
"minInterval": 1,
135-
"maxInterval": 65534,
136-
"reportableChange": 0
137-
},
138-
{
139-
"name": "ClusterRevision",
140-
"code": 65533,
141-
"mfgCode": null,
142-
"side": "server",
143-
"type": "int16u",
144-
"included": 1,
145-
"storageOption": "RAM",
146-
"singleton": 0,
147-
"bounded": 0,
148-
"defaultValue": "4",
149-
"reportable": 1,
150-
"minInterval": 0,
151-
"maxInterval": 65344,
152-
"reportableChange": 0
153-
}
154-
]
155-
},
15672
{
15773
"name": "Groups",
15874
"code": 4,

‎examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -3594,4 +3594,4 @@
35943594
"parentEndpointIdentifier": null
35953595
}
35963596
]
3597-
}
3597+
}

‎examples/chef/devices/rootnode_dishwasher_cc105034fe.matter

-10
Original file line numberDiff line numberDiff line change
@@ -1368,16 +1368,6 @@ endpoint 0 {
13681368
device type ma_rootdevice = 22, version 1;
13691369

13701370

1371-
server cluster Identify {
1372-
ram attribute identifyTime default = 0x0000;
1373-
ram attribute identifyType default = 0x00;
1374-
ram attribute featureMap default = 0;
1375-
ram attribute clusterRevision default = 4;
1376-
1377-
handle command Identify;
1378-
handle command TriggerEffect;
1379-
}
1380-
13811371
server cluster Descriptor {
13821372
callback attribute deviceTypeList;
13831373
callback attribute serverList;

‎examples/chef/devices/rootnode_dishwasher_cc105034fe.zap

-92
Original file line numberDiff line numberDiff line change
@@ -61,98 +61,6 @@
6161
"deviceTypeCode": 22,
6262
"deviceTypeProfileId": 259,
6363
"clusters": [
64-
{
65-
"name": "Identify",
66-
"code": 3,
67-
"mfgCode": null,
68-
"define": "IDENTIFY_CLUSTER",
69-
"side": "server",
70-
"enabled": 1,
71-
"commands": [
72-
{
73-
"name": "Identify",
74-
"code": 0,
75-
"mfgCode": null,
76-
"source": "client",
77-
"isIncoming": 1,
78-
"isEnabled": 1
79-
},
80-
{
81-
"name": "TriggerEffect",
82-
"code": 64,
83-
"mfgCode": null,
84-
"source": "client",
85-
"isIncoming": 1,
86-
"isEnabled": 1
87-
}
88-
],
89-
"attributes": [
90-
{
91-
"name": "IdentifyTime",
92-
"code": 0,
93-
"mfgCode": null,
94-
"side": "server",
95-
"type": "int16u",
96-
"included": 1,
97-
"storageOption": "RAM",
98-
"singleton": 0,
99-
"bounded": 0,
100-
"defaultValue": "0x0000",
101-
"reportable": 1,
102-
"minInterval": 0,
103-
"maxInterval": 65344,
104-
"reportableChange": 0
105-
},
106-
{
107-
"name": "IdentifyType",
108-
"code": 1,
109-
"mfgCode": null,
110-
"side": "server",
111-
"type": "IdentifyTypeEnum",
112-
"included": 1,
113-
"storageOption": "RAM",
114-
"singleton": 0,
115-
"bounded": 0,
116-
"defaultValue": "0x00",
117-
"reportable": 1,
118-
"minInterval": 1,
119-
"maxInterval": 65534,
120-
"reportableChange": 0
121-
},
122-
{
123-
"name": "FeatureMap",
124-
"code": 65532,
125-
"mfgCode": null,
126-
"side": "server",
127-
"type": "bitmap32",
128-
"included": 1,
129-
"storageOption": "RAM",
130-
"singleton": 0,
131-
"bounded": 0,
132-
"defaultValue": "0",
133-
"reportable": 1,
134-
"minInterval": 1,
135-
"maxInterval": 65534,
136-
"reportableChange": 0
137-
},
138-
{
139-
"name": "ClusterRevision",
140-
"code": 65533,
141-
"mfgCode": null,
142-
"side": "server",
143-
"type": "int16u",
144-
"included": 1,
145-
"storageOption": "RAM",
146-
"singleton": 0,
147-
"bounded": 0,
148-
"defaultValue": "4",
149-
"reportable": 1,
150-
"minInterval": 0,
151-
"maxInterval": 65344,
152-
"reportableChange": 0
153-
}
154-
]
155-
},
15664
{
15765
"name": "Descriptor",
15866
"code": 29,

0 commit comments

Comments
 (0)