From 46b2114ce3bb1710df3d9684cc34475b1a852b1d Mon Sep 17 00:00:00 2001 From: mkardous-silabs <84793247+mkardous-silabs@users.noreply.github.com> Date: Fri, 2 Dec 2022 11:37:15 -0500 Subject: [PATCH 1/8] [IC-Device] Initial Structure for client monitoring cluster (#23838) * Initial Structure for client monitoring cluster * generated files * Review Comments * generated files * fix xml file * generated files * fix conflict * Update cluster xml * regen --- src/app/chip_data_model.gni | 1 + .../client-monitoring-server.cpp | 52 ++++ .../client-monitoring-server.h | 23 ++ src/app/zap-templates/zcl/data-model/all.xml | 1 + .../chip/client-monitoring-cluster.xml | 52 ++++ .../zcl/zcl-with-test-extensions.json | 1 + src/app/zap-templates/zcl/zcl.json | 1 + src/app/zap_cluster_list.py | 2 + .../python/chip/clusters/Objects.py | 229 +++++++++++++++++ .../CHIP/zap-generated/MTRClusterConstants.h | 59 +++++ .../zap-generated/MTRCommandPayloadsObjc.h | 44 ++++ .../zap-generated/MTRCommandPayloadsObjc.mm | 57 +++++ .../CHIP/zap-generated/MTRStructsObjc.h | 9 + .../CHIP/zap-generated/MTRStructsObjc.mm | 34 +++ .../app-common/zap-generated/af-structs.h | 8 + .../app-common/zap-generated/attribute-id.h | 10 + .../zap-generated/attributes/Accessors.cpp | 161 ++++++++++++ .../zap-generated/attributes/Accessors.h | 31 +++ .../app-common/zap-generated/callback.h | 118 +++++++++ .../app-common/zap-generated/cluster-enums.h | 3 + .../app-common/zap-generated/cluster-id.h | 239 ++++++++++++++++++ .../zap-generated/cluster-objects.cpp | 193 ++++++++++++++ .../zap-generated/cluster-objects.h | 222 ++++++++++++++++ .../app-common/zap-generated/command-id.h | 4 + .../app-common/zap-generated/ids/Attributes.h | 42 +++ .../app-common/zap-generated/ids/Clusters.h | 3 + .../app-common/zap-generated/ids/Commands.h | 14 + .../app-common/zap-generated/print-cluster.h | 7 + .../zap-generated/cluster/Commands.h | 131 ++++++++++ .../cluster/ComplexArgumentParser.cpp | 32 +++ .../cluster/ComplexArgumentParser.h | 4 + .../cluster/logging/DataModelLogger.cpp | 33 +++ .../cluster/logging/DataModelLogger.h | 2 + .../zap-generated/cluster/Commands.h | 1 + 34 files changed, 1823 insertions(+) create mode 100644 src/app/clusters/client-monitoring-server/client-monitoring-server.cpp create mode 100644 src/app/clusters/client-monitoring-server/client-monitoring-server.h create mode 100644 src/app/zap-templates/zcl/data-model/chip/client-monitoring-cluster.xml create mode 100644 zzz_generated/app-common/app-common/zap-generated/cluster-id.h diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni index ecab5a9d02a465..6e336f94929eb2 100644 --- a/src/app/chip_data_model.gni +++ b/src/app/chip_data_model.gni @@ -101,6 +101,7 @@ template("chip_data_model") { sources += [ "${_app_root}/clusters/barrier-control-server/barrier-control-server.h", "${_app_root}/clusters/basic/basic.h", + "${_app_root}/clusters/client-monitoring-server/client-monitoring-server.h", "${_app_root}/clusters/color-control-server/color-control-server.h", "${_app_root}/clusters/door-lock-server/door-lock-server.h", "${_app_root}/clusters/groups-server/groups-server.h", diff --git a/src/app/clusters/client-monitoring-server/client-monitoring-server.cpp b/src/app/clusters/client-monitoring-server/client-monitoring-server.cpp new file mode 100644 index 00000000000000..02cc4bfcb9ae85 --- /dev/null +++ b/src/app/clusters/client-monitoring-server/client-monitoring-server.cpp @@ -0,0 +1,52 @@ +/** + * + * Copyright (c) 2022 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "client-monitoring-server.h" + +#include +#include +#include +#include +#include +#include + +using namespace chip; +using namespace chip::app::Clusters; +using namespace chip::app::Clusters::ClientMonitoring; + +/** + * @brief Client Monitoring Cluster RegisterClientMonitoring Command callback (from client) + */ +bool emberAfClientMonitoringClusterRegisterClientMonitoringCallback( + app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, + const Commands::RegisterClientMonitoring::DecodableType & commandData) +{ + emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_UNSUPPORTED_COMMAND); + return false; +} +/** + * @brief Client Monitoring Cluster StayAwakeRequest Command callback (from client) + */ +bool emberAfClientMonitoringClusterStayAwakeRequestCallback(app::CommandHandler * commandObj, + const chip::app::ConcreteCommandPath & commandPath, + const Commands::StayAwakeRequest::DecodableType & commandData) +{ + emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_UNSUPPORTED_COMMAND); + return false; +} + +void MatterClientMonitoringPluginServerInitCallback() {} diff --git a/src/app/clusters/client-monitoring-server/client-monitoring-server.h b/src/app/clusters/client-monitoring-server/client-monitoring-server.h new file mode 100644 index 00000000000000..68a536760f3990 --- /dev/null +++ b/src/app/clusters/client-monitoring-server/client-monitoring-server.h @@ -0,0 +1,23 @@ +/** + * + * Copyright (c) 2022 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#pragma once + +#include +#include +#include +#include diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml index c050af49dcafa5..9126b0ff26101a 100644 --- a/src/app/zap-templates/zcl/data-model/all.xml +++ b/src/app/zap-templates/zcl/data-model/all.xml @@ -13,6 +13,7 @@ + diff --git a/src/app/zap-templates/zcl/data-model/chip/client-monitoring-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/client-monitoring-cluster.xml new file mode 100644 index 00000000000000..9dc128947904c5 --- /dev/null +++ b/src/app/zap-templates/zcl/data-model/chip/client-monitoring-cluster.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + General + Client Monitoring + 0x1046 + CLIENT_MONITORING_CLUSTER + Client Monitoring allows for ensuring that listed clients meet the required monitoring conditions on the server. + IdleModeInterval + ActiveModeInterval + ActiveModeThreshold + + + ExpectedClients + + + Register a client to the end device + + + + + + + Request the end device to stay in Active Mode for an additional ActiveModeThreshold + + + + diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json index 241753199a7105..51f9acc0a93d58 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -25,6 +25,7 @@ "chip-ota.xml", "chip-types.xml", "channel-cluster.xml", + "client-monitoring-cluster.xml", "clusters-extensions.xml", "content-launch-cluster.xml", "descriptor-cluster.xml", diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index 801b04b57c0c94..52f482acb70847 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -20,6 +20,7 @@ "chip-ota.xml", "chip-types.xml", "channel-cluster.xml", + "client-monitoring-cluster.xml", "clusters-extensions.xml", "content-launch-cluster.xml", "descriptor-cluster.xml", diff --git a/src/app/zap_cluster_list.py b/src/app/zap_cluster_list.py index 11b3c21f05623b..9ef42c9b79b156 100755 --- a/src/app/zap_cluster_list.py +++ b/src/app/zap_cluster_list.py @@ -25,6 +25,7 @@ 'ACTIONS_CLUSTER': [], 'BRIDGED_DEVICE_BASIC_CLUSTER': ['bridged-device-basic-information-server'], 'CHANNEL_CLUSTER': ['channel-server'], + 'CLIENT_MONITORING_CLUSTER': ['client-monitoring-server'], 'COLOR_CONTROL_CLUSTER': ['color-control-server'], 'COMMISSIONING_CLUSTER': [], 'CONTENT_LAUNCHER_CLUSTER': ['content-launch-server'], @@ -110,6 +111,7 @@ 'ACTIONS_CLUSTER': [], 'BRIDGED_DEVICE_BASIC_CLUSTER': [], 'CHANNEL_CLUSTER': [], + 'CLIENT_MONITORING_CLUSTER': [], 'COLOR_CONTROL_CLUSTER': [], 'COMMISSIONING_CLUSTER': [], 'CONTENT_LAUNCHER_CLUSTER': [], diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index ebe66dee75d117..84904704965102 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -26805,6 +26805,235 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: +@dataclass +class ClientMonitoring(Cluster): + id: typing.ClassVar[int] = 0x1046 + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields = [ + ClusterObjectFieldDescriptor(Label="idleModeInterval", Tag=0x00000000, Type=uint), + ClusterObjectFieldDescriptor(Label="activeModeInterval", Tag=0x00000001, Type=uint), + ClusterObjectFieldDescriptor(Label="activeModeThreshold", Tag=0x00000002, Type=uint), + ClusterObjectFieldDescriptor(Label="expectedClients", Tag=0x00000003, Type=typing.List[ClientMonitoring.Structs.MonitoringRegistration]), + ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), + ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), + ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]), + ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint), + ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), + ]) + + idleModeInterval: 'uint' = None + activeModeInterval: 'uint' = None + activeModeThreshold: 'uint' = None + expectedClients: 'typing.List[ClientMonitoring.Structs.MonitoringRegistration]' = None + generatedCommandList: 'typing.List[uint]' = None + acceptedCommandList: 'typing.List[uint]' = None + attributeList: 'typing.List[uint]' = None + featureMap: 'uint' = None + clusterRevision: 'uint' = None + + + class Structs: + @dataclass + class MonitoringRegistration(ClusterObject): + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields = [ + ClusterObjectFieldDescriptor(Label="clientNodeId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="ICid", Tag=2, Type=uint), + ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint), + ]) + + clientNodeId: 'uint' = 0 + ICid: 'uint' = 0 + fabricIndex: 'uint' = 0 + + + + class Commands: + @dataclass + class RegisterClientMonitoring(ClusterCommand): + cluster_id: typing.ClassVar[int] = 0x1046 + command_id: typing.ClassVar[int] = 0x0000 + is_client: typing.ClassVar[bool] = True + response_type: typing.ClassVar[str] = None + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields = [ + ClusterObjectFieldDescriptor(Label="clientNodeId", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="ICid", Tag=1, Type=uint), + ]) + + clientNodeId: 'uint' = 0 + ICid: 'uint' = 0 + + @dataclass + class StayAwakeRequest(ClusterCommand): + cluster_id: typing.ClassVar[int] = 0x1046 + command_id: typing.ClassVar[int] = 0x0001 + is_client: typing.ClassVar[bool] = True + response_type: typing.ClassVar[str] = None + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields = [ + ]) + + + + class Attributes: + @dataclass + class IdleModeInterval(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x1046 + + @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 ActiveModeInterval(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x1046 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000001 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=uint) + + value: 'uint' = 0 + + @dataclass + class ActiveModeThreshold(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x1046 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000002 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=uint) + + value: 'uint' = 0 + + @dataclass + class ExpectedClients(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x1046 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000003 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.List[ClientMonitoring.Structs.MonitoringRegistration]) + + value: 'typing.List[ClientMonitoring.Structs.MonitoringRegistration]' = field(default_factory=lambda: []) + + @dataclass + class GeneratedCommandList(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x1046 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFF8 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.List[uint]) + + value: 'typing.List[uint]' = field(default_factory=lambda: []) + + @dataclass + class AcceptedCommandList(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x1046 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFF9 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.List[uint]) + + value: 'typing.List[uint]' = field(default_factory=lambda: []) + + @dataclass + class AttributeList(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x1046 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFB + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.List[uint]) + + value: 'typing.List[uint]' = field(default_factory=lambda: []) + + @dataclass + class FeatureMap(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x1046 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFC + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=uint) + + value: 'uint' = 0 + + @dataclass + class ClusterRevision(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x1046 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFD + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=uint) + + value: 'uint' = 0 + + + @dataclass class UnitTesting(Cluster): id: typing.ClassVar[int] = 0xFFF1FC05 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index 63896e7e95f830..d6b5c27d560ac4 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -99,6 +99,7 @@ typedef NS_ENUM(uint32_t, MTRClusterIDType) { MTRClusterApplicationBasicID MTR_NEWLY_DEPRECATED("Please use MTRClusterIDTypeApplicationBasicID") = 0x0000050D, MTRClusterAccountLoginID MTR_NEWLY_DEPRECATED("Please use MTRClusterIDTypeAccountLoginID") = 0x0000050E, MTRClusterElectricalMeasurementID MTR_NEWLY_DEPRECATED("Please use MTRClusterIDTypeElectricalMeasurementID") = 0x00000B04, + MTRClusterClientMonitoringID MTR_NEWLY_DEPRECATED("Please use MTRClusterIDTypeClientMonitoringID") = 0x00001046, MTRClusterTestClusterID MTR_NEWLY_DEPRECATED("Please use MTRClusterIDTypeUnitTestingID") = 0xFFF1FC05, MTRClusterFaultInjectionID MTR_NEWLY_DEPRECATED("Please use MTRClusterIDTypeFaultInjectionID") = 0xFFF1FC06, MTRClusterIDTypeIdentifyID MTR_NEWLY_AVAILABLE = 0x00000003, @@ -170,6 +171,7 @@ typedef NS_ENUM(uint32_t, MTRClusterIDType) { MTRClusterIDTypeApplicationBasicID MTR_NEWLY_AVAILABLE = 0x0000050D, MTRClusterIDTypeAccountLoginID MTR_NEWLY_AVAILABLE = 0x0000050E, MTRClusterIDTypeElectricalMeasurementID MTR_NEWLY_AVAILABLE = 0x00000B04, + MTRClusterIDTypeClientMonitoringID MTR_NEWLY_AVAILABLE = 0x00001046, MTRClusterIDTypeUnitTestingID MTR_NEWLY_AVAILABLE = 0xFFF1FC05, MTRClusterIDTypeFaultInjectionID MTR_NEWLY_AVAILABLE = 0xFFF1FC06, }; @@ -4887,6 +4889,51 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { MTRAttributeIDTypeClusterElectricalMeasurementAttributeClusterRevisionID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID, + // Cluster ClientMonitoring deprecated attribute names + MTRClusterClientMonitoringAttributeIdleModeIntervalID MTR_NEWLY_DEPRECATED( + "Please use MTRAttributeIDTypeClusterClientMonitoringAttributeIdleModeIntervalID") + = 0x00000000, + MTRClusterClientMonitoringAttributeActiveModeIntervalID MTR_NEWLY_DEPRECATED( + "Please use MTRAttributeIDTypeClusterClientMonitoringAttributeActiveModeIntervalID") + = 0x00000001, + MTRClusterClientMonitoringAttributeActiveModeThresholdID MTR_NEWLY_DEPRECATED( + "Please use MTRAttributeIDTypeClusterClientMonitoringAttributeActiveModeThresholdID") + = 0x00000002, + MTRClusterClientMonitoringAttributeExpectedClientsID MTR_NEWLY_DEPRECATED( + "Please use MTRAttributeIDTypeClusterClientMonitoringAttributeExpectedClientsID") + = 0x00000003, + MTRClusterClientMonitoringAttributeGeneratedCommandListID MTR_NEWLY_DEPRECATED( + "Please use MTRAttributeIDTypeClusterClientMonitoringAttributeGeneratedCommandListID") + = MTRClusterGlobalAttributeGeneratedCommandListID, + MTRClusterClientMonitoringAttributeAcceptedCommandListID MTR_NEWLY_DEPRECATED( + "Please use MTRAttributeIDTypeClusterClientMonitoringAttributeAcceptedCommandListID") + = MTRClusterGlobalAttributeAcceptedCommandListID, + MTRClusterClientMonitoringAttributeAttributeListID MTR_NEWLY_DEPRECATED( + "Please use MTRAttributeIDTypeClusterClientMonitoringAttributeAttributeListID") + = MTRClusterGlobalAttributeAttributeListID, + MTRClusterClientMonitoringAttributeFeatureMapID MTR_NEWLY_DEPRECATED( + "Please use MTRAttributeIDTypeClusterClientMonitoringAttributeFeatureMapID") + = MTRClusterGlobalAttributeFeatureMapID, + MTRClusterClientMonitoringAttributeClusterRevisionID MTR_NEWLY_DEPRECATED( + "Please use MTRAttributeIDTypeClusterClientMonitoringAttributeClusterRevisionID") + = MTRClusterGlobalAttributeClusterRevisionID, + + // Cluster ClientMonitoring attributes + MTRAttributeIDTypeClusterClientMonitoringAttributeIdleModeIntervalID MTR_NEWLY_AVAILABLE = 0x00000000, + MTRAttributeIDTypeClusterClientMonitoringAttributeActiveModeIntervalID MTR_NEWLY_AVAILABLE = 0x00000001, + MTRAttributeIDTypeClusterClientMonitoringAttributeActiveModeThresholdID MTR_NEWLY_AVAILABLE = 0x00000002, + MTRAttributeIDTypeClusterClientMonitoringAttributeExpectedClientsID MTR_NEWLY_AVAILABLE = 0x00000003, + MTRAttributeIDTypeClusterClientMonitoringAttributeGeneratedCommandListID MTR_NEWLY_AVAILABLE + = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID, + MTRAttributeIDTypeClusterClientMonitoringAttributeAcceptedCommandListID MTR_NEWLY_AVAILABLE + = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID, + MTRAttributeIDTypeClusterClientMonitoringAttributeAttributeListID MTR_NEWLY_AVAILABLE + = MTRAttributeIDTypeGlobalAttributeAttributeListID, + MTRAttributeIDTypeClusterClientMonitoringAttributeFeatureMapID MTR_NEWLY_AVAILABLE + = MTRAttributeIDTypeGlobalAttributeFeatureMapID, + MTRAttributeIDTypeClusterClientMonitoringAttributeClusterRevisionID MTR_NEWLY_AVAILABLE + = MTRAttributeIDTypeGlobalAttributeClusterRevisionID, + // Cluster TestCluster deprecated attribute names MTRClusterTestClusterAttributeBooleanID MTR_NEWLY_DEPRECATED( "Please use MTRAttributeIDTypeClusterUnitTestingAttributeBooleanID") @@ -6199,6 +6246,18 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) { MTRCommandIDTypeClusterElectricalMeasurementCommandGetMeasurementProfileResponseCommandID MTR_NEWLY_AVAILABLE = 0x00000001, MTRCommandIDTypeClusterElectricalMeasurementCommandGetMeasurementProfileCommandID MTR_NEWLY_AVAILABLE = 0x00000001, + // Cluster ClientMonitoring deprecated command id names + MTRClusterClientMonitoringCommandRegisterClientMonitoringID MTR_NEWLY_DEPRECATED( + "Please use MTRCommandIDTypeClusterClientMonitoringCommandRegisterClientMonitoringID") + = 0x00000000, + MTRClusterClientMonitoringCommandStayAwakeRequestID MTR_NEWLY_DEPRECATED( + "Please use MTRCommandIDTypeClusterClientMonitoringCommandStayAwakeRequestID") + = 0x00000001, + + // Cluster ClientMonitoring commands + MTRCommandIDTypeClusterClientMonitoringCommandRegisterClientMonitoringID MTR_NEWLY_AVAILABLE = 0x00000000, + MTRCommandIDTypeClusterClientMonitoringCommandStayAwakeRequestID MTR_NEWLY_AVAILABLE = 0x00000001, + // Cluster TestCluster deprecated command id names MTRClusterTestClusterCommandTestID MTR_NEWLY_DEPRECATED("Please use MTRCommandIDTypeClusterUnitTestingCommandTestID") = 0x00000000, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index 6ce42082934421..e13a48473d1196 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -5276,6 +5276,50 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; +- (instancetype)init; +- (id)copyWithZone:(NSZone * _Nullable)zone; +@end +@interface MTRClientMonitoringClusterRegisterClientMonitoringParams : NSObject + +@property (nonatomic, copy) NSNumber * _Nonnull clientNodeId; + +@property (nonatomic, copy) NSNumber * _Nonnull iCid; +/** + * Controls whether the command is a timed command (using Timed Invoke). + * + * If nil (the default value), a regular invoke is done for commands that do + * not require a timed invoke and a timed invoke with some default timed request + * timeout is done for commands that require a timed invoke. + * + * If not nil, a timed invoke is done, with the provided value used as the timed + * request timeout. The value should be chosen small enough to provide the + * desired security properties but large enough that it will allow a round-trip + * from the sever to the client (for the status response and actual invoke + * request) within the timeout window. + * + */ +@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; + +- (instancetype)init; +- (id)copyWithZone:(NSZone * _Nullable)zone; +@end +@interface MTRClientMonitoringClusterStayAwakeRequestParams : NSObject +/** + * Controls whether the command is a timed command (using Timed Invoke). + * + * If nil (the default value), a regular invoke is done for commands that do + * not require a timed invoke and a timed invoke with some default timed request + * timeout is done for commands that require a timed invoke. + * + * If not nil, a timed invoke is done, with the provided value used as the timed + * request timeout. The value should be chosen small enough to provide the + * desired security properties but large enough that it will allow a round-trip + * from the sever to the client (for the status response and actual invoke + * request) within the timeout window. + * + */ +@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; + - (instancetype)init; - (id)copyWithZone:(NSZone * _Nullable)zone; @end diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index 744bd8ceaa80e1..0f925b15110406 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -6995,6 +6995,63 @@ - (NSString *)description return descriptionString; } +@end +@implementation MTRClientMonitoringClusterRegisterClientMonitoringParams +- (instancetype)init +{ + if (self = [super init]) { + + _clientNodeId = @(0); + + _iCid = @(0); + _timedInvokeTimeoutMs = nil; + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone; +{ + auto other = [[MTRClientMonitoringClusterRegisterClientMonitoringParams alloc] init]; + + other.clientNodeId = self.clientNodeId; + other.iCid = self.iCid; + other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = + [NSString stringWithFormat:@"<%@: clientNodeId:%@; iCid:%@; >", NSStringFromClass([self class]), _clientNodeId, _iCid]; + return descriptionString; +} + +@end +@implementation MTRClientMonitoringClusterStayAwakeRequestParams +- (instancetype)init +{ + if (self = [super init]) { + _timedInvokeTimeoutMs = nil; + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone; +{ + auto other = [[MTRClientMonitoringClusterStayAwakeRequestParams alloc] init]; + + other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])]; + return descriptionString; +} + @end @implementation MTRUnitTestingClusterTestParams - (instancetype)init diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index 3fc761310b2e4f..d48d05149e0814 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -970,6 +970,15 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr - (id)copyWithZone:(NSZone * _Nullable)zone; @end +@interface MTRClientMonitoringClusterMonitoringRegistration : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull clientNodeId; +@property (nonatomic, copy) NSNumber * _Nonnull iCid; +@property (nonatomic, copy) NSNumber * _Nonnull fabricIndex; + +- (instancetype)init; +- (id)copyWithZone:(NSZone * _Nullable)zone; +@end + MTR_NEWLY_AVAILABLE @interface MTRUnitTestingClusterSimpleStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull a; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 78f31666267b70..07769ead2b09aa 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -3581,6 +3581,40 @@ - (NSString *)description @end +@implementation MTRClientMonitoringClusterMonitoringRegistration +- (instancetype)init +{ + if (self = [super init]) { + + _clientNodeId = @(0); + + _iCid = @(0); + + _fabricIndex = @(0); + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone +{ + auto other = [[MTRClientMonitoringClusterMonitoringRegistration alloc] init]; + + other.clientNodeId = self.clientNodeId; + other.iCid = self.iCid; + other.fabricIndex = self.fabricIndex; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = [NSString stringWithFormat:@"<%@: clientNodeId:%@; iCid:%@; fabricIndex:%@; >", + NSStringFromClass([self class]), _clientNodeId, _iCid, _fabricIndex]; + return descriptionString; +} + +@end + @implementation MTRUnitTestingClusterSimpleStruct - (instancetype)init { diff --git a/zzz_generated/app-common/app-common/zap-generated/af-structs.h b/zzz_generated/app-common/app-common/zap-generated/af-structs.h index 3c1d5866c587f0..504c6d137296ba 100644 --- a/zzz_generated/app-common/app-common/zap-generated/af-structs.h +++ b/zzz_generated/app-common/app-common/zap-generated/af-structs.h @@ -368,6 +368,14 @@ typedef struct _LineupInfo uint8_t lineupInfoType; } LineupInfo; +// Struct for MonitoringRegistration +typedef struct _MonitoringRegistration +{ + chip::NodeId ClientNodeId; + uint64_t ICid; + chip::FabricIndex FabricIndex; +} MonitoringRegistration; + // Struct for NOCStruct typedef struct _NOCStruct { diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h index ae5e84a0245133..db53fc67718181 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h @@ -1133,6 +1133,16 @@ #define ZCL_RMS_VOLTAGE_SAG_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A16) #define ZCL_RMS_VOLTAGE_SWELL_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A17) +// Attribute ids for cluster: Client Monitoring + +// Client attributes + +// Server attributes +#define ZCL_IDLE_MODE_INTERVAL_ATTRIBUTE_ID (0x0000) +#define ZCL_ACTIVE_MODE_INTERVAL_ATTRIBUTE_ID (0x0001) +#define ZCL_ACTIVE_MODE_THRESHOLD_ATTRIBUTE_ID (0x0002) +#define ZCL_EXPECTED_CLIENTS_ATTRIBUTE_ID (0x0003) + // Attribute ids for cluster: Unit Testing // Client attributes 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 aba2445a5cba5d..6b644145702ab1 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 @@ -27727,6 +27727,167 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) } // namespace Attributes } // namespace ElectricalMeasurement +namespace ClientMonitoring { +namespace Attributes { + +namespace IdleModeInterval { + +EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ClientMonitoring::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, uint32_t 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 emberAfWriteServerAttribute(endpoint, Clusters::ClientMonitoring::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE); +} + +} // namespace IdleModeInterval + +namespace ActiveModeInterval { + +EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ClientMonitoring::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, uint32_t 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 emberAfWriteServerAttribute(endpoint, Clusters::ClientMonitoring::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE); +} + +} // namespace ActiveModeInterval + +namespace ActiveModeThreshold { + +EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ClientMonitoring::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, uint16_t 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 emberAfWriteServerAttribute(endpoint, Clusters::ClientMonitoring::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); +} + +} // namespace ActiveModeThreshold + +namespace FeatureMap { + +EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ClientMonitoring::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, uint32_t 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 emberAfWriteServerAttribute(endpoint, Clusters::ClientMonitoring::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); +} + +} // namespace FeatureMap + +namespace ClusterRevision { + +EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ClientMonitoring::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, uint16_t 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 emberAfWriteServerAttribute(endpoint, Clusters::ClientMonitoring::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); +} + +} // namespace ClusterRevision + +} // namespace Attributes +} // namespace ClientMonitoring + namespace UnitTesting { namespace Attributes { 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 e1e6b3dd21d05d..9f35b1e9624458 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 @@ -4652,6 +4652,37 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace Attributes } // namespace ElectricalMeasurement +namespace ClientMonitoring { +namespace Attributes { + +namespace IdleModeInterval { +EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int32u +EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value); +} // namespace IdleModeInterval + +namespace ActiveModeInterval { +EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // int32u +EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value); +} // namespace ActiveModeInterval + +namespace ActiveModeThreshold { +EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u +EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); +} // namespace ActiveModeThreshold + +namespace FeatureMap { +EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // bitmap32 +EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value); +} // namespace FeatureMap + +namespace ClusterRevision { +EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u +EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); +} // namespace ClusterRevision + +} // namespace Attributes +} // namespace ClientMonitoring + namespace UnitTesting { namespace Attributes { diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index 6669d106cd3da8..8c82bc550c2a7e 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -586,6 +586,14 @@ void emberAfAccountLoginClusterInitCallback(chip::EndpointId endpoint); */ void emberAfElectricalMeasurementClusterInitCallback(chip::EndpointId endpoint); +/** @brief Client Monitoring Cluster Init + * + * Cluster Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfClientMonitoringClusterInitCallback(chip::EndpointId endpoint); + /** @brief Unit Testing Cluster Init * * Cluster Init @@ -7255,6 +7263,104 @@ void emberAfElectricalMeasurementClusterServerTickCallback(chip::EndpointId endp */ void emberAfElectricalMeasurementClusterClientTickCallback(chip::EndpointId endpoint); +// +// Client Monitoring Cluster +// + +/** @brief Client Monitoring Cluster Server Init + * + * Server Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfClientMonitoringClusterServerInitCallback(chip::EndpointId endpoint); + +/** @brief Client Monitoring Cluster Client Init + * + * Client Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfClientMonitoringClusterClientInitCallback(chip::EndpointId endpoint); + +/** @brief Client Monitoring Cluster Server Attribute Changed + * + * Server Attribute Changed + * + * @param attributePath Concrete attribute path that changed + */ +void MatterClientMonitoringClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); + +/** @brief Client Monitoring Cluster Server Message Sent + * + * Server Message Sent + * + * @param destination The destination to which the message was sent + * @param apsFrame The APS frame for the message + * @param msgLen The length of the message + * @param message The message that was sent + * @param status The status of the sent message + */ +void emberAfClientMonitoringClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, + EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, + EmberStatus status); + +/** @brief Client Monitoring Cluster Client Message Sent + * + * Client Message Sent + * + * @param destination The destination to which the message was sent + * @param apsFrame The APS frame for the message + * @param msgLen The length of the message + * @param message The message that was sent + * @param status The status of the sent message + */ +void emberAfClientMonitoringClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, + EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, + EmberStatus status); + +/** @brief Client Monitoring Cluster Server Pre Attribute Changed + * + * Server Pre Attribute Changed + * + * @param attributePath Concrete attribute path to be changed + * @param attributeType Attribute type + * @param size Attribute size + * @param value Attribute value + */ +chip::Protocols::InteractionModel::Status +MatterClientMonitoringClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); + +/** @brief Client Monitoring Cluster Client Pre Attribute Changed + * + * Client Pre Attribute Changed + * + * @param attributePath Concrete attribute path to be changed + * @param attributeType Attribute type + * @param size Attribute size + * @param value Attribute value + */ +chip::Protocols::InteractionModel::Status +MatterClientMonitoringClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); + +/** @brief Client Monitoring Cluster Server Tick + * + * Server Tick + * + * @param endpoint Endpoint that is being served + */ +void emberAfClientMonitoringClusterServerTickCallback(chip::EndpointId endpoint); + +/** @brief Client Monitoring Cluster Client Tick + * + * Client Tick + * + * @param endpoint Endpoint that is being served + */ +void emberAfClientMonitoringClusterClientTickCallback(chip::EndpointId endpoint); + // // Unit Testing Cluster // @@ -8695,6 +8801,18 @@ bool emberAfElectricalMeasurementClusterGetMeasurementProfileResponseCommandCall bool emberAfElectricalMeasurementClusterGetMeasurementProfileCommandCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileCommand::DecodableType & commandData); +/** + * @brief Client Monitoring Cluster RegisterClientMonitoring Command callback (from client) + */ +bool emberAfClientMonitoringClusterRegisterClientMonitoringCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::ClientMonitoring::Commands::RegisterClientMonitoring::DecodableType & commandData); +/** + * @brief Client Monitoring Cluster StayAwakeRequest Command callback (from client) + */ +bool emberAfClientMonitoringClusterStayAwakeRequestCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::ClientMonitoring::Commands::StayAwakeRequest::DecodableType & commandData); /** * @brief Unit Testing Cluster Test Command callback (from client) */ diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index b71d81dba7eaaf..12cb3de9b1caaf 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -2273,6 +2273,9 @@ namespace AccountLogin { namespace ElectricalMeasurement { } // namespace ElectricalMeasurement +namespace ClientMonitoring { +} // namespace ClientMonitoring + namespace UnitTesting { // Enum for SimpleEnum diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-id.h b/zzz_generated/app-common/app-common/zap-generated/cluster-id.h new file mode 100644 index 00000000000000..087eb6fd1ae65c --- /dev/null +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-id.h @@ -0,0 +1,239 @@ +/* + * + * Copyright (c) 2022 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// THIS FILE IS GENERATED BY ZAP + +// Prevent multiple inclusion +#pragma once + +#include + +// Definitions for cluster: Identify +static constexpr chip::ClusterId ZCL_IDENTIFY_CLUSTER_ID = 0x0003; + +// Definitions for cluster: Groups +static constexpr chip::ClusterId ZCL_GROUPS_CLUSTER_ID = 0x0004; + +// Definitions for cluster: Scenes +static constexpr chip::ClusterId ZCL_SCENES_CLUSTER_ID = 0x0005; + +// Definitions for cluster: On/Off +static constexpr chip::ClusterId ZCL_ON_OFF_CLUSTER_ID = 0x0006; + +// Definitions for cluster: On/off Switch Configuration +static constexpr chip::ClusterId ZCL_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_ID = 0x0007; + +// Definitions for cluster: Level Control +static constexpr chip::ClusterId ZCL_LEVEL_CONTROL_CLUSTER_ID = 0x0008; + +// Definitions for cluster: Binary Input (Basic) +static constexpr chip::ClusterId ZCL_BINARY_INPUT_BASIC_CLUSTER_ID = 0x000F; + +// Definitions for cluster: Pulse Width Modulation +static constexpr chip::ClusterId ZCL_PWM_CLUSTER_ID = 0x001C; + +// Definitions for cluster: Descriptor +static constexpr chip::ClusterId ZCL_DESCRIPTOR_CLUSTER_ID = 0x001D; + +// Definitions for cluster: Binding +static constexpr chip::ClusterId ZCL_BINDING_CLUSTER_ID = 0x001E; + +// Definitions for cluster: Access Control +static constexpr chip::ClusterId ZCL_ACCESS_CONTROL_CLUSTER_ID = 0x001F; + +// Definitions for cluster: Actions +static constexpr chip::ClusterId ZCL_ACTIONS_CLUSTER_ID = 0x0025; + +// Definitions for cluster: Basic +static constexpr chip::ClusterId ZCL_BASIC_CLUSTER_ID = 0x0028; + +// Definitions for cluster: OTA Software Update Provider +static constexpr chip::ClusterId ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID = 0x0029; + +// Definitions for cluster: OTA Software Update Requestor +static constexpr chip::ClusterId ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID = 0x002A; + +// Definitions for cluster: Localization Configuration +static constexpr chip::ClusterId ZCL_LOCALIZATION_CONFIGURATION_CLUSTER_ID = 0x002B; + +// Definitions for cluster: Time Format Localization +static constexpr chip::ClusterId ZCL_TIME_FORMAT_LOCALIZATION_CLUSTER_ID = 0x002C; + +// Definitions for cluster: Unit Localization +static constexpr chip::ClusterId ZCL_UNIT_LOCALIZATION_CLUSTER_ID = 0x002D; + +// Definitions for cluster: Power Source Configuration +static constexpr chip::ClusterId ZCL_POWER_SOURCE_CONFIGURATION_CLUSTER_ID = 0x002E; + +// Definitions for cluster: Power Source +static constexpr chip::ClusterId ZCL_POWER_SOURCE_CLUSTER_ID = 0x002F; + +// Definitions for cluster: General Commissioning +static constexpr chip::ClusterId ZCL_GENERAL_COMMISSIONING_CLUSTER_ID = 0x0030; + +// Definitions for cluster: Network Commissioning +static constexpr chip::ClusterId ZCL_NETWORK_COMMISSIONING_CLUSTER_ID = 0x0031; + +// Definitions for cluster: Diagnostic Logs +static constexpr chip::ClusterId ZCL_DIAGNOSTIC_LOGS_CLUSTER_ID = 0x0032; + +// Definitions for cluster: General Diagnostics +static constexpr chip::ClusterId ZCL_GENERAL_DIAGNOSTICS_CLUSTER_ID = 0x0033; + +// Definitions for cluster: Software Diagnostics +static constexpr chip::ClusterId ZCL_SOFTWARE_DIAGNOSTICS_CLUSTER_ID = 0x0034; + +// Definitions for cluster: Thread Network Diagnostics +static constexpr chip::ClusterId ZCL_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID = 0x0035; + +// Definitions for cluster: WiFi Network Diagnostics +static constexpr chip::ClusterId ZCL_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID = 0x0036; + +// Definitions for cluster: Ethernet Network Diagnostics +static constexpr chip::ClusterId ZCL_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID = 0x0037; + +// Definitions for cluster: Time Synchronization +static constexpr chip::ClusterId ZCL_TIME_SYNCHRONIZATION_CLUSTER_ID = 0x0038; + +// Definitions for cluster: Bridged Device Basic +static constexpr chip::ClusterId ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID = 0x0039; + +// Definitions for cluster: Switch +static constexpr chip::ClusterId ZCL_SWITCH_CLUSTER_ID = 0x003B; + +// Definitions for cluster: AdministratorCommissioning +static constexpr chip::ClusterId ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID = 0x003C; + +// Definitions for cluster: Operational Credentials +static constexpr chip::ClusterId ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID = 0x003E; + +// Definitions for cluster: Group Key Management +static constexpr chip::ClusterId ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID = 0x003F; + +// Definitions for cluster: Fixed Label +static constexpr chip::ClusterId ZCL_FIXED_LABEL_CLUSTER_ID = 0x0040; + +// Definitions for cluster: User Label +static constexpr chip::ClusterId ZCL_USER_LABEL_CLUSTER_ID = 0x0041; + +// Definitions for cluster: Proxy Configuration +static constexpr chip::ClusterId ZCL_PROXY_CONFIGURATION_CLUSTER_ID = 0x0042; + +// Definitions for cluster: Proxy Discovery +static constexpr chip::ClusterId ZCL_PROXY_DISCOVERY_CLUSTER_ID = 0x0043; + +// Definitions for cluster: Proxy Valid +static constexpr chip::ClusterId ZCL_PROXY_VALID_CLUSTER_ID = 0x0044; + +// Definitions for cluster: Boolean State +static constexpr chip::ClusterId ZCL_BOOLEAN_STATE_CLUSTER_ID = 0x0045; + +// Definitions for cluster: Client Monitoring +static constexpr chip::ClusterId ZCL_CLIENT_MONITORING_CLUSTER_ID = 0x0046; + +// Definitions for cluster: Mode Select +static constexpr chip::ClusterId ZCL_MODE_SELECT_CLUSTER_ID = 0x0050; + +// Definitions for cluster: Door Lock +static constexpr chip::ClusterId ZCL_DOOR_LOCK_CLUSTER_ID = 0x0101; + +// Definitions for cluster: Window Covering +static constexpr chip::ClusterId ZCL_WINDOW_COVERING_CLUSTER_ID = 0x0102; + +// Definitions for cluster: Barrier Control +static constexpr chip::ClusterId ZCL_BARRIER_CONTROL_CLUSTER_ID = 0x0103; + +// Definitions for cluster: Pump Configuration and Control +static constexpr chip::ClusterId ZCL_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_ID = 0x0200; + +// Definitions for cluster: Thermostat +static constexpr chip::ClusterId ZCL_THERMOSTAT_CLUSTER_ID = 0x0201; + +// Definitions for cluster: Fan Control +static constexpr chip::ClusterId ZCL_FAN_CONTROL_CLUSTER_ID = 0x0202; + +// Definitions for cluster: Thermostat User Interface Configuration +static constexpr chip::ClusterId ZCL_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_ID = 0x0204; + +// Definitions for cluster: Color Control +static constexpr chip::ClusterId ZCL_COLOR_CONTROL_CLUSTER_ID = 0x0300; + +// Definitions for cluster: Ballast Configuration +static constexpr chip::ClusterId ZCL_BALLAST_CONFIGURATION_CLUSTER_ID = 0x0301; + +// Definitions for cluster: Illuminance Measurement +static constexpr chip::ClusterId ZCL_ILLUMINANCE_MEASUREMENT_CLUSTER_ID = 0x0400; + +// Definitions for cluster: Temperature Measurement +static constexpr chip::ClusterId ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID = 0x0402; + +// Definitions for cluster: Pressure Measurement +static constexpr chip::ClusterId ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID = 0x0403; + +// Definitions for cluster: Flow Measurement +static constexpr chip::ClusterId ZCL_FLOW_MEASUREMENT_CLUSTER_ID = 0x0404; + +// Definitions for cluster: Relative Humidity Measurement +static constexpr chip::ClusterId ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID = 0x0405; + +// Definitions for cluster: Occupancy Sensing +static constexpr chip::ClusterId ZCL_OCCUPANCY_SENSING_CLUSTER_ID = 0x0406; + +// Definitions for cluster: Wake on LAN +static constexpr chip::ClusterId ZCL_WAKE_ON_LAN_CLUSTER_ID = 0x0503; + +// Definitions for cluster: Channel +static constexpr chip::ClusterId ZCL_CHANNEL_CLUSTER_ID = 0x0504; + +// Definitions for cluster: Target Navigator +static constexpr chip::ClusterId ZCL_TARGET_NAVIGATOR_CLUSTER_ID = 0x0505; + +// Definitions for cluster: Media Playback +static constexpr chip::ClusterId ZCL_MEDIA_PLAYBACK_CLUSTER_ID = 0x0506; + +// Definitions for cluster: Media Input +static constexpr chip::ClusterId ZCL_MEDIA_INPUT_CLUSTER_ID = 0x0507; + +// Definitions for cluster: Low Power +static constexpr chip::ClusterId ZCL_LOW_POWER_CLUSTER_ID = 0x0508; + +// Definitions for cluster: Keypad Input +static constexpr chip::ClusterId ZCL_KEYPAD_INPUT_CLUSTER_ID = 0x0509; + +// Definitions for cluster: Content Launcher +static constexpr chip::ClusterId ZCL_CONTENT_LAUNCHER_CLUSTER_ID = 0x050A; + +// Definitions for cluster: Audio Output +static constexpr chip::ClusterId ZCL_AUDIO_OUTPUT_CLUSTER_ID = 0x050B; + +// Definitions for cluster: Application Launcher +static constexpr chip::ClusterId ZCL_APPLICATION_LAUNCHER_CLUSTER_ID = 0x050C; + +// Definitions for cluster: Application Basic +static constexpr chip::ClusterId ZCL_APPLICATION_BASIC_CLUSTER_ID = 0x050D; + +// Definitions for cluster: Account Login +static constexpr chip::ClusterId ZCL_ACCOUNT_LOGIN_CLUSTER_ID = 0x050E; + +// Definitions for cluster: Electrical Measurement +static constexpr chip::ClusterId ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID = 0x0B04; + +// Definitions for cluster: Unit Testing +static constexpr chip::ClusterId ZCL_UNIT_TESTING_CLUSTER_ID = 0xFFF1FC05; + +// Definitions for cluster: Fault Injection +static constexpr chip::ClusterId ZCL_FAULT_INJECTION_CLUSTER_ID = 0xFFF1FC06; 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 37fdb4628962f7..51873b26562bcf 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 @@ -18554,6 +18554,192 @@ namespace Events { } // namespace Events } // namespace ElectricalMeasurement +namespace ClientMonitoring { +namespace Structs { +namespace MonitoringRegistration { +CHIP_ERROR Type::EncodeForWrite(TLV::TLVWriter & writer, TLV::Tag tag) const +{ + return DoEncode(writer, tag, NullOptional); +} + +CHIP_ERROR Type::EncodeForRead(TLV::TLVWriter & writer, TLV::Tag tag, FabricIndex accessingFabricIndex) const +{ + return DoEncode(writer, tag, MakeOptional(accessingFabricIndex)); +} + +CHIP_ERROR Type::DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional & accessingFabricIndex) const +{ + TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kClientNodeId)), clientNodeId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kICid)), ICid)); + if (accessingFabricIndex.HasValue()) + { + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kFabricIndex)), fabricIndex)); + } + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVType outer; + VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + err = reader.EnterContainer(outer); + ReturnErrorOnFailure(err); + while ((err = reader.Next()) == CHIP_NO_ERROR) + { + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } + switch (TLV::TagNumFromTag(reader.GetTag())) + { + case to_underlying(Fields::kClientNodeId): + ReturnErrorOnFailure(DataModel::Decode(reader, clientNodeId)); + break; + case to_underlying(Fields::kICid): + ReturnErrorOnFailure(DataModel::Decode(reader, ICid)); + break; + case to_underlying(Fields::kFabricIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, fabricIndex)); + break; + default: + break; + } + } + + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); + + return CHIP_NO_ERROR; +} + +} // namespace MonitoringRegistration +} // namespace Structs + +namespace Commands { +namespace RegisterClientMonitoring { +CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +{ + TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kClientNodeId)), clientNodeId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kICid)), ICid)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVType outer; + VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + ReturnErrorOnFailure(reader.EnterContainer(outer)); + while ((err = reader.Next()) == CHIP_NO_ERROR) + { + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } + switch (TLV::TagNumFromTag(reader.GetTag())) + { + case to_underlying(Fields::kClientNodeId): + ReturnErrorOnFailure(DataModel::Decode(reader, clientNodeId)); + break; + case to_underlying(Fields::kICid): + ReturnErrorOnFailure(DataModel::Decode(reader, ICid)); + break; + default: + break; + } + } + + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); + return CHIP_NO_ERROR; +} +} // namespace RegisterClientMonitoring. +namespace StayAwakeRequest { +CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +{ + TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVType outer; + VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + ReturnErrorOnFailure(reader.EnterContainer(outer)); + while ((err = reader.Next()) == CHIP_NO_ERROR) + { + if (!TLV::IsContextTag(reader.GetTag())) + { + continue; + } + switch (TLV::TagNumFromTag(reader.GetTag())) + { + default: + break; + } + } + + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); + return CHIP_NO_ERROR; +} +} // namespace StayAwakeRequest. +} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +{ + switch (path.mAttributeId) + { + case Attributes::IdleModeInterval::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, idleModeInterval)); + break; + case Attributes::ActiveModeInterval::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, activeModeInterval)); + break; + case Attributes::ActiveModeThreshold::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, activeModeThreshold)); + break; + case Attributes::ExpectedClients::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, expectedClients)); + break; + case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); + break; + case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, acceptedCommandList)); + break; + case Attributes::AttributeList::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, attributeList)); + break; + case Attributes::FeatureMap::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, featureMap)); + break; + case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, clusterRevision)); + break; + default: + break; + } + + return CHIP_NO_ERROR; +} +} // namespace Attributes + +namespace Events { +} // namespace Events + +} // namespace ClientMonitoring namespace UnitTesting { namespace Structs { namespace SimpleStruct { @@ -21401,6 +21587,13 @@ bool CommandIsFabricScoped(ClusterId aCluster, CommandId aCommand) return false; } } + case Clusters::ClientMonitoring::Id: { + switch (aCommand) + { + default: + return false; + } + } case Clusters::UnitTesting::Id: { switch (aCommand) { 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 4fadf5d916bf8c..c08f33b94259ea 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 @@ -25185,6 +25185,228 @@ struct TypeInfo }; } // namespace Attributes } // namespace ElectricalMeasurement +namespace ClientMonitoring { +namespace Structs { +namespace MonitoringRegistration { +enum class Fields +{ + kClientNodeId = 1, + kICid = 2, + kFabricIndex = 254, +}; + +struct Type +{ +public: + chip::NodeId clientNodeId = static_cast(0); + uint64_t ICid = static_cast(0); + chip::FabricIndex fabricIndex = static_cast(0); + + CHIP_ERROR Decode(TLV::TLVReader & reader); + + static constexpr bool kIsFabricScoped = true; + + auto GetFabricIndex() const { return fabricIndex; } + + void SetFabricIndex(chip::FabricIndex fabricIndex_) { fabricIndex = fabricIndex_; } + + CHIP_ERROR EncodeForWrite(TLV::TLVWriter & writer, TLV::Tag tag) const; + CHIP_ERROR EncodeForRead(TLV::TLVWriter & writer, TLV::Tag tag, FabricIndex accessingFabricIndex) const; + +private: + CHIP_ERROR DoEncode(TLV::TLVWriter & writer, TLV::Tag tag, const Optional & accessingFabricIndex) const; +}; + +using DecodableType = Type; + +} // namespace MonitoringRegistration +} // namespace Structs + +namespace Commands { +// Forward-declarations so we can reference these later. + +namespace RegisterClientMonitoring { +struct Type; +struct DecodableType; +} // namespace RegisterClientMonitoring + +namespace StayAwakeRequest { +struct Type; +struct DecodableType; +} // namespace StayAwakeRequest + +} // namespace Commands + +namespace Commands { +namespace RegisterClientMonitoring { +enum class Fields +{ + kClientNodeId = 0, + kICid = 1, +}; + +struct Type +{ +public: + // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand + static constexpr CommandId GetCommandId() { return Commands::RegisterClientMonitoring::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::ClientMonitoring::Id; } + + chip::NodeId clientNodeId = static_cast(0); + uint64_t ICid = static_cast(0); + + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; + + using ResponseType = DataModel::NullObjectType; + + static constexpr bool MustUseTimedInvoke() { return false; } +}; + +struct DecodableType +{ +public: + static constexpr CommandId GetCommandId() { return Commands::RegisterClientMonitoring::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::ClientMonitoring::Id; } + + chip::NodeId clientNodeId = static_cast(0); + uint64_t ICid = static_cast(0); + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +}; // namespace RegisterClientMonitoring +namespace StayAwakeRequest { +enum class Fields +{ +}; + +struct Type +{ +public: + // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand + static constexpr CommandId GetCommandId() { return Commands::StayAwakeRequest::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::ClientMonitoring::Id; } + + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; + + using ResponseType = DataModel::NullObjectType; + + static constexpr bool MustUseTimedInvoke() { return false; } +}; + +struct DecodableType +{ +public: + static constexpr CommandId GetCommandId() { return Commands::StayAwakeRequest::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::ClientMonitoring::Id; } + + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +}; // namespace StayAwakeRequest +} // namespace Commands + +namespace Attributes { + +namespace IdleModeInterval { +struct TypeInfo +{ + using Type = uint32_t; + using DecodableType = uint32_t; + using DecodableArgType = uint32_t; + + static constexpr ClusterId GetClusterId() { return Clusters::ClientMonitoring::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::IdleModeInterval::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace IdleModeInterval +namespace ActiveModeInterval { +struct TypeInfo +{ + using Type = uint32_t; + using DecodableType = uint32_t; + using DecodableArgType = uint32_t; + + static constexpr ClusterId GetClusterId() { return Clusters::ClientMonitoring::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ActiveModeInterval::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace ActiveModeInterval +namespace ActiveModeThreshold { +struct TypeInfo +{ + using Type = uint16_t; + using DecodableType = uint16_t; + using DecodableArgType = uint16_t; + + static constexpr ClusterId GetClusterId() { return Clusters::ClientMonitoring::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ActiveModeThreshold::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace ActiveModeThreshold +namespace ExpectedClients { +struct TypeInfo +{ + using Type = chip::app::DataModel::List; + using DecodableType = + chip::app::DataModel::DecodableList; + using DecodableArgType = const chip::app::DataModel::DecodableList< + chip::app::Clusters::ClientMonitoring::Structs::MonitoringRegistration::DecodableType> &; + + static constexpr ClusterId GetClusterId() { return Clusters::ClientMonitoring::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ExpectedClients::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace ExpectedClients +namespace GeneratedCommandList { +struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo +{ + static constexpr ClusterId GetClusterId() { return Clusters::ClientMonitoring::Id; } +}; +} // namespace GeneratedCommandList +namespace AcceptedCommandList { +struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo +{ + static constexpr ClusterId GetClusterId() { return Clusters::ClientMonitoring::Id; } +}; +} // namespace AcceptedCommandList +namespace AttributeList { +struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo +{ + static constexpr ClusterId GetClusterId() { return Clusters::ClientMonitoring::Id; } +}; +} // namespace AttributeList +namespace FeatureMap { +struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo +{ + static constexpr ClusterId GetClusterId() { return Clusters::ClientMonitoring::Id; } +}; +} // namespace FeatureMap +namespace ClusterRevision { +struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo +{ + static constexpr ClusterId GetClusterId() { return Clusters::ClientMonitoring::Id; } +}; +} // namespace ClusterRevision + +struct TypeInfo +{ + struct DecodableType + { + static constexpr ClusterId GetClusterId() { return Clusters::ClientMonitoring::Id; } + + CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); + + Attributes::IdleModeInterval::TypeInfo::DecodableType idleModeInterval = static_cast(0); + Attributes::ActiveModeInterval::TypeInfo::DecodableType activeModeInterval = static_cast(0); + Attributes::ActiveModeThreshold::TypeInfo::DecodableType activeModeThreshold = static_cast(0); + Attributes::ExpectedClients::TypeInfo::DecodableType expectedClients; + Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; + Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList; + Attributes::AttributeList::TypeInfo::DecodableType attributeList; + Attributes::FeatureMap::TypeInfo::DecodableType featureMap = static_cast(0); + Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast(0); + }; +}; +} // namespace Attributes +} // namespace ClientMonitoring namespace UnitTesting { namespace Structs { namespace SimpleStruct { diff --git a/zzz_generated/app-common/app-common/zap-generated/command-id.h b/zzz_generated/app-common/app-common/zap-generated/command-id.h index 45c8decb6fdc72..b443dfc0199f10 100644 --- a/zzz_generated/app-common/app-common/zap-generated/command-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/command-id.h @@ -317,6 +317,10 @@ #define ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID (0x01) #define ZCL_GET_MEASUREMENT_PROFILE_COMMAND_COMMAND_ID (0x01) +// Commands for cluster: Client Monitoring +#define ZCL_REGISTER_CLIENT_MONITORING_COMMAND_ID (0x00) +#define ZCL_STAY_AWAKE_REQUEST_COMMAND_ID (0x01) + // Commands for cluster: Unit Testing #define ZCL_TEST_COMMAND_ID (0x00) #define ZCL_TEST_SPECIFIC_RESPONSE_COMMAND_ID (0x00) 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 c7dce39a648afe..78fed4d2e9636f 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 @@ -4605,6 +4605,48 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace Attributes } // namespace ElectricalMeasurement +namespace ClientMonitoring { +namespace Attributes { + +namespace IdleModeInterval { +static constexpr AttributeId Id = 0x00000000; +} // namespace IdleModeInterval + +namespace ActiveModeInterval { +static constexpr AttributeId Id = 0x00000001; +} // namespace ActiveModeInterval + +namespace ActiveModeThreshold { +static constexpr AttributeId Id = 0x00000002; +} // namespace ActiveModeThreshold + +namespace ExpectedClients { +static constexpr AttributeId Id = 0x00000003; +} // namespace ExpectedClients + +namespace GeneratedCommandList { +static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id; +} // namespace GeneratedCommandList + +namespace AcceptedCommandList { +static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id; +} // namespace AcceptedCommandList + +namespace AttributeList { +static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id; +} // namespace AttributeList + +namespace FeatureMap { +static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id; +} // namespace FeatureMap + +namespace ClusterRevision { +static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; +} // namespace ClusterRevision + +} // namespace Attributes +} // namespace ClientMonitoring + namespace UnitTesting { namespace Attributes { diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h index a5d2738c08311f..6d9fe6fbd0cfdd 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h @@ -232,6 +232,9 @@ static constexpr ClusterId Id = 0x0000050E; namespace ElectricalMeasurement { static constexpr ClusterId Id = 0x00000B04; } // namespace ElectricalMeasurement +namespace ClientMonitoring { +static constexpr ClusterId Id = 0x00001046; +} // namespace ClientMonitoring namespace UnitTesting { static constexpr ClusterId Id = 0xFFF1FC05; } // namespace UnitTesting diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h index d7430e8e41f21b..1da2e63b9e3996 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h @@ -1091,6 +1091,20 @@ static constexpr CommandId Id = 0x00000001; } // namespace Commands } // namespace ElectricalMeasurement +namespace ClientMonitoring { +namespace Commands { + +namespace RegisterClientMonitoring { +static constexpr CommandId Id = 0x00000000; +} // namespace RegisterClientMonitoring + +namespace StayAwakeRequest { +static constexpr CommandId Id = 0x00000001; +} // namespace StayAwakeRequest + +} // namespace Commands +} // namespace ClientMonitoring + namespace UnitTesting { namespace Commands { diff --git a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h index c12c9c4da68c77..9b315e279a7397 100644 --- a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h +++ b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h @@ -461,6 +461,12 @@ #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER #endif +#if defined(ZCL_USING_CLIENT_MONITORING_CLUSTER_SERVER) || defined(ZCL_USING_CLIENT_MONITORING_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_CLIENT_MONITORING_CLUSTER { chip::app::Clusters::ClientMonitoring::Id, "Client Monitoring" }, +#else +#define CHIP_PRINTCLUSTER_CLIENT_MONITORING_CLUSTER +#endif + #if defined(ZCL_USING_UNIT_TESTING_CLUSTER_SERVER) || defined(ZCL_USING_UNIT_TESTING_CLUSTER_CLIENT) #define CHIP_PRINTCLUSTER_UNIT_TESTING_CLUSTER { chip::app::Clusters::UnitTesting::Id, "Unit Testing" }, #else @@ -543,6 +549,7 @@ CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER \ CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER \ CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER \ + CHIP_PRINTCLUSTER_CLIENT_MONITORING_CLUSTER \ CHIP_PRINTCLUSTER_UNIT_TESTING_CLUSTER \ CHIP_PRINTCLUSTER_FAULT_INJECTION_CLUSTER diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 852804cdd7daff..aafc35794b3bf4 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -102,6 +102,7 @@ | ApplicationBasic | 0x050D | | AccountLogin | 0x050E | | ElectricalMeasurement | 0x0B04 | +| ClientMonitoring | 0x1046 | | UnitTesting | 0xFFF1FC05| | FaultInjection | 0xFFF1FC06| \*----------------------------------------------------------------------------*/ @@ -7296,6 +7297,89 @@ class ElectricalMeasurementGetMeasurementProfileCommand : public ClusterCommand chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileCommand::Type mRequest; }; +/*----------------------------------------------------------------------------*\ +| Cluster ClientMonitoring | 0x1046 | +|------------------------------------------------------------------------------| +| Commands: | | +| * RegisterClientMonitoring | 0x00 | +| * StayAwakeRequest | 0x01 | +|------------------------------------------------------------------------------| +| Attributes: | | +| * IdleModeInterval | 0x0000 | +| * ActiveModeInterval | 0x0001 | +| * ActiveModeThreshold | 0x0002 | +| * ExpectedClients | 0x0003 | +| * GeneratedCommandList | 0xFFF8 | +| * AcceptedCommandList | 0xFFF9 | +| * AttributeList | 0xFFFB | +| * FeatureMap | 0xFFFC | +| * ClusterRevision | 0xFFFD | +|------------------------------------------------------------------------------| +| Events: | | +\*----------------------------------------------------------------------------*/ + +/* + * Command RegisterClientMonitoring + */ +class ClientMonitoringRegisterClientMonitoring : public ClusterCommand +{ +public: + ClientMonitoringRegisterClientMonitoring(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("register-client-monitoring", credsIssuerConfig) + { + AddArgument("ClientNodeId", 0, UINT64_MAX, &mRequest.clientNodeId); + AddArgument("ICid", 0, UINT64_MAX, &mRequest.ICid); + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00001046) command (0x00000000) on endpoint %u", endpointIds.at(0)); + + return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00001046, 0x00000000, mRequest); + } + + CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00001046) command (0x00000000) on Group %u", groupId); + + return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00001046, 0x00000000, mRequest); + } + +private: + chip::app::Clusters::ClientMonitoring::Commands::RegisterClientMonitoring::Type mRequest; +}; + +/* + * Command StayAwakeRequest + */ +class ClientMonitoringStayAwakeRequest : public ClusterCommand +{ +public: + ClientMonitoringStayAwakeRequest(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("stay-awake-request", credsIssuerConfig) + { + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00001046) command (0x00000001) on endpoint %u", endpointIds.at(0)); + + return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00001046, 0x00000001, mRequest); + } + + CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00001046) command (0x00000001) on Group %u", groupId); + + return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00001046, 0x00000001, mRequest); + } + +private: + chip::app::Clusters::ClientMonitoring::Commands::StayAwakeRequest::Type mRequest; +}; + /*----------------------------------------------------------------------------*\ | Cluster UnitTesting | 0xFFF1FC05| |------------------------------------------------------------------------------| @@ -12909,6 +12993,52 @@ void registerClusterElectricalMeasurement(Commands & commands, CredentialIssuerC commands.Register(clusterName, clusterCommands); } +void registerClusterClientMonitoring(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) +{ + using namespace chip::app::Clusters::ClientMonitoring; + + const char * clusterName = "ClientMonitoring"; + + commands_list clusterCommands = { + // + // Commands + // + make_unique(Id, credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + // + // Attributes + // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "idle-mode-interval", Attributes::IdleModeInterval::Id, credsIssuerConfig), // + make_unique(Id, "active-mode-interval", Attributes::ActiveModeInterval::Id, credsIssuerConfig), // + make_unique(Id, "active-mode-threshold", Attributes::ActiveModeThreshold::Id, credsIssuerConfig), // + make_unique(Id, "expected-clients", Attributes::ExpectedClients::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + 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, credsIssuerConfig), // + make_unique(Id, "idle-mode-interval", Attributes::IdleModeInterval::Id, credsIssuerConfig), // + make_unique(Id, "active-mode-interval", Attributes::ActiveModeInterval::Id, credsIssuerConfig), // + make_unique(Id, "active-mode-threshold", Attributes::ActiveModeThreshold::Id, credsIssuerConfig), // + make_unique(Id, "expected-clients", Attributes::ExpectedClients::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + // + // Events + // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + }; + + commands.Register(clusterName, clusterCommands); +} void registerClusterUnitTesting(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { using namespace chip::app::Clusters::UnitTesting; @@ -13427,6 +13557,7 @@ void registerClusters(Commands & commands, CredentialIssuerCommands * credsIssue registerClusterApplicationBasic(commands, credsIssuerConfig); registerClusterAccountLogin(commands, credsIssuerConfig); registerClusterElectricalMeasurement(commands, credsIssuerConfig); + registerClusterClientMonitoring(commands, credsIssuerConfig); registerClusterUnitTesting(commands, credsIssuerConfig); registerClusterFaultInjection(commands, credsIssuerConfig); registerClusterSubscriptions(commands, credsIssuerConfig); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 5fec5e0a074e79..ac4bcac9fc2dd7 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -997,6 +997,38 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::ModeSelect::Structs::M ComplexArgumentParser::Finalize(request.mode); ComplexArgumentParser::Finalize(request.semanticTags); } +CHIP_ERROR ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::ClientMonitoring::Structs::MonitoringRegistration::Type & request, + Json::Value & value) +{ + VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); + + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("MonitoringRegistration.clientNodeId", "clientNodeId", + value.isMember("clientNodeId"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("MonitoringRegistration.ICid", "ICid", value.isMember("ICid"))); + + char labelWithMember[kMaxLabelLength]; + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "clientNodeId"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.clientNodeId, value["clientNodeId"])); + + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "ICid"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.ICid, value["ICid"])); + + if (value.isMember("fabricIndex")) + { + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "fabricIndex"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.fabricIndex, value["fabricIndex"])); + } + + return CHIP_NO_ERROR; +} + +void ComplexArgumentParser::Finalize(chip::app::Clusters::ClientMonitoring::Structs::MonitoringRegistration::Type & request) +{ + ComplexArgumentParser::Finalize(request.clientNodeId); + ComplexArgumentParser::Finalize(request.ICid); + ComplexArgumentParser::Finalize(request.fabricIndex); +} CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::Type & request, Json::Value & value) diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index 7a69b9477b2d65..dacf0f20365f4d 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -142,6 +142,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ModeSelect::Str Json::Value & value); static void Finalize(chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::Type & request); +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ClientMonitoring::Structs::MonitoringRegistration::Type & request, + Json::Value & value); + +static void Finalize(chip::app::Clusters::ClientMonitoring::Structs::MonitoringRegistration::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::Type & request, Json::Value & value); 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 c9f8748cdbe4da..418d7dfd1b565a 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -1021,6 +1021,39 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } +CHIP_ERROR +DataModelLogger::LogValue(const char * label, size_t indent, + const chip::app::Clusters::ClientMonitoring::Structs::MonitoringRegistration::DecodableType & value) +{ + DataModelLogger::LogString(label, indent, "{"); + { + CHIP_ERROR err = LogValue("ClientNodeId", indent + 1, value.clientNodeId); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ClientNodeId'"); + return err; + } + } + { + CHIP_ERROR err = LogValue("ICid", indent + 1, value.ICid); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ICid'"); + return err; + } + } + { + CHIP_ERROR err = LogValue("FabricIndex", indent + 1, value.fabricIndex); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'FabricIndex'"); + return err; + } + } + DataModelLogger::LogString(indent, "}"); + + return CHIP_NO_ERROR; +} CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType & value) { diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h index c9b823373808fc..a0b5f9a78388a2 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -81,6 +81,8 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::Channel::Structs::LineupInfo::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType & value); +static CHIP_ERROR LogValue(const char * label, size_t indent, + const chip::app::Clusters::ClientMonitoring::Structs::MonitoringRegistration::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, 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 6af52880cbfe6a..ff16d0a26e1d58 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -104,6 +104,7 @@ | ApplicationBasic | 0x050D | | AccountLogin | 0x050E | | ElectricalMeasurement | 0x0B04 | +| ClientMonitoring | 0x1046 | | UnitTesting | 0xFFF1FC05| | FaultInjection | 0xFFF1FC06| \*----------------------------------------------------------------------------*/ From a307034c9e6a77cf6eb3fe0cd9dae2cf51415805 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 2 Dec 2022 11:39:39 -0500 Subject: [PATCH 2/8] Fix up cert bins docker script. (#23874) * Run cert bins compilation as a single run to preserve build environment * Need to also checkout submodules for builds to work * Update to the SHA inside #23869 * Re-create the npm CI logic since the repo SHA is pinned in certbins * make checkout and bootstrap separate layers, so they can be re-run separately. Checkout and bootstrap is slow. * update shell to bash to allow for source usage * Correct naming: in the image version I have, name of the app is without minimal * Remove minimal all clusters app build because build-examples script is buggy in the given version * Replace tabs with spaces * Install zap to make sure builds work --- .../docker/images/chip-cert-bins/Dockerfile | 187 ++++++++++-------- 1 file changed, 101 insertions(+), 86 deletions(-) diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile index 14fce86b771cd8..0bd2932123a90c 100644 --- a/integrations/docker/images/chip-cert-bins/Dockerfile +++ b/integrations/docker/images/chip-cert-bins/Dockerfile @@ -2,26 +2,26 @@ FROM ubuntu:22.04 as chip-build-cert ARG TARGETPLATFORM # COMMITHASH defines the target commit to build from. May be passed in using --build-arg. -ARG COMMITHASH=e556daac2e1ed3a141034a6dcc7e410e4cd1f8f6 +ARG COMMITHASH=21245f42393e63dbb16fb4d99d8bf96aef7ae0fc # Ensure TARGETPLATFORM is set RUN case ${TARGETPLATFORM} in \ "linux/amd64") \ echo "Building for linux/amd64" \ - ;; \ + ;; \ "linux/arm64") \ echo "Building for linux/arm64" \ - ;; \ + ;; \ *) \ - if [ -z "$TARGETPLATFORM" ] ;\ - then \ - echo "TARGETPLATFORM not defined! Please run from buildkit (buildx)." \ - && return 1 ;\ - else \ - echo "Unsupported platform ${TARGETPLATFORM}." \ - && return 1 ;\ - fi \ - ;; \ + if [ -z "$TARGETPLATFORM" ] ;\ + then \ + echo "TARGETPLATFORM not defined! Please run from buildkit (buildx)." \ + && return 1 ;\ + else \ + echo "Unsupported platform ${TARGETPLATFORM}." \ + && return 1 ;\ + fi \ + ;; \ esac # Below should be the same as chip-build except arm64 logic for cmake and node. @@ -108,9 +108,9 @@ RUN case ${TARGETPLATFORM} in \ && exec bash \ ;; \ *) \ - test -n "$TARGETPLATFORM" \ - echo "Unsupported platform ${TARGETPLATFORM}" \ - ;; \ + test -n "$TARGETPLATFORM" \ + echo "Unsupported platform ${TARGETPLATFORM}" \ + ;; \ esac # Python 3 and PIP @@ -156,28 +156,28 @@ RUN set -x \ RUN case ${TARGETPLATFORM} in \ "linux/amd64") \ set -x \ - && mkdir node_js \ - && cd node_js \ - && wget https://nodejs.org/dist/v12.19.0/node-v12.19.0-linux-x64.tar.xz \ - && tar xfvJ node-v12.19.0-linux-x64.tar.xz \ - && mv node-v12.19.0-linux-x64 /opt/ \ - && ln -s /opt/node-v12.19.0-linux-x64 /opt/node \ - && ln -s /opt/node/bin/* /usr/bin \ - && cd .. \ - && rm -rf node_js \ - ;; \ + && mkdir node_js \ + && cd node_js \ + && wget https://nodejs.org/dist/v12.19.0/node-v12.19.0-linux-x64.tar.xz \ + && tar xfvJ node-v12.19.0-linux-x64.tar.xz \ + && mv node-v12.19.0-linux-x64 /opt/ \ + && ln -s /opt/node-v12.19.0-linux-x64 /opt/node \ + && ln -s /opt/node/bin/* /usr/bin \ + && cd .. \ + && rm -rf node_js \ + ;; \ "linux/arm64")\ set -x \ - && mkdir node_js \ - && cd node_js \ - && wget https://nodejs.org/dist/v12.19.0/node-v12.19.0-linux-arm64.tar.xz \ - && tar xfvJ node-v12.19.0-linux-arm64.tar.xz \ - && mv node-v12.19.0-linux-arm64 /opt/ \ - && ln -s /opt/node-v12.19.0-linux-arm64 /opt/node \ - && ln -s /opt/node/bin/* /usr/bin \ - && cd .. \ - && rm -rf node_js \ - ;; \ + && mkdir node_js \ + && cd node_js \ + && wget https://nodejs.org/dist/v12.19.0/node-v12.19.0-linux-arm64.tar.xz \ + && tar xfvJ node-v12.19.0-linux-arm64.tar.xz \ + && mv node-v12.19.0-linux-arm64 /opt/ \ + && ln -s /opt/node-v12.19.0-linux-arm64 /opt/node \ + && ln -s /opt/node/bin/* /usr/bin \ + && cd .. \ + && rm -rf node_js \ + ;; \ *) ;; \ esac @@ -186,71 +186,87 @@ RUN mkdir /root/connectedhomeip RUN git clone https://github.com/project-chip/connectedhomeip.git /root/connectedhomeip WORKDIR /root/connectedhomeip/ RUN git checkout ${COMMITHASH} +RUN ./scripts/checkout_submodules.py --shallow --platform linux RUN scripts/build/gn_bootstrap.sh -RUN gn gen out/debug --args='chip_mdns="platform" chip_inet_config_enable_ipv4=false' -RUN ninja -C out/debug +SHELL ["/bin/bash", "-c"] +RUN set -x && \ + source scripts/activate.sh \ + && gn gen out/debug --args='chip_mdns="platform" chip_inet_config_enable_ipv4=false' \ + && ninja -C out/debug # Stage 2: Build. from chip-build-cert as chip-build-cert-bins SHELL ["/bin/bash", "-c"] # Records Matter SDK commit hash to include in the image. RUN git rev-parse HEAD > /root/.sdk-sha-version + +# TODO: below the build of linux-arm64-all-clusters-minimal-ipv6only/linux-x64-all-clusters-minimal-ipv6only +# is NOT performed because the given SHA does not build minimal and +# builds the regular all-clusters app instead. RUN case ${TARGETPLATFORM} in \ "linux/amd64") \ set -x \ - && source scripts/activate.sh \ - && scripts/build/build_examples.py \ - --target linux-x64-all-clusters-ipv6only \ - --target linux-x64-all-clusters-minimal-ipv6only \ - --target linux-x64-bridge-ipv6only \ - --target linux-x64-tv-app-ipv6only \ - --target linux-x64-tv-casting-app-ipv6only \ - --target linux-x64-light-ipv6only \ - --target linux-x64-thermostat-ipv6only \ - --target linux-x64-ota-provider-ipv6only \ - --target linux-x64-ota-requestor-ipv6only \ - --target linux-x64-lock-ipv6only \ - build \ - && mv out/linux-x64-all-clusters-ipv6only/chip-all-clusters-app out/chip-all-clusters-app \ - && mv out/linux-x64-all-clusters-minimal-ipv6only/chip-all-clusters-minimal-app out/chip-all-clusters-minimal-app \ - && mv out/linux-x64-bridge-ipv6only/chip-bridge-app out/chip-bridge-app \ - && mv out/linux-x64-tv-app-ipv6only/chip-tv-app out/chip-tv-app \ - && mv out/linux-x64-tv-casting-app-ipv6only/chip-tv-casting-app out/chip-tv-casting-app \ - && mv out/linux-x64-light-ipv6only/chip-lighting-app out/chip-lighting-app \ - && mv out/linux-x64-thermostat-ipv6only/thermostat-app out/thermostat-app \ - && mv out/linux-x64-ota-provider-ipv6only/chip-ota-provider-app out/chip-ota-provider-app \ - && mv out/linux-x64-ota-requestor-ipv6only/chip-ota-requestor-app out/chip-ota-requestor-app \ - && mv out/linux-x64-lock-ipv6only/chip-lock-app out/chip-lock-app \ - ;; \ + && source scripts/activate.sh \ + && scripts/build/build_examples.py \ + --target linux-x64-all-clusters-ipv6only \ + --target linux-x64-bridge-ipv6only \ + --target linux-x64-tv-app-ipv6only \ + --target linux-x64-tv-casting-app-ipv6only \ + --target linux-x64-light-ipv6only \ + --target linux-x64-thermostat-ipv6only \ + --target linux-x64-ota-provider-ipv6only \ + --target linux-x64-ota-requestor-ipv6only \ + --target linux-x64-lock-ipv6only \ + build \ + && mv out/linux-x64-all-clusters-ipv6only/chip-all-clusters-app out/chip-all-clusters-app \ + && mv out/linux-x64-bridge-ipv6only/chip-bridge-app out/chip-bridge-app \ + && mv out/linux-x64-tv-app-ipv6only/chip-tv-app out/chip-tv-app \ + && mv out/linux-x64-tv-casting-app-ipv6only/chip-tv-casting-app out/chip-tv-casting-app \ + && mv out/linux-x64-light-ipv6only/chip-lighting-app out/chip-lighting-app \ + && mv out/linux-x64-thermostat-ipv6only/thermostat-app out/thermostat-app \ + && mv out/linux-x64-ota-provider-ipv6only/chip-ota-provider-app out/chip-ota-provider-app \ + && mv out/linux-x64-ota-requestor-ipv6only/chip-ota-requestor-app out/chip-ota-requestor-app \ + && mv out/linux-x64-lock-ipv6only/chip-lock-app out/chip-lock-app \ + ;; \ "linux/arm64")\ set -x \ - && source scripts/activate.sh \ - && scripts/build/build_examples.py \ - --target linux-arm64-all-clusters-ipv6only \ - --target linux-arm64-all-clusters-minimal-ipv6only \ - --target linux-arm64-bridge-ipv6only \ - --target linux-arm64-tv-app-ipv6only \ - --target linux-arm64-tv-casting-app-ipv6only \ - --target linux-arm64-light-ipv6only \ - --target linux-arm64-thermostat-ipv6only \ - --target linux-arm64-ota-provider-ipv6only \ - --target linux-arm64-ota-requestor-ipv6only \ - --target linux-arm64-lock-ipv6only \ - build \ - && mv out/linux-arm64-all-clusters-ipv6only/chip-all-clusters-app out/chip-all-clusters-app \ - && mv out/linux-arm64-all-clusters-minimal-ipv6only/chip-all-clusters-minimal-app out/chip-all-clusters-minimal-app \ - && mv out/linux-arm64-bridge-ipv6only/chip-bridge-app out/chip-bridge-app \ - && mv out/linux-arm64-tv-app-ipv6only/chip-tv-app out/chip-tv-app \ - && mv out/linux-arm64-tv-casting-app-ipv6only/chip-tv-casting-app out/chip-tv-casting-app \ - && mv out/linux-arm64-light-ipv6only/chip-lighting-app out/chip-lighting-app \ - && mv out/linux-arm64-thermostat-ipv6only/thermostat-app out/thermostat-app \ - && mv out/linux-arm64-ota-provider-ipv6only/chip-ota-provider-app out/chip-ota-provider-app \ - && mv out/linux-arm64-ota-requestor-ipv6only/chip-ota-requestor-app out/chip-ota-requestor-app \ - && mv out/linux-arm64-lock-ipv6only/chip-lock-app out/chip-lock-app \ - ;; \ + && source scripts/activate.sh \ + && scripts/build/build_examples.py \ + --target linux-arm64-all-clusters-ipv6only \ + --target linux-arm64-bridge-ipv6only \ + --target linux-arm64-tv-app-ipv6only \ + --target linux-arm64-tv-casting-app-ipv6only \ + --target linux-arm64-light-ipv6only \ + --target linux-arm64-thermostat-ipv6only \ + --target linux-arm64-ota-provider-ipv6only \ + --target linux-arm64-ota-requestor-ipv6only \ + --target linux-arm64-lock-ipv6only \ + build \ + && mv out/linux-arm64-all-clusters-ipv6only/chip-all-clusters-app out/chip-all-clusters-app \ + && mv out/linux-arm64-bridge-ipv6only/chip-bridge-app out/chip-bridge-app \ + && mv out/linux-arm64-tv-app-ipv6only/chip-tv-app out/chip-tv-app \ + && mv out/linux-arm64-tv-casting-app-ipv6only/chip-tv-casting-app out/chip-tv-casting-app \ + && mv out/linux-arm64-light-ipv6only/chip-lighting-app out/chip-lighting-app \ + && mv out/linux-arm64-thermostat-ipv6only/thermostat-app out/thermostat-app \ + && mv out/linux-arm64-ota-provider-ipv6only/chip-ota-provider-app out/chip-ota-provider-app \ + && mv out/linux-arm64-ota-requestor-ipv6only/chip-ota-requestor-app out/chip-ota-requestor-app \ + && mv out/linux-arm64-lock-ipv6only/chip-lock-app out/chip-lock-app \ + ;; \ *) ;; \ esac +# Install a known ZAP release +# Only keep the cli version, since `zap` is 143MB and not usable (UI) +ENV ZAP_VERSION=v2022.11.29-nightly +RUN set -x \ + && mkdir -p /opt/zap-${ZAP_VERSION} \ + && cd /opt/zap-${ZAP_VERSION} \ + && wget https://github.com/project-chip/zap/releases/download/${ZAP_VERSION}/zap-linux.zip \ + && unzip zap-linux.zip \ + && rm zap-linux.zip \ + && rm zap \ + && ln -s /opt/zap-${ZAP_VERSION}/zap-cli /usr/bin/ \ + && : # last line RUN scripts/examples/gn_build_test_example.sh app1 RUN source scripts/activate.sh && scripts/build_python.sh -m platform -d true -i no @@ -267,7 +283,6 @@ COPY --from=chip-build-cert-bins /root/connectedhomeip/out/debug/chip-tool chip- COPY --from=chip-build-cert-bins /root/connectedhomeip/out/debug/chip-shell chip-shell COPY --from=chip-build-cert-bins /root/connectedhomeip/out/debug/chip-cert chip-cert COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-all-clusters-app chip-all-clusters-app -COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-all-clusters-minimal-app chip-all-clusters-minimal-app COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-lighting-app chip-lighting-app COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-tv-casting-app chip-tv-casting-app COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-tv-app chip-tv-app From 5dfbd633a673b1a661ba142af7288a4b1e683d0c Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 2 Dec 2022 12:36:02 -0500 Subject: [PATCH 3/8] Remove redundant init and copyWithZone declarations in Matter framework. (#23866) Fixes https://github.com/project-chip/connectedhomeip/issues/23482 --- .../templates/MTRCommandPayloadsObjc.zapt | 3 - .../CHIP/templates/MTRStructsObjc.zapt | 6 - .../zap-generated/MTRCommandPayloadsObjc.h | 737 +----------------- .../CHIP/zap-generated/MTRStructsObjc.h | 351 --------- 4 files changed, 1 insertion(+), 1096 deletions(-) diff --git a/src/darwin/Framework/CHIP/templates/MTRCommandPayloadsObjc.zapt b/src/darwin/Framework/CHIP/templates/MTRCommandPayloadsObjc.zapt index e7190cc935f3e6..16f8bf03697008 100644 --- a/src/darwin/Framework/CHIP/templates/MTRCommandPayloadsObjc.zapt +++ b/src/darwin/Framework/CHIP/templates/MTRCommandPayloadsObjc.zapt @@ -36,9 +36,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs {{#if (isStrEqual source "server")}}MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"){{/if}}; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end {{#*inline "deprecatedDecl"}} diff --git a/src/darwin/Framework/CHIP/templates/MTRStructsObjc.zapt b/src/darwin/Framework/CHIP/templates/MTRStructsObjc.zapt index 2a347486576795..7f26306abe1ffd 100644 --- a/src/darwin/Framework/CHIP/templates/MTRStructsObjc.zapt +++ b/src/darwin/Framework/CHIP/templates/MTRStructsObjc.zapt @@ -12,9 +12,6 @@ NS_ASSUME_NONNULL_BEGIN {{#zcl_struct_items}} @property (nonatomic, copy{{#unless (isStrEqual (asGetterName label) (asStructPropertyName label))}}, getter={{asGetterName label}}{{/unless}}) {{asObjectiveCType type parent.parent.name}} {{asStructPropertyName label}}; {{/zcl_struct_items}} - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; {{/inline}} {{! TODO: We need a better setup for the API_AVALABLE annotations here; this does not scale at all sanely. }} {{#if (isStrEqual (asUpperCamelCase parent.name) "Descriptor")}} @@ -54,9 +51,6 @@ MTR_NEWLY_AVAILABLE {{#zcl_event_fields}} @property (nonatomic, copy{{#unless (isStrEqual (asGetterName name) (asStructPropertyName name))}}, getter={{asGetterName name}}{{/unless}}) {{asObjectiveCType type parent.parent.name}} {{asStructPropertyName name}}; {{/zcl_event_fields}} - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end {{#unless (isStrEqual (asUpperCamelCase parent.name preserveAcronyms=true) (compatClusterNameRemapping parent.name))}} diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index e13a48473d1196..4c17683a2dc516 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -38,9 +38,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRIdentifyClusterTriggerEffectParams : NSObject @@ -62,9 +59,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupsClusterAddGroupParams : NSObject @@ -86,9 +80,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupsClusterAddGroupResponseParams : NSObject @@ -111,9 +102,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupsClusterViewGroupParams : NSObject @@ -133,9 +121,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupsClusterViewGroupResponseParams : NSObject @@ -160,9 +145,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupsClusterGetGroupMembershipParams : NSObject @@ -182,9 +164,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupsClusterGetGroupMembershipResponseParams : NSObject @@ -207,9 +186,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupsClusterRemoveGroupParams : NSObject @@ -229,9 +205,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupsClusterRemoveGroupResponseParams : NSObject @@ -254,9 +227,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupsClusterRemoveAllGroupsParams : NSObject /** @@ -274,9 +244,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupsClusterAddGroupIfIdentifyingParams : NSObject @@ -298,9 +265,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterAddSceneParams : NSObject @@ -328,9 +292,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterAddSceneResponseParams : NSObject @@ -355,9 +316,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterViewSceneParams : NSObject @@ -379,9 +337,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterViewSceneResponseParams : NSObject @@ -412,9 +367,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterRemoveSceneParams : NSObject @@ -436,9 +388,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterRemoveSceneResponseParams : NSObject @@ -463,9 +412,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterRemoveAllScenesParams : NSObject @@ -485,9 +431,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterRemoveAllScenesResponseParams : NSObject @@ -510,9 +453,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterStoreSceneParams : NSObject @@ -534,9 +474,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterStoreSceneResponseParams : NSObject @@ -561,9 +498,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterRecallSceneParams : NSObject @@ -587,9 +521,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterGetSceneMembershipParams : NSObject @@ -609,9 +540,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterGetSceneMembershipResponseParams : NSObject @@ -638,9 +566,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterEnhancedAddSceneParams : NSObject @@ -668,9 +593,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterEnhancedAddSceneResponseParams : NSObject @@ -695,9 +617,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterEnhancedViewSceneParams : NSObject @@ -719,9 +638,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterEnhancedViewSceneResponseParams : NSObject @@ -752,9 +668,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterCopySceneParams : NSObject @@ -782,9 +695,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterCopySceneResponseParams : NSObject @@ -809,9 +719,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROnOffClusterOffParams : NSObject /** @@ -829,9 +736,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROnOffClusterOnParams : NSObject /** @@ -849,9 +753,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROnOffClusterToggleParams : NSObject /** @@ -869,9 +770,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROnOffClusterOffWithEffectParams : NSObject @@ -893,9 +791,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROnOffClusterOnWithRecallGlobalSceneParams : NSObject /** @@ -913,9 +808,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROnOffClusterOnWithTimedOffParams : NSObject @@ -939,9 +831,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRLevelControlClusterMoveToLevelParams : NSObject @@ -967,9 +856,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRLevelControlClusterMoveParams : NSObject @@ -995,9 +881,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRLevelControlClusterStepParams : NSObject @@ -1025,9 +908,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRLevelControlClusterStopParams : NSObject @@ -1049,9 +929,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRLevelControlClusterMoveToLevelWithOnOffParams : NSObject @@ -1077,9 +954,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRLevelControlClusterMoveWithOnOffParams : NSObject @@ -1105,9 +979,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRLevelControlClusterStepWithOnOffParams : NSObject @@ -1135,9 +1006,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRLevelControlClusterStopWithOnOffParams : NSObject @@ -1159,9 +1027,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRLevelControlClusterMoveToClosestFrequencyParams : NSObject @@ -1181,9 +1046,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterInstantActionParams : NSObject @@ -1205,9 +1067,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterInstantActionWithTransitionParams : NSObject @@ -1231,9 +1090,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterStartActionParams : NSObject @@ -1255,9 +1111,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterStartActionWithDurationParams : NSObject @@ -1281,9 +1134,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterStopActionParams : NSObject @@ -1305,9 +1155,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterPauseActionParams : NSObject @@ -1329,9 +1176,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterPauseActionWithDurationParams : NSObject @@ -1355,9 +1199,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterResumeActionParams : NSObject @@ -1379,9 +1220,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterEnableActionParams : NSObject @@ -1403,9 +1241,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterEnableActionWithDurationParams : NSObject @@ -1429,9 +1264,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterDisableActionParams : NSObject @@ -1453,9 +1285,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterDisableActionWithDurationParams : NSObject @@ -1479,9 +1308,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRBasicClusterMfgSpecificPingParams : NSObject /** @@ -1499,9 +1325,6 @@ NS_ASSUME_NONNULL_BEGIN * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_AVAILABLE @interface MTROTASoftwareUpdateProviderClusterQueryImageParams : NSObject @@ -1536,9 +1359,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderClusterQueryImageParams") @@ -1579,9 +1399,6 @@ MTR_NEWLY_AVAILABLE */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderClusterQueryImageResponseParams") @@ -1609,9 +1426,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderClusterApplyUpdateRequestParams") @@ -1640,9 +1454,6 @@ MTR_NEWLY_AVAILABLE */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams") @@ -1671,9 +1482,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateProviderClusterNotifyUpdateAppliedParams") @@ -1708,9 +1516,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOtaProviderParams") @@ -1738,9 +1543,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGeneralCommissioningClusterArmFailSafeResponseParams : NSObject @@ -1763,9 +1565,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGeneralCommissioningClusterSetRegulatoryConfigParams : NSObject @@ -1789,9 +1588,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams : NSObject @@ -1814,9 +1610,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGeneralCommissioningClusterCommissioningCompleteParams : NSObject /** @@ -1834,9 +1627,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGeneralCommissioningClusterCommissioningCompleteResponseParams : NSObject @@ -1859,9 +1649,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRNetworkCommissioningClusterScanNetworksParams : NSObject @@ -1883,9 +1670,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRNetworkCommissioningClusterScanNetworksResponseParams : NSObject @@ -1912,9 +1696,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRNetworkCommissioningClusterAddOrUpdateWiFiNetworkParams : NSObject @@ -1938,9 +1719,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRNetworkCommissioningClusterAddOrUpdateThreadNetworkParams : NSObject @@ -1962,9 +1740,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRNetworkCommissioningClusterRemoveNetworkParams : NSObject @@ -1986,9 +1761,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRNetworkCommissioningClusterNetworkConfigResponseParams : NSObject @@ -2013,9 +1785,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRNetworkCommissioningClusterConnectNetworkParams : NSObject @@ -2037,9 +1806,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRNetworkCommissioningClusterConnectNetworkResponseParams : NSObject @@ -2064,9 +1830,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRNetworkCommissioningClusterReorderNetworkParams : NSObject @@ -2090,9 +1853,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDiagnosticLogsClusterRetrieveLogsRequestParams : NSObject @@ -2116,9 +1876,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDiagnosticLogsClusterRetrieveLogsResponseParams : NSObject @@ -2145,9 +1902,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGeneralDiagnosticsClusterTestEventTriggerParams : NSObject @@ -2169,9 +1923,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRSoftwareDiagnosticsClusterResetWatermarksParams : NSObject /** @@ -2189,9 +1940,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRThreadNetworkDiagnosticsClusterResetCountsParams : NSObject /** @@ -2209,9 +1957,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRWiFiNetworkDiagnosticsClusterResetCountsParams : NSObject /** @@ -2229,9 +1974,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTREthernetNetworkDiagnosticsClusterResetCountsParams : NSObject /** @@ -2249,9 +1991,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRTimeSynchronizationClusterSetUtcTimeParams : NSObject @@ -2275,9 +2014,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRAdministratorCommissioningClusterOpenCommissioningWindowParams : NSObject @@ -2305,9 +2041,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRAdministratorCommissioningClusterOpenBasicCommissioningWindowParams : NSObject @@ -2327,9 +2060,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRAdministratorCommissioningClusterRevokeCommissioningParams : NSObject /** @@ -2347,9 +2077,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROperationalCredentialsClusterAttestationRequestParams : NSObject @@ -2369,9 +2096,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROperationalCredentialsClusterAttestationResponseParams : NSObject @@ -2394,9 +2118,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROperationalCredentialsClusterCertificateChainRequestParams : NSObject @@ -2416,9 +2137,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROperationalCredentialsClusterCertificateChainResponseParams : NSObject @@ -2439,9 +2157,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROperationalCredentialsClusterCSRRequestParams : NSObject @@ -2463,9 +2178,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROperationalCredentialsClusterCSRResponseParams : NSObject @@ -2488,9 +2200,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROperationalCredentialsClusterAddNOCParams : NSObject @@ -2518,9 +2227,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROperationalCredentialsClusterUpdateNOCParams : NSObject @@ -2542,9 +2248,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROperationalCredentialsClusterNOCResponseParams : NSObject @@ -2569,9 +2272,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROperationalCredentialsClusterUpdateFabricLabelParams : NSObject @@ -2591,9 +2291,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROperationalCredentialsClusterRemoveFabricParams : NSObject @@ -2613,9 +2310,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROperationalCredentialsClusterAddTrustedRootCertificateParams : NSObject @@ -2635,9 +2329,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupKeyManagementClusterKeySetWriteParams : NSObject @@ -2657,9 +2348,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupKeyManagementClusterKeySetReadParams : NSObject @@ -2679,9 +2367,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupKeyManagementClusterKeySetReadResponseParams : NSObject @@ -2702,9 +2387,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupKeyManagementClusterKeySetRemoveParams : NSObject @@ -2724,9 +2406,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupKeyManagementClusterKeySetReadAllIndicesParams : NSObject @@ -2746,9 +2425,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams : NSObject @@ -2769,9 +2445,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRModeSelectClusterChangeToModeParams : NSObject @@ -2791,9 +2464,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterLockDoorParams : NSObject @@ -2813,9 +2483,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterUnlockDoorParams : NSObject @@ -2835,9 +2502,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterUnlockWithTimeoutParams : NSObject @@ -2859,9 +2523,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterSetWeekDayScheduleParams : NSObject @@ -2893,9 +2554,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterGetWeekDayScheduleParams : NSObject @@ -2917,9 +2575,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterGetWeekDayScheduleResponseParams : NSObject @@ -2954,9 +2609,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterClearWeekDayScheduleParams : NSObject @@ -2978,9 +2630,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterSetYearDayScheduleParams : NSObject @@ -3006,9 +2655,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterGetYearDayScheduleParams : NSObject @@ -3030,9 +2676,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterGetYearDayScheduleResponseParams : NSObject @@ -3061,9 +2704,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterClearYearDayScheduleParams : NSObject @@ -3085,9 +2725,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterSetHolidayScheduleParams : NSObject @@ -3113,9 +2750,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterGetHolidayScheduleParams : NSObject @@ -3135,9 +2769,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterGetHolidayScheduleResponseParams : NSObject @@ -3166,9 +2797,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterClearHolidayScheduleParams : NSObject @@ -3188,9 +2816,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterSetUserParams : NSObject @@ -3222,9 +2847,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterGetUserParams : NSObject @@ -3244,9 +2866,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterGetUserResponseParams : NSObject @@ -3285,9 +2904,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterClearUserParams : NSObject @@ -3307,9 +2923,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterSetCredentialParams : NSObject @@ -3339,9 +2952,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterSetCredentialResponseParams : NSObject @@ -3366,9 +2976,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterGetCredentialStatusParams : NSObject @@ -3388,9 +2995,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterGetCredentialStatusResponseParams : NSObject @@ -3419,9 +3023,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterClearCredentialParams : NSObject @@ -3441,9 +3042,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRWindowCoveringClusterUpOrOpenParams : NSObject /** @@ -3461,9 +3059,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRWindowCoveringClusterDownOrCloseParams : NSObject /** @@ -3481,9 +3076,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRWindowCoveringClusterStopMotionParams : NSObject /** @@ -3501,9 +3093,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRWindowCoveringClusterGoToLiftValueParams : NSObject @@ -3523,9 +3112,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRWindowCoveringClusterGoToLiftPercentageParams : NSObject @@ -3545,9 +3131,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRWindowCoveringClusterGoToTiltValueParams : NSObject @@ -3567,9 +3150,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRWindowCoveringClusterGoToTiltPercentageParams : NSObject @@ -3589,9 +3169,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRBarrierControlClusterBarrierControlGoToPercentParams : NSObject @@ -3611,9 +3188,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRBarrierControlClusterBarrierControlStopParams : NSObject /** @@ -3631,9 +3205,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRThermostatClusterSetpointRaiseLowerParams : NSObject @@ -3655,9 +3226,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRThermostatClusterGetWeeklyScheduleResponseParams : NSObject @@ -3684,9 +3252,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRThermostatClusterSetWeeklyScheduleParams : NSObject @@ -3712,9 +3277,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRThermostatClusterGetWeeklyScheduleParams : NSObject @@ -3736,9 +3298,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRThermostatClusterClearWeeklyScheduleParams : NSObject /** @@ -3756,9 +3315,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterMoveToHueParams : NSObject @@ -3786,9 +3342,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterMoveHueParams : NSObject @@ -3814,9 +3367,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterStepHueParams : NSObject @@ -3844,9 +3394,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterMoveToSaturationParams : NSObject @@ -3872,9 +3419,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterMoveSaturationParams : NSObject @@ -3900,9 +3444,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterStepSaturationParams : NSObject @@ -3930,9 +3471,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterMoveToHueAndSaturationParams : NSObject @@ -3960,9 +3498,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterMoveToColorParams : NSObject @@ -3990,9 +3525,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterMoveColorParams : NSObject @@ -4018,9 +3550,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterStepColorParams : NSObject @@ -4048,9 +3577,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterMoveToColorTemperatureParams : NSObject @@ -4076,9 +3602,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterEnhancedMoveToHueParams : NSObject @@ -4105,10 +3628,7 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * request) within the timeout window. * */ -@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; +@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; @end @interface MTRColorControlClusterEnhancedMoveHueParams : NSObject @@ -4134,9 +3654,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterEnhancedStepHueParams : NSObject @@ -4164,9 +3681,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterEnhancedMoveToHueAndSaturationParams : NSObject @@ -4194,9 +3708,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterColorLoopSetParams : NSObject @@ -4228,9 +3739,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterStopMoveStepParams : NSObject @@ -4252,9 +3760,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterMoveColorTemperatureParams : NSObject @@ -4284,9 +3789,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRColorControlClusterStepColorTemperatureParams : NSObject @@ -4318,9 +3820,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRChannelClusterChangeChannelParams : NSObject @@ -4340,9 +3839,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRChannelClusterChangeChannelResponseParams : NSObject @@ -4365,9 +3861,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRChannelClusterChangeChannelByNumberParams : NSObject @@ -4389,9 +3882,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRChannelClusterSkipChannelParams : NSObject @@ -4411,9 +3901,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRTargetNavigatorClusterNavigateTargetParams : NSObject @@ -4435,9 +3922,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRTargetNavigatorClusterNavigateTargetResponseParams : NSObject @@ -4460,9 +3944,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaPlaybackClusterPlayParams : NSObject /** @@ -4480,9 +3961,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaPlaybackClusterPauseParams : NSObject /** @@ -4500,9 +3978,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaPlaybackClusterStopPlaybackParams : NSObject /** @@ -4520,9 +3995,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaPlaybackClusterStartOverParams : NSObject /** @@ -4540,9 +4012,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaPlaybackClusterPreviousParams : NSObject /** @@ -4560,9 +4029,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaPlaybackClusterNextParams : NSObject /** @@ -4580,9 +4046,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaPlaybackClusterRewindParams : NSObject /** @@ -4600,9 +4063,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaPlaybackClusterFastForwardParams : NSObject /** @@ -4620,9 +4080,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaPlaybackClusterSkipForwardParams : NSObject @@ -4642,9 +4099,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaPlaybackClusterSkipBackwardParams : NSObject @@ -4664,9 +4118,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaPlaybackClusterPlaybackResponseParams : NSObject @@ -4689,9 +4140,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaPlaybackClusterSeekParams : NSObject @@ -4711,9 +4159,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaInputClusterSelectInputParams : NSObject @@ -4733,9 +4178,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaInputClusterShowInputStatusParams : NSObject /** @@ -4753,9 +4195,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaInputClusterHideInputStatusParams : NSObject /** @@ -4773,9 +4212,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaInputClusterRenameInputParams : NSObject @@ -4797,9 +4233,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRLowPowerClusterSleepParams : NSObject /** @@ -4817,9 +4250,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRKeypadInputClusterSendKeyParams : NSObject @@ -4839,9 +4269,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRKeypadInputClusterSendKeyResponseParams : NSObject @@ -4862,9 +4289,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRContentLauncherClusterLaunchContentParams : NSObject @@ -4888,9 +4312,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRContentLauncherClusterLaunchURLParams : NSObject @@ -4914,9 +4335,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRContentLauncherClusterLaunchResponseParams : NSObject @@ -4939,9 +4357,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRAudioOutputClusterSelectOutputParams : NSObject @@ -4961,9 +4376,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRAudioOutputClusterRenameOutputParams : NSObject @@ -4985,9 +4397,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRApplicationLauncherClusterLaunchAppParams : NSObject @@ -5009,9 +4418,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRApplicationLauncherClusterStopAppParams : NSObject @@ -5031,9 +4437,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRApplicationLauncherClusterHideAppParams : NSObject @@ -5053,9 +4456,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRApplicationLauncherClusterLauncherResponseParams : NSObject @@ -5078,9 +4478,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRAccountLoginClusterGetSetupPINParams : NSObject @@ -5100,9 +4497,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRAccountLoginClusterGetSetupPINResponseParams : NSObject @@ -5123,9 +4517,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRAccountLoginClusterLoginParams : NSObject @@ -5147,9 +4538,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRAccountLoginClusterLogoutParams : NSObject /** @@ -5167,9 +4555,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRElectricalMeasurementClusterGetProfileInfoResponseCommandParams : NSObject @@ -5196,9 +4581,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRElectricalMeasurementClusterGetProfileInfoCommandParams : NSObject /** @@ -5216,9 +4598,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRElectricalMeasurementClusterGetMeasurementProfileResponseCommandParams : NSObject @@ -5249,9 +4628,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRElectricalMeasurementClusterGetMeasurementProfileCommandParams : NSObject @@ -5275,9 +4651,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRClientMonitoringClusterRegisterClientMonitoringParams : NSObject @@ -5340,9 +4713,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestParams") @@ -5369,9 +4739,6 @@ MTR_NEWLY_AVAILABLE */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestSpecificResponseParams") @@ -5395,9 +4762,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestNotHandledParams") @@ -5424,9 +4788,6 @@ MTR_NEWLY_AVAILABLE */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestAddArgumentsResponseParams") @@ -5450,9 +4811,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestSpecificParams") @@ -5479,9 +4837,6 @@ MTR_NEWLY_AVAILABLE */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestSimpleArgumentResponseParams") @@ -5505,9 +4860,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestUnknownCommandParams") @@ -5544,9 +4896,6 @@ MTR_NEWLY_AVAILABLE */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestStructArrayArgumentResponseParams") @@ -5574,9 +4923,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestAddArgumentsParams") @@ -5603,9 +4949,6 @@ MTR_NEWLY_AVAILABLE */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestListInt8UReverseResponseParams") @@ -5631,9 +4974,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestSimpleArgumentRequestParams") @@ -5662,9 +5002,6 @@ MTR_NEWLY_AVAILABLE */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestEnumsResponseParams") @@ -5700,9 +5037,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestStructArrayArgumentRequestParams") @@ -5735,9 +5069,6 @@ MTR_NEWLY_AVAILABLE */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestNullableOptionalResponseParams") @@ -5763,9 +5094,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestStructArgumentRequestParams") @@ -5846,9 +5174,6 @@ MTR_NEWLY_AVAILABLE */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestComplexNullableOptionalResponseParams") @@ -5875,9 +5200,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestNestedStructArgumentRequestParams") @@ -5904,9 +5226,6 @@ MTR_NEWLY_AVAILABLE */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterBooleanResponseParams") @@ -5932,9 +5251,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestListStructArgumentRequestParams") @@ -5961,9 +5277,6 @@ MTR_NEWLY_AVAILABLE */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterSimpleStructResponseParams") @@ -5989,9 +5302,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestListInt8UArgumentRequestParams") @@ -6018,9 +5328,6 @@ MTR_NEWLY_AVAILABLE */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestEmitTestEventResponseParams") @@ -6046,9 +5353,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestNestedStructListArgumentRequestParams") @@ -6076,9 +5380,6 @@ MTR_NEWLY_AVAILABLE */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestEmitTestFabricScopedEventResponseParams") @@ -6105,9 +5406,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestListNestedStructListArgumentRequestParams") @@ -6134,9 +5432,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestListInt8UReverseRequestParams") @@ -6164,9 +5459,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestEnumsRequestParams") @@ -6192,9 +5484,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestNullableOptionalRequestParams") @@ -6242,9 +5531,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestComplexNullableOptionalRequestParams") @@ -6271,9 +5557,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterSimpleStructEchoRequestParams") @@ -6297,9 +5580,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTimedInvokeRequestParams") @@ -6325,9 +5605,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestSimpleOptionalArgumentRequestParams") @@ -6358,9 +5635,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestEmitTestEventRequestParams") @@ -6386,9 +5660,6 @@ MTR_NEWLY_AVAILABLE * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestEmitTestFabricScopedEventRequestParams") @@ -6422,9 +5693,6 @@ MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestEmitTestFabricScopedEv * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRFaultInjectionClusterFailRandomlyAtFaultParams : NSObject @@ -6448,9 +5716,6 @@ MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestEmitTestFabricScopedEv * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end NS_ASSUME_NONNULL_END diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index d48d05149e0814..20b04e8d9b2b43 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -22,34 +22,22 @@ NS_ASSUME_NONNULL_BEGIN @interface MTRScenesClusterAttributeValuePair : NSObject @property (nonatomic, copy) NSNumber * _Nullable attributeId; @property (nonatomic, copy) NSArray * _Nonnull attributeValue; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRScenesClusterExtensionFieldSet : NSObject @property (nonatomic, copy) NSNumber * _Nonnull clusterId; @property (nonatomic, copy) NSArray * _Nonnull attributeValueList; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end API_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2)) @interface MTRDescriptorClusterDeviceTypeStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull type; @property (nonatomic, copy) NSNumber * _Nonnull revision; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDescriptorClusterDeviceType : NSObject @property (nonatomic, copy) NSNumber * _Nonnull type; @property (nonatomic, copy) NSNumber * _Nonnull revision; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRBindingClusterTargetStruct : NSObject @@ -58,18 +46,12 @@ API_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2)) @property (nonatomic, copy) NSNumber * _Nullable endpoint; @property (nonatomic, copy) NSNumber * _Nullable cluster; @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRAccessControlClusterTarget : NSObject @property (nonatomic, copy) NSNumber * _Nullable cluster; @property (nonatomic, copy) NSNumber * _Nullable endpoint; @property (nonatomic, copy) NSNumber * _Nullable deviceType; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRAccessControlClusterAccessControlEntry : NSObject @@ -78,17 +60,11 @@ API_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2)) @property (nonatomic, copy) NSArray * _Nullable subjects; @property (nonatomic, copy) NSArray * _Nullable targets; @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRAccessControlClusterExtensionEntry : NSObject @property (nonatomic, copy) NSData * _Nonnull data; @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRAccessControlClusterAccessControlEntryChangedEvent : NSObject @@ -97,9 +73,6 @@ API_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2)) @property (nonatomic, copy) NSNumber * _Nonnull changeType; @property (nonatomic, copy) MTRAccessControlClusterAccessControlEntry * _Nullable latestValue; @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRAccessControlClusterAccessControlExtensionChangedEvent : NSObject @@ -108,9 +81,6 @@ API_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2)) @property (nonatomic, copy) NSNumber * _Nonnull changeType; @property (nonatomic, copy) MTRAccessControlClusterExtensionEntry * _Nullable latestValue; @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterActionStruct : NSObject @@ -120,9 +90,6 @@ API_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2)) @property (nonatomic, copy) NSNumber * _Nonnull endpointListID; @property (nonatomic, copy) NSNumber * _Nonnull supportedCommands; @property (nonatomic, copy) NSNumber * _Nonnull state; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterEndpointListStruct : NSObject @@ -130,18 +97,12 @@ API_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2)) @property (nonatomic, copy) NSString * _Nonnull name; @property (nonatomic, copy) NSNumber * _Nonnull type; @property (nonatomic, copy) NSArray * _Nonnull endpoints; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterStateChangedEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull actionID; @property (nonatomic, copy) NSNumber * _Nonnull invokeID; @property (nonatomic, copy, getter=getNewState) NSNumber * _Nonnull newState; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRActionsClusterActionFailedEvent : NSObject @@ -149,44 +110,26 @@ API_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2)) @property (nonatomic, copy) NSNumber * _Nonnull invokeID; @property (nonatomic, copy, getter=getNewState) NSNumber * _Nonnull newState; @property (nonatomic, copy) NSNumber * _Nonnull error; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRBasicClusterCapabilityMinimaStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull caseSessionsPerFabric; @property (nonatomic, copy) NSNumber * _Nonnull subscriptionsPerFabric; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRBasicClusterStartUpEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull softwareVersion; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRBasicClusterShutDownEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRBasicClusterLeaveEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRBasicClusterReachableChangedEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull reachableNewValue; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_AVAILABLE @@ -194,9 +137,6 @@ MTR_NEWLY_AVAILABLE @property (nonatomic, copy) NSNumber * _Nonnull providerNodeID; @property (nonatomic, copy) NSNumber * _Nonnull endpoint; @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterProviderLocation") @@ -209,9 +149,6 @@ MTR_NEWLY_AVAILABLE @property (nonatomic, copy, getter=getNewState) NSNumber * _Nonnull newState; @property (nonatomic, copy) NSNumber * _Nonnull reason; @property (nonatomic, copy) NSNumber * _Nullable targetSoftwareVersion; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterStateTransitionEvent") @@ -222,9 +159,6 @@ MTR_NEWLY_AVAILABLE @interface MTROTASoftwareUpdateRequestorClusterVersionAppliedEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull softwareVersion; @property (nonatomic, copy) NSNumber * _Nonnull productID; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterVersionAppliedEvent") @@ -237,9 +171,6 @@ MTR_NEWLY_AVAILABLE @property (nonatomic, copy) NSNumber * _Nonnull bytesDownloaded; @property (nonatomic, copy) NSNumber * _Nullable progressPercent; @property (nonatomic, copy) NSNumber * _Nullable platformCode; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErrorEvent") @@ -249,41 +180,26 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @interface MTRPowerSourceClusterBatChargeFaultChangeType : NSObject @property (nonatomic, copy) NSArray * _Nonnull current; @property (nonatomic, copy) NSArray * _Nonnull previous; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPowerSourceClusterBatFaultChangeType : NSObject @property (nonatomic, copy) NSArray * _Nonnull current; @property (nonatomic, copy) NSArray * _Nonnull previous; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPowerSourceClusterWiredFaultChangeType : NSObject @property (nonatomic, copy) NSArray * _Nonnull current; @property (nonatomic, copy) NSArray * _Nonnull previous; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGeneralCommissioningClusterBasicCommissioningInfo : NSObject @property (nonatomic, copy) NSNumber * _Nonnull failSafeExpiryLengthSeconds; @property (nonatomic, copy) NSNumber * _Nonnull maxCumulativeFailsafeSeconds; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRNetworkCommissioningClusterNetworkInfo : NSObject @property (nonatomic, copy) NSData * _Nonnull networkID; @property (nonatomic, copy) NSNumber * _Nonnull connected; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRNetworkCommissioningClusterThreadInterfaceScanResult : NSObject @@ -295,9 +211,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSData * _Nonnull extendedAddress; @property (nonatomic, copy) NSNumber * _Nonnull rssi; @property (nonatomic, copy) NSNumber * _Nonnull lqi; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRNetworkCommissioningClusterWiFiInterfaceScanResult : NSObject @@ -307,9 +220,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSNumber * _Nonnull channel; @property (nonatomic, copy) NSNumber * _Nonnull wiFiBand; @property (nonatomic, copy) NSNumber * _Nonnull rssi; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGeneralDiagnosticsClusterNetworkInterfaceType : NSObject @@ -321,40 +231,25 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSArray * _Nonnull iPv4Addresses; @property (nonatomic, copy) NSArray * _Nonnull iPv6Addresses; @property (nonatomic, copy) NSNumber * _Nonnull type; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGeneralDiagnosticsClusterHardwareFaultChangeEvent : NSObject @property (nonatomic, copy) NSArray * _Nonnull current; @property (nonatomic, copy) NSArray * _Nonnull previous; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGeneralDiagnosticsClusterRadioFaultChangeEvent : NSObject @property (nonatomic, copy) NSArray * _Nonnull current; @property (nonatomic, copy) NSArray * _Nonnull previous; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGeneralDiagnosticsClusterNetworkFaultChangeEvent : NSObject @property (nonatomic, copy) NSArray * _Nonnull current; @property (nonatomic, copy) NSArray * _Nonnull previous; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGeneralDiagnosticsClusterBootReasonEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull bootReason; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRSoftwareDiagnosticsClusterThreadMetrics : NSObject @@ -363,18 +258,12 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSNumber * _Nullable stackFreeCurrent; @property (nonatomic, copy) NSNumber * _Nullable stackFreeMinimum; @property (nonatomic, copy) NSNumber * _Nullable stackSize; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRSoftwareDiagnosticsClusterSoftwareFaultEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull id; @property (nonatomic, copy) NSString * _Nullable name; @property (nonatomic, copy) NSData * _Nullable faultRecording; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRThreadNetworkDiagnosticsClusterNeighborTable : NSObject @@ -392,9 +281,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSNumber * _Nonnull fullThreadDevice; @property (nonatomic, copy) NSNumber * _Nonnull fullNetworkData; @property (nonatomic, copy) NSNumber * _Nonnull isChild; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents : NSObject @@ -410,9 +296,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSNumber * _Nonnull pskcPresent; @property (nonatomic, copy) NSNumber * _Nonnull securityPolicyPresent; @property (nonatomic, copy) NSNumber * _Nonnull channelMaskPresent; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRThreadNetworkDiagnosticsClusterRouteTable : NSObject @@ -426,149 +309,89 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSNumber * _Nonnull age; @property (nonatomic, copy) NSNumber * _Nonnull allocated; @property (nonatomic, copy) NSNumber * _Nonnull linkEstablished; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRThreadNetworkDiagnosticsClusterSecurityPolicy : NSObject @property (nonatomic, copy) NSNumber * _Nonnull rotationTime; @property (nonatomic, copy) NSNumber * _Nonnull flags; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRThreadNetworkDiagnosticsClusterConnectionStatusEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull connectionStatus; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent : NSObject @property (nonatomic, copy) NSArray * _Nonnull current; @property (nonatomic, copy) NSArray * _Nonnull previous; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRWiFiNetworkDiagnosticsClusterDisconnectionEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull reasonCode; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRWiFiNetworkDiagnosticsClusterAssociationFailureEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull associationFailure; @property (nonatomic, copy) NSNumber * _Nonnull status; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRWiFiNetworkDiagnosticsClusterConnectionStatusEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull connectionStatus; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRTimeSynchronizationClusterDstOffsetType : NSObject @property (nonatomic, copy) NSNumber * _Nonnull offset; @property (nonatomic, copy) NSNumber * _Nonnull validStarting; @property (nonatomic, copy) NSNumber * _Nonnull validUntil; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRTimeSynchronizationClusterTimeZoneType : NSObject @property (nonatomic, copy) NSNumber * _Nonnull offset; @property (nonatomic, copy) NSNumber * _Nonnull validAt; @property (nonatomic, copy) NSString * _Nullable name; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRBridgedDeviceBasicClusterStartUpEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull softwareVersion; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRBridgedDeviceBasicClusterShutDownEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRBridgedDeviceBasicClusterLeaveEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRBridgedDeviceBasicClusterReachableChangedEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull reachableNewValue; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRSwitchClusterSwitchLatchedEvent : NSObject @property (nonatomic, copy, getter=getNewPosition) NSNumber * _Nonnull newPosition; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRSwitchClusterInitialPressEvent : NSObject @property (nonatomic, copy, getter=getNewPosition) NSNumber * _Nonnull newPosition; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRSwitchClusterLongPressEvent : NSObject @property (nonatomic, copy, getter=getNewPosition) NSNumber * _Nonnull newPosition; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRSwitchClusterShortReleaseEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull previousPosition; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRSwitchClusterLongReleaseEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull previousPosition; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRSwitchClusterMultiPressOngoingEvent : NSObject @property (nonatomic, copy, getter=getNewPosition) NSNumber * _Nonnull newPosition; @property (nonatomic, copy) NSNumber * _Nonnull currentNumberOfPressesCounted; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRSwitchClusterMultiPressCompleteEvent : NSObject @property (nonatomic, copy, getter=getNewPosition) NSNumber * _Nonnull newPosition; @property (nonatomic, copy) NSNumber * _Nonnull totalNumberOfPressesCounted; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROperationalCredentialsClusterFabricDescriptor : NSObject @@ -578,18 +401,12 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSNumber * _Nonnull nodeId; @property (nonatomic, copy) NSString * _Nonnull label; @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTROperationalCredentialsClusterNOCStruct : NSObject @property (nonatomic, copy) NSData * _Nonnull noc; @property (nonatomic, copy) NSData * _Nullable icac; @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupKeyManagementClusterGroupInfoMapStruct : NSObject @@ -597,18 +414,12 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSArray * _Nonnull endpoints; @property (nonatomic, copy) NSString * _Nullable groupName; @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupKeyManagementClusterGroupKeyMapStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull groupId; @property (nonatomic, copy) NSNumber * _Nonnull groupKeySetID; @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRGroupKeyManagementClusterGroupKeySetStruct : NSObject @@ -620,71 +431,44 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSNumber * _Nullable epochStartTime1; @property (nonatomic, copy) NSData * _Nullable epochKey2; @property (nonatomic, copy) NSNumber * _Nullable epochStartTime2; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRFixedLabelClusterLabelStruct : NSObject @property (nonatomic, copy) NSString * _Nonnull label; @property (nonatomic, copy) NSString * _Nonnull value; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRUserLabelClusterLabelStruct : NSObject @property (nonatomic, copy) NSString * _Nonnull label; @property (nonatomic, copy) NSString * _Nonnull value; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRBooleanStateClusterStateChangeEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull stateValue; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRModeSelectClusterSemanticTag : NSObject @property (nonatomic, copy) NSNumber * _Nonnull mfgCode; @property (nonatomic, copy) NSNumber * _Nonnull value; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRModeSelectClusterModeOptionStruct : NSObject @property (nonatomic, copy) NSString * _Nonnull label; @property (nonatomic, copy) NSNumber * _Nonnull mode; @property (nonatomic, copy) NSArray * _Nonnull semanticTags; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterDlCredential : NSObject @property (nonatomic, copy) NSNumber * _Nonnull credentialType; @property (nonatomic, copy) NSNumber * _Nonnull credentialIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterDoorLockAlarmEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull alarmCode; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterDoorStateChangeEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull doorState; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterLockOperationEvent : NSObject @@ -694,9 +478,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSNumber * _Nullable fabricIndex; @property (nonatomic, copy) NSNumber * _Nullable sourceNode; @property (nonatomic, copy) NSArray * _Nullable credentials; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterLockOperationErrorEvent : NSObject @@ -707,9 +488,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSNumber * _Nullable fabricIndex; @property (nonatomic, copy) NSNumber * _Nullable sourceNode; @property (nonatomic, copy) NSArray * _Nullable credentials; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRDoorLockClusterLockUserChangeEvent : NSObject @@ -720,120 +498,63 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSNumber * _Nullable fabricIndex; @property (nonatomic, copy) NSNumber * _Nullable sourceNode; @property (nonatomic, copy) NSNumber * _Nullable dataIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterSupplyVoltageLowEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterSupplyVoltageHighEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterPowerMissingPhaseEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterSystemPressureLowEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterSystemPressureHighEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterDryRunningEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterMotorTemperatureHighEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterPumpMotorFatalFailureEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterElectronicTemperatureHighEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterPumpBlockedEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterSensorFailureEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterElectronicNonFatalFailureEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterElectronicFatalFailureEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterGeneralFaultEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterLeakageEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterAirDetectionEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRPumpConfigurationAndControlClusterTurbineOperationEvent : NSObject - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRThermostatClusterThermostatScheduleTransition : NSObject @property (nonatomic, copy) NSNumber * _Nonnull transitionTime; @property (nonatomic, copy) NSNumber * _Nullable heatSetpoint; @property (nonatomic, copy) NSNumber * _Nullable coolSetpoint; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRChannelClusterChannelInfo : NSObject @@ -842,9 +563,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSString * _Nullable name; @property (nonatomic, copy) NSString * _Nullable callSign; @property (nonatomic, copy) NSString * _Nullable affiliateCallSign; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRChannelClusterLineupInfo : NSObject @@ -852,25 +570,16 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSString * _Nullable lineupName; @property (nonatomic, copy) NSString * _Nullable postalCode; @property (nonatomic, copy) NSNumber * _Nonnull lineupInfoType; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRTargetNavigatorClusterTargetInfo : NSObject @property (nonatomic, copy) NSNumber * _Nonnull identifier; @property (nonatomic, copy) NSString * _Nonnull name; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaPlaybackClusterPlaybackPosition : NSObject @property (nonatomic, copy) NSNumber * _Nonnull updatedAt; @property (nonatomic, copy) NSNumber * _Nullable position; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRMediaInputClusterInputInfo : NSObject @@ -878,51 +587,33 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSNumber * _Nonnull inputType; @property (nonatomic, copy) NSString * _Nonnull name; @property (nonatomic, copy) NSString * _Nonnull descriptionString; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRContentLauncherClusterDimension : NSObject @property (nonatomic, copy) NSNumber * _Nonnull width; @property (nonatomic, copy) NSNumber * _Nonnull height; @property (nonatomic, copy) NSNumber * _Nonnull metric; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRContentLauncherClusterAdditionalInfo : NSObject @property (nonatomic, copy) NSString * _Nonnull name; @property (nonatomic, copy) NSString * _Nonnull value; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRContentLauncherClusterParameter : NSObject @property (nonatomic, copy) NSNumber * _Nonnull type; @property (nonatomic, copy) NSString * _Nonnull value; @property (nonatomic, copy) NSArray * _Nullable externalIDList; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRContentLauncherClusterContentSearch : NSObject @property (nonatomic, copy) NSArray * _Nonnull parameterList; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRContentLauncherClusterStyleInformation : NSObject @property (nonatomic, copy) NSString * _Nullable imageUrl; @property (nonatomic, copy) NSString * _Nullable color; @property (nonatomic, copy) MTRContentLauncherClusterDimension * _Nullable size; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRContentLauncherClusterBrandingInformation : NSObject @@ -932,42 +623,27 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) MTRContentLauncherClusterStyleInformation * _Nullable progressBar; @property (nonatomic, copy) MTRContentLauncherClusterStyleInformation * _Nullable splash; @property (nonatomic, copy) MTRContentLauncherClusterStyleInformation * _Nullable waterMark; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRAudioOutputClusterOutputInfo : NSObject @property (nonatomic, copy) NSNumber * _Nonnull index; @property (nonatomic, copy) NSNumber * _Nonnull outputType; @property (nonatomic, copy) NSString * _Nonnull name; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRApplicationLauncherClusterApplication : NSObject @property (nonatomic, copy) NSNumber * _Nonnull catalogVendorId; @property (nonatomic, copy) NSString * _Nonnull applicationId; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRApplicationLauncherClusterApplicationEP : NSObject @property (nonatomic, copy) MTRApplicationLauncherClusterApplication * _Nonnull application; @property (nonatomic, copy) NSNumber * _Nullable endpoint; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRApplicationBasicClusterApplicationBasicApplication : NSObject @property (nonatomic, copy) NSNumber * _Nonnull catalogVendorId; @property (nonatomic, copy) NSString * _Nonnull applicationId; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRClientMonitoringClusterMonitoringRegistration : NSObject @@ -989,9 +665,6 @@ MTR_NEWLY_AVAILABLE @property (nonatomic, copy) NSNumber * _Nonnull f; @property (nonatomic, copy) NSNumber * _Nonnull g; @property (nonatomic, copy) NSNumber * _Nonnull h; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterSimpleStruct") @@ -1007,9 +680,6 @@ MTR_NEWLY_AVAILABLE @property (nonatomic, copy) MTRUnitTestingClusterSimpleStruct * _Nonnull fabricSensitiveStruct; @property (nonatomic, copy) NSArray * _Nonnull fabricSensitiveInt8uList; @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestFabricScoped") @@ -1029,9 +699,6 @@ MTR_NEWLY_AVAILABLE @property (nonatomic, copy) NSArray * _Nullable nullableList; @property (nonatomic, copy) NSArray * _Nullable optionalList; @property (nonatomic, copy) NSArray * _Nullable nullableOptionalList; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterNullablesAndOptionalsStruct") @@ -1042,9 +709,6 @@ MTR_NEWLY_AVAILABLE @property (nonatomic, copy) NSNumber * _Nonnull a; @property (nonatomic, copy) NSNumber * _Nonnull b; @property (nonatomic, copy) MTRUnitTestingClusterSimpleStruct * _Nonnull c; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterNestedStruct") @@ -1059,9 +723,6 @@ MTR_NEWLY_AVAILABLE @property (nonatomic, copy) NSArray * _Nonnull e; @property (nonatomic, copy) NSArray * _Nonnull f; @property (nonatomic, copy) NSArray * _Nonnull g; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterNestedStructList") @@ -1070,9 +731,6 @@ MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterNestedStructList") MTR_NEWLY_AVAILABLE @interface MTRUnitTestingClusterDoubleNestedStructList : NSObject @property (nonatomic, copy) NSArray * _Nonnull a; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterDoubleNestedStructList") @@ -1082,9 +740,6 @@ MTR_NEWLY_AVAILABLE @interface MTRUnitTestingClusterTestListStructOctet : NSObject @property (nonatomic, copy) NSNumber * _Nonnull member1; @property (nonatomic, copy) NSData * _Nonnull member2; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestListStructOctet") @@ -1099,9 +754,6 @@ MTR_NEWLY_AVAILABLE @property (nonatomic, copy) MTRUnitTestingClusterSimpleStruct * _Nonnull arg4; @property (nonatomic, copy) NSArray * _Nonnull arg5; @property (nonatomic, copy) NSArray * _Nonnull arg6; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestEventEvent") @@ -1111,9 +763,6 @@ MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestEventEvent") MTR_NEWLY_AVAILABLE @interface MTRUnitTestingClusterTestFabricScopedEventEvent : NSObject @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_DEPRECATED("Please use MTRUnitTestingClusterTestFabricScopedEventEvent") From a541b5b226a06bc95d85cd5b0f9c36e2082d161a Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Fri, 2 Dec 2022 18:38:01 +0100 Subject: [PATCH 4/8] [typo] Replace ' Unit / Interation Tests' with ' Unit / Integration Tests' (#23875) --- .github/workflows/unit_integration_test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml index 959815a7963816..dd3547731fa906 100644 --- a/.github/workflows/unit_integration_test.yaml +++ b/.github/workflows/unit_integration_test.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: Unit / Interation Tests +name: Unit / Integration Tests on: push: @@ -24,7 +24,7 @@ concurrency: jobs: unit_tests: - name: Unit / Interation Tests + name: Unit / Integration Tests timeout-minutes: 60 if: github.actor != 'restyled-io[bot]' From c276f727a093341253b7ef5c28abbab4d4bb74ee Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 2 Dec 2022 12:38:28 -0500 Subject: [PATCH 5/8] Fix typo in build targets for minimal app (#23876) --- scripts/build/build/targets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py index 7f408c538e011f..d25bb983d932de 100755 --- a/scripts/build/build/targets.py +++ b/scripts/build/build/targets.py @@ -97,7 +97,7 @@ def BuildHostTarget(): app_parts = [ TargetPart('rpc-console', app=HostApp.RPC_CONSOLE).OnlyIfRe(f'{native_board_name}-'), TargetPart('all-clusters', app=HostApp.ALL_CLUSTERS), - TargetPart('all-clusters-minimal', app=HostApp.ALL_CLUSTERS), + TargetPart('all-clusters-minimal', app=HostApp.ALL_CLUSTERS_MINIMAL), TargetPart('chip-tool', app=HostApp.CHIP_TOOL), TargetPart('thermostat', app=HostApp.THERMOSTAT), TargetPart('java-matter-controller', app=HostApp.JAVA_MATTER_CONTROLLER), From 1e06479f412b78eea0dfbeacf7cad51d005b649b Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 2 Dec 2022 14:01:19 -0500 Subject: [PATCH 6/8] zap regen (#23879) * zap regen * Undo regen for files that master zap complains about. I am unclear why differences exist though --- .../Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h | 6 ------ src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h | 3 --- 2 files changed, 9 deletions(-) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index 4c17683a2dc516..0809cb2d5dc57f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -4672,9 +4672,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end @interface MTRClientMonitoringClusterStayAwakeRequestParams : NSObject /** @@ -4692,9 +4689,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterAnnounceOta * */ @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_AVAILABLE @interface MTRUnitTestingClusterTestParams : NSObject diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index 20b04e8d9b2b43..96b8ae47f2b02c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -650,9 +650,6 @@ MTR_NEWLY_DEPRECATED("Please use MTROTASoftwareUpdateRequestorClusterDownloadErr @property (nonatomic, copy) NSNumber * _Nonnull clientNodeId; @property (nonatomic, copy) NSNumber * _Nonnull iCid; @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex; - -- (instancetype)init; -- (id)copyWithZone:(NSZone * _Nullable)zone; @end MTR_NEWLY_AVAILABLE From 35422eb5ade1301700eb4a075a1e5b81083ece81 Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Fri, 2 Dec 2022 20:41:21 +0100 Subject: [PATCH 7/8] [chip-tool] Add --skip-commissioning-complete optional parameter for non-concurrent connection use case (#23701) --- .../chip-tool/commands/pairing/PairingCommand.cpp | 14 ++++++++++---- .../chip-tool/commands/pairing/PairingCommand.h | 6 ++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp index 9f827004d087f4..adc560a812fe11 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.cpp +++ b/examples/chip-tool/commands/pairing/PairingCommand.cpp @@ -70,17 +70,23 @@ CHIP_ERROR PairingCommand::RunInternal(NodeId remoteId) CommissioningParameters PairingCommand::GetCommissioningParameters() { + auto params = CommissioningParameters(); + params.SetSkipCommissioningComplete(mSkipCommissioningComplete.ValueOr(false)); + switch (mNetworkType) { case PairingNetworkType::WiFi: - return CommissioningParameters().SetWiFiCredentials(Controller::WiFiCredentials(mSSID, mPassword)); + params.SetWiFiCredentials(Controller::WiFiCredentials(mSSID, mPassword)); + break; case PairingNetworkType::Thread: - return CommissioningParameters().SetThreadOperationalDataset(mOperationalDataset); + params.SetThreadOperationalDataset(mOperationalDataset); + break; case PairingNetworkType::Ethernet: case PairingNetworkType::None: - return CommissioningParameters(); + break; } - return CommissioningParameters(); + + return params; } CHIP_ERROR PairingCommand::PaseWithCode(NodeId remoteId) diff --git a/examples/chip-tool/commands/pairing/PairingCommand.h b/examples/chip-tool/commands/pairing/PairingCommand.h index 61c7440ad9963e..3edd1cfd9e3f4e 100644 --- a/examples/chip-tool/commands/pairing/PairingCommand.h +++ b/examples/chip-tool/commands/pairing/PairingCommand.h @@ -78,20 +78,24 @@ class PairingCommand : public CHIPCommand, case PairingMode::None: break; case PairingMode::Code: + AddArgument("skip-commissioning-complete", 0, 1, &mSkipCommissioningComplete); case PairingMode::CodePaseOnly: AddArgument("payload", &mOnboardingPayload); AddArgument("discover-once", 0, 1, &mDiscoverOnce); AddArgument("use-only-onnetwork-discovery", 0, 1, &mUseOnlyOnNetworkDiscovery); break; case PairingMode::Ble: + AddArgument("skip-commissioning-complete", 0, 1, &mSkipCommissioningComplete); AddArgument("setup-pin-code", 0, 134217727, &mSetupPINCode); AddArgument("discriminator", 0, 4096, &mDiscriminator); break; case PairingMode::OnNetwork: + AddArgument("skip-commissioning-complete", 0, 1, &mSkipCommissioningComplete); AddArgument("setup-pin-code", 0, 134217727, &mSetupPINCode); AddArgument("pase-only", 0, 1, &mPaseOnly); break; case PairingMode::SoftAP: + AddArgument("skip-commissioning-complete", 0, 1, &mSkipCommissioningComplete); AddArgument("setup-pin-code", 0, 134217727, &mSetupPINCode); AddArgument("discriminator", 0, 4096, &mDiscriminator); AddArgument("device-remote-ip", &mRemoteAddr); @@ -99,6 +103,7 @@ class PairingCommand : public CHIPCommand, AddArgument("pase-only", 0, 1, &mPaseOnly); break; case PairingMode::Ethernet: + AddArgument("skip-commissioning-complete", 0, 1, &mSkipCommissioningComplete); AddArgument("setup-pin-code", 0, 134217727, &mSetupPINCode); AddArgument("discriminator", 0, 4096, &mDiscriminator); AddArgument("device-remote-ip", &mRemoteAddr); @@ -169,6 +174,7 @@ class PairingCommand : public CHIPCommand, chip::Optional mDiscoverOnce; chip::Optional mUseOnlyOnNetworkDiscovery; chip::Optional mPaseOnly; + chip::Optional mSkipCommissioningComplete; uint16_t mRemotePort; uint16_t mDiscriminator; uint32_t mSetupPINCode; From 85aa1446604accd632d3ec461bdba910895cf0ae Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Fri, 2 Dec 2022 20:41:41 +0100 Subject: [PATCH 8/8] [darwin-framework-tool] Do not build Matter SDK twice when config_enable_yaml_tests=false (#23682) --- .../chip-tool/commands/common/Command.cpp | 2 +- examples/chip-tool/commands/common/Command.h | 1 - .../common/CredentialIssuerCommands.h | 8 ++- .../discover/DiscoverCommissionersCommand.cpp | 1 + .../example/ExampleCredentialIssuerCommands.h | 1 + examples/darwin-framework-tool/BUILD.gn | 68 +++++++++++++++---- .../commands/clusters/ModelCommandBridge.h | 2 - .../commands/common/CHIPCommandBridge.h | 1 + .../pairing/OpenCommissioningWindowCommand.h | 4 +- .../templates/tests/commands.zapt | 1 + scripts/build/build_darwin_framework.py | 4 ++ .../zap-generated/test/Commands.h | 1 + 12 files changed, 73 insertions(+), 21 deletions(-) diff --git a/examples/chip-tool/commands/common/Command.cpp b/examples/chip-tool/commands/common/Command.cpp index 077e0fb715f589..ebfb99bad5c9e5 100644 --- a/examples/chip-tool/commands/common/Command.cpp +++ b/examples/chip-tool/commands/common/Command.cpp @@ -17,8 +17,8 @@ */ #include "Command.h" -#include "platform/PlatformManager.h" +#include #include #include #include diff --git a/examples/chip-tool/commands/common/Command.h b/examples/chip-tool/commands/common/Command.h index 96de49477621d8..265bf1af3c5925 100644 --- a/examples/chip-tool/commands/common/Command.h +++ b/examples/chip-tool/commands/common/Command.h @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/examples/chip-tool/commands/common/CredentialIssuerCommands.h b/examples/chip-tool/commands/common/CredentialIssuerCommands.h index 2a5df5a42abe63..1ea712ffa9593f 100644 --- a/examples/chip-tool/commands/common/CredentialIssuerCommands.h +++ b/examples/chip-tool/commands/common/CredentialIssuerCommands.h @@ -19,12 +19,18 @@ #pragma once #include -#include #include #include #include #include +namespace chip { +namespace Controller { +struct SetupParams; +class OperationalCredentialsDelegate; +} // namespace Controller +} // namespace chip + class CredentialIssuerCommands { public: diff --git a/examples/chip-tool/commands/discover/DiscoverCommissionersCommand.cpp b/examples/chip-tool/commands/discover/DiscoverCommissionersCommand.cpp index b2fe353931328a..0d1c9a032de02c 100644 --- a/examples/chip-tool/commands/discover/DiscoverCommissionersCommand.cpp +++ b/examples/chip-tool/commands/discover/DiscoverCommissionersCommand.cpp @@ -18,6 +18,7 @@ #include "DiscoverCommissionersCommand.h" #include +#include using namespace ::chip; diff --git a/examples/chip-tool/commands/example/ExampleCredentialIssuerCommands.h b/examples/chip-tool/commands/example/ExampleCredentialIssuerCommands.h index da4716e957e921..e06466ca4ab67d 100644 --- a/examples/chip-tool/commands/example/ExampleCredentialIssuerCommands.h +++ b/examples/chip-tool/commands/example/ExampleCredentialIssuerCommands.h @@ -19,6 +19,7 @@ #pragma once #include +#include #include #include #include diff --git a/examples/darwin-framework-tool/BUILD.gn b/examples/darwin-framework-tool/BUILD.gn index 5a9fbabfbbe5b2..51746d12455679 100644 --- a/examples/darwin-framework-tool/BUILD.gn +++ b/examples/darwin-framework-tool/BUILD.gn @@ -143,20 +143,6 @@ executable("darwin-framework-tool") { deps = [ ":build-darwin-framework", - "${chip_root}/src/app/tests/suites/commands/delay", - - # IM is needed for MTRError - "${chip_root}/src/app/tests/suites/commands/interaction_model", - - # Log is needed by tests UserPrompt and Log - "${chip_root}/src/app/tests/suites/commands/log", - - # System is needed by tests FactoryReset etc.. - "${chip_root}/src/app/tests/suites/commands/system", - - # pics is needed by tests - "${chip_root}/src/app/tests/suites/pics", - "${chip_root}/third_party/inipp", "${chip_root}/third_party/jsoncpp", ] @@ -175,6 +161,60 @@ executable("darwin-framework-tool") { "Security.framework", ] + # When config_enable_yaml_tests=true the Matter SDK is pulled in as a dependency because the code of the test suite + # uses some helpers from the Matter SDK. As a result, the SDK is built twice. Once because of this dependency and once + # when the Matter.framework is built. + # It may results in different versions of the Matter SDK between the output binary and the linked Matter.framework. + # + # When config_enable_yaml_tests=false the Matter SDK is built once when the Matter.framework is built and the resulting + # libCHIP.a library is linked statically to the output binary. + if (config_enable_yaml_tests) { + deps += [ + "${chip_root}/src/app/tests/suites/commands/delay", + + # IM is needed for MTRError + "${chip_root}/src/app/tests/suites/commands/interaction_model", + + # Log is needed by tests UserPrompt and Log + "${chip_root}/src/app/tests/suites/commands/log", + + # System is needed by tests FactoryReset etc.. + "${chip_root}/src/app/tests/suites/commands/system", + + # pics is needed by tests + "${chip_root}/src/app/tests/suites/pics", + ] + } else { + include_dirs = [ + "${chip_root}/config/standalone/", + "${chip_root}/src/", + "${chip_root}/src/include/", + "${chip_root}/third_party/nlassert/repo/include/", + "${chip_root}/third_party/nlio/repo/include/", + "${chip_root}/zzz_generated/app-common/", + "${root_gen_dir}/include", + "${root_out_dir}/macos_framework_output/Build/Intermediates.noindex/Matter.build/${output_sdk_type}/Matter.build/out/gen/include", + ] + + defines = [ + "CHIP_HAVE_CONFIG_H=1", + "CHIP_SYSTEM_CONFIG_USE_SOCKETS=1", + ] + + frameworks += [ + "CoreFoundation.framework", + "Foundation.framework", + "CoreBluetooth.framework", + "Network.framework", + ] + + # Other SDKs are linked statically to Matter.framework but the macosx SDK is linked dynamically but needs some symbols that are + # not exposed by the dylib. + if (sdk == "macosx") { + libs = [ "${root_out_dir}/macos_framework_output/Build/Intermediates.noindex/Matter.build/${output_sdk_type}/Matter.build/out/lib/libCHIP.a" ] + } + } + public_configs = [ ":config" ] output_dir = root_out_dir diff --git a/examples/darwin-framework-tool/commands/clusters/ModelCommandBridge.h b/examples/darwin-framework-tool/commands/clusters/ModelCommandBridge.h index df6cf196c04569..447d2c2ae5ccf6 100644 --- a/examples/darwin-framework-tool/commands/clusters/ModelCommandBridge.h +++ b/examples/darwin-framework-tool/commands/clusters/ModelCommandBridge.h @@ -24,8 +24,6 @@ class ModelCommand : public CHIPCommandBridge { public: - using ChipDevice = ::chip::OperationalDeviceProxy; - ModelCommand(const char * _Nonnull commandName) : CHIPCommandBridge(commandName) {} void AddArguments() diff --git a/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.h b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.h index ca11c746e30e09..bf5e7b49fce0fd 100644 --- a/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.h +++ b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.h @@ -21,6 +21,7 @@ #include #include #include +#include #include #include "../provider/OTAProviderDelegate.h" diff --git a/examples/darwin-framework-tool/commands/pairing/OpenCommissioningWindowCommand.h b/examples/darwin-framework-tool/commands/pairing/OpenCommissioningWindowCommand.h index e9fc4ce373b352..68c0d2b7aab6aa 100644 --- a/examples/darwin-framework-tool/commands/pairing/OpenCommissioningWindowCommand.h +++ b/examples/darwin-framework-tool/commands/pairing/OpenCommissioningWindowCommand.h @@ -31,8 +31,8 @@ class OpenCommissioningWindowCommand : public CHIPCommandBridge "1 to use Enhanced Commissioning Method.\n 0 to use Basic Commissioning Method."); AddArgument("window-timeout", 0, UINT16_MAX, &mCommissioningWindowTimeoutMs, "Time, in seconds, before the commissioning window closes."); - AddArgument("iteration", chip::kSpake2p_Min_PBKDF_Iterations, chip::kSpake2p_Max_PBKDF_Iterations, &mIteration, - "Number of PBKDF iterations to use to derive the verifier. Ignored if 'option' is 0."); + AddArgument("iteration", chip::Crypto::kSpake2p_Min_PBKDF_Iterations, chip::Crypto::kSpake2p_Max_PBKDF_Iterations, + &mIteration, "Number of PBKDF iterations to use to derive the verifier. Ignored if 'option' is 0."); AddArgument("discriminator", 0, 4096, &mDiscriminator, "Discriminator to use for advertising. Ignored if 'option' is 0."); AddArgument("timeout", 0, UINT16_MAX, &mTimeout, "Time, in seconds, before this command is considered to have timed out."); } diff --git a/examples/darwin-framework-tool/templates/tests/commands.zapt b/examples/darwin-framework-tool/templates/tests/commands.zapt index adfa4662f7b1c5..4040d94975a8be 100644 --- a/examples/darwin-framework-tool/templates/tests/commands.zapt +++ b/examples/darwin-framework-tool/templates/tests/commands.zapt @@ -4,6 +4,7 @@ #if CONFIG_ENABLE_YAML_TESTS +#include #include #include #include diff --git a/scripts/build/build_darwin_framework.py b/scripts/build/build_darwin_framework.py index d84ea53cf20837..77b033d019883f 100644 --- a/scripts/build/build_darwin_framework.py +++ b/scripts/build/build_darwin_framework.py @@ -65,6 +65,10 @@ def build_darwin_framework(args): # Build Matter.framework as a static library "SUPPORTS_TEXT_BASED_API=NO", "MACH_O_TYPE=staticlib", + # Change visibility flags such that both darwin-framework-tool and Matter.framework + # are built with the same flags. + "GCC_INLINES_ARE_PRIVATE_EXTERN=NO", + "GCC_SYMBOLS_PRIVATE_EXTERN=NO", ] command_result = run_command(command) diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 560a723adefbd1..2329031ef9ec52 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -21,6 +21,7 @@ #if CONFIG_ENABLE_YAML_TESTS +#include #include #include #include