From 356213620046828b4158427cb4a8dc8af413e423 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 8 Dec 2023 13:18:21 -0500 Subject: [PATCH] Mark several clusters that are zigbee only as deprecated. (#30871) * mark several clusters as zigbee-only * update comment * zap regen --------- Co-authored-by: Andrei Litvin --- .../all-clusters-common/all-clusters-app.matter | 8 ++++---- .../tv-casting-common/tv-casting-app.matter | 2 +- .../zap-templates/zcl/data-model/chip/pwm-cluster.xml | 3 ++- .../zcl/data-model/draft/barrier-control-cluster.xml | 3 ++- .../draft/electrical-measurement-cluster.xml | 6 +++++- .../data-model/draft/input-output-value-clusters.xml | 3 ++- .../draft/onoff-switch-configuration-cluster.xml | 3 ++- src/controller/data_model/controller-clusters.matter | 10 +++++----- 8 files changed, 23 insertions(+), 15 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index c8c0cc26d379bb..a9e2f8cfb4ee98 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -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; @@ -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; @@ -3792,7 +3792,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 { @@ -5415,7 +5415,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; diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index 9225e5bc56bf32..36474e7f23eda3 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -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; diff --git a/src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml index ba31ad6d185b85..dcd0acd3c4d4ff 100644 --- a/src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml @@ -17,7 +17,8 @@ limitations under the License. - + + General Pulse Width Modulation 0x001c diff --git a/src/app/zap-templates/zcl/data-model/draft/barrier-control-cluster.xml b/src/app/zap-templates/zcl/data-model/draft/barrier-control-cluster.xml index ce3f7494c76d2d..282cb205020935 100644 --- a/src/app/zap-templates/zcl/data-model/draft/barrier-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/draft/barrier-control-cluster.xml @@ -30,7 +30,8 @@ limitations under the License. - + + Barrier Control Closures 0x0103 diff --git a/src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml index 3fca4504c4fcbe..e9246a1e3ff84d 100644 --- a/src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml @@ -17,7 +17,11 @@ limitations under the License. - + + Electrical Measurement Home Automation 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.. diff --git a/src/app/zap-templates/zcl/data-model/draft/input-output-value-clusters.xml b/src/app/zap-templates/zcl/data-model/draft/input-output-value-clusters.xml index dc52fd7c90532a..132de384def242 100644 --- a/src/app/zap-templates/zcl/data-model/draft/input-output-value-clusters.xml +++ b/src/app/zap-templates/zcl/data-model/draft/input-output-value-clusters.xml @@ -17,7 +17,8 @@ limitations under the License. - + + Binary Input (Basic) General An interface for reading the value of a binary measurement and accessing various characteristics of that measurement. diff --git a/src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml index 1662b2b442cf01..eb74be7c600b06 100644 --- a/src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml @@ -17,7 +17,8 @@ limitations under the License. - + + On/off Switch Configuration General Attributes and commands for configuring On/Off switching devices. diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 73cb03e45c0693..6dfaf7efbd68c7 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -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; @@ -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; @@ -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; @@ -5439,7 +5439,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 { @@ -8067,7 +8067,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;