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

Jump to bottom

Add provisional and internal markers cluster-wide #29765

Merged
merged 10 commits into from
Oct 18, 2023
Merged

Add provisional and internal markers cluster-wide #29765

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8ed08cc
Update cluster data with api maturity
andreilitvin Oct 13, 2023
30741d6
Pull in latest zap that supports api maturity
andreilitvin Oct 13, 2023
2c260b2
mark scenes provisional, mark unit testing and fault injection as int…
andreilitvin Oct 13, 2023
bd3e062
Mark more clusters as provisional
andreilitvin Oct 13, 2023
eae5a12
Merge branch 'master' into cluster_provisional_internal
andy31415 Oct 16, 2023
8cc73de
Undo domain move
andy31415 Oct 16, 2023
6a7ad8c
Undo submodule change
andy31415 Oct 16, 2023
b27c782
make the scenes domain identical with how it was
andy31415 Oct 16, 2023
6b9beaf
Merge branch 'master' into cluster_provisional_internal
andreilitvin Oct 17, 2023
a1b7294
Restyle
andreilitvin Oct 17, 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
10 changes: 5 additions & 5 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 @@ -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;
Expand Down Expand Up @@ -4186,7 +4186,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;
Expand Down Expand Up @@ -4577,7 +4577,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;
Expand Down Expand Up @@ -5791,7 +5791,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;
Expand Down Expand Up @@ -6113,7 +6113,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;
Expand Down
8 changes: 4 additions & 4 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...irpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/lighting-common/lighting-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/silabs/data_model/lighting-thread-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app1/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app2/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions scripts/setup/zap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"mac-amd64",
"windows-amd64"
],
"tags": ["version:[email protected].09-nightly.1"]
"tags": ["version:[email protected].13-nightly.1"]
},
{
"_comment": "Always get the amd64 version on mac until usable arm64 zap build is available",
"path": "fuchsia/third_party/zap/mac-amd64",
"platforms": ["mac-arm64"],
"tags": ["version:[email protected].09-nightly.1"]
"tags": ["version:[email protected].13-nightly.1"]
}
]
}
1 change: 1 addition & 0 deletions src/app/zap-templates/partials/idl/cluster_definition.zapt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** {{description}} */
{{#if apiMaturity}}{{apiMaturity}} {{/if~}}
{{#if generateClientCluster}}client {{else}}server {{/if~}}
cluster {{asUpperCamelCase name}} = {{!}}
{{~#if manufacturerCode}}
Expand Down
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ limitations under the License.
<field name="LampBurnHours" mask="0x01"/>
</bitmap>

<cluster>
<cluster apiMaturity="provisional">
<name>Ballast Configuration</name>
<domain>Lighting</domain>
<description>Attributes and commands for configuring a lighting ballast.</description>
Expand Down
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ limitations under the License.
<item name="Reverse" value="0x01"/>
</enum>

<cluster>
<cluster apiMaturity="provisional">
<name>Fan Control</name>
<domain>HVAC</domain>
<description>An interface for controlling a fan in a heating/cooling system.</description>
Expand Down
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/data-model/chip/fault-injection-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ limitations under the License.
<item name="ChipFault" value="0x03"/>
<item name="CertFault" value="0x04"/>
</enum>
<cluster>
<cluster apiMaturity="internal">
<domain>CHIP</domain>
<name>Fault Injection</name>
<code>0xFFF1FC06</code>
Expand Down
4 changes: 2 additions & 2 deletions 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,11 +17,11 @@ limitations under the License.
<configurator>
<domain name="CHIP" />

<cluster>
<cluster apiMaturity="provisional">
<domain>General</domain>
<name>Pulse Width Modulation</name>
<code>0x001c</code>
<define>PWM_CLUSTER</define>
<description>Cluster to control pulse width modulation</description>
</cluster>
</configurator>
</configurator>
4 changes: 2 additions & 2 deletions src/app/zap-templates/zcl/data-model/chip/scene.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ limitations under the License.
<item name="AttributeValueList" type="AttributeValuePair" array="true"/>
</struct>

<domain name="CHIP"/>
<cluster>
<cluster apiMaturity="provisional">
<domain>CHIP</domain>
andy31415 marked this conversation as resolved.
Show resolved Hide resolved
<name>Scenes</name>
<domain>General</domain>
<description>Attributes and commands for scene configuration and manipulation.</description>
Expand Down
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/data-model/chip/test-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ limitations under the License.
<field mask="0x4000000000000000" name="MaskVal4" />
</bitmap>

<cluster>
<cluster apiMaturity="internal">
<domain>CHIP</domain>
<name>Unit Testing</name>
<code>0xFFF1FC05</code>
Expand Down
12 changes: 6 additions & 6 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 @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading