Skip to content

Commit d7e1eb4

Browse files
cecillececille
committed
New DM XML drop from Sept 3
1 parent 59f246e commit d7e1eb4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+249
-248
lines changed

‎data_model/in_progress/clusters/GeneralCommissioningCluster.xml

-15
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,6 @@ Davis, CA 95616, USA
8181
<item value="4" name="BusyWithOtherAdmin" summary="[[ref_BusyWithOtherAdmin]] Attempting to arm fail-safe or execute CommissioningComplete from a fabric different than the one associated with the current fail-safe context.">
8282
<mandatoryConform/>
8383
</item>
84-
<item value="5" name="RequiredTCNotAccepted" summary="[[ref_RequiredTCNotAccepted]] One or more required TC features from the Enhanced Setup Flow were not accepted.">
85-
<mandatoryConform>
86-
<feature name="TC"/>
87-
</mandatoryConform>
88-
</item>
89-
<item value="6" name="TCAcknowledgementsNotReceived" summary="[[ref_TCAcknowledgementsNotReceived, TCAcknowledgementsNotReceived]] No acknowledgements from the user for the TC features were received.">
90-
<mandatoryConform>
91-
<feature name="TC"/>
92-
</mandatoryConform>
93-
</item>
94-
<item value="7" name="TCMinVersionNotMet" summary="[[ref_TCMinVersionNotMet, TCMinVersionNotMet]] The version of the TC features acknowledged by the user did not meet the minimum required version.">
95-
<mandatoryConform>
96-
<feature name="TC"/>
97-
</mandatoryConform>
98-
</item>
9984
</enum>
10085
<enum name="RegulatoryLocationTypeEnum">
10186
<item value="0" name="Indoor" summary="Indoor only">

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,10 @@ Davis, CA 95616, USA
8484
<constraint type="desc"/>
8585
</field>
8686
<field id="4" name="DeviceTypes" type="list">
87-
<entry type="ref_DeviceTypeStruct">
88-
<constraint type="desc"/>
89-
</entry>
87+
<entry type="ref_DeviceTypeStruct"/>
9088
<access fabricSensitive="true"/>
9189
<mandatoryConform/>
92-
<constraint type="minCount" value="1"/>
90+
<constraint type="desc"/>
9391
</field>
9492
<field id="5" name="UniqueLocationIDs" type="list">
9593
<entry type="string">

‎data_model/in_progress/clusters/cluster_ids.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -118,5 +118,7 @@
118118
"1295": "Content Control",
119119
"1296": "Content App Observer",
120120
"1872": "Ecosystem Information",
121-
"1873": "Commissioner Control"
121+
"1873": "Commissioner Control",
122+
"1874": "Joint Fabric Datastore Cluster",
123+
"1875": "Joint Fabric PKI"
122124
}

‎data_model/in_progress/spec_sha

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
450fe38da1973e618b49c0ca72e44e9ea8ef6073
1+
ec20ddf482db8deffe8b2eb745e34d2f9cea72b2

‎data_model/master/clusters/ACL-Cluster.xml

+5-15
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ Davis, CA 95616, USA
6868
<feature bit="0" code="EXTS" name="Extension" summary="Device provides ACL Extension attribute">
6969
<optionalConform/>
7070
</feature>
71-
<feature bit="1" code="MNGD" name="ManagedDevice" summary="Device is managed">
72-
<optionalConform/>
73-
</feature>
71+
<feature bit="1" code="MNGD" name="ManagedDevice" summary="Device is managed"/>
7472
</features>
7573
<dataTypes>
7674
<enum name="AccessControlEntryAuthModeEnum">
@@ -333,13 +331,7 @@ Davis, CA 95616, USA
333331
<mandatoryConform/>
334332
</field>
335333
</event>
336-
<event id="0x02" name="AccessRestrictionEntryChanged" priority="info">
337-
<access readPrivilege="admin" fabricSensitive="true"/>
338-
<mandatoryConform>
339-
<feature name="MNGD"/>
340-
</mandatoryConform>
341-
</event>
342-
<event id="0x03" name="FabricRestrictionReviewUpdate" priority="info">
334+
<event id="0x02" name="FabricRestrictionReviewUpdate" priority="info">
343335
<access readPrivilege="admin" fabricSensitive="true"/>
344336
<mandatoryConform>
345337
<feature name="MNGD"/>
@@ -348,13 +340,11 @@ Davis, CA 95616, USA
348340
<mandatoryConform/>
349341
</field>
350342
<field id="1" name="Instruction" type="string">
351-
<quality nullable="true"/>
352-
<mandatoryConform/>
343+
<optionalConform/>
353344
<constraint type="maxLength" value="512"/>
354345
</field>
355-
<field id="2" name="RedirectURL" type="string">
356-
<quality nullable="true"/>
357-
<mandatoryConform/>
346+
<field id="2" name="ARLRequestFlowUrl" type="string">
347+
<optionalConform/>
358348
<constraint type="maxLength" value="256"/>
359349
</field>
360350
</event>

‎data_model/master/clusters/Channel.xml

-4
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ Davis, CA 95616, USA
366366
</field>
367367
</command>
368368
<command id="0x04" name="GetProgramGuide" direction="commandToServer" response="ProgramGuideResponse">
369-
<quality largeMessage="true"/>
370369
<access invokePrivilege="operate"/>
371370
<mandatoryConform>
372371
<feature name="EG"/>
@@ -401,7 +400,6 @@ Davis, CA 95616, USA
401400
</field>
402401
</command>
403402
<command id="0x05" name="ProgramGuideResponse" direction="responseFromServer">
404-
<quality largeMessage="true"/>
405403
<mandatoryConform>
406404
<feature name="EG"/>
407405
</mandatoryConform>
@@ -414,7 +412,6 @@ Davis, CA 95616, USA
414412
</field>
415413
</command>
416414
<command id="0x06" name="RecordProgram" direction="commandToServer" response="Y">
417-
<quality largeMessage="true"/>
418415
<access invokePrivilege="operate"/>
419416
<mandatoryConform>
420417
<andTerm>
@@ -440,7 +437,6 @@ Davis, CA 95616, USA
440437
</field>
441438
</command>
442439
<command id="0x07" name="CancelRecordProgram" direction="commandToServer" response="Y">
443-
<quality largeMessage="true"/>
444440
<access invokePrivilege="operate"/>
445441
<mandatoryConform>
446442
<andTerm>

‎data_model/master/clusters/ColorControl.xml

+9-7
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ Davis, CA 95616, USA
6565
<revision revision="4" summary="All Hubs changes"/>
6666
<revision revision="5" summary="New data model format and notation, FeatureMap support"/>
6767
<revision revision="6" summary="Added clarifications to Scenes support for Matter"/>
68-
<revision revision="7" summary="Added Q quality for CurrentHue, CurrentSaturation, CurrentX, CurrentY, EnhancedCurrentHue and RemainingTime attributes +
69-
and added clarifications for behavior related to Step values"/>
68+
<revision revision="7" summary="Added Q quality for CurrentHue, CurrentSaturation, CurrentX, CurrentY, ColorTemperatureMireds,
69+
EnhancedCurrentHue and RemainingTime attributes.
70+
Added clarifications for behavior related to Step values.
71+
Added constraints on minimum acceptable color temperature values in mireds."/>
7072
</revisionHistory>
7173
<clusterIds>
7274
<clusterId id="0x0300" name="Color Control"/>
@@ -291,7 +293,7 @@ Davis, CA 95616, USA
291293
</attribute>
292294
<attribute id="0x0007" name="ColorTemperatureMireds" type="uint16" default="250 (4000K)">
293295
<access read="true" readPrivilege="view"/>
294-
<quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
296+
<quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="true" sourceAttribution="false" quieterReporting="true"/>
295297
<mandatoryConform>
296298
<feature name="CT"/>
297299
</mandatoryConform>
@@ -666,14 +668,14 @@ Davis, CA 95616, USA
666668
<mandatoryConform/>
667669
<constraint type="max" value="0x001F"/>
668670
</attribute>
669-
<attribute id="0x400B" name="ColorTempPhysicalMinMireds" type="uint16" default="0">
671+
<attribute id="0x400B" name="ColorTempPhysicalMinMireds" type="uint16">
670672
<access read="true" readPrivilege="view"/>
671673
<mandatoryConform>
672674
<feature name="CT"/>
673675
</mandatoryConform>
674-
<constraint type="max" value="65279"/>
676+
<constraint type="between" from="1" to="65279"/>
675677
</attribute>
676-
<attribute id="0x400C" name="ColorTempPhysicalMaxMireds" type="uint16" default="65279">
678+
<attribute id="0x400C" name="ColorTempPhysicalMaxMireds" type="uint16">
677679
<access read="true" readPrivilege="view"/>
678680
<mandatoryConform>
679681
<feature name="CT"/>
@@ -699,7 +701,7 @@ Davis, CA 95616, USA
699701
<attribute name="ColorTemperatureMireds"/>
700702
</orTerm>
701703
</mandatoryConform>
702-
<constraint type="max" value="65279"/>
704+
<constraint type="between" from="1" to="65279"/>
703705
</attribute>
704706
</attributes>
705707
<commands>

‎data_model/master/clusters/CommissionerControlCluster.xml

+7-13
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ Davis, CA 95616, USA
8080
<command id="0x00" name="RequestCommissioningApproval" direction="commandToServer" response="Y">
8181
<access invokePrivilege="manage"/>
8282
<mandatoryConform/>
83-
<field id="0" name="RequestId" type="uint64">
83+
<field id="0" name="RequestID" type="uint64">
8484
<mandatoryConform/>
8585
</field>
86-
<field id="1" name="VendorId" type="vendor-id">
86+
<field id="1" name="VendorID" type="vendor-id">
8787
<mandatoryConform/>
8888
</field>
89-
<field id="2" name="ProductId" type="uint16">
89+
<field id="2" name="ProductID" type="uint16">
9090
<mandatoryConform/>
9191
</field>
9292
<field id="3" name="Label" type="string">
@@ -97,19 +97,13 @@ Davis, CA 95616, USA
9797
<command id="0x01" name="CommissionNode" direction="commandToServer" response="ReverseOpenCommissioningWindow">
9898
<access invokePrivilege="manage"/>
9999
<mandatoryConform/>
100-
<field id="0" name="RequestId" type="uint64">
100+
<field id="0" name="RequestID" type="uint64">
101101
<mandatoryConform/>
102102
</field>
103-
<field id="2" name="ResponseTimeoutSeconds" type="uint16" default="30">
103+
<field id="1" name="ResponseTimeoutSeconds" type="uint16" default="30">
104104
<mandatoryConform/>
105105
<constraint type="between" from="30" to="120"/>
106106
</field>
107-
<field id="3" name="IpAddress" type="ipadr">
108-
<optionalConform/>
109-
</field>
110-
<field id="4" name="Port" type="uint16">
111-
<optionalConform/>
112-
</field>
113107
</command>
114108
<command id="0x02" name="ReverseOpenCommissioningWindow" direction="responseFromServer">
115109
<mandatoryConform/>
@@ -138,10 +132,10 @@ Davis, CA 95616, USA
138132
<event id="0x00" name="CommissioningRequestResult" priority="info">
139133
<access readPrivilege="manage" fabricSensitive="true"/>
140134
<mandatoryConform/>
141-
<field id="0" name="RequestId" type="uint64">
135+
<field id="0" name="RequestID" type="uint64">
142136
<mandatoryConform/>
143137
</field>
144-
<field id="1" name="ClientNodeId" type="node-id">
138+
<field id="1" name="ClientNodeID" type="node-id">
145139
<mandatoryConform/>
146140
</field>
147141
<field id="2" name="StatusCode" type="status">

‎data_model/master/clusters/ConcentrationMeasurement.xml

-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ Davis, CA 95616, USA
193193
<mandatoryConform>
194194
<feature name="MEA"/>
195195
</mandatoryConform>
196-
<constraint type="max" value="MaxMeasuredValue"/>
197196
</attribute>
198197
<attribute id="0x0002" name="MaxMeasuredValue" type="single" default="null">
199198
<access read="true" readPrivilege="view"/>

‎data_model/master/clusters/DeviceEnergyManagement.xml

+19-16
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Davis, CA 95616, USA
6262
<revision revision="1" summary="Initial revision"/>
6363
<revision revision="2" summary="Updates after 0.7 Ballot review"/>
6464
<revision revision="3" summary="Updates to match cluster spec updates"/>
65-
<revision revision="4" summary="Bug fixes found during PICS production"/>
65+
<revision revision="4" summary="Updates to feature conformance. Corrected ForecastID type"/>
6666
</revisionHistory>
6767
<clusterIds>
6868
<clusterId id="0x0098" name="Device Energy Management">
@@ -123,27 +123,27 @@ Davis, CA 95616, USA
123123
<number name="PowerAdjustCapability" type=""/>
124124
<enum name="AdjustmentCauseEnum">
125125
<item value="0" name="LocalOptimization" summary="The adjustment is to optimize the local energy usage">
126-
<optionalConform/>
126+
<mandatoryConform/>
127127
</item>
128128
<item value="1" name="GridOptimization" summary="The adjustment is to optimize the grid energy usage">
129-
<optionalConform/>
129+
<mandatoryConform/>
130130
</item>
131131
</enum>
132132
<enum name="CauseEnum">
133133
<item value="0" name="NormalCompletion" summary="The ESA completed the power adjustment as requested">
134-
<optionalConform/>
134+
<mandatoryConform/>
135135
</item>
136136
<item value="1" name="Offline" summary="The ESA was set to offline">
137-
<optionalConform/>
137+
<mandatoryConform/>
138138
</item>
139139
<item value="2" name="Fault" summary="The ESA has developed a fault could not complete the adjustment">
140-
<optionalConform/>
140+
<mandatoryConform/>
141141
</item>
142142
<item value="3" name="UserOptOut" summary="The user has disabled the ESA's flexibility capability">
143-
<optionalConform/>
143+
<mandatoryConform/>
144144
</item>
145145
<item value="4" name="Cancelled" summary="The adjustment was cancelled by a client">
146-
<optionalConform/>
146+
<mandatoryConform/>
147147
</item>
148148
</enum>
149149
<enum name="CostTypeEnum">
@@ -230,13 +230,13 @@ Davis, CA 95616, USA
230230
</enum>
231231
<enum name="ForecastUpdateReasonEnum">
232232
<item value="0" name="InternalOptimization" summary="The update was due to internal ESA device optimization">
233-
<optionalConform/>
233+
<mandatoryConform/>
234234
</item>
235235
<item value="1" name="LocalOptimization" summary="The update was due to local EMS optimization">
236-
<optionalConform/>
236+
<mandatoryConform/>
237237
</item>
238238
<item value="2" name="GridOptimization" summary="The update was due to grid optimization">
239-
<optionalConform/>
239+
<mandatoryConform/>
240240
</item>
241241
</enum>
242242
<enum name="OptOutStateEnum">
@@ -255,13 +255,13 @@ Davis, CA 95616, USA
255255
</enum>
256256
<enum name="PowerAdjustReasonEnum">
257257
<item value="0" name="NoAdjustment" summary="There is no Power Adjustment active">
258-
<optionalConform/>
258+
<mandatoryConform/>
259259
</item>
260260
<item value="1" name="LocalOptimizationAdjustment" summary="There is PowerAdjustment active due to local EMS optimization">
261-
<optionalConform/>
261+
<mandatoryConform/>
262262
</item>
263263
<item value="2" name="GridOptimizationAdjustment" summary="There is PowerAdjustment active due to local EMS optimization">
264-
<optionalConform/>
264+
<mandatoryConform/>
265265
</item>
266266
</enum>
267267
<struct name="ConstraintsStruct">
@@ -359,12 +359,14 @@ Davis, CA 95616, USA
359359
</field>
360360
<field id="1" name="MaxPower" type="power-mW" default="0">
361361
<mandatoryConform/>
362+
<constraint type="min" value="MinPower"/>
362363
</field>
363364
<field id="2" name="MinDuration" type="elapsed-s" default="0">
364365
<mandatoryConform/>
365366
</field>
366367
<field id="3" name="MaxDuration" type="elapsed-s">
367368
<mandatoryConform/>
369+
<constraint type="min" value="MinDuration"/>
368370
</field>
369371
</struct>
370372
<struct name="SlotAdjustmentStruct">
@@ -495,17 +497,18 @@ Davis, CA 95616, USA
495497
<attribute id="0x0004" name="AbsMaxPower" type="power-mW" default="0">
496498
<access read="true" readPrivilege="view"/>
497499
<mandatoryConform/>
500+
<constraint type="min" value="AbsMinPower"/>
498501
</attribute>
499502
<attribute id="0x0005" name="PowerAdjustmentCapability" type="PowerAdjustCapabilityStruct" default="null">
500503
<access read="true" readPrivilege="view"/>
501-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
504+
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="true"/>
502505
<mandatoryConform>
503506
<feature name="PA"/>
504507
</mandatoryConform>
505508
</attribute>
506509
<attribute id="0x0006" name="Forecast" type="ForecastStruct" default="null">
507510
<access read="true" readPrivilege="view"/>
508-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
511+
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="true"/>
509512
<mandatoryConform>
510513
<orTerm>
511514
<feature name="PFR"/>

‎data_model/master/clusters/EnergyCalendar.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ Davis, CA 95616, USA
158158
</field>
159159
</struct>
160160
<struct name="DayStruct">
161-
<field id="0" name="Date" type="date">
161+
<field id="0" name="Date" type="epoch-s">
162162
<optionalConform choice="a"/>
163163
</field>
164164
<field id="1" name="DaysOfWeek" type="TransitionDayOfWeekBitmap">

‎data_model/master/clusters/FanControl.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,12 @@ Davis, CA 95616, USA
5757
5858
:xrefstyle: short
5959
-->
60-
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0202" name="Fan Control Cluster" revision="5">
60+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0202" name="Fan Control Cluster" revision="4">
6161
<revisionHistory>
6262
<revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
6363
<revision revision="2" summary="New data model format and notation; Percent, speed and motion settings; General cleanup"/>
6464
<revision revision="3" summary="Addition of AirflowDirection and Step command"/>
6565
<revision revision="4" summary="Change conformance for FanModeSequenceEnum"/>
66-
<revision revision="5" summary="Added Q quality for PercentCurrent and SpeedCurrent"/>
6766
</revisionHistory>
6867
<clusterIds>
6968
<clusterId id="0x0202" name="Fan Control"/>
@@ -211,7 +210,6 @@ Davis, CA 95616, USA
211210
</attribute>
212211
<attribute id="0x0003" name="PercentCurrent" type="percent" default="desc">
213212
<access read="true" readPrivilege="view"/>
214-
<quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="true"/>
215213
<mandatoryConform/>
216214
<constraint type="max" value="100"/>
217215
</attribute>
@@ -233,7 +231,7 @@ Davis, CA 95616, USA
233231
</attribute>
234232
<attribute id="0x0006" name="SpeedCurrent" type="uint8" default="desc">
235233
<access read="true" readPrivilege="view"/>
236-
<quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="true"/>
234+
<quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
237235
<mandatoryConform>
238236
<feature name="SPD"/>
239237
</mandatoryConform>

0 commit comments

Comments
 (0)