From 1749792a82623692a4f79619beeeef9103abbb09 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 17 Oct 2023 20:38:30 -0400 Subject: [PATCH] Add provisional and internal markers cluster-wide (#29765) * Update cluster data with api maturity * Pull in latest zap that supports api maturity * mark scenes provisional, mark unit testing and fault injection as internal * Mark more clusters as provisional * Undo domain move * Undo submodule change * make the scenes domain identical with how it was * Restyle --------- Co-authored-by: Andrei Litvin --- .../all-clusters-common/all-clusters-app.matter | 10 +++++----- .../all-clusters-minimal-app.matter | 8 ++++---- ...ensor_humiditysensor_thermostat_56de3d5f45.matter | 2 +- examples/chef/devices/rootnode_fan_7N2TobIlOX.matter | 2 +- .../rootnode_heatingcoolingunit_ncdGai1E5a.matter | 2 +- .../rootnode_roboticvacuumcleaner_1807ff0c49.matter | 2 +- .../rootnode_roomairconditioner_9cf3607804.matter | 2 +- .../devices/rootnode_thermostat_bm3fb8dhYi.matter | 2 +- .../light-switch-common/light-switch-app.matter | 2 +- .../lighting-app/lighting-common/lighting-app.matter | 2 +- .../silabs/data_model/lighting-thread-app.matter | 2 +- .../silabs/data_model/lighting-wifi-app.matter | 2 +- examples/placeholder/linux/apps/app1/config.matter | 2 +- examples/placeholder/linux/apps/app2/config.matter | 2 +- .../resource-monitoring-app.matter | 2 +- .../virtual-device-common/virtual-device-app.matter | 2 +- .../partials/idl/cluster_definition.zapt | 1 + .../chip/ballast-configuration-cluster.xml | 2 +- .../zcl/data-model/chip/fan-control-cluster.xml | 2 +- .../zcl/data-model/chip/fault-injection-cluster.xml | 2 +- .../zcl/data-model/chip/pwm-cluster.xml | 4 ++-- src/app/zap-templates/zcl/data-model/chip/scene.xml | 2 +- .../zcl/data-model/chip/test-cluster.xml | 2 +- src/controller/data_model/controller-clusters.matter | 12 ++++++------ 24 files changed, 37 insertions(+), 36 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 efd0d098cb872d..367388c7b2f015 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 @@ -117,7 +117,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; @@ -4183,7 +4183,7 @@ server cluster Thermostat = 513 { } /** An interface for controlling a fan in a heating/cooling system. */ -server cluster FanControl = 514 { +provisional server cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; @@ -4574,7 +4574,7 @@ server cluster ColorControl = 768 { } /** Attributes and commands for configuring a lighting ballast. */ -server cluster BallastConfiguration = 769 { +provisional server cluster BallastConfiguration = 769 { bitmap BallastStatusBitmap : BITMAP8 { kBallastNonOperational = 0x1; kLampFailure = 0x2; @@ -5310,7 +5310,7 @@ server cluster ElectricalMeasurement = 2820 { } /** The Test Cluster is meant to validate the generated code */ -server cluster UnitTesting = 4294048773 { +internal server cluster UnitTesting = 4294048773 { enum SimpleEnum : ENUM8 { kUnspecified = 0; kValueA = 1; @@ -5632,7 +5632,7 @@ server cluster UnitTesting = 4294048773 { } /** The Fault Injection Cluster provide a means for a test harness to configure faults(for example triggering a fault in the system). */ -server cluster FaultInjection = 4294048774 { +internal server cluster FaultInjection = 4294048774 { enum FaultType : ENUM8 { kUnspecified = 0; kSystemFault = 1; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 73ac50358c13b4..f7ae8b3196bc0e 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; @@ -2819,7 +2819,7 @@ server cluster Thermostat = 513 { } /** An interface for controlling a fan in a heating/cooling system. */ -server cluster FanControl = 514 { +provisional server cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; @@ -2978,7 +2978,7 @@ server cluster ColorControl = 768 { } /** Attributes and commands for configuring a lighting ballast. */ -server cluster BallastConfiguration = 769 { +provisional server cluster BallastConfiguration = 769 { bitmap BallastStatusBitmap : BITMAP8 { kBallastNonOperational = 0x1; kLampFailure = 0x2; @@ -3654,7 +3654,7 @@ server cluster AccountLogin = 1294 { } /** The Test Cluster is meant to validate the generated code */ -server cluster UnitTesting = 4294048773 { +internal server cluster UnitTesting = 4294048773 { enum SimpleEnum : ENUM8 { kUnspecified = 0; kValueA = 1; diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter index becc2994f937e9..3e798fbc65b9c1 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter @@ -1088,7 +1088,7 @@ server cluster Thermostat = 513 { } /** An interface for controlling a fan in a heating/cooling system. */ -server cluster FanControl = 514 { +provisional server cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 9367e36ea00e89..af74d9b8417c8f 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -1139,7 +1139,7 @@ server cluster FixedLabel = 64 { } /** An interface for controlling a fan in a heating/cooling system. */ -server cluster FanControl = 514 { +provisional server cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index e4aa78bbd25bdf..f2b3878dda758d 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -1453,7 +1453,7 @@ client cluster Thermostat = 513 { } /** An interface for controlling a fan in a heating/cooling system. */ -server cluster FanControl = 514 { +provisional server cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter index e824e2cdc1b7b2..789188da2eeeb9 100644 --- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter +++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter index 3bccbecf18922b..29941df8ef18b5 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter @@ -1019,7 +1019,7 @@ server cluster Thermostat = 513 { } /** An interface for controlling a fan in a heating/cooling system. */ -server cluster FanControl = 514 { +provisional server cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 42f0736a950d47..57b611204f1081 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -1261,7 +1261,7 @@ server cluster Thermostat = 513 { } /** An interface for controlling a fan in a heating/cooling system. */ -client cluster FanControl = 514 { +provisional client cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index d05cbfa828b51d..f703cbfc4860b7 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -165,7 +165,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -client cluster Scenes = 5 { +provisional client cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 44cc85d26015dd..c0b6344bcab4aa 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter index 1ee2508f922b9a..e1951b6a9ba901 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter index ccad91158a901d..ca9d823350b0b1 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 3dc67eaec358aa..990047f1259d9f 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -165,7 +165,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index daa24822170a95..f11e7bb353e52c 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -165,7 +165,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter index 3f7be93a0d8b03..dd6e4bfb9b90b4 100644 --- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter +++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter @@ -1579,7 +1579,7 @@ server cluster ActivatedCarbonFilterMonitoring = 114 { } /** An interface for controlling a fan in a heating/cooling system. */ -server cluster FanControl = 514 { +provisional server cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter index 997aad965458a9..e20e6d41f29309 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -server cluster Scenes = 5 { +provisional server cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; diff --git a/src/app/zap-templates/partials/idl/cluster_definition.zapt b/src/app/zap-templates/partials/idl/cluster_definition.zapt index 22550157b665f2..54f6f687c9538a 100644 --- a/src/app/zap-templates/partials/idl/cluster_definition.zapt +++ b/src/app/zap-templates/partials/idl/cluster_definition.zapt @@ -1,4 +1,5 @@ /** {{description}} */ +{{#if apiMaturity}}{{apiMaturity}} {{/if~}} {{#if generateClientCluster}}client {{else}}server {{/if~}} cluster {{asUpperCamelCase name}} = {{!}} {{~#if manufacturerCode}} diff --git a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml index 1b3a2d5ffb89be..7819e95cb7b3c6 100644 --- a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml @@ -28,7 +28,7 @@ limitations under the License. - + Ballast Configuration Lighting Attributes and commands for configuring a lighting ballast. diff --git a/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml index 9eb833bc5cf12c..3c30d960f18fe7 100644 --- a/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml @@ -73,7 +73,7 @@ limitations under the License. - + Fan Control HVAC An interface for controlling a fan in a heating/cooling system. diff --git a/src/app/zap-templates/zcl/data-model/chip/fault-injection-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/fault-injection-cluster.xml index 76bc15ea6a904c..3d95c992c98ae0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/fault-injection-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/fault-injection-cluster.xml @@ -24,7 +24,7 @@ limitations under the License. - + CHIP Fault Injection 0xFFF1FC06 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 b71c0f1090b707..ba31ad6d185b85 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,11 +17,11 @@ limitations under the License. - + General Pulse Width Modulation 0x001c PWM_CLUSTER Cluster to control pulse width modulation - \ No newline at end of file + diff --git a/src/app/zap-templates/zcl/data-model/chip/scene.xml b/src/app/zap-templates/zcl/data-model/chip/scene.xml index 8418f9c4a97eee..ff6769249dc4f0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/scene.xml +++ b/src/app/zap-templates/zcl/data-model/chip/scene.xml @@ -33,7 +33,7 @@ limitations under the License. - + Scenes General Attributes and commands for scene configuration and manipulation. diff --git a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml index 2f7e1376013ebd..9117389fa3f9c6 100644 --- a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml @@ -136,7 +136,7 @@ limitations under the License. - + CHIP Unit Testing 0xFFF1FC05 diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index cf5a9d605c772a..e4dec560e8d8f2 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -125,7 +125,7 @@ client cluster Groups = 4 { } /** Attributes and commands for scene configuration and manipulation. */ -client cluster Scenes = 5 { +provisional client cluster Scenes = 5 { bitmap Feature : BITMAP32 { kSceneNames = 0x1; kExplicit = 0x2; @@ -526,7 +526,7 @@ client cluster BinaryInputBasic = 15 { } /** Cluster to control pulse width modulation */ -client cluster PulseWidthModulation = 28 { +provisional client cluster PulseWidthModulation = 28 { readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -4630,7 +4630,7 @@ client cluster Thermostat = 513 { } /** An interface for controlling a fan in a heating/cooling system. */ -client cluster FanControl = 514 { +provisional client cluster FanControl = 514 { enum AirflowDirectionEnum : ENUM8 { kForward = 0; kReverse = 1; @@ -5041,7 +5041,7 @@ client cluster ColorControl = 768 { } /** Attributes and commands for configuring a lighting ballast. */ -client cluster BallastConfiguration = 769 { +provisional client cluster BallastConfiguration = 769 { bitmap BallastStatusBitmap : BITMAP8 { kBallastNonOperational = 0x1; kLampFailure = 0x2; @@ -6572,7 +6572,7 @@ client cluster ElectricalMeasurement = 2820 { } /** The Test Cluster is meant to validate the generated code */ -client cluster UnitTesting = 4294048773 { +internal client cluster UnitTesting = 4294048773 { enum SimpleEnum : ENUM8 { kUnspecified = 0; kValueA = 1; @@ -7018,7 +7018,7 @@ client cluster UnitTesting = 4294048773 { } /** The Fault Injection Cluster provide a means for a test harness to configure faults(for example triggering a fault in the system). */ -client cluster FaultInjection = 4294048774 { +internal client cluster FaultInjection = 4294048774 { enum FaultType : ENUM8 { kUnspecified = 0; kSystemFault = 1;