Skip to content

Commit

Permalink
[Scenes] Fix Yaml 2_1 to 2_4 to enable on CI (#29569)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Boris Zbarsky <[email protected]>
  • Loading branch information
3 people authored Oct 10, 2023
1 parent 7a50966 commit ce23773
Show file tree
Hide file tree
Showing 8 changed files with 484 additions and 294 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,27 @@ server cluster Scenes = 5 {
group_id groupID = 0;
}

request struct EnhancedAddSceneRequest {
group_id groupID = 0;
INT8U sceneID = 1;
INT16U transitionTime = 2;
CHAR_STRING sceneName = 3;
ExtensionFieldSet extensionFieldSets[] = 4;
}

request struct EnhancedViewSceneRequest {
group_id groupID = 0;
INT8U sceneID = 1;
}

request struct CopySceneRequest {
ScenesCopyMode mode = 0;
group_id groupIdentifierFrom = 1;
INT8U sceneIdentifierFrom = 2;
group_id groupIdentifierTo = 3;
INT8U sceneIdentifierTo = 4;
}

response struct AddSceneResponse = 0 {
status status = 0;
group_id groupID = 1;
Expand Down Expand Up @@ -230,13 +251,37 @@ server cluster Scenes = 5 {
optional INT8U sceneList[] = 3;
}

response struct EnhancedAddSceneResponse = 64 {
status status = 0;
group_id groupID = 1;
INT8U sceneID = 2;
}

response struct EnhancedViewSceneResponse = 65 {
status status = 0;
group_Id groupID = 1;
INT8U sceneID = 2;
optional INT16U transitionTime = 3;
optional CHAR_STRING sceneName = 4;
optional ExtensionFieldSet extensionFieldSets[] = 5;
}

response struct CopySceneResponse = 66 {
status status = 0;
group_Id groupIdentifierFrom = 1;
INT8U sceneIdentifierFrom = 2;
}

fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
fabric command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
fabric command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
fabric command EnhancedAddScene(EnhancedAddSceneRequest): EnhancedAddSceneResponse = 64;
fabric command EnhancedViewScene(EnhancedViewSceneRequest): EnhancedViewSceneResponse = 65;
fabric command CopyScene(CopySceneRequest): CopySceneResponse = 66;
}

/** Attributes and commands for switching devices between 'On' and 'Off' states. */
Expand Down Expand Up @@ -7615,6 +7660,7 @@ endpoint 2 {
ram attribute currentGroup default = 0x0000;
ram attribute sceneValid default = 0x00;
ram attribute nameSupport default = 0x80;
ram attribute lastConfiguredBy;
ram attribute sceneTableSize default = 16;
callback attribute remainingCapacity default = 8;
callback attribute generatedCommandList;
Expand Down
112 changes: 112 additions & 0 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -6745,6 +6745,54 @@
"source": "server",
"isIncoming": 0,
"isEnabled": 1
},
{
"name": "EnhancedAddScene",
"code": 64,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "EnhancedAddSceneResponse",
"code": 64,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
},
{
"name": "EnhancedViewScene",
"code": 65,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "EnhancedViewSceneResponse",
"code": 65,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
},
{
"name": "CopyScene",
"code": 66,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "CopySceneResponse",
"code": 66,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
Expand Down Expand Up @@ -21905,6 +21953,54 @@
"source": "server",
"isIncoming": 0,
"isEnabled": 1
},
{
"name": "EnhancedAddScene",
"code": 64,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "EnhancedAddSceneResponse",
"code": 64,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
},
{
"name": "EnhancedViewScene",
"code": 65,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "EnhancedViewSceneResponse",
"code": 65,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
},
{
"name": "CopyScene",
"code": 66,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "CopySceneResponse",
"code": 66,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
Expand Down Expand Up @@ -21988,6 +22084,22 @@
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "LastConfiguredBy",
"code": 5,
"mfgCode": null,
"side": "server",
"type": "node_id",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "SceneTableSize",
"code": 6,
Expand Down
Loading

0 comments on commit ce23773

Please sign in to comment.