Skip to content

Commit f9f7909

Browse files
cecillerestyled-commits
cecille
and
restyled-commits
authored
Cherry pick DM XML changes to 1.4 (project-chip#37389)
* Add 1.4.1 as a direct copy of 1.4 This can be used to see a diff between these two releases * Update alchemy version on 1.4 changes contraints - will update on tot soon, but don't want to wait for the PR to land before this goes in. * data model files at the 1.4.1 tag * Add 1.4.1 to parser with tests. * Restyled by isort * Fixup includes * Update 1.4 DM XMLs to latest (project-chip#37146) * Update 1.4 DM XMLs to latest * Fix CI checker so it properly checks spec_sha * DM XMLs: switch 1.4 to use alchemy (project-chip#37201) * Run dos2unix on all DM XML files in 1.4 * Add newlines at end of all DM XML files for 1.4 sed -i -e '$a\' data_model/1.4/device_types/* sed -i -e '$a\' data_model/1.4/clusters/* * DM XMLs: switch 1.4 DM XMLs to alchemy * Generator updates to alchemy * Update 1.4 using alchemy 1.5.0 * Restyled by autopep8 * Add the in-progress defines to match the 1.5 0.7 spec ballot * Fix define processing for alchemy, add tag file * Fix linter, add check for non-existent tag file * Remove a leftover file - this isn't generated by alchemy * Remove file from gni list --------- Co-authored-by: Restyled.io <commits@restyled.io> --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 3338248 commit f9f7909

File tree

379 files changed

+50795
-12196
lines changed

Some content is hidden

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

379 files changed

+50795
-12196
lines changed

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

+396
Large diffs are not rendered by default.

‎data_model/1.4.1/clusters/AccountLogin.xml

+132
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
<?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
57+
58+
:xrefstyle: basic
59+
-->
60+
<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">
61+
<revisionHistory>
62+
<revision revision="1" summary="Initial revision"/>
63+
<revision revision="2" summary="Add support for 8 character PIN code, Add Node to Login, Logout commands. Add LoggedOut event."/>
64+
</revisionHistory>
65+
<clusterIds>
66+
<clusterId id="0x050E" name="Account Login"/>
67+
</clusterIds>
68+
<classification hierarchy="base" role="application" picsCode="ALOGIN" scope="Endpoint"/>
69+
<commands>
70+
<command id="0x00" name="GetSetupPIN" direction="commandToServer" response="GetSetupPINResponse">
71+
<access invokePrivilege="admin" fabricScoped="true" timed="true"/>
72+
<mandatoryConform/>
73+
<field id="0" name="TempAccountIdentifier" type="string">
74+
<mandatoryConform/>
75+
<constraint>
76+
<lengthBetween>
77+
<from value="16"/>
78+
<to value="100"/>
79+
</lengthBetween>
80+
</constraint>
81+
</field>
82+
</command>
83+
<command id="0x01" name="GetSetupPINResponse" direction="responseFromServer">
84+
<access fabricScoped="true"/>
85+
<mandatoryConform/>
86+
<field id="0" name="SetupPIN" type="string">
87+
<mandatoryConform/>
88+
<constraint>
89+
<desc/>
90+
</constraint>
91+
</field>
92+
</command>
93+
<command id="0x02" name="Login" direction="commandToServer" response="Y">
94+
<access invokePrivilege="admin" fabricScoped="true" timed="true"/>
95+
<mandatoryConform/>
96+
<field id="0" name="TempAccountIdentifier" type="string">
97+
<mandatoryConform/>
98+
<constraint>
99+
<lengthBetween>
100+
<from value="16"/>
101+
<to value="100"/>
102+
</lengthBetween>
103+
</constraint>
104+
</field>
105+
<field id="1" name="SetupPIN" type="string">
106+
<mandatoryConform/>
107+
<constraint>
108+
<minLength value="8"/>
109+
</constraint>
110+
</field>
111+
<field id="2" name="Node" type="node-id">
112+
<optionalConform/>
113+
</field>
114+
</command>
115+
<command id="0x03" name="Logout" direction="commandToServer" response="Y">
116+
<access invokePrivilege="operate" fabricScoped="true" timed="true"/>
117+
<mandatoryConform/>
118+
<field id="0" name="Node" type="node-id">
119+
<optionalConform/>
120+
</field>
121+
</command>
122+
</commands>
123+
<events>
124+
<event id="0x00" name="LoggedOut" priority="critical">
125+
<access readPrivilege="admin" fabricSensitive="true"/>
126+
<optionalConform/>
127+
<field id="0" name="Node" type="node-id">
128+
<optionalConform/>
129+
</field>
130+
</event>
131+
</events>
132+
</cluster>

‎data_model/1.4.1/clusters/AdminCommissioningCluster.xml

+173
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
<?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
57+
58+
:xrefstyle: basic
59+
-->
60+
<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">
61+
<revisionHistory>
62+
<revision revision="1" summary="Initial revision"/>
63+
</revisionHistory>
64+
<clusterIds>
65+
<clusterId id="0x003C" name="Administrator Commissioning"/>
66+
</clusterIds>
67+
<classification hierarchy="base" role="utility" picsCode="CADMIN" scope="Node"/>
68+
<features>
69+
<feature bit="0" code="BC" name="Basic" summary="Node supports Basic Commissioning Method.">
70+
<optionalConform/>
71+
</feature>
72+
</features>
73+
<dataTypes>
74+
<enum name="CommissioningWindowStatusEnum">
75+
<item value="0" name="WindowNotOpen" summary="Commissioning window not open">
76+
<mandatoryConform/>
77+
</item>
78+
<item value="1" name="EnhancedWindowOpen" summary="An Enhanced Commissioning Method window is open">
79+
<mandatoryConform/>
80+
</item>
81+
<item value="2" name="BasicWindowOpen" summary="A Basic Commissioning Method window is open">
82+
<mandatoryConform>
83+
<feature name="BC"/>
84+
</mandatoryConform>
85+
</item>
86+
</enum>
87+
<enum name="StatusCodeEnum">
88+
<item value="0x02" name="Busy" summary="Could not be completed because another commissioning is in progress">
89+
<mandatoryConform/>
90+
</item>
91+
<item value="0x03" name="PAKEParameterError" summary="Provided PAKE parameters were incorrectly formatted or otherwise invalid">
92+
<mandatoryConform/>
93+
</item>
94+
<item value="0x04" name="WindowNotOpen" summary="No commissioning window was currently open">
95+
<mandatoryConform/>
96+
</item>
97+
</enum>
98+
</dataTypes>
99+
<attributes>
100+
<attribute id="0x0000" name="WindowStatus" type="CommissioningWindowStatusEnum">
101+
<access read="true" readPrivilege="view"/>
102+
<mandatoryConform/>
103+
</attribute>
104+
<attribute id="0x0001" name="AdminFabricIndex" type="fabric-idx">
105+
<access read="true" readPrivilege="view"/>
106+
<quality nullable="true"/>
107+
<mandatoryConform/>
108+
</attribute>
109+
<attribute id="0x0002" name="AdminVendorId" type="vendor-id">
110+
<access read="true" readPrivilege="view"/>
111+
<quality nullable="true"/>
112+
<mandatoryConform/>
113+
</attribute>
114+
</attributes>
115+
<commands>
116+
<command id="0x00" name="OpenCommissioningWindow" direction="commandToServer" response="Y">
117+
<access invokePrivilege="admin" timed="true"/>
118+
<mandatoryConform/>
119+
<field id="0" name="CommissioningTimeout" type="uint16">
120+
<mandatoryConform/>
121+
<constraint>
122+
<desc/>
123+
</constraint>
124+
</field>
125+
<field id="1" name="PAKEPasscodeVerifier" type="octstr">
126+
<mandatoryConform/>
127+
</field>
128+
<field id="2" name="Discriminator" type="uint16">
129+
<mandatoryConform/>
130+
<constraint>
131+
<between>
132+
<from value="0"/>
133+
<to value="4095"/>
134+
</between>
135+
</constraint>
136+
</field>
137+
<field id="3" name="Iterations" type="uint32">
138+
<mandatoryConform/>
139+
<constraint>
140+
<between>
141+
<from value="1000"/>
142+
<to value="100000"/>
143+
</between>
144+
</constraint>
145+
</field>
146+
<field id="4" name="Salt" type="octstr">
147+
<mandatoryConform/>
148+
<constraint>
149+
<lengthBetween>
150+
<from value="16"/>
151+
<to value="32"/>
152+
</lengthBetween>
153+
</constraint>
154+
</field>
155+
</command>
156+
<command id="0x01" name="OpenBasicCommissioningWindow" direction="commandToServer" response="Y">
157+
<access invokePrivilege="admin" timed="true"/>
158+
<mandatoryConform>
159+
<feature name="BC"/>
160+
</mandatoryConform>
161+
<field id="0" name="CommissioningTimeout" type="uint16">
162+
<mandatoryConform/>
163+
<constraint>
164+
<desc/>
165+
</constraint>
166+
</field>
167+
</command>
168+
<command id="0x02" name="RevokeCommissioning" direction="commandToServer" response="Y">
169+
<access invokePrivilege="admin" timed="true"/>
170+
<mandatoryConform/>
171+
</command>
172+
</commands>
173+
</cluster>

0 commit comments

Comments
 (0)