Skip to content

Commit

Permalink
Cherry pick DM XML changes to 1.4 (#37389)
Browse files Browse the repository at this point in the history 
* 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 (#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 (#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>
  • Loading branch information
@cecille @restyled-commits
cecille and restyled-commits authored Feb 5, 2025
1 parent 3338248 commit f9f7909
Show file tree
Hide file tree
Showing 379 changed files with 50,795 additions and 12,196 deletions.
396 changes: 396 additions & 0 deletions data_model/1.4.1/clusters/ACL-Cluster.xml
View file

Large diffs are not rendered by default.

132 changes: 132 additions & 0 deletions data_model/1.4.1/clusters/AccountLogin.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
<?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
:xrefstyle: basic
-->
<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 revision"/>
<revision revision="2" summary="Add support for 8 character PIN code, Add Node to Login, Logout commands. Add LoggedOut event."/>
</revisionHistory>
<clusterIds>
<clusterId id="0x050E" name="Account Login"/>
</clusterIds>
<classification hierarchy="base" role="application" picsCode="ALOGIN" scope="Endpoint"/>
<commands>
<command id="0x00" name="GetSetupPIN" direction="commandToServer" response="GetSetupPINResponse">
<access invokePrivilege="admin" fabricScoped="true" timed="true"/>
<mandatoryConform/>
<field id="0" name="TempAccountIdentifier" type="string">
<mandatoryConform/>
<constraint>
<lengthBetween>
<from value="16"/>
<to value="100"/>
</lengthBetween>
</constraint>
</field>
</command>
<command id="0x01" name="GetSetupPINResponse" direction="responseFromServer">
<access fabricScoped="true"/>
<mandatoryConform/>
<field id="0" name="SetupPIN" type="string">
<mandatoryConform/>
<constraint>
<desc/>
</constraint>
</field>
</command>
<command id="0x02" name="Login" direction="commandToServer" response="Y">
<access invokePrivilege="admin" fabricScoped="true" timed="true"/>
<mandatoryConform/>
<field id="0" name="TempAccountIdentifier" type="string">
<mandatoryConform/>
<constraint>
<lengthBetween>
<from value="16"/>
<to value="100"/>
</lengthBetween>
</constraint>
</field>
<field id="1" name="SetupPIN" type="string">
<mandatoryConform/>
<constraint>
<minLength value="8"/>
</constraint>
</field>
<field id="2" name="Node" type="node-id">
<optionalConform/>
</field>
</command>
<command id="0x03" name="Logout" direction="commandToServer" response="Y">
<access invokePrivilege="operate" fabricScoped="true" timed="true"/>
<mandatoryConform/>
<field id="0" name="Node" type="node-id">
<optionalConform/>
</field>
</command>
</commands>
<events>
<event id="0x00" name="LoggedOut" priority="critical">
<access readPrivilege="admin" fabricSensitive="true"/>
<optionalConform/>
<field id="0" name="Node" type="node-id">
<optionalConform/>
</field>
</event>
</events>
</cluster>
173 changes: 173 additions & 0 deletions data_model/1.4.1/clusters/AdminCommissioningCluster.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
<?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
:xrefstyle: basic
-->
<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 revision"/>
</revisionHistory>
<clusterIds>
<clusterId id="0x003C" name="Administrator Commissioning"/>
</clusterIds>
<classification hierarchy="base" role="utility" picsCode="CADMIN" scope="Node"/>
<features>
<feature bit="0" code="BC" name="Basic" summary="Node supports Basic Commissioning Method.">
<optionalConform/>
</feature>
</features>
<dataTypes>
<enum name="CommissioningWindowStatusEnum">
<item value="0" name="WindowNotOpen" summary="Commissioning window not open">
<mandatoryConform/>
</item>
<item value="1" name="EnhancedWindowOpen" summary="An Enhanced Commissioning Method window is open">
<mandatoryConform/>
</item>
<item value="2" name="BasicWindowOpen" summary="A Basic Commissioning Method window is open">
<mandatoryConform>
<feature name="BC"/>
</mandatoryConform>
</item>
</enum>
<enum name="StatusCodeEnum">
<item value="0x02" name="Busy" summary="Could not be completed because another commissioning is in progress">
<mandatoryConform/>
</item>
<item value="0x03" name="PAKEParameterError" summary="Provided PAKE parameters were incorrectly formatted or otherwise invalid">
<mandatoryConform/>
</item>
<item value="0x04" name="WindowNotOpen" summary="No commissioning window was currently open">
<mandatoryConform/>
</item>
</enum>
</dataTypes>
<attributes>
<attribute id="0x0000" name="WindowStatus" type="CommissioningWindowStatusEnum">
<access read="true" readPrivilege="view"/>
<mandatoryConform/>
</attribute>
<attribute id="0x0001" name="AdminFabricIndex" type="fabric-idx">
<access read="true" readPrivilege="view"/>
<quality nullable="true"/>
<mandatoryConform/>
</attribute>
<attribute id="0x0002" name="AdminVendorId" type="vendor-id">
<access read="true" readPrivilege="view"/>
<quality nullable="true"/>
<mandatoryConform/>
</attribute>
</attributes>
<commands>
<command id="0x00" name="OpenCommissioningWindow" direction="commandToServer" response="Y">
<access invokePrivilege="admin" timed="true"/>
<mandatoryConform/>
<field id="0" name="CommissioningTimeout" type="uint16">
<mandatoryConform/>
<constraint>
<desc/>
</constraint>
</field>
<field id="1" name="PAKEPasscodeVerifier" type="octstr">
<mandatoryConform/>
</field>
<field id="2" name="Discriminator" type="uint16">
<mandatoryConform/>
<constraint>
<between>
<from value="0"/>
<to value="4095"/>
</between>
</constraint>
</field>
<field id="3" name="Iterations" type="uint32">
<mandatoryConform/>
<constraint>
<between>
<from value="1000"/>
<to value="100000"/>
</between>
</constraint>
</field>
<field id="4" name="Salt" type="octstr">
<mandatoryConform/>
<constraint>
<lengthBetween>
<from value="16"/>
<to value="32"/>
</lengthBetween>
</constraint>
</field>
</command>
<command id="0x01" name="OpenBasicCommissioningWindow" direction="commandToServer" response="Y">
<access invokePrivilege="admin" timed="true"/>
<mandatoryConform>
<feature name="BC"/>
</mandatoryConform>
<field id="0" name="CommissioningTimeout" type="uint16">
<mandatoryConform/>
<constraint>
<desc/>
</constraint>
</field>
</command>
<command id="0x02" name="RevokeCommissioning" direction="commandToServer" response="Y">
<access invokePrivilege="admin" timed="true"/>
<mandatoryConform/>
</command>
</commands>
</cluster>
Loading

0 comments on commit f9f7909

Please sign in to comment.