Skip to content

Commit b2860cd

Browse files
cecillececille
authored
Merge branch '1.3-sve' into cherry-pick-1.3-sve-c5a07207ea37df369e3685bb9c67fc5b9a87b732
2 parents f783e84 + 3db0d30 commit b2860cd

File tree

82 files changed

+7834
-1402
lines changed

Some content is hidden

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

82 files changed

+7834
-1402
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

+151-151
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0"?>
22
<!--
33
Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
44
The information within this document is the property of the Connectivity
@@ -56,154 +56,154 @@ Connectivity Standards Alliance
5656
Davis, CA 95616, USA
5757
5858
// Update Name
59-
-->
60-
<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">
61-
<revisionHistory>
62-
<revision revision="1" summary="Initial Release"/>
63-
</revisionHistory>
64-
<clusterIds>
65-
<clusterId id="0x0046" name="ICDManagement"/>
66-
</clusterIds>
67-
<classification hierarchy="base" role="utility" picsCode="ICDM" scope="Node"/>
68-
<features>
69-
<feature bit="0" code="CIP" name="CheckInProtocolSupport" summary="Device supports attributes and commands for the Check-In Protocol support.">
70-
<otherwiseConform>
71-
<provisionalConform/>
72-
<optionalConform/>
73-
</otherwiseConform>
74-
</feature>
75-
</features>
76-
<dataTypes>
77-
<enum name="OperatingModeEnum">
78-
<item value="0" name="SIT" summary="ICD is operating as a Short Idle Time ICD.">
79-
<mandatoryConform/>
80-
</item>
81-
<item value="1" name="LIT" summary="ICD is operating as a Long Idle Time ICD.">
82-
<mandatoryConform/>
83-
</item>
84-
</enum>
85-
<struct name="MonitoringRegistrationStruct">
86-
<field id="1" name="CheckInNodeID" type="node-id">
87-
<access fabricSensitive="true"/>
88-
<mandatoryConform/>
89-
</field>
90-
<field id="2" name="MonitoredSubject" type="subject-id">
91-
<access fabricSensitive="true"/>
92-
<mandatoryConform/>
93-
</field>
94-
<field id="3" name="Key">
95-
<deprecateConform/>
96-
</field>
97-
<access fabricScoped="true"/>
98-
</struct>
99-
</dataTypes>
100-
<attributes>
101-
<attribute id="0x0000" name="IdleModeDuration" type="uint32" default="1">
102-
<access read="true" readPrivilege="view"/>
103-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
104-
<mandatoryConform/>
105-
<constraint type="between" from="1" to="64800"/>
106-
</attribute>
107-
<attribute id="0x0001" name="ActiveModeDuration" type="uint32" default="300">
108-
<access read="true" readPrivilege="view"/>
109-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
110-
<mandatoryConform/>
111-
</attribute>
112-
<attribute id="0x0002" name="ActiveModeThreshold" type="uint16" default="300">
113-
<access read="true" readPrivilege="view"/>
114-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
115-
<mandatoryConform/>
116-
</attribute>
117-
<attribute id="0x0003" name="RegisteredClients" type="list" default="[]">
118-
<entry type="MonitoringRegistrationStruct"/>
119-
<access read="true" readPrivilege="admin" fabricScoped="true"/>
120-
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
121-
<mandatoryConform>
122-
<feature name="CIP"/>
123-
</mandatoryConform>
124-
<constraint type="desc"/>
125-
</attribute>
126-
<attribute id="0x0004" name="ICDCounter" type="uint32" default="0">
127-
<access read="true" readPrivilege="admin"/>
128-
<quality changeOmitted="true" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
129-
<mandatoryConform>
130-
<feature name="CIP"/>
131-
</mandatoryConform>
132-
</attribute>
133-
<attribute id="0x0005" name="ClientsSupportedPerFabric" type="uint16" default="1">
134-
<access read="true" readPrivilege="view"/>
135-
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
136-
<mandatoryConform>
137-
<feature name="CIP"/>
138-
</mandatoryConform>
139-
<constraint type="min" value="1"/>
140-
</attribute>
141-
</attributes>
142-
<commands>
143-
<command id="0x00" name="RegisterClient" direction="commandToServer" response="RegisterClientResponse">
144-
<access invokePrivilege="manage" fabricScoped="true"/>
145-
<mandatoryConform>
146-
<feature name="CIP"/>
147-
</mandatoryConform>
148-
<field id="0" name="CheckInNodeID" type="node-id">
149-
<mandatoryConform/>
150-
</field>
151-
<field id="1" name="MonitoredSubject" type="subject-id">
152-
<mandatoryConform/>
153-
</field>
154-
<field id="2" name="Key" type="octstr">
155-
<mandatoryConform/>
156-
<constraint type="maxLength" value="16"/>
157-
</field>
158-
<field id="3" name="VerificationKey" type="octstr">
159-
<optionalConform/>
160-
<constraint type="maxLength" value="16"/>
161-
</field>
162-
</command>
163-
<command id="0x01" name="RegisterClientResponse" direction="responseFromServer">
164-
<mandatoryConform>
165-
<feature name="CIP"/>
166-
</mandatoryConform>
167-
<field id="0" name="ICDCounter" type="uint32">
168-
<mandatoryConform/>
169-
</field>
170-
</command>
171-
<command id="0x02" name="UnregisterClient" direction="commandToServer" response="Y">
172-
<access invokePrivilege="manage" fabricScoped="true"/>
173-
<mandatoryConform>
174-
<feature name="CIP"/>
175-
</mandatoryConform>
176-
<field id="0" name="CheckInNodeID" type="node-id">
177-
<mandatoryConform/>
178-
</field>
179-
<field id="1" name="VerificationKey" type="octstr">
180-
<optionalConform/>
181-
<constraint type="maxLength" value="16"/>
182-
</field>
183-
</command>
184-
<command id="0x03" name="StayActiveRequest" direction="commandToServer" response="StayActiveResponse">
185-
<access invokePrivilege="operate"/>
186-
<otherwiseConform>
187-
<mandatoryConform>
188-
<feature name="LITS"/>
189-
</mandatoryConform>
190-
<optionalConform/>
191-
</otherwiseConform>
192-
<field id="0" name="StayActiveDuration" type="uint32">
193-
<mandatoryConform/>
194-
</field>
195-
</command>
196-
<command id="0x04" name="StayActiveResponse" direction="responseFromServer">
197-
<otherwiseConform>
198-
<mandatoryConform>
199-
<feature name="LITS"/>
200-
</mandatoryConform>
201-
<optionalConform/>
202-
</otherwiseConform>
203-
<field id="0" name="PromisedActiveDuration" type="uint32">
204-
<mandatoryConform/>
205-
<constraint type="desc"/>
206-
</field>
207-
</command>
208-
</commands>
59+
-->
60+
<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">
61+
<revisionHistory>
62+
<revision revision="1" summary="Initial Release"/>
63+
</revisionHistory>
64+
<clusterIds>
65+
<clusterId id="0x0046" name="ICDManagement"/>
66+
</clusterIds>
67+
<classification hierarchy="base" role="utility" picsCode="ICDM" scope="Node"/>
68+
<features>
69+
<feature bit="0" code="CIP" name="CheckInProtocolSupport" summary="Device supports attributes and commands for the Check-In Protocol support.">
70+
<otherwiseConform>
71+
<provisionalConform/>
72+
<optionalConform/>
73+
</otherwiseConform>
74+
</feature>
75+
</features>
76+
<dataTypes>
77+
<enum name="OperatingModeEnum">
78+
<item value="0" name="SIT" summary="ICD is operating as a Short Idle Time ICD.">
79+
<mandatoryConform/>
80+
</item>
81+
<item value="1" name="LIT" summary="ICD is operating as a Long Idle Time ICD.">
82+
<mandatoryConform/>
83+
</item>
84+
</enum>
85+
<struct name="MonitoringRegistrationStruct">
86+
<field id="1" name="CheckInNodeID" type="node-id">
87+
<access fabricSensitive="true"/>
88+
<mandatoryConform/>
89+
</field>
90+
<field id="2" name="MonitoredSubject" type="subject-id">
91+
<access fabricSensitive="true"/>
92+
<mandatoryConform/>
93+
</field>
94+
<field id="3" name="Key">
95+
<deprecateConform/>
96+
</field>
97+
<access fabricScoped="true"/>
98+
</struct>
99+
</dataTypes>
100+
<attributes>
101+
<attribute id="0x0000" name="IdleModeDuration" type="uint32" default="1">
102+
<access read="true" readPrivilege="view"/>
103+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
104+
<mandatoryConform/>
105+
<constraint type="between" from="1" to="64800"/>
106+
</attribute>
107+
<attribute id="0x0001" name="ActiveModeDuration" type="uint32" default="300">
108+
<access read="true" readPrivilege="view"/>
109+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
110+
<mandatoryConform/>
111+
</attribute>
112+
<attribute id="0x0002" name="ActiveModeThreshold" type="uint16" default="300">
113+
<access read="true" readPrivilege="view"/>
114+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
115+
<mandatoryConform/>
116+
</attribute>
117+
<attribute id="0x0003" name="RegisteredClients" type="list" default="[]">
118+
<entry type="MonitoringRegistrationStruct"/>
119+
<access read="true" readPrivilege="admin" fabricScoped="true"/>
120+
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
121+
<mandatoryConform>
122+
<feature name="CIP"/>
123+
</mandatoryConform>
124+
<constraint type="desc"/>
125+
</attribute>
126+
<attribute id="0x0004" name="ICDCounter" type="uint32" default="0">
127+
<access read="true" readPrivilege="admin"/>
128+
<quality changeOmitted="true" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
129+
<mandatoryConform>
130+
<feature name="CIP"/>
131+
</mandatoryConform>
132+
</attribute>
133+
<attribute id="0x0005" name="ClientsSupportedPerFabric" type="uint16" default="1">
134+
<access read="true" readPrivilege="view"/>
135+
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
136+
<mandatoryConform>
137+
<feature name="CIP"/>
138+
</mandatoryConform>
139+
<constraint type="min" value="1"/>
140+
</attribute>
141+
</attributes>
142+
<commands>
143+
<command id="0x00" name="RegisterClient" direction="commandToServer" response="RegisterClientResponse">
144+
<access invokePrivilege="manage" fabricScoped="true"/>
145+
<mandatoryConform>
146+
<feature name="CIP"/>
147+
</mandatoryConform>
148+
<field id="0" name="CheckInNodeID" type="node-id">
149+
<mandatoryConform/>
150+
</field>
151+
<field id="1" name="MonitoredSubject" type="subject-id">
152+
<mandatoryConform/>
153+
</field>
154+
<field id="2" name="Key" type="octstr">
155+
<mandatoryConform/>
156+
<constraint type="maxLength" value="16"/>
157+
</field>
158+
<field id="3" name="VerificationKey" type="octstr">
159+
<optionalConform/>
160+
<constraint type="maxLength" value="16"/>
161+
</field>
162+
</command>
163+
<command id="0x01" name="RegisterClientResponse" direction="responseFromServer">
164+
<mandatoryConform>
165+
<feature name="CIP"/>
166+
</mandatoryConform>
167+
<field id="0" name="ICDCounter" type="uint32">
168+
<mandatoryConform/>
169+
</field>
170+
</command>
171+
<command id="0x02" name="UnregisterClient" direction="commandToServer" response="Y">
172+
<access invokePrivilege="manage" fabricScoped="true"/>
173+
<mandatoryConform>
174+
<feature name="CIP"/>
175+
</mandatoryConform>
176+
<field id="0" name="CheckInNodeID" type="node-id">
177+
<mandatoryConform/>
178+
</field>
179+
<field id="1" name="VerificationKey" type="octstr">
180+
<optionalConform/>
181+
<constraint type="maxLength" value="16"/>
182+
</field>
183+
</command>
184+
<command id="0x03" name="StayActiveRequest" direction="commandToServer" response="StayActiveResponse">
185+
<access invokePrivilege="operate"/>
186+
<otherwiseConform>
187+
<mandatoryConform>
188+
<feature name="LITS"/>
189+
</mandatoryConform>
190+
<optionalConform/>
191+
</otherwiseConform>
192+
<field id="0" name="StayActiveDuration" type="uint32">
193+
<mandatoryConform/>
194+
</field>
195+
</command>
196+
<command id="0x04" name="StayActiveResponse" direction="responseFromServer">
197+
<otherwiseConform>
198+
<mandatoryConform>
199+
<feature name="LITS"/>
200+
</mandatoryConform>
201+
<optionalConform/>
202+
</otherwiseConform>
203+
<field id="0" name="PromisedActiveDuration" type="uint32">
204+
<mandatoryConform/>
205+
<constraint type="desc"/>
206+
</field>
207+
</command>
208+
</commands>
209209
</cluster>

0 commit comments

Comments
 (0)