Skip to content

Commit

Permalink
Modified Attribute 7 from scene cluster to SceneInfoStruct and added …
Browse files Browse the repository at this point in the history 
…support in scenes-server
  • Loading branch information
@lpbeliveau-silabs
lpbeliveau-silabs committed Oct 27, 2023
1 parent 1f9814e commit 6bb4af8
Show file tree
Hide file tree
Showing 69 changed files with 1,744 additions and 456 deletions.
19 changes: 14 additions & 5 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,23 @@ provisional server cluster Scenes = 5 {
AttributeValuePair attributeValueList[] = 1;
}

fabric_scoped struct SceneInfoStruct {
int8u sceneCount = 0;
fabric_sensitive int8u currentScene = 1;
fabric_sensitive group_id currentGroup = 2;
fabric_sensitive boolean sceneValid = 3;
int8u remainingCapacity = 4;
fabric_idx fabricIndex = 254;
}

readonly attribute int8u sceneCount = 0;
readonly attribute int8u currentScene = 1;
readonly attribute group_id currentGroup = 2;
readonly attribute boolean sceneValid = 3;
readonly attribute bitmap8 nameSupport = 4;
readonly attribute nullable node_id lastConfiguredBy = 5;
readonly attribute int16u sceneTableSize = 6;
readonly attribute int8u remainingCapacity = 7;
readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down Expand Up @@ -5700,12 +5709,12 @@ endpoint 1 {
ram attribute nameSupport default = 0x80;
ram attribute lastConfiguredBy;
ram attribute sceneTableSize default = 16;
callback attribute remainingCapacity default = 8;
callback attribute fabricSceneInfo;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 7;
ram attribute featureMap default = 15;
ram attribute clusterRevision default = 5;

handle command AddScene;
Expand Down Expand Up @@ -6784,12 +6793,12 @@ endpoint 2 {
ram attribute nameSupport default = 0x80;
ram attribute lastConfiguredBy;
ram attribute sceneTableSize default = 16;
callback attribute remainingCapacity default = 8;
callback attribute fabricSceneInfo;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 7;
ram attribute featureMap default = 15;
ram attribute clusterRevision default = 5;

handle command AddScene;
Expand Down
22 changes: 11 additions & 11 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6911,16 +6911,16 @@
"reportableChange": 0
},
{
"name": "RemainingCapacity",
"name": "FabricSceneInfo",
"code": 7,
"mfgCode": null,
"side": "server",
"type": "int8u",
"type": "array",
"included": 1,
"storageOption": "External",
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "8",
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -7000,7 +7000,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "7",
"defaultValue": "15",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -20503,16 +20503,16 @@
"reportableChange": 0
},
{
"name": "RemainingCapacity",
"name": "FabricSceneInfo",
"code": 7,
"mfgCode": null,
"side": "server",
"type": "int8u",
"type": "array",
"included": 1,
"storageOption": "External",
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "8",
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -20592,7 +20592,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "7",
"defaultValue": "15",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -21887,4 +21887,4 @@
}
],
"log": []
}
}
41 changes: 25 additions & 16 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,23 @@ provisional server cluster Scenes = 5 {
AttributeValuePair attributeValueList[] = 1;
}

fabric_scoped struct SceneInfoStruct {
int8u sceneCount = 0;
fabric_sensitive int8u currentScene = 1;
fabric_sensitive group_id currentGroup = 2;
fabric_sensitive boolean sceneValid = 3;
int8u remainingCapacity = 4;
fabric_idx fabricIndex = 254;
}

readonly attribute int8u sceneCount = 0;
readonly attribute int8u currentScene = 1;
readonly attribute group_id currentGroup = 2;
readonly attribute boolean sceneValid = 3;
readonly attribute bitmap8 nameSupport = 4;
readonly attribute nullable node_id lastConfiguredBy = 5;
readonly attribute int16u sceneTableSize = 6;
readonly attribute int8u remainingCapacity = 7;
readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down Expand Up @@ -4378,18 +4387,18 @@ endpoint 1 {

server cluster Scenes {
callback attribute sceneCount default = 0x00;
ram attribute currentScene default = 0x00;
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 currentScene default = 0x00;
callback attribute currentGroup default = 0x0000;
callback attribute sceneValid default = 0x00;
callback attribute nameSupport default = 0x80;
callback attribute lastConfiguredBy;
callback attribute sceneTableSize default = 16;
callback attribute fabricSceneInfo;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 7;
ram attribute featureMap default = 15;
ram attribute clusterRevision default = 5;

handle command AddScene;
Expand Down Expand Up @@ -4942,17 +4951,17 @@ endpoint 2 {

server cluster Scenes {
callback attribute sceneCount default = 0x00;
ram attribute currentScene default = 0x00;
ram attribute currentGroup default = 0x0000;
ram attribute sceneValid default = 0x00;
ram attribute nameSupport default = 0x80;
ram attribute sceneTableSize default = 16;
callback attribute remainingCapacity default = 8;
callback attribute currentScene default = 0x00;
callback attribute currentGroup default = 0x0000;
callback attribute sceneValid default = 0x00;
callback attribute nameSupport default = 0x80;
callback attribute sceneTableSize default = 16;
callback attribute fabricSceneInfo;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 7;
ram attribute featureMap default = 15;
ram attribute clusterRevision default = 5;

handle command AddScene;
Expand Down
44 changes: 22 additions & 22 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4624,7 +4624,7 @@
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
Expand All @@ -4640,7 +4640,7 @@
"side": "server",
"type": "group_id",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
Expand All @@ -4656,7 +4656,7 @@
"side": "server",
"type": "boolean",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
Expand All @@ -4672,7 +4672,7 @@
"side": "server",
"type": "bitmap8",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x80",
Expand All @@ -4688,7 +4688,7 @@
"side": "server",
"type": "node_id",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
Expand All @@ -4704,7 +4704,7 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "16",
Expand All @@ -4714,16 +4714,16 @@
"reportableChange": 0
},
{
"name": "RemainingCapacity",
"name": "FabricSceneInfo",
"code": 7,
"mfgCode": null,
"side": "server",
"type": "int8u",
"type": "array",
"included": 1,
"storageOption": "External",
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "8",
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -4803,7 +4803,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "7",
"defaultValue": "15",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -10924,7 +10924,7 @@
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
Expand All @@ -10940,7 +10940,7 @@
"side": "server",
"type": "group_id",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
Expand All @@ -10956,7 +10956,7 @@
"side": "server",
"type": "boolean",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
Expand All @@ -10972,7 +10972,7 @@
"side": "server",
"type": "bitmap8",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x80",
Expand All @@ -10988,7 +10988,7 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "16",
Expand All @@ -10998,16 +10998,16 @@
"reportableChange": 0
},
{
"name": "RemainingCapacity",
"name": "FabricSceneInfo",
"code": 7,
"mfgCode": null,
"side": "server",
"type": "int8u",
"type": "array",
"included": 1,
"storageOption": "External",
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "8",
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -11087,7 +11087,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "7",
"defaultValue": "15",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -12318,4 +12318,4 @@
}
],
"log": []
}
}
11 changes: 10 additions & 1 deletion examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,14 +187,23 @@ provisional client cluster Scenes = 5 {
AttributeValuePair attributeValueList[] = 1;
}

fabric_scoped struct SceneInfoStruct {
int8u sceneCount = 0;
fabric_sensitive int8u currentScene = 1;
fabric_sensitive group_id currentGroup = 2;
fabric_sensitive boolean sceneValid = 3;
int8u remainingCapacity = 4;
fabric_idx fabricIndex = 254;
}

readonly attribute int8u sceneCount = 0;
readonly attribute int8u currentScene = 1;
readonly attribute group_id currentGroup = 2;
readonly attribute boolean sceneValid = 3;
readonly attribute bitmap8 nameSupport = 4;
readonly attribute optional nullable node_id lastConfiguredBy = 5;
readonly attribute int16u sceneTableSize = 6;
readonly attribute int8u remainingCapacity = 7;
readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down
Loading

0 comments on commit 6bb4af8

Please sign in to comment.