From b67fc0696476896ee6eb1fa22c00550b95aac7e2 Mon Sep 17 00:00:00 2001
From: Petru Lauric <plauric@irobot.com>
Date: Mon, 24 Jul 2023 17:52:34 -0400
Subject: [PATCH 1/2] add rvc device type

---
 .../zcl/data-model/chip/matter-devices.xml     | 18 ++++++++++++++++++
 .../data-model/chip/rvc-clean-mode-cluster.xml |  2 +-
 .../data-model/chip/rvc-run-mode-cluster.xml   |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
index 3c923129fb9f12..2ce4c429637057 100644
--- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
@@ -1989,6 +1989,24 @@ limitations under the License.
             <include cluster="Operational State" client="false" server="true" clientLocked="true" serverLocked="true"></include>
         </clusters>
     </deviceType>
+    <deviceType>
+        <name>MA-robotic-vacuum-cleaner</name>
+        <domain>CHIP</domain>
+        <typeName>Matter Robotic Vacuum Cleaner</typeName>
+        <profileId editable="false">0x0103</profileId>
+        <deviceId editable="false">0x0074</deviceId>
+        <clusters lockOthers="true">
+            <include cluster="Identify" client="false" server="true" clientLocked="true" serverLocked="true">
+                <requireAttribute>IDENTIFY_TIME</requireAttribute>
+                <requireAttribute>IDENTIFY_TYPE</requireAttribute>
+                <requireCommand>Identify</requireCommand>
+            </include>
+            <include cluster="Descriptor" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+            <include cluster="RVC Run Mode" client="false" server="false" clientLocked="true" serverLocked="true"></include>
+            <include cluster="RVC Clean Mode" client="false" server="false" clientLocked="true" serverLocked="false"></include>
+            <include cluster="RVC Operational State" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+        </clusters>
+    </deviceType>
     <deviceType>
         <name>MA-temperature-controlled-cabinet</name>
         <domain>CHIP</domain>
diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml
index 1baf10841b9672..8921822d4f89c5 100644
--- a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml
@@ -30,7 +30,7 @@ limitations under the License.
   </enum>
 
   <cluster>
-    <domain>General</domain>
+    <domain>Robots</domain>
     <name>RVC Clean Mode</name>
     <code>0x0055</code>
     <define>RVC_CLEAN_MODE_CLUSTER</define>
diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml
index dd7905ce9891d7..d6a3a241c32bd1 100644
--- a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml
@@ -36,7 +36,7 @@ limitations under the License.
   </enum>
 
   <cluster>
-    <domain>General</domain>
+    <domain>Robots</domain>
     <name>RVC Run Mode</name>
     <code>0x0054</code>
     <define>RVC_RUN_MODE_CLUSTER</define>

From 78a1781acc9869ddf6e7184f2eeadb46128a5fb5 Mon Sep 17 00:00:00 2001
From: Petru Lauric <81822411+plauric@users.noreply.github.com>
Date: Tue, 25 Jul 2023 09:30:06 -0400
Subject: [PATCH 2/2] Apply suggestions from code review

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
---
 src/app/zap-templates/zcl/data-model/chip/matter-devices.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
index 2ce4c429637057..be7b55cb5ed43e 100644
--- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
@@ -1997,12 +1997,9 @@ limitations under the License.
         <deviceId editable="false">0x0074</deviceId>
         <clusters lockOthers="true">
             <include cluster="Identify" client="false" server="true" clientLocked="true" serverLocked="true">
-                <requireAttribute>IDENTIFY_TIME</requireAttribute>
-                <requireAttribute>IDENTIFY_TYPE</requireAttribute>
-                <requireCommand>Identify</requireCommand>
             </include>
             <include cluster="Descriptor" client="false" server="true" clientLocked="true" serverLocked="true"></include>
-            <include cluster="RVC Run Mode" client="false" server="false" clientLocked="true" serverLocked="true"></include>
+            <include cluster="RVC Run Mode" client="false" server="true" clientLocked="true" serverLocked="true"></include>
             <include cluster="RVC Clean Mode" client="false" server="false" clientLocked="true" serverLocked="false"></include>
             <include cluster="RVC Operational State" client="false" server="true" clientLocked="true" serverLocked="true"></include>
         </clusters>