Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM XML: Add device types to script and re-gen #30387

Merged
merged 4 commits into from
Nov 15, 2023
Merged

DM XML: Add device types to script and re-gen #30387

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5b2d70
DM XML: Add device types to script and re-gen
cecille Nov 9, 2023
6db0f45
Merge remote-tracking branch 'upstream/master' into DM_xml_add_device…
cecille Nov 14, 2023
700bf48
Address review comments, use new scraper, add version
cecille Nov 14, 2023
f290f13
Use old scraper version
cecille Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions data_model/clusters/ACL-Cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ 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="0x001f" name="AccessControl" revision="1">
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001F" name="AccessControl" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
Expand Down Expand Up @@ -112,21 +112,21 @@ Davis, CA 95616, USA
<access fabricSensitive="true"/>
<mandatoryConform/>
</field>
<field id="3" name="Subjects" type="&lt;&lt;ref_DataTypeList&gt;&gt;[&lt;&lt;ref_SubjectId&gt;&gt;]">
<field id="3" name="Subjects" type="ref_DataTypeList[SubjectID]">
<access fabricSensitive="true"/>
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="max" value="SubjectsPerAccessControlEntry"/>
</field>
<field id="4" name="Targets" type="&lt;&lt;ref_DataTypeList&gt;&gt;[AccessControlTargetStruct Type]">
<field id="4" name="Targets" type="ref_DataTypeList[AccessControlTargetStruct Type]">
<access fabricSensitive="true"/>
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="max" value="TargetsPerAccessControlEntry"/>
</field>
</struct>
<struct name="AccessControlExtensionStruct">
<field id="1" name="Data" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
<field id="1" name="Data" type="ref_DataTypeOctstr">
<access fabricSensitive="true"/>
<mandatoryConform/>
<constraint type="max" value="128"/>
Expand All @@ -148,12 +148,12 @@ Davis, CA 95616, USA
</struct>
</dataTypes>
<attributes>
<attribute id="0x0000" name="ACL" type="&lt;&lt;ref_DataTypeList&gt;&gt;[AccessControlEntryStruct Type]" default="desc">
<attribute id="0x0000" name="ACL" type="ref_DataTypeList[AccessControlEntryStruct Type]" default="desc">
<access read="true" write="true" readPrivilege="admin" writePrivilege="operate"/>
<mandatoryConform/>
<constraint type="desc"/>
</attribute>
<attribute id="0x0001" name="Extension" type="&lt;&lt;ref_DataTypeList&gt;&gt;[AccessControlExtensionStruct Type]" default="desc">
<attribute id="0x0001" name="Extension" type="ref_DataTypeList[AccessControlExtensionStruct Type]" default="desc">
<access read="true" write="true" readPrivilege="admin" writePrivilege="operate"/>
<optionalConform/>
<constraint type="desc"/>
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/AccountLogin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ 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="0x050e" name="Account Login" revision="1">
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050E" name="Account Login" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
Expand Down
8 changes: 4 additions & 4 deletions data_model/clusters/AdminCommissioningCluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ 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="0x003c" name="Administrator Commissioning" revision="1">
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x003C" name="Administrator Commissioning" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
Expand Down Expand Up @@ -92,7 +92,7 @@ Davis, CA 95616, USA
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<mandatoryConform/>
</attribute>
<attribute id="0x0002" name="AdminVendorId" type="&lt;&lt;ref_DataTypeVendorId&gt;&gt;">
<attribute id="0x0002" name="AdminVendorId" type="ref_DataTypeVendorId">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<mandatoryConform/>
Expand All @@ -106,7 +106,7 @@ Davis, CA 95616, USA
<mandatoryConform/>
<constraint type="desc"/>
</field>
<field id="1" name="PAKEPasscodeVerifier" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
<field id="1" name="PAKEPasscodeVerifier" type="ref_DataTypeOctstr">
<mandatoryConform/>
</field>
<field id="2" name="Discriminator" type="uint16">
Expand All @@ -117,7 +117,7 @@ Davis, CA 95616, USA
<mandatoryConform/>
<constraint type="between" from="1000" to="100000"/>
</field>
<field id="4" name="Salt" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
<field id="4" name="Salt" type="ref_DataTypeOctstr">
<mandatoryConform/>
<constraint type="between" from="16" to="32"/>
</field>
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/AirQuality.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ 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="0x005b" name="Air Quality" revision="1">
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005B" name="Air Quality" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial version of the Air Quality cluster"/>
</revisionHistory>
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/ApplicationBasic.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ 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="0x050d" name="Application Basic" revision="1">
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050D" name="Application Basic" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
Expand Down
6 changes: 3 additions & 3 deletions data_model/clusters/ApplicationLauncher.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ 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="0x050c" name="Application Launcher" 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" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
Expand Down Expand Up @@ -120,7 +120,7 @@ Davis, CA 95616, USA
</mandatoryConform>
<constraint type="desc"/>
</field>
<field id="1" name="Data" type="octets" default="MS">
<field id="1" name="Data" type="octstr" default="MS">
<optionalConform/>
</field>
</command>
Expand Down Expand Up @@ -150,7 +150,7 @@ Davis, CA 95616, USA
<field id="0" name="Status" type="StatusEnum">
<mandatoryConform/>
</field>
<field id="1" name="Data" type="octets" default="MS">
<field id="1" name="Data" type="octstr" default="MS">
<optionalConform/>
</field>
</command>
Expand Down
8 changes: 3 additions & 5 deletions data_model/clusters/AudioOutput.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ 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="0x050b" name="Audio Output" revision="1">
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050B" name="Audio Output" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
Expand Down Expand Up @@ -88,22 +88,20 @@ Davis, CA 95616, USA
</enum>
<struct name="OutputInfoStruct">
<field id="0" name="Index" type="uint8">
<access read="true" write="true"/>
<mandatoryConform/>
</field>
<field id="1" name="OutputType" type="OutputTypeEnum">
<access read="true" write="true"/>
<mandatoryConform/>
<constraint type="desc"/>
</field>
<field id="2" name="Name" type="string">
<access read="true" write="true"/>
<mandatoryConform/>
</field>
</struct>
</dataTypes>
<attributes>
<attribute id="0x0000" name="OutputList" type="list[OutputInfoStruct Type]">
<attribute id="0x0000" name="OutputList" type="list">
<entry type="OutputInfoStruct"/>
<access read="true" readPrivilege="view"/>
<mandatoryConform/>
</attribute>
Expand Down
28 changes: 13 additions & 15 deletions data_model/clusters/BasicInformationCluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,9 @@ Davis, CA 95616, USA
</struct>
<struct name="ProductAppearanceStruct">
<field id="0" name="Finish" type="ProductFinishEnum">
<access read="true" write="true"/>
<mandatoryConform/>
</field>
<field id="1" name="PrimaryColor" type="ColorEnum">
<access read="true" write="true"/>
<quality nullable="true"/>
<mandatoryConform/>
</field>
Expand All @@ -176,18 +174,18 @@ Davis, CA 95616, USA
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform/>
</attribute>
<attribute id="0x0001" name="VendorName" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
<attribute id="0x0001" name="VendorName" type="ref_DataTypeString" default="MS">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform/>
<constraint type="max" value="32"/>
</attribute>
<attribute id="0x0002" name="VendorID" type="&lt;&lt;ref_DataTypeVendorId&gt;&gt;" default="MS">
<attribute id="0x0002" name="VendorID" type="ref_DataTypeVendorId" default="MS">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform/>
</attribute>
<attribute id="0x0003" name="ProductName" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
<attribute id="0x0003" name="ProductName" type="ref_DataTypeString" default="MS">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform/>
Expand All @@ -198,13 +196,13 @@ Davis, CA 95616, USA
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform/>
</attribute>
<attribute id="0x0005" name="NodeLabel" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="&quot;">
<attribute id="0x0005" name="NodeLabel" type="ref_DataTypeString" default="&quot;">
<access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
<mandatoryConform/>
<constraint type="max" value="32"/>
</attribute>
<attribute id="0x0006" name="Location" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="&quot;XX&quot;">
<attribute id="0x0006" name="Location" type="ref_DataTypeString" default="&quot;XX&quot;">
<access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
<mandatoryConform/>
Expand All @@ -215,7 +213,7 @@ Davis, CA 95616, USA
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform/>
</attribute>
<attribute id="0x0008" name="HardwareVersionString" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
<attribute id="0x0008" name="HardwareVersionString" type="ref_DataTypeString" default="MS">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform/>
Expand All @@ -227,37 +225,37 @@ Davis, CA 95616, USA
<mandatoryConform/>
<constraint type="desc"/>
</attribute>
<attribute id="0x000a" name="SoftwareVersionString" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
<attribute id="0x000A" name="SoftwareVersionString" type="ref_DataTypeString" default="MS">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<mandatoryConform/>
<constraint type="between" from="1" to="64"/>
</attribute>
<attribute id="0x000b" name="ManufacturingDate" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
<attribute id="0x000B" name="ManufacturingDate" type="ref_DataTypeString" default="MS">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<optionalConform/>
<constraint type="between" from="8" to="16"/>
</attribute>
<attribute id="0x000c" name="PartNumber" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
<attribute id="0x000C" name="PartNumber" type="ref_DataTypeString" default="MS">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<optionalConform/>
<constraint type="max" value="32"/>
</attribute>
<attribute id="0x000d" name="ProductURL" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
<attribute id="0x000D" name="ProductURL" type="ref_DataTypeString" default="MS">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<optionalConform/>
<constraint type="max" value="256"/>
</attribute>
<attribute id="0x000e" name="ProductLabel" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
<attribute id="0x000E" name="ProductLabel" type="ref_DataTypeString" default="MS">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<optionalConform/>
<constraint type="max" value="64"/>
</attribute>
<attribute id="0x000f" name="SerialNumber" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
<attribute id="0x000F" name="SerialNumber" type="ref_DataTypeString" default="MS">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<optionalConform/>
Expand All @@ -272,7 +270,7 @@ Davis, CA 95616, USA
<access read="true" readPrivilege="view"/>
<optionalConform/>
</attribute>
<attribute id="0x0012" name="UniqueID" type="&lt;&lt;ref_DataTypeString&gt;&gt;" default="MS">
<attribute id="0x0012" name="UniqueID" type="ref_DataTypeString" default="MS">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<optionalConform/>
Expand Down
5 changes: 3 additions & 2 deletions data_model/clusters/Binding-Cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ 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="0x001e" name="Binding" revision="1">
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001E" name="Binding" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
Expand Down Expand Up @@ -87,7 +87,8 @@ Davis, CA 95616, USA
</struct>
</dataTypes>
<attributes>
<attribute id="0x0000" name="Binding" type="list[TargetStruct Type]" default="[]">
<attribute id="0x0000" name="Binding" type="list" default="[]">
<entry type="TargetStruct"/>
<access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
<mandatoryConform/>
Expand Down
7 changes: 2 additions & 5 deletions data_model/clusters/Channel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,26 +104,23 @@ Davis, CA 95616, USA
</struct>
<struct name="LineupInfoStruct">
<field id="0" name="OperatorName" type="string">
<access read="true" write="true"/>
<mandatoryConform/>
</field>
<field id="1" name="LineupName" type="string" default="empty">
<access read="true" write="true"/>
<optionalConform/>
</field>
<field id="2" name="PostalCode" type="string" default="empty">
<access read="true" write="true"/>
<optionalConform/>
</field>
<field id="3" name="LineupInfoType" type="LineupInfoTypeEnum">
<access read="true" write="true"/>
<mandatoryConform/>
<constraint type="desc"/>
</field>
</struct>
</dataTypes>
<attributes>
<attribute id="0x0000" name="ChannelList" type="list[ChannelInfoStruct Type]" default="empty">
<attribute id="0x0000" name="ChannelList" type="list" default="empty">
<entry type="ChannelInfoStruct"/>
<access read="true" readPrivilege="view"/>
<mandatoryConform>
<feature name="CL"/>
Expand Down
Loading
Loading