From 90d200c1fbb2b2bb11eb57dacdda65e0d37e1a6e Mon Sep 17 00:00:00 2001
From: Janus <janusheide@gmail.com>
Date: Wed, 2 Jun 2021 07:15:05 +0200
Subject: [PATCH] moved flow measurement cluster into seperate xml (#7226)

---
 .../zcl/data-model/silabs/ha-thread.xml       | 17 ----------
 .../zcl/data-model/silabs/ha.xml              | 18 ----------
 .../zcl/flow-measurement-cluster.xml          | 33 +++++++++++++++++++
 src/app/zap-templates/zcl/zcl.json            |  1 +
 4 files changed, 34 insertions(+), 35 deletions(-)
 create mode 100644 src/app/zap-templates/zcl/flow-measurement-cluster.xml

diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha-thread.xml b/src/app/zap-templates/zcl/data-model/silabs/ha-thread.xml
index 659c3fdd2b7931..f25bd294a8c0db 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/ha-thread.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/ha-thread.xml
@@ -445,23 +445,6 @@ limitations under the License.
     <attribute side="server" code="0x0013" define="PRESSURE_SCALED_TOLERANCE" type="INT16S" min="0x0000" max="0x0800" writable="false" reportable="true" optional="true">scaled tolerance</attribute>
     <attribute side="server" code="0x0014" define="PRESSURE_SCALE" type="INT8S" min="0x81" max="0x7F" writable="false" optional="true">scale</attribute>
   </cluster>
-  <cluster>
-    <name>Flow Measurement</name>
-    <domain>Measurement &amp; Sensing</domain>
-    <description>Attributes and commands for configuring the measurement of flow, and reporting flow rates.</description>
-    <code>0x0404</code>
-    <define>FLOW_MEASUREMENT_CLUSTER</define>
-    <client tick="false" init="false">true</client>
-    <server tick="false" tickFrequency="half" init="false">true</server>
-    <attribute side="server" code="0x0000" define="FLOW_MEASURED_VALUE" type="INT16U" writable="false" reportable="true" default="0x0000" optional="false">measured value</attribute>
-    <!-- MEASURED_VALUE -->
-    <attribute side="server" code="0x0001" define="FLOW_MIN_MEASURED_VALUE" type="INT16U" min="0x0000" max="0xfffd" writable="false" optional="false">min measured value</attribute>
-    <!-- MIN_MEASURED_VALUE -->
-    <attribute side="server" code="0x0002" define="FLOW_MAX_MEASURED_VALUE" type="INT16U" min="0x0001" max="0xfffe" writable="false" optional="false">max measured value</attribute>
-    <!-- MAX_MEASURED_VALUE -->
-    <attribute side="server" code="0x0003" define="FLOW_TOLERANCE" type="INT16U" min="0x0000" max="0x0800" writable="false" reportable="true" optional="true">tolerance</attribute>
-    <!-- TOLERANCE -->
-  </cluster>
   <cluster>
     <name>Relative Humidity Measurement</name>
     <domain>Measurement &amp; Sensing</domain>
diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha.xml b/src/app/zap-templates/zcl/data-model/silabs/ha.xml
index afb79e189d6ff8..a48fa9f28940b3 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/ha.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/ha.xml
@@ -474,24 +474,6 @@ limitations under the License.
     <attribute side="server" code="0x0013" define="PRESSURE_SCALED_TOLERANCE" type="INT16S" min="0x0000" max="0x0800" writable="false" reportable="true" optional="true">scaled tolerance</attribute>
     <attribute side="server" code="0x0014" define="PRESSURE_SCALE" type="INT8S" min="0x81" max="0x7F" writable="false" optional="true">scale</attribute>
   </cluster>
-  <cluster>
-    <name>Flow Measurement</name>
-    <domain>Measurement &amp; Sensing</domain>
-    <description>Attributes and commands for configuring the measurement of flow, and reporting flow rates.</description>
-    <code>0x0404</code>
-    <define>FLOW_MEASUREMENT_CLUSTER</define>
-    <client tick="false" init="false">true</client>
-    <server tick="false" tickFrequency="half" init="false">true</server>
-    <globalAttribute side="either" code="0xFFFD" value="2"/>
-    <attribute side="server" code="0x0000" define="FLOW_MEASURED_VALUE" type="INT16U" writable="false" reportable="true" default="0x0000" optional="false">measured value</attribute>
-    <!-- MEASURED_VALUE -->
-    <attribute side="server" code="0x0001" define="FLOW_MIN_MEASURED_VALUE" type="INT16U" min="0x0000" max="0xfffd" writable="false" optional="false">min measured value</attribute>
-    <!-- MIN_MEASURED_VALUE -->
-    <attribute side="server" code="0x0002" define="FLOW_MAX_MEASURED_VALUE" type="INT16U" min="0x0001" max="0xfffe" writable="false" optional="false">max measured value</attribute>
-    <!-- MAX_MEASURED_VALUE -->
-    <attribute side="server" code="0x0003" define="FLOW_TOLERANCE" type="INT16U" min="0x0000" max="0x0800" writable="false" reportable="true" optional="true">tolerance</attribute>
-    <!-- TOLERANCE -->
-  </cluster>
   <cluster>
     <name>Relative Humidity Measurement</name>
     <domain>Measurement &amp; Sensing</domain>
diff --git a/src/app/zap-templates/zcl/flow-measurement-cluster.xml b/src/app/zap-templates/zcl/flow-measurement-cluster.xml
new file mode 100644
index 00000000000000..0844e9cd5998f6
--- /dev/null
+++ b/src/app/zap-templates/zcl/flow-measurement-cluster.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2021 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="CHIP"/>
+  <cluster>
+    <name>Flow Measurement</name>
+    <domain>Measurement &amp; Sensing</domain>
+    <description>Attributes and commands for configuring the measurement of flow, and reporting flow measurements.</description>
+    <code>0x0404</code>
+    <define>FLOW_MEASUREMENT_CLUSTER</define>
+    <client tick="false" init="false">true</client>
+    <server tick="false" init="false">true</server>
+    <attribute side="server" code="0x0000" define="FLOW_MEASURED_VALUE" type="INT16S" writable="false" optional="false">measured value</attribute>
+    <attribute side="server" code="0x0001" define="FLOW_MIN_MEASURED_VALUE" type="INT16S" min="-38221" max="65535" writable="false" optional="false">min measured value</attribute>
+    <attribute side="server" code="0x0002" define="FLOW_MAX_MEASURED_VALUE" type="INT16S" min="-38221" max="65535" writable="false" optional="false">max measured value</attribute>
+    <attribute side="server" code="0x0003" define="FLOW_TOLERANCE" type="INT16U" writable="false" default="0" optional="true">tolerance</attribute>
+  </cluster>
+
+</configurator>
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index 15f626dca29751..bcb8283b1e963a 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -23,6 +23,7 @@
         "custom-types.xml",
         "chip-devices.xml",
         "descriptor-cluster.xml",
+        "flow-measurement-cluster.xml",
         "types.xml",
         "general.xml",
         "operational-credentials-cluster.xml",