Skip to content

Commit 32c961f

Browse files
tcarmelveilleuxtcarmelveilleux
authored
Add missing occupancy event (#35220)
* XML: Add OccupancyChanged event * Regen zap
1 parent d185778 commit 32c961f

File tree

49 files changed

+485
-35
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+485
-35
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+5-1
Original file line numberDiff line numberDiff line change
@@ -6301,7 +6301,7 @@ cluster RelativeHumidityMeasurement = 1029 {
63016301
readonly attribute int16u clusterRevision = 65533;
63026302
}
63036303

6304-
/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
6304+
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
63056305
cluster OccupancySensing = 1030 {
63066306
revision 5;
63076307

@@ -6339,6 +6339,10 @@ cluster OccupancySensing = 1030 {
63396339
int16u holdTimeDefault = 2;
63406340
}
63416341

6342+
info event OccupancyChanged = 0 {
6343+
OccupancyBitmap occupancy = 0;
6344+
}
6345+
63426346
readonly attribute OccupancyBitmap occupancy = 0;
63436347
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
63446348
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

+5-1
Original file line numberDiff line numberDiff line change
@@ -4735,7 +4735,7 @@ cluster RelativeHumidityMeasurement = 1029 {
47354735
readonly attribute int16u clusterRevision = 65533;
47364736
}
47374737

4738-
/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
4738+
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
47394739
cluster OccupancySensing = 1030 {
47404740
revision 5;
47414741

@@ -4773,6 +4773,10 @@ cluster OccupancySensing = 1030 {
47734773
int16u holdTimeDefault = 2;
47744774
}
47754775

4776+
info event OccupancyChanged = 0 {
4777+
OccupancyBitmap occupancy = 0;
4778+
}
4779+
47764780
readonly attribute OccupancyBitmap occupancy = 0;
47774781
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
47784782
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -12488,4 +12488,4 @@
1248812488
"parentEndpointIdentifier": null
1248912489
}
1249012490
]
12491-
}
12491+
}

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter

+5-1
Original file line numberDiff line numberDiff line change
@@ -1917,7 +1917,7 @@ cluster FixedLabel = 64 {
19171917
readonly attribute int16u clusterRevision = 65533;
19181918
}
19191919

1920-
/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
1920+
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
19211921
cluster OccupancySensing = 1030 {
19221922
revision 5;
19231923

@@ -1955,6 +1955,10 @@ cluster OccupancySensing = 1030 {
19551955
int16u holdTimeDefault = 2;
19561956
}
19571957

1958+
info event OccupancyChanged = 0 {
1959+
OccupancyBitmap occupancy = 0;
1960+
}
1961+
19581962
readonly attribute OccupancyBitmap occupancy = 0;
19591963
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
19601964
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;

‎examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter

+5-1
Original file line numberDiff line numberDiff line change
@@ -1812,7 +1812,7 @@ cluster FixedLabel = 64 {
18121812
readonly attribute int16u clusterRevision = 65533;
18131813
}
18141814

1815-
/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
1815+
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
18161816
cluster OccupancySensing = 1030 {
18171817
revision 5;
18181818

@@ -1850,6 +1850,10 @@ cluster OccupancySensing = 1030 {
18501850
int16u holdTimeDefault = 2;
18511851
}
18521852

1853+
info event OccupancyChanged = 0 {
1854+
OccupancyBitmap occupancy = 0;
1855+
}
1856+
18531857
readonly attribute OccupancyBitmap occupancy = 0;
18541858
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
18551859
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;

‎examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter

+5-1
Original file line numberDiff line numberDiff line change
@@ -1968,7 +1968,7 @@ provisional cluster ScenesManagement = 98 {
19681968
fabric command CopyScene(CopySceneRequest): CopySceneResponse = 64;
19691969
}
19701970

1971-
/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
1971+
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
19721972
cluster OccupancySensing = 1030 {
19731973
revision 5;
19741974

@@ -2006,6 +2006,10 @@ cluster OccupancySensing = 1030 {
20062006
int16u holdTimeDefault = 2;
20072007
}
20082008

2009+
info event OccupancyChanged = 0 {
2010+
OccupancyBitmap occupancy = 0;
2011+
}
2012+
20092013
readonly attribute OccupancyBitmap occupancy = 0;
20102014
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
20112015
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;

‎examples/chef/devices/rootnode_genericswitch_2dfff6e516.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2801,4 +2801,4 @@
28012801
"parentEndpointIdentifier": null
28022802
}
28032803
]
2804-
}
2804+
}

‎examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2780,4 +2780,4 @@
27802780
"parentEndpointIdentifier": null
27812781
}
27822782
]
2783-
}
2783+
}

‎examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter

+6-2
Original file line numberDiff line numberDiff line change
@@ -1615,7 +1615,7 @@ cluster FixedLabel = 64 {
16151615
readonly attribute int16u clusterRevision = 65533;
16161616
}
16171617

1618-
/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
1618+
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
16191619
cluster OccupancySensing = 1030 {
16201620
revision 5;
16211621

@@ -1653,6 +1653,10 @@ cluster OccupancySensing = 1030 {
16531653
int16u holdTimeDefault = 2;
16541654
}
16551655

1656+
info event OccupancyChanged = 0 {
1657+
OccupancyBitmap occupancy = 0;
1658+
}
1659+
16561660
readonly attribute OccupancyBitmap occupancy = 0;
16571661
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
16581662
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
@@ -1896,7 +1900,7 @@ endpoint 0 {
18961900
}
18971901
}
18981902
endpoint 1 {
1899-
device type ma_occupancysensor = 263, version 1;
1903+
device type ma_occupancysensor = 263, version 4;
19001904

19011905
binding cluster Groups;
19021906
binding cluster Binding;

‎examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -2484,7 +2484,7 @@
24842484
}
24852485
],
24862486
"deviceVersions": [
2487-
1
2487+
4
24882488
],
24892489
"deviceIdentifiers": [
24902490
263
@@ -3022,4 +3022,4 @@
30223022
"parentEndpointIdentifier": null
30233023
}
30243024
]
3025-
}
3025+
}

‎examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter

+5-1
Original file line numberDiff line numberDiff line change
@@ -2118,7 +2118,7 @@ cluster RelativeHumidityMeasurement = 1029 {
21182118
readonly attribute int16u clusterRevision = 65533;
21192119
}
21202120

2121-
/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
2121+
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
21222122
cluster OccupancySensing = 1030 {
21232123
revision 5;
21242124

@@ -2156,6 +2156,10 @@ cluster OccupancySensing = 1030 {
21562156
int16u holdTimeDefault = 2;
21572157
}
21582158

2159+
info event OccupancyChanged = 0 {
2160+
OccupancyBitmap occupancy = 0;
2161+
}
2162+
21592163
readonly attribute OccupancyBitmap occupancy = 0;
21602164
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
21612165
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;

‎examples/chef/sample_app_util/test_files/sample_zap_file.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -5683,4 +5683,4 @@
56835683
"parentEndpointIdentifier": null
56845684
}
56855685
]
5686-
}
5686+
}

‎examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter

+5-1
Original file line numberDiff line numberDiff line change
@@ -1914,7 +1914,7 @@ cluster BooleanState = 69 {
19141914
readonly attribute int16u clusterRevision = 65533;
19151915
}
19161916

1917-
/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
1917+
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
19181918
cluster OccupancySensing = 1030 {
19191919
revision 5;
19201920

@@ -1952,6 +1952,10 @@ cluster OccupancySensing = 1030 {
19521952
int16u holdTimeDefault = 2;
19531953
}
19541954

1955+
info event OccupancyChanged = 0 {
1956+
OccupancyBitmap occupancy = 0;
1957+
}
1958+
19551959
readonly attribute OccupancyBitmap occupancy = 0;
19561960
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
19571961
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;

‎examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -4750,4 +4750,4 @@
47504750
"parentEndpointIdentifier": null
47514751
}
47524752
]
4753-
}
4753+
}

‎examples/light-switch-app/light-switch-common/light-switch-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -5903,4 +5903,4 @@
59035903
"parentEndpointIdentifier": null
59045904
}
59055905
]
5906-
}
5906+
}

‎examples/light-switch-app/qpg/zap/switch.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -6569,4 +6569,4 @@
65696569
"parentEndpointIdentifier": null
65706570
}
65716571
]
6572-
}
6572+
}

‎examples/lighting-app/lighting-common/lighting-app.matter

+5-1
Original file line numberDiff line numberDiff line change
@@ -2634,7 +2634,7 @@ cluster ColorControl = 768 {
26342634
command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76;
26352635
}
26362636

2637-
/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
2637+
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
26382638
cluster OccupancySensing = 1030 {
26392639
revision 5;
26402640

@@ -2672,6 +2672,10 @@ cluster OccupancySensing = 1030 {
26722672
int16u holdTimeDefault = 2;
26732673
}
26742674

2675+
info event OccupancyChanged = 0 {
2676+
OccupancyBitmap occupancy = 0;
2677+
}
2678+
26752679
readonly attribute OccupancyBitmap occupancy = 0;
26762680
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
26772681
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;

‎examples/lighting-app/lighting-common/lighting-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -5932,4 +5932,4 @@
59325932
"parentEndpointIdentifier": null
59335933
}
59345934
]
5935-
}
5935+
}

‎examples/placeholder/linux/apps/app1/config.matter

+5-1
Original file line numberDiff line numberDiff line change
@@ -6651,7 +6651,7 @@ cluster RelativeHumidityMeasurement = 1029 {
66516651
readonly attribute int16u clusterRevision = 65533;
66526652
}
66536653

6654-
/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
6654+
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
66556655
cluster OccupancySensing = 1030 {
66566656
revision 5;
66576657

@@ -6689,6 +6689,10 @@ cluster OccupancySensing = 1030 {
66896689
int16u holdTimeDefault = 2;
66906690
}
66916691

6692+
info event OccupancyChanged = 0 {
6693+
OccupancyBitmap occupancy = 0;
6694+
}
6695+
66926696
readonly attribute OccupancyBitmap occupancy = 0;
66936697
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
66946698
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;

‎examples/placeholder/linux/apps/app1/config.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -15129,4 +15129,4 @@
1512915129
"parentEndpointIdentifier": null
1513015130
}
1513115131
]
15132-
}
15132+
}

‎examples/placeholder/linux/apps/app2/config.matter

+5-1
Original file line numberDiff line numberDiff line change
@@ -6608,7 +6608,7 @@ cluster RelativeHumidityMeasurement = 1029 {
66086608
readonly attribute int16u clusterRevision = 65533;
66096609
}
66106610

6611-
/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
6611+
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
66126612
cluster OccupancySensing = 1030 {
66136613
revision 5;
66146614

@@ -6646,6 +6646,10 @@ cluster OccupancySensing = 1030 {
66466646
int16u holdTimeDefault = 2;
66476647
}
66486648

6649+
info event OccupancyChanged = 0 {
6650+
OccupancyBitmap occupancy = 0;
6651+
}
6652+
66496653
readonly attribute OccupancyBitmap occupancy = 0;
66506654
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
66516655
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;

‎examples/placeholder/linux/apps/app2/config.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -14889,4 +14889,4 @@
1488914889
"parentEndpointIdentifier": null
1489014890
}
1489114891
]
14892-
}
14892+
}

‎examples/pump-app/pump-common/pump-app.matter

+5-1
Original file line numberDiff line numberDiff line change
@@ -1918,7 +1918,7 @@ cluster FlowMeasurement = 1028 {
19181918
readonly attribute int16u clusterRevision = 65533;
19191919
}
19201920

1921-
/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
1921+
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
19221922
cluster OccupancySensing = 1030 {
19231923
revision 5;
19241924

@@ -1956,6 +1956,10 @@ cluster OccupancySensing = 1030 {
19561956
int16u holdTimeDefault = 2;
19571957
}
19581958

1959+
info event OccupancyChanged = 0 {
1960+
OccupancyBitmap occupancy = 0;
1961+
}
1962+
19591963
readonly attribute OccupancyBitmap occupancy = 0;
19601964
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
19611965
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;

‎examples/pump-app/silabs/data_model/pump-thread-app.matter

+5-1
Original file line numberDiff line numberDiff line change
@@ -1918,7 +1918,7 @@ cluster FlowMeasurement = 1028 {
19181918
readonly attribute int16u clusterRevision = 65533;
19191919
}
19201920

1921-
/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
1921+
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
19221922
cluster OccupancySensing = 1030 {
19231923
revision 5;
19241924

@@ -1956,6 +1956,10 @@ cluster OccupancySensing = 1030 {
19561956
int16u holdTimeDefault = 2;
19571957
}
19581958

1959+
info event OccupancyChanged = 0 {
1960+
OccupancyBitmap occupancy = 0;
1961+
}
1962+
19591963
readonly attribute OccupancyBitmap occupancy = 0;
19601964
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
19611965
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;

‎examples/pump-app/silabs/data_model/pump-wifi-app.matter

+5-1
Original file line numberDiff line numberDiff line change
@@ -1918,7 +1918,7 @@ cluster FlowMeasurement = 1028 {
19181918
readonly attribute int16u clusterRevision = 65533;
19191919
}
19201920

1921-
/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
1921+
/** The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status. */
19221922
cluster OccupancySensing = 1030 {
19231923
revision 5;
19241924

@@ -1956,6 +1956,10 @@ cluster OccupancySensing = 1030 {
19561956
int16u holdTimeDefault = 2;
19571957
}
19581958

1959+
info event OccupancyChanged = 0 {
1960+
OccupancyBitmap occupancy = 0;
1961+
}
1962+
19591963
readonly attribute OccupancyBitmap occupancy = 0;
19601964
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
19611965
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;

‎src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ limitations under the License.
4747
<cluster>
4848
<name>Occupancy Sensing</name>
4949
<domain>Measurement &amp; Sensing</domain>
50-
<description>Attributes and commands for configuring occupancy sensing, and reporting occupancy status.</description>
50+
<description>The server cluster provides an interface to occupancy sensing functionality based on one or more sensing modalities, including configuration and provision of notifications of occupancy status.</description>
5151
<code>0x0406</code>
5252
<define>OCCUPANCY_SENSING_CLUSTER</define>
5353

@@ -147,5 +147,10 @@ limitations under the License.
147147
<access op="read" role="view"/>
148148
<access op="write" role="manage"/>
149149
</attribute>
150+
151+
<event side="server" code="0x00" priority="info" name="OccupancyChanged" optional="true">
152+
<description>If this event is supported, it SHALL be generated when the Occupancy attribute changes.</description>
153+
<field id="0" name="Occupancy" type="OccupancyBitmap"/>
154+
</event>
150155
</cluster>
151156
</configurator>

0 commit comments

Comments
 (0)