Skip to content

Commit d7abcbf

Browse files
cecillececille
authored
DM XMLs 1.4 tag (#36153)
* DM XMLs 1.4 tag * Update to master
1 parent 79c1cf5 commit d7abcbf

27 files changed

+53
-88
lines changed

‎data_model/1.4/clusters/DeviceEnergyManagement.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ Davis, CA 95616, USA
6565
<revision revision="4" summary="Updates to feature conformance. Corrected ForecastID type"/>
6666
</revisionHistory>
6767
<clusterIds>
68-
<clusterId id="0x0098" name="Device Energy Management">
69-
<provisionalConform/>
70-
</clusterId>
68+
<clusterId id="0x0098" name="Device Energy Management"/>
7169
</clusterIds>
7270
<classification hierarchy="base" role="application" picsCode="DEM" scope="Endpoint"/>
7371
<features>
@@ -566,7 +564,6 @@ Davis, CA 95616, USA
566564
</field>
567565
<field id="1" name="Cause" type="AdjustmentCauseEnum">
568566
<mandatoryConform/>
569-
<constraint type="desc"/>
570567
</field>
571568
</command>
572569
<command id="0x03" name="PauseRequest" direction="commandToServer" response="Y">
@@ -580,7 +577,6 @@ Davis, CA 95616, USA
580577
</field>
581578
<field id="1" name="Cause" type="AdjustmentCauseEnum">
582579
<mandatoryConform/>
583-
<constraint type="desc"/>
584580
</field>
585581
</command>
586582
<command id="0x04" name="ResumeRequest" direction="commandToServer" response="Y">
@@ -604,7 +600,6 @@ Davis, CA 95616, USA
604600
</field>
605601
<field id="2" name="Cause" type="AdjustmentCauseEnum">
606602
<mandatoryConform/>
607-
<constraint type="desc"/>
608603
</field>
609604
</command>
610605
<command id="0x06" name="RequestConstraintBasedForecast" direction="commandToServer" response="Y">
@@ -619,7 +614,6 @@ Davis, CA 95616, USA
619614
</field>
620615
<field id="1" name="Cause" type="AdjustmentCauseEnum">
621616
<mandatoryConform/>
622-
<constraint type="desc"/>
623617
</field>
624618
</command>
625619
<command id="0x07" name="CancelRequest" direction="commandToServer" response="Y">

‎data_model/1.4/clusters/DiagnosticsGeneral.xml

-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ Davis, CA 95616, USA
263263
<mandatoryConform/>
264264
</attribute>
265265
<attribute id="0x0009" name="DoNotUse">
266-
<access read="true" readPrivilege="view"/>
267266
<disallowConform/>
268267
</attribute>
269268
</attributes>

‎data_model/1.4/clusters/DiagnosticsThread.xml

+8-2
Original file line numberDiff line numberDiff line change
@@ -669,12 +669,18 @@ Davis, CA 95616, USA
669669
<attribute id="0x003F" name="ExtAddress" type="uint64">
670670
<access read="true" readPrivilege="view"/>
671671
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
672-
<mandatoryConform/>
672+
<otherwiseConform>
673+
<provisionalConform/>
674+
<mandatoryConform/>
675+
</otherwiseConform>
673676
</attribute>
674677
<attribute id="0x0040" name="Rloc16" type="uint16">
675678
<access read="true" readPrivilege="view"/>
676679
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
677-
<mandatoryConform/>
680+
<otherwiseConform>
681+
<provisionalConform/>
682+
<mandatoryConform/>
683+
</otherwiseConform>
678684
</attribute>
679685
</attributes>
680686
<commands>

‎data_model/1.4/clusters/DoorLock.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Davis, CA 95616, USA
6666
<revision revision="5" summary="CCB 3472 3474 3338"/>
6767
<revision revision="6" summary="New data model format and notation. Added User features. General cleanup of functionality"/>
6868
<revision revision="7" summary="Added support for European door locks (unbolt feature)"/>
69-
<revision revision="8" summary="Removed LOG feature, fixed constraints on NumberOf*Schedules attributes.
69+
<revision revision="8" summary="Removed LOG and NOT feature, fixed constraints on NumberOf*Schedules attributes.
7070
and added support for Aliro credential provisioning"/>
7171
</revisionHistory>
7272
<clusterIds>
@@ -600,9 +600,6 @@ Davis, CA 95616, USA
600600
<bitfield name="LockFactoryReset" bit="1" summary="Lock Reset to Factory Defaults">
601601
<optionalConform/>
602602
</bitfield>
603-
<bitfield name="N/A" bit="2" summary="Reserved">
604-
<optionalConform/>
605-
</bitfield>
606603
<bitfield name="LockRadioPowerCycled" bit="3" summary="RF Module Power Cycled">
607604
<optionalConform/>
608605
</bitfield>

‎data_model/1.4/clusters/bridge-clusters-EcosystemInformationCluster.xml ‎data_model/1.4/clusters/EcosystemInformationCluster.xml

File renamed without changes.

‎data_model/1.4/clusters/EnergyEVSE.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ Davis, CA 95616, USA
6969
<classification hierarchy="base" role="application" picsCode="EEVSE" scope="Endpoint"/>
7070
<features>
7171
<feature bit="0" code="PREF" name="ChargingPreferences" summary="EVSE supports storing user charging preferences">
72-
<otherwiseConform>
73-
<provisionalConform/>
74-
<mandatoryConform/>
75-
</otherwiseConform>
72+
<mandatoryConform/>
7673
</feature>
7774
<feature bit="1" code="SOC" name="SoCReporting" summary="EVSE supports reporting of vehicle State of Charge (SoC)">
7875
<otherwiseConform>
@@ -240,7 +237,6 @@ Davis, CA 95616, USA
240237
<struct name="ChargingTargetScheduleStruct">
241238
<field id="0" name="DayOfWeekForSequence" type="TargetDayOfWeekBitmap">
242239
<mandatoryConform/>
243-
<constraint type="desc"/>
244240
</field>
245241
<field id="1" name="ChargingTargets" type="list">
246242
<entry type="ChargingTargetStruct"/>

‎data_model/1.4/clusters/ICDManagement.xml

+10-24
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ Davis, CA 95616, USA
7070
<features>
7171
<feature bit="0" code="CIP" name="CheckInProtocolSupport" summary="Device supports attributes and commands for the Check-In Protocol support.">
7272
<otherwiseConform>
73-
<provisionalConform/>
7473
<mandatoryConform>
7574
<feature name="LITS"/>
7675
</mandatoryConform>
@@ -79,26 +78,19 @@ Davis, CA 95616, USA
7978
</feature>
8079
<feature bit="1" code="UAT" name="UserActiveModeTrigger" summary="Device supports the user active mode trigger feature.">
8180
<otherwiseConform>
82-
<provisionalConform/>
8381
<mandatoryConform>
8482
<feature name="LITS"/>
8583
</mandatoryConform>
8684
<optionalConform/>
8785
</otherwiseConform>
8886
</feature>
8987
<feature bit="2" code="LITS" name="LongIdleTimeSupport" summary="Device supports operating as a Long Idle Time ICD.">
90-
<otherwiseConform>
91-
<provisionalConform/>
92-
<optionalConform/>
93-
</otherwiseConform>
88+
<optionalConform/>
9489
</feature>
9590
<feature bit="3" code="DSLS" name="DynamicSitLitSupport" summary="Device supports dynamic switching from SIT to LIT operating modes.">
96-
<otherwiseConform>
97-
<provisionalConform/>
98-
<optionalConform>
99-
<feature name="LITS"/>
100-
</optionalConform>
101-
</otherwiseConform>
91+
<optionalConform>
92+
<feature name="LITS"/>
93+
</optionalConform>
10294
</feature>
10395
</features>
10496
<dataTypes>
@@ -227,12 +219,9 @@ Davis, CA 95616, USA
227219
<attribute id="0x0006" name="UserActiveModeTriggerHint" type="UserActiveModeTriggerBitmap" default="0">
228220
<access read="true" readPrivilege="view"/>
229221
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
230-
<otherwiseConform>
231-
<provisionalConform/>
232-
<mandatoryConform>
233-
<feature name="UAT"/>
234-
</mandatoryConform>
235-
</otherwiseConform>
222+
<mandatoryConform>
223+
<feature name="UAT"/>
224+
</mandatoryConform>
236225
<constraint type="desc"/>
237226
</attribute>
238227
<attribute id="0x0007" name="UserActiveModeTriggerInstruction" type="string" default="&quot;">
@@ -242,12 +231,9 @@ Davis, CA 95616, USA
242231
</attribute>
243232
<attribute id="0x0008" name="OperatingMode" type="OperatingModeEnum">
244233
<access read="true" readPrivilege="view"/>
245-
<otherwiseConform>
246-
<provisionalConform/>
247-
<mandatoryConform>
248-
<feature name="LITS"/>
249-
</mandatoryConform>
250-
</otherwiseConform>
234+
<mandatoryConform>
235+
<feature name="LITS"/>
236+
</mandatoryConform>
251237
</attribute>
252238
<attribute id="0x0009" name="MaximumCheckInBackoff" type="uint32" default="1">
253239
<access read="true" readPrivilege="view"/>

‎data_model/1.4/clusters/LevelControl.xml

-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ Davis, CA 95616, USA
165165
<mandatoryConform>
166166
<feature name="FQ"/>
167167
</mandatoryConform>
168-
<constraint type="max" value="MaxFrequency"/>
169168
</attribute>
170169
<attribute id="0x0006" name="MaxFrequency" type="uint16" default="0">
171170
<access read="true" readPrivilege="view"/>

‎data_model/1.4/clusters/Mode_DeviceEnergyManagement.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ Davis, CA 95616, USA
6363
<revision revision="2" summary="Disallowed DEPONOFF feature and OnMode and StartUpMode attributes"/>
6464
</revisionHistory>
6565
<clusterIds>
66-
<clusterId id="0x009F" name="Device Energy Management Mode">
67-
<provisionalConform/>
68-
</clusterId>
66+
<clusterId id="0x009F" name="Device Energy Management Mode"/>
6967
</clusterIds>
7068
<classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="DEMM" scope="Endpoint"/>
7169
<features>

‎data_model/1.4/clusters/Mode_Dishwasher.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,11 @@ 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="0x0059" name="Dishwasher Mode Cluster" revision="2">
60+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0059" name="Dishwasher Mode Cluster" revision="3">
6161
<revisionHistory>
6262
<revision revision="1" summary="Initial revision"/>
6363
<revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
64+
<revision revision="3" summary="Set OnOff feature as disallowed (previously a Device Type override), Set StartUpMode and OnMode as disallowed (previously provisional)"/>
6465
</revisionHistory>
6566
<clusterIds>
6667
<clusterId id="0x0059" name="Dishwasher Mode"/>

‎data_model/1.4/clusters/Mode_EVSE.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Davis, CA 95616, USA
6060
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009D" name="Energy EVSE Mode Cluster" revision="2">
6161
<revisionHistory>
6262
<revision revision="1" summary="Initial revision"/>
63-
<revision revision="2" summary="Disallowed OnMode and StartUpMode attributes"/>
63+
<revision revision="2" summary="Disallowed DEPONOFF feature and OnMode and StartUpMode attributes"/>
6464
</revisionHistory>
6565
<clusterIds>
6666
<clusterId id="0x009D" name="Energy EVSE Mode"/>

‎data_model/1.4/clusters/Mode_LaundryWasher.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,11 @@ 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="0x0051" name="Laundry Washer Mode Cluster" revision="2">
60+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0051" name="Laundry Washer Mode Cluster" revision="3">
6161
<revisionHistory>
6262
<revision revision="1" summary="Initial revision"/>
6363
<revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
64+
<revision revision="3" summary="Set OnOff feature, StartUpMode, and OnMode as disallowed (previously a Device Type override)"/>
6465
</revisionHistory>
6566
<clusterIds>
6667
<clusterId id="0x0051" name="Laundry Washer Mode"/>

‎data_model/1.4/clusters/Mode_MicrowaveOven.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ 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="0x005E" name="Microwave Oven Mode Cluster" revision="1">
60+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005E" name="Microwave Oven Mode Cluster" revision="2">
6161
<revisionHistory>
6262
<revision revision="1" summary="Initial revision"/>
63+
<revision revision="2" summary="Set OnOff feature as disallowed"/>
6364
</revisionHistory>
6465
<clusterIds>
6566
<clusterId id="0x005E" name="Microwave Oven Mode"/>

‎data_model/1.4/clusters/Mode_Oven.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ 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="0x0049" name="Oven Mode Cluster" revision="1">
60+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0049" name="Oven Mode Cluster" revision="2">
6161
<revisionHistory>
6262
<revision revision="1" summary="Initial revision"/>
63+
<revision revision="2" summary="Set OnOff feature, StartUpMode, and OnMode as disallowed (previously a Device Type override)"/>
6364
</revisionHistory>
6465
<clusterIds>
6566
<clusterId id="0x0049" name="Oven Mode"/>

‎data_model/1.4/clusters/Mode_Refrigerator.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,11 @@ 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="0x0052" name="Refrigerator And Temperature Controlled Cabinet Mode Cluster" revision="2">
60+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0052" name="Refrigerator And Temperature Controlled Cabinet Mode Cluster" revision="3">
6161
<revisionHistory>
6262
<revision revision="1" summary="Initial revision"/>
6363
<revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
64+
<revision revision="3" summary="Set OnOff feature, StartUpMode, and OnMode as disallowed (previously a Device Type override)"/>
6465
</revisionHistory>
6566
<clusterIds>
6667
<clusterId id="0x0052" name="Refrigerator And Temperature Controlled Cabinet Mode"/>

‎data_model/1.4/clusters/OccupancySensing.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ Davis, CA 95616, USA
173173
</otherwiseConform>
174174
<constraint type="between" from="0" to="7"/>
175175
</attribute>
176-
<attribute id="0x0003" name="HoldTime" type="min 1">
176+
<attribute id="0x0003" name="HoldTime" type="uint16">
177177
<access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
178178
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
179179
<optionalConform/>

‎data_model/1.4/clusters/OperationalState.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,7 @@ Davis, CA 95616, USA
203203
</event>
204204
<event id="0x01" name="OperationCompletion" priority="info">
205205
<access readPrivilege="view"/>
206-
<otherwiseConform>
207-
<provisionalConform/>
208-
<optionalConform/>
209-
</otherwiseConform>
206+
<optionalConform/>
210207
<field id="0" name="CompletionErrorCode" type="enum8">
211208
<mandatoryConform/>
212209
</field>

‎data_model/1.4/clusters/OperationalState_Oven.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ 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="0x0048" name="Oven Cavity Operational State Cluster" revision="1">
60+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0048" name="Oven Cavity Operational State Cluster" revision="2">
6161
<revisionHistory>
6262
<revision revision="1" summary="Initial revision"/>
63+
<revision revision="2" summary="Set Pause and Resume commands as disallowed (previously a Device Type override)"/>
6364
</revisionHistory>
6465
<clusterIds>
6566
<clusterId id="0x0048" name="Oven Cavity Operational State"/>

‎data_model/1.4/clusters/OperationalState_RVC.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,7 @@ Davis, CA 95616, USA
117117
<command id="0x04" name="OperationalCommandResponse"/>
118118
<command id="0x80" name="GoHome" direction="commandToServer" response="OperationalCommandResponse">
119119
<access invokePrivilege="operate"/>
120-
<otherwiseConform>
121-
<provisionalConform/>
122-
<optionalConform/>
123-
</otherwiseConform>
120+
<optionalConform/>
124121
</command>
125122
</commands>
126123
</cluster>

‎data_model/1.4/clusters/PumpConfigurationControl.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -373,11 +373,8 @@ Davis, CA 95616, USA
373373
<optionalConform/>
374374
<constraint type="desc"/>
375375
</attribute>
376-
<attribute id="0x0022" name="AlarmMask" type="map16" default="0">
377-
<access read="true" readPrivilege="view"/>
378-
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
376+
<attribute id="0x0022" name="AlarmMask">
379377
<deprecateConform/>
380-
<constraint type="desc"/>
381378
</attribute>
382379
</attributes>
383380
<events>

‎data_model/1.4/clusters/Scenes.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -373,14 +373,16 @@ Davis, CA 95616, USA
373373
<field id="1" name="GroupIdentifierFrom" type="group-id">
374374
<mandatoryConform/>
375375
</field>
376-
<field id="2" name="SceneIdentifierFrom" type="max 254">
376+
<field id="2" name="SceneIdentifierFrom" type="uint8">
377377
<mandatoryConform/>
378+
<constraint type="max" value="254"/>
378379
</field>
379380
<field id="3" name="GroupIdentifierTo" type="group-id">
380381
<mandatoryConform/>
381382
</field>
382-
<field id="4" name="SceneIdentifierTo" type="max 254">
383+
<field id="4" name="SceneIdentifierTo" type="uint8">
383384
<mandatoryConform/>
385+
<constraint type="max" value="254"/>
384386
</field>
385387
</command>
386388
<command id="0x40" name="CopySceneResponse" direction="responseFromServer">

‎data_model/1.4/clusters/ThermostatUserInterfaceConfiguration.xml

-3
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,14 @@ Davis, CA 95616, USA
106106
<attribute id="0x0000" name="TemperatureDisplayMode" type="TemperatureDisplayModeEnum" default="Celsius">
107107
<access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
108108
<mandatoryConform/>
109-
<constraint type="desc"/>
110109
</attribute>
111110
<attribute id="0x0001" name="KeypadLockout" type="KeypadLockoutEnum" default="NoLockout">
112111
<access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
113112
<mandatoryConform/>
114-
<constraint type="desc"/>
115113
</attribute>
116114
<attribute id="0x0002" name="ScheduleProgrammingVisibility" type="ScheduleProgrammingVisibilityEnum" default="ScheduleProgrammingPermitted">
117115
<access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
118116
<optionalConform/>
119-
<constraint type="desc"/>
120117
</attribute>
121118
</attributes>
122119
</cluster>

‎data_model/1.4/clusters/WaterHeaterManagement.xml

-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ Davis, CA 95616, USA
168168
<mandatoryConform/>
169169
<field id="0" name="BoostInfo" type="WaterHeaterBoostInfoStruct">
170170
<mandatoryConform/>
171-
<constraint type="desc"/>
172171
</field>
173172
</command>
174173
<command id="0x01" name="CancelBoost" direction="commandToServer" response="Y">
@@ -182,7 +181,6 @@ Davis, CA 95616, USA
182181
<mandatoryConform/>
183182
<field id="0" name="BoostInfo" type="WaterHeaterBoostInfoStruct">
184183
<mandatoryConform/>
185-
<constraint type="desc"/>
186184
</field>
187185
</event>
188186
<event id="0x01" name="BoostEnded" priority="info">

0 commit comments

Comments
 (0)