Skip to content

Commit e85f59c

Browse files
Remove twise generated structures/enums/etc
1 parent c2a5b99 commit e85f59c

35 files changed

+4
-4830
lines changed

docs/zap_clusters.md

-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ Generally regenerate using one of:
129129
| 1294 | 0x50E | AccountLogin |
130130
| 1295 | 0x50F | ContentControl |
131131
| 1296 | 0x510 | ContentAppObserver |
132-
| 2817 | 0xB01 | MeterIdentification |
133132
| 2820 | 0xB04 | ElectricalMeasurement |
134133
| 2822 | 0xB06 | MeterIdentification |
135134
| 4294048773 | 0xFFF1FC05 | UnitTesting |

src/app/common/templates/config-data.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ CommandHandlerInterfaceOnlyClusters:
3636
- Microwave Oven Control
3737
- Energy EVSE
3838
- Energy EVSE Mode
39-
- Meter Identification
4039
- Device Energy Management
4140
- Device Energy Management Mode
4241
- Electrical Power Measurement

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

+4-26
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<?xml version="1.0"?>
22
<!--
3-
Copyright (c) 2024 Project CHIP Authors
3+
Copyright (c) 2021-2024 Project CHIP Authors
4+
45
Licensed under the Apache License, Version 2.0 (the "License");
56
you may not use this file except in compliance with the License.
67
You may obtain a copy of the License at
8+
79
http://www.apache.org/licenses/LICENSE-2.0
10+
811
Unless required by applicable law or agreed to in writing, software
912
distributed under the License is distributed on an "AS IS" BASIS,
1013
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,31 +30,6 @@ limitations under the License.
2730
<item name="Equipment" value="0x02"/>
2831
</enum>
2932

30-
<cluster>
31-
<name>Meter Identification</name>
32-
<domain>Energy Management</domain>
33-
<code>0x0B01</code>
34-
<define>METER_IDENTIFICATION_CLUSTER</define>
35-
<client init="false" tick="false">true</client>
36-
<server init="false" tick="false">true</server>
37-
<description>This cluster provides attributes for determining advanced information about utility metering device.</description>
38-
<features>
39-
<feature bit="0" code="PWRTHLD" name="PowerThreshold" summary="Supports information about power threshold">
40-
<provisionalConform/>
41-
</feature>
42-
</features>
43-
<attribute code="0x0000" side="server" define="METER_TYPE" type="MeterTypeEnum" isNullable="true" writable="false">MeterType</attribute>
44-
<attribute code="0x0001" side="server" define="CUSTOMER_NAME" type="char_string" isNullable="true" writable="true" length="64">
45-
<access op="read" privilege="view"/>
46-
<access op="write" privilege="operate"/>
47-
<description>CustomerName</description>
48-
</attribute>
49-
<attribute code="0x0002" side="server" define="UTILITY_NAME" type="char_string" length="16" isNullable="true">UtilityName</attribute>
50-
<attribute code="0x0003" side="server" define="POINT_OF_DELIVERY" type="char_string" length="16" isNullable="true">PointOfDelivery</attribute>
51-
<attribute code="0x0004" side="server" define="POWER_THRESHOLD" type="power_mw" isNullable="true">PowerThreshold</attribute>
52-
<attribute code="0x0005" side="server" define="POWER_THRESHOLD_SOURCE" type="PowerThresholdSourceEnum" isNullable="true">PowerThresholdSource</attribute>
53-
</cluster>
54-
5533
<cluster>
5634
<domain>Energy Management</domain>
5735
<name>Meter Identification</name>

src/controller/data_model/controller-clusters.matter

-22
Original file line numberDiff line numberDiff line change
@@ -8811,28 +8811,6 @@ provisional cluster ContentAppObserver = 1296 {
88118811
command ContentAppMessage(ContentAppMessageRequest): ContentAppMessageResponse = 0;
88128812
}
88138813

8814-
/** This cluster provides attributes for determining advanced information about utility metering device. */
8815-
cluster MeterIdentification = 2817 {
8816-
revision 1; // NOTE: Default/not specifically set
8817-
8818-
bitmap Feature : bitmap32 {
8819-
kPowerThreshold = 0x1;
8820-
}
8821-
8822-
readonly attribute nullable MeterTypeEnum meterType = 0;
8823-
attribute nullable char_string<64> customerName = 1;
8824-
readonly attribute nullable char_string<16> utilityName = 2;
8825-
readonly attribute nullable char_string<16> pointOfDelivery = 3;
8826-
readonly attribute nullable power_mw powerThreshold = 4;
8827-
readonly attribute nullable PowerThresholdSourceEnum powerThresholdSource = 5;
8828-
readonly attribute command_id generatedCommandList[] = 65528;
8829-
readonly attribute command_id acceptedCommandList[] = 65529;
8830-
readonly attribute event_id eventList[] = 65530;
8831-
readonly attribute attrib_id attributeList[] = 65531;
8832-
readonly attribute bitmap32 featureMap = 65532;
8833-
readonly attribute int16u clusterRevision = 65533;
8834-
}
8835-
88368814
/** Attributes related to the electrical properties of a device. This cluster is used by power outlets and other devices that need to provide instantaneous data as opposed to metrology data which should be retrieved from the metering cluster.. */
88378815
deprecated cluster ElectricalMeasurement = 2820 {
88388816
revision 3;

0 commit comments

Comments
 (0)