Skip to content

Commit eb2b62a

Browse files
cecillececille
authored
DM XMLs 1.5: Update to latest spec changes (project-chip#41847)
* DM XMLs 1.5: Update to latest spec changes * Update to tag * Add 1.5 to diff script
1 parent eeb36ee commit eb2b62a

27 files changed

+54
-257
lines changed

‎data_model/1.5/clusters/CameraAVSettingsUserLevelManagement.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ Davis, CA 95616, USA
6262
<revision revision="1" summary="Initial release"/>
6363
</revisionHistory>
6464
<clusterIds>
65-
<clusterId id="0x0552" name="Camera AV Settings User Level Management">
66-
<provisionalConform/>
67-
</clusterId>
65+
<clusterId id="0x0552" name="Camera AV Settings User Level Management"/>
6866
</clusterIds>
6967
<classification hierarchy="base" role="application" picsCode="AVSUM" scope="Endpoint"/>
7068
<features>

‎data_model/1.5/clusters/CameraAVStreamManagement.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ Davis, CA 95616, USA
6262
<revision revision="1" summary="Initial release"/>
6363
</revisionHistory>
6464
<clusterIds>
65-
<clusterId id="0x0551" name="Camera AV Stream Management">
66-
<provisionalConform/>
67-
</clusterId>
65+
<clusterId id="0x0551" name="Camera AV Stream Management"/>
6866
</clusterIds>
6967
<classification hierarchy="base" role="application" picsCode="AVSM" scope="Endpoint"/>
7068
<features>
@@ -631,14 +629,14 @@ Davis, CA 95616, USA
631629
</attribute>
632630
<attribute id="0x0013" name="SoftRecordingPrivacyModeEnabled" type="bool">
633631
<access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
634-
<quality persistence="nonVolatile" sourceAttribution="true"/>
632+
<quality persistence="nonVolatile"/>
635633
<mandatoryConform>
636634
<feature name="PRIV"/>
637635
</mandatoryConform>
638636
</attribute>
639637
<attribute id="0x0014" name="SoftLivestreamPrivacyModeEnabled" type="bool">
640638
<access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
641-
<quality persistence="nonVolatile" sourceAttribution="true"/>
639+
<quality persistence="nonVolatile"/>
642640
<mandatoryConform>
643641
<feature name="PRIV"/>
644642
</mandatoryConform>

‎data_model/1.5/clusters/Chime.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ Davis, CA 95616, USA
6262
<revision revision="1" summary="Initial release"/>
6363
</revisionHistory>
6464
<clusterIds>
65-
<clusterId id="0x0556" name="Chime">
66-
<provisionalConform/>
67-
</clusterId>
65+
<clusterId id="0x0556" name="Chime"/>
6866
</clusterIds>
6967
<classification hierarchy="base" role="application" picsCode="CHIME" scope="Endpoint"/>
7068
<dataTypes>

‎data_model/1.5/clusters/ClosureControl.xml‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ Davis, CA 95616, USA
6262
<revision revision="1" summary="Initial revision"/>
6363
</revisionHistory>
6464
<clusterIds>
65-
<clusterId id="0x0104" name="Closure Control">
66-
<provisionalConform/>
67-
</clusterId>
65+
<clusterId id="0x0104" name="Closure Control"/>
6866
</clusterIds>
6967
<classification hierarchy="base" role="application" picsCode="CLCTRL" scope="Endpoint"/>
7068
<features>
@@ -108,12 +106,6 @@ Davis, CA 95616, USA
108106
<feature bit="8" code="MO" name="ManuallyOperable" summary="Supports the manual operation feature">
109107
<optionalConform/>
110108
</feature>
111-
<feature bit="9" code="ACC" name="Access" summary="The closure can grant access to a secured building or restricted area">
112-
<otherwiseConform>
113-
<provisionalConform/>
114-
<optionalConform/>
115-
</otherwiseConform>
116-
</feature>
117109
</features>
118110
<dataTypes>
119111
<enum name="ClosureErrorEnum">
@@ -354,29 +346,6 @@ Davis, CA 95616, USA
354346
<feature name="CL"/>
355347
</mandatoryConform>
356348
</command>
357-
<command id="0x03" name="GroupedMoveTo" direction="commandToServer" response="Y">
358-
<access invokePrivilege="operate"/>
359-
<otherwiseConform>
360-
<provisionalConform/>
361-
<mandatoryConform>
362-
<notTerm>
363-
<feature name="ACC"/>
364-
</notTerm>
365-
</mandatoryConform>
366-
</otherwiseConform>
367-
<field id="0" name="Position" type="TargetPositionEnum" default="desc">
368-
<optionalConform choice="a" more="true" min="1"/>
369-
</field>
370-
<field id="1" name="Latch" type="bool" default="desc">
371-
<optionalConform choice="a" more="true" min="1"/>
372-
</field>
373-
<field id="2" name="Speed" type="ThreeLevelAutoEnum">
374-
<default>
375-
<enum default="Auto"/>
376-
</default>
377-
<optionalConform choice="a" more="true" min="1"/>
378-
</field>
379-
</command>
380349
</commands>
381350
<events>
382351
<event id="0x00" name="OperationalError" priority="critical">

‎data_model/1.5/clusters/ClosureDimension.xml‎

Lines changed: 1 addition & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ Davis, CA 95616, USA
6262
<revision revision="1" summary="Initial revision"/>
6363
</revisionHistory>
6464
<clusterIds>
65-
<clusterId id="0x0105" name="Closure Dimension">
66-
<provisionalConform/>
67-
</clusterId>
65+
<clusterId id="0x0105" name="Closure Dimension"/>
6866
</clusterIds>
6967
<classification hierarchy="base" role="application" picsCode="CLDIM" scope="Endpoint"/>
7068
<features>
@@ -104,12 +102,6 @@ Davis, CA 95616, USA
104102
<feature name="PS"/>
105103
</optionalConform>
106104
</feature>
107-
<feature bit="8" code="ACC" name="Access" summary="The closure can grant access to a secured building or restricted area">
108-
<otherwiseConform>
109-
<provisionalConform/>
110-
<optionalConform/>
111-
</otherwiseConform>
112-
</feature>
113105
</features>
114106
<dataTypes>
115107
<enum name="ClosureUnitEnum">
@@ -468,60 +460,5 @@ Davis, CA 95616, USA
468460
</constraint>
469461
</field>
470462
</command>
471-
<command id="0x02" name="GroupedSetTarget" direction="commandToServer" response="Y">
472-
<access invokePrivilege="operate"/>
473-
<otherwiseConform>
474-
<provisionalConform/>
475-
<mandatoryConform>
476-
<notTerm>
477-
<feature name="ACC"/>
478-
</notTerm>
479-
</mandatoryConform>
480-
</otherwiseConform>
481-
<field id="0" name="Position" type="percent100ths" default="desc">
482-
<optionalConform choice="a" more="true" min="1"/>
483-
</field>
484-
<field id="1" name="Latch" type="bool" default="desc">
485-
<optionalConform choice="a" more="true" min="1"/>
486-
</field>
487-
<field id="2" name="Speed" type="ThreeLevelAutoEnum">
488-
<default>
489-
<enum default="Auto"/>
490-
</default>
491-
<optionalConform choice="a" more="true" min="1"/>
492-
</field>
493-
</command>
494-
<command id="0x03" name="GroupedStep" direction="commandToServer" response="Y">
495-
<access invokePrivilege="operate"/>
496-
<otherwiseConform>
497-
<provisionalConform/>
498-
<mandatoryConform>
499-
<andTerm>
500-
<feature name="PS"/>
501-
<notTerm>
502-
<feature name="ACC"/>
503-
</notTerm>
504-
</andTerm>
505-
</mandatoryConform>
506-
</otherwiseConform>
507-
<field id="0" name="Direction" type="StepDirectionEnum">
508-
<mandatoryConform/>
509-
</field>
510-
<field id="1" name="NumberOfSteps" type="uint16">
511-
<mandatoryConform/>
512-
<constraint>
513-
<min value="1"/>
514-
</constraint>
515-
</field>
516-
<field id="2" name="Speed" type="ThreeLevelAutoEnum">
517-
<default>
518-
<enum default="Auto"/>
519-
</default>
520-
<optionalConform/>
521-
<constraint>
522-
<desc/>
523-
</constraint>
524-
</field>
525-
</command>
526463
</commands>
527464
</cluster>

‎data_model/1.5/clusters/CommodityPrice.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ Davis, CA 95616, USA
6565
<revision revision="4" summary="Initial Matter revision"/>
6666
</revisionHistory>
6767
<clusterIds>
68-
<clusterId id="0x0095" name="Commodity Price">
69-
<provisionalConform/>
70-
</clusterId>
68+
<clusterId id="0x0095" name="Commodity Price"/>
7169
</clusterIds>
7270
<classification hierarchy="base" role="application" picsCode="SEPR" scope="Endpoint"/>
7371
<features>

‎data_model/1.5/clusters/ElectricalGridConditions.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ Davis, CA 95616, USA
6262
<revision revision="1" summary="Initial Matter revision"/>
6363
</revisionHistory>
6464
<clusterIds>
65-
<clusterId id="0x00A0" name="Electrical Grid Conditions">
66-
<provisionalConform/>
67-
</clusterId>
65+
<clusterId id="0x00A0" name="Electrical Grid Conditions"/>
6866
</clusterIds>
6967
<classification hierarchy="base" role="application" picsCode="EGC" scope="Endpoint"/>
7068
<features>

‎data_model/1.5/clusters/MeterIdentification.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ Davis, CA 95616, USA
6262
<revision revision="1" summary="Initial version"/>
6363
</revisionHistory>
6464
<clusterIds>
65-
<clusterId id="0x0B06" name="Meter Identification">
66-
<provisionalConform/>
67-
</clusterId>
65+
<clusterId id="0x0B06" name="Meter Identification"/>
6866
</clusterIds>
6967
<classification hierarchy="base" role="application" picsCode="MTRID" scope="Endpoint"/>
7068
<features>

‎data_model/1.5/clusters/Mode_RVCClean.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,13 @@ Davis, CA 95616, USA
5757
5858
:xrefstyle: basic
5959
-->
60-
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0055" name="RVC Clean Mode Cluster" revision="4">
60+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0055" name="RVC Clean Mode Cluster" revision="5">
6161
<revisionHistory>
6262
<revision revision="1" summary="Initial revision"/>
6363
<revision revision="2" summary="Add constraint about changing cleaning modes while the RVC Run Mode cluster is in a non-Idle mode. ChangeToModeResponse command: StatusText must be provided for InvalidInMode status. Deprecate the OnMode attribute and the related feature map bit."/>
6464
<revision revision="3" summary="Remove constraint on changing cleaning modes while the RVC Run Mode cluster is in a non-Idle mode. Continue to allow InvalidInMode response for devices that do not support such mode changes."/>
6565
<revision revision="4" summary="Add Vacuum then Mop cleaning mode"/>
66+
<revision revision="5" summary="DirectModeChange made non-provisional"/>
6667
</revisionHistory>
6768
<clusterIds>
6869
<clusterId id="0x0055" name="RVC Clean Mode"/>
@@ -73,10 +74,7 @@ Davis, CA 95616, USA
7374
<disallowConform/>
7475
</feature>
7576
<feature bit="20" code="DIRECTMODECH" name="DirectModeChange" summary="Cluster supports changing clean modes from non-Idle states">
76-
<otherwiseConform>
77-
<provisionalConform/>
78-
<optionalConform/>
79-
</otherwiseConform>
77+
<optionalConform/>
8078
</feature>
8179
</features>
8280
<dataTypes>

‎data_model/1.5/clusters/Mode_RVCRun.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,12 @@ Davis, CA 95616, USA
5757
5858
:xrefstyle: basic
5959
-->
60-
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0054" name="RVC Run Mode Cluster" revision="3">
60+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0054" name="RVC Run Mode Cluster" revision="4">
6161
<revisionHistory>
6262
<revision revision="1" summary="Initial revision"/>
6363
<revision revision="2" summary="Add constraint about switching from non-Idle to non-Idle modes. ChangeToModeResponse command: StatusText must be provided for InvalidInMode status. Deprecate the OnMode attribute and the related feature map bit. Add the Mapping mode tag."/>
6464
<revision revision="3" summary="Remove constraint on changing cleaning modes while the RVC Run Mode cluster is in a non-Idle mode. Continue to allow InvalidInMode response for devices that do not support such mode changes."/>
65+
<revision revision="4" summary="DirectModeChange made non-provisional"/>
6566
</revisionHistory>
6667
<clusterIds>
6768
<clusterId id="0x0054" name="RVC Run Mode"/>
@@ -72,10 +73,7 @@ Davis, CA 95616, USA
7273
<disallowConform/>
7374
</feature>
7475
<feature bit="20" code="DIRECTMODECH" name="DirectModeChange" summary="Cluster supports changing run modes from non-Idle states">
75-
<otherwiseConform>
76-
<provisionalConform/>
77-
<optionalConform/>
78-
</otherwiseConform>
76+
<optionalConform/>
7977
</feature>
8078
</features>
8179
<dataTypes>

0 commit comments

Comments
 (0)