Skip to content

Commit

Permalink
Fix disparity in OnOff cluster revision (#10789)
Browse files Browse the repository at this point in the history 
* Update OnOff Cluster revision to 4, Update yaml test, Enable onoff featuremap attribute in lighting-app and required onoff attributes in lock-app

* regen all

* regen after rebase conflicts
  • Loading branch information
@jmartinez-silabs
jmartinez-silabs authored Oct 22, 2021
1 parent 568b10e commit 685e556
Show file tree
Hide file tree
Showing 22 changed files with 200 additions and 52 deletions.
4 changes: 2 additions & 2 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 @@ -7188,7 +7188,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"defaultValue": "4",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -16039,7 +16039,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "4",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
2 changes: 1 addition & 1 deletion examples/bridge-app/bridge-common/bridge-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3240,7 +3240,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "4",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
19 changes: 17 additions & 2 deletions examples/lighting-app/lighting-common/lighting-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4212,7 +4212,7 @@
"singleton": 0,
"bounded": 0,
"defaultValue": "0x00",
"reportable": 0,
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
Expand Down Expand Up @@ -4277,6 +4277,21 @@
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand All @@ -4286,7 +4301,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "4",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
79 changes: 77 additions & 2 deletions examples/lock-app/lock-common/lock-app.zap
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 55,
"featureLevel": 62,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -4297,6 +4297,81 @@
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "GlobalSceneControl",
"code": 16384,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "OnTime",
"code": 16385,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "OffWaitTime",
"code": 16386,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "StartUpOnOff",
"code": 16387,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"reportable": 0,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
Expand All @@ -4306,7 +4381,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "4",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
4 changes: 2 additions & 2 deletions examples/pump-app/pump-common/pump-app.zap
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 55,
"featureLevel": 62,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -4521,7 +4521,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "4",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
4 changes: 2 additions & 2 deletions examples/thermostat/thermostat-common/thermostat.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6936,7 +6936,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "4",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -14274,7 +14274,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "4",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
4 changes: 2 additions & 2 deletions examples/tv-app/tv-common/tv-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6371,7 +6371,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "4",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -7632,7 +7632,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "4",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
4 changes: 2 additions & 2 deletions examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6921,7 +6921,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "4",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -14093,7 +14093,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "2",
"defaultValue": "4",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
4 changes: 2 additions & 2 deletions src/app/tests/suites/certification/Test_TC_OO_1_1.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ tests:
command: "readAttribute"
attribute: "ClusterRevision"
response:
value: 3
value: 4

- label:
"write the default values to mandatory global attribute:
Expand All @@ -39,7 +39,7 @@ tests:
command: "readAttribute"
attribute: "ClusterRevision"
response:
value: 3
value: 4

- label: "read the optional global attribute: FeatureMap"
command: "readAttribute"
Expand Down
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ limitations under the License.
<code>0x0006</code>
<define>ON_OFF_CLUSTER</define>
<description>Attributes and commands for switching devices between 'On' and 'Off' states.</description>
<globalAttribute side="either" code="0xFFFD" value="3"/>
<globalAttribute side="either" code="0xFFFD" value="4"/>

<attribute side="server" code="0x0000" define="ON_OFF" type="boolean" default="0" reportable="true" >OnOff</attribute>
<attribute side="server" code="0x4000" define="GLOBAL_SCENE_CONTROL" type="boolean" default="1" optional="true">GlobalSceneControl</attribute>
Expand Down
4 changes: 2 additions & 2 deletions src/darwin/Framework/CHIPTests/CHIPClustersTests.m
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion zzz_generated/bridge-app/zap-generated/endpoint_config.h
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions zzz_generated/chip-tool/zap-generated/test/Commands.h
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions zzz_generated/lighting-app/zap-generated/CHIPClusters.cpp
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions zzz_generated/lighting-app/zap-generated/CHIPClusters.h
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 685e556

Please sign in to comment.