Skip to content

Commit

Permalink
WindowCovering: Zap definition updates / fixes (#19968)
Browse files Browse the repository at this point in the history 
* ZAP: Fix descriptor clusters

* ZAP: Window Covering clusters add missing global attributes

* ZAP: Update WindowCovering for all-clusters-minimal-app

* ZAP: window-app WindowCovering remove non-use declaration

* ZAP: update all-clusters-minimal-app.matter

* ZAP: Identify ep0 add missing attribute

* ZAP: Identify ep2

* ZAP: Identify ep1

* ZAP: Align GeneralCommissioning

* ZAP: tweak identify

* ZAP: Add Binding Clusters on ep 1, 2

* ZAP: Scenes + Group fix ep 1,2

* ZAP: Remove not used Thread Diag Cluster from Ep

* ZAP: Remove not used Network Commissioning from bad ep

* ZAP: Remove not used BASIC_CLUSTER from bad ep

* ZAP: Remove not use BASIC_CLUSTER from bad ep 2

* ZAP: Autogenerated files

* ZAP: Scenes remove non-implemented enhanced calls

* ZAP: Desactivate non required Binding server cluster ep 1 2

* Revert "ZAP: Update WindowCovering for all-clusters-minimal-app"

This reverts commit 985b719.

* ZAP: all-cluster-minimal add missing global attributes

* ZAP: RollBack all-cluster-minimal.matter

* ZAP: remove Binding server artifact

* ZAP: Update + Regen
  • Loading branch information
@jmeg-sfy @pull
jmeg-sfy authored and pull[bot] committed Aug 4, 2022
1 parent 58acae1 commit 1710108
Show file tree
Hide file tree
Showing 11 changed files with 1,301 additions and 2,301 deletions.
6 changes: 6 additions & 0 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 @@ -2086,6 +2086,9 @@ server cluster WindowCovering = 258 {
readonly attribute OperationalStatus operationalStatus = 10;
readonly attribute EndProductType endProductType = 13;
attribute access(write: manage) Mode mode = 23;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down Expand Up @@ -3590,6 +3593,9 @@ endpoint 1 {
ram attribute operationalStatus;
ram attribute endProductType;
persist attribute mode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 1;
ram attribute clusterRevision default = 5;
}
Expand Down
48 changes: 48 additions & 0 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 @@ -13880,6 +13880,54 @@
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AcceptedCommandList",
"code": 65529,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "FeatureMap",
"code": 65532,
Expand Down
77 changes: 73 additions & 4 deletions examples/window-app/common/window-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ server cluster Identify = 3 {

attribute int16u identifyTime = 0;
readonly attribute enum8 identifyType = 1;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand All @@ -49,6 +52,9 @@ server cluster Identify = 3 {

server cluster Groups = 4 {
readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down Expand Up @@ -103,7 +109,7 @@ server cluster Groups = 4 {
command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
}

client cluster Scenes = 5 {
server cluster Scenes = 5 {
bitmap ScenesCopyMode : BITMAP8 {
kCopyAllScenes = 0x1;
}
Expand All @@ -123,7 +129,10 @@ client cluster Scenes = 5 {
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 attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

request struct AddSceneRequest {
Expand Down Expand Up @@ -640,6 +649,7 @@ server cluster GeneralCommissioning = 48 {
readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1;
readonly attribute RegulatoryLocationType regulatoryConfig = 2;
readonly attribute RegulatoryLocationType locationCapability = 3;
readonly attribute boolean supportsConcurrentConnection = 4;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand Down Expand Up @@ -1529,6 +1539,9 @@ server cluster WindowCovering = 258 {
readonly attribute int16u installedClosedLimitTilt = 19;
attribute access(write: manage) Mode mode = 23;
readonly attribute SafetyStatus safetyStatus = 26;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down Expand Up @@ -1671,6 +1684,7 @@ endpoint 0 {
callback attribute basicCommissioningInfo;
callback attribute regulatoryConfig;
callback attribute locationCapability;
callback attribute supportsConcurrentConnection default = 1;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
Expand Down Expand Up @@ -1871,17 +1885,35 @@ endpoint 0 {
}
endpoint 1 {
device type windowcovering = 514;
binding cluster Scenes;

server cluster Identify {
ram attribute identifyTime;
ram attribute identifyType;
ram attribute identifyType default = 0x05;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap;
ram attribute clusterRevision default = 4;
}

server cluster Groups {
ram attribute nameSupport;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap;
ram attribute clusterRevision default = 4;
}

server cluster Scenes {
ram attribute sceneCount;
ram attribute currentScene;
ram attribute currentGroup;
ram attribute sceneValid;
ram attribute nameSupport;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap;
ram attribute clusterRevision default = 4;
}
Expand All @@ -1891,6 +1923,9 @@ endpoint 1 {
callback attribute serverList;
callback attribute clientList;
callback attribute partsList;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap;
callback attribute clusterRevision default = 1;
}
Expand Down Expand Up @@ -1918,16 +1953,44 @@ endpoint 1 {
persist attribute installedClosedLimitTilt default = 0xFFFF;
persist attribute mode;
ram attribute safetyStatus;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x0017;
ram attribute clusterRevision default = 5;
}
}
endpoint 2 {
device type windowcovering = 514;
binding cluster Scenes;

server cluster Identify {
ram attribute identifyTime;
ram attribute identifyType default = 0x05;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap;
ram attribute clusterRevision default = 4;
}

server cluster Groups {
ram attribute nameSupport;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap;
ram attribute clusterRevision default = 4;
}

server cluster Scenes {
ram attribute sceneCount;
ram attribute currentScene;
ram attribute currentGroup;
ram attribute sceneValid;
ram attribute nameSupport;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap;
ram attribute clusterRevision default = 4;
}
Expand All @@ -1937,6 +2000,9 @@ endpoint 2 {
callback attribute serverList;
callback attribute clientList;
callback attribute partsList;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap;
callback attribute clusterRevision default = 1;
}
Expand Down Expand Up @@ -1964,6 +2030,9 @@ endpoint 2 {
persist attribute installedClosedLimitTilt default = 0xFFFF;
persist attribute mode;
ram attribute safetyStatus;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x0017;
ram attribute clusterRevision default = 5;
}
Expand Down
Loading

0 comments on commit 1710108

Please sign in to comment.