Updated xml files

project-chip · Jan 10, 2024 · 001f492 · 001f492
1 parent 23f3af8
commit 001f492
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 237 deletions.
diff --git a/data_model/clusters/Scenes.xml b/data_model/clusters/Scenes.xml
@@ -1,59 +1,59 @@
 <?xml version="1.0"?>
-<!--
-Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
-The information within this document is the property of the Connectivity
-Standards Alliance and its use and disclosure are restricted, except as
-expressly set forth herein.
-
-Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
-nontransferable, worldwide, limited and revocable license (without the right to
-sublicense), under Connectivity Standards Alliance's applicable copyright
-rights, to view, download, save, reproduce and use the document solely for your
-own internal purposes and in accordance with the terms of the license set forth
-herein. This license does not authorize you to, and you expressly warrant that
-you shall not: (a) permit others (outside your organization) to use this
-document; (b) post or publish this document; (c) modify, adapt, translate, or
-otherwise change this document in any manner or create any derivative work
-based on this document; (d) remove or modify any notice or label on this
-document, including this Copyright Notice, License and Disclaimer. The
-Connectivity Standards Alliance does not grant you any license hereunder other
-than as expressly stated herein.
-
-Elements of this document may be subject to third party intellectual property
-rights, including without limitation, patent, copyright or trademark rights,
-and any such third party may or may not be a member of the Connectivity
-Standards Alliance. Connectivity Standards Alliance members grant other
-Connectivity Standards Alliance members certain intellectual property rights as
-set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
-Standards Alliance members do not grant you any rights under this license. The
-Connectivity Standards Alliance is not responsible for, and shall not be held
-responsible in any manner for, identifying or failing to identify any or all
-such third party intellectual property rights. Please visit www.csa-iot.org for
-more information on how to become a member of the Connectivity Standards
-Alliance.
-
-This document and the information contained herein are provided on an “AS IS”
-basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
-INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
-WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
-OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
-CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
-BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
-DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
-DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
-OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-LOSS OR DAMAGE.
-
-All company, brand and product names in this document may be trademarks that
-are the sole property of their respective owners.
-
-This notice and disclaimer must be included on all copies of this document.
-
-Connectivity Standards Alliance
-508 Second Street, Suite 206
-Davis, CA 95616, USA
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0005" name="Scenes" revision="5">
   <revisionHistory>
@@ -68,27 +68,13 @@ Davis, CA 95616, USA
     <feature bit="0" code="SN" name="SceneNames" summary="The ability to store a name for a scene.">
       <optionalConform/>
     </feature>
-    <feature bit="1" code="EX" name="Explicit" summary="Use explicit attribute IDs, not implicit based on order">
-      <mandatoryConform/>
-    </feature>
-    <feature bit="2" code="TS" name="TableSize" summary="Table size and remaining capacity supported">
-      <mandatoryConform/>
-    </feature>
-    <feature bit="3" code="FS" name="FabricScenes" summary="Supports current scene, count, group etc, as fabric-scoped.">
-      <mandatoryConform/>
-    </feature>
   </features>
   <dataTypes>
     <bitmap name="CopyModeBitmap">
       <bitfield name="CopyAllScenes" bit="0" summary="Copy all scenes in the scene table">
         <mandatoryConform/>
       </bitfield>
     </bitmap>
-    <bitmap name="NameSupportBitmap">
-      <bitfield name="SceneNames" bit="7" summary="The ability to store a name for a scene.">
-        <mandatoryConform/>
-      </bitfield>
-    </bitmap>
     <struct name="AttributeValuePairStruct">
       <field id="0" name="AttributeID" type="attribute-id">
         <access read="true" write="true"/>
@@ -157,17 +143,13 @@ Davis, CA 95616, USA
         </mandatoryConform>
         <constraint type="maxLength" value="16"/>
       </field>
-      <field id="3" name="SceneTransitionTime" type="uint16" default="0">
+      <field id="3" name="SceneTransitionTimeMS" type="uint32" default="0">
         <mandatoryConform/>
       </field>
       <field id="4" name="ExtensionFields" type="list" default="empty">
         <entry type="ExtensionFieldSetStruct"/>
         <mandatoryConform/>
       </field>
-      <field id="5" name="TransitionTime100ms" type="uint8" default="0">
-        <mandatoryConform/>
-        <constraint type="max" value="9"/>
-      </field>
     </struct>
     <struct name="SceneInfoStruct">
       <field id="0" name="SceneCount" type="uint8" default="0">
@@ -197,43 +179,6 @@ Davis, CA 95616, USA
     </struct>
   </dataTypes>
   <attributes>
-    <attribute id="0x0000" name="SceneCount" type="uint8" default="0">
-      <access read="true" readPrivilege="view"/>
-      <mandatoryConform>
-        <notTerm>
-          <feature name="FS"/>
-        </notTerm>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x0001" name="CurrentScene" type="uint8" default="0">
-      <access read="true" readPrivilege="view"/>
-      <mandatoryConform>
-        <notTerm>
-          <feature name="FS"/>
-        </notTerm>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x0002" name="CurrentGroup" type="group-id" default="0">
-      <access read="true" readPrivilege="view"/>
-      <mandatoryConform>
-        <notTerm>
-          <feature name="FS"/>
-        </notTerm>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x0003" name="SceneValid" type="bool" default="False">
-      <access read="true" readPrivilege="view"/>
-      <mandatoryConform>
-        <notTerm>
-          <feature name="FS"/>
-        </notTerm>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x0004" name="NameSupport" type="NameSupportBitmap" default="0">
-      <access read="true" readPrivilege="view"/>
-      <mandatoryConform/>
-      <constraint type="desc"/>
-    </attribute>
     <attribute id="0x0005" name="LastConfiguredBy" type="node-id" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
@@ -266,9 +211,9 @@ Davis, CA 95616, USA
       <field id="1" name="SceneID" type="uint8">
         <mandatoryConform/>
       </field>
-      <field id="2" name="TransitionTime" type="uint16">
+      <field id="2" name="TransitionTimeMS" type="uint32">
         <mandatoryConform/>
-        <constraint type="max" value="6000"/>
+        <constraint type="max" value="6000000"/>
       </field>
       <field id="3" name="SceneName" type="string">
         <mandatoryConform/>
@@ -317,8 +262,8 @@ Davis, CA 95616, USA
       <field id="2" name="SceneID" type="uint8">
         <mandatoryConform/>
       </field>
-      <field id="3" name="TransitionTime" type="uint16">
-        <constraint type="max" value="6000"/>
+      <field id="3" name="TransitionTimeMS" type="uint32">
+        <constraint type="max" value="6000000"/>
       </field>
       <field id="4" name="SceneName" type="string">
         <constraint type="maxLength" value="16"/>
@@ -402,10 +347,10 @@ Davis, CA 95616, USA
       <field id="1" name="SceneID" type="uint8">
         <mandatoryConform/>
       </field>
-      <field id="2" name="TransitionTime" type="uint16">
+      <field id="2" name="TransitionTimeMS" type="uint32">
         <quality nullable="true"/>
         <optionalConform/>
-        <constraint type="max" value="60000"/>
+        <constraint type="max" value="60000000"/>
       </field>
     </command>
     <command id="0x06" name="GetSceneMembership" response="GetSceneMembershipResponse">
@@ -433,65 +378,7 @@ Davis, CA 95616, USA
         <entry type="uint8"/>
       </field>
     </command>
-    <command id="0x40" name="EnhancedAddScene" response="EnhancedAddSceneResponse">
-      <access invokePrivilege="manage"/>
-      <optionalConform/>
-      <field id="0" name="GroupID" type="group-id">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="SceneID" type="uint8">
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="TransitionTime" type="uint16">
-        <mandatoryConform/>
-        <constraint type="max" value="60000"/>
-      </field>
-      <field id="3" name="SceneName" type="string">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="16"/>
-      </field>
-      <field id="4" name="ExtensionFieldSetStructs" type="list">
-        <entry type="ExtensionFieldSetStruct"/>
-        <mandatoryConform/>
-        <constraint type="desc"/>
-      </field>
-    </command>
-    <command id="0x40" name="EnhancedAddSceneResponse" direction="responseFromServer">
-      <access invokePrivilege="operate"/>
-      <mandatoryConform>
-        <attribute name="EnhancedAddScene"/>
-      </mandatoryConform>
-    </command>
-    <command id="0x41" name="EnhancedViewScene" response="EnhancedViewSceneResponse">
-      <access invokePrivilege="operate"/>
-      <optionalConform/>
-    </command>
-    <command id="0x41" name="EnhancedViewSceneResponse" direction="responseFromServer">
-      <access invokePrivilege="operate"/>
-      <mandatoryConform>
-        <attribute name="EnhancedViewScene"/>
-      </mandatoryConform>
-      <field id="0" name="Status" type="status">
-        <mandatoryConform/>
-        <constraint type="desc"/>
-      </field>
-      <field id="1" name="GroupID" type="group-id">
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="SceneID" type="uint8">
-        <mandatoryConform/>
-      </field>
-      <field id="3" name="TransitionTime" type="uint16">
-        <constraint type="max" value="60000"/>
-      </field>
-      <field id="4" name="SceneName" type="string">
-        <constraint type="maxLength" value="16"/>
-      </field>
-      <field id="5" name="ExtensionFieldSetStructs" type="list">
-        <entry type="ExtensionFieldSetStruct"/>
-      </field>
-    </command>
-    <command id="0x42" name="CopyScene" response="CopySceneResponse">
+    <command id="0x40" name="CopyScene" response="CopySceneResponse">
       <access invokePrivilege="manage"/>
       <optionalConform/>
       <field id="0" name="Mode" type="CopyModeBitmap">
@@ -511,7 +398,7 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x42" name="CopySceneResponse" direction="responseFromServer">
+    <command id="0x40" name="CopySceneResponse" direction="responseFromServer">
       <access invokePrivilege="operate"/>
       <mandatoryConform>
         <attribute name="CopyScene"/>
@@ -528,4 +415,4 @@ Davis, CA 95616, USA
       </field>
     </command>
   </commands>
-</cluster>
+</cluster>