From 45d438f83b8e9369416cedad98d1a1d869aad2ac Mon Sep 17 00:00:00 2001
From: eahove <eahove@gmail.com>
Date: Wed, 29 Nov 2023 17:30:40 -0600
Subject: [PATCH] Adding the Oven Device on top of 8349 change. (#30671)

* Updating for issue 8349

* Updating regen

* Attempting to fix CI failures

* Attempting to regen again

* Reverting changes back

* Adding provisional

* Attempting to fix CI issues with global attribute fix

* Fixing regen and CI issues with missing zcl addition

* adding oven device type

* zap-regen-all

* Fixing zcl with test file

* update oven device

* update cluster zap file

* reran zap_regen_all

* Attempting to fix CI failures

* Attempting to regen again

* adding oven device type

* zap-regen-all

* update oven device

* update cluster zap file

* rerun zap and zap_regen_all

* regenerated zap

* Attempting to fix CI failures

* Attempting to regen again

* adding oven device type

* update oven device

* update cluster zap file

* rerun zap and zap_regen_all

* Updating for issue 8349

* Updating regen

* Attempting to fix CI failures

* Attempting to regen again

* Reverting changes back

* Adding provisional

* Attempting to fix CI issues with global attribute fix

* Fixing regen and CI issues with missing zcl addition

* adding oven device type

* update oven device

* update cluster zap file

* reran zap_regen_all

* regen zap

* regen zap

* fix merge issue. regen zap.

---------

Co-authored-by: abeck-riis <98488327+abeck-riis@users.noreply.github.com>
---
 .../zcl/data-model/chip/matter-devices.xml        | 12 ++++++++++++
 src/controller/data_model/controller-clusters.zap | 15 ++++++++-------
 .../CHIP/zap-generated/MTRDeviceTypeMetadata.mm   |  1 +
 3 files changed, 21 insertions(+), 7 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 b73bea88aab9af..94b8327c474d70 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
@@ -1966,6 +1966,18 @@ limitations under the License.
             <include cluster="Dishwasher Alarm" client="false" server="false" clientLocked="true" serverLocked="false"></include>
             <include cluster="Operational State" client="false" server="true" clientLocked="true" serverLocked="true"></include>
         </clusters>
+    </deviceType>
+     <deviceType>
+        <name>MA-oven</name>
+        <domain>CHIP</domain>
+        <typeName>Matter Oven</typeName>
+        <profileId editable="false">0x0103</profileId>
+        <deviceId editable="false">0x007B</deviceId>
+        <class>Simple</class>
+        <scope>Endpoint</scope>
+        <clusters lockOthers="true">
+            <include cluster="Identify" client="false" server="false" clientLocked="true" serverLocked="false"></include>
+        </clusters>
     </deviceType>
     <deviceType>
         <name>MA-refrigerator</name>
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index 67b8da72bb5505..34eed703bb2519 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -17,6 +17,12 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../app/zap-templates/zcl/zcl.json",
@@ -24,12 +30,6 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
@@ -5400,5 +5400,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm b/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
index ee76e5fa82df42..cca0eb56a3aee3 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
@@ -65,6 +65,7 @@
     { 0x00000075, DeviceTypeClass::Simple, "Matter Dishwasher" },
     { 0x00000076, DeviceTypeClass::Simple, "Matter Smoke CO Alarm" },
     { 0x00000078, DeviceTypeClass::Simple, "Matter Cooktop" },
+    { 0x0000007B, DeviceTypeClass::Simple, "Matter Oven" },
     { 0x0000007C, DeviceTypeClass::Simple, "Matter Laundry Dryer" },
     { 0x00000100, DeviceTypeClass::Simple, "Matter On/Off Light" },
     { 0x00000101, DeviceTypeClass::Simple, "Matter Dimmable Light" },