Skip to content

Commit e798888

Browse files
popovdgpopovdg
committed
zap generated files for Meter Identification cluster
1 parent 9e9fa4e commit e798888

File tree

104 files changed

+9192
-367
lines changed

Some content is hidden

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

104 files changed

+9192
-367
lines changed

‎.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ jobs:
9797
src/app/zap-templates/zcl/data-model/chip/global-bitmaps.xml \
9898
src/app/zap-templates/zcl/data-model/chip/global-enums.xml \
9999
src/app/zap-templates/zcl/data-model/chip/global-structs.xml \
100+
src/app/zap-templates/zcl/data-model/chip/meter-identification-cluster.xml \
100101
src/app/zap-templates/zcl/data-model/chip/push-av-stream-transport-cluster.xml \
101102
src/app/zap-templates/zcl/data-model/chip/semantic-tag-namespace-enums.xml \
102103
src/app/zap-templates/zcl/data-model/chip/access-control-definitions.xml \

‎data_model/master/clusters/BasicInformationCluster.xml

+1-6
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Davis, CA 95616, USA
6363
<revision revision="2" summary="Added ProductAppearance attribute"/>
6464
<revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
6565
<revision revision="4" summary="Updated conformance for UniqueID to mandatory"/>
66-
<revision revision="5" summary="Added DeviceLocation and ConfigurationVersion attribute"/>
66+
<revision revision="5" summary="Added ConfigurationVersion attribute"/>
6767
</revisionHistory>
6868
<clusterIds>
6969
<clusterId id="0x0028" name="Basic Information"/>
@@ -351,11 +351,6 @@ Davis, CA 95616, USA
351351
<min value="1"/>
352352
</constraint>
353353
</attribute>
354-
<attribute id="0x0017" name="DeviceLocation" type="LocationDescriptorStruct" default="MS">
355-
<access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
356-
<quality nullable="true" persistence="nonVolatile"/>
357-
<optionalConform/>
358-
</attribute>
359354
<attribute id="0x0018" name="ConfigurationVersion" type="uint32" default="0">
360355
<access read="true" readPrivilege="view"/>
361356
<quality persistence="nonVolatile"/>

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

+1-10
Original file line numberDiff line numberDiff line change
@@ -57,11 +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="0x001D" name="Descriptor Cluster" revision="3">
60+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001D" name="Descriptor Cluster" revision="2">
6161
<revisionHistory>
6262
<revision revision="1" summary="Initial revision"/>
6363
<revision revision="2" summary="Semantic tag list; TagList feature"/>
64-
<revision revision="3" summary="Add EndpointUniqueID attribute"/>
6564
</revisionHistory>
6665
<clusterIds>
6766
<clusterId id="0x001D" name="Descriptor"/>
@@ -124,13 +123,5 @@ Davis, CA 95616, USA
124123
</countBetween>
125124
</constraint>
126125
</attribute>
127-
<attribute id="0x0005" name="EndpointUniqueID" type="string">
128-
<access read="true" readPrivilege="view"/>
129-
<quality persistence="fixed"/>
130-
<optionalConform/>
131-
<constraint>
132-
<maxLength value="32"/>
133-
</constraint>
134-
</attribute>
135126
</attributes>
136127
</cluster>

‎data_model/master/clusters/GeneralCommissioningCluster.xml

-13
Original file line numberDiff line numberDiff line change
@@ -223,19 +223,6 @@ Davis, CA 95616, USA
223223
</mandatoryConform>
224224
</otherwiseConform>
225225
</attribute>
226-
<attribute id="0x000A" name="NFCConstrainedDataModel" type="bool" default="false">
227-
<access read="true" readPrivilege="view"/>
228-
<quality persistence="fixed"/>
229-
<otherwiseConform>
230-
<mandatoryConform/>
231-
<mandatoryConform>
232-
<feature name="NFC"/>
233-
</mandatoryConform>
234-
</otherwiseConform>
235-
<constraint>
236-
<desc/>
237-
</constraint>
238-
</attribute>
239226
</attributes>
240227
<commands>
241228
<command id="0x00" name="ArmFailSafe" direction="commandToServer" response="ArmFailSafeResponse">

‎data_model/master/clusters/Humidistat.xml

+292
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,292 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
4+
The information within this document is the property of the Connectivity
5+
Standards Alliance and its use and disclosure are restricted, except as
6+
expressly set forth herein.
7+
8+
Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
9+
nontransferable, worldwide, limited and revocable license (without the right to
10+
sublicense), under Connectivity Standards Alliance's applicable copyright
11+
rights, to view, download, save, reproduce and use the document solely for your
12+
own internal purposes and in accordance with the terms of the license set forth
13+
herein. This license does not authorize you to, and you expressly warrant that
14+
you shall not: (a) permit others (outside your organization) to use this
15+
document; (b) post or publish this document; (c) modify, adapt, translate, or
16+
otherwise change this document in any manner or create any derivative work
17+
based on this document; (d) remove or modify any notice or label on this
18+
document, including this Copyright Notice, License and Disclaimer. The
19+
Connectivity Standards Alliance does not grant you any license hereunder other
20+
than as expressly stated herein.
21+
22+
Elements of this document may be subject to third party intellectual property
23+
rights, including without limitation, patent, copyright or trademark rights,
24+
and any such third party may or may not be a member of the Connectivity
25+
Standards Alliance. Connectivity Standards Alliance members grant other
26+
Connectivity Standards Alliance members certain intellectual property rights as
27+
set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
28+
Standards Alliance members do not grant you any rights under this license. The
29+
Connectivity Standards Alliance is not responsible for, and shall not be held
30+
responsible in any manner for, identifying or failing to identify any or all
31+
such third party intellectual property rights. Please visit www.csa-iot.org for
32+
more information on how to become a member of the Connectivity Standards
33+
Alliance.
34+
35+
This document and the information contained herein are provided on an “AS IS”
36+
basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
37+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
38+
INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
39+
WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
40+
OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
41+
FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
42+
CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
43+
BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
44+
DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
45+
DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
46+
OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
47+
LOSS OR DAMAGE.
48+
49+
All company, brand and product names in this document may be trademarks that
50+
are the sole property of their respective owners.
51+
52+
This notice and disclaimer must be included on all copies of this document.
53+
54+
Connectivity Standards Alliance
55+
508 Second Street, Suite 206
56+
Davis, CA 95616, USA
57+
58+
:xrefstyle: basic
59+
-->
60+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0205" name="Humidistat Cluster" revision="1">
61+
<revisionHistory>
62+
<revision revision="1" summary="Initial revision"/>
63+
</revisionHistory>
64+
<clusterIds>
65+
<clusterId id="0x0205" name="Humidistat"/>
66+
</clusterIds>
67+
<classification hierarchy="base" role="application" picsCode="HSTAT" scope="Endpoint"/>
68+
<features>
69+
<feature bit="0" code="HUM" name="Humidifier" summary="Supports increasing the humidity in a space">
70+
<optionalConform choice="a" more="true" min="1"/>
71+
</feature>
72+
<feature bit="1" code="DEHUM" name="Dehumidifier" summary="Supports decreasing the humidity in a space">
73+
<optionalConform choice="a" more="true" min="1"/>
74+
</feature>
75+
<feature bit="2" code="CONT" name="Continuous" summary="Supports continuous humidity operation">
76+
<optionalConform choice="b" more="true" min="1"/>
77+
</feature>
78+
<feature bit="3" code="SENSOR" name="Sensor" summary="Supports humidity control to a setpoint via an humidity sensor">
79+
<optionalConform choice="b" more="true" min="1"/>
80+
</feature>
81+
<feature bit="4" code="AUTO" name="Auto" summary="Supports automatically switching operating states to maintain a set humidity">
82+
<optionalConform>
83+
<andTerm>
84+
<feature name="HUM"/>
85+
<feature name="DEHUM"/>
86+
<feature name="SENSOR"/>
87+
</andTerm>
88+
</optionalConform>
89+
</feature>
90+
<feature bit="5" code="FAN" name="FanOnly" summary="Supports running the fan alone without humidity control">
91+
<optionalConform/>
92+
</feature>
93+
<feature bit="6" code="OPT" name="Optimal" summary="Supports controlling to an optimal humidity">
94+
<optionalConform>
95+
<feature name="SENSOR"/>
96+
</optionalConform>
97+
</feature>
98+
<feature bit="7" code="WARM" name="WarmMist" summary="Supports warm mist operation">
99+
<optionalConform choice="c" more="true" min="1">
100+
<feature name="HUM"/>
101+
</optionalConform>
102+
</feature>
103+
<feature bit="8" code="COLD" name="ColdMist" summary="Supports cold mist operation">
104+
<optionalConform choice="c" more="true" min="1">
105+
<feature name="HUM"/>
106+
</optionalConform>
107+
</feature>
108+
</features>
109+
<dataTypes>
110+
<enum name="Mode">
111+
<item value="0" name="Off" summary="Humidity is not being controlled">
112+
<mandatoryConform/>
113+
</item>
114+
<item value="1" name="Humidifier" summary="Humidity is being increased">
115+
<mandatoryConform>
116+
<feature name="HUM"/>
117+
</mandatoryConform>
118+
</item>
119+
<item value="2" name="Dehumidifier" summary="Humidity is being decreased">
120+
<mandatoryConform>
121+
<feature name="DEHUM"/>
122+
</mandatoryConform>
123+
</item>
124+
<item value="3" name="Auto" summary="Humidity is being held">
125+
<mandatoryConform>
126+
<feature name="AUTO"/>
127+
</mandatoryConform>
128+
</item>
129+
<item value="4" name="FanOnly" summary="Fan is running without humidity control">
130+
<mandatoryConform>
131+
<feature name="FAN"/>
132+
</mandatoryConform>
133+
</item>
134+
</enum>
135+
<enum name="SystemStateEnum">
136+
<item value="0" name="Off" summary="Humidity is not being controlled">
137+
<mandatoryConform/>
138+
</item>
139+
<item value="1" name="Humidifying" summary="Humidity is being increased">
140+
<mandatoryConform>
141+
<feature name="HUM"/>
142+
</mandatoryConform>
143+
</item>
144+
<item value="2" name="Dehumidifying" summary="Humidity is being decreased">
145+
<mandatoryConform>
146+
<feature name="DEHUM"/>
147+
</mandatoryConform>
148+
</item>
149+
<item value="3" name="Fan" summary="Fan is running without humidity control">
150+
<mandatoryConform>
151+
<feature name="FAN"/>
152+
</mandatoryConform>
153+
</item>
154+
<item value="4" name="Idle" summary="Humidity level is satisfied">
155+
<mandatoryConform/>
156+
</item>
157+
</enum>
158+
<bitmap name="MistTypeBitmap">
159+
<bitfield name="MistCold" bit="0" summary="Cold mist humidification">
160+
<mandatoryConform>
161+
<feature name="COLD"/>
162+
</mandatoryConform>
163+
</bitfield>
164+
<bitfield name="MistWarm" bit="1" summary="Warm mist humidification">
165+
<mandatoryConform>
166+
<feature name="WARM"/>
167+
</mandatoryConform>
168+
</bitfield>
169+
</bitmap>
170+
</dataTypes>
171+
<attributes>
172+
<attribute id="0x0000" name="Mode" type="Mode">
173+
<enum default="Off"/>
174+
<access read="true" readPrivilege="view"/>
175+
<quality persistence="nonVolatile"/>
176+
<mandatoryConform/>
177+
</attribute>
178+
<attribute id="0x0001" name="SystemState" type="SystemStateEnum">
179+
<enum default="Off"/>
180+
<access read="true" readPrivilege="view"/>
181+
<quality persistence="nonVolatile"/>
182+
<mandatoryConform/>
183+
</attribute>
184+
<attribute id="0x0002" name="UserSetpoint" type="percent" default="MS">
185+
<access read="true" readPrivilege="view"/>
186+
<quality persistence="nonVolatile"/>
187+
<mandatoryConform>
188+
<feature name="SENSOR"/>
189+
</mandatoryConform>
190+
<constraint>
191+
<desc/>
192+
</constraint>
193+
</attribute>
194+
<attribute id="0x0003" name="MinSetpoint" type="percent">
195+
<access read="true" readPrivilege="view"/>
196+
<quality persistence="fixed"/>
197+
<mandatoryConform>
198+
<feature name="SENSOR"/>
199+
</mandatoryConform>
200+
<constraint>
201+
<max value="99"/>
202+
</constraint>
203+
</attribute>
204+
<attribute id="0x0004" name="MaxSetpoint" type="percent">
205+
<access read="true" readPrivilege="view"/>
206+
<quality persistence="fixed"/>
207+
<mandatoryConform>
208+
<feature name="SENSOR"/>
209+
</mandatoryConform>
210+
<constraint>
211+
<desc/>
212+
</constraint>
213+
</attribute>
214+
<attribute id="0x0005" name="Step" type="percent">
215+
<access read="true" readPrivilege="view"/>
216+
<quality persistence="fixed"/>
217+
<mandatoryConform>
218+
<feature name="SENSOR"/>
219+
</mandatoryConform>
220+
<constraint>
221+
<desc/>
222+
</constraint>
223+
</attribute>
224+
<attribute id="0x0006" name="TargetSetpoint" type="percent">
225+
<access read="true" readPrivilege="view"/>
226+
<otherwiseConform>
227+
<mandatoryConform>
228+
<feature name="OPT"/>
229+
</mandatoryConform>
230+
<optionalConform>
231+
<feature name="SENSOR"/>
232+
</optionalConform>
233+
</otherwiseConform>
234+
<constraint>
235+
<desc/>
236+
</constraint>
237+
</attribute>
238+
<attribute id="0x0007" name="MistType" type="MistTypeBitmap" default="MS">
239+
<access read="true" readPrivilege="view"/>
240+
<quality persistence="nonVolatile"/>
241+
<mandatoryConform>
242+
<feature name="HUM"/>
243+
</mandatoryConform>
244+
</attribute>
245+
<attribute id="0x0008" name="Continuous" type="bool" default="false">
246+
<access read="true" readPrivilege="view"/>
247+
<quality persistence="nonVolatile"/>
248+
<mandatoryConform>
249+
<feature name="CONT"/>
250+
</mandatoryConform>
251+
</attribute>
252+
<attribute id="0x0009" name="Sleep" type="bool" default="false">
253+
<access read="true" readPrivilege="view"/>
254+
<quality persistence="nonVolatile"/>
255+
<optionalConform/>
256+
</attribute>
257+
<attribute id="0x000A" name="Optimal" type="bool" default="false">
258+
<access read="true" readPrivilege="view"/>
259+
<quality persistence="nonVolatile"/>
260+
<mandatoryConform>
261+
<feature name="OPT"/>
262+
</mandatoryConform>
263+
</attribute>
264+
</attributes>
265+
<commands>
266+
<command id="0x00" name="SetSettings" direction="commandToServer">
267+
<access invokePrivilege="operate"/>
268+
<mandatoryConform/>
269+
<field id="0" name="UserSetpoint" type="percent">
270+
<optionalConform/>
271+
<constraint>
272+
<desc/>
273+
</constraint>
274+
</field>
275+
<field id="1" name="Mode" type="Mode">
276+
<optionalConform/>
277+
</field>
278+
<field id="2" name="MistType" type="MistTypeBitmap">
279+
<optionalConform/>
280+
</field>
281+
<field id="3" name="Continuous" type="bool">
282+
<optionalConform/>
283+
</field>
284+
<field id="4" name="Sleep" type="bool">
285+
<optionalConform/>
286+
</field>
287+
<field id="5" name="Optimal" type="bool">
288+
<optionalConform/>
289+
</field>
290+
</command>
291+
</commands>
292+
</cluster>

‎data_model/master/clusters/MeterIdentification.xml

+23
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,29 @@ Davis, CA 95616, USA
8282
<mandatoryConform/>
8383
</item>
8484
</enum>
85+
<enum name="PowerThresholdSourceEnum">
86+
<item value="0x00" name="Contract" summary="The value comes from a signed contract">
87+
<mandatoryConform/>
88+
</item>
89+
<item value="0x01" name="Regulator" summary="The value comes from a legal regulator">
90+
<mandatoryConform/>
91+
</item>
92+
<item value="0x02" name="Equipment" summary="The value comes from a certified limits of the meter">
93+
<mandatoryConform/>
94+
</item>
95+
</enum>
96+
<struct name="PowerThresholdStruct">
97+
<field id="0" name="PowerThreshold" type="int64">
98+
<optionalConform choice="b"/>
99+
</field>
100+
<field id="1" name="ApparentPowerThreshold" type="int64">
101+
<optionalConform choice="b"/>
102+
</field>
103+
<field id="2" name="PowerThresholdSource" type="PowerThresholdSourceEnum">
104+
<quality nullable="true"/>
105+
<mandatoryConform/>
106+
</field>
107+
</struct>
85108
</dataTypes>
86109
<attributes>
87110
<attribute id="0x0000" name="MeterType" type="MeterTypeEnum">

0 commit comments

Comments
 (0)