From 1448224f920b83a7113c809855e283d7e8ad9d54 Mon Sep 17 00:00:00 2001
From: Janus <janusheide@gmail.com>
Date: Fri, 4 Jun 2021 22:18:41 +0200
Subject: [PATCH] correct stuff that differs from the spec (#7396)

---
 src/app/zap-templates/zcl/pump-controller-device.xml | 8 +++-----
 src/app/zap-templates/zcl/pump-device.xml            | 4 +---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/app/zap-templates/zcl/pump-controller-device.xml b/src/app/zap-templates/zcl/pump-controller-device.xml
index b017efb321c69b..9b1891cff1c747 100644
--- a/src/app/zap-templates/zcl/pump-controller-device.xml
+++ b/src/app/zap-templates/zcl/pump-controller-device.xml
@@ -25,8 +25,6 @@ limitations under the License.
       <include cluster="Basic" client="false" server="true" clientLocked="true" serverLocked="true">
         <requireAttribute>VERSION</requireAttribute>
         <requireAttribute>POWER_SOURCE</requireAttribute>
-        <requireCommand>ResetToFactoryDefaults</requireCommand>
-        <requireCommand>MfgSpecificPing</requireCommand>
       </include>
       <include cluster="Identify" client="true" server="true" clientLocked="true" serverLocked="true">
         <requireAttribute>IDENTIFY_TIME</requireAttribute>
@@ -51,11 +49,11 @@ limitations under the License.
       </include>
       <include cluster="Level Control" client="true" server="false" clientLocked="true" serverLocked="true">
       </include>
-      <include cluster="Temperature Measurement" client="true" server="true" clientLocked="true" serverLocked="true">
+      <include cluster="Temperature Measurement" client="true" server="false" clientLocked="true" serverLocked="true">
       </include>
-      <include cluster="Pressure Measurement" client="true" server="true" clientLocked="true" serverLocked="true">
+      <include cluster="Pressure Measurement" client="true" server="false" clientLocked="true" serverLocked="true">
       </include>
-      <include cluster="Flow Measurement" client="true" server="true" clientLocked="true" serverLocked="true">
+      <include cluster="Flow Measurement" client="true" server="false" clientLocked="true" serverLocked="true">
       </include>
       <!-- TODO add OTA software update -->
     </clusters>
diff --git a/src/app/zap-templates/zcl/pump-device.xml b/src/app/zap-templates/zcl/pump-device.xml
index a871d36229242d..8cc67fcd46b1ac 100644
--- a/src/app/zap-templates/zcl/pump-device.xml
+++ b/src/app/zap-templates/zcl/pump-device.xml
@@ -25,8 +25,6 @@ limitations under the License.
       <include cluster="Basic" client="false" server="true" clientLocked="true" serverLocked="true">
         <requireAttribute>VERSION</requireAttribute>
         <requireAttribute>POWER_SOURCE</requireAttribute>
-        <requireCommand>ResetToFactoryDefaults</requireCommand>
-        <requireCommand>MfgSpecificPing</requireCommand>
       </include>
       <include cluster="Identify" client="true" server="true" clientLocked="true" serverLocked="true">
         <requireAttribute>IDENTIFY_TIME</requireAttribute>
@@ -79,7 +77,7 @@ limitations under the License.
         <requireAttribute>MAX_FLOW</requireAttribute>
         <requireAttribute>EffectiveOperationMode</requireAttribute>
         <requireAttribute>EffectiveControlMode</requireAttribute>
-        <requireAttribute>Capasity</requireAttribute>
+        <requireAttribute>Capacity</requireAttribute>
         <requireAttribute>OperationMode</requireAttribute>
       </include>
       <include cluster="Level Control" client="false" server="true" clientLocked="true" serverLocked="true">