New DM XML drop from Sept 3

cecille · Sep 3, 2024 · d7e1eb4 · d7e1eb4
1 parent 59f246e
commit d7e1eb4
Show file tree

Hide file tree

Showing 52 changed files with 249 additions and 248 deletions.
diff --git a/data_model/in_progress/clusters/GeneralCommissioningCluster.xml b/data_model/in_progress/clusters/GeneralCommissioningCluster.xml
@@ -81,21 +81,6 @@ Davis, CA 95616, USA
       <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.">
         <mandatoryConform/>
       </item>
-      <item value="5" name="RequiredTCNotAccepted" summary="[[ref_RequiredTCNotAccepted]] One or more required TC features from the Enhanced Setup Flow were not accepted.">
-        <mandatoryConform>
-          <feature name="TC"/>
-        </mandatoryConform>
-      </item>
-      <item value="6" name="TCAcknowledgementsNotReceived" summary="[[ref_TCAcknowledgementsNotReceived, TCAcknowledgementsNotReceived]] No acknowledgements from the user for the TC features were received.">
-        <mandatoryConform>
-          <feature name="TC"/>
-        </mandatoryConform>
-      </item>
-      <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.">
-        <mandatoryConform>
-          <feature name="TC"/>
-        </mandatoryConform>
-      </item>
     </enum>
     <enum name="RegulatoryLocationTypeEnum">
       <item value="0" name="Indoor" summary="Indoor only">

diff --git a/data_model/in_progress/clusters/bridge-clusters-EcosystemInformationCluster.xml b/data_model/in_progress/clusters/bridge-clusters-EcosystemInformationCluster.xml
@@ -84,12 +84,10 @@ Davis, CA 95616, USA
         <constraint type="desc"/>
       </field>
       <field id="4" name="DeviceTypes" type="list">
-        <entry type="ref_DeviceTypeStruct">
-          <constraint type="desc"/>
-        </entry>
+        <entry type="ref_DeviceTypeStruct"/>
         <access fabricSensitive="true"/>
         <mandatoryConform/>
-        <constraint type="minCount" value="1"/>
+        <constraint type="desc"/>
       </field>
       <field id="5" name="UniqueLocationIDs" type="list">
         <entry type="string">

diff --git a/data_model/in_progress/clusters/cluster_ids.json b/data_model/in_progress/clusters/cluster_ids.json
@@ -118,5 +118,7 @@
     "1295": "Content Control",
     "1296": "Content App Observer",
     "1872": "Ecosystem Information",
-    "1873": "Commissioner Control"
+    "1873": "Commissioner Control",
+    "1874": "Joint Fabric Datastore Cluster",
+    "1875": "Joint Fabric PKI"
 }
diff --git a/data_model/in_progress/spec_sha b/data_model/in_progress/spec_sha
@@ -1 +1 @@
-450fe38da1973e618b49c0ca72e44e9ea8ef6073
+ec20ddf482db8deffe8b2eb745e34d2f9cea72b2
diff --git a/data_model/master/clusters/ACL-Cluster.xml b/data_model/master/clusters/ACL-Cluster.xml
@@ -68,9 +68,7 @@ Davis, CA 95616, USA
     <feature bit="0" code="EXTS" name="Extension" summary="Device provides ACL Extension attribute">
       <optionalConform/>
     </feature>
-    <feature bit="1" code="MNGD" name="ManagedDevice" summary="Device is managed">
-      <optionalConform/>
-    </feature>
+    <feature bit="1" code="MNGD" name="ManagedDevice" summary="Device is managed"/>
   </features>
   <dataTypes>
     <enum name="AccessControlEntryAuthModeEnum">
@@ -333,13 +331,7 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </field>
     </event>
-    <event id="0x02" name="AccessRestrictionEntryChanged" priority="info">
-      <access readPrivilege="admin" fabricSensitive="true"/>
-      <mandatoryConform>
-        <feature name="MNGD"/>
-      </mandatoryConform>
-    </event>
-    <event id="0x03" name="FabricRestrictionReviewUpdate" priority="info">
+    <event id="0x02" name="FabricRestrictionReviewUpdate" priority="info">
       <access readPrivilege="admin" fabricSensitive="true"/>
       <mandatoryConform>
         <feature name="MNGD"/>
@@ -348,13 +340,11 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </field>
       <field id="1" name="Instruction" type="string">
-        <quality nullable="true"/>
-        <mandatoryConform/>
+        <optionalConform/>
         <constraint type="maxLength" value="512"/>
       </field>
-      <field id="2" name="RedirectURL" type="string">
-        <quality nullable="true"/>
-        <mandatoryConform/>
+      <field id="2" name="ARLRequestFlowUrl" type="string">
+        <optionalConform/>
         <constraint type="maxLength" value="256"/>
       </field>
     </event>

diff --git a/data_model/master/clusters/Channel.xml b/data_model/master/clusters/Channel.xml
@@ -366,7 +366,6 @@ Davis, CA 95616, USA
       </field>
     </command>
     <command id="0x04" name="GetProgramGuide" direction="commandToServer" response="ProgramGuideResponse">
-      <quality largeMessage="true"/>
       <access invokePrivilege="operate"/>
       <mandatoryConform>
         <feature name="EG"/>
@@ -401,7 +400,6 @@ Davis, CA 95616, USA
       </field>
     </command>
     <command id="0x05" name="ProgramGuideResponse" direction="responseFromServer">
-      <quality largeMessage="true"/>
       <mandatoryConform>
         <feature name="EG"/>
       </mandatoryConform>
@@ -414,7 +412,6 @@ Davis, CA 95616, USA
       </field>
     </command>
     <command id="0x06" name="RecordProgram" direction="commandToServer" response="Y">
-      <quality largeMessage="true"/>
       <access invokePrivilege="operate"/>
       <mandatoryConform>
         <andTerm>
@@ -440,7 +437,6 @@ Davis, CA 95616, USA
       </field>
     </command>
     <command id="0x07" name="CancelRecordProgram" direction="commandToServer" response="Y">
-      <quality largeMessage="true"/>
       <access invokePrivilege="operate"/>
       <mandatoryConform>
         <andTerm>

diff --git a/data_model/master/clusters/ColorControl.xml b/data_model/master/clusters/ColorControl.xml
@@ -65,8 +65,10 @@ Davis, CA 95616, USA
     <revision revision="4" summary="All Hubs changes"/>
     <revision revision="5" summary="New data model format and notation, FeatureMap support"/>
     <revision revision="6" summary="Added clarifications to Scenes support for Matter"/>
-    <revision revision="7" summary="Added Q quality for CurrentHue, CurrentSaturation, CurrentX, CurrentY, EnhancedCurrentHue and RemainingTime attributes +
-             and added clarifications for behavior related to Step values"/>
+    <revision revision="7" summary="Added Q quality for CurrentHue, CurrentSaturation, CurrentX, CurrentY, ColorTemperatureMireds,
+             EnhancedCurrentHue and RemainingTime attributes.
+             Added clarifications for behavior related to Step values.
+             Added constraints on minimum acceptable color temperature values in mireds."/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0300" name="Color Control"/>
@@ -291,7 +293,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x0007" name="ColorTemperatureMireds" type="uint16" default="250 (4000K)">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="true" sourceAttribution="false" quieterReporting="true"/>
       <mandatoryConform>
         <feature name="CT"/>
       </mandatoryConform>
@@ -666,14 +668,14 @@ Davis, CA 95616, USA
       <mandatoryConform/>
       <constraint type="max" value="0x001F"/>
     </attribute>
-    <attribute id="0x400B" name="ColorTempPhysicalMinMireds" type="uint16" default="0">
+    <attribute id="0x400B" name="ColorTempPhysicalMinMireds" type="uint16">
       <access read="true" readPrivilege="view"/>
       <mandatoryConform>
         <feature name="CT"/>
       </mandatoryConform>
-      <constraint type="max" value="65279"/>
+      <constraint type="between" from="1" to="65279"/>
     </attribute>
-    <attribute id="0x400C" name="ColorTempPhysicalMaxMireds" type="uint16" default="65279">
+    <attribute id="0x400C" name="ColorTempPhysicalMaxMireds" type="uint16">
       <access read="true" readPrivilege="view"/>
       <mandatoryConform>
         <feature name="CT"/>
@@ -699,7 +701,7 @@ Davis, CA 95616, USA
           <attribute name="ColorTemperatureMireds"/>
         </orTerm>
       </mandatoryConform>
-      <constraint type="max" value="65279"/>
+      <constraint type="between" from="1" to="65279"/>
     </attribute>
   </attributes>
   <commands>

diff --git a/data_model/master/clusters/CommissionerControlCluster.xml b/data_model/master/clusters/CommissionerControlCluster.xml
@@ -80,13 +80,13 @@ Davis, CA 95616, USA
     <command id="0x00" name="RequestCommissioningApproval" direction="commandToServer" response="Y">
       <access invokePrivilege="manage"/>
       <mandatoryConform/>
-      <field id="0" name="RequestId" type="uint64">
+      <field id="0" name="RequestID" type="uint64">
         <mandatoryConform/>
       </field>
-      <field id="1" name="VendorId" type="vendor-id">
+      <field id="1" name="VendorID" type="vendor-id">
         <mandatoryConform/>
       </field>
-      <field id="2" name="ProductId" type="uint16">
+      <field id="2" name="ProductID" type="uint16">
         <mandatoryConform/>
       </field>
       <field id="3" name="Label" type="string">
@@ -97,19 +97,13 @@ Davis, CA 95616, USA
     <command id="0x01" name="CommissionNode" direction="commandToServer" response="ReverseOpenCommissioningWindow">
       <access invokePrivilege="manage"/>
       <mandatoryConform/>
-      <field id="0" name="RequestId" type="uint64">
+      <field id="0" name="RequestID" type="uint64">
         <mandatoryConform/>
       </field>
-      <field id="2" name="ResponseTimeoutSeconds" type="uint16" default="30">
+      <field id="1" name="ResponseTimeoutSeconds" type="uint16" default="30">
         <mandatoryConform/>
         <constraint type="between" from="30" to="120"/>
       </field>
-      <field id="3" name="IpAddress" type="ipadr">
-        <optionalConform/>
-      </field>
-      <field id="4" name="Port" type="uint16">
-        <optionalConform/>
-      </field>
     </command>
     <command id="0x02" name="ReverseOpenCommissioningWindow" direction="responseFromServer">
       <mandatoryConform/>
@@ -138,10 +132,10 @@ Davis, CA 95616, USA
     <event id="0x00" name="CommissioningRequestResult" priority="info">
       <access readPrivilege="manage" fabricSensitive="true"/>
       <mandatoryConform/>
-      <field id="0" name="RequestId" type="uint64">
+      <field id="0" name="RequestID" type="uint64">
         <mandatoryConform/>
       </field>
-      <field id="1" name="ClientNodeId" type="node-id">
+      <field id="1" name="ClientNodeID" type="node-id">
         <mandatoryConform/>
       </field>
       <field id="2" name="StatusCode" type="status">

diff --git a/data_model/master/clusters/ConcentrationMeasurement.xml b/data_model/master/clusters/ConcentrationMeasurement.xml
@@ -193,7 +193,6 @@ Davis, CA 95616, USA
       <mandatoryConform>
         <feature name="MEA"/>
       </mandatoryConform>
-      <constraint type="max" value="MaxMeasuredValue"/>
     </attribute>
     <attribute id="0x0002" name="MaxMeasuredValue" type="single" default="null">
       <access read="true" readPrivilege="view"/>

diff --git a/data_model/master/clusters/DeviceEnergyManagement.xml b/data_model/master/clusters/DeviceEnergyManagement.xml
@@ -62,7 +62,7 @@ Davis, CA 95616, USA
     <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Updates after 0.7 Ballot review"/>
     <revision revision="3" summary="Updates to match cluster spec updates"/>
-    <revision revision="4" summary="Bug fixes found during PICS production"/>
+    <revision revision="4" summary="Updates to feature conformance. Corrected ForecastID type"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0098" name="Device Energy Management">
@@ -123,27 +123,27 @@ Davis, CA 95616, USA
     <number name="PowerAdjustCapability" type=""/>
     <enum name="AdjustmentCauseEnum">
       <item value="0" name="LocalOptimization" summary="The adjustment is to optimize the local energy usage">
-        <optionalConform/>
+        <mandatoryConform/>
       </item>
       <item value="1" name="GridOptimization" summary="The adjustment is to optimize the grid energy usage">
-        <optionalConform/>
+        <mandatoryConform/>
       </item>
     </enum>
     <enum name="CauseEnum">
       <item value="0" name="NormalCompletion" summary="The ESA completed the power adjustment as requested">
-        <optionalConform/>
+        <mandatoryConform/>
       </item>
       <item value="1" name="Offline" summary="The ESA was set to offline">
-        <optionalConform/>
+        <mandatoryConform/>
       </item>
       <item value="2" name="Fault" summary="The ESA has developed a fault could not complete the adjustment">
-        <optionalConform/>
+        <mandatoryConform/>
       </item>
       <item value="3" name="UserOptOut" summary="The user has disabled the ESA's flexibility capability">
-        <optionalConform/>
+        <mandatoryConform/>
       </item>
       <item value="4" name="Cancelled" summary="The adjustment was cancelled by a client">
-        <optionalConform/>
+        <mandatoryConform/>
       </item>
     </enum>
     <enum name="CostTypeEnum">
@@ -230,13 +230,13 @@ Davis, CA 95616, USA
     </enum>
     <enum name="ForecastUpdateReasonEnum">
       <item value="0" name="InternalOptimization" summary="The update was due to internal ESA device optimization">
-        <optionalConform/>
+        <mandatoryConform/>
       </item>
       <item value="1" name="LocalOptimization" summary="The update was due to local EMS optimization">
-        <optionalConform/>
+        <mandatoryConform/>
       </item>
       <item value="2" name="GridOptimization" summary="The update was due to grid optimization">
-        <optionalConform/>
+        <mandatoryConform/>
       </item>
     </enum>
     <enum name="OptOutStateEnum">
@@ -255,13 +255,13 @@ Davis, CA 95616, USA
     </enum>
     <enum name="PowerAdjustReasonEnum">
       <item value="0" name="NoAdjustment" summary="There is no Power Adjustment active">
-        <optionalConform/>
+        <mandatoryConform/>
       </item>
       <item value="1" name="LocalOptimizationAdjustment" summary="There is PowerAdjustment active due to local EMS optimization">
-        <optionalConform/>
+        <mandatoryConform/>
       </item>
       <item value="2" name="GridOptimizationAdjustment" summary="There is PowerAdjustment active due to local EMS optimization">
-        <optionalConform/>
+        <mandatoryConform/>
       </item>
     </enum>
     <struct name="ConstraintsStruct">
@@ -359,12 +359,14 @@ Davis, CA 95616, USA
       </field>
       <field id="1" name="MaxPower" type="power-mW" default="0">
         <mandatoryConform/>
+        <constraint type="min" value="MinPower"/>
       </field>
       <field id="2" name="MinDuration" type="elapsed-s" default="0">
         <mandatoryConform/>
       </field>
       <field id="3" name="MaxDuration" type="elapsed-s">
         <mandatoryConform/>
+        <constraint type="min" value="MinDuration"/>
       </field>
     </struct>
     <struct name="SlotAdjustmentStruct">
@@ -495,17 +497,18 @@ Davis, CA 95616, USA
     <attribute id="0x0004" name="AbsMaxPower" type="power-mW" default="0">
       <access read="true" readPrivilege="view"/>
       <mandatoryConform/>
+      <constraint type="min" value="AbsMinPower"/>
     </attribute>
     <attribute id="0x0005" name="PowerAdjustmentCapability" type="PowerAdjustCapabilityStruct" default="null">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="true"/>
       <mandatoryConform>
         <feature name="PA"/>
       </mandatoryConform>
     </attribute>
     <attribute id="0x0006" name="Forecast" type="ForecastStruct" default="null">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="true"/>
       <mandatoryConform>
         <orTerm>
           <feature name="PFR"/>

diff --git a/data_model/master/clusters/EnergyCalendar.xml b/data_model/master/clusters/EnergyCalendar.xml
@@ -158,7 +158,7 @@ Davis, CA 95616, USA
       </field>
     </struct>
     <struct name="DayStruct">
-      <field id="0" name="Date" type="date">
+      <field id="0" name="Date" type="epoch-s">
         <optionalConform choice="a"/>
       </field>
       <field id="1" name="DaysOfWeek" type="TransitionDayOfWeekBitmap">

diff --git a/data_model/master/clusters/FanControl.xml b/data_model/master/clusters/FanControl.xml
@@ -57,13 +57,12 @@ Davis, CA 95616, USA
 
 :xrefstyle: short
 -->
-<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">
+<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">
   <revisionHistory>
     <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
     <revision revision="2" summary="New data model format and notation; Percent, speed and motion settings; General cleanup"/>
     <revision revision="3" summary="Addition of AirflowDirection and Step command"/>
     <revision revision="4" summary="Change conformance for FanModeSequenceEnum"/>
-    <revision revision="5" summary="Added Q quality for PercentCurrent and SpeedCurrent"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0202" name="Fan Control"/>
@@ -211,7 +210,6 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x0003" name="PercentCurrent" type="percent" default="desc">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="true"/>
       <mandatoryConform/>
       <constraint type="max" value="100"/>
     </attribute>
@@ -233,7 +231,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x0006" name="SpeedCurrent" type="uint8" default="desc">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="true"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform>
         <feature name="SPD"/>
       </mandatoryConform>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		450fe38da1973e618b49c0ca72e44e9ea8ef6073
		ec20ddf482db8deffe8b2eb745e34d2f9cea72b2