From deb5bb50d07e61b2c0a1f5b5c4ae4698223917eb Mon Sep 17 00:00:00 2001
From: jamesharrow <93921463+jamesharrow@users.noreply.github.com>
Date: Thu, 24 Oct 2024 18:21:44 +0100
Subject: [PATCH] Add missing device types solar pv, battery storage, heat pump
(#36147)
* Added Heat Pump, Solar Power, Battery Storage to matter-devices.xml
* Update after regen_all
---
.../zcl/data-model/chip/matter-devices.xml | 72 +++++++++++++++++++
.../CHIP/zap-generated/MTRClusterConstants.h | 3 +
.../zap-generated/MTRDeviceTypeMetadata.mm | 3 +
.../cluster/logging/EntryToText.cpp | 6 ++
4 files changed, 84 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 ff485bbf6bba81..bdccfbe39e1582 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
@@ -2741,4 +2741,76 @@ limitations under the License.
+
+ MA-heatpump
+ CHIP
+ Heat Pump
+ 0x0103
+ 0x0309
+ Simple
+ Endpoint
+
+
+ CLIENT_LIST
+ DEVICE_TYPE_LIST
+ PARTS_LIST
+ SERVER_LIST
+
+
+ IDENTIFY_TIME
+ IDENTIFY_TYPE
+ Identify
+
+
+ CONTROL_SEQUENCE_OF_OPERATION
+ LOCAL_TEMPERATURE
+ SYSTEM_MODE
+ SetpointRaiseLower
+
+
+
+
+ MA-solarpower
+ CHIP
+ Solar Power
+ 0x0103
+ 0x0017
+ Simple
+ Endpoint
+
+
+ CLIENT_LIST
+ DEVICE_TYPE_LIST
+ PARTS_LIST
+ SERVER_LIST
+
+
+ IDENTIFY_TIME
+ IDENTIFY_TYPE
+ Identify
+
+
+
+
+ MA-batterystorage
+ CHIP
+ Battery Storage
+ 0x0103
+ 0x0018
+ Simple
+ Endpoint
+
+
+ CLIENT_LIST
+ DEVICE_TYPE_LIST
+ PARTS_LIST
+ SERVER_LIST
+
+
+ IDENTIFY_TIME
+ IDENTIFY_TYPE
+ Identify
+
+
+
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
index da2ce72f59373d..c44b789060f895 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
@@ -7572,6 +7572,8 @@ typedef NS_ENUM(uint32_t, MTRDeviceTypeIDType) {
MTRDeviceTypeIDTypeOTAProviderID MTR_NEWLY_AVAILABLE = 0x00000014,
MTRDeviceTypeIDTypeContactSensorID MTR_NEWLY_AVAILABLE = 0x00000015,
MTRDeviceTypeIDTypeRootNodeID MTR_NEWLY_AVAILABLE = 0x00000016,
+ MTRDeviceTypeIDTypeSolarPowerID MTR_PROVISIONALLY_AVAILABLE = 0x00000017,
+ MTRDeviceTypeIDTypeBatteryStorageID MTR_PROVISIONALLY_AVAILABLE = 0x00000018,
MTRDeviceTypeIDTypeSecondaryNetworkInterfaceID MTR_NEWLY_AVAILABLE = 0x00000019,
MTRDeviceTypeIDTypeSpeakerID MTR_NEWLY_AVAILABLE = 0x00000022,
MTRDeviceTypeIDTypeCastingVideoPlayerID MTR_NEWLY_AVAILABLE = 0x00000023,
@@ -7623,6 +7625,7 @@ typedef NS_ENUM(uint32_t, MTRDeviceTypeIDType) {
MTRDeviceTypeIDTypePressureSensorID MTR_NEWLY_AVAILABLE = 0x00000305,
MTRDeviceTypeIDTypeFlowSensorID MTR_NEWLY_AVAILABLE = 0x00000306,
MTRDeviceTypeIDTypeHumiditySensorID MTR_NEWLY_AVAILABLE = 0x00000307,
+ MTRDeviceTypeIDTypeHeatPumpID MTR_PROVISIONALLY_AVAILABLE = 0x00000309,
MTRDeviceTypeIDTypeEVSEID MTR_NEWLY_AVAILABLE = 0x0000050C,
MTRDeviceTypeIDTypeDeviceEnergyManagementID MTR_NEWLY_AVAILABLE = 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 b4ea67c2ed66fe..fc9d8c7d930d88 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm
@@ -32,6 +32,8 @@
{ 0x00000014, MTRDeviceTypeClass::Utility, "OTA Provider" },
{ 0x00000015, MTRDeviceTypeClass::Simple, "Contact Sensor" },
{ 0x00000016, MTRDeviceTypeClass::Node, "Root Node" },
+ { 0x00000017, MTRDeviceTypeClass::Simple, "Solar Power" },
+ { 0x00000018, MTRDeviceTypeClass::Simple, "Battery Storage" },
{ 0x00000019, MTRDeviceTypeClass::Utility, "Secondary Network Interface" },
{ 0x00000022, MTRDeviceTypeClass::Simple, "Speaker" },
{ 0x00000023, MTRDeviceTypeClass::Simple, "Casting Video Player" },
@@ -83,6 +85,7 @@
{ 0x00000305, MTRDeviceTypeClass::Simple, "Pressure Sensor" },
{ 0x00000306, MTRDeviceTypeClass::Simple, "Flow Sensor" },
{ 0x00000307, MTRDeviceTypeClass::Simple, "Humidity Sensor" },
+ { 0x00000309, MTRDeviceTypeClass::Simple, "Heat Pump" },
{ 0x0000050C, MTRDeviceTypeClass::Simple, "EVSE" },
{ 0x0000050D, MTRDeviceTypeClass::Simple, "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 7c4c38ae6cec3f..caa60d3532e401 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp
@@ -6389,6 +6389,10 @@ char const * DeviceTypeIdToText(chip::DeviceTypeId id)
return "Contact Sensor";
case 0x00000016:
return "Root Node";
+ case 0x00000017:
+ return "Solar Power";
+ case 0x00000018:
+ return "Battery Storage";
case 0x00000019:
return "Secondary Network Interface";
case 0x00000022:
@@ -6491,6 +6495,8 @@ char const * DeviceTypeIdToText(chip::DeviceTypeId id)
return "Flow Sensor";
case 0x00000307:
return "Humidity Sensor";
+ case 0x00000309:
+ return "Heat Pump";
case 0x0000050C:
return "EVSE";
case 0x0000050D: