Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Scenes] Fix Yaml 2_1 to 2_4 to enable on CI #29569

Merged
merged 13 commits into from
Oct 10, 2023
Merged

[Scenes] Fix Yaml 2_1 to 2_4 to enable on CI #29569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ecf1c5d
Activating scenes yaml tests on CI now that the level control cluster…
lpbeliveau-silabs Sep 12, 2023
4ca6b58
Restyled by whitespace
restyled-commits Oct 5, 2023
dd22e42
Restyled by prettier-yaml
restyled-commits Oct 5, 2023
7061b23
Used G1 instead of raw value where possible, modified TC_S_1_1 to be …
lpbeliveau-silabs Oct 5, 2023
da26a82
Restyled by prettier-yaml
restyled-commits Oct 5, 2023
a86eb80
Added comments related to issues and remove un-necessary check
lpbeliveau-silabs Oct 6, 2023
6a13595
Update src/app/tests/suites/certification/Test_TC_S_1_1.yaml
lpbeliveau-silabs Oct 10, 2023
20fe9e9
Added access control in yaml 2_3, fixed group key format and values a…
lpbeliveau-silabs Oct 10, 2023
53b2233
Restyled by whitespace
restyled-commits Oct 10, 2023
24c6936
Restyled by prettier-yaml
restyled-commits Oct 10, 2023
1d33721
Modified TC_S_2_2 to pass the Store Scene test now that level Control…
lpbeliveau-silabs Oct 10, 2023
03adda5
Restyled by prettier-yaml
restyled-commits Oct 10, 2023
d72874b
Fixed .matter for all clusters app
lpbeliveau-silabs Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
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 @@ -7606,6 +7651,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
124 changes: 118 additions & 6 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
}
],
"package": [
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data with some extensions"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
}
],
"endpointTypes": [
Expand Down 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
Loading