Skip to content

Commit

Permalink
DM XMLs: Re-scrape from 0.9 spec. (#32418)
Browse files Browse the repository at this point in the history
Notable changes:
- ICD management cluster revision has been updated and features added
  as provisional
- power source changes for energy have been removed
- thermostat changes for schedule have been removed as they are not
  landing for 1.3
- bunch of device type revision updates for scenes clusters
  • Loading branch information
cecille authored and pull[bot] committed May 16, 2024
1 parent aa02616 commit 1090608
Show file tree
Hide file tree
Showing 46 changed files with 543 additions and 756 deletions.
1 change: 1 addition & 0 deletions data_model/clusters/Binding-Cluster.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ Davis, CA 95616, USA
<attribute name="Endpoint"/>
</notTerm>
</mandatoryConform>
<constraint type="min" value="1"/>
</field>
<field id="3" name="Endpoint" type="endpoint-no">
<mandatoryConform>
Expand Down
1 change: 1 addition & 0 deletions data_model/clusters/ColorControl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ Davis, CA 95616, USA
</attribute>
<attribute id="0x0002" name="RemainingTime" type="uint16" default="0">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="false"/>
<optionalConform/>
<constraint type="between" from="0" to="65534"/>
</attribute>
Expand Down
59 changes: 58 additions & 1 deletion data_model/clusters/GeneralCommissioningCluster.xml
Original file line number Diff line number Diff line change
Expand Up @@ -128,5 +128,62 @@ Davis, CA 95616, USA
<mandatoryConform/>
</attribute>
</attributes>
<commands/>
<commands>
<command id="0x00" name="ArmFailSafe" direction="commandToServer" response="ArmFailSafeResponse">
<access invokePrivilege="admin"/>
<mandatoryConform/>
<field id="0" name="ExpiryLengthSeconds" type="uint16" default="900">
<mandatoryConform/>
</field>
<field id="1" name="Breadcrumb" type="uint64">
<mandatoryConform/>
</field>
</command>
<command id="0x01" name="ArmFailSafeResponse" direction="responseFromServer">
<mandatoryConform/>
<field id="0" name="ErrorCode" type="CommissioningErrorEnum" default="OK">
<mandatoryConform/>
</field>
<field id="1" name="DebugText" type="String" default="&quot;">
<mandatoryConform/>
<constraint type="max" value="128"/>
</field>
</command>
<command id="0x02" name="SetRegulatoryConfig" direction="commandToServer" response="SetRegulatoryConfigResponse">
<access invokePrivilege="admin"/>
<mandatoryConform/>
<field id="0" name="NewRegulatoryConfig" type="RegulatoryLocationTypeEnum">
<mandatoryConform/>
</field>
<field id="1" name="CountryCode" type="string">
<mandatoryConform/>
<constraint type="maxLength" value="2"/>
</field>
<field id="2" name="Breadcrumb" type="uint64">
<mandatoryConform/>
</field>
</command>
<command id="0x03" name="SetRegulatoryConfigResponse" direction="responseFromServer">
<mandatoryConform/>
<field id="0" name="ErrorCode" type="CommissioningErrorEnum" default="OK">
<mandatoryConform/>
</field>
<field id="1" name="DebugText" type="String" default="&quot;">
<mandatoryConform/>
</field>
</command>
<command id="0x04" name="CommissioningComplete" direction="commandToServer" response="CommissioningCompleteResponse">
<access invokePrivilege="admin" fabricScoped="true"/>
<mandatoryConform/>
</command>
<command id="0x05" name="CommissioningCompleteResponse" direction="responseFromServer">
<mandatoryConform/>
<field id="0" name="ErrorCode" type="CommissioningErrorEnum" default="OK">
<mandatoryConform/>
</field>
<field id="1" name="DebugText" type="String" default="&quot;">
<mandatoryConform/>
</field>
</command>
</commands>
</cluster>
47 changes: 46 additions & 1 deletion data_model/clusters/ICDManagement.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,23 +57,43 @@ Davis, CA 95616, USA
// Update Name
-->
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0046" name="ICD Management" revision="1">
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0046" name="ICD Management" revision="2">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
<revision revision="2" summary="Addition of LIT ICD support, UserActiveModeTrigger, ActiveModeDuration, StayActiveResponse; removal of field Key in MonitoringRegistrationStruct"/>
</revisionHistory>
<clusterIds>
<clusterId id="0x0046" name="ICDManagement"/>
</clusterIds>
<classification hierarchy="base" role="utility" picsCode="ICDM" scope="Node"/>
<features>
<feature bit="0" code="CIP" name="CheckInProtocolSupport" summary="Device supports attributes and commands for the Check-In Protocol support.">
<otherwiseConform>
<provisionalConform/>
<mandatoryConform>
<feature name="LITS"/>
</mandatoryConform>
<optionalConform/>
</otherwiseConform>
</feature>
<feature bit="1" code="UAT" name="UserActiveModeTrigger" summary="Device supports the user active mode trigger feature.">
<otherwiseConform>
<provisionalConform/>
<mandatoryConform>
<feature name="LITS"/>
</mandatoryConform>
<optionalConform/>
</otherwiseConform>
</feature>
<feature bit="2" code="LITS" name="LongIdleTimeSupport" summary="Device supports operating as a Long Idle Time ICD.">
<otherwiseConform>
<provisionalConform/>
<optionalConform/>
</otherwiseConform>
</feature>
</features>
<dataTypes>
<number name="UserActiveModeTriggerBitmap" type=""/>
<enum name="OperatingModeEnum">
<item value="0" name="SIT" summary="ICD is operating as a Short Idle Time ICD.">
<mandatoryConform/>
Expand Down Expand Up @@ -138,6 +158,31 @@ Davis, CA 95616, USA
</mandatoryConform>
<constraint type="min" value="1"/>
</attribute>
<attribute id="0x0006" name="UserActiveModeTriggerHint" type="UserActiveModeTriggerBitmap" default="0">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<otherwiseConform>
<provisionalConform/>
<mandatoryConform>
<feature name="UAT"/>
</mandatoryConform>
</otherwiseConform>
<constraint type="desc"/>
</attribute>
<attribute id="0x0007" name="UserActiveModeTriggerInstruction" type="string" default="&quot;">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<constraint type="maxLength" value="128"/>
</attribute>
<attribute id="0x0008" name="OperatingMode" type="OperatingModeEnum">
<access read="true" readPrivilege="view"/>
<otherwiseConform>
<provisionalConform/>
<mandatoryConform>
<feature name="LITS"/>
</mandatoryConform>
</otherwiseConform>
</attribute>
</attributes>
<commands>
<command id="0x00" name="RegisterClient" direction="commandToServer" response="RegisterClientResponse">
Expand Down
1 change: 1 addition & 0 deletions data_model/clusters/LevelControl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ Davis, CA 95616, USA
</attribute>
<attribute id="0x0001" name="RemainingTime" type="uint16" default="0">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="false"/>
<mandatoryConform>
<feature name="LT"/>
</mandatoryConform>
Expand Down
10 changes: 6 additions & 4 deletions data_model/clusters/MediaPlayback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ Davis, CA 95616, USA
<field id="2" name="DisplayName" type="string" default="null">
<quality nullable="true"/>
<optionalConform/>
<constraint type="maxLength" value="256"/>
</field>
</struct>
<struct name="TrackStruct">
Expand Down Expand Up @@ -389,12 +390,13 @@ Davis, CA 95616, USA
</mandatoryConform>
<field id="0" name="TrackID" type="string">
<mandatoryConform/>
<constraint type="desc"/>
<constraint type="maxLength" value="32"/>
</field>
<field id="1" name="AudioOutputIndex" type="uint8">
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="desc"/>
<mandatoryConform>
<feature name="AT"/>
</mandatoryConform>
</field>
</command>
<command id="0x0D" name="ActivateTextTrack" direction="commandToServer" response="Y">
Expand All @@ -404,7 +406,7 @@ Davis, CA 95616, USA
</mandatoryConform>
<field id="0" name="TrackID" type="string">
<mandatoryConform/>
<constraint type="desc"/>
<constraint type="maxLength" value="32"/>
</field>
</command>
<command id="0x0E" name="DeactivateTextTrack" direction="commandToServer" response="Y">
Expand Down
13 changes: 6 additions & 7 deletions data_model/clusters/Messages.xml
Original file line number Diff line number Diff line change
Expand Up @@ -186,15 +186,11 @@ Davis, CA 95616, USA
</bitmap>
<struct name="MessageResponseOptionStruct">
<field id="0" name="MessageResponseID" type="uint32">
<mandatoryConform>
<feature name="RESP"/>
</mandatoryConform>
<mandatoryConform/>
<constraint type="min" value="1"/>
</field>
<field id="1" name="Label" type="string">
<mandatoryConform>
<feature name="RPLY"/>
</mandatoryConform>
<mandatoryConform/>
<constraint type="maxLength" value="32"/>
</field>
</struct>
Expand Down Expand Up @@ -268,18 +264,20 @@ Davis, CA 95616, USA
<quality nullable="true"/>
<mandatoryConform/>
</field>
<field id="4" name="Duration" type="uint16" default="0">
<field id="4" name="Duration" type="uint64" default="0">
<quality nullable="true"/>
<mandatoryConform/>
</field>
<field id="5" name="MessageText" type="string">
<mandatoryConform/>
<constraint type="maxLength" value="256"/>
</field>
<field id="6" name="Responses" type="list" default="empty">
<entry type="MessageResponseOptionStruct"/>
<mandatoryConform>
<feature name="RESP"/>
</mandatoryConform>
<constraint type="maxCount" value="4"/>
</field>
</command>
<command id="0x01" name="CancelMessagesRequest" direction="commandToServer" response="Y">
Expand All @@ -288,6 +286,7 @@ Davis, CA 95616, USA
<field id="0" name="MessageIDs" type="list">
<entry type="MessageID"/>
<mandatoryConform/>
<constraint type="maxCount" value="8"/>
</field>
</command>
</commands>
Expand Down
6 changes: 3 additions & 3 deletions data_model/clusters/NetworkIdentityManagement.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ 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="" name="Network Identity Management" revision="1">
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0450" name="Network Identity Management" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
<clusterIds>
<clusterId name="Network Identity Management"/>
<clusterId id="0x0450" name="Network Identity Management"/>
</clusterIds>
<classification hierarchy="base" role="application" picsCode="TODO" scope="Endpoint"/>
<classification hierarchy="base" role="application" picsCode="NETIM" scope="Endpoint"/>
<dataTypes>
<number name="Client Table" type=""/>
<enum name="NetworkIdentityStatus">
Expand Down
24 changes: 12 additions & 12 deletions data_model/clusters/OperationalState.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,17 @@ Davis, CA 95616, USA
</clusterIds>
<classification hierarchy="base" role="application" picsCode="OPSTATE" scope="Endpoint"/>
<dataTypes>
<enum name="ErrorStateEnum">
<item from="0x00" to="0x3F" name="GeneralErrors" summary="Generally applicable values for error, defined herein">
<mandatoryConform/>
</item>
<item from="0x40" to="0x7F" name="DerivedClusterErrors" summary="Derived Cluster defined errors">
<mandatoryConform/>
</item>
<item from="0x80" to="0xBF" name="ManufacturerError" summary="Vendor specific errors">
<mandatoryConform/>
</item>
</enum>
<enum name="OperationalStateEnum">
<item from="0x00" to="0x3F" name="GeneralStates" summary="Generally applicable values for state, defined herein">
<mandatoryConform/>
Expand All @@ -77,18 +88,7 @@ Davis, CA 95616, USA
</item>
</enum>
<struct name="ErrorStateStruct">
<field id="0" name="ErrorStateID" type="enum8" default="0">
<enum>
<item from="0x00" to="0x3F" name="GeneralErrors" summary="Generally applicable values for error, defined herein">
<mandatoryConform/>
</item>
<item from="0x40" to="0x7F" name="DerivedClusterErrors" summary="Derived Cluster defined errors">
<mandatoryConform/>
</item>
<item from="0x80" to="0xBF" name="ManufacturerError" summary="Vendor specific errors">
<mandatoryConform/>
</item>
</enum>
<field id="0" name="ErrorStateID" type="ErrorStateEnum" default="0">
<mandatoryConform/>
</field>
<field id="1" name="ErrorStateLabel" type="string" default="empty">
Expand Down
Loading

0 comments on commit 1090608

Please sign in to comment.