Skip to content

Commit

Permalink
Remove scene cluster from the thermostat app and window-cover app (#2…
Browse files Browse the repository at this point in the history
  • Loading branch information
jmartinez-silabs authored Aug 18, 2023
1 parent 441aad7 commit 18d27aa
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 308 deletions.
130 changes: 0 additions & 130 deletions examples/thermostat/thermostat-common/thermostat.matter
Original file line number Diff line number Diff line change
Expand Up @@ -196,126 +196,6 @@ server cluster Groups = 4 {
fabric command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
}

/** Attributes and commands for scene configuration and manipulation. */
server cluster Scenes = 5 {
bitmap Feature : BITMAP32 {
kSceneNames = 0x1;
kExplicit = 0x2;
kTableSize = 0x4;
kFabricScenes = 0x8;
}

bitmap ScenesCopyMode : BITMAP8 {
kCopyAllScenes = 0x1;
}

struct AttributeValuePair {
attrib_id attributeID = 0;
int32u attributeValue = 1;
}

struct ExtensionFieldSet {
cluster_id clusterID = 0;
AttributeValuePair attributeValueList[] = 1;
}

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 command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

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

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

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

request struct RemoveAllScenesRequest {
group_id groupID = 0;
}

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

request struct RecallSceneRequest {
group_id groupID = 0;
INT8U sceneID = 1;
optional nullable INT16U transitionTime = 2;
}

request struct GetSceneMembershipRequest {
group_id groupID = 0;
}

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

response struct ViewSceneResponse = 1 {
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 RemoveSceneResponse = 2 {
status status = 0;
group_id groupID = 1;
INT8U sceneID = 2;
}

response struct RemoveAllScenesResponse = 3 {
status status = 0;
group_id groupID = 1;
}

response struct StoreSceneResponse = 4 {
status status = 0;
group_id groupID = 1;
INT8U sceneID = 2;
}

response struct GetSceneMembershipResponse = 6 {
status status = 0;
nullable INT8U capacity = 1;
group_id groupID = 2;
optional INT8U sceneList[] = 3;
}

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;
}

/** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
server cluster Descriptor = 29 {
bitmap Feature : BITMAP32 {
Expand Down Expand Up @@ -2085,16 +1965,6 @@ endpoint 1 {
ram attribute clusterRevision default = 4;
}

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;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 5;
}

server cluster Descriptor {
callback attribute deviceTypeList;
callback attribute serverList;
Expand Down
62 changes: 55 additions & 7 deletions examples/thermostat/thermostat-common/thermostat.zap
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,33 @@
],
"endpointTypes": [
{
"id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 2,
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
"name": "MA-rootdevice"
},
"deviceTypes": [
{
"id": 2,
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
"name": "MA-rootdevice"
}
],
"deviceTypeRefs": [
2
],
"deviceVersions": [
1
],
"deviceIdentifiers": [
22
],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
Expand Down Expand Up @@ -7629,7 +7655,33 @@
]
},
{
"id": 2,
"name": "MA-thermostat",
"deviceTypeRef": {
"id": 34,
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
"name": "MA-thermostat"
},
"deviceTypes": [
{
"id": 34,
"code": 769,
"profileId": 259,
"label": "MA-thermostat",
"name": "MA-thermostat"
}
],
"deviceTypeRefs": [
34
],
"deviceVersions": [
1
],
"deviceIdentifiers": [
769
],
"deviceTypeName": "MA-thermostat",
"deviceTypeCode": 769,
"deviceTypeProfileId": 259,
Expand Down Expand Up @@ -8010,7 +8062,7 @@
"mfgCode": null,
"define": "SCENES_CLUSTER",
"side": "server",
"enabled": 1,
"enabled": 0,
"commands": [
{
"name": "AddSceneResponse",
Expand Down Expand Up @@ -14769,18 +14821,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
"networkId": 0,
"endpointVersion": 1,
"deviceIdentifier": 22
"networkId": 0
},
{
"endpointTypeName": "MA-thermostat",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
"networkId": 0,
"endpointVersion": 1,
"deviceIdentifier": 769
"networkId": 0
}
],
"log": []
Expand Down
Loading

0 comments on commit 18d27aa

Please sign in to comment.