Skip to content

Commit

Permalink
WindowCovering: Activate test and update Zap config + PICs (#18076)
Browse files Browse the repository at this point in the history
* YAML: WNCV 2-1 add numbering chapter

* YAML: WNCV 2-1 correct numbering

* YAML: WNCV 2-1 Add PICS

* YAML: WNCV 2-1 enable disabled test

* YAML: WNCV 2-1 PICS renaming

* YAML: WNCV 4-3 4-4 Enable test not implemented

* Zap: Update all-cluster + controller + window-app config

* YAML: Add missing PICS

* DEV: Update autogenerated files

* PICS: Add some missing values for WNCV PICS

* DEV: Ignores comment from PICS files into the PICS Linter

* ZAP: Update regen

* Restyled by prettier-yaml

* ZAP:Update + Regen

* ZAP: Update + Regen

* Restyled by prettier-yaml

* ZAP: Update and Regen

* Restyled by whitespace

* Restyled by google-java-format

* ZAP: Update + Regen

Co-authored-by: Restyled.io <commits@restyled.io>
  • Loading branch information
2 people authored and pull[bot] committed Jan 9, 2024
1 parent f5e257c commit 4129080
Show file tree
Hide file tree
Showing 21 changed files with 1,321 additions and 257 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3784,8 +3784,12 @@ server cluster WindowCovering = 258 {
}

readonly attribute Type type = 0;
readonly attribute int16u physicalClosedLimitLift = 1;
readonly attribute int16u physicalClosedLimitTilt = 2;
readonly attribute nullable int16u currentPositionLift = 3;
readonly attribute nullable int16u currentPositionTilt = 4;
readonly attribute int16u numberOfActuationsLift = 5;
readonly attribute int16u numberOfActuationsTilt = 6;
readonly attribute ConfigStatus configStatus = 7;
readonly attribute nullable Percent currentPositionLiftPercentage = 8;
readonly attribute nullable Percent currentPositionTiltPercentage = 9;
Expand All @@ -3801,6 +3805,9 @@ server cluster WindowCovering = 258 {
readonly attribute int16u installedClosedLimitTilt = 19;
attribute access(write: manage) Mode mode = 23;
readonly attribute bitmap16 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 @@ -4330,23 +4337,30 @@ endpoint 1 {

server cluster WindowCovering {
ram attribute type;
ram attribute physicalClosedLimitLift default = 0xFFFF;
ram attribute physicalClosedLimitTilt default = 0xFFFF;
persist attribute currentPositionLift default = 0x7FFF;
persist attribute currentPositionTilt default = 0x7FFF;
persist attribute numberOfActuationsLift;
persist attribute numberOfActuationsTilt;
persist attribute configStatus default = 0x03;
persist attribute currentPositionLiftPercentage default = 50;
persist attribute currentPositionTiltPercentage default = 50;
ram attribute operationalStatus;
ram attribute targetPositionLiftPercent100ths default = 500;
ram attribute targetPositionTiltPercent100ths default = 500;
ram attribute targetPositionLiftPercent100ths default = 5000;
ram attribute targetPositionTiltPercent100ths default = 5000;
ram attribute endProductType;
persist attribute currentPositionLiftPercent100ths default = 500;
persist attribute currentPositionTiltPercent100ths default = 500;
persist attribute currentPositionLiftPercent100ths default = 5000;
persist attribute currentPositionTiltPercent100ths default = 5000;
persist attribute installedOpenLimitLift;
persist attribute installedClosedLimitLift default = 0xFFFF;
persist attribute installedOpenLimitTilt;
persist attribute installedClosedLimitTilt default = 0xFFFF;
persist attribute mode;
ram attribute safetyStatus;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0x17;
ram attribute clusterRevision default = 5;
}
Expand Down
122 changes: 117 additions & 5 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -13608,6 +13608,38 @@
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "PhysicalClosedLimitLift",
"code": 1,
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0xFFFF",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65545,
"reportableChange": 0
},
{
"name": "PhysicalClosedLimitTilt",
"code": 2,
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0xFFFF",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65545,
"reportableChange": 0
},
{
"name": "CurrentPositionLift",
"code": 3,
Expand Down Expand Up @@ -13640,6 +13672,38 @@
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "NumberOfActuationsLift",
"code": 5,
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65545,
"reportableChange": 0
},
{
"name": "NumberOfActuationsTilt",
"code": 6,
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x0000",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65545,
"reportableChange": 0
},
{
"name": "ConfigStatus",
"code": 7,
Expand Down Expand Up @@ -13714,7 +13778,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "500",
"defaultValue": "5000",
"reportable": 1,
"minInterval": 0,
"maxInterval": 10000,
Expand All @@ -13730,7 +13794,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "500",
"defaultValue": "5000",
"reportable": 1,
"minInterval": 0,
"maxInterval": 10000,
Expand Down Expand Up @@ -13762,7 +13826,7 @@
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "500",
"defaultValue": "5000",
"reportable": 1,
"minInterval": 0,
"maxInterval": 10000,
Expand All @@ -13778,7 +13842,7 @@
"storageOption": "NVM",
"singleton": 0,
"bounded": 0,
"defaultValue": "500",
"defaultValue": "5000",
"reportable": 1,
"minInterval": 0,
"maxInterval": 10000,
Expand Down Expand Up @@ -13880,6 +13944,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": 0,
"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": 0,
"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 Expand Up @@ -25013,4 +25125,4 @@
"deviceIdentifier": 61442
}
]
}
}
12 changes: 12 additions & 0 deletions examples/window-app/common/window-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1500,8 +1500,12 @@ server cluster WindowCovering = 258 {
}

readonly attribute Type type = 0;
readonly attribute int16u physicalClosedLimitLift = 1;
readonly attribute int16u physicalClosedLimitTilt = 2;
readonly attribute nullable int16u currentPositionLift = 3;
readonly attribute nullable int16u currentPositionTilt = 4;
readonly attribute int16u numberOfActuationsLift = 5;
readonly attribute int16u numberOfActuationsTilt = 6;
readonly attribute ConfigStatus configStatus = 7;
readonly attribute nullable Percent currentPositionLiftPercentage = 8;
readonly attribute nullable Percent currentPositionTiltPercentage = 9;
Expand Down Expand Up @@ -1885,8 +1889,12 @@ endpoint 1 {

server cluster WindowCovering {
ram attribute type;
ram attribute physicalClosedLimitLift default = 0xFFFF;
ram attribute physicalClosedLimitTilt default = 0xFFFF;
persist attribute currentPositionLift;
persist attribute currentPositionTilt;
persist attribute numberOfActuationsLift;
persist attribute numberOfActuationsTilt;
persist attribute configStatus default = 0x03;
persist attribute currentPositionLiftPercentage;
persist attribute currentPositionTiltPercentage;
Expand Down Expand Up @@ -1927,8 +1935,12 @@ endpoint 2 {

server cluster WindowCovering {
ram attribute type;
ram attribute physicalClosedLimitLift default = 0xFFFF;
ram attribute physicalClosedLimitTilt default = 0xFFFF;
persist attribute currentPositionLift;
persist attribute currentPositionTilt;
persist attribute numberOfActuationsLift;
persist attribute numberOfActuationsTilt;
persist attribute configStatus default = 0x03;
persist attribute currentPositionLiftPercentage;
persist attribute currentPositionTiltPercentage;
Expand Down
Loading

0 comments on commit 4129080

Please sign in to comment.