From 10051002e6f802f954eb6d01f29e2a543ffe3ef9 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Sat, 18 Nov 2023 00:43:10 -0500 Subject: [PATCH] Update DRLC cluster to spec changes. (#30557) The DeviceClass attibute has been removed in https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/7762 NumberOfTransitions was spelled wrong. --- .../zcl/data-model/chip/drlc-cluster.xml | 19 ++- .../data_model/controller-clusters.matter | 19 ++- .../chip/devicecontroller/ChipClusters.java | 54 ++----- .../devicecontroller/ClusterIDMapping.java | 17 +-- .../devicecontroller/ClusterReadMapping.java | 23 +-- .../DemandResponseLoadControlCluster.kt | 12 +- .../CHIPAttributeTLVValueDecoder.cpp | 20 +-- .../python/chip/clusters/CHIPClusters.py | 32 ++-- .../python/chip/clusters/Objects.py | 54 +++---- .../MTRAttributeSpecifiedCheck.mm | 5 +- .../MTRAttributeTLVValueDecoder.mm | 15 +- .../CHIP/zap-generated/MTRBaseClusters.h | 16 +- .../CHIP/zap-generated/MTRBaseClusters.mm | 52 +------ .../CHIP/zap-generated/MTRClusterConstants.h | 17 +-- .../CHIP/zap-generated/MTRClusters.h | 4 +- .../CHIP/zap-generated/MTRClusters.mm | 9 +- .../zap-generated/attributes/Accessors.cpp | 36 +---- .../zap-generated/attributes/Accessors.h | 11 +- .../zap-generated/cluster-objects.cpp | 6 +- .../zap-generated/cluster-objects.h | 22 +-- .../app-common/zap-generated/ids/Attributes.h | 24 ++- .../zap-generated/cluster/Commands.h | 27 ++-- .../cluster/logging/DataModelLogger.cpp | 9 +- .../zap-generated/cluster/Commands.h | 142 ++++-------------- 24 files changed, 167 insertions(+), 478 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml index e3fa9f85c51c21..bc68ed6e7f2ac0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml @@ -182,7 +182,7 @@ limitations under the License. - + Demand Response Load Control Energy This cluster provides an interface to the functionality of Smart Energy Demand Response and Load Control. @@ -192,19 +192,18 @@ limitations under the License. true - DeviceClass - LoadControlPrograms - NumberOfLoadControlPrograms - Events - ActiveEvents - NumberOfEventsPerProgram - NumberOfTransistions - + LoadControlPrograms + NumberOfLoadControlPrograms + Events + ActiveEvents + NumberOfEventsPerProgram + NumberOfTransitions + DefaultRandomStart - + DefaultRandomDuration diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 533767e110f582..5a5895914abde5 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -3888,7 +3888,7 @@ provisional client cluster ValveConfigurationAndControl = 129 { } /** This cluster provides an interface to the functionality of Smart Energy Demand Response and Load Control. */ -client cluster DemandResponseLoadControl = 150 { +provisional client cluster DemandResponseLoadControl = 150 { enum CriticalityLevelEnum : enum8 { kUnknown = 0; kGreen = 1; @@ -4043,15 +4043,14 @@ client cluster DemandResponseLoadControl = 150 { optional nullable HeatingSourceControlStruct heatingSourceControl = 9; } - readonly attribute DeviceClassBitmap deviceClass = 0; - readonly attribute LoadControlProgramStruct loadControlPrograms[] = 1; - readonly attribute int8u numberOfLoadControlPrograms = 2; - readonly attribute LoadControlEventStruct events[] = 3; - readonly attribute LoadControlEventStruct activeEvents[] = 4; - readonly attribute int8u numberOfEventsPerProgram = 5; - readonly attribute int8u numberOfTransistions = 6; - attribute access(write: manage) int8u defaultRandomStart = 7; - attribute access(write: manage) int8u defaultRandomDuration = 8; + readonly attribute LoadControlProgramStruct loadControlPrograms[] = 0; + readonly attribute int8u numberOfLoadControlPrograms = 1; + readonly attribute LoadControlEventStruct events[] = 2; + readonly attribute LoadControlEventStruct activeEvents[] = 3; + readonly attribute int8u numberOfEventsPerProgram = 4; + readonly attribute int8u numberOfTransitions = 5; + attribute access(write: manage) int8u defaultRandomStart = 6; + attribute access(write: manage) int8u defaultRandomDuration = 7; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java index 239e80a9272419..11aa449670f3a9 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java @@ -27573,15 +27573,14 @@ public void onSuccess(byte[] tlv) { public static class DemandResponseLoadControlCluster extends BaseChipCluster { public static final long CLUSTER_ID = 150L; - private static final long DEVICE_CLASS_ATTRIBUTE_ID = 0L; - private static final long LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID = 1L; - private static final long NUMBER_OF_LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID = 2L; - private static final long EVENTS_ATTRIBUTE_ID = 3L; - private static final long ACTIVE_EVENTS_ATTRIBUTE_ID = 4L; - private static final long NUMBER_OF_EVENTS_PER_PROGRAM_ATTRIBUTE_ID = 5L; - private static final long NUMBER_OF_TRANSISTIONS_ATTRIBUTE_ID = 6L; - private static final long DEFAULT_RANDOM_START_ATTRIBUTE_ID = 7L; - private static final long DEFAULT_RANDOM_DURATION_ATTRIBUTE_ID = 8L; + private static final long LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID = 0L; + private static final long NUMBER_OF_LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID = 1L; + private static final long EVENTS_ATTRIBUTE_ID = 2L; + private static final long ACTIVE_EVENTS_ATTRIBUTE_ID = 3L; + private static final long NUMBER_OF_EVENTS_PER_PROGRAM_ATTRIBUTE_ID = 4L; + private static final long NUMBER_OF_TRANSITIONS_ATTRIBUTE_ID = 5L; + private static final long DEFAULT_RANDOM_START_ATTRIBUTE_ID = 6L; + private static final long DEFAULT_RANDOM_DURATION_ATTRIBUTE_ID = 7L; private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L; private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L; private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L; @@ -27727,31 +27726,6 @@ public interface AttributeListAttributeCallback extends BaseAttributeCallback { void onSuccess(List value); } - public void readDeviceClassAttribute( - LongAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEVICE_CLASS_ATTRIBUTE_ID); - - readAttribute(new ReportCallbackImpl(callback, path) { - @Override - public void onSuccess(byte[] tlv) { - Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); - callback.onSuccess(value); - } - }, DEVICE_CLASS_ATTRIBUTE_ID, true); - } - - public void subscribeDeviceClassAttribute( - LongAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEVICE_CLASS_ATTRIBUTE_ID); - - subscribeAttribute(new ReportCallbackImpl(callback, path) { - @Override - public void onSuccess(byte[] tlv) { - Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); - } - }, DEVICE_CLASS_ATTRIBUTE_ID, minInterval, maxInterval); - } - public void readLoadControlProgramsAttribute( LoadControlProgramsAttributeCallback callback) { ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID); @@ -27877,9 +27851,9 @@ public void onSuccess(byte[] tlv) { }, NUMBER_OF_EVENTS_PER_PROGRAM_ATTRIBUTE_ID, minInterval, maxInterval); } - public void readNumberOfTransistionsAttribute( + public void readNumberOfTransitionsAttribute( IntegerAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_TRANSISTIONS_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_TRANSITIONS_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @Override @@ -27887,19 +27861,19 @@ public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); callback.onSuccess(value); } - }, NUMBER_OF_TRANSISTIONS_ATTRIBUTE_ID, true); + }, NUMBER_OF_TRANSITIONS_ATTRIBUTE_ID, true); } - public void subscribeNumberOfTransistionsAttribute( + public void subscribeNumberOfTransitionsAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_TRANSISTIONS_ATTRIBUTE_ID); + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_TRANSITIONS_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @Override public void onSuccess(byte[] tlv) { Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); } - }, NUMBER_OF_TRANSISTIONS_ATTRIBUTE_ID, minInterval, maxInterval); + }, NUMBER_OF_TRANSITIONS_ATTRIBUTE_ID, minInterval, maxInterval); } public void readDefaultRandomStartAttribute( diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java index b28850721a73a2..a9afb548631586 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java @@ -8813,15 +8813,14 @@ public long getID() { } public enum Attribute { - DeviceClass(0L), - LoadControlPrograms(1L), - NumberOfLoadControlPrograms(2L), - Events(3L), - ActiveEvents(4L), - NumberOfEventsPerProgram(5L), - NumberOfTransistions(6L), - DefaultRandomStart(7L), - DefaultRandomDuration(8L), + LoadControlPrograms(0L), + NumberOfLoadControlPrograms(1L), + Events(2L), + ActiveEvents(3L), + NumberOfEventsPerProgram(4L), + NumberOfTransitions(5L), + DefaultRandomStart(6L), + DefaultRandomDuration(7L), GeneratedCommandList(65528L), AcceptedCommandList(65529L), EventList(65530L), diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java index d5cb920d299b57..cb820da9f950dc 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java @@ -8715,18 +8715,7 @@ private static Map readValveConfigurationAndControlInte return result; } private static Map readDemandResponseLoadControlInteractionInfo() { - Map result = new LinkedHashMap<>();Map readDemandResponseLoadControlDeviceClassCommandParams = new LinkedHashMap(); - InteractionInfo readDemandResponseLoadControlDeviceClassAttributeInteractionInfo = new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.DemandResponseLoadControlCluster) cluster).readDeviceClassAttribute( - (ChipClusters.LongAttributeCallback) callback - ); - }, - () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), - readDemandResponseLoadControlDeviceClassCommandParams - ); - result.put("readDeviceClassAttribute", readDemandResponseLoadControlDeviceClassAttributeInteractionInfo); - Map readDemandResponseLoadControlLoadControlProgramsCommandParams = new LinkedHashMap(); + Map result = new LinkedHashMap<>();Map readDemandResponseLoadControlLoadControlProgramsCommandParams = new LinkedHashMap(); InteractionInfo readDemandResponseLoadControlLoadControlProgramsAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.DemandResponseLoadControlCluster) cluster).readLoadControlProgramsAttribute( @@ -8781,17 +8770,17 @@ private static Map readDemandResponseLoadControlInterac readDemandResponseLoadControlNumberOfEventsPerProgramCommandParams ); result.put("readNumberOfEventsPerProgramAttribute", readDemandResponseLoadControlNumberOfEventsPerProgramAttributeInteractionInfo); - Map readDemandResponseLoadControlNumberOfTransistionsCommandParams = new LinkedHashMap(); - InteractionInfo readDemandResponseLoadControlNumberOfTransistionsAttributeInteractionInfo = new InteractionInfo( + Map readDemandResponseLoadControlNumberOfTransitionsCommandParams = new LinkedHashMap(); + InteractionInfo readDemandResponseLoadControlNumberOfTransitionsAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.DemandResponseLoadControlCluster) cluster).readNumberOfTransistionsAttribute( + ((ChipClusters.DemandResponseLoadControlCluster) cluster).readNumberOfTransitionsAttribute( (ChipClusters.IntegerAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readDemandResponseLoadControlNumberOfTransistionsCommandParams + readDemandResponseLoadControlNumberOfTransitionsCommandParams ); - result.put("readNumberOfTransistionsAttribute", readDemandResponseLoadControlNumberOfTransistionsAttributeInteractionInfo); + result.put("readNumberOfTransitionsAttribute", readDemandResponseLoadControlNumberOfTransitionsAttributeInteractionInfo); Map readDemandResponseLoadControlDefaultRandomStartCommandParams = new LinkedHashMap(); InteractionInfo readDemandResponseLoadControlDefaultRandomStartAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DemandResponseLoadControlCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DemandResponseLoadControlCluster.kt index f2e3ce480e1eb4..2f61d6f7b0c5db 100644 --- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DemandResponseLoadControlCluster.kt +++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DemandResponseLoadControlCluster.kt @@ -105,14 +105,6 @@ class DemandResponseLoadControlCluster( } } - suspend fun readDeviceClassAttribute(): UInt { - // Implementation needs to be added here - } - - suspend fun subscribeDeviceClassAttribute(minInterval: Int, maxInterval: Int): UInt { - // Implementation needs to be added here - } - suspend fun readLoadControlProgramsAttribute(): LoadControlProgramsAttribute { // Implementation needs to be added here } @@ -165,11 +157,11 @@ class DemandResponseLoadControlCluster( // Implementation needs to be added here } - suspend fun readNumberOfTransistionsAttribute(): UByte { + suspend fun readNumberOfTransitionsAttribute(): UByte { // Implementation needs to be added here } - suspend fun subscribeNumberOfTransistionsAttribute(minInterval: Int, maxInterval: Int): UByte { + suspend fun subscribeNumberOfTransitionsAttribute(minInterval: Int, maxInterval: Int): UByte { // Implementation needs to be added here } diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 8b170677a47186..e3ec8f8a1559de 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -18804,22 +18804,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR using namespace app::Clusters::DemandResponseLoadControl; switch (aPath.mAttributeId) { - case Attributes::DeviceClass::Id: { - using TypeInfo = Attributes::DeviceClass::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = app::DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) - { - return nullptr; - } - jobject value; - std::string valueClassName = "java/lang/Long"; - std::string valueCtorSignature = "(J)V"; - jlong jnivalue = static_cast(cppValue.Raw()); - chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), - jnivalue, value); - return value; - } case Attributes::LoadControlPrograms::Id: { using TypeInfo = Attributes::LoadControlPrograms::TypeInfo; TypeInfo::DecodableType cppValue; @@ -19997,8 +19981,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR value); return value; } - case Attributes::NumberOfTransistions::Id: { - using TypeInfo = Attributes::NumberOfTransistions::TypeInfo; + case Attributes::NumberOfTransitions::Id: { + using TypeInfo = Attributes::NumberOfTransitions::TypeInfo; TypeInfo::DecodableType cppValue; *aError = app::DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 3642708c0339d2..d5b1d44a09e243 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -6221,57 +6221,51 @@ class ChipClusters: }, "attributes": { 0x00000000: { - "attributeName": "DeviceClass", + "attributeName": "LoadControlPrograms", "attributeId": 0x00000000, - "type": "int", + "type": "", "reportable": True, }, 0x00000001: { - "attributeName": "LoadControlPrograms", + "attributeName": "NumberOfLoadControlPrograms", "attributeId": 0x00000001, - "type": "", + "type": "int", "reportable": True, }, 0x00000002: { - "attributeName": "NumberOfLoadControlPrograms", + "attributeName": "Events", "attributeId": 0x00000002, - "type": "int", + "type": "", "reportable": True, }, 0x00000003: { - "attributeName": "Events", + "attributeName": "ActiveEvents", "attributeId": 0x00000003, "type": "", "reportable": True, }, 0x00000004: { - "attributeName": "ActiveEvents", + "attributeName": "NumberOfEventsPerProgram", "attributeId": 0x00000004, - "type": "", + "type": "int", "reportable": True, }, 0x00000005: { - "attributeName": "NumberOfEventsPerProgram", + "attributeName": "NumberOfTransitions", "attributeId": 0x00000005, "type": "int", "reportable": True, }, 0x00000006: { - "attributeName": "NumberOfTransistions", - "attributeId": 0x00000006, - "type": "int", - "reportable": True, - }, - 0x00000007: { "attributeName": "DefaultRandomStart", - "attributeId": 0x00000007, + "attributeId": 0x00000006, "type": "int", "reportable": True, "writable": True, }, - 0x00000008: { + 0x00000007: { "attributeName": "DefaultRandomDuration", - "attributeId": 0x00000008, + "attributeId": 0x00000007, "type": "int", "reportable": True, "writable": True, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 2e6abe5faca104..7fc69546cee7fe 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -21588,15 +21588,14 @@ class DemandResponseLoadControl(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="deviceClass", Tag=0x00000000, Type=uint), - ClusterObjectFieldDescriptor(Label="loadControlPrograms", Tag=0x00000001, Type=typing.List[DemandResponseLoadControl.Structs.LoadControlProgramStruct]), - ClusterObjectFieldDescriptor(Label="numberOfLoadControlPrograms", Tag=0x00000002, Type=uint), - ClusterObjectFieldDescriptor(Label="events", Tag=0x00000003, Type=typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]), - ClusterObjectFieldDescriptor(Label="activeEvents", Tag=0x00000004, Type=typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]), - ClusterObjectFieldDescriptor(Label="numberOfEventsPerProgram", Tag=0x00000005, Type=uint), - ClusterObjectFieldDescriptor(Label="numberOfTransistions", Tag=0x00000006, Type=uint), - ClusterObjectFieldDescriptor(Label="defaultRandomStart", Tag=0x00000007, Type=uint), - ClusterObjectFieldDescriptor(Label="defaultRandomDuration", Tag=0x00000008, Type=uint), + ClusterObjectFieldDescriptor(Label="loadControlPrograms", Tag=0x00000000, Type=typing.List[DemandResponseLoadControl.Structs.LoadControlProgramStruct]), + ClusterObjectFieldDescriptor(Label="numberOfLoadControlPrograms", Tag=0x00000001, Type=uint), + ClusterObjectFieldDescriptor(Label="events", Tag=0x00000002, Type=typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]), + ClusterObjectFieldDescriptor(Label="activeEvents", Tag=0x00000003, Type=typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]), + ClusterObjectFieldDescriptor(Label="numberOfEventsPerProgram", Tag=0x00000004, Type=uint), + ClusterObjectFieldDescriptor(Label="numberOfTransitions", Tag=0x00000005, Type=uint), + ClusterObjectFieldDescriptor(Label="defaultRandomStart", Tag=0x00000006, Type=uint), + ClusterObjectFieldDescriptor(Label="defaultRandomDuration", Tag=0x00000007, Type=uint), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]), @@ -21605,13 +21604,12 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - deviceClass: 'uint' = None loadControlPrograms: 'typing.List[DemandResponseLoadControl.Structs.LoadControlProgramStruct]' = None numberOfLoadControlPrograms: 'uint' = None events: 'typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]' = None activeEvents: 'typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]' = None numberOfEventsPerProgram: 'uint' = None - numberOfTransistions: 'uint' = None + numberOfTransitions: 'uint' = None defaultRandomStart: 'uint' = None defaultRandomDuration: 'uint' = None generatedCommandList: 'typing.List[uint]' = None @@ -21937,22 +21935,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: ]) class Attributes: - @dataclass - class DeviceClass(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x00000096 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x00000000 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=uint) - - value: 'uint' = 0 - @dataclass class LoadControlPrograms(ClusterAttributeDescriptor): @ChipUtility.classproperty @@ -21961,7 +21943,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000001 + return 0x00000000 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -21977,7 +21959,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000002 + return 0x00000001 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -21993,7 +21975,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000003 + return 0x00000002 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -22009,7 +21991,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000004 + return 0x00000003 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -22025,7 +22007,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000005 + return 0x00000004 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -22034,14 +22016,14 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'uint' = 0 @dataclass - class NumberOfTransistions(ClusterAttributeDescriptor): + class NumberOfTransitions(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x00000096 @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000006 + return 0x00000005 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -22057,7 +22039,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000007 + return 0x00000006 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -22073,7 +22055,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000008 + return 0x00000007 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm index 93d825bbdbf865..d125a8f8e4cc99 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm @@ -2841,9 +2841,6 @@ static BOOL AttributeIsSpecifiedInDemandResponseLoadControlCluster(AttributeId a { using namespace Clusters::DemandResponseLoadControl; switch (aAttributeId) { - case Attributes::DeviceClass::Id: { - return YES; - } case Attributes::LoadControlPrograms::Id: { return YES; } @@ -2859,7 +2856,7 @@ static BOOL AttributeIsSpecifiedInDemandResponseLoadControlCluster(AttributeId a case Attributes::NumberOfEventsPerProgram::Id: { return YES; } - case Attributes::NumberOfTransistions::Id: { + case Attributes::NumberOfTransitions::Id: { return YES; } case Attributes::DefaultRandomStart::Id: { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 6b62937c80f566..badacae1572845 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -7385,17 +7385,6 @@ static id _Nullable DecodeAttributeValueForDemandResponseLoadControlCluster(Attr { using namespace Clusters::DemandResponseLoadControl; switch (aAttributeId) { - case Attributes::DeviceClass::Id: { - using TypeInfo = Attributes::DeviceClass::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) { - return nil; - } - NSNumber * _Nonnull value; - value = [NSNumber numberWithUnsignedInt:cppValue.Raw()]; - return value; - } case Attributes::LoadControlPrograms::Id: { using TypeInfo = Attributes::LoadControlPrograms::TypeInfo; TypeInfo::DecodableType cppValue; @@ -7722,8 +7711,8 @@ static id _Nullable DecodeAttributeValueForDemandResponseLoadControlCluster(Attr value = [NSNumber numberWithUnsignedChar:cppValue]; return value; } - case Attributes::NumberOfTransistions::Id: { - using TypeInfo = Attributes::NumberOfTransistions::TypeInfo; + case Attributes::NumberOfTransitions::Id: { + using TypeInfo = Attributes::NumberOfTransitions::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index b0b89b206e96e1..2fec7ede6ecb8d 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -7063,12 +7063,6 @@ MTR_PROVISIONALLY_AVAILABLE - (void)clearLoadControlEventsRequestWithCompletion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (void)readAttributeDeviceClassWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)subscribeAttributeDeviceClassWithParams:(MTRSubscribeParams *)params - subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; -+ (void)readAttributeDeviceClassWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - - (void)readAttributeLoadControlProgramsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - (void)subscribeAttributeLoadControlProgramsWithParams:(MTRSubscribeParams *)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished @@ -7099,11 +7093,11 @@ MTR_PROVISIONALLY_AVAILABLE reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; + (void)readAttributeNumberOfEventsPerProgramWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)readAttributeNumberOfTransistionsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)subscribeAttributeNumberOfTransistionsWithParams:(MTRSubscribeParams *)params - subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; -+ (void)readAttributeNumberOfTransistionsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)readAttributeNumberOfTransitionsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeNumberOfTransitionsWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeNumberOfTransitionsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - (void)readAttributeDefaultRandomStartWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - (void)writeAttributeDefaultRandomStartWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 580d0ad08415de..0690590d719cd1 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -49531,42 +49531,6 @@ - (void)clearLoadControlEventsRequestWithParams:(MTRDemandResponseLoadControlClu completion:responseHandler]; } -- (void)readAttributeDeviceClassWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion -{ - using TypeInfo = DemandResponseLoadControl::Attributes::DeviceClass::TypeInfo; - [self.device _readKnownAttributeWithEndpointID:@(self.endpoint) - clusterID:@(TypeInfo::GetClusterId()) - attributeID:@(TypeInfo::GetAttributeId()) - params:nil - queue:self.callbackQueue - completion:completion]; -} - -- (void)subscribeAttributeDeviceClassWithParams:(MTRSubscribeParams * _Nonnull)params - subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler -{ - using TypeInfo = DemandResponseLoadControl::Attributes::DeviceClass::TypeInfo; - [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint) - clusterID:@(TypeInfo::GetClusterId()) - attributeID:@(TypeInfo::GetAttributeId()) - params:params - queue:self.callbackQueue - reportHandler:reportHandler - subscriptionEstablished:subscriptionEstablished]; -} - -+ (void)readAttributeDeviceClassWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion -{ - using TypeInfo = DemandResponseLoadControl::Attributes::DeviceClass::TypeInfo; - [clusterStateCacheContainer - _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) - clusterID:TypeInfo::GetClusterId() - attributeID:TypeInfo::GetAttributeId() - queue:queue - completion:completion]; -} - - (void)readAttributeLoadControlProgramsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { using TypeInfo = DemandResponseLoadControl::Attributes::LoadControlPrograms::TypeInfo; @@ -49747,9 +49711,9 @@ + (void)readAttributeNumberOfEventsPerProgramWithClusterStateCache:(MTRClusterSt completion:completion]; } -- (void)readAttributeNumberOfTransistionsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +- (void)readAttributeNumberOfTransitionsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfTransistions::TypeInfo; + using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfTransitions::TypeInfo; [self.device _readKnownAttributeWithEndpointID:@(self.endpoint) clusterID:@(TypeInfo::GetClusterId()) attributeID:@(TypeInfo::GetAttributeId()) @@ -49758,11 +49722,11 @@ - (void)readAttributeNumberOfTransistionsWithCompletion:(void (^)(NSNumber * _Nu completion:completion]; } -- (void)subscribeAttributeNumberOfTransistionsWithParams:(MTRSubscribeParams * _Nonnull)params - subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +- (void)subscribeAttributeNumberOfTransitionsWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfTransistions::TypeInfo; + using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfTransitions::TypeInfo; [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint) clusterID:@(TypeInfo::GetClusterId()) attributeID:@(TypeInfo::GetAttributeId()) @@ -49772,9 +49736,9 @@ - (void)subscribeAttributeNumberOfTransistionsWithParams:(MTRSubscribeParams * _ subscriptionEstablished:subscriptionEstablished]; } -+ (void)readAttributeNumberOfTransistionsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion ++ (void)readAttributeNumberOfTransitionsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfTransistions::TypeInfo; + using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfTransitions::TypeInfo; [clusterStateCacheContainer _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) clusterID:TypeInfo::GetClusterId() diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index d529d5a004bb16..9695d702d07336 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -2576,15 +2576,14 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID, // Cluster DemandResponseLoadControl attributes - MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDeviceClassID MTR_PROVISIONALLY_AVAILABLE = 0x00000000, - MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeLoadControlProgramsID MTR_PROVISIONALLY_AVAILABLE = 0x00000001, - MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfLoadControlProgramsID MTR_PROVISIONALLY_AVAILABLE = 0x00000002, - MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeEventsID MTR_PROVISIONALLY_AVAILABLE = 0x00000003, - MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeActiveEventsID MTR_PROVISIONALLY_AVAILABLE = 0x00000004, - MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfEventsPerProgramID MTR_PROVISIONALLY_AVAILABLE = 0x00000005, - MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfTransistionsID MTR_PROVISIONALLY_AVAILABLE = 0x00000006, - MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDefaultRandomStartID MTR_PROVISIONALLY_AVAILABLE = 0x00000007, - MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDefaultRandomDurationID MTR_PROVISIONALLY_AVAILABLE = 0x00000008, + MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeLoadControlProgramsID MTR_PROVISIONALLY_AVAILABLE = 0x00000000, + MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfLoadControlProgramsID MTR_PROVISIONALLY_AVAILABLE = 0x00000001, + MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeEventsID MTR_PROVISIONALLY_AVAILABLE = 0x00000002, + MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeActiveEventsID MTR_PROVISIONALLY_AVAILABLE = 0x00000003, + MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfEventsPerProgramID MTR_PROVISIONALLY_AVAILABLE = 0x00000004, + MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfTransitionsID MTR_PROVISIONALLY_AVAILABLE = 0x00000005, + MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDefaultRandomStartID MTR_PROVISIONALLY_AVAILABLE = 0x00000006, + MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDefaultRandomDurationID MTR_PROVISIONALLY_AVAILABLE = 0x00000007, MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID, MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID, MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index 9453309717e85d..8e270679edb88e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -3339,8 +3339,6 @@ MTR_PROVISIONALLY_AVAILABLE - (void)clearLoadControlEventsRequestWithExpectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (NSDictionary * _Nullable)readAttributeDeviceClassWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; - - (NSDictionary * _Nullable)readAttributeLoadControlProgramsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; - (NSDictionary * _Nullable)readAttributeNumberOfLoadControlProgramsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; @@ -3351,7 +3349,7 @@ MTR_PROVISIONALLY_AVAILABLE - (NSDictionary * _Nullable)readAttributeNumberOfEventsPerProgramWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; -- (NSDictionary * _Nullable)readAttributeNumberOfTransistionsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; +- (NSDictionary * _Nullable)readAttributeNumberOfTransitionsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; - (NSDictionary * _Nullable)readAttributeDefaultRandomStartWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; - (void)writeAttributeDefaultRandomStartWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 8e7f7470c68b23..c271972d2d02d3 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -9151,11 +9151,6 @@ - (void)clearLoadControlEventsRequestWithParams:(MTRDemandResponseLoadControlClu completion:responseHandler]; } -- (NSDictionary * _Nullable)readAttributeDeviceClassWithParams:(MTRReadParams * _Nullable)params -{ - return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDeviceClassID) params:params]; -} - - (NSDictionary * _Nullable)readAttributeLoadControlProgramsWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeLoadControlProgramsID) params:params]; @@ -9181,9 +9176,9 @@ - (void)clearLoadControlEventsRequestWithParams:(MTRDemandResponseLoadControlClu return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfEventsPerProgramID) params:params]; } -- (NSDictionary * _Nullable)readAttributeNumberOfTransistionsWithParams:(MTRReadParams * _Nullable)params +- (NSDictionary * _Nullable)readAttributeNumberOfTransitionsWithParams:(MTRReadParams * _Nullable)params { - return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfTransistionsID) params:params]; + return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfTransitionsID) params:params]; } - (NSDictionary * _Nullable)readAttributeDefaultRandomStartWithParams:(MTRReadParams * _Nullable)params diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index a3a3fbc23f1b03..30b2e2d66b5b57 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -9942,38 +9942,6 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) namespace DemandResponseLoadControl { namespace Attributes { -namespace DeviceClass { - -EmberAfStatus Get(chip::EndpointId endpoint, - chip::BitMask * value) -{ - using Traits = NumericAttributeTraits>; - Traits::StorageType temp; - uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, readable, sizeof(temp)); - VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - *value = Traits::StorageToWorking(temp); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask value) -{ - using Traits = NumericAttributeTraits>; - if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - Traits::StorageType storageValue; - Traits::WorkingToStorage(value, storageValue); - uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); -} - -} // namespace DeviceClass - namespace NumberOfLoadControlPrograms { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) @@ -10036,7 +10004,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) } // namespace NumberOfEventsPerProgram -namespace NumberOfTransistions { +namespace NumberOfTransitions { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { @@ -10065,7 +10033,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } -} // namespace NumberOfTransistions +} // namespace NumberOfTransitions namespace DefaultRandomStart { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index 309f3eaaea650a..0f91b735ca128b 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -1923,13 +1923,6 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); namespace DemandResponseLoadControl { namespace Attributes { -namespace DeviceClass { -EmberAfStatus Get(chip::EndpointId endpoint, - chip::BitMask * value); // DeviceClassBitmap -EmberAfStatus Set(chip::EndpointId endpoint, - chip::BitMask value); -} // namespace DeviceClass - namespace NumberOfLoadControlPrograms { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); @@ -1940,10 +1933,10 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); } // namespace NumberOfEventsPerProgram -namespace NumberOfTransistions { +namespace NumberOfTransitions { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); -} // namespace NumberOfTransistions +} // namespace NumberOfTransitions namespace DefaultRandomStart { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 5a39feaae41d35..44b5a91247cae1 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -14253,8 +14253,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre { switch (path.mAttributeId) { - case Attributes::DeviceClass::TypeInfo::GetAttributeId(): - return DataModel::Decode(reader, deviceClass); case Attributes::LoadControlPrograms::TypeInfo::GetAttributeId(): return DataModel::Decode(reader, loadControlPrograms); case Attributes::NumberOfLoadControlPrograms::TypeInfo::GetAttributeId(): @@ -14265,8 +14263,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre return DataModel::Decode(reader, activeEvents); case Attributes::NumberOfEventsPerProgram::TypeInfo::GetAttributeId(): return DataModel::Decode(reader, numberOfEventsPerProgram); - case Attributes::NumberOfTransistions::TypeInfo::GetAttributeId(): - return DataModel::Decode(reader, numberOfTransistions); + case Attributes::NumberOfTransitions::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, numberOfTransitions); case Attributes::DefaultRandomStart::TypeInfo::GetAttributeId(): return DataModel::Decode(reader, defaultRandomStart); case Attributes::DefaultRandomDuration::TypeInfo::GetAttributeId(): diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 9809bd9f0e36d9..c782ac22ffafc0 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -20012,18 +20012,6 @@ struct DecodableType namespace Attributes { -namespace DeviceClass { -struct TypeInfo -{ - using Type = chip::BitMask; - using DecodableType = chip::BitMask; - using DecodableArgType = chip::BitMask; - - static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::DeviceClass::Id; } - static constexpr bool MustUseTimedWrite() { return false; } -}; -} // namespace DeviceClass namespace LoadControlPrograms { struct TypeInfo { @@ -20093,7 +20081,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace NumberOfEventsPerProgram -namespace NumberOfTransistions { +namespace NumberOfTransitions { struct TypeInfo { using Type = uint8_t; @@ -20101,10 +20089,10 @@ struct TypeInfo using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfTransistions::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfTransitions::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace NumberOfTransistions +} // namespace NumberOfTransitions namespace DefaultRandomStart { struct TypeInfo { @@ -20174,14 +20162,12 @@ struct TypeInfo CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); - Attributes::DeviceClass::TypeInfo::DecodableType deviceClass = - static_cast>(0); Attributes::LoadControlPrograms::TypeInfo::DecodableType loadControlPrograms; Attributes::NumberOfLoadControlPrograms::TypeInfo::DecodableType numberOfLoadControlPrograms = static_cast(0); Attributes::Events::TypeInfo::DecodableType events; Attributes::ActiveEvents::TypeInfo::DecodableType activeEvents; Attributes::NumberOfEventsPerProgram::TypeInfo::DecodableType numberOfEventsPerProgram = static_cast(0); - Attributes::NumberOfTransistions::TypeInfo::DecodableType numberOfTransistions = static_cast(0); + Attributes::NumberOfTransitions::TypeInfo::DecodableType numberOfTransitions = static_cast(0); Attributes::DefaultRandomStart::TypeInfo::DecodableType defaultRandomStart = static_cast(0); Attributes::DefaultRandomDuration::TypeInfo::DecodableType defaultRandomDuration = static_cast(0); Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index 1bc7d5674bb9f3..ed0205778b1751 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -3540,40 +3540,36 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; namespace DemandResponseLoadControl { namespace Attributes { -namespace DeviceClass { -static constexpr AttributeId Id = 0x00000000; -} // namespace DeviceClass - namespace LoadControlPrograms { -static constexpr AttributeId Id = 0x00000001; +static constexpr AttributeId Id = 0x00000000; } // namespace LoadControlPrograms namespace NumberOfLoadControlPrograms { -static constexpr AttributeId Id = 0x00000002; +static constexpr AttributeId Id = 0x00000001; } // namespace NumberOfLoadControlPrograms namespace Events { -static constexpr AttributeId Id = 0x00000003; +static constexpr AttributeId Id = 0x00000002; } // namespace Events namespace ActiveEvents { -static constexpr AttributeId Id = 0x00000004; +static constexpr AttributeId Id = 0x00000003; } // namespace ActiveEvents namespace NumberOfEventsPerProgram { -static constexpr AttributeId Id = 0x00000005; +static constexpr AttributeId Id = 0x00000004; } // namespace NumberOfEventsPerProgram -namespace NumberOfTransistions { -static constexpr AttributeId Id = 0x00000006; -} // namespace NumberOfTransistions +namespace NumberOfTransitions { +static constexpr AttributeId Id = 0x00000005; +} // namespace NumberOfTransitions namespace DefaultRandomStart { -static constexpr AttributeId Id = 0x00000007; +static constexpr AttributeId Id = 0x00000006; } // namespace DefaultRandomStart namespace DefaultRandomDuration { -static constexpr AttributeId Id = 0x00000008; +static constexpr AttributeId Id = 0x00000007; } // namespace DefaultRandomDuration namespace GeneratedCommandList { diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 277fc6724ccdc9..2383493ac95559 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -6388,15 +6388,14 @@ class ValveConfigurationAndControlSetLevel : public ClusterCommand | * ClearLoadControlEventsRequest | 0x04 | |------------------------------------------------------------------------------| | Attributes: | | -| * DeviceClass | 0x0000 | -| * LoadControlPrograms | 0x0001 | -| * NumberOfLoadControlPrograms | 0x0002 | -| * Events | 0x0003 | -| * ActiveEvents | 0x0004 | -| * NumberOfEventsPerProgram | 0x0005 | -| * NumberOfTransistions | 0x0006 | -| * DefaultRandomStart | 0x0007 | -| * DefaultRandomDuration | 0x0008 | +| * LoadControlPrograms | 0x0000 | +| * NumberOfLoadControlPrograms | 0x0001 | +| * Events | 0x0002 | +| * ActiveEvents | 0x0003 | +| * NumberOfEventsPerProgram | 0x0004 | +| * NumberOfTransitions | 0x0005 | +| * DefaultRandomStart | 0x0006 | +| * DefaultRandomDuration | 0x0007 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * EventList | 0xFFFA | @@ -17635,7 +17634,6 @@ void registerClusterDemandResponseLoadControl(Commands & commands, CredentialIss // Attributes // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "device-class", Attributes::DeviceClass::Id, credsIssuerConfig), // make_unique(Id, "load-control-programs", Attributes::LoadControlPrograms::Id, credsIssuerConfig), // make_unique(Id, "number-of-load-control-programs", Attributes::NumberOfLoadControlPrograms::Id, credsIssuerConfig), // @@ -17643,7 +17641,7 @@ void registerClusterDemandResponseLoadControl(Commands & commands, CredentialIss make_unique(Id, "active-events", Attributes::ActiveEvents::Id, credsIssuerConfig), // make_unique(Id, "number-of-events-per-program", Attributes::NumberOfEventsPerProgram::Id, credsIssuerConfig), // - make_unique(Id, "number-of-transistions", Attributes::NumberOfTransistions::Id, credsIssuerConfig), // + make_unique(Id, "number-of-transitions", Attributes::NumberOfTransitions::Id, credsIssuerConfig), // make_unique(Id, "default-random-start", Attributes::DefaultRandomStart::Id, credsIssuerConfig), // make_unique(Id, "default-random-duration", Attributes::DefaultRandomDuration::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // @@ -17653,8 +17651,6 @@ void registerClusterDemandResponseLoadControl(Commands & commands, CredentialIss make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>>( - Id, "device-class", 0, UINT32_MAX, Attributes::DeviceClass::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( Id, "load-control-programs", Attributes::LoadControlPrograms::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // @@ -17670,7 +17666,7 @@ void registerClusterDemandResponseLoadControl(Commands & commands, CredentialIss make_unique>(Id, "number-of-events-per-program", 0, UINT8_MAX, Attributes::NumberOfEventsPerProgram::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>(Id, "number-of-transistions", 0, UINT8_MAX, Attributes::NumberOfTransistions::Id, + make_unique>(Id, "number-of-transitions", 0, UINT8_MAX, Attributes::NumberOfTransitions::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "default-random-start", 0, UINT8_MAX, Attributes::DefaultRandomStart::Id, WriteCommandType::kWrite, credsIssuerConfig), // @@ -17690,7 +17686,6 @@ void registerClusterDemandResponseLoadControl(Commands & commands, CredentialIss make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "device-class", Attributes::DeviceClass::Id, credsIssuerConfig), // make_unique(Id, "load-control-programs", Attributes::LoadControlPrograms::Id, credsIssuerConfig), // make_unique(Id, "number-of-load-control-programs", Attributes::NumberOfLoadControlPrograms::Id, credsIssuerConfig), // @@ -17698,7 +17693,7 @@ void registerClusterDemandResponseLoadControl(Commands & commands, CredentialIss make_unique(Id, "active-events", Attributes::ActiveEvents::Id, credsIssuerConfig), // make_unique(Id, "number-of-events-per-program", Attributes::NumberOfEventsPerProgram::Id, credsIssuerConfig), // - make_unique(Id, "number-of-transistions", Attributes::NumberOfTransistions::Id, credsIssuerConfig), // + make_unique(Id, "number-of-transitions", Attributes::NumberOfTransitions::Id, credsIssuerConfig), // make_unique(Id, "default-random-start", Attributes::DefaultRandomStart::Id, credsIssuerConfig), // make_unique(Id, "default-random-duration", Attributes::DefaultRandomDuration::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 32355291d4c801..86c1081875f6f1 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -9947,11 +9947,6 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP case DemandResponseLoadControl::Id: { switch (path.mAttributeId) { - case DemandResponseLoadControl::Attributes::DeviceClass::Id: { - chip::BitMask value; - ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("DeviceClass", 1, value); - } case DemandResponseLoadControl::Attributes::LoadControlPrograms::Id: { chip::app::DataModel::DecodableList< chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::DecodableType> @@ -9983,10 +9978,10 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("NumberOfEventsPerProgram", 1, value); } - case DemandResponseLoadControl::Attributes::NumberOfTransistions::Id: { + case DemandResponseLoadControl::Attributes::NumberOfTransitions::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("NumberOfTransistions", 1, value); + return DataModelLogger::LogValue("NumberOfTransitions", 1, value); } case DemandResponseLoadControl::Attributes::DefaultRandomStart::Id: { uint8_t value; diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index a23de84bad8639..96f2883bd02cd0 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -74110,15 +74110,14 @@ class SubscribeAttributeValveConfigurationAndControlClusterRevision : public Sub | * ClearLoadControlEventsRequest | 0x04 | |------------------------------------------------------------------------------| | Attributes: | | -| * DeviceClass | 0x0000 | -| * LoadControlPrograms | 0x0001 | -| * NumberOfLoadControlPrograms | 0x0002 | -| * Events | 0x0003 | -| * ActiveEvents | 0x0004 | -| * NumberOfEventsPerProgram | 0x0005 | -| * NumberOfTransistions | 0x0006 | -| * DefaultRandomStart | 0x0007 | -| * DefaultRandomDuration | 0x0008 | +| * LoadControlPrograms | 0x0000 | +| * NumberOfLoadControlPrograms | 0x0001 | +| * Events | 0x0002 | +| * ActiveEvents | 0x0003 | +| * NumberOfEventsPerProgram | 0x0004 | +| * NumberOfTransitions | 0x0005 | +| * DefaultRandomStart | 0x0006 | +| * DefaultRandomDuration | 0x0007 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * EventList | 0xFFFA | @@ -74513,91 +74512,6 @@ class DemandResponseLoadControlClearLoadControlEventsRequest : public ClusterCom #if MTR_ENABLE_PROVISIONAL -/* - * Attribute DeviceClass - */ -class ReadDemandResponseLoadControlDeviceClass : public ReadAttribute { -public: - ReadDemandResponseLoadControlDeviceClass() - : ReadAttribute("device-class") - { - } - - ~ReadDemandResponseLoadControlDeviceClass() - { - } - - CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override - { - constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id; - constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::DeviceClass::Id; - - ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); - - dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - [cluster readAttributeDeviceClassWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"DemandResponseLoadControl.DeviceClass response %@", [value description]); - if (error == nil) { - RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); - } else { - LogNSError("DemandResponseLoadControl DeviceClass read Error", error); - RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); - } - SetCommandExitStatus(error); - }]; - return CHIP_NO_ERROR; - } -}; - -class SubscribeAttributeDemandResponseLoadControlDeviceClass : public SubscribeAttribute { -public: - SubscribeAttributeDemandResponseLoadControlDeviceClass() - : SubscribeAttribute("device-class") - { - } - - ~SubscribeAttributeDemandResponseLoadControlDeviceClass() - { - } - - CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override - { - constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id; - constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::DeviceClass::Id; - - ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); - dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; - if (mKeepSubscriptions.HasValue()) { - params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); - } - if (mFabricFiltered.HasValue()) { - params.filterByFabric = mFabricFiltered.Value(); - } - if (mAutoResubscribe.HasValue()) { - params.resubscribeAutomatically = mAutoResubscribe.Value(); - } - [cluster subscribeAttributeDeviceClassWithParams:params - subscriptionEstablished:^() { mSubscriptionEstablished = YES; } - reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"DemandResponseLoadControl.DeviceClass response %@", [value description]); - if (error == nil) { - RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); - } else { - RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); - } - SetCommandExitStatus(error); - }]; - - return CHIP_NO_ERROR; - } -}; - -#endif // MTR_ENABLE_PROVISIONAL -#if MTR_ENABLE_PROVISIONAL - /* * Attribute LoadControlPrograms */ @@ -75024,34 +74938,34 @@ class SubscribeAttributeDemandResponseLoadControlNumberOfEventsPerProgram : publ #if MTR_ENABLE_PROVISIONAL /* - * Attribute NumberOfTransistions + * Attribute NumberOfTransitions */ -class ReadDemandResponseLoadControlNumberOfTransistions : public ReadAttribute { +class ReadDemandResponseLoadControlNumberOfTransitions : public ReadAttribute { public: - ReadDemandResponseLoadControlNumberOfTransistions() - : ReadAttribute("number-of-transistions") + ReadDemandResponseLoadControlNumberOfTransitions() + : ReadAttribute("number-of-transitions") { } - ~ReadDemandResponseLoadControlNumberOfTransistions() + ~ReadDemandResponseLoadControlNumberOfTransitions() { } CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id; - constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::NumberOfTransistions::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::NumberOfTransitions::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - [cluster readAttributeNumberOfTransistionsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"DemandResponseLoadControl.NumberOfTransistions response %@", [value description]); + [cluster readAttributeNumberOfTransitionsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"DemandResponseLoadControl.NumberOfTransitions response %@", [value description]); if (error == nil) { RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); } else { - LogNSError("DemandResponseLoadControl NumberOfTransistions read Error", error); + LogNSError("DemandResponseLoadControl NumberOfTransitions read Error", error); RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); } SetCommandExitStatus(error); @@ -75060,21 +74974,21 @@ class ReadDemandResponseLoadControlNumberOfTransistions : public ReadAttribute { } }; -class SubscribeAttributeDemandResponseLoadControlNumberOfTransistions : public SubscribeAttribute { +class SubscribeAttributeDemandResponseLoadControlNumberOfTransitions : public SubscribeAttribute { public: - SubscribeAttributeDemandResponseLoadControlNumberOfTransistions() - : SubscribeAttribute("number-of-transistions") + SubscribeAttributeDemandResponseLoadControlNumberOfTransitions() + : SubscribeAttribute("number-of-transitions") { } - ~SubscribeAttributeDemandResponseLoadControlNumberOfTransistions() + ~SubscribeAttributeDemandResponseLoadControlNumberOfTransitions() { } CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::DemandResponseLoadControl::Id; - constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::NumberOfTransistions::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::NumberOfTransitions::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); @@ -75089,10 +75003,10 @@ class SubscribeAttributeDemandResponseLoadControlNumberOfTransistions : public S if (mAutoResubscribe.HasValue()) { params.resubscribeAutomatically = mAutoResubscribe.Value(); } - [cluster subscribeAttributeNumberOfTransistionsWithParams:params + [cluster subscribeAttributeNumberOfTransitionsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"DemandResponseLoadControl.NumberOfTransistions response %@", [value description]); + NSLog(@"DemandResponseLoadControl.NumberOfTransitions response %@", [value description]); if (error == nil) { RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); } else { @@ -165505,10 +165419,6 @@ void registerClusterDemandResponseLoadControl(Commands & commands) make_unique(Id), // make_unique(Id), // make_unique(Id), // -#if MTR_ENABLE_PROVISIONAL - make_unique(), // - make_unique(), // -#endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL make_unique(), // make_unique(), // @@ -165530,8 +165440,8 @@ void registerClusterDemandResponseLoadControl(Commands & commands) make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL make_unique(), //