Skip to content

Commit

Permalink
Add XMLs and generated files only
Browse files Browse the repository at this point in the history
  • Loading branch information
Michail-Antropov committed Jun 26, 2024
1 parent 58536ba commit 10a3201
Show file tree
Hide file tree
Showing 42 changed files with 6,144 additions and 121 deletions.
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ jobs:
src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/measurement-and-sensing.xml \
src/app/zap-templates/zcl/data-model/chip/meter-identification-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml \
Expand Down
130 changes: 130 additions & 0 deletions data_model/clusters/MeterIdentification.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<?xml version="1.0"?>
<!--
Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
The information within this document is the property of the Connectivity
Standards Alliance and its use and disclosure are restricted, except as
expressly set forth herein.
Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
nontransferable, worldwide, limited and revocable license (without the right to
sublicense), under Connectivity Standards Alliance's applicable copyright
rights, to view, download, save, reproduce and use the document solely for your
own internal purposes and in accordance with the terms of the license set forth
herein. This license does not authorize you to, and you expressly warrant that
you shall not: (a) permit others (outside your organization) to use this
document; (b) post or publish this document; (c) modify, adapt, translate, or
otherwise change this document in any manner or create any derivative work
based on this document; (d) remove or modify any notice or label on this
document, including this Copyright Notice, License and Disclaimer. The
Connectivity Standards Alliance does not grant you any license hereunder other
than as expressly stated herein.
Elements of this document may be subject to third party intellectual property
rights, including without limitation, patent, copyright or trademark rights,
and any such third party may or may not be a member of the Connectivity
Standards Alliance. Connectivity Standards Alliance members grant other
Connectivity Standards Alliance members certain intellectual property rights as
set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
Standards Alliance members do not grant you any rights under this license. The
Connectivity Standards Alliance is not responsible for, and shall not be held
responsible in any manner for, identifying or failing to identify any or all
such third party intellectual property rights. Please visit www.csa-iot.org for
more information on how to become a member of the Connectivity Standards
Alliance.
This document and the information contained herein are provided on an “AS IS”
basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
LOSS OR DAMAGE.
All company, brand and product names in this document may be trademarks that
are the sole property of their respective owners.
This notice and disclaimer must be included on all copies of this document.
Connectivity Standards Alliance
508 Second Street, Suite 206
Davis, CA 95616, USA
:xrefstyle: short
-->
<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">
<revisionHistory>
<revision revision="1" summary="Initial version"/>
</revisionHistory>
<clusterIds>
<clusterId id="0x0B06" name="Meter Identification"/>
</clusterIds>
<classification hierarchy="base" role="application" picsCode="MTRID" scope="Endpoint"/>
<features>
<feature bit="0" code="PWRTHLD" name="PowerThreshold" summary="Supports information about power threshold">
<optionalConform/>
</feature>
</features>
<dataTypes>
<enum name="MeterTypeEnum">
<item value="0x00" name="Utility" summary="Utility Meter">
<mandatoryConform/>
</item>
<item value="0x01" name="Private" summary="Private Meter">
<mandatoryConform/>
</item>
<item value="0x02" name="Generic" summary="Generic Meter">
<mandatoryConform/>
</item>
</enum>
<enum name="PowerThresholdSourceEnum">
<item value="0x00" name="Contract" summary="The value comes from a signed contract">
<mandatoryConform/>
</item>
<item value="0x01" name="Regulator" summary="The value comes from a legal regulator">
<mandatoryConform/>
</item>
<item value="0x02" name="Equipment" summary="The value comes from a certified limits of the meter">
<mandatoryConform/>
</item>
</enum>
</dataTypes>
<attributes>
<attribute id="0x0000" name="MeterType" type="MeterTypeEnum" default="null">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
</attribute>
<attribute id="0x0001" name="UtilityName" type="string" default="null">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
<constraint type="maxLength" value="16"/>
</attribute>
<attribute id="0x0002" name="PointOfDelivery" type="string" default="null">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
<constraint type="maxLength" value="16"/>
</attribute>
<attribute id="0x0003" name="PowerThreshold" type="power-mW" default="null">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform>
<feature name="PWRTHLD"/>
</mandatoryConform>
</attribute>
<attribute id="0x0004" name="PowerThresholdSource" type="PowerThresholdSourceEnum" default="null">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform>
<feature name="PWRTHLD"/>
</mandatoryConform>
</attribute>
</attributes>
</cluster>
1 change: 1 addition & 0 deletions docs/zap_clusters.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ Generally regenerate using one of:
| 1295 | 0x50F | ContentControl |
| 1296 | 0x510 | ContentAppObserver |
| 2820 | 0xB04 | ElectricalMeasurement |
| 2822 | 0xB06 | MeterIdentification |
| 4294048773 | 0xFFF1FC05 | UnitTesting |
| 4294048774 | 0xFFF1FC06 | FaultInjection |
| 4294048800 | 0xFFF1FC20 | SampleMei |
1 change: 1 addition & 0 deletions scripts/rules.matterlint
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/measurement-and-sensing.xml";
load "../src/app/zap-templates/zcl/data-model/chip/meter-identification-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0"?>
<!--
Copyright (c) 2024 Project CHIP Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configurator>
<domain name="Energy Management"/>
<enum name="MeterTypeEnum" type="enum8">
<cluster code="0x0B06"/>
<item name="Utility" value="0x00"/>
<item name="Private" value="0x01"/>
<item name="Generic" value="0x02"/>
</enum>

<enum name="PowerThresholdSourceEnum" type="enum8">
<cluster code="0x0B06"/>
<item name="Contract" value="0x00"/>
<item name="Regulator" value="0x01"/>
<item name="Equipment" value="0x02"/>
</enum>

<cluster>
<domain>Energy Management</domain>
<name>Meter Identification</name>
<code>0x0B06</code>
<define>METER_IDENTIFICATION_CLUSTER</define>
<description/>
<client init="false" tick="false">true</client>
<features>
<feature bit="0" code="PWRTHLD" name="PowerThreshold" summary="Supports information about power threshold">
<optionalConform/>
</feature>
</features>
<server init="false" tick="false">true</server>
<globalAttribute code="0xFFFD" side="either" value="1"/>
<attribute code="0x0000" side="server" define="METER_TYPE" type="MeterTypeEnum" isNullable="true" min="0x00" max="0x02">MeterType</attribute>
<attribute code="0x0001" side="server" define="UTILITY_NAME" type="char_string" isNullable="true" length="16">UtilityName</attribute>
<attribute code="0x0002" side="server" define="POINT_OF_DELIVERY" type="char_string" isNullable="true" length="16">PointOfDelivery</attribute>
<attribute code="0x0003" side="server" define="POWER_THRESHOLD" type="power_mw" isNullable="true" optional="true">PowerThreshold</attribute>
<attribute code="0x0004" side="server" define="POWER_THRESHOLD_SOURCE" type="PowerThresholdSourceEnum" isNullable="true" min="0x00" max="0x02" optional="true">PowerThresholdSource</attribute>
</cluster>
</configurator>
97 changes: 77 additions & 20 deletions src/app/zap-templates/zcl/zcl-with-test-extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"dishwasher-alarm-cluster.xml",
"dishwasher-mode-cluster.xml",
"drlc-cluster.xml",
"meter-identification-cluster.xml",
"microwave-oven-mode-cluster.xml",
"microwave-oven-control-cluster.xml",
"door-lock-cluster.xml",
Expand Down Expand Up @@ -138,9 +139,15 @@
"manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
"options": {
"text": {
"defaultResponsePolicy": ["Always", "Conditional", "Never"]
"defaultResponsePolicy": [
"Always",
"Conditional",
"Never"
]
},
"bool": ["commandDiscovery"]
"bool": [
"commandDiscovery"
]
},
"defaults": {
"text": {
Expand Down Expand Up @@ -186,8 +193,13 @@
"SpecificationVersion",
"MaxPathsPerInvoke"
],
"Bridged Device Basic Information": ["ProductAppearance"],
"Descriptor": ["ClusterRevision", "FeatureMap"],
"Bridged Device Basic Information": [
"ProductAppearance"
],
"Descriptor": [
"ClusterRevision",
"FeatureMap"
],
"Device Energy Management": [
"ESAType",
"ESACanGenerate",
Expand Down Expand Up @@ -230,7 +242,11 @@
"SessionEnergyDischarged",
"FeatureMap"
],
"Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
"Energy EVSE Mode": [
"SupportedModes",
"CurrentMode",
"FeatureMap"
],
"Ethernet Network Diagnostics": [
"PHYRate",
"FullDuplex",
Expand Down Expand Up @@ -369,14 +385,21 @@
"CurrentMaxRate",
"OverrunCount"
],
"Channel": ["Lineup", "CurrentChannel"],
"Channel": [
"Lineup",
"CurrentChannel"
],
"Media Playback": [
"SampledPosition",
"ActiveAudioTrack",
"ActiveTextTrack"
],
"Application Launcher": ["CurrentApp"],
"Application Basic": ["Application"],
"Application Launcher": [
"CurrentApp"
],
"Application Basic": [
"Application"
],
"Time Synchronization": [
"TrustedTimeSource",
"DefaultNTP",
Expand All @@ -388,15 +411,21 @@
"TimeZoneListMaxSize",
"DSTOffsetListMaxSize"
],
"Temperature Control": ["SupportedTemperatureLevels"],
"Temperature Control": [
"SupportedTemperatureLevels"
],
"Dishwasher Mode": [
"SupportedModes",
"CurrentMode",
"StartUpMode",
"OnMode",
"FeatureMap"
],
"Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
"Microwave Oven Mode": [
"SupportedModes",
"CurrentMode",
"FeatureMap"
],
"Microwave Oven Control": [
"CookTime",
"MaxCookTime",
Expand All @@ -423,8 +452,16 @@
"OnMode",
"FeatureMap"
],
"RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
"RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
"RVC Clean Mode": [
"SupportedModes",
"CurrentMode",
"FeatureMap"
],
"RVC Run Mode": [
"SupportedModes",
"CurrentMode",
"FeatureMap"
],
"Operational State": [
"OperationalState",
"OperationalError",
Expand Down Expand Up @@ -601,8 +638,13 @@
"LevelValue",
"FeatureMap"
],
"Air Quality": ["AirQuality", "FeatureMap"],
"Thermostat": ["QueuedPreset"],
"Air Quality": [
"AirQuality",
"FeatureMap"
],
"Thermostat": [
"QueuedPreset"
],
"Electrical Energy Measurement": [
"Accuracy",
"CumulativeEnergyImported",
Expand Down Expand Up @@ -634,13 +676,28 @@
"NeutralCurrent",
"FeatureMap"
],
"Power Topology": ["FeatureMap"],
"Valve Configuration and Control": ["RemainingDuration"],
"Boolean State Configuration": ["CurrentSensitivityLevel"],
"Wi-Fi Network Management": ["SSID"]
"Power Topology": [
"FeatureMap"
],
"Valve Configuration and Control": [
"RemainingDuration"
],
"Boolean State Configuration": [
"CurrentSensitivityLevel"
],
"Wi-Fi Network Management": [
"SSID"
]
},
"defaultReportingPolicy": "mandatory",
"ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],
"ZCLDataTypes": [
"ARRAY",
"BITMAP",
"ENUM",
"NUMBER",
"STRING",
"STRUCT"
],
"fabricHandling": {
"automaticallyCreateFields": true,
"indexFieldId": 254,
Expand All @@ -650,4 +707,4 @@
"uiOptions": {
"showProfileId": false
}
}
}
Loading

0 comments on commit 10a3201

Please sign in to comment.