Skip to content

Commit

Permalink
Align naming in Scenes cluster XML with the spec. (#24625)
Browse files Browse the repository at this point in the history 
* Align naming in Scenes cluster XML with the spec.

* Regenerate generated code.
  • Loading branch information
@bzbarsky-apple @pull
bzbarsky-apple authored and pull[bot] committed Aug 4, 2023
1 parent 0a0a937 commit 4495948
Show file tree
Hide file tree
Showing 52 changed files with 1,991 additions and 1,279 deletions.
60 changes: 28 additions & 32 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 @@ -108,17 +108,21 @@ server cluster Groups = 4 {
}

server cluster Scenes = 5 {
bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

bitmap ScenesCopyMode : BITMAP8 {
kCopyAllScenes = 0x1;
}

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

struct AttributeValuePair {
optional attrib_id attributeId = 0;
optional attrib_id attributeID = 0;
int8u attributeValue[] = 1;
}

Expand All @@ -131,78 +135,78 @@ server cluster Scenes = 5 {
readonly attribute int16u clusterRevision = 65533;

request struct AddSceneRequest {
group_id groupId = 0;
INT8U sceneId = 1;
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;
group_id groupID = 0;
INT8U sceneID = 1;
}

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

request struct RemoveAllScenesRequest {
group_id groupId = 0;
group_id groupID = 0;
}

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

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

request struct GetSceneMembershipRequest {
group_id groupId = 0;
group_id groupID = 0;
}

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

response struct ViewSceneResponse = 1 {
ENUM8 status = 0;
group_id groupId = 1;
INT8U sceneId = 2;
group_id groupID = 1;
INT8U sceneID = 2;
optional INT16U transitionTime = 3;
optional CHAR_STRING sceneName = 4;
optional ExtensionFieldSet extensionFieldSets[] = 5;
}

response struct RemoveSceneResponse = 2 {
ENUM8 status = 0;
group_id groupId = 1;
INT8U sceneId = 2;
group_id groupID = 1;
INT8U sceneID = 2;
}

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

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

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

Expand Down Expand Up @@ -245,10 +249,6 @@ client cluster OnOff = 6 {
kLighting = 0x1;
}

bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

readonly attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
Expand Down Expand Up @@ -292,10 +292,6 @@ server cluster OnOff = 6 {
kLighting = 0x1;
}

bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

readonly attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
Expand Down
56 changes: 28 additions & 28 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 @@ -107,17 +107,21 @@ server cluster Groups = 4 {
}

server cluster Scenes = 5 {
bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

bitmap ScenesCopyMode : BITMAP8 {
kCopyAllScenes = 0x1;
}

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

struct AttributeValuePair {
optional attrib_id attributeId = 0;
optional attrib_id attributeID = 0;
int8u attributeValue[] = 1;
}

Expand All @@ -130,78 +134,78 @@ server cluster Scenes = 5 {
readonly attribute int16u clusterRevision = 65533;

request struct AddSceneRequest {
group_id groupId = 0;
INT8U sceneId = 1;
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;
group_id groupID = 0;
INT8U sceneID = 1;
}

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

request struct RemoveAllScenesRequest {
group_id groupId = 0;
group_id groupID = 0;
}

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

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

request struct GetSceneMembershipRequest {
group_id groupId = 0;
group_id groupID = 0;
}

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

response struct ViewSceneResponse = 1 {
ENUM8 status = 0;
group_id groupId = 1;
INT8U sceneId = 2;
group_id groupID = 1;
INT8U sceneID = 2;
optional INT16U transitionTime = 3;
optional CHAR_STRING sceneName = 4;
optional ExtensionFieldSet extensionFieldSets[] = 5;
}

response struct RemoveSceneResponse = 2 {
ENUM8 status = 0;
group_id groupId = 1;
INT8U sceneId = 2;
group_id groupID = 1;
INT8U sceneID = 2;
}

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

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

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

Expand Down Expand Up @@ -244,10 +248,6 @@ server cluster OnOff = 6 {
kLighting = 0x1;
}

bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

readonly attribute boolean onOff = 0;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down
4 changes: 0 additions & 4 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ server cluster OnOff = 6 {
kLighting = 0x1;
}

bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

readonly attribute boolean onOff = 0;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down
4 changes: 0 additions & 4 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,6 @@ server cluster OnOff = 6 {
kLighting = 0x1;
}

bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

readonly attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
Expand Down
4 changes: 0 additions & 4 deletions examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,6 @@ server cluster OnOff = 6 {
kLighting = 0x1;
}

bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

readonly nosubscribe attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
Expand Down
4 changes: 0 additions & 4 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,6 @@ server cluster OnOff = 6 {
kLighting = 0x1;
}

bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

readonly attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
Expand Down
4 changes: 0 additions & 4 deletions examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,6 @@ server cluster OnOff = 6 {
kLighting = 0x1;
}

bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

readonly attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
Expand Down
4 changes: 0 additions & 4 deletions examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,6 @@ server cluster OnOff = 6 {
kLighting = 0x1;
}

bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

readonly attribute boolean onOff = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
4 changes: 0 additions & 4 deletions examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,6 @@ server cluster OnOff = 6 {
kLighting = 0x1;
}

bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

readonly attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
Expand Down
8 changes: 0 additions & 8 deletions examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,6 @@ client cluster OnOff = 6 {
kLighting = 0x1;
}

bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

readonly attribute boolean onOff = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down Expand Up @@ -178,10 +174,6 @@ server cluster OnOff = 6 {
kLighting = 0x1;
}

bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

readonly attribute boolean onOff = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
4 changes: 0 additions & 4 deletions examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,6 @@ server cluster OnOff = 6 {
kLighting = 0x1;
}

bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

readonly attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
Expand Down

0 comments on commit 4495948

Please sign in to comment.