From a28dfd75b5c613c1fa54dd3853113dbba60226b2 Mon Sep 17 00:00:00 2001 From: James Harrow Date: Fri, 18 Oct 2024 16:57:35 +0100 Subject: [PATCH 1/2] Added Heat Pump, Solar Power, Battery Storage to matter-devices.xml --- .../zcl/data-model/chip/matter-devices.xml | 72 +++++++++++++++++++ 1 file changed, 72 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 f7f5699ef8fccf..86f36da5bad7b1 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 @@ -2698,4 +2698,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 + + + From 8a0276ac729b9636e435032a3d558d1c173f18c0 Mon Sep 17 00:00:00 2001 From: James Harrow Date: Fri, 18 Oct 2024 17:16:53 +0100 Subject: [PATCH 2/2] Update after regen_all --- .../Framework/CHIP/zap-generated/MTRClusterConstants.h | 3 +++ .../Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm | 3 +++ .../chip-tool/zap-generated/cluster/logging/EntryToText.cpp | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index 76d6ab35d3724a..3097d866b0ab8b 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -7702,6 +7702,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, @@ -7753,6 +7755,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, MTRDeviceTypeIDTypeElectricalSensorID MTR_NEWLY_AVAILABLE = 0x00000510, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm b/src/darwin/Framework/CHIP/zap-generated/MTRDeviceTypeMetadata.mm index f0530c41a54f00..7c179402810d85 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" }, { 0x00000510, MTRDeviceTypeClass::Utility, "Electrical Sensor" }, 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 5aa0a783f8bfac..1bccc5a2fc3571 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp @@ -6655,6 +6655,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: @@ -6757,6 +6761,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: