Merge branch 'master' into add_presets_to_Sdk

project-chip · Jul 30, 2024 · fadce3b · fadce3b
2 parents 5abc22d + cc55c2a
commit fadce3b
Show file tree

Hide file tree

Showing 190 changed files with 1,113 additions and 881 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -650,6 +650,7 @@ href
 HSM
 hsm
 HTTPS
+Humidistat
 HW
 hwadr
 HydrogenConcentrationMeasurement

diff --git a/data_model/master/clusters/ACL-Cluster.xml b/data_model/master/clusters/ACL-Cluster.xml
@@ -57,15 +57,18 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001F" name="Access Control Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
-    <revision revision="2" summary="Added Managed feature"/>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Managed Device feature, Extension feature, fixed conformance"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x001F" name="AccessControl"/>
   </clusterIds>
   <classification hierarchy="base" role="utility" picsCode="ACL" scope="Node"/>
   <features>
-    <feature bit="0" code="MNGD" name="Managed" summary="Device is managed">
+    <feature bit="0" code="EXTS" name="Extension" summary="Device provides ACL Extension attribute">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="MNGD" name="Managed" summary="Device is managed">
       <optionalConform/>
     </feature>
   </features>
@@ -80,11 +83,6 @@ Davis, CA 95616, USA
       <item value="3" name="Group" summary="Group authenticated session">
         <mandatoryConform/>
       </item>
-      <item value="4" name="ALL" summary="All modes">
-        <mandatoryConform>
-          <feature name="MNGD"/>
-        </mandatoryConform>
-      </item>
     </enum>
     <enum name="AccessControlEntryPrivilegeEnum">
       <item value="1" name="View" summary="Can read and observe all (except Access Control Cluster and as seen by a non-Proxy)">
@@ -106,6 +104,20 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </item>
     </enum>
+    <enum name="AccessRestrictionTypeEnum">
+      <item value="0" name="AttributeAccessForbidden" summary="Clients on this fabric are currently forbidden from reading and writing an attribute">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AttributeWriteForbidden" summary="Clients on this fabric are currently forbidden from writing an attribute">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="CommandForbidden" summary="Clients on this fabric are currently forbidden from invoking a command">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="EventForbidden" summary="Clients on this fabric are currently forbidden from reading an event">
+        <mandatoryConform/>
+      </item>
+    </enum>
     <enum name="ChangeTypeEnum">
       <item value="0" name="Changed" summary="Entry or extension was changed">
         <mandatoryConform/>
@@ -164,6 +176,45 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </field>
     </struct>
+    <struct name="AccessRestrictionEntryStruct">
+      <field id="0" name="Endpoint" type="endpoint-no">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Cluster" type="cluster-id">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Restrictions" type="list" default="desc">
+        <entry type="AccessRestrictionStruct"/>
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+        <constraint type="minCount" value="1"/>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+    <struct name="AccessRestrictionStruct">
+      <field id="0" name="Type" type="AccessRestrictionTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ID" type="uint32">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="CommissioningAccessRestrictionEntryStruct">
+      <field id="0" name="Endpoint" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Cluster" type="cluster-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Restrictions" type="list" default="desc">
+        <entry type="AccessRestrictionStruct"/>
+        <mandatoryConform/>
+        <constraint type="minCount" value="1"/>
+      </field>
+    </struct>
   </dataTypes>
   <attributes>
     <attribute id="0x0000" name="ACL" type="list" default="desc">
@@ -175,7 +226,9 @@ Davis, CA 95616, USA
     <attribute id="0x0001" name="Extension" type="list" default="desc">
       <entry type="AccessControlExtensionStruct"/>
       <access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
-      <optionalConform/>
+      <mandatoryConform>
+        <feature name="EXTS"/>
+      </mandatoryConform>
       <constraint type="desc"/>
     </attribute>
     <attribute id="0x0002" name="SubjectsPerAccessControlEntry" type="uint16" default="4">
@@ -196,15 +249,45 @@ Davis, CA 95616, USA
       <mandatoryConform/>
       <constraint type="min" value="4"/>
     </attribute>
-    <attribute id="0x0005" name="ManagedACL" type="list" default="desc">
-      <entry type="AccessControlEntryStruct"/>
+    <attribute id="0x0005" name="CommissioningARL" type="list" default="[]">
+      <entry type="CommissioningAccessRestrictionEntryStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <mandatoryConform>
+        <feature name="MNGD"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0006" name="ARL" type="list" default="[]">
+      <entry type="AccessRestrictionEntryStruct"/>
       <access read="true" readPrivilege="view" fabricScoped="true"/>
       <mandatoryConform>
         <feature name="MNGD"/>
       </mandatoryConform>
       <constraint type="desc"/>
     </attribute>
   </attributes>
+  <commands>
+    <command id="0x00" name="ReviewFabricRestrictions" direction="commandToServer" response="ReviewFabricRestrictionsResponse">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform>
+        <feature name="MNGD"/>
+      </mandatoryConform>
+      <field id="0" name="ARL" type="list" default="desc">
+        <entry type="AccessRestrictionStruct"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x01" name="ReviewFabricRestrictionsResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="MNGD"/>
+      </mandatoryConform>
+      <field id="0" name="Token" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
   <events>
     <event id="0x00" name="AccessControlEntryChanged" priority="info">
       <access readPrivilege="admin" fabricSensitive="true"/>
@@ -229,7 +312,9 @@ Davis, CA 95616, USA
     </event>
     <event id="0x01" name="AccessControlExtensionChanged" priority="info">
       <access readPrivilege="admin" fabricSensitive="true"/>
-      <mandatoryConform/>
+      <mandatoryConform>
+        <feature name="EXTS"/>
+      </mandatoryConform>
       <field id="1" name="AdminNodeID" type="node-id">
         <quality nullable="true"/>
         <mandatoryConform/>
@@ -248,5 +333,30 @@ 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">
+      <access readPrivilege="admin" fabricSensitive="true"/>
+      <mandatoryConform>
+        <feature name="MNGD"/>
+      </mandatoryConform>
+      <field id="0" name="Token" type="uint64">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Instruction" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="512"/>
+      </field>
+      <field id="2" name="RedirectURL" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="256"/>
+      </field>
+    </event>
   </events>
 </cluster>
diff --git a/data_model/master/clusters/AccountLogin.xml b/data_model/master/clusters/AccountLogin.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050E" name="Account Login Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Add support for 8 character PIN code, Add Node to Login, Logout commands. Add LoggedOut event."/>
   </revisionHistory>
   <clusterIds>

diff --git a/data_model/master/clusters/AdminCommissioningCluster.xml b/data_model/master/clusters/AdminCommissioningCluster.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x003C" name="Administrator Commissioning Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x003C" name="Administrator Commissioning"/>

diff --git a/data_model/master/clusters/AirQuality.xml b/data_model/master/clusters/AirQuality.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005B" name="Air Quality Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial version of the Air Quality cluster"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x005B" name="Air Quality"/>

diff --git a/data_model/master/clusters/ApplicationBasic.xml b/data_model/master/clusters/ApplicationBasic.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050D" name="Application Basic Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x050D" name="Application Basic"/>

diff --git a/data_model/master/clusters/ApplicationLauncher.xml b/data_model/master/clusters/ApplicationLauncher.xml
@@ -57,9 +57,10 @@ Davis, CA 95616, USA
 
 :xrefstyle: basic
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050C" name="Application Launcher Cluster" revision="1">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050C" name="Application Launcher Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Addition of new states to StatusEnum"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x050C" name="Application Launcher"/>
@@ -75,10 +76,19 @@ Davis, CA 95616, USA
       <item value="0" name="Success" summary="Command succeeded">
         <mandatoryConform/>
       </item>
-      <item value="1" name="AppNotAvailable" summary="Requested app is not available.">
+      <item value="1" name="AppNotAvailable" summary="Requested app is not available">
         <mandatoryConform/>
       </item>
-      <item value="2" name="SystemBusy" summary="Video platform unable to honor command.">
+      <item value="2" name="SystemBusy" summary="Video platform unable to honor command">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="PendingUserApproval" summary="User approval for app download is pending">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Downloading" summary="Downloading the requested app">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Installing" summary="Installing the requested app">
         <mandatoryConform/>
       </item>
     </enum>

diff --git a/data_model/master/clusters/AudioOutput.xml b/data_model/master/clusters/AudioOutput.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050B" name="Audio Output Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x050B" name="Audio Output"/>

diff --git a/data_model/master/clusters/BasicInformationCluster.xml b/data_model/master/clusters/BasicInformationCluster.xml
@@ -57,20 +57,15 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0028" name="Basic Information Cluster" revision="4">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added ProductAppearance attribute"/>
     <revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
-    <revision revision="4" summary="Updated conformance for UniqueID to mandatory and add the BridgedICDSupport feature. Added DeviceLocation attribute."/>
+    <revision revision="4" summary="Updated conformance for UniqueID to mandatory. Added DeviceLocation attribute."/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0028" name="Basic Information"/>
   </clusterIds>
   <classification hierarchy="base" role="utility" picsCode="BINFO" scope="Node"/>
-  <features>
-    <feature bit="0" code="BIS" name="BridgedICDSupport" summary="A set of features that support Bridged ICD Devices.">
-      <optionalConform/>
-    </feature>
-  </features>
   <dataTypes>
     <enum name="ColorEnum">
       <item value="0" name="Black" summary="Approximately RGB #000000.">
@@ -308,23 +303,12 @@ Davis, CA 95616, USA
       <mandatoryConform/>
       <constraint type="min" value="1"/>
     </attribute>
-    <attribute id="0x0017" name="DeviceLocation" type="homeloc" default="MS">
+    <attribute id="0x0017" name="DeviceLocation" type="locationdesc" default="MS">
       <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <optionalConform/>
     </attribute>
   </attributes>
-  <commands>
-    <command id="0x00" name="KeepActive" direction="commandToServer" response="Y">
-      <access invokePrivilege="operate"/>
-      <mandatoryConform>
-        <feature name="BIS"/>
-      </mandatoryConform>
-      <field id="0" name="StayActiveDuration" type="uint32">
-        <mandatoryConform/>
-      </field>
-    </command>
-  </commands>
   <events>
     <event id="0x00" name="StartUp" priority="critical">
       <access readPrivilege="view"/>
@@ -351,15 +335,5 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </field>
     </event>
-    <event id="0x04" name="ActiveChanged" priority="info">
-      <access readPrivilege="view"/>
-      <mandatoryConform>
-        <feature name="BIS"/>
-      </mandatoryConform>
-      <field id="0" name="PromisedActiveDuration" type="uint32">
-        <mandatoryConform/>
-        <constraint type="desc"/>
-      </field>
-    </event>
   </events>
 </cluster>
diff --git a/data_model/master/clusters/Binding-Cluster.xml b/data_model/master/clusters/Binding-Cluster.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001E" name="Binding Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x001E" name="Binding"/>

diff --git a/data_model/master/clusters/BooleanState.xml b/data_model/master/clusters/BooleanState.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0045" name="Boolean State Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0045" name="Boolean State"/>

diff --git a/data_model/master/clusters/BooleanStateConfiguration.xml b/data_model/master/clusters/BooleanStateConfiguration.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0080" name="Boolean State Configuration Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0080" name="Boolean State Configuration"/>

diff --git a/data_model/master/clusters/Channel.xml b/data_model/master/clusters/Channel.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0504" name="Channel Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Add EG and RP features, Identifier and Type to Channel Info for Over-the-Top (OTT) channel support."/>
   </revisionHistory>
   <clusterIds>
-Original file line number
+Diff line change
@@ Expand Up / @@ -650,6 +650,7 @@ href @@
     HSM
     hsm
     HTTPS
+    Humidistat
     HW
     hwadr
     HydrogenConcentrationMeasurement
@@ Expand Down @@