Skip to content

Commit 6d25ef4

Browse files
andy31415andy31415
authored
Merge branch '1.3-sve' into cherry-pick-1.3-sve-04d7a3e3385ac57f40156e12464877df4fff53e8
2 parents 70cd859 + 3db0d30 commit 6d25ef4

File tree

79 files changed

+7652
-1249
lines changed

Some content is hidden

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

79 files changed

+7652
-1249
lines changed

‎data_model/clusters/Binding-Cluster.xml

+1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ Davis, CA 95616, USA
7878
<attribute name="Endpoint"/>
7979
</notTerm>
8080
</mandatoryConform>
81+
<constraint type="min" value="1"/>
8182
</field>
8283
<field id="3" name="Endpoint" type="endpoint-no">
8384
<mandatoryConform>

‎data_model/clusters/ColorControl.xml

+1
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ 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"/>
110111
<optionalConform/>
111112
<constraint type="between" from="0" to="65534"/>
112113
</attribute>

‎data_model/clusters/GeneralCommissioningCluster.xml

+58-1
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,62 @@ Davis, CA 95616, USA
128128
<mandatoryConform/>
129129
</attribute>
130130
</attributes>
131-
<commands/>
131+
<commands>
132+
<command id="0x00" name="ArmFailSafe" direction="commandToServer" response="ArmFailSafeResponse">
133+
<access invokePrivilege="admin"/>
134+
<mandatoryConform/>
135+
<field id="0" name="ExpiryLengthSeconds" type="uint16" default="900">
136+
<mandatoryConform/>
137+
</field>
138+
<field id="1" name="Breadcrumb" type="uint64">
139+
<mandatoryConform/>
140+
</field>
141+
</command>
142+
<command id="0x01" name="ArmFailSafeResponse" direction="responseFromServer">
143+
<mandatoryConform/>
144+
<field id="0" name="ErrorCode" type="CommissioningErrorEnum" default="OK">
145+
<mandatoryConform/>
146+
</field>
147+
<field id="1" name="DebugText" type="String" default="&quot;">
148+
<mandatoryConform/>
149+
<constraint type="max" value="128"/>
150+
</field>
151+
</command>
152+
<command id="0x02" name="SetRegulatoryConfig" direction="commandToServer" response="SetRegulatoryConfigResponse">
153+
<access invokePrivilege="admin"/>
154+
<mandatoryConform/>
155+
<field id="0" name="NewRegulatoryConfig" type="RegulatoryLocationTypeEnum">
156+
<mandatoryConform/>
157+
</field>
158+
<field id="1" name="CountryCode" type="string">
159+
<mandatoryConform/>
160+
<constraint type="maxLength" value="2"/>
161+
</field>
162+
<field id="2" name="Breadcrumb" type="uint64">
163+
<mandatoryConform/>
164+
</field>
165+
</command>
166+
<command id="0x03" name="SetRegulatoryConfigResponse" direction="responseFromServer">
167+
<mandatoryConform/>
168+
<field id="0" name="ErrorCode" type="CommissioningErrorEnum" default="OK">
169+
<mandatoryConform/>
170+
</field>
171+
<field id="1" name="DebugText" type="String" default="&quot;">
172+
<mandatoryConform/>
173+
</field>
174+
</command>
175+
<command id="0x04" name="CommissioningComplete" direction="commandToServer" response="CommissioningCompleteResponse">
176+
<access invokePrivilege="admin" fabricScoped="true"/>
177+
<mandatoryConform/>
178+
</command>
179+
<command id="0x05" name="CommissioningCompleteResponse" direction="responseFromServer">
180+
<mandatoryConform/>
181+
<field id="0" name="ErrorCode" type="CommissioningErrorEnum" default="OK">
182+
<mandatoryConform/>
183+
</field>
184+
<field id="1" name="DebugText" type="String" default="&quot;">
185+
<mandatoryConform/>
186+
</field>
187+
</command>
188+
</commands>
132189
</cluster>

‎data_model/clusters/ICDManagement.xml

+20-6
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ Davis, CA 95616, USA
6969
<features>
7070
<feature bit="0" code="CIP" name="CheckInProtocolSupport" summary="Device supports attributes and commands for the Check-In Protocol support.">
7171
<otherwiseConform>
72+
<provisionalConform/>
7273
<mandatoryConform>
7374
<feature name="LITS"/>
7475
</mandatoryConform>
@@ -77,12 +78,19 @@ Davis, CA 95616, USA
7778
</feature>
7879
<feature bit="1" code="UAT" name="UserActiveModeTrigger" summary="Device supports the user active mode trigger feature.">
7980
<otherwiseConform>
81+
<provisionalConform/>
8082
<mandatoryConform>
8183
<feature name="LITS"/>
8284
</mandatoryConform>
8385
<optionalConform/>
8486
</otherwiseConform>
8587
</feature>
88+
<feature bit="2" code="LITS" name="LongIdleTimeSupport" summary="Device supports operating as a Long Idle Time ICD.">
89+
<otherwiseConform>
90+
<provisionalConform/>
91+
<optionalConform/>
92+
</otherwiseConform>
93+
</feature>
8694
<feature bit="2" code="LITS" name="LongIdleTimeSupport" summary="Device supports operating as a Long Idle Time ICD.">
8795
<optionalConform/>
8896
</feature>
@@ -156,9 +164,12 @@ Davis, CA 95616, USA
156164
<attribute id="0x0006" name="UserActiveModeTriggerHint" type="UserActiveModeTriggerBitmap" default="0">
157165
<access read="true" readPrivilege="view"/>
158166
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
159-
<mandatoryConform>
160-
<feature name="UAT"/>
161-
</mandatoryConform>
167+
<otherwiseConform>
168+
<provisionalConform/>
169+
<mandatoryConform>
170+
<feature name="UAT"/>
171+
</mandatoryConform>
172+
</otherwiseConform>
162173
<constraint type="desc"/>
163174
</attribute>
164175
<attribute id="0x0007" name="UserActiveModeTriggerInstruction" type="string" default="&quot;">
@@ -168,9 +179,12 @@ Davis, CA 95616, USA
168179
</attribute>
169180
<attribute id="0x0008" name="OperatingMode" type="OperatingModeEnum">
170181
<access read="true" readPrivilege="view"/>
171-
<mandatoryConform>
172-
<feature name="LITS"/>
173-
</mandatoryConform>
182+
<otherwiseConform>
183+
<provisionalConform/>
184+
<mandatoryConform>
185+
<feature name="LITS"/>
186+
</mandatoryConform>
187+
</otherwiseConform>
174188
</attribute>
175189
</attributes>
176190
<commands>

‎data_model/clusters/LevelControl.xml

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ 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"/>
129130
<mandatoryConform>
130131
<feature name="LT"/>
131132
</mandatoryConform>

‎data_model/clusters/MediaPlayback.xml

+6-4
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ Davis, CA 95616, USA
202202
<field id="2" name="DisplayName" type="string" default="null">
203203
<quality nullable="true"/>
204204
<optionalConform/>
205+
<constraint type="maxLength" value="256"/>
205206
</field>
206207
</struct>
207208
<struct name="TrackStruct">
@@ -389,12 +390,13 @@ Davis, CA 95616, USA
389390
</mandatoryConform>
390391
<field id="0" name="TrackID" type="string">
391392
<mandatoryConform/>
392-
<constraint type="desc"/>
393+
<constraint type="maxLength" value="32"/>
393394
</field>
394395
<field id="1" name="AudioOutputIndex" type="uint8">
395396
<quality nullable="true"/>
396-
<mandatoryConform/>
397-
<constraint type="desc"/>
397+
<mandatoryConform>
398+
<feature name="AT"/>
399+
</mandatoryConform>
398400
</field>
399401
</command>
400402
<command id="0x0D" name="ActivateTextTrack" direction="commandToServer" response="Y">
@@ -404,7 +406,7 @@ Davis, CA 95616, USA
404406
</mandatoryConform>
405407
<field id="0" name="TrackID" type="string">
406408
<mandatoryConform/>
407-
<constraint type="desc"/>
409+
<constraint type="maxLength" value="32"/>
408410
</field>
409411
</command>
410412
<command id="0x0E" name="DeactivateTextTrack" direction="commandToServer" response="Y">

‎data_model/clusters/Messages.xml

+6-7
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,11 @@ Davis, CA 95616, USA
186186
</bitmap>
187187
<struct name="MessageResponseOptionStruct">
188188
<field id="0" name="MessageResponseID" type="uint32">
189-
<mandatoryConform>
190-
<feature name="RESP"/>
191-
</mandatoryConform>
189+
<mandatoryConform/>
192190
<constraint type="min" value="1"/>
193191
</field>
194192
<field id="1" name="Label" type="string">
195-
<mandatoryConform>
196-
<feature name="RPLY"/>
197-
</mandatoryConform>
193+
<mandatoryConform/>
198194
<constraint type="maxLength" value="32"/>
199195
</field>
200196
</struct>
@@ -268,18 +264,20 @@ Davis, CA 95616, USA
268264
<quality nullable="true"/>
269265
<mandatoryConform/>
270266
</field>
271-
<field id="4" name="Duration" type="uint16" default="0">
267+
<field id="4" name="Duration" type="uint64" default="0">
272268
<quality nullable="true"/>
273269
<mandatoryConform/>
274270
</field>
275271
<field id="5" name="MessageText" type="string">
276272
<mandatoryConform/>
273+
<constraint type="maxLength" value="256"/>
277274
</field>
278275
<field id="6" name="Responses" type="list" default="empty">
279276
<entry type="MessageResponseOptionStruct"/>
280277
<mandatoryConform>
281278
<feature name="RESP"/>
282279
</mandatoryConform>
280+
<constraint type="maxCount" value="4"/>
283281
</field>
284282
</command>
285283
<command id="0x01" name="CancelMessagesRequest" direction="commandToServer" response="Y">
@@ -288,6 +286,7 @@ Davis, CA 95616, USA
288286
<field id="0" name="MessageIDs" type="list">
289287
<entry type="MessageID"/>
290288
<mandatoryConform/>
289+
<constraint type="maxCount" value="8"/>
291290
</field>
292291
</command>
293292
</commands>

‎data_model/clusters/NetworkIdentityManagement.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ Davis, CA 95616, USA
5757
5858
:xrefstyle: basic
5959
-->
60-
<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">
60+
<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">
6161
<revisionHistory>
6262
<revision revision="1" summary="Initial Release"/>
6363
</revisionHistory>
6464
<clusterIds>
65-
<clusterId name="Network Identity Management"/>
65+
<clusterId id="0x0450" name="Network Identity Management"/>
6666
</clusterIds>
67-
<classification hierarchy="base" role="application" picsCode="TODO" scope="Endpoint"/>
67+
<classification hierarchy="base" role="application" picsCode="NETIM" scope="Endpoint"/>
6868
<dataTypes>
6969
<number name="Client Table" type=""/>
7070
<enum name="NetworkIdentityStatus">

‎data_model/clusters/OperationalState.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,17 @@ Davis, CA 95616, USA
6565
</clusterIds>
6666
<classification hierarchy="base" role="application" picsCode="OPSTATE" scope="Endpoint"/>
6767
<dataTypes>
68+
<enum name="ErrorStateEnum">
69+
<item from="0x00" to="0x3F" name="GeneralErrors" summary="Generally applicable values for error, defined herein">
70+
<mandatoryConform/>
71+
</item>
72+
<item from="0x40" to="0x7F" name="DerivedClusterErrors" summary="Derived Cluster defined errors">
73+
<mandatoryConform/>
74+
</item>
75+
<item from="0x80" to="0xBF" name="ManufacturerError" summary="Vendor specific errors">
76+
<mandatoryConform/>
77+
</item>
78+
</enum>
6879
<enum name="OperationalStateEnum">
6980
<item from="0x00" to="0x3F" name="GeneralStates" summary="Generally applicable values for state, defined herein">
7081
<mandatoryConform/>
@@ -77,18 +88,7 @@ Davis, CA 95616, USA
7788
</item>
7889
</enum>
7990
<struct name="ErrorStateStruct">
80-
<field id="0" name="ErrorStateID" type="enum8" default="0">
81-
<enum>
82-
<item from="0x00" to="0x3F" name="GeneralErrors" summary="Generally applicable values for error, defined herein">
83-
<mandatoryConform/>
84-
</item>
85-
<item from="0x40" to="0x7F" name="DerivedClusterErrors" summary="Derived Cluster defined errors">
86-
<mandatoryConform/>
87-
</item>
88-
<item from="0x80" to="0xBF" name="ManufacturerError" summary="Vendor specific errors">
89-
<mandatoryConform/>
90-
</item>
91-
</enum>
91+
<field id="0" name="ErrorStateID" type="ErrorStateEnum" default="0">
9292
<mandatoryConform/>
9393
</field>
9494
<field id="1" name="ErrorStateLabel" type="string" default="empty">

0 commit comments

Comments
 (0)