From 089c1b5059b8916fa6f08f142ba3ef86961926a9 Mon Sep 17 00:00:00 2001
From: fuxiaoming-lumi <xiaoming.fu@aqara.com>
Date: Tue, 11 Feb 2025 13:57:45 +0000
Subject: [PATCH 1/2] Add Thermostat Controller New Device Type

---
 .../zcl/data-model/chip/matter-devices.xml    | 24 +++++++++++++++++++
 .../CHIP/zap-generated/MTRClusterConstants.h  |  1 +
 .../zap-generated/MTRDeviceTypeMetadata.mm    |  1 +
 .../cluster/logging/EntryToText.cpp           |  2 ++
 4 files changed, 28 insertions(+)

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 84b5720e165fe1..3def94bdd59116 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
@@ -2805,4 +2805,28 @@ limitations under the License.
             </include>
         </clusters>
     </deviceType>
+    <deviceType>
+        <name>MA-thermostatcontroller</name>
+        <domain>CHIP</domain>
+        <typeName>Matter Thermostat Controller</typeName>
+        <profileId editable="false">0x0103</profileId>
+        <deviceId editable="false">0x030A</deviceId>
+        <class>Simple</class>
+        <scope>Endpoint</scope>
+        <clusters lockOthers="true">
+            <include cluster="Descriptor" client="false" server="true" clientLocked="true" serverLocked="true">
+                <requireAttribute>DEVICE_TYPE_LIST</requireAttribute>
+                <requireAttribute>SERVER_LIST</requireAttribute>
+                <requireAttribute>CLIENT_LIST</requireAttribute>
+                <requireAttribute>PARTS_LIST</requireAttribute>
+            </include>
+            <include cluster="Binding" client="false" server="true" clientLocked="true" serverLocked="true">
+                <requireAttribute>BINDING</requireAttribute>
+            </include>
+            <include cluster="Thermostat" client="true" server="false" clientLocked="true" serverLocked="true"></include>
+            <include cluster="Identify" client="true" server="false" clientLocked="false" serverLocked="true"></include>
+            <include cluster="Groups" client="true" server="false" clientLocked="false" serverLocked="true"></include>
+            <include cluster="Scenes Management" client="true" server="false" clientLocked="false" serverLocked="true"></include>
+        </clusters>
+    </deviceType>
 </configurator>
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
index d6f8f73697ae22..566e9afb74aea4 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
@@ -7687,6 +7687,7 @@ typedef NS_ENUM(uint32_t, MTRDeviceTypeIDType) {
     MTRDeviceTypeIDTypeFlowSensorID MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2)) = 0x00000306,
     MTRDeviceTypeIDTypeHumiditySensorID MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2)) = 0x00000307,
     MTRDeviceTypeIDTypeHeatPumpID MTR_PROVISIONALLY_AVAILABLE = 0x00000309,
+    MTRDeviceTypeIDTypeThermostatControllerID MTR_PROVISIONALLY_AVAILABLE = 0x0000030A,
     MTRDeviceTypeIDTypeEVSEID MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2)) = 0x0000050C,
     MTRDeviceTypeIDTypeDeviceEnergyManagementID MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2)) = 0x0000050D,
     MTRDeviceTypeIDTypeWaterHeaterID MTR_PROVISIONALLY_AVAILABLE = 0x0000050F,
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm b/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
index 9e4b98f3ffdb77..b24e3caf9754b8 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
@@ -88,6 +88,7 @@
     { 0x00000306, MTRDeviceTypeClass::Simple, @"Flow Sensor" },
     { 0x00000307, MTRDeviceTypeClass::Simple, @"Humidity Sensor" },
     { 0x00000309, MTRDeviceTypeClass::Simple, @"Heat Pump" },
+    { 0x0000030A, MTRDeviceTypeClass::Simple, @"Thermostat Controller" },
     { 0x0000050C, MTRDeviceTypeClass::Simple, @"EVSE" },
     { 0x0000050D, MTRDeviceTypeClass::Utility, @"Device Energy Management" },
     { 0x0000050F, MTRDeviceTypeClass::Simple, @"Water Heater" },
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
index d0593cdcc9ea15..fc3ed50503cbce 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
@@ -6663,6 +6663,8 @@ char const * DeviceTypeIdToText(chip::DeviceTypeId id)
         return "Humidity Sensor";
     case 0x00000309:
         return "Heat Pump";
+    case 0x0000030A:
+        return "Thermostat Controller";
     case 0x0000050C:
         return "EVSE";
     case 0x0000050D:

From 7f18f7b275e14981a20497e4071b3ca0da4bc4bf Mon Sep 17 00:00:00 2001
From: fuxiaoming-lumi <xiaoming.fu@aqara.com>
Date: Wed, 12 Feb 2025 04:28:39 +0000
Subject: [PATCH 2/2] Rename Matter Thermostat Controller to Thermostat
 Controller

---
 src/app/zap-templates/zcl/data-model/chip/matter-devices.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 3def94bdd59116..332a8669ff163f 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
@@ -2808,7 +2808,7 @@ limitations under the License.
     <deviceType>
         <name>MA-thermostatcontroller</name>
         <domain>CHIP</domain>
-        <typeName>Matter Thermostat Controller</typeName>
+        <typeName>Thermostat Controller</typeName>
         <profileId editable="false">0x0103</profileId>
         <deviceId editable="false">0x030A</deviceId>
         <class>Simple</class>