Skip to content

Commit c6e07d0

Browse files
hastyhasty
committed
Merge branch 'add_presets_to_Sdk' of github.com:hasty/connectedhomeip into add_presets_to_Sdk
2 parents 637db40 + fadce3b commit c6e07d0

File tree

190 files changed

+1113
-881
lines changed

Some content is hidden

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

190 files changed

+1113
-881
lines changed

‎.github/.wordlist.txt

+1
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,7 @@ href
650650
HSM
651651
hsm
652652
HTTPS
653+
Humidistat
653654
HW
654655
hwadr
655656
HydrogenConcentrationMeasurement

‎data_model/master/clusters/ACL-Cluster.xml

+122-12
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,18 @@ Davis, CA 95616, USA
5757
-->
5858
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001F" name="Access Control Cluster" revision="2">
5959
<revisionHistory>
60-
<revision revision="1" summary="Initial Release"/>
61-
<revision revision="2" summary="Added Managed feature"/>
60+
<revision revision="1" summary="Initial revision"/>
61+
<revision revision="2" summary="Added Managed Device feature, Extension feature, fixed conformance"/>
6262
</revisionHistory>
6363
<clusterIds>
6464
<clusterId id="0x001F" name="AccessControl"/>
6565
</clusterIds>
6666
<classification hierarchy="base" role="utility" picsCode="ACL" scope="Node"/>
6767
<features>
68-
<feature bit="0" code="MNGD" name="Managed" summary="Device is managed">
68+
<feature bit="0" code="EXTS" name="Extension" summary="Device provides ACL Extension attribute">
69+
<optionalConform/>
70+
</feature>
71+
<feature bit="1" code="MNGD" name="Managed" summary="Device is managed">
6972
<optionalConform/>
7073
</feature>
7174
</features>
@@ -80,11 +83,6 @@ Davis, CA 95616, USA
8083
<item value="3" name="Group" summary="Group authenticated session">
8184
<mandatoryConform/>
8285
</item>
83-
<item value="4" name="ALL" summary="All modes">
84-
<mandatoryConform>
85-
<feature name="MNGD"/>
86-
</mandatoryConform>
87-
</item>
8886
</enum>
8987
<enum name="AccessControlEntryPrivilegeEnum">
9088
<item value="1" name="View" summary="Can read and observe all (except Access Control Cluster and as seen by a non-Proxy)">
@@ -106,6 +104,20 @@ Davis, CA 95616, USA
106104
<mandatoryConform/>
107105
</item>
108106
</enum>
107+
<enum name="AccessRestrictionTypeEnum">
108+
<item value="0" name="AttributeAccessForbidden" summary="Clients on this fabric are currently forbidden from reading and writing an attribute">
109+
<mandatoryConform/>
110+
</item>
111+
<item value="1" name="AttributeWriteForbidden" summary="Clients on this fabric are currently forbidden from writing an attribute">
112+
<mandatoryConform/>
113+
</item>
114+
<item value="2" name="CommandForbidden" summary="Clients on this fabric are currently forbidden from invoking a command">
115+
<mandatoryConform/>
116+
</item>
117+
<item value="3" name="EventForbidden" summary="Clients on this fabric are currently forbidden from reading an event">
118+
<mandatoryConform/>
119+
</item>
120+
</enum>
109121
<enum name="ChangeTypeEnum">
110122
<item value="0" name="Changed" summary="Entry or extension was changed">
111123
<mandatoryConform/>
@@ -164,6 +176,45 @@ Davis, CA 95616, USA
164176
<mandatoryConform/>
165177
</field>
166178
</struct>
179+
<struct name="AccessRestrictionEntryStruct">
180+
<field id="0" name="Endpoint" type="endpoint-no">
181+
<access fabricSensitive="true"/>
182+
<mandatoryConform/>
183+
</field>
184+
<field id="1" name="Cluster" type="cluster-id">
185+
<access fabricSensitive="true"/>
186+
<mandatoryConform/>
187+
</field>
188+
<field id="2" name="Restrictions" type="list" default="desc">
189+
<entry type="AccessRestrictionStruct"/>
190+
<access fabricSensitive="true"/>
191+
<mandatoryConform/>
192+
<constraint type="minCount" value="1"/>
193+
</field>
194+
<access fabricScoped="true"/>
195+
</struct>
196+
<struct name="AccessRestrictionStruct">
197+
<field id="0" name="Type" type="AccessRestrictionTypeEnum">
198+
<mandatoryConform/>
199+
</field>
200+
<field id="1" name="ID" type="uint32">
201+
<quality nullable="true"/>
202+
<mandatoryConform/>
203+
</field>
204+
</struct>
205+
<struct name="CommissioningAccessRestrictionEntryStruct">
206+
<field id="0" name="Endpoint" type="endpoint-no">
207+
<mandatoryConform/>
208+
</field>
209+
<field id="1" name="Cluster" type="cluster-id">
210+
<mandatoryConform/>
211+
</field>
212+
<field id="2" name="Restrictions" type="list" default="desc">
213+
<entry type="AccessRestrictionStruct"/>
214+
<mandatoryConform/>
215+
<constraint type="minCount" value="1"/>
216+
</field>
217+
</struct>
167218
</dataTypes>
168219
<attributes>
169220
<attribute id="0x0000" name="ACL" type="list" default="desc">
@@ -175,7 +226,9 @@ Davis, CA 95616, USA
175226
<attribute id="0x0001" name="Extension" type="list" default="desc">
176227
<entry type="AccessControlExtensionStruct"/>
177228
<access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
178-
<optionalConform/>
229+
<mandatoryConform>
230+
<feature name="EXTS"/>
231+
</mandatoryConform>
179232
<constraint type="desc"/>
180233
</attribute>
181234
<attribute id="0x0002" name="SubjectsPerAccessControlEntry" type="uint16" default="4">
@@ -196,15 +249,45 @@ Davis, CA 95616, USA
196249
<mandatoryConform/>
197250
<constraint type="min" value="4"/>
198251
</attribute>
199-
<attribute id="0x0005" name="ManagedACL" type="list" default="desc">
200-
<entry type="AccessControlEntryStruct"/>
252+
<attribute id="0x0005" name="CommissioningARL" type="list" default="[]">
253+
<entry type="CommissioningAccessRestrictionEntryStruct"/>
254+
<access read="true" readPrivilege="view"/>
255+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
256+
<mandatoryConform>
257+
<feature name="MNGD"/>
258+
</mandatoryConform>
259+
<constraint type="desc"/>
260+
</attribute>
261+
<attribute id="0x0006" name="ARL" type="list" default="[]">
262+
<entry type="AccessRestrictionEntryStruct"/>
201263
<access read="true" readPrivilege="view" fabricScoped="true"/>
202264
<mandatoryConform>
203265
<feature name="MNGD"/>
204266
</mandatoryConform>
205267
<constraint type="desc"/>
206268
</attribute>
207269
</attributes>
270+
<commands>
271+
<command id="0x00" name="ReviewFabricRestrictions" direction="commandToServer" response="ReviewFabricRestrictionsResponse">
272+
<access invokePrivilege="admin" fabricScoped="true"/>
273+
<mandatoryConform>
274+
<feature name="MNGD"/>
275+
</mandatoryConform>
276+
<field id="0" name="ARL" type="list" default="desc">
277+
<entry type="AccessRestrictionStruct"/>
278+
<mandatoryConform/>
279+
<constraint type="desc"/>
280+
</field>
281+
</command>
282+
<command id="0x01" name="ReviewFabricRestrictionsResponse" direction="responseFromServer">
283+
<mandatoryConform>
284+
<feature name="MNGD"/>
285+
</mandatoryConform>
286+
<field id="0" name="Token" type="uint64">
287+
<mandatoryConform/>
288+
</field>
289+
</command>
290+
</commands>
208291
<events>
209292
<event id="0x00" name="AccessControlEntryChanged" priority="info">
210293
<access readPrivilege="admin" fabricSensitive="true"/>
@@ -229,7 +312,9 @@ Davis, CA 95616, USA
229312
</event>
230313
<event id="0x01" name="AccessControlExtensionChanged" priority="info">
231314
<access readPrivilege="admin" fabricSensitive="true"/>
232-
<mandatoryConform/>
315+
<mandatoryConform>
316+
<feature name="EXTS"/>
317+
</mandatoryConform>
233318
<field id="1" name="AdminNodeID" type="node-id">
234319
<quality nullable="true"/>
235320
<mandatoryConform/>
@@ -248,5 +333,30 @@ Davis, CA 95616, USA
248333
<mandatoryConform/>
249334
</field>
250335
</event>
336+
<event id="0x02" name="AccessRestrictionEntryChanged" priority="info">
337+
<access readPrivilege="admin" fabricSensitive="true"/>
338+
<mandatoryConform>
339+
<feature name="MNGD"/>
340+
</mandatoryConform>
341+
</event>
342+
<event id="0x03" name="FabricRestrictionReviewUpdate" priority="info">
343+
<access readPrivilege="admin" fabricSensitive="true"/>
344+
<mandatoryConform>
345+
<feature name="MNGD"/>
346+
</mandatoryConform>
347+
<field id="0" name="Token" type="uint64">
348+
<mandatoryConform/>
349+
</field>
350+
<field id="1" name="Instruction" type="string">
351+
<quality nullable="true"/>
352+
<mandatoryConform/>
353+
<constraint type="maxLength" value="512"/>
354+
</field>
355+
<field id="2" name="RedirectURL" type="string">
356+
<quality nullable="true"/>
357+
<mandatoryConform/>
358+
<constraint type="maxLength" value="256"/>
359+
</field>
360+
</event>
251361
</events>
252362
</cluster>

‎data_model/master/clusters/AccountLogin.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
5959
-->
6060
<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">
6161
<revisionHistory>
62-
<revision revision="1" summary="Initial Release"/>
62+
<revision revision="1" summary="Initial revision"/>
6363
<revision revision="2" summary="Add support for 8 character PIN code, Add Node to Login, Logout commands. Add LoggedOut event."/>
6464
</revisionHistory>
6565
<clusterIds>

‎data_model/master/clusters/AdminCommissioningCluster.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
5757
-->
5858
<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">
5959
<revisionHistory>
60-
<revision revision="1" summary="Initial Release"/>
60+
<revision revision="1" summary="Initial revision"/>
6161
</revisionHistory>
6262
<clusterIds>
6363
<clusterId id="0x003C" name="Administrator Commissioning"/>

‎data_model/master/clusters/AirQuality.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
5959
-->
6060
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005B" name="Air Quality Cluster" revision="1">
6161
<revisionHistory>
62-
<revision revision="1" summary="Initial version of the Air Quality cluster"/>
62+
<revision revision="1" summary="Initial revision"/>
6363
</revisionHistory>
6464
<clusterIds>
6565
<clusterId id="0x005B" name="Air Quality"/>

‎data_model/master/clusters/ApplicationBasic.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
5959
-->
6060
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050D" name="Application Basic Cluster" revision="1">
6161
<revisionHistory>
62-
<revision revision="1" summary="Initial Release"/>
62+
<revision revision="1" summary="Initial revision"/>
6363
</revisionHistory>
6464
<clusterIds>
6565
<clusterId id="0x050D" name="Application Basic"/>

‎data_model/master/clusters/ApplicationLauncher.xml

+14-4
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ 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="0x050C" name="Application Launcher Cluster" revision="1">
60+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050C" name="Application Launcher Cluster" revision="2">
6161
<revisionHistory>
62-
<revision revision="1" summary="Initial Release"/>
62+
<revision revision="1" summary="Initial revision"/>
63+
<revision revision="2" summary="Addition of new states to StatusEnum"/>
6364
</revisionHistory>
6465
<clusterIds>
6566
<clusterId id="0x050C" name="Application Launcher"/>
@@ -75,10 +76,19 @@ Davis, CA 95616, USA
7576
<item value="0" name="Success" summary="Command succeeded">
7677
<mandatoryConform/>
7778
</item>
78-
<item value="1" name="AppNotAvailable" summary="Requested app is not available.">
79+
<item value="1" name="AppNotAvailable" summary="Requested app is not available">
7980
<mandatoryConform/>
8081
</item>
81-
<item value="2" name="SystemBusy" summary="Video platform unable to honor command.">
82+
<item value="2" name="SystemBusy" summary="Video platform unable to honor command">
83+
<mandatoryConform/>
84+
</item>
85+
<item value="3" name="PendingUserApproval" summary="User approval for app download is pending">
86+
<mandatoryConform/>
87+
</item>
88+
<item value="4" name="Downloading" summary="Downloading the requested app">
89+
<mandatoryConform/>
90+
</item>
91+
<item value="5" name="Installing" summary="Installing the requested app">
8292
<mandatoryConform/>
8393
</item>
8494
</enum>

‎data_model/master/clusters/AudioOutput.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
5959
-->
6060
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050B" name="Audio Output Cluster" revision="1">
6161
<revisionHistory>
62-
<revision revision="1" summary="Initial Release"/>
62+
<revision revision="1" summary="Initial revision"/>
6363
</revisionHistory>
6464
<clusterIds>
6565
<clusterId id="0x050B" name="Audio Output"/>

‎data_model/master/clusters/BasicInformationCluster.xml

+3-29
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,15 @@ Davis, CA 95616, USA
5757
-->
5858
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0028" name="Basic Information Cluster" revision="4">
5959
<revisionHistory>
60-
<revision revision="1" summary="Initial Release"/>
60+
<revision revision="1" summary="Initial revision"/>
6161
<revision revision="2" summary="Added ProductAppearance attribute"/>
6262
<revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
63-
<revision revision="4" summary="Updated conformance for UniqueID to mandatory and add the BridgedICDSupport feature. Added DeviceLocation attribute."/>
63+
<revision revision="4" summary="Updated conformance for UniqueID to mandatory. Added DeviceLocation attribute."/>
6464
</revisionHistory>
6565
<clusterIds>
6666
<clusterId id="0x0028" name="Basic Information"/>
6767
</clusterIds>
6868
<classification hierarchy="base" role="utility" picsCode="BINFO" scope="Node"/>
69-
<features>
70-
<feature bit="0" code="BIS" name="BridgedICDSupport" summary="A set of features that support Bridged ICD Devices.">
71-
<optionalConform/>
72-
</feature>
73-
</features>
7469
<dataTypes>
7570
<enum name="ColorEnum">
7671
<item value="0" name="Black" summary="Approximately RGB #000000.">
@@ -308,23 +303,12 @@ Davis, CA 95616, USA
308303
<mandatoryConform/>
309304
<constraint type="min" value="1"/>
310305
</attribute>
311-
<attribute id="0x0017" name="DeviceLocation" type="homeloc" default="MS">
306+
<attribute id="0x0017" name="DeviceLocation" type="locationdesc" default="MS">
312307
<access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
313308
<quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
314309
<optionalConform/>
315310
</attribute>
316311
</attributes>
317-
<commands>
318-
<command id="0x00" name="KeepActive" direction="commandToServer" response="Y">
319-
<access invokePrivilege="operate"/>
320-
<mandatoryConform>
321-
<feature name="BIS"/>
322-
</mandatoryConform>
323-
<field id="0" name="StayActiveDuration" type="uint32">
324-
<mandatoryConform/>
325-
</field>
326-
</command>
327-
</commands>
328312
<events>
329313
<event id="0x00" name="StartUp" priority="critical">
330314
<access readPrivilege="view"/>
@@ -351,15 +335,5 @@ Davis, CA 95616, USA
351335
<mandatoryConform/>
352336
</field>
353337
</event>
354-
<event id="0x04" name="ActiveChanged" priority="info">
355-
<access readPrivilege="view"/>
356-
<mandatoryConform>
357-
<feature name="BIS"/>
358-
</mandatoryConform>
359-
<field id="0" name="PromisedActiveDuration" type="uint32">
360-
<mandatoryConform/>
361-
<constraint type="desc"/>
362-
</field>
363-
</event>
364338
</events>
365339
</cluster>

‎data_model/master/clusters/Binding-Cluster.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
5959
-->
6060
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001E" name="Binding Cluster" revision="1">
6161
<revisionHistory>
62-
<revision revision="1" summary="Initial Release"/>
62+
<revision revision="1" summary="Initial revision"/>
6363
</revisionHistory>
6464
<clusterIds>
6565
<clusterId id="0x001E" name="Binding"/>

‎data_model/master/clusters/BooleanState.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
5959
-->
6060
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0045" name="Boolean State Cluster" revision="1">
6161
<revisionHistory>
62-
<revision revision="1" summary="Initial release"/>
62+
<revision revision="1" summary="Initial revision"/>
6363
</revisionHistory>
6464
<clusterIds>
6565
<clusterId id="0x0045" name="Boolean State"/>

‎data_model/master/clusters/BooleanStateConfiguration.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
5959
-->
6060
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0080" name="Boolean State Configuration Cluster" revision="1">
6161
<revisionHistory>
62-
<revision revision="1" summary="Initial Release"/>
62+
<revision revision="1" summary="Initial revision"/>
6363
</revisionHistory>
6464
<clusterIds>
6565
<clusterId id="0x0080" name="Boolean State Configuration"/>

‎data_model/master/clusters/Channel.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
5959
-->
6060
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0504" name="Channel Cluster" revision="2">
6161
<revisionHistory>
62-
<revision revision="1" summary="Initial Release"/>
62+
<revision revision="1" summary="Initial revision"/>
6363
<revision revision="2" summary="Add EG and RP features, Identifier and Type to Channel Info for Over-the-Top (OTT) channel support."/>
6464
</revisionHistory>
6565
<clusterIds>

0 commit comments

Comments
 (0)