Skip to content

Commit c2a5b99

Browse files
Michail-AntropovMichail-Antropov
committed
Update XMLs using tools
1 parent 954af09 commit c2a5b99

37 files changed

+4713
-399
lines changed

‎data_model/clusters/MeterIdentification.xml

+78-83
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
<?xml version="1.0"?>
2-
<!--
3-
Copyright (C) Connectivity Standards Alliance (2024). 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: short
2+
<!--
3+
Copyright (C) Connectivity Standards Alliance (2021). 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: short
5959
-->
60-
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0B01" name="Meter Identification Cluster" revision="1">
60+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0B06" name="Meter Identification Cluster" revision="1">
6161
<revisionHistory>
6262
<revision revision="1" summary="Initial version"/>
6363
</revisionHistory>
6464
<clusterIds>
65-
<clusterId id="0x0B01" name="Meter Identification"/>
65+
<clusterId id="0x0B06" name="Meter Identification"/>
6666
</clusterIds>
6767
<classification hierarchy="base" role="application" picsCode="MTRID" scope="Endpoint"/>
6868
<features>
@@ -72,64 +72,59 @@ Davis, CA 95616, USA
7272
</features>
7373
<dataTypes>
7474
<enum name="MeterTypeEnum">
75-
<item value="0" name="Utility" summary="Utility Meter">
75+
<item value="0x00" name="Utility" summary="Utility Meter">
7676
<mandatoryConform/>
7777
</item>
78-
<item value="1" name="Private" summary="Private Meter">
78+
<item value="0x01" name="Private" summary="Private Meter">
7979
<mandatoryConform/>
8080
</item>
81-
<item value="2" name="Generic" summary="Generic Meter">
81+
<item value="0x02" name="Generic" summary="Generic Meter">
8282
<mandatoryConform/>
8383
</item>
8484
</enum>
8585
<enum name="PowerThresholdSourceEnum">
86-
<item value="0" name="Contract" summary="The value comes from a signed contract">
86+
<item value="0x00" name="Contract" summary="The value comes from a signed contract">
8787
<mandatoryConform/>
8888
</item>
89-
<item value="1" name="Regulator" summary="The value comes from a legal regulator">
89+
<item value="0x01" name="Regulator" summary="The value comes from a legal regulator">
9090
<mandatoryConform/>
9191
</item>
92-
<item value="2" name="Equipment" summary="The value comes from a certified limits of the meter">
92+
<item value="0x02" name="Equipment" summary="The value comes from a certified limits of the meter">
9393
<mandatoryConform/>
9494
</item>
9595
</enum>
96-
</dataTypes>
96+
</dataTypes>
9797
<attributes>
9898
<attribute id="0x0000" name="MeterType" type="MeterTypeEnum" default="null">
9999
<access read="true" readPrivilege="view"/>
100+
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
100101
<mandatoryConform/>
101102
</attribute>
102-
<attribute id="0x0001" name="CustomerName" type="string" default="null">
103-
<access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
104-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
105-
<mandatoryConform/>
106-
<constraint type="maxLength" value="64"/>
107-
</attribute>
108-
<attribute id="0x0002" name="UtilityName" type="string" default="null">
109-
<access read="true" readPrivilege="view" />
110-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
103+
<attribute id="0x0001" name="UtilityName" type="string" default="null">
104+
<access read="true" readPrivilege="view"/>
105+
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
111106
<mandatoryConform/>
112107
<constraint type="maxLength" value="16"/>
113108
</attribute>
114-
<attribute id="0x0003" name="PointOfDelivery" type="string" default="null">
115-
<access read="true" readPrivilege="view" />
116-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
109+
<attribute id="0x0002" name="PointOfDelivery" type="string" default="null">
110+
<access read="true" readPrivilege="view"/>
111+
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
117112
<mandatoryConform/>
118113
<constraint type="maxLength" value="16"/>
119114
</attribute>
120-
<attribute id="0x0004" name="PowerThreshold" type="power-mW" default="null">
115+
<attribute id="0x0003" name="PowerThreshold" type="power-mW" default="null">
121116
<access read="true" readPrivilege="view"/>
122-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
117+
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
123118
<mandatoryConform>
124119
<feature name="PWRTHLD"/>
125120
</mandatoryConform>
126121
</attribute>
127-
<attribute id="0x0005" name="PowerThresholdSource" type="PowerThresholdSourceEnum" default="null">
122+
<attribute id="0x0004" name="PowerThresholdSource" type="PowerThresholdSourceEnum" default="null">
128123
<access read="true" readPrivilege="view"/>
129-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
124+
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
130125
<mandatoryConform>
131126
<feature name="PWRTHLD"/>
132127
</mandatoryConform>
133128
</attribute>
134129
</attributes>
135-
</cluster>
130+
</cluster>

‎docs/zap_clusters.md

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ Generally regenerate using one of:
131131
| 1296 | 0x510 | ContentAppObserver |
132132
| 2817 | 0xB01 | MeterIdentification |
133133
| 2820 | 0xB04 | ElectricalMeasurement |
134+
| 2822 | 0xB06 | MeterIdentification |
134135
| 4294048773 | 0xFFF1FC05 | UnitTesting |
135136
| 4294048774 | 0xFFF1FC06 | FaultInjection |
136137
| 4294048800 | 0xFFF1FC20 | SampleMei |

‎src/app/zap-templates/zcl/data-model/chip/meter-identification-cluster.xml

+22-6
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,17 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
See the License for the specific language governing permissions and
1212
limitations under the License.
1313
-->
14-
1514
<configurator>
1615
<domain name="Energy Management"/>
17-
1816
<enum name="MeterTypeEnum" type="enum8">
19-
<cluster code="0x0B01"/>
17+
<cluster code="0x0B06"/>
2018
<item name="Utility" value="0x00"/>
2119
<item name="Private" value="0x01"/>
2220
<item name="Generic" value="0x02"/>
2321
</enum>
2422

2523
<enum name="PowerThresholdSourceEnum" type="enum8">
26-
<cluster code="0x0B01"/>
24+
<cluster code="0x0B06"/>
2725
<item name="Contract" value="0x00"/>
2826
<item name="Regulator" value="0x01"/>
2927
<item name="Equipment" value="0x02"/>
@@ -37,13 +35,11 @@ limitations under the License.
3735
<client init="false" tick="false">true</client>
3836
<server init="false" tick="false">true</server>
3937
<description>This cluster provides attributes for determining advanced information about utility metering device.</description>
40-
4138
<features>
4239
<feature bit="0" code="PWRTHLD" name="PowerThreshold" summary="Supports information about power threshold">
4340
<provisionalConform/>
4441
</feature>
4542
</features>
46-
4743
<attribute code="0x0000" side="server" define="METER_TYPE" type="MeterTypeEnum" isNullable="true" writable="false">MeterType</attribute>
4844
<attribute code="0x0001" side="server" define="CUSTOMER_NAME" type="char_string" isNullable="true" writable="true" length="64">
4945
<access op="read" privilege="view"/>
@@ -56,4 +52,24 @@ limitations under the License.
5652
<attribute code="0x0005" side="server" define="POWER_THRESHOLD_SOURCE" type="PowerThresholdSourceEnum" isNullable="true">PowerThresholdSource</attribute>
5753
</cluster>
5854

55+
<cluster>
56+
<domain>Energy Management</domain>
57+
<name>Meter Identification</name>
58+
<code>0x0B06</code>
59+
<define>METER_IDENTIFICATION_CLUSTER</define>
60+
<description/>
61+
<client init="false" tick="false">true</client>
62+
<features>
63+
<feature bit="0" code="PWRTHLD" name="PowerThreshold" summary="Supports information about power threshold">
64+
<optionalConform/>
65+
</feature>
66+
</features>
67+
<server init="false" tick="false">true</server>
68+
<globalAttribute code="0xFFFD" side="either" value="1"/>
69+
<attribute code="0x0000" side="server" define="METER_TYPE" type="MeterTypeEnum" isNullable="true" min="0x00" max="0x02">MeterType</attribute>
70+
<attribute code="0x0001" side="server" define="UTILITY_NAME" type="char_string" isNullable="true" length="16">UtilityName</attribute>
71+
<attribute code="0x0002" side="server" define="POINT_OF_DELIVERY" type="char_string" isNullable="true" length="16">PointOfDelivery</attribute>
72+
<attribute code="0x0003" side="server" define="POWER_THRESHOLD" type="power_mw" isNullable="true" optional="true">PowerThreshold</attribute>
73+
<attribute code="0x0004" side="server" define="POWER_THRESHOLD_SOURCE" type="PowerThresholdSourceEnum" isNullable="true" min="0x00" max="0x02" optional="true">PowerThresholdSource</attribute>
74+
</cluster>
5975
</configurator>

0 commit comments

Comments
 (0)