Skip to content

Commit 74e2cd4

Browse files
cecillececille
authored
DM XML scrape for 1.3 (#32972)
1 parent fd72eae commit 74e2cd4

Some content is hidden

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

62 files changed

+150
-183
lines changed

‎data_model/clusters/BooleanStateConfiguration.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -104,31 +104,31 @@ Davis, CA 95616, USA
104104
</bitmap>
105105
</dataTypes>
106106
<attributes>
107-
<attribute id="0x0000" name="CurrentSensitivityLevel" type="uint8">
107+
<attribute id="0x0000" name="CurrentSensitivityLevel" type="uint8" default="MS">
108108
<access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
109109
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
110110
<mandatoryConform>
111111
<feature name="SENSLVL"/>
112112
</mandatoryConform>
113113
<constraint type="max" value="SupportedSensitivityLevels - 1"/>
114114
</attribute>
115-
<attribute id="0x0001" name="SupportedSensitivityLevels" type="uint8">
115+
<attribute id="0x0001" name="SupportedSensitivityLevels" type="uint8" default="MS">
116116
<access read="true" readPrivilege="view"/>
117117
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
118118
<mandatoryConform>
119119
<feature name="SENSLVL"/>
120120
</mandatoryConform>
121121
<constraint type="between" from="2" to="10"/>
122122
</attribute>
123-
<attribute id="0x0002" name="DefaultSensitivityLevel" type="uint8">
123+
<attribute id="0x0002" name="DefaultSensitivityLevel" type="uint8" default="MS">
124124
<access read="true" readPrivilege="view"/>
125125
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
126126
<optionalConform>
127127
<feature name="SENSLVL"/>
128128
</optionalConform>
129129
<constraint type="max" value="SupportedSensitivityLevels - 1"/>
130130
</attribute>
131-
<attribute id="0x0003" name="AlarmsActive" type="AlarmModeBitmap">
131+
<attribute id="0x0003" name="AlarmsActive" type="AlarmModeBitmap" default="0">
132132
<access read="true" readPrivilege="view"/>
133133
<mandatoryConform>
134134
<orTerm>
@@ -137,13 +137,13 @@ Davis, CA 95616, USA
137137
</orTerm>
138138
</mandatoryConform>
139139
</attribute>
140-
<attribute id="0x0004" name="AlarmsSuppressed" type="AlarmModeBitmap">
140+
<attribute id="0x0004" name="AlarmsSuppressed" type="AlarmModeBitmap" default="0">
141141
<access read="true" readPrivilege="view"/>
142142
<mandatoryConform>
143143
<feature name="SPRS"/>
144144
</mandatoryConform>
145145
</attribute>
146-
<attribute id="0x0005" name="AlarmsEnabled" type="AlarmModeBitmap">
146+
<attribute id="0x0005" name="AlarmsEnabled" type="AlarmModeBitmap" default="MS">
147147
<access read="true" readPrivilege="view"/>
148148
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
149149
<optionalConform>
@@ -153,7 +153,7 @@ Davis, CA 95616, USA
153153
</orTerm>
154154
</optionalConform>
155155
</attribute>
156-
<attribute id="0x0006" name="AlarmsSupported" type="AlarmModeBitmap">
156+
<attribute id="0x0006" name="AlarmsSupported" type="AlarmModeBitmap" default="0">
157157
<access read="true" readPrivilege="view"/>
158158
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
159159
<mandatoryConform>

‎data_model/clusters/ColorControl.xml

-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ Davis, CA 95616, USA
107107
</attribute>
108108
<attribute id="0x0002" name="RemainingTime" type="uint16" default="0">
109109
<access read="true" readPrivilege="view"/>
110-
<quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="false"/>
111110
<optionalConform/>
112111
<constraint type="between" from="0" to="65534"/>
113112
</attribute>

‎data_model/clusters/DiagnosticsGeneral.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ Davis, CA 95616, USA
6565
</clusterIds>
6666
<classification hierarchy="base" role="utility" picsCode="DGGEN" scope="Node"/>
6767
<features>
68-
<feature bit="0" code="DMTEST" name="DataModelTest" summary="Support specific testing needs for extended Data Model features">
69-
<optionalConform/>
70-
</feature>
68+
<feature bit="0" code="DMTEST" name="DataModelTest" summary="Support specific testing needs for extended Data Model features"/>
7169
</features>
7270
<dataTypes>
7371
<enum name="BootReasonEnum">

‎data_model/clusters/EnergyEVSE.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Davis, CA 95616, USA
6868
<classification hierarchy="base" role="application" picsCode="EEVSE" scope="Endpoint"/>
6969
<features>
7070
<feature bit="0" code="PREF" name="ChargingPreferences" summary="EVSE supports storing user charging preferences">
71-
<optionalConform/>
71+
<provisionalConform/>
7272
</feature>
7373
<feature bit="1" code="SOC" name="SoCReporting" summary="EVSE supports reporting of vehicle State of Charge (SoC)">
7474
<provisionalConform/>

‎data_model/clusters/LevelControl.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ Davis, CA 95616, USA
7979
<optionalConform/>
8080
</feature>
8181
<feature bit="2" code="FQ" name="Frequency" default="0" summary="Supports frequency attributes and behavior.
82-
The Pulse Width Modulation cluster was created
83-
for frequency control.">
82+
The Pulse Width Modulation cluster was created
83+
for frequency control.">
8484
<provisionalConform/>
8585
</feature>
8686
</features>
@@ -126,7 +126,6 @@ Davis, CA 95616, USA
126126
</attribute>
127127
<attribute id="0x0001" name="RemainingTime" type="uint16" default="0">
128128
<access read="true" readPrivilege="view"/>
129-
<quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="false"/>
130129
<mandatoryConform>
131130
<feature name="LT"/>
132131
</mandatoryConform>

‎data_model/clusters/MicrowaveOvenControl.xml

+17-8
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@ Davis, CA 95616, USA
7070
<optionalConform choice="a"/>
7171
</feature>
7272
<feature bit="1" code="WATTS" name="PowerInWatts" summary="Power is specified in Watts">
73-
<optionalConform choice="a"/>
73+
<otherwiseConform>
74+
<provisionalConform/>
75+
<optionalConform choice="a"/>
76+
</otherwiseConform>
7477
</feature>
7578
<feature bit="2" code="PWRLMTS" name="PowerNumberLimits" summary="Supports the limit attributes used with the PWRNUM feature">
7679
<optionalConform>
@@ -125,16 +128,22 @@ Davis, CA 95616, USA
125128
<entry type="uint16"/>
126129
<access read="true" readPrivilege="view"/>
127130
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
128-
<mandatoryConform>
129-
<feature name="WATTS"/>
130-
</mandatoryConform>
131+
<otherwiseConform>
132+
<provisionalConform/>
133+
<mandatoryConform>
134+
<feature name="WATTS"/>
135+
</mandatoryConform>
136+
</otherwiseConform>
131137
<constraint type="countBetween" from="1" to="10"/>
132138
</attribute>
133139
<attribute id="0x0007" name="SelectedWattIndex" type="uint8" default="MS">
134140
<access read="true" readPrivilege="view"/>
135-
<mandatoryConform>
136-
<feature name="WATTS"/>
137-
</mandatoryConform>
141+
<otherwiseConform>
142+
<provisionalConform/>
143+
<mandatoryConform>
144+
<feature name="WATTS"/>
145+
</mandatoryConform>
146+
</otherwiseConform>
138147
<constraint type="desc"/>
139148
</attribute>
140149
<attribute id="0x0008" name="WattRating" type="uint16" default="MS">
@@ -165,7 +174,7 @@ Davis, CA 95616, USA
165174
<optionalConform choice="a" more="true">
166175
<feature name="WATTS"/>
167176
</optionalConform>
168-
<constraint type="between" from="0" to="len(SupportedWatts)-1"/>
177+
<constraint type="desc"/>
169178
</field>
170179
<field id="4" name="StartAfterSetting" type="bool" default="false">
171180
<optionalConform/>

‎data_model/clusters/Mode_RVCClean.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,6 @@ Davis, CA 95616, USA
6666
<clusterId id="0x0055" name="RVC Clean Mode"/>
6767
</clusterIds>
6868
<classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="RVCCLEANM" scope="Endpoint"/>
69-
<attributes>
70-
<attribute id="0x0000" name="SupportedModes">
71-
<mandatoryConform/>
72-
</attribute>
73-
<attribute id="0x0001" name="CurrentMode">
74-
<mandatoryConform/>
75-
</attribute>
76-
<attribute id="0x0002" name="StartUpMode">
77-
<disallowConform/>
78-
</attribute>
79-
<attribute id="0x0003" name="OnMode">
80-
<deprecateConform/>
81-
</attribute>
82-
</attributes>
8369
<dataTypes>
8470
<struct name="ModeOptionStruct">
8571
<field id="0" name="Label">
@@ -94,4 +80,18 @@ Davis, CA 95616, USA
9480
</field>
9581
</struct>
9682
</dataTypes>
83+
<attributes>
84+
<attribute id="0x0000" name="SupportedModes">
85+
<mandatoryConform/>
86+
</attribute>
87+
<attribute id="0x0001" name="CurrentMode">
88+
<mandatoryConform/>
89+
</attribute>
90+
<attribute id="0x0002" name="StartUpMode">
91+
<disallowConform/>
92+
</attribute>
93+
<attribute id="0x0003" name="OnMode">
94+
<deprecateConform/>
95+
</attribute>
96+
</attributes>
9797
</cluster>

‎data_model/clusters/Mode_RVCRun.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,6 @@ Davis, CA 95616, USA
6666
<clusterId id="0x0054" name="RVC Run Mode"/>
6767
</clusterIds>
6868
<classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="RVCRUNM" scope="Endpoint"/>
69-
<attributes>
70-
<attribute id="0x0000" name="SupportedModes">
71-
<mandatoryConform/>
72-
</attribute>
73-
<attribute id="0x0001" name="CurrentMode">
74-
<mandatoryConform/>
75-
</attribute>
76-
<attribute id="0x0002" name="StartUpMode">
77-
<disallowConform/>
78-
</attribute>
79-
<attribute id="0x0003" name="OnMode">
80-
<deprecateConform/>
81-
</attribute>
82-
</attributes>
8369
<dataTypes>
8470
<struct name="ModeOptionStruct">
8571
<field id="0" name="Label">
@@ -94,4 +80,18 @@ Davis, CA 95616, USA
9480
</field>
9581
</struct>
9682
</dataTypes>
83+
<attributes>
84+
<attribute id="0x0000" name="SupportedModes">
85+
<mandatoryConform/>
86+
</attribute>
87+
<attribute id="0x0001" name="CurrentMode">
88+
<mandatoryConform/>
89+
</attribute>
90+
<attribute id="0x0002" name="StartUpMode">
91+
<disallowConform/>
92+
</attribute>
93+
<attribute id="0x0003" name="OnMode">
94+
<deprecateConform/>
95+
</attribute>
96+
</attributes>
9797
</cluster>

‎data_model/clusters/NetworkCommissioningCluster.xml

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ This notice and disclaimer must be included on all copies of this document.
5454
Connectivity Standards Alliance
5555
508 Second Street, Suite 206
5656
Davis, CA 95616, USA
57-
5857
-->
5958
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0031" name="Network Commissioning" revision="2">
6059
<revisionHistory>

‎data_model/clusters/OperationalState.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,10 @@ Davis, CA 95616, USA
203203
</event>
204204
<event id="0x01" name="OperationCompletion" priority="info">
205205
<access readPrivilege="view"/>
206-
<optionalConform/>
206+
<otherwiseConform>
207+
<provisionalConform/>
208+
<optionalConform/>
209+
</otherwiseConform>
207210
<field id="0" name="CompletionErrorCode" type="enum8">
208211
<mandatoryConform/>
209212
</field>

‎data_model/clusters/OperationalState_RVC.xml

+18-15
Original file line numberDiff line numberDiff line change
@@ -66,21 +66,6 @@ Davis, CA 95616, USA
6666
<clusterId id="0x0061" name="RVC Operational State"/>
6767
</clusterIds>
6868
<classification hierarchy="derived" baseCluster="Operational State" role="application" picsCode="RVCOPSTATE" scope="Endpoint"/>
69-
<commands>
70-
<command id="0x00" name="Pause"/>
71-
<command id="0x01" name="Stop">
72-
<deprecateConform/>
73-
</command>
74-
<command id="0x02" name="Start">
75-
<deprecateConform/>
76-
</command>
77-
<command id="0x03" name="Resume"/>
78-
<command id="0x04" name="OperationalCommandResponse"/>
79-
<command id="0x80" name="GoHome" direction="commandToServer" response="OperationalCommandResponse">
80-
<access invokePrivilege="operate"/>
81-
<optionalConform/>
82-
</command>
83-
</commands>
8469
<dataTypes>
8570
<enum name="ErrorStateEnum">
8671
<item value="0x40" name="FailedToFindChargingDock" summary="The device has failed to find or reach the charging dock">
@@ -120,4 +105,22 @@ Davis, CA 95616, USA
120105
</item>
121106
</enum>
122107
</dataTypes>
108+
<commands>
109+
<command id="0x00" name="Pause"/>
110+
<command id="0x01" name="Stop">
111+
<deprecateConform/>
112+
</command>
113+
<command id="0x02" name="Start">
114+
<deprecateConform/>
115+
</command>
116+
<command id="0x03" name="Resume"/>
117+
<command id="0x04" name="OperationalCommandResponse"/>
118+
<command id="0x80" name="GoHome" direction="commandToServer" response="OperationalCommandResponse">
119+
<access invokePrivilege="operate"/>
120+
<otherwiseConform>
121+
<provisionalConform/>
122+
<optionalConform/>
123+
</otherwiseConform>
124+
</command>
125+
</commands>
123126
</cluster>

‎data_model/clusters/PowerTopology.xml

-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ This notice and disclaimer must be included on all copies of this document.
5454
Connectivity Standards Alliance
5555
508 Second Street, Suite 206
5656
Davis, CA 95616, USA
57-
58-
:xrefstyle: short
5957
-->
6058
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009C" name="Power Topology" revision="1">
6159
<revisionHistory>

‎data_model/clusters/Scenes.xml

+3
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,17 @@ Davis, CA 95616, USA
121121
</field>
122122
<field id="1" name="SceneID" type="uint8">
123123
<mandatoryConform/>
124+
<constraint type="max" value="254"/>
124125
</field>
125126
<field id="2" name="SceneName" type="string">
126127
<mandatoryConform>
127128
<feature name="SN"/>
128129
</mandatoryConform>
130+
<constraint type="maxLength" value="16"/>
129131
</field>
130132
<field id="3" name="SceneTransitionTime" type="uint32" default="0">
131133
<mandatoryConform/>
134+
<constraint type="max" value="60000000"/>
132135
</field>
133136
<field id="4" name="ExtensionFields" type="list" default="empty">
134137
<entry type="ExtensionFieldSetStruct"/>

‎data_model/clusters/TimeSync.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Davis, CA 95616, USA
9292
<item value="2" name="SecondsGranularity" summary="This indicates the node is synchronized to an upstream source using a low resolution protocol. UTC Time is accurate to ± 5 seconds.">
9393
<mandatoryConform/>
9494
</item>
95-
<item value="3" name="MillisecondsGranularity" summary="This indicates the node is synchronized to an upstream source using high resolution time-synchronization protocol such as NTP, or has built-in GNSS with some amount of jitter applying its GNSS timestamp. UTC Time is accurate to ± 50ms.">
95+
<item value="3" name="MillisecondsGranularity" summary="This indicates the node is synchronized to an upstream source using high resolution time-synchronization protocol such as NTP, or has built-in GNSS with some amount of jitter applying its GNSS timestamp. UTC Time is accurate to ± 50 ms.">
9696
<mandatoryConform/>
9797
</item>
9898
<item value="4" name="MicrosecondsGranularity" summary="This indicates the node is synchronized to an upstream source using a highly precise time-synchronization protocol such as PTP, or has built-in GNSS. UTC time is accurate to ± 10 μs.">

‎data_model/clusters/network_infrastructure.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,7 @@ This notice and disclaimer must be included on all copies of this document.
5858
Connectivity Standards Alliance
5959
508 Second Street, Suite 206
6060
Davis, CA 95616, USA
61+
62+
:toc:
6163
-->
62-
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Network Infrastructure" revision=""/>
64+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Network Infrastructure" revision=""/>

‎data_model/device_types/Aggregator.xml

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ Davis, CA 95616, USA
5757
-->
5858
<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x000E" name="Aggregator" revision="1">
5959
<revisionHistory>
60-
<revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
6160
<revision revision="1" summary="Initial release of this document"/>
6261
</revisionHistory>
6362
<classification class="simple" scope="endpoint"/>

‎data_model/device_types/BaseDeviceType.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ Davis, CA 95616, USA
5757
-->
5858
<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="" name="Base Device Type" revision="2">
5959
<revisionHistory>
60-
<revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
6160
<revision revision="1" summary="Initial release of this document"/>
6261
<revision revision="2" summary="Duplicate condition replaces Multiple condition"/>
6362
</revisionHistory>
@@ -66,7 +65,7 @@ Davis, CA 95616, USA
6665
<cluster id="0x001D" name="Descriptor" side="server">
6766
<mandatoryConform/>
6867
<features>
69-
<feature code="" name="TAGLIST">
68+
<feature code="" name="TagList">
7069
<mandatoryConform>
7170
<attribute name="Duplicate"/>
7271
</mandatoryConform>

‎data_model/device_types/BasicVideoPlayer.xml

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ Davis, CA 95616, USA
5757
-->
5858
<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0028" name="Basic Video Player" revision="2">
5959
<revisionHistory>
60-
<revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
6160
<revision revision="1" summary="Initial release of this document"/>
6261
<revision revision="2" summary="Added Messages and Content Control clusters"/>
6362
</revisionHistory>

‎data_model/device_types/BridgedNode.xml

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ Davis, CA 95616, USA
5757
-->
5858
<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0013" name="Bridged Node" revision="2">
5959
<revisionHistory>
60-
<revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
6160
<revision revision="1" summary="Initial release of this document"/>
6261
<revision revision="2" summary="Added Power Source to device type; Deprecated Power Source Configuration"/>
6362
</revisionHistory>

0 commit comments

Comments
 (0)