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.

Sign up for GitHub

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

Mark several clusters that are zigbee only as deprecated. #30871

Merged
merged 3 commits into from
Dec 8, 2023
Merged

Mark several clusters that are zigbee only as deprecated. #30871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54bc4fb
mark several clusters as zigbee-only
andreilitvin Dec 7, 2023
bffaafc
update comment
andreilitvin Dec 7, 2023
1f64ebd
zap regen
andreilitvin Dec 7, 2023
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
8 changes: 4 additions & 4 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ cluster OnOff = 6 {
}

/** Attributes and commands for configuring On/Off switching devices. */
cluster OnOffSwitchConfiguration = 7 {
deprecated cluster OnOffSwitchConfiguration = 7 {
revision 1; // NOTE: Default/not specifically set

readonly attribute enum8 switchType = 0;
Expand Down Expand Up @@ -605,7 +605,7 @@ cluster LevelControl = 8 {
}

/** An interface for reading the value of a binary measurement and accessing various characteristics of that measurement. */
cluster BinaryInputBasic = 15 {
deprecated cluster BinaryInputBasic = 15 {
revision 1; // NOTE: Default/not specifically set

attribute optional char_string<16> activeText = 4;
Expand Down Expand Up @@ -3790,7 +3790,7 @@ cluster WindowCovering = 258 {
}

/** This cluster provides control of a barrier (garage door). */
cluster BarrierControl = 259 {
deprecated cluster BarrierControl = 259 {
revision 1; // NOTE: Default/not specifically set

bitmap BarrierControlCapabilities : bitmap8 {
Expand Down Expand Up @@ -5321,7 +5321,7 @@ cluster LowPower = 1288 {
}

/** Attributes related to the electrical properties of a device. This cluster is used by power outlets and other devices that need to provide instantaneous data as opposed to metrology data which should be retrieved from the metering cluster.. */
cluster ElectricalMeasurement = 2820 {
deprecated cluster ElectricalMeasurement = 2820 {
revision 3;

readonly attribute optional bitmap32 measurementType = 0;
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ cluster LevelControl = 8 {
}

/** An interface for reading the value of a binary measurement and accessing various characteristics of that measurement. */
cluster BinaryInputBasic = 15 {
deprecated cluster BinaryInputBasic = 15 {
revision 1; // NOTE: Default/not specifically set

attribute optional char_string<16> activeText = 4;
Expand Down
3 changes: 2 additions & 1 deletion src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ limitations under the License.
<configurator>
<domain name="CHIP" />

<cluster apiMaturity="provisional">
<!-- Deprecated because this is a zigbee-only cluster -->
<cluster apiMaturity="deprecated">
<domain>General</domain>
<name>Pulse Width Modulation</name>
<code>0x001c</code>
Expand Down
3 changes: 2 additions & 1 deletion src/app/zap-templates/zcl/data-model/draft/barrier-control-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ limitations under the License.
<field name="positionFailure" mask="0x08"/>
</bitmap>

<cluster>
<!-- Deprecated because this is a zigbee-only cluster -->
<cluster apiMaturity="deprecated">
<name>Barrier Control</name>
<domain>Closures</domain>
<code>0x0103</code>
Expand Down
6 changes: 5 additions & 1 deletion src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ limitations under the License.
<configurator>
<domain name="Home Automation"/>

<cluster introducedIn="ha-1.2-05-3520-29">
<!--
Deprecated because this is a zigbee-only cluster.
Matter electrical measurement is 0x90 (see https://github.com/project-chip/connectedhomeip/pull/30389)
-->
<cluster apiMaturity="deprecated" introducedIn="ha-1.2-05-3520-29">
<name>Electrical Measurement</name>
<domain>Home Automation</domain>
<description>Attributes related to the electrical properties of a device. This cluster is used by power outlets and other devices that need to provide instantaneous data as opposed to metrology data which should be retrieved from the metering cluster..</description>
Expand Down
3 changes: 2 additions & 1 deletion src/app/zap-templates/zcl/data-model/draft/input-output-value-clusters.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ limitations under the License.
<configurator>
<domain name="General"/>

<cluster>
<!-- Deprecated because this is a zigbee-only cluster -->
<cluster apiMaturity="deprecated">
<name>Binary Input (Basic)</name>
<domain>General</domain>
<description>An interface for reading the value of a binary measurement and accessing various characteristics of that measurement. </description>
Expand Down
3 changes: 2 additions & 1 deletion src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ limitations under the License.
<configurator>
<domain name="General"/>

<cluster>
<!-- Deprecated because this is a zigbee-only cluster -->
<cluster apiMaturity="deprecated">
<name>On/off Switch Configuration</name>
<domain>General</domain>
<description>Attributes and commands for configuring On/Off switching devices.</description>
Expand Down
10 changes: 5 additions & 5 deletions src/controller/data_model/controller-clusters.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ cluster OnOff = 6 {
}

/** Attributes and commands for configuring On/Off switching devices. */
cluster OnOffSwitchConfiguration = 7 {
deprecated cluster OnOffSwitchConfiguration = 7 {
revision 1; // NOTE: Default/not specifically set

readonly attribute enum8 switchType = 0;
Expand Down Expand Up @@ -533,7 +533,7 @@ cluster LevelControl = 8 {
}

/** An interface for reading the value of a binary measurement and accessing various characteristics of that measurement. */
cluster BinaryInputBasic = 15 {
deprecated cluster BinaryInputBasic = 15 {
revision 1; // NOTE: Default/not specifically set

attribute optional char_string<16> activeText = 4;
Expand All @@ -554,7 +554,7 @@ cluster BinaryInputBasic = 15 {
}

/** Cluster to control pulse width modulation */
provisional cluster PulseWidthModulation = 28 {
deprecated cluster PulseWidthModulation = 28 {
revision 1; // NOTE: Default/not specifically set

readonly attribute command_id generatedCommandList[] = 65528;
Expand Down Expand Up @@ -5437,7 +5437,7 @@ cluster WindowCovering = 258 {
}

/** This cluster provides control of a barrier (garage door). */
cluster BarrierControl = 259 {
deprecated cluster BarrierControl = 259 {
revision 1; // NOTE: Default/not specifically set

bitmap BarrierControlCapabilities : bitmap8 {
Expand Down Expand Up @@ -7973,7 +7973,7 @@ cluster ContentAppObserver = 1296 {
}

/** Attributes related to the electrical properties of a device. This cluster is used by power outlets and other devices that need to provide instantaneous data as opposed to metrology data which should be retrieved from the metering cluster.. */
cluster ElectricalMeasurement = 2820 {
deprecated cluster ElectricalMeasurement = 2820 {
revision 3;

readonly attribute optional bitmap32 measurementType = 0;
Expand Down
Loading