From c8b79f100414f1401dd645512076cac9a684b024 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Thu, 19 Oct 2023 11:14:13 -0700 Subject: [PATCH] Revert "Ensure that MTRDevice invokes provide a timed invoke timeout when needed. (#29855)" This reverts commit 4e13b93caa8ee5c12ca6422d89ee037695800de4. --- .../Framework/CHIP/MTRCommandTimedCheck.h | 26 - .../Framework/CHIP/MTRDefines_Internal.h | 3 - src/darwin/Framework/CHIP/MTRDevice.h | 50 +- src/darwin/Framework/CHIP/MTRDevice.mm | 26 - .../CHIP/templates/MTRBaseClusters-src.zapt | 7 +- .../CHIP/templates/MTRClusters-src.zapt | 5 +- .../templates/MTRCommandTimedCheck-src.zapt | 51 - .../Framework/CHIP/templates/templates.json | 5 - .../CHIP/zap-generated/MTRBaseClusters.mm | 34 +- .../CHIP/zap-generated/MTRClusters.mm | 33 +- .../zap-generated/MTRCommandTimedCheck.mm | 1210 ----------------- .../Framework/CHIPTests/MTRDeviceTests.m | 3 - .../Matter.xcodeproj/project.pbxproj | 18 - 13 files changed, 50 insertions(+), 1421 deletions(-) delete mode 100644 src/darwin/Framework/CHIP/MTRCommandTimedCheck.h delete mode 100644 src/darwin/Framework/CHIP/templates/MTRCommandTimedCheck-src.zapt delete mode 100644 src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm diff --git a/src/darwin/Framework/CHIP/MTRCommandTimedCheck.h b/src/darwin/Framework/CHIP/MTRCommandTimedCheck.h deleted file mode 100644 index 423a133d93dcc7..00000000000000 --- a/src/darwin/Framework/CHIP/MTRCommandTimedCheck.h +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright (c) 2023 Project CHIP Authors - * All rights reserved. - * - * 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 - -#import - -NS_ASSUME_NONNULL_BEGIN - -BOOL MTRCommandNeedsTimedInvoke(NSNumber * aClusterID, NSNumber * aCommandID); - -NS_ASSUME_NONNULL_END diff --git a/src/darwin/Framework/CHIP/MTRDefines_Internal.h b/src/darwin/Framework/CHIP/MTRDefines_Internal.h index 731ea45d4ce17a..b4e73c8f97e044 100644 --- a/src/darwin/Framework/CHIP/MTRDefines_Internal.h +++ b/src/darwin/Framework/CHIP/MTRDefines_Internal.h @@ -57,6 +57,3 @@ _Pragma("clang diagnostic pop") typedef struct {} variable_hidden_by_mtr_hide; // clang-format on - -// Default timed interaction timeout, in ms, if another one is not provided. -#define MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS 10000 diff --git a/src/darwin/Framework/CHIP/MTRDevice.h b/src/darwin/Framework/CHIP/MTRDevice.h index 2830bd71d77dc3..2544deaa32280a 100644 --- a/src/darwin/Framework/CHIP/MTRDevice.h +++ b/src/darwin/Framework/CHIP/MTRDevice.h @@ -126,54 +126,32 @@ typedef NS_ENUM(NSUInteger, MTRDeviceState) { /** * Invoke a command with a designated command path * - * @param commandFields command fields object. The object must be a data-value NSDictionary object + * @param commandFields command fields object. The object must be a data-value NSDictionary object * as described in the MTRDeviceResponseHandler. - * The value must be a Structure, i.e., + * The attribute must be a Structure, i.e., * the NSDictionary MTRTypeKey key must have the value MTRStructureValueType. * - * @param expectedValues The expected values of attributes that will be affected by the command, if - * any. If these are provided, the relevant attributes will have the provided - * values when read until one of the following happens: - * - * 1. Something (another invoke or a write) sets different expected values. - * 2. expectedValueInterval elapses without the device reporting the - * attributes changing their values to the expected values. - * 3. The command invoke fails. - * 4. The device reports some other values for these attributes. - * - * The dictionaries in this array are expected to be response-value - * dictionaries as documented in the documentation of - * MTRDeviceResponseHandler, and each one must have an MTRAttributePathKey. - * + * @param expectedValues array of dictionaries containing the expected values in the same format as + * attribute read completion handler. Requires MTRAttributePathKey values. + * See MTRDeviceResponseHandler definition for dictionary details. * The expectedValues and expectedValueInterval arguments need to be both * nil or both non-nil, or both will be both ignored. * - * @param expectedValueInterval maximum interval in milliseconds during which reads of the - * attributes that had expected values provided will return the - * expected values. If the value is less than 1, both this value and - * expectedValues will be ignored. If this value is greater than - * UINT32_MAX, it will be clamped to UINT32_MAX. + * TODO: document better the expectedValues is how this command is expected to change attributes when read, and that the next + * readAttribute will get these values + * + * @param expectedValueInterval maximum interval in milliseconds during which reads of the attribute will return the value being + * written. If the value is less than 1, both this value and expectedValues will be ignored. + If this value is greater than UINT32_MAX, it will be clamped to UINT32_MAX. + * + * @param timeout timeout in milliseconds for timed invoke, or nil. This value must be within [1, UINT16_MAX], and will be clamped + * to this range. * * @param completion response handler will receive either values or error. A * path-specific error status from the command invocation * will result in an error being passed to the completion, so * values will only be passed in when the command succeeds. - * - * If values are passed, the array length will always be 1 and the single - * response-value in it will have an MTRCommandPathKey. If the command - * response is just a success status, there will be no MTRDataKey. If the - * command response has data fields, there will be an MTRDataKey, whose value - * will be of type MTRStructureValueType and describe the response payload. */ -- (void)invokeCommandWithEndpointID:(NSNumber *)endpointID - clusterID:(NSNumber *)clusterID - commandID:(NSNumber *)commandID - commandFields:(id)commandFields - expectedValues:(NSArray *> * _Nullable)expectedValues - expectedValueInterval:(NSNumber * _Nullable)expectedValueInterval - queue:(dispatch_queue_t)queue - completion:(MTRDeviceResponseHandler)completion MTR_NEWLY_AVAILABLE; - - (void)invokeCommandWithEndpointID:(NSNumber *)endpointID clusterID:(NSNumber *)clusterID commandID:(NSNumber *)commandID diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm index 6201f002147a81..8b05921dba8ec6 100644 --- a/src/darwin/Framework/CHIP/MTRDevice.mm +++ b/src/darwin/Framework/CHIP/MTRDevice.mm @@ -24,8 +24,6 @@ #import "MTRBaseSubscriptionCallback.h" #import "MTRCluster.h" #import "MTRClusterConstants.h" -#import "MTRCommandTimedCheck.h" -#import "MTRDefines_Internal.h" #import "MTRDeviceController_Internal.h" #import "MTRDevice_Internal.h" #import "MTRError_Internal.h" @@ -1089,26 +1087,6 @@ - (void)writeAttributeWithEndpointID:(NSNumber *)endpointID [_asyncWorkQueue enqueueWorkItem:workItem descriptionWithFormat:@"write %@ %@ %@", endpointID, clusterID, attributeID]; } -- (void)invokeCommandWithEndpointID:(NSNumber *)endpointID - clusterID:(NSNumber *)clusterID - commandID:(NSNumber *)commandID - commandFields:(id)commandFields - expectedValues:(NSArray *> * _Nullable)expectedValues - expectedValueInterval:(NSNumber * _Nullable)expectedValueInterval - queue:(dispatch_queue_t)queue - completion:(MTRDeviceResponseHandler)completion -{ - [self invokeCommandWithEndpointID:endpointID - clusterID:clusterID - commandID:commandID - commandFields:commandFields - expectedValues:expectedValues - expectedValueInterval:expectedValueInterval - timedInvokeTimeout:nil - queue:queue - completion:completion]; -} - - (void)invokeCommandWithEndpointID:(NSNumber *)endpointID clusterID:(NSNumber *)clusterID commandID:(NSNumber *)commandID @@ -1155,10 +1133,6 @@ - (void)_invokeCommandWithEndpointID:(NSNumber *)endpointID serverSideProcessingTimeout = [serverSideProcessingTimeout copy]; timeout = [timeout copy]; - if (timeout == nil && MTRCommandNeedsTimedInvoke(clusterID, commandID)) { - timeout = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); - } - NSDate * cutoffTime; if (timeout) { cutoffTime = [NSDate dateWithTimeIntervalSinceNow:(timeout.doubleValue / 1000)]; diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt index fa249b734ee90a..94a9a6e93dfc65 100644 --- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt +++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt @@ -12,7 +12,6 @@ #import "MTRStructsObjc.h" #import "NSStringSpanConversion.h" #import "NSDataSpanConversion.h" -#import "MTRDefines_Internal.h" #include #include @@ -98,7 +97,7 @@ MTR{{cluster}}Cluster{{command}}Params auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; {{#if mustUseTimedInvoke}} if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } {{/if}} @@ -176,9 +175,9 @@ MTR{{cluster}}Cluster{{command}}Params timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue); } } - {{#if mustUseTimedWrite}} + {{#if mustUseTimedInvoke}} if (!timedWriteTimeout.HasValue()) { - timedWriteTimeout.SetValue(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedWriteTimeout.SetValue(10000); } {{/if}} diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt index 617beb92815d92..d8ebe2f39b1f40 100644 --- a/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt +++ b/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt @@ -10,7 +10,6 @@ #import "MTRStructsObjc.h" #import "MTRCommandPayloadsObjc.h" #import "MTRLogging_Internal.h" -#import "MTRDefines_Internal.h" #include #include @@ -80,7 +79,7 @@ MTR{{cluster}}Cluster{{command}}Params auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; {{#if mustUseTimedInvoke}} if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } {{/if}} @@ -134,7 +133,7 @@ MTR{{cluster}}Cluster{{command}}Params NSNumber *timedWriteTimeout = params.timedWriteTimeout; {{#if mustUseTimedWrite}} if (!timedWriteTimeout) { - timedWriteTimeout = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedWriteTimeout = @(10000); } {{/if}} diff --git a/src/darwin/Framework/CHIP/templates/MTRCommandTimedCheck-src.zapt b/src/darwin/Framework/CHIP/templates/MTRCommandTimedCheck-src.zapt deleted file mode 100644 index ea0c2d3a92b73d..00000000000000 --- a/src/darwin/Framework/CHIP/templates/MTRCommandTimedCheck-src.zapt +++ /dev/null @@ -1,51 +0,0 @@ -{{> header excludeZapComment=true}} - -#import "MTRCommandTimedCheck.h" - -#include -#include - -using namespace chip; -using namespace chip::app; - -{{#zcl_clusters}} -{{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}} -static BOOL CommandNeedsTimedInvokeIn{{asUpperCamelCase name preserveAcronyms=true}}Cluster(AttributeId aAttributeId) -{ - using namespace Clusters::{{asUpperCamelCase name}}; - switch (aAttributeId) { - {{#zcl_commands}} - {{#if (and (isSupported (asUpperCamelCase ../name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true)) - mustUseTimedInvoke)}} - case Commands::{{asUpperCamelCase name}}::Id: { - return YES; - } - {{/if}} - {{/zcl_commands}} - default: { - return NO; - } - } -} -{{/if}} -{{/zcl_clusters}} - -BOOL MTRCommandNeedsTimedInvoke(NSNumber * _Nonnull aClusterID, NSNumber * _Nonnull aCommandID) -{ - ClusterId clusterID = static_cast(aClusterID.unsignedLongLongValue); - CommandId commandID = static_cast(aCommandID.unsignedLongLongValue); - - switch (clusterID) - { - {{#zcl_clusters}} - {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}} - case Clusters::{{asUpperCamelCase name}}::Id: { - return CommandNeedsTimedInvokeIn{{asUpperCamelCase name preserveAcronyms=true}}Cluster(commandID); - } - {{/if}} - {{/zcl_clusters}} - default: { - return NO; - } - } -} diff --git a/src/darwin/Framework/CHIP/templates/templates.json b/src/darwin/Framework/CHIP/templates/templates.json index 47804e519dfba7..73eb9fbb986fa5 100644 --- a/src/darwin/Framework/CHIP/templates/templates.json +++ b/src/darwin/Framework/CHIP/templates/templates.json @@ -123,11 +123,6 @@ "path": "MTRAttributeSpecifiedCheck-src.zapt", "name": "Function to check if attribute is specified", "output": "src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm" - }, - { - "path": "MTRCommandTimedCheck-src.zapt", - "name": "Function to check if command needs timed invoke", - "output": "src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm" } ] } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index b62652b9d46429..b50f013f88502e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -23,7 +23,6 @@ #import "MTRClusterStateCacheContainer_Internal.h" #import "MTRCluster_Internal.h" #import "MTRCommandPayloadsObjc.h" -#import "MTRDefines_Internal.h" #import "MTRDevice_Internal.h" #import "MTRStructsObjc.h" #import "NSDataSpanConversion.h" @@ -34411,7 +34410,7 @@ - (void)openCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterO auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = AdministratorCommissioning::Commands::OpenCommissioningWindow::Type; @@ -34438,7 +34437,7 @@ - (void)openBasicCommissioningWindowWithParams:(MTRAdministratorCommissioningClu auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type; @@ -34469,7 +34468,7 @@ - (void)revokeCommissioningWithParams:(MTRAdministratorCommissioningClusterRevok auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = AdministratorCommissioning::Commands::RevokeCommissioning::Type; @@ -47434,7 +47433,7 @@ - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::LockDoor::Type; @@ -47461,7 +47460,7 @@ - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)par auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::UnlockDoor::Type; @@ -47488,7 +47487,7 @@ - (void)unlockWithTimeoutWithParams:(MTRDoorLockClusterUnlockWithTimeoutParams * auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::UnlockWithTimeout::Type; @@ -47731,7 +47730,7 @@ - (void)setUserWithParams:(MTRDoorLockClusterSetUserParams *)params completion:( auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::SetUser::Type; @@ -47782,7 +47781,7 @@ - (void)clearUserWithParams:(MTRDoorLockClusterClearUserParams *)params completi auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::ClearUser::Type; @@ -47809,7 +47808,7 @@ - (void)setCredentialWithParams:(MTRDoorLockClusterSetCredentialParams *)params auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::SetCredential::Type; @@ -47860,7 +47859,7 @@ - (void)clearCredentialWithParams:(MTRDoorLockClusterClearCredentialParams *)par auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::ClearCredential::Type; @@ -47887,7 +47886,7 @@ - (void)unboltDoorWithParams:(MTRDoorLockClusterUnboltDoorParams * _Nullable)par auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::UnboltDoor::Type; @@ -91849,7 +91848,7 @@ - (void)getSetupPINWithParams:(MTRAccountLoginClusterGetSetupPINParams *)params auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = AccountLogin::Commands::GetSetupPIN::Type; @@ -91876,7 +91875,7 @@ - (void)loginWithParams:(MTRAccountLoginClusterLoginParams *)params completion:( auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = AccountLogin::Commands::Login::Type; @@ -91907,7 +91906,7 @@ - (void)logoutWithParams:(MTRAccountLoginClusterLogoutParams * _Nullable)params auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = AccountLogin::Commands::Logout::Type; @@ -102738,7 +102737,7 @@ - (void)timedInvokeRequestWithParams:(MTRUnitTestingClusterTimedInvokeRequestPar auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = UnitTesting::Commands::TimedInvokeRequest::Type; @@ -106282,9 +106281,6 @@ - (void)writeAttributeTimedWriteBooleanWithValue:(NSNumber * _Nonnull)value para timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue); } } - if (!timedWriteTimeout.HasValue()) { - timedWriteTimeout.SetValue(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); - } ListFreer listFreer; using TypeInfo = UnitTesting::Attributes::TimedWriteBoolean::TypeInfo; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 4a7e4e27ccf3ac..329fdafa6eeda8 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -22,7 +22,6 @@ #import "MTRCluster_Internal.h" #import "MTRClusters_Internal.h" #import "MTRCommandPayloadsObjc.h" -#import "MTRDefines_Internal.h" #import "MTRDevice_Internal.h" #import "MTRLogging_Internal.h" #import "MTRStructsObjc.h" @@ -5857,7 +5856,7 @@ - (void)openCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterO auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = AdministratorCommissioning::Commands::OpenCommissioningWindow::Type; @@ -5887,7 +5886,7 @@ - (void)openBasicCommissioningWindowWithParams:(MTRAdministratorCommissioningClu auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type; @@ -5921,7 +5920,7 @@ - (void)revokeCommissioningWithParams:(MTRAdministratorCommissioningClusterRevok auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = AdministratorCommissioning::Commands::RevokeCommissioning::Type; @@ -8904,7 +8903,7 @@ - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::LockDoor::Type; @@ -8934,7 +8933,7 @@ - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)par auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::UnlockDoor::Type; @@ -8964,7 +8963,7 @@ - (void)unlockWithTimeoutWithParams:(MTRDoorLockClusterUnlockWithTimeoutParams * auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::UnlockWithTimeout::Type; @@ -9237,7 +9236,7 @@ - (void)setUserWithParams:(MTRDoorLockClusterSetUserParams *)params expectedValu auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::SetUser::Type; @@ -9294,7 +9293,7 @@ - (void)clearUserWithParams:(MTRDoorLockClusterClearUserParams *)params expected auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::ClearUser::Type; @@ -9324,7 +9323,7 @@ - (void)setCredentialWithParams:(MTRDoorLockClusterSetCredentialParams *)params auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::SetCredential::Type; @@ -9381,7 +9380,7 @@ - (void)clearCredentialWithParams:(MTRDoorLockClusterClearCredentialParams *)par auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::ClearCredential::Type; @@ -9411,7 +9410,7 @@ - (void)unboltDoorWithParams:(MTRDoorLockClusterUnboltDoorParams * _Nullable)par auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = DoorLock::Commands::UnboltDoor::Type; @@ -16714,7 +16713,7 @@ - (void)getSetupPINWithParams:(MTRAccountLoginClusterGetSetupPINParams *)params auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = AccountLogin::Commands::GetSetupPIN::Type; @@ -16744,7 +16743,7 @@ - (void)loginWithParams:(MTRAccountLoginClusterLoginParams *)params expectedValu auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = AccountLogin::Commands::Login::Type; @@ -16778,7 +16777,7 @@ - (void)logoutWithParams:(MTRAccountLoginClusterLogoutParams * _Nullable)params auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = AccountLogin::Commands::Logout::Type; @@ -18246,7 +18245,7 @@ - (void)timedInvokeRequestWithParams:(MTRUnitTestingClusterTimedInvokeRequestPar auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; if (timedInvokeTimeoutMs == nil) { - timedInvokeTimeoutMs = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedInvokeTimeoutMs = @(10000); } using RequestType = UnitTesting::Commands::TimedInvokeRequest::Type; @@ -19061,7 +19060,7 @@ - (void)writeAttributeTimedWriteBooleanWithValue:(NSDictionary * { NSNumber * timedWriteTimeout = params.timedWriteTimeout; if (!timedWriteTimeout) { - timedWriteTimeout = @(MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS); + timedWriteTimeout = @(10000); } [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeUnitTestingID) attributeID:@(MTRAttributeIDTypeClusterUnitTestingAttributeTimedWriteBooleanID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout]; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm deleted file mode 100644 index 9bfe9808a3d775..00000000000000 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm +++ /dev/null @@ -1,1210 +0,0 @@ -/* - * - * 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. - */ - -#import "MTRCommandTimedCheck.h" - -#include -#include - -using namespace chip; -using namespace chip::app; - -static BOOL CommandNeedsTimedInvokeInIdentifyCluster(AttributeId aAttributeId) -{ - using namespace Clusters::Identify; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInGroupsCluster(AttributeId aAttributeId) -{ - using namespace Clusters::Groups; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInScenesCluster(AttributeId aAttributeId) -{ - using namespace Clusters::Scenes; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInOnOffCluster(AttributeId aAttributeId) -{ - using namespace Clusters::OnOff; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInOnOffSwitchConfigurationCluster(AttributeId aAttributeId) -{ - using namespace Clusters::OnOffSwitchConfiguration; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInLevelControlCluster(AttributeId aAttributeId) -{ - using namespace Clusters::LevelControl; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInBinaryInputBasicCluster(AttributeId aAttributeId) -{ - using namespace Clusters::BinaryInputBasic; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInPulseWidthModulationCluster(AttributeId aAttributeId) -{ - using namespace Clusters::PulseWidthModulation; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInDescriptorCluster(AttributeId aAttributeId) -{ - using namespace Clusters::Descriptor; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInBindingCluster(AttributeId aAttributeId) -{ - using namespace Clusters::Binding; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInAccessControlCluster(AttributeId aAttributeId) -{ - using namespace Clusters::AccessControl; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInActionsCluster(AttributeId aAttributeId) -{ - using namespace Clusters::Actions; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInBasicInformationCluster(AttributeId aAttributeId) -{ - using namespace Clusters::BasicInformation; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInOTASoftwareUpdateProviderCluster(AttributeId aAttributeId) -{ - using namespace Clusters::OtaSoftwareUpdateProvider; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInOTASoftwareUpdateRequestorCluster(AttributeId aAttributeId) -{ - using namespace Clusters::OtaSoftwareUpdateRequestor; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInLocalizationConfigurationCluster(AttributeId aAttributeId) -{ - using namespace Clusters::LocalizationConfiguration; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInTimeFormatLocalizationCluster(AttributeId aAttributeId) -{ - using namespace Clusters::TimeFormatLocalization; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInUnitLocalizationCluster(AttributeId aAttributeId) -{ - using namespace Clusters::UnitLocalization; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInPowerSourceConfigurationCluster(AttributeId aAttributeId) -{ - using namespace Clusters::PowerSourceConfiguration; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInPowerSourceCluster(AttributeId aAttributeId) -{ - using namespace Clusters::PowerSource; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInGeneralCommissioningCluster(AttributeId aAttributeId) -{ - using namespace Clusters::GeneralCommissioning; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInNetworkCommissioningCluster(AttributeId aAttributeId) -{ - using namespace Clusters::NetworkCommissioning; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInDiagnosticLogsCluster(AttributeId aAttributeId) -{ - using namespace Clusters::DiagnosticLogs; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInGeneralDiagnosticsCluster(AttributeId aAttributeId) -{ - using namespace Clusters::GeneralDiagnostics; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInSoftwareDiagnosticsCluster(AttributeId aAttributeId) -{ - using namespace Clusters::SoftwareDiagnostics; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInThreadNetworkDiagnosticsCluster(AttributeId aAttributeId) -{ - using namespace Clusters::ThreadNetworkDiagnostics; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInWiFiNetworkDiagnosticsCluster(AttributeId aAttributeId) -{ - using namespace Clusters::WiFiNetworkDiagnostics; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInEthernetNetworkDiagnosticsCluster(AttributeId aAttributeId) -{ - using namespace Clusters::EthernetNetworkDiagnostics; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInTimeSynchronizationCluster(AttributeId aAttributeId) -{ - using namespace Clusters::TimeSynchronization; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInBridgedDeviceBasicInformationCluster(AttributeId aAttributeId) -{ - using namespace Clusters::BridgedDeviceBasicInformation; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInSwitchCluster(AttributeId aAttributeId) -{ - using namespace Clusters::Switch; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInAdministratorCommissioningCluster(AttributeId aAttributeId) -{ - using namespace Clusters::AdministratorCommissioning; - switch (aAttributeId) { - case Commands::OpenCommissioningWindow::Id: { - return YES; - } - case Commands::OpenBasicCommissioningWindow::Id: { - return YES; - } - case Commands::RevokeCommissioning::Id: { - return YES; - } - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInOperationalCredentialsCluster(AttributeId aAttributeId) -{ - using namespace Clusters::OperationalCredentials; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInGroupKeyManagementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::GroupKeyManagement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInFixedLabelCluster(AttributeId aAttributeId) -{ - using namespace Clusters::FixedLabel; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInUserLabelCluster(AttributeId aAttributeId) -{ - using namespace Clusters::UserLabel; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInBooleanStateCluster(AttributeId aAttributeId) -{ - using namespace Clusters::BooleanState; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInICDManagementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::IcdManagement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInModeSelectCluster(AttributeId aAttributeId) -{ - using namespace Clusters::ModeSelect; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInLaundryWasherModeCluster(AttributeId aAttributeId) -{ - using namespace Clusters::LaundryWasherMode; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInRefrigeratorAndTemperatureControlledCabinetModeCluster(AttributeId aAttributeId) -{ - using namespace Clusters::RefrigeratorAndTemperatureControlledCabinetMode; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInLaundryWasherControlsCluster(AttributeId aAttributeId) -{ - using namespace Clusters::LaundryWasherControls; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInRVCRunModeCluster(AttributeId aAttributeId) -{ - using namespace Clusters::RvcRunMode; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInRVCCleanModeCluster(AttributeId aAttributeId) -{ - using namespace Clusters::RvcCleanMode; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInTemperatureControlCluster(AttributeId aAttributeId) -{ - using namespace Clusters::TemperatureControl; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInRefrigeratorAlarmCluster(AttributeId aAttributeId) -{ - using namespace Clusters::RefrigeratorAlarm; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInDishwasherModeCluster(AttributeId aAttributeId) -{ - using namespace Clusters::DishwasherMode; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInAirQualityCluster(AttributeId aAttributeId) -{ - using namespace Clusters::AirQuality; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInSmokeCOAlarmCluster(AttributeId aAttributeId) -{ - using namespace Clusters::SmokeCoAlarm; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInDishwasherAlarmCluster(AttributeId aAttributeId) -{ - using namespace Clusters::DishwasherAlarm; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInOperationalStateCluster(AttributeId aAttributeId) -{ - using namespace Clusters::OperationalState; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInRVCOperationalStateCluster(AttributeId aAttributeId) -{ - using namespace Clusters::RvcOperationalState; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInHEPAFilterMonitoringCluster(AttributeId aAttributeId) -{ - using namespace Clusters::HepaFilterMonitoring; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInActivatedCarbonFilterMonitoringCluster(AttributeId aAttributeId) -{ - using namespace Clusters::ActivatedCarbonFilterMonitoring; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInDoorLockCluster(AttributeId aAttributeId) -{ - using namespace Clusters::DoorLock; - switch (aAttributeId) { - case Commands::LockDoor::Id: { - return YES; - } - case Commands::UnlockDoor::Id: { - return YES; - } - case Commands::UnlockWithTimeout::Id: { - return YES; - } - case Commands::SetUser::Id: { - return YES; - } - case Commands::ClearUser::Id: { - return YES; - } - case Commands::SetCredential::Id: { - return YES; - } - case Commands::ClearCredential::Id: { - return YES; - } - case Commands::UnboltDoor::Id: { - return YES; - } - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInWindowCoveringCluster(AttributeId aAttributeId) -{ - using namespace Clusters::WindowCovering; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInBarrierControlCluster(AttributeId aAttributeId) -{ - using namespace Clusters::BarrierControl; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInPumpConfigurationAndControlCluster(AttributeId aAttributeId) -{ - using namespace Clusters::PumpConfigurationAndControl; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInThermostatCluster(AttributeId aAttributeId) -{ - using namespace Clusters::Thermostat; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInFanControlCluster(AttributeId aAttributeId) -{ - using namespace Clusters::FanControl; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInThermostatUserInterfaceConfigurationCluster(AttributeId aAttributeId) -{ - using namespace Clusters::ThermostatUserInterfaceConfiguration; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInColorControlCluster(AttributeId aAttributeId) -{ - using namespace Clusters::ColorControl; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInBallastConfigurationCluster(AttributeId aAttributeId) -{ - using namespace Clusters::BallastConfiguration; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInIlluminanceMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::IlluminanceMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInTemperatureMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::TemperatureMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInPressureMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::PressureMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInFlowMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::FlowMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInRelativeHumidityMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::RelativeHumidityMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInOccupancySensingCluster(AttributeId aAttributeId) -{ - using namespace Clusters::OccupancySensing; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInCarbonMonoxideConcentrationMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::CarbonMonoxideConcentrationMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInCarbonDioxideConcentrationMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::CarbonDioxideConcentrationMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInNitrogenDioxideConcentrationMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::NitrogenDioxideConcentrationMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInOzoneConcentrationMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::OzoneConcentrationMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInPM25ConcentrationMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::Pm25ConcentrationMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInFormaldehydeConcentrationMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::FormaldehydeConcentrationMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInPM1ConcentrationMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::Pm1ConcentrationMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInPM10ConcentrationMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::Pm10ConcentrationMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInTotalVolatileOrganicCompoundsConcentrationMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::TotalVolatileOrganicCompoundsConcentrationMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInRadonConcentrationMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::RadonConcentrationMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInWakeOnLANCluster(AttributeId aAttributeId) -{ - using namespace Clusters::WakeOnLan; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInChannelCluster(AttributeId aAttributeId) -{ - using namespace Clusters::Channel; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInTargetNavigatorCluster(AttributeId aAttributeId) -{ - using namespace Clusters::TargetNavigator; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInMediaPlaybackCluster(AttributeId aAttributeId) -{ - using namespace Clusters::MediaPlayback; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInMediaInputCluster(AttributeId aAttributeId) -{ - using namespace Clusters::MediaInput; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInLowPowerCluster(AttributeId aAttributeId) -{ - using namespace Clusters::LowPower; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInKeypadInputCluster(AttributeId aAttributeId) -{ - using namespace Clusters::KeypadInput; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInContentLauncherCluster(AttributeId aAttributeId) -{ - using namespace Clusters::ContentLauncher; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInAudioOutputCluster(AttributeId aAttributeId) -{ - using namespace Clusters::AudioOutput; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInApplicationLauncherCluster(AttributeId aAttributeId) -{ - using namespace Clusters::ApplicationLauncher; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInApplicationBasicCluster(AttributeId aAttributeId) -{ - using namespace Clusters::ApplicationBasic; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInAccountLoginCluster(AttributeId aAttributeId) -{ - using namespace Clusters::AccountLogin; - switch (aAttributeId) { - case Commands::GetSetupPIN::Id: { - return YES; - } - case Commands::Login::Id: { - return YES; - } - case Commands::Logout::Id: { - return YES; - } - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInElectricalMeasurementCluster(AttributeId aAttributeId) -{ - using namespace Clusters::ElectricalMeasurement; - switch (aAttributeId) { - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInUnitTestingCluster(AttributeId aAttributeId) -{ - using namespace Clusters::UnitTesting; - switch (aAttributeId) { - case Commands::TimedInvokeRequest::Id: { - return YES; - } - default: { - return NO; - } - } -} -static BOOL CommandNeedsTimedInvokeInSampleMEICluster(AttributeId aAttributeId) -{ - using namespace Clusters::SampleMei; - switch (aAttributeId) { - default: { - return NO; - } - } -} - -BOOL MTRCommandNeedsTimedInvoke(NSNumber * _Nonnull aClusterID, NSNumber * _Nonnull aCommandID) -{ - ClusterId clusterID = static_cast(aClusterID.unsignedLongLongValue); - CommandId commandID = static_cast(aCommandID.unsignedLongLongValue); - - switch (clusterID) { - case Clusters::Identify::Id: { - return CommandNeedsTimedInvokeInIdentifyCluster(commandID); - } - case Clusters::Groups::Id: { - return CommandNeedsTimedInvokeInGroupsCluster(commandID); - } - case Clusters::Scenes::Id: { - return CommandNeedsTimedInvokeInScenesCluster(commandID); - } - case Clusters::OnOff::Id: { - return CommandNeedsTimedInvokeInOnOffCluster(commandID); - } - case Clusters::OnOffSwitchConfiguration::Id: { - return CommandNeedsTimedInvokeInOnOffSwitchConfigurationCluster(commandID); - } - case Clusters::LevelControl::Id: { - return CommandNeedsTimedInvokeInLevelControlCluster(commandID); - } - case Clusters::BinaryInputBasic::Id: { - return CommandNeedsTimedInvokeInBinaryInputBasicCluster(commandID); - } - case Clusters::PulseWidthModulation::Id: { - return CommandNeedsTimedInvokeInPulseWidthModulationCluster(commandID); - } - case Clusters::Descriptor::Id: { - return CommandNeedsTimedInvokeInDescriptorCluster(commandID); - } - case Clusters::Binding::Id: { - return CommandNeedsTimedInvokeInBindingCluster(commandID); - } - case Clusters::AccessControl::Id: { - return CommandNeedsTimedInvokeInAccessControlCluster(commandID); - } - case Clusters::Actions::Id: { - return CommandNeedsTimedInvokeInActionsCluster(commandID); - } - case Clusters::BasicInformation::Id: { - return CommandNeedsTimedInvokeInBasicInformationCluster(commandID); - } - case Clusters::OtaSoftwareUpdateProvider::Id: { - return CommandNeedsTimedInvokeInOTASoftwareUpdateProviderCluster(commandID); - } - case Clusters::OtaSoftwareUpdateRequestor::Id: { - return CommandNeedsTimedInvokeInOTASoftwareUpdateRequestorCluster(commandID); - } - case Clusters::LocalizationConfiguration::Id: { - return CommandNeedsTimedInvokeInLocalizationConfigurationCluster(commandID); - } - case Clusters::TimeFormatLocalization::Id: { - return CommandNeedsTimedInvokeInTimeFormatLocalizationCluster(commandID); - } - case Clusters::UnitLocalization::Id: { - return CommandNeedsTimedInvokeInUnitLocalizationCluster(commandID); - } - case Clusters::PowerSourceConfiguration::Id: { - return CommandNeedsTimedInvokeInPowerSourceConfigurationCluster(commandID); - } - case Clusters::PowerSource::Id: { - return CommandNeedsTimedInvokeInPowerSourceCluster(commandID); - } - case Clusters::GeneralCommissioning::Id: { - return CommandNeedsTimedInvokeInGeneralCommissioningCluster(commandID); - } - case Clusters::NetworkCommissioning::Id: { - return CommandNeedsTimedInvokeInNetworkCommissioningCluster(commandID); - } - case Clusters::DiagnosticLogs::Id: { - return CommandNeedsTimedInvokeInDiagnosticLogsCluster(commandID); - } - case Clusters::GeneralDiagnostics::Id: { - return CommandNeedsTimedInvokeInGeneralDiagnosticsCluster(commandID); - } - case Clusters::SoftwareDiagnostics::Id: { - return CommandNeedsTimedInvokeInSoftwareDiagnosticsCluster(commandID); - } - case Clusters::ThreadNetworkDiagnostics::Id: { - return CommandNeedsTimedInvokeInThreadNetworkDiagnosticsCluster(commandID); - } - case Clusters::WiFiNetworkDiagnostics::Id: { - return CommandNeedsTimedInvokeInWiFiNetworkDiagnosticsCluster(commandID); - } - case Clusters::EthernetNetworkDiagnostics::Id: { - return CommandNeedsTimedInvokeInEthernetNetworkDiagnosticsCluster(commandID); - } - case Clusters::TimeSynchronization::Id: { - return CommandNeedsTimedInvokeInTimeSynchronizationCluster(commandID); - } - case Clusters::BridgedDeviceBasicInformation::Id: { - return CommandNeedsTimedInvokeInBridgedDeviceBasicInformationCluster(commandID); - } - case Clusters::Switch::Id: { - return CommandNeedsTimedInvokeInSwitchCluster(commandID); - } - case Clusters::AdministratorCommissioning::Id: { - return CommandNeedsTimedInvokeInAdministratorCommissioningCluster(commandID); - } - case Clusters::OperationalCredentials::Id: { - return CommandNeedsTimedInvokeInOperationalCredentialsCluster(commandID); - } - case Clusters::GroupKeyManagement::Id: { - return CommandNeedsTimedInvokeInGroupKeyManagementCluster(commandID); - } - case Clusters::FixedLabel::Id: { - return CommandNeedsTimedInvokeInFixedLabelCluster(commandID); - } - case Clusters::UserLabel::Id: { - return CommandNeedsTimedInvokeInUserLabelCluster(commandID); - } - case Clusters::BooleanState::Id: { - return CommandNeedsTimedInvokeInBooleanStateCluster(commandID); - } - case Clusters::IcdManagement::Id: { - return CommandNeedsTimedInvokeInICDManagementCluster(commandID); - } - case Clusters::ModeSelect::Id: { - return CommandNeedsTimedInvokeInModeSelectCluster(commandID); - } - case Clusters::LaundryWasherMode::Id: { - return CommandNeedsTimedInvokeInLaundryWasherModeCluster(commandID); - } - case Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id: { - return CommandNeedsTimedInvokeInRefrigeratorAndTemperatureControlledCabinetModeCluster(commandID); - } - case Clusters::LaundryWasherControls::Id: { - return CommandNeedsTimedInvokeInLaundryWasherControlsCluster(commandID); - } - case Clusters::RvcRunMode::Id: { - return CommandNeedsTimedInvokeInRVCRunModeCluster(commandID); - } - case Clusters::RvcCleanMode::Id: { - return CommandNeedsTimedInvokeInRVCCleanModeCluster(commandID); - } - case Clusters::TemperatureControl::Id: { - return CommandNeedsTimedInvokeInTemperatureControlCluster(commandID); - } - case Clusters::RefrigeratorAlarm::Id: { - return CommandNeedsTimedInvokeInRefrigeratorAlarmCluster(commandID); - } - case Clusters::DishwasherMode::Id: { - return CommandNeedsTimedInvokeInDishwasherModeCluster(commandID); - } - case Clusters::AirQuality::Id: { - return CommandNeedsTimedInvokeInAirQualityCluster(commandID); - } - case Clusters::SmokeCoAlarm::Id: { - return CommandNeedsTimedInvokeInSmokeCOAlarmCluster(commandID); - } - case Clusters::DishwasherAlarm::Id: { - return CommandNeedsTimedInvokeInDishwasherAlarmCluster(commandID); - } - case Clusters::OperationalState::Id: { - return CommandNeedsTimedInvokeInOperationalStateCluster(commandID); - } - case Clusters::RvcOperationalState::Id: { - return CommandNeedsTimedInvokeInRVCOperationalStateCluster(commandID); - } - case Clusters::HepaFilterMonitoring::Id: { - return CommandNeedsTimedInvokeInHEPAFilterMonitoringCluster(commandID); - } - case Clusters::ActivatedCarbonFilterMonitoring::Id: { - return CommandNeedsTimedInvokeInActivatedCarbonFilterMonitoringCluster(commandID); - } - case Clusters::DoorLock::Id: { - return CommandNeedsTimedInvokeInDoorLockCluster(commandID); - } - case Clusters::WindowCovering::Id: { - return CommandNeedsTimedInvokeInWindowCoveringCluster(commandID); - } - case Clusters::BarrierControl::Id: { - return CommandNeedsTimedInvokeInBarrierControlCluster(commandID); - } - case Clusters::PumpConfigurationAndControl::Id: { - return CommandNeedsTimedInvokeInPumpConfigurationAndControlCluster(commandID); - } - case Clusters::Thermostat::Id: { - return CommandNeedsTimedInvokeInThermostatCluster(commandID); - } - case Clusters::FanControl::Id: { - return CommandNeedsTimedInvokeInFanControlCluster(commandID); - } - case Clusters::ThermostatUserInterfaceConfiguration::Id: { - return CommandNeedsTimedInvokeInThermostatUserInterfaceConfigurationCluster(commandID); - } - case Clusters::ColorControl::Id: { - return CommandNeedsTimedInvokeInColorControlCluster(commandID); - } - case Clusters::BallastConfiguration::Id: { - return CommandNeedsTimedInvokeInBallastConfigurationCluster(commandID); - } - case Clusters::IlluminanceMeasurement::Id: { - return CommandNeedsTimedInvokeInIlluminanceMeasurementCluster(commandID); - } - case Clusters::TemperatureMeasurement::Id: { - return CommandNeedsTimedInvokeInTemperatureMeasurementCluster(commandID); - } - case Clusters::PressureMeasurement::Id: { - return CommandNeedsTimedInvokeInPressureMeasurementCluster(commandID); - } - case Clusters::FlowMeasurement::Id: { - return CommandNeedsTimedInvokeInFlowMeasurementCluster(commandID); - } - case Clusters::RelativeHumidityMeasurement::Id: { - return CommandNeedsTimedInvokeInRelativeHumidityMeasurementCluster(commandID); - } - case Clusters::OccupancySensing::Id: { - return CommandNeedsTimedInvokeInOccupancySensingCluster(commandID); - } - case Clusters::CarbonMonoxideConcentrationMeasurement::Id: { - return CommandNeedsTimedInvokeInCarbonMonoxideConcentrationMeasurementCluster(commandID); - } - case Clusters::CarbonDioxideConcentrationMeasurement::Id: { - return CommandNeedsTimedInvokeInCarbonDioxideConcentrationMeasurementCluster(commandID); - } - case Clusters::NitrogenDioxideConcentrationMeasurement::Id: { - return CommandNeedsTimedInvokeInNitrogenDioxideConcentrationMeasurementCluster(commandID); - } - case Clusters::OzoneConcentrationMeasurement::Id: { - return CommandNeedsTimedInvokeInOzoneConcentrationMeasurementCluster(commandID); - } - case Clusters::Pm25ConcentrationMeasurement::Id: { - return CommandNeedsTimedInvokeInPM25ConcentrationMeasurementCluster(commandID); - } - case Clusters::FormaldehydeConcentrationMeasurement::Id: { - return CommandNeedsTimedInvokeInFormaldehydeConcentrationMeasurementCluster(commandID); - } - case Clusters::Pm1ConcentrationMeasurement::Id: { - return CommandNeedsTimedInvokeInPM1ConcentrationMeasurementCluster(commandID); - } - case Clusters::Pm10ConcentrationMeasurement::Id: { - return CommandNeedsTimedInvokeInPM10ConcentrationMeasurementCluster(commandID); - } - case Clusters::TotalVolatileOrganicCompoundsConcentrationMeasurement::Id: { - return CommandNeedsTimedInvokeInTotalVolatileOrganicCompoundsConcentrationMeasurementCluster(commandID); - } - case Clusters::RadonConcentrationMeasurement::Id: { - return CommandNeedsTimedInvokeInRadonConcentrationMeasurementCluster(commandID); - } - case Clusters::WakeOnLan::Id: { - return CommandNeedsTimedInvokeInWakeOnLANCluster(commandID); - } - case Clusters::Channel::Id: { - return CommandNeedsTimedInvokeInChannelCluster(commandID); - } - case Clusters::TargetNavigator::Id: { - return CommandNeedsTimedInvokeInTargetNavigatorCluster(commandID); - } - case Clusters::MediaPlayback::Id: { - return CommandNeedsTimedInvokeInMediaPlaybackCluster(commandID); - } - case Clusters::MediaInput::Id: { - return CommandNeedsTimedInvokeInMediaInputCluster(commandID); - } - case Clusters::LowPower::Id: { - return CommandNeedsTimedInvokeInLowPowerCluster(commandID); - } - case Clusters::KeypadInput::Id: { - return CommandNeedsTimedInvokeInKeypadInputCluster(commandID); - } - case Clusters::ContentLauncher::Id: { - return CommandNeedsTimedInvokeInContentLauncherCluster(commandID); - } - case Clusters::AudioOutput::Id: { - return CommandNeedsTimedInvokeInAudioOutputCluster(commandID); - } - case Clusters::ApplicationLauncher::Id: { - return CommandNeedsTimedInvokeInApplicationLauncherCluster(commandID); - } - case Clusters::ApplicationBasic::Id: { - return CommandNeedsTimedInvokeInApplicationBasicCluster(commandID); - } - case Clusters::AccountLogin::Id: { - return CommandNeedsTimedInvokeInAccountLoginCluster(commandID); - } - case Clusters::ElectricalMeasurement::Id: { - return CommandNeedsTimedInvokeInElectricalMeasurementCluster(commandID); - } - case Clusters::UnitTesting::Id: { - return CommandNeedsTimedInvokeInUnitTestingCluster(commandID); - } - case Clusters::SampleMei::Id: { - return CommandNeedsTimedInvokeInSampleMEICluster(commandID); - } - default: { - return NO; - } - } -} diff --git a/src/darwin/Framework/CHIPTests/MTRDeviceTests.m b/src/darwin/Framework/CHIPTests/MTRDeviceTests.m index 0e33264ef7e64e..04c80ee8ba0d13 100644 --- a/src/darwin/Framework/CHIPTests/MTRDeviceTests.m +++ b/src/darwin/Framework/CHIPTests/MTRDeviceTests.m @@ -2240,15 +2240,12 @@ - (void)test023_SubscribeMultipleAttributes { XCTAssertTrue([values isKindOfClass:[NSArray class]]); NSArray * resultArray = values; - XCTAssertEqual(resultArray.count, 1); for (NSDictionary * result in resultArray) { MTRCommandPath * path = result[@"commandPath"]; XCTAssertEqualObjects(path.endpoint, @1); XCTAssertEqualObjects(path.cluster, @6); XCTAssertEqualObjects(path.command, @1); XCTAssertNil(result[@"error"]); - // This command just has a status response. - XCTAssertNil(result[@"value"]); } XCTAssertEqual([resultArray count], 1); } diff --git a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj index b2fc3f8c50e86a..33032722024600 100644 --- a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj +++ b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj @@ -164,9 +164,6 @@ 5173A47929C0E82300F67F48 /* MTRFabricInfoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5173A47829C0E82300F67F48 /* MTRFabricInfoTests.m */; }; 51742B4A29CB5FC1009974FE /* MTRTestResetCommissioneeHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 51742B4929CB5FC0009974FE /* MTRTestResetCommissioneeHelper.m */; }; 51742B4E29CB6B88009974FE /* MTRPairingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 51742B4D29CB6B88009974FE /* MTRPairingTests.m */; }; - 5178E67E2AE098210069DF72 /* MTRCommandTimedCheck.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5178E67D2AE098210069DF72 /* MTRCommandTimedCheck.mm */; }; - 5178E6812AE098520069DF72 /* MTRCommandTimedCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 5178E67F2AE098510069DF72 /* MTRCommandTimedCheck.h */; }; - 5178E6822AE098520069DF72 /* MTRCommissionableBrowserResult_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5178E6802AE098520069DF72 /* MTRCommissionableBrowserResult_Internal.h */; }; 517BF3F0282B62B800A8B7DB /* MTRCertificates.h in Headers */ = {isa = PBXBuildFile; fileRef = 517BF3EE282B62B800A8B7DB /* MTRCertificates.h */; settings = {ATTRIBUTES = (Public, ); }; }; 517BF3F1282B62B800A8B7DB /* MTRCertificates.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517BF3EF282B62B800A8B7DB /* MTRCertificates.mm */; }; 517BF3F3282B62CB00A8B7DB /* MTRCertificateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 517BF3F2282B62CB00A8B7DB /* MTRCertificateTests.m */; }; @@ -522,12 +519,6 @@ 51742B4829CB5F45009974FE /* MTRTestResetCommissioneeHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRTestResetCommissioneeHelper.h; sourceTree = ""; }; 51742B4929CB5FC0009974FE /* MTRTestResetCommissioneeHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTRTestResetCommissioneeHelper.m; sourceTree = ""; }; 51742B4D29CB6B88009974FE /* MTRPairingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTRPairingTests.m; sourceTree = ""; }; - 5178E6592AE097A20069DF72 /* MTRCommandPayloads_Internal.zapt */ = {isa = PBXFileReference; lastKnownFileType = text; path = MTRCommandPayloads_Internal.zapt; sourceTree = ""; }; - 5178E65A2AE097A20069DF72 /* MTRCommandTimedCheck-src.zapt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "MTRCommandTimedCheck-src.zapt"; sourceTree = ""; }; - 5178E65B2AE097B30069DF72 /* availability.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.yaml; path = availability.yaml; sourceTree = ""; }; - 5178E67D2AE098210069DF72 /* MTRCommandTimedCheck.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRCommandTimedCheck.mm; sourceTree = ""; }; - 5178E67F2AE098510069DF72 /* MTRCommandTimedCheck.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRCommandTimedCheck.h; sourceTree = ""; }; - 5178E6802AE098520069DF72 /* MTRCommissionableBrowserResult_Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRCommissionableBrowserResult_Internal.h; sourceTree = ""; }; 517BF3EE282B62B800A8B7DB /* MTRCertificates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRCertificates.h; sourceTree = ""; }; 517BF3EF282B62B800A8B7DB /* MTRCertificates.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRCertificates.mm; sourceTree = ""; }; 517BF3F2282B62CB00A8B7DB /* MTRCertificateTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTRCertificateTests.m; sourceTree = ""; }; @@ -990,7 +981,6 @@ 7560FD1B27FBBD3F005E85B3 /* MTREventTLVValueDecoder.mm */, 51B22C1D2740CB0A008D5055 /* MTRStructsObjc.h */, 51B22C252740CB32008D5055 /* MTRStructsObjc.mm */, - 5178E67D2AE098210069DF72 /* MTRCommandTimedCheck.mm */, ); path = "zap-generated"; sourceTree = ""; @@ -1029,9 +1019,6 @@ 3D84371D294984AF0070D20A /* MTREventTLVValueDecoder-src.zapt */, 3D84371F294984AF0070D20A /* MTRStructsObjc.zapt */, 3D843722294984AF0070D20A /* MTRStructsObjc-src.zapt */, - 5178E6592AE097A20069DF72 /* MTRCommandPayloads_Internal.zapt */, - 5178E65A2AE097A20069DF72 /* MTRCommandTimedCheck-src.zapt */, - 5178E65B2AE097B30069DF72 /* availability.yaml */, 3D843729294984AF0070D20A /* partials */, ); path = templates; @@ -1134,9 +1121,7 @@ 5ACDDD7B27CD14AF00EFD68A /* MTRClusterStateCacheContainer_Internal.h */, 5ACDDD7C27CD16D200EFD68A /* MTRClusterStateCacheContainer.mm */, 5A60370727EA1FF60020DB79 /* MTRClusterStateCacheContainer+XPC.h */, - 5178E67F2AE098510069DF72 /* MTRCommandTimedCheck.h */, 51FE723E2ACDEF3E00437032 /* MTRCommandPayloadExtensions_Internal.h */, - 5178E6802AE098520069DF72 /* MTRCommissionableBrowserResult_Internal.h */, 99D466E02798936D0089A18F /* MTRCommissioningParameters.h */, 99AECC7F2798A57E00B6355B /* MTRCommissioningParameters.mm */, 3DFCB32B29678C9500332B35 /* MTRConversion.h */, @@ -1398,7 +1383,6 @@ 517BF3F0282B62B800A8B7DB /* MTRCertificates.h in Headers */, 51E51FBF282AD37A00FC978D /* MTRDeviceControllerStartupParams.h in Headers */, 5136661628067D550025EDAE /* MTRDeviceControllerFactory.h in Headers */, - 5178E6812AE098520069DF72 /* MTRCommandTimedCheck.h in Headers */, 7596A84B287636C1004DAE0E /* MTRDevice_Internal.h in Headers */, 5A6FEC9927B5C88900F25F42 /* MTRDeviceOverXPC.h in Headers */, 51B22C222740CB1D008D5055 /* MTRCommandPayloadsObjc.h in Headers */, @@ -1428,7 +1412,6 @@ AF1CB86E2874B03B00865A96 /* MTROTAProviderDelegate.h in Headers */, 754F3DF427FBB94B00E60580 /* MTREventTLVValueDecoder_Internal.h in Headers */, 3CF134AF289D90FF0017A19E /* MTROperationalCertificateIssuer.h in Headers */, - 5178E6822AE098520069DF72 /* MTRCommissionableBrowserResult_Internal.h in Headers */, 3CF134AB289D8DF70017A19E /* MTRDeviceAttestationInfo.h in Headers */, B2E0D7B2245B0B5C003C5B48 /* MTRManualSetupPayloadParser.h in Headers */, 3CF134A7289D8ADA0017A19E /* MTRCSRInfo.h in Headers */, @@ -1755,7 +1738,6 @@ 3CF134AD289D8E570017A19E /* MTRDeviceAttestationInfo.mm in Sources */, 2C1B027A2641DB4E00780EF1 /* MTROperationalCredentialsDelegate.mm in Sources */, 7560FD1C27FBBD3F005E85B3 /* MTREventTLVValueDecoder.mm in Sources */, - 5178E67E2AE098210069DF72 /* MTRCommandTimedCheck.mm in Sources */, 7596A84928762783004DAE0E /* MTRAsyncCallbackWorkQueue.mm in Sources */, B2E0D7B9245B0B5C003C5B48 /* MTRSetupPayload.mm in Sources */, B2E0D7B6245B0B5C003C5B48 /* MTRManualSetupPayloadParser.mm in Sources */,