Skip to content

Commit c7b4965

Browse files
authoredMay 28, 2024
Remove provisional from evse, evse mode, epm, eem, power topology (#33558)
* XML file changes to remove apiMaturity="provisional" for clusters and features which are approved in Matter 1.3 * Removed stray text. * Updated after regen_all
1 parent 4dac536 commit c7b4965

File tree

8 files changed

+57
-57
lines changed

8 files changed

+57
-57
lines changed
 

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+5-5
Original file line numberDiff line numberDiff line change
@@ -3876,7 +3876,7 @@ cluster ValveConfigurationAndControl = 129 {
38763876
}
38773877

38783878
/** This cluster provides a mechanism for querying data about electrical power as measured by the server. */
3879-
provisional cluster ElectricalPowerMeasurement = 144 {
3879+
cluster ElectricalPowerMeasurement = 144 {
38803880
revision 1;
38813881

38823882
enum MeasurementTypeEnum : enum16 {
@@ -3981,7 +3981,7 @@ provisional cluster ElectricalPowerMeasurement = 144 {
39813981
}
39823982

39833983
/** This cluster provides a mechanism for querying data about the electrical energy imported or provided by the server. */
3984-
provisional cluster ElectricalEnergyMeasurement = 145 {
3984+
cluster ElectricalEnergyMeasurement = 145 {
39853985
revision 1;
39863986

39873987
enum MeasurementTypeEnum : enum16 {
@@ -4278,7 +4278,7 @@ provisional cluster DeviceEnergyManagement = 152 {
42784278
}
42794279

42804280
/** Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an interface to the functionality of Electric Vehicle Supply Equipment (EVSE) management. */
4281-
provisional cluster EnergyEvse = 153 {
4281+
cluster EnergyEvse = 153 {
42824282
revision 2;
42834283

42844284
enum EnergyTransferStoppedReasonEnum : enum8 {
@@ -4490,7 +4490,7 @@ provisional cluster EnergyPreference = 155 {
44904490
}
44914491

44924492
/** The Power Topology Cluster provides a mechanism for expressing how power is flowing between endpoints. */
4493-
provisional cluster PowerTopology = 156 {
4493+
cluster PowerTopology = 156 {
44944494
revision 1;
44954495

44964496
bitmap Feature : bitmap32 {
@@ -4511,7 +4511,7 @@ provisional cluster PowerTopology = 156 {
45114511
}
45124512

45134513
/** Attributes and commands for selecting a mode from a list of supported options. */
4514-
provisional cluster EnergyEvseMode = 157 {
4514+
cluster EnergyEvseMode = 157 {
45154515
revision 1;
45164516

45174517
enum ModeTag : enum16 {

‎examples/energy-management-app/energy-management-common/energy-management-app.matter

+5-5
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,7 @@ cluster GroupKeyManagement = 63 {
12371237
}
12381238

12391239
/** This cluster provides a mechanism for querying data about electrical power as measured by the server. */
1240-
provisional cluster ElectricalPowerMeasurement = 144 {
1240+
cluster ElectricalPowerMeasurement = 144 {
12411241
revision 1;
12421242

12431243
enum MeasurementTypeEnum : enum16 {
@@ -1342,7 +1342,7 @@ provisional cluster ElectricalPowerMeasurement = 144 {
13421342
}
13431343

13441344
/** This cluster provides a mechanism for querying data about the electrical energy imported or provided by the server. */
1345-
provisional cluster ElectricalEnergyMeasurement = 145 {
1345+
cluster ElectricalEnergyMeasurement = 145 {
13461346
revision 1;
13471347

13481348
enum MeasurementTypeEnum : enum16 {
@@ -1639,7 +1639,7 @@ provisional cluster DeviceEnergyManagement = 152 {
16391639
}
16401640

16411641
/** Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an interface to the functionality of Electric Vehicle Supply Equipment (EVSE) management. */
1642-
provisional cluster EnergyEvse = 153 {
1642+
cluster EnergyEvse = 153 {
16431643
revision 2;
16441644

16451645
enum EnergyTransferStoppedReasonEnum : enum8 {
@@ -1817,7 +1817,7 @@ provisional cluster EnergyEvse = 153 {
18171817
}
18181818

18191819
/** The Power Topology Cluster provides a mechanism for expressing how power is flowing between endpoints. */
1820-
provisional cluster PowerTopology = 156 {
1820+
cluster PowerTopology = 156 {
18211821
revision 1;
18221822

18231823
bitmap Feature : bitmap32 {
@@ -1838,7 +1838,7 @@ provisional cluster PowerTopology = 156 {
18381838
}
18391839

18401840
/** Attributes and commands for selecting a mode from a list of supported options. */
1841-
provisional cluster EnergyEvseMode = 157 {
1841+
cluster EnergyEvseMode = 157 {
18421842
revision 1;
18431843

18441844
enum ModeTag : enum16 {

‎src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616
-->
1717
<configurator>
1818
<domain name="CHIP"/>
19-
<cluster apiMaturity="provisional">
19+
<cluster>
2020
<name>Electrical Energy Measurement</name>
2121
<domain>Measurement &amp; Sensing</domain>
2222
<code>0x0091</code>
@@ -52,25 +52,25 @@ limitations under the License.
5252
<attribute code="0x0004" side="server" define="PERIODIC_ENERGY_EXPORTED" type="EnergyMeasurementStruct" isNullable="true" optional="true">PeriodicEnergyExported</attribute>
5353
<attribute code="0x0005" side="server" define="CUMULATIVE_ENERGY_RESET" type="CumulativeEnergyResetStruct" isNullable="true" optional="true">CumulativeEnergyReset</attribute>
5454
<!--Conformance feature EXPE & PERE - for now optional-->
55-
<event code="0x00" side="server" name="CumulativeEnergyMeasured" priority="info" apiMaturity="provisional" optional="true">
55+
<event code="0x00" side="server" name="CumulativeEnergyMeasured" priority="info" optional="true">
5656
<description>CumulativeEnergyMeasured</description>
5757
<field id="0" name="EnergyImported" type="EnergyMeasurementStruct" optional="true"/>
5858
<field id="1" name="EnergyExported" type="EnergyMeasurementStruct" optional="true"/>
5959
</event>
60-
<event code="0x01" side="server" name="PeriodicEnergyMeasured" priority="info" apiMaturity="provisional" optional="true">
60+
<event code="0x01" side="server" name="PeriodicEnergyMeasured" priority="info" optional="true">
6161
<description>PeriodicEnergyMeasured</description>
6262
<field id="0" name="EnergyImported" type="EnergyMeasurementStruct" optional="true"/>
6363
<field id="1" name="EnergyExported" type="EnergyMeasurementStruct" optional="true"/>
6464
</event>
6565
</cluster>
66-
<struct name="CumulativeEnergyResetStruct" apiMaturity="provisional">
66+
<struct name="CumulativeEnergyResetStruct">
6767
<cluster code="0x0091"/>
6868
<item fieldId="0" name="ImportedResetTimestamp" type="epoch_s" isNullable="true" optional="true"/>
6969
<item fieldId="1" name="ExportedResetTimestamp" type="epoch_s" isNullable="true" optional="true"/>
7070
<item fieldId="2" name="ImportedResetSystime" type="systime_ms" isNullable="true" optional="true"/>
7171
<item fieldId="3" name="ExportedResetSystime" type="systime_ms" isNullable="true" optional="true"/>
7272
</struct>
73-
<struct name="EnergyMeasurementStruct" apiMaturity="provisional">
73+
<struct name="EnergyMeasurementStruct">
7474
<cluster code="0x0091"/>
7575
<item fieldId="0" name="Energy" type="energy_mwh" min="0" max="4611686018427387904"/>
7676
<item fieldId="1" name="StartTimestamp" type="epoch_s" optional="true"/>

‎src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616
-->
1717
<configurator>
1818
<domain name="CHIP"/>
19-
<cluster apiMaturity="provisional">
19+
<cluster>
2020
<name>Electrical Power Measurement</name>
2121
<domain>Measurement &amp; Sensing</domain>
2222
<code>0x0090</code>
@@ -82,18 +82,18 @@ limitations under the License.
8282
<!--Conformance feature [POLY] - for now optional-->
8383
<attribute code="0x0011" side="server" define="POWER_FACTOR" type="int64s" isNullable="true" min="-10000" max="10000" optional="true">PowerFactor</attribute>
8484
<attribute code="0x0012" side="server" type="amperage_ma" define="NEUTRAL_CURRENT" isNullable="true" min="-4611686018427387904" max="4611686018427387904" optional="true">NeutralCurrent</attribute>
85-
<event code="0x00" side="server" name="MeasurementPeriodRanges" priority="info" apiMaturity="provisional" optional="true">
85+
<event code="0x00" side="server" name="MeasurementPeriodRanges" priority="info" optional="true">
8686
<description>MeasurementPeriodRanges</description>
8787
<field id="0" name="Ranges" array="true" type="MeasurementRangeStruct"/>
8888
</event>
8989
</cluster>
90-
<enum name="PowerModeEnum" type="enum8" apiMaturity="provisional">
90+
<enum name="PowerModeEnum" type="enum8">
9191
<cluster code="0x0090"/>
9292
<item name="Unknown" value="0x00"/>
9393
<item name="DC" value="0x01"/>
9494
<item name="AC" value="0x02"/>
9595
</enum>
96-
<struct name="MeasurementRangeStruct" apiMaturity="provisional">
96+
<struct name="MeasurementRangeStruct">
9797
<cluster code="0x0090"/>
9898
<item fieldId="0" name="MeasurementType" type="MeasurementTypeEnum" min="0x0000" max="0x000E"/>
9999
<item fieldId="1" name="Min" type="int64s" min="-4611686018427387904" max="4611686018427387904"/>
@@ -107,7 +107,7 @@ limitations under the License.
107107
<item fieldId="9" name="MinSystime" type="systime_ms" optional="true"/>
108108
<item fieldId="10" name="MaxSystime" type="systime_ms" optional="true"/>
109109
</struct>
110-
<struct name="HarmonicMeasurementStruct" apiMaturity="provisional">
110+
<struct name="HarmonicMeasurementStruct">
111111
<cluster code="0x0090"/>
112112
<item fieldId="0" name="Order" type="int8u" min="1" default="1"/>
113113
<item fieldId="1" name="Measurement" type="int64s" min="-4611686018427387904" max="4611686018427387904" isNullable="true"/>

‎src/app/zap-templates/zcl/data-model/chip/energy-evse-cluster.xml

+30-30
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ limitations under the License.
1414
<configurator>
1515
<domain name="Energy Management"/>
1616

17-
<enum name="StateEnum" type="enum8" apiMaturity="provisional">
17+
<enum name="StateEnum" type="enum8">
1818
<cluster code="0x0099"/>
1919
<item name="NotPluggedIn" value="0x00"/>
2020
<item name="PluggedInNoDemand" value="0x01"/>
@@ -25,7 +25,7 @@ limitations under the License.
2525
<item name="Fault" value="0x06"/>
2626
</enum>
2727

28-
<enum name="SupplyStateEnum" type="enum8" apiMaturity="provisional">
28+
<enum name="SupplyStateEnum" type="enum8">
2929
<cluster code="0x0099"/>
3030
<item name="Disabled" value="0x00"/>
3131
<item name="ChargingEnabled" value="0x01"/>
@@ -34,7 +34,7 @@ limitations under the License.
3434
<item name="DisabledDiagnostics" value="0x04"/>
3535
</enum>
3636

37-
<enum name="FaultStateEnum" type="enum8" apiMaturity="provisional">
37+
<enum name="FaultStateEnum" type="enum8">
3838
<cluster code="0x0099"/>
3939
<item name="NoError" value="0x00"/>
4040
<item name="MeterFailure" value="0x01"/>
@@ -55,7 +55,7 @@ limitations under the License.
5555
<item name="Other" value="0xFF"/>
5656
</enum>
5757

58-
<enum name="EnergyTransferStoppedReasonEnum" type="enum8" apiMaturity="provisional">
58+
<enum name="EnergyTransferStoppedReasonEnum" type="enum8">
5959
<cluster code="0x0099"/>
6060
<item name="EVStopped" value="0x00"/>
6161
<item name="EVSEStopped" value="0x01"/>
@@ -86,7 +86,7 @@ limitations under the License.
8686
<item fieldId="1" name="ChargingTargets" array="true" type="ChargingTargetStruct" length="10"/>
8787
</struct>
8888

89-
<cluster apiMaturity="provisional">
89+
<cluster>
9090
<name>Energy EVSE</name>
9191
<domain>Energy Management</domain>
9292
<code>0x0099</code>
@@ -177,7 +177,7 @@ limitations under the License.
177177
<command source="client" code="0x01" name="Disable" optional="false" mustUseTimedInvoke="true" apiMaturity="provisional">
178178
<description>Allows a client to disable the EVSE from charging and discharging.</description>
179179
</command>
180-
<command source="client" code="0x02" name="EnableCharging" optional="false" mustUseTimedInvoke="true" apiMaturity="provisional">
180+
<command source="client" code="0x02" name="EnableCharging" optional="false" mustUseTimedInvoke="true">
181181
<arg name="ChargingEnabledUntil" type="epoch_s" isNullable="true"/>
182182
<arg name="MinimumChargeCurrent" type="amperage_ma" min="0" max="80000"/>
183183
<arg name="MaximumChargeCurrent" type="amperage_ma" min="0" max="80000"/>
@@ -188,7 +188,7 @@ limitations under the License.
188188
<arg name="MaximumDischargeCurrent" type="amperage_ma" min="0" max="80000"/>
189189
<description>Allows a client to enable the EVSE to discharge an EV.</description>
190190
</command>
191-
<command source="client" code="0x04" name="StartDiagnostics" optional="true" mustUseTimedInvoke="true" apiMaturity="provisional">
191+
<command source="client" code="0x04" name="StartDiagnostics" optional="true" mustUseTimedInvoke="true">
192192
<description>Allows a client to put the EVSE into a self-diagnostics mode.</description>
193193
</command>
194194
<command source="client" code="0x05" name="SetTargets" optional="true" mustUseTimedInvoke="true" apiMaturity="provisional">
@@ -205,41 +205,41 @@ limitations under the License.
205205
<arg name="ChargingTargetSchedules" type="ChargingTargetScheduleStruct" array="true" length="7"/>
206206
<description>The GetTargetsResponse is sent in response to the GetTargets Command.</description>
207207
</command>
208-
<event side="server" code="0x00" name="EVConnected" priority="info" apiMaturity="provisional">
208+
<event side="server" code="0x00" name="EVConnected" priority="info">
209209
<description>EVConnected</description>
210-
<field id="0" name="SessionID" type="int32u" apiMaturity="provisional"/>
210+
<field id="0" name="SessionID" type="int32u"/>
211211
</event>
212-
<event side="server" code="0x01" name="EVNotDetected" priority="info" apiMaturity="provisional">
212+
<event side="server" code="0x01" name="EVNotDetected" priority="info">
213213
<description>EVNotDetected</description>
214-
<field id="0" name="SessionID" type="int32u" apiMaturity="provisional"/>
215-
<field id="1" name="State" type="StateEnum" apiMaturity="provisional" min="0x00" max="0x06"/>
216-
<field id="2" name="SessionDuration" type="elapsed_s" apiMaturity="provisional"/>
217-
<field id="3" name="SessionEnergyCharged" type="energy_mwh" min="0" apiMaturity="provisional"/>
214+
<field id="0" name="SessionID" type="int32u"/>
215+
<field id="1" name="State" type="StateEnum" min="0x00" max="0x06"/>
216+
<field id="2" name="SessionDuration" type="elapsed_s"/>
217+
<field id="3" name="SessionEnergyCharged" type="energy_mwh" min="0"/>
218218
<field id="4" name="SessionEnergyDischarged" type="energy_mwh" min="0" optional="true" apiMaturity="provisional"/>
219219
</event>
220-
<event side="server" code="0x02" name="EnergyTransferStarted" priority="info" apiMaturity="provisional">
220+
<event side="server" code="0x02" name="EnergyTransferStarted" priority="info">
221221
<description>EnergyTransferStarted</description>
222-
<field id="0" name="SessionID" type="int32u" apiMaturity="provisional"/>
223-
<field id="1" name="State" type="StateEnum" apiMaturity="provisional" min="0x00" max="0x06"/>
224-
<field id="2" name="MaximumCurrent" type="amperage_ma" min="0" max="80000" apiMaturity="provisional"/>
222+
<field id="0" name="SessionID" type="int32u"/>
223+
<field id="1" name="State" type="StateEnum" min="0x00" max="0x06"/>
224+
<field id="2" name="MaximumCurrent" type="amperage_ma" min="0" max="80000"/>
225225
</event>
226-
<event side="server" code="0x03" name="EnergyTransferStopped" priority="info" apiMaturity="provisional">
226+
<event side="server" code="0x03" name="EnergyTransferStopped" priority="info">
227227
<description>EnergyTransferStopped</description>
228-
<field id="0" name="SessionID" type="int32u" apiMaturity="provisional"/>
229-
<field id="1" name="State" type="StateEnum" apiMaturity="provisional" min="0x00" max="0x06"/>
230-
<field id="2" name="Reason" type="EnergyTransferStoppedReasonEnum" apiMaturity="provisional" min="0x00" max="0x02"/>
231-
<field id="4" name="EnergyTransferred" type="energy_mwh" min="0" apiMaturity="provisional"/>
228+
<field id="0" name="SessionID" type="int32u"/>
229+
<field id="1" name="State" type="StateEnum" min="0x00" max="0x06"/>
230+
<field id="2" name="Reason" type="EnergyTransferStoppedReasonEnum" min="0x00" max="0x02"/>
231+
<field id="4" name="EnergyTransferred" type="energy_mwh" min="0"/>
232232
</event>
233-
<event side="server" code="0x04" name="Fault" priority="critical" apiMaturity="provisional">
233+
<event side="server" code="0x04" name="Fault" priority="critical">
234234
<description>Fault</description>
235-
<field id="0" name="SessionID" type="int32u" isNullable="true" apiMaturity="provisional"/>
236-
<field id="1" name="State" type="StateEnum" apiMaturity="provisional" min="0x00" max="0x06"/>
237-
<field id="2" name="FaultStatePreviousState" type="FaultStateEnum" apiMaturity="provisional" min="0x00" max="0xFF"/>
238-
<field id="4" name="FaultStateCurrentState" type="FaultStateEnum" apiMaturity="provisional" min="0x00" max="0xFF"/>
235+
<field id="0" name="SessionID" type="int32u" isNullable="true"/>
236+
<field id="1" name="State" type="StateEnum" min="0x00" max="0x06"/>
237+
<field id="2" name="FaultStatePreviousState" type="FaultStateEnum" min="0x00" max="0xFF"/>
238+
<field id="4" name="FaultStateCurrentState" type="FaultStateEnum" min="0x00" max="0xFF"/>
239239
</event>
240-
<event side="server" code="0x05" name="RFID" priority="info" apiMaturity="provisional" optional="true">
240+
<event side="server" code="0x05" name="RFID" priority="info" optional="true">
241241
<description>RFID</description>
242-
<field id="0" name="UID" type="octet_string" length="10" apiMaturity="provisional"/>
242+
<field id="0" name="UID" type="octet_string" length="10"/>
243243
</event>
244244
</cluster>
245245

‎src/app/zap-templates/zcl/data-model/chip/energy-evse-mode-cluster.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ limitations under the License.
2424
<item value="0x4002" name="SolarCharging"/>
2525
</enum>
2626

27-
<cluster apiMaturity="provisional">
27+
<cluster>
2828
<domain>General</domain>
2929
<name>Energy EVSE Mode</name>
3030
<code>0x009D</code>

‎src/app/zap-templates/zcl/data-model/chip/power-topology-cluster.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
<configurator>
1818
<domain name="Measurement &amp; Sensing"/>
1919

20-
<cluster code="0x009C" apiMaturity="provisional">
20+
<cluster code="0x009C">
2121
<domain>Measurement &amp; Sensing</domain>
2222
<name>Power Topology</name>
2323
<code>0x009C</code>

‎src/controller/data_model/controller-clusters.matter

+5-5
Original file line numberDiff line numberDiff line change
@@ -4112,7 +4112,7 @@ cluster ValveConfigurationAndControl = 129 {
41124112
}
41134113

41144114
/** This cluster provides a mechanism for querying data about electrical power as measured by the server. */
4115-
provisional cluster ElectricalPowerMeasurement = 144 {
4115+
cluster ElectricalPowerMeasurement = 144 {
41164116
revision 1;
41174117

41184118
enum MeasurementTypeEnum : enum16 {
@@ -4217,7 +4217,7 @@ provisional cluster ElectricalPowerMeasurement = 144 {
42174217
}
42184218

42194219
/** This cluster provides a mechanism for querying data about the electrical energy imported or provided by the server. */
4220-
provisional cluster ElectricalEnergyMeasurement = 145 {
4220+
cluster ElectricalEnergyMeasurement = 145 {
42214221
revision 1;
42224222

42234223
enum MeasurementTypeEnum : enum16 {
@@ -4803,7 +4803,7 @@ provisional cluster DeviceEnergyManagement = 152 {
48034803
}
48044804

48054805
/** Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an interface to the functionality of Electric Vehicle Supply Equipment (EVSE) management. */
4806-
provisional cluster EnergyEvse = 153 {
4806+
cluster EnergyEvse = 153 {
48074807
revision 2;
48084808

48094809
enum EnergyTransferStoppedReasonEnum : enum8 {
@@ -5015,7 +5015,7 @@ provisional cluster EnergyPreference = 155 {
50155015
}
50165016

50175017
/** The Power Topology Cluster provides a mechanism for expressing how power is flowing between endpoints. */
5018-
provisional cluster PowerTopology = 156 {
5018+
cluster PowerTopology = 156 {
50195019
revision 1;
50205020

50215021
bitmap Feature : bitmap32 {
@@ -5036,7 +5036,7 @@ provisional cluster PowerTopology = 156 {
50365036
}
50375037

50385038
/** Attributes and commands for selecting a mode from a list of supported options. */
5039-
provisional cluster EnergyEvseMode = 157 {
5039+
cluster EnergyEvseMode = 157 {
50405040
revision 1;
50415041

50425042
enum ModeTag : enum16 {

0 commit comments

Comments
 (0)