Skip to content

Commit

Permalink
add isNullable to the onoff cluster attributes OnTime, OffWaitTime an…
Browse files Browse the repository at this point in the history 
…d StartUpOnOff
  • Loading branch information
@bauerschwan
bauerschwan committed Mar 2, 2022
1 parent c3a34eb commit 8444469
Show file tree
Hide file tree
Showing 30 changed files with 786 additions and 258 deletions.
6 changes: 3 additions & 3 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 @@ -2267,9 +2267,9 @@ server cluster OnOff = 6 {

readonly attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
attribute int16u offWaitTime = 16386;
attribute enum8 startUpOnOff = 16387;
attribute nullable int16u onTime = 16385;
attribute nullable int16u offWaitTime = 16386;
attribute nullable enum8 startUpOnOff = 16387;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;

Expand Down
6 changes: 3 additions & 3 deletions examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1009,9 +1009,9 @@ client cluster OnOff = 6 {

readonly attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
attribute int16u offWaitTime = 16386;
attribute enum8 startUpOnOff = 16387;
attribute nullable int16u onTime = 16385;
attribute nullable int16u offWaitTime = 16386;
attribute nullable enum8 startUpOnOff = 16387;
readonly global attribute attrib_id attributeList[] = 65531;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;
Expand Down
6 changes: 3 additions & 3 deletions examples/lighting-app/lighting-common/lighting-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1173,9 +1173,9 @@ server cluster OnOff = 6 {

readonly attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
attribute int16u offWaitTime = 16386;
attribute enum8 startUpOnOff = 16387;
attribute nullable int16u onTime = 16385;
attribute nullable int16u offWaitTime = 16386;
attribute nullable enum8 startUpOnOff = 16387;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;

Expand Down
6 changes: 3 additions & 3 deletions examples/lock-app/lock-common/lock-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -659,9 +659,9 @@ server cluster OnOff = 6 {

readonly attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
attribute int16u offWaitTime = 16386;
attribute enum8 startUpOnOff = 16387;
attribute nullable int16u onTime = 16385;
attribute nullable int16u offWaitTime = 16386;
attribute nullable enum8 startUpOnOff = 16387;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;

Expand Down
6 changes: 3 additions & 3 deletions examples/pump-app/pump-common/pump-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -901,9 +901,9 @@ server cluster OnOff = 6 {

readonly attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
attribute int16u offWaitTime = 16386;
attribute enum8 startUpOnOff = 16387;
attribute nullable int16u onTime = 16385;
attribute nullable int16u offWaitTime = 16386;
attribute nullable enum8 startUpOnOff = 16387;
readonly global attribute int16u clusterRevision = 65533;

request struct OffWithEffectRequest {
Expand Down
6 changes: 3 additions & 3 deletions examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2079,9 +2079,9 @@ server cluster OnOff = 6 {

readonly attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
attribute int16u offWaitTime = 16386;
attribute enum8 startUpOnOff = 16387;
attribute nullable int16u onTime = 16385;
attribute nullable int16u offWaitTime = 16386;
attribute nullable enum8 startUpOnOff = 16387;
readonly global attribute bitmap32 featureMap = 65532;
readonly global attribute int16u clusterRevision = 65533;

Expand Down
6 changes: 3 additions & 3 deletions 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 @@ -50,9 +50,9 @@ limitations under the License.

<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>
<attribute side="server" code="0x4001" define="ON_TIME" type="int16u" default="0" writable="true" optional="true">OnTime</attribute>
<attribute side="server" code="0x4002" define="OFF_WAIT_TIME" type="int16u" default="0" writable="true" optional="true">OffWaitTime</attribute>
<attribute side="server" code="0x4003" define="START_UP_ON_OFF" type="enum8" writable="true" optional="true">StartUpOnOff</attribute>
<attribute side="server" code="0x4001" define="ON_TIME" type="int16u" default="0" writable="true" isNullable="true" optional="true">OnTime</attribute>
<attribute side="server" code="0x4002" define="OFF_WAIT_TIME" type="int16u" default="0" writable="true" isNullable="true" optional="true">OffWaitTime</attribute>
<attribute side="server" code="0x4003" define="START_UP_ON_OFF" type="enum8" writable="true" isNullable="true" optional="true">StartUpOnOff</attribute>

<command source="client" code="0x00" name="Off" optional="false">
<description>On receipt of this command, a device SHALL enter its ‘Off’ state. This state is device dependent, but it is recommended that it is used for power off or similar functions. On receipt of the Off command, the OnTime attribute SHALL be set to 0.</description>
Expand Down
6 changes: 3 additions & 3 deletions src/controller/data_model/controller-clusters.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2672,9 +2672,9 @@ client cluster OnOff = 6 {

readonly attribute boolean onOff = 0;
readonly attribute boolean globalSceneControl = 16384;
attribute int16u onTime = 16385;
attribute int16u offWaitTime = 16386;
attribute enum8 startUpOnOff = 16387;
attribute nullable int16u onTime = 16385;
attribute nullable int16u offWaitTime = 16386;
attribute nullable enum8 startUpOnOff = 16387;
readonly global attribute command_id serverGeneratedCommandList[] = 65528;
readonly global attribute command_id clientGeneratedCommandList[] = 65529;
readonly global attribute attrib_id attributeList[] = 65531;
Expand Down
45 changes: 33 additions & 12 deletions src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
View file

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

36 changes: 30 additions & 6 deletions src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
View file

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

Loading

0 comments on commit 8444469

Please sign in to comment.