Skip to content

Commit df32baa

Browse files
lpbeliveau-silabslpbeliveau-silabs
committed
Updated xml files
1 parent 221e466 commit df32baa

File tree

2 files changed

+71
-232
lines changed

2 files changed

+71
-232
lines changed

‎data_model/clusters/Scenes.xml

Lines changed: 63 additions & 173 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
11
<?xml version="1.0"?>
2-
<!--
3-
Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
4-
The information within this document is the property of the Connectivity
5-
Standards Alliance and its use and disclosure are restricted, except as
6-
expressly set forth herein.
7-
8-
Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
9-
nontransferable, worldwide, limited and revocable license (without the right to
10-
sublicense), under Connectivity Standards Alliance's applicable copyright
11-
rights, to view, download, save, reproduce and use the document solely for your
12-
own internal purposes and in accordance with the terms of the license set forth
13-
herein. This license does not authorize you to, and you expressly warrant that
14-
you shall not: (a) permit others (outside your organization) to use this
15-
document; (b) post or publish this document; (c) modify, adapt, translate, or
16-
otherwise change this document in any manner or create any derivative work
17-
based on this document; (d) remove or modify any notice or label on this
18-
document, including this Copyright Notice, License and Disclaimer. The
19-
Connectivity Standards Alliance does not grant you any license hereunder other
20-
than as expressly stated herein.
21-
22-
Elements of this document may be subject to third party intellectual property
23-
rights, including without limitation, patent, copyright or trademark rights,
24-
and any such third party may or may not be a member of the Connectivity
25-
Standards Alliance. Connectivity Standards Alliance members grant other
26-
Connectivity Standards Alliance members certain intellectual property rights as
27-
set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
28-
Standards Alliance members do not grant you any rights under this license. The
29-
Connectivity Standards Alliance is not responsible for, and shall not be held
30-
responsible in any manner for, identifying or failing to identify any or all
31-
such third party intellectual property rights. Please visit www.csa-iot.org for
32-
more information on how to become a member of the Connectivity Standards
33-
Alliance.
34-
35-
This document and the information contained herein are provided on an “AS IS”
36-
basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
37-
OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
38-
INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
39-
WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
40-
OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
41-
FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
42-
CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
43-
BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
44-
DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
45-
DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
46-
OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
47-
LOSS OR DAMAGE.
48-
49-
All company, brand and product names in this document may be trademarks that
50-
are the sole property of their respective owners.
51-
52-
This notice and disclaimer must be included on all copies of this document.
53-
54-
Connectivity Standards Alliance
55-
508 Second Street, Suite 206
56-
Davis, CA 95616, USA
2+
<!--
3+
Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
4+
The information within this document is the property of the Connectivity
5+
Standards Alliance and its use and disclosure are restricted, except as
6+
expressly set forth herein.
7+
8+
Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
9+
nontransferable, worldwide, limited and revocable license (without the right to
10+
sublicense), under Connectivity Standards Alliance's applicable copyright
11+
rights, to view, download, save, reproduce and use the document solely for your
12+
own internal purposes and in accordance with the terms of the license set forth
13+
herein. This license does not authorize you to, and you expressly warrant that
14+
you shall not: (a) permit others (outside your organization) to use this
15+
document; (b) post or publish this document; (c) modify, adapt, translate, or
16+
otherwise change this document in any manner or create any derivative work
17+
based on this document; (d) remove or modify any notice or label on this
18+
document, including this Copyright Notice, License and Disclaimer. The
19+
Connectivity Standards Alliance does not grant you any license hereunder other
20+
than as expressly stated herein.
21+
22+
Elements of this document may be subject to third party intellectual property
23+
rights, including without limitation, patent, copyright or trademark rights,
24+
and any such third party may or may not be a member of the Connectivity
25+
Standards Alliance. Connectivity Standards Alliance members grant other
26+
Connectivity Standards Alliance members certain intellectual property rights as
27+
set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
28+
Standards Alliance members do not grant you any rights under this license. The
29+
Connectivity Standards Alliance is not responsible for, and shall not be held
30+
responsible in any manner for, identifying or failing to identify any or all
31+
such third party intellectual property rights. Please visit www.csa-iot.org for
32+
more information on how to become a member of the Connectivity Standards
33+
Alliance.
34+
35+
This document and the information contained herein are provided on an “AS IS”
36+
basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
37+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
38+
INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
39+
WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
40+
OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
41+
FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
42+
CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
43+
BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
44+
DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
45+
DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
46+
OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
47+
LOSS OR DAMAGE.
48+
49+
All company, brand and product names in this document may be trademarks that
50+
are the sole property of their respective owners.
51+
52+
This notice and disclaimer must be included on all copies of this document.
53+
54+
Connectivity Standards Alliance
55+
508 Second Street, Suite 206
56+
Davis, CA 95616, USA
5757
-->
5858
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0005" name="Scenes" revision="5">
5959
<revisionHistory>
@@ -68,27 +68,13 @@ Davis, CA 95616, USA
6868
<feature bit="0" code="SN" name="SceneNames" summary="The ability to store a name for a scene.">
6969
<optionalConform/>
7070
</feature>
71-
<feature bit="1" code="EX" name="Explicit" summary="Use explicit attribute IDs, not implicit based on order">
72-
<mandatoryConform/>
73-
</feature>
74-
<feature bit="2" code="TS" name="TableSize" summary="Table size and remaining capacity supported">
75-
<mandatoryConform/>
76-
</feature>
77-
<feature bit="3" code="FS" name="FabricScenes" summary="Supports current scene, count, group etc, as fabric-scoped.">
78-
<mandatoryConform/>
79-
</feature>
8071
</features>
8172
<dataTypes>
8273
<bitmap name="CopyModeBitmap">
8374
<bitfield name="CopyAllScenes" bit="0" summary="Copy all scenes in the scene table">
8475
<mandatoryConform/>
8576
</bitfield>
8677
</bitmap>
87-
<bitmap name="NameSupportBitmap">
88-
<bitfield name="SceneNames" bit="7" summary="The ability to store a name for a scene.">
89-
<mandatoryConform/>
90-
</bitfield>
91-
</bitmap>
9278
<struct name="AttributeValuePairStruct">
9379
<field id="0" name="AttributeID" type="attribute-id">
9480
<access read="true" write="true"/>
@@ -156,16 +142,12 @@ Davis, CA 95616, USA
156142
</mandatoryConform>
157143
<constraint type="maxLength" value="16"/>
158144
</field>
159-
<field id="3" name="SceneTransitionTime" type="uint16" default="0">
145+
<field id="3" name="SceneTransitionTimeMS" type="uint32" default="0">
160146
<mandatoryConform/>
161147
</field>
162148
<field id="4" name="ExtensionFields" type="list[ExtensionFieldSetStruct Type]" default="empty">
163149
<mandatoryConform/>
164150
</field>
165-
<field id="5" name="TransitionTime100ms" type="uint8" default="0">
166-
<mandatoryConform/>
167-
<constraint type="max" value="9"/>
168-
</field>
169151
</struct>
170152
<struct name="SceneInfoStruct">
171153
<field id="0" name="SceneCount" type="uint8" default="0">
@@ -194,43 +176,6 @@ Davis, CA 95616, USA
194176
</struct>
195177
</dataTypes>
196178
<attributes>
197-
<attribute id="0x0000" name="SceneCount" type="uint8" default="0">
198-
<access read="true" readPrivilege="view"/>
199-
<mandatoryConform>
200-
<notTerm>
201-
<feature name="FS"/>
202-
</notTerm>
203-
</mandatoryConform>
204-
</attribute>
205-
<attribute id="0x0001" name="CurrentScene" type="uint8" default="0">
206-
<access read="true" readPrivilege="view"/>
207-
<mandatoryConform>
208-
<notTerm>
209-
<feature name="FS"/>
210-
</notTerm>
211-
</mandatoryConform>
212-
</attribute>
213-
<attribute id="0x0002" name="CurrentGroup" type="group-id" default="0">
214-
<access read="true" readPrivilege="view"/>
215-
<mandatoryConform>
216-
<notTerm>
217-
<feature name="FS"/>
218-
</notTerm>
219-
</mandatoryConform>
220-
</attribute>
221-
<attribute id="0x0003" name="SceneValid" type="bool" default="False">
222-
<access read="true" readPrivilege="view"/>
223-
<mandatoryConform>
224-
<notTerm>
225-
<feature name="FS"/>
226-
</notTerm>
227-
</mandatoryConform>
228-
</attribute>
229-
<attribute id="0x0004" name="NameSupport" type="NameSupportBitmap" default="0">
230-
<access read="true" readPrivilege="view"/>
231-
<mandatoryConform/>
232-
<constraint type="desc"/>
233-
</attribute>
234179
<attribute id="0x0005" name="LastConfiguredBy" type="node-id" default="null">
235180
<access read="true" readPrivilege="view"/>
236181
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
@@ -262,9 +207,9 @@ Davis, CA 95616, USA
262207
<field id="1" name="SceneID" type="uint8">
263208
<mandatoryConform/>
264209
</field>
265-
<field id="2" name="TransitionTime" type="uint16">
210+
<field id="2" name="TransitionTimeMS" type="uint32">
266211
<mandatoryConform/>
267-
<constraint type="max" value="6000"/>
212+
<constraint type="max" value="6000000"/>
268213
</field>
269214
<field id="3" name="SceneName" type="string">
270215
<mandatoryConform/>
@@ -312,8 +257,8 @@ Davis, CA 95616, USA
312257
<field id="2" name="SceneID" type="uint8">
313258
<mandatoryConform/>
314259
</field>
315-
<field id="3" name="TransitionTime" type="uint16">
316-
<constraint type="max" value="6000"/>
260+
<field id="3" name="TransitionTimeMS" type="uint32">
261+
<constraint type="max" value="6000000"/>
317262
</field>
318263
<field id="4" name="SceneName" type="string">
319264
<constraint type="maxLength" value="16"/>
@@ -395,10 +340,10 @@ Davis, CA 95616, USA
395340
<field id="1" name="SceneID" type="uint8">
396341
<mandatoryConform/>
397342
</field>
398-
<field id="2" name="TransitionTime" type="uint16">
343+
<field id="2" name="TransitionTimeMS" type="uint32">
399344
<quality nullable="true"/>
400345
<optionalConform/>
401-
<constraint type="max" value="60000"/>
346+
<constraint type="max" value="60000000"/>
402347
</field>
403348
</command>
404349
<command id="0x06" name="GetSceneMembership" response="GetSceneMembershipResponse">
@@ -426,61 +371,6 @@ Davis, CA 95616, USA
426371
<entry type="uint8"/>
427372
</field>
428373
</command>
429-
<command id="0x40" name="EnhancedAddScene" response="EnhancedAddSceneResponse">
430-
<access invokePrivilege="manage"/>
431-
<optionalConform/>
432-
<field id="0" name="GroupID" type="group-id">
433-
<mandatoryConform/>
434-
</field>
435-
<field id="1" name="SceneID" type="uint8">
436-
<mandatoryConform/>
437-
</field>
438-
<field id="2" name="TransitionTime" type="uint16">
439-
<mandatoryConform/>
440-
<constraint type="max" value="60000"/>
441-
</field>
442-
<field id="3" name="SceneName" type="string">
443-
<mandatoryConform/>
444-
<constraint type="maxLength" value="16"/>
445-
</field>
446-
<field id="4" name="ExtensionFieldSetStructs" type="list[ExtensionFieldSetStruct Type]">
447-
<mandatoryConform/>
448-
<constraint type="desc"/>
449-
</field>
450-
</command>
451-
<command id="0x40" name="EnhancedAddSceneResponse" direction="responseFromServer">
452-
<access invokePrivilege="operate"/>
453-
<mandatoryConform>
454-
<attribute name="EnhancedAddScene"/>
455-
</mandatoryConform>
456-
</command>
457-
<command id="0x41" name="EnhancedViewScene" response="EnhancedViewSceneResponse">
458-
<access invokePrivilege="operate"/>
459-
<optionalConform/>
460-
</command>
461-
<command id="0x41" name="EnhancedViewSceneResponse" direction="responseFromServer">
462-
<access invokePrivilege="operate"/>
463-
<mandatoryConform>
464-
<attribute name="EnhancedViewScene"/>
465-
</mandatoryConform>
466-
<field id="0" name="Status" type="status">
467-
<mandatoryConform/>
468-
<constraint type="desc"/>
469-
</field>
470-
<field id="1" name="GroupID" type="group-id">
471-
<mandatoryConform/>
472-
</field>
473-
<field id="2" name="SceneID" type="uint8">
474-
<mandatoryConform/>
475-
</field>
476-
<field id="3" name="TransitionTime" type="uint16">
477-
<constraint type="max" value="60000"/>
478-
</field>
479-
<field id="4" name="SceneName" type="string">
480-
<constraint type="maxLength" value="16"/>
481-
</field>
482-
<field id="5" name="ExtensionFieldSetStructs" type="list[ExtensionFieldSetStruct Type]"/>
483-
</command>
484374
<command id="0x42" name="CopyScene" response="CopySceneResponse">
485375
<access invokePrivilege="manage"/>
486376
<optionalConform/>
@@ -518,4 +408,4 @@ Davis, CA 95616, USA
518408
</field>
519409
</command>
520410
</commands>
521-
</cluster>
411+
</cluster>

0 commit comments

Comments
 (0)