Skip to content

Commit 80eeabb

Browse files
lpbeliveau-silabsrestyled-commitsbzbarsky-apple
authored and
HunsupJung
committed
[Scenes] Fix Yaml 2_1 to 2_4 to enable on CI (project-chip#29569)
* Activating scenes yaml tests on CI now that the level control cluster handler is implemented * Restyled by whitespace * Restyled by prettier-yaml * Used G1 instead of raw value where possible, modified TC_S_1_1 to be more spec compliant * Restyled by prettier-yaml * Added comments related to issues and remove un-necessary check * Update src/app/tests/suites/certification/Test_TC_S_1_1.yaml Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Added access control in yaml 2_3, fixed group key format and values and added bitwise check in 1_1 * Restyled by whitespace * Restyled by prettier-yaml * Modified TC_S_2_2 to pass the Store Scene test now that level Control is enabled * Restyled by prettier-yaml * Fixed .matter for all clusters app --------- Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
1 parent 0805ff2 commit 80eeabb

File tree

8 files changed

+484
-294
lines changed

8 files changed

+484
-294
lines changed

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

+46
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,27 @@ server cluster Scenes = 5 {
191191
group_id groupID = 0;
192192
}
193193

194+
request struct EnhancedAddSceneRequest {
195+
group_id groupID = 0;
196+
INT8U sceneID = 1;
197+
INT16U transitionTime = 2;
198+
CHAR_STRING sceneName = 3;
199+
ExtensionFieldSet extensionFieldSets[] = 4;
200+
}
201+
202+
request struct EnhancedViewSceneRequest {
203+
group_id groupID = 0;
204+
INT8U sceneID = 1;
205+
}
206+
207+
request struct CopySceneRequest {
208+
ScenesCopyMode mode = 0;
209+
group_id groupIdentifierFrom = 1;
210+
INT8U sceneIdentifierFrom = 2;
211+
group_id groupIdentifierTo = 3;
212+
INT8U sceneIdentifierTo = 4;
213+
}
214+
194215
response struct AddSceneResponse = 0 {
195216
status status = 0;
196217
group_id groupID = 1;
@@ -230,13 +251,37 @@ server cluster Scenes = 5 {
230251
optional INT8U sceneList[] = 3;
231252
}
232253

254+
response struct EnhancedAddSceneResponse = 64 {
255+
status status = 0;
256+
group_id groupID = 1;
257+
INT8U sceneID = 2;
258+
}
259+
260+
response struct EnhancedViewSceneResponse = 65 {
261+
status status = 0;
262+
group_Id groupID = 1;
263+
INT8U sceneID = 2;
264+
optional INT16U transitionTime = 3;
265+
optional CHAR_STRING sceneName = 4;
266+
optional ExtensionFieldSet extensionFieldSets[] = 5;
267+
}
268+
269+
response struct CopySceneResponse = 66 {
270+
status status = 0;
271+
group_Id groupIdentifierFrom = 1;
272+
INT8U sceneIdentifierFrom = 2;
273+
}
274+
233275
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
234276
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
235277
fabric command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
236278
fabric command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
237279
fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
238280
fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
239281
fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
282+
fabric command EnhancedAddScene(EnhancedAddSceneRequest): EnhancedAddSceneResponse = 64;
283+
fabric command EnhancedViewScene(EnhancedViewSceneRequest): EnhancedViewSceneResponse = 65;
284+
fabric command CopyScene(CopySceneRequest): CopySceneResponse = 66;
240285
}
241286

242287
/** Attributes and commands for switching devices between 'On' and 'Off' states. */
@@ -7615,6 +7660,7 @@ endpoint 2 {
76157660
ram attribute currentGroup default = 0x0000;
76167661
ram attribute sceneValid default = 0x00;
76177662
ram attribute nameSupport default = 0x80;
7663+
ram attribute lastConfiguredBy;
76187664
ram attribute sceneTableSize default = 16;
76197665
callback attribute remainingCapacity default = 8;
76207666
callback attribute generatedCommandList;

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

+112
Original file line numberDiff line numberDiff line change
@@ -6745,6 +6745,54 @@
67456745
"source": "server",
67466746
"isIncoming": 0,
67476747
"isEnabled": 1
6748+
},
6749+
{
6750+
"name": "EnhancedAddScene",
6751+
"code": 64,
6752+
"mfgCode": null,
6753+
"source": "client",
6754+
"isIncoming": 1,
6755+
"isEnabled": 1
6756+
},
6757+
{
6758+
"name": "EnhancedAddSceneResponse",
6759+
"code": 64,
6760+
"mfgCode": null,
6761+
"source": "server",
6762+
"isIncoming": 0,
6763+
"isEnabled": 1
6764+
},
6765+
{
6766+
"name": "EnhancedViewScene",
6767+
"code": 65,
6768+
"mfgCode": null,
6769+
"source": "client",
6770+
"isIncoming": 1,
6771+
"isEnabled": 1
6772+
},
6773+
{
6774+
"name": "EnhancedViewSceneResponse",
6775+
"code": 65,
6776+
"mfgCode": null,
6777+
"source": "server",
6778+
"isIncoming": 0,
6779+
"isEnabled": 1
6780+
},
6781+
{
6782+
"name": "CopyScene",
6783+
"code": 66,
6784+
"mfgCode": null,
6785+
"source": "client",
6786+
"isIncoming": 1,
6787+
"isEnabled": 1
6788+
},
6789+
{
6790+
"name": "CopySceneResponse",
6791+
"code": 66,
6792+
"mfgCode": null,
6793+
"source": "server",
6794+
"isIncoming": 0,
6795+
"isEnabled": 1
67486796
}
67496797
],
67506798
"attributes": [
@@ -21905,6 +21953,54 @@
2190521953
"source": "server",
2190621954
"isIncoming": 0,
2190721955
"isEnabled": 1
21956+
},
21957+
{
21958+
"name": "EnhancedAddScene",
21959+
"code": 64,
21960+
"mfgCode": null,
21961+
"source": "client",
21962+
"isIncoming": 1,
21963+
"isEnabled": 1
21964+
},
21965+
{
21966+
"name": "EnhancedAddSceneResponse",
21967+
"code": 64,
21968+
"mfgCode": null,
21969+
"source": "server",
21970+
"isIncoming": 0,
21971+
"isEnabled": 1
21972+
},
21973+
{
21974+
"name": "EnhancedViewScene",
21975+
"code": 65,
21976+
"mfgCode": null,
21977+
"source": "client",
21978+
"isIncoming": 1,
21979+
"isEnabled": 1
21980+
},
21981+
{
21982+
"name": "EnhancedViewSceneResponse",
21983+
"code": 65,
21984+
"mfgCode": null,
21985+
"source": "server",
21986+
"isIncoming": 0,
21987+
"isEnabled": 1
21988+
},
21989+
{
21990+
"name": "CopyScene",
21991+
"code": 66,
21992+
"mfgCode": null,
21993+
"source": "client",
21994+
"isIncoming": 1,
21995+
"isEnabled": 1
21996+
},
21997+
{
21998+
"name": "CopySceneResponse",
21999+
"code": 66,
22000+
"mfgCode": null,
22001+
"source": "server",
22002+
"isIncoming": 0,
22003+
"isEnabled": 1
2190822004
}
2190922005
],
2191022006
"attributes": [
@@ -21988,6 +22084,22 @@
2198822084
"maxInterval": 65344,
2198922085
"reportableChange": 0
2199022086
},
22087+
{
22088+
"name": "LastConfiguredBy",
22089+
"code": 5,
22090+
"mfgCode": null,
22091+
"side": "server",
22092+
"type": "node_id",
22093+
"included": 1,
22094+
"storageOption": "RAM",
22095+
"singleton": 0,
22096+
"bounded": 0,
22097+
"defaultValue": "",
22098+
"reportable": 1,
22099+
"minInterval": 1,
22100+
"maxInterval": 65534,
22101+
"reportableChange": 0
22102+
},
2199122103
{
2199222104
"name": "SceneTableSize",
2199322105
"code": 6,

0 commit comments

Comments
 (0)