Skip to content

Commit

Permalink
Reworked .zap and .matter files
Browse files Browse the repository at this point in the history
  • Loading branch information
@lpbeliveau-silabs
lpbeliveau-silabs committed Jan 10, 2024
1 parent 001f492 commit 1440672
Show file tree
Hide file tree
Showing 25 changed files with 160 additions and 1,208 deletions.
76 changes: 10 additions & 66 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 @@ -138,13 +138,6 @@ provisional cluster Scenes = 5 {

bitmap Feature : bitmap32 {
kSceneNames = 0x1;
kExplicit = 0x2;
kTableSize = 0x4;
kFabricScenes = 0x8;
}

bitmap NameSupportBitmap : bitmap8 {
kSceneNames = 0x80;
}

struct AttributeValuePair {
Expand All @@ -166,14 +159,9 @@ provisional cluster Scenes = 5 {
fabric_idx fabricIndex = 254;
}

readonly attribute optional int8u sceneCount = 0;
readonly attribute optional int8u currentScene = 1;
readonly attribute optional group_id currentGroup = 2;
readonly attribute optional boolean sceneValid = 3;
readonly attribute NameSupportBitmap nameSupport = 4;
readonly attribute optional nullable node_id lastConfiguredBy = 5;
readonly attribute int16u sceneTableSize = 6;
readonly attribute SceneInfoStruct fabricSceneInfo[] = 7;
readonly attribute optional nullable node_id lastConfiguredBy = 0;
readonly attribute int16u sceneTableSize = 1;
readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -184,7 +172,7 @@ provisional cluster Scenes = 5 {
request struct AddSceneRequest {
group_id groupID = 0;
int8u sceneID = 1;
int16u transitionTime = 2;
int32u transitionTimeMS = 2;
char_string sceneName = 3;
ExtensionFieldSet extensionFieldSets[] = 4;
}
Expand All @@ -204,7 +192,7 @@ provisional cluster Scenes = 5 {
status status = 0;
group_id groupID = 1;
int8u sceneID = 2;
optional int16u transitionTime = 3;
optional int32u transitionTimeMS = 3;
optional char_string sceneName = 4;
optional ExtensionFieldSet extensionFieldSets[] = 5;
}
Expand Down Expand Up @@ -243,7 +231,7 @@ provisional cluster Scenes = 5 {
request struct RecallSceneRequest {
group_id groupID = 0;
int8u sceneID = 1;
optional nullable int16u transitionTime = 2;
optional nullable int32u transitionTimeMS = 2;
}

request struct GetSceneMembershipRequest {
Expand All @@ -257,34 +245,6 @@ provisional cluster Scenes = 5 {
optional int8u sceneList[] = 3;
}

request struct EnhancedAddSceneRequest {
group_id groupID = 0;
int8u sceneID = 1;
int16u transitionTime = 2;
char_string sceneName = 3;
ExtensionFieldSet extensionFieldSets[] = 4;
}

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

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

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

request struct CopySceneRequest {
CopyModeBitmap mode = 0;
group_id groupIdentifierFrom = 1;
Expand All @@ -293,7 +253,7 @@ provisional cluster Scenes = 5 {
int8u sceneIdentifierTo = 4;
}

response struct CopySceneResponse = 66 {
response struct CopySceneResponse = 60 {
status status = 0;
group_id groupIdentifierFrom = 1;
int8u sceneIdentifierFrom = 2;
Expand All @@ -313,12 +273,8 @@ provisional cluster Scenes = 5 {
fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
/** Get an unused scene identifier when no commissioning tool is in the network, or for a commissioning tool to get the used scene identifiers within a certain group */
fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
/** Allows a scene to be added using a finer scene transition time than the AddScene command. */
fabric command EnhancedAddScene(EnhancedAddSceneRequest): EnhancedAddSceneResponse = 64;
/** Allows a scene to be retrieved using a finer scene transition time than the ViewScene command */
fabric command EnhancedViewScene(EnhancedViewSceneRequest): EnhancedViewSceneResponse = 65;
/** Allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair. */
fabric command CopyScene(CopySceneRequest): CopySceneResponse = 66;
fabric command CopyScene(CopySceneRequest): CopySceneResponse = 60;
}

/** Attributes and commands for switching devices between 'On' and 'Off' states. */
Expand Down Expand Up @@ -6913,15 +6869,14 @@ endpoint 1 {
}

server cluster Scenes {
ram attribute nameSupport default = 0x80;
ram attribute lastConfiguredBy;
ram attribute sceneTableSize default = 16;
callback attribute fabricSceneInfo;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 15;
ram attribute featureMap default = 1;
ram attribute clusterRevision default = 5;

handle command AddScene;
Expand All @@ -6937,10 +6892,6 @@ endpoint 1 {
handle command RecallScene;
handle command GetSceneMembership;
handle command GetSceneMembershipResponse;
handle command EnhancedAddScene;
handle command EnhancedAddSceneResponse;
handle command EnhancedViewScene;
handle command EnhancedViewSceneResponse;
handle command CopyScene;
handle command CopySceneResponse;
}
Expand Down Expand Up @@ -8077,15 +8028,14 @@ endpoint 2 {
}

server cluster Scenes {
ram attribute nameSupport default = 0x80;
ram attribute lastConfiguredBy;
ram attribute sceneTableSize default = 16;
callback attribute fabricSceneInfo;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 15;
ram attribute featureMap default = 1;
ram attribute clusterRevision default = 5;

handle command AddScene;
Expand All @@ -8101,10 +8051,6 @@ endpoint 2 {
handle command RecallScene;
handle command GetSceneMembership;
handle command GetSceneMembershipResponse;
handle command EnhancedAddScene;
handle command EnhancedAddSceneResponse;
handle command EnhancedViewScene;
handle command EnhancedViewSceneResponse;
handle command CopyScene;
handle command CopySceneResponse;
}
Expand Down Expand Up @@ -8212,5 +8158,3 @@ endpoint 65534 {
handle command ReorderNetwork;
}
}


120 changes: 12 additions & 108 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 @@ -6576,75 +6576,27 @@
"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,
"code": 60,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "CopySceneResponse",
"code": 66,
"code": 60,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
{
"name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x80",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "LastConfiguredBy",
"code": 5,
"code": 0,
"mfgCode": null,
"side": "server",
"type": "node_id",
Expand All @@ -6660,7 +6612,7 @@
},
{
"name": "SceneTableSize",
"code": 6,
"code": 1,
"mfgCode": null,
"side": "server",
"type": "int16u",
Expand All @@ -6676,7 +6628,7 @@
},
{
"name": "FabricSceneInfo",
"code": 7,
"code": 2,
"mfgCode": null,
"side": "server",
"type": "array",
Expand Down Expand Up @@ -6764,7 +6716,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "15",
"defaultValue": "1",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -21193,75 +21145,27 @@
"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,
"code": 60,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "CopySceneResponse",
"code": 66,
"code": 60,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
{
"name": "NameSupport",
"code": 4,
"mfgCode": null,
"side": "server",
"type": "NameSupportBitmap",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x80",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "LastConfiguredBy",
"code": 5,
"code": 0,
"mfgCode": null,
"side": "server",
"type": "node_id",
Expand All @@ -21277,7 +21181,7 @@
},
{
"name": "SceneTableSize",
"code": 6,
"code": 1,
"mfgCode": null,
"side": "server",
"type": "int16u",
Expand All @@ -21293,7 +21197,7 @@
},
{
"name": "FabricSceneInfo",
"code": 7,
"code": 2,
"mfgCode": null,
"side": "server",
"type": "array",
Expand Down Expand Up @@ -21381,7 +21285,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "15",
"defaultValue": "1",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
Loading

0 comments on commit 1440672

Please sign in to comment.