Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing occupancy event #35220

Merged
merged 2 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6301,7 +6301,7 @@ cluster RelativeHumidityMeasurement = 1029 {
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
/** 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. */
cluster OccupancySensing = 1030 {
revision 5;

Expand Down Expand Up @@ -6339,6 +6339,10 @@ cluster OccupancySensing = 1030 {
int16u holdTimeDefault = 2;
}

info event OccupancyChanged = 0 {
OccupancyBitmap occupancy = 0;
}

readonly attribute OccupancyBitmap occupancy = 0;
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4735,7 +4735,7 @@ cluster RelativeHumidityMeasurement = 1029 {
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
/** 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. */
cluster OccupancySensing = 1030 {
revision 5;

Expand Down Expand Up @@ -4773,6 +4773,10 @@ cluster OccupancySensing = 1030 {
int16u holdTimeDefault = 2;
}

info event OccupancyChanged = 0 {
OccupancyBitmap occupancy = 0;
}

readonly attribute OccupancyBitmap occupancy = 0;
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12488,4 +12488,4 @@
"parentEndpointIdentifier": null
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1917,7 +1917,7 @@ cluster FixedLabel = 64 {
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
/** 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. */
cluster OccupancySensing = 1030 {
revision 5;

Expand Down Expand Up @@ -1955,6 +1955,10 @@ cluster OccupancySensing = 1030 {
int16u holdTimeDefault = 2;
}

info event OccupancyChanged = 0 {
OccupancyBitmap occupancy = 0;
}

readonly attribute OccupancyBitmap occupancy = 0;
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1812,7 +1812,7 @@ cluster FixedLabel = 64 {
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
/** 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. */
cluster OccupancySensing = 1030 {
revision 5;

Expand Down Expand Up @@ -1850,6 +1850,10 @@ cluster OccupancySensing = 1030 {
int16u holdTimeDefault = 2;
}

info event OccupancyChanged = 0 {
OccupancyBitmap occupancy = 0;
}

readonly attribute OccupancyBitmap occupancy = 0;
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1968,7 +1968,7 @@ provisional cluster ScenesManagement = 98 {
fabric command CopyScene(CopySceneRequest): CopySceneResponse = 64;
}

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
/** 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. */
cluster OccupancySensing = 1030 {
revision 5;

Expand Down Expand Up @@ -2006,6 +2006,10 @@ cluster OccupancySensing = 1030 {
int16u holdTimeDefault = 2;
}

info event OccupancyChanged = 0 {
OccupancyBitmap occupancy = 0;
}

readonly attribute OccupancyBitmap occupancy = 0;
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2801,4 +2801,4 @@
"parentEndpointIdentifier": null
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2780,4 +2780,4 @@
"parentEndpointIdentifier": null
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1615,7 +1615,7 @@ cluster FixedLabel = 64 {
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
/** 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. */
cluster OccupancySensing = 1030 {
revision 5;

Expand Down Expand Up @@ -1653,6 +1653,10 @@ cluster OccupancySensing = 1030 {
int16u holdTimeDefault = 2;
}

info event OccupancyChanged = 0 {
OccupancyBitmap occupancy = 0;
}

readonly attribute OccupancyBitmap occupancy = 0;
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
Expand Down Expand Up @@ -1896,7 +1900,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type ma_occupancysensor = 263, version 1;
device type ma_occupancysensor = 263, version 4;

binding cluster Groups;
binding cluster Binding;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
Original file line number Diff line number Diff line change
Expand Up @@ -2484,7 +2484,7 @@
}
],
"deviceVersions": [
1
4
],
"deviceIdentifiers": [
263
Expand Down Expand Up @@ -3022,4 +3022,4 @@
"parentEndpointIdentifier": null
}
]
}
}
6 changes: 5 additions & 1 deletion examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
Original file line number Diff line number Diff line change
Expand Up @@ -2118,7 +2118,7 @@ cluster RelativeHumidityMeasurement = 1029 {
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
/** 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. */
cluster OccupancySensing = 1030 {
revision 5;

Expand Down Expand Up @@ -2156,6 +2156,10 @@ cluster OccupancySensing = 1030 {
int16u holdTimeDefault = 2;
}

info event OccupancyChanged = 0 {
OccupancyBitmap occupancy = 0;
}

readonly attribute OccupancyBitmap occupancy = 0;
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5683,4 +5683,4 @@
"parentEndpointIdentifier": null
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1914,7 +1914,7 @@ cluster BooleanState = 69 {
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
/** 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. */
cluster OccupancySensing = 1030 {
revision 5;

Expand Down Expand Up @@ -1952,6 +1952,10 @@ cluster OccupancySensing = 1030 {
int16u holdTimeDefault = 2;
}

info event OccupancyChanged = 0 {
OccupancyBitmap occupancy = 0;
}

readonly attribute OccupancyBitmap occupancy = 0;
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4750,4 +4750,4 @@
"parentEndpointIdentifier": null
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5903,4 +5903,4 @@
"parentEndpointIdentifier": null
}
]
}
}
2 changes: 1 addition & 1 deletion examples/light-switch-app/qpg/zap/switch.zap
Original file line number Diff line number Diff line change
Expand Up @@ -6569,4 +6569,4 @@
"parentEndpointIdentifier": null
}
]
}
}
6 changes: 5 additions & 1 deletion examples/lighting-app/lighting-common/lighting-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -2634,7 +2634,7 @@ cluster ColorControl = 768 {
command StepColorTemperature(StepColorTemperatureRequest): DefaultSuccess = 76;
}

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
/** 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. */
cluster OccupancySensing = 1030 {
revision 5;

Expand Down Expand Up @@ -2672,6 +2672,10 @@ cluster OccupancySensing = 1030 {
int16u holdTimeDefault = 2;
}

info event OccupancyChanged = 0 {
OccupancyBitmap occupancy = 0;
}

readonly attribute OccupancyBitmap occupancy = 0;
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/lighting-common/lighting-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -5932,4 +5932,4 @@
"parentEndpointIdentifier": null
}
]
}
}
6 changes: 5 additions & 1 deletion examples/placeholder/linux/apps/app1/config.matter
Original file line number Diff line number Diff line change
Expand Up @@ -6651,7 +6651,7 @@ cluster RelativeHumidityMeasurement = 1029 {
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
/** 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. */
cluster OccupancySensing = 1030 {
revision 5;

Expand Down Expand Up @@ -6689,6 +6689,10 @@ cluster OccupancySensing = 1030 {
int16u holdTimeDefault = 2;
}

info event OccupancyChanged = 0 {
OccupancyBitmap occupancy = 0;
}

readonly attribute OccupancyBitmap occupancy = 0;
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app1/config.zap
Original file line number Diff line number Diff line change
Expand Up @@ -15129,4 +15129,4 @@
"parentEndpointIdentifier": null
}
]
}
}
6 changes: 5 additions & 1 deletion examples/placeholder/linux/apps/app2/config.matter
Original file line number Diff line number Diff line change
Expand Up @@ -6608,7 +6608,7 @@ cluster RelativeHumidityMeasurement = 1029 {
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
/** 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. */
cluster OccupancySensing = 1030 {
revision 5;

Expand Down Expand Up @@ -6646,6 +6646,10 @@ cluster OccupancySensing = 1030 {
int16u holdTimeDefault = 2;
}

info event OccupancyChanged = 0 {
OccupancyBitmap occupancy = 0;
}

readonly attribute OccupancyBitmap occupancy = 0;
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app2/config.zap
Original file line number Diff line number Diff line change
Expand Up @@ -14889,4 +14889,4 @@
"parentEndpointIdentifier": null
}
]
}
}
6 changes: 5 additions & 1 deletion examples/pump-app/pump-common/pump-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1918,7 +1918,7 @@ cluster FlowMeasurement = 1028 {
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
/** 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. */
cluster OccupancySensing = 1030 {
revision 5;

Expand Down Expand Up @@ -1956,6 +1956,10 @@ cluster OccupancySensing = 1030 {
int16u holdTimeDefault = 2;
}

info event OccupancyChanged = 0 {
OccupancyBitmap occupancy = 0;
}

readonly attribute OccupancyBitmap occupancy = 0;
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1918,7 +1918,7 @@ cluster FlowMeasurement = 1028 {
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
/** 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. */
cluster OccupancySensing = 1030 {
revision 5;

Expand Down Expand Up @@ -1956,6 +1956,10 @@ cluster OccupancySensing = 1030 {
int16u holdTimeDefault = 2;
}

info event OccupancyChanged = 0 {
OccupancyBitmap occupancy = 0;
}

readonly attribute OccupancyBitmap occupancy = 0;
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
Expand Down
6 changes: 5 additions & 1 deletion examples/pump-app/silabs/data_model/pump-wifi-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1918,7 +1918,7 @@ cluster FlowMeasurement = 1028 {
readonly attribute int16u clusterRevision = 65533;
}

/** Attributes and commands for configuring occupancy sensing, and reporting occupancy status. */
/** 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. */
cluster OccupancySensing = 1030 {
revision 5;

Expand Down Expand Up @@ -1956,6 +1956,10 @@ cluster OccupancySensing = 1030 {
int16u holdTimeDefault = 2;
}

info event OccupancyChanged = 0 {
OccupancyBitmap occupancy = 0;
}

readonly attribute OccupancyBitmap occupancy = 0;
readonly attribute OccupancySensorTypeEnum occupancySensorType = 1;
readonly attribute OccupancySensorTypeBitmap occupancySensorTypeBitmap = 2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ limitations under the License.
<cluster>
<name>Occupancy Sensing</name>
<domain>Measurement &amp; Sensing</domain>
<description>Attributes and commands for configuring occupancy sensing, and reporting occupancy status.</description>
<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>
<code>0x0406</code>
<define>OCCUPANCY_SENSING_CLUSTER</define>

Expand Down Expand Up @@ -147,5 +147,10 @@ limitations under the License.
<access op="read" role="view"/>
<access op="write" role="manage"/>
</attribute>

<event side="server" code="0x00" priority="info" name="OccupancyChanged" optional="true">
<description>If this event is supported, it SHALL be generated when the Occupancy attribute changes.</description>
<field id="0" name="Occupancy" type="OccupancyBitmap"/>
</event>
</cluster>
</configurator>
Loading
Loading