diff --git a/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h index 012f45d40bfa7f..3e4b2c4d8d5ec7 100644 --- a/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h @@ -183,6 +183,7 @@ class ReadAccessControlAcl : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "acl"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -196,6 +197,7 @@ class ReadAccessControlAcl : public ModelCommand { CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block err = CHIP_NO_ERROR; CHIPReadParams * params = [[CHIPReadParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster readAttributeAclWithParams:params completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { NSLog(@"AccessControl.Acl response %@", [value description]); @@ -206,6 +208,9 @@ class ReadAccessControlAcl : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteAccessControlAcl : public ModelCommand { @@ -216,6 +221,7 @@ class WriteAccessControlAcl : public ModelCommand { { AddArgument("attr-name", "acl"); AddArgument("attr-value", &mComplex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -227,7 +233,9 @@ class WriteAccessControlAcl : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSArray * _Nonnull value; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; @@ -284,6 +292,7 @@ class WriteAccessControlAcl : public ModelCommand { } [cluster writeAttributeAclWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "AccessControl Acl Error: %s", chip::ErrorStr(chipError)); @@ -293,6 +302,7 @@ class WriteAccessControlAcl : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::DataModel::List mValue; TypedComplexArgument> mComplex; @@ -306,6 +316,7 @@ class SubscribeAttributeAccessControlAcl : public ModelCommand { AddArgument("attr-name", "acl"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -318,6 +329,7 @@ class SubscribeAttributeAccessControlAcl : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAclWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -338,6 +350,7 @@ class SubscribeAttributeAccessControlAcl : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -352,6 +365,7 @@ class ReadAccessControlExtension : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "extension"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -365,6 +379,7 @@ class ReadAccessControlExtension : public ModelCommand { CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block err = CHIP_NO_ERROR; CHIPReadParams * params = [[CHIPReadParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster readAttributeExtensionWithParams:params completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { NSLog(@"AccessControl.Extension response %@", [value description]); @@ -375,6 +390,9 @@ class ReadAccessControlExtension : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteAccessControlExtension : public ModelCommand { @@ -385,6 +403,7 @@ class WriteAccessControlExtension : public ModelCommand { { AddArgument("attr-name", "extension"); AddArgument("attr-value", &mComplex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -396,7 +415,9 @@ class WriteAccessControlExtension : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSArray * _Nonnull value; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; @@ -411,6 +432,7 @@ class WriteAccessControlExtension : public ModelCommand { } [cluster writeAttributeExtensionWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "AccessControl Extension Error: %s", chip::ErrorStr(chipError)); @@ -420,6 +442,7 @@ class WriteAccessControlExtension : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::DataModel::List mValue; TypedComplexArgument> mComplex; @@ -433,6 +456,7 @@ class SubscribeAttributeAccessControlExtension : public ModelCommand { AddArgument("attr-name", "extension"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -445,6 +469,7 @@ class SubscribeAttributeAccessControlExtension : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeExtensionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -465,6 +490,7 @@ class SubscribeAttributeAccessControlExtension : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -479,6 +505,7 @@ class ReadAccessControlSubjectsPerAccessControlEntry : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "subjects-per-access-control-entry"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -501,6 +528,9 @@ class ReadAccessControlSubjectsPerAccessControlEntry : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAccessControlSubjectsPerAccessControlEntry : public ModelCommand { @@ -511,6 +541,7 @@ class SubscribeAttributeAccessControlSubjectsPerAccessControlEntry : public Mode AddArgument("attr-name", "subjects-per-access-control-entry"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -523,6 +554,7 @@ class SubscribeAttributeAccessControlSubjectsPerAccessControlEntry : public Mode dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSubjectsPerAccessControlEntryWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -546,6 +578,7 @@ class SubscribeAttributeAccessControlSubjectsPerAccessControlEntry : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -560,6 +593,7 @@ class ReadAccessControlTargetsPerAccessControlEntry : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "targets-per-access-control-entry"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -582,6 +616,9 @@ class ReadAccessControlTargetsPerAccessControlEntry : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAccessControlTargetsPerAccessControlEntry : public ModelCommand { @@ -592,6 +629,7 @@ class SubscribeAttributeAccessControlTargetsPerAccessControlEntry : public Model AddArgument("attr-name", "targets-per-access-control-entry"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -604,6 +642,7 @@ class SubscribeAttributeAccessControlTargetsPerAccessControlEntry : public Model dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTargetsPerAccessControlEntryWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -626,6 +665,7 @@ class SubscribeAttributeAccessControlTargetsPerAccessControlEntry : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -640,6 +680,7 @@ class ReadAccessControlAccessControlEntriesPerFabric : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "access-control-entries-per-fabric"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -662,6 +703,9 @@ class ReadAccessControlAccessControlEntriesPerFabric : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAccessControlAccessControlEntriesPerFabric : public ModelCommand { @@ -672,6 +716,7 @@ class SubscribeAttributeAccessControlAccessControlEntriesPerFabric : public Mode AddArgument("attr-name", "access-control-entries-per-fabric"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -684,6 +729,7 @@ class SubscribeAttributeAccessControlAccessControlEntriesPerFabric : public Mode dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAccessControlEntriesPerFabricWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -707,6 +753,7 @@ class SubscribeAttributeAccessControlAccessControlEntriesPerFabric : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -721,6 +768,7 @@ class ReadAccessControlGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -742,6 +790,9 @@ class ReadAccessControlGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAccessControlGeneratedCommandList : public ModelCommand { @@ -752,6 +803,7 @@ class SubscribeAttributeAccessControlGeneratedCommandList : public ModelCommand AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -764,6 +816,7 @@ class SubscribeAttributeAccessControlGeneratedCommandList : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -785,6 +838,7 @@ class SubscribeAttributeAccessControlGeneratedCommandList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -799,6 +853,7 @@ class ReadAccessControlAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -820,6 +875,9 @@ class ReadAccessControlAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAccessControlAcceptedCommandList : public ModelCommand { @@ -830,6 +888,7 @@ class SubscribeAttributeAccessControlAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -842,6 +901,7 @@ class SubscribeAttributeAccessControlAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -863,6 +923,7 @@ class SubscribeAttributeAccessControlAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -877,6 +938,7 @@ class ReadAccessControlAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -898,6 +960,9 @@ class ReadAccessControlAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAccessControlAttributeList : public ModelCommand { @@ -908,6 +973,7 @@ class SubscribeAttributeAccessControlAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -920,6 +986,7 @@ class SubscribeAttributeAccessControlAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -940,6 +1007,7 @@ class SubscribeAttributeAccessControlAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -954,6 +1022,7 @@ class ReadAccessControlClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -975,6 +1044,9 @@ class ReadAccessControlClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAccessControlClusterRevision : public ModelCommand { @@ -985,6 +1057,7 @@ class SubscribeAttributeAccessControlClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -997,6 +1070,7 @@ class SubscribeAttributeAccessControlClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccessControl * cluster = [[CHIPAccessControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -1017,6 +1091,7 @@ class SubscribeAttributeAccessControlClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -1049,6 +1124,7 @@ class AccountLoginGetSetupPIN : public ModelCommand { : ModelCommand("get-setup-pin") { AddArgument("TempAccountIdentifier", &mTempAccountIdentifier); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -1060,7 +1136,8 @@ class AccountLoginGetSetupPIN : public ModelCommand { CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPAccountLoginClusterGetSetupPINParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.tempAccountIdentifier = [[NSString alloc] initWithBytes:mTempAccountIdentifier.data() length:mTempAccountIdentifier.size() encoding:NSUTF8StringEncoding]; @@ -1076,6 +1153,7 @@ class AccountLoginGetSetupPIN : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mTempAccountIdentifier; }; @@ -1089,6 +1167,7 @@ class AccountLoginLogin : public ModelCommand { { AddArgument("TempAccountIdentifier", &mTempAccountIdentifier); AddArgument("SetupPIN", &mSetupPIN); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -1100,11 +1179,11 @@ class AccountLoginLogin : public ModelCommand { CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPAccountLoginClusterLoginParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.tempAccountIdentifier = [[NSString alloc] initWithBytes:mTempAccountIdentifier.data() length:mTempAccountIdentifier.size() encoding:NSUTF8StringEncoding]; - params.setupPIN = [[NSString alloc] initWithBytes:mSetupPIN.data() length:mSetupPIN.size() encoding:NSUTF8StringEncoding]; [cluster loginWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -1116,6 +1195,7 @@ class AccountLoginLogin : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mTempAccountIdentifier; chip::ByteSpan mSetupPIN; }; @@ -1128,6 +1208,7 @@ class AccountLoginLogout : public ModelCommand { AccountLoginLogout() : ModelCommand("logout") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -1138,6 +1219,9 @@ class AccountLoginLogout : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPAccountLoginClusterLogoutParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster logoutWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -1147,6 +1231,7 @@ class AccountLoginLogout : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -1158,6 +1243,7 @@ class ReadAccountLoginGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -1179,6 +1265,9 @@ class ReadAccountLoginGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAccountLoginGeneratedCommandList : public ModelCommand { @@ -1189,6 +1278,7 @@ class SubscribeAttributeAccountLoginGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -1201,6 +1291,7 @@ class SubscribeAttributeAccountLoginGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -1222,6 +1313,7 @@ class SubscribeAttributeAccountLoginGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -1236,6 +1328,7 @@ class ReadAccountLoginAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -1257,6 +1350,9 @@ class ReadAccountLoginAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAccountLoginAcceptedCommandList : public ModelCommand { @@ -1267,6 +1363,7 @@ class SubscribeAttributeAccountLoginAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -1279,6 +1376,7 @@ class SubscribeAttributeAccountLoginAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -1300,6 +1398,7 @@ class SubscribeAttributeAccountLoginAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -1314,6 +1413,7 @@ class ReadAccountLoginAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -1335,6 +1435,9 @@ class ReadAccountLoginAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAccountLoginAttributeList : public ModelCommand { @@ -1345,6 +1448,7 @@ class SubscribeAttributeAccountLoginAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -1357,6 +1461,7 @@ class SubscribeAttributeAccountLoginAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -1377,6 +1482,7 @@ class SubscribeAttributeAccountLoginAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -1391,6 +1497,7 @@ class ReadAccountLoginClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -1412,6 +1519,9 @@ class ReadAccountLoginClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAccountLoginClusterRevision : public ModelCommand { @@ -1422,6 +1532,7 @@ class SubscribeAttributeAccountLoginClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -1434,6 +1545,7 @@ class SubscribeAttributeAccountLoginClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAccountLogin * cluster = [[CHIPAccountLogin alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -1454,6 +1566,7 @@ class SubscribeAttributeAccountLoginClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -1489,6 +1602,7 @@ class AdministratorCommissioningOpenBasicCommissioningWindow : public ModelComma : ModelCommand("open-basic-commissioning-window") { AddArgument("CommissioningTimeout", 0, UINT16_MAX, &mCommissioningTimeout); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -1502,7 +1616,8 @@ class AdministratorCommissioningOpenBasicCommissioningWindow : public ModelComma queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenBasicCommissioningWindowParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.commissioningTimeout = [NSNumber numberWithUnsignedShort:mCommissioningTimeout]; [cluster openBasicCommissioningWindowWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -1514,6 +1629,7 @@ class AdministratorCommissioningOpenBasicCommissioningWindow : public ModelComma } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mCommissioningTimeout; }; @@ -1530,6 +1646,7 @@ class AdministratorCommissioningOpenCommissioningWindow : public ModelCommand { AddArgument("Discriminator", 0, UINT16_MAX, &mDiscriminator); AddArgument("Iterations", 0, UINT32_MAX, &mIterations); AddArgument("Salt", &mSalt); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -1543,15 +1660,12 @@ class AdministratorCommissioningOpenCommissioningWindow : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPAdministratorCommissioningClusterOpenCommissioningWindowParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.commissioningTimeout = [NSNumber numberWithUnsignedShort:mCommissioningTimeout]; - params.pakeVerifier = [[NSData alloc] initWithBytes:mPAKEVerifier.data() length:mPAKEVerifier.size()]; - params.discriminator = [NSNumber numberWithUnsignedShort:mDiscriminator]; - params.iterations = [NSNumber numberWithUnsignedInt:mIterations]; - params.salt = [[NSData alloc] initWithBytes:mSalt.data() length:mSalt.size()]; [cluster openCommissioningWindowWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -1563,6 +1677,7 @@ class AdministratorCommissioningOpenCommissioningWindow : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mCommissioningTimeout; chip::ByteSpan mPAKEVerifier; uint16_t mDiscriminator; @@ -1578,6 +1693,7 @@ class AdministratorCommissioningRevokeCommissioning : public ModelCommand { AdministratorCommissioningRevokeCommissioning() : ModelCommand("revoke-commissioning") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -1590,6 +1706,9 @@ class AdministratorCommissioningRevokeCommissioning : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPAdministratorCommissioningClusterRevokeCommissioningParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster revokeCommissioningWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -1599,6 +1718,7 @@ class AdministratorCommissioningRevokeCommissioning : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -1610,6 +1730,7 @@ class ReadAdministratorCommissioningWindowStatus : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "window-status"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -1633,6 +1754,9 @@ class ReadAdministratorCommissioningWindowStatus : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAdministratorCommissioningWindowStatus : public ModelCommand { @@ -1643,6 +1767,7 @@ class SubscribeAttributeAdministratorCommissioningWindowStatus : public ModelCom AddArgument("attr-name", "window-status"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -1657,6 +1782,7 @@ class SubscribeAttributeAdministratorCommissioningWindowStatus : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeWindowStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -1678,6 +1804,7 @@ class SubscribeAttributeAdministratorCommissioningWindowStatus : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -1692,6 +1819,7 @@ class ReadAdministratorCommissioningAdminFabricIndex : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "admin-fabric-index"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -1715,6 +1843,9 @@ class ReadAdministratorCommissioningAdminFabricIndex : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAdministratorCommissioningAdminFabricIndex : public ModelCommand { @@ -1725,6 +1856,7 @@ class SubscribeAttributeAdministratorCommissioningAdminFabricIndex : public Mode AddArgument("attr-name", "admin-fabric-index"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -1739,6 +1871,7 @@ class SubscribeAttributeAdministratorCommissioningAdminFabricIndex : public Mode endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAdminFabricIndexWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -1760,6 +1893,7 @@ class SubscribeAttributeAdministratorCommissioningAdminFabricIndex : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -1774,6 +1908,7 @@ class ReadAdministratorCommissioningAdminVendorId : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "admin-vendor-id"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -1797,6 +1932,9 @@ class ReadAdministratorCommissioningAdminVendorId : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAdministratorCommissioningAdminVendorId : public ModelCommand { @@ -1807,6 +1945,7 @@ class SubscribeAttributeAdministratorCommissioningAdminVendorId : public ModelCo AddArgument("attr-name", "admin-vendor-id"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -1821,6 +1960,7 @@ class SubscribeAttributeAdministratorCommissioningAdminVendorId : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAdminVendorIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -1842,6 +1982,7 @@ class SubscribeAttributeAdministratorCommissioningAdminVendorId : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -1856,6 +1997,7 @@ class ReadAdministratorCommissioningGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -1879,6 +2021,9 @@ class ReadAdministratorCommissioningGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAdministratorCommissioningGeneratedCommandList : public ModelCommand { @@ -1889,6 +2034,7 @@ class SubscribeAttributeAdministratorCommissioningGeneratedCommandList : public AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -1903,6 +2049,7 @@ class SubscribeAttributeAdministratorCommissioningGeneratedCommandList : public endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -1924,6 +2071,7 @@ class SubscribeAttributeAdministratorCommissioningGeneratedCommandList : public } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -1938,6 +2086,7 @@ class ReadAdministratorCommissioningAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -1961,6 +2110,9 @@ class ReadAdministratorCommissioningAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAdministratorCommissioningAcceptedCommandList : public ModelCommand { @@ -1971,6 +2123,7 @@ class SubscribeAttributeAdministratorCommissioningAcceptedCommandList : public M AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -1985,6 +2138,7 @@ class SubscribeAttributeAdministratorCommissioningAcceptedCommandList : public M endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -2006,6 +2160,7 @@ class SubscribeAttributeAdministratorCommissioningAcceptedCommandList : public M } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -2020,6 +2175,7 @@ class ReadAdministratorCommissioningAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -2043,6 +2199,9 @@ class ReadAdministratorCommissioningAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAdministratorCommissioningAttributeList : public ModelCommand { @@ -2053,6 +2212,7 @@ class SubscribeAttributeAdministratorCommissioningAttributeList : public ModelCo AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -2067,6 +2227,7 @@ class SubscribeAttributeAdministratorCommissioningAttributeList : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -2088,6 +2249,7 @@ class SubscribeAttributeAdministratorCommissioningAttributeList : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -2102,6 +2264,7 @@ class ReadAdministratorCommissioningClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -2125,6 +2288,9 @@ class ReadAdministratorCommissioningClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAdministratorCommissioningClusterRevision : public ModelCommand { @@ -2135,6 +2301,7 @@ class SubscribeAttributeAdministratorCommissioningClusterRevision : public Model AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -2149,6 +2316,7 @@ class SubscribeAttributeAdministratorCommissioningClusterRevision : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -2170,6 +2338,7 @@ class SubscribeAttributeAdministratorCommissioningClusterRevision : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -2207,6 +2376,7 @@ class ReadApplicationBasicVendorName : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "vendor-name"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -2230,6 +2400,9 @@ class ReadApplicationBasicVendorName : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationBasicVendorName : public ModelCommand { @@ -2240,6 +2413,7 @@ class SubscribeAttributeApplicationBasicVendorName : public ModelCommand { AddArgument("attr-name", "vendor-name"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -2254,6 +2428,7 @@ class SubscribeAttributeApplicationBasicVendorName : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeVendorNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -2274,6 +2449,7 @@ class SubscribeAttributeApplicationBasicVendorName : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -2288,6 +2464,7 @@ class ReadApplicationBasicVendorID : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "vendor-id"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -2311,6 +2488,9 @@ class ReadApplicationBasicVendorID : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationBasicVendorID : public ModelCommand { @@ -2321,6 +2501,7 @@ class SubscribeAttributeApplicationBasicVendorID : public ModelCommand { AddArgument("attr-name", "vendor-id"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -2335,6 +2516,7 @@ class SubscribeAttributeApplicationBasicVendorID : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeVendorIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -2355,6 +2537,7 @@ class SubscribeAttributeApplicationBasicVendorID : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -2369,6 +2552,7 @@ class ReadApplicationBasicApplicationName : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "application-name"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -2392,6 +2576,9 @@ class ReadApplicationBasicApplicationName : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationBasicApplicationName : public ModelCommand { @@ -2402,6 +2589,7 @@ class SubscribeAttributeApplicationBasicApplicationName : public ModelCommand { AddArgument("attr-name", "application-name"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -2416,6 +2604,7 @@ class SubscribeAttributeApplicationBasicApplicationName : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeApplicationNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -2436,6 +2625,7 @@ class SubscribeAttributeApplicationBasicApplicationName : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -2450,6 +2640,7 @@ class ReadApplicationBasicProductID : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "product-id"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -2473,6 +2664,9 @@ class ReadApplicationBasicProductID : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationBasicProductID : public ModelCommand { @@ -2483,6 +2677,7 @@ class SubscribeAttributeApplicationBasicProductID : public ModelCommand { AddArgument("attr-name", "product-id"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -2497,6 +2692,7 @@ class SubscribeAttributeApplicationBasicProductID : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeProductIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -2517,6 +2713,7 @@ class SubscribeAttributeApplicationBasicProductID : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -2531,6 +2728,7 @@ class ReadApplicationBasicApplication : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "application"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -2555,6 +2753,9 @@ class ReadApplicationBasicApplication : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationBasicApplication : public ModelCommand { @@ -2565,6 +2766,7 @@ class SubscribeAttributeApplicationBasicApplication : public ModelCommand { AddArgument("attr-name", "application"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -2579,6 +2781,7 @@ class SubscribeAttributeApplicationBasicApplication : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeApplicationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -2601,6 +2804,7 @@ class SubscribeAttributeApplicationBasicApplication : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -2615,6 +2819,7 @@ class ReadApplicationBasicStatus : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "status"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -2638,6 +2843,9 @@ class ReadApplicationBasicStatus : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationBasicStatus : public ModelCommand { @@ -2648,6 +2856,7 @@ class SubscribeAttributeApplicationBasicStatus : public ModelCommand { AddArgument("attr-name", "status"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -2662,6 +2871,7 @@ class SubscribeAttributeApplicationBasicStatus : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -2682,6 +2892,7 @@ class SubscribeAttributeApplicationBasicStatus : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -2696,6 +2907,7 @@ class ReadApplicationBasicApplicationVersion : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "application-version"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -2719,6 +2931,9 @@ class ReadApplicationBasicApplicationVersion : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationBasicApplicationVersion : public ModelCommand { @@ -2729,6 +2944,7 @@ class SubscribeAttributeApplicationBasicApplicationVersion : public ModelCommand AddArgument("attr-name", "application-version"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -2743,6 +2959,7 @@ class SubscribeAttributeApplicationBasicApplicationVersion : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeApplicationVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -2764,6 +2981,7 @@ class SubscribeAttributeApplicationBasicApplicationVersion : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -2778,6 +2996,7 @@ class ReadApplicationBasicAllowedVendorList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "allowed-vendor-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -2801,6 +3020,9 @@ class ReadApplicationBasicAllowedVendorList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationBasicAllowedVendorList : public ModelCommand { @@ -2811,6 +3033,7 @@ class SubscribeAttributeApplicationBasicAllowedVendorList : public ModelCommand AddArgument("attr-name", "allowed-vendor-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -2825,6 +3048,7 @@ class SubscribeAttributeApplicationBasicAllowedVendorList : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAllowedVendorListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -2846,6 +3070,7 @@ class SubscribeAttributeApplicationBasicAllowedVendorList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -2860,6 +3085,7 @@ class ReadApplicationBasicGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -2883,6 +3109,9 @@ class ReadApplicationBasicGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationBasicGeneratedCommandList : public ModelCommand { @@ -2893,6 +3122,7 @@ class SubscribeAttributeApplicationBasicGeneratedCommandList : public ModelComma AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -2907,6 +3137,7 @@ class SubscribeAttributeApplicationBasicGeneratedCommandList : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -2928,6 +3159,7 @@ class SubscribeAttributeApplicationBasicGeneratedCommandList : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -2942,6 +3174,7 @@ class ReadApplicationBasicAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -2965,6 +3198,9 @@ class ReadApplicationBasicAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationBasicAcceptedCommandList : public ModelCommand { @@ -2975,6 +3211,7 @@ class SubscribeAttributeApplicationBasicAcceptedCommandList : public ModelComman AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -2989,6 +3226,7 @@ class SubscribeAttributeApplicationBasicAcceptedCommandList : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -3010,6 +3248,7 @@ class SubscribeAttributeApplicationBasicAcceptedCommandList : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -3024,6 +3263,7 @@ class ReadApplicationBasicAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -3047,6 +3287,9 @@ class ReadApplicationBasicAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationBasicAttributeList : public ModelCommand { @@ -3057,6 +3300,7 @@ class SubscribeAttributeApplicationBasicAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -3071,6 +3315,7 @@ class SubscribeAttributeApplicationBasicAttributeList : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -3091,6 +3336,7 @@ class SubscribeAttributeApplicationBasicAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -3105,6 +3351,7 @@ class ReadApplicationBasicClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -3128,6 +3375,9 @@ class ReadApplicationBasicClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationBasicClusterRevision : public ModelCommand { @@ -3138,6 +3388,7 @@ class SubscribeAttributeApplicationBasicClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -3152,6 +3403,7 @@ class SubscribeAttributeApplicationBasicClusterRevision : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -3172,6 +3424,7 @@ class SubscribeAttributeApplicationBasicClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -3207,6 +3460,7 @@ class ApplicationLauncherHideApp : public ModelCommand { , mComplex_Application(&mRequest.application) { AddArgument("Application", &mComplex_Application); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -3220,7 +3474,8 @@ class ApplicationLauncherHideApp : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPApplicationLauncherClusterHideAppParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.application = [CHIPApplicationLauncherClusterApplication new]; params.application.catalogVendorId = [NSNumber numberWithUnsignedShort:mRequest.application.catalogVendorId]; params.application.applicationId = [[NSString alloc] initWithBytes:mRequest.application.applicationId.data() @@ -3238,6 +3493,7 @@ class ApplicationLauncherHideApp : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::ApplicationLauncher::Commands::HideApp::Type mRequest; TypedComplexArgument mComplex_Application; }; @@ -3253,6 +3509,7 @@ class ApplicationLauncherLaunchApp : public ModelCommand { { AddArgument("Application", &mComplex_Application); AddArgument("Data", &mData); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -3266,13 +3523,13 @@ class ApplicationLauncherLaunchApp : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPApplicationLauncherClusterLaunchAppParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.application = [CHIPApplicationLauncherClusterApplication new]; params.application.catalogVendorId = [NSNumber numberWithUnsignedShort:mRequest.application.catalogVendorId]; params.application.applicationId = [[NSString alloc] initWithBytes:mRequest.application.applicationId.data() length:mRequest.application.applicationId.size() encoding:NSUTF8StringEncoding]; - params.data = [[NSData alloc] initWithBytes:mData.data() length:mData.size()]; [cluster launchAppWithParams:params completionHandler:^( @@ -3286,6 +3543,7 @@ class ApplicationLauncherLaunchApp : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::ApplicationLauncher::Commands::LaunchApp::Type mRequest; TypedComplexArgument mComplex_Application; chip::ByteSpan mData; @@ -3301,6 +3559,7 @@ class ApplicationLauncherStopApp : public ModelCommand { , mComplex_Application(&mRequest.application) { AddArgument("Application", &mComplex_Application); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -3314,7 +3573,8 @@ class ApplicationLauncherStopApp : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPApplicationLauncherClusterStopAppParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.application = [CHIPApplicationLauncherClusterApplication new]; params.application.catalogVendorId = [NSNumber numberWithUnsignedShort:mRequest.application.catalogVendorId]; params.application.applicationId = [[NSString alloc] initWithBytes:mRequest.application.applicationId.data() @@ -3332,6 +3592,7 @@ class ApplicationLauncherStopApp : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::ApplicationLauncher::Commands::StopApp::Type mRequest; TypedComplexArgument mComplex_Application; }; @@ -3345,6 +3606,7 @@ class ReadApplicationLauncherCatalogList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "catalog-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -3368,6 +3630,9 @@ class ReadApplicationLauncherCatalogList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationLauncherCatalogList : public ModelCommand { @@ -3378,6 +3643,7 @@ class SubscribeAttributeApplicationLauncherCatalogList : public ModelCommand { AddArgument("attr-name", "catalog-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -3392,6 +3658,7 @@ class SubscribeAttributeApplicationLauncherCatalogList : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCatalogListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -3412,6 +3679,7 @@ class SubscribeAttributeApplicationLauncherCatalogList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -3426,6 +3694,7 @@ class ReadApplicationLauncherCurrentApp : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-app"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -3450,6 +3719,9 @@ class ReadApplicationLauncherCurrentApp : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteApplicationLauncherCurrentApp : public ModelCommand { @@ -3460,6 +3732,7 @@ class WriteApplicationLauncherCurrentApp : public ModelCommand { { AddArgument("attr-name", "current-app"); AddArgument("attr-value", &mComplex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -3473,7 +3746,9 @@ class WriteApplicationLauncherCurrentApp : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; CHIPApplicationLauncherClusterApplicationEP * _Nullable value; if (mValue.IsNull()) { value = nil; @@ -3492,6 +3767,7 @@ class WriteApplicationLauncherCurrentApp : public ModelCommand { } [cluster writeAttributeCurrentAppWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ApplicationLauncher CurrentApp Error: %s", chip::ErrorStr(chipError)); @@ -3501,6 +3777,7 @@ class WriteApplicationLauncherCurrentApp : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::DataModel::Nullable mValue; TypedComplexArgument> mComplex; @@ -3514,6 +3791,7 @@ class SubscribeAttributeApplicationLauncherCurrentApp : public ModelCommand { AddArgument("attr-name", "current-app"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -3528,6 +3806,7 @@ class SubscribeAttributeApplicationLauncherCurrentApp : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentAppWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -3549,6 +3828,7 @@ class SubscribeAttributeApplicationLauncherCurrentApp : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -3563,6 +3843,7 @@ class ReadApplicationLauncherGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -3586,6 +3867,9 @@ class ReadApplicationLauncherGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationLauncherGeneratedCommandList : public ModelCommand { @@ -3596,6 +3880,7 @@ class SubscribeAttributeApplicationLauncherGeneratedCommandList : public ModelCo AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -3610,6 +3895,7 @@ class SubscribeAttributeApplicationLauncherGeneratedCommandList : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -3631,6 +3917,7 @@ class SubscribeAttributeApplicationLauncherGeneratedCommandList : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -3645,6 +3932,7 @@ class ReadApplicationLauncherAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -3668,6 +3956,9 @@ class ReadApplicationLauncherAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationLauncherAcceptedCommandList : public ModelCommand { @@ -3678,6 +3969,7 @@ class SubscribeAttributeApplicationLauncherAcceptedCommandList : public ModelCom AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -3692,6 +3984,7 @@ class SubscribeAttributeApplicationLauncherAcceptedCommandList : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -3713,6 +4006,7 @@ class SubscribeAttributeApplicationLauncherAcceptedCommandList : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -3727,6 +4021,7 @@ class ReadApplicationLauncherAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -3750,6 +4045,9 @@ class ReadApplicationLauncherAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationLauncherAttributeList : public ModelCommand { @@ -3760,6 +4058,7 @@ class SubscribeAttributeApplicationLauncherAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -3774,6 +4073,7 @@ class SubscribeAttributeApplicationLauncherAttributeList : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -3794,6 +4094,7 @@ class SubscribeAttributeApplicationLauncherAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -3808,6 +4109,7 @@ class ReadApplicationLauncherClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -3831,6 +4133,9 @@ class ReadApplicationLauncherClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeApplicationLauncherClusterRevision : public ModelCommand { @@ -3841,6 +4146,7 @@ class SubscribeAttributeApplicationLauncherClusterRevision : public ModelCommand AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -3855,6 +4161,7 @@ class SubscribeAttributeApplicationLauncherClusterRevision : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -3876,6 +4183,7 @@ class SubscribeAttributeApplicationLauncherClusterRevision : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -3910,6 +4218,7 @@ class AudioOutputRenameOutput : public ModelCommand { { AddArgument("Index", 0, UINT8_MAX, &mIndex); AddArgument("Name", &mName); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -3921,9 +4230,9 @@ class AudioOutputRenameOutput : public ModelCommand { CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPAudioOutputClusterRenameOutputParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.index = [NSNumber numberWithUnsignedChar:mIndex]; - params.name = [[NSString alloc] initWithBytes:mName.data() length:mName.size() encoding:NSUTF8StringEncoding]; [cluster renameOutputWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -3935,6 +4244,7 @@ class AudioOutputRenameOutput : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mIndex; chip::ByteSpan mName; }; @@ -3948,6 +4258,7 @@ class AudioOutputSelectOutput : public ModelCommand { : ModelCommand("select-output") { AddArgument("Index", 0, UINT8_MAX, &mIndex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -3959,7 +4270,8 @@ class AudioOutputSelectOutput : public ModelCommand { CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPAudioOutputClusterSelectOutputParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.index = [NSNumber numberWithUnsignedChar:mIndex]; [cluster selectOutputWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -3971,6 +4283,7 @@ class AudioOutputSelectOutput : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mIndex; }; @@ -3983,6 +4296,7 @@ class ReadAudioOutputOutputList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "output-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -4004,6 +4318,9 @@ class ReadAudioOutputOutputList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAudioOutputOutputList : public ModelCommand { @@ -4014,6 +4331,7 @@ class SubscribeAttributeAudioOutputOutputList : public ModelCommand { AddArgument("attr-name", "output-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -4026,6 +4344,7 @@ class SubscribeAttributeAudioOutputOutputList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOutputListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -4046,6 +4365,7 @@ class SubscribeAttributeAudioOutputOutputList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -4060,6 +4380,7 @@ class ReadAudioOutputCurrentOutput : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-output"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -4081,6 +4402,9 @@ class ReadAudioOutputCurrentOutput : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAudioOutputCurrentOutput : public ModelCommand { @@ -4091,6 +4415,7 @@ class SubscribeAttributeAudioOutputCurrentOutput : public ModelCommand { AddArgument("attr-name", "current-output"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -4103,6 +4428,7 @@ class SubscribeAttributeAudioOutputCurrentOutput : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentOutputWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -4123,6 +4449,7 @@ class SubscribeAttributeAudioOutputCurrentOutput : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -4137,6 +4464,7 @@ class ReadAudioOutputGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -4158,6 +4486,9 @@ class ReadAudioOutputGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAudioOutputGeneratedCommandList : public ModelCommand { @@ -4168,6 +4499,7 @@ class SubscribeAttributeAudioOutputGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -4180,6 +4512,7 @@ class SubscribeAttributeAudioOutputGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -4201,6 +4534,7 @@ class SubscribeAttributeAudioOutputGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -4215,6 +4549,7 @@ class ReadAudioOutputAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -4236,6 +4571,9 @@ class ReadAudioOutputAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAudioOutputAcceptedCommandList : public ModelCommand { @@ -4246,6 +4584,7 @@ class SubscribeAttributeAudioOutputAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -4258,6 +4597,7 @@ class SubscribeAttributeAudioOutputAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -4279,6 +4619,7 @@ class SubscribeAttributeAudioOutputAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -4293,6 +4634,7 @@ class ReadAudioOutputAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -4314,6 +4656,9 @@ class ReadAudioOutputAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAudioOutputAttributeList : public ModelCommand { @@ -4324,6 +4669,7 @@ class SubscribeAttributeAudioOutputAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -4336,6 +4682,7 @@ class SubscribeAttributeAudioOutputAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -4356,6 +4703,7 @@ class SubscribeAttributeAudioOutputAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -4370,6 +4718,7 @@ class ReadAudioOutputClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -4391,6 +4740,9 @@ class ReadAudioOutputClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeAudioOutputClusterRevision : public ModelCommand { @@ -4401,6 +4753,7 @@ class SubscribeAttributeAudioOutputClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -4413,6 +4766,7 @@ class SubscribeAttributeAudioOutputClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPAudioOutput * cluster = [[CHIPAudioOutput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -4433,6 +4787,7 @@ class SubscribeAttributeAudioOutputClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -4474,6 +4829,7 @@ class BarrierControlBarrierControlGoToPercent : public ModelCommand { : ModelCommand("barrier-control-go-to-percent") { AddArgument("PercentOpen", 0, UINT8_MAX, &mPercentOpen); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -4485,7 +4841,8 @@ class BarrierControlBarrierControlGoToPercent : public ModelCommand { CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPBarrierControlClusterBarrierControlGoToPercentParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.percentOpen = [NSNumber numberWithUnsignedChar:mPercentOpen]; [cluster barrierControlGoToPercentWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -4497,6 +4854,7 @@ class BarrierControlBarrierControlGoToPercent : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mPercentOpen; }; @@ -4508,6 +4866,7 @@ class BarrierControlBarrierControlStop : public ModelCommand { BarrierControlBarrierControlStop() : ModelCommand("barrier-control-stop") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -4518,6 +4877,9 @@ class BarrierControlBarrierControlStop : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPBarrierControlClusterBarrierControlStopParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster barrierControlStopWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -4527,6 +4889,7 @@ class BarrierControlBarrierControlStop : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -4538,6 +4901,7 @@ class ReadBarrierControlBarrierMovingState : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "barrier-moving-state"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -4559,6 +4923,9 @@ class ReadBarrierControlBarrierMovingState : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBarrierControlBarrierMovingState : public ModelCommand { @@ -4569,6 +4936,7 @@ class SubscribeAttributeBarrierControlBarrierMovingState : public ModelCommand { AddArgument("attr-name", "barrier-moving-state"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -4581,6 +4949,7 @@ class SubscribeAttributeBarrierControlBarrierMovingState : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBarrierMovingStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -4602,6 +4971,7 @@ class SubscribeAttributeBarrierControlBarrierMovingState : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -4616,6 +4986,7 @@ class ReadBarrierControlBarrierSafetyStatus : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "barrier-safety-status"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -4637,6 +5008,9 @@ class ReadBarrierControlBarrierSafetyStatus : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBarrierControlBarrierSafetyStatus : public ModelCommand { @@ -4647,6 +5021,7 @@ class SubscribeAttributeBarrierControlBarrierSafetyStatus : public ModelCommand AddArgument("attr-name", "barrier-safety-status"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -4659,6 +5034,7 @@ class SubscribeAttributeBarrierControlBarrierSafetyStatus : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBarrierSafetyStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -4680,6 +5056,7 @@ class SubscribeAttributeBarrierControlBarrierSafetyStatus : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -4694,6 +5071,7 @@ class ReadBarrierControlBarrierCapabilities : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "barrier-capabilities"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -4715,6 +5093,9 @@ class ReadBarrierControlBarrierCapabilities : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBarrierControlBarrierCapabilities : public ModelCommand { @@ -4725,6 +5106,7 @@ class SubscribeAttributeBarrierControlBarrierCapabilities : public ModelCommand AddArgument("attr-name", "barrier-capabilities"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -4737,6 +5119,7 @@ class SubscribeAttributeBarrierControlBarrierCapabilities : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBarrierCapabilitiesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -4758,6 +5141,7 @@ class SubscribeAttributeBarrierControlBarrierCapabilities : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -4772,6 +5156,7 @@ class ReadBarrierControlBarrierPosition : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "barrier-position"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -4793,6 +5178,9 @@ class ReadBarrierControlBarrierPosition : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBarrierControlBarrierPosition : public ModelCommand { @@ -4803,6 +5191,7 @@ class SubscribeAttributeBarrierControlBarrierPosition : public ModelCommand { AddArgument("attr-name", "barrier-position"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -4815,6 +5204,7 @@ class SubscribeAttributeBarrierControlBarrierPosition : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBarrierPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -4835,6 +5225,7 @@ class SubscribeAttributeBarrierControlBarrierPosition : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -4849,6 +5240,7 @@ class ReadBarrierControlGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -4870,6 +5262,9 @@ class ReadBarrierControlGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBarrierControlGeneratedCommandList : public ModelCommand { @@ -4880,6 +5275,7 @@ class SubscribeAttributeBarrierControlGeneratedCommandList : public ModelCommand AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -4892,6 +5288,7 @@ class SubscribeAttributeBarrierControlGeneratedCommandList : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -4913,6 +5310,7 @@ class SubscribeAttributeBarrierControlGeneratedCommandList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -4927,6 +5325,7 @@ class ReadBarrierControlAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -4948,6 +5347,9 @@ class ReadBarrierControlAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBarrierControlAcceptedCommandList : public ModelCommand { @@ -4958,6 +5360,7 @@ class SubscribeAttributeBarrierControlAcceptedCommandList : public ModelCommand AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -4970,6 +5373,7 @@ class SubscribeAttributeBarrierControlAcceptedCommandList : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -4991,6 +5395,7 @@ class SubscribeAttributeBarrierControlAcceptedCommandList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -5005,6 +5410,7 @@ class ReadBarrierControlAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -5026,6 +5432,9 @@ class ReadBarrierControlAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBarrierControlAttributeList : public ModelCommand { @@ -5036,6 +5445,7 @@ class SubscribeAttributeBarrierControlAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -5048,6 +5458,7 @@ class SubscribeAttributeBarrierControlAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -5068,6 +5479,7 @@ class SubscribeAttributeBarrierControlAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -5082,6 +5494,7 @@ class ReadBarrierControlClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -5103,6 +5516,9 @@ class ReadBarrierControlClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBarrierControlClusterRevision : public ModelCommand { @@ -5113,6 +5529,7 @@ class SubscribeAttributeBarrierControlClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -5125,6 +5542,7 @@ class SubscribeAttributeBarrierControlClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBarrierControl * cluster = [[CHIPBarrierControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -5145,6 +5563,7 @@ class SubscribeAttributeBarrierControlClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -5199,6 +5618,7 @@ class ReadBasicDataModelRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "data-model-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -5220,6 +5640,9 @@ class ReadBasicDataModelRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicDataModelRevision : public ModelCommand { @@ -5230,6 +5653,7 @@ class SubscribeAttributeBasicDataModelRevision : public ModelCommand { AddArgument("attr-name", "data-model-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -5242,6 +5666,7 @@ class SubscribeAttributeBasicDataModelRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeDataModelRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -5262,6 +5687,7 @@ class SubscribeAttributeBasicDataModelRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -5276,6 +5702,7 @@ class ReadBasicVendorName : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "vendor-name"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -5297,6 +5724,9 @@ class ReadBasicVendorName : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicVendorName : public ModelCommand { @@ -5307,6 +5737,7 @@ class SubscribeAttributeBasicVendorName : public ModelCommand { AddArgument("attr-name", "vendor-name"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -5319,6 +5750,7 @@ class SubscribeAttributeBasicVendorName : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeVendorNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -5339,6 +5771,7 @@ class SubscribeAttributeBasicVendorName : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -5353,6 +5786,7 @@ class ReadBasicVendorID : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "vendor-id"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -5374,6 +5808,9 @@ class ReadBasicVendorID : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicVendorID : public ModelCommand { @@ -5384,6 +5821,7 @@ class SubscribeAttributeBasicVendorID : public ModelCommand { AddArgument("attr-name", "vendor-id"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -5396,6 +5834,7 @@ class SubscribeAttributeBasicVendorID : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeVendorIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -5416,6 +5855,7 @@ class SubscribeAttributeBasicVendorID : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -5430,6 +5870,7 @@ class ReadBasicProductName : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "product-name"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -5451,6 +5892,9 @@ class ReadBasicProductName : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicProductName : public ModelCommand { @@ -5461,6 +5905,7 @@ class SubscribeAttributeBasicProductName : public ModelCommand { AddArgument("attr-name", "product-name"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -5473,6 +5918,7 @@ class SubscribeAttributeBasicProductName : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeProductNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -5493,6 +5939,7 @@ class SubscribeAttributeBasicProductName : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -5507,6 +5954,7 @@ class ReadBasicProductID : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "product-id"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -5528,6 +5976,9 @@ class ReadBasicProductID : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicProductID : public ModelCommand { @@ -5538,6 +5989,7 @@ class SubscribeAttributeBasicProductID : public ModelCommand { AddArgument("attr-name", "product-id"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -5550,6 +6002,7 @@ class SubscribeAttributeBasicProductID : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeProductIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -5570,6 +6023,7 @@ class SubscribeAttributeBasicProductID : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -5584,6 +6038,7 @@ class ReadBasicNodeLabel : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "node-label"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -5605,6 +6060,9 @@ class ReadBasicNodeLabel : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteBasicNodeLabel : public ModelCommand { @@ -5614,6 +6072,7 @@ class WriteBasicNodeLabel : public ModelCommand { { AddArgument("attr-name", "node-label"); AddArgument("attr-value", &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -5625,12 +6084,15 @@ class WriteBasicNodeLabel : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data() length:mValue.size() encoding:NSUTF8StringEncoding]; [cluster writeAttributeNodeLabelWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "Basic NodeLabel Error: %s", chip::ErrorStr(chipError)); @@ -5640,6 +6102,7 @@ class WriteBasicNodeLabel : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mValue; }; @@ -5651,6 +6114,7 @@ class SubscribeAttributeBasicNodeLabel : public ModelCommand { AddArgument("attr-name", "node-label"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -5663,6 +6127,7 @@ class SubscribeAttributeBasicNodeLabel : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNodeLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -5683,6 +6148,7 @@ class SubscribeAttributeBasicNodeLabel : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -5697,6 +6163,7 @@ class ReadBasicLocation : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "location"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -5718,6 +6185,9 @@ class ReadBasicLocation : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteBasicLocation : public ModelCommand { @@ -5727,6 +6197,7 @@ class WriteBasicLocation : public ModelCommand { { AddArgument("attr-name", "location"); AddArgument("attr-value", &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -5738,12 +6209,15 @@ class WriteBasicLocation : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data() length:mValue.size() encoding:NSUTF8StringEncoding]; [cluster writeAttributeLocationWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "Basic Location Error: %s", chip::ErrorStr(chipError)); @@ -5753,6 +6227,7 @@ class WriteBasicLocation : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mValue; }; @@ -5764,6 +6239,7 @@ class SubscribeAttributeBasicLocation : public ModelCommand { AddArgument("attr-name", "location"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -5776,6 +6252,7 @@ class SubscribeAttributeBasicLocation : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLocationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -5796,6 +6273,7 @@ class SubscribeAttributeBasicLocation : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -5810,6 +6288,7 @@ class ReadBasicHardwareVersion : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "hardware-version"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -5831,6 +6310,9 @@ class ReadBasicHardwareVersion : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicHardwareVersion : public ModelCommand { @@ -5841,6 +6323,7 @@ class SubscribeAttributeBasicHardwareVersion : public ModelCommand { AddArgument("attr-name", "hardware-version"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -5853,6 +6336,7 @@ class SubscribeAttributeBasicHardwareVersion : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeHardwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -5873,6 +6357,7 @@ class SubscribeAttributeBasicHardwareVersion : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -5887,6 +6372,7 @@ class ReadBasicHardwareVersionString : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "hardware-version-string"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -5908,6 +6394,9 @@ class ReadBasicHardwareVersionString : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicHardwareVersionString : public ModelCommand { @@ -5918,6 +6407,7 @@ class SubscribeAttributeBasicHardwareVersionString : public ModelCommand { AddArgument("attr-name", "hardware-version-string"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -5930,6 +6420,7 @@ class SubscribeAttributeBasicHardwareVersionString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeHardwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -5951,6 +6442,7 @@ class SubscribeAttributeBasicHardwareVersionString : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -5965,6 +6457,7 @@ class ReadBasicSoftwareVersion : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "software-version"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -5986,6 +6479,9 @@ class ReadBasicSoftwareVersion : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicSoftwareVersion : public ModelCommand { @@ -5996,6 +6492,7 @@ class SubscribeAttributeBasicSoftwareVersion : public ModelCommand { AddArgument("attr-name", "software-version"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -6008,6 +6505,7 @@ class SubscribeAttributeBasicSoftwareVersion : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSoftwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -6028,6 +6526,7 @@ class SubscribeAttributeBasicSoftwareVersion : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -6042,6 +6541,7 @@ class ReadBasicSoftwareVersionString : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "software-version-string"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -6063,6 +6563,9 @@ class ReadBasicSoftwareVersionString : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicSoftwareVersionString : public ModelCommand { @@ -6073,6 +6576,7 @@ class SubscribeAttributeBasicSoftwareVersionString : public ModelCommand { AddArgument("attr-name", "software-version-string"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -6085,6 +6589,7 @@ class SubscribeAttributeBasicSoftwareVersionString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSoftwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -6106,6 +6611,7 @@ class SubscribeAttributeBasicSoftwareVersionString : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -6120,6 +6626,7 @@ class ReadBasicManufacturingDate : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "manufacturing-date"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -6141,6 +6648,9 @@ class ReadBasicManufacturingDate : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicManufacturingDate : public ModelCommand { @@ -6151,6 +6661,7 @@ class SubscribeAttributeBasicManufacturingDate : public ModelCommand { AddArgument("attr-name", "manufacturing-date"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -6163,6 +6674,7 @@ class SubscribeAttributeBasicManufacturingDate : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeManufacturingDateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -6183,6 +6695,7 @@ class SubscribeAttributeBasicManufacturingDate : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -6197,6 +6710,7 @@ class ReadBasicPartNumber : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "part-number"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -6218,6 +6732,9 @@ class ReadBasicPartNumber : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicPartNumber : public ModelCommand { @@ -6228,6 +6745,7 @@ class SubscribeAttributeBasicPartNumber : public ModelCommand { AddArgument("attr-name", "part-number"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -6240,6 +6758,7 @@ class SubscribeAttributeBasicPartNumber : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePartNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -6260,6 +6779,7 @@ class SubscribeAttributeBasicPartNumber : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -6274,6 +6794,7 @@ class ReadBasicProductURL : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "product-url"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -6295,6 +6816,9 @@ class ReadBasicProductURL : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicProductURL : public ModelCommand { @@ -6305,6 +6829,7 @@ class SubscribeAttributeBasicProductURL : public ModelCommand { AddArgument("attr-name", "product-url"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -6317,6 +6842,7 @@ class SubscribeAttributeBasicProductURL : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeProductURLWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -6337,6 +6863,7 @@ class SubscribeAttributeBasicProductURL : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -6351,6 +6878,7 @@ class ReadBasicProductLabel : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "product-label"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -6372,6 +6900,9 @@ class ReadBasicProductLabel : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicProductLabel : public ModelCommand { @@ -6382,6 +6913,7 @@ class SubscribeAttributeBasicProductLabel : public ModelCommand { AddArgument("attr-name", "product-label"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -6394,6 +6926,7 @@ class SubscribeAttributeBasicProductLabel : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeProductLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -6414,6 +6947,7 @@ class SubscribeAttributeBasicProductLabel : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -6428,6 +6962,7 @@ class ReadBasicSerialNumber : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "serial-number"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -6449,6 +6984,9 @@ class ReadBasicSerialNumber : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicSerialNumber : public ModelCommand { @@ -6459,6 +6997,7 @@ class SubscribeAttributeBasicSerialNumber : public ModelCommand { AddArgument("attr-name", "serial-number"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -6471,6 +7010,7 @@ class SubscribeAttributeBasicSerialNumber : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSerialNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -6491,6 +7031,7 @@ class SubscribeAttributeBasicSerialNumber : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -6505,6 +7046,7 @@ class ReadBasicLocalConfigDisabled : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "local-config-disabled"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -6526,6 +7068,9 @@ class ReadBasicLocalConfigDisabled : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteBasicLocalConfigDisabled : public ModelCommand { @@ -6535,6 +7080,7 @@ class WriteBasicLocalConfigDisabled : public ModelCommand { { AddArgument("attr-name", "local-config-disabled"); AddArgument("attr-value", 0, 1, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -6546,11 +7092,14 @@ class WriteBasicLocalConfigDisabled : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue]; [cluster writeAttributeLocalConfigDisabledWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "Basic LocalConfigDisabled Error: %s", chip::ErrorStr(chipError)); @@ -6560,6 +7109,7 @@ class WriteBasicLocalConfigDisabled : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; bool mValue; }; @@ -6571,6 +7121,7 @@ class SubscribeAttributeBasicLocalConfigDisabled : public ModelCommand { AddArgument("attr-name", "local-config-disabled"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -6583,6 +7134,7 @@ class SubscribeAttributeBasicLocalConfigDisabled : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLocalConfigDisabledWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -6603,6 +7155,7 @@ class SubscribeAttributeBasicLocalConfigDisabled : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -6617,6 +7170,7 @@ class ReadBasicReachable : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "reachable"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -6638,6 +7192,9 @@ class ReadBasicReachable : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicReachable : public ModelCommand { @@ -6648,6 +7205,7 @@ class SubscribeAttributeBasicReachable : public ModelCommand { AddArgument("attr-name", "reachable"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -6660,6 +7218,7 @@ class SubscribeAttributeBasicReachable : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeReachableWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -6680,6 +7239,7 @@ class SubscribeAttributeBasicReachable : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -6694,6 +7254,7 @@ class ReadBasicUniqueID : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "unique-id"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -6715,6 +7276,9 @@ class ReadBasicUniqueID : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicUniqueID : public ModelCommand { @@ -6725,6 +7289,7 @@ class SubscribeAttributeBasicUniqueID : public ModelCommand { AddArgument("attr-name", "unique-id"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -6737,6 +7302,7 @@ class SubscribeAttributeBasicUniqueID : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeUniqueIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -6757,6 +7323,7 @@ class SubscribeAttributeBasicUniqueID : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -6771,6 +7338,7 @@ class ReadBasicCapabilityMinima : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "capability-minima"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -6793,6 +7361,9 @@ class ReadBasicCapabilityMinima : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicCapabilityMinima : public ModelCommand { @@ -6803,6 +7374,7 @@ class SubscribeAttributeBasicCapabilityMinima : public ModelCommand { AddArgument("attr-name", "capability-minima"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -6815,6 +7387,7 @@ class SubscribeAttributeBasicCapabilityMinima : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCapabilityMinimaWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -6836,6 +7409,7 @@ class SubscribeAttributeBasicCapabilityMinima : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -6850,6 +7424,7 @@ class ReadBasicGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -6871,6 +7446,9 @@ class ReadBasicGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicGeneratedCommandList : public ModelCommand { @@ -6881,6 +7459,7 @@ class SubscribeAttributeBasicGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -6893,6 +7472,7 @@ class SubscribeAttributeBasicGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -6913,6 +7493,7 @@ class SubscribeAttributeBasicGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -6927,6 +7508,7 @@ class ReadBasicAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -6948,6 +7530,9 @@ class ReadBasicAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicAcceptedCommandList : public ModelCommand { @@ -6958,6 +7543,7 @@ class SubscribeAttributeBasicAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -6970,6 +7556,7 @@ class SubscribeAttributeBasicAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -6990,6 +7577,7 @@ class SubscribeAttributeBasicAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -7004,6 +7592,7 @@ class ReadBasicAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -7025,6 +7614,9 @@ class ReadBasicAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicAttributeList : public ModelCommand { @@ -7035,6 +7627,7 @@ class SubscribeAttributeBasicAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -7047,6 +7640,7 @@ class SubscribeAttributeBasicAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -7067,6 +7661,7 @@ class SubscribeAttributeBasicAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -7081,6 +7676,7 @@ class ReadBasicClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -7102,6 +7698,9 @@ class ReadBasicClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBasicClusterRevision : public ModelCommand { @@ -7112,6 +7711,7 @@ class SubscribeAttributeBasicClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -7124,6 +7724,7 @@ class SubscribeAttributeBasicClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBasic * cluster = [[CHIPBasic alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -7144,6 +7745,7 @@ class SubscribeAttributeBasicClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -7182,6 +7784,7 @@ class ReadBinaryInputBasicOutOfService : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "out-of-service"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -7205,6 +7808,9 @@ class ReadBinaryInputBasicOutOfService : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteBinaryInputBasicOutOfService : public ModelCommand { @@ -7214,6 +7820,7 @@ class WriteBinaryInputBasicOutOfService : public ModelCommand { { AddArgument("attr-name", "out-of-service"); AddArgument("attr-value", 0, 1, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -7227,10 +7834,13 @@ class WriteBinaryInputBasicOutOfService : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue]; [cluster writeAttributeOutOfServiceWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "BinaryInputBasic OutOfService Error: %s", chip::ErrorStr(chipError)); @@ -7240,6 +7850,7 @@ class WriteBinaryInputBasicOutOfService : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; bool mValue; }; @@ -7251,6 +7862,7 @@ class SubscribeAttributeBinaryInputBasicOutOfService : public ModelCommand { AddArgument("attr-name", "out-of-service"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -7265,6 +7877,7 @@ class SubscribeAttributeBinaryInputBasicOutOfService : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOutOfServiceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -7285,6 +7898,7 @@ class SubscribeAttributeBinaryInputBasicOutOfService : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -7299,6 +7913,7 @@ class ReadBinaryInputBasicPresentValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "present-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -7322,6 +7937,9 @@ class ReadBinaryInputBasicPresentValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteBinaryInputBasicPresentValue : public ModelCommand { @@ -7331,6 +7949,7 @@ class WriteBinaryInputBasicPresentValue : public ModelCommand { { AddArgument("attr-name", "present-value"); AddArgument("attr-value", 0, 1, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -7344,10 +7963,13 @@ class WriteBinaryInputBasicPresentValue : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue]; [cluster writeAttributePresentValueWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "BinaryInputBasic PresentValue Error: %s", chip::ErrorStr(chipError)); @@ -7357,6 +7979,7 @@ class WriteBinaryInputBasicPresentValue : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; bool mValue; }; @@ -7368,6 +7991,7 @@ class SubscribeAttributeBinaryInputBasicPresentValue : public ModelCommand { AddArgument("attr-name", "present-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -7382,6 +8006,7 @@ class SubscribeAttributeBinaryInputBasicPresentValue : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePresentValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -7402,6 +8027,7 @@ class SubscribeAttributeBinaryInputBasicPresentValue : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -7416,6 +8042,7 @@ class ReadBinaryInputBasicStatusFlags : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "status-flags"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -7439,6 +8066,9 @@ class ReadBinaryInputBasicStatusFlags : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBinaryInputBasicStatusFlags : public ModelCommand { @@ -7449,6 +8079,7 @@ class SubscribeAttributeBinaryInputBasicStatusFlags : public ModelCommand { AddArgument("attr-name", "status-flags"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -7463,6 +8094,7 @@ class SubscribeAttributeBinaryInputBasicStatusFlags : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeStatusFlagsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -7483,6 +8115,7 @@ class SubscribeAttributeBinaryInputBasicStatusFlags : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -7497,6 +8130,7 @@ class ReadBinaryInputBasicGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -7520,6 +8154,9 @@ class ReadBinaryInputBasicGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBinaryInputBasicGeneratedCommandList : public ModelCommand { @@ -7530,6 +8167,7 @@ class SubscribeAttributeBinaryInputBasicGeneratedCommandList : public ModelComma AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -7544,6 +8182,7 @@ class SubscribeAttributeBinaryInputBasicGeneratedCommandList : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -7565,6 +8204,7 @@ class SubscribeAttributeBinaryInputBasicGeneratedCommandList : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -7579,6 +8219,7 @@ class ReadBinaryInputBasicAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -7602,6 +8243,9 @@ class ReadBinaryInputBasicAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBinaryInputBasicAcceptedCommandList : public ModelCommand { @@ -7612,6 +8256,7 @@ class SubscribeAttributeBinaryInputBasicAcceptedCommandList : public ModelComman AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -7626,6 +8271,7 @@ class SubscribeAttributeBinaryInputBasicAcceptedCommandList : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -7647,6 +8293,7 @@ class SubscribeAttributeBinaryInputBasicAcceptedCommandList : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -7661,6 +8308,7 @@ class ReadBinaryInputBasicAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -7684,6 +8332,9 @@ class ReadBinaryInputBasicAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBinaryInputBasicAttributeList : public ModelCommand { @@ -7694,6 +8345,7 @@ class SubscribeAttributeBinaryInputBasicAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -7708,6 +8360,7 @@ class SubscribeAttributeBinaryInputBasicAttributeList : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -7728,6 +8381,7 @@ class SubscribeAttributeBinaryInputBasicAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -7742,6 +8396,7 @@ class ReadBinaryInputBasicClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -7765,6 +8420,9 @@ class ReadBinaryInputBasicClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBinaryInputBasicClusterRevision : public ModelCommand { @@ -7775,6 +8433,7 @@ class SubscribeAttributeBinaryInputBasicClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -7789,6 +8448,7 @@ class SubscribeAttributeBinaryInputBasicClusterRevision : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -7809,6 +8469,7 @@ class SubscribeAttributeBinaryInputBasicClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -7839,6 +8500,7 @@ class ReadBindingBinding : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "binding"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -7852,6 +8514,7 @@ class ReadBindingBinding : public ModelCommand { CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block err = CHIP_NO_ERROR; CHIPReadParams * params = [[CHIPReadParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster readAttributeBindingWithParams:params completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { NSLog(@"Binding.Binding response %@", [value description]); @@ -7862,6 +8525,9 @@ class ReadBindingBinding : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteBindingBinding : public ModelCommand { @@ -7872,6 +8538,7 @@ class WriteBindingBinding : public ModelCommand { { AddArgument("attr-name", "binding"); AddArgument("attr-value", &mComplex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -7883,7 +8550,9 @@ class WriteBindingBinding : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSArray * _Nonnull value; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; @@ -7917,6 +8586,7 @@ class WriteBindingBinding : public ModelCommand { } [cluster writeAttributeBindingWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "Binding Binding Error: %s", chip::ErrorStr(chipError)); @@ -7926,6 +8596,7 @@ class WriteBindingBinding : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::DataModel::List mValue; TypedComplexArgument> mComplex; }; @@ -7938,6 +8609,7 @@ class SubscribeAttributeBindingBinding : public ModelCommand { AddArgument("attr-name", "binding"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -7950,6 +8622,7 @@ class SubscribeAttributeBindingBinding : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBindingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -7970,6 +8643,7 @@ class SubscribeAttributeBindingBinding : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -7984,6 +8658,7 @@ class ReadBindingGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -8005,6 +8680,9 @@ class ReadBindingGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBindingGeneratedCommandList : public ModelCommand { @@ -8015,6 +8693,7 @@ class SubscribeAttributeBindingGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -8027,6 +8706,7 @@ class SubscribeAttributeBindingGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -8048,6 +8728,7 @@ class SubscribeAttributeBindingGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -8062,6 +8743,7 @@ class ReadBindingAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -8083,6 +8765,9 @@ class ReadBindingAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBindingAcceptedCommandList : public ModelCommand { @@ -8093,6 +8778,7 @@ class SubscribeAttributeBindingAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -8105,6 +8791,7 @@ class SubscribeAttributeBindingAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -8125,6 +8812,7 @@ class SubscribeAttributeBindingAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -8139,6 +8827,7 @@ class ReadBindingAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -8160,6 +8849,9 @@ class ReadBindingAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBindingAttributeList : public ModelCommand { @@ -8170,6 +8862,7 @@ class SubscribeAttributeBindingAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -8182,6 +8875,7 @@ class SubscribeAttributeBindingAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -8202,6 +8896,7 @@ class SubscribeAttributeBindingAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -8216,6 +8911,7 @@ class ReadBindingClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -8237,6 +8933,9 @@ class ReadBindingClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBindingClusterRevision : public ModelCommand { @@ -8247,6 +8946,7 @@ class SubscribeAttributeBindingClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -8259,6 +8959,7 @@ class SubscribeAttributeBindingClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBinding * cluster = [[CHIPBinding alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -8279,6 +8980,7 @@ class SubscribeAttributeBindingClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -8310,6 +9012,7 @@ class ReadBooleanStateStateValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "state-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -8331,6 +9034,9 @@ class ReadBooleanStateStateValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBooleanStateStateValue : public ModelCommand { @@ -8341,6 +9047,7 @@ class SubscribeAttributeBooleanStateStateValue : public ModelCommand { AddArgument("attr-name", "state-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -8353,6 +9060,7 @@ class SubscribeAttributeBooleanStateStateValue : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeStateValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -8373,6 +9081,7 @@ class SubscribeAttributeBooleanStateStateValue : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -8387,6 +9096,7 @@ class ReadBooleanStateGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -8408,6 +9118,9 @@ class ReadBooleanStateGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBooleanStateGeneratedCommandList : public ModelCommand { @@ -8418,6 +9131,7 @@ class SubscribeAttributeBooleanStateGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -8430,6 +9144,7 @@ class SubscribeAttributeBooleanStateGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -8451,6 +9166,7 @@ class SubscribeAttributeBooleanStateGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -8465,6 +9181,7 @@ class ReadBooleanStateAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -8486,6 +9203,9 @@ class ReadBooleanStateAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBooleanStateAcceptedCommandList : public ModelCommand { @@ -8496,6 +9216,7 @@ class SubscribeAttributeBooleanStateAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -8508,6 +9229,7 @@ class SubscribeAttributeBooleanStateAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -8529,6 +9251,7 @@ class SubscribeAttributeBooleanStateAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -8543,6 +9266,7 @@ class ReadBooleanStateAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -8564,6 +9288,9 @@ class ReadBooleanStateAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBooleanStateAttributeList : public ModelCommand { @@ -8574,6 +9301,7 @@ class SubscribeAttributeBooleanStateAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -8586,6 +9314,7 @@ class SubscribeAttributeBooleanStateAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -8606,6 +9335,7 @@ class SubscribeAttributeBooleanStateAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -8620,6 +9350,7 @@ class ReadBooleanStateClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -8641,6 +9372,9 @@ class ReadBooleanStateClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBooleanStateClusterRevision : public ModelCommand { @@ -8651,6 +9385,7 @@ class SubscribeAttributeBooleanStateClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -8663,6 +9398,7 @@ class SubscribeAttributeBooleanStateClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBooleanState * cluster = [[CHIPBooleanState alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -8683,6 +9419,7 @@ class SubscribeAttributeBooleanStateClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -8730,6 +9467,7 @@ class BridgedActionsDisableAction : public ModelCommand { { AddArgument("ActionID", 0, UINT16_MAX, &mActionID); AddArgument("InvokeID", 0, UINT32_MAX, &mInvokeID); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -8741,9 +9479,9 @@ class BridgedActionsDisableAction : public ModelCommand { CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPBridgedActionsClusterDisableActionParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.actionID = [NSNumber numberWithUnsignedShort:mActionID]; - params.invokeID = [NSNumber numberWithUnsignedInt:mInvokeID]; [cluster disableActionWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -8755,6 +9493,7 @@ class BridgedActionsDisableAction : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mActionID; uint32_t mInvokeID; }; @@ -8770,6 +9509,7 @@ class BridgedActionsDisableActionWithDuration : public ModelCommand { AddArgument("ActionID", 0, UINT16_MAX, &mActionID); AddArgument("InvokeID", 0, UINT32_MAX, &mInvokeID); AddArgument("Duration", 0, UINT32_MAX, &mDuration); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -8781,11 +9521,10 @@ class BridgedActionsDisableActionWithDuration : public ModelCommand { CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPBridgedActionsClusterDisableActionWithDurationParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.actionID = [NSNumber numberWithUnsignedShort:mActionID]; - params.invokeID = [NSNumber numberWithUnsignedInt:mInvokeID]; - params.duration = [NSNumber numberWithUnsignedInt:mDuration]; [cluster disableActionWithDurationWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -8797,6 +9536,7 @@ class BridgedActionsDisableActionWithDuration : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mActionID; uint32_t mInvokeID; uint32_t mDuration; @@ -8812,6 +9552,7 @@ class BridgedActionsEnableAction : public ModelCommand { { AddArgument("ActionID", 0, UINT16_MAX, &mActionID); AddArgument("InvokeID", 0, UINT32_MAX, &mInvokeID); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -8823,9 +9564,9 @@ class BridgedActionsEnableAction : public ModelCommand { CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPBridgedActionsClusterEnableActionParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.actionID = [NSNumber numberWithUnsignedShort:mActionID]; - params.invokeID = [NSNumber numberWithUnsignedInt:mInvokeID]; [cluster enableActionWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -8837,6 +9578,7 @@ class BridgedActionsEnableAction : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mActionID; uint32_t mInvokeID; }; @@ -8852,6 +9594,7 @@ class BridgedActionsEnableActionWithDuration : public ModelCommand { AddArgument("ActionID", 0, UINT16_MAX, &mActionID); AddArgument("InvokeID", 0, UINT32_MAX, &mInvokeID); AddArgument("Duration", 0, UINT32_MAX, &mDuration); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -8863,11 +9606,10 @@ class BridgedActionsEnableActionWithDuration : public ModelCommand { CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPBridgedActionsClusterEnableActionWithDurationParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.actionID = [NSNumber numberWithUnsignedShort:mActionID]; - params.invokeID = [NSNumber numberWithUnsignedInt:mInvokeID]; - params.duration = [NSNumber numberWithUnsignedInt:mDuration]; [cluster enableActionWithDurationWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -8879,6 +9621,7 @@ class BridgedActionsEnableActionWithDuration : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mActionID; uint32_t mInvokeID; uint32_t mDuration; @@ -8894,6 +9637,7 @@ class BridgedActionsInstantAction : public ModelCommand { { AddArgument("ActionID", 0, UINT16_MAX, &mActionID); AddArgument("InvokeID", 0, UINT32_MAX, &mInvokeID); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -8905,9 +9649,9 @@ class BridgedActionsInstantAction : public ModelCommand { CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPBridgedActionsClusterInstantActionParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.actionID = [NSNumber numberWithUnsignedShort:mActionID]; - params.invokeID = [NSNumber numberWithUnsignedInt:mInvokeID]; [cluster instantActionWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -8919,6 +9663,7 @@ class BridgedActionsInstantAction : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mActionID; uint32_t mInvokeID; }; @@ -8934,6 +9679,7 @@ class BridgedActionsInstantActionWithTransition : public ModelCommand { AddArgument("ActionID", 0, UINT16_MAX, &mActionID); AddArgument("InvokeID", 0, UINT32_MAX, &mInvokeID); AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -8945,11 +9691,10 @@ class BridgedActionsInstantActionWithTransition : public ModelCommand { CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPBridgedActionsClusterInstantActionWithTransitionParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.actionID = [NSNumber numberWithUnsignedShort:mActionID]; - params.invokeID = [NSNumber numberWithUnsignedInt:mInvokeID]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; [cluster instantActionWithTransitionWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -8961,6 +9706,7 @@ class BridgedActionsInstantActionWithTransition : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mActionID; uint32_t mInvokeID; uint16_t mTransitionTime; @@ -8976,6 +9722,7 @@ class BridgedActionsPauseAction : public ModelCommand { { AddArgument("ActionID", 0, UINT16_MAX, &mActionID); AddArgument("InvokeID", 0, UINT32_MAX, &mInvokeID); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -8987,9 +9734,9 @@ class BridgedActionsPauseAction : public ModelCommand { CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPBridgedActionsClusterPauseActionParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.actionID = [NSNumber numberWithUnsignedShort:mActionID]; - params.invokeID = [NSNumber numberWithUnsignedInt:mInvokeID]; [cluster pauseActionWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -9001,6 +9748,7 @@ class BridgedActionsPauseAction : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mActionID; uint32_t mInvokeID; }; @@ -9016,6 +9764,7 @@ class BridgedActionsPauseActionWithDuration : public ModelCommand { AddArgument("ActionID", 0, UINT16_MAX, &mActionID); AddArgument("InvokeID", 0, UINT32_MAX, &mInvokeID); AddArgument("Duration", 0, UINT32_MAX, &mDuration); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -9027,11 +9776,10 @@ class BridgedActionsPauseActionWithDuration : public ModelCommand { CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPBridgedActionsClusterPauseActionWithDurationParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.actionID = [NSNumber numberWithUnsignedShort:mActionID]; - params.invokeID = [NSNumber numberWithUnsignedInt:mInvokeID]; - params.duration = [NSNumber numberWithUnsignedInt:mDuration]; [cluster pauseActionWithDurationWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -9043,6 +9791,7 @@ class BridgedActionsPauseActionWithDuration : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mActionID; uint32_t mInvokeID; uint32_t mDuration; @@ -9058,6 +9807,7 @@ class BridgedActionsResumeAction : public ModelCommand { { AddArgument("ActionID", 0, UINT16_MAX, &mActionID); AddArgument("InvokeID", 0, UINT32_MAX, &mInvokeID); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -9069,9 +9819,9 @@ class BridgedActionsResumeAction : public ModelCommand { CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPBridgedActionsClusterResumeActionParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.actionID = [NSNumber numberWithUnsignedShort:mActionID]; - params.invokeID = [NSNumber numberWithUnsignedInt:mInvokeID]; [cluster resumeActionWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -9083,6 +9833,7 @@ class BridgedActionsResumeAction : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mActionID; uint32_t mInvokeID; }; @@ -9097,6 +9848,7 @@ class BridgedActionsStartAction : public ModelCommand { { AddArgument("ActionID", 0, UINT16_MAX, &mActionID); AddArgument("InvokeID", 0, UINT32_MAX, &mInvokeID); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -9108,9 +9860,9 @@ class BridgedActionsStartAction : public ModelCommand { CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPBridgedActionsClusterStartActionParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.actionID = [NSNumber numberWithUnsignedShort:mActionID]; - params.invokeID = [NSNumber numberWithUnsignedInt:mInvokeID]; [cluster startActionWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -9122,6 +9874,7 @@ class BridgedActionsStartAction : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mActionID; uint32_t mInvokeID; }; @@ -9137,6 +9890,7 @@ class BridgedActionsStartActionWithDuration : public ModelCommand { AddArgument("ActionID", 0, UINT16_MAX, &mActionID); AddArgument("InvokeID", 0, UINT32_MAX, &mInvokeID); AddArgument("Duration", 0, UINT32_MAX, &mDuration); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -9148,11 +9902,10 @@ class BridgedActionsStartActionWithDuration : public ModelCommand { CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPBridgedActionsClusterStartActionWithDurationParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.actionID = [NSNumber numberWithUnsignedShort:mActionID]; - params.invokeID = [NSNumber numberWithUnsignedInt:mInvokeID]; - params.duration = [NSNumber numberWithUnsignedInt:mDuration]; [cluster startActionWithDurationWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -9164,6 +9917,7 @@ class BridgedActionsStartActionWithDuration : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mActionID; uint32_t mInvokeID; uint32_t mDuration; @@ -9179,6 +9933,7 @@ class BridgedActionsStopAction : public ModelCommand { { AddArgument("ActionID", 0, UINT16_MAX, &mActionID); AddArgument("InvokeID", 0, UINT32_MAX, &mInvokeID); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -9190,9 +9945,9 @@ class BridgedActionsStopAction : public ModelCommand { CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPBridgedActionsClusterStopActionParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.actionID = [NSNumber numberWithUnsignedShort:mActionID]; - params.invokeID = [NSNumber numberWithUnsignedInt:mInvokeID]; [cluster stopActionWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -9204,6 +9959,7 @@ class BridgedActionsStopAction : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mActionID; uint32_t mInvokeID; }; @@ -9217,6 +9973,7 @@ class ReadBridgedActionsActionList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "action-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -9238,6 +9995,9 @@ class ReadBridgedActionsActionList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedActionsActionList : public ModelCommand { @@ -9248,6 +10008,7 @@ class SubscribeAttributeBridgedActionsActionList : public ModelCommand { AddArgument("attr-name", "action-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -9260,6 +10021,7 @@ class SubscribeAttributeBridgedActionsActionList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeActionListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -9280,6 +10042,7 @@ class SubscribeAttributeBridgedActionsActionList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -9294,6 +10057,7 @@ class ReadBridgedActionsEndpointList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "endpoint-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -9315,6 +10079,9 @@ class ReadBridgedActionsEndpointList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedActionsEndpointList : public ModelCommand { @@ -9325,6 +10092,7 @@ class SubscribeAttributeBridgedActionsEndpointList : public ModelCommand { AddArgument("attr-name", "endpoint-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -9337,6 +10105,7 @@ class SubscribeAttributeBridgedActionsEndpointList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeEndpointListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -9357,6 +10126,7 @@ class SubscribeAttributeBridgedActionsEndpointList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -9371,6 +10141,7 @@ class ReadBridgedActionsSetupUrl : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "setup-url"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -9392,6 +10163,9 @@ class ReadBridgedActionsSetupUrl : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedActionsSetupUrl : public ModelCommand { @@ -9402,6 +10176,7 @@ class SubscribeAttributeBridgedActionsSetupUrl : public ModelCommand { AddArgument("attr-name", "setup-url"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -9414,6 +10189,7 @@ class SubscribeAttributeBridgedActionsSetupUrl : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSetupUrlWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -9434,6 +10210,7 @@ class SubscribeAttributeBridgedActionsSetupUrl : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -9448,6 +10225,7 @@ class ReadBridgedActionsGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -9469,6 +10247,9 @@ class ReadBridgedActionsGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedActionsGeneratedCommandList : public ModelCommand { @@ -9479,6 +10260,7 @@ class SubscribeAttributeBridgedActionsGeneratedCommandList : public ModelCommand AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -9491,6 +10273,7 @@ class SubscribeAttributeBridgedActionsGeneratedCommandList : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -9512,6 +10295,7 @@ class SubscribeAttributeBridgedActionsGeneratedCommandList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -9526,6 +10310,7 @@ class ReadBridgedActionsAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -9547,6 +10332,9 @@ class ReadBridgedActionsAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedActionsAcceptedCommandList : public ModelCommand { @@ -9557,6 +10345,7 @@ class SubscribeAttributeBridgedActionsAcceptedCommandList : public ModelCommand AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -9569,6 +10358,7 @@ class SubscribeAttributeBridgedActionsAcceptedCommandList : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -9590,6 +10380,7 @@ class SubscribeAttributeBridgedActionsAcceptedCommandList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -9604,6 +10395,7 @@ class ReadBridgedActionsAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -9625,6 +10417,9 @@ class ReadBridgedActionsAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedActionsAttributeList : public ModelCommand { @@ -9635,6 +10430,7 @@ class SubscribeAttributeBridgedActionsAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -9647,6 +10443,7 @@ class SubscribeAttributeBridgedActionsAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -9667,6 +10464,7 @@ class SubscribeAttributeBridgedActionsAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -9681,6 +10479,7 @@ class ReadBridgedActionsClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -9702,6 +10501,9 @@ class ReadBridgedActionsClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedActionsClusterRevision : public ModelCommand { @@ -9712,6 +10514,7 @@ class SubscribeAttributeBridgedActionsClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -9724,6 +10527,7 @@ class SubscribeAttributeBridgedActionsClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPBridgedActions * cluster = [[CHIPBridgedActions alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -9744,6 +10548,7 @@ class SubscribeAttributeBridgedActionsClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -9792,6 +10597,7 @@ class ReadBridgedDeviceBasicVendorName : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "vendor-name"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -9815,6 +10621,9 @@ class ReadBridgedDeviceBasicVendorName : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicVendorName : public ModelCommand { @@ -9825,6 +10634,7 @@ class SubscribeAttributeBridgedDeviceBasicVendorName : public ModelCommand { AddArgument("attr-name", "vendor-name"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -9839,6 +10649,7 @@ class SubscribeAttributeBridgedDeviceBasicVendorName : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeVendorNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -9859,6 +10670,7 @@ class SubscribeAttributeBridgedDeviceBasicVendorName : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -9873,6 +10685,7 @@ class ReadBridgedDeviceBasicVendorID : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "vendor-id"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -9896,6 +10709,9 @@ class ReadBridgedDeviceBasicVendorID : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicVendorID : public ModelCommand { @@ -9906,6 +10722,7 @@ class SubscribeAttributeBridgedDeviceBasicVendorID : public ModelCommand { AddArgument("attr-name", "vendor-id"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -9920,6 +10737,7 @@ class SubscribeAttributeBridgedDeviceBasicVendorID : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeVendorIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -9940,6 +10758,7 @@ class SubscribeAttributeBridgedDeviceBasicVendorID : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -9954,6 +10773,7 @@ class ReadBridgedDeviceBasicProductName : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "product-name"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -9977,6 +10797,9 @@ class ReadBridgedDeviceBasicProductName : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicProductName : public ModelCommand { @@ -9987,6 +10810,7 @@ class SubscribeAttributeBridgedDeviceBasicProductName : public ModelCommand { AddArgument("attr-name", "product-name"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -10001,6 +10825,7 @@ class SubscribeAttributeBridgedDeviceBasicProductName : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeProductNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -10021,6 +10846,7 @@ class SubscribeAttributeBridgedDeviceBasicProductName : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -10035,6 +10861,7 @@ class ReadBridgedDeviceBasicNodeLabel : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "node-label"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -10058,6 +10885,9 @@ class ReadBridgedDeviceBasicNodeLabel : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteBridgedDeviceBasicNodeLabel : public ModelCommand { @@ -10067,6 +10897,7 @@ class WriteBridgedDeviceBasicNodeLabel : public ModelCommand { { AddArgument("attr-name", "node-label"); AddArgument("attr-value", &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -10080,12 +10911,15 @@ class WriteBridgedDeviceBasicNodeLabel : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data() length:mValue.size() encoding:NSUTF8StringEncoding]; [cluster writeAttributeNodeLabelWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "BridgedDeviceBasic NodeLabel Error: %s", chip::ErrorStr(chipError)); @@ -10095,6 +10929,7 @@ class WriteBridgedDeviceBasicNodeLabel : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mValue; }; @@ -10106,6 +10941,7 @@ class SubscribeAttributeBridgedDeviceBasicNodeLabel : public ModelCommand { AddArgument("attr-name", "node-label"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -10120,6 +10956,7 @@ class SubscribeAttributeBridgedDeviceBasicNodeLabel : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNodeLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -10140,6 +10977,7 @@ class SubscribeAttributeBridgedDeviceBasicNodeLabel : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -10154,6 +10992,7 @@ class ReadBridgedDeviceBasicHardwareVersion : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "hardware-version"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -10177,6 +11016,9 @@ class ReadBridgedDeviceBasicHardwareVersion : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicHardwareVersion : public ModelCommand { @@ -10187,6 +11029,7 @@ class SubscribeAttributeBridgedDeviceBasicHardwareVersion : public ModelCommand AddArgument("attr-name", "hardware-version"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -10201,6 +11044,7 @@ class SubscribeAttributeBridgedDeviceBasicHardwareVersion : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeHardwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -10222,6 +11066,7 @@ class SubscribeAttributeBridgedDeviceBasicHardwareVersion : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -10236,6 +11081,7 @@ class ReadBridgedDeviceBasicHardwareVersionString : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "hardware-version-string"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -10259,6 +11105,9 @@ class ReadBridgedDeviceBasicHardwareVersionString : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicHardwareVersionString : public ModelCommand { @@ -10269,6 +11118,7 @@ class SubscribeAttributeBridgedDeviceBasicHardwareVersionString : public ModelCo AddArgument("attr-name", "hardware-version-string"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -10283,6 +11133,7 @@ class SubscribeAttributeBridgedDeviceBasicHardwareVersionString : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeHardwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -10304,6 +11155,7 @@ class SubscribeAttributeBridgedDeviceBasicHardwareVersionString : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -10318,6 +11170,7 @@ class ReadBridgedDeviceBasicSoftwareVersion : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "software-version"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -10341,6 +11194,9 @@ class ReadBridgedDeviceBasicSoftwareVersion : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicSoftwareVersion : public ModelCommand { @@ -10351,6 +11207,7 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersion : public ModelCommand AddArgument("attr-name", "software-version"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -10365,6 +11222,7 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersion : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSoftwareVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -10386,6 +11244,7 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersion : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -10400,6 +11259,7 @@ class ReadBridgedDeviceBasicSoftwareVersionString : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "software-version-string"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -10423,6 +11283,9 @@ class ReadBridgedDeviceBasicSoftwareVersionString : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicSoftwareVersionString : public ModelCommand { @@ -10433,6 +11296,7 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersionString : public ModelCo AddArgument("attr-name", "software-version-string"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -10447,6 +11311,7 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersionString : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSoftwareVersionStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -10468,6 +11333,7 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersionString : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -10482,6 +11348,7 @@ class ReadBridgedDeviceBasicManufacturingDate : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "manufacturing-date"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -10505,6 +11372,9 @@ class ReadBridgedDeviceBasicManufacturingDate : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicManufacturingDate : public ModelCommand { @@ -10515,6 +11385,7 @@ class SubscribeAttributeBridgedDeviceBasicManufacturingDate : public ModelComman AddArgument("attr-name", "manufacturing-date"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -10529,6 +11400,7 @@ class SubscribeAttributeBridgedDeviceBasicManufacturingDate : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeManufacturingDateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -10550,6 +11422,7 @@ class SubscribeAttributeBridgedDeviceBasicManufacturingDate : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -10564,6 +11437,7 @@ class ReadBridgedDeviceBasicPartNumber : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "part-number"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -10587,6 +11461,9 @@ class ReadBridgedDeviceBasicPartNumber : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicPartNumber : public ModelCommand { @@ -10597,6 +11474,7 @@ class SubscribeAttributeBridgedDeviceBasicPartNumber : public ModelCommand { AddArgument("attr-name", "part-number"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -10611,6 +11489,7 @@ class SubscribeAttributeBridgedDeviceBasicPartNumber : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePartNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -10631,6 +11510,7 @@ class SubscribeAttributeBridgedDeviceBasicPartNumber : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -10645,6 +11525,7 @@ class ReadBridgedDeviceBasicProductURL : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "product-url"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -10668,6 +11549,9 @@ class ReadBridgedDeviceBasicProductURL : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicProductURL : public ModelCommand { @@ -10678,6 +11562,7 @@ class SubscribeAttributeBridgedDeviceBasicProductURL : public ModelCommand { AddArgument("attr-name", "product-url"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -10692,6 +11577,7 @@ class SubscribeAttributeBridgedDeviceBasicProductURL : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeProductURLWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -10712,6 +11598,7 @@ class SubscribeAttributeBridgedDeviceBasicProductURL : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -10726,6 +11613,7 @@ class ReadBridgedDeviceBasicProductLabel : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "product-label"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -10749,6 +11637,9 @@ class ReadBridgedDeviceBasicProductLabel : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicProductLabel : public ModelCommand { @@ -10759,6 +11650,7 @@ class SubscribeAttributeBridgedDeviceBasicProductLabel : public ModelCommand { AddArgument("attr-name", "product-label"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -10773,6 +11665,7 @@ class SubscribeAttributeBridgedDeviceBasicProductLabel : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeProductLabelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -10793,6 +11686,7 @@ class SubscribeAttributeBridgedDeviceBasicProductLabel : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -10807,6 +11701,7 @@ class ReadBridgedDeviceBasicSerialNumber : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "serial-number"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -10830,6 +11725,9 @@ class ReadBridgedDeviceBasicSerialNumber : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicSerialNumber : public ModelCommand { @@ -10840,6 +11738,7 @@ class SubscribeAttributeBridgedDeviceBasicSerialNumber : public ModelCommand { AddArgument("attr-name", "serial-number"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -10854,6 +11753,7 @@ class SubscribeAttributeBridgedDeviceBasicSerialNumber : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSerialNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -10874,6 +11774,7 @@ class SubscribeAttributeBridgedDeviceBasicSerialNumber : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -10888,6 +11789,7 @@ class ReadBridgedDeviceBasicReachable : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "reachable"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -10911,6 +11813,9 @@ class ReadBridgedDeviceBasicReachable : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicReachable : public ModelCommand { @@ -10921,6 +11826,7 @@ class SubscribeAttributeBridgedDeviceBasicReachable : public ModelCommand { AddArgument("attr-name", "reachable"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -10935,6 +11841,7 @@ class SubscribeAttributeBridgedDeviceBasicReachable : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeReachableWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -10955,6 +11862,7 @@ class SubscribeAttributeBridgedDeviceBasicReachable : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -10969,6 +11877,7 @@ class ReadBridgedDeviceBasicUniqueID : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "unique-id"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -10992,6 +11901,9 @@ class ReadBridgedDeviceBasicUniqueID : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicUniqueID : public ModelCommand { @@ -11002,6 +11914,7 @@ class SubscribeAttributeBridgedDeviceBasicUniqueID : public ModelCommand { AddArgument("attr-name", "unique-id"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -11016,6 +11929,7 @@ class SubscribeAttributeBridgedDeviceBasicUniqueID : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeUniqueIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -11036,6 +11950,7 @@ class SubscribeAttributeBridgedDeviceBasicUniqueID : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -11050,6 +11965,7 @@ class ReadBridgedDeviceBasicGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -11073,6 +11989,9 @@ class ReadBridgedDeviceBasicGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicGeneratedCommandList : public ModelCommand { @@ -11083,6 +12002,7 @@ class SubscribeAttributeBridgedDeviceBasicGeneratedCommandList : public ModelCom AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -11097,6 +12017,7 @@ class SubscribeAttributeBridgedDeviceBasicGeneratedCommandList : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -11118,6 +12039,7 @@ class SubscribeAttributeBridgedDeviceBasicGeneratedCommandList : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -11132,6 +12054,7 @@ class ReadBridgedDeviceBasicAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -11155,6 +12078,9 @@ class ReadBridgedDeviceBasicAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicAcceptedCommandList : public ModelCommand { @@ -11165,6 +12091,7 @@ class SubscribeAttributeBridgedDeviceBasicAcceptedCommandList : public ModelComm AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -11179,6 +12106,7 @@ class SubscribeAttributeBridgedDeviceBasicAcceptedCommandList : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -11200,6 +12128,7 @@ class SubscribeAttributeBridgedDeviceBasicAcceptedCommandList : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -11214,6 +12143,7 @@ class ReadBridgedDeviceBasicAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -11237,6 +12167,9 @@ class ReadBridgedDeviceBasicAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicAttributeList : public ModelCommand { @@ -11247,6 +12180,7 @@ class SubscribeAttributeBridgedDeviceBasicAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -11261,6 +12195,7 @@ class SubscribeAttributeBridgedDeviceBasicAttributeList : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -11281,6 +12216,7 @@ class SubscribeAttributeBridgedDeviceBasicAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -11295,6 +12231,7 @@ class ReadBridgedDeviceBasicClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -11318,6 +12255,9 @@ class ReadBridgedDeviceBasicClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeBridgedDeviceBasicClusterRevision : public ModelCommand { @@ -11328,6 +12268,7 @@ class SubscribeAttributeBridgedDeviceBasicClusterRevision : public ModelCommand AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -11342,6 +12283,7 @@ class SubscribeAttributeBridgedDeviceBasicClusterRevision : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -11363,6 +12305,7 @@ class SubscribeAttributeBridgedDeviceBasicClusterRevision : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -11398,6 +12341,7 @@ class ChannelChangeChannel : public ModelCommand { : ModelCommand("change-channel") { AddArgument("Match", &mMatch); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -11409,7 +12353,8 @@ class ChannelChangeChannel : public ModelCommand { CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPChannelClusterChangeChannelParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.match = [[NSString alloc] initWithBytes:mMatch.data() length:mMatch.size() encoding:NSUTF8StringEncoding]; [cluster changeChannelWithParams:params @@ -11423,6 +12368,7 @@ class ChannelChangeChannel : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mMatch; }; @@ -11436,6 +12382,7 @@ class ChannelChangeChannelByNumber : public ModelCommand { { AddArgument("MajorNumber", 0, UINT16_MAX, &mMajorNumber); AddArgument("MinorNumber", 0, UINT16_MAX, &mMinorNumber); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -11447,9 +12394,9 @@ class ChannelChangeChannelByNumber : public ModelCommand { CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPChannelClusterChangeChannelByNumberParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.majorNumber = [NSNumber numberWithUnsignedShort:mMajorNumber]; - params.minorNumber = [NSNumber numberWithUnsignedShort:mMinorNumber]; [cluster changeChannelByNumberWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -11461,6 +12408,7 @@ class ChannelChangeChannelByNumber : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mMajorNumber; uint16_t mMinorNumber; }; @@ -11474,6 +12422,7 @@ class ChannelSkipChannel : public ModelCommand { : ModelCommand("skip-channel") { AddArgument("Count", 0, UINT16_MAX, &mCount); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -11485,7 +12434,8 @@ class ChannelSkipChannel : public ModelCommand { CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPChannelClusterSkipChannelParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.count = [NSNumber numberWithUnsignedShort:mCount]; [cluster skipChannelWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -11497,6 +12447,7 @@ class ChannelSkipChannel : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mCount; }; @@ -11509,6 +12460,7 @@ class ReadChannelChannelList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "channel-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -11530,6 +12482,9 @@ class ReadChannelChannelList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeChannelChannelList : public ModelCommand { @@ -11540,6 +12495,7 @@ class SubscribeAttributeChannelChannelList : public ModelCommand { AddArgument("attr-name", "channel-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -11552,6 +12508,7 @@ class SubscribeAttributeChannelChannelList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeChannelListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -11572,6 +12529,7 @@ class SubscribeAttributeChannelChannelList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -11586,6 +12544,7 @@ class ReadChannelLineup : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "lineup"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -11608,6 +12567,9 @@ class ReadChannelLineup : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeChannelLineup : public ModelCommand { @@ -11618,6 +12580,7 @@ class SubscribeAttributeChannelLineup : public ModelCommand { AddArgument("attr-name", "lineup"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -11630,6 +12593,7 @@ class SubscribeAttributeChannelLineup : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLineupWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -11651,6 +12615,7 @@ class SubscribeAttributeChannelLineup : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -11665,6 +12630,7 @@ class ReadChannelCurrentChannel : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-channel"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -11687,6 +12653,9 @@ class ReadChannelCurrentChannel : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeChannelCurrentChannel : public ModelCommand { @@ -11697,6 +12666,7 @@ class SubscribeAttributeChannelCurrentChannel : public ModelCommand { AddArgument("attr-name", "current-channel"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -11709,6 +12679,7 @@ class SubscribeAttributeChannelCurrentChannel : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentChannelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -11730,6 +12701,7 @@ class SubscribeAttributeChannelCurrentChannel : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -11744,6 +12716,7 @@ class ReadChannelGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -11765,6 +12738,9 @@ class ReadChannelGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeChannelGeneratedCommandList : public ModelCommand { @@ -11775,6 +12751,7 @@ class SubscribeAttributeChannelGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -11787,6 +12764,7 @@ class SubscribeAttributeChannelGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -11808,6 +12786,7 @@ class SubscribeAttributeChannelGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -11822,6 +12801,7 @@ class ReadChannelAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -11843,6 +12823,9 @@ class ReadChannelAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeChannelAcceptedCommandList : public ModelCommand { @@ -11853,6 +12836,7 @@ class SubscribeAttributeChannelAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -11865,6 +12849,7 @@ class SubscribeAttributeChannelAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -11885,6 +12870,7 @@ class SubscribeAttributeChannelAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -11899,6 +12885,7 @@ class ReadChannelAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -11920,6 +12907,9 @@ class ReadChannelAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeChannelAttributeList : public ModelCommand { @@ -11930,6 +12920,7 @@ class SubscribeAttributeChannelAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -11942,6 +12933,7 @@ class SubscribeAttributeChannelAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -11962,6 +12954,7 @@ class SubscribeAttributeChannelAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -11976,6 +12969,7 @@ class ReadChannelClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -11997,6 +12991,9 @@ class ReadChannelClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeChannelClusterRevision : public ModelCommand { @@ -12007,6 +13004,7 @@ class SubscribeAttributeChannelClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -12019,6 +13017,7 @@ class SubscribeAttributeChannelClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPChannel * cluster = [[CHIPChannel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -12039,6 +13038,7 @@ class SubscribeAttributeChannelClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -12145,6 +13145,7 @@ class ColorControlColorLoopSet : public ModelCommand { AddArgument("StartHue", 0, UINT16_MAX, &mStartHue); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12156,19 +13157,14 @@ class ColorControlColorLoopSet : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterColorLoopSetParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.updateFlags = [NSNumber numberWithUnsignedChar:mUpdateFlags]; - params.action = [NSNumber numberWithUnsignedChar:mAction]; - params.direction = [NSNumber numberWithUnsignedChar:mDirection]; - params.time = [NSNumber numberWithUnsignedShort:mTime]; - params.startHue = [NSNumber numberWithUnsignedShort:mStartHue]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster colorLoopSetWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12180,6 +13176,7 @@ class ColorControlColorLoopSet : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mUpdateFlags; uint8_t mAction; uint8_t mDirection; @@ -12201,6 +13198,7 @@ class ColorControlEnhancedMoveHue : public ModelCommand { AddArgument("Rate", 0, UINT16_MAX, &mRate); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12212,13 +13210,11 @@ class ColorControlEnhancedMoveHue : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterEnhancedMoveHueParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.moveMode = [NSNumber numberWithUnsignedChar:mMoveMode]; - params.rate = [NSNumber numberWithUnsignedShort:mRate]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster enhancedMoveHueWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12230,6 +13226,7 @@ class ColorControlEnhancedMoveHue : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mMoveMode; uint16_t mRate; uint8_t mOptionsMask; @@ -12249,6 +13246,7 @@ class ColorControlEnhancedMoveToHue : public ModelCommand { AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12260,15 +13258,12 @@ class ColorControlEnhancedMoveToHue : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterEnhancedMoveToHueParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.enhancedHue = [NSNumber numberWithUnsignedShort:mEnhancedHue]; - params.direction = [NSNumber numberWithUnsignedChar:mDirection]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster enhancedMoveToHueWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12280,6 +13275,7 @@ class ColorControlEnhancedMoveToHue : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mEnhancedHue; uint8_t mDirection; uint16_t mTransitionTime; @@ -12300,6 +13296,7 @@ class ColorControlEnhancedMoveToHueAndSaturation : public ModelCommand { AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12311,15 +13308,12 @@ class ColorControlEnhancedMoveToHueAndSaturation : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterEnhancedMoveToHueAndSaturationParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.enhancedHue = [NSNumber numberWithUnsignedShort:mEnhancedHue]; - params.saturation = [NSNumber numberWithUnsignedChar:mSaturation]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster enhancedMoveToHueAndSaturationWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12331,6 +13325,7 @@ class ColorControlEnhancedMoveToHueAndSaturation : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mEnhancedHue; uint8_t mSaturation; uint16_t mTransitionTime; @@ -12351,6 +13346,7 @@ class ColorControlEnhancedStepHue : public ModelCommand { AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12362,15 +13358,12 @@ class ColorControlEnhancedStepHue : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterEnhancedStepHueParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.stepMode = [NSNumber numberWithUnsignedChar:mStepMode]; - params.stepSize = [NSNumber numberWithUnsignedShort:mStepSize]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster enhancedStepHueWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12382,6 +13375,7 @@ class ColorControlEnhancedStepHue : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mStepMode; uint16_t mStepSize; uint16_t mTransitionTime; @@ -12401,6 +13395,7 @@ class ColorControlMoveColor : public ModelCommand { AddArgument("RateY", INT16_MIN, INT16_MAX, &mRateY); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12412,13 +13407,11 @@ class ColorControlMoveColor : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterMoveColorParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.rateX = [NSNumber numberWithShort:mRateX]; - params.rateY = [NSNumber numberWithShort:mRateY]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster moveColorWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12430,6 +13423,7 @@ class ColorControlMoveColor : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int16_t mRateX; int16_t mRateY; uint8_t mOptionsMask; @@ -12450,6 +13444,7 @@ class ColorControlMoveColorTemperature : public ModelCommand { AddArgument("ColorTemperatureMaximum", 0, UINT16_MAX, &mColorTemperatureMaximum); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12461,17 +13456,13 @@ class ColorControlMoveColorTemperature : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterMoveColorTemperatureParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.moveMode = [NSNumber numberWithUnsignedChar:mMoveMode]; - params.rate = [NSNumber numberWithUnsignedShort:mRate]; - params.colorTemperatureMinimum = [NSNumber numberWithUnsignedShort:mColorTemperatureMinimum]; - params.colorTemperatureMaximum = [NSNumber numberWithUnsignedShort:mColorTemperatureMaximum]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster moveColorTemperatureWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12483,6 +13474,7 @@ class ColorControlMoveColorTemperature : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mMoveMode; uint16_t mRate; uint16_t mColorTemperatureMinimum; @@ -12503,6 +13495,7 @@ class ColorControlMoveHue : public ModelCommand { AddArgument("Rate", 0, UINT8_MAX, &mRate); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12514,13 +13507,11 @@ class ColorControlMoveHue : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterMoveHueParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.moveMode = [NSNumber numberWithUnsignedChar:mMoveMode]; - params.rate = [NSNumber numberWithUnsignedChar:mRate]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster moveHueWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12532,6 +13523,7 @@ class ColorControlMoveHue : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mMoveMode; uint8_t mRate; uint8_t mOptionsMask; @@ -12550,6 +13542,7 @@ class ColorControlMoveSaturation : public ModelCommand { AddArgument("Rate", 0, UINT8_MAX, &mRate); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12561,13 +13554,11 @@ class ColorControlMoveSaturation : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterMoveSaturationParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.moveMode = [NSNumber numberWithUnsignedChar:mMoveMode]; - params.rate = [NSNumber numberWithUnsignedChar:mRate]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster moveSaturationWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12579,6 +13570,7 @@ class ColorControlMoveSaturation : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mMoveMode; uint8_t mRate; uint8_t mOptionsMask; @@ -12598,6 +13590,7 @@ class ColorControlMoveToColor : public ModelCommand { AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12609,15 +13602,12 @@ class ColorControlMoveToColor : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterMoveToColorParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.colorX = [NSNumber numberWithUnsignedShort:mColorX]; - params.colorY = [NSNumber numberWithUnsignedShort:mColorY]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster moveToColorWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12629,6 +13619,7 @@ class ColorControlMoveToColor : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mColorX; uint16_t mColorY; uint16_t mTransitionTime; @@ -12648,6 +13639,7 @@ class ColorControlMoveToColorTemperature : public ModelCommand { AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12659,13 +13651,11 @@ class ColorControlMoveToColorTemperature : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterMoveToColorTemperatureParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.colorTemperature = [NSNumber numberWithUnsignedShort:mColorTemperature]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster moveToColorTemperatureWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12677,6 +13667,7 @@ class ColorControlMoveToColorTemperature : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mColorTemperature; uint16_t mTransitionTime; uint8_t mOptionsMask; @@ -12696,6 +13687,7 @@ class ColorControlMoveToHue : public ModelCommand { AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12707,15 +13699,12 @@ class ColorControlMoveToHue : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterMoveToHueParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.hue = [NSNumber numberWithUnsignedChar:mHue]; - params.direction = [NSNumber numberWithUnsignedChar:mDirection]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster moveToHueWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12727,6 +13716,7 @@ class ColorControlMoveToHue : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mHue; uint8_t mDirection; uint16_t mTransitionTime; @@ -12747,6 +13737,7 @@ class ColorControlMoveToHueAndSaturation : public ModelCommand { AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12758,15 +13749,12 @@ class ColorControlMoveToHueAndSaturation : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterMoveToHueAndSaturationParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.hue = [NSNumber numberWithUnsignedChar:mHue]; - params.saturation = [NSNumber numberWithUnsignedChar:mSaturation]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster moveToHueAndSaturationWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12778,6 +13766,7 @@ class ColorControlMoveToHueAndSaturation : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mHue; uint8_t mSaturation; uint16_t mTransitionTime; @@ -12797,6 +13786,7 @@ class ColorControlMoveToSaturation : public ModelCommand { AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12808,13 +13798,11 @@ class ColorControlMoveToSaturation : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterMoveToSaturationParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.saturation = [NSNumber numberWithUnsignedChar:mSaturation]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster moveToSaturationWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12826,6 +13814,7 @@ class ColorControlMoveToSaturation : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mSaturation; uint16_t mTransitionTime; uint8_t mOptionsMask; @@ -12845,6 +13834,7 @@ class ColorControlStepColor : public ModelCommand { AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12856,15 +13846,12 @@ class ColorControlStepColor : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterStepColorParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.stepX = [NSNumber numberWithShort:mStepX]; - params.stepY = [NSNumber numberWithShort:mStepY]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster stepColorWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12876,6 +13863,7 @@ class ColorControlStepColor : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int16_t mStepX; int16_t mStepY; uint16_t mTransitionTime; @@ -12898,6 +13886,7 @@ class ColorControlStepColorTemperature : public ModelCommand { AddArgument("ColorTemperatureMaximum", 0, UINT16_MAX, &mColorTemperatureMaximum); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12909,19 +13898,14 @@ class ColorControlStepColorTemperature : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterStepColorTemperatureParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.stepMode = [NSNumber numberWithUnsignedChar:mStepMode]; - params.stepSize = [NSNumber numberWithUnsignedShort:mStepSize]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; - params.colorTemperatureMinimum = [NSNumber numberWithUnsignedShort:mColorTemperatureMinimum]; - params.colorTemperatureMaximum = [NSNumber numberWithUnsignedShort:mColorTemperatureMaximum]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster stepColorTemperatureWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12933,6 +13917,7 @@ class ColorControlStepColorTemperature : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mStepMode; uint16_t mStepSize; uint16_t mTransitionTime; @@ -12955,6 +13940,7 @@ class ColorControlStepHue : public ModelCommand { AddArgument("TransitionTime", 0, UINT8_MAX, &mTransitionTime); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -12966,15 +13952,12 @@ class ColorControlStepHue : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterStepHueParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.stepMode = [NSNumber numberWithUnsignedChar:mStepMode]; - params.stepSize = [NSNumber numberWithUnsignedChar:mStepSize]; - params.transitionTime = [NSNumber numberWithUnsignedChar:mTransitionTime]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster stepHueWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -12986,6 +13969,7 @@ class ColorControlStepHue : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mStepMode; uint8_t mStepSize; uint8_t mTransitionTime; @@ -13006,6 +13990,7 @@ class ColorControlStepSaturation : public ModelCommand { AddArgument("TransitionTime", 0, UINT8_MAX, &mTransitionTime); AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -13017,15 +14002,12 @@ class ColorControlStepSaturation : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterStepSaturationParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.stepMode = [NSNumber numberWithUnsignedChar:mStepMode]; - params.stepSize = [NSNumber numberWithUnsignedChar:mStepSize]; - params.transitionTime = [NSNumber numberWithUnsignedChar:mTransitionTime]; - params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster stepSaturationWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -13037,6 +14019,7 @@ class ColorControlStepSaturation : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mStepMode; uint8_t mStepSize; uint8_t mTransitionTime; @@ -13054,6 +14037,7 @@ class ColorControlStopMoveStep : public ModelCommand { { AddArgument("OptionsMask", 0, UINT8_MAX, &mOptionsMask); AddArgument("OptionsOverride", 0, UINT8_MAX, &mOptionsOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -13065,9 +14049,9 @@ class ColorControlStopMoveStep : public ModelCommand { CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPColorControlClusterStopMoveStepParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.optionsMask = [NSNumber numberWithUnsignedChar:mOptionsMask]; - params.optionsOverride = [NSNumber numberWithUnsignedChar:mOptionsOverride]; [cluster stopMoveStepWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -13079,6 +14063,7 @@ class ColorControlStopMoveStep : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mOptionsMask; uint8_t mOptionsOverride; }; @@ -13092,6 +14077,7 @@ class ReadColorControlCurrentHue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-hue"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -13113,6 +14099,9 @@ class ReadColorControlCurrentHue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlCurrentHue : public ModelCommand { @@ -13123,6 +14112,7 @@ class SubscribeAttributeColorControlCurrentHue : public ModelCommand { AddArgument("attr-name", "current-hue"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -13135,6 +14125,7 @@ class SubscribeAttributeColorControlCurrentHue : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -13155,6 +14146,7 @@ class SubscribeAttributeColorControlCurrentHue : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -13169,6 +14161,7 @@ class ReadColorControlCurrentSaturation : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-saturation"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -13190,6 +14183,9 @@ class ReadColorControlCurrentSaturation : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlCurrentSaturation : public ModelCommand { @@ -13200,6 +14196,7 @@ class SubscribeAttributeColorControlCurrentSaturation : public ModelCommand { AddArgument("attr-name", "current-saturation"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -13212,6 +14209,7 @@ class SubscribeAttributeColorControlCurrentSaturation : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentSaturationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -13232,6 +14230,7 @@ class SubscribeAttributeColorControlCurrentSaturation : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -13246,6 +14245,7 @@ class ReadColorControlRemainingTime : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "remaining-time"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -13267,6 +14267,9 @@ class ReadColorControlRemainingTime : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlRemainingTime : public ModelCommand { @@ -13277,6 +14280,7 @@ class SubscribeAttributeColorControlRemainingTime : public ModelCommand { AddArgument("attr-name", "remaining-time"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -13289,6 +14293,7 @@ class SubscribeAttributeColorControlRemainingTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRemainingTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -13309,6 +14314,7 @@ class SubscribeAttributeColorControlRemainingTime : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -13323,6 +14329,7 @@ class ReadColorControlCurrentX : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-x"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -13344,6 +14351,9 @@ class ReadColorControlCurrentX : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlCurrentX : public ModelCommand { @@ -13354,6 +14364,7 @@ class SubscribeAttributeColorControlCurrentX : public ModelCommand { AddArgument("attr-name", "current-x"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -13366,6 +14377,7 @@ class SubscribeAttributeColorControlCurrentX : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -13386,6 +14398,7 @@ class SubscribeAttributeColorControlCurrentX : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -13400,6 +14413,7 @@ class ReadColorControlCurrentY : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-y"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -13421,6 +14435,9 @@ class ReadColorControlCurrentY : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlCurrentY : public ModelCommand { @@ -13431,6 +14448,7 @@ class SubscribeAttributeColorControlCurrentY : public ModelCommand { AddArgument("attr-name", "current-y"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -13443,6 +14461,7 @@ class SubscribeAttributeColorControlCurrentY : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -13463,6 +14482,7 @@ class SubscribeAttributeColorControlCurrentY : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -13477,6 +14497,7 @@ class ReadColorControlDriftCompensation : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "drift-compensation"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -13498,6 +14519,9 @@ class ReadColorControlDriftCompensation : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlDriftCompensation : public ModelCommand { @@ -13508,6 +14532,7 @@ class SubscribeAttributeColorControlDriftCompensation : public ModelCommand { AddArgument("attr-name", "drift-compensation"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -13520,6 +14545,7 @@ class SubscribeAttributeColorControlDriftCompensation : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeDriftCompensationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -13540,6 +14566,7 @@ class SubscribeAttributeColorControlDriftCompensation : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -13554,6 +14581,7 @@ class ReadColorControlCompensationText : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "compensation-text"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -13575,6 +14603,9 @@ class ReadColorControlCompensationText : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlCompensationText : public ModelCommand { @@ -13585,6 +14616,7 @@ class SubscribeAttributeColorControlCompensationText : public ModelCommand { AddArgument("attr-name", "compensation-text"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -13597,6 +14629,7 @@ class SubscribeAttributeColorControlCompensationText : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCompensationTextWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -13617,6 +14650,7 @@ class SubscribeAttributeColorControlCompensationText : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -13631,6 +14665,7 @@ class ReadColorControlColorTemperature : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-temperature"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -13652,6 +14687,9 @@ class ReadColorControlColorTemperature : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlColorTemperature : public ModelCommand { @@ -13662,6 +14700,7 @@ class SubscribeAttributeColorControlColorTemperature : public ModelCommand { AddArgument("attr-name", "color-temperature"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -13674,6 +14713,7 @@ class SubscribeAttributeColorControlColorTemperature : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -13694,6 +14734,7 @@ class SubscribeAttributeColorControlColorTemperature : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -13708,6 +14749,7 @@ class ReadColorControlColorMode : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-mode"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -13729,6 +14771,9 @@ class ReadColorControlColorMode : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlColorMode : public ModelCommand { @@ -13739,6 +14784,7 @@ class SubscribeAttributeColorControlColorMode : public ModelCommand { AddArgument("attr-name", "color-mode"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -13751,6 +14797,7 @@ class SubscribeAttributeColorControlColorMode : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -13771,6 +14818,7 @@ class SubscribeAttributeColorControlColorMode : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -13785,6 +14833,7 @@ class ReadColorControlColorControlOptions : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-control-options"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -13806,6 +14855,9 @@ class ReadColorControlColorControlOptions : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteColorControlColorControlOptions : public ModelCommand { @@ -13815,6 +14867,7 @@ class WriteColorControlColorControlOptions : public ModelCommand { { AddArgument("attr-name", "color-control-options"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -13826,10 +14879,13 @@ class WriteColorControlColorControlOptions : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeColorControlOptionsWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ColorControl ColorControlOptions Error: %s", @@ -13840,6 +14896,7 @@ class WriteColorControlColorControlOptions : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -13851,6 +14908,7 @@ class SubscribeAttributeColorControlColorControlOptions : public ModelCommand { AddArgument("attr-name", "color-control-options"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -13863,6 +14921,7 @@ class SubscribeAttributeColorControlColorControlOptions : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorControlOptionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -13884,6 +14943,7 @@ class SubscribeAttributeColorControlColorControlOptions : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -13898,6 +14958,7 @@ class ReadColorControlNumberOfPrimaries : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "number-of-primaries"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -13919,6 +14980,9 @@ class ReadColorControlNumberOfPrimaries : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlNumberOfPrimaries : public ModelCommand { @@ -13929,6 +14993,7 @@ class SubscribeAttributeColorControlNumberOfPrimaries : public ModelCommand { AddArgument("attr-name", "number-of-primaries"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -13941,6 +15006,7 @@ class SubscribeAttributeColorControlNumberOfPrimaries : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNumberOfPrimariesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -13961,6 +15027,7 @@ class SubscribeAttributeColorControlNumberOfPrimaries : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -13975,6 +15042,7 @@ class ReadColorControlPrimary1X : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary1x"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -13996,6 +15064,9 @@ class ReadColorControlPrimary1X : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary1X : public ModelCommand { @@ -14006,6 +15077,7 @@ class SubscribeAttributeColorControlPrimary1X : public ModelCommand { AddArgument("attr-name", "primary1x"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -14018,6 +15090,7 @@ class SubscribeAttributeColorControlPrimary1X : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary1XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -14038,6 +15111,7 @@ class SubscribeAttributeColorControlPrimary1X : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -14052,6 +15126,7 @@ class ReadColorControlPrimary1Y : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary1y"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -14073,6 +15148,9 @@ class ReadColorControlPrimary1Y : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary1Y : public ModelCommand { @@ -14083,6 +15161,7 @@ class SubscribeAttributeColorControlPrimary1Y : public ModelCommand { AddArgument("attr-name", "primary1y"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -14095,6 +15174,7 @@ class SubscribeAttributeColorControlPrimary1Y : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary1YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -14115,6 +15195,7 @@ class SubscribeAttributeColorControlPrimary1Y : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -14129,6 +15210,7 @@ class ReadColorControlPrimary1Intensity : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary1intensity"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -14150,6 +15232,9 @@ class ReadColorControlPrimary1Intensity : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary1Intensity : public ModelCommand { @@ -14160,6 +15245,7 @@ class SubscribeAttributeColorControlPrimary1Intensity : public ModelCommand { AddArgument("attr-name", "primary1intensity"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -14172,6 +15258,7 @@ class SubscribeAttributeColorControlPrimary1Intensity : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary1IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -14192,6 +15279,7 @@ class SubscribeAttributeColorControlPrimary1Intensity : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -14206,6 +15294,7 @@ class ReadColorControlPrimary2X : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary2x"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -14227,6 +15316,9 @@ class ReadColorControlPrimary2X : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary2X : public ModelCommand { @@ -14237,6 +15329,7 @@ class SubscribeAttributeColorControlPrimary2X : public ModelCommand { AddArgument("attr-name", "primary2x"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -14249,6 +15342,7 @@ class SubscribeAttributeColorControlPrimary2X : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary2XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -14269,6 +15363,7 @@ class SubscribeAttributeColorControlPrimary2X : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -14283,6 +15378,7 @@ class ReadColorControlPrimary2Y : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary2y"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -14304,6 +15400,9 @@ class ReadColorControlPrimary2Y : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary2Y : public ModelCommand { @@ -14314,6 +15413,7 @@ class SubscribeAttributeColorControlPrimary2Y : public ModelCommand { AddArgument("attr-name", "primary2y"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -14326,6 +15426,7 @@ class SubscribeAttributeColorControlPrimary2Y : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary2YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -14346,6 +15447,7 @@ class SubscribeAttributeColorControlPrimary2Y : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -14360,6 +15462,7 @@ class ReadColorControlPrimary2Intensity : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary2intensity"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -14381,6 +15484,9 @@ class ReadColorControlPrimary2Intensity : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary2Intensity : public ModelCommand { @@ -14391,6 +15497,7 @@ class SubscribeAttributeColorControlPrimary2Intensity : public ModelCommand { AddArgument("attr-name", "primary2intensity"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -14403,6 +15510,7 @@ class SubscribeAttributeColorControlPrimary2Intensity : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary2IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -14423,6 +15531,7 @@ class SubscribeAttributeColorControlPrimary2Intensity : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -14437,6 +15546,7 @@ class ReadColorControlPrimary3X : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary3x"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -14458,6 +15568,9 @@ class ReadColorControlPrimary3X : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary3X : public ModelCommand { @@ -14468,6 +15581,7 @@ class SubscribeAttributeColorControlPrimary3X : public ModelCommand { AddArgument("attr-name", "primary3x"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -14480,6 +15594,7 @@ class SubscribeAttributeColorControlPrimary3X : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary3XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -14500,6 +15615,7 @@ class SubscribeAttributeColorControlPrimary3X : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -14514,6 +15630,7 @@ class ReadColorControlPrimary3Y : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary3y"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -14535,6 +15652,9 @@ class ReadColorControlPrimary3Y : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary3Y : public ModelCommand { @@ -14545,6 +15665,7 @@ class SubscribeAttributeColorControlPrimary3Y : public ModelCommand { AddArgument("attr-name", "primary3y"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -14557,6 +15678,7 @@ class SubscribeAttributeColorControlPrimary3Y : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary3YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -14577,6 +15699,7 @@ class SubscribeAttributeColorControlPrimary3Y : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -14591,6 +15714,7 @@ class ReadColorControlPrimary3Intensity : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary3intensity"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -14612,6 +15736,9 @@ class ReadColorControlPrimary3Intensity : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary3Intensity : public ModelCommand { @@ -14622,6 +15749,7 @@ class SubscribeAttributeColorControlPrimary3Intensity : public ModelCommand { AddArgument("attr-name", "primary3intensity"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -14634,6 +15762,7 @@ class SubscribeAttributeColorControlPrimary3Intensity : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary3IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -14654,6 +15783,7 @@ class SubscribeAttributeColorControlPrimary3Intensity : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -14668,6 +15798,7 @@ class ReadColorControlPrimary4X : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary4x"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -14689,6 +15820,9 @@ class ReadColorControlPrimary4X : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary4X : public ModelCommand { @@ -14699,6 +15833,7 @@ class SubscribeAttributeColorControlPrimary4X : public ModelCommand { AddArgument("attr-name", "primary4x"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -14711,6 +15846,7 @@ class SubscribeAttributeColorControlPrimary4X : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary4XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -14731,6 +15867,7 @@ class SubscribeAttributeColorControlPrimary4X : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -14745,6 +15882,7 @@ class ReadColorControlPrimary4Y : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary4y"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -14766,6 +15904,9 @@ class ReadColorControlPrimary4Y : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary4Y : public ModelCommand { @@ -14776,6 +15917,7 @@ class SubscribeAttributeColorControlPrimary4Y : public ModelCommand { AddArgument("attr-name", "primary4y"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -14788,6 +15930,7 @@ class SubscribeAttributeColorControlPrimary4Y : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary4YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -14808,6 +15951,7 @@ class SubscribeAttributeColorControlPrimary4Y : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -14822,6 +15966,7 @@ class ReadColorControlPrimary4Intensity : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary4intensity"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -14843,6 +15988,9 @@ class ReadColorControlPrimary4Intensity : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary4Intensity : public ModelCommand { @@ -14853,6 +16001,7 @@ class SubscribeAttributeColorControlPrimary4Intensity : public ModelCommand { AddArgument("attr-name", "primary4intensity"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -14865,6 +16014,7 @@ class SubscribeAttributeColorControlPrimary4Intensity : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary4IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -14885,6 +16035,7 @@ class SubscribeAttributeColorControlPrimary4Intensity : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -14899,6 +16050,7 @@ class ReadColorControlPrimary5X : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary5x"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -14920,6 +16072,9 @@ class ReadColorControlPrimary5X : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary5X : public ModelCommand { @@ -14930,6 +16085,7 @@ class SubscribeAttributeColorControlPrimary5X : public ModelCommand { AddArgument("attr-name", "primary5x"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -14942,6 +16098,7 @@ class SubscribeAttributeColorControlPrimary5X : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary5XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -14962,6 +16119,7 @@ class SubscribeAttributeColorControlPrimary5X : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -14976,6 +16134,7 @@ class ReadColorControlPrimary5Y : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary5y"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -14997,6 +16156,9 @@ class ReadColorControlPrimary5Y : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary5Y : public ModelCommand { @@ -15007,6 +16169,7 @@ class SubscribeAttributeColorControlPrimary5Y : public ModelCommand { AddArgument("attr-name", "primary5y"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -15019,6 +16182,7 @@ class SubscribeAttributeColorControlPrimary5Y : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary5YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -15039,6 +16203,7 @@ class SubscribeAttributeColorControlPrimary5Y : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -15053,6 +16218,7 @@ class ReadColorControlPrimary5Intensity : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary5intensity"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -15074,6 +16240,9 @@ class ReadColorControlPrimary5Intensity : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary5Intensity : public ModelCommand { @@ -15084,6 +16253,7 @@ class SubscribeAttributeColorControlPrimary5Intensity : public ModelCommand { AddArgument("attr-name", "primary5intensity"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -15096,6 +16266,7 @@ class SubscribeAttributeColorControlPrimary5Intensity : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary5IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -15116,6 +16287,7 @@ class SubscribeAttributeColorControlPrimary5Intensity : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -15130,6 +16302,7 @@ class ReadColorControlPrimary6X : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary6x"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -15151,6 +16324,9 @@ class ReadColorControlPrimary6X : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary6X : public ModelCommand { @@ -15161,6 +16337,7 @@ class SubscribeAttributeColorControlPrimary6X : public ModelCommand { AddArgument("attr-name", "primary6x"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -15173,6 +16350,7 @@ class SubscribeAttributeColorControlPrimary6X : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary6XWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -15193,6 +16371,7 @@ class SubscribeAttributeColorControlPrimary6X : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -15207,6 +16386,7 @@ class ReadColorControlPrimary6Y : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary6y"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -15228,6 +16408,9 @@ class ReadColorControlPrimary6Y : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary6Y : public ModelCommand { @@ -15238,6 +16421,7 @@ class SubscribeAttributeColorControlPrimary6Y : public ModelCommand { AddArgument("attr-name", "primary6y"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -15250,6 +16434,7 @@ class SubscribeAttributeColorControlPrimary6Y : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary6YWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -15270,6 +16455,7 @@ class SubscribeAttributeColorControlPrimary6Y : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -15284,6 +16470,7 @@ class ReadColorControlPrimary6Intensity : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "primary6intensity"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -15305,6 +16492,9 @@ class ReadColorControlPrimary6Intensity : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlPrimary6Intensity : public ModelCommand { @@ -15315,6 +16505,7 @@ class SubscribeAttributeColorControlPrimary6Intensity : public ModelCommand { AddArgument("attr-name", "primary6intensity"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -15327,6 +16518,7 @@ class SubscribeAttributeColorControlPrimary6Intensity : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePrimary6IntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -15347,6 +16539,7 @@ class SubscribeAttributeColorControlPrimary6Intensity : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -15361,6 +16554,7 @@ class ReadColorControlWhitePointX : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "white-point-x"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -15382,6 +16576,9 @@ class ReadColorControlWhitePointX : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteColorControlWhitePointX : public ModelCommand { @@ -15391,6 +16588,7 @@ class WriteColorControlWhitePointX : public ModelCommand { { AddArgument("attr-name", "white-point-x"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -15402,10 +16600,13 @@ class WriteColorControlWhitePointX : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeWhitePointXWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ColorControl WhitePointX Error: %s", chip::ErrorStr(chipError)); @@ -15415,6 +16616,7 @@ class WriteColorControlWhitePointX : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -15426,6 +16628,7 @@ class SubscribeAttributeColorControlWhitePointX : public ModelCommand { AddArgument("attr-name", "white-point-x"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -15438,6 +16641,7 @@ class SubscribeAttributeColorControlWhitePointX : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeWhitePointXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -15458,6 +16662,7 @@ class SubscribeAttributeColorControlWhitePointX : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -15472,6 +16677,7 @@ class ReadColorControlWhitePointY : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "white-point-y"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -15493,6 +16699,9 @@ class ReadColorControlWhitePointY : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteColorControlWhitePointY : public ModelCommand { @@ -15502,6 +16711,7 @@ class WriteColorControlWhitePointY : public ModelCommand { { AddArgument("attr-name", "white-point-y"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -15513,10 +16723,13 @@ class WriteColorControlWhitePointY : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeWhitePointYWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ColorControl WhitePointY Error: %s", chip::ErrorStr(chipError)); @@ -15526,6 +16739,7 @@ class WriteColorControlWhitePointY : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -15537,6 +16751,7 @@ class SubscribeAttributeColorControlWhitePointY : public ModelCommand { AddArgument("attr-name", "white-point-y"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -15549,6 +16764,7 @@ class SubscribeAttributeColorControlWhitePointY : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeWhitePointYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -15569,6 +16785,7 @@ class SubscribeAttributeColorControlWhitePointY : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -15583,6 +16800,7 @@ class ReadColorControlColorPointRX : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-point-rx"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -15604,6 +16822,9 @@ class ReadColorControlColorPointRX : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteColorControlColorPointRX : public ModelCommand { @@ -15613,6 +16834,7 @@ class WriteColorControlColorPointRX : public ModelCommand { { AddArgument("attr-name", "color-point-rx"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -15624,10 +16846,13 @@ class WriteColorControlColorPointRX : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeColorPointRXWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ColorControl ColorPointRX Error: %s", chip::ErrorStr(chipError)); @@ -15637,6 +16862,7 @@ class WriteColorControlColorPointRX : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -15648,6 +16874,7 @@ class SubscribeAttributeColorControlColorPointRX : public ModelCommand { AddArgument("attr-name", "color-point-rx"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -15660,6 +16887,7 @@ class SubscribeAttributeColorControlColorPointRX : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorPointRXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -15680,6 +16908,7 @@ class SubscribeAttributeColorControlColorPointRX : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -15694,6 +16923,7 @@ class ReadColorControlColorPointRY : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-point-ry"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -15715,6 +16945,9 @@ class ReadColorControlColorPointRY : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteColorControlColorPointRY : public ModelCommand { @@ -15724,6 +16957,7 @@ class WriteColorControlColorPointRY : public ModelCommand { { AddArgument("attr-name", "color-point-ry"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -15735,10 +16969,13 @@ class WriteColorControlColorPointRY : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeColorPointRYWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ColorControl ColorPointRY Error: %s", chip::ErrorStr(chipError)); @@ -15748,6 +16985,7 @@ class WriteColorControlColorPointRY : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -15759,6 +16997,7 @@ class SubscribeAttributeColorControlColorPointRY : public ModelCommand { AddArgument("attr-name", "color-point-ry"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -15771,6 +17010,7 @@ class SubscribeAttributeColorControlColorPointRY : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorPointRYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -15791,6 +17031,7 @@ class SubscribeAttributeColorControlColorPointRY : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -15805,6 +17046,7 @@ class ReadColorControlColorPointRIntensity : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-point-rintensity"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -15826,6 +17068,9 @@ class ReadColorControlColorPointRIntensity : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteColorControlColorPointRIntensity : public ModelCommand { @@ -15835,6 +17080,7 @@ class WriteColorControlColorPointRIntensity : public ModelCommand { { AddArgument("attr-name", "color-point-rintensity"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -15846,10 +17092,13 @@ class WriteColorControlColorPointRIntensity : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeColorPointRIntensityWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ColorControl ColorPointRIntensity Error: %s", @@ -15860,6 +17109,7 @@ class WriteColorControlColorPointRIntensity : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -15871,6 +17121,7 @@ class SubscribeAttributeColorControlColorPointRIntensity : public ModelCommand { AddArgument("attr-name", "color-point-rintensity"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -15883,6 +17134,7 @@ class SubscribeAttributeColorControlColorPointRIntensity : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorPointRIntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -15904,6 +17156,7 @@ class SubscribeAttributeColorControlColorPointRIntensity : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -15918,6 +17171,7 @@ class ReadColorControlColorPointGX : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-point-gx"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -15939,6 +17193,9 @@ class ReadColorControlColorPointGX : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteColorControlColorPointGX : public ModelCommand { @@ -15948,6 +17205,7 @@ class WriteColorControlColorPointGX : public ModelCommand { { AddArgument("attr-name", "color-point-gx"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -15959,10 +17217,13 @@ class WriteColorControlColorPointGX : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeColorPointGXWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ColorControl ColorPointGX Error: %s", chip::ErrorStr(chipError)); @@ -15972,6 +17233,7 @@ class WriteColorControlColorPointGX : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -15983,6 +17245,7 @@ class SubscribeAttributeColorControlColorPointGX : public ModelCommand { AddArgument("attr-name", "color-point-gx"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -15995,6 +17258,7 @@ class SubscribeAttributeColorControlColorPointGX : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorPointGXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -16015,6 +17279,7 @@ class SubscribeAttributeColorControlColorPointGX : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -16029,6 +17294,7 @@ class ReadColorControlColorPointGY : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-point-gy"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -16050,6 +17316,9 @@ class ReadColorControlColorPointGY : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteColorControlColorPointGY : public ModelCommand { @@ -16059,6 +17328,7 @@ class WriteColorControlColorPointGY : public ModelCommand { { AddArgument("attr-name", "color-point-gy"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -16070,10 +17340,13 @@ class WriteColorControlColorPointGY : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeColorPointGYWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ColorControl ColorPointGY Error: %s", chip::ErrorStr(chipError)); @@ -16083,6 +17356,7 @@ class WriteColorControlColorPointGY : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -16094,6 +17368,7 @@ class SubscribeAttributeColorControlColorPointGY : public ModelCommand { AddArgument("attr-name", "color-point-gy"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -16106,6 +17381,7 @@ class SubscribeAttributeColorControlColorPointGY : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorPointGYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -16126,6 +17402,7 @@ class SubscribeAttributeColorControlColorPointGY : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -16140,6 +17417,7 @@ class ReadColorControlColorPointGIntensity : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-point-gintensity"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -16161,6 +17439,9 @@ class ReadColorControlColorPointGIntensity : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteColorControlColorPointGIntensity : public ModelCommand { @@ -16170,6 +17451,7 @@ class WriteColorControlColorPointGIntensity : public ModelCommand { { AddArgument("attr-name", "color-point-gintensity"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -16181,10 +17463,13 @@ class WriteColorControlColorPointGIntensity : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeColorPointGIntensityWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ColorControl ColorPointGIntensity Error: %s", @@ -16195,6 +17480,7 @@ class WriteColorControlColorPointGIntensity : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -16206,6 +17492,7 @@ class SubscribeAttributeColorControlColorPointGIntensity : public ModelCommand { AddArgument("attr-name", "color-point-gintensity"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -16218,6 +17505,7 @@ class SubscribeAttributeColorControlColorPointGIntensity : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorPointGIntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -16239,6 +17527,7 @@ class SubscribeAttributeColorControlColorPointGIntensity : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -16253,6 +17542,7 @@ class ReadColorControlColorPointBX : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-point-bx"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -16274,6 +17564,9 @@ class ReadColorControlColorPointBX : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteColorControlColorPointBX : public ModelCommand { @@ -16283,6 +17576,7 @@ class WriteColorControlColorPointBX : public ModelCommand { { AddArgument("attr-name", "color-point-bx"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -16294,10 +17588,13 @@ class WriteColorControlColorPointBX : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeColorPointBXWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ColorControl ColorPointBX Error: %s", chip::ErrorStr(chipError)); @@ -16307,6 +17604,7 @@ class WriteColorControlColorPointBX : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -16318,6 +17616,7 @@ class SubscribeAttributeColorControlColorPointBX : public ModelCommand { AddArgument("attr-name", "color-point-bx"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -16330,6 +17629,7 @@ class SubscribeAttributeColorControlColorPointBX : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorPointBXWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -16350,6 +17650,7 @@ class SubscribeAttributeColorControlColorPointBX : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -16364,6 +17665,7 @@ class ReadColorControlColorPointBY : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-point-by"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -16385,6 +17687,9 @@ class ReadColorControlColorPointBY : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteColorControlColorPointBY : public ModelCommand { @@ -16394,6 +17699,7 @@ class WriteColorControlColorPointBY : public ModelCommand { { AddArgument("attr-name", "color-point-by"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -16405,10 +17711,13 @@ class WriteColorControlColorPointBY : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeColorPointBYWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ColorControl ColorPointBY Error: %s", chip::ErrorStr(chipError)); @@ -16418,6 +17727,7 @@ class WriteColorControlColorPointBY : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -16429,6 +17739,7 @@ class SubscribeAttributeColorControlColorPointBY : public ModelCommand { AddArgument("attr-name", "color-point-by"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -16441,6 +17752,7 @@ class SubscribeAttributeColorControlColorPointBY : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorPointBYWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -16461,6 +17773,7 @@ class SubscribeAttributeColorControlColorPointBY : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -16475,6 +17788,7 @@ class ReadColorControlColorPointBIntensity : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-point-bintensity"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -16496,6 +17810,9 @@ class ReadColorControlColorPointBIntensity : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteColorControlColorPointBIntensity : public ModelCommand { @@ -16505,6 +17822,7 @@ class WriteColorControlColorPointBIntensity : public ModelCommand { { AddArgument("attr-name", "color-point-bintensity"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -16516,10 +17834,13 @@ class WriteColorControlColorPointBIntensity : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeColorPointBIntensityWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ColorControl ColorPointBIntensity Error: %s", @@ -16530,6 +17851,7 @@ class WriteColorControlColorPointBIntensity : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -16541,6 +17863,7 @@ class SubscribeAttributeColorControlColorPointBIntensity : public ModelCommand { AddArgument("attr-name", "color-point-bintensity"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -16553,6 +17876,7 @@ class SubscribeAttributeColorControlColorPointBIntensity : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorPointBIntensityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -16574,6 +17898,7 @@ class SubscribeAttributeColorControlColorPointBIntensity : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -16588,6 +17913,7 @@ class ReadColorControlEnhancedCurrentHue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "enhanced-current-hue"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -16609,6 +17935,9 @@ class ReadColorControlEnhancedCurrentHue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlEnhancedCurrentHue : public ModelCommand { @@ -16619,6 +17948,7 @@ class SubscribeAttributeColorControlEnhancedCurrentHue : public ModelCommand { AddArgument("attr-name", "enhanced-current-hue"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -16631,6 +17961,7 @@ class SubscribeAttributeColorControlEnhancedCurrentHue : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeEnhancedCurrentHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -16652,6 +17983,7 @@ class SubscribeAttributeColorControlEnhancedCurrentHue : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -16666,6 +17998,7 @@ class ReadColorControlEnhancedColorMode : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "enhanced-color-mode"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -16687,6 +18020,9 @@ class ReadColorControlEnhancedColorMode : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlEnhancedColorMode : public ModelCommand { @@ -16697,6 +18033,7 @@ class SubscribeAttributeColorControlEnhancedColorMode : public ModelCommand { AddArgument("attr-name", "enhanced-color-mode"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -16709,6 +18046,7 @@ class SubscribeAttributeColorControlEnhancedColorMode : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeEnhancedColorModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -16729,6 +18067,7 @@ class SubscribeAttributeColorControlEnhancedColorMode : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -16743,6 +18082,7 @@ class ReadColorControlColorLoopActive : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-loop-active"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -16764,6 +18104,9 @@ class ReadColorControlColorLoopActive : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlColorLoopActive : public ModelCommand { @@ -16774,6 +18117,7 @@ class SubscribeAttributeColorControlColorLoopActive : public ModelCommand { AddArgument("attr-name", "color-loop-active"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -16786,6 +18130,7 @@ class SubscribeAttributeColorControlColorLoopActive : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorLoopActiveWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -16806,6 +18151,7 @@ class SubscribeAttributeColorControlColorLoopActive : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -16820,6 +18166,7 @@ class ReadColorControlColorLoopDirection : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-loop-direction"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -16841,6 +18188,9 @@ class ReadColorControlColorLoopDirection : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlColorLoopDirection : public ModelCommand { @@ -16851,6 +18201,7 @@ class SubscribeAttributeColorControlColorLoopDirection : public ModelCommand { AddArgument("attr-name", "color-loop-direction"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -16863,6 +18214,7 @@ class SubscribeAttributeColorControlColorLoopDirection : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorLoopDirectionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -16884,6 +18236,7 @@ class SubscribeAttributeColorControlColorLoopDirection : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -16898,6 +18251,7 @@ class ReadColorControlColorLoopTime : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-loop-time"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -16919,6 +18273,9 @@ class ReadColorControlColorLoopTime : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlColorLoopTime : public ModelCommand { @@ -16929,6 +18286,7 @@ class SubscribeAttributeColorControlColorLoopTime : public ModelCommand { AddArgument("attr-name", "color-loop-time"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -16941,6 +18299,7 @@ class SubscribeAttributeColorControlColorLoopTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorLoopTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -16961,6 +18320,7 @@ class SubscribeAttributeColorControlColorLoopTime : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -16975,6 +18335,7 @@ class ReadColorControlColorLoopStartEnhancedHue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-loop-start-enhanced-hue"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -16997,6 +18358,9 @@ class ReadColorControlColorLoopStartEnhancedHue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlColorLoopStartEnhancedHue : public ModelCommand { @@ -17007,6 +18371,7 @@ class SubscribeAttributeColorControlColorLoopStartEnhancedHue : public ModelComm AddArgument("attr-name", "color-loop-start-enhanced-hue"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -17019,6 +18384,7 @@ class SubscribeAttributeColorControlColorLoopStartEnhancedHue : public ModelComm dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorLoopStartEnhancedHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -17041,6 +18407,7 @@ class SubscribeAttributeColorControlColorLoopStartEnhancedHue : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -17055,6 +18422,7 @@ class ReadColorControlColorLoopStoredEnhancedHue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-loop-stored-enhanced-hue"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -17077,6 +18445,9 @@ class ReadColorControlColorLoopStoredEnhancedHue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlColorLoopStoredEnhancedHue : public ModelCommand { @@ -17087,6 +18458,7 @@ class SubscribeAttributeColorControlColorLoopStoredEnhancedHue : public ModelCom AddArgument("attr-name", "color-loop-stored-enhanced-hue"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -17099,6 +18471,7 @@ class SubscribeAttributeColorControlColorLoopStoredEnhancedHue : public ModelCom dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorLoopStoredEnhancedHueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -17121,6 +18494,7 @@ class SubscribeAttributeColorControlColorLoopStoredEnhancedHue : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -17135,6 +18509,7 @@ class ReadColorControlColorCapabilities : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-capabilities"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -17156,6 +18531,9 @@ class ReadColorControlColorCapabilities : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlColorCapabilities : public ModelCommand { @@ -17166,6 +18544,7 @@ class SubscribeAttributeColorControlColorCapabilities : public ModelCommand { AddArgument("attr-name", "color-capabilities"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -17178,6 +18557,7 @@ class SubscribeAttributeColorControlColorCapabilities : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorCapabilitiesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -17198,6 +18578,7 @@ class SubscribeAttributeColorControlColorCapabilities : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -17212,6 +18593,7 @@ class ReadColorControlColorTempPhysicalMin : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-temp-physical-min"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -17233,6 +18615,9 @@ class ReadColorControlColorTempPhysicalMin : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlColorTempPhysicalMin : public ModelCommand { @@ -17243,6 +18628,7 @@ class SubscribeAttributeColorControlColorTempPhysicalMin : public ModelCommand { AddArgument("attr-name", "color-temp-physical-min"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -17255,6 +18641,7 @@ class SubscribeAttributeColorControlColorTempPhysicalMin : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorTempPhysicalMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -17276,6 +18663,7 @@ class SubscribeAttributeColorControlColorTempPhysicalMin : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -17290,6 +18678,7 @@ class ReadColorControlColorTempPhysicalMax : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "color-temp-physical-max"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -17311,6 +18700,9 @@ class ReadColorControlColorTempPhysicalMax : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlColorTempPhysicalMax : public ModelCommand { @@ -17321,6 +18713,7 @@ class SubscribeAttributeColorControlColorTempPhysicalMax : public ModelCommand { AddArgument("attr-name", "color-temp-physical-max"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -17333,6 +18726,7 @@ class SubscribeAttributeColorControlColorTempPhysicalMax : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeColorTempPhysicalMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -17354,6 +18748,7 @@ class SubscribeAttributeColorControlColorTempPhysicalMax : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -17368,6 +18763,7 @@ class ReadColorControlCoupleColorTempToLevelMinMireds : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "couple-color-temp-to-level-min-mireds"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -17390,6 +18786,9 @@ class ReadColorControlCoupleColorTempToLevelMinMireds : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlCoupleColorTempToLevelMinMireds : public ModelCommand { @@ -17400,6 +18799,7 @@ class SubscribeAttributeColorControlCoupleColorTempToLevelMinMireds : public Mod AddArgument("attr-name", "couple-color-temp-to-level-min-mireds"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -17412,6 +18812,7 @@ class SubscribeAttributeColorControlCoupleColorTempToLevelMinMireds : public Mod dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCoupleColorTempToLevelMinMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -17436,6 +18837,7 @@ class SubscribeAttributeColorControlCoupleColorTempToLevelMinMireds : public Mod } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -17450,6 +18852,7 @@ class ReadColorControlStartUpColorTemperatureMireds : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "start-up-color-temperature-mireds"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -17472,6 +18875,9 @@ class ReadColorControlStartUpColorTemperatureMireds : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteColorControlStartUpColorTemperatureMireds : public ModelCommand { @@ -17481,6 +18887,7 @@ class WriteColorControlStartUpColorTemperatureMireds : public ModelCommand { { AddArgument("attr-name", "start-up-color-temperature-mireds"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -17492,11 +18899,14 @@ class WriteColorControlStartUpColorTemperatureMireds : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeStartUpColorTemperatureMiredsWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ColorControl StartUpColorTemperatureMireds Error: %s", @@ -17507,6 +18917,7 @@ class WriteColorControlStartUpColorTemperatureMireds : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -17518,6 +18929,7 @@ class SubscribeAttributeColorControlStartUpColorTemperatureMireds : public Model AddArgument("attr-name", "start-up-color-temperature-mireds"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -17530,6 +18942,7 @@ class SubscribeAttributeColorControlStartUpColorTemperatureMireds : public Model dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeStartUpColorTemperatureMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -17553,6 +18966,7 @@ class SubscribeAttributeColorControlStartUpColorTemperatureMireds : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -17567,6 +18981,7 @@ class ReadColorControlGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -17588,6 +19003,9 @@ class ReadColorControlGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlGeneratedCommandList : public ModelCommand { @@ -17598,6 +19016,7 @@ class SubscribeAttributeColorControlGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -17610,6 +19029,7 @@ class SubscribeAttributeColorControlGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -17631,6 +19051,7 @@ class SubscribeAttributeColorControlGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -17645,6 +19066,7 @@ class ReadColorControlAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -17666,6 +19088,9 @@ class ReadColorControlAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlAcceptedCommandList : public ModelCommand { @@ -17676,6 +19101,7 @@ class SubscribeAttributeColorControlAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -17688,6 +19114,7 @@ class SubscribeAttributeColorControlAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -17709,6 +19136,7 @@ class SubscribeAttributeColorControlAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -17723,6 +19151,7 @@ class ReadColorControlAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -17744,6 +19173,9 @@ class ReadColorControlAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlAttributeList : public ModelCommand { @@ -17754,6 +19186,7 @@ class SubscribeAttributeColorControlAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -17766,6 +19199,7 @@ class SubscribeAttributeColorControlAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -17786,6 +19220,7 @@ class SubscribeAttributeColorControlAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -17800,6 +19235,7 @@ class ReadColorControlClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -17821,6 +19257,9 @@ class ReadColorControlClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeColorControlClusterRevision : public ModelCommand { @@ -17831,6 +19270,7 @@ class SubscribeAttributeColorControlClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -17843,6 +19283,7 @@ class SubscribeAttributeColorControlClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPColorControl * cluster = [[CHIPColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -17863,6 +19304,7 @@ class SubscribeAttributeColorControlClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -17899,6 +19341,7 @@ class ContentLauncherLaunchContent : public ModelCommand { AddArgument("Search", &mComplex_Search); AddArgument("AutoPlay", 0, 1, &mAutoPlay); AddArgument("Data", &mData); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -17910,7 +19353,8 @@ class ContentLauncherLaunchContent : public ModelCommand { CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPContentLauncherClusterLaunchContentParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.search = [CHIPContentLauncherClusterContentSearch new]; { // Scope for our temporary variables auto * array_1 = [NSMutableArray new]; @@ -17944,9 +19388,7 @@ class ContentLauncherLaunchContent : public ModelCommand { } params.search.parameterList = array_1; } - params.autoPlay = [NSNumber numberWithBool:mAutoPlay]; - params.data = [[NSString alloc] initWithBytes:mData.data() length:mData.size() encoding:NSUTF8StringEncoding]; [cluster launchContentWithParams:params completionHandler:^( @@ -17960,6 +19402,7 @@ class ContentLauncherLaunchContent : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::ContentLauncher::Commands::LaunchContent::Type mRequest; TypedComplexArgument mComplex_Search; bool mAutoPlay; @@ -17978,6 +19421,7 @@ class ContentLauncherLaunchURL : public ModelCommand { AddArgument("ContentURL", &mContentURL); AddArgument("DisplayString", &mDisplayString); AddArgument("BrandingInformation", &mComplex_BrandingInformation); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -17989,15 +19433,14 @@ class ContentLauncherLaunchURL : public ModelCommand { CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPContentLauncherClusterLaunchURLParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.contentURL = [[NSString alloc] initWithBytes:mContentURL.data() length:mContentURL.size() encoding:NSUTF8StringEncoding]; - params.displayString = [[NSString alloc] initWithBytes:mDisplayString.data() length:mDisplayString.size() encoding:NSUTF8StringEncoding]; - if (mRequest.brandingInformation.HasValue()) { params.brandingInformation = [CHIPContentLauncherClusterBrandingInformation new]; params.brandingInformation.providerName = @@ -18184,6 +19627,7 @@ class ContentLauncherLaunchURL : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mContentURL; chip::ByteSpan mDisplayString; chip::app::Clusters::ContentLauncher::Commands::LaunchURL::Type mRequest; @@ -18200,6 +19644,7 @@ class ReadContentLauncherAcceptHeader : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accept-header"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -18221,6 +19666,9 @@ class ReadContentLauncherAcceptHeader : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeContentLauncherAcceptHeader : public ModelCommand { @@ -18231,6 +19679,7 @@ class SubscribeAttributeContentLauncherAcceptHeader : public ModelCommand { AddArgument("attr-name", "accept-header"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -18243,6 +19692,7 @@ class SubscribeAttributeContentLauncherAcceptHeader : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptHeaderWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -18263,6 +19713,7 @@ class SubscribeAttributeContentLauncherAcceptHeader : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -18277,6 +19728,7 @@ class ReadContentLauncherSupportedStreamingProtocols : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "supported-streaming-protocols"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -18299,6 +19751,9 @@ class ReadContentLauncherSupportedStreamingProtocols : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteContentLauncherSupportedStreamingProtocols : public ModelCommand { @@ -18308,6 +19763,7 @@ class WriteContentLauncherSupportedStreamingProtocols : public ModelCommand { { AddArgument("attr-name", "supported-streaming-protocols"); AddArgument("attr-value", 0, UINT32_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -18319,11 +19775,14 @@ class WriteContentLauncherSupportedStreamingProtocols : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue]; [cluster writeAttributeSupportedStreamingProtocolsWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ContentLauncher SupportedStreamingProtocols Error: %s", @@ -18334,6 +19793,7 @@ class WriteContentLauncherSupportedStreamingProtocols : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint32_t mValue; }; @@ -18345,6 +19805,7 @@ class SubscribeAttributeContentLauncherSupportedStreamingProtocols : public Mode AddArgument("attr-name", "supported-streaming-protocols"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -18357,6 +19818,7 @@ class SubscribeAttributeContentLauncherSupportedStreamingProtocols : public Mode dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSupportedStreamingProtocolsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -18379,6 +19841,7 @@ class SubscribeAttributeContentLauncherSupportedStreamingProtocols : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -18393,6 +19856,7 @@ class ReadContentLauncherGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -18414,6 +19878,9 @@ class ReadContentLauncherGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeContentLauncherGeneratedCommandList : public ModelCommand { @@ -18424,6 +19891,7 @@ class SubscribeAttributeContentLauncherGeneratedCommandList : public ModelComman AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -18436,6 +19904,7 @@ class SubscribeAttributeContentLauncherGeneratedCommandList : public ModelComman dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -18457,6 +19926,7 @@ class SubscribeAttributeContentLauncherGeneratedCommandList : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -18471,6 +19941,7 @@ class ReadContentLauncherAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -18492,6 +19963,9 @@ class ReadContentLauncherAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeContentLauncherAcceptedCommandList : public ModelCommand { @@ -18502,6 +19976,7 @@ class SubscribeAttributeContentLauncherAcceptedCommandList : public ModelCommand AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -18514,6 +19989,7 @@ class SubscribeAttributeContentLauncherAcceptedCommandList : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -18535,6 +20011,7 @@ class SubscribeAttributeContentLauncherAcceptedCommandList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -18549,6 +20026,7 @@ class ReadContentLauncherAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -18570,6 +20048,9 @@ class ReadContentLauncherAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeContentLauncherAttributeList : public ModelCommand { @@ -18580,6 +20061,7 @@ class SubscribeAttributeContentLauncherAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -18592,6 +20074,7 @@ class SubscribeAttributeContentLauncherAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -18612,6 +20095,7 @@ class SubscribeAttributeContentLauncherAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -18626,6 +20110,7 @@ class ReadContentLauncherClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -18647,6 +20132,9 @@ class ReadContentLauncherClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeContentLauncherClusterRevision : public ModelCommand { @@ -18657,6 +20145,7 @@ class SubscribeAttributeContentLauncherClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -18669,6 +20158,7 @@ class SubscribeAttributeContentLauncherClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPContentLauncher * cluster = [[CHIPContentLauncher alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -18689,6 +20179,7 @@ class SubscribeAttributeContentLauncherClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -18722,6 +20213,7 @@ class ReadDescriptorDeviceList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "device-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -18743,6 +20235,9 @@ class ReadDescriptorDeviceList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDescriptorDeviceList : public ModelCommand { @@ -18753,6 +20248,7 @@ class SubscribeAttributeDescriptorDeviceList : public ModelCommand { AddArgument("attr-name", "device-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -18765,6 +20261,7 @@ class SubscribeAttributeDescriptorDeviceList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeDeviceListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -18785,6 +20282,7 @@ class SubscribeAttributeDescriptorDeviceList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -18799,6 +20297,7 @@ class ReadDescriptorServerList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "server-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -18820,6 +20319,9 @@ class ReadDescriptorServerList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDescriptorServerList : public ModelCommand { @@ -18830,6 +20332,7 @@ class SubscribeAttributeDescriptorServerList : public ModelCommand { AddArgument("attr-name", "server-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -18842,6 +20345,7 @@ class SubscribeAttributeDescriptorServerList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeServerListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -18862,6 +20366,7 @@ class SubscribeAttributeDescriptorServerList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -18876,6 +20381,7 @@ class ReadDescriptorClientList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "client-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -18897,6 +20403,9 @@ class ReadDescriptorClientList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDescriptorClientList : public ModelCommand { @@ -18907,6 +20416,7 @@ class SubscribeAttributeDescriptorClientList : public ModelCommand { AddArgument("attr-name", "client-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -18919,6 +20429,7 @@ class SubscribeAttributeDescriptorClientList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClientListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -18939,6 +20450,7 @@ class SubscribeAttributeDescriptorClientList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -18953,6 +20465,7 @@ class ReadDescriptorPartsList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "parts-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -18974,6 +20487,9 @@ class ReadDescriptorPartsList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDescriptorPartsList : public ModelCommand { @@ -18984,6 +20500,7 @@ class SubscribeAttributeDescriptorPartsList : public ModelCommand { AddArgument("attr-name", "parts-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -18996,6 +20513,7 @@ class SubscribeAttributeDescriptorPartsList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePartsListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -19016,6 +20534,7 @@ class SubscribeAttributeDescriptorPartsList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -19030,6 +20549,7 @@ class ReadDescriptorGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -19051,6 +20571,9 @@ class ReadDescriptorGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDescriptorGeneratedCommandList : public ModelCommand { @@ -19061,6 +20584,7 @@ class SubscribeAttributeDescriptorGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -19073,6 +20597,7 @@ class SubscribeAttributeDescriptorGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -19094,6 +20619,7 @@ class SubscribeAttributeDescriptorGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -19108,6 +20634,7 @@ class ReadDescriptorAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -19129,6 +20656,9 @@ class ReadDescriptorAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDescriptorAcceptedCommandList : public ModelCommand { @@ -19139,6 +20669,7 @@ class SubscribeAttributeDescriptorAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -19151,6 +20682,7 @@ class SubscribeAttributeDescriptorAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -19172,6 +20704,7 @@ class SubscribeAttributeDescriptorAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -19186,6 +20719,7 @@ class ReadDescriptorAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -19207,6 +20741,9 @@ class ReadDescriptorAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDescriptorAttributeList : public ModelCommand { @@ -19217,6 +20754,7 @@ class SubscribeAttributeDescriptorAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -19229,6 +20767,7 @@ class SubscribeAttributeDescriptorAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -19249,6 +20788,7 @@ class SubscribeAttributeDescriptorAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -19263,6 +20803,7 @@ class ReadDescriptorClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -19284,6 +20825,9 @@ class ReadDescriptorClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDescriptorClusterRevision : public ModelCommand { @@ -19294,6 +20838,7 @@ class SubscribeAttributeDescriptorClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -19306,6 +20851,7 @@ class SubscribeAttributeDescriptorClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDescriptor * cluster = [[CHIPDescriptor alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -19326,6 +20872,7 @@ class SubscribeAttributeDescriptorClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -19358,6 +20905,7 @@ class DiagnosticLogsRetrieveLogsRequest : public ModelCommand { AddArgument("Intent", 0, UINT8_MAX, &mIntent); AddArgument("RequestedProtocol", 0, UINT8_MAX, &mRequestedProtocol); AddArgument("TransferFileDesignator", &mTransferFileDesignator); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -19369,11 +20917,10 @@ class DiagnosticLogsRetrieveLogsRequest : public ModelCommand { CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDiagnosticLogsClusterRetrieveLogsRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.intent = [NSNumber numberWithUnsignedChar:mIntent]; - params.requestedProtocol = [NSNumber numberWithUnsignedChar:mRequestedProtocol]; - params.transferFileDesignator = [[NSData alloc] initWithBytes:mTransferFileDesignator.data() length:mTransferFileDesignator.size()]; [cluster retrieveLogsRequestWithParams:params @@ -19388,6 +20935,7 @@ class DiagnosticLogsRetrieveLogsRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mIntent; uint8_t mRequestedProtocol; chip::ByteSpan mTransferFileDesignator; @@ -19402,6 +20950,7 @@ class ReadDiagnosticLogsGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -19423,6 +20972,9 @@ class ReadDiagnosticLogsGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDiagnosticLogsGeneratedCommandList : public ModelCommand { @@ -19433,6 +20985,7 @@ class SubscribeAttributeDiagnosticLogsGeneratedCommandList : public ModelCommand AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -19445,6 +20998,7 @@ class SubscribeAttributeDiagnosticLogsGeneratedCommandList : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -19466,6 +21020,7 @@ class SubscribeAttributeDiagnosticLogsGeneratedCommandList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -19480,6 +21035,7 @@ class ReadDiagnosticLogsAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -19501,6 +21057,9 @@ class ReadDiagnosticLogsAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDiagnosticLogsAcceptedCommandList : public ModelCommand { @@ -19511,6 +21070,7 @@ class SubscribeAttributeDiagnosticLogsAcceptedCommandList : public ModelCommand AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -19523,6 +21083,7 @@ class SubscribeAttributeDiagnosticLogsAcceptedCommandList : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -19544,6 +21105,7 @@ class SubscribeAttributeDiagnosticLogsAcceptedCommandList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -19558,6 +21120,7 @@ class ReadDiagnosticLogsAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -19579,6 +21142,9 @@ class ReadDiagnosticLogsAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDiagnosticLogsAttributeList : public ModelCommand { @@ -19589,6 +21155,7 @@ class SubscribeAttributeDiagnosticLogsAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -19601,6 +21168,7 @@ class SubscribeAttributeDiagnosticLogsAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDiagnosticLogs * cluster = [[CHIPDiagnosticLogs alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -19621,6 +21189,7 @@ class SubscribeAttributeDiagnosticLogsAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -19732,6 +21301,7 @@ class DoorLockClearCredential : public ModelCommand { , mComplex_Credential(&mRequest.credential) { AddArgument("Credential", &mComplex_Credential); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -19743,7 +21313,8 @@ class DoorLockClearCredential : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterClearCredentialParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; if (mRequest.credential.IsNull()) { params.credential = nil; } else { @@ -19762,6 +21333,7 @@ class DoorLockClearCredential : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::DoorLock::Commands::ClearCredential::Type mRequest; TypedComplexArgument> mComplex_Credential; @@ -19776,6 +21348,7 @@ class DoorLockClearHolidaySchedule : public ModelCommand { : ModelCommand("clear-holiday-schedule") { AddArgument("HolidayIndex", 0, UINT8_MAX, &mHolidayIndex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -19787,7 +21360,8 @@ class DoorLockClearHolidaySchedule : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterClearHolidayScheduleParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.holidayIndex = [NSNumber numberWithUnsignedChar:mHolidayIndex]; [cluster clearHolidayScheduleWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -19799,6 +21373,7 @@ class DoorLockClearHolidaySchedule : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mHolidayIndex; }; @@ -19811,6 +21386,7 @@ class DoorLockClearUser : public ModelCommand { : ModelCommand("clear-user") { AddArgument("UserIndex", 0, UINT16_MAX, &mUserIndex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -19822,7 +21398,8 @@ class DoorLockClearUser : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterClearUserParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.userIndex = [NSNumber numberWithUnsignedShort:mUserIndex]; [cluster clearUserWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -19834,6 +21411,7 @@ class DoorLockClearUser : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mUserIndex; }; @@ -19847,6 +21425,7 @@ class DoorLockClearWeekDaySchedule : public ModelCommand { { AddArgument("WeekDayIndex", 0, UINT8_MAX, &mWeekDayIndex); AddArgument("UserIndex", 0, UINT16_MAX, &mUserIndex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -19858,9 +21437,9 @@ class DoorLockClearWeekDaySchedule : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterClearWeekDayScheduleParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.weekDayIndex = [NSNumber numberWithUnsignedChar:mWeekDayIndex]; - params.userIndex = [NSNumber numberWithUnsignedShort:mUserIndex]; [cluster clearWeekDayScheduleWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -19872,6 +21451,7 @@ class DoorLockClearWeekDaySchedule : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mWeekDayIndex; uint16_t mUserIndex; }; @@ -19886,6 +21466,7 @@ class DoorLockClearYearDaySchedule : public ModelCommand { { AddArgument("YearDayIndex", 0, UINT8_MAX, &mYearDayIndex); AddArgument("UserIndex", 0, UINT16_MAX, &mUserIndex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -19897,9 +21478,9 @@ class DoorLockClearYearDaySchedule : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterClearYearDayScheduleParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.yearDayIndex = [NSNumber numberWithUnsignedChar:mYearDayIndex]; - params.userIndex = [NSNumber numberWithUnsignedShort:mUserIndex]; [cluster clearYearDayScheduleWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -19911,6 +21492,7 @@ class DoorLockClearYearDaySchedule : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mYearDayIndex; uint16_t mUserIndex; }; @@ -19925,6 +21507,7 @@ class DoorLockGetCredentialStatus : public ModelCommand { , mComplex_Credential(&mRequest.credential) { AddArgument("Credential", &mComplex_Credential); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -19936,7 +21519,8 @@ class DoorLockGetCredentialStatus : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterGetCredentialStatusParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.credential = [CHIPDoorLockClusterDlCredential new]; params.credential.credentialType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credential.credentialType)]; @@ -19953,6 +21537,7 @@ class DoorLockGetCredentialStatus : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type mRequest; TypedComplexArgument mComplex_Credential; }; @@ -19966,6 +21551,7 @@ class DoorLockGetHolidaySchedule : public ModelCommand { : ModelCommand("get-holiday-schedule") { AddArgument("HolidayIndex", 0, UINT8_MAX, &mHolidayIndex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -19977,7 +21563,8 @@ class DoorLockGetHolidaySchedule : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterGetHolidayScheduleParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.holidayIndex = [NSNumber numberWithUnsignedChar:mHolidayIndex]; [cluster getHolidayScheduleWithParams:params completionHandler:^( @@ -19991,6 +21578,7 @@ class DoorLockGetHolidaySchedule : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mHolidayIndex; }; @@ -20003,6 +21591,7 @@ class DoorLockGetUser : public ModelCommand { : ModelCommand("get-user") { AddArgument("UserIndex", 0, UINT16_MAX, &mUserIndex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -20014,7 +21603,8 @@ class DoorLockGetUser : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterGetUserParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.userIndex = [NSNumber numberWithUnsignedShort:mUserIndex]; [cluster getUserWithParams:params completionHandler:^(CHIPDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable error) { @@ -20027,6 +21617,7 @@ class DoorLockGetUser : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mUserIndex; }; @@ -20040,6 +21631,7 @@ class DoorLockGetWeekDaySchedule : public ModelCommand { { AddArgument("WeekDayIndex", 0, UINT8_MAX, &mWeekDayIndex); AddArgument("UserIndex", 0, UINT16_MAX, &mUserIndex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -20051,9 +21643,9 @@ class DoorLockGetWeekDaySchedule : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterGetWeekDayScheduleParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.weekDayIndex = [NSNumber numberWithUnsignedChar:mWeekDayIndex]; - params.userIndex = [NSNumber numberWithUnsignedShort:mUserIndex]; [cluster getWeekDayScheduleWithParams:params completionHandler:^( @@ -20067,6 +21659,7 @@ class DoorLockGetWeekDaySchedule : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mWeekDayIndex; uint16_t mUserIndex; }; @@ -20081,6 +21674,7 @@ class DoorLockGetYearDaySchedule : public ModelCommand { { AddArgument("YearDayIndex", 0, UINT8_MAX, &mYearDayIndex); AddArgument("UserIndex", 0, UINT16_MAX, &mUserIndex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -20092,9 +21686,9 @@ class DoorLockGetYearDaySchedule : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterGetYearDayScheduleParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.yearDayIndex = [NSNumber numberWithUnsignedChar:mYearDayIndex]; - params.userIndex = [NSNumber numberWithUnsignedShort:mUserIndex]; [cluster getYearDayScheduleWithParams:params completionHandler:^( @@ -20108,6 +21702,7 @@ class DoorLockGetYearDaySchedule : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mYearDayIndex; uint16_t mUserIndex; }; @@ -20121,6 +21716,7 @@ class DoorLockLockDoor : public ModelCommand { : ModelCommand("lock-door") { AddArgument("PinCode", &mPinCode); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -20132,7 +21728,8 @@ class DoorLockLockDoor : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterLockDoorParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.pinCode = [[NSData alloc] initWithBytes:mPinCode.data() length:mPinCode.size()]; [cluster lockDoorWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -20144,6 +21741,7 @@ class DoorLockLockDoor : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mPinCode; }; @@ -20162,6 +21760,7 @@ class DoorLockSetCredential : public ModelCommand { AddArgument("UserIndex", 0, UINT16_MAX, &mUserIndex); AddArgument("UserStatus", 0, UINT8_MAX, &mUserStatus); AddArgument("UserType", 0, UINT8_MAX, &mUserType); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -20173,20 +21772,16 @@ class DoorLockSetCredential : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterSetCredentialParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.operationType = [NSNumber numberWithUnsignedChar:mOperationType]; - params.credential = [CHIPDoorLockClusterDlCredential new]; params.credential.credentialType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credential.credentialType)]; params.credential.credentialIndex = [NSNumber numberWithUnsignedShort:mRequest.credential.credentialIndex]; - params.credentialData = [[NSData alloc] initWithBytes:mCredentialData.data() length:mCredentialData.size()]; - params.userIndex = [NSNumber numberWithUnsignedShort:mUserIndex]; - params.userStatus = [NSNumber numberWithUnsignedChar:mUserStatus]; - params.userType = [NSNumber numberWithUnsignedChar:mUserType]; [cluster setCredentialWithParams:params completionHandler:^( @@ -20200,6 +21795,7 @@ class DoorLockSetCredential : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mOperationType; chip::app::Clusters::DoorLock::Commands::SetCredential::Type mRequest; TypedComplexArgument mComplex_Credential; @@ -20221,6 +21817,7 @@ class DoorLockSetHolidaySchedule : public ModelCommand { AddArgument("LocalStartTime", 0, UINT32_MAX, &mLocalStartTime); AddArgument("LocalEndTime", 0, UINT32_MAX, &mLocalEndTime); AddArgument("OperatingMode", 0, UINT8_MAX, &mOperatingMode); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -20232,13 +21829,11 @@ class DoorLockSetHolidaySchedule : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterSetHolidayScheduleParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.holidayIndex = [NSNumber numberWithUnsignedChar:mHolidayIndex]; - params.localStartTime = [NSNumber numberWithUnsignedInt:mLocalStartTime]; - params.localEndTime = [NSNumber numberWithUnsignedInt:mLocalEndTime]; - params.operatingMode = [NSNumber numberWithUnsignedChar:mOperatingMode]; [cluster setHolidayScheduleWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -20250,6 +21845,7 @@ class DoorLockSetHolidaySchedule : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mHolidayIndex; uint32_t mLocalStartTime; uint32_t mLocalEndTime; @@ -20271,6 +21867,7 @@ class DoorLockSetUser : public ModelCommand { AddArgument("UserStatus", 0, UINT8_MAX, &mUserStatus); AddArgument("UserType", 0, UINT8_MAX, &mUserType); AddArgument("CredentialRule", 0, UINT8_MAX, &mCredentialRule); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -20282,19 +21879,14 @@ class DoorLockSetUser : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterSetUserParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.operationType = [NSNumber numberWithUnsignedChar:mOperationType]; - params.userIndex = [NSNumber numberWithUnsignedShort:mUserIndex]; - params.userName = [[NSString alloc] initWithBytes:mUserName.data() length:mUserName.size() encoding:NSUTF8StringEncoding]; - params.userUniqueId = [NSNumber numberWithUnsignedInt:mUserUniqueId]; - params.userStatus = [NSNumber numberWithUnsignedChar:mUserStatus]; - params.userType = [NSNumber numberWithUnsignedChar:mUserType]; - params.credentialRule = [NSNumber numberWithUnsignedChar:mCredentialRule]; [cluster setUserWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -20306,6 +21898,7 @@ class DoorLockSetUser : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mOperationType; uint16_t mUserIndex; chip::ByteSpan mUserName; @@ -20330,6 +21923,7 @@ class DoorLockSetWeekDaySchedule : public ModelCommand { AddArgument("StartMinute", 0, UINT8_MAX, &mStartMinute); AddArgument("EndHour", 0, UINT8_MAX, &mEndHour); AddArgument("EndMinute", 0, UINT8_MAX, &mEndMinute); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -20341,19 +21935,14 @@ class DoorLockSetWeekDaySchedule : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterSetWeekDayScheduleParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.weekDayIndex = [NSNumber numberWithUnsignedChar:mWeekDayIndex]; - params.userIndex = [NSNumber numberWithUnsignedShort:mUserIndex]; - params.daysMask = [NSNumber numberWithUnsignedChar:mDaysMask]; - params.startHour = [NSNumber numberWithUnsignedChar:mStartHour]; - params.startMinute = [NSNumber numberWithUnsignedChar:mStartMinute]; - params.endHour = [NSNumber numberWithUnsignedChar:mEndHour]; - params.endMinute = [NSNumber numberWithUnsignedChar:mEndMinute]; [cluster setWeekDayScheduleWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -20365,6 +21954,7 @@ class DoorLockSetWeekDaySchedule : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mWeekDayIndex; uint16_t mUserIndex; uint8_t mDaysMask; @@ -20386,6 +21976,7 @@ class DoorLockSetYearDaySchedule : public ModelCommand { AddArgument("UserIndex", 0, UINT16_MAX, &mUserIndex); AddArgument("LocalStartTime", 0, UINT32_MAX, &mLocalStartTime); AddArgument("LocalEndTime", 0, UINT32_MAX, &mLocalEndTime); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -20397,13 +21988,11 @@ class DoorLockSetYearDaySchedule : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterSetYearDayScheduleParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.yearDayIndex = [NSNumber numberWithUnsignedChar:mYearDayIndex]; - params.userIndex = [NSNumber numberWithUnsignedShort:mUserIndex]; - params.localStartTime = [NSNumber numberWithUnsignedInt:mLocalStartTime]; - params.localEndTime = [NSNumber numberWithUnsignedInt:mLocalEndTime]; [cluster setYearDayScheduleWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -20415,6 +22004,7 @@ class DoorLockSetYearDaySchedule : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mYearDayIndex; uint16_t mUserIndex; uint32_t mLocalStartTime; @@ -20430,6 +22020,7 @@ class DoorLockUnlockDoor : public ModelCommand { : ModelCommand("unlock-door") { AddArgument("PinCode", &mPinCode); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -20441,7 +22032,8 @@ class DoorLockUnlockDoor : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterUnlockDoorParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.pinCode = [[NSData alloc] initWithBytes:mPinCode.data() length:mPinCode.size()]; [cluster unlockDoorWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -20453,6 +22045,7 @@ class DoorLockUnlockDoor : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mPinCode; }; @@ -20466,6 +22059,7 @@ class DoorLockUnlockWithTimeout : public ModelCommand { { AddArgument("Timeout", 0, UINT16_MAX, &mTimeout); AddArgument("PinCode", &mPinCode); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -20477,9 +22071,9 @@ class DoorLockUnlockWithTimeout : public ModelCommand { CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPDoorLockClusterUnlockWithTimeoutParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.timeout = [NSNumber numberWithUnsignedShort:mTimeout]; - params.pinCode = [[NSData alloc] initWithBytes:mPinCode.data() length:mPinCode.size()]; [cluster unlockWithTimeoutWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -20491,6 +22085,7 @@ class DoorLockUnlockWithTimeout : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mTimeout; chip::ByteSpan mPinCode; }; @@ -20504,6 +22099,7 @@ class ReadDoorLockLockState : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "lock-state"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -20525,6 +22121,9 @@ class ReadDoorLockLockState : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockLockState : public ModelCommand { @@ -20535,6 +22134,7 @@ class SubscribeAttributeDoorLockLockState : public ModelCommand { AddArgument("attr-name", "lock-state"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -20547,6 +22147,7 @@ class SubscribeAttributeDoorLockLockState : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLockStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -20567,6 +22168,7 @@ class SubscribeAttributeDoorLockLockState : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -20581,6 +22183,7 @@ class ReadDoorLockLockType : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "lock-type"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -20602,6 +22205,9 @@ class ReadDoorLockLockType : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockLockType : public ModelCommand { @@ -20612,6 +22218,7 @@ class SubscribeAttributeDoorLockLockType : public ModelCommand { AddArgument("attr-name", "lock-type"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -20624,6 +22231,7 @@ class SubscribeAttributeDoorLockLockType : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLockTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -20644,6 +22252,7 @@ class SubscribeAttributeDoorLockLockType : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -20658,6 +22267,7 @@ class ReadDoorLockActuatorEnabled : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "actuator-enabled"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -20679,6 +22289,9 @@ class ReadDoorLockActuatorEnabled : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockActuatorEnabled : public ModelCommand { @@ -20689,6 +22302,7 @@ class SubscribeAttributeDoorLockActuatorEnabled : public ModelCommand { AddArgument("attr-name", "actuator-enabled"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -20701,6 +22315,7 @@ class SubscribeAttributeDoorLockActuatorEnabled : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeActuatorEnabledWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -20721,6 +22336,7 @@ class SubscribeAttributeDoorLockActuatorEnabled : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -20735,6 +22351,7 @@ class ReadDoorLockDoorState : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "door-state"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -20756,6 +22373,9 @@ class ReadDoorLockDoorState : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockDoorState : public ModelCommand { @@ -20766,6 +22386,7 @@ class SubscribeAttributeDoorLockDoorState : public ModelCommand { AddArgument("attr-name", "door-state"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -20778,6 +22399,7 @@ class SubscribeAttributeDoorLockDoorState : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeDoorStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -20798,6 +22420,7 @@ class SubscribeAttributeDoorLockDoorState : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -20812,6 +22435,7 @@ class ReadDoorLockNumberOfTotalUsersSupported : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "number-of-total-users-supported"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -20834,6 +22458,9 @@ class ReadDoorLockNumberOfTotalUsersSupported : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockNumberOfTotalUsersSupported : public ModelCommand { @@ -20844,6 +22471,7 @@ class SubscribeAttributeDoorLockNumberOfTotalUsersSupported : public ModelComman AddArgument("attr-name", "number-of-total-users-supported"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -20856,6 +22484,7 @@ class SubscribeAttributeDoorLockNumberOfTotalUsersSupported : public ModelComman dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNumberOfTotalUsersSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -20878,6 +22507,7 @@ class SubscribeAttributeDoorLockNumberOfTotalUsersSupported : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -20892,6 +22522,7 @@ class ReadDoorLockNumberOfPINUsersSupported : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "number-of-pinusers-supported"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -20914,6 +22545,9 @@ class ReadDoorLockNumberOfPINUsersSupported : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockNumberOfPINUsersSupported : public ModelCommand { @@ -20924,6 +22558,7 @@ class SubscribeAttributeDoorLockNumberOfPINUsersSupported : public ModelCommand AddArgument("attr-name", "number-of-pinusers-supported"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -20936,6 +22571,7 @@ class SubscribeAttributeDoorLockNumberOfPINUsersSupported : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNumberOfPINUsersSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -20958,6 +22594,7 @@ class SubscribeAttributeDoorLockNumberOfPINUsersSupported : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -20972,6 +22609,7 @@ class ReadDoorLockNumberOfRFIDUsersSupported : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "number-of-rfidusers-supported"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -20994,6 +22632,9 @@ class ReadDoorLockNumberOfRFIDUsersSupported : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockNumberOfRFIDUsersSupported : public ModelCommand { @@ -21004,6 +22645,7 @@ class SubscribeAttributeDoorLockNumberOfRFIDUsersSupported : public ModelCommand AddArgument("attr-name", "number-of-rfidusers-supported"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -21016,6 +22658,7 @@ class SubscribeAttributeDoorLockNumberOfRFIDUsersSupported : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNumberOfRFIDUsersSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -21038,6 +22681,7 @@ class SubscribeAttributeDoorLockNumberOfRFIDUsersSupported : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -21052,6 +22696,7 @@ class ReadDoorLockNumberOfWeekDaySchedulesSupportedPerUser : public ModelCommand : ModelCommand("read") { AddArgument("attr-name", "number-of-week-day-schedules-supported-per-user"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -21074,6 +22719,9 @@ class ReadDoorLockNumberOfWeekDaySchedulesSupportedPerUser : public ModelCommand }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockNumberOfWeekDaySchedulesSupportedPerUser : public ModelCommand { @@ -21084,6 +22732,7 @@ class SubscribeAttributeDoorLockNumberOfWeekDaySchedulesSupportedPerUser : publi AddArgument("attr-name", "number-of-week-day-schedules-supported-per-user"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -21096,6 +22745,7 @@ class SubscribeAttributeDoorLockNumberOfWeekDaySchedulesSupportedPerUser : publi dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -21122,6 +22772,7 @@ class SubscribeAttributeDoorLockNumberOfWeekDaySchedulesSupportedPerUser : publi } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -21136,6 +22787,7 @@ class ReadDoorLockNumberOfYearDaySchedulesSupportedPerUser : public ModelCommand : ModelCommand("read") { AddArgument("attr-name", "number-of-year-day-schedules-supported-per-user"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -21158,6 +22810,9 @@ class ReadDoorLockNumberOfYearDaySchedulesSupportedPerUser : public ModelCommand }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockNumberOfYearDaySchedulesSupportedPerUser : public ModelCommand { @@ -21168,6 +22823,7 @@ class SubscribeAttributeDoorLockNumberOfYearDaySchedulesSupportedPerUser : publi AddArgument("attr-name", "number-of-year-day-schedules-supported-per-user"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -21180,6 +22836,7 @@ class SubscribeAttributeDoorLockNumberOfYearDaySchedulesSupportedPerUser : publi dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNumberOfYearDaySchedulesSupportedPerUserWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -21206,6 +22863,7 @@ class SubscribeAttributeDoorLockNumberOfYearDaySchedulesSupportedPerUser : publi } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -21220,6 +22878,7 @@ class ReadDoorLockNumberOfHolidaySchedulesSupported : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "number-of-holiday-schedules-supported"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -21242,6 +22901,9 @@ class ReadDoorLockNumberOfHolidaySchedulesSupported : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockNumberOfHolidaySchedulesSupported : public ModelCommand { @@ -21252,6 +22914,7 @@ class SubscribeAttributeDoorLockNumberOfHolidaySchedulesSupported : public Model AddArgument("attr-name", "number-of-holiday-schedules-supported"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -21264,6 +22927,7 @@ class SubscribeAttributeDoorLockNumberOfHolidaySchedulesSupported : public Model dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNumberOfHolidaySchedulesSupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -21289,6 +22953,7 @@ class SubscribeAttributeDoorLockNumberOfHolidaySchedulesSupported : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -21303,6 +22968,7 @@ class ReadDoorLockMaxPINCodeLength : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-pincode-length"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -21324,6 +22990,9 @@ class ReadDoorLockMaxPINCodeLength : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockMaxPINCodeLength : public ModelCommand { @@ -21334,6 +23003,7 @@ class SubscribeAttributeDoorLockMaxPINCodeLength : public ModelCommand { AddArgument("attr-name", "max-pincode-length"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -21346,6 +23016,7 @@ class SubscribeAttributeDoorLockMaxPINCodeLength : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxPINCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -21366,6 +23037,7 @@ class SubscribeAttributeDoorLockMaxPINCodeLength : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -21380,6 +23052,7 @@ class ReadDoorLockMinPINCodeLength : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-pincode-length"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -21401,6 +23074,9 @@ class ReadDoorLockMinPINCodeLength : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockMinPINCodeLength : public ModelCommand { @@ -21411,6 +23087,7 @@ class SubscribeAttributeDoorLockMinPINCodeLength : public ModelCommand { AddArgument("attr-name", "min-pincode-length"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -21423,6 +23100,7 @@ class SubscribeAttributeDoorLockMinPINCodeLength : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinPINCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -21443,6 +23121,7 @@ class SubscribeAttributeDoorLockMinPINCodeLength : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -21457,6 +23136,7 @@ class ReadDoorLockMaxRFIDCodeLength : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-rfidcode-length"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -21478,6 +23158,9 @@ class ReadDoorLockMaxRFIDCodeLength : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockMaxRFIDCodeLength : public ModelCommand { @@ -21488,6 +23171,7 @@ class SubscribeAttributeDoorLockMaxRFIDCodeLength : public ModelCommand { AddArgument("attr-name", "max-rfidcode-length"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -21500,6 +23184,7 @@ class SubscribeAttributeDoorLockMaxRFIDCodeLength : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxRFIDCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -21520,6 +23205,7 @@ class SubscribeAttributeDoorLockMaxRFIDCodeLength : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -21534,6 +23220,7 @@ class ReadDoorLockMinRFIDCodeLength : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-rfidcode-length"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -21555,6 +23242,9 @@ class ReadDoorLockMinRFIDCodeLength : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockMinRFIDCodeLength : public ModelCommand { @@ -21565,6 +23255,7 @@ class SubscribeAttributeDoorLockMinRFIDCodeLength : public ModelCommand { AddArgument("attr-name", "min-rfidcode-length"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -21577,6 +23268,7 @@ class SubscribeAttributeDoorLockMinRFIDCodeLength : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinRFIDCodeLengthWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -21597,6 +23289,7 @@ class SubscribeAttributeDoorLockMinRFIDCodeLength : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -21611,6 +23304,7 @@ class ReadDoorLockLanguage : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "language"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -21632,6 +23326,9 @@ class ReadDoorLockLanguage : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteDoorLockLanguage : public ModelCommand { @@ -21641,6 +23338,7 @@ class WriteDoorLockLanguage : public ModelCommand { { AddArgument("attr-name", "language"); AddArgument("attr-value", &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -21652,12 +23350,15 @@ class WriteDoorLockLanguage : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data() length:mValue.size() encoding:NSUTF8StringEncoding]; [cluster writeAttributeLanguageWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "DoorLock Language Error: %s", chip::ErrorStr(chipError)); @@ -21667,6 +23368,7 @@ class WriteDoorLockLanguage : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mValue; }; @@ -21678,6 +23380,7 @@ class SubscribeAttributeDoorLockLanguage : public ModelCommand { AddArgument("attr-name", "language"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -21690,6 +23393,7 @@ class SubscribeAttributeDoorLockLanguage : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLanguageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -21710,6 +23414,7 @@ class SubscribeAttributeDoorLockLanguage : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -21724,6 +23429,7 @@ class ReadDoorLockAutoRelockTime : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "auto-relock-time"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -21745,6 +23451,9 @@ class ReadDoorLockAutoRelockTime : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteDoorLockAutoRelockTime : public ModelCommand { @@ -21754,6 +23463,7 @@ class WriteDoorLockAutoRelockTime : public ModelCommand { { AddArgument("attr-name", "auto-relock-time"); AddArgument("attr-value", 0, UINT32_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -21765,10 +23475,13 @@ class WriteDoorLockAutoRelockTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue]; [cluster writeAttributeAutoRelockTimeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "DoorLock AutoRelockTime Error: %s", chip::ErrorStr(chipError)); @@ -21778,6 +23491,7 @@ class WriteDoorLockAutoRelockTime : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint32_t mValue; }; @@ -21789,6 +23503,7 @@ class SubscribeAttributeDoorLockAutoRelockTime : public ModelCommand { AddArgument("attr-name", "auto-relock-time"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -21801,6 +23516,7 @@ class SubscribeAttributeDoorLockAutoRelockTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAutoRelockTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -21821,6 +23537,7 @@ class SubscribeAttributeDoorLockAutoRelockTime : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -21835,6 +23552,7 @@ class ReadDoorLockSoundVolume : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "sound-volume"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -21856,6 +23574,9 @@ class ReadDoorLockSoundVolume : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteDoorLockSoundVolume : public ModelCommand { @@ -21865,6 +23586,7 @@ class WriteDoorLockSoundVolume : public ModelCommand { { AddArgument("attr-name", "sound-volume"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -21876,10 +23598,13 @@ class WriteDoorLockSoundVolume : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeSoundVolumeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "DoorLock SoundVolume Error: %s", chip::ErrorStr(chipError)); @@ -21889,6 +23614,7 @@ class WriteDoorLockSoundVolume : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -21900,6 +23626,7 @@ class SubscribeAttributeDoorLockSoundVolume : public ModelCommand { AddArgument("attr-name", "sound-volume"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -21912,6 +23639,7 @@ class SubscribeAttributeDoorLockSoundVolume : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSoundVolumeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -21932,6 +23660,7 @@ class SubscribeAttributeDoorLockSoundVolume : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -21946,6 +23675,7 @@ class ReadDoorLockOperatingMode : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "operating-mode"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -21967,6 +23697,9 @@ class ReadDoorLockOperatingMode : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteDoorLockOperatingMode : public ModelCommand { @@ -21976,6 +23709,7 @@ class WriteDoorLockOperatingMode : public ModelCommand { { AddArgument("attr-name", "operating-mode"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -21987,10 +23721,13 @@ class WriteDoorLockOperatingMode : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeOperatingModeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "DoorLock OperatingMode Error: %s", chip::ErrorStr(chipError)); @@ -22000,6 +23737,7 @@ class WriteDoorLockOperatingMode : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -22011,6 +23749,7 @@ class SubscribeAttributeDoorLockOperatingMode : public ModelCommand { AddArgument("attr-name", "operating-mode"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -22023,6 +23762,7 @@ class SubscribeAttributeDoorLockOperatingMode : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOperatingModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -22043,6 +23783,7 @@ class SubscribeAttributeDoorLockOperatingMode : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -22057,6 +23798,7 @@ class ReadDoorLockSupportedOperatingModes : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "supported-operating-modes"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -22079,6 +23821,9 @@ class ReadDoorLockSupportedOperatingModes : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockSupportedOperatingModes : public ModelCommand { @@ -22089,6 +23834,7 @@ class SubscribeAttributeDoorLockSupportedOperatingModes : public ModelCommand { AddArgument("attr-name", "supported-operating-modes"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -22101,6 +23847,7 @@ class SubscribeAttributeDoorLockSupportedOperatingModes : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSupportedOperatingModesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -22122,6 +23869,7 @@ class SubscribeAttributeDoorLockSupportedOperatingModes : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -22136,6 +23884,7 @@ class ReadDoorLockEnableOneTouchLocking : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "enable-one-touch-locking"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -22157,6 +23906,9 @@ class ReadDoorLockEnableOneTouchLocking : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteDoorLockEnableOneTouchLocking : public ModelCommand { @@ -22166,6 +23918,7 @@ class WriteDoorLockEnableOneTouchLocking : public ModelCommand { { AddArgument("attr-name", "enable-one-touch-locking"); AddArgument("attr-value", 0, 1, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -22177,10 +23930,13 @@ class WriteDoorLockEnableOneTouchLocking : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue]; [cluster writeAttributeEnableOneTouchLockingWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "DoorLock EnableOneTouchLocking Error: %s", @@ -22191,6 +23947,7 @@ class WriteDoorLockEnableOneTouchLocking : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; bool mValue; }; @@ -22202,6 +23959,7 @@ class SubscribeAttributeDoorLockEnableOneTouchLocking : public ModelCommand { AddArgument("attr-name", "enable-one-touch-locking"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -22214,6 +23972,7 @@ class SubscribeAttributeDoorLockEnableOneTouchLocking : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeEnableOneTouchLockingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -22235,6 +23994,7 @@ class SubscribeAttributeDoorLockEnableOneTouchLocking : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -22249,6 +24009,7 @@ class ReadDoorLockEnablePrivacyModeButton : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "enable-privacy-mode-button"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -22271,6 +24032,9 @@ class ReadDoorLockEnablePrivacyModeButton : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteDoorLockEnablePrivacyModeButton : public ModelCommand { @@ -22280,6 +24044,7 @@ class WriteDoorLockEnablePrivacyModeButton : public ModelCommand { { AddArgument("attr-name", "enable-privacy-mode-button"); AddArgument("attr-value", 0, 1, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -22291,10 +24056,13 @@ class WriteDoorLockEnablePrivacyModeButton : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue]; [cluster writeAttributeEnablePrivacyModeButtonWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "DoorLock EnablePrivacyModeButton Error: %s", @@ -22305,6 +24073,7 @@ class WriteDoorLockEnablePrivacyModeButton : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; bool mValue; }; @@ -22316,6 +24085,7 @@ class SubscribeAttributeDoorLockEnablePrivacyModeButton : public ModelCommand { AddArgument("attr-name", "enable-privacy-mode-button"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -22328,6 +24098,7 @@ class SubscribeAttributeDoorLockEnablePrivacyModeButton : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeEnablePrivacyModeButtonWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -22349,6 +24120,7 @@ class SubscribeAttributeDoorLockEnablePrivacyModeButton : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -22363,6 +24135,7 @@ class ReadDoorLockWrongCodeEntryLimit : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "wrong-code-entry-limit"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -22384,6 +24157,9 @@ class ReadDoorLockWrongCodeEntryLimit : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteDoorLockWrongCodeEntryLimit : public ModelCommand { @@ -22393,6 +24169,7 @@ class WriteDoorLockWrongCodeEntryLimit : public ModelCommand { { AddArgument("attr-name", "wrong-code-entry-limit"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -22404,10 +24181,13 @@ class WriteDoorLockWrongCodeEntryLimit : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeWrongCodeEntryLimitWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError( @@ -22418,6 +24198,7 @@ class WriteDoorLockWrongCodeEntryLimit : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -22429,6 +24210,7 @@ class SubscribeAttributeDoorLockWrongCodeEntryLimit : public ModelCommand { AddArgument("attr-name", "wrong-code-entry-limit"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -22441,6 +24223,7 @@ class SubscribeAttributeDoorLockWrongCodeEntryLimit : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeWrongCodeEntryLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -22461,6 +24244,7 @@ class SubscribeAttributeDoorLockWrongCodeEntryLimit : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -22475,6 +24259,7 @@ class ReadDoorLockUserCodeTemporaryDisableTime : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "user-code-temporary-disable-time"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -22497,6 +24282,9 @@ class ReadDoorLockUserCodeTemporaryDisableTime : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteDoorLockUserCodeTemporaryDisableTime : public ModelCommand { @@ -22506,6 +24294,7 @@ class WriteDoorLockUserCodeTemporaryDisableTime : public ModelCommand { { AddArgument("attr-name", "user-code-temporary-disable-time"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -22517,10 +24306,13 @@ class WriteDoorLockUserCodeTemporaryDisableTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeUserCodeTemporaryDisableTimeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "DoorLock UserCodeTemporaryDisableTime Error: %s", @@ -22531,6 +24323,7 @@ class WriteDoorLockUserCodeTemporaryDisableTime : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -22542,6 +24335,7 @@ class SubscribeAttributeDoorLockUserCodeTemporaryDisableTime : public ModelComma AddArgument("attr-name", "user-code-temporary-disable-time"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -22554,6 +24348,7 @@ class SubscribeAttributeDoorLockUserCodeTemporaryDisableTime : public ModelComma dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeUserCodeTemporaryDisableTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -22576,6 +24371,7 @@ class SubscribeAttributeDoorLockUserCodeTemporaryDisableTime : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -22590,6 +24386,7 @@ class ReadDoorLockRequirePINforRemoteOperation : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "require-pinfor-remote-operation"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -22612,6 +24409,9 @@ class ReadDoorLockRequirePINforRemoteOperation : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteDoorLockRequirePINforRemoteOperation : public ModelCommand { @@ -22621,6 +24421,7 @@ class WriteDoorLockRequirePINforRemoteOperation : public ModelCommand { { AddArgument("attr-name", "require-pinfor-remote-operation"); AddArgument("attr-value", 0, 1, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -22632,10 +24433,13 @@ class WriteDoorLockRequirePINforRemoteOperation : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue]; [cluster writeAttributeRequirePINforRemoteOperationWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "DoorLock RequirePINforRemoteOperation Error: %s", @@ -22646,6 +24450,7 @@ class WriteDoorLockRequirePINforRemoteOperation : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; bool mValue; }; @@ -22658,6 +24463,7 @@ class ReadDoorLockGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -22679,6 +24485,9 @@ class ReadDoorLockGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockGeneratedCommandList : public ModelCommand { @@ -22689,6 +24498,7 @@ class SubscribeAttributeDoorLockGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -22701,6 +24511,7 @@ class SubscribeAttributeDoorLockGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -22722,6 +24533,7 @@ class SubscribeAttributeDoorLockGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -22736,6 +24548,7 @@ class ReadDoorLockAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -22757,6 +24570,9 @@ class ReadDoorLockAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockAcceptedCommandList : public ModelCommand { @@ -22767,6 +24583,7 @@ class SubscribeAttributeDoorLockAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -22779,6 +24596,7 @@ class SubscribeAttributeDoorLockAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -22799,6 +24617,7 @@ class SubscribeAttributeDoorLockAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -22813,6 +24632,7 @@ class ReadDoorLockAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -22834,6 +24654,9 @@ class ReadDoorLockAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockAttributeList : public ModelCommand { @@ -22844,6 +24667,7 @@ class SubscribeAttributeDoorLockAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -22856,6 +24680,7 @@ class SubscribeAttributeDoorLockAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -22876,6 +24701,7 @@ class SubscribeAttributeDoorLockAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -22890,6 +24716,7 @@ class ReadDoorLockClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -22911,6 +24738,9 @@ class ReadDoorLockClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeDoorLockClusterRevision : public ModelCommand { @@ -22921,6 +24751,7 @@ class SubscribeAttributeDoorLockClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -22933,6 +24764,7 @@ class SubscribeAttributeDoorLockClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPDoorLock * cluster = [[CHIPDoorLock alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -22953,6 +24785,7 @@ class SubscribeAttributeDoorLockClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -23112,6 +24945,7 @@ class ReadElectricalMeasurementMeasurementType : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "measurement-type"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -23135,6 +24969,9 @@ class ReadElectricalMeasurementMeasurementType : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeElectricalMeasurementMeasurementType : public ModelCommand { @@ -23145,6 +24982,7 @@ class SubscribeAttributeElectricalMeasurementMeasurementType : public ModelComma AddArgument("attr-name", "measurement-type"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -23159,6 +24997,7 @@ class SubscribeAttributeElectricalMeasurementMeasurementType : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMeasurementTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -23180,6 +25019,7 @@ class SubscribeAttributeElectricalMeasurementMeasurementType : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -23194,6 +25034,7 @@ class ReadElectricalMeasurementTotalActivePower : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "total-active-power"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -23217,6 +25058,9 @@ class ReadElectricalMeasurementTotalActivePower : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeElectricalMeasurementTotalActivePower : public ModelCommand { @@ -23227,6 +25071,7 @@ class SubscribeAttributeElectricalMeasurementTotalActivePower : public ModelComm AddArgument("attr-name", "total-active-power"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -23241,6 +25086,7 @@ class SubscribeAttributeElectricalMeasurementTotalActivePower : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTotalActivePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -23262,6 +25108,7 @@ class SubscribeAttributeElectricalMeasurementTotalActivePower : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -23276,6 +25123,7 @@ class ReadElectricalMeasurementRmsVoltage : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rms-voltage"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -23299,6 +25147,9 @@ class ReadElectricalMeasurementRmsVoltage : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeElectricalMeasurementRmsVoltage : public ModelCommand { @@ -23309,6 +25160,7 @@ class SubscribeAttributeElectricalMeasurementRmsVoltage : public ModelCommand { AddArgument("attr-name", "rms-voltage"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -23323,6 +25175,7 @@ class SubscribeAttributeElectricalMeasurementRmsVoltage : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRmsVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -23343,6 +25196,7 @@ class SubscribeAttributeElectricalMeasurementRmsVoltage : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -23357,6 +25211,7 @@ class ReadElectricalMeasurementRmsVoltageMin : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rms-voltage-min"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -23380,6 +25235,9 @@ class ReadElectricalMeasurementRmsVoltageMin : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeElectricalMeasurementRmsVoltageMin : public ModelCommand { @@ -23390,6 +25248,7 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMin : public ModelCommand AddArgument("attr-name", "rms-voltage-min"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -23404,6 +25263,7 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMin : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRmsVoltageMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -23425,6 +25285,7 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMin : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -23439,6 +25300,7 @@ class ReadElectricalMeasurementRmsVoltageMax : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rms-voltage-max"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -23462,6 +25324,9 @@ class ReadElectricalMeasurementRmsVoltageMax : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeElectricalMeasurementRmsVoltageMax : public ModelCommand { @@ -23472,6 +25337,7 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMax : public ModelCommand AddArgument("attr-name", "rms-voltage-max"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -23486,6 +25352,7 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMax : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRmsVoltageMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -23507,6 +25374,7 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMax : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -23521,6 +25389,7 @@ class ReadElectricalMeasurementRmsCurrent : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rms-current"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -23544,6 +25413,9 @@ class ReadElectricalMeasurementRmsCurrent : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeElectricalMeasurementRmsCurrent : public ModelCommand { @@ -23554,6 +25426,7 @@ class SubscribeAttributeElectricalMeasurementRmsCurrent : public ModelCommand { AddArgument("attr-name", "rms-current"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -23568,6 +25441,7 @@ class SubscribeAttributeElectricalMeasurementRmsCurrent : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRmsCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -23588,6 +25462,7 @@ class SubscribeAttributeElectricalMeasurementRmsCurrent : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -23602,6 +25477,7 @@ class ReadElectricalMeasurementRmsCurrentMin : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rms-current-min"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -23625,6 +25501,9 @@ class ReadElectricalMeasurementRmsCurrentMin : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeElectricalMeasurementRmsCurrentMin : public ModelCommand { @@ -23635,6 +25514,7 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMin : public ModelCommand AddArgument("attr-name", "rms-current-min"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -23649,6 +25529,7 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMin : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRmsCurrentMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -23670,6 +25551,7 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMin : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -23684,6 +25566,7 @@ class ReadElectricalMeasurementRmsCurrentMax : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rms-current-max"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -23707,6 +25590,9 @@ class ReadElectricalMeasurementRmsCurrentMax : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeElectricalMeasurementRmsCurrentMax : public ModelCommand { @@ -23717,6 +25603,7 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMax : public ModelCommand AddArgument("attr-name", "rms-current-max"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -23731,6 +25618,7 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMax : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRmsCurrentMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -23752,6 +25640,7 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMax : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -23766,6 +25655,7 @@ class ReadElectricalMeasurementActivePower : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "active-power"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -23789,6 +25679,9 @@ class ReadElectricalMeasurementActivePower : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeElectricalMeasurementActivePower : public ModelCommand { @@ -23799,6 +25692,7 @@ class SubscribeAttributeElectricalMeasurementActivePower : public ModelCommand { AddArgument("attr-name", "active-power"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -23813,6 +25707,7 @@ class SubscribeAttributeElectricalMeasurementActivePower : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeActivePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -23833,6 +25728,7 @@ class SubscribeAttributeElectricalMeasurementActivePower : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -23847,6 +25743,7 @@ class ReadElectricalMeasurementActivePowerMin : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "active-power-min"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -23870,6 +25767,9 @@ class ReadElectricalMeasurementActivePowerMin : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeElectricalMeasurementActivePowerMin : public ModelCommand { @@ -23880,6 +25780,7 @@ class SubscribeAttributeElectricalMeasurementActivePowerMin : public ModelComman AddArgument("attr-name", "active-power-min"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -23894,6 +25795,7 @@ class SubscribeAttributeElectricalMeasurementActivePowerMin : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeActivePowerMinWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -23915,6 +25817,7 @@ class SubscribeAttributeElectricalMeasurementActivePowerMin : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -23929,6 +25832,7 @@ class ReadElectricalMeasurementActivePowerMax : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "active-power-max"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -23952,6 +25856,9 @@ class ReadElectricalMeasurementActivePowerMax : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeElectricalMeasurementActivePowerMax : public ModelCommand { @@ -23962,6 +25869,7 @@ class SubscribeAttributeElectricalMeasurementActivePowerMax : public ModelComman AddArgument("attr-name", "active-power-max"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -23976,6 +25884,7 @@ class SubscribeAttributeElectricalMeasurementActivePowerMax : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeActivePowerMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -23997,6 +25906,7 @@ class SubscribeAttributeElectricalMeasurementActivePowerMax : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -24011,6 +25921,7 @@ class ReadElectricalMeasurementGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -24034,6 +25945,9 @@ class ReadElectricalMeasurementGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeElectricalMeasurementGeneratedCommandList : public ModelCommand { @@ -24044,6 +25958,7 @@ class SubscribeAttributeElectricalMeasurementGeneratedCommandList : public Model AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -24058,6 +25973,7 @@ class SubscribeAttributeElectricalMeasurementGeneratedCommandList : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -24079,6 +25995,7 @@ class SubscribeAttributeElectricalMeasurementGeneratedCommandList : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -24093,6 +26010,7 @@ class ReadElectricalMeasurementAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -24116,6 +26034,9 @@ class ReadElectricalMeasurementAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeElectricalMeasurementAcceptedCommandList : public ModelCommand { @@ -24126,6 +26047,7 @@ class SubscribeAttributeElectricalMeasurementAcceptedCommandList : public ModelC AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -24140,6 +26062,7 @@ class SubscribeAttributeElectricalMeasurementAcceptedCommandList : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -24161,6 +26084,7 @@ class SubscribeAttributeElectricalMeasurementAcceptedCommandList : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -24175,6 +26099,7 @@ class ReadElectricalMeasurementAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -24198,6 +26123,9 @@ class ReadElectricalMeasurementAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeElectricalMeasurementAttributeList : public ModelCommand { @@ -24208,6 +26136,7 @@ class SubscribeAttributeElectricalMeasurementAttributeList : public ModelCommand AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -24222,6 +26151,7 @@ class SubscribeAttributeElectricalMeasurementAttributeList : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -24243,6 +26173,7 @@ class SubscribeAttributeElectricalMeasurementAttributeList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -24257,6 +26188,7 @@ class ReadElectricalMeasurementClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -24280,6 +26212,9 @@ class ReadElectricalMeasurementClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeElectricalMeasurementClusterRevision : public ModelCommand { @@ -24290,6 +26225,7 @@ class SubscribeAttributeElectricalMeasurementClusterRevision : public ModelComma AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -24304,6 +26240,7 @@ class SubscribeAttributeElectricalMeasurementClusterRevision : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -24325,6 +26262,7 @@ class SubscribeAttributeElectricalMeasurementClusterRevision : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -24363,6 +26301,7 @@ class EthernetNetworkDiagnosticsResetCounts : public ModelCommand { EthernetNetworkDiagnosticsResetCounts() : ModelCommand("reset-counts") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -24375,6 +26314,9 @@ class EthernetNetworkDiagnosticsResetCounts : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPEthernetNetworkDiagnosticsClusterResetCountsParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster resetCountsWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -24384,6 +26326,7 @@ class EthernetNetworkDiagnosticsResetCounts : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -24395,6 +26338,7 @@ class ReadEthernetNetworkDiagnosticsPHYRate : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "phyrate"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -24418,6 +26362,9 @@ class ReadEthernetNetworkDiagnosticsPHYRate : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeEthernetNetworkDiagnosticsPHYRate : public ModelCommand { @@ -24428,6 +26375,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPHYRate : public ModelCommand AddArgument("attr-name", "phyrate"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -24442,6 +26390,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPHYRate : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePHYRateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -24462,6 +26411,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPHYRate : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -24476,6 +26426,7 @@ class ReadEthernetNetworkDiagnosticsFullDuplex : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "full-duplex"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -24499,6 +26450,9 @@ class ReadEthernetNetworkDiagnosticsFullDuplex : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeEthernetNetworkDiagnosticsFullDuplex : public ModelCommand { @@ -24509,6 +26463,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsFullDuplex : public ModelComma AddArgument("attr-name", "full-duplex"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -24523,6 +26478,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsFullDuplex : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFullDuplexWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -24543,6 +26499,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsFullDuplex : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -24557,6 +26514,7 @@ class ReadEthernetNetworkDiagnosticsPacketRxCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "packet-rx-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -24580,6 +26538,9 @@ class ReadEthernetNetworkDiagnosticsPacketRxCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeEthernetNetworkDiagnosticsPacketRxCount : public ModelCommand { @@ -24590,6 +26551,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPacketRxCount : public ModelCo AddArgument("attr-name", "packet-rx-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -24604,6 +26566,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPacketRxCount : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePacketRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -24625,6 +26588,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPacketRxCount : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -24639,6 +26603,7 @@ class ReadEthernetNetworkDiagnosticsPacketTxCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "packet-tx-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -24662,6 +26627,9 @@ class ReadEthernetNetworkDiagnosticsPacketTxCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeEthernetNetworkDiagnosticsPacketTxCount : public ModelCommand { @@ -24672,6 +26640,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPacketTxCount : public ModelCo AddArgument("attr-name", "packet-tx-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -24686,6 +26655,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPacketTxCount : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePacketTxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -24707,6 +26677,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPacketTxCount : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -24721,6 +26692,7 @@ class ReadEthernetNetworkDiagnosticsTxErrCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-err-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -24744,6 +26716,9 @@ class ReadEthernetNetworkDiagnosticsTxErrCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeEthernetNetworkDiagnosticsTxErrCount : public ModelCommand { @@ -24754,6 +26729,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsTxErrCount : public ModelComma AddArgument("attr-name", "tx-err-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -24768,6 +26744,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsTxErrCount : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxErrCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -24788,6 +26765,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsTxErrCount : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -24802,6 +26780,7 @@ class ReadEthernetNetworkDiagnosticsCollisionCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "collision-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -24825,6 +26804,9 @@ class ReadEthernetNetworkDiagnosticsCollisionCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeEthernetNetworkDiagnosticsCollisionCount : public ModelCommand { @@ -24835,6 +26817,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsCollisionCount : public ModelC AddArgument("attr-name", "collision-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -24849,6 +26832,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsCollisionCount : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCollisionCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -24870,6 +26854,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsCollisionCount : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -24884,6 +26869,7 @@ class ReadEthernetNetworkDiagnosticsOverrunCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "overrun-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -24907,6 +26893,9 @@ class ReadEthernetNetworkDiagnosticsOverrunCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeEthernetNetworkDiagnosticsOverrunCount : public ModelCommand { @@ -24917,6 +26906,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsOverrunCount : public ModelCom AddArgument("attr-name", "overrun-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -24931,6 +26921,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsOverrunCount : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOverrunCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -24952,6 +26943,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsOverrunCount : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -24966,6 +26958,7 @@ class ReadEthernetNetworkDiagnosticsCarrierDetect : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "carrier-detect"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -24989,6 +26982,9 @@ class ReadEthernetNetworkDiagnosticsCarrierDetect : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeEthernetNetworkDiagnosticsCarrierDetect : public ModelCommand { @@ -24999,6 +26995,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsCarrierDetect : public ModelCo AddArgument("attr-name", "carrier-detect"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -25013,6 +27010,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsCarrierDetect : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCarrierDetectWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -25034,6 +27032,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsCarrierDetect : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -25048,6 +27047,7 @@ class ReadEthernetNetworkDiagnosticsTimeSinceReset : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "time-since-reset"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -25071,6 +27071,9 @@ class ReadEthernetNetworkDiagnosticsTimeSinceReset : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeEthernetNetworkDiagnosticsTimeSinceReset : public ModelCommand { @@ -25081,6 +27084,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsTimeSinceReset : public ModelC AddArgument("attr-name", "time-since-reset"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -25095,6 +27099,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsTimeSinceReset : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTimeSinceResetWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -25116,6 +27121,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsTimeSinceReset : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -25130,6 +27136,7 @@ class ReadEthernetNetworkDiagnosticsGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -25153,6 +27160,9 @@ class ReadEthernetNetworkDiagnosticsGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeEthernetNetworkDiagnosticsGeneratedCommandList : public ModelCommand { @@ -25163,6 +27173,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsGeneratedCommandList : public AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -25177,6 +27188,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsGeneratedCommandList : public endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -25198,6 +27210,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsGeneratedCommandList : public } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -25212,6 +27225,7 @@ class ReadEthernetNetworkDiagnosticsAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -25235,6 +27249,9 @@ class ReadEthernetNetworkDiagnosticsAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeEthernetNetworkDiagnosticsAcceptedCommandList : public ModelCommand { @@ -25245,6 +27262,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsAcceptedCommandList : public M AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -25259,6 +27277,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsAcceptedCommandList : public M endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -25280,6 +27299,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsAcceptedCommandList : public M } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -25294,6 +27314,7 @@ class ReadEthernetNetworkDiagnosticsAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -25317,6 +27338,9 @@ class ReadEthernetNetworkDiagnosticsAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeEthernetNetworkDiagnosticsAttributeList : public ModelCommand { @@ -25327,6 +27351,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsAttributeList : public ModelCo AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -25341,6 +27366,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsAttributeList : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -25362,6 +27388,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsAttributeList : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -25376,6 +27403,7 @@ class ReadEthernetNetworkDiagnosticsFeatureMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "feature-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -25399,6 +27427,9 @@ class ReadEthernetNetworkDiagnosticsFeatureMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeEthernetNetworkDiagnosticsFeatureMap : public ModelCommand { @@ -25409,6 +27440,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsFeatureMap : public ModelComma AddArgument("attr-name", "feature-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -25423,6 +27455,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsFeatureMap : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -25443,6 +27476,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsFeatureMap : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -25457,6 +27491,7 @@ class ReadEthernetNetworkDiagnosticsClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -25480,6 +27515,9 @@ class ReadEthernetNetworkDiagnosticsClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision : public ModelCommand { @@ -25490,6 +27528,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision : public Model AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -25504,6 +27543,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -25525,6 +27565,7 @@ class SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -25565,6 +27606,7 @@ class ReadFanControlFanMode : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "fan-mode"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -25586,6 +27628,9 @@ class ReadFanControlFanMode : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteFanControlFanMode : public ModelCommand { @@ -25595,6 +27640,7 @@ class WriteFanControlFanMode : public ModelCommand { { AddArgument("attr-name", "fan-mode"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -25606,10 +27652,13 @@ class WriteFanControlFanMode : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeFanModeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "FanControl FanMode Error: %s", chip::ErrorStr(chipError)); @@ -25619,6 +27668,7 @@ class WriteFanControlFanMode : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -25630,6 +27680,7 @@ class SubscribeAttributeFanControlFanMode : public ModelCommand { AddArgument("attr-name", "fan-mode"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -25642,6 +27693,7 @@ class SubscribeAttributeFanControlFanMode : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFanModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -25662,6 +27714,7 @@ class SubscribeAttributeFanControlFanMode : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -25676,6 +27729,7 @@ class ReadFanControlFanModeSequence : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "fan-mode-sequence"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -25697,6 +27751,9 @@ class ReadFanControlFanModeSequence : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteFanControlFanModeSequence : public ModelCommand { @@ -25706,6 +27763,7 @@ class WriteFanControlFanModeSequence : public ModelCommand { { AddArgument("attr-name", "fan-mode-sequence"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -25717,10 +27775,13 @@ class WriteFanControlFanModeSequence : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeFanModeSequenceWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "FanControl FanModeSequence Error: %s", chip::ErrorStr(chipError)); @@ -25730,6 +27791,7 @@ class WriteFanControlFanModeSequence : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -25741,6 +27803,7 @@ class SubscribeAttributeFanControlFanModeSequence : public ModelCommand { AddArgument("attr-name", "fan-mode-sequence"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -25753,6 +27816,7 @@ class SubscribeAttributeFanControlFanModeSequence : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFanModeSequenceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -25773,6 +27837,7 @@ class SubscribeAttributeFanControlFanModeSequence : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -25787,6 +27852,7 @@ class ReadFanControlPercentSetting : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "percent-setting"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -25808,6 +27874,9 @@ class ReadFanControlPercentSetting : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteFanControlPercentSetting : public ModelCommand { @@ -25817,6 +27886,7 @@ class WriteFanControlPercentSetting : public ModelCommand { { AddArgument("attr-name", "percent-setting"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -25828,10 +27898,13 @@ class WriteFanControlPercentSetting : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributePercentSettingWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "FanControl PercentSetting Error: %s", chip::ErrorStr(chipError)); @@ -25841,6 +27914,7 @@ class WriteFanControlPercentSetting : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -25852,6 +27926,7 @@ class SubscribeAttributeFanControlPercentSetting : public ModelCommand { AddArgument("attr-name", "percent-setting"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -25864,6 +27939,7 @@ class SubscribeAttributeFanControlPercentSetting : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePercentSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -25884,6 +27960,7 @@ class SubscribeAttributeFanControlPercentSetting : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -25898,6 +27975,7 @@ class ReadFanControlPercentCurrent : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "percent-current"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -25919,6 +27997,9 @@ class ReadFanControlPercentCurrent : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFanControlPercentCurrent : public ModelCommand { @@ -25929,6 +28010,7 @@ class SubscribeAttributeFanControlPercentCurrent : public ModelCommand { AddArgument("attr-name", "percent-current"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -25941,6 +28023,7 @@ class SubscribeAttributeFanControlPercentCurrent : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePercentCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -25961,6 +28044,7 @@ class SubscribeAttributeFanControlPercentCurrent : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -25975,6 +28059,7 @@ class ReadFanControlSpeedMax : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "speed-max"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -25996,6 +28081,9 @@ class ReadFanControlSpeedMax : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFanControlSpeedMax : public ModelCommand { @@ -26006,6 +28094,7 @@ class SubscribeAttributeFanControlSpeedMax : public ModelCommand { AddArgument("attr-name", "speed-max"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -26018,6 +28107,7 @@ class SubscribeAttributeFanControlSpeedMax : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSpeedMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -26038,6 +28128,7 @@ class SubscribeAttributeFanControlSpeedMax : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -26052,6 +28143,7 @@ class ReadFanControlSpeedSetting : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "speed-setting"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -26073,6 +28165,9 @@ class ReadFanControlSpeedSetting : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteFanControlSpeedSetting : public ModelCommand { @@ -26082,6 +28177,7 @@ class WriteFanControlSpeedSetting : public ModelCommand { { AddArgument("attr-name", "speed-setting"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -26093,10 +28189,13 @@ class WriteFanControlSpeedSetting : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeSpeedSettingWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "FanControl SpeedSetting Error: %s", chip::ErrorStr(chipError)); @@ -26106,6 +28205,7 @@ class WriteFanControlSpeedSetting : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -26117,6 +28217,7 @@ class SubscribeAttributeFanControlSpeedSetting : public ModelCommand { AddArgument("attr-name", "speed-setting"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -26129,6 +28230,7 @@ class SubscribeAttributeFanControlSpeedSetting : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSpeedSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -26149,6 +28251,7 @@ class SubscribeAttributeFanControlSpeedSetting : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -26163,6 +28266,7 @@ class ReadFanControlSpeedCurrent : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "speed-current"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -26184,6 +28288,9 @@ class ReadFanControlSpeedCurrent : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFanControlSpeedCurrent : public ModelCommand { @@ -26194,6 +28301,7 @@ class SubscribeAttributeFanControlSpeedCurrent : public ModelCommand { AddArgument("attr-name", "speed-current"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -26206,6 +28314,7 @@ class SubscribeAttributeFanControlSpeedCurrent : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSpeedCurrentWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -26226,6 +28335,7 @@ class SubscribeAttributeFanControlSpeedCurrent : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -26240,6 +28350,7 @@ class ReadFanControlRockSupport : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rock-support"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -26261,6 +28372,9 @@ class ReadFanControlRockSupport : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFanControlRockSupport : public ModelCommand { @@ -26271,6 +28385,7 @@ class SubscribeAttributeFanControlRockSupport : public ModelCommand { AddArgument("attr-name", "rock-support"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -26283,6 +28398,7 @@ class SubscribeAttributeFanControlRockSupport : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRockSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -26303,6 +28419,7 @@ class SubscribeAttributeFanControlRockSupport : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -26317,6 +28434,7 @@ class ReadFanControlRockSetting : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rock-setting"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -26338,6 +28456,9 @@ class ReadFanControlRockSetting : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteFanControlRockSetting : public ModelCommand { @@ -26347,6 +28468,7 @@ class WriteFanControlRockSetting : public ModelCommand { { AddArgument("attr-name", "rock-setting"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -26358,10 +28480,13 @@ class WriteFanControlRockSetting : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeRockSettingWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "FanControl RockSetting Error: %s", chip::ErrorStr(chipError)); @@ -26371,6 +28496,7 @@ class WriteFanControlRockSetting : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -26382,6 +28508,7 @@ class SubscribeAttributeFanControlRockSetting : public ModelCommand { AddArgument("attr-name", "rock-setting"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -26394,6 +28521,7 @@ class SubscribeAttributeFanControlRockSetting : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRockSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -26414,6 +28542,7 @@ class SubscribeAttributeFanControlRockSetting : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -26428,6 +28557,7 @@ class ReadFanControlWindSupport : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "wind-support"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -26449,6 +28579,9 @@ class ReadFanControlWindSupport : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFanControlWindSupport : public ModelCommand { @@ -26459,6 +28592,7 @@ class SubscribeAttributeFanControlWindSupport : public ModelCommand { AddArgument("attr-name", "wind-support"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -26471,6 +28605,7 @@ class SubscribeAttributeFanControlWindSupport : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeWindSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -26491,6 +28626,7 @@ class SubscribeAttributeFanControlWindSupport : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -26505,6 +28641,7 @@ class ReadFanControlWindSetting : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "wind-setting"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -26526,6 +28663,9 @@ class ReadFanControlWindSetting : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteFanControlWindSetting : public ModelCommand { @@ -26535,6 +28675,7 @@ class WriteFanControlWindSetting : public ModelCommand { { AddArgument("attr-name", "wind-setting"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -26546,10 +28687,13 @@ class WriteFanControlWindSetting : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeWindSettingWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "FanControl WindSetting Error: %s", chip::ErrorStr(chipError)); @@ -26559,6 +28703,7 @@ class WriteFanControlWindSetting : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -26570,6 +28715,7 @@ class SubscribeAttributeFanControlWindSetting : public ModelCommand { AddArgument("attr-name", "wind-setting"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -26582,6 +28728,7 @@ class SubscribeAttributeFanControlWindSetting : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeWindSettingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -26602,6 +28749,7 @@ class SubscribeAttributeFanControlWindSetting : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -26616,6 +28764,7 @@ class ReadFanControlGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -26637,6 +28786,9 @@ class ReadFanControlGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFanControlGeneratedCommandList : public ModelCommand { @@ -26647,6 +28799,7 @@ class SubscribeAttributeFanControlGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -26659,6 +28812,7 @@ class SubscribeAttributeFanControlGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -26680,6 +28834,7 @@ class SubscribeAttributeFanControlGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -26694,6 +28849,7 @@ class ReadFanControlAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -26715,6 +28871,9 @@ class ReadFanControlAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFanControlAcceptedCommandList : public ModelCommand { @@ -26725,6 +28884,7 @@ class SubscribeAttributeFanControlAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -26737,6 +28897,7 @@ class SubscribeAttributeFanControlAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -26758,6 +28919,7 @@ class SubscribeAttributeFanControlAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -26772,6 +28934,7 @@ class ReadFanControlAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -26793,6 +28956,9 @@ class ReadFanControlAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFanControlAttributeList : public ModelCommand { @@ -26803,6 +28969,7 @@ class SubscribeAttributeFanControlAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -26815,6 +28982,7 @@ class SubscribeAttributeFanControlAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -26835,6 +29003,7 @@ class SubscribeAttributeFanControlAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -26849,6 +29018,7 @@ class ReadFanControlFeatureMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "feature-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -26870,6 +29040,9 @@ class ReadFanControlFeatureMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFanControlFeatureMap : public ModelCommand { @@ -26880,6 +29053,7 @@ class SubscribeAttributeFanControlFeatureMap : public ModelCommand { AddArgument("attr-name", "feature-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -26892,6 +29066,7 @@ class SubscribeAttributeFanControlFeatureMap : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -26912,6 +29087,7 @@ class SubscribeAttributeFanControlFeatureMap : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -26926,6 +29102,7 @@ class ReadFanControlClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -26947,6 +29124,9 @@ class ReadFanControlClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFanControlClusterRevision : public ModelCommand { @@ -26957,6 +29137,7 @@ class SubscribeAttributeFanControlClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -26969,6 +29150,7 @@ class SubscribeAttributeFanControlClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFanControl * cluster = [[CHIPFanControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -26989,6 +29171,7 @@ class SubscribeAttributeFanControlClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -27019,6 +29202,7 @@ class ReadFixedLabelLabelList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "label-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -27040,6 +29224,9 @@ class ReadFixedLabelLabelList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFixedLabelLabelList : public ModelCommand { @@ -27050,6 +29237,7 @@ class SubscribeAttributeFixedLabelLabelList : public ModelCommand { AddArgument("attr-name", "label-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -27062,6 +29250,7 @@ class SubscribeAttributeFixedLabelLabelList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLabelListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -27082,6 +29271,7 @@ class SubscribeAttributeFixedLabelLabelList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -27096,6 +29286,7 @@ class ReadFixedLabelGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -27117,6 +29308,9 @@ class ReadFixedLabelGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFixedLabelGeneratedCommandList : public ModelCommand { @@ -27127,6 +29321,7 @@ class SubscribeAttributeFixedLabelGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -27139,6 +29334,7 @@ class SubscribeAttributeFixedLabelGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -27160,6 +29356,7 @@ class SubscribeAttributeFixedLabelGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -27174,6 +29371,7 @@ class ReadFixedLabelAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -27195,6 +29393,9 @@ class ReadFixedLabelAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFixedLabelAcceptedCommandList : public ModelCommand { @@ -27205,6 +29406,7 @@ class SubscribeAttributeFixedLabelAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -27217,6 +29419,7 @@ class SubscribeAttributeFixedLabelAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -27238,6 +29441,7 @@ class SubscribeAttributeFixedLabelAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -27252,6 +29456,7 @@ class ReadFixedLabelAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -27273,6 +29478,9 @@ class ReadFixedLabelAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFixedLabelAttributeList : public ModelCommand { @@ -27283,6 +29491,7 @@ class SubscribeAttributeFixedLabelAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -27295,6 +29504,7 @@ class SubscribeAttributeFixedLabelAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -27315,6 +29525,7 @@ class SubscribeAttributeFixedLabelAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -27329,6 +29540,7 @@ class ReadFixedLabelClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -27350,6 +29562,9 @@ class ReadFixedLabelClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFixedLabelClusterRevision : public ModelCommand { @@ -27360,6 +29575,7 @@ class SubscribeAttributeFixedLabelClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -27372,6 +29588,7 @@ class SubscribeAttributeFixedLabelClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFixedLabel * cluster = [[CHIPFixedLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -27392,6 +29609,7 @@ class SubscribeAttributeFixedLabelClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -27425,6 +29643,7 @@ class ReadFlowMeasurementMeasuredValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "measured-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -27446,6 +29665,9 @@ class ReadFlowMeasurementMeasuredValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFlowMeasurementMeasuredValue : public ModelCommand { @@ -27456,6 +29678,7 @@ class SubscribeAttributeFlowMeasurementMeasuredValue : public ModelCommand { AddArgument("attr-name", "measured-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -27468,6 +29691,7 @@ class SubscribeAttributeFlowMeasurementMeasuredValue : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -27488,6 +29712,7 @@ class SubscribeAttributeFlowMeasurementMeasuredValue : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -27502,6 +29727,7 @@ class ReadFlowMeasurementMinMeasuredValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-measured-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -27523,6 +29749,9 @@ class ReadFlowMeasurementMinMeasuredValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFlowMeasurementMinMeasuredValue : public ModelCommand { @@ -27533,6 +29762,7 @@ class SubscribeAttributeFlowMeasurementMinMeasuredValue : public ModelCommand { AddArgument("attr-name", "min-measured-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -27545,6 +29775,7 @@ class SubscribeAttributeFlowMeasurementMinMeasuredValue : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -27566,6 +29797,7 @@ class SubscribeAttributeFlowMeasurementMinMeasuredValue : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -27580,6 +29812,7 @@ class ReadFlowMeasurementMaxMeasuredValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-measured-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -27601,6 +29834,9 @@ class ReadFlowMeasurementMaxMeasuredValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFlowMeasurementMaxMeasuredValue : public ModelCommand { @@ -27611,6 +29847,7 @@ class SubscribeAttributeFlowMeasurementMaxMeasuredValue : public ModelCommand { AddArgument("attr-name", "max-measured-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -27623,6 +29860,7 @@ class SubscribeAttributeFlowMeasurementMaxMeasuredValue : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -27644,6 +29882,7 @@ class SubscribeAttributeFlowMeasurementMaxMeasuredValue : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -27658,6 +29897,7 @@ class ReadFlowMeasurementTolerance : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tolerance"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -27679,6 +29919,9 @@ class ReadFlowMeasurementTolerance : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFlowMeasurementTolerance : public ModelCommand { @@ -27689,6 +29932,7 @@ class SubscribeAttributeFlowMeasurementTolerance : public ModelCommand { AddArgument("attr-name", "tolerance"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -27701,6 +29945,7 @@ class SubscribeAttributeFlowMeasurementTolerance : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -27721,6 +29966,7 @@ class SubscribeAttributeFlowMeasurementTolerance : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -27735,6 +29981,7 @@ class ReadFlowMeasurementGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -27756,6 +30003,9 @@ class ReadFlowMeasurementGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFlowMeasurementGeneratedCommandList : public ModelCommand { @@ -27766,6 +30016,7 @@ class SubscribeAttributeFlowMeasurementGeneratedCommandList : public ModelComman AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -27778,6 +30029,7 @@ class SubscribeAttributeFlowMeasurementGeneratedCommandList : public ModelComman dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -27799,6 +30051,7 @@ class SubscribeAttributeFlowMeasurementGeneratedCommandList : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -27813,6 +30066,7 @@ class ReadFlowMeasurementAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -27834,6 +30088,9 @@ class ReadFlowMeasurementAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFlowMeasurementAcceptedCommandList : public ModelCommand { @@ -27844,6 +30101,7 @@ class SubscribeAttributeFlowMeasurementAcceptedCommandList : public ModelCommand AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -27856,6 +30114,7 @@ class SubscribeAttributeFlowMeasurementAcceptedCommandList : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -27877,6 +30136,7 @@ class SubscribeAttributeFlowMeasurementAcceptedCommandList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -27891,6 +30151,7 @@ class ReadFlowMeasurementAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -27912,6 +30173,9 @@ class ReadFlowMeasurementAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFlowMeasurementAttributeList : public ModelCommand { @@ -27922,6 +30186,7 @@ class SubscribeAttributeFlowMeasurementAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -27934,6 +30199,7 @@ class SubscribeAttributeFlowMeasurementAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -27954,6 +30220,7 @@ class SubscribeAttributeFlowMeasurementAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -27968,6 +30235,7 @@ class ReadFlowMeasurementClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -27989,6 +30257,9 @@ class ReadFlowMeasurementClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeFlowMeasurementClusterRevision : public ModelCommand { @@ -27999,6 +30270,7 @@ class SubscribeAttributeFlowMeasurementClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -28011,6 +30283,7 @@ class SubscribeAttributeFlowMeasurementClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPFlowMeasurement * cluster = [[CHIPFlowMeasurement alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -28031,6 +30304,7 @@ class SubscribeAttributeFlowMeasurementClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -28069,6 +30343,7 @@ class GeneralCommissioningArmFailSafe : public ModelCommand { { AddArgument("ExpiryLengthSeconds", 0, UINT16_MAX, &mExpiryLengthSeconds); AddArgument("Breadcrumb", 0, UINT64_MAX, &mBreadcrumb); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -28082,9 +30357,9 @@ class GeneralCommissioningArmFailSafe : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPGeneralCommissioningClusterArmFailSafeParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.expiryLengthSeconds = [NSNumber numberWithUnsignedShort:mExpiryLengthSeconds]; - params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mBreadcrumb]; [cluster armFailSafeWithParams:params completionHandler:^( @@ -28098,6 +30373,7 @@ class GeneralCommissioningArmFailSafe : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mExpiryLengthSeconds; uint64_t mBreadcrumb; }; @@ -28110,6 +30386,7 @@ class GeneralCommissioningCommissioningComplete : public ModelCommand { GeneralCommissioningCommissioningComplete() : ModelCommand("commissioning-complete") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -28122,6 +30399,9 @@ class GeneralCommissioningCommissioningComplete : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPGeneralCommissioningClusterCommissioningCompleteParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster commissioningCompleteWithCompletionHandler:^( CHIPGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); @@ -28133,6 +30413,7 @@ class GeneralCommissioningCommissioningComplete : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -28146,6 +30427,7 @@ class GeneralCommissioningSetRegulatoryConfig : public ModelCommand { AddArgument("NewRegulatoryConfig", 0, UINT8_MAX, &mNewRegulatoryConfig); AddArgument("CountryCode", &mCountryCode); AddArgument("Breadcrumb", 0, UINT64_MAX, &mBreadcrumb); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -28159,13 +30441,12 @@ class GeneralCommissioningSetRegulatoryConfig : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPGeneralCommissioningClusterSetRegulatoryConfigParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.newRegulatoryConfig = [NSNumber numberWithUnsignedChar:mNewRegulatoryConfig]; - params.countryCode = [[NSString alloc] initWithBytes:mCountryCode.data() length:mCountryCode.size() encoding:NSUTF8StringEncoding]; - params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mBreadcrumb]; [cluster setRegulatoryConfigWithParams:params @@ -28180,6 +30461,7 @@ class GeneralCommissioningSetRegulatoryConfig : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mNewRegulatoryConfig; chip::ByteSpan mCountryCode; uint64_t mBreadcrumb; @@ -28194,6 +30476,7 @@ class ReadGeneralCommissioningBreadcrumb : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "breadcrumb"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -28217,6 +30500,9 @@ class ReadGeneralCommissioningBreadcrumb : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteGeneralCommissioningBreadcrumb : public ModelCommand { @@ -28226,6 +30512,7 @@ class WriteGeneralCommissioningBreadcrumb : public ModelCommand { { AddArgument("attr-name", "breadcrumb"); AddArgument("attr-value", 0, UINT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -28239,10 +30526,13 @@ class WriteGeneralCommissioningBreadcrumb : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue]; [cluster writeAttributeBreadcrumbWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "GeneralCommissioning Breadcrumb Error: %s", chip::ErrorStr(chipError)); @@ -28252,6 +30542,7 @@ class WriteGeneralCommissioningBreadcrumb : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint64_t mValue; }; @@ -28263,6 +30554,7 @@ class SubscribeAttributeGeneralCommissioningBreadcrumb : public ModelCommand { AddArgument("attr-name", "breadcrumb"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -28277,6 +30569,7 @@ class SubscribeAttributeGeneralCommissioningBreadcrumb : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBreadcrumbWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -28297,6 +30590,7 @@ class SubscribeAttributeGeneralCommissioningBreadcrumb : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -28311,6 +30605,7 @@ class ReadGeneralCommissioningBasicCommissioningInfo : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "basic-commissioning-info"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -28335,6 +30630,9 @@ class ReadGeneralCommissioningBasicCommissioningInfo : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralCommissioningBasicCommissioningInfo : public ModelCommand { @@ -28345,6 +30643,7 @@ class SubscribeAttributeGeneralCommissioningBasicCommissioningInfo : public Mode AddArgument("attr-name", "basic-commissioning-info"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -28359,6 +30658,7 @@ class SubscribeAttributeGeneralCommissioningBasicCommissioningInfo : public Mode endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBasicCommissioningInfoWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -28383,6 +30683,7 @@ class SubscribeAttributeGeneralCommissioningBasicCommissioningInfo : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -28397,6 +30698,7 @@ class ReadGeneralCommissioningRegulatoryConfig : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "regulatory-config"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -28420,6 +30722,9 @@ class ReadGeneralCommissioningRegulatoryConfig : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralCommissioningRegulatoryConfig : public ModelCommand { @@ -28430,6 +30735,7 @@ class SubscribeAttributeGeneralCommissioningRegulatoryConfig : public ModelComma AddArgument("attr-name", "regulatory-config"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -28444,6 +30750,7 @@ class SubscribeAttributeGeneralCommissioningRegulatoryConfig : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRegulatoryConfigWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -28465,6 +30772,7 @@ class SubscribeAttributeGeneralCommissioningRegulatoryConfig : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -28479,6 +30787,7 @@ class ReadGeneralCommissioningLocationCapability : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "location-capability"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -28502,6 +30811,9 @@ class ReadGeneralCommissioningLocationCapability : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralCommissioningLocationCapability : public ModelCommand { @@ -28512,6 +30824,7 @@ class SubscribeAttributeGeneralCommissioningLocationCapability : public ModelCom AddArgument("attr-name", "location-capability"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -28526,6 +30839,7 @@ class SubscribeAttributeGeneralCommissioningLocationCapability : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLocationCapabilityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -28547,6 +30861,7 @@ class SubscribeAttributeGeneralCommissioningLocationCapability : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -28561,6 +30876,7 @@ class ReadGeneralCommissioningSupportsConcurrentConnection : public ModelCommand : ModelCommand("read") { AddArgument("attr-name", "supports-concurrent-connection"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -28585,6 +30901,9 @@ class ReadGeneralCommissioningSupportsConcurrentConnection : public ModelCommand }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralCommissioningSupportsConcurrentConnection : public ModelCommand { @@ -28595,6 +30914,7 @@ class SubscribeAttributeGeneralCommissioningSupportsConcurrentConnection : publi AddArgument("attr-name", "supports-concurrent-connection"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -28609,6 +30929,7 @@ class SubscribeAttributeGeneralCommissioningSupportsConcurrentConnection : publi endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSupportsConcurrentConnectionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -28632,6 +30953,7 @@ class SubscribeAttributeGeneralCommissioningSupportsConcurrentConnection : publi } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -28646,6 +30968,7 @@ class ReadGeneralCommissioningGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -28669,6 +30992,9 @@ class ReadGeneralCommissioningGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralCommissioningGeneratedCommandList : public ModelCommand { @@ -28679,6 +31005,7 @@ class SubscribeAttributeGeneralCommissioningGeneratedCommandList : public ModelC AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -28693,6 +31020,7 @@ class SubscribeAttributeGeneralCommissioningGeneratedCommandList : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -28714,6 +31042,7 @@ class SubscribeAttributeGeneralCommissioningGeneratedCommandList : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -28728,6 +31057,7 @@ class ReadGeneralCommissioningAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -28751,6 +31081,9 @@ class ReadGeneralCommissioningAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralCommissioningAcceptedCommandList : public ModelCommand { @@ -28761,6 +31094,7 @@ class SubscribeAttributeGeneralCommissioningAcceptedCommandList : public ModelCo AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -28775,6 +31109,7 @@ class SubscribeAttributeGeneralCommissioningAcceptedCommandList : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -28796,6 +31131,7 @@ class SubscribeAttributeGeneralCommissioningAcceptedCommandList : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -28810,6 +31146,7 @@ class ReadGeneralCommissioningAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -28833,6 +31170,9 @@ class ReadGeneralCommissioningAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralCommissioningAttributeList : public ModelCommand { @@ -28843,6 +31183,7 @@ class SubscribeAttributeGeneralCommissioningAttributeList : public ModelCommand AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -28857,6 +31198,7 @@ class SubscribeAttributeGeneralCommissioningAttributeList : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -28877,6 +31219,7 @@ class SubscribeAttributeGeneralCommissioningAttributeList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -28891,6 +31234,7 @@ class ReadGeneralCommissioningClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -28914,6 +31258,9 @@ class ReadGeneralCommissioningClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralCommissioningClusterRevision : public ModelCommand { @@ -28924,6 +31271,7 @@ class SubscribeAttributeGeneralCommissioningClusterRevision : public ModelComman AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -28938,6 +31286,7 @@ class SubscribeAttributeGeneralCommissioningClusterRevision : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -28959,6 +31308,7 @@ class SubscribeAttributeGeneralCommissioningClusterRevision : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -29000,6 +31350,7 @@ class ReadGeneralDiagnosticsNetworkInterfaces : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "network-interfaces"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -29023,6 +31374,9 @@ class ReadGeneralDiagnosticsNetworkInterfaces : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralDiagnosticsNetworkInterfaces : public ModelCommand { @@ -29033,6 +31387,7 @@ class SubscribeAttributeGeneralDiagnosticsNetworkInterfaces : public ModelComman AddArgument("attr-name", "network-interfaces"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -29047,6 +31402,7 @@ class SubscribeAttributeGeneralDiagnosticsNetworkInterfaces : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNetworkInterfacesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -29068,6 +31424,7 @@ class SubscribeAttributeGeneralDiagnosticsNetworkInterfaces : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -29082,6 +31439,7 @@ class ReadGeneralDiagnosticsRebootCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "reboot-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -29105,6 +31463,9 @@ class ReadGeneralDiagnosticsRebootCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralDiagnosticsRebootCount : public ModelCommand { @@ -29115,6 +31476,7 @@ class SubscribeAttributeGeneralDiagnosticsRebootCount : public ModelCommand { AddArgument("attr-name", "reboot-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -29129,6 +31491,7 @@ class SubscribeAttributeGeneralDiagnosticsRebootCount : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRebootCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -29149,6 +31512,7 @@ class SubscribeAttributeGeneralDiagnosticsRebootCount : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -29163,6 +31527,7 @@ class ReadGeneralDiagnosticsUpTime : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "up-time"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -29186,6 +31551,9 @@ class ReadGeneralDiagnosticsUpTime : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralDiagnosticsUpTime : public ModelCommand { @@ -29196,6 +31564,7 @@ class SubscribeAttributeGeneralDiagnosticsUpTime : public ModelCommand { AddArgument("attr-name", "up-time"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -29210,6 +31579,7 @@ class SubscribeAttributeGeneralDiagnosticsUpTime : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeUpTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -29230,6 +31600,7 @@ class SubscribeAttributeGeneralDiagnosticsUpTime : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -29244,6 +31615,7 @@ class ReadGeneralDiagnosticsTotalOperationalHours : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "total-operational-hours"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -29267,6 +31639,9 @@ class ReadGeneralDiagnosticsTotalOperationalHours : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralDiagnosticsTotalOperationalHours : public ModelCommand { @@ -29277,6 +31652,7 @@ class SubscribeAttributeGeneralDiagnosticsTotalOperationalHours : public ModelCo AddArgument("attr-name", "total-operational-hours"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -29291,6 +31667,7 @@ class SubscribeAttributeGeneralDiagnosticsTotalOperationalHours : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTotalOperationalHoursWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -29312,6 +31689,7 @@ class SubscribeAttributeGeneralDiagnosticsTotalOperationalHours : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -29326,6 +31704,7 @@ class ReadGeneralDiagnosticsBootReasons : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "boot-reasons"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -29349,6 +31728,9 @@ class ReadGeneralDiagnosticsBootReasons : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralDiagnosticsBootReasons : public ModelCommand { @@ -29359,6 +31741,7 @@ class SubscribeAttributeGeneralDiagnosticsBootReasons : public ModelCommand { AddArgument("attr-name", "boot-reasons"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -29373,6 +31756,7 @@ class SubscribeAttributeGeneralDiagnosticsBootReasons : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBootReasonsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -29393,6 +31777,7 @@ class SubscribeAttributeGeneralDiagnosticsBootReasons : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -29407,6 +31792,7 @@ class ReadGeneralDiagnosticsActiveHardwareFaults : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "active-hardware-faults"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -29430,6 +31816,9 @@ class ReadGeneralDiagnosticsActiveHardwareFaults : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralDiagnosticsActiveHardwareFaults : public ModelCommand { @@ -29440,6 +31829,7 @@ class SubscribeAttributeGeneralDiagnosticsActiveHardwareFaults : public ModelCom AddArgument("attr-name", "active-hardware-faults"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -29454,6 +31844,7 @@ class SubscribeAttributeGeneralDiagnosticsActiveHardwareFaults : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeActiveHardwareFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -29475,6 +31866,7 @@ class SubscribeAttributeGeneralDiagnosticsActiveHardwareFaults : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -29489,6 +31881,7 @@ class ReadGeneralDiagnosticsActiveRadioFaults : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "active-radio-faults"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -29512,6 +31905,9 @@ class ReadGeneralDiagnosticsActiveRadioFaults : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralDiagnosticsActiveRadioFaults : public ModelCommand { @@ -29522,6 +31918,7 @@ class SubscribeAttributeGeneralDiagnosticsActiveRadioFaults : public ModelComman AddArgument("attr-name", "active-radio-faults"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -29536,6 +31933,7 @@ class SubscribeAttributeGeneralDiagnosticsActiveRadioFaults : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeActiveRadioFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -29557,6 +31955,7 @@ class SubscribeAttributeGeneralDiagnosticsActiveRadioFaults : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -29571,6 +31970,7 @@ class ReadGeneralDiagnosticsActiveNetworkFaults : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "active-network-faults"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -29594,6 +31994,9 @@ class ReadGeneralDiagnosticsActiveNetworkFaults : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults : public ModelCommand { @@ -29604,6 +32007,7 @@ class SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults : public ModelComm AddArgument("attr-name", "active-network-faults"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -29618,6 +32022,7 @@ class SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeActiveNetworkFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -29639,6 +32044,7 @@ class SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -29653,6 +32059,7 @@ class ReadGeneralDiagnosticsGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -29676,6 +32083,9 @@ class ReadGeneralDiagnosticsGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralDiagnosticsGeneratedCommandList : public ModelCommand { @@ -29686,6 +32096,7 @@ class SubscribeAttributeGeneralDiagnosticsGeneratedCommandList : public ModelCom AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -29700,6 +32111,7 @@ class SubscribeAttributeGeneralDiagnosticsGeneratedCommandList : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -29721,6 +32133,7 @@ class SubscribeAttributeGeneralDiagnosticsGeneratedCommandList : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -29735,6 +32148,7 @@ class ReadGeneralDiagnosticsAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -29758,6 +32172,9 @@ class ReadGeneralDiagnosticsAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralDiagnosticsAcceptedCommandList : public ModelCommand { @@ -29768,6 +32185,7 @@ class SubscribeAttributeGeneralDiagnosticsAcceptedCommandList : public ModelComm AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -29782,6 +32200,7 @@ class SubscribeAttributeGeneralDiagnosticsAcceptedCommandList : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -29803,6 +32222,7 @@ class SubscribeAttributeGeneralDiagnosticsAcceptedCommandList : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -29817,6 +32237,7 @@ class ReadGeneralDiagnosticsAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -29840,6 +32261,9 @@ class ReadGeneralDiagnosticsAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralDiagnosticsAttributeList : public ModelCommand { @@ -29850,6 +32274,7 @@ class SubscribeAttributeGeneralDiagnosticsAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -29864,6 +32289,7 @@ class SubscribeAttributeGeneralDiagnosticsAttributeList : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -29884,6 +32310,7 @@ class SubscribeAttributeGeneralDiagnosticsAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -29898,6 +32325,7 @@ class ReadGeneralDiagnosticsClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -29921,6 +32349,9 @@ class ReadGeneralDiagnosticsClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGeneralDiagnosticsClusterRevision : public ModelCommand { @@ -29931,6 +32362,7 @@ class SubscribeAttributeGeneralDiagnosticsClusterRevision : public ModelCommand AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -29945,6 +32377,7 @@ class SubscribeAttributeGeneralDiagnosticsClusterRevision : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -29966,6 +32399,7 @@ class SubscribeAttributeGeneralDiagnosticsClusterRevision : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -30003,6 +32437,7 @@ class GroupKeyManagementKeySetRead : public ModelCommand { : ModelCommand("key-set-read") { AddArgument("GroupKeySetID", 0, UINT16_MAX, &mGroupKeySetID); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -30016,7 +32451,8 @@ class GroupKeyManagementKeySetRead : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPGroupKeyManagementClusterKeySetReadParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.groupKeySetID = [NSNumber numberWithUnsignedShort:mGroupKeySetID]; [cluster keySetReadWithParams:params completionHandler:^( @@ -30030,6 +32466,7 @@ class GroupKeyManagementKeySetRead : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mGroupKeySetID; }; @@ -30043,6 +32480,7 @@ class GroupKeyManagementKeySetReadAllIndices : public ModelCommand { , mComplex_GroupKeySetIDs(&mRequest.groupKeySetIDs) { AddArgument("GroupKeySetIDs", &mComplex_GroupKeySetIDs); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -30056,7 +32494,8 @@ class GroupKeyManagementKeySetReadAllIndices : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPGroupKeyManagementClusterKeySetReadAllIndicesParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; for (auto & entry_0 : mRequest.groupKeySetIDs) { @@ -30079,6 +32518,7 @@ class GroupKeyManagementKeySetReadAllIndices : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndices::Type mRequest; TypedComplexArgument> mComplex_GroupKeySetIDs; }; @@ -30092,6 +32532,7 @@ class GroupKeyManagementKeySetRemove : public ModelCommand { : ModelCommand("key-set-remove") { AddArgument("GroupKeySetID", 0, UINT16_MAX, &mGroupKeySetID); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -30105,7 +32546,8 @@ class GroupKeyManagementKeySetRemove : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPGroupKeyManagementClusterKeySetRemoveParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.groupKeySetID = [NSNumber numberWithUnsignedShort:mGroupKeySetID]; [cluster keySetRemoveWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -30117,6 +32559,7 @@ class GroupKeyManagementKeySetRemove : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mGroupKeySetID; }; @@ -30130,6 +32573,7 @@ class GroupKeyManagementKeySetWrite : public ModelCommand { , mComplex_GroupKeySet(&mRequest.groupKeySet) { AddArgument("GroupKeySet", &mComplex_GroupKeySet); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -30143,7 +32587,8 @@ class GroupKeyManagementKeySetWrite : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPGroupKeyManagementClusterKeySetWriteParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.groupKeySet = [CHIPGroupKeyManagementClusterGroupKeySetStruct new]; params.groupKeySet.groupKeySetID = [NSNumber numberWithUnsignedShort:mRequest.groupKeySet.groupKeySetID]; params.groupKeySet.groupKeySecurityPolicy = @@ -30191,6 +32636,7 @@ class GroupKeyManagementKeySetWrite : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type mRequest; TypedComplexArgument mComplex_GroupKeySet; }; @@ -30204,6 +32650,7 @@ class ReadGroupKeyManagementGroupKeyMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "group-key-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -30219,6 +32666,7 @@ class ReadGroupKeyManagementGroupKeyMap : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block err = CHIP_NO_ERROR; CHIPReadParams * params = [[CHIPReadParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster readAttributeGroupKeyMapWithParams:params completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { NSLog(@"GroupKeyManagement.GroupKeyMap response %@", [value description]); @@ -30229,6 +32677,9 @@ class ReadGroupKeyManagementGroupKeyMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteGroupKeyManagementGroupKeyMap : public ModelCommand { @@ -30239,6 +32690,7 @@ class WriteGroupKeyManagementGroupKeyMap : public ModelCommand { { AddArgument("attr-name", "group-key-map"); AddArgument("attr-value", &mComplex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -30252,7 +32704,9 @@ class WriteGroupKeyManagementGroupKeyMap : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSArray * _Nonnull value; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; @@ -30268,6 +32722,7 @@ class WriteGroupKeyManagementGroupKeyMap : public ModelCommand { } [cluster writeAttributeGroupKeyMapWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "GroupKeyManagement GroupKeyMap Error: %s", chip::ErrorStr(chipError)); @@ -30277,6 +32732,7 @@ class WriteGroupKeyManagementGroupKeyMap : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::DataModel::List mValue; TypedComplexArgument< chip::app::DataModel::List> @@ -30291,6 +32747,7 @@ class SubscribeAttributeGroupKeyManagementGroupKeyMap : public ModelCommand { AddArgument("attr-name", "group-key-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -30305,6 +32762,7 @@ class SubscribeAttributeGroupKeyManagementGroupKeyMap : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGroupKeyMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -30325,6 +32783,7 @@ class SubscribeAttributeGroupKeyManagementGroupKeyMap : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -30339,6 +32798,7 @@ class ReadGroupKeyManagementGroupTable : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "group-table"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -30354,6 +32814,7 @@ class ReadGroupKeyManagementGroupTable : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block err = CHIP_NO_ERROR; CHIPReadParams * params = [[CHIPReadParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster readAttributeGroupTableWithParams:params completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { NSLog(@"GroupKeyManagement.GroupTable response %@", [value description]); @@ -30364,6 +32825,9 @@ class ReadGroupKeyManagementGroupTable : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGroupKeyManagementGroupTable : public ModelCommand { @@ -30374,6 +32838,7 @@ class SubscribeAttributeGroupKeyManagementGroupTable : public ModelCommand { AddArgument("attr-name", "group-table"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -30388,6 +32853,7 @@ class SubscribeAttributeGroupKeyManagementGroupTable : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGroupTableWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -30408,6 +32874,7 @@ class SubscribeAttributeGroupKeyManagementGroupTable : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -30422,6 +32889,7 @@ class ReadGroupKeyManagementMaxGroupsPerFabric : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-groups-per-fabric"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -30445,6 +32913,9 @@ class ReadGroupKeyManagementMaxGroupsPerFabric : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric : public ModelCommand { @@ -30455,6 +32926,7 @@ class SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric : public ModelComma AddArgument("attr-name", "max-groups-per-fabric"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -30469,6 +32941,7 @@ class SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxGroupsPerFabricWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -30490,6 +32963,7 @@ class SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -30504,6 +32978,7 @@ class ReadGroupKeyManagementMaxGroupKeysPerFabric : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-group-keys-per-fabric"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -30527,6 +33002,9 @@ class ReadGroupKeyManagementMaxGroupKeysPerFabric : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric : public ModelCommand { @@ -30537,6 +33015,7 @@ class SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric : public ModelCo AddArgument("attr-name", "max-group-keys-per-fabric"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -30551,6 +33030,7 @@ class SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxGroupKeysPerFabricWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -30572,6 +33052,7 @@ class SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -30586,6 +33067,7 @@ class ReadGroupKeyManagementGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -30609,6 +33091,9 @@ class ReadGroupKeyManagementGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGroupKeyManagementGeneratedCommandList : public ModelCommand { @@ -30619,6 +33104,7 @@ class SubscribeAttributeGroupKeyManagementGeneratedCommandList : public ModelCom AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -30633,6 +33119,7 @@ class SubscribeAttributeGroupKeyManagementGeneratedCommandList : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -30654,6 +33141,7 @@ class SubscribeAttributeGroupKeyManagementGeneratedCommandList : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -30668,6 +33156,7 @@ class ReadGroupKeyManagementAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -30691,6 +33180,9 @@ class ReadGroupKeyManagementAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGroupKeyManagementAcceptedCommandList : public ModelCommand { @@ -30701,6 +33193,7 @@ class SubscribeAttributeGroupKeyManagementAcceptedCommandList : public ModelComm AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -30715,6 +33208,7 @@ class SubscribeAttributeGroupKeyManagementAcceptedCommandList : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -30736,6 +33230,7 @@ class SubscribeAttributeGroupKeyManagementAcceptedCommandList : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -30750,6 +33245,7 @@ class ReadGroupKeyManagementAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -30773,6 +33269,9 @@ class ReadGroupKeyManagementAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGroupKeyManagementAttributeList : public ModelCommand { @@ -30783,6 +33282,7 @@ class SubscribeAttributeGroupKeyManagementAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -30797,6 +33297,7 @@ class SubscribeAttributeGroupKeyManagementAttributeList : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -30817,6 +33318,7 @@ class SubscribeAttributeGroupKeyManagementAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -30831,6 +33333,7 @@ class ReadGroupKeyManagementClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -30854,6 +33357,9 @@ class ReadGroupKeyManagementClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGroupKeyManagementClusterRevision : public ModelCommand { @@ -30864,6 +33370,7 @@ class SubscribeAttributeGroupKeyManagementClusterRevision : public ModelCommand AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -30878,6 +33385,7 @@ class SubscribeAttributeGroupKeyManagementClusterRevision : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -30899,6 +33407,7 @@ class SubscribeAttributeGroupKeyManagementClusterRevision : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -30936,6 +33445,7 @@ class GroupsAddGroup : public ModelCommand { { AddArgument("GroupId", 0, UINT16_MAX, &mGroupId); AddArgument("GroupName", &mGroupName); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -30947,9 +33457,9 @@ class GroupsAddGroup : public ModelCommand { CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPGroupsClusterAddGroupParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.groupId = [NSNumber numberWithUnsignedShort:mGroupId]; - params.groupName = [[NSString alloc] initWithBytes:mGroupName.data() length:mGroupName.size() encoding:NSUTF8StringEncoding]; @@ -30964,6 +33474,7 @@ class GroupsAddGroup : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::GroupId mGroupId; chip::ByteSpan mGroupName; }; @@ -30978,6 +33489,7 @@ class GroupsAddGroupIfIdentifying : public ModelCommand { { AddArgument("GroupId", 0, UINT16_MAX, &mGroupId); AddArgument("GroupName", &mGroupName); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -30989,9 +33501,9 @@ class GroupsAddGroupIfIdentifying : public ModelCommand { CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPGroupsClusterAddGroupIfIdentifyingParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.groupId = [NSNumber numberWithUnsignedShort:mGroupId]; - params.groupName = [[NSString alloc] initWithBytes:mGroupName.data() length:mGroupName.size() encoding:NSUTF8StringEncoding]; @@ -31005,6 +33517,7 @@ class GroupsAddGroupIfIdentifying : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::GroupId mGroupId; chip::ByteSpan mGroupName; }; @@ -31019,6 +33532,7 @@ class GroupsGetGroupMembership : public ModelCommand { , mComplex_GroupList(&mRequest.groupList) { AddArgument("GroupList", &mComplex_GroupList); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -31030,7 +33544,8 @@ class GroupsGetGroupMembership : public ModelCommand { CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPGroupsClusterGetGroupMembershipParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; for (auto & entry_0 : mRequest.groupList) { @@ -31052,6 +33567,7 @@ class GroupsGetGroupMembership : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::Groups::Commands::GetGroupMembership::Type mRequest; TypedComplexArgument> mComplex_GroupList; }; @@ -31064,6 +33580,7 @@ class GroupsRemoveAllGroups : public ModelCommand { GroupsRemoveAllGroups() : ModelCommand("remove-all-groups") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -31074,6 +33591,9 @@ class GroupsRemoveAllGroups : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPGroupsClusterRemoveAllGroupsParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster removeAllGroupsWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -31083,6 +33603,7 @@ class GroupsRemoveAllGroups : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -31094,6 +33615,7 @@ class GroupsRemoveGroup : public ModelCommand { : ModelCommand("remove-group") { AddArgument("GroupId", 0, UINT16_MAX, &mGroupId); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -31105,7 +33627,8 @@ class GroupsRemoveGroup : public ModelCommand { CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPGroupsClusterRemoveGroupParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.groupId = [NSNumber numberWithUnsignedShort:mGroupId]; [cluster removeGroupWithParams:params completionHandler:^(CHIPGroupsClusterRemoveGroupResponseParams * _Nullable values, NSError * _Nullable error) { @@ -31118,6 +33641,7 @@ class GroupsRemoveGroup : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::GroupId mGroupId; }; @@ -31130,6 +33654,7 @@ class GroupsViewGroup : public ModelCommand { : ModelCommand("view-group") { AddArgument("GroupId", 0, UINT16_MAX, &mGroupId); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -31141,7 +33666,8 @@ class GroupsViewGroup : public ModelCommand { CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPGroupsClusterViewGroupParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.groupId = [NSNumber numberWithUnsignedShort:mGroupId]; [cluster viewGroupWithParams:params completionHandler:^(CHIPGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable error) { @@ -31154,6 +33680,7 @@ class GroupsViewGroup : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::GroupId mGroupId; }; @@ -31166,6 +33693,7 @@ class ReadGroupsNameSupport : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "name-support"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -31187,6 +33715,9 @@ class ReadGroupsNameSupport : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGroupsNameSupport : public ModelCommand { @@ -31197,6 +33728,7 @@ class SubscribeAttributeGroupsNameSupport : public ModelCommand { AddArgument("attr-name", "name-support"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -31209,6 +33741,7 @@ class SubscribeAttributeGroupsNameSupport : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNameSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -31229,6 +33762,7 @@ class SubscribeAttributeGroupsNameSupport : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -31243,6 +33777,7 @@ class ReadGroupsGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -31264,6 +33799,9 @@ class ReadGroupsGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGroupsGeneratedCommandList : public ModelCommand { @@ -31274,6 +33812,7 @@ class SubscribeAttributeGroupsGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -31286,6 +33825,7 @@ class SubscribeAttributeGroupsGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -31306,6 +33846,7 @@ class SubscribeAttributeGroupsGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -31320,6 +33861,7 @@ class ReadGroupsAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -31341,6 +33883,9 @@ class ReadGroupsAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGroupsAcceptedCommandList : public ModelCommand { @@ -31351,6 +33896,7 @@ class SubscribeAttributeGroupsAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -31363,6 +33909,7 @@ class SubscribeAttributeGroupsAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -31383,6 +33930,7 @@ class SubscribeAttributeGroupsAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -31397,6 +33945,7 @@ class ReadGroupsAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -31418,6 +33967,9 @@ class ReadGroupsAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGroupsAttributeList : public ModelCommand { @@ -31428,6 +33980,7 @@ class SubscribeAttributeGroupsAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -31440,6 +33993,7 @@ class SubscribeAttributeGroupsAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -31460,6 +34014,7 @@ class SubscribeAttributeGroupsAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -31474,6 +34029,7 @@ class ReadGroupsClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -31495,6 +34051,9 @@ class ReadGroupsClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeGroupsClusterRevision : public ModelCommand { @@ -31505,6 +34064,7 @@ class SubscribeAttributeGroupsClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -31517,6 +34077,7 @@ class SubscribeAttributeGroupsClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPGroups * cluster = [[CHIPGroups alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -31537,6 +34098,7 @@ class SubscribeAttributeGroupsClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -31571,6 +34133,7 @@ class IdentifyIdentify : public ModelCommand { : ModelCommand("identify") { AddArgument("IdentifyTime", 0, UINT16_MAX, &mIdentifyTime); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -31582,7 +34145,8 @@ class IdentifyIdentify : public ModelCommand { CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPIdentifyClusterIdentifyParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.identifyTime = [NSNumber numberWithUnsignedShort:mIdentifyTime]; [cluster identifyWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -31594,6 +34158,7 @@ class IdentifyIdentify : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mIdentifyTime; }; @@ -31605,6 +34170,7 @@ class IdentifyIdentifyQuery : public ModelCommand { IdentifyIdentifyQuery() : ModelCommand("identify-query") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -31615,6 +34181,9 @@ class IdentifyIdentifyQuery : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPIdentifyClusterIdentifyQueryParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster identifyQueryWithCompletionHandler:^( CHIPIdentifyClusterIdentifyQueryResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); @@ -31626,6 +34195,7 @@ class IdentifyIdentifyQuery : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -31638,6 +34208,7 @@ class IdentifyTriggerEffect : public ModelCommand { { AddArgument("EffectIdentifier", 0, UINT8_MAX, &mEffectIdentifier); AddArgument("EffectVariant", 0, UINT8_MAX, &mEffectVariant); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -31649,9 +34220,9 @@ class IdentifyTriggerEffect : public ModelCommand { CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPIdentifyClusterTriggerEffectParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.effectIdentifier = [NSNumber numberWithUnsignedChar:mEffectIdentifier]; - params.effectVariant = [NSNumber numberWithUnsignedChar:mEffectVariant]; [cluster triggerEffectWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -31663,6 +34234,7 @@ class IdentifyTriggerEffect : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mEffectIdentifier; uint8_t mEffectVariant; }; @@ -31676,6 +34248,7 @@ class ReadIdentifyIdentifyTime : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "identify-time"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -31697,6 +34270,9 @@ class ReadIdentifyIdentifyTime : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteIdentifyIdentifyTime : public ModelCommand { @@ -31706,6 +34282,7 @@ class WriteIdentifyIdentifyTime : public ModelCommand { { AddArgument("attr-name", "identify-time"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -31717,10 +34294,13 @@ class WriteIdentifyIdentifyTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeIdentifyTimeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "Identify IdentifyTime Error: %s", chip::ErrorStr(chipError)); @@ -31730,6 +34310,7 @@ class WriteIdentifyIdentifyTime : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -31741,6 +34322,7 @@ class SubscribeAttributeIdentifyIdentifyTime : public ModelCommand { AddArgument("attr-name", "identify-time"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -31753,6 +34335,7 @@ class SubscribeAttributeIdentifyIdentifyTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeIdentifyTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -31773,6 +34356,7 @@ class SubscribeAttributeIdentifyIdentifyTime : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -31787,6 +34371,7 @@ class ReadIdentifyIdentifyType : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "identify-type"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -31808,6 +34393,9 @@ class ReadIdentifyIdentifyType : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeIdentifyIdentifyType : public ModelCommand { @@ -31818,6 +34406,7 @@ class SubscribeAttributeIdentifyIdentifyType : public ModelCommand { AddArgument("attr-name", "identify-type"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -31830,6 +34419,7 @@ class SubscribeAttributeIdentifyIdentifyType : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeIdentifyTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -31850,6 +34440,7 @@ class SubscribeAttributeIdentifyIdentifyType : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -31864,6 +34455,7 @@ class ReadIdentifyGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -31885,6 +34477,9 @@ class ReadIdentifyGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeIdentifyGeneratedCommandList : public ModelCommand { @@ -31895,6 +34490,7 @@ class SubscribeAttributeIdentifyGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -31907,6 +34503,7 @@ class SubscribeAttributeIdentifyGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -31928,6 +34525,7 @@ class SubscribeAttributeIdentifyGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -31942,6 +34540,7 @@ class ReadIdentifyAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -31963,6 +34562,9 @@ class ReadIdentifyAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeIdentifyAcceptedCommandList : public ModelCommand { @@ -31973,6 +34575,7 @@ class SubscribeAttributeIdentifyAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -31985,6 +34588,7 @@ class SubscribeAttributeIdentifyAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -32005,6 +34609,7 @@ class SubscribeAttributeIdentifyAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -32019,6 +34624,7 @@ class ReadIdentifyAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -32040,6 +34646,9 @@ class ReadIdentifyAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeIdentifyAttributeList : public ModelCommand { @@ -32050,6 +34659,7 @@ class SubscribeAttributeIdentifyAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -32062,6 +34672,7 @@ class SubscribeAttributeIdentifyAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -32082,6 +34693,7 @@ class SubscribeAttributeIdentifyAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -32096,6 +34708,7 @@ class ReadIdentifyClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -32117,6 +34730,9 @@ class ReadIdentifyClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeIdentifyClusterRevision : public ModelCommand { @@ -32127,6 +34743,7 @@ class SubscribeAttributeIdentifyClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -32139,6 +34756,7 @@ class SubscribeAttributeIdentifyClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -32159,6 +34777,7 @@ class SubscribeAttributeIdentifyClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -32193,6 +34812,7 @@ class ReadIlluminanceMeasurementMeasuredValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "measured-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -32216,6 +34836,9 @@ class ReadIlluminanceMeasurementMeasuredValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeIlluminanceMeasurementMeasuredValue : public ModelCommand { @@ -32226,6 +34849,7 @@ class SubscribeAttributeIlluminanceMeasurementMeasuredValue : public ModelComman AddArgument("attr-name", "measured-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -32240,6 +34864,7 @@ class SubscribeAttributeIlluminanceMeasurementMeasuredValue : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -32261,6 +34886,7 @@ class SubscribeAttributeIlluminanceMeasurementMeasuredValue : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -32275,6 +34901,7 @@ class ReadIlluminanceMeasurementMinMeasuredValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-measured-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -32298,6 +34925,9 @@ class ReadIlluminanceMeasurementMinMeasuredValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeIlluminanceMeasurementMinMeasuredValue : public ModelCommand { @@ -32308,6 +34938,7 @@ class SubscribeAttributeIlluminanceMeasurementMinMeasuredValue : public ModelCom AddArgument("attr-name", "min-measured-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -32322,6 +34953,7 @@ class SubscribeAttributeIlluminanceMeasurementMinMeasuredValue : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -32343,6 +34975,7 @@ class SubscribeAttributeIlluminanceMeasurementMinMeasuredValue : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -32357,6 +34990,7 @@ class ReadIlluminanceMeasurementMaxMeasuredValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-measured-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -32380,6 +35014,9 @@ class ReadIlluminanceMeasurementMaxMeasuredValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeIlluminanceMeasurementMaxMeasuredValue : public ModelCommand { @@ -32390,6 +35027,7 @@ class SubscribeAttributeIlluminanceMeasurementMaxMeasuredValue : public ModelCom AddArgument("attr-name", "max-measured-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -32404,6 +35042,7 @@ class SubscribeAttributeIlluminanceMeasurementMaxMeasuredValue : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -32425,6 +35064,7 @@ class SubscribeAttributeIlluminanceMeasurementMaxMeasuredValue : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -32439,6 +35079,7 @@ class ReadIlluminanceMeasurementTolerance : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tolerance"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -32462,6 +35103,9 @@ class ReadIlluminanceMeasurementTolerance : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeIlluminanceMeasurementTolerance : public ModelCommand { @@ -32472,6 +35116,7 @@ class SubscribeAttributeIlluminanceMeasurementTolerance : public ModelCommand { AddArgument("attr-name", "tolerance"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -32486,6 +35131,7 @@ class SubscribeAttributeIlluminanceMeasurementTolerance : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -32506,6 +35152,7 @@ class SubscribeAttributeIlluminanceMeasurementTolerance : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -32520,6 +35167,7 @@ class ReadIlluminanceMeasurementLightSensorType : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "light-sensor-type"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -32543,6 +35191,9 @@ class ReadIlluminanceMeasurementLightSensorType : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeIlluminanceMeasurementLightSensorType : public ModelCommand { @@ -32553,6 +35204,7 @@ class SubscribeAttributeIlluminanceMeasurementLightSensorType : public ModelComm AddArgument("attr-name", "light-sensor-type"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -32567,6 +35219,7 @@ class SubscribeAttributeIlluminanceMeasurementLightSensorType : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLightSensorTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -32588,6 +35241,7 @@ class SubscribeAttributeIlluminanceMeasurementLightSensorType : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -32602,6 +35256,7 @@ class ReadIlluminanceMeasurementGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -32625,6 +35280,9 @@ class ReadIlluminanceMeasurementGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeIlluminanceMeasurementGeneratedCommandList : public ModelCommand { @@ -32635,6 +35293,7 @@ class SubscribeAttributeIlluminanceMeasurementGeneratedCommandList : public Mode AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -32649,6 +35308,7 @@ class SubscribeAttributeIlluminanceMeasurementGeneratedCommandList : public Mode endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -32670,6 +35330,7 @@ class SubscribeAttributeIlluminanceMeasurementGeneratedCommandList : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -32684,6 +35345,7 @@ class ReadIlluminanceMeasurementAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -32707,6 +35369,9 @@ class ReadIlluminanceMeasurementAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeIlluminanceMeasurementAcceptedCommandList : public ModelCommand { @@ -32717,6 +35382,7 @@ class SubscribeAttributeIlluminanceMeasurementAcceptedCommandList : public Model AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -32731,6 +35397,7 @@ class SubscribeAttributeIlluminanceMeasurementAcceptedCommandList : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -32752,6 +35419,7 @@ class SubscribeAttributeIlluminanceMeasurementAcceptedCommandList : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -32766,6 +35434,7 @@ class ReadIlluminanceMeasurementAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -32789,6 +35458,9 @@ class ReadIlluminanceMeasurementAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeIlluminanceMeasurementAttributeList : public ModelCommand { @@ -32799,6 +35471,7 @@ class SubscribeAttributeIlluminanceMeasurementAttributeList : public ModelComman AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -32813,6 +35486,7 @@ class SubscribeAttributeIlluminanceMeasurementAttributeList : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -32834,6 +35508,7 @@ class SubscribeAttributeIlluminanceMeasurementAttributeList : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -32848,6 +35523,7 @@ class ReadIlluminanceMeasurementClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -32871,6 +35547,9 @@ class ReadIlluminanceMeasurementClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeIlluminanceMeasurementClusterRevision : public ModelCommand { @@ -32881,6 +35560,7 @@ class SubscribeAttributeIlluminanceMeasurementClusterRevision : public ModelComm AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -32895,6 +35575,7 @@ class SubscribeAttributeIlluminanceMeasurementClusterRevision : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -32916,6 +35597,7 @@ class SubscribeAttributeIlluminanceMeasurementClusterRevision : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -32946,6 +35628,7 @@ class KeypadInputSendKey : public ModelCommand { : ModelCommand("send-key") { AddArgument("KeyCode", 0, UINT8_MAX, &mKeyCode); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -32957,7 +35640,8 @@ class KeypadInputSendKey : public ModelCommand { CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPKeypadInputClusterSendKeyParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.keyCode = [NSNumber numberWithUnsignedChar:mKeyCode]; [cluster sendKeyWithParams:params completionHandler:^(CHIPKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable error) { @@ -32970,6 +35654,7 @@ class KeypadInputSendKey : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mKeyCode; }; @@ -32982,6 +35667,7 @@ class ReadKeypadInputGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -33003,6 +35689,9 @@ class ReadKeypadInputGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeKeypadInputGeneratedCommandList : public ModelCommand { @@ -33013,6 +35702,7 @@ class SubscribeAttributeKeypadInputGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -33025,6 +35715,7 @@ class SubscribeAttributeKeypadInputGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -33046,6 +35737,7 @@ class SubscribeAttributeKeypadInputGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -33060,6 +35752,7 @@ class ReadKeypadInputAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -33081,6 +35774,9 @@ class ReadKeypadInputAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeKeypadInputAcceptedCommandList : public ModelCommand { @@ -33091,6 +35787,7 @@ class SubscribeAttributeKeypadInputAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -33103,6 +35800,7 @@ class SubscribeAttributeKeypadInputAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -33124,6 +35822,7 @@ class SubscribeAttributeKeypadInputAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -33138,6 +35837,7 @@ class ReadKeypadInputAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -33159,6 +35859,9 @@ class ReadKeypadInputAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeKeypadInputAttributeList : public ModelCommand { @@ -33169,6 +35872,7 @@ class SubscribeAttributeKeypadInputAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -33181,6 +35885,7 @@ class SubscribeAttributeKeypadInputAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -33201,6 +35906,7 @@ class SubscribeAttributeKeypadInputAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -33215,6 +35921,7 @@ class ReadKeypadInputClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -33236,6 +35943,9 @@ class ReadKeypadInputClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeKeypadInputClusterRevision : public ModelCommand { @@ -33246,6 +35956,7 @@ class SubscribeAttributeKeypadInputClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -33258,6 +35969,7 @@ class SubscribeAttributeKeypadInputClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPKeypadInput * cluster = [[CHIPKeypadInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -33278,6 +35990,7 @@ class SubscribeAttributeKeypadInputClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -33332,6 +36045,7 @@ class LevelControlMove : public ModelCommand { AddArgument("Rate", 0, UINT8_MAX, &mRate); AddArgument("OptionMask", 0, UINT8_MAX, &mOptionMask); AddArgument("OptionOverride", 0, UINT8_MAX, &mOptionOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -33343,13 +36057,11 @@ class LevelControlMove : public ModelCommand { CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPLevelControlClusterMoveParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.moveMode = [NSNumber numberWithUnsignedChar:mMoveMode]; - params.rate = [NSNumber numberWithUnsignedChar:mRate]; - params.optionMask = [NSNumber numberWithUnsignedChar:mOptionMask]; - params.optionOverride = [NSNumber numberWithUnsignedChar:mOptionOverride]; [cluster moveWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -33361,6 +36073,7 @@ class LevelControlMove : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mMoveMode; uint8_t mRate; uint8_t mOptionMask; @@ -33379,6 +36092,7 @@ class LevelControlMoveToLevel : public ModelCommand { AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); AddArgument("OptionMask", 0, UINT8_MAX, &mOptionMask); AddArgument("OptionOverride", 0, UINT8_MAX, &mOptionOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -33390,13 +36104,11 @@ class LevelControlMoveToLevel : public ModelCommand { CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPLevelControlClusterMoveToLevelParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.level = [NSNumber numberWithUnsignedChar:mLevel]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; - params.optionMask = [NSNumber numberWithUnsignedChar:mOptionMask]; - params.optionOverride = [NSNumber numberWithUnsignedChar:mOptionOverride]; [cluster moveToLevelWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -33408,6 +36120,7 @@ class LevelControlMoveToLevel : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mLevel; uint16_t mTransitionTime; uint8_t mOptionMask; @@ -33424,6 +36137,7 @@ class LevelControlMoveToLevelWithOnOff : public ModelCommand { { AddArgument("Level", 0, UINT8_MAX, &mLevel); AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -33435,9 +36149,9 @@ class LevelControlMoveToLevelWithOnOff : public ModelCommand { CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPLevelControlClusterMoveToLevelWithOnOffParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.level = [NSNumber numberWithUnsignedChar:mLevel]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; [cluster moveToLevelWithOnOffWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -33449,6 +36163,7 @@ class LevelControlMoveToLevelWithOnOff : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mLevel; uint16_t mTransitionTime; }; @@ -33463,6 +36178,7 @@ class LevelControlMoveWithOnOff : public ModelCommand { { AddArgument("MoveMode", 0, UINT8_MAX, &mMoveMode); AddArgument("Rate", 0, UINT8_MAX, &mRate); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -33474,9 +36190,9 @@ class LevelControlMoveWithOnOff : public ModelCommand { CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPLevelControlClusterMoveWithOnOffParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.moveMode = [NSNumber numberWithUnsignedChar:mMoveMode]; - params.rate = [NSNumber numberWithUnsignedChar:mRate]; [cluster moveWithOnOffWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -33488,6 +36204,7 @@ class LevelControlMoveWithOnOff : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mMoveMode; uint8_t mRate; }; @@ -33505,6 +36222,7 @@ class LevelControlStep : public ModelCommand { AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); AddArgument("OptionMask", 0, UINT8_MAX, &mOptionMask); AddArgument("OptionOverride", 0, UINT8_MAX, &mOptionOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -33516,15 +36234,12 @@ class LevelControlStep : public ModelCommand { CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPLevelControlClusterStepParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.stepMode = [NSNumber numberWithUnsignedChar:mStepMode]; - params.stepSize = [NSNumber numberWithUnsignedChar:mStepSize]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; - params.optionMask = [NSNumber numberWithUnsignedChar:mOptionMask]; - params.optionOverride = [NSNumber numberWithUnsignedChar:mOptionOverride]; [cluster stepWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -33536,6 +36251,7 @@ class LevelControlStep : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mStepMode; uint8_t mStepSize; uint16_t mTransitionTime; @@ -33554,6 +36270,7 @@ class LevelControlStepWithOnOff : public ModelCommand { AddArgument("StepMode", 0, UINT8_MAX, &mStepMode); AddArgument("StepSize", 0, UINT8_MAX, &mStepSize); AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -33565,11 +36282,10 @@ class LevelControlStepWithOnOff : public ModelCommand { CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPLevelControlClusterStepWithOnOffParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.stepMode = [NSNumber numberWithUnsignedChar:mStepMode]; - params.stepSize = [NSNumber numberWithUnsignedChar:mStepSize]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; [cluster stepWithOnOffWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -33581,6 +36297,7 @@ class LevelControlStepWithOnOff : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mStepMode; uint8_t mStepSize; uint16_t mTransitionTime; @@ -33596,6 +36313,7 @@ class LevelControlStop : public ModelCommand { { AddArgument("OptionMask", 0, UINT8_MAX, &mOptionMask); AddArgument("OptionOverride", 0, UINT8_MAX, &mOptionOverride); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -33607,9 +36325,9 @@ class LevelControlStop : public ModelCommand { CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPLevelControlClusterStopParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.optionMask = [NSNumber numberWithUnsignedChar:mOptionMask]; - params.optionOverride = [NSNumber numberWithUnsignedChar:mOptionOverride]; [cluster stopWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -33621,6 +36339,7 @@ class LevelControlStop : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mOptionMask; uint8_t mOptionOverride; }; @@ -33633,6 +36352,7 @@ class LevelControlStopWithOnOff : public ModelCommand { LevelControlStopWithOnOff() : ModelCommand("stop-with-on-off") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -33643,6 +36363,9 @@ class LevelControlStopWithOnOff : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPLevelControlClusterStopWithOnOffParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster stopWithOnOffWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -33652,6 +36375,7 @@ class LevelControlStopWithOnOff : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -33663,6 +36387,7 @@ class ReadLevelControlCurrentLevel : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-level"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -33684,6 +36409,9 @@ class ReadLevelControlCurrentLevel : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLevelControlCurrentLevel : public ModelCommand { @@ -33694,6 +36422,7 @@ class SubscribeAttributeLevelControlCurrentLevel : public ModelCommand { AddArgument("attr-name", "current-level"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -33706,6 +36435,7 @@ class SubscribeAttributeLevelControlCurrentLevel : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -33726,6 +36456,7 @@ class SubscribeAttributeLevelControlCurrentLevel : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -33740,6 +36471,7 @@ class ReadLevelControlRemainingTime : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "remaining-time"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -33761,6 +36493,9 @@ class ReadLevelControlRemainingTime : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLevelControlRemainingTime : public ModelCommand { @@ -33771,6 +36506,7 @@ class SubscribeAttributeLevelControlRemainingTime : public ModelCommand { AddArgument("attr-name", "remaining-time"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -33783,6 +36519,7 @@ class SubscribeAttributeLevelControlRemainingTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRemainingTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -33803,6 +36540,7 @@ class SubscribeAttributeLevelControlRemainingTime : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -33817,6 +36555,7 @@ class ReadLevelControlMinLevel : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-level"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -33838,6 +36577,9 @@ class ReadLevelControlMinLevel : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLevelControlMinLevel : public ModelCommand { @@ -33848,6 +36590,7 @@ class SubscribeAttributeLevelControlMinLevel : public ModelCommand { AddArgument("attr-name", "min-level"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -33860,6 +36603,7 @@ class SubscribeAttributeLevelControlMinLevel : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -33880,6 +36624,7 @@ class SubscribeAttributeLevelControlMinLevel : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -33894,6 +36639,7 @@ class ReadLevelControlMaxLevel : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-level"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -33915,6 +36661,9 @@ class ReadLevelControlMaxLevel : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLevelControlMaxLevel : public ModelCommand { @@ -33925,6 +36674,7 @@ class SubscribeAttributeLevelControlMaxLevel : public ModelCommand { AddArgument("attr-name", "max-level"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -33937,6 +36687,7 @@ class SubscribeAttributeLevelControlMaxLevel : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -33957,6 +36708,7 @@ class SubscribeAttributeLevelControlMaxLevel : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -33971,6 +36723,7 @@ class ReadLevelControlCurrentFrequency : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-frequency"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -33992,6 +36745,9 @@ class ReadLevelControlCurrentFrequency : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLevelControlCurrentFrequency : public ModelCommand { @@ -34002,6 +36758,7 @@ class SubscribeAttributeLevelControlCurrentFrequency : public ModelCommand { AddArgument("attr-name", "current-frequency"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -34014,6 +36771,7 @@ class SubscribeAttributeLevelControlCurrentFrequency : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -34034,6 +36792,7 @@ class SubscribeAttributeLevelControlCurrentFrequency : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -34048,6 +36807,7 @@ class ReadLevelControlMinFrequency : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-frequency"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -34069,6 +36829,9 @@ class ReadLevelControlMinFrequency : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLevelControlMinFrequency : public ModelCommand { @@ -34079,6 +36842,7 @@ class SubscribeAttributeLevelControlMinFrequency : public ModelCommand { AddArgument("attr-name", "min-frequency"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -34091,6 +36855,7 @@ class SubscribeAttributeLevelControlMinFrequency : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -34111,6 +36876,7 @@ class SubscribeAttributeLevelControlMinFrequency : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -34125,6 +36891,7 @@ class ReadLevelControlMaxFrequency : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-frequency"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -34146,6 +36913,9 @@ class ReadLevelControlMaxFrequency : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLevelControlMaxFrequency : public ModelCommand { @@ -34156,6 +36926,7 @@ class SubscribeAttributeLevelControlMaxFrequency : public ModelCommand { AddArgument("attr-name", "max-frequency"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -34168,6 +36939,7 @@ class SubscribeAttributeLevelControlMaxFrequency : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxFrequencyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -34188,6 +36960,7 @@ class SubscribeAttributeLevelControlMaxFrequency : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -34202,6 +36975,7 @@ class ReadLevelControlOptions : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "options"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -34223,6 +36997,9 @@ class ReadLevelControlOptions : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteLevelControlOptions : public ModelCommand { @@ -34232,6 +37009,7 @@ class WriteLevelControlOptions : public ModelCommand { { AddArgument("attr-name", "options"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -34243,10 +37021,13 @@ class WriteLevelControlOptions : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeOptionsWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "LevelControl Options Error: %s", chip::ErrorStr(chipError)); @@ -34256,6 +37037,7 @@ class WriteLevelControlOptions : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -34267,6 +37049,7 @@ class SubscribeAttributeLevelControlOptions : public ModelCommand { AddArgument("attr-name", "options"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -34279,6 +37062,7 @@ class SubscribeAttributeLevelControlOptions : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOptionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -34299,6 +37083,7 @@ class SubscribeAttributeLevelControlOptions : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -34313,6 +37098,7 @@ class ReadLevelControlOnOffTransitionTime : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "on-off-transition-time"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -34334,6 +37120,9 @@ class ReadLevelControlOnOffTransitionTime : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteLevelControlOnOffTransitionTime : public ModelCommand { @@ -34343,6 +37132,7 @@ class WriteLevelControlOnOffTransitionTime : public ModelCommand { { AddArgument("attr-name", "on-off-transition-time"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -34354,10 +37144,13 @@ class WriteLevelControlOnOffTransitionTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeOnOffTransitionTimeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "LevelControl OnOffTransitionTime Error: %s", @@ -34368,6 +37161,7 @@ class WriteLevelControlOnOffTransitionTime : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -34379,6 +37173,7 @@ class SubscribeAttributeLevelControlOnOffTransitionTime : public ModelCommand { AddArgument("attr-name", "on-off-transition-time"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -34391,6 +37186,7 @@ class SubscribeAttributeLevelControlOnOffTransitionTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOnOffTransitionTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -34412,6 +37208,7 @@ class SubscribeAttributeLevelControlOnOffTransitionTime : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -34426,6 +37223,7 @@ class ReadLevelControlOnLevel : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "on-level"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -34447,6 +37245,9 @@ class ReadLevelControlOnLevel : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteLevelControlOnLevel : public ModelCommand { @@ -34456,6 +37257,7 @@ class WriteLevelControlOnLevel : public ModelCommand { { AddArgument("attr-name", "on-level"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -34467,10 +37269,13 @@ class WriteLevelControlOnLevel : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeOnLevelWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "LevelControl OnLevel Error: %s", chip::ErrorStr(chipError)); @@ -34480,6 +37285,7 @@ class WriteLevelControlOnLevel : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -34491,6 +37297,7 @@ class SubscribeAttributeLevelControlOnLevel : public ModelCommand { AddArgument("attr-name", "on-level"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -34503,6 +37310,7 @@ class SubscribeAttributeLevelControlOnLevel : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOnLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -34523,6 +37331,7 @@ class SubscribeAttributeLevelControlOnLevel : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -34537,6 +37346,7 @@ class ReadLevelControlOnTransitionTime : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "on-transition-time"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -34558,6 +37368,9 @@ class ReadLevelControlOnTransitionTime : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteLevelControlOnTransitionTime : public ModelCommand { @@ -34567,6 +37380,7 @@ class WriteLevelControlOnTransitionTime : public ModelCommand { { AddArgument("attr-name", "on-transition-time"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -34578,11 +37392,14 @@ class WriteLevelControlOnTransitionTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeOnTransitionTimeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "LevelControl OnTransitionTime Error: %s", chip::ErrorStr(chipError)); @@ -34592,6 +37409,7 @@ class WriteLevelControlOnTransitionTime : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -34603,6 +37421,7 @@ class SubscribeAttributeLevelControlOnTransitionTime : public ModelCommand { AddArgument("attr-name", "on-transition-time"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -34615,6 +37434,7 @@ class SubscribeAttributeLevelControlOnTransitionTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOnTransitionTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -34635,6 +37455,7 @@ class SubscribeAttributeLevelControlOnTransitionTime : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -34649,6 +37470,7 @@ class ReadLevelControlOffTransitionTime : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "off-transition-time"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -34670,6 +37492,9 @@ class ReadLevelControlOffTransitionTime : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteLevelControlOffTransitionTime : public ModelCommand { @@ -34679,6 +37504,7 @@ class WriteLevelControlOffTransitionTime : public ModelCommand { { AddArgument("attr-name", "off-transition-time"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -34690,10 +37516,13 @@ class WriteLevelControlOffTransitionTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeOffTransitionTimeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError( @@ -34704,6 +37533,7 @@ class WriteLevelControlOffTransitionTime : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -34715,6 +37545,7 @@ class SubscribeAttributeLevelControlOffTransitionTime : public ModelCommand { AddArgument("attr-name", "off-transition-time"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -34727,6 +37558,7 @@ class SubscribeAttributeLevelControlOffTransitionTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOffTransitionTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -34747,6 +37579,7 @@ class SubscribeAttributeLevelControlOffTransitionTime : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -34761,6 +37594,7 @@ class ReadLevelControlDefaultMoveRate : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "default-move-rate"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -34782,6 +37616,9 @@ class ReadLevelControlDefaultMoveRate : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteLevelControlDefaultMoveRate : public ModelCommand { @@ -34791,6 +37628,7 @@ class WriteLevelControlDefaultMoveRate : public ModelCommand { { AddArgument("attr-name", "default-move-rate"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -34802,11 +37640,14 @@ class WriteLevelControlDefaultMoveRate : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeDefaultMoveRateWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "LevelControl DefaultMoveRate Error: %s", chip::ErrorStr(chipError)); @@ -34816,6 +37657,7 @@ class WriteLevelControlDefaultMoveRate : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -34827,6 +37669,7 @@ class SubscribeAttributeLevelControlDefaultMoveRate : public ModelCommand { AddArgument("attr-name", "default-move-rate"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -34839,6 +37682,7 @@ class SubscribeAttributeLevelControlDefaultMoveRate : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeDefaultMoveRateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -34859,6 +37703,7 @@ class SubscribeAttributeLevelControlDefaultMoveRate : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -34873,6 +37718,7 @@ class ReadLevelControlStartUpCurrentLevel : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "start-up-current-level"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -34894,6 +37740,9 @@ class ReadLevelControlStartUpCurrentLevel : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteLevelControlStartUpCurrentLevel : public ModelCommand { @@ -34903,6 +37752,7 @@ class WriteLevelControlStartUpCurrentLevel : public ModelCommand { { AddArgument("attr-name", "start-up-current-level"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -34914,10 +37764,13 @@ class WriteLevelControlStartUpCurrentLevel : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeStartUpCurrentLevelWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "LevelControl StartUpCurrentLevel Error: %s", @@ -34928,6 +37781,7 @@ class WriteLevelControlStartUpCurrentLevel : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -34939,6 +37793,7 @@ class SubscribeAttributeLevelControlStartUpCurrentLevel : public ModelCommand { AddArgument("attr-name", "start-up-current-level"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -34951,6 +37806,7 @@ class SubscribeAttributeLevelControlStartUpCurrentLevel : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeStartUpCurrentLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -34972,6 +37828,7 @@ class SubscribeAttributeLevelControlStartUpCurrentLevel : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -34986,6 +37843,7 @@ class ReadLevelControlGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -35007,6 +37865,9 @@ class ReadLevelControlGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLevelControlGeneratedCommandList : public ModelCommand { @@ -35017,6 +37878,7 @@ class SubscribeAttributeLevelControlGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -35029,6 +37891,7 @@ class SubscribeAttributeLevelControlGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -35050,6 +37913,7 @@ class SubscribeAttributeLevelControlGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -35064,6 +37928,7 @@ class ReadLevelControlAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -35085,6 +37950,9 @@ class ReadLevelControlAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLevelControlAcceptedCommandList : public ModelCommand { @@ -35095,6 +37963,7 @@ class SubscribeAttributeLevelControlAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -35107,6 +37976,7 @@ class SubscribeAttributeLevelControlAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -35128,6 +37998,7 @@ class SubscribeAttributeLevelControlAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -35142,6 +38013,7 @@ class ReadLevelControlAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -35163,6 +38035,9 @@ class ReadLevelControlAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLevelControlAttributeList : public ModelCommand { @@ -35173,6 +38048,7 @@ class SubscribeAttributeLevelControlAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -35185,6 +38061,7 @@ class SubscribeAttributeLevelControlAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -35205,6 +38082,7 @@ class SubscribeAttributeLevelControlAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -35219,6 +38097,7 @@ class ReadLevelControlFeatureMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "feature-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -35240,6 +38119,9 @@ class ReadLevelControlFeatureMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLevelControlFeatureMap : public ModelCommand { @@ -35250,6 +38132,7 @@ class SubscribeAttributeLevelControlFeatureMap : public ModelCommand { AddArgument("attr-name", "feature-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -35262,6 +38145,7 @@ class SubscribeAttributeLevelControlFeatureMap : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -35282,6 +38166,7 @@ class SubscribeAttributeLevelControlFeatureMap : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -35296,6 +38181,7 @@ class ReadLevelControlClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -35317,6 +38203,9 @@ class ReadLevelControlClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLevelControlClusterRevision : public ModelCommand { @@ -35327,6 +38216,7 @@ class SubscribeAttributeLevelControlClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -35339,6 +38229,7 @@ class SubscribeAttributeLevelControlClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLevelControl * cluster = [[CHIPLevelControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -35359,6 +38250,7 @@ class SubscribeAttributeLevelControlClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -35390,6 +38282,7 @@ class ReadLocalizationConfigurationActiveLocale : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "active-locale"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -35413,6 +38306,9 @@ class ReadLocalizationConfigurationActiveLocale : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteLocalizationConfigurationActiveLocale : public ModelCommand { @@ -35422,6 +38318,7 @@ class WriteLocalizationConfigurationActiveLocale : public ModelCommand { { AddArgument("attr-name", "active-locale"); AddArgument("attr-value", &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -35435,12 +38332,15 @@ class WriteLocalizationConfigurationActiveLocale : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data() length:mValue.size() encoding:NSUTF8StringEncoding]; [cluster writeAttributeActiveLocaleWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError( @@ -35451,6 +38351,7 @@ class WriteLocalizationConfigurationActiveLocale : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mValue; }; @@ -35462,6 +38363,7 @@ class SubscribeAttributeLocalizationConfigurationActiveLocale : public ModelComm AddArgument("attr-name", "active-locale"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -35476,6 +38378,7 @@ class SubscribeAttributeLocalizationConfigurationActiveLocale : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeActiveLocaleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -35497,6 +38400,7 @@ class SubscribeAttributeLocalizationConfigurationActiveLocale : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -35511,6 +38415,7 @@ class ReadLocalizationConfigurationSupportedLocales : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "supported-locales"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -35534,6 +38439,9 @@ class ReadLocalizationConfigurationSupportedLocales : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLocalizationConfigurationSupportedLocales : public ModelCommand { @@ -35544,6 +38452,7 @@ class SubscribeAttributeLocalizationConfigurationSupportedLocales : public Model AddArgument("attr-name", "supported-locales"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -35558,6 +38467,7 @@ class SubscribeAttributeLocalizationConfigurationSupportedLocales : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSupportedLocalesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -35579,6 +38489,7 @@ class SubscribeAttributeLocalizationConfigurationSupportedLocales : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -35593,6 +38504,7 @@ class ReadLocalizationConfigurationGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -35616,6 +38528,9 @@ class ReadLocalizationConfigurationGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLocalizationConfigurationGeneratedCommandList : public ModelCommand { @@ -35626,6 +38541,7 @@ class SubscribeAttributeLocalizationConfigurationGeneratedCommandList : public M AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -35640,6 +38556,7 @@ class SubscribeAttributeLocalizationConfigurationGeneratedCommandList : public M endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -35661,6 +38578,7 @@ class SubscribeAttributeLocalizationConfigurationGeneratedCommandList : public M } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -35675,6 +38593,7 @@ class ReadLocalizationConfigurationAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -35698,6 +38617,9 @@ class ReadLocalizationConfigurationAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLocalizationConfigurationAcceptedCommandList : public ModelCommand { @@ -35708,6 +38630,7 @@ class SubscribeAttributeLocalizationConfigurationAcceptedCommandList : public Mo AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -35722,6 +38645,7 @@ class SubscribeAttributeLocalizationConfigurationAcceptedCommandList : public Mo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -35743,6 +38667,7 @@ class SubscribeAttributeLocalizationConfigurationAcceptedCommandList : public Mo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -35757,6 +38682,7 @@ class ReadLocalizationConfigurationClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -35780,6 +38706,9 @@ class ReadLocalizationConfigurationClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLocalizationConfigurationClusterRevision : public ModelCommand { @@ -35790,6 +38719,7 @@ class SubscribeAttributeLocalizationConfigurationClusterRevision : public ModelC AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -35804,6 +38734,7 @@ class SubscribeAttributeLocalizationConfigurationClusterRevision : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -35825,6 +38756,7 @@ class SubscribeAttributeLocalizationConfigurationClusterRevision : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -35854,6 +38786,7 @@ class LowPowerSleep : public ModelCommand { LowPowerSleep() : ModelCommand("sleep") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -35864,6 +38797,9 @@ class LowPowerSleep : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPLowPowerClusterSleepParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster sleepWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -35873,6 +38809,7 @@ class LowPowerSleep : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -35884,6 +38821,7 @@ class ReadLowPowerGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -35905,6 +38843,9 @@ class ReadLowPowerGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLowPowerGeneratedCommandList : public ModelCommand { @@ -35915,6 +38856,7 @@ class SubscribeAttributeLowPowerGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -35927,6 +38869,7 @@ class SubscribeAttributeLowPowerGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -35948,6 +38891,7 @@ class SubscribeAttributeLowPowerGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -35962,6 +38906,7 @@ class ReadLowPowerAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -35983,6 +38928,9 @@ class ReadLowPowerAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLowPowerAcceptedCommandList : public ModelCommand { @@ -35993,6 +38941,7 @@ class SubscribeAttributeLowPowerAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -36005,6 +38954,7 @@ class SubscribeAttributeLowPowerAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -36025,6 +38975,7 @@ class SubscribeAttributeLowPowerAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -36039,6 +38990,7 @@ class ReadLowPowerAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -36060,6 +39012,9 @@ class ReadLowPowerAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLowPowerAttributeList : public ModelCommand { @@ -36070,6 +39025,7 @@ class SubscribeAttributeLowPowerAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -36082,6 +39038,7 @@ class SubscribeAttributeLowPowerAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -36102,6 +39059,7 @@ class SubscribeAttributeLowPowerAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -36116,6 +39074,7 @@ class ReadLowPowerClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -36137,6 +39096,9 @@ class ReadLowPowerClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeLowPowerClusterRevision : public ModelCommand { @@ -36147,6 +39109,7 @@ class SubscribeAttributeLowPowerClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -36159,6 +39122,7 @@ class SubscribeAttributeLowPowerClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPLowPower * cluster = [[CHIPLowPower alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -36179,6 +39143,7 @@ class SubscribeAttributeLowPowerClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -36213,6 +39178,7 @@ class MediaInputHideInputStatus : public ModelCommand { MediaInputHideInputStatus() : ModelCommand("hide-input-status") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -36223,6 +39189,9 @@ class MediaInputHideInputStatus : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPMediaInputClusterHideInputStatusParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster hideInputStatusWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -36232,6 +39201,7 @@ class MediaInputHideInputStatus : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -36244,6 +39214,7 @@ class MediaInputRenameInput : public ModelCommand { { AddArgument("Index", 0, UINT8_MAX, &mIndex); AddArgument("Name", &mName); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -36255,9 +39226,9 @@ class MediaInputRenameInput : public ModelCommand { CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPMediaInputClusterRenameInputParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.index = [NSNumber numberWithUnsignedChar:mIndex]; - params.name = [[NSString alloc] initWithBytes:mName.data() length:mName.size() encoding:NSUTF8StringEncoding]; [cluster renameInputWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -36269,6 +39240,7 @@ class MediaInputRenameInput : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mIndex; chip::ByteSpan mName; }; @@ -36282,6 +39254,7 @@ class MediaInputSelectInput : public ModelCommand { : ModelCommand("select-input") { AddArgument("Index", 0, UINT8_MAX, &mIndex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -36293,7 +39266,8 @@ class MediaInputSelectInput : public ModelCommand { CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPMediaInputClusterSelectInputParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.index = [NSNumber numberWithUnsignedChar:mIndex]; [cluster selectInputWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -36305,6 +39279,7 @@ class MediaInputSelectInput : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mIndex; }; @@ -36316,6 +39291,7 @@ class MediaInputShowInputStatus : public ModelCommand { MediaInputShowInputStatus() : ModelCommand("show-input-status") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -36326,6 +39302,9 @@ class MediaInputShowInputStatus : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPMediaInputClusterShowInputStatusParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster showInputStatusWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -36335,6 +39314,7 @@ class MediaInputShowInputStatus : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -36346,6 +39326,7 @@ class ReadMediaInputInputList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "input-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -36367,6 +39348,9 @@ class ReadMediaInputInputList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaInputInputList : public ModelCommand { @@ -36377,6 +39361,7 @@ class SubscribeAttributeMediaInputInputList : public ModelCommand { AddArgument("attr-name", "input-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -36389,6 +39374,7 @@ class SubscribeAttributeMediaInputInputList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInputListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -36409,6 +39395,7 @@ class SubscribeAttributeMediaInputInputList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -36423,6 +39410,7 @@ class ReadMediaInputCurrentInput : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-input"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -36444,6 +39432,9 @@ class ReadMediaInputCurrentInput : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaInputCurrentInput : public ModelCommand { @@ -36454,6 +39445,7 @@ class SubscribeAttributeMediaInputCurrentInput : public ModelCommand { AddArgument("attr-name", "current-input"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -36466,6 +39458,7 @@ class SubscribeAttributeMediaInputCurrentInput : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentInputWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -36486,6 +39479,7 @@ class SubscribeAttributeMediaInputCurrentInput : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -36500,6 +39494,7 @@ class ReadMediaInputGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -36521,6 +39516,9 @@ class ReadMediaInputGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaInputGeneratedCommandList : public ModelCommand { @@ -36531,6 +39529,7 @@ class SubscribeAttributeMediaInputGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -36543,6 +39542,7 @@ class SubscribeAttributeMediaInputGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -36564,6 +39564,7 @@ class SubscribeAttributeMediaInputGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -36578,6 +39579,7 @@ class ReadMediaInputAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -36599,6 +39601,9 @@ class ReadMediaInputAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaInputAcceptedCommandList : public ModelCommand { @@ -36609,6 +39614,7 @@ class SubscribeAttributeMediaInputAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -36621,6 +39627,7 @@ class SubscribeAttributeMediaInputAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -36642,6 +39649,7 @@ class SubscribeAttributeMediaInputAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -36656,6 +39664,7 @@ class ReadMediaInputAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -36677,6 +39686,9 @@ class ReadMediaInputAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaInputAttributeList : public ModelCommand { @@ -36687,6 +39699,7 @@ class SubscribeAttributeMediaInputAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -36699,6 +39712,7 @@ class SubscribeAttributeMediaInputAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -36719,6 +39733,7 @@ class SubscribeAttributeMediaInputAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -36733,6 +39748,7 @@ class ReadMediaInputClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -36754,6 +39770,9 @@ class ReadMediaInputClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaInputClusterRevision : public ModelCommand { @@ -36764,6 +39783,7 @@ class SubscribeAttributeMediaInputClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -36776,6 +39796,7 @@ class SubscribeAttributeMediaInputClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaInput * cluster = [[CHIPMediaInput alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -36796,6 +39817,7 @@ class SubscribeAttributeMediaInputClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -36842,6 +39864,7 @@ class MediaPlaybackFastForward : public ModelCommand { MediaPlaybackFastForward() : ModelCommand("fast-forward") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -36852,6 +39875,9 @@ class MediaPlaybackFastForward : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPMediaPlaybackClusterFastForwardParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster fastForwardWithCompletionHandler:^( CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); @@ -36863,6 +39889,7 @@ class MediaPlaybackFastForward : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -36873,6 +39900,7 @@ class MediaPlaybackNext : public ModelCommand { MediaPlaybackNext() : ModelCommand("next") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -36883,6 +39911,9 @@ class MediaPlaybackNext : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPMediaPlaybackClusterNextParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster nextWithCompletionHandler:^( CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); @@ -36894,6 +39925,7 @@ class MediaPlaybackNext : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -36904,6 +39936,7 @@ class MediaPlaybackPause : public ModelCommand { MediaPlaybackPause() : ModelCommand("pause") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -36914,6 +39947,9 @@ class MediaPlaybackPause : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPMediaPlaybackClusterPauseParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster pauseWithCompletionHandler:^( CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); @@ -36925,6 +39961,7 @@ class MediaPlaybackPause : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -36935,6 +39972,7 @@ class MediaPlaybackPlay : public ModelCommand { MediaPlaybackPlay() : ModelCommand("play") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -36945,6 +39983,9 @@ class MediaPlaybackPlay : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPMediaPlaybackClusterPlayParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster playWithCompletionHandler:^( CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); @@ -36956,6 +39997,7 @@ class MediaPlaybackPlay : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -36966,6 +40008,7 @@ class MediaPlaybackPrevious : public ModelCommand { MediaPlaybackPrevious() : ModelCommand("previous") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -36976,6 +40019,9 @@ class MediaPlaybackPrevious : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPMediaPlaybackClusterPreviousParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster previousWithCompletionHandler:^( CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); @@ -36987,6 +40033,7 @@ class MediaPlaybackPrevious : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -36997,6 +40044,7 @@ class MediaPlaybackRewind : public ModelCommand { MediaPlaybackRewind() : ModelCommand("rewind") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -37007,6 +40055,9 @@ class MediaPlaybackRewind : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPMediaPlaybackClusterRewindParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster rewindWithCompletionHandler:^( CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); @@ -37018,6 +40069,7 @@ class MediaPlaybackRewind : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -37029,6 +40081,7 @@ class MediaPlaybackSeek : public ModelCommand { : ModelCommand("seek") { AddArgument("Position", 0, UINT64_MAX, &mPosition); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -37040,7 +40093,8 @@ class MediaPlaybackSeek : public ModelCommand { CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPMediaPlaybackClusterSeekParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.position = [NSNumber numberWithUnsignedLongLong:mPosition]; [cluster seekWithParams:params completionHandler:^(CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) { @@ -37053,6 +40107,7 @@ class MediaPlaybackSeek : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint64_t mPosition; }; @@ -37065,6 +40120,7 @@ class MediaPlaybackSkipBackward : public ModelCommand { : ModelCommand("skip-backward") { AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mDeltaPositionMilliseconds); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -37076,7 +40132,8 @@ class MediaPlaybackSkipBackward : public ModelCommand { CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPMediaPlaybackClusterSkipBackwardParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.deltaPositionMilliseconds = [NSNumber numberWithUnsignedLongLong:mDeltaPositionMilliseconds]; [cluster skipBackwardWithParams:params @@ -37090,6 +40147,7 @@ class MediaPlaybackSkipBackward : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint64_t mDeltaPositionMilliseconds; }; @@ -37102,6 +40160,7 @@ class MediaPlaybackSkipForward : public ModelCommand { : ModelCommand("skip-forward") { AddArgument("DeltaPositionMilliseconds", 0, UINT64_MAX, &mDeltaPositionMilliseconds); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -37113,7 +40172,8 @@ class MediaPlaybackSkipForward : public ModelCommand { CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPMediaPlaybackClusterSkipForwardParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.deltaPositionMilliseconds = [NSNumber numberWithUnsignedLongLong:mDeltaPositionMilliseconds]; [cluster skipForwardWithParams:params @@ -37127,6 +40187,7 @@ class MediaPlaybackSkipForward : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint64_t mDeltaPositionMilliseconds; }; @@ -37138,6 +40199,7 @@ class MediaPlaybackStartOver : public ModelCommand { MediaPlaybackStartOver() : ModelCommand("start-over") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -37148,6 +40210,9 @@ class MediaPlaybackStartOver : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPMediaPlaybackClusterStartOverParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster startOverWithCompletionHandler:^( CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); @@ -37159,6 +40224,7 @@ class MediaPlaybackStartOver : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -37169,6 +40235,7 @@ class MediaPlaybackStopPlayback : public ModelCommand { MediaPlaybackStopPlayback() : ModelCommand("stop-playback") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -37179,6 +40246,9 @@ class MediaPlaybackStopPlayback : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPMediaPlaybackClusterStopPlaybackParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster stopPlaybackWithCompletionHandler:^( CHIPMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); @@ -37190,6 +40260,7 @@ class MediaPlaybackStopPlayback : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -37201,6 +40272,7 @@ class ReadMediaPlaybackCurrentState : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-state"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -37222,6 +40294,9 @@ class ReadMediaPlaybackCurrentState : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaPlaybackCurrentState : public ModelCommand { @@ -37232,6 +40307,7 @@ class SubscribeAttributeMediaPlaybackCurrentState : public ModelCommand { AddArgument("attr-name", "current-state"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -37244,6 +40320,7 @@ class SubscribeAttributeMediaPlaybackCurrentState : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -37264,6 +40341,7 @@ class SubscribeAttributeMediaPlaybackCurrentState : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -37278,6 +40356,7 @@ class ReadMediaPlaybackStartTime : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "start-time"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -37299,6 +40378,9 @@ class ReadMediaPlaybackStartTime : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaPlaybackStartTime : public ModelCommand { @@ -37309,6 +40391,7 @@ class SubscribeAttributeMediaPlaybackStartTime : public ModelCommand { AddArgument("attr-name", "start-time"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -37321,6 +40404,7 @@ class SubscribeAttributeMediaPlaybackStartTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeStartTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -37341,6 +40425,7 @@ class SubscribeAttributeMediaPlaybackStartTime : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -37355,6 +40440,7 @@ class ReadMediaPlaybackDuration : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "duration"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -37376,6 +40462,9 @@ class ReadMediaPlaybackDuration : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaPlaybackDuration : public ModelCommand { @@ -37386,6 +40475,7 @@ class SubscribeAttributeMediaPlaybackDuration : public ModelCommand { AddArgument("attr-name", "duration"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -37398,6 +40488,7 @@ class SubscribeAttributeMediaPlaybackDuration : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeDurationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -37418,6 +40509,7 @@ class SubscribeAttributeMediaPlaybackDuration : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -37432,6 +40524,7 @@ class ReadMediaPlaybackSampledPosition : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "sampled-position"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -37454,6 +40547,9 @@ class ReadMediaPlaybackSampledPosition : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaPlaybackSampledPosition : public ModelCommand { @@ -37464,6 +40560,7 @@ class SubscribeAttributeMediaPlaybackSampledPosition : public ModelCommand { AddArgument("attr-name", "sampled-position"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -37476,6 +40573,7 @@ class SubscribeAttributeMediaPlaybackSampledPosition : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSampledPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -37497,6 +40595,7 @@ class SubscribeAttributeMediaPlaybackSampledPosition : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -37511,6 +40610,7 @@ class ReadMediaPlaybackPlaybackSpeed : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "playback-speed"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -37532,6 +40632,9 @@ class ReadMediaPlaybackPlaybackSpeed : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaPlaybackPlaybackSpeed : public ModelCommand { @@ -37542,6 +40645,7 @@ class SubscribeAttributeMediaPlaybackPlaybackSpeed : public ModelCommand { AddArgument("attr-name", "playback-speed"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -37554,6 +40658,7 @@ class SubscribeAttributeMediaPlaybackPlaybackSpeed : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePlaybackSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -37574,6 +40679,7 @@ class SubscribeAttributeMediaPlaybackPlaybackSpeed : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -37588,6 +40694,7 @@ class ReadMediaPlaybackSeekRangeEnd : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "seek-range-end"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -37609,6 +40716,9 @@ class ReadMediaPlaybackSeekRangeEnd : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaPlaybackSeekRangeEnd : public ModelCommand { @@ -37619,6 +40729,7 @@ class SubscribeAttributeMediaPlaybackSeekRangeEnd : public ModelCommand { AddArgument("attr-name", "seek-range-end"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -37631,6 +40742,7 @@ class SubscribeAttributeMediaPlaybackSeekRangeEnd : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSeekRangeEndWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -37651,6 +40763,7 @@ class SubscribeAttributeMediaPlaybackSeekRangeEnd : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -37665,6 +40778,7 @@ class ReadMediaPlaybackSeekRangeStart : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "seek-range-start"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -37686,6 +40800,9 @@ class ReadMediaPlaybackSeekRangeStart : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaPlaybackSeekRangeStart : public ModelCommand { @@ -37696,6 +40813,7 @@ class SubscribeAttributeMediaPlaybackSeekRangeStart : public ModelCommand { AddArgument("attr-name", "seek-range-start"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -37708,6 +40826,7 @@ class SubscribeAttributeMediaPlaybackSeekRangeStart : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSeekRangeStartWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -37728,6 +40847,7 @@ class SubscribeAttributeMediaPlaybackSeekRangeStart : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -37742,6 +40862,7 @@ class ReadMediaPlaybackGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -37763,6 +40884,9 @@ class ReadMediaPlaybackGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaPlaybackGeneratedCommandList : public ModelCommand { @@ -37773,6 +40897,7 @@ class SubscribeAttributeMediaPlaybackGeneratedCommandList : public ModelCommand AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -37785,6 +40910,7 @@ class SubscribeAttributeMediaPlaybackGeneratedCommandList : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -37806,6 +40932,7 @@ class SubscribeAttributeMediaPlaybackGeneratedCommandList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -37820,6 +40947,7 @@ class ReadMediaPlaybackAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -37841,6 +40969,9 @@ class ReadMediaPlaybackAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaPlaybackAcceptedCommandList : public ModelCommand { @@ -37851,6 +40982,7 @@ class SubscribeAttributeMediaPlaybackAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -37863,6 +40995,7 @@ class SubscribeAttributeMediaPlaybackAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -37884,6 +41017,7 @@ class SubscribeAttributeMediaPlaybackAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -37898,6 +41032,7 @@ class ReadMediaPlaybackAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -37919,6 +41054,9 @@ class ReadMediaPlaybackAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaPlaybackAttributeList : public ModelCommand { @@ -37929,6 +41067,7 @@ class SubscribeAttributeMediaPlaybackAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -37941,6 +41080,7 @@ class SubscribeAttributeMediaPlaybackAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -37961,6 +41101,7 @@ class SubscribeAttributeMediaPlaybackAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -37975,6 +41116,7 @@ class ReadMediaPlaybackClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -37996,6 +41138,9 @@ class ReadMediaPlaybackClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeMediaPlaybackClusterRevision : public ModelCommand { @@ -38006,6 +41151,7 @@ class SubscribeAttributeMediaPlaybackClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -38018,6 +41164,7 @@ class SubscribeAttributeMediaPlaybackClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPMediaPlayback * cluster = [[CHIPMediaPlayback alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -38038,6 +41185,7 @@ class SubscribeAttributeMediaPlaybackClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -38074,6 +41222,7 @@ class ModeSelectChangeToMode : public ModelCommand { : ModelCommand("change-to-mode") { AddArgument("NewMode", 0, UINT8_MAX, &mNewMode); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -38085,7 +41234,8 @@ class ModeSelectChangeToMode : public ModelCommand { CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPModeSelectClusterChangeToModeParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.newMode = [NSNumber numberWithUnsignedChar:mNewMode]; [cluster changeToModeWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -38097,6 +41247,7 @@ class ModeSelectChangeToMode : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mNewMode; }; @@ -38109,6 +41260,7 @@ class ReadModeSelectDescription : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "description"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -38130,6 +41282,9 @@ class ReadModeSelectDescription : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeModeSelectDescription : public ModelCommand { @@ -38140,6 +41295,7 @@ class SubscribeAttributeModeSelectDescription : public ModelCommand { AddArgument("attr-name", "description"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -38152,6 +41308,7 @@ class SubscribeAttributeModeSelectDescription : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeDescriptionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -38172,6 +41329,7 @@ class SubscribeAttributeModeSelectDescription : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -38186,6 +41344,7 @@ class ReadModeSelectStandardNamespace : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "standard-namespace"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -38207,6 +41366,9 @@ class ReadModeSelectStandardNamespace : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeModeSelectStandardNamespace : public ModelCommand { @@ -38217,6 +41379,7 @@ class SubscribeAttributeModeSelectStandardNamespace : public ModelCommand { AddArgument("attr-name", "standard-namespace"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -38229,6 +41392,7 @@ class SubscribeAttributeModeSelectStandardNamespace : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeStandardNamespaceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -38249,6 +41413,7 @@ class SubscribeAttributeModeSelectStandardNamespace : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -38263,6 +41428,7 @@ class ReadModeSelectSupportedModes : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "supported-modes"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -38284,6 +41450,9 @@ class ReadModeSelectSupportedModes : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeModeSelectSupportedModes : public ModelCommand { @@ -38294,6 +41463,7 @@ class SubscribeAttributeModeSelectSupportedModes : public ModelCommand { AddArgument("attr-name", "supported-modes"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -38306,6 +41476,7 @@ class SubscribeAttributeModeSelectSupportedModes : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSupportedModesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -38326,6 +41497,7 @@ class SubscribeAttributeModeSelectSupportedModes : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -38340,6 +41512,7 @@ class ReadModeSelectCurrentMode : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-mode"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -38361,6 +41534,9 @@ class ReadModeSelectCurrentMode : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeModeSelectCurrentMode : public ModelCommand { @@ -38371,6 +41547,7 @@ class SubscribeAttributeModeSelectCurrentMode : public ModelCommand { AddArgument("attr-name", "current-mode"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -38383,6 +41560,7 @@ class SubscribeAttributeModeSelectCurrentMode : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -38403,6 +41581,7 @@ class SubscribeAttributeModeSelectCurrentMode : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -38417,6 +41596,7 @@ class ReadModeSelectStartUpMode : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "start-up-mode"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -38438,6 +41618,9 @@ class ReadModeSelectStartUpMode : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteModeSelectStartUpMode : public ModelCommand { @@ -38447,6 +41630,7 @@ class WriteModeSelectStartUpMode : public ModelCommand { { AddArgument("attr-name", "start-up-mode"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -38458,10 +41642,13 @@ class WriteModeSelectStartUpMode : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeStartUpModeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ModeSelect StartUpMode Error: %s", chip::ErrorStr(chipError)); @@ -38471,6 +41658,7 @@ class WriteModeSelectStartUpMode : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -38482,6 +41670,7 @@ class SubscribeAttributeModeSelectStartUpMode : public ModelCommand { AddArgument("attr-name", "start-up-mode"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -38494,6 +41683,7 @@ class SubscribeAttributeModeSelectStartUpMode : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeStartUpModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -38514,6 +41704,7 @@ class SubscribeAttributeModeSelectStartUpMode : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -38528,6 +41719,7 @@ class ReadModeSelectOnMode : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "on-mode"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -38549,6 +41741,9 @@ class ReadModeSelectOnMode : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteModeSelectOnMode : public ModelCommand { @@ -38558,6 +41753,7 @@ class WriteModeSelectOnMode : public ModelCommand { { AddArgument("attr-name", "on-mode"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -38569,10 +41765,13 @@ class WriteModeSelectOnMode : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeOnModeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ModeSelect OnMode Error: %s", chip::ErrorStr(chipError)); @@ -38582,6 +41781,7 @@ class WriteModeSelectOnMode : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -38593,6 +41793,7 @@ class SubscribeAttributeModeSelectOnMode : public ModelCommand { AddArgument("attr-name", "on-mode"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -38605,6 +41806,7 @@ class SubscribeAttributeModeSelectOnMode : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOnModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -38625,6 +41827,7 @@ class SubscribeAttributeModeSelectOnMode : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -38639,6 +41842,7 @@ class ReadModeSelectGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -38660,6 +41864,9 @@ class ReadModeSelectGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeModeSelectGeneratedCommandList : public ModelCommand { @@ -38670,6 +41877,7 @@ class SubscribeAttributeModeSelectGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -38682,6 +41890,7 @@ class SubscribeAttributeModeSelectGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -38703,6 +41912,7 @@ class SubscribeAttributeModeSelectGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -38717,6 +41927,7 @@ class ReadModeSelectAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -38738,6 +41949,9 @@ class ReadModeSelectAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeModeSelectAcceptedCommandList : public ModelCommand { @@ -38748,6 +41962,7 @@ class SubscribeAttributeModeSelectAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -38760,6 +41975,7 @@ class SubscribeAttributeModeSelectAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -38781,6 +41997,7 @@ class SubscribeAttributeModeSelectAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -38795,6 +42012,7 @@ class ReadModeSelectAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -38816,6 +42034,9 @@ class ReadModeSelectAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeModeSelectAttributeList : public ModelCommand { @@ -38826,6 +42047,7 @@ class SubscribeAttributeModeSelectAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -38838,6 +42060,7 @@ class SubscribeAttributeModeSelectAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -38858,6 +42081,7 @@ class SubscribeAttributeModeSelectAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -38872,6 +42096,7 @@ class ReadModeSelectFeatureMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "feature-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -38893,6 +42118,9 @@ class ReadModeSelectFeatureMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeModeSelectFeatureMap : public ModelCommand { @@ -38903,6 +42131,7 @@ class SubscribeAttributeModeSelectFeatureMap : public ModelCommand { AddArgument("attr-name", "feature-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -38915,6 +42144,7 @@ class SubscribeAttributeModeSelectFeatureMap : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -38935,6 +42165,7 @@ class SubscribeAttributeModeSelectFeatureMap : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -38949,6 +42180,7 @@ class ReadModeSelectClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -38970,6 +42202,9 @@ class ReadModeSelectClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeModeSelectClusterRevision : public ModelCommand { @@ -38980,6 +42215,7 @@ class SubscribeAttributeModeSelectClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -38992,6 +42228,7 @@ class SubscribeAttributeModeSelectClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPModeSelect * cluster = [[CHIPModeSelect alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -39012,6 +42249,7 @@ class SubscribeAttributeModeSelectClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -39056,6 +42294,7 @@ class NetworkCommissioningAddOrUpdateThreadNetwork : public ModelCommand { { AddArgument("OperationalDataset", &mOperationalDataset); AddArgument("Breadcrumb", 0, UINT64_MAX, &mBreadcrumb); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -39069,9 +42308,9 @@ class NetworkCommissioningAddOrUpdateThreadNetwork : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPNetworkCommissioningClusterAddOrUpdateThreadNetworkParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.operationalDataset = [[NSData alloc] initWithBytes:mOperationalDataset.data() length:mOperationalDataset.size()]; - params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mBreadcrumb]; [cluster addOrUpdateThreadNetworkWithParams:params completionHandler:^(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values, @@ -39085,6 +42324,7 @@ class NetworkCommissioningAddOrUpdateThreadNetwork : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mOperationalDataset; uint64_t mBreadcrumb; }; @@ -39100,6 +42340,7 @@ class NetworkCommissioningAddOrUpdateWiFiNetwork : public ModelCommand { AddArgument("Ssid", &mSsid); AddArgument("Credentials", &mCredentials); AddArgument("Breadcrumb", 0, UINT64_MAX, &mBreadcrumb); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -39113,11 +42354,10 @@ class NetworkCommissioningAddOrUpdateWiFiNetwork : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPNetworkCommissioningClusterAddOrUpdateWiFiNetworkParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.ssid = [[NSData alloc] initWithBytes:mSsid.data() length:mSsid.size()]; - params.credentials = [[NSData alloc] initWithBytes:mCredentials.data() length:mCredentials.size()]; - params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mBreadcrumb]; [cluster addOrUpdateWiFiNetworkWithParams:params completionHandler:^(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values, @@ -39131,6 +42371,7 @@ class NetworkCommissioningAddOrUpdateWiFiNetwork : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mSsid; chip::ByteSpan mCredentials; uint64_t mBreadcrumb; @@ -39146,6 +42387,7 @@ class NetworkCommissioningConnectNetwork : public ModelCommand { { AddArgument("NetworkID", &mNetworkID); AddArgument("Breadcrumb", 0, UINT64_MAX, &mBreadcrumb); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -39159,9 +42401,9 @@ class NetworkCommissioningConnectNetwork : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPNetworkCommissioningClusterConnectNetworkParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.networkID = [[NSData alloc] initWithBytes:mNetworkID.data() length:mNetworkID.size()]; - params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mBreadcrumb]; [cluster connectNetworkWithParams:params completionHandler:^(CHIPNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable values, @@ -39175,6 +42417,7 @@ class NetworkCommissioningConnectNetwork : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mNetworkID; uint64_t mBreadcrumb; }; @@ -39189,6 +42432,7 @@ class NetworkCommissioningRemoveNetwork : public ModelCommand { { AddArgument("NetworkID", &mNetworkID); AddArgument("Breadcrumb", 0, UINT64_MAX, &mBreadcrumb); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -39202,9 +42446,9 @@ class NetworkCommissioningRemoveNetwork : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPNetworkCommissioningClusterRemoveNetworkParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.networkID = [[NSData alloc] initWithBytes:mNetworkID.data() length:mNetworkID.size()]; - params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mBreadcrumb]; [cluster removeNetworkWithParams:params completionHandler:^(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values, @@ -39218,6 +42462,7 @@ class NetworkCommissioningRemoveNetwork : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mNetworkID; uint64_t mBreadcrumb; }; @@ -39233,6 +42478,7 @@ class NetworkCommissioningReorderNetwork : public ModelCommand { AddArgument("NetworkID", &mNetworkID); AddArgument("NetworkIndex", 0, UINT8_MAX, &mNetworkIndex); AddArgument("Breadcrumb", 0, UINT64_MAX, &mBreadcrumb); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -39246,11 +42492,10 @@ class NetworkCommissioningReorderNetwork : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPNetworkCommissioningClusterReorderNetworkParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.networkID = [[NSData alloc] initWithBytes:mNetworkID.data() length:mNetworkID.size()]; - params.networkIndex = [NSNumber numberWithUnsignedChar:mNetworkIndex]; - params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mBreadcrumb]; [cluster reorderNetworkWithParams:params completionHandler:^(CHIPNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values, @@ -39264,6 +42509,7 @@ class NetworkCommissioningReorderNetwork : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mNetworkID; uint8_t mNetworkIndex; uint64_t mBreadcrumb; @@ -39279,6 +42525,7 @@ class NetworkCommissioningScanNetworks : public ModelCommand { { AddArgument("Ssid", &mSsid); AddArgument("Breadcrumb", 0, UINT64_MAX, &mBreadcrumb); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -39292,9 +42539,9 @@ class NetworkCommissioningScanNetworks : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPNetworkCommissioningClusterScanNetworksParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.ssid = [[NSData alloc] initWithBytes:mSsid.data() length:mSsid.size()]; - params.breadcrumb = [NSNumber numberWithUnsignedLongLong:mBreadcrumb]; [cluster scanNetworksWithParams:params completionHandler:^( @@ -39308,6 +42555,7 @@ class NetworkCommissioningScanNetworks : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mSsid; uint64_t mBreadcrumb; }; @@ -39321,6 +42569,7 @@ class ReadNetworkCommissioningMaxNetworks : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-networks"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -39344,6 +42593,9 @@ class ReadNetworkCommissioningMaxNetworks : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeNetworkCommissioningMaxNetworks : public ModelCommand { @@ -39354,6 +42606,7 @@ class SubscribeAttributeNetworkCommissioningMaxNetworks : public ModelCommand { AddArgument("attr-name", "max-networks"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -39368,6 +42621,7 @@ class SubscribeAttributeNetworkCommissioningMaxNetworks : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxNetworksWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -39388,6 +42642,7 @@ class SubscribeAttributeNetworkCommissioningMaxNetworks : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -39402,6 +42657,7 @@ class ReadNetworkCommissioningNetworks : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "networks"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -39425,6 +42681,9 @@ class ReadNetworkCommissioningNetworks : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeNetworkCommissioningNetworks : public ModelCommand { @@ -39435,6 +42694,7 @@ class SubscribeAttributeNetworkCommissioningNetworks : public ModelCommand { AddArgument("attr-name", "networks"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -39449,6 +42709,7 @@ class SubscribeAttributeNetworkCommissioningNetworks : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNetworksWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -39469,6 +42730,7 @@ class SubscribeAttributeNetworkCommissioningNetworks : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -39483,6 +42745,7 @@ class ReadNetworkCommissioningScanMaxTimeSeconds : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "scan-max-time-seconds"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -39506,6 +42769,9 @@ class ReadNetworkCommissioningScanMaxTimeSeconds : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeNetworkCommissioningScanMaxTimeSeconds : public ModelCommand { @@ -39516,6 +42782,7 @@ class SubscribeAttributeNetworkCommissioningScanMaxTimeSeconds : public ModelCom AddArgument("attr-name", "scan-max-time-seconds"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -39530,6 +42797,7 @@ class SubscribeAttributeNetworkCommissioningScanMaxTimeSeconds : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeScanMaxTimeSecondsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -39551,6 +42819,7 @@ class SubscribeAttributeNetworkCommissioningScanMaxTimeSeconds : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -39565,6 +42834,7 @@ class ReadNetworkCommissioningConnectMaxTimeSeconds : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "connect-max-time-seconds"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -39588,6 +42858,9 @@ class ReadNetworkCommissioningConnectMaxTimeSeconds : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeNetworkCommissioningConnectMaxTimeSeconds : public ModelCommand { @@ -39598,6 +42871,7 @@ class SubscribeAttributeNetworkCommissioningConnectMaxTimeSeconds : public Model AddArgument("attr-name", "connect-max-time-seconds"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -39612,6 +42886,7 @@ class SubscribeAttributeNetworkCommissioningConnectMaxTimeSeconds : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeConnectMaxTimeSecondsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -39633,6 +42908,7 @@ class SubscribeAttributeNetworkCommissioningConnectMaxTimeSeconds : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -39647,6 +42923,7 @@ class ReadNetworkCommissioningInterfaceEnabled : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "interface-enabled"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -39670,6 +42947,9 @@ class ReadNetworkCommissioningInterfaceEnabled : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteNetworkCommissioningInterfaceEnabled : public ModelCommand { @@ -39679,6 +42959,7 @@ class WriteNetworkCommissioningInterfaceEnabled : public ModelCommand { { AddArgument("attr-name", "interface-enabled"); AddArgument("attr-value", 0, 1, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -39692,10 +42973,13 @@ class WriteNetworkCommissioningInterfaceEnabled : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue]; [cluster writeAttributeInterfaceEnabledWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "NetworkCommissioning InterfaceEnabled Error: %s", @@ -39706,6 +42990,7 @@ class WriteNetworkCommissioningInterfaceEnabled : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; bool mValue; }; @@ -39717,6 +43002,7 @@ class SubscribeAttributeNetworkCommissioningInterfaceEnabled : public ModelComma AddArgument("attr-name", "interface-enabled"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -39731,6 +43017,7 @@ class SubscribeAttributeNetworkCommissioningInterfaceEnabled : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInterfaceEnabledWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -39752,6 +43039,7 @@ class SubscribeAttributeNetworkCommissioningInterfaceEnabled : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -39766,6 +43054,7 @@ class ReadNetworkCommissioningLastNetworkingStatus : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "last-networking-status"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -39789,6 +43078,9 @@ class ReadNetworkCommissioningLastNetworkingStatus : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeNetworkCommissioningLastNetworkingStatus : public ModelCommand { @@ -39799,6 +43091,7 @@ class SubscribeAttributeNetworkCommissioningLastNetworkingStatus : public ModelC AddArgument("attr-name", "last-networking-status"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -39813,6 +43106,7 @@ class SubscribeAttributeNetworkCommissioningLastNetworkingStatus : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLastNetworkingStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -39834,6 +43128,7 @@ class SubscribeAttributeNetworkCommissioningLastNetworkingStatus : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -39848,6 +43143,7 @@ class ReadNetworkCommissioningLastNetworkID : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "last-network-id"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -39871,6 +43167,9 @@ class ReadNetworkCommissioningLastNetworkID : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeNetworkCommissioningLastNetworkID : public ModelCommand { @@ -39881,6 +43180,7 @@ class SubscribeAttributeNetworkCommissioningLastNetworkID : public ModelCommand AddArgument("attr-name", "last-network-id"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -39895,6 +43195,7 @@ class SubscribeAttributeNetworkCommissioningLastNetworkID : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLastNetworkIDWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -39915,6 +43216,7 @@ class SubscribeAttributeNetworkCommissioningLastNetworkID : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -39929,6 +43231,7 @@ class ReadNetworkCommissioningLastConnectErrorValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "last-connect-error-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -39952,6 +43255,9 @@ class ReadNetworkCommissioningLastConnectErrorValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeNetworkCommissioningLastConnectErrorValue : public ModelCommand { @@ -39962,6 +43268,7 @@ class SubscribeAttributeNetworkCommissioningLastConnectErrorValue : public Model AddArgument("attr-name", "last-connect-error-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -39976,6 +43283,7 @@ class SubscribeAttributeNetworkCommissioningLastConnectErrorValue : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLastConnectErrorValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -39997,6 +43305,7 @@ class SubscribeAttributeNetworkCommissioningLastConnectErrorValue : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -40011,6 +43320,7 @@ class ReadNetworkCommissioningGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -40034,6 +43344,9 @@ class ReadNetworkCommissioningGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeNetworkCommissioningGeneratedCommandList : public ModelCommand { @@ -40044,6 +43357,7 @@ class SubscribeAttributeNetworkCommissioningGeneratedCommandList : public ModelC AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -40058,6 +43372,7 @@ class SubscribeAttributeNetworkCommissioningGeneratedCommandList : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -40079,6 +43394,7 @@ class SubscribeAttributeNetworkCommissioningGeneratedCommandList : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -40093,6 +43409,7 @@ class ReadNetworkCommissioningAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -40116,6 +43433,9 @@ class ReadNetworkCommissioningAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeNetworkCommissioningAcceptedCommandList : public ModelCommand { @@ -40126,6 +43446,7 @@ class SubscribeAttributeNetworkCommissioningAcceptedCommandList : public ModelCo AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -40140,6 +43461,7 @@ class SubscribeAttributeNetworkCommissioningAcceptedCommandList : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -40161,6 +43483,7 @@ class SubscribeAttributeNetworkCommissioningAcceptedCommandList : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -40175,6 +43498,7 @@ class ReadNetworkCommissioningFeatureMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "feature-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -40198,6 +43522,9 @@ class ReadNetworkCommissioningFeatureMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeNetworkCommissioningFeatureMap : public ModelCommand { @@ -40208,6 +43535,7 @@ class SubscribeAttributeNetworkCommissioningFeatureMap : public ModelCommand { AddArgument("attr-name", "feature-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -40222,6 +43550,7 @@ class SubscribeAttributeNetworkCommissioningFeatureMap : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -40242,6 +43571,7 @@ class SubscribeAttributeNetworkCommissioningFeatureMap : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -40256,6 +43586,7 @@ class ReadNetworkCommissioningClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -40279,6 +43610,9 @@ class ReadNetworkCommissioningClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeNetworkCommissioningClusterRevision : public ModelCommand { @@ -40289,6 +43623,7 @@ class SubscribeAttributeNetworkCommissioningClusterRevision : public ModelComman AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -40303,6 +43638,7 @@ class SubscribeAttributeNetworkCommissioningClusterRevision : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -40324,6 +43660,7 @@ class SubscribeAttributeNetworkCommissioningClusterRevision : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -40357,6 +43694,7 @@ class OtaSoftwareUpdateProviderApplyUpdateRequest : public ModelCommand { { AddArgument("UpdateToken", &mUpdateToken); AddArgument("NewVersion", 0, UINT32_MAX, &mNewVersion); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -40370,9 +43708,9 @@ class OtaSoftwareUpdateProviderApplyUpdateRequest : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.updateToken = [[NSData alloc] initWithBytes:mUpdateToken.data() length:mUpdateToken.size()]; - params.newVersion = [NSNumber numberWithUnsignedInt:mNewVersion]; [cluster applyUpdateRequestWithParams:params completionHandler:^(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable values, @@ -40386,6 +43724,7 @@ class OtaSoftwareUpdateProviderApplyUpdateRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mUpdateToken; uint32_t mNewVersion; }; @@ -40400,6 +43739,7 @@ class OtaSoftwareUpdateProviderNotifyUpdateApplied : public ModelCommand { { AddArgument("UpdateToken", &mUpdateToken); AddArgument("SoftwareVersion", 0, UINT32_MAX, &mSoftwareVersion); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -40413,9 +43753,9 @@ class OtaSoftwareUpdateProviderNotifyUpdateApplied : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPOtaSoftwareUpdateProviderClusterNotifyUpdateAppliedParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.updateToken = [[NSData alloc] initWithBytes:mUpdateToken.data() length:mUpdateToken.size()]; - params.softwareVersion = [NSNumber numberWithUnsignedInt:mSoftwareVersion]; [cluster notifyUpdateAppliedWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -40427,6 +43767,7 @@ class OtaSoftwareUpdateProviderNotifyUpdateApplied : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mUpdateToken; uint32_t mSoftwareVersion; }; @@ -40448,6 +43789,7 @@ class OtaSoftwareUpdateProviderQueryImage : public ModelCommand { AddArgument("Location", &mLocation); AddArgument("RequestorCanConsent", 0, 1, &mRequestorCanConsent); AddArgument("MetadataForProvider", &mMetadataForProvider); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -40461,13 +43803,11 @@ class OtaSoftwareUpdateProviderQueryImage : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPOtaSoftwareUpdateProviderClusterQueryImageParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.vendorId = [NSNumber numberWithUnsignedShort:mVendorId]; - params.productId = [NSNumber numberWithUnsignedShort:mProductId]; - params.softwareVersion = [NSNumber numberWithUnsignedInt:mSoftwareVersion]; - { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; for (auto & entry_0 : mRequest.protocolsSupported) { @@ -40477,13 +43817,9 @@ class OtaSoftwareUpdateProviderQueryImage : public ModelCommand { } params.protocolsSupported = array_0; } - params.hardwareVersion = [NSNumber numberWithUnsignedShort:mHardwareVersion]; - params.location = [[NSString alloc] initWithBytes:mLocation.data() length:mLocation.size() encoding:NSUTF8StringEncoding]; - params.requestorCanConsent = [NSNumber numberWithBool:mRequestorCanConsent]; - params.metadataForProvider = [[NSData alloc] initWithBytes:mMetadataForProvider.data() length:mMetadataForProvider.size()]; [cluster queryImageWithParams:params completionHandler:^(CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable values, @@ -40497,6 +43833,7 @@ class OtaSoftwareUpdateProviderQueryImage : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::VendorId mVendorId; uint16_t mProductId; uint32_t mSoftwareVersion; @@ -40518,6 +43855,7 @@ class ReadOtaSoftwareUpdateProviderAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -40541,6 +43879,9 @@ class ReadOtaSoftwareUpdateProviderAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOtaSoftwareUpdateProviderAttributeList : public ModelCommand { @@ -40551,6 +43892,7 @@ class SubscribeAttributeOtaSoftwareUpdateProviderAttributeList : public ModelCom AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -40565,6 +43907,7 @@ class SubscribeAttributeOtaSoftwareUpdateProviderAttributeList : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -40586,6 +43929,7 @@ class SubscribeAttributeOtaSoftwareUpdateProviderAttributeList : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -40600,6 +43944,7 @@ class ReadOtaSoftwareUpdateProviderClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -40623,6 +43968,9 @@ class ReadOtaSoftwareUpdateProviderClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision : public ModelCommand { @@ -40633,6 +43981,7 @@ class SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision : public ModelC AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -40647,6 +43996,7 @@ class SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -40668,6 +44018,7 @@ class SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -40709,6 +44060,7 @@ class OtaSoftwareUpdateRequestorAnnounceOtaProvider : public ModelCommand { AddArgument("AnnouncementReason", 0, UINT8_MAX, &mAnnouncementReason); AddArgument("MetadataForNode", &mMetadataForNode); AddArgument("Endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -40722,15 +44074,12 @@ class OtaSoftwareUpdateRequestorAnnounceOtaProvider : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPOtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.providerNodeId = [NSNumber numberWithUnsignedLongLong:mProviderNodeId]; - params.vendorId = [NSNumber numberWithUnsignedShort:mVendorId]; - params.announcementReason = [NSNumber numberWithUnsignedChar:mAnnouncementReason]; - params.metadataForNode = [[NSData alloc] initWithBytes:mMetadataForNode.data() length:mMetadataForNode.size()]; - params.endpoint = [NSNumber numberWithUnsignedShort:mEndpoint]; [cluster announceOtaProviderWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -40742,6 +44091,7 @@ class OtaSoftwareUpdateRequestorAnnounceOtaProvider : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::NodeId mProviderNodeId; chip::VendorId mVendorId; uint8_t mAnnouncementReason; @@ -40758,6 +44108,7 @@ class ReadOtaSoftwareUpdateRequestorDefaultOtaProviders : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "default-ota-providers"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -40773,6 +44124,7 @@ class ReadOtaSoftwareUpdateRequestorDefaultOtaProviders : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block err = CHIP_NO_ERROR; CHIPReadParams * params = [[CHIPReadParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster readAttributeDefaultOtaProvidersWithParams:params completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { @@ -40785,6 +44137,9 @@ class ReadOtaSoftwareUpdateRequestorDefaultOtaProviders : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteOtaSoftwareUpdateRequestorDefaultOtaProviders : public ModelCommand { @@ -40795,6 +44150,7 @@ class WriteOtaSoftwareUpdateRequestorDefaultOtaProviders : public ModelCommand { { AddArgument("attr-name", "default-ota-providers"); AddArgument("attr-value", &mComplex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -40808,7 +44164,9 @@ class WriteOtaSoftwareUpdateRequestorDefaultOtaProviders : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSArray * _Nonnull value; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; @@ -40824,6 +44182,7 @@ class WriteOtaSoftwareUpdateRequestorDefaultOtaProviders : public ModelCommand { } [cluster writeAttributeDefaultOtaProvidersWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "OtaSoftwareUpdateRequestor DefaultOtaProviders Error: %s", @@ -40834,6 +44193,7 @@ class WriteOtaSoftwareUpdateRequestorDefaultOtaProviders : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::DataModel::List mValue; TypedComplexArgument< chip::app::DataModel::List> @@ -40848,6 +44208,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders : public M AddArgument("attr-name", "default-ota-providers"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -40862,6 +44223,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders : public M endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeDefaultOtaProvidersWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -40883,6 +44245,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders : public M } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -40897,6 +44260,7 @@ class ReadOtaSoftwareUpdateRequestorUpdatePossible : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "update-possible"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -40920,6 +44284,9 @@ class ReadOtaSoftwareUpdateRequestorUpdatePossible : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOtaSoftwareUpdateRequestorUpdatePossible : public ModelCommand { @@ -40930,6 +44297,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdatePossible : public ModelC AddArgument("attr-name", "update-possible"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -40944,6 +44312,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdatePossible : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeUpdatePossibleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -40965,6 +44334,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdatePossible : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -40979,6 +44349,7 @@ class ReadOtaSoftwareUpdateRequestorUpdateState : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "update-state"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -41002,6 +44373,9 @@ class ReadOtaSoftwareUpdateRequestorUpdateState : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateState : public ModelCommand { @@ -41012,6 +44386,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateState : public ModelComm AddArgument("attr-name", "update-state"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -41026,6 +44401,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateState : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeUpdateStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -41047,6 +44423,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateState : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -41061,6 +44438,7 @@ class ReadOtaSoftwareUpdateRequestorUpdateStateProgress : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "update-state-progress"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -41084,6 +44462,9 @@ class ReadOtaSoftwareUpdateRequestorUpdateStateProgress : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateStateProgress : public ModelCommand { @@ -41094,6 +44475,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateStateProgress : public M AddArgument("attr-name", "update-state-progress"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -41108,6 +44490,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateStateProgress : public M endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeUpdateStateProgressWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -41129,6 +44512,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateStateProgress : public M } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -41143,6 +44527,7 @@ class ReadOtaSoftwareUpdateRequestorAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -41166,6 +44551,9 @@ class ReadOtaSoftwareUpdateRequestorAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOtaSoftwareUpdateRequestorAttributeList : public ModelCommand { @@ -41176,6 +44564,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorAttributeList : public ModelCo AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -41190,6 +44579,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorAttributeList : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -41211,6 +44601,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorAttributeList : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -41225,6 +44616,7 @@ class ReadOtaSoftwareUpdateRequestorClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -41248,6 +44640,9 @@ class ReadOtaSoftwareUpdateRequestorClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOtaSoftwareUpdateRequestorClusterRevision : public ModelCommand { @@ -41258,6 +44653,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorClusterRevision : public Model AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -41272,6 +44668,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorClusterRevision : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -41293,6 +44690,7 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorClusterRevision : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -41334,6 +44732,7 @@ class ReadOccupancySensingOccupancy : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "occupancy"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -41357,6 +44756,9 @@ class ReadOccupancySensingOccupancy : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOccupancySensingOccupancy : public ModelCommand { @@ -41367,6 +44769,7 @@ class SubscribeAttributeOccupancySensingOccupancy : public ModelCommand { AddArgument("attr-name", "occupancy"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -41381,6 +44784,7 @@ class SubscribeAttributeOccupancySensingOccupancy : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOccupancyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -41401,6 +44805,7 @@ class SubscribeAttributeOccupancySensingOccupancy : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -41415,6 +44820,7 @@ class ReadOccupancySensingOccupancySensorType : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "occupancy-sensor-type"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -41438,6 +44844,9 @@ class ReadOccupancySensingOccupancySensorType : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOccupancySensingOccupancySensorType : public ModelCommand { @@ -41448,6 +44857,7 @@ class SubscribeAttributeOccupancySensingOccupancySensorType : public ModelComman AddArgument("attr-name", "occupancy-sensor-type"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -41462,6 +44872,7 @@ class SubscribeAttributeOccupancySensingOccupancySensorType : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOccupancySensorTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -41483,6 +44894,7 @@ class SubscribeAttributeOccupancySensingOccupancySensorType : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -41497,6 +44909,7 @@ class ReadOccupancySensingOccupancySensorTypeBitmap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "occupancy-sensor-type-bitmap"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -41521,6 +44934,9 @@ class ReadOccupancySensingOccupancySensorTypeBitmap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap : public ModelCommand { @@ -41531,6 +44947,7 @@ class SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap : public Model AddArgument("attr-name", "occupancy-sensor-type-bitmap"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -41545,6 +44962,7 @@ class SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOccupancySensorTypeBitmapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -41567,6 +44985,7 @@ class SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -41581,6 +45000,7 @@ class ReadOccupancySensingGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -41604,6 +45024,9 @@ class ReadOccupancySensingGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOccupancySensingGeneratedCommandList : public ModelCommand { @@ -41614,6 +45037,7 @@ class SubscribeAttributeOccupancySensingGeneratedCommandList : public ModelComma AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -41628,6 +45052,7 @@ class SubscribeAttributeOccupancySensingGeneratedCommandList : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -41649,6 +45074,7 @@ class SubscribeAttributeOccupancySensingGeneratedCommandList : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -41663,6 +45089,7 @@ class ReadOccupancySensingAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -41686,6 +45113,9 @@ class ReadOccupancySensingAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOccupancySensingAcceptedCommandList : public ModelCommand { @@ -41696,6 +45126,7 @@ class SubscribeAttributeOccupancySensingAcceptedCommandList : public ModelComman AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -41710,6 +45141,7 @@ class SubscribeAttributeOccupancySensingAcceptedCommandList : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -41731,6 +45163,7 @@ class SubscribeAttributeOccupancySensingAcceptedCommandList : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -41745,6 +45178,7 @@ class ReadOccupancySensingAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -41768,6 +45202,9 @@ class ReadOccupancySensingAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOccupancySensingAttributeList : public ModelCommand { @@ -41778,6 +45215,7 @@ class SubscribeAttributeOccupancySensingAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -41792,6 +45230,7 @@ class SubscribeAttributeOccupancySensingAttributeList : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -41812,6 +45251,7 @@ class SubscribeAttributeOccupancySensingAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -41826,6 +45266,7 @@ class ReadOccupancySensingClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -41849,6 +45290,9 @@ class ReadOccupancySensingClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOccupancySensingClusterRevision : public ModelCommand { @@ -41859,6 +45303,7 @@ class SubscribeAttributeOccupancySensingClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -41873,6 +45318,7 @@ class SubscribeAttributeOccupancySensingClusterRevision : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -41893,6 +45339,7 @@ class SubscribeAttributeOccupancySensingClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -41932,6 +45379,7 @@ class OnOffOff : public ModelCommand { OnOffOff() : ModelCommand("off") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -41942,6 +45390,9 @@ class OnOffOff : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPOnOffClusterOffParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster offWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -41951,6 +45402,7 @@ class OnOffOff : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -41963,6 +45415,7 @@ class OnOffOffWithEffect : public ModelCommand { { AddArgument("EffectId", 0, UINT8_MAX, &mEffectId); AddArgument("EffectVariant", 0, UINT8_MAX, &mEffectVariant); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -41974,9 +45427,9 @@ class OnOffOffWithEffect : public ModelCommand { CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPOnOffClusterOffWithEffectParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.effectId = [NSNumber numberWithUnsignedChar:mEffectId]; - params.effectVariant = [NSNumber numberWithUnsignedChar:mEffectVariant]; [cluster offWithEffectWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -41988,6 +45441,7 @@ class OnOffOffWithEffect : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mEffectId; uint8_t mEffectVariant; }; @@ -42000,6 +45454,7 @@ class OnOffOn : public ModelCommand { OnOffOn() : ModelCommand("on") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -42010,6 +45465,9 @@ class OnOffOn : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPOnOffClusterOnParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster onWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -42019,6 +45477,7 @@ class OnOffOn : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -42029,6 +45488,7 @@ class OnOffOnWithRecallGlobalScene : public ModelCommand { OnOffOnWithRecallGlobalScene() : ModelCommand("on-with-recall-global-scene") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -42039,6 +45499,9 @@ class OnOffOnWithRecallGlobalScene : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPOnOffClusterOnWithRecallGlobalSceneParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster onWithRecallGlobalSceneWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -42048,6 +45511,7 @@ class OnOffOnWithRecallGlobalScene : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -42061,6 +45525,7 @@ class OnOffOnWithTimedOff : public ModelCommand { AddArgument("OnOffControl", 0, UINT8_MAX, &mOnOffControl); AddArgument("OnTime", 0, UINT16_MAX, &mOnTime); AddArgument("OffWaitTime", 0, UINT16_MAX, &mOffWaitTime); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -42072,11 +45537,10 @@ class OnOffOnWithTimedOff : public ModelCommand { CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPOnOffClusterOnWithTimedOffParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.onOffControl = [NSNumber numberWithUnsignedChar:mOnOffControl]; - params.onTime = [NSNumber numberWithUnsignedShort:mOnTime]; - params.offWaitTime = [NSNumber numberWithUnsignedShort:mOffWaitTime]; [cluster onWithTimedOffWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -42088,6 +45552,7 @@ class OnOffOnWithTimedOff : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mOnOffControl; uint16_t mOnTime; uint16_t mOffWaitTime; @@ -42101,6 +45566,7 @@ class OnOffToggle : public ModelCommand { OnOffToggle() : ModelCommand("toggle") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -42111,6 +45577,9 @@ class OnOffToggle : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPOnOffClusterToggleParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster toggleWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -42120,6 +45589,7 @@ class OnOffToggle : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -42131,6 +45601,7 @@ class ReadOnOffOnOff : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "on-off"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -42152,6 +45623,9 @@ class ReadOnOffOnOff : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOnOffOnOff : public ModelCommand { @@ -42162,6 +45636,7 @@ class SubscribeAttributeOnOffOnOff : public ModelCommand { AddArgument("attr-name", "on-off"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -42174,6 +45649,7 @@ class SubscribeAttributeOnOffOnOff : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOnOffWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -42194,6 +45670,7 @@ class SubscribeAttributeOnOffOnOff : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -42208,6 +45685,7 @@ class ReadOnOffGlobalSceneControl : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "global-scene-control"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -42229,6 +45707,9 @@ class ReadOnOffGlobalSceneControl : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOnOffGlobalSceneControl : public ModelCommand { @@ -42239,6 +45720,7 @@ class SubscribeAttributeOnOffGlobalSceneControl : public ModelCommand { AddArgument("attr-name", "global-scene-control"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -42251,6 +45733,7 @@ class SubscribeAttributeOnOffGlobalSceneControl : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGlobalSceneControlWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -42271,6 +45754,7 @@ class SubscribeAttributeOnOffGlobalSceneControl : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -42285,6 +45769,7 @@ class ReadOnOffOnTime : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "on-time"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -42306,6 +45791,9 @@ class ReadOnOffOnTime : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteOnOffOnTime : public ModelCommand { @@ -42315,6 +45803,7 @@ class WriteOnOffOnTime : public ModelCommand { { AddArgument("attr-name", "on-time"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -42326,10 +45815,13 @@ class WriteOnOffOnTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeOnTimeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "OnOff OnTime Error: %s", chip::ErrorStr(chipError)); @@ -42339,6 +45831,7 @@ class WriteOnOffOnTime : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -42350,6 +45843,7 @@ class SubscribeAttributeOnOffOnTime : public ModelCommand { AddArgument("attr-name", "on-time"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -42362,6 +45856,7 @@ class SubscribeAttributeOnOffOnTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOnTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -42382,6 +45877,7 @@ class SubscribeAttributeOnOffOnTime : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -42396,6 +45892,7 @@ class ReadOnOffOffWaitTime : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "off-wait-time"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -42417,6 +45914,9 @@ class ReadOnOffOffWaitTime : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteOnOffOffWaitTime : public ModelCommand { @@ -42426,6 +45926,7 @@ class WriteOnOffOffWaitTime : public ModelCommand { { AddArgument("attr-name", "off-wait-time"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -42437,10 +45938,13 @@ class WriteOnOffOffWaitTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeOffWaitTimeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "OnOff OffWaitTime Error: %s", chip::ErrorStr(chipError)); @@ -42450,6 +45954,7 @@ class WriteOnOffOffWaitTime : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -42461,6 +45966,7 @@ class SubscribeAttributeOnOffOffWaitTime : public ModelCommand { AddArgument("attr-name", "off-wait-time"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -42473,6 +45979,7 @@ class SubscribeAttributeOnOffOffWaitTime : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOffWaitTimeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -42493,6 +46000,7 @@ class SubscribeAttributeOnOffOffWaitTime : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -42507,6 +46015,7 @@ class ReadOnOffStartUpOnOff : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "start-up-on-off"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -42528,6 +46037,9 @@ class ReadOnOffStartUpOnOff : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteOnOffStartUpOnOff : public ModelCommand { @@ -42537,6 +46049,7 @@ class WriteOnOffStartUpOnOff : public ModelCommand { { AddArgument("attr-name", "start-up-on-off"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -42548,10 +46061,13 @@ class WriteOnOffStartUpOnOff : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeStartUpOnOffWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "OnOff StartUpOnOff Error: %s", chip::ErrorStr(chipError)); @@ -42561,6 +46077,7 @@ class WriteOnOffStartUpOnOff : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -42572,6 +46089,7 @@ class SubscribeAttributeOnOffStartUpOnOff : public ModelCommand { AddArgument("attr-name", "start-up-on-off"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -42584,6 +46102,7 @@ class SubscribeAttributeOnOffStartUpOnOff : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeStartUpOnOffWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -42604,6 +46123,7 @@ class SubscribeAttributeOnOffStartUpOnOff : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -42618,6 +46138,7 @@ class ReadOnOffGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -42639,6 +46160,9 @@ class ReadOnOffGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOnOffGeneratedCommandList : public ModelCommand { @@ -42649,6 +46173,7 @@ class SubscribeAttributeOnOffGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -42661,6 +46186,7 @@ class SubscribeAttributeOnOffGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -42681,6 +46207,7 @@ class SubscribeAttributeOnOffGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -42695,6 +46222,7 @@ class ReadOnOffAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -42716,6 +46244,9 @@ class ReadOnOffAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOnOffAcceptedCommandList : public ModelCommand { @@ -42726,6 +46257,7 @@ class SubscribeAttributeOnOffAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -42738,6 +46270,7 @@ class SubscribeAttributeOnOffAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -42758,6 +46291,7 @@ class SubscribeAttributeOnOffAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -42772,6 +46306,7 @@ class ReadOnOffAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -42793,6 +46328,9 @@ class ReadOnOffAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOnOffAttributeList : public ModelCommand { @@ -42803,6 +46341,7 @@ class SubscribeAttributeOnOffAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -42815,6 +46354,7 @@ class SubscribeAttributeOnOffAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -42835,6 +46375,7 @@ class SubscribeAttributeOnOffAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -42849,6 +46390,7 @@ class ReadOnOffFeatureMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "feature-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -42870,6 +46412,9 @@ class ReadOnOffFeatureMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOnOffFeatureMap : public ModelCommand { @@ -42880,6 +46425,7 @@ class SubscribeAttributeOnOffFeatureMap : public ModelCommand { AddArgument("attr-name", "feature-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -42892,6 +46438,7 @@ class SubscribeAttributeOnOffFeatureMap : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -42912,6 +46459,7 @@ class SubscribeAttributeOnOffFeatureMap : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -42926,6 +46474,7 @@ class ReadOnOffClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -42947,6 +46496,9 @@ class ReadOnOffClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOnOffClusterRevision : public ModelCommand { @@ -42957,6 +46509,7 @@ class SubscribeAttributeOnOffClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -42969,6 +46522,7 @@ class SubscribeAttributeOnOffClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPOnOff * cluster = [[CHIPOnOff alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -42989,6 +46543,7 @@ class SubscribeAttributeOnOffClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -43020,6 +46575,7 @@ class ReadOnOffSwitchConfigurationSwitchType : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "switch-type"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -43043,6 +46599,9 @@ class ReadOnOffSwitchConfigurationSwitchType : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOnOffSwitchConfigurationSwitchType : public ModelCommand { @@ -43053,6 +46612,7 @@ class SubscribeAttributeOnOffSwitchConfigurationSwitchType : public ModelCommand AddArgument("attr-name", "switch-type"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -43067,6 +46627,7 @@ class SubscribeAttributeOnOffSwitchConfigurationSwitchType : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSwitchTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -43087,6 +46648,7 @@ class SubscribeAttributeOnOffSwitchConfigurationSwitchType : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -43101,6 +46663,7 @@ class ReadOnOffSwitchConfigurationSwitchActions : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "switch-actions"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -43124,6 +46687,9 @@ class ReadOnOffSwitchConfigurationSwitchActions : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteOnOffSwitchConfigurationSwitchActions : public ModelCommand { @@ -43133,6 +46699,7 @@ class WriteOnOffSwitchConfigurationSwitchActions : public ModelCommand { { AddArgument("attr-name", "switch-actions"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -43146,10 +46713,13 @@ class WriteOnOffSwitchConfigurationSwitchActions : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeSwitchActionsWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "OnOffSwitchConfiguration SwitchActions Error: %s", @@ -43160,6 +46730,7 @@ class WriteOnOffSwitchConfigurationSwitchActions : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -43171,6 +46742,7 @@ class SubscribeAttributeOnOffSwitchConfigurationSwitchActions : public ModelComm AddArgument("attr-name", "switch-actions"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -43185,6 +46757,7 @@ class SubscribeAttributeOnOffSwitchConfigurationSwitchActions : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSwitchActionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -43206,6 +46779,7 @@ class SubscribeAttributeOnOffSwitchConfigurationSwitchActions : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -43220,6 +46794,7 @@ class ReadOnOffSwitchConfigurationGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -43243,6 +46818,9 @@ class ReadOnOffSwitchConfigurationGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList : public ModelCommand { @@ -43253,6 +46831,7 @@ class SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList : public Mo AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -43267,6 +46846,7 @@ class SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList : public Mo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -43288,6 +46868,7 @@ class SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList : public Mo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -43302,6 +46883,7 @@ class ReadOnOffSwitchConfigurationAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -43325,6 +46907,9 @@ class ReadOnOffSwitchConfigurationAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList : public ModelCommand { @@ -43335,6 +46920,7 @@ class SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList : public Mod AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -43349,6 +46935,7 @@ class SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList : public Mod endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -43370,6 +46957,7 @@ class SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList : public Mod } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -43384,6 +46972,7 @@ class ReadOnOffSwitchConfigurationAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -43407,6 +46996,9 @@ class ReadOnOffSwitchConfigurationAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOnOffSwitchConfigurationAttributeList : public ModelCommand { @@ -43417,6 +47009,7 @@ class SubscribeAttributeOnOffSwitchConfigurationAttributeList : public ModelComm AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -43431,6 +47024,7 @@ class SubscribeAttributeOnOffSwitchConfigurationAttributeList : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -43452,6 +47046,7 @@ class SubscribeAttributeOnOffSwitchConfigurationAttributeList : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -43466,6 +47061,7 @@ class ReadOnOffSwitchConfigurationClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -43489,6 +47085,9 @@ class ReadOnOffSwitchConfigurationClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOnOffSwitchConfigurationClusterRevision : public ModelCommand { @@ -43499,6 +47098,7 @@ class SubscribeAttributeOnOffSwitchConfigurationClusterRevision : public ModelCo AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -43513,6 +47113,7 @@ class SubscribeAttributeOnOffSwitchConfigurationClusterRevision : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -43534,6 +47135,7 @@ class SubscribeAttributeOnOffSwitchConfigurationClusterRevision : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -43582,6 +47184,7 @@ class OperationalCredentialsAddNOC : public ModelCommand { AddArgument("IPKValue", &mIPKValue); AddArgument("CaseAdminNode", 0, UINT64_MAX, &mCaseAdminNode); AddArgument("AdminVendorId", 0, UINT16_MAX, &mAdminVendorId); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -43595,15 +47198,12 @@ class OperationalCredentialsAddNOC : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPOperationalCredentialsClusterAddNOCParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.nocValue = [[NSData alloc] initWithBytes:mNOCValue.data() length:mNOCValue.size()]; - params.icacValue = [[NSData alloc] initWithBytes:mICACValue.data() length:mICACValue.size()]; - params.ipkValue = [[NSData alloc] initWithBytes:mIPKValue.data() length:mIPKValue.size()]; - params.caseAdminNode = [NSNumber numberWithUnsignedLongLong:mCaseAdminNode]; - params.adminVendorId = [NSNumber numberWithUnsignedShort:mAdminVendorId]; [cluster addNOCWithParams:params @@ -43617,6 +47217,7 @@ class OperationalCredentialsAddNOC : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mNOCValue; chip::ByteSpan mICACValue; chip::ByteSpan mIPKValue; @@ -43633,6 +47234,7 @@ class OperationalCredentialsAddTrustedRootCertificate : public ModelCommand { : ModelCommand("add-trusted-root-certificate") { AddArgument("RootCertificate", &mRootCertificate); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -43646,7 +47248,8 @@ class OperationalCredentialsAddTrustedRootCertificate : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPOperationalCredentialsClusterAddTrustedRootCertificateParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.rootCertificate = [[NSData alloc] initWithBytes:mRootCertificate.data() length:mRootCertificate.size()]; [cluster addTrustedRootCertificateWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -43658,6 +47261,7 @@ class OperationalCredentialsAddTrustedRootCertificate : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mRootCertificate; }; @@ -43670,6 +47274,7 @@ class OperationalCredentialsAttestationRequest : public ModelCommand { : ModelCommand("attestation-request") { AddArgument("AttestationNonce", &mAttestationNonce); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -43683,7 +47288,8 @@ class OperationalCredentialsAttestationRequest : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPOperationalCredentialsClusterAttestationRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.attestationNonce = [[NSData alloc] initWithBytes:mAttestationNonce.data() length:mAttestationNonce.size()]; [cluster attestationRequestWithParams:params completionHandler:^(CHIPOperationalCredentialsClusterAttestationResponseParams * _Nullable values, @@ -43697,6 +47303,7 @@ class OperationalCredentialsAttestationRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mAttestationNonce; }; @@ -43709,6 +47316,7 @@ class OperationalCredentialsCSRRequest : public ModelCommand { : ModelCommand("csrrequest") { AddArgument("CSRNonce", &mCSRNonce); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -43722,7 +47330,8 @@ class OperationalCredentialsCSRRequest : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPOperationalCredentialsClusterCSRRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.csrNonce = [[NSData alloc] initWithBytes:mCSRNonce.data() length:mCSRNonce.size()]; [cluster CSRRequestWithParams:params completionHandler:^( @@ -43736,6 +47345,7 @@ class OperationalCredentialsCSRRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mCSRNonce; }; @@ -43748,6 +47358,7 @@ class OperationalCredentialsCertificateChainRequest : public ModelCommand { : ModelCommand("certificate-chain-request") { AddArgument("CertificateType", 0, UINT8_MAX, &mCertificateType); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -43761,7 +47372,8 @@ class OperationalCredentialsCertificateChainRequest : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPOperationalCredentialsClusterCertificateChainRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.certificateType = [NSNumber numberWithUnsignedChar:mCertificateType]; [cluster certificateChainRequestWithParams:params @@ -43776,6 +47388,7 @@ class OperationalCredentialsCertificateChainRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mCertificateType; }; @@ -43788,6 +47401,7 @@ class OperationalCredentialsRemoveFabric : public ModelCommand { : ModelCommand("remove-fabric") { AddArgument("FabricIndex", 0, UINT8_MAX, &mFabricIndex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -43801,7 +47415,8 @@ class OperationalCredentialsRemoveFabric : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPOperationalCredentialsClusterRemoveFabricParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.fabricIndex = [NSNumber numberWithUnsignedChar:mFabricIndex]; [cluster removeFabricWithParams:params completionHandler:^( @@ -43815,6 +47430,7 @@ class OperationalCredentialsRemoveFabric : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::FabricIndex mFabricIndex; }; @@ -43827,6 +47443,7 @@ class OperationalCredentialsRemoveTrustedRootCertificate : public ModelCommand { : ModelCommand("remove-trusted-root-certificate") { AddArgument("TrustedRootIdentifier", &mTrustedRootIdentifier); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -43840,7 +47457,8 @@ class OperationalCredentialsRemoveTrustedRootCertificate : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPOperationalCredentialsClusterRemoveTrustedRootCertificateParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.trustedRootIdentifier = [[NSData alloc] initWithBytes:mTrustedRootIdentifier.data() length:mTrustedRootIdentifier.size()]; [cluster removeTrustedRootCertificateWithParams:params @@ -43853,6 +47471,7 @@ class OperationalCredentialsRemoveTrustedRootCertificate : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mTrustedRootIdentifier; }; @@ -43865,6 +47484,7 @@ class OperationalCredentialsUpdateFabricLabel : public ModelCommand { : ModelCommand("update-fabric-label") { AddArgument("Label", &mLabel); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -43878,7 +47498,8 @@ class OperationalCredentialsUpdateFabricLabel : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPOperationalCredentialsClusterUpdateFabricLabelParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.label = [[NSString alloc] initWithBytes:mLabel.data() length:mLabel.size() encoding:NSUTF8StringEncoding]; [cluster updateFabricLabelWithParams:params completionHandler:^( @@ -43892,6 +47513,7 @@ class OperationalCredentialsUpdateFabricLabel : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mLabel; }; @@ -43905,6 +47527,7 @@ class OperationalCredentialsUpdateNOC : public ModelCommand { { AddArgument("NOCValue", &mNOCValue); AddArgument("ICACValue", &mICACValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -43918,9 +47541,9 @@ class OperationalCredentialsUpdateNOC : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPOperationalCredentialsClusterUpdateNOCParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.nocValue = [[NSData alloc] initWithBytes:mNOCValue.data() length:mNOCValue.size()]; - params.icacValue = [[NSData alloc] initWithBytes:mICACValue.data() length:mICACValue.size()]; [cluster updateNOCWithParams:params completionHandler:^( @@ -43934,6 +47557,7 @@ class OperationalCredentialsUpdateNOC : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mNOCValue; chip::ByteSpan mICACValue; }; @@ -43947,6 +47571,7 @@ class ReadOperationalCredentialsNOCs : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nocs"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -43962,6 +47587,7 @@ class ReadOperationalCredentialsNOCs : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block err = CHIP_NO_ERROR; CHIPReadParams * params = [[CHIPReadParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster readAttributeNOCsWithParams:params completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { NSLog(@"OperationalCredentials.NOCs response %@", [value description]); @@ -43972,6 +47598,9 @@ class ReadOperationalCredentialsNOCs : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOperationalCredentialsNOCs : public ModelCommand { @@ -43982,6 +47611,7 @@ class SubscribeAttributeOperationalCredentialsNOCs : public ModelCommand { AddArgument("attr-name", "nocs"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -43996,6 +47626,7 @@ class SubscribeAttributeOperationalCredentialsNOCs : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNOCsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -44016,6 +47647,7 @@ class SubscribeAttributeOperationalCredentialsNOCs : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -44030,6 +47662,7 @@ class ReadOperationalCredentialsFabrics : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "fabrics"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -44045,6 +47678,7 @@ class ReadOperationalCredentialsFabrics : public ModelCommand { queue:callbackQueue]; CHIP_ERROR __block err = CHIP_NO_ERROR; CHIPReadParams * params = [[CHIPReadParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster readAttributeFabricsWithParams:params completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { NSLog(@"OperationalCredentials.Fabrics response %@", [value description]); @@ -44055,6 +47689,9 @@ class ReadOperationalCredentialsFabrics : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOperationalCredentialsFabrics : public ModelCommand { @@ -44065,6 +47702,7 @@ class SubscribeAttributeOperationalCredentialsFabrics : public ModelCommand { AddArgument("attr-name", "fabrics"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -44079,6 +47717,7 @@ class SubscribeAttributeOperationalCredentialsFabrics : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFabricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -44099,6 +47738,7 @@ class SubscribeAttributeOperationalCredentialsFabrics : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -44113,6 +47753,7 @@ class ReadOperationalCredentialsSupportedFabrics : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "supported-fabrics"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -44136,6 +47777,9 @@ class ReadOperationalCredentialsSupportedFabrics : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOperationalCredentialsSupportedFabrics : public ModelCommand { @@ -44146,6 +47790,7 @@ class SubscribeAttributeOperationalCredentialsSupportedFabrics : public ModelCom AddArgument("attr-name", "supported-fabrics"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -44160,6 +47805,7 @@ class SubscribeAttributeOperationalCredentialsSupportedFabrics : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSupportedFabricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -44181,6 +47827,7 @@ class SubscribeAttributeOperationalCredentialsSupportedFabrics : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -44195,6 +47842,7 @@ class ReadOperationalCredentialsCommissionedFabrics : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "commissioned-fabrics"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -44218,6 +47866,9 @@ class ReadOperationalCredentialsCommissionedFabrics : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOperationalCredentialsCommissionedFabrics : public ModelCommand { @@ -44228,6 +47879,7 @@ class SubscribeAttributeOperationalCredentialsCommissionedFabrics : public Model AddArgument("attr-name", "commissioned-fabrics"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -44242,6 +47894,7 @@ class SubscribeAttributeOperationalCredentialsCommissionedFabrics : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCommissionedFabricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -44263,6 +47916,7 @@ class SubscribeAttributeOperationalCredentialsCommissionedFabrics : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -44277,6 +47931,7 @@ class ReadOperationalCredentialsTrustedRootCertificates : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "trusted-root-certificates"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -44300,6 +47955,9 @@ class ReadOperationalCredentialsTrustedRootCertificates : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOperationalCredentialsTrustedRootCertificates : public ModelCommand { @@ -44310,6 +47968,7 @@ class SubscribeAttributeOperationalCredentialsTrustedRootCertificates : public M AddArgument("attr-name", "trusted-root-certificates"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -44324,6 +47983,7 @@ class SubscribeAttributeOperationalCredentialsTrustedRootCertificates : public M endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTrustedRootCertificatesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -44345,6 +48005,7 @@ class SubscribeAttributeOperationalCredentialsTrustedRootCertificates : public M } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -44359,6 +48020,7 @@ class ReadOperationalCredentialsCurrentFabricIndex : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-fabric-index"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -44382,6 +48044,9 @@ class ReadOperationalCredentialsCurrentFabricIndex : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOperationalCredentialsCurrentFabricIndex : public ModelCommand { @@ -44392,6 +48057,7 @@ class SubscribeAttributeOperationalCredentialsCurrentFabricIndex : public ModelC AddArgument("attr-name", "current-fabric-index"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -44406,6 +48072,7 @@ class SubscribeAttributeOperationalCredentialsCurrentFabricIndex : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentFabricIndexWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -44427,6 +48094,7 @@ class SubscribeAttributeOperationalCredentialsCurrentFabricIndex : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -44441,6 +48109,7 @@ class ReadOperationalCredentialsGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -44464,6 +48133,9 @@ class ReadOperationalCredentialsGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOperationalCredentialsGeneratedCommandList : public ModelCommand { @@ -44474,6 +48146,7 @@ class SubscribeAttributeOperationalCredentialsGeneratedCommandList : public Mode AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -44488,6 +48161,7 @@ class SubscribeAttributeOperationalCredentialsGeneratedCommandList : public Mode endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -44509,6 +48183,7 @@ class SubscribeAttributeOperationalCredentialsGeneratedCommandList : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -44523,6 +48198,7 @@ class ReadOperationalCredentialsAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -44546,6 +48222,9 @@ class ReadOperationalCredentialsAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOperationalCredentialsAcceptedCommandList : public ModelCommand { @@ -44556,6 +48235,7 @@ class SubscribeAttributeOperationalCredentialsAcceptedCommandList : public Model AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -44570,6 +48250,7 @@ class SubscribeAttributeOperationalCredentialsAcceptedCommandList : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -44591,6 +48272,7 @@ class SubscribeAttributeOperationalCredentialsAcceptedCommandList : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -44605,6 +48287,7 @@ class ReadOperationalCredentialsAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -44628,6 +48311,9 @@ class ReadOperationalCredentialsAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOperationalCredentialsAttributeList : public ModelCommand { @@ -44638,6 +48324,7 @@ class SubscribeAttributeOperationalCredentialsAttributeList : public ModelComman AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -44652,6 +48339,7 @@ class SubscribeAttributeOperationalCredentialsAttributeList : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -44673,6 +48361,7 @@ class SubscribeAttributeOperationalCredentialsAttributeList : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -44687,6 +48376,7 @@ class ReadOperationalCredentialsClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -44710,6 +48400,9 @@ class ReadOperationalCredentialsClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeOperationalCredentialsClusterRevision : public ModelCommand { @@ -44720,6 +48413,7 @@ class SubscribeAttributeOperationalCredentialsClusterRevision : public ModelComm AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -44734,6 +48428,7 @@ class SubscribeAttributeOperationalCredentialsClusterRevision : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -44755,6 +48450,7 @@ class SubscribeAttributeOperationalCredentialsClusterRevision : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -44815,6 +48511,7 @@ class ReadPowerSourceStatus : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "status"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -44836,6 +48533,9 @@ class ReadPowerSourceStatus : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceStatus : public ModelCommand { @@ -44846,6 +48546,7 @@ class SubscribeAttributePowerSourceStatus : public ModelCommand { AddArgument("attr-name", "status"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -44858,6 +48559,7 @@ class SubscribeAttributePowerSourceStatus : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -44878,6 +48580,7 @@ class SubscribeAttributePowerSourceStatus : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -44892,6 +48595,7 @@ class ReadPowerSourceOrder : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "order"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -44913,6 +48617,9 @@ class ReadPowerSourceOrder : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceOrder : public ModelCommand { @@ -44923,6 +48630,7 @@ class SubscribeAttributePowerSourceOrder : public ModelCommand { AddArgument("attr-name", "order"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -44935,6 +48643,7 @@ class SubscribeAttributePowerSourceOrder : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOrderWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -44955,6 +48664,7 @@ class SubscribeAttributePowerSourceOrder : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -44969,6 +48679,7 @@ class ReadPowerSourceDescription : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "description"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -44990,6 +48701,9 @@ class ReadPowerSourceDescription : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceDescription : public ModelCommand { @@ -45000,6 +48714,7 @@ class SubscribeAttributePowerSourceDescription : public ModelCommand { AddArgument("attr-name", "description"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -45012,6 +48727,7 @@ class SubscribeAttributePowerSourceDescription : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeDescriptionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -45032,6 +48748,7 @@ class SubscribeAttributePowerSourceDescription : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -45046,6 +48763,7 @@ class ReadPowerSourceBatteryVoltage : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "battery-voltage"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -45067,6 +48785,9 @@ class ReadPowerSourceBatteryVoltage : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceBatteryVoltage : public ModelCommand { @@ -45077,6 +48798,7 @@ class SubscribeAttributePowerSourceBatteryVoltage : public ModelCommand { AddArgument("attr-name", "battery-voltage"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -45089,6 +48811,7 @@ class SubscribeAttributePowerSourceBatteryVoltage : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBatteryVoltageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -45109,6 +48832,7 @@ class SubscribeAttributePowerSourceBatteryVoltage : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -45123,6 +48847,7 @@ class ReadPowerSourceBatteryPercentRemaining : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "battery-percent-remaining"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -45145,6 +48870,9 @@ class ReadPowerSourceBatteryPercentRemaining : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceBatteryPercentRemaining : public ModelCommand { @@ -45155,6 +48883,7 @@ class SubscribeAttributePowerSourceBatteryPercentRemaining : public ModelCommand AddArgument("attr-name", "battery-percent-remaining"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -45167,6 +48896,7 @@ class SubscribeAttributePowerSourceBatteryPercentRemaining : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBatteryPercentRemainingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -45188,6 +48918,7 @@ class SubscribeAttributePowerSourceBatteryPercentRemaining : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -45202,6 +48933,7 @@ class ReadPowerSourceBatteryTimeRemaining : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "battery-time-remaining"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -45223,6 +48955,9 @@ class ReadPowerSourceBatteryTimeRemaining : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceBatteryTimeRemaining : public ModelCommand { @@ -45233,6 +48968,7 @@ class SubscribeAttributePowerSourceBatteryTimeRemaining : public ModelCommand { AddArgument("attr-name", "battery-time-remaining"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -45245,6 +48981,7 @@ class SubscribeAttributePowerSourceBatteryTimeRemaining : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBatteryTimeRemainingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -45266,6 +49003,7 @@ class SubscribeAttributePowerSourceBatteryTimeRemaining : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -45280,6 +49018,7 @@ class ReadPowerSourceBatteryChargeLevel : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "battery-charge-level"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -45301,6 +49040,9 @@ class ReadPowerSourceBatteryChargeLevel : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceBatteryChargeLevel : public ModelCommand { @@ -45311,6 +49053,7 @@ class SubscribeAttributePowerSourceBatteryChargeLevel : public ModelCommand { AddArgument("attr-name", "battery-charge-level"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -45323,6 +49066,7 @@ class SubscribeAttributePowerSourceBatteryChargeLevel : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBatteryChargeLevelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -45344,6 +49088,7 @@ class SubscribeAttributePowerSourceBatteryChargeLevel : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -45358,6 +49103,7 @@ class ReadPowerSourceActiveBatteryFaults : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "active-battery-faults"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -45379,6 +49125,9 @@ class ReadPowerSourceActiveBatteryFaults : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceActiveBatteryFaults : public ModelCommand { @@ -45389,6 +49138,7 @@ class SubscribeAttributePowerSourceActiveBatteryFaults : public ModelCommand { AddArgument("attr-name", "active-battery-faults"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -45401,6 +49151,7 @@ class SubscribeAttributePowerSourceActiveBatteryFaults : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeActiveBatteryFaultsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -45422,6 +49173,7 @@ class SubscribeAttributePowerSourceActiveBatteryFaults : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -45436,6 +49188,7 @@ class ReadPowerSourceBatteryChargeState : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "battery-charge-state"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -45457,6 +49210,9 @@ class ReadPowerSourceBatteryChargeState : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceBatteryChargeState : public ModelCommand { @@ -45467,6 +49223,7 @@ class SubscribeAttributePowerSourceBatteryChargeState : public ModelCommand { AddArgument("attr-name", "battery-charge-state"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -45479,6 +49236,7 @@ class SubscribeAttributePowerSourceBatteryChargeState : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBatteryChargeStateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -45500,6 +49258,7 @@ class SubscribeAttributePowerSourceBatteryChargeState : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -45514,6 +49273,7 @@ class ReadPowerSourceGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -45535,6 +49295,9 @@ class ReadPowerSourceGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceGeneratedCommandList : public ModelCommand { @@ -45545,6 +49308,7 @@ class SubscribeAttributePowerSourceGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -45557,6 +49321,7 @@ class SubscribeAttributePowerSourceGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -45578,6 +49343,7 @@ class SubscribeAttributePowerSourceGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -45592,6 +49358,7 @@ class ReadPowerSourceAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -45613,6 +49380,9 @@ class ReadPowerSourceAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceAcceptedCommandList : public ModelCommand { @@ -45623,6 +49393,7 @@ class SubscribeAttributePowerSourceAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -45635,6 +49406,7 @@ class SubscribeAttributePowerSourceAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -45656,6 +49428,7 @@ class SubscribeAttributePowerSourceAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -45670,6 +49443,7 @@ class ReadPowerSourceAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -45691,6 +49465,9 @@ class ReadPowerSourceAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceAttributeList : public ModelCommand { @@ -45701,6 +49478,7 @@ class SubscribeAttributePowerSourceAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -45713,6 +49491,7 @@ class SubscribeAttributePowerSourceAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -45733,6 +49512,7 @@ class SubscribeAttributePowerSourceAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -45747,6 +49527,7 @@ class ReadPowerSourceFeatureMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "feature-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -45768,6 +49549,9 @@ class ReadPowerSourceFeatureMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceFeatureMap : public ModelCommand { @@ -45778,6 +49562,7 @@ class SubscribeAttributePowerSourceFeatureMap : public ModelCommand { AddArgument("attr-name", "feature-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -45790,6 +49575,7 @@ class SubscribeAttributePowerSourceFeatureMap : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -45810,6 +49596,7 @@ class SubscribeAttributePowerSourceFeatureMap : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -45824,6 +49611,7 @@ class ReadPowerSourceClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -45845,6 +49633,9 @@ class ReadPowerSourceClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceClusterRevision : public ModelCommand { @@ -45855,6 +49646,7 @@ class SubscribeAttributePowerSourceClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -45867,6 +49659,7 @@ class SubscribeAttributePowerSourceClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPPowerSource * cluster = [[CHIPPowerSource alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -45887,6 +49680,7 @@ class SubscribeAttributePowerSourceClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -45917,6 +49711,7 @@ class ReadPowerSourceConfigurationSources : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "sources"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -45940,6 +49735,9 @@ class ReadPowerSourceConfigurationSources : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceConfigurationSources : public ModelCommand { @@ -45950,6 +49748,7 @@ class SubscribeAttributePowerSourceConfigurationSources : public ModelCommand { AddArgument("attr-name", "sources"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -45964,6 +49763,7 @@ class SubscribeAttributePowerSourceConfigurationSources : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSourcesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -45984,6 +49784,7 @@ class SubscribeAttributePowerSourceConfigurationSources : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -45998,6 +49799,7 @@ class ReadPowerSourceConfigurationGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -46021,6 +49823,9 @@ class ReadPowerSourceConfigurationGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceConfigurationGeneratedCommandList : public ModelCommand { @@ -46031,6 +49836,7 @@ class SubscribeAttributePowerSourceConfigurationGeneratedCommandList : public Mo AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -46045,6 +49851,7 @@ class SubscribeAttributePowerSourceConfigurationGeneratedCommandList : public Mo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -46066,6 +49873,7 @@ class SubscribeAttributePowerSourceConfigurationGeneratedCommandList : public Mo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -46080,6 +49888,7 @@ class ReadPowerSourceConfigurationAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -46103,6 +49912,9 @@ class ReadPowerSourceConfigurationAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceConfigurationAcceptedCommandList : public ModelCommand { @@ -46113,6 +49925,7 @@ class SubscribeAttributePowerSourceConfigurationAcceptedCommandList : public Mod AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -46127,6 +49940,7 @@ class SubscribeAttributePowerSourceConfigurationAcceptedCommandList : public Mod endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -46148,6 +49962,7 @@ class SubscribeAttributePowerSourceConfigurationAcceptedCommandList : public Mod } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -46162,6 +49977,7 @@ class ReadPowerSourceConfigurationAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -46185,6 +50001,9 @@ class ReadPowerSourceConfigurationAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceConfigurationAttributeList : public ModelCommand { @@ -46195,6 +50014,7 @@ class SubscribeAttributePowerSourceConfigurationAttributeList : public ModelComm AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -46209,6 +50029,7 @@ class SubscribeAttributePowerSourceConfigurationAttributeList : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -46230,6 +50051,7 @@ class SubscribeAttributePowerSourceConfigurationAttributeList : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -46244,6 +50066,7 @@ class ReadPowerSourceConfigurationClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -46267,6 +50090,9 @@ class ReadPowerSourceConfigurationClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePowerSourceConfigurationClusterRevision : public ModelCommand { @@ -46277,6 +50103,7 @@ class SubscribeAttributePowerSourceConfigurationClusterRevision : public ModelCo AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -46291,6 +50118,7 @@ class SubscribeAttributePowerSourceConfigurationClusterRevision : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -46312,6 +50140,7 @@ class SubscribeAttributePowerSourceConfigurationClusterRevision : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -46350,6 +50179,7 @@ class ReadPressureMeasurementMeasuredValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "measured-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -46373,6 +50203,9 @@ class ReadPressureMeasurementMeasuredValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePressureMeasurementMeasuredValue : public ModelCommand { @@ -46383,6 +50216,7 @@ class SubscribeAttributePressureMeasurementMeasuredValue : public ModelCommand { AddArgument("attr-name", "measured-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -46397,6 +50231,7 @@ class SubscribeAttributePressureMeasurementMeasuredValue : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -46417,6 +50252,7 @@ class SubscribeAttributePressureMeasurementMeasuredValue : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -46431,6 +50267,7 @@ class ReadPressureMeasurementMinMeasuredValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-measured-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -46454,6 +50291,9 @@ class ReadPressureMeasurementMinMeasuredValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePressureMeasurementMinMeasuredValue : public ModelCommand { @@ -46464,6 +50304,7 @@ class SubscribeAttributePressureMeasurementMinMeasuredValue : public ModelComman AddArgument("attr-name", "min-measured-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -46478,6 +50319,7 @@ class SubscribeAttributePressureMeasurementMinMeasuredValue : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -46499,6 +50341,7 @@ class SubscribeAttributePressureMeasurementMinMeasuredValue : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -46513,6 +50356,7 @@ class ReadPressureMeasurementMaxMeasuredValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-measured-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -46536,6 +50380,9 @@ class ReadPressureMeasurementMaxMeasuredValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePressureMeasurementMaxMeasuredValue : public ModelCommand { @@ -46546,6 +50393,7 @@ class SubscribeAttributePressureMeasurementMaxMeasuredValue : public ModelComman AddArgument("attr-name", "max-measured-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -46560,6 +50408,7 @@ class SubscribeAttributePressureMeasurementMaxMeasuredValue : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -46581,6 +50430,7 @@ class SubscribeAttributePressureMeasurementMaxMeasuredValue : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -46595,6 +50445,7 @@ class ReadPressureMeasurementAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -46618,6 +50469,9 @@ class ReadPressureMeasurementAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePressureMeasurementAttributeList : public ModelCommand { @@ -46628,6 +50482,7 @@ class SubscribeAttributePressureMeasurementAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -46642,6 +50497,7 @@ class SubscribeAttributePressureMeasurementAttributeList : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -46662,6 +50518,7 @@ class SubscribeAttributePressureMeasurementAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -46676,6 +50533,7 @@ class ReadPressureMeasurementClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -46699,6 +50557,9 @@ class ReadPressureMeasurementClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePressureMeasurementClusterRevision : public ModelCommand { @@ -46709,6 +50570,7 @@ class SubscribeAttributePressureMeasurementClusterRevision : public ModelCommand AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -46723,6 +50585,7 @@ class SubscribeAttributePressureMeasurementClusterRevision : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -46744,6 +50607,7 @@ class SubscribeAttributePressureMeasurementClusterRevision : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -46814,6 +50678,7 @@ class ReadPumpConfigurationAndControlMaxPressure : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-pressure"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -46837,6 +50702,9 @@ class ReadPumpConfigurationAndControlMaxPressure : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlMaxPressure : public ModelCommand { @@ -46847,6 +50715,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxPressure : public ModelCom AddArgument("attr-name", "max-pressure"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -46861,6 +50730,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxPressure : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -46882,6 +50752,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxPressure : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -46896,6 +50767,7 @@ class ReadPumpConfigurationAndControlMaxSpeed : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-speed"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -46919,6 +50791,9 @@ class ReadPumpConfigurationAndControlMaxSpeed : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlMaxSpeed : public ModelCommand { @@ -46929,6 +50804,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxSpeed : public ModelComman AddArgument("attr-name", "max-speed"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -46943,6 +50819,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxSpeed : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -46963,6 +50840,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxSpeed : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -46977,6 +50855,7 @@ class ReadPumpConfigurationAndControlMaxFlow : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-flow"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -47000,6 +50879,9 @@ class ReadPumpConfigurationAndControlMaxFlow : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlMaxFlow : public ModelCommand { @@ -47010,6 +50892,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxFlow : public ModelCommand AddArgument("attr-name", "max-flow"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -47024,6 +50907,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxFlow : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxFlowWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -47044,6 +50928,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxFlow : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -47058,6 +50943,7 @@ class ReadPumpConfigurationAndControlMinConstPressure : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-const-pressure"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -47081,6 +50967,9 @@ class ReadPumpConfigurationAndControlMinConstPressure : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlMinConstPressure : public ModelCommand { @@ -47091,6 +50980,7 @@ class SubscribeAttributePumpConfigurationAndControlMinConstPressure : public Mod AddArgument("attr-name", "min-const-pressure"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -47105,6 +50995,7 @@ class SubscribeAttributePumpConfigurationAndControlMinConstPressure : public Mod endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinConstPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -47126,6 +51017,7 @@ class SubscribeAttributePumpConfigurationAndControlMinConstPressure : public Mod } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -47140,6 +51032,7 @@ class ReadPumpConfigurationAndControlMaxConstPressure : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-const-pressure"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -47163,6 +51056,9 @@ class ReadPumpConfigurationAndControlMaxConstPressure : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlMaxConstPressure : public ModelCommand { @@ -47173,6 +51069,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstPressure : public Mod AddArgument("attr-name", "max-const-pressure"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -47187,6 +51084,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstPressure : public Mod endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxConstPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -47208,6 +51106,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstPressure : public Mod } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -47222,6 +51121,7 @@ class ReadPumpConfigurationAndControlMinCompPressure : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-comp-pressure"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -47245,6 +51145,9 @@ class ReadPumpConfigurationAndControlMinCompPressure : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlMinCompPressure : public ModelCommand { @@ -47255,6 +51158,7 @@ class SubscribeAttributePumpConfigurationAndControlMinCompPressure : public Mode AddArgument("attr-name", "min-comp-pressure"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -47269,6 +51173,7 @@ class SubscribeAttributePumpConfigurationAndControlMinCompPressure : public Mode endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinCompPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -47290,6 +51195,7 @@ class SubscribeAttributePumpConfigurationAndControlMinCompPressure : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -47304,6 +51210,7 @@ class ReadPumpConfigurationAndControlMaxCompPressure : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-comp-pressure"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -47327,6 +51234,9 @@ class ReadPumpConfigurationAndControlMaxCompPressure : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlMaxCompPressure : public ModelCommand { @@ -47337,6 +51247,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxCompPressure : public Mode AddArgument("attr-name", "max-comp-pressure"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -47351,6 +51262,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxCompPressure : public Mode endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxCompPressureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -47372,6 +51284,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxCompPressure : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -47386,6 +51299,7 @@ class ReadPumpConfigurationAndControlMinConstSpeed : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-const-speed"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -47409,6 +51323,9 @@ class ReadPumpConfigurationAndControlMinConstSpeed : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlMinConstSpeed : public ModelCommand { @@ -47419,6 +51336,7 @@ class SubscribeAttributePumpConfigurationAndControlMinConstSpeed : public ModelC AddArgument("attr-name", "min-const-speed"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -47433,6 +51351,7 @@ class SubscribeAttributePumpConfigurationAndControlMinConstSpeed : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinConstSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -47454,6 +51373,7 @@ class SubscribeAttributePumpConfigurationAndControlMinConstSpeed : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -47468,6 +51388,7 @@ class ReadPumpConfigurationAndControlMaxConstSpeed : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-const-speed"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -47491,6 +51412,9 @@ class ReadPumpConfigurationAndControlMaxConstSpeed : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlMaxConstSpeed : public ModelCommand { @@ -47501,6 +51425,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstSpeed : public ModelC AddArgument("attr-name", "max-const-speed"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -47515,6 +51440,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstSpeed : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxConstSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -47536,6 +51462,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstSpeed : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -47550,6 +51477,7 @@ class ReadPumpConfigurationAndControlMinConstFlow : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-const-flow"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -47573,6 +51501,9 @@ class ReadPumpConfigurationAndControlMinConstFlow : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlMinConstFlow : public ModelCommand { @@ -47583,6 +51514,7 @@ class SubscribeAttributePumpConfigurationAndControlMinConstFlow : public ModelCo AddArgument("attr-name", "min-const-flow"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -47597,6 +51529,7 @@ class SubscribeAttributePumpConfigurationAndControlMinConstFlow : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinConstFlowWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -47618,6 +51551,7 @@ class SubscribeAttributePumpConfigurationAndControlMinConstFlow : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -47632,6 +51566,7 @@ class ReadPumpConfigurationAndControlMaxConstFlow : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-const-flow"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -47655,6 +51590,9 @@ class ReadPumpConfigurationAndControlMaxConstFlow : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlMaxConstFlow : public ModelCommand { @@ -47665,6 +51603,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstFlow : public ModelCo AddArgument("attr-name", "max-const-flow"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -47679,6 +51618,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstFlow : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxConstFlowWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -47700,6 +51640,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstFlow : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -47714,6 +51655,7 @@ class ReadPumpConfigurationAndControlMinConstTemp : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-const-temp"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -47737,6 +51679,9 @@ class ReadPumpConfigurationAndControlMinConstTemp : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlMinConstTemp : public ModelCommand { @@ -47747,6 +51692,7 @@ class SubscribeAttributePumpConfigurationAndControlMinConstTemp : public ModelCo AddArgument("attr-name", "min-const-temp"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -47761,6 +51707,7 @@ class SubscribeAttributePumpConfigurationAndControlMinConstTemp : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinConstTempWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -47782,6 +51729,7 @@ class SubscribeAttributePumpConfigurationAndControlMinConstTemp : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -47796,6 +51744,7 @@ class ReadPumpConfigurationAndControlMaxConstTemp : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-const-temp"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -47819,6 +51768,9 @@ class ReadPumpConfigurationAndControlMaxConstTemp : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlMaxConstTemp : public ModelCommand { @@ -47829,6 +51781,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstTemp : public ModelCo AddArgument("attr-name", "max-const-temp"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -47843,6 +51796,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstTemp : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxConstTempWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -47864,6 +51818,7 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstTemp : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -47878,6 +51833,7 @@ class ReadPumpConfigurationAndControlPumpStatus : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "pump-status"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -47901,6 +51857,9 @@ class ReadPumpConfigurationAndControlPumpStatus : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlPumpStatus : public ModelCommand { @@ -47911,6 +51870,7 @@ class SubscribeAttributePumpConfigurationAndControlPumpStatus : public ModelComm AddArgument("attr-name", "pump-status"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -47925,6 +51885,7 @@ class SubscribeAttributePumpConfigurationAndControlPumpStatus : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePumpStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -47946,6 +51907,7 @@ class SubscribeAttributePumpConfigurationAndControlPumpStatus : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -47960,6 +51922,7 @@ class ReadPumpConfigurationAndControlEffectiveOperationMode : public ModelComman : ModelCommand("read") { AddArgument("attr-name", "effective-operation-mode"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -47983,6 +51946,9 @@ class ReadPumpConfigurationAndControlEffectiveOperationMode : public ModelComman }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlEffectiveOperationMode : public ModelCommand { @@ -47993,6 +51959,7 @@ class SubscribeAttributePumpConfigurationAndControlEffectiveOperationMode : publ AddArgument("attr-name", "effective-operation-mode"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -48007,6 +51974,7 @@ class SubscribeAttributePumpConfigurationAndControlEffectiveOperationMode : publ endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeEffectiveOperationModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -48029,6 +51997,7 @@ class SubscribeAttributePumpConfigurationAndControlEffectiveOperationMode : publ } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -48043,6 +52012,7 @@ class ReadPumpConfigurationAndControlEffectiveControlMode : public ModelCommand : ModelCommand("read") { AddArgument("attr-name", "effective-control-mode"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -48066,6 +52036,9 @@ class ReadPumpConfigurationAndControlEffectiveControlMode : public ModelCommand }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlEffectiveControlMode : public ModelCommand { @@ -48076,6 +52049,7 @@ class SubscribeAttributePumpConfigurationAndControlEffectiveControlMode : public AddArgument("attr-name", "effective-control-mode"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -48090,6 +52064,7 @@ class SubscribeAttributePumpConfigurationAndControlEffectiveControlMode : public endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeEffectiveControlModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -48111,6 +52086,7 @@ class SubscribeAttributePumpConfigurationAndControlEffectiveControlMode : public } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -48125,6 +52101,7 @@ class ReadPumpConfigurationAndControlCapacity : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "capacity"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -48148,6 +52125,9 @@ class ReadPumpConfigurationAndControlCapacity : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlCapacity : public ModelCommand { @@ -48158,6 +52138,7 @@ class SubscribeAttributePumpConfigurationAndControlCapacity : public ModelComman AddArgument("attr-name", "capacity"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -48172,6 +52153,7 @@ class SubscribeAttributePumpConfigurationAndControlCapacity : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCapacityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -48192,6 +52174,7 @@ class SubscribeAttributePumpConfigurationAndControlCapacity : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -48206,6 +52189,7 @@ class ReadPumpConfigurationAndControlSpeed : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "speed"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -48229,6 +52213,9 @@ class ReadPumpConfigurationAndControlSpeed : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlSpeed : public ModelCommand { @@ -48239,6 +52226,7 @@ class SubscribeAttributePumpConfigurationAndControlSpeed : public ModelCommand { AddArgument("attr-name", "speed"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -48253,6 +52241,7 @@ class SubscribeAttributePumpConfigurationAndControlSpeed : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSpeedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -48273,6 +52262,7 @@ class SubscribeAttributePumpConfigurationAndControlSpeed : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -48287,6 +52277,7 @@ class ReadPumpConfigurationAndControlLifetimeRunningHours : public ModelCommand : ModelCommand("read") { AddArgument("attr-name", "lifetime-running-hours"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -48310,6 +52301,9 @@ class ReadPumpConfigurationAndControlLifetimeRunningHours : public ModelCommand }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WritePumpConfigurationAndControlLifetimeRunningHours : public ModelCommand { @@ -48319,6 +52313,7 @@ class WritePumpConfigurationAndControlLifetimeRunningHours : public ModelCommand { AddArgument("attr-name", "lifetime-running-hours"); AddArgument("attr-value", 0, UINT32_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -48332,10 +52327,13 @@ class WritePumpConfigurationAndControlLifetimeRunningHours : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedInt:mValue]; [cluster writeAttributeLifetimeRunningHoursWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "PumpConfigurationAndControl LifetimeRunningHours Error: %s", @@ -48346,6 +52344,7 @@ class WritePumpConfigurationAndControlLifetimeRunningHours : public ModelCommand } private: + chip::Optional mTimedInteractionTimeoutMs; uint32_t mValue; }; @@ -48357,6 +52356,7 @@ class SubscribeAttributePumpConfigurationAndControlLifetimeRunningHours : public AddArgument("attr-name", "lifetime-running-hours"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -48371,6 +52371,7 @@ class SubscribeAttributePumpConfigurationAndControlLifetimeRunningHours : public endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLifetimeRunningHoursWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -48392,6 +52393,7 @@ class SubscribeAttributePumpConfigurationAndControlLifetimeRunningHours : public } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -48406,6 +52408,7 @@ class ReadPumpConfigurationAndControlPower : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "power"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -48429,6 +52432,9 @@ class ReadPumpConfigurationAndControlPower : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlPower : public ModelCommand { @@ -48439,6 +52445,7 @@ class SubscribeAttributePumpConfigurationAndControlPower : public ModelCommand { AddArgument("attr-name", "power"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -48453,6 +52460,7 @@ class SubscribeAttributePumpConfigurationAndControlPower : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePowerWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -48473,6 +52481,7 @@ class SubscribeAttributePumpConfigurationAndControlPower : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -48487,6 +52496,7 @@ class ReadPumpConfigurationAndControlLifetimeEnergyConsumed : public ModelComman : ModelCommand("read") { AddArgument("attr-name", "lifetime-energy-consumed"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -48510,6 +52520,9 @@ class ReadPumpConfigurationAndControlLifetimeEnergyConsumed : public ModelComman }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WritePumpConfigurationAndControlLifetimeEnergyConsumed : public ModelCommand { @@ -48519,6 +52532,7 @@ class WritePumpConfigurationAndControlLifetimeEnergyConsumed : public ModelComma { AddArgument("attr-name", "lifetime-energy-consumed"); AddArgument("attr-value", 0, UINT32_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -48532,11 +52546,14 @@ class WritePumpConfigurationAndControlLifetimeEnergyConsumed : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedInt:mValue]; [cluster writeAttributeLifetimeEnergyConsumedWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "PumpConfigurationAndControl LifetimeEnergyConsumed Error: %s", @@ -48547,6 +52564,7 @@ class WritePumpConfigurationAndControlLifetimeEnergyConsumed : public ModelComma } private: + chip::Optional mTimedInteractionTimeoutMs; uint32_t mValue; }; @@ -48558,6 +52576,7 @@ class SubscribeAttributePumpConfigurationAndControlLifetimeEnergyConsumed : publ AddArgument("attr-name", "lifetime-energy-consumed"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -48572,6 +52591,7 @@ class SubscribeAttributePumpConfigurationAndControlLifetimeEnergyConsumed : publ endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLifetimeEnergyConsumedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -48594,6 +52614,7 @@ class SubscribeAttributePumpConfigurationAndControlLifetimeEnergyConsumed : publ } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -48608,6 +52629,7 @@ class ReadPumpConfigurationAndControlOperationMode : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "operation-mode"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -48631,6 +52653,9 @@ class ReadPumpConfigurationAndControlOperationMode : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WritePumpConfigurationAndControlOperationMode : public ModelCommand { @@ -48640,6 +52665,7 @@ class WritePumpConfigurationAndControlOperationMode : public ModelCommand { { AddArgument("attr-name", "operation-mode"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -48653,10 +52679,13 @@ class WritePumpConfigurationAndControlOperationMode : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeOperationModeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "PumpConfigurationAndControl OperationMode Error: %s", @@ -48667,6 +52696,7 @@ class WritePumpConfigurationAndControlOperationMode : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -48678,6 +52708,7 @@ class SubscribeAttributePumpConfigurationAndControlOperationMode : public ModelC AddArgument("attr-name", "operation-mode"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -48692,6 +52723,7 @@ class SubscribeAttributePumpConfigurationAndControlOperationMode : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOperationModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -48713,6 +52745,7 @@ class SubscribeAttributePumpConfigurationAndControlOperationMode : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -48727,6 +52760,7 @@ class ReadPumpConfigurationAndControlControlMode : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "control-mode"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -48750,6 +52784,9 @@ class ReadPumpConfigurationAndControlControlMode : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WritePumpConfigurationAndControlControlMode : public ModelCommand { @@ -48759,6 +52796,7 @@ class WritePumpConfigurationAndControlControlMode : public ModelCommand { { AddArgument("attr-name", "control-mode"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -48772,10 +52810,13 @@ class WritePumpConfigurationAndControlControlMode : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeControlModeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError( @@ -48786,6 +52827,7 @@ class WritePumpConfigurationAndControlControlMode : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -48797,6 +52839,7 @@ class SubscribeAttributePumpConfigurationAndControlControlMode : public ModelCom AddArgument("attr-name", "control-mode"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -48811,6 +52854,7 @@ class SubscribeAttributePumpConfigurationAndControlControlMode : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeControlModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -48832,6 +52876,7 @@ class SubscribeAttributePumpConfigurationAndControlControlMode : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -48846,6 +52891,7 @@ class ReadPumpConfigurationAndControlAlarmMask : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "alarm-mask"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -48869,6 +52915,9 @@ class ReadPumpConfigurationAndControlAlarmMask : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlAlarmMask : public ModelCommand { @@ -48879,6 +52928,7 @@ class SubscribeAttributePumpConfigurationAndControlAlarmMask : public ModelComma AddArgument("attr-name", "alarm-mask"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -48893,6 +52943,7 @@ class SubscribeAttributePumpConfigurationAndControlAlarmMask : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAlarmMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -48913,6 +52964,7 @@ class SubscribeAttributePumpConfigurationAndControlAlarmMask : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -48927,6 +52979,7 @@ class ReadPumpConfigurationAndControlGeneratedCommandList : public ModelCommand : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -48950,6 +53003,9 @@ class ReadPumpConfigurationAndControlGeneratedCommandList : public ModelCommand }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlGeneratedCommandList : public ModelCommand { @@ -48960,6 +53016,7 @@ class SubscribeAttributePumpConfigurationAndControlGeneratedCommandList : public AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -48974,6 +53031,7 @@ class SubscribeAttributePumpConfigurationAndControlGeneratedCommandList : public endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -48995,6 +53053,7 @@ class SubscribeAttributePumpConfigurationAndControlGeneratedCommandList : public } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -49009,6 +53068,7 @@ class ReadPumpConfigurationAndControlAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -49032,6 +53092,9 @@ class ReadPumpConfigurationAndControlAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlAcceptedCommandList : public ModelCommand { @@ -49042,6 +53105,7 @@ class SubscribeAttributePumpConfigurationAndControlAcceptedCommandList : public AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -49056,6 +53120,7 @@ class SubscribeAttributePumpConfigurationAndControlAcceptedCommandList : public endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -49077,6 +53142,7 @@ class SubscribeAttributePumpConfigurationAndControlAcceptedCommandList : public } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -49091,6 +53157,7 @@ class ReadPumpConfigurationAndControlAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -49114,6 +53181,9 @@ class ReadPumpConfigurationAndControlAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlAttributeList : public ModelCommand { @@ -49124,6 +53194,7 @@ class SubscribeAttributePumpConfigurationAndControlAttributeList : public ModelC AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -49138,6 +53209,7 @@ class SubscribeAttributePumpConfigurationAndControlAttributeList : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -49159,6 +53231,7 @@ class SubscribeAttributePumpConfigurationAndControlAttributeList : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -49173,6 +53246,7 @@ class ReadPumpConfigurationAndControlFeatureMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "feature-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -49196,6 +53270,9 @@ class ReadPumpConfigurationAndControlFeatureMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlFeatureMap : public ModelCommand { @@ -49206,6 +53283,7 @@ class SubscribeAttributePumpConfigurationAndControlFeatureMap : public ModelComm AddArgument("attr-name", "feature-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -49220,6 +53298,7 @@ class SubscribeAttributePumpConfigurationAndControlFeatureMap : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -49241,6 +53320,7 @@ class SubscribeAttributePumpConfigurationAndControlFeatureMap : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -49255,6 +53335,7 @@ class ReadPumpConfigurationAndControlClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -49278,6 +53359,9 @@ class ReadPumpConfigurationAndControlClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributePumpConfigurationAndControlClusterRevision : public ModelCommand { @@ -49288,6 +53372,7 @@ class SubscribeAttributePumpConfigurationAndControlClusterRevision : public Mode AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -49302,6 +53387,7 @@ class SubscribeAttributePumpConfigurationAndControlClusterRevision : public Mode endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -49323,6 +53409,7 @@ class SubscribeAttributePumpConfigurationAndControlClusterRevision : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -49356,6 +53443,7 @@ class ReadRelativeHumidityMeasurementMeasuredValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "measured-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -49379,6 +53467,9 @@ class ReadRelativeHumidityMeasurementMeasuredValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeRelativeHumidityMeasurementMeasuredValue : public ModelCommand { @@ -49389,6 +53480,7 @@ class SubscribeAttributeRelativeHumidityMeasurementMeasuredValue : public ModelC AddArgument("attr-name", "measured-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -49403,6 +53495,7 @@ class SubscribeAttributeRelativeHumidityMeasurementMeasuredValue : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -49424,6 +53517,7 @@ class SubscribeAttributeRelativeHumidityMeasurementMeasuredValue : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -49438,6 +53532,7 @@ class ReadRelativeHumidityMeasurementMinMeasuredValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-measured-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -49461,6 +53556,9 @@ class ReadRelativeHumidityMeasurementMinMeasuredValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeRelativeHumidityMeasurementMinMeasuredValue : public ModelCommand { @@ -49471,6 +53569,7 @@ class SubscribeAttributeRelativeHumidityMeasurementMinMeasuredValue : public Mod AddArgument("attr-name", "min-measured-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -49485,6 +53584,7 @@ class SubscribeAttributeRelativeHumidityMeasurementMinMeasuredValue : public Mod endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -49506,6 +53606,7 @@ class SubscribeAttributeRelativeHumidityMeasurementMinMeasuredValue : public Mod } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -49520,6 +53621,7 @@ class ReadRelativeHumidityMeasurementMaxMeasuredValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-measured-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -49543,6 +53645,9 @@ class ReadRelativeHumidityMeasurementMaxMeasuredValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeRelativeHumidityMeasurementMaxMeasuredValue : public ModelCommand { @@ -49553,6 +53658,7 @@ class SubscribeAttributeRelativeHumidityMeasurementMaxMeasuredValue : public Mod AddArgument("attr-name", "max-measured-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -49567,6 +53673,7 @@ class SubscribeAttributeRelativeHumidityMeasurementMaxMeasuredValue : public Mod endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -49588,6 +53695,7 @@ class SubscribeAttributeRelativeHumidityMeasurementMaxMeasuredValue : public Mod } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -49602,6 +53710,7 @@ class ReadRelativeHumidityMeasurementTolerance : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tolerance"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -49625,6 +53734,9 @@ class ReadRelativeHumidityMeasurementTolerance : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeRelativeHumidityMeasurementTolerance : public ModelCommand { @@ -49635,6 +53747,7 @@ class SubscribeAttributeRelativeHumidityMeasurementTolerance : public ModelComma AddArgument("attr-name", "tolerance"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -49649,6 +53762,7 @@ class SubscribeAttributeRelativeHumidityMeasurementTolerance : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -49669,6 +53783,7 @@ class SubscribeAttributeRelativeHumidityMeasurementTolerance : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -49683,6 +53798,7 @@ class ReadRelativeHumidityMeasurementGeneratedCommandList : public ModelCommand : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -49706,6 +53822,9 @@ class ReadRelativeHumidityMeasurementGeneratedCommandList : public ModelCommand }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList : public ModelCommand { @@ -49716,6 +53835,7 @@ class SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList : public AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -49730,6 +53850,7 @@ class SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList : public endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -49751,6 +53872,7 @@ class SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList : public } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -49765,6 +53887,7 @@ class ReadRelativeHumidityMeasurementAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -49788,6 +53911,9 @@ class ReadRelativeHumidityMeasurementAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList : public ModelCommand { @@ -49798,6 +53924,7 @@ class SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList : public AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -49812,6 +53939,7 @@ class SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList : public endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -49833,6 +53961,7 @@ class SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList : public } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -49847,6 +53976,7 @@ class ReadRelativeHumidityMeasurementAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -49870,6 +54000,9 @@ class ReadRelativeHumidityMeasurementAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeRelativeHumidityMeasurementAttributeList : public ModelCommand { @@ -49880,6 +54013,7 @@ class SubscribeAttributeRelativeHumidityMeasurementAttributeList : public ModelC AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -49894,6 +54028,7 @@ class SubscribeAttributeRelativeHumidityMeasurementAttributeList : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -49915,6 +54050,7 @@ class SubscribeAttributeRelativeHumidityMeasurementAttributeList : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -49929,6 +54065,7 @@ class ReadRelativeHumidityMeasurementClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -49952,6 +54089,9 @@ class ReadRelativeHumidityMeasurementClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeRelativeHumidityMeasurementClusterRevision : public ModelCommand { @@ -49962,6 +54102,7 @@ class SubscribeAttributeRelativeHumidityMeasurementClusterRevision : public Mode AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -49976,6 +54117,7 @@ class SubscribeAttributeRelativeHumidityMeasurementClusterRevision : public Mode endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -49997,6 +54139,7 @@ class SubscribeAttributeRelativeHumidityMeasurementClusterRevision : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -50047,6 +54190,7 @@ class ScenesAddScene : public ModelCommand { AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); AddArgument("SceneName", &mSceneName); AddArgument("ExtensionFieldSets", &mComplex_ExtensionFieldSets); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -50058,17 +54202,14 @@ class ScenesAddScene : public ModelCommand { CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPScenesClusterAddSceneParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.groupId = [NSNumber numberWithUnsignedShort:mGroupId]; - params.sceneId = [NSNumber numberWithUnsignedChar:mSceneId]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; - params.sceneName = [[NSString alloc] initWithBytes:mSceneName.data() length:mSceneName.size() encoding:NSUTF8StringEncoding]; - { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; for (auto & entry_0 : mRequest.extensionFieldSets) { @@ -50092,6 +54233,7 @@ class ScenesAddScene : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mGroupId; uint8_t mSceneId; uint16_t mTransitionTime; @@ -50110,6 +54252,7 @@ class ScenesGetSceneMembership : public ModelCommand { : ModelCommand("get-scene-membership") { AddArgument("GroupId", 0, UINT16_MAX, &mGroupId); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -50121,7 +54264,8 @@ class ScenesGetSceneMembership : public ModelCommand { CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPScenesClusterGetSceneMembershipParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.groupId = [NSNumber numberWithUnsignedShort:mGroupId]; [cluster getSceneMembershipWithParams:params completionHandler:^( @@ -50135,6 +54279,7 @@ class ScenesGetSceneMembership : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mGroupId; }; @@ -50149,6 +54294,7 @@ class ScenesRecallScene : public ModelCommand { AddArgument("GroupId", 0, UINT16_MAX, &mGroupId); AddArgument("SceneId", 0, UINT8_MAX, &mSceneId); AddArgument("TransitionTime", 0, UINT16_MAX, &mTransitionTime); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -50160,11 +54306,10 @@ class ScenesRecallScene : public ModelCommand { CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPScenesClusterRecallSceneParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.groupId = [NSNumber numberWithUnsignedShort:mGroupId]; - params.sceneId = [NSNumber numberWithUnsignedChar:mSceneId]; - params.transitionTime = [NSNumber numberWithUnsignedShort:mTransitionTime]; [cluster recallSceneWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -50176,6 +54321,7 @@ class ScenesRecallScene : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mGroupId; uint8_t mSceneId; uint16_t mTransitionTime; @@ -50190,6 +54336,7 @@ class ScenesRemoveAllScenes : public ModelCommand { : ModelCommand("remove-all-scenes") { AddArgument("GroupId", 0, UINT16_MAX, &mGroupId); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -50201,7 +54348,8 @@ class ScenesRemoveAllScenes : public ModelCommand { CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPScenesClusterRemoveAllScenesParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.groupId = [NSNumber numberWithUnsignedShort:mGroupId]; [cluster removeAllScenesWithParams:params completionHandler:^( @@ -50215,6 +54363,7 @@ class ScenesRemoveAllScenes : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mGroupId; }; @@ -50228,6 +54377,7 @@ class ScenesRemoveScene : public ModelCommand { { AddArgument("GroupId", 0, UINT16_MAX, &mGroupId); AddArgument("SceneId", 0, UINT8_MAX, &mSceneId); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -50239,9 +54389,9 @@ class ScenesRemoveScene : public ModelCommand { CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPScenesClusterRemoveSceneParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.groupId = [NSNumber numberWithUnsignedShort:mGroupId]; - params.sceneId = [NSNumber numberWithUnsignedChar:mSceneId]; [cluster removeSceneWithParams:params completionHandler:^(CHIPScenesClusterRemoveSceneResponseParams * _Nullable values, NSError * _Nullable error) { @@ -50254,6 +54404,7 @@ class ScenesRemoveScene : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mGroupId; uint8_t mSceneId; }; @@ -50268,6 +54419,7 @@ class ScenesStoreScene : public ModelCommand { { AddArgument("GroupId", 0, UINT16_MAX, &mGroupId); AddArgument("SceneId", 0, UINT8_MAX, &mSceneId); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -50279,9 +54431,9 @@ class ScenesStoreScene : public ModelCommand { CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPScenesClusterStoreSceneParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.groupId = [NSNumber numberWithUnsignedShort:mGroupId]; - params.sceneId = [NSNumber numberWithUnsignedChar:mSceneId]; [cluster storeSceneWithParams:params completionHandler:^(CHIPScenesClusterStoreSceneResponseParams * _Nullable values, NSError * _Nullable error) { @@ -50294,6 +54446,7 @@ class ScenesStoreScene : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mGroupId; uint8_t mSceneId; }; @@ -50308,6 +54461,7 @@ class ScenesViewScene : public ModelCommand { { AddArgument("GroupId", 0, UINT16_MAX, &mGroupId); AddArgument("SceneId", 0, UINT8_MAX, &mSceneId); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -50319,9 +54473,9 @@ class ScenesViewScene : public ModelCommand { CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPScenesClusterViewSceneParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.groupId = [NSNumber numberWithUnsignedShort:mGroupId]; - params.sceneId = [NSNumber numberWithUnsignedChar:mSceneId]; [cluster viewSceneWithParams:params completionHandler:^(CHIPScenesClusterViewSceneResponseParams * _Nullable values, NSError * _Nullable error) { @@ -50334,6 +54488,7 @@ class ScenesViewScene : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mGroupId; uint8_t mSceneId; }; @@ -50347,6 +54502,7 @@ class ReadScenesSceneCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "scene-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -50368,6 +54524,9 @@ class ReadScenesSceneCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeScenesSceneCount : public ModelCommand { @@ -50378,6 +54537,7 @@ class SubscribeAttributeScenesSceneCount : public ModelCommand { AddArgument("attr-name", "scene-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -50390,6 +54550,7 @@ class SubscribeAttributeScenesSceneCount : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSceneCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -50410,6 +54571,7 @@ class SubscribeAttributeScenesSceneCount : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -50424,6 +54586,7 @@ class ReadScenesCurrentScene : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-scene"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -50445,6 +54608,9 @@ class ReadScenesCurrentScene : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeScenesCurrentScene : public ModelCommand { @@ -50455,6 +54621,7 @@ class SubscribeAttributeScenesCurrentScene : public ModelCommand { AddArgument("attr-name", "current-scene"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -50467,6 +54634,7 @@ class SubscribeAttributeScenesCurrentScene : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentSceneWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -50487,6 +54655,7 @@ class SubscribeAttributeScenesCurrentScene : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -50501,6 +54670,7 @@ class ReadScenesCurrentGroup : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-group"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -50522,6 +54692,9 @@ class ReadScenesCurrentGroup : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeScenesCurrentGroup : public ModelCommand { @@ -50532,6 +54705,7 @@ class SubscribeAttributeScenesCurrentGroup : public ModelCommand { AddArgument("attr-name", "current-group"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -50544,6 +54718,7 @@ class SubscribeAttributeScenesCurrentGroup : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentGroupWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -50564,6 +54739,7 @@ class SubscribeAttributeScenesCurrentGroup : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -50578,6 +54754,7 @@ class ReadScenesSceneValid : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "scene-valid"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -50599,6 +54776,9 @@ class ReadScenesSceneValid : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeScenesSceneValid : public ModelCommand { @@ -50609,6 +54789,7 @@ class SubscribeAttributeScenesSceneValid : public ModelCommand { AddArgument("attr-name", "scene-valid"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -50621,6 +54802,7 @@ class SubscribeAttributeScenesSceneValid : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSceneValidWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -50641,6 +54823,7 @@ class SubscribeAttributeScenesSceneValid : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -50655,6 +54838,7 @@ class ReadScenesNameSupport : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "name-support"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -50676,6 +54860,9 @@ class ReadScenesNameSupport : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeScenesNameSupport : public ModelCommand { @@ -50686,6 +54873,7 @@ class SubscribeAttributeScenesNameSupport : public ModelCommand { AddArgument("attr-name", "name-support"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -50698,6 +54886,7 @@ class SubscribeAttributeScenesNameSupport : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNameSupportWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -50718,6 +54907,7 @@ class SubscribeAttributeScenesNameSupport : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -50732,6 +54922,7 @@ class ReadScenesGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -50753,6 +54944,9 @@ class ReadScenesGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeScenesGeneratedCommandList : public ModelCommand { @@ -50763,6 +54957,7 @@ class SubscribeAttributeScenesGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -50775,6 +54970,7 @@ class SubscribeAttributeScenesGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -50795,6 +54991,7 @@ class SubscribeAttributeScenesGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -50809,6 +55006,7 @@ class ReadScenesAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -50830,6 +55028,9 @@ class ReadScenesAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeScenesAcceptedCommandList : public ModelCommand { @@ -50840,6 +55041,7 @@ class SubscribeAttributeScenesAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -50852,6 +55054,7 @@ class SubscribeAttributeScenesAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -50872,6 +55075,7 @@ class SubscribeAttributeScenesAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -50886,6 +55090,7 @@ class ReadScenesAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -50907,6 +55112,9 @@ class ReadScenesAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeScenesAttributeList : public ModelCommand { @@ -50917,6 +55125,7 @@ class SubscribeAttributeScenesAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -50929,6 +55138,7 @@ class SubscribeAttributeScenesAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -50949,6 +55159,7 @@ class SubscribeAttributeScenesAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -50963,6 +55174,7 @@ class ReadScenesClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -50984,6 +55196,9 @@ class ReadScenesClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeScenesClusterRevision : public ModelCommand { @@ -50994,6 +55209,7 @@ class SubscribeAttributeScenesClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -51006,6 +55222,7 @@ class SubscribeAttributeScenesClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPScenes * cluster = [[CHIPScenes alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -51026,6 +55243,7 @@ class SubscribeAttributeScenesClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -51060,6 +55278,7 @@ class SoftwareDiagnosticsResetWatermarks : public ModelCommand { SoftwareDiagnosticsResetWatermarks() : ModelCommand("reset-watermarks") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -51072,6 +55291,9 @@ class SoftwareDiagnosticsResetWatermarks : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPSoftwareDiagnosticsClusterResetWatermarksParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster resetWatermarksWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -51081,6 +55303,7 @@ class SoftwareDiagnosticsResetWatermarks : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -51092,6 +55315,7 @@ class ReadSoftwareDiagnosticsThreadMetrics : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "thread-metrics"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -51115,6 +55339,9 @@ class ReadSoftwareDiagnosticsThreadMetrics : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSoftwareDiagnosticsThreadMetrics : public ModelCommand { @@ -51125,6 +55352,7 @@ class SubscribeAttributeSoftwareDiagnosticsThreadMetrics : public ModelCommand { AddArgument("attr-name", "thread-metrics"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -51139,6 +55367,7 @@ class SubscribeAttributeSoftwareDiagnosticsThreadMetrics : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeThreadMetricsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -51159,6 +55388,7 @@ class SubscribeAttributeSoftwareDiagnosticsThreadMetrics : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -51173,6 +55403,7 @@ class ReadSoftwareDiagnosticsCurrentHeapFree : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-heap-free"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -51196,6 +55427,9 @@ class ReadSoftwareDiagnosticsCurrentHeapFree : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSoftwareDiagnosticsCurrentHeapFree : public ModelCommand { @@ -51206,6 +55440,7 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapFree : public ModelCommand AddArgument("attr-name", "current-heap-free"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -51220,6 +55455,7 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapFree : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentHeapFreeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -51241,6 +55477,7 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapFree : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -51255,6 +55492,7 @@ class ReadSoftwareDiagnosticsCurrentHeapUsed : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-heap-used"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -51278,6 +55516,9 @@ class ReadSoftwareDiagnosticsCurrentHeapUsed : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSoftwareDiagnosticsCurrentHeapUsed : public ModelCommand { @@ -51288,6 +55529,7 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapUsed : public ModelCommand AddArgument("attr-name", "current-heap-used"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -51302,6 +55544,7 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapUsed : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentHeapUsedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -51323,6 +55566,7 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapUsed : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -51337,6 +55581,7 @@ class ReadSoftwareDiagnosticsCurrentHeapHighWatermark : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-heap-high-watermark"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -51361,6 +55606,9 @@ class ReadSoftwareDiagnosticsCurrentHeapHighWatermark : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSoftwareDiagnosticsCurrentHeapHighWatermark : public ModelCommand { @@ -51371,6 +55619,7 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapHighWatermark : public Mod AddArgument("attr-name", "current-heap-high-watermark"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -51385,6 +55634,7 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapHighWatermark : public Mod endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentHeapHighWatermarkWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -51407,6 +55657,7 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapHighWatermark : public Mod } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -51421,6 +55672,7 @@ class ReadSoftwareDiagnosticsGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -51444,6 +55696,9 @@ class ReadSoftwareDiagnosticsGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSoftwareDiagnosticsGeneratedCommandList : public ModelCommand { @@ -51454,6 +55709,7 @@ class SubscribeAttributeSoftwareDiagnosticsGeneratedCommandList : public ModelCo AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -51468,6 +55724,7 @@ class SubscribeAttributeSoftwareDiagnosticsGeneratedCommandList : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -51489,6 +55746,7 @@ class SubscribeAttributeSoftwareDiagnosticsGeneratedCommandList : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -51503,6 +55761,7 @@ class ReadSoftwareDiagnosticsAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -51526,6 +55785,9 @@ class ReadSoftwareDiagnosticsAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSoftwareDiagnosticsAcceptedCommandList : public ModelCommand { @@ -51536,6 +55798,7 @@ class SubscribeAttributeSoftwareDiagnosticsAcceptedCommandList : public ModelCom AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -51550,6 +55813,7 @@ class SubscribeAttributeSoftwareDiagnosticsAcceptedCommandList : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -51571,6 +55835,7 @@ class SubscribeAttributeSoftwareDiagnosticsAcceptedCommandList : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -51585,6 +55850,7 @@ class ReadSoftwareDiagnosticsAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -51608,6 +55874,9 @@ class ReadSoftwareDiagnosticsAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSoftwareDiagnosticsAttributeList : public ModelCommand { @@ -51618,6 +55887,7 @@ class SubscribeAttributeSoftwareDiagnosticsAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -51632,6 +55902,7 @@ class SubscribeAttributeSoftwareDiagnosticsAttributeList : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -51652,6 +55923,7 @@ class SubscribeAttributeSoftwareDiagnosticsAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -51666,6 +55938,7 @@ class ReadSoftwareDiagnosticsFeatureMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "feature-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -51689,6 +55962,9 @@ class ReadSoftwareDiagnosticsFeatureMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSoftwareDiagnosticsFeatureMap : public ModelCommand { @@ -51699,6 +55975,7 @@ class SubscribeAttributeSoftwareDiagnosticsFeatureMap : public ModelCommand { AddArgument("attr-name", "feature-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -51713,6 +55990,7 @@ class SubscribeAttributeSoftwareDiagnosticsFeatureMap : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -51733,6 +56011,7 @@ class SubscribeAttributeSoftwareDiagnosticsFeatureMap : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -51747,6 +56026,7 @@ class ReadSoftwareDiagnosticsClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -51770,6 +56050,9 @@ class ReadSoftwareDiagnosticsClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSoftwareDiagnosticsClusterRevision : public ModelCommand { @@ -51780,6 +56063,7 @@ class SubscribeAttributeSoftwareDiagnosticsClusterRevision : public ModelCommand AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -51794,6 +56078,7 @@ class SubscribeAttributeSoftwareDiagnosticsClusterRevision : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -51815,6 +56100,7 @@ class SubscribeAttributeSoftwareDiagnosticsClusterRevision : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -51854,6 +56140,7 @@ class ReadSwitchNumberOfPositions : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "number-of-positions"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -51875,6 +56162,9 @@ class ReadSwitchNumberOfPositions : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSwitchNumberOfPositions : public ModelCommand { @@ -51885,6 +56175,7 @@ class SubscribeAttributeSwitchNumberOfPositions : public ModelCommand { AddArgument("attr-name", "number-of-positions"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -51897,6 +56188,7 @@ class SubscribeAttributeSwitchNumberOfPositions : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNumberOfPositionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -51917,6 +56209,7 @@ class SubscribeAttributeSwitchNumberOfPositions : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -51931,6 +56224,7 @@ class ReadSwitchCurrentPosition : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-position"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -51952,6 +56246,9 @@ class ReadSwitchCurrentPosition : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSwitchCurrentPosition : public ModelCommand { @@ -51962,6 +56259,7 @@ class SubscribeAttributeSwitchCurrentPosition : public ModelCommand { AddArgument("attr-name", "current-position"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -51974,6 +56272,7 @@ class SubscribeAttributeSwitchCurrentPosition : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentPositionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -51994,6 +56293,7 @@ class SubscribeAttributeSwitchCurrentPosition : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -52008,6 +56308,7 @@ class ReadSwitchMultiPressMax : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "multi-press-max"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -52029,6 +56330,9 @@ class ReadSwitchMultiPressMax : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSwitchMultiPressMax : public ModelCommand { @@ -52039,6 +56343,7 @@ class SubscribeAttributeSwitchMultiPressMax : public ModelCommand { AddArgument("attr-name", "multi-press-max"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -52051,6 +56356,7 @@ class SubscribeAttributeSwitchMultiPressMax : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMultiPressMaxWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -52071,6 +56377,7 @@ class SubscribeAttributeSwitchMultiPressMax : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -52085,6 +56392,7 @@ class ReadSwitchGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -52106,6 +56414,9 @@ class ReadSwitchGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSwitchGeneratedCommandList : public ModelCommand { @@ -52116,6 +56427,7 @@ class SubscribeAttributeSwitchGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -52128,6 +56440,7 @@ class SubscribeAttributeSwitchGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -52148,6 +56461,7 @@ class SubscribeAttributeSwitchGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -52162,6 +56476,7 @@ class ReadSwitchAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -52183,6 +56498,9 @@ class ReadSwitchAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSwitchAcceptedCommandList : public ModelCommand { @@ -52193,6 +56511,7 @@ class SubscribeAttributeSwitchAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -52205,6 +56524,7 @@ class SubscribeAttributeSwitchAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -52225,6 +56545,7 @@ class SubscribeAttributeSwitchAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -52239,6 +56560,7 @@ class ReadSwitchAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -52260,6 +56582,9 @@ class ReadSwitchAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSwitchAttributeList : public ModelCommand { @@ -52270,6 +56595,7 @@ class SubscribeAttributeSwitchAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -52282,6 +56608,7 @@ class SubscribeAttributeSwitchAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -52302,6 +56629,7 @@ class SubscribeAttributeSwitchAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -52316,6 +56644,7 @@ class ReadSwitchFeatureMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "feature-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -52337,6 +56666,9 @@ class ReadSwitchFeatureMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSwitchFeatureMap : public ModelCommand { @@ -52347,6 +56679,7 @@ class SubscribeAttributeSwitchFeatureMap : public ModelCommand { AddArgument("attr-name", "feature-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -52359,6 +56692,7 @@ class SubscribeAttributeSwitchFeatureMap : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -52379,6 +56713,7 @@ class SubscribeAttributeSwitchFeatureMap : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -52393,6 +56728,7 @@ class ReadSwitchClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -52414,6 +56750,9 @@ class ReadSwitchClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeSwitchClusterRevision : public ModelCommand { @@ -52424,6 +56763,7 @@ class SubscribeAttributeSwitchClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -52436,6 +56776,7 @@ class SubscribeAttributeSwitchClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPSwitch * cluster = [[CHIPSwitch alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -52456,6 +56797,7 @@ class SubscribeAttributeSwitchClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -52489,6 +56831,7 @@ class TargetNavigatorNavigateTarget : public ModelCommand { { AddArgument("Target", 0, UINT8_MAX, &mTarget); AddArgument("Data", &mData); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -52500,9 +56843,9 @@ class TargetNavigatorNavigateTarget : public ModelCommand { CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPTargetNavigatorClusterNavigateTargetParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.target = [NSNumber numberWithUnsignedChar:mTarget]; - params.data = [[NSString alloc] initWithBytes:mData.data() length:mData.size() encoding:NSUTF8StringEncoding]; [cluster navigateTargetWithParams:params completionHandler:^( @@ -52516,6 +56859,7 @@ class TargetNavigatorNavigateTarget : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mTarget; chip::ByteSpan mData; }; @@ -52529,6 +56873,7 @@ class ReadTargetNavigatorTargetList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "target-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -52550,6 +56895,9 @@ class ReadTargetNavigatorTargetList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTargetNavigatorTargetList : public ModelCommand { @@ -52560,6 +56908,7 @@ class SubscribeAttributeTargetNavigatorTargetList : public ModelCommand { AddArgument("attr-name", "target-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -52572,6 +56921,7 @@ class SubscribeAttributeTargetNavigatorTargetList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTargetListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -52592,6 +56942,7 @@ class SubscribeAttributeTargetNavigatorTargetList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -52606,6 +56957,7 @@ class ReadTargetNavigatorCurrentTarget : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-target"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -52627,6 +56979,9 @@ class ReadTargetNavigatorCurrentTarget : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTargetNavigatorCurrentTarget : public ModelCommand { @@ -52637,6 +56992,7 @@ class SubscribeAttributeTargetNavigatorCurrentTarget : public ModelCommand { AddArgument("attr-name", "current-target"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -52649,6 +57005,7 @@ class SubscribeAttributeTargetNavigatorCurrentTarget : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentTargetWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -52669,6 +57026,7 @@ class SubscribeAttributeTargetNavigatorCurrentTarget : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -52683,6 +57041,7 @@ class ReadTargetNavigatorGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -52704,6 +57063,9 @@ class ReadTargetNavigatorGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTargetNavigatorGeneratedCommandList : public ModelCommand { @@ -52714,6 +57076,7 @@ class SubscribeAttributeTargetNavigatorGeneratedCommandList : public ModelComman AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -52726,6 +57089,7 @@ class SubscribeAttributeTargetNavigatorGeneratedCommandList : public ModelComman dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -52747,6 +57111,7 @@ class SubscribeAttributeTargetNavigatorGeneratedCommandList : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -52761,6 +57126,7 @@ class ReadTargetNavigatorAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -52782,6 +57148,9 @@ class ReadTargetNavigatorAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTargetNavigatorAcceptedCommandList : public ModelCommand { @@ -52792,6 +57161,7 @@ class SubscribeAttributeTargetNavigatorAcceptedCommandList : public ModelCommand AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -52804,6 +57174,7 @@ class SubscribeAttributeTargetNavigatorAcceptedCommandList : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -52825,6 +57196,7 @@ class SubscribeAttributeTargetNavigatorAcceptedCommandList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -52839,6 +57211,7 @@ class ReadTargetNavigatorAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -52860,6 +57233,9 @@ class ReadTargetNavigatorAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTargetNavigatorAttributeList : public ModelCommand { @@ -52870,6 +57246,7 @@ class SubscribeAttributeTargetNavigatorAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -52882,6 +57259,7 @@ class SubscribeAttributeTargetNavigatorAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -52902,6 +57280,7 @@ class SubscribeAttributeTargetNavigatorAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -52916,6 +57295,7 @@ class ReadTargetNavigatorClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -52937,6 +57317,9 @@ class ReadTargetNavigatorClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTargetNavigatorClusterRevision : public ModelCommand { @@ -52947,6 +57330,7 @@ class SubscribeAttributeTargetNavigatorClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -52959,6 +57343,7 @@ class SubscribeAttributeTargetNavigatorClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTargetNavigator * cluster = [[CHIPTargetNavigator alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -52979,6 +57364,7 @@ class SubscribeAttributeTargetNavigatorClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -53012,6 +57398,7 @@ class ReadTemperatureMeasurementMeasuredValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "measured-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -53035,6 +57422,9 @@ class ReadTemperatureMeasurementMeasuredValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTemperatureMeasurementMeasuredValue : public ModelCommand { @@ -53045,6 +57435,7 @@ class SubscribeAttributeTemperatureMeasurementMeasuredValue : public ModelComman AddArgument("attr-name", "measured-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -53059,6 +57450,7 @@ class SubscribeAttributeTemperatureMeasurementMeasuredValue : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -53080,6 +57472,7 @@ class SubscribeAttributeTemperatureMeasurementMeasuredValue : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -53094,6 +57487,7 @@ class ReadTemperatureMeasurementMinMeasuredValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-measured-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -53117,6 +57511,9 @@ class ReadTemperatureMeasurementMinMeasuredValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTemperatureMeasurementMinMeasuredValue : public ModelCommand { @@ -53127,6 +57524,7 @@ class SubscribeAttributeTemperatureMeasurementMinMeasuredValue : public ModelCom AddArgument("attr-name", "min-measured-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -53141,6 +57539,7 @@ class SubscribeAttributeTemperatureMeasurementMinMeasuredValue : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -53162,6 +57561,7 @@ class SubscribeAttributeTemperatureMeasurementMinMeasuredValue : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -53176,6 +57576,7 @@ class ReadTemperatureMeasurementMaxMeasuredValue : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-measured-value"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -53199,6 +57600,9 @@ class ReadTemperatureMeasurementMaxMeasuredValue : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTemperatureMeasurementMaxMeasuredValue : public ModelCommand { @@ -53209,6 +57613,7 @@ class SubscribeAttributeTemperatureMeasurementMaxMeasuredValue : public ModelCom AddArgument("attr-name", "max-measured-value"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -53223,6 +57628,7 @@ class SubscribeAttributeTemperatureMeasurementMaxMeasuredValue : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxMeasuredValueWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -53244,6 +57650,7 @@ class SubscribeAttributeTemperatureMeasurementMaxMeasuredValue : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -53258,6 +57665,7 @@ class ReadTemperatureMeasurementTolerance : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tolerance"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -53281,6 +57689,9 @@ class ReadTemperatureMeasurementTolerance : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTemperatureMeasurementTolerance : public ModelCommand { @@ -53291,6 +57702,7 @@ class SubscribeAttributeTemperatureMeasurementTolerance : public ModelCommand { AddArgument("attr-name", "tolerance"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -53305,6 +57717,7 @@ class SubscribeAttributeTemperatureMeasurementTolerance : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeToleranceWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -53325,6 +57738,7 @@ class SubscribeAttributeTemperatureMeasurementTolerance : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -53339,6 +57753,7 @@ class ReadTemperatureMeasurementAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -53362,6 +57777,9 @@ class ReadTemperatureMeasurementAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTemperatureMeasurementAttributeList : public ModelCommand { @@ -53372,6 +57790,7 @@ class SubscribeAttributeTemperatureMeasurementAttributeList : public ModelComman AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -53386,6 +57805,7 @@ class SubscribeAttributeTemperatureMeasurementAttributeList : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -53407,6 +57827,7 @@ class SubscribeAttributeTemperatureMeasurementAttributeList : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -53421,6 +57842,7 @@ class ReadTemperatureMeasurementClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -53444,6 +57866,9 @@ class ReadTemperatureMeasurementClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTemperatureMeasurementClusterRevision : public ModelCommand { @@ -53454,6 +57879,7 @@ class SubscribeAttributeTemperatureMeasurementClusterRevision : public ModelComm AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -53468,6 +57894,7 @@ class SubscribeAttributeTemperatureMeasurementClusterRevision : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -53489,6 +57916,7 @@ class SubscribeAttributeTemperatureMeasurementClusterRevision : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -53624,6 +58052,7 @@ class TestClusterSimpleStructEchoRequest : public ModelCommand { , mComplex_Arg1(&mRequest.arg1) { AddArgument("Arg1", &mComplex_Arg1); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -53635,7 +58064,8 @@ class TestClusterSimpleStructEchoRequest : public ModelCommand { CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPTestClusterClusterSimpleStructEchoRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.arg1 = [CHIPTestClusterClusterSimpleStruct new]; params.arg1.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.a]; params.arg1.b = [NSNumber numberWithBool:mRequest.arg1.b]; @@ -53659,6 +58089,7 @@ class TestClusterSimpleStructEchoRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::TestCluster::Commands::SimpleStructEchoRequest::Type mRequest; TypedComplexArgument mComplex_Arg1; }; @@ -53671,6 +58102,7 @@ class TestClusterTest : public ModelCommand { TestClusterTest() : ModelCommand("test") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -53681,6 +58113,9 @@ class TestClusterTest : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPTestClusterClusterTestParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster testWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -53690,6 +58125,7 @@ class TestClusterTest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -53702,6 +58138,7 @@ class TestClusterTestAddArguments : public ModelCommand { { AddArgument("Arg1", 0, UINT8_MAX, &mArg1); AddArgument("Arg2", 0, UINT8_MAX, &mArg2); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -53713,9 +58150,9 @@ class TestClusterTestAddArguments : public ModelCommand { CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPTestClusterClusterTestAddArgumentsParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.arg1 = [NSNumber numberWithUnsignedChar:mArg1]; - params.arg2 = [NSNumber numberWithUnsignedChar:mArg2]; [cluster testAddArgumentsWithParams:params completionHandler:^( @@ -53729,6 +58166,7 @@ class TestClusterTestAddArguments : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mArg1; uint8_t mArg2; }; @@ -53744,6 +58182,7 @@ class TestClusterTestEmitTestEventRequest : public ModelCommand { AddArgument("Arg1", 0, UINT8_MAX, &mArg1); AddArgument("Arg2", 0, UINT8_MAX, &mArg2); AddArgument("Arg3", 0, 1, &mArg3); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -53755,11 +58194,10 @@ class TestClusterTestEmitTestEventRequest : public ModelCommand { CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPTestClusterClusterTestEmitTestEventRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.arg1 = [NSNumber numberWithUnsignedChar:mArg1]; - params.arg2 = [NSNumber numberWithUnsignedChar:mArg2]; - params.arg3 = [NSNumber numberWithBool:mArg3]; [cluster testEmitTestEventRequestWithParams:params completionHandler:^(CHIPTestClusterClusterTestEmitTestEventResponseParams * _Nullable values, @@ -53773,6 +58211,7 @@ class TestClusterTestEmitTestEventRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mArg1; uint8_t mArg2; bool mArg3; @@ -53788,6 +58227,7 @@ class TestClusterTestEnumsRequest : public ModelCommand { { AddArgument("Arg1", 0, UINT16_MAX, &mArg1); AddArgument("Arg2", 0, UINT8_MAX, &mArg2); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -53799,9 +58239,9 @@ class TestClusterTestEnumsRequest : public ModelCommand { CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPTestClusterClusterTestEnumsRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.arg1 = [NSNumber numberWithUnsignedShort:mArg1]; - params.arg2 = [NSNumber numberWithUnsignedChar:mArg2]; [cluster testEnumsRequestWithParams:params completionHandler:^( @@ -53815,6 +58255,7 @@ class TestClusterTestEnumsRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::VendorId mArg1; uint8_t mArg2; }; @@ -53829,6 +58270,7 @@ class TestClusterTestListInt8UArgumentRequest : public ModelCommand { , mComplex_Arg1(&mRequest.arg1) { AddArgument("Arg1", &mComplex_Arg1); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -53840,7 +58282,8 @@ class TestClusterTestListInt8UArgumentRequest : public ModelCommand { CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPTestClusterClusterTestListInt8UArgumentRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; for (auto & entry_0 : mRequest.arg1) { @@ -53862,6 +58305,7 @@ class TestClusterTestListInt8UArgumentRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::TestCluster::Commands::TestListInt8UArgumentRequest::Type mRequest; TypedComplexArgument> mComplex_Arg1; }; @@ -53876,6 +58320,7 @@ class TestClusterTestListInt8UReverseRequest : public ModelCommand { , mComplex_Arg1(&mRequest.arg1) { AddArgument("Arg1", &mComplex_Arg1); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -53887,7 +58332,8 @@ class TestClusterTestListInt8UReverseRequest : public ModelCommand { CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPTestClusterClusterTestListInt8UReverseRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; for (auto & entry_0 : mRequest.arg1) { @@ -53910,6 +58356,7 @@ class TestClusterTestListInt8UReverseRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::TestCluster::Commands::TestListInt8UReverseRequest::Type mRequest; TypedComplexArgument> mComplex_Arg1; }; @@ -53924,6 +58371,7 @@ class TestClusterTestListNestedStructListArgumentRequest : public ModelCommand { , mComplex_Arg1(&mRequest.arg1) { AddArgument("Arg1", &mComplex_Arg1); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -53935,7 +58383,8 @@ class TestClusterTestListNestedStructListArgumentRequest : public ModelCommand { CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPTestClusterClusterTestListNestedStructListArgumentRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; for (auto & entry_0 : mRequest.arg1) { @@ -54016,6 +58465,7 @@ class TestClusterTestListNestedStructListArgumentRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::TestCluster::Commands::TestListNestedStructListArgumentRequest::Type mRequest; TypedComplexArgument> mComplex_Arg1; @@ -54031,6 +58481,7 @@ class TestClusterTestListStructArgumentRequest : public ModelCommand { , mComplex_Arg1(&mRequest.arg1) { AddArgument("Arg1", &mComplex_Arg1); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -54042,7 +58493,8 @@ class TestClusterTestListStructArgumentRequest : public ModelCommand { CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPTestClusterClusterTestListStructArgumentRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; for (auto & entry_0 : mRequest.arg1) { @@ -54074,6 +58526,7 @@ class TestClusterTestListStructArgumentRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::TestCluster::Commands::TestListStructArgumentRequest::Type mRequest; TypedComplexArgument> mComplex_Arg1; @@ -54089,6 +58542,7 @@ class TestClusterTestNestedStructArgumentRequest : public ModelCommand { , mComplex_Arg1(&mRequest.arg1) { AddArgument("Arg1", &mComplex_Arg1); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -54100,7 +58554,8 @@ class TestClusterTestNestedStructArgumentRequest : public ModelCommand { CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPTestClusterClusterTestNestedStructArgumentRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.arg1 = [CHIPTestClusterClusterNestedStruct new]; params.arg1.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.a]; params.arg1.b = [NSNumber numberWithBool:mRequest.arg1.b]; @@ -54127,6 +58582,7 @@ class TestClusterTestNestedStructArgumentRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::TestCluster::Commands::TestNestedStructArgumentRequest::Type mRequest; TypedComplexArgument mComplex_Arg1; }; @@ -54141,6 +58597,7 @@ class TestClusterTestNestedStructListArgumentRequest : public ModelCommand { , mComplex_Arg1(&mRequest.arg1) { AddArgument("Arg1", &mComplex_Arg1); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -54152,7 +58609,8 @@ class TestClusterTestNestedStructListArgumentRequest : public ModelCommand { CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPTestClusterClusterTestNestedStructListArgumentRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.arg1 = [CHIPTestClusterClusterNestedStructList new]; params.arg1.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.a]; params.arg1.b = [NSNumber numberWithBool:mRequest.arg1.b]; @@ -54225,6 +58683,7 @@ class TestClusterTestNestedStructListArgumentRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::TestCluster::Commands::TestNestedStructListArgumentRequest::Type mRequest; TypedComplexArgument mComplex_Arg1; }; @@ -54237,6 +58696,7 @@ class TestClusterTestNotHandled : public ModelCommand { TestClusterTestNotHandled() : ModelCommand("test-not-handled") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -54247,6 +58707,9 @@ class TestClusterTestNotHandled : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPTestClusterClusterTestNotHandledParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster testNotHandledWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -54256,6 +58719,7 @@ class TestClusterTestNotHandled : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -54267,6 +58731,7 @@ class TestClusterTestNullableOptionalRequest : public ModelCommand { : ModelCommand("test-nullable-optional-request") { AddArgument("Arg1", 0, UINT8_MAX, &mArg1); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -54278,7 +58743,8 @@ class TestClusterTestNullableOptionalRequest : public ModelCommand { CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPTestClusterClusterTestNullableOptionalRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.arg1 = [NSNumber numberWithUnsignedChar:mArg1]; [cluster testNullableOptionalRequestWithParams:params @@ -54293,6 +58759,7 @@ class TestClusterTestNullableOptionalRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mArg1; }; @@ -54305,6 +58772,7 @@ class TestClusterTestSimpleOptionalArgumentRequest : public ModelCommand { : ModelCommand("test-simple-optional-argument-request") { AddArgument("Arg1", 0, 1, &mArg1); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -54316,7 +58784,8 @@ class TestClusterTestSimpleOptionalArgumentRequest : public ModelCommand { CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPTestClusterClusterTestSimpleOptionalArgumentRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.arg1 = [NSNumber numberWithBool:mArg1]; [cluster testSimpleOptionalArgumentRequestWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -54328,6 +58797,7 @@ class TestClusterTestSimpleOptionalArgumentRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; bool mArg1; }; @@ -54339,6 +58809,7 @@ class TestClusterTestSpecific : public ModelCommand { TestClusterTestSpecific() : ModelCommand("test-specific") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -54349,6 +58820,9 @@ class TestClusterTestSpecific : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPTestClusterClusterTestSpecificParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster testSpecificWithCompletionHandler:^( CHIPTestClusterClusterTestSpecificResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); @@ -54360,6 +58834,7 @@ class TestClusterTestSpecific : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -54372,6 +58847,7 @@ class TestClusterTestStructArgumentRequest : public ModelCommand { , mComplex_Arg1(&mRequest.arg1) { AddArgument("Arg1", &mComplex_Arg1); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -54383,7 +58859,8 @@ class TestClusterTestStructArgumentRequest : public ModelCommand { CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPTestClusterClusterTestStructArgumentRequestParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.arg1 = [CHIPTestClusterClusterSimpleStruct new]; params.arg1.a = [NSNumber numberWithUnsignedChar:mRequest.arg1.a]; params.arg1.b = [NSNumber numberWithBool:mRequest.arg1.b]; @@ -54407,6 +58884,7 @@ class TestClusterTestStructArgumentRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::TestCluster::Commands::TestStructArgumentRequest::Type mRequest; TypedComplexArgument mComplex_Arg1; }; @@ -54419,6 +58897,7 @@ class TestClusterTestUnknownCommand : public ModelCommand { TestClusterTestUnknownCommand() : ModelCommand("test-unknown-command") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -54429,6 +58908,9 @@ class TestClusterTestUnknownCommand : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPTestClusterClusterTestUnknownCommandParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster testUnknownCommandWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -54438,6 +58920,7 @@ class TestClusterTestUnknownCommand : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -54448,6 +58931,7 @@ class TestClusterTimedInvokeRequest : public ModelCommand { TestClusterTimedInvokeRequest() : ModelCommand("timed-invoke-request") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -54458,6 +58942,9 @@ class TestClusterTimedInvokeRequest : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPTestClusterClusterTimedInvokeRequestParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster timedInvokeRequestWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -54467,6 +58954,7 @@ class TestClusterTimedInvokeRequest : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -54478,6 +58966,7 @@ class ReadTestClusterBoolean : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "boolean"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -54499,6 +58988,9 @@ class ReadTestClusterBoolean : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterBoolean : public ModelCommand { @@ -54508,6 +59000,7 @@ class WriteTestClusterBoolean : public ModelCommand { { AddArgument("attr-name", "boolean"); AddArgument("attr-value", 0, 1, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -54519,10 +59012,13 @@ class WriteTestClusterBoolean : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue]; [cluster writeAttributeBooleanWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Boolean Error: %s", chip::ErrorStr(chipError)); @@ -54532,6 +59028,7 @@ class WriteTestClusterBoolean : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; bool mValue; }; @@ -54543,6 +59040,7 @@ class SubscribeAttributeTestClusterBoolean : public ModelCommand { AddArgument("attr-name", "boolean"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -54555,6 +59053,7 @@ class SubscribeAttributeTestClusterBoolean : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -54575,6 +59074,7 @@ class SubscribeAttributeTestClusterBoolean : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -54589,6 +59089,7 @@ class ReadTestClusterBitmap8 : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "bitmap8"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -54610,6 +59111,9 @@ class ReadTestClusterBitmap8 : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterBitmap8 : public ModelCommand { @@ -54619,6 +59123,7 @@ class WriteTestClusterBitmap8 : public ModelCommand { { AddArgument("attr-name", "bitmap8"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -54630,10 +59135,13 @@ class WriteTestClusterBitmap8 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeBitmap8WithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Bitmap8 Error: %s", chip::ErrorStr(chipError)); @@ -54643,6 +59151,7 @@ class WriteTestClusterBitmap8 : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -54654,6 +59163,7 @@ class SubscribeAttributeTestClusterBitmap8 : public ModelCommand { AddArgument("attr-name", "bitmap8"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -54666,6 +59176,7 @@ class SubscribeAttributeTestClusterBitmap8 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBitmap8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -54686,6 +59197,7 @@ class SubscribeAttributeTestClusterBitmap8 : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -54700,6 +59212,7 @@ class ReadTestClusterBitmap16 : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "bitmap16"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -54721,6 +59234,9 @@ class ReadTestClusterBitmap16 : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterBitmap16 : public ModelCommand { @@ -54730,6 +59246,7 @@ class WriteTestClusterBitmap16 : public ModelCommand { { AddArgument("attr-name", "bitmap16"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -54741,10 +59258,13 @@ class WriteTestClusterBitmap16 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeBitmap16WithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Bitmap16 Error: %s", chip::ErrorStr(chipError)); @@ -54754,6 +59274,7 @@ class WriteTestClusterBitmap16 : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -54765,6 +59286,7 @@ class SubscribeAttributeTestClusterBitmap16 : public ModelCommand { AddArgument("attr-name", "bitmap16"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -54777,6 +59299,7 @@ class SubscribeAttributeTestClusterBitmap16 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBitmap16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -54797,6 +59320,7 @@ class SubscribeAttributeTestClusterBitmap16 : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -54811,6 +59335,7 @@ class ReadTestClusterBitmap32 : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "bitmap32"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -54832,6 +59357,9 @@ class ReadTestClusterBitmap32 : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterBitmap32 : public ModelCommand { @@ -54841,6 +59369,7 @@ class WriteTestClusterBitmap32 : public ModelCommand { { AddArgument("attr-name", "bitmap32"); AddArgument("attr-value", 0, UINT32_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -54852,10 +59381,13 @@ class WriteTestClusterBitmap32 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue]; [cluster writeAttributeBitmap32WithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Bitmap32 Error: %s", chip::ErrorStr(chipError)); @@ -54865,6 +59397,7 @@ class WriteTestClusterBitmap32 : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint32_t mValue; }; @@ -54876,6 +59409,7 @@ class SubscribeAttributeTestClusterBitmap32 : public ModelCommand { AddArgument("attr-name", "bitmap32"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -54888,6 +59422,7 @@ class SubscribeAttributeTestClusterBitmap32 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBitmap32WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -54908,6 +59443,7 @@ class SubscribeAttributeTestClusterBitmap32 : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -54922,6 +59458,7 @@ class ReadTestClusterBitmap64 : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "bitmap64"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -54943,6 +59480,9 @@ class ReadTestClusterBitmap64 : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterBitmap64 : public ModelCommand { @@ -54952,6 +59492,7 @@ class WriteTestClusterBitmap64 : public ModelCommand { { AddArgument("attr-name", "bitmap64"); AddArgument("attr-value", 0, UINT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -54963,10 +59504,13 @@ class WriteTestClusterBitmap64 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue]; [cluster writeAttributeBitmap64WithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Bitmap64 Error: %s", chip::ErrorStr(chipError)); @@ -54976,6 +59520,7 @@ class WriteTestClusterBitmap64 : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint64_t mValue; }; @@ -54987,6 +59532,7 @@ class SubscribeAttributeTestClusterBitmap64 : public ModelCommand { AddArgument("attr-name", "bitmap64"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -54999,6 +59545,7 @@ class SubscribeAttributeTestClusterBitmap64 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBitmap64WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -55019,6 +59566,7 @@ class SubscribeAttributeTestClusterBitmap64 : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -55033,6 +59581,7 @@ class ReadTestClusterInt8u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int8u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -55054,6 +59603,9 @@ class ReadTestClusterInt8u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt8u : public ModelCommand { @@ -55063,6 +59615,7 @@ class WriteTestClusterInt8u : public ModelCommand { { AddArgument("attr-name", "int8u"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -55074,10 +59627,13 @@ class WriteTestClusterInt8u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeInt8uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int8u Error: %s", chip::ErrorStr(chipError)); @@ -55087,6 +59643,7 @@ class WriteTestClusterInt8u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -55098,6 +59655,7 @@ class SubscribeAttributeTestClusterInt8u : public ModelCommand { AddArgument("attr-name", "int8u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -55110,6 +59668,7 @@ class SubscribeAttributeTestClusterInt8u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -55130,6 +59689,7 @@ class SubscribeAttributeTestClusterInt8u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -55144,6 +59704,7 @@ class ReadTestClusterInt16u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int16u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -55165,6 +59726,9 @@ class ReadTestClusterInt16u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt16u : public ModelCommand { @@ -55174,6 +59738,7 @@ class WriteTestClusterInt16u : public ModelCommand { { AddArgument("attr-name", "int16u"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -55185,10 +59750,13 @@ class WriteTestClusterInt16u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeInt16uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int16u Error: %s", chip::ErrorStr(chipError)); @@ -55198,6 +59766,7 @@ class WriteTestClusterInt16u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -55209,6 +59778,7 @@ class SubscribeAttributeTestClusterInt16u : public ModelCommand { AddArgument("attr-name", "int16u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -55221,6 +59791,7 @@ class SubscribeAttributeTestClusterInt16u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -55241,6 +59812,7 @@ class SubscribeAttributeTestClusterInt16u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -55255,6 +59827,7 @@ class ReadTestClusterInt24u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int24u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -55276,6 +59849,9 @@ class ReadTestClusterInt24u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt24u : public ModelCommand { @@ -55285,6 +59861,7 @@ class WriteTestClusterInt24u : public ModelCommand { { AddArgument("attr-name", "int24u"); AddArgument("attr-value", 0, UINT32_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -55296,10 +59873,13 @@ class WriteTestClusterInt24u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue]; [cluster writeAttributeInt24uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int24u Error: %s", chip::ErrorStr(chipError)); @@ -55309,6 +59889,7 @@ class WriteTestClusterInt24u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint32_t mValue; }; @@ -55320,6 +59901,7 @@ class SubscribeAttributeTestClusterInt24u : public ModelCommand { AddArgument("attr-name", "int24u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -55332,6 +59914,7 @@ class SubscribeAttributeTestClusterInt24u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt24uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -55352,6 +59935,7 @@ class SubscribeAttributeTestClusterInt24u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -55366,6 +59950,7 @@ class ReadTestClusterInt32u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int32u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -55387,6 +59972,9 @@ class ReadTestClusterInt32u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt32u : public ModelCommand { @@ -55396,6 +59984,7 @@ class WriteTestClusterInt32u : public ModelCommand { { AddArgument("attr-name", "int32u"); AddArgument("attr-value", 0, UINT32_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -55407,10 +59996,13 @@ class WriteTestClusterInt32u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue]; [cluster writeAttributeInt32uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int32u Error: %s", chip::ErrorStr(chipError)); @@ -55420,6 +60012,7 @@ class WriteTestClusterInt32u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint32_t mValue; }; @@ -55431,6 +60024,7 @@ class SubscribeAttributeTestClusterInt32u : public ModelCommand { AddArgument("attr-name", "int32u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -55443,6 +60037,7 @@ class SubscribeAttributeTestClusterInt32u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt32uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -55463,6 +60058,7 @@ class SubscribeAttributeTestClusterInt32u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -55477,6 +60073,7 @@ class ReadTestClusterInt40u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int40u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -55498,6 +60095,9 @@ class ReadTestClusterInt40u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt40u : public ModelCommand { @@ -55507,6 +60107,7 @@ class WriteTestClusterInt40u : public ModelCommand { { AddArgument("attr-name", "int40u"); AddArgument("attr-value", 0, UINT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -55518,10 +60119,13 @@ class WriteTestClusterInt40u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue]; [cluster writeAttributeInt40uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int40u Error: %s", chip::ErrorStr(chipError)); @@ -55531,6 +60135,7 @@ class WriteTestClusterInt40u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint64_t mValue; }; @@ -55542,6 +60147,7 @@ class SubscribeAttributeTestClusterInt40u : public ModelCommand { AddArgument("attr-name", "int40u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -55554,6 +60160,7 @@ class SubscribeAttributeTestClusterInt40u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt40uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -55574,6 +60181,7 @@ class SubscribeAttributeTestClusterInt40u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -55588,6 +60196,7 @@ class ReadTestClusterInt48u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int48u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -55609,6 +60218,9 @@ class ReadTestClusterInt48u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt48u : public ModelCommand { @@ -55618,6 +60230,7 @@ class WriteTestClusterInt48u : public ModelCommand { { AddArgument("attr-name", "int48u"); AddArgument("attr-value", 0, UINT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -55629,10 +60242,13 @@ class WriteTestClusterInt48u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue]; [cluster writeAttributeInt48uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int48u Error: %s", chip::ErrorStr(chipError)); @@ -55642,6 +60258,7 @@ class WriteTestClusterInt48u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint64_t mValue; }; @@ -55653,6 +60270,7 @@ class SubscribeAttributeTestClusterInt48u : public ModelCommand { AddArgument("attr-name", "int48u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -55665,6 +60283,7 @@ class SubscribeAttributeTestClusterInt48u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt48uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -55685,6 +60304,7 @@ class SubscribeAttributeTestClusterInt48u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -55699,6 +60319,7 @@ class ReadTestClusterInt56u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int56u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -55720,6 +60341,9 @@ class ReadTestClusterInt56u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt56u : public ModelCommand { @@ -55729,6 +60353,7 @@ class WriteTestClusterInt56u : public ModelCommand { { AddArgument("attr-name", "int56u"); AddArgument("attr-value", 0, UINT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -55740,10 +60365,13 @@ class WriteTestClusterInt56u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue]; [cluster writeAttributeInt56uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int56u Error: %s", chip::ErrorStr(chipError)); @@ -55753,6 +60381,7 @@ class WriteTestClusterInt56u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint64_t mValue; }; @@ -55764,6 +60393,7 @@ class SubscribeAttributeTestClusterInt56u : public ModelCommand { AddArgument("attr-name", "int56u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -55776,6 +60406,7 @@ class SubscribeAttributeTestClusterInt56u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt56uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -55796,6 +60427,7 @@ class SubscribeAttributeTestClusterInt56u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -55810,6 +60442,7 @@ class ReadTestClusterInt64u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int64u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -55831,6 +60464,9 @@ class ReadTestClusterInt64u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt64u : public ModelCommand { @@ -55840,6 +60476,7 @@ class WriteTestClusterInt64u : public ModelCommand { { AddArgument("attr-name", "int64u"); AddArgument("attr-value", 0, UINT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -55851,10 +60488,13 @@ class WriteTestClusterInt64u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue]; [cluster writeAttributeInt64uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int64u Error: %s", chip::ErrorStr(chipError)); @@ -55864,6 +60504,7 @@ class WriteTestClusterInt64u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint64_t mValue; }; @@ -55875,6 +60516,7 @@ class SubscribeAttributeTestClusterInt64u : public ModelCommand { AddArgument("attr-name", "int64u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -55887,6 +60529,7 @@ class SubscribeAttributeTestClusterInt64u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt64uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -55907,6 +60550,7 @@ class SubscribeAttributeTestClusterInt64u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -55921,6 +60565,7 @@ class ReadTestClusterInt8s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int8s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -55942,6 +60587,9 @@ class ReadTestClusterInt8s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt8s : public ModelCommand { @@ -55951,6 +60599,7 @@ class WriteTestClusterInt8s : public ModelCommand { { AddArgument("attr-name", "int8s"); AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -55962,10 +60611,13 @@ class WriteTestClusterInt8s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithChar:mValue]; [cluster writeAttributeInt8sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int8s Error: %s", chip::ErrorStr(chipError)); @@ -55975,6 +60627,7 @@ class WriteTestClusterInt8s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int8_t mValue; }; @@ -55986,6 +60639,7 @@ class SubscribeAttributeTestClusterInt8s : public ModelCommand { AddArgument("attr-name", "int8s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -55998,6 +60652,7 @@ class SubscribeAttributeTestClusterInt8s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -56018,6 +60673,7 @@ class SubscribeAttributeTestClusterInt8s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -56032,6 +60688,7 @@ class ReadTestClusterInt16s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int16s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -56053,6 +60710,9 @@ class ReadTestClusterInt16s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt16s : public ModelCommand { @@ -56062,6 +60722,7 @@ class WriteTestClusterInt16s : public ModelCommand { { AddArgument("attr-name", "int16s"); AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -56073,10 +60734,13 @@ class WriteTestClusterInt16s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue]; [cluster writeAttributeInt16sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int16s Error: %s", chip::ErrorStr(chipError)); @@ -56086,6 +60750,7 @@ class WriteTestClusterInt16s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int16_t mValue; }; @@ -56097,6 +60762,7 @@ class SubscribeAttributeTestClusterInt16s : public ModelCommand { AddArgument("attr-name", "int16s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -56109,6 +60775,7 @@ class SubscribeAttributeTestClusterInt16s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -56129,6 +60796,7 @@ class SubscribeAttributeTestClusterInt16s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -56143,6 +60811,7 @@ class ReadTestClusterInt24s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int24s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -56164,6 +60833,9 @@ class ReadTestClusterInt24s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt24s : public ModelCommand { @@ -56173,6 +60845,7 @@ class WriteTestClusterInt24s : public ModelCommand { { AddArgument("attr-name", "int24s"); AddArgument("attr-value", INT32_MIN, INT32_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -56184,10 +60857,13 @@ class WriteTestClusterInt24s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithInt:mValue]; [cluster writeAttributeInt24sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int24s Error: %s", chip::ErrorStr(chipError)); @@ -56197,6 +60873,7 @@ class WriteTestClusterInt24s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int32_t mValue; }; @@ -56208,6 +60885,7 @@ class SubscribeAttributeTestClusterInt24s : public ModelCommand { AddArgument("attr-name", "int24s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -56220,6 +60898,7 @@ class SubscribeAttributeTestClusterInt24s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt24sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -56240,6 +60919,7 @@ class SubscribeAttributeTestClusterInt24s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -56254,6 +60934,7 @@ class ReadTestClusterInt32s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int32s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -56275,6 +60956,9 @@ class ReadTestClusterInt32s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt32s : public ModelCommand { @@ -56284,6 +60968,7 @@ class WriteTestClusterInt32s : public ModelCommand { { AddArgument("attr-name", "int32s"); AddArgument("attr-value", INT32_MIN, INT32_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -56295,10 +60980,13 @@ class WriteTestClusterInt32s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithInt:mValue]; [cluster writeAttributeInt32sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int32s Error: %s", chip::ErrorStr(chipError)); @@ -56308,6 +60996,7 @@ class WriteTestClusterInt32s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int32_t mValue; }; @@ -56319,6 +61008,7 @@ class SubscribeAttributeTestClusterInt32s : public ModelCommand { AddArgument("attr-name", "int32s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -56331,6 +61021,7 @@ class SubscribeAttributeTestClusterInt32s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt32sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -56351,6 +61042,7 @@ class SubscribeAttributeTestClusterInt32s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -56365,6 +61057,7 @@ class ReadTestClusterInt40s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int40s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -56386,6 +61079,9 @@ class ReadTestClusterInt40s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt40s : public ModelCommand { @@ -56395,6 +61091,7 @@ class WriteTestClusterInt40s : public ModelCommand { { AddArgument("attr-name", "int40s"); AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -56406,10 +61103,13 @@ class WriteTestClusterInt40s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithLongLong:mValue]; [cluster writeAttributeInt40sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int40s Error: %s", chip::ErrorStr(chipError)); @@ -56419,6 +61119,7 @@ class WriteTestClusterInt40s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int64_t mValue; }; @@ -56430,6 +61131,7 @@ class SubscribeAttributeTestClusterInt40s : public ModelCommand { AddArgument("attr-name", "int40s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -56442,6 +61144,7 @@ class SubscribeAttributeTestClusterInt40s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt40sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -56462,6 +61165,7 @@ class SubscribeAttributeTestClusterInt40s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -56476,6 +61180,7 @@ class ReadTestClusterInt48s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int48s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -56497,6 +61202,9 @@ class ReadTestClusterInt48s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt48s : public ModelCommand { @@ -56506,6 +61214,7 @@ class WriteTestClusterInt48s : public ModelCommand { { AddArgument("attr-name", "int48s"); AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -56517,10 +61226,13 @@ class WriteTestClusterInt48s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithLongLong:mValue]; [cluster writeAttributeInt48sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int48s Error: %s", chip::ErrorStr(chipError)); @@ -56530,6 +61242,7 @@ class WriteTestClusterInt48s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int64_t mValue; }; @@ -56541,6 +61254,7 @@ class SubscribeAttributeTestClusterInt48s : public ModelCommand { AddArgument("attr-name", "int48s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -56553,6 +61267,7 @@ class SubscribeAttributeTestClusterInt48s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt48sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -56573,6 +61288,7 @@ class SubscribeAttributeTestClusterInt48s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -56587,6 +61303,7 @@ class ReadTestClusterInt56s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int56s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -56608,6 +61325,9 @@ class ReadTestClusterInt56s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt56s : public ModelCommand { @@ -56617,6 +61337,7 @@ class WriteTestClusterInt56s : public ModelCommand { { AddArgument("attr-name", "int56s"); AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -56628,10 +61349,13 @@ class WriteTestClusterInt56s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithLongLong:mValue]; [cluster writeAttributeInt56sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int56s Error: %s", chip::ErrorStr(chipError)); @@ -56641,6 +61365,7 @@ class WriteTestClusterInt56s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int64_t mValue; }; @@ -56652,6 +61377,7 @@ class SubscribeAttributeTestClusterInt56s : public ModelCommand { AddArgument("attr-name", "int56s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -56664,6 +61390,7 @@ class SubscribeAttributeTestClusterInt56s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt56sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -56684,6 +61411,7 @@ class SubscribeAttributeTestClusterInt56s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -56698,6 +61426,7 @@ class ReadTestClusterInt64s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "int64s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -56719,6 +61448,9 @@ class ReadTestClusterInt64s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterInt64s : public ModelCommand { @@ -56728,6 +61460,7 @@ class WriteTestClusterInt64s : public ModelCommand { { AddArgument("attr-name", "int64s"); AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -56739,10 +61472,13 @@ class WriteTestClusterInt64s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithLongLong:mValue]; [cluster writeAttributeInt64sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Int64s Error: %s", chip::ErrorStr(chipError)); @@ -56752,6 +61488,7 @@ class WriteTestClusterInt64s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int64_t mValue; }; @@ -56763,6 +61500,7 @@ class SubscribeAttributeTestClusterInt64s : public ModelCommand { AddArgument("attr-name", "int64s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -56775,6 +61513,7 @@ class SubscribeAttributeTestClusterInt64s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInt64sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -56795,6 +61534,7 @@ class SubscribeAttributeTestClusterInt64s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -56809,6 +61549,7 @@ class ReadTestClusterEnum8 : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "enum8"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -56830,6 +61571,9 @@ class ReadTestClusterEnum8 : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterEnum8 : public ModelCommand { @@ -56839,6 +61583,7 @@ class WriteTestClusterEnum8 : public ModelCommand { { AddArgument("attr-name", "enum8"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -56850,10 +61595,13 @@ class WriteTestClusterEnum8 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeEnum8WithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Enum8 Error: %s", chip::ErrorStr(chipError)); @@ -56863,6 +61611,7 @@ class WriteTestClusterEnum8 : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -56874,6 +61623,7 @@ class SubscribeAttributeTestClusterEnum8 : public ModelCommand { AddArgument("attr-name", "enum8"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -56886,6 +61636,7 @@ class SubscribeAttributeTestClusterEnum8 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeEnum8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -56906,6 +61657,7 @@ class SubscribeAttributeTestClusterEnum8 : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -56920,6 +61672,7 @@ class ReadTestClusterEnum16 : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "enum16"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -56941,6 +61694,9 @@ class ReadTestClusterEnum16 : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterEnum16 : public ModelCommand { @@ -56950,6 +61706,7 @@ class WriteTestClusterEnum16 : public ModelCommand { { AddArgument("attr-name", "enum16"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -56961,10 +61718,13 @@ class WriteTestClusterEnum16 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeEnum16WithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Enum16 Error: %s", chip::ErrorStr(chipError)); @@ -56974,6 +61734,7 @@ class WriteTestClusterEnum16 : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -56985,6 +61746,7 @@ class SubscribeAttributeTestClusterEnum16 : public ModelCommand { AddArgument("attr-name", "enum16"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -56997,6 +61759,7 @@ class SubscribeAttributeTestClusterEnum16 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeEnum16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -57017,6 +61780,7 @@ class SubscribeAttributeTestClusterEnum16 : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -57031,6 +61795,7 @@ class ReadTestClusterFloatSingle : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "float-single"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -57052,6 +61817,9 @@ class ReadTestClusterFloatSingle : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterFloatSingle : public ModelCommand { @@ -57061,6 +61829,7 @@ class WriteTestClusterFloatSingle : public ModelCommand { { AddArgument("attr-name", "float-single"); AddArgument("attr-value", -std::numeric_limits::infinity(), std::numeric_limits::infinity(), &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -57072,10 +61841,13 @@ class WriteTestClusterFloatSingle : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithFloat:mValue]; [cluster writeAttributeFloatSingleWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster FloatSingle Error: %s", chip::ErrorStr(chipError)); @@ -57085,6 +61857,7 @@ class WriteTestClusterFloatSingle : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; float mValue; }; @@ -57096,6 +61869,7 @@ class SubscribeAttributeTestClusterFloatSingle : public ModelCommand { AddArgument("attr-name", "float-single"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -57108,6 +61882,7 @@ class SubscribeAttributeTestClusterFloatSingle : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFloatSingleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -57128,6 +61903,7 @@ class SubscribeAttributeTestClusterFloatSingle : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -57142,6 +61918,7 @@ class ReadTestClusterFloatDouble : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "float-double"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -57163,6 +61940,9 @@ class ReadTestClusterFloatDouble : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterFloatDouble : public ModelCommand { @@ -57172,6 +61952,7 @@ class WriteTestClusterFloatDouble : public ModelCommand { { AddArgument("attr-name", "float-double"); AddArgument("attr-value", -std::numeric_limits::infinity(), std::numeric_limits::infinity(), &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -57183,10 +61964,13 @@ class WriteTestClusterFloatDouble : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithDouble:mValue]; [cluster writeAttributeFloatDoubleWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster FloatDouble Error: %s", chip::ErrorStr(chipError)); @@ -57196,6 +61980,7 @@ class WriteTestClusterFloatDouble : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; double mValue; }; @@ -57207,6 +61992,7 @@ class SubscribeAttributeTestClusterFloatDouble : public ModelCommand { AddArgument("attr-name", "float-double"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -57219,6 +62005,7 @@ class SubscribeAttributeTestClusterFloatDouble : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFloatDoubleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -57239,6 +62026,7 @@ class SubscribeAttributeTestClusterFloatDouble : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -57253,6 +62041,7 @@ class ReadTestClusterOctetString : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "octet-string"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -57274,6 +62063,9 @@ class ReadTestClusterOctetString : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterOctetString : public ModelCommand { @@ -57283,6 +62075,7 @@ class WriteTestClusterOctetString : public ModelCommand { { AddArgument("attr-name", "octet-string"); AddArgument("attr-value", &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -57294,10 +62087,13 @@ class WriteTestClusterOctetString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSData * _Nonnull value = [[NSData alloc] initWithBytes:mValue.data() length:mValue.size()]; [cluster writeAttributeOctetStringWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster OctetString Error: %s", chip::ErrorStr(chipError)); @@ -57307,6 +62103,7 @@ class WriteTestClusterOctetString : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mValue; }; @@ -57318,6 +62115,7 @@ class SubscribeAttributeTestClusterOctetString : public ModelCommand { AddArgument("attr-name", "octet-string"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -57330,6 +62128,7 @@ class SubscribeAttributeTestClusterOctetString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -57350,6 +62149,7 @@ class SubscribeAttributeTestClusterOctetString : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -57364,6 +62164,7 @@ class ReadTestClusterListInt8u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "list-int8u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -57385,6 +62186,9 @@ class ReadTestClusterListInt8u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterListInt8u : public ModelCommand { @@ -57395,6 +62199,7 @@ class WriteTestClusterListInt8u : public ModelCommand { { AddArgument("attr-name", "list-int8u"); AddArgument("attr-value", &mComplex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -57406,7 +62211,9 @@ class WriteTestClusterListInt8u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSArray * _Nonnull value; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; @@ -57419,6 +62226,7 @@ class WriteTestClusterListInt8u : public ModelCommand { } [cluster writeAttributeListInt8uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster ListInt8u Error: %s", chip::ErrorStr(chipError)); @@ -57428,6 +62236,7 @@ class WriteTestClusterListInt8u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::DataModel::List mValue; TypedComplexArgument> mComplex; }; @@ -57440,6 +62249,7 @@ class SubscribeAttributeTestClusterListInt8u : public ModelCommand { AddArgument("attr-name", "list-int8u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -57452,6 +62262,7 @@ class SubscribeAttributeTestClusterListInt8u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeListInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -57472,6 +62283,7 @@ class SubscribeAttributeTestClusterListInt8u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -57486,6 +62298,7 @@ class ReadTestClusterListOctetString : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "list-octet-string"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -57507,6 +62320,9 @@ class ReadTestClusterListOctetString : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterListOctetString : public ModelCommand { @@ -57517,6 +62333,7 @@ class WriteTestClusterListOctetString : public ModelCommand { { AddArgument("attr-name", "list-octet-string"); AddArgument("attr-value", &mComplex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -57528,7 +62345,9 @@ class WriteTestClusterListOctetString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSArray * _Nonnull value; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; @@ -57542,6 +62361,7 @@ class WriteTestClusterListOctetString : public ModelCommand { [cluster writeAttributeListOctetStringWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster ListOctetString Error: %s", chip::ErrorStr(chipError)); @@ -57551,6 +62371,7 @@ class WriteTestClusterListOctetString : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::DataModel::List mValue; TypedComplexArgument> mComplex; }; @@ -57563,6 +62384,7 @@ class SubscribeAttributeTestClusterListOctetString : public ModelCommand { AddArgument("attr-name", "list-octet-string"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -57575,6 +62397,7 @@ class SubscribeAttributeTestClusterListOctetString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeListOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -57595,6 +62418,7 @@ class SubscribeAttributeTestClusterListOctetString : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -57609,6 +62433,7 @@ class ReadTestClusterListStructOctetString : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "list-struct-octet-string"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -57630,6 +62455,9 @@ class ReadTestClusterListStructOctetString : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterListStructOctetString : public ModelCommand { @@ -57640,6 +62468,7 @@ class WriteTestClusterListStructOctetString : public ModelCommand { { AddArgument("attr-name", "list-struct-octet-string"); AddArgument("attr-value", &mComplex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -57651,7 +62480,9 @@ class WriteTestClusterListStructOctetString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSArray * _Nonnull value; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; @@ -57667,6 +62498,7 @@ class WriteTestClusterListStructOctetString : public ModelCommand { } [cluster writeAttributeListStructOctetStringWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster ListStructOctetString Error: %s", @@ -57677,6 +62509,7 @@ class WriteTestClusterListStructOctetString : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::DataModel::List mValue; TypedComplexArgument> mComplex; @@ -57690,6 +62523,7 @@ class SubscribeAttributeTestClusterListStructOctetString : public ModelCommand { AddArgument("attr-name", "list-struct-octet-string"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -57702,6 +62536,7 @@ class SubscribeAttributeTestClusterListStructOctetString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeListStructOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -57723,6 +62558,7 @@ class SubscribeAttributeTestClusterListStructOctetString : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -57737,6 +62573,7 @@ class ReadTestClusterLongOctetString : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "long-octet-string"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -57758,6 +62595,9 @@ class ReadTestClusterLongOctetString : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterLongOctetString : public ModelCommand { @@ -57767,6 +62607,7 @@ class WriteTestClusterLongOctetString : public ModelCommand { { AddArgument("attr-name", "long-octet-string"); AddArgument("attr-value", &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -57778,11 +62619,14 @@ class WriteTestClusterLongOctetString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSData * _Nonnull value = [[NSData alloc] initWithBytes:mValue.data() length:mValue.size()]; [cluster writeAttributeLongOctetStringWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster LongOctetString Error: %s", chip::ErrorStr(chipError)); @@ -57792,6 +62636,7 @@ class WriteTestClusterLongOctetString : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mValue; }; @@ -57803,6 +62648,7 @@ class SubscribeAttributeTestClusterLongOctetString : public ModelCommand { AddArgument("attr-name", "long-octet-string"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -57815,6 +62661,7 @@ class SubscribeAttributeTestClusterLongOctetString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLongOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -57835,6 +62682,7 @@ class SubscribeAttributeTestClusterLongOctetString : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -57849,6 +62697,7 @@ class ReadTestClusterCharString : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "char-string"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -57870,6 +62719,9 @@ class ReadTestClusterCharString : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterCharString : public ModelCommand { @@ -57879,6 +62731,7 @@ class WriteTestClusterCharString : public ModelCommand { { AddArgument("attr-name", "char-string"); AddArgument("attr-value", &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -57890,12 +62743,15 @@ class WriteTestClusterCharString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data() length:mValue.size() encoding:NSUTF8StringEncoding]; [cluster writeAttributeCharStringWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster CharString Error: %s", chip::ErrorStr(chipError)); @@ -57905,6 +62761,7 @@ class WriteTestClusterCharString : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mValue; }; @@ -57916,6 +62773,7 @@ class SubscribeAttributeTestClusterCharString : public ModelCommand { AddArgument("attr-name", "char-string"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -57928,6 +62786,7 @@ class SubscribeAttributeTestClusterCharString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCharStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -57948,6 +62807,7 @@ class SubscribeAttributeTestClusterCharString : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -57962,6 +62822,7 @@ class ReadTestClusterLongCharString : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "long-char-string"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -57983,6 +62844,9 @@ class ReadTestClusterLongCharString : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterLongCharString : public ModelCommand { @@ -57992,6 +62856,7 @@ class WriteTestClusterLongCharString : public ModelCommand { { AddArgument("attr-name", "long-char-string"); AddArgument("attr-value", &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -58003,12 +62868,15 @@ class WriteTestClusterLongCharString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSString * _Nonnull value = [[NSString alloc] initWithBytes:mValue.data() length:mValue.size() encoding:NSUTF8StringEncoding]; [cluster writeAttributeLongCharStringWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster LongCharString Error: %s", chip::ErrorStr(chipError)); @@ -58018,6 +62886,7 @@ class WriteTestClusterLongCharString : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mValue; }; @@ -58029,6 +62898,7 @@ class SubscribeAttributeTestClusterLongCharString : public ModelCommand { AddArgument("attr-name", "long-char-string"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -58041,6 +62911,7 @@ class SubscribeAttributeTestClusterLongCharString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLongCharStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -58061,6 +62932,7 @@ class SubscribeAttributeTestClusterLongCharString : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -58075,6 +62947,7 @@ class ReadTestClusterEpochUs : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "epoch-us"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -58096,6 +62969,9 @@ class ReadTestClusterEpochUs : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterEpochUs : public ModelCommand { @@ -58105,6 +62981,7 @@ class WriteTestClusterEpochUs : public ModelCommand { { AddArgument("attr-name", "epoch-us"); AddArgument("attr-value", 0, UINT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -58116,10 +62993,13 @@ class WriteTestClusterEpochUs : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedLongLong:mValue]; [cluster writeAttributeEpochUsWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster EpochUs Error: %s", chip::ErrorStr(chipError)); @@ -58129,6 +63009,7 @@ class WriteTestClusterEpochUs : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint64_t mValue; }; @@ -58140,6 +63021,7 @@ class SubscribeAttributeTestClusterEpochUs : public ModelCommand { AddArgument("attr-name", "epoch-us"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -58152,6 +63034,7 @@ class SubscribeAttributeTestClusterEpochUs : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeEpochUsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -58172,6 +63055,7 @@ class SubscribeAttributeTestClusterEpochUs : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -58186,6 +63070,7 @@ class ReadTestClusterEpochS : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "epoch-s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -58207,6 +63092,9 @@ class ReadTestClusterEpochS : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterEpochS : public ModelCommand { @@ -58216,6 +63104,7 @@ class WriteTestClusterEpochS : public ModelCommand { { AddArgument("attr-name", "epoch-s"); AddArgument("attr-value", 0, UINT32_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -58227,10 +63116,13 @@ class WriteTestClusterEpochS : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedInt:mValue]; [cluster writeAttributeEpochSWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster EpochS Error: %s", chip::ErrorStr(chipError)); @@ -58240,6 +63132,7 @@ class WriteTestClusterEpochS : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint32_t mValue; }; @@ -58251,6 +63144,7 @@ class SubscribeAttributeTestClusterEpochS : public ModelCommand { AddArgument("attr-name", "epoch-s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -58263,6 +63157,7 @@ class SubscribeAttributeTestClusterEpochS : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeEpochSWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -58283,6 +63178,7 @@ class SubscribeAttributeTestClusterEpochS : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -58297,6 +63193,7 @@ class ReadTestClusterVendorId : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "vendor-id"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -58318,6 +63215,9 @@ class ReadTestClusterVendorId : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterVendorId : public ModelCommand { @@ -58327,6 +63227,7 @@ class WriteTestClusterVendorId : public ModelCommand { { AddArgument("attr-name", "vendor-id"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -58338,10 +63239,13 @@ class WriteTestClusterVendorId : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeVendorIdWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster VendorId Error: %s", chip::ErrorStr(chipError)); @@ -58351,6 +63255,7 @@ class WriteTestClusterVendorId : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::VendorId mValue; }; @@ -58362,6 +63267,7 @@ class SubscribeAttributeTestClusterVendorId : public ModelCommand { AddArgument("attr-name", "vendor-id"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -58374,6 +63280,7 @@ class SubscribeAttributeTestClusterVendorId : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeVendorIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -58394,6 +63301,7 @@ class SubscribeAttributeTestClusterVendorId : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -58408,6 +63316,7 @@ class ReadTestClusterListNullablesAndOptionalsStruct : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "list-nullables-and-optionals-struct"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -58430,6 +63339,9 @@ class ReadTestClusterListNullablesAndOptionalsStruct : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterListNullablesAndOptionalsStruct : public ModelCommand { @@ -58440,6 +63352,7 @@ class WriteTestClusterListNullablesAndOptionalsStruct : public ModelCommand { { AddArgument("attr-name", "list-nullables-and-optionals-struct"); AddArgument("attr-value", &mComplex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -58451,7 +63364,9 @@ class WriteTestClusterListNullablesAndOptionalsStruct : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSArray * _Nonnull value; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; @@ -58616,6 +63531,7 @@ class WriteTestClusterListNullablesAndOptionalsStruct : public ModelCommand { [cluster writeAttributeListNullablesAndOptionalsStructWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster ListNullablesAndOptionalsStruct Error: %s", @@ -58626,6 +63542,7 @@ class WriteTestClusterListNullablesAndOptionalsStruct : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::DataModel::List mValue; TypedComplexArgument< chip::app::DataModel::List> @@ -58640,6 +63557,7 @@ class SubscribeAttributeTestClusterListNullablesAndOptionalsStruct : public Mode AddArgument("attr-name", "list-nullables-and-optionals-struct"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -58652,6 +63570,7 @@ class SubscribeAttributeTestClusterListNullablesAndOptionalsStruct : public Mode dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeListNullablesAndOptionalsStructWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -58675,6 +63594,7 @@ class SubscribeAttributeTestClusterListNullablesAndOptionalsStruct : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -58689,6 +63609,7 @@ class ReadTestClusterEnumAttr : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "enum-attr"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -58710,6 +63631,9 @@ class ReadTestClusterEnumAttr : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterEnumAttr : public ModelCommand { @@ -58719,6 +63643,7 @@ class WriteTestClusterEnumAttr : public ModelCommand { { AddArgument("attr-name", "enum-attr"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -58730,10 +63655,13 @@ class WriteTestClusterEnumAttr : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeEnumAttrWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster EnumAttr Error: %s", chip::ErrorStr(chipError)); @@ -58743,6 +63671,7 @@ class WriteTestClusterEnumAttr : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -58754,6 +63683,7 @@ class SubscribeAttributeTestClusterEnumAttr : public ModelCommand { AddArgument("attr-name", "enum-attr"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -58766,6 +63696,7 @@ class SubscribeAttributeTestClusterEnumAttr : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeEnumAttrWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -58786,6 +63717,7 @@ class SubscribeAttributeTestClusterEnumAttr : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -58800,6 +63732,7 @@ class ReadTestClusterStructAttr : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "struct-attr"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -58822,6 +63755,9 @@ class ReadTestClusterStructAttr : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterStructAttr : public ModelCommand { @@ -58832,6 +63768,7 @@ class WriteTestClusterStructAttr : public ModelCommand { { AddArgument("attr-name", "struct-attr"); AddArgument("attr-value", &mComplex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -58843,7 +63780,9 @@ class WriteTestClusterStructAttr : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; CHIPTestClusterClusterSimpleStruct * _Nonnull value; value = [CHIPTestClusterClusterSimpleStruct new]; value.a = [NSNumber numberWithUnsignedChar:mValue.a]; @@ -58856,6 +63795,7 @@ class WriteTestClusterStructAttr : public ModelCommand { value.h = [NSNumber numberWithDouble:mValue.h]; [cluster writeAttributeStructAttrWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster StructAttr Error: %s", chip::ErrorStr(chipError)); @@ -58865,6 +63805,7 @@ class WriteTestClusterStructAttr : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::Clusters::TestCluster::Structs::SimpleStruct::Type mValue; TypedComplexArgument mComplex; }; @@ -58877,6 +63818,7 @@ class SubscribeAttributeTestClusterStructAttr : public ModelCommand { AddArgument("attr-name", "struct-attr"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -58889,6 +63831,7 @@ class SubscribeAttributeTestClusterStructAttr : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeStructAttrWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -58910,6 +63853,7 @@ class SubscribeAttributeTestClusterStructAttr : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -58924,6 +63868,7 @@ class ReadTestClusterRangeRestrictedInt8u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "range-restricted-int8u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -58945,6 +63890,9 @@ class ReadTestClusterRangeRestrictedInt8u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterRangeRestrictedInt8u : public ModelCommand { @@ -58954,6 +63902,7 @@ class WriteTestClusterRangeRestrictedInt8u : public ModelCommand { { AddArgument("attr-name", "range-restricted-int8u"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -58965,10 +63914,13 @@ class WriteTestClusterRangeRestrictedInt8u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeRangeRestrictedInt8uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster RangeRestrictedInt8u Error: %s", @@ -58979,6 +63931,7 @@ class WriteTestClusterRangeRestrictedInt8u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -58990,6 +63943,7 @@ class SubscribeAttributeTestClusterRangeRestrictedInt8u : public ModelCommand { AddArgument("attr-name", "range-restricted-int8u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -59002,6 +63956,7 @@ class SubscribeAttributeTestClusterRangeRestrictedInt8u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRangeRestrictedInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -59023,6 +63978,7 @@ class SubscribeAttributeTestClusterRangeRestrictedInt8u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -59037,6 +63993,7 @@ class ReadTestClusterRangeRestrictedInt8s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "range-restricted-int8s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -59058,6 +64015,9 @@ class ReadTestClusterRangeRestrictedInt8s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterRangeRestrictedInt8s : public ModelCommand { @@ -59067,6 +64027,7 @@ class WriteTestClusterRangeRestrictedInt8s : public ModelCommand { { AddArgument("attr-name", "range-restricted-int8s"); AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -59078,10 +64039,13 @@ class WriteTestClusterRangeRestrictedInt8s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithChar:mValue]; [cluster writeAttributeRangeRestrictedInt8sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster RangeRestrictedInt8s Error: %s", @@ -59092,6 +64056,7 @@ class WriteTestClusterRangeRestrictedInt8s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int8_t mValue; }; @@ -59103,6 +64068,7 @@ class SubscribeAttributeTestClusterRangeRestrictedInt8s : public ModelCommand { AddArgument("attr-name", "range-restricted-int8s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -59115,6 +64081,7 @@ class SubscribeAttributeTestClusterRangeRestrictedInt8s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRangeRestrictedInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -59136,6 +64103,7 @@ class SubscribeAttributeTestClusterRangeRestrictedInt8s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -59150,6 +64118,7 @@ class ReadTestClusterRangeRestrictedInt16u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "range-restricted-int16u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -59171,6 +64140,9 @@ class ReadTestClusterRangeRestrictedInt16u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterRangeRestrictedInt16u : public ModelCommand { @@ -59180,6 +64152,7 @@ class WriteTestClusterRangeRestrictedInt16u : public ModelCommand { { AddArgument("attr-name", "range-restricted-int16u"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -59191,10 +64164,13 @@ class WriteTestClusterRangeRestrictedInt16u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeRangeRestrictedInt16uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster RangeRestrictedInt16u Error: %s", @@ -59205,6 +64181,7 @@ class WriteTestClusterRangeRestrictedInt16u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -59216,6 +64193,7 @@ class SubscribeAttributeTestClusterRangeRestrictedInt16u : public ModelCommand { AddArgument("attr-name", "range-restricted-int16u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -59228,6 +64206,7 @@ class SubscribeAttributeTestClusterRangeRestrictedInt16u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRangeRestrictedInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -59249,6 +64228,7 @@ class SubscribeAttributeTestClusterRangeRestrictedInt16u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -59263,6 +64243,7 @@ class ReadTestClusterRangeRestrictedInt16s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "range-restricted-int16s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -59284,6 +64265,9 @@ class ReadTestClusterRangeRestrictedInt16s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterRangeRestrictedInt16s : public ModelCommand { @@ -59293,6 +64277,7 @@ class WriteTestClusterRangeRestrictedInt16s : public ModelCommand { { AddArgument("attr-name", "range-restricted-int16s"); AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -59304,10 +64289,13 @@ class WriteTestClusterRangeRestrictedInt16s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue]; [cluster writeAttributeRangeRestrictedInt16sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster RangeRestrictedInt16s Error: %s", @@ -59318,6 +64306,7 @@ class WriteTestClusterRangeRestrictedInt16s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int16_t mValue; }; @@ -59329,6 +64318,7 @@ class SubscribeAttributeTestClusterRangeRestrictedInt16s : public ModelCommand { AddArgument("attr-name", "range-restricted-int16s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -59341,6 +64331,7 @@ class SubscribeAttributeTestClusterRangeRestrictedInt16s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRangeRestrictedInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -59362,6 +64353,7 @@ class SubscribeAttributeTestClusterRangeRestrictedInt16s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -59376,6 +64368,7 @@ class ReadTestClusterListLongOctetString : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "list-long-octet-string"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -59397,6 +64390,9 @@ class ReadTestClusterListLongOctetString : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterListLongOctetString : public ModelCommand { @@ -59407,6 +64403,7 @@ class WriteTestClusterListLongOctetString : public ModelCommand { { AddArgument("attr-name", "list-long-octet-string"); AddArgument("attr-value", &mComplex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -59418,7 +64415,9 @@ class WriteTestClusterListLongOctetString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSArray * _Nonnull value; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; @@ -59431,6 +64430,7 @@ class WriteTestClusterListLongOctetString : public ModelCommand { } [cluster writeAttributeListLongOctetStringWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError( @@ -59441,6 +64441,7 @@ class WriteTestClusterListLongOctetString : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::DataModel::List mValue; TypedComplexArgument> mComplex; }; @@ -59453,6 +64454,7 @@ class SubscribeAttributeTestClusterListLongOctetString : public ModelCommand { AddArgument("attr-name", "list-long-octet-string"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -59465,6 +64467,7 @@ class SubscribeAttributeTestClusterListLongOctetString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeListLongOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -59486,6 +64489,7 @@ class SubscribeAttributeTestClusterListLongOctetString : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -59500,6 +64504,7 @@ class ReadTestClusterListFabricScoped : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "list-fabric-scoped"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -59513,6 +64518,7 @@ class ReadTestClusterListFabricScoped : public ModelCommand { CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block err = CHIP_NO_ERROR; CHIPReadParams * params = [[CHIPReadParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster readAttributeListFabricScopedWithParams:params completionHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { NSLog(@"TestCluster.ListFabricScoped response %@", [value description]); @@ -59523,6 +64529,9 @@ class ReadTestClusterListFabricScoped : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterListFabricScoped : public ModelCommand { @@ -59533,6 +64542,7 @@ class WriteTestClusterListFabricScoped : public ModelCommand { { AddArgument("attr-name", "list-fabric-scoped"); AddArgument("attr-value", &mComplex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -59544,7 +64554,9 @@ class WriteTestClusterListFabricScoped : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSArray * _Nonnull value; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; @@ -59607,6 +64619,7 @@ class WriteTestClusterListFabricScoped : public ModelCommand { [cluster writeAttributeListFabricScopedWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster ListFabricScoped Error: %s", chip::ErrorStr(chipError)); @@ -59616,6 +64629,7 @@ class WriteTestClusterListFabricScoped : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::DataModel::List mValue; TypedComplexArgument> mComplex; @@ -59629,6 +64643,7 @@ class SubscribeAttributeTestClusterListFabricScoped : public ModelCommand { AddArgument("attr-name", "list-fabric-scoped"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -59641,6 +64656,7 @@ class SubscribeAttributeTestClusterListFabricScoped : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeListFabricScopedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -59661,6 +64677,7 @@ class SubscribeAttributeTestClusterListFabricScoped : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -59675,6 +64692,7 @@ class ReadTestClusterTimedWriteBoolean : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "timed-write-boolean"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -59696,6 +64714,9 @@ class ReadTestClusterTimedWriteBoolean : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterTimedWriteBoolean : public ModelCommand { @@ -59705,6 +64726,7 @@ class WriteTestClusterTimedWriteBoolean : public ModelCommand { { AddArgument("attr-name", "timed-write-boolean"); AddArgument("attr-value", 0, 1, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -59716,11 +64738,14 @@ class WriteTestClusterTimedWriteBoolean : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue]; [cluster writeAttributeTimedWriteBooleanWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster TimedWriteBoolean Error: %s", chip::ErrorStr(chipError)); @@ -59730,6 +64755,7 @@ class WriteTestClusterTimedWriteBoolean : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; bool mValue; }; @@ -59741,6 +64767,7 @@ class SubscribeAttributeTestClusterTimedWriteBoolean : public ModelCommand { AddArgument("attr-name", "timed-write-boolean"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -59753,6 +64780,7 @@ class SubscribeAttributeTestClusterTimedWriteBoolean : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTimedWriteBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -59773,6 +64801,7 @@ class SubscribeAttributeTestClusterTimedWriteBoolean : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -59787,6 +64816,7 @@ class ReadTestClusterGeneralErrorBoolean : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "general-error-boolean"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -59808,6 +64838,9 @@ class ReadTestClusterGeneralErrorBoolean : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterGeneralErrorBoolean : public ModelCommand { @@ -59817,6 +64850,7 @@ class WriteTestClusterGeneralErrorBoolean : public ModelCommand { { AddArgument("attr-name", "general-error-boolean"); AddArgument("attr-value", 0, 1, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -59828,10 +64862,13 @@ class WriteTestClusterGeneralErrorBoolean : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue]; [cluster writeAttributeGeneralErrorBooleanWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError( @@ -59842,6 +64879,7 @@ class WriteTestClusterGeneralErrorBoolean : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; bool mValue; }; @@ -59853,6 +64891,7 @@ class SubscribeAttributeTestClusterGeneralErrorBoolean : public ModelCommand { AddArgument("attr-name", "general-error-boolean"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -59865,6 +64904,7 @@ class SubscribeAttributeTestClusterGeneralErrorBoolean : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneralErrorBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -59886,6 +64926,7 @@ class SubscribeAttributeTestClusterGeneralErrorBoolean : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -59900,6 +64941,7 @@ class ReadTestClusterClusterErrorBoolean : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-error-boolean"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -59921,6 +64963,9 @@ class ReadTestClusterClusterErrorBoolean : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterClusterErrorBoolean : public ModelCommand { @@ -59930,6 +64975,7 @@ class WriteTestClusterClusterErrorBoolean : public ModelCommand { { AddArgument("attr-name", "cluster-error-boolean"); AddArgument("attr-value", 0, 1, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -59941,10 +64987,13 @@ class WriteTestClusterClusterErrorBoolean : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue]; [cluster writeAttributeClusterErrorBooleanWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError( @@ -59955,6 +65004,7 @@ class WriteTestClusterClusterErrorBoolean : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; bool mValue; }; @@ -59966,6 +65016,7 @@ class SubscribeAttributeTestClusterClusterErrorBoolean : public ModelCommand { AddArgument("attr-name", "cluster-error-boolean"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -59978,6 +65029,7 @@ class SubscribeAttributeTestClusterClusterErrorBoolean : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterErrorBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -59999,6 +65051,7 @@ class SubscribeAttributeTestClusterClusterErrorBoolean : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -60013,6 +65066,7 @@ class ReadTestClusterUnsupported : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "unsupported"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -60034,6 +65088,9 @@ class ReadTestClusterUnsupported : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterUnsupported : public ModelCommand { @@ -60043,6 +65100,7 @@ class WriteTestClusterUnsupported : public ModelCommand { { AddArgument("attr-name", "unsupported"); AddArgument("attr-value", 0, 1, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -60054,10 +65112,13 @@ class WriteTestClusterUnsupported : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithBool:mValue]; [cluster writeAttributeUnsupportedWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster Unsupported Error: %s", chip::ErrorStr(chipError)); @@ -60067,6 +65128,7 @@ class WriteTestClusterUnsupported : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; bool mValue; }; @@ -60078,6 +65140,7 @@ class SubscribeAttributeTestClusterUnsupported : public ModelCommand { AddArgument("attr-name", "unsupported"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -60090,6 +65153,7 @@ class SubscribeAttributeTestClusterUnsupported : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeUnsupportedWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -60110,6 +65174,7 @@ class SubscribeAttributeTestClusterUnsupported : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -60124,6 +65189,7 @@ class ReadTestClusterNullableBoolean : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-boolean"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -60145,6 +65211,9 @@ class ReadTestClusterNullableBoolean : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableBoolean : public ModelCommand { @@ -60154,6 +65223,7 @@ class WriteTestClusterNullableBoolean : public ModelCommand { { AddArgument("attr-name", "nullable-boolean"); AddArgument("attr-value", 0, 1, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -60165,11 +65235,14 @@ class WriteTestClusterNullableBoolean : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithBool:mValue]; [cluster writeAttributeNullableBooleanWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableBoolean Error: %s", chip::ErrorStr(chipError)); @@ -60179,6 +65252,7 @@ class WriteTestClusterNullableBoolean : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; bool mValue; }; @@ -60190,6 +65264,7 @@ class SubscribeAttributeTestClusterNullableBoolean : public ModelCommand { AddArgument("attr-name", "nullable-boolean"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -60202,6 +65277,7 @@ class SubscribeAttributeTestClusterNullableBoolean : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableBooleanWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -60222,6 +65298,7 @@ class SubscribeAttributeTestClusterNullableBoolean : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -60236,6 +65313,7 @@ class ReadTestClusterNullableBitmap8 : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-bitmap8"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -60257,6 +65335,9 @@ class ReadTestClusterNullableBitmap8 : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableBitmap8 : public ModelCommand { @@ -60266,6 +65347,7 @@ class WriteTestClusterNullableBitmap8 : public ModelCommand { { AddArgument("attr-name", "nullable-bitmap8"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -60277,11 +65359,14 @@ class WriteTestClusterNullableBitmap8 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeNullableBitmap8WithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableBitmap8 Error: %s", chip::ErrorStr(chipError)); @@ -60291,6 +65376,7 @@ class WriteTestClusterNullableBitmap8 : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -60302,6 +65388,7 @@ class SubscribeAttributeTestClusterNullableBitmap8 : public ModelCommand { AddArgument("attr-name", "nullable-bitmap8"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -60314,6 +65401,7 @@ class SubscribeAttributeTestClusterNullableBitmap8 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableBitmap8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -60334,6 +65422,7 @@ class SubscribeAttributeTestClusterNullableBitmap8 : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -60348,6 +65437,7 @@ class ReadTestClusterNullableBitmap16 : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-bitmap16"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -60369,6 +65459,9 @@ class ReadTestClusterNullableBitmap16 : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableBitmap16 : public ModelCommand { @@ -60378,6 +65471,7 @@ class WriteTestClusterNullableBitmap16 : public ModelCommand { { AddArgument("attr-name", "nullable-bitmap16"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -60389,11 +65483,14 @@ class WriteTestClusterNullableBitmap16 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeNullableBitmap16WithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableBitmap16 Error: %s", chip::ErrorStr(chipError)); @@ -60403,6 +65500,7 @@ class WriteTestClusterNullableBitmap16 : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -60414,6 +65512,7 @@ class SubscribeAttributeTestClusterNullableBitmap16 : public ModelCommand { AddArgument("attr-name", "nullable-bitmap16"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -60426,6 +65525,7 @@ class SubscribeAttributeTestClusterNullableBitmap16 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableBitmap16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -60446,6 +65546,7 @@ class SubscribeAttributeTestClusterNullableBitmap16 : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -60460,6 +65561,7 @@ class ReadTestClusterNullableBitmap32 : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-bitmap32"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -60481,6 +65583,9 @@ class ReadTestClusterNullableBitmap32 : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableBitmap32 : public ModelCommand { @@ -60490,6 +65595,7 @@ class WriteTestClusterNullableBitmap32 : public ModelCommand { { AddArgument("attr-name", "nullable-bitmap32"); AddArgument("attr-value", 0, UINT32_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -60501,11 +65607,14 @@ class WriteTestClusterNullableBitmap32 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedInt:mValue]; [cluster writeAttributeNullableBitmap32WithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableBitmap32 Error: %s", chip::ErrorStr(chipError)); @@ -60515,6 +65624,7 @@ class WriteTestClusterNullableBitmap32 : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint32_t mValue; }; @@ -60526,6 +65636,7 @@ class SubscribeAttributeTestClusterNullableBitmap32 : public ModelCommand { AddArgument("attr-name", "nullable-bitmap32"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -60538,6 +65649,7 @@ class SubscribeAttributeTestClusterNullableBitmap32 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableBitmap32WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -60558,6 +65670,7 @@ class SubscribeAttributeTestClusterNullableBitmap32 : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -60572,6 +65685,7 @@ class ReadTestClusterNullableBitmap64 : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-bitmap64"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -60593,6 +65707,9 @@ class ReadTestClusterNullableBitmap64 : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableBitmap64 : public ModelCommand { @@ -60602,6 +65719,7 @@ class WriteTestClusterNullableBitmap64 : public ModelCommand { { AddArgument("attr-name", "nullable-bitmap64"); AddArgument("attr-value", 0, UINT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -60613,11 +65731,14 @@ class WriteTestClusterNullableBitmap64 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedLongLong:mValue]; [cluster writeAttributeNullableBitmap64WithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableBitmap64 Error: %s", chip::ErrorStr(chipError)); @@ -60627,6 +65748,7 @@ class WriteTestClusterNullableBitmap64 : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint64_t mValue; }; @@ -60638,6 +65760,7 @@ class SubscribeAttributeTestClusterNullableBitmap64 : public ModelCommand { AddArgument("attr-name", "nullable-bitmap64"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -60650,6 +65773,7 @@ class SubscribeAttributeTestClusterNullableBitmap64 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableBitmap64WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -60670,6 +65794,7 @@ class SubscribeAttributeTestClusterNullableBitmap64 : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -60684,6 +65809,7 @@ class ReadTestClusterNullableInt8u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int8u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -60705,6 +65831,9 @@ class ReadTestClusterNullableInt8u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt8u : public ModelCommand { @@ -60714,6 +65843,7 @@ class WriteTestClusterNullableInt8u : public ModelCommand { { AddArgument("attr-name", "nullable-int8u"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -60725,10 +65855,13 @@ class WriteTestClusterNullableInt8u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeNullableInt8uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt8u Error: %s", chip::ErrorStr(chipError)); @@ -60738,6 +65871,7 @@ class WriteTestClusterNullableInt8u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -60749,6 +65883,7 @@ class SubscribeAttributeTestClusterNullableInt8u : public ModelCommand { AddArgument("attr-name", "nullable-int8u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -60761,6 +65896,7 @@ class SubscribeAttributeTestClusterNullableInt8u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -60781,6 +65917,7 @@ class SubscribeAttributeTestClusterNullableInt8u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -60795,6 +65932,7 @@ class ReadTestClusterNullableInt16u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int16u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -60816,6 +65954,9 @@ class ReadTestClusterNullableInt16u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt16u : public ModelCommand { @@ -60825,6 +65966,7 @@ class WriteTestClusterNullableInt16u : public ModelCommand { { AddArgument("attr-name", "nullable-int16u"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -60836,10 +65978,13 @@ class WriteTestClusterNullableInt16u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeNullableInt16uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt16u Error: %s", chip::ErrorStr(chipError)); @@ -60849,6 +65994,7 @@ class WriteTestClusterNullableInt16u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -60860,6 +66006,7 @@ class SubscribeAttributeTestClusterNullableInt16u : public ModelCommand { AddArgument("attr-name", "nullable-int16u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -60872,6 +66019,7 @@ class SubscribeAttributeTestClusterNullableInt16u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -60892,6 +66040,7 @@ class SubscribeAttributeTestClusterNullableInt16u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -60906,6 +66055,7 @@ class ReadTestClusterNullableInt24u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int24u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -60927,6 +66077,9 @@ class ReadTestClusterNullableInt24u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt24u : public ModelCommand { @@ -60936,6 +66089,7 @@ class WriteTestClusterNullableInt24u : public ModelCommand { { AddArgument("attr-name", "nullable-int24u"); AddArgument("attr-value", 0, UINT32_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -60947,10 +66101,13 @@ class WriteTestClusterNullableInt24u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedInt:mValue]; [cluster writeAttributeNullableInt24uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt24u Error: %s", chip::ErrorStr(chipError)); @@ -60960,6 +66117,7 @@ class WriteTestClusterNullableInt24u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint32_t mValue; }; @@ -60971,6 +66129,7 @@ class SubscribeAttributeTestClusterNullableInt24u : public ModelCommand { AddArgument("attr-name", "nullable-int24u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -60983,6 +66142,7 @@ class SubscribeAttributeTestClusterNullableInt24u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt24uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -61003,6 +66163,7 @@ class SubscribeAttributeTestClusterNullableInt24u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -61017,6 +66178,7 @@ class ReadTestClusterNullableInt32u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int32u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -61038,6 +66200,9 @@ class ReadTestClusterNullableInt32u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt32u : public ModelCommand { @@ -61047,6 +66212,7 @@ class WriteTestClusterNullableInt32u : public ModelCommand { { AddArgument("attr-name", "nullable-int32u"); AddArgument("attr-value", 0, UINT32_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -61058,10 +66224,13 @@ class WriteTestClusterNullableInt32u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedInt:mValue]; [cluster writeAttributeNullableInt32uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt32u Error: %s", chip::ErrorStr(chipError)); @@ -61071,6 +66240,7 @@ class WriteTestClusterNullableInt32u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint32_t mValue; }; @@ -61082,6 +66252,7 @@ class SubscribeAttributeTestClusterNullableInt32u : public ModelCommand { AddArgument("attr-name", "nullable-int32u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -61094,6 +66265,7 @@ class SubscribeAttributeTestClusterNullableInt32u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt32uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -61114,6 +66286,7 @@ class SubscribeAttributeTestClusterNullableInt32u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -61128,6 +66301,7 @@ class ReadTestClusterNullableInt40u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int40u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -61149,6 +66323,9 @@ class ReadTestClusterNullableInt40u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt40u : public ModelCommand { @@ -61158,6 +66335,7 @@ class WriteTestClusterNullableInt40u : public ModelCommand { { AddArgument("attr-name", "nullable-int40u"); AddArgument("attr-value", 0, UINT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -61169,10 +66347,13 @@ class WriteTestClusterNullableInt40u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedLongLong:mValue]; [cluster writeAttributeNullableInt40uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt40u Error: %s", chip::ErrorStr(chipError)); @@ -61182,6 +66363,7 @@ class WriteTestClusterNullableInt40u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint64_t mValue; }; @@ -61193,6 +66375,7 @@ class SubscribeAttributeTestClusterNullableInt40u : public ModelCommand { AddArgument("attr-name", "nullable-int40u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -61205,6 +66388,7 @@ class SubscribeAttributeTestClusterNullableInt40u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt40uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -61225,6 +66409,7 @@ class SubscribeAttributeTestClusterNullableInt40u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -61239,6 +66424,7 @@ class ReadTestClusterNullableInt48u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int48u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -61260,6 +66446,9 @@ class ReadTestClusterNullableInt48u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt48u : public ModelCommand { @@ -61269,6 +66458,7 @@ class WriteTestClusterNullableInt48u : public ModelCommand { { AddArgument("attr-name", "nullable-int48u"); AddArgument("attr-value", 0, UINT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -61280,10 +66470,13 @@ class WriteTestClusterNullableInt48u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedLongLong:mValue]; [cluster writeAttributeNullableInt48uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt48u Error: %s", chip::ErrorStr(chipError)); @@ -61293,6 +66486,7 @@ class WriteTestClusterNullableInt48u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint64_t mValue; }; @@ -61304,6 +66498,7 @@ class SubscribeAttributeTestClusterNullableInt48u : public ModelCommand { AddArgument("attr-name", "nullable-int48u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -61316,6 +66511,7 @@ class SubscribeAttributeTestClusterNullableInt48u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt48uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -61336,6 +66532,7 @@ class SubscribeAttributeTestClusterNullableInt48u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -61350,6 +66547,7 @@ class ReadTestClusterNullableInt56u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int56u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -61371,6 +66569,9 @@ class ReadTestClusterNullableInt56u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt56u : public ModelCommand { @@ -61380,6 +66581,7 @@ class WriteTestClusterNullableInt56u : public ModelCommand { { AddArgument("attr-name", "nullable-int56u"); AddArgument("attr-value", 0, UINT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -61391,10 +66593,13 @@ class WriteTestClusterNullableInt56u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedLongLong:mValue]; [cluster writeAttributeNullableInt56uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt56u Error: %s", chip::ErrorStr(chipError)); @@ -61404,6 +66609,7 @@ class WriteTestClusterNullableInt56u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint64_t mValue; }; @@ -61415,6 +66621,7 @@ class SubscribeAttributeTestClusterNullableInt56u : public ModelCommand { AddArgument("attr-name", "nullable-int56u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -61427,6 +66634,7 @@ class SubscribeAttributeTestClusterNullableInt56u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt56uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -61447,6 +66655,7 @@ class SubscribeAttributeTestClusterNullableInt56u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -61461,6 +66670,7 @@ class ReadTestClusterNullableInt64u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int64u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -61482,6 +66692,9 @@ class ReadTestClusterNullableInt64u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt64u : public ModelCommand { @@ -61491,6 +66704,7 @@ class WriteTestClusterNullableInt64u : public ModelCommand { { AddArgument("attr-name", "nullable-int64u"); AddArgument("attr-value", 0, UINT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -61502,10 +66716,13 @@ class WriteTestClusterNullableInt64u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedLongLong:mValue]; [cluster writeAttributeNullableInt64uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt64u Error: %s", chip::ErrorStr(chipError)); @@ -61515,6 +66732,7 @@ class WriteTestClusterNullableInt64u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint64_t mValue; }; @@ -61526,6 +66744,7 @@ class SubscribeAttributeTestClusterNullableInt64u : public ModelCommand { AddArgument("attr-name", "nullable-int64u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -61538,6 +66757,7 @@ class SubscribeAttributeTestClusterNullableInt64u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt64uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -61558,6 +66778,7 @@ class SubscribeAttributeTestClusterNullableInt64u : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -61572,6 +66793,7 @@ class ReadTestClusterNullableInt8s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int8s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -61593,6 +66815,9 @@ class ReadTestClusterNullableInt8s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt8s : public ModelCommand { @@ -61602,6 +66827,7 @@ class WriteTestClusterNullableInt8s : public ModelCommand { { AddArgument("attr-name", "nullable-int8s"); AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -61613,10 +66839,13 @@ class WriteTestClusterNullableInt8s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithChar:mValue]; [cluster writeAttributeNullableInt8sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt8s Error: %s", chip::ErrorStr(chipError)); @@ -61626,6 +66855,7 @@ class WriteTestClusterNullableInt8s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int8_t mValue; }; @@ -61637,6 +66867,7 @@ class SubscribeAttributeTestClusterNullableInt8s : public ModelCommand { AddArgument("attr-name", "nullable-int8s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -61649,6 +66880,7 @@ class SubscribeAttributeTestClusterNullableInt8s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -61669,6 +66901,7 @@ class SubscribeAttributeTestClusterNullableInt8s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -61683,6 +66916,7 @@ class ReadTestClusterNullableInt16s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int16s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -61704,6 +66938,9 @@ class ReadTestClusterNullableInt16s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt16s : public ModelCommand { @@ -61713,6 +66950,7 @@ class WriteTestClusterNullableInt16s : public ModelCommand { { AddArgument("attr-name", "nullable-int16s"); AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -61724,10 +66962,13 @@ class WriteTestClusterNullableInt16s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithShort:mValue]; [cluster writeAttributeNullableInt16sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt16s Error: %s", chip::ErrorStr(chipError)); @@ -61737,6 +66978,7 @@ class WriteTestClusterNullableInt16s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int16_t mValue; }; @@ -61748,6 +66990,7 @@ class SubscribeAttributeTestClusterNullableInt16s : public ModelCommand { AddArgument("attr-name", "nullable-int16s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -61760,6 +67003,7 @@ class SubscribeAttributeTestClusterNullableInt16s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -61780,6 +67024,7 @@ class SubscribeAttributeTestClusterNullableInt16s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -61794,6 +67039,7 @@ class ReadTestClusterNullableInt24s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int24s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -61815,6 +67061,9 @@ class ReadTestClusterNullableInt24s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt24s : public ModelCommand { @@ -61824,6 +67073,7 @@ class WriteTestClusterNullableInt24s : public ModelCommand { { AddArgument("attr-name", "nullable-int24s"); AddArgument("attr-value", INT32_MIN, INT32_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -61835,10 +67085,13 @@ class WriteTestClusterNullableInt24s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithInt:mValue]; [cluster writeAttributeNullableInt24sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt24s Error: %s", chip::ErrorStr(chipError)); @@ -61848,6 +67101,7 @@ class WriteTestClusterNullableInt24s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int32_t mValue; }; @@ -61859,6 +67113,7 @@ class SubscribeAttributeTestClusterNullableInt24s : public ModelCommand { AddArgument("attr-name", "nullable-int24s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -61871,6 +67126,7 @@ class SubscribeAttributeTestClusterNullableInt24s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt24sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -61891,6 +67147,7 @@ class SubscribeAttributeTestClusterNullableInt24s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -61905,6 +67162,7 @@ class ReadTestClusterNullableInt32s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int32s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -61926,6 +67184,9 @@ class ReadTestClusterNullableInt32s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt32s : public ModelCommand { @@ -61935,6 +67196,7 @@ class WriteTestClusterNullableInt32s : public ModelCommand { { AddArgument("attr-name", "nullable-int32s"); AddArgument("attr-value", INT32_MIN, INT32_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -61946,10 +67208,13 @@ class WriteTestClusterNullableInt32s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithInt:mValue]; [cluster writeAttributeNullableInt32sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt32s Error: %s", chip::ErrorStr(chipError)); @@ -61959,6 +67224,7 @@ class WriteTestClusterNullableInt32s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int32_t mValue; }; @@ -61970,6 +67236,7 @@ class SubscribeAttributeTestClusterNullableInt32s : public ModelCommand { AddArgument("attr-name", "nullable-int32s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -61982,6 +67249,7 @@ class SubscribeAttributeTestClusterNullableInt32s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt32sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -62002,6 +67270,7 @@ class SubscribeAttributeTestClusterNullableInt32s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -62016,6 +67285,7 @@ class ReadTestClusterNullableInt40s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int40s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -62037,6 +67307,9 @@ class ReadTestClusterNullableInt40s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt40s : public ModelCommand { @@ -62046,6 +67319,7 @@ class WriteTestClusterNullableInt40s : public ModelCommand { { AddArgument("attr-name", "nullable-int40s"); AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -62057,10 +67331,13 @@ class WriteTestClusterNullableInt40s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithLongLong:mValue]; [cluster writeAttributeNullableInt40sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt40s Error: %s", chip::ErrorStr(chipError)); @@ -62070,6 +67347,7 @@ class WriteTestClusterNullableInt40s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int64_t mValue; }; @@ -62081,6 +67359,7 @@ class SubscribeAttributeTestClusterNullableInt40s : public ModelCommand { AddArgument("attr-name", "nullable-int40s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -62093,6 +67372,7 @@ class SubscribeAttributeTestClusterNullableInt40s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt40sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -62113,6 +67393,7 @@ class SubscribeAttributeTestClusterNullableInt40s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -62127,6 +67408,7 @@ class ReadTestClusterNullableInt48s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int48s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -62148,6 +67430,9 @@ class ReadTestClusterNullableInt48s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt48s : public ModelCommand { @@ -62157,6 +67442,7 @@ class WriteTestClusterNullableInt48s : public ModelCommand { { AddArgument("attr-name", "nullable-int48s"); AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -62168,10 +67454,13 @@ class WriteTestClusterNullableInt48s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithLongLong:mValue]; [cluster writeAttributeNullableInt48sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt48s Error: %s", chip::ErrorStr(chipError)); @@ -62181,6 +67470,7 @@ class WriteTestClusterNullableInt48s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int64_t mValue; }; @@ -62192,6 +67482,7 @@ class SubscribeAttributeTestClusterNullableInt48s : public ModelCommand { AddArgument("attr-name", "nullable-int48s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -62204,6 +67495,7 @@ class SubscribeAttributeTestClusterNullableInt48s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt48sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -62224,6 +67516,7 @@ class SubscribeAttributeTestClusterNullableInt48s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -62238,6 +67531,7 @@ class ReadTestClusterNullableInt56s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int56s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -62259,6 +67553,9 @@ class ReadTestClusterNullableInt56s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt56s : public ModelCommand { @@ -62268,6 +67565,7 @@ class WriteTestClusterNullableInt56s : public ModelCommand { { AddArgument("attr-name", "nullable-int56s"); AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -62279,10 +67577,13 @@ class WriteTestClusterNullableInt56s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithLongLong:mValue]; [cluster writeAttributeNullableInt56sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt56s Error: %s", chip::ErrorStr(chipError)); @@ -62292,6 +67593,7 @@ class WriteTestClusterNullableInt56s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int64_t mValue; }; @@ -62303,6 +67605,7 @@ class SubscribeAttributeTestClusterNullableInt56s : public ModelCommand { AddArgument("attr-name", "nullable-int56s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -62315,6 +67618,7 @@ class SubscribeAttributeTestClusterNullableInt56s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt56sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -62335,6 +67639,7 @@ class SubscribeAttributeTestClusterNullableInt56s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -62349,6 +67654,7 @@ class ReadTestClusterNullableInt64s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-int64s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -62370,6 +67676,9 @@ class ReadTestClusterNullableInt64s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableInt64s : public ModelCommand { @@ -62379,6 +67688,7 @@ class WriteTestClusterNullableInt64s : public ModelCommand { { AddArgument("attr-name", "nullable-int64s"); AddArgument("attr-value", INT64_MIN, INT64_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -62390,10 +67700,13 @@ class WriteTestClusterNullableInt64s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithLongLong:mValue]; [cluster writeAttributeNullableInt64sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableInt64s Error: %s", chip::ErrorStr(chipError)); @@ -62403,6 +67716,7 @@ class WriteTestClusterNullableInt64s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int64_t mValue; }; @@ -62414,6 +67728,7 @@ class SubscribeAttributeTestClusterNullableInt64s : public ModelCommand { AddArgument("attr-name", "nullable-int64s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -62426,6 +67741,7 @@ class SubscribeAttributeTestClusterNullableInt64s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableInt64sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -62446,6 +67762,7 @@ class SubscribeAttributeTestClusterNullableInt64s : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -62460,6 +67777,7 @@ class ReadTestClusterNullableEnum8 : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-enum8"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -62481,6 +67799,9 @@ class ReadTestClusterNullableEnum8 : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableEnum8 : public ModelCommand { @@ -62490,6 +67811,7 @@ class WriteTestClusterNullableEnum8 : public ModelCommand { { AddArgument("attr-name", "nullable-enum8"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -62501,10 +67823,13 @@ class WriteTestClusterNullableEnum8 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeNullableEnum8WithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableEnum8 Error: %s", chip::ErrorStr(chipError)); @@ -62514,6 +67839,7 @@ class WriteTestClusterNullableEnum8 : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -62525,6 +67851,7 @@ class SubscribeAttributeTestClusterNullableEnum8 : public ModelCommand { AddArgument("attr-name", "nullable-enum8"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -62537,6 +67864,7 @@ class SubscribeAttributeTestClusterNullableEnum8 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableEnum8WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -62557,6 +67885,7 @@ class SubscribeAttributeTestClusterNullableEnum8 : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -62571,6 +67900,7 @@ class ReadTestClusterNullableEnum16 : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-enum16"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -62592,6 +67922,9 @@ class ReadTestClusterNullableEnum16 : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableEnum16 : public ModelCommand { @@ -62601,6 +67934,7 @@ class WriteTestClusterNullableEnum16 : public ModelCommand { { AddArgument("attr-name", "nullable-enum16"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -62612,10 +67946,13 @@ class WriteTestClusterNullableEnum16 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeNullableEnum16WithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableEnum16 Error: %s", chip::ErrorStr(chipError)); @@ -62625,6 +67962,7 @@ class WriteTestClusterNullableEnum16 : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -62636,6 +67974,7 @@ class SubscribeAttributeTestClusterNullableEnum16 : public ModelCommand { AddArgument("attr-name", "nullable-enum16"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -62648,6 +67987,7 @@ class SubscribeAttributeTestClusterNullableEnum16 : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableEnum16WithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -62668,6 +68008,7 @@ class SubscribeAttributeTestClusterNullableEnum16 : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -62682,6 +68023,7 @@ class ReadTestClusterNullableFloatSingle : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-float-single"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -62703,6 +68045,9 @@ class ReadTestClusterNullableFloatSingle : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableFloatSingle : public ModelCommand { @@ -62712,6 +68057,7 @@ class WriteTestClusterNullableFloatSingle : public ModelCommand { { AddArgument("attr-name", "nullable-float-single"); AddArgument("attr-value", -std::numeric_limits::infinity(), std::numeric_limits::infinity(), &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -62723,10 +68069,13 @@ class WriteTestClusterNullableFloatSingle : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithFloat:mValue]; [cluster writeAttributeNullableFloatSingleWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError( @@ -62737,6 +68086,7 @@ class WriteTestClusterNullableFloatSingle : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; float mValue; }; @@ -62748,6 +68098,7 @@ class SubscribeAttributeTestClusterNullableFloatSingle : public ModelCommand { AddArgument("attr-name", "nullable-float-single"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -62760,6 +68111,7 @@ class SubscribeAttributeTestClusterNullableFloatSingle : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableFloatSingleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -62781,6 +68133,7 @@ class SubscribeAttributeTestClusterNullableFloatSingle : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -62795,6 +68148,7 @@ class ReadTestClusterNullableFloatDouble : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-float-double"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -62816,6 +68170,9 @@ class ReadTestClusterNullableFloatDouble : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableFloatDouble : public ModelCommand { @@ -62825,6 +68182,7 @@ class WriteTestClusterNullableFloatDouble : public ModelCommand { { AddArgument("attr-name", "nullable-float-double"); AddArgument("attr-value", -std::numeric_limits::infinity(), std::numeric_limits::infinity(), &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -62836,10 +68194,13 @@ class WriteTestClusterNullableFloatDouble : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithDouble:mValue]; [cluster writeAttributeNullableFloatDoubleWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError( @@ -62850,6 +68211,7 @@ class WriteTestClusterNullableFloatDouble : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; double mValue; }; @@ -62861,6 +68223,7 @@ class SubscribeAttributeTestClusterNullableFloatDouble : public ModelCommand { AddArgument("attr-name", "nullable-float-double"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -62873,6 +68236,7 @@ class SubscribeAttributeTestClusterNullableFloatDouble : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableFloatDoubleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -62894,6 +68258,7 @@ class SubscribeAttributeTestClusterNullableFloatDouble : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -62908,6 +68273,7 @@ class ReadTestClusterNullableOctetString : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-octet-string"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -62929,6 +68295,9 @@ class ReadTestClusterNullableOctetString : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableOctetString : public ModelCommand { @@ -62938,6 +68307,7 @@ class WriteTestClusterNullableOctetString : public ModelCommand { { AddArgument("attr-name", "nullable-octet-string"); AddArgument("attr-value", &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -62949,10 +68319,13 @@ class WriteTestClusterNullableOctetString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSData * _Nullable value = [[NSData alloc] initWithBytes:mValue.data() length:mValue.size()]; [cluster writeAttributeNullableOctetStringWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError( @@ -62963,6 +68336,7 @@ class WriteTestClusterNullableOctetString : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mValue; }; @@ -62974,6 +68348,7 @@ class SubscribeAttributeTestClusterNullableOctetString : public ModelCommand { AddArgument("attr-name", "nullable-octet-string"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -62986,6 +68361,7 @@ class SubscribeAttributeTestClusterNullableOctetString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableOctetStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -63007,6 +68383,7 @@ class SubscribeAttributeTestClusterNullableOctetString : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -63021,6 +68398,7 @@ class ReadTestClusterNullableCharString : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-char-string"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -63042,6 +68420,9 @@ class ReadTestClusterNullableCharString : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableCharString : public ModelCommand { @@ -63051,6 +68432,7 @@ class WriteTestClusterNullableCharString : public ModelCommand { { AddArgument("attr-name", "nullable-char-string"); AddArgument("attr-value", &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -63062,12 +68444,15 @@ class WriteTestClusterNullableCharString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSString * _Nullable value = [[NSString alloc] initWithBytes:mValue.data() length:mValue.size() encoding:NSUTF8StringEncoding]; [cluster writeAttributeNullableCharStringWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError( @@ -63078,6 +68463,7 @@ class WriteTestClusterNullableCharString : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::ByteSpan mValue; }; @@ -63089,6 +68475,7 @@ class SubscribeAttributeTestClusterNullableCharString : public ModelCommand { AddArgument("attr-name", "nullable-char-string"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -63101,6 +68488,7 @@ class SubscribeAttributeTestClusterNullableCharString : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableCharStringWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -63122,6 +68510,7 @@ class SubscribeAttributeTestClusterNullableCharString : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -63136,6 +68525,7 @@ class ReadTestClusterNullableEnumAttr : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-enum-attr"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -63157,6 +68547,9 @@ class ReadTestClusterNullableEnumAttr : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableEnumAttr : public ModelCommand { @@ -63166,6 +68559,7 @@ class WriteTestClusterNullableEnumAttr : public ModelCommand { { AddArgument("attr-name", "nullable-enum-attr"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -63177,11 +68571,14 @@ class WriteTestClusterNullableEnumAttr : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeNullableEnumAttrWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableEnumAttr Error: %s", chip::ErrorStr(chipError)); @@ -63191,6 +68588,7 @@ class WriteTestClusterNullableEnumAttr : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -63202,6 +68600,7 @@ class SubscribeAttributeTestClusterNullableEnumAttr : public ModelCommand { AddArgument("attr-name", "nullable-enum-attr"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -63214,6 +68613,7 @@ class SubscribeAttributeTestClusterNullableEnumAttr : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableEnumAttrWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -63234,6 +68634,7 @@ class SubscribeAttributeTestClusterNullableEnumAttr : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -63248,6 +68649,7 @@ class ReadTestClusterNullableStruct : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-struct"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -63270,6 +68672,9 @@ class ReadTestClusterNullableStruct : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableStruct : public ModelCommand { @@ -63280,6 +68685,7 @@ class WriteTestClusterNullableStruct : public ModelCommand { { AddArgument("attr-name", "nullable-struct"); AddArgument("attr-value", &mComplex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -63291,7 +68697,9 @@ class WriteTestClusterNullableStruct : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; CHIPTestClusterClusterSimpleStruct * _Nullable value; if (mValue.IsNull()) { value = nil; @@ -63310,6 +68718,7 @@ class WriteTestClusterNullableStruct : public ModelCommand { } [cluster writeAttributeNullableStructWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableStruct Error: %s", chip::ErrorStr(chipError)); @@ -63319,6 +68728,7 @@ class WriteTestClusterNullableStruct : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::DataModel::Nullable mValue; TypedComplexArgument> mComplex; }; @@ -63331,6 +68741,7 @@ class SubscribeAttributeTestClusterNullableStruct : public ModelCommand { AddArgument("attr-name", "nullable-struct"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -63343,6 +68754,7 @@ class SubscribeAttributeTestClusterNullableStruct : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableStructWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -63364,6 +68776,7 @@ class SubscribeAttributeTestClusterNullableStruct : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -63378,6 +68791,7 @@ class ReadTestClusterNullableRangeRestrictedInt8u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-range-restricted-int8u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -63400,6 +68814,9 @@ class ReadTestClusterNullableRangeRestrictedInt8u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableRangeRestrictedInt8u : public ModelCommand { @@ -63409,6 +68826,7 @@ class WriteTestClusterNullableRangeRestrictedInt8u : public ModelCommand { { AddArgument("attr-name", "nullable-range-restricted-int8u"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -63420,10 +68838,13 @@ class WriteTestClusterNullableRangeRestrictedInt8u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeNullableRangeRestrictedInt8uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableRangeRestrictedInt8u Error: %s", @@ -63434,6 +68855,7 @@ class WriteTestClusterNullableRangeRestrictedInt8u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -63445,6 +68867,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt8u : public ModelCo AddArgument("attr-name", "nullable-range-restricted-int8u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -63457,6 +68880,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt8u : public ModelCo dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableRangeRestrictedInt8uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -63479,6 +68903,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt8u : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -63493,6 +68918,7 @@ class ReadTestClusterNullableRangeRestrictedInt8s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-range-restricted-int8s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -63515,6 +68941,9 @@ class ReadTestClusterNullableRangeRestrictedInt8s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableRangeRestrictedInt8s : public ModelCommand { @@ -63524,6 +68953,7 @@ class WriteTestClusterNullableRangeRestrictedInt8s : public ModelCommand { { AddArgument("attr-name", "nullable-range-restricted-int8s"); AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -63535,10 +68965,13 @@ class WriteTestClusterNullableRangeRestrictedInt8s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithChar:mValue]; [cluster writeAttributeNullableRangeRestrictedInt8sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableRangeRestrictedInt8s Error: %s", @@ -63549,6 +68982,7 @@ class WriteTestClusterNullableRangeRestrictedInt8s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int8_t mValue; }; @@ -63560,6 +68994,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt8s : public ModelCo AddArgument("attr-name", "nullable-range-restricted-int8s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -63572,6 +69007,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt8s : public ModelCo dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableRangeRestrictedInt8sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -63594,6 +69030,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt8s : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -63608,6 +69045,7 @@ class ReadTestClusterNullableRangeRestrictedInt16u : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-range-restricted-int16u"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -63630,6 +69068,9 @@ class ReadTestClusterNullableRangeRestrictedInt16u : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableRangeRestrictedInt16u : public ModelCommand { @@ -63639,6 +69080,7 @@ class WriteTestClusterNullableRangeRestrictedInt16u : public ModelCommand { { AddArgument("attr-name", "nullable-range-restricted-int16u"); AddArgument("attr-value", 0, UINT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -63650,11 +69092,14 @@ class WriteTestClusterNullableRangeRestrictedInt16u : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedShort:mValue]; [cluster writeAttributeNullableRangeRestrictedInt16uWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableRangeRestrictedInt16u Error: %s", @@ -63665,6 +69110,7 @@ class WriteTestClusterNullableRangeRestrictedInt16u : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mValue; }; @@ -63676,6 +69122,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt16u : public ModelC AddArgument("attr-name", "nullable-range-restricted-int16u"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -63688,6 +69135,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt16u : public ModelC dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableRangeRestrictedInt16uWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -63711,6 +69159,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt16u : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -63725,6 +69174,7 @@ class ReadTestClusterNullableRangeRestrictedInt16s : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "nullable-range-restricted-int16s"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -63747,6 +69197,9 @@ class ReadTestClusterNullableRangeRestrictedInt16s : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTestClusterNullableRangeRestrictedInt16s : public ModelCommand { @@ -63756,6 +69209,7 @@ class WriteTestClusterNullableRangeRestrictedInt16s : public ModelCommand { { AddArgument("attr-name", "nullable-range-restricted-int16s"); AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -63767,11 +69221,14 @@ class WriteTestClusterNullableRangeRestrictedInt16s : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithShort:mValue]; [cluster writeAttributeNullableRangeRestrictedInt16sWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TestCluster NullableRangeRestrictedInt16s Error: %s", @@ -63782,6 +69239,7 @@ class WriteTestClusterNullableRangeRestrictedInt16s : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int16_t mValue; }; @@ -63793,6 +69251,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt16s : public ModelC AddArgument("attr-name", "nullable-range-restricted-int16s"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -63805,6 +69264,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt16s : public ModelC dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNullableRangeRestrictedInt16sWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -63828,6 +69288,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt16s : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -63842,6 +69303,7 @@ class ReadTestClusterGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -63863,6 +69325,9 @@ class ReadTestClusterGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTestClusterGeneratedCommandList : public ModelCommand { @@ -63873,6 +69338,7 @@ class SubscribeAttributeTestClusterGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -63885,6 +69351,7 @@ class SubscribeAttributeTestClusterGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -63906,6 +69373,7 @@ class SubscribeAttributeTestClusterGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -63920,6 +69388,7 @@ class ReadTestClusterAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -63941,6 +69410,9 @@ class ReadTestClusterAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTestClusterAcceptedCommandList : public ModelCommand { @@ -63951,6 +69423,7 @@ class SubscribeAttributeTestClusterAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -63963,6 +69436,7 @@ class SubscribeAttributeTestClusterAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -63984,6 +69458,7 @@ class SubscribeAttributeTestClusterAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -63998,6 +69473,7 @@ class ReadTestClusterAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -64019,6 +69495,9 @@ class ReadTestClusterAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTestClusterAttributeList : public ModelCommand { @@ -64029,6 +69508,7 @@ class SubscribeAttributeTestClusterAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -64041,6 +69521,7 @@ class SubscribeAttributeTestClusterAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -64061,6 +69542,7 @@ class SubscribeAttributeTestClusterAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -64075,6 +69557,7 @@ class ReadTestClusterClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -64096,6 +69579,9 @@ class ReadTestClusterClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTestClusterClusterRevision : public ModelCommand { @@ -64106,6 +69592,7 @@ class SubscribeAttributeTestClusterClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -64118,6 +69605,7 @@ class SubscribeAttributeTestClusterClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -64138,6 +69626,7 @@ class SubscribeAttributeTestClusterClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -64214,6 +69703,7 @@ class ThermostatClearWeeklySchedule : public ModelCommand { ThermostatClearWeeklySchedule() : ModelCommand("clear-weekly-schedule") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -64224,6 +69714,9 @@ class ThermostatClearWeeklySchedule : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPThermostatClusterClearWeeklyScheduleParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster clearWeeklyScheduleWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -64233,6 +69726,7 @@ class ThermostatClearWeeklySchedule : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -64243,6 +69737,7 @@ class ThermostatGetRelayStatusLog : public ModelCommand { ThermostatGetRelayStatusLog() : ModelCommand("get-relay-status-log") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -64253,6 +69748,9 @@ class ThermostatGetRelayStatusLog : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPThermostatClusterGetRelayStatusLogParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster getRelayStatusLogWithCompletionHandler:^( CHIPThermostatClusterGetRelayStatusLogResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); @@ -64264,6 +69762,7 @@ class ThermostatGetRelayStatusLog : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -64276,6 +69775,7 @@ class ThermostatGetWeeklySchedule : public ModelCommand { { AddArgument("DaysToReturn", 0, UINT8_MAX, &mDaysToReturn); AddArgument("ModeToReturn", 0, UINT8_MAX, &mModeToReturn); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -64287,9 +69787,9 @@ class ThermostatGetWeeklySchedule : public ModelCommand { CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPThermostatClusterGetWeeklyScheduleParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.daysToReturn = [NSNumber numberWithUnsignedChar:mDaysToReturn]; - params.modeToReturn = [NSNumber numberWithUnsignedChar:mModeToReturn]; [cluster getWeeklyScheduleWithParams:params completionHandler:^( @@ -64303,6 +69803,7 @@ class ThermostatGetWeeklySchedule : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mDaysToReturn; uint8_t mModeToReturn; }; @@ -64320,6 +69821,7 @@ class ThermostatSetWeeklySchedule : public ModelCommand { AddArgument("DayOfWeekForSequence", 0, UINT8_MAX, &mDayOfWeekForSequence); AddArgument("ModeForSequence", 0, UINT8_MAX, &mModeForSequence); AddArgument("Payload", &mComplex_Payload); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -64331,13 +69833,11 @@ class ThermostatSetWeeklySchedule : public ModelCommand { CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPThermostatClusterSetWeeklyScheduleParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.numberOfTransitionsForSequence = [NSNumber numberWithUnsignedChar:mNumberOfTransitionsForSequence]; - params.dayOfWeekForSequence = [NSNumber numberWithUnsignedChar:mDayOfWeekForSequence]; - params.modeForSequence = [NSNumber numberWithUnsignedChar:mModeForSequence]; - { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; for (auto & entry_0 : mRequest.payload) { @@ -64357,6 +69857,7 @@ class ThermostatSetWeeklySchedule : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mNumberOfTransitionsForSequence; uint8_t mDayOfWeekForSequence; uint8_t mModeForSequence; @@ -64374,6 +69875,7 @@ class ThermostatSetpointRaiseLower : public ModelCommand { { AddArgument("Mode", 0, UINT8_MAX, &mMode); AddArgument("Amount", INT8_MIN, INT8_MAX, &mAmount); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -64385,9 +69887,9 @@ class ThermostatSetpointRaiseLower : public ModelCommand { CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPThermostatClusterSetpointRaiseLowerParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.mode = [NSNumber numberWithUnsignedChar:mMode]; - params.amount = [NSNumber numberWithChar:mAmount]; [cluster setpointRaiseLowerWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -64399,6 +69901,7 @@ class ThermostatSetpointRaiseLower : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mMode; int8_t mAmount; }; @@ -64412,6 +69915,7 @@ class ReadThermostatLocalTemperature : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "local-temperature"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -64433,6 +69937,9 @@ class ReadThermostatLocalTemperature : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThermostatLocalTemperature : public ModelCommand { @@ -64443,6 +69950,7 @@ class SubscribeAttributeThermostatLocalTemperature : public ModelCommand { AddArgument("attr-name", "local-temperature"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -64455,6 +69963,7 @@ class SubscribeAttributeThermostatLocalTemperature : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLocalTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -64475,6 +69984,7 @@ class SubscribeAttributeThermostatLocalTemperature : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -64489,6 +69999,7 @@ class ReadThermostatAbsMinHeatSetpointLimit : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "abs-min-heat-setpoint-limit"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -64511,6 +70022,9 @@ class ReadThermostatAbsMinHeatSetpointLimit : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThermostatAbsMinHeatSetpointLimit : public ModelCommand { @@ -64521,6 +70035,7 @@ class SubscribeAttributeThermostatAbsMinHeatSetpointLimit : public ModelCommand AddArgument("attr-name", "abs-min-heat-setpoint-limit"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -64533,6 +70048,7 @@ class SubscribeAttributeThermostatAbsMinHeatSetpointLimit : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAbsMinHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -64554,6 +70070,7 @@ class SubscribeAttributeThermostatAbsMinHeatSetpointLimit : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -64568,6 +70085,7 @@ class ReadThermostatAbsMaxHeatSetpointLimit : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "abs-max-heat-setpoint-limit"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -64590,6 +70108,9 @@ class ReadThermostatAbsMaxHeatSetpointLimit : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThermostatAbsMaxHeatSetpointLimit : public ModelCommand { @@ -64600,6 +70121,7 @@ class SubscribeAttributeThermostatAbsMaxHeatSetpointLimit : public ModelCommand AddArgument("attr-name", "abs-max-heat-setpoint-limit"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -64612,6 +70134,7 @@ class SubscribeAttributeThermostatAbsMaxHeatSetpointLimit : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAbsMaxHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -64633,6 +70156,7 @@ class SubscribeAttributeThermostatAbsMaxHeatSetpointLimit : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -64647,6 +70171,7 @@ class ReadThermostatAbsMinCoolSetpointLimit : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "abs-min-cool-setpoint-limit"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -64669,6 +70194,9 @@ class ReadThermostatAbsMinCoolSetpointLimit : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThermostatAbsMinCoolSetpointLimit : public ModelCommand { @@ -64679,6 +70207,7 @@ class SubscribeAttributeThermostatAbsMinCoolSetpointLimit : public ModelCommand AddArgument("attr-name", "abs-min-cool-setpoint-limit"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -64691,6 +70220,7 @@ class SubscribeAttributeThermostatAbsMinCoolSetpointLimit : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAbsMinCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -64712,6 +70242,7 @@ class SubscribeAttributeThermostatAbsMinCoolSetpointLimit : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -64726,6 +70257,7 @@ class ReadThermostatAbsMaxCoolSetpointLimit : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "abs-max-cool-setpoint-limit"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -64748,6 +70280,9 @@ class ReadThermostatAbsMaxCoolSetpointLimit : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThermostatAbsMaxCoolSetpointLimit : public ModelCommand { @@ -64758,6 +70293,7 @@ class SubscribeAttributeThermostatAbsMaxCoolSetpointLimit : public ModelCommand AddArgument("attr-name", "abs-max-cool-setpoint-limit"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -64770,6 +70306,7 @@ class SubscribeAttributeThermostatAbsMaxCoolSetpointLimit : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAbsMaxCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -64791,6 +70328,7 @@ class SubscribeAttributeThermostatAbsMaxCoolSetpointLimit : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -64805,6 +70343,7 @@ class ReadThermostatOccupiedCoolingSetpoint : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "occupied-cooling-setpoint"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -64827,6 +70366,9 @@ class ReadThermostatOccupiedCoolingSetpoint : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteThermostatOccupiedCoolingSetpoint : public ModelCommand { @@ -64836,6 +70378,7 @@ class WriteThermostatOccupiedCoolingSetpoint : public ModelCommand { { AddArgument("attr-name", "occupied-cooling-setpoint"); AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -64847,10 +70390,13 @@ class WriteThermostatOccupiedCoolingSetpoint : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue]; [cluster writeAttributeOccupiedCoolingSetpointWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "Thermostat OccupiedCoolingSetpoint Error: %s", @@ -64861,6 +70407,7 @@ class WriteThermostatOccupiedCoolingSetpoint : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int16_t mValue; }; @@ -64872,6 +70419,7 @@ class SubscribeAttributeThermostatOccupiedCoolingSetpoint : public ModelCommand AddArgument("attr-name", "occupied-cooling-setpoint"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -64884,6 +70432,7 @@ class SubscribeAttributeThermostatOccupiedCoolingSetpoint : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOccupiedCoolingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -64905,6 +70454,7 @@ class SubscribeAttributeThermostatOccupiedCoolingSetpoint : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -64919,6 +70469,7 @@ class ReadThermostatOccupiedHeatingSetpoint : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "occupied-heating-setpoint"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -64941,6 +70492,9 @@ class ReadThermostatOccupiedHeatingSetpoint : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteThermostatOccupiedHeatingSetpoint : public ModelCommand { @@ -64950,6 +70504,7 @@ class WriteThermostatOccupiedHeatingSetpoint : public ModelCommand { { AddArgument("attr-name", "occupied-heating-setpoint"); AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -64961,10 +70516,13 @@ class WriteThermostatOccupiedHeatingSetpoint : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue]; [cluster writeAttributeOccupiedHeatingSetpointWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "Thermostat OccupiedHeatingSetpoint Error: %s", @@ -64975,6 +70533,7 @@ class WriteThermostatOccupiedHeatingSetpoint : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int16_t mValue; }; @@ -64986,6 +70545,7 @@ class SubscribeAttributeThermostatOccupiedHeatingSetpoint : public ModelCommand AddArgument("attr-name", "occupied-heating-setpoint"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -64998,6 +70558,7 @@ class SubscribeAttributeThermostatOccupiedHeatingSetpoint : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOccupiedHeatingSetpointWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -65019,6 +70580,7 @@ class SubscribeAttributeThermostatOccupiedHeatingSetpoint : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -65033,6 +70595,7 @@ class ReadThermostatMinHeatSetpointLimit : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-heat-setpoint-limit"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -65054,6 +70617,9 @@ class ReadThermostatMinHeatSetpointLimit : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteThermostatMinHeatSetpointLimit : public ModelCommand { @@ -65063,6 +70629,7 @@ class WriteThermostatMinHeatSetpointLimit : public ModelCommand { { AddArgument("attr-name", "min-heat-setpoint-limit"); AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -65074,10 +70641,13 @@ class WriteThermostatMinHeatSetpointLimit : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue]; [cluster writeAttributeMinHeatSetpointLimitWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "Thermostat MinHeatSetpointLimit Error: %s", @@ -65088,6 +70658,7 @@ class WriteThermostatMinHeatSetpointLimit : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int16_t mValue; }; @@ -65099,6 +70670,7 @@ class SubscribeAttributeThermostatMinHeatSetpointLimit : public ModelCommand { AddArgument("attr-name", "min-heat-setpoint-limit"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -65111,6 +70683,7 @@ class SubscribeAttributeThermostatMinHeatSetpointLimit : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -65132,6 +70705,7 @@ class SubscribeAttributeThermostatMinHeatSetpointLimit : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -65146,6 +70720,7 @@ class ReadThermostatMaxHeatSetpointLimit : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-heat-setpoint-limit"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -65167,6 +70742,9 @@ class ReadThermostatMaxHeatSetpointLimit : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteThermostatMaxHeatSetpointLimit : public ModelCommand { @@ -65176,6 +70754,7 @@ class WriteThermostatMaxHeatSetpointLimit : public ModelCommand { { AddArgument("attr-name", "max-heat-setpoint-limit"); AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -65187,10 +70766,13 @@ class WriteThermostatMaxHeatSetpointLimit : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue]; [cluster writeAttributeMaxHeatSetpointLimitWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "Thermostat MaxHeatSetpointLimit Error: %s", @@ -65201,6 +70783,7 @@ class WriteThermostatMaxHeatSetpointLimit : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int16_t mValue; }; @@ -65212,6 +70795,7 @@ class SubscribeAttributeThermostatMaxHeatSetpointLimit : public ModelCommand { AddArgument("attr-name", "max-heat-setpoint-limit"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -65224,6 +70808,7 @@ class SubscribeAttributeThermostatMaxHeatSetpointLimit : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxHeatSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -65245,6 +70830,7 @@ class SubscribeAttributeThermostatMaxHeatSetpointLimit : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -65259,6 +70845,7 @@ class ReadThermostatMinCoolSetpointLimit : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-cool-setpoint-limit"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -65280,6 +70867,9 @@ class ReadThermostatMinCoolSetpointLimit : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteThermostatMinCoolSetpointLimit : public ModelCommand { @@ -65289,6 +70879,7 @@ class WriteThermostatMinCoolSetpointLimit : public ModelCommand { { AddArgument("attr-name", "min-cool-setpoint-limit"); AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -65300,10 +70891,13 @@ class WriteThermostatMinCoolSetpointLimit : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue]; [cluster writeAttributeMinCoolSetpointLimitWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "Thermostat MinCoolSetpointLimit Error: %s", @@ -65314,6 +70908,7 @@ class WriteThermostatMinCoolSetpointLimit : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int16_t mValue; }; @@ -65325,6 +70920,7 @@ class SubscribeAttributeThermostatMinCoolSetpointLimit : public ModelCommand { AddArgument("attr-name", "min-cool-setpoint-limit"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -65337,6 +70933,7 @@ class SubscribeAttributeThermostatMinCoolSetpointLimit : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -65358,6 +70955,7 @@ class SubscribeAttributeThermostatMinCoolSetpointLimit : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -65372,6 +70970,7 @@ class ReadThermostatMaxCoolSetpointLimit : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "max-cool-setpoint-limit"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -65393,6 +70992,9 @@ class ReadThermostatMaxCoolSetpointLimit : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteThermostatMaxCoolSetpointLimit : public ModelCommand { @@ -65402,6 +71004,7 @@ class WriteThermostatMaxCoolSetpointLimit : public ModelCommand { { AddArgument("attr-name", "max-cool-setpoint-limit"); AddArgument("attr-value", INT16_MIN, INT16_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -65413,10 +71016,13 @@ class WriteThermostatMaxCoolSetpointLimit : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithShort:mValue]; [cluster writeAttributeMaxCoolSetpointLimitWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "Thermostat MaxCoolSetpointLimit Error: %s", @@ -65427,6 +71033,7 @@ class WriteThermostatMaxCoolSetpointLimit : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int16_t mValue; }; @@ -65438,6 +71045,7 @@ class SubscribeAttributeThermostatMaxCoolSetpointLimit : public ModelCommand { AddArgument("attr-name", "max-cool-setpoint-limit"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -65450,6 +71058,7 @@ class SubscribeAttributeThermostatMaxCoolSetpointLimit : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMaxCoolSetpointLimitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -65471,6 +71080,7 @@ class SubscribeAttributeThermostatMaxCoolSetpointLimit : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -65485,6 +71095,7 @@ class ReadThermostatMinSetpointDeadBand : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "min-setpoint-dead-band"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -65506,6 +71117,9 @@ class ReadThermostatMinSetpointDeadBand : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteThermostatMinSetpointDeadBand : public ModelCommand { @@ -65515,6 +71129,7 @@ class WriteThermostatMinSetpointDeadBand : public ModelCommand { { AddArgument("attr-name", "min-setpoint-dead-band"); AddArgument("attr-value", INT8_MIN, INT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -65526,10 +71141,13 @@ class WriteThermostatMinSetpointDeadBand : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithChar:mValue]; [cluster writeAttributeMinSetpointDeadBandWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError( @@ -65540,6 +71158,7 @@ class WriteThermostatMinSetpointDeadBand : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; int8_t mValue; }; @@ -65551,6 +71170,7 @@ class SubscribeAttributeThermostatMinSetpointDeadBand : public ModelCommand { AddArgument("attr-name", "min-setpoint-dead-band"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -65563,6 +71183,7 @@ class SubscribeAttributeThermostatMinSetpointDeadBand : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMinSetpointDeadBandWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -65584,6 +71205,7 @@ class SubscribeAttributeThermostatMinSetpointDeadBand : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -65598,6 +71220,7 @@ class ReadThermostatControlSequenceOfOperation : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "control-sequence-of-operation"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -65620,6 +71243,9 @@ class ReadThermostatControlSequenceOfOperation : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteThermostatControlSequenceOfOperation : public ModelCommand { @@ -65629,6 +71255,7 @@ class WriteThermostatControlSequenceOfOperation : public ModelCommand { { AddArgument("attr-name", "control-sequence-of-operation"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -65640,10 +71267,13 @@ class WriteThermostatControlSequenceOfOperation : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeControlSequenceOfOperationWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "Thermostat ControlSequenceOfOperation Error: %s", @@ -65654,6 +71284,7 @@ class WriteThermostatControlSequenceOfOperation : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -65665,6 +71296,7 @@ class SubscribeAttributeThermostatControlSequenceOfOperation : public ModelComma AddArgument("attr-name", "control-sequence-of-operation"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -65677,6 +71309,7 @@ class SubscribeAttributeThermostatControlSequenceOfOperation : public ModelComma dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeControlSequenceOfOperationWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -65699,6 +71332,7 @@ class SubscribeAttributeThermostatControlSequenceOfOperation : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -65713,6 +71347,7 @@ class ReadThermostatSystemMode : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "system-mode"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -65734,6 +71369,9 @@ class ReadThermostatSystemMode : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteThermostatSystemMode : public ModelCommand { @@ -65743,6 +71381,7 @@ class WriteThermostatSystemMode : public ModelCommand { { AddArgument("attr-name", "system-mode"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -65754,10 +71393,13 @@ class WriteThermostatSystemMode : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeSystemModeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "Thermostat SystemMode Error: %s", chip::ErrorStr(chipError)); @@ -65767,6 +71409,7 @@ class WriteThermostatSystemMode : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -65778,6 +71421,7 @@ class SubscribeAttributeThermostatSystemMode : public ModelCommand { AddArgument("attr-name", "system-mode"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -65790,6 +71434,7 @@ class SubscribeAttributeThermostatSystemMode : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSystemModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -65810,6 +71455,7 @@ class SubscribeAttributeThermostatSystemMode : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -65824,6 +71470,7 @@ class ReadThermostatStartOfWeek : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "start-of-week"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -65845,6 +71492,9 @@ class ReadThermostatStartOfWeek : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThermostatStartOfWeek : public ModelCommand { @@ -65855,6 +71505,7 @@ class SubscribeAttributeThermostatStartOfWeek : public ModelCommand { AddArgument("attr-name", "start-of-week"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -65867,6 +71518,7 @@ class SubscribeAttributeThermostatStartOfWeek : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeStartOfWeekWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -65887,6 +71539,7 @@ class SubscribeAttributeThermostatStartOfWeek : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -65901,6 +71554,7 @@ class ReadThermostatNumberOfWeeklyTransitions : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "number-of-weekly-transitions"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -65923,6 +71577,9 @@ class ReadThermostatNumberOfWeeklyTransitions : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThermostatNumberOfWeeklyTransitions : public ModelCommand { @@ -65933,6 +71590,7 @@ class SubscribeAttributeThermostatNumberOfWeeklyTransitions : public ModelComman AddArgument("attr-name", "number-of-weekly-transitions"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -65945,6 +71603,7 @@ class SubscribeAttributeThermostatNumberOfWeeklyTransitions : public ModelComman dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNumberOfWeeklyTransitionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -65967,6 +71626,7 @@ class SubscribeAttributeThermostatNumberOfWeeklyTransitions : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -65981,6 +71641,7 @@ class ReadThermostatNumberOfDailyTransitions : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "number-of-daily-transitions"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -66003,6 +71664,9 @@ class ReadThermostatNumberOfDailyTransitions : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThermostatNumberOfDailyTransitions : public ModelCommand { @@ -66013,6 +71677,7 @@ class SubscribeAttributeThermostatNumberOfDailyTransitions : public ModelCommand AddArgument("attr-name", "number-of-daily-transitions"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -66025,6 +71690,7 @@ class SubscribeAttributeThermostatNumberOfDailyTransitions : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNumberOfDailyTransitionsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -66047,6 +71713,7 @@ class SubscribeAttributeThermostatNumberOfDailyTransitions : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -66061,6 +71728,7 @@ class ReadThermostatAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -66082,6 +71750,9 @@ class ReadThermostatAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThermostatAttributeList : public ModelCommand { @@ -66092,6 +71763,7 @@ class SubscribeAttributeThermostatAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -66104,6 +71776,7 @@ class SubscribeAttributeThermostatAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -66124,6 +71797,7 @@ class SubscribeAttributeThermostatAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -66138,6 +71812,7 @@ class ReadThermostatFeatureMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "feature-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -66159,6 +71834,9 @@ class ReadThermostatFeatureMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThermostatFeatureMap : public ModelCommand { @@ -66169,6 +71847,7 @@ class SubscribeAttributeThermostatFeatureMap : public ModelCommand { AddArgument("attr-name", "feature-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -66181,6 +71860,7 @@ class SubscribeAttributeThermostatFeatureMap : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -66201,6 +71881,7 @@ class SubscribeAttributeThermostatFeatureMap : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -66215,6 +71896,7 @@ class ReadThermostatClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -66236,6 +71918,9 @@ class ReadThermostatClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThermostatClusterRevision : public ModelCommand { @@ -66246,6 +71931,7 @@ class SubscribeAttributeThermostatClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -66258,6 +71944,7 @@ class SubscribeAttributeThermostatClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPThermostat * cluster = [[CHIPThermostat alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -66278,6 +71965,7 @@ class SubscribeAttributeThermostatClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -66310,6 +71998,7 @@ class ReadThermostatUserInterfaceConfigurationTemperatureDisplayMode : public Mo : ModelCommand("read") { AddArgument("attr-name", "temperature-display-mode"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -66332,6 +72021,9 @@ class ReadThermostatUserInterfaceConfigurationTemperatureDisplayMode : public Mo }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteThermostatUserInterfaceConfigurationTemperatureDisplayMode : public ModelCommand { @@ -66341,6 +72033,7 @@ class WriteThermostatUserInterfaceConfigurationTemperatureDisplayMode : public M { AddArgument("attr-name", "temperature-display-mode"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -66353,10 +72046,13 @@ class WriteThermostatUserInterfaceConfigurationTemperatureDisplayMode : public M CHIPThermostatUserInterfaceConfiguration * cluster = [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeTemperatureDisplayModeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, @@ -66368,6 +72064,7 @@ class WriteThermostatUserInterfaceConfigurationTemperatureDisplayMode : public M } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -66379,6 +72076,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationTemperatureDisplayMo AddArgument("attr-name", "temperature-display-mode"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -66392,6 +72090,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationTemperatureDisplayMo CHIPThermostatUserInterfaceConfiguration * cluster = [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTemperatureDisplayModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -66414,6 +72113,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationTemperatureDisplayMo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -66428,6 +72128,7 @@ class ReadThermostatUserInterfaceConfigurationKeypadLockout : public ModelComman : ModelCommand("read") { AddArgument("attr-name", "keypad-lockout"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -66450,6 +72151,9 @@ class ReadThermostatUserInterfaceConfigurationKeypadLockout : public ModelComman }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteThermostatUserInterfaceConfigurationKeypadLockout : public ModelCommand { @@ -66459,6 +72163,7 @@ class WriteThermostatUserInterfaceConfigurationKeypadLockout : public ModelComma { AddArgument("attr-name", "keypad-lockout"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -66471,10 +72176,13 @@ class WriteThermostatUserInterfaceConfigurationKeypadLockout : public ModelComma CHIPThermostatUserInterfaceConfiguration * cluster = [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeKeypadLockoutWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "ThermostatUserInterfaceConfiguration KeypadLockout Error: %s", @@ -66485,6 +72193,7 @@ class WriteThermostatUserInterfaceConfigurationKeypadLockout : public ModelComma } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -66496,6 +72205,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationKeypadLockout : publ AddArgument("attr-name", "keypad-lockout"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -66509,6 +72219,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationKeypadLockout : publ CHIPThermostatUserInterfaceConfiguration * cluster = [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeKeypadLockoutWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -66530,6 +72241,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationKeypadLockout : publ } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -66544,6 +72256,7 @@ class ReadThermostatUserInterfaceConfigurationScheduleProgrammingVisibility : pu : ModelCommand("read") { AddArgument("attr-name", "schedule-programming-visibility"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -66568,6 +72281,9 @@ class ReadThermostatUserInterfaceConfigurationScheduleProgrammingVisibility : pu }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteThermostatUserInterfaceConfigurationScheduleProgrammingVisibility : public ModelCommand { @@ -66577,6 +72293,7 @@ class WriteThermostatUserInterfaceConfigurationScheduleProgrammingVisibility : p { AddArgument("attr-name", "schedule-programming-visibility"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -66589,10 +72306,13 @@ class WriteThermostatUserInterfaceConfigurationScheduleProgrammingVisibility : p CHIPThermostatUserInterfaceConfiguration * cluster = [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeScheduleProgrammingVisibilityWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, @@ -66605,6 +72325,7 @@ class WriteThermostatUserInterfaceConfigurationScheduleProgrammingVisibility : p } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -66616,6 +72337,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationScheduleProgrammingV AddArgument("attr-name", "schedule-programming-visibility"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -66629,6 +72351,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationScheduleProgrammingV CHIPThermostatUserInterfaceConfiguration * cluster = [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeScheduleProgrammingVisibilityWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -66653,6 +72376,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationScheduleProgrammingV } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -66667,6 +72391,7 @@ class ReadThermostatUserInterfaceConfigurationGeneratedCommandList : public Mode : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -66689,6 +72414,9 @@ class ReadThermostatUserInterfaceConfigurationGeneratedCommandList : public Mode }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThermostatUserInterfaceConfigurationGeneratedCommandList : public ModelCommand { @@ -66699,6 +72427,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationGeneratedCommandList AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -66712,6 +72441,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationGeneratedCommandList CHIPThermostatUserInterfaceConfiguration * cluster = [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -66734,6 +72464,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationGeneratedCommandList } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -66748,6 +72479,7 @@ class ReadThermostatUserInterfaceConfigurationAcceptedCommandList : public Model : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -66770,6 +72502,9 @@ class ReadThermostatUserInterfaceConfigurationAcceptedCommandList : public Model }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThermostatUserInterfaceConfigurationAcceptedCommandList : public ModelCommand { @@ -66780,6 +72515,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationAcceptedCommandList AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -66793,6 +72529,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationAcceptedCommandList CHIPThermostatUserInterfaceConfiguration * cluster = [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -66816,6 +72553,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationAcceptedCommandList } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -66830,6 +72568,7 @@ class ReadThermostatUserInterfaceConfigurationAttributeList : public ModelComman : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -66852,6 +72591,9 @@ class ReadThermostatUserInterfaceConfigurationAttributeList : public ModelComman }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThermostatUserInterfaceConfigurationAttributeList : public ModelCommand { @@ -66862,6 +72604,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationAttributeList : publ AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -66875,6 +72618,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationAttributeList : publ CHIPThermostatUserInterfaceConfiguration * cluster = [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -66896,6 +72640,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationAttributeList : publ } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -66910,6 +72655,7 @@ class ReadThermostatUserInterfaceConfigurationClusterRevision : public ModelComm : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -66932,6 +72678,9 @@ class ReadThermostatUserInterfaceConfigurationClusterRevision : public ModelComm }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision : public ModelCommand { @@ -66942,6 +72691,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision : pu AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -66955,6 +72705,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision : pu CHIPThermostatUserInterfaceConfiguration * cluster = [[CHIPThermostatUserInterfaceConfiguration alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -66976,6 +72727,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision : pu } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -67069,6 +72821,7 @@ class ThreadNetworkDiagnosticsResetCounts : public ModelCommand { ThreadNetworkDiagnosticsResetCounts() : ModelCommand("reset-counts") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -67081,6 +72834,9 @@ class ThreadNetworkDiagnosticsResetCounts : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPThreadNetworkDiagnosticsClusterResetCountsParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster resetCountsWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -67090,6 +72846,7 @@ class ThreadNetworkDiagnosticsResetCounts : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -67101,6 +72858,7 @@ class ReadThreadNetworkDiagnosticsChannel : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "channel"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -67124,6 +72882,9 @@ class ReadThreadNetworkDiagnosticsChannel : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsChannel : public ModelCommand { @@ -67134,6 +72895,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsChannel : public ModelCommand { AddArgument("attr-name", "channel"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -67148,6 +72910,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsChannel : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeChannelWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -67168,6 +72931,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsChannel : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -67182,6 +72946,7 @@ class ReadThreadNetworkDiagnosticsRoutingRole : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "routing-role"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -67205,6 +72970,9 @@ class ReadThreadNetworkDiagnosticsRoutingRole : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRoutingRole : public ModelCommand { @@ -67215,6 +72983,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRoutingRole : public ModelComman AddArgument("attr-name", "routing-role"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -67229,6 +72998,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRoutingRole : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRoutingRoleWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -67249,6 +73019,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRoutingRole : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -67263,6 +73034,7 @@ class ReadThreadNetworkDiagnosticsNetworkName : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "network-name"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -67286,6 +73058,9 @@ class ReadThreadNetworkDiagnosticsNetworkName : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsNetworkName : public ModelCommand { @@ -67296,6 +73071,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsNetworkName : public ModelComman AddArgument("attr-name", "network-name"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -67310,6 +73086,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsNetworkName : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNetworkNameWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -67330,6 +73107,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsNetworkName : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -67344,6 +73122,7 @@ class ReadThreadNetworkDiagnosticsPanId : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "pan-id"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -67367,6 +73146,9 @@ class ReadThreadNetworkDiagnosticsPanId : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsPanId : public ModelCommand { @@ -67377,6 +73159,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsPanId : public ModelCommand { AddArgument("attr-name", "pan-id"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -67391,6 +73174,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsPanId : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePanIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -67411,6 +73195,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsPanId : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -67425,6 +73210,7 @@ class ReadThreadNetworkDiagnosticsExtendedPanId : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "extended-pan-id"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -67448,6 +73234,9 @@ class ReadThreadNetworkDiagnosticsExtendedPanId : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsExtendedPanId : public ModelCommand { @@ -67458,6 +73247,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsExtendedPanId : public ModelComm AddArgument("attr-name", "extended-pan-id"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -67472,6 +73262,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsExtendedPanId : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeExtendedPanIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -67493,6 +73284,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsExtendedPanId : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -67507,6 +73299,7 @@ class ReadThreadNetworkDiagnosticsMeshLocalPrefix : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "mesh-local-prefix"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -67530,6 +73323,9 @@ class ReadThreadNetworkDiagnosticsMeshLocalPrefix : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsMeshLocalPrefix : public ModelCommand { @@ -67540,6 +73336,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsMeshLocalPrefix : public ModelCo AddArgument("attr-name", "mesh-local-prefix"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -67554,6 +73351,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsMeshLocalPrefix : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMeshLocalPrefixWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -67575,6 +73373,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsMeshLocalPrefix : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -67589,6 +73388,7 @@ class ReadThreadNetworkDiagnosticsOverrunCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "overrun-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -67612,6 +73412,9 @@ class ReadThreadNetworkDiagnosticsOverrunCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsOverrunCount : public ModelCommand { @@ -67622,6 +73425,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsOverrunCount : public ModelComma AddArgument("attr-name", "overrun-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -67636,6 +73440,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsOverrunCount : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOverrunCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -67657,6 +73462,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsOverrunCount : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -67671,6 +73477,7 @@ class ReadThreadNetworkDiagnosticsNeighborTableList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "neighbor-table-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -67694,6 +73501,9 @@ class ReadThreadNetworkDiagnosticsNeighborTableList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsNeighborTableList : public ModelCommand { @@ -67704,6 +73514,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsNeighborTableList : public Model AddArgument("attr-name", "neighbor-table-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -67718,6 +73529,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsNeighborTableList : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeNeighborTableListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -67739,6 +73551,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsNeighborTableList : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -67753,6 +73566,7 @@ class ReadThreadNetworkDiagnosticsRouteTableList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "route-table-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -67776,6 +73590,9 @@ class ReadThreadNetworkDiagnosticsRouteTableList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRouteTableList : public ModelCommand { @@ -67786,6 +73603,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRouteTableList : public ModelCom AddArgument("attr-name", "route-table-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -67800,6 +73618,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRouteTableList : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRouteTableListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -67821,6 +73640,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRouteTableList : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -67835,6 +73655,7 @@ class ReadThreadNetworkDiagnosticsPartitionId : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "partition-id"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -67858,6 +73679,9 @@ class ReadThreadNetworkDiagnosticsPartitionId : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsPartitionId : public ModelCommand { @@ -67868,6 +73692,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsPartitionId : public ModelComman AddArgument("attr-name", "partition-id"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -67882,6 +73707,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsPartitionId : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePartitionIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -67902,6 +73728,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsPartitionId : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -67916,6 +73743,7 @@ class ReadThreadNetworkDiagnosticsWeighting : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "weighting"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -67939,6 +73767,9 @@ class ReadThreadNetworkDiagnosticsWeighting : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsWeighting : public ModelCommand { @@ -67949,6 +73780,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsWeighting : public ModelCommand AddArgument("attr-name", "weighting"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -67963,6 +73795,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsWeighting : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeWeightingWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -67983,6 +73816,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsWeighting : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -67997,6 +73831,7 @@ class ReadThreadNetworkDiagnosticsDataVersion : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "data-version"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -68020,6 +73855,9 @@ class ReadThreadNetworkDiagnosticsDataVersion : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsDataVersion : public ModelCommand { @@ -68030,6 +73868,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsDataVersion : public ModelComman AddArgument("attr-name", "data-version"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -68044,6 +73883,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsDataVersion : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeDataVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -68064,6 +73904,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsDataVersion : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -68078,6 +73919,7 @@ class ReadThreadNetworkDiagnosticsStableDataVersion : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "stable-data-version"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -68101,6 +73943,9 @@ class ReadThreadNetworkDiagnosticsStableDataVersion : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsStableDataVersion : public ModelCommand { @@ -68111,6 +73956,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsStableDataVersion : public Model AddArgument("attr-name", "stable-data-version"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -68125,6 +73971,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsStableDataVersion : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeStableDataVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -68146,6 +73993,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsStableDataVersion : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -68160,6 +74008,7 @@ class ReadThreadNetworkDiagnosticsLeaderRouterId : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "leader-router-id"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -68183,6 +74032,9 @@ class ReadThreadNetworkDiagnosticsLeaderRouterId : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsLeaderRouterId : public ModelCommand { @@ -68193,6 +74045,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsLeaderRouterId : public ModelCom AddArgument("attr-name", "leader-router-id"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -68207,6 +74060,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsLeaderRouterId : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLeaderRouterIdWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -68228,6 +74082,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsLeaderRouterId : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -68242,6 +74097,7 @@ class ReadThreadNetworkDiagnosticsDetachedRoleCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "detached-role-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -68265,6 +74121,9 @@ class ReadThreadNetworkDiagnosticsDetachedRoleCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsDetachedRoleCount : public ModelCommand { @@ -68275,6 +74134,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsDetachedRoleCount : public Model AddArgument("attr-name", "detached-role-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -68289,6 +74149,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsDetachedRoleCount : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeDetachedRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -68310,6 +74171,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsDetachedRoleCount : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -68324,6 +74186,7 @@ class ReadThreadNetworkDiagnosticsChildRoleCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "child-role-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -68347,6 +74210,9 @@ class ReadThreadNetworkDiagnosticsChildRoleCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsChildRoleCount : public ModelCommand { @@ -68357,6 +74223,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsChildRoleCount : public ModelCom AddArgument("attr-name", "child-role-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -68371,6 +74238,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsChildRoleCount : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeChildRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -68392,6 +74260,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsChildRoleCount : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -68406,6 +74275,7 @@ class ReadThreadNetworkDiagnosticsRouterRoleCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "router-role-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -68429,6 +74299,9 @@ class ReadThreadNetworkDiagnosticsRouterRoleCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRouterRoleCount : public ModelCommand { @@ -68439,6 +74312,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRouterRoleCount : public ModelCo AddArgument("attr-name", "router-role-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -68453,6 +74327,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRouterRoleCount : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRouterRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -68474,6 +74349,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRouterRoleCount : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -68488,6 +74364,7 @@ class ReadThreadNetworkDiagnosticsLeaderRoleCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "leader-role-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -68511,6 +74388,9 @@ class ReadThreadNetworkDiagnosticsLeaderRoleCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsLeaderRoleCount : public ModelCommand { @@ -68521,6 +74401,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsLeaderRoleCount : public ModelCo AddArgument("attr-name", "leader-role-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -68535,6 +74416,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsLeaderRoleCount : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLeaderRoleCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -68556,6 +74438,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsLeaderRoleCount : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -68570,6 +74453,7 @@ class ReadThreadNetworkDiagnosticsAttachAttemptCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attach-attempt-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -68593,6 +74477,9 @@ class ReadThreadNetworkDiagnosticsAttachAttemptCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsAttachAttemptCount : public ModelCommand { @@ -68603,6 +74490,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsAttachAttemptCount : public Mode AddArgument("attr-name", "attach-attempt-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -68617,6 +74505,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsAttachAttemptCount : public Mode endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttachAttemptCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -68638,6 +74527,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsAttachAttemptCount : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -68652,6 +74542,7 @@ class ReadThreadNetworkDiagnosticsPartitionIdChangeCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "partition-id-change-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -68675,6 +74566,9 @@ class ReadThreadNetworkDiagnosticsPartitionIdChangeCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsPartitionIdChangeCount : public ModelCommand { @@ -68685,6 +74579,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsPartitionIdChangeCount : public AddArgument("attr-name", "partition-id-change-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -68699,6 +74594,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsPartitionIdChangeCount : public endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePartitionIdChangeCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -68720,6 +74616,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsPartitionIdChangeCount : public } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -68734,6 +74631,7 @@ class ReadThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount : public Mod : ModelCommand("read") { AddArgument("attr-name", "better-partition-attach-attempt-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -68758,6 +74656,9 @@ class ReadThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount : public Mod }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsBetterPartitionAttachAttemptCount : public ModelCommand { @@ -68768,6 +74669,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsBetterPartitionAttachAttemptCoun AddArgument("attr-name", "better-partition-attach-attempt-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -68782,6 +74684,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsBetterPartitionAttachAttemptCoun endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBetterPartitionAttachAttemptCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -68806,6 +74709,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsBetterPartitionAttachAttemptCoun } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -68820,6 +74724,7 @@ class ReadThreadNetworkDiagnosticsParentChangeCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "parent-change-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -68843,6 +74748,9 @@ class ReadThreadNetworkDiagnosticsParentChangeCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsParentChangeCount : public ModelCommand { @@ -68853,6 +74761,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsParentChangeCount : public Model AddArgument("attr-name", "parent-change-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -68867,6 +74776,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsParentChangeCount : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeParentChangeCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -68888,6 +74798,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsParentChangeCount : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -68902,6 +74813,7 @@ class ReadThreadNetworkDiagnosticsTxTotalCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-total-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -68925,6 +74837,9 @@ class ReadThreadNetworkDiagnosticsTxTotalCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxTotalCount : public ModelCommand { @@ -68935,6 +74850,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxTotalCount : public ModelComma AddArgument("attr-name", "tx-total-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -68949,6 +74865,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxTotalCount : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxTotalCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -68970,6 +74887,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxTotalCount : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -68984,6 +74902,7 @@ class ReadThreadNetworkDiagnosticsTxUnicastCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-unicast-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -69007,6 +74926,9 @@ class ReadThreadNetworkDiagnosticsTxUnicastCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxUnicastCount : public ModelCommand { @@ -69017,6 +74939,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxUnicastCount : public ModelCom AddArgument("attr-name", "tx-unicast-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -69031,6 +74954,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxUnicastCount : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxUnicastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -69052,6 +74976,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxUnicastCount : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -69066,6 +74991,7 @@ class ReadThreadNetworkDiagnosticsTxBroadcastCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-broadcast-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -69089,6 +75015,9 @@ class ReadThreadNetworkDiagnosticsTxBroadcastCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxBroadcastCount : public ModelCommand { @@ -69099,6 +75028,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBroadcastCount : public ModelC AddArgument("attr-name", "tx-broadcast-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -69113,6 +75043,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBroadcastCount : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxBroadcastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -69134,6 +75065,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBroadcastCount : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -69148,6 +75080,7 @@ class ReadThreadNetworkDiagnosticsTxAckRequestedCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-ack-requested-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -69171,6 +75104,9 @@ class ReadThreadNetworkDiagnosticsTxAckRequestedCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxAckRequestedCount : public ModelCommand { @@ -69181,6 +75117,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxAckRequestedCount : public Mod AddArgument("attr-name", "tx-ack-requested-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -69195,6 +75132,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxAckRequestedCount : public Mod endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxAckRequestedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -69216,6 +75154,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxAckRequestedCount : public Mod } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -69230,6 +75169,7 @@ class ReadThreadNetworkDiagnosticsTxAckedCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-acked-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -69253,6 +75193,9 @@ class ReadThreadNetworkDiagnosticsTxAckedCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxAckedCount : public ModelCommand { @@ -69263,6 +75206,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxAckedCount : public ModelComma AddArgument("attr-name", "tx-acked-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -69277,6 +75221,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxAckedCount : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxAckedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -69298,6 +75243,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxAckedCount : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -69312,6 +75258,7 @@ class ReadThreadNetworkDiagnosticsTxNoAckRequestedCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-no-ack-requested-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -69335,6 +75282,9 @@ class ReadThreadNetworkDiagnosticsTxNoAckRequestedCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxNoAckRequestedCount : public ModelCommand { @@ -69345,6 +75295,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxNoAckRequestedCount : public M AddArgument("attr-name", "tx-no-ack-requested-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -69359,6 +75310,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxNoAckRequestedCount : public M endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxNoAckRequestedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -69380,6 +75332,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxNoAckRequestedCount : public M } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -69394,6 +75347,7 @@ class ReadThreadNetworkDiagnosticsTxDataCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-data-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -69417,6 +75371,9 @@ class ReadThreadNetworkDiagnosticsTxDataCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxDataCount : public ModelCommand { @@ -69427,6 +75384,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDataCount : public ModelComman AddArgument("attr-name", "tx-data-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -69441,6 +75399,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDataCount : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxDataCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -69461,6 +75420,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDataCount : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -69475,6 +75435,7 @@ class ReadThreadNetworkDiagnosticsTxDataPollCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-data-poll-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -69498,6 +75459,9 @@ class ReadThreadNetworkDiagnosticsTxDataPollCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxDataPollCount : public ModelCommand { @@ -69508,6 +75472,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDataPollCount : public ModelCo AddArgument("attr-name", "tx-data-poll-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -69522,6 +75487,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDataPollCount : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxDataPollCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -69543,6 +75509,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDataPollCount : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -69557,6 +75524,7 @@ class ReadThreadNetworkDiagnosticsTxBeaconCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-beacon-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -69580,6 +75548,9 @@ class ReadThreadNetworkDiagnosticsTxBeaconCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconCount : public ModelCommand { @@ -69590,6 +75561,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconCount : public ModelComm AddArgument("attr-name", "tx-beacon-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -69604,6 +75576,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconCount : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxBeaconCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -69625,6 +75598,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconCount : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -69639,6 +75613,7 @@ class ReadThreadNetworkDiagnosticsTxBeaconRequestCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-beacon-request-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -69662,6 +75637,9 @@ class ReadThreadNetworkDiagnosticsTxBeaconRequestCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconRequestCount : public ModelCommand { @@ -69672,6 +75650,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconRequestCount : public Mo AddArgument("attr-name", "tx-beacon-request-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -69686,6 +75665,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconRequestCount : public Mo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxBeaconRequestCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -69707,6 +75687,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconRequestCount : public Mo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -69721,6 +75702,7 @@ class ReadThreadNetworkDiagnosticsTxOtherCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-other-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -69744,6 +75726,9 @@ class ReadThreadNetworkDiagnosticsTxOtherCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxOtherCount : public ModelCommand { @@ -69754,6 +75739,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxOtherCount : public ModelComma AddArgument("attr-name", "tx-other-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -69768,6 +75754,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxOtherCount : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxOtherCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -69789,6 +75776,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxOtherCount : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -69803,6 +75791,7 @@ class ReadThreadNetworkDiagnosticsTxRetryCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-retry-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -69826,6 +75815,9 @@ class ReadThreadNetworkDiagnosticsTxRetryCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxRetryCount : public ModelCommand { @@ -69836,6 +75828,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxRetryCount : public ModelComma AddArgument("attr-name", "tx-retry-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -69850,6 +75843,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxRetryCount : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxRetryCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -69871,6 +75865,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxRetryCount : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -69885,6 +75880,7 @@ class ReadThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount : public ModelComm : ModelCommand("read") { AddArgument("attr-name", "tx-direct-max-retry-expiry-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -69909,6 +75905,9 @@ class ReadThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount : public ModelComm }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount : public ModelCommand { @@ -69919,6 +75918,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount : pu AddArgument("attr-name", "tx-direct-max-retry-expiry-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -69933,6 +75933,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount : pu endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxDirectMaxRetryExpiryCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -69956,6 +75957,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount : pu } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -69970,6 +75972,7 @@ class ReadThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount : public ModelCo : ModelCommand("read") { AddArgument("attr-name", "tx-indirect-max-retry-expiry-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -69994,6 +75997,9 @@ class ReadThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount : public ModelCo }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount : public ModelCommand { @@ -70004,6 +76010,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount : AddArgument("attr-name", "tx-indirect-max-retry-expiry-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -70018,6 +76025,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount : endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxIndirectMaxRetryExpiryCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -70042,6 +76050,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount : } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -70056,6 +76065,7 @@ class ReadThreadNetworkDiagnosticsTxErrCcaCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-err-cca-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -70079,6 +76089,9 @@ class ReadThreadNetworkDiagnosticsTxErrCcaCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxErrCcaCount : public ModelCommand { @@ -70089,6 +76102,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrCcaCount : public ModelComm AddArgument("attr-name", "tx-err-cca-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -70103,6 +76117,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrCcaCount : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxErrCcaCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -70124,6 +76139,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrCcaCount : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -70138,6 +76154,7 @@ class ReadThreadNetworkDiagnosticsTxErrAbortCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-err-abort-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -70161,6 +76178,9 @@ class ReadThreadNetworkDiagnosticsTxErrAbortCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxErrAbortCount : public ModelCommand { @@ -70171,6 +76191,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrAbortCount : public ModelCo AddArgument("attr-name", "tx-err-abort-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -70185,6 +76206,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrAbortCount : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxErrAbortCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -70206,6 +76228,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrAbortCount : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -70220,6 +76243,7 @@ class ReadThreadNetworkDiagnosticsTxErrBusyChannelCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "tx-err-busy-channel-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -70243,6 +76267,9 @@ class ReadThreadNetworkDiagnosticsTxErrBusyChannelCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsTxErrBusyChannelCount : public ModelCommand { @@ -70253,6 +76280,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrBusyChannelCount : public M AddArgument("attr-name", "tx-err-busy-channel-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -70267,6 +76295,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrBusyChannelCount : public M endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTxErrBusyChannelCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -70288,6 +76317,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrBusyChannelCount : public M } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -70302,6 +76332,7 @@ class ReadThreadNetworkDiagnosticsRxTotalCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rx-total-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -70325,6 +76356,9 @@ class ReadThreadNetworkDiagnosticsRxTotalCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxTotalCount : public ModelCommand { @@ -70335,6 +76369,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxTotalCount : public ModelComma AddArgument("attr-name", "rx-total-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -70349,6 +76384,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxTotalCount : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxTotalCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -70370,6 +76406,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxTotalCount : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -70384,6 +76421,7 @@ class ReadThreadNetworkDiagnosticsRxUnicastCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rx-unicast-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -70407,6 +76445,9 @@ class ReadThreadNetworkDiagnosticsRxUnicastCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxUnicastCount : public ModelCommand { @@ -70417,6 +76458,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxUnicastCount : public ModelCom AddArgument("attr-name", "rx-unicast-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -70431,6 +76473,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxUnicastCount : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxUnicastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -70452,6 +76495,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxUnicastCount : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -70466,6 +76510,7 @@ class ReadThreadNetworkDiagnosticsRxBroadcastCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rx-broadcast-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -70489,6 +76534,9 @@ class ReadThreadNetworkDiagnosticsRxBroadcastCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxBroadcastCount : public ModelCommand { @@ -70499,6 +76547,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBroadcastCount : public ModelC AddArgument("attr-name", "rx-broadcast-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -70513,6 +76562,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBroadcastCount : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxBroadcastCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -70534,6 +76584,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBroadcastCount : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -70548,6 +76599,7 @@ class ReadThreadNetworkDiagnosticsRxDataCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rx-data-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -70571,6 +76623,9 @@ class ReadThreadNetworkDiagnosticsRxDataCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxDataCount : public ModelCommand { @@ -70581,6 +76636,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDataCount : public ModelComman AddArgument("attr-name", "rx-data-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -70595,6 +76651,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDataCount : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxDataCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -70615,6 +76672,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDataCount : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -70629,6 +76687,7 @@ class ReadThreadNetworkDiagnosticsRxDataPollCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rx-data-poll-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -70652,6 +76711,9 @@ class ReadThreadNetworkDiagnosticsRxDataPollCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxDataPollCount : public ModelCommand { @@ -70662,6 +76724,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDataPollCount : public ModelCo AddArgument("attr-name", "rx-data-poll-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -70676,6 +76739,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDataPollCount : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxDataPollCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -70697,6 +76761,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDataPollCount : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -70711,6 +76776,7 @@ class ReadThreadNetworkDiagnosticsRxBeaconCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rx-beacon-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -70734,6 +76800,9 @@ class ReadThreadNetworkDiagnosticsRxBeaconCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconCount : public ModelCommand { @@ -70744,6 +76813,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconCount : public ModelComm AddArgument("attr-name", "rx-beacon-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -70758,6 +76828,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconCount : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxBeaconCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -70779,6 +76850,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconCount : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -70793,6 +76865,7 @@ class ReadThreadNetworkDiagnosticsRxBeaconRequestCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rx-beacon-request-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -70816,6 +76889,9 @@ class ReadThreadNetworkDiagnosticsRxBeaconRequestCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconRequestCount : public ModelCommand { @@ -70826,6 +76902,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconRequestCount : public Mo AddArgument("attr-name", "rx-beacon-request-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -70840,6 +76917,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconRequestCount : public Mo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxBeaconRequestCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -70861,6 +76939,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconRequestCount : public Mo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -70875,6 +76954,7 @@ class ReadThreadNetworkDiagnosticsRxOtherCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rx-other-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -70898,6 +76978,9 @@ class ReadThreadNetworkDiagnosticsRxOtherCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxOtherCount : public ModelCommand { @@ -70908,6 +76991,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxOtherCount : public ModelComma AddArgument("attr-name", "rx-other-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -70922,6 +77006,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxOtherCount : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxOtherCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -70943,6 +77028,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxOtherCount : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -70957,6 +77043,7 @@ class ReadThreadNetworkDiagnosticsRxAddressFilteredCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rx-address-filtered-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -70980,6 +77067,9 @@ class ReadThreadNetworkDiagnosticsRxAddressFilteredCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxAddressFilteredCount : public ModelCommand { @@ -70990,6 +77080,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxAddressFilteredCount : public AddArgument("attr-name", "rx-address-filtered-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -71004,6 +77095,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxAddressFilteredCount : public endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxAddressFilteredCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -71025,6 +77117,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxAddressFilteredCount : public } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -71039,6 +77132,7 @@ class ReadThreadNetworkDiagnosticsRxDestAddrFilteredCount : public ModelCommand : ModelCommand("read") { AddArgument("attr-name", "rx-dest-addr-filtered-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -71063,6 +77157,9 @@ class ReadThreadNetworkDiagnosticsRxDestAddrFilteredCount : public ModelCommand }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxDestAddrFilteredCount : public ModelCommand { @@ -71073,6 +77170,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDestAddrFilteredCount : public AddArgument("attr-name", "rx-dest-addr-filtered-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -71087,6 +77185,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDestAddrFilteredCount : public endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxDestAddrFilteredCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -71109,6 +77208,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDestAddrFilteredCount : public } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -71123,6 +77223,7 @@ class ReadThreadNetworkDiagnosticsRxDuplicatedCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rx-duplicated-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -71146,6 +77247,9 @@ class ReadThreadNetworkDiagnosticsRxDuplicatedCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxDuplicatedCount : public ModelCommand { @@ -71156,6 +77260,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDuplicatedCount : public Model AddArgument("attr-name", "rx-duplicated-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -71170,6 +77275,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDuplicatedCount : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxDuplicatedCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -71191,6 +77297,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDuplicatedCount : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -71205,6 +77312,7 @@ class ReadThreadNetworkDiagnosticsRxErrNoFrameCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rx-err-no-frame-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -71228,6 +77336,9 @@ class ReadThreadNetworkDiagnosticsRxErrNoFrameCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxErrNoFrameCount : public ModelCommand { @@ -71238,6 +77349,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrNoFrameCount : public Model AddArgument("attr-name", "rx-err-no-frame-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -71252,6 +77364,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrNoFrameCount : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxErrNoFrameCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -71273,6 +77386,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrNoFrameCount : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -71287,6 +77401,7 @@ class ReadThreadNetworkDiagnosticsRxErrUnknownNeighborCount : public ModelComman : ModelCommand("read") { AddArgument("attr-name", "rx-err-unknown-neighbor-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -71311,6 +77426,9 @@ class ReadThreadNetworkDiagnosticsRxErrUnknownNeighborCount : public ModelComman }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxErrUnknownNeighborCount : public ModelCommand { @@ -71321,6 +77439,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrUnknownNeighborCount : publ AddArgument("attr-name", "rx-err-unknown-neighbor-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -71335,6 +77454,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrUnknownNeighborCount : publ endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxErrUnknownNeighborCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -71358,6 +77478,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrUnknownNeighborCount : publ } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -71372,6 +77493,7 @@ class ReadThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount : public ModelCommand : ModelCommand("read") { AddArgument("attr-name", "rx-err-invalid-src-addr-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -71396,6 +77518,9 @@ class ReadThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount : public ModelCommand }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount : public ModelCommand { @@ -71406,6 +77531,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount : publi AddArgument("attr-name", "rx-err-invalid-src-addr-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -71420,6 +77546,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount : publi endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxErrInvalidSrcAddrCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -71442,6 +77569,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount : publi } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -71456,6 +77584,7 @@ class ReadThreadNetworkDiagnosticsRxErrSecCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rx-err-sec-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -71479,6 +77608,9 @@ class ReadThreadNetworkDiagnosticsRxErrSecCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxErrSecCount : public ModelCommand { @@ -71489,6 +77621,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrSecCount : public ModelComm AddArgument("attr-name", "rx-err-sec-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -71503,6 +77636,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrSecCount : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxErrSecCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -71524,6 +77658,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrSecCount : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -71538,6 +77673,7 @@ class ReadThreadNetworkDiagnosticsRxErrFcsCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rx-err-fcs-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -71561,6 +77697,9 @@ class ReadThreadNetworkDiagnosticsRxErrFcsCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxErrFcsCount : public ModelCommand { @@ -71571,6 +77710,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrFcsCount : public ModelComm AddArgument("attr-name", "rx-err-fcs-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -71585,6 +77725,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrFcsCount : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxErrFcsCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -71606,6 +77747,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrFcsCount : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -71620,6 +77762,7 @@ class ReadThreadNetworkDiagnosticsRxErrOtherCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rx-err-other-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -71643,6 +77786,9 @@ class ReadThreadNetworkDiagnosticsRxErrOtherCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsRxErrOtherCount : public ModelCommand { @@ -71653,6 +77799,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrOtherCount : public ModelCo AddArgument("attr-name", "rx-err-other-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -71667,6 +77814,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrOtherCount : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRxErrOtherCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -71688,6 +77836,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrOtherCount : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -71702,6 +77851,7 @@ class ReadThreadNetworkDiagnosticsActiveTimestamp : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "active-timestamp"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -71725,6 +77875,9 @@ class ReadThreadNetworkDiagnosticsActiveTimestamp : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsActiveTimestamp : public ModelCommand { @@ -71735,6 +77888,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsActiveTimestamp : public ModelCo AddArgument("attr-name", "active-timestamp"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -71749,6 +77903,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsActiveTimestamp : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeActiveTimestampWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -71770,6 +77925,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsActiveTimestamp : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -71784,6 +77940,7 @@ class ReadThreadNetworkDiagnosticsPendingTimestamp : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "pending-timestamp"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -71807,6 +77964,9 @@ class ReadThreadNetworkDiagnosticsPendingTimestamp : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsPendingTimestamp : public ModelCommand { @@ -71817,6 +77977,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsPendingTimestamp : public ModelC AddArgument("attr-name", "pending-timestamp"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -71831,6 +77992,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsPendingTimestamp : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePendingTimestampWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -71852,6 +78014,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsPendingTimestamp : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -71866,6 +78029,7 @@ class ReadThreadNetworkDiagnosticsDelay : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "delay"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -71889,6 +78053,9 @@ class ReadThreadNetworkDiagnosticsDelay : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsDelay : public ModelCommand { @@ -71899,6 +78066,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsDelay : public ModelCommand { AddArgument("attr-name", "delay"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -71913,6 +78081,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsDelay : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeDelayWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -71933,6 +78102,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsDelay : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -71947,6 +78117,7 @@ class ReadThreadNetworkDiagnosticsSecurityPolicy : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "security-policy"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -71970,6 +78141,9 @@ class ReadThreadNetworkDiagnosticsSecurityPolicy : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy : public ModelCommand { @@ -71980,6 +78154,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy : public ModelCom AddArgument("attr-name", "security-policy"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -71994,6 +78169,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy : public ModelCom endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSecurityPolicyWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -72015,6 +78191,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -72029,6 +78206,7 @@ class ReadThreadNetworkDiagnosticsChannelMask : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "channel-mask"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -72052,6 +78230,9 @@ class ReadThreadNetworkDiagnosticsChannelMask : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsChannelMask : public ModelCommand { @@ -72062,6 +78243,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsChannelMask : public ModelComman AddArgument("attr-name", "channel-mask"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -72076,6 +78258,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsChannelMask : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeChannelMaskWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -72096,6 +78279,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsChannelMask : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -72110,6 +78294,7 @@ class ReadThreadNetworkDiagnosticsOperationalDatasetComponents : public ModelCom : ModelCommand("read") { AddArgument("attr-name", "operational-dataset-components"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -72134,6 +78319,9 @@ class ReadThreadNetworkDiagnosticsOperationalDatasetComponents : public ModelCom }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents : public ModelCommand { @@ -72144,6 +78332,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents : p AddArgument("attr-name", "operational-dataset-components"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -72158,6 +78347,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents : p endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOperationalDatasetComponentsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -72181,6 +78371,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents : p } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -72195,6 +78386,7 @@ class ReadThreadNetworkDiagnosticsActiveNetworkFaultsList : public ModelCommand : ModelCommand("read") { AddArgument("attr-name", "active-network-faults-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -72218,6 +78410,9 @@ class ReadThreadNetworkDiagnosticsActiveNetworkFaultsList : public ModelCommand }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsActiveNetworkFaultsList : public ModelCommand { @@ -72228,6 +78423,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsActiveNetworkFaultsList : public AddArgument("attr-name", "active-network-faults-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -72242,6 +78438,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsActiveNetworkFaultsList : public endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeActiveNetworkFaultsListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -72264,6 +78461,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsActiveNetworkFaultsList : public } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -72278,6 +78476,7 @@ class ReadThreadNetworkDiagnosticsGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -72301,6 +78500,9 @@ class ReadThreadNetworkDiagnosticsGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsGeneratedCommandList : public ModelCommand { @@ -72311,6 +78513,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsGeneratedCommandList : public Mo AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -72325,6 +78528,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsGeneratedCommandList : public Mo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -72346,6 +78550,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsGeneratedCommandList : public Mo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -72360,6 +78565,7 @@ class ReadThreadNetworkDiagnosticsAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -72383,6 +78589,9 @@ class ReadThreadNetworkDiagnosticsAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsAcceptedCommandList : public ModelCommand { @@ -72393,6 +78602,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsAcceptedCommandList : public Mod AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -72407,6 +78617,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsAcceptedCommandList : public Mod endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -72428,6 +78639,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsAcceptedCommandList : public Mod } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -72442,6 +78654,7 @@ class ReadThreadNetworkDiagnosticsAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -72465,6 +78678,9 @@ class ReadThreadNetworkDiagnosticsAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsAttributeList : public ModelCommand { @@ -72475,6 +78691,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsAttributeList : public ModelComm AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -72489,6 +78706,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsAttributeList : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -72510,6 +78728,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsAttributeList : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -72524,6 +78743,7 @@ class ReadThreadNetworkDiagnosticsFeatureMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "feature-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -72547,6 +78767,9 @@ class ReadThreadNetworkDiagnosticsFeatureMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsFeatureMap : public ModelCommand { @@ -72557,6 +78780,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsFeatureMap : public ModelCommand AddArgument("attr-name", "feature-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -72571,6 +78795,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsFeatureMap : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -72591,6 +78816,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsFeatureMap : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -72605,6 +78831,7 @@ class ReadThreadNetworkDiagnosticsClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -72628,6 +78855,9 @@ class ReadThreadNetworkDiagnosticsClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeThreadNetworkDiagnosticsClusterRevision : public ModelCommand { @@ -72638,6 +78868,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsClusterRevision : public ModelCo AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -72652,6 +78883,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsClusterRevision : public ModelCo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -72673,6 +78905,7 @@ class SubscribeAttributeThreadNetworkDiagnosticsClusterRevision : public ModelCo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -72705,6 +78938,7 @@ class ReadTimeFormatLocalizationHourFormat : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "hour-format"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -72728,6 +78962,9 @@ class ReadTimeFormatLocalizationHourFormat : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTimeFormatLocalizationHourFormat : public ModelCommand { @@ -72737,6 +78974,7 @@ class WriteTimeFormatLocalizationHourFormat : public ModelCommand { { AddArgument("attr-name", "hour-format"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -72750,11 +78988,14 @@ class WriteTimeFormatLocalizationHourFormat : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeHourFormatWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TimeFormatLocalization HourFormat Error: %s", chip::ErrorStr(chipError)); @@ -72764,6 +79005,7 @@ class WriteTimeFormatLocalizationHourFormat : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -72775,6 +79017,7 @@ class SubscribeAttributeTimeFormatLocalizationHourFormat : public ModelCommand { AddArgument("attr-name", "hour-format"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -72789,6 +79032,7 @@ class SubscribeAttributeTimeFormatLocalizationHourFormat : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeHourFormatWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -72809,6 +79053,7 @@ class SubscribeAttributeTimeFormatLocalizationHourFormat : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -72823,6 +79068,7 @@ class ReadTimeFormatLocalizationActiveCalendarType : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "active-calendar-type"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -72846,6 +79092,9 @@ class ReadTimeFormatLocalizationActiveCalendarType : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteTimeFormatLocalizationActiveCalendarType : public ModelCommand { @@ -72855,6 +79104,7 @@ class WriteTimeFormatLocalizationActiveCalendarType : public ModelCommand { { AddArgument("attr-name", "active-calendar-type"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -72868,10 +79118,13 @@ class WriteTimeFormatLocalizationActiveCalendarType : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeActiveCalendarTypeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "TimeFormatLocalization ActiveCalendarType Error: %s", @@ -72882,6 +79135,7 @@ class WriteTimeFormatLocalizationActiveCalendarType : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -72893,6 +79147,7 @@ class SubscribeAttributeTimeFormatLocalizationActiveCalendarType : public ModelC AddArgument("attr-name", "active-calendar-type"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -72907,6 +79162,7 @@ class SubscribeAttributeTimeFormatLocalizationActiveCalendarType : public ModelC endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeActiveCalendarTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -72928,6 +79184,7 @@ class SubscribeAttributeTimeFormatLocalizationActiveCalendarType : public ModelC } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -72942,6 +79199,7 @@ class ReadTimeFormatLocalizationSupportedCalendarTypes : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "supported-calendar-types"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -72965,6 +79223,9 @@ class ReadTimeFormatLocalizationSupportedCalendarTypes : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTimeFormatLocalizationSupportedCalendarTypes : public ModelCommand { @@ -72975,6 +79236,7 @@ class SubscribeAttributeTimeFormatLocalizationSupportedCalendarTypes : public Mo AddArgument("attr-name", "supported-calendar-types"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -72989,6 +79251,7 @@ class SubscribeAttributeTimeFormatLocalizationSupportedCalendarTypes : public Mo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSupportedCalendarTypesWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -73010,6 +79273,7 @@ class SubscribeAttributeTimeFormatLocalizationSupportedCalendarTypes : public Mo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -73024,6 +79288,7 @@ class ReadTimeFormatLocalizationGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -73047,6 +79312,9 @@ class ReadTimeFormatLocalizationGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTimeFormatLocalizationGeneratedCommandList : public ModelCommand { @@ -73057,6 +79325,7 @@ class SubscribeAttributeTimeFormatLocalizationGeneratedCommandList : public Mode AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -73071,6 +79340,7 @@ class SubscribeAttributeTimeFormatLocalizationGeneratedCommandList : public Mode endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -73092,6 +79362,7 @@ class SubscribeAttributeTimeFormatLocalizationGeneratedCommandList : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -73106,6 +79377,7 @@ class ReadTimeFormatLocalizationAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -73129,6 +79401,9 @@ class ReadTimeFormatLocalizationAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTimeFormatLocalizationAcceptedCommandList : public ModelCommand { @@ -73139,6 +79414,7 @@ class SubscribeAttributeTimeFormatLocalizationAcceptedCommandList : public Model AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -73153,6 +79429,7 @@ class SubscribeAttributeTimeFormatLocalizationAcceptedCommandList : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -73174,6 +79451,7 @@ class SubscribeAttributeTimeFormatLocalizationAcceptedCommandList : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -73188,6 +79466,7 @@ class ReadTimeFormatLocalizationClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -73211,6 +79490,9 @@ class ReadTimeFormatLocalizationClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeTimeFormatLocalizationClusterRevision : public ModelCommand { @@ -73221,6 +79503,7 @@ class SubscribeAttributeTimeFormatLocalizationClusterRevision : public ModelComm AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -73235,6 +79518,7 @@ class SubscribeAttributeTimeFormatLocalizationClusterRevision : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -73256,6 +79540,7 @@ class SubscribeAttributeTimeFormatLocalizationClusterRevision : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -73286,6 +79571,7 @@ class ReadUnitLocalizationTemperatureUnit : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "temperature-unit"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -73309,6 +79595,9 @@ class ReadUnitLocalizationTemperatureUnit : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteUnitLocalizationTemperatureUnit : public ModelCommand { @@ -73318,6 +79607,7 @@ class WriteUnitLocalizationTemperatureUnit : public ModelCommand { { AddArgument("attr-name", "temperature-unit"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -73331,10 +79621,13 @@ class WriteUnitLocalizationTemperatureUnit : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeTemperatureUnitWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError( @@ -73345,6 +79638,7 @@ class WriteUnitLocalizationTemperatureUnit : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -73356,6 +79650,7 @@ class SubscribeAttributeUnitLocalizationTemperatureUnit : public ModelCommand { AddArgument("attr-name", "temperature-unit"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -73370,6 +79665,7 @@ class SubscribeAttributeUnitLocalizationTemperatureUnit : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTemperatureUnitWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -73390,6 +79686,7 @@ class SubscribeAttributeUnitLocalizationTemperatureUnit : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -73404,6 +79701,7 @@ class ReadUnitLocalizationAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -73427,6 +79725,9 @@ class ReadUnitLocalizationAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeUnitLocalizationAttributeList : public ModelCommand { @@ -73437,6 +79738,7 @@ class SubscribeAttributeUnitLocalizationAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -73451,6 +79753,7 @@ class SubscribeAttributeUnitLocalizationAttributeList : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -73471,6 +79774,7 @@ class SubscribeAttributeUnitLocalizationAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -73485,6 +79789,7 @@ class ReadUnitLocalizationFeatureMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "feature-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -73508,6 +79813,9 @@ class ReadUnitLocalizationFeatureMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeUnitLocalizationFeatureMap : public ModelCommand { @@ -73518,6 +79826,7 @@ class SubscribeAttributeUnitLocalizationFeatureMap : public ModelCommand { AddArgument("attr-name", "feature-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -73532,6 +79841,7 @@ class SubscribeAttributeUnitLocalizationFeatureMap : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -73552,6 +79862,7 @@ class SubscribeAttributeUnitLocalizationFeatureMap : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -73566,6 +79877,7 @@ class ReadUnitLocalizationClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -73589,6 +79901,9 @@ class ReadUnitLocalizationClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeUnitLocalizationClusterRevision : public ModelCommand { @@ -73599,6 +79914,7 @@ class SubscribeAttributeUnitLocalizationClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -73613,6 +79929,7 @@ class SubscribeAttributeUnitLocalizationClusterRevision : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -73633,6 +79950,7 @@ class SubscribeAttributeUnitLocalizationClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -73663,6 +79981,7 @@ class ReadUserLabelLabelList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "label-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -73684,6 +80003,9 @@ class ReadUserLabelLabelList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteUserLabelLabelList : public ModelCommand { @@ -73694,6 +80016,7 @@ class WriteUserLabelLabelList : public ModelCommand { { AddArgument("attr-name", "label-list"); AddArgument("attr-value", &mComplex); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -73705,7 +80028,9 @@ class WriteUserLabelLabelList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSArray * _Nonnull value; { // Scope for our temporary variables auto * array_0 = [NSMutableArray new]; @@ -73724,6 +80049,7 @@ class WriteUserLabelLabelList : public ModelCommand { } [cluster writeAttributeLabelListWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "UserLabel LabelList Error: %s", chip::ErrorStr(chipError)); @@ -73733,6 +80059,7 @@ class WriteUserLabelLabelList : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::app::DataModel::List mValue; TypedComplexArgument> mComplex; }; @@ -73745,6 +80072,7 @@ class SubscribeAttributeUserLabelLabelList : public ModelCommand { AddArgument("attr-name", "label-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -73757,6 +80085,7 @@ class SubscribeAttributeUserLabelLabelList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeLabelListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -73777,6 +80106,7 @@ class SubscribeAttributeUserLabelLabelList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -73791,6 +80121,7 @@ class ReadUserLabelGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -73812,6 +80143,9 @@ class ReadUserLabelGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeUserLabelGeneratedCommandList : public ModelCommand { @@ -73822,6 +80156,7 @@ class SubscribeAttributeUserLabelGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -73834,6 +80169,7 @@ class SubscribeAttributeUserLabelGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -73855,6 +80191,7 @@ class SubscribeAttributeUserLabelGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -73869,6 +80206,7 @@ class ReadUserLabelAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -73890,6 +80228,9 @@ class ReadUserLabelAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeUserLabelAcceptedCommandList : public ModelCommand { @@ -73900,6 +80241,7 @@ class SubscribeAttributeUserLabelAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -73912,6 +80254,7 @@ class SubscribeAttributeUserLabelAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -73933,6 +80276,7 @@ class SubscribeAttributeUserLabelAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -73947,6 +80291,7 @@ class ReadUserLabelClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -73968,6 +80313,9 @@ class ReadUserLabelClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeUserLabelClusterRevision : public ModelCommand { @@ -73978,6 +80326,7 @@ class SubscribeAttributeUserLabelClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -73990,6 +80339,7 @@ class SubscribeAttributeUserLabelClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPUserLabel * cluster = [[CHIPUserLabel alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -74010,6 +80360,7 @@ class SubscribeAttributeUserLabelClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -74040,6 +80391,7 @@ class ReadWakeOnLanMACAddress : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "macaddress"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -74061,6 +80413,9 @@ class ReadWakeOnLanMACAddress : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWakeOnLanMACAddress : public ModelCommand { @@ -74071,6 +80426,7 @@ class SubscribeAttributeWakeOnLanMACAddress : public ModelCommand { AddArgument("attr-name", "macaddress"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -74083,6 +80439,7 @@ class SubscribeAttributeWakeOnLanMACAddress : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeMACAddressWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -74103,6 +80460,7 @@ class SubscribeAttributeWakeOnLanMACAddress : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -74117,6 +80475,7 @@ class ReadWakeOnLanGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -74138,6 +80497,9 @@ class ReadWakeOnLanGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWakeOnLanGeneratedCommandList : public ModelCommand { @@ -74148,6 +80510,7 @@ class SubscribeAttributeWakeOnLanGeneratedCommandList : public ModelCommand { AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -74160,6 +80523,7 @@ class SubscribeAttributeWakeOnLanGeneratedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -74181,6 +80545,7 @@ class SubscribeAttributeWakeOnLanGeneratedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -74195,6 +80560,7 @@ class ReadWakeOnLanAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -74216,6 +80582,9 @@ class ReadWakeOnLanAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWakeOnLanAcceptedCommandList : public ModelCommand { @@ -74226,6 +80595,7 @@ class SubscribeAttributeWakeOnLanAcceptedCommandList : public ModelCommand { AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -74238,6 +80608,7 @@ class SubscribeAttributeWakeOnLanAcceptedCommandList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -74259,6 +80630,7 @@ class SubscribeAttributeWakeOnLanAcceptedCommandList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -74273,6 +80645,7 @@ class ReadWakeOnLanAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -74294,6 +80667,9 @@ class ReadWakeOnLanAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWakeOnLanAttributeList : public ModelCommand { @@ -74304,6 +80680,7 @@ class SubscribeAttributeWakeOnLanAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -74316,6 +80693,7 @@ class SubscribeAttributeWakeOnLanAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -74336,6 +80714,7 @@ class SubscribeAttributeWakeOnLanAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -74350,6 +80729,7 @@ class ReadWakeOnLanClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -74371,6 +80751,9 @@ class ReadWakeOnLanClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWakeOnLanClusterRevision : public ModelCommand { @@ -74381,6 +80764,7 @@ class SubscribeAttributeWakeOnLanClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -74393,6 +80777,7 @@ class SubscribeAttributeWakeOnLanClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWakeOnLan * cluster = [[CHIPWakeOnLan alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -74413,6 +80798,7 @@ class SubscribeAttributeWakeOnLanClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -74458,6 +80844,7 @@ class WiFiNetworkDiagnosticsResetCounts : public ModelCommand { WiFiNetworkDiagnosticsResetCounts() : ModelCommand("reset-counts") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -74470,6 +80857,9 @@ class WiFiNetworkDiagnosticsResetCounts : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPWiFiNetworkDiagnosticsClusterResetCountsParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster resetCountsWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -74479,6 +80869,7 @@ class WiFiNetworkDiagnosticsResetCounts : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -74490,6 +80881,7 @@ class ReadWiFiNetworkDiagnosticsBssid : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "bssid"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -74513,6 +80905,9 @@ class ReadWiFiNetworkDiagnosticsBssid : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsBssid : public ModelCommand { @@ -74523,6 +80918,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBssid : public ModelCommand { AddArgument("attr-name", "bssid"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -74537,6 +80933,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBssid : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBssidWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -74557,6 +80954,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBssid : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -74571,6 +80969,7 @@ class ReadWiFiNetworkDiagnosticsSecurityType : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "security-type"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -74594,6 +80993,9 @@ class ReadWiFiNetworkDiagnosticsSecurityType : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsSecurityType : public ModelCommand { @@ -74604,6 +81006,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsSecurityType : public ModelCommand AddArgument("attr-name", "security-type"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -74618,6 +81021,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsSecurityType : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSecurityTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -74638,6 +81042,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsSecurityType : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -74652,6 +81057,7 @@ class ReadWiFiNetworkDiagnosticsWiFiVersion : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "wi-fi-version"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -74675,6 +81081,9 @@ class ReadWiFiNetworkDiagnosticsWiFiVersion : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsWiFiVersion : public ModelCommand { @@ -74685,6 +81094,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsWiFiVersion : public ModelCommand AddArgument("attr-name", "wi-fi-version"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -74699,6 +81109,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsWiFiVersion : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeWiFiVersionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -74719,6 +81130,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsWiFiVersion : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -74733,6 +81145,7 @@ class ReadWiFiNetworkDiagnosticsChannelNumber : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "channel-number"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -74756,6 +81169,9 @@ class ReadWiFiNetworkDiagnosticsChannelNumber : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsChannelNumber : public ModelCommand { @@ -74766,6 +81182,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsChannelNumber : public ModelComman AddArgument("attr-name", "channel-number"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -74780,6 +81197,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsChannelNumber : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeChannelNumberWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -74801,6 +81219,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsChannelNumber : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -74815,6 +81234,7 @@ class ReadWiFiNetworkDiagnosticsRssi : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "rssi"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -74838,6 +81258,9 @@ class ReadWiFiNetworkDiagnosticsRssi : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsRssi : public ModelCommand { @@ -74848,6 +81271,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsRssi : public ModelCommand { AddArgument("attr-name", "rssi"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -74862,6 +81286,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsRssi : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeRssiWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -74882,6 +81307,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsRssi : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -74896,6 +81322,7 @@ class ReadWiFiNetworkDiagnosticsBeaconLostCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "beacon-lost-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -74919,6 +81346,9 @@ class ReadWiFiNetworkDiagnosticsBeaconLostCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsBeaconLostCount : public ModelCommand { @@ -74929,6 +81359,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBeaconLostCount : public ModelComm AddArgument("attr-name", "beacon-lost-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -74943,6 +81374,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBeaconLostCount : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBeaconLostCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -74964,6 +81396,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBeaconLostCount : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -74978,6 +81411,7 @@ class ReadWiFiNetworkDiagnosticsBeaconRxCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "beacon-rx-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -75001,6 +81435,9 @@ class ReadWiFiNetworkDiagnosticsBeaconRxCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsBeaconRxCount : public ModelCommand { @@ -75011,6 +81448,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBeaconRxCount : public ModelComman AddArgument("attr-name", "beacon-rx-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -75025,6 +81463,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBeaconRxCount : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeBeaconRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -75046,6 +81485,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBeaconRxCount : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -75060,6 +81500,7 @@ class ReadWiFiNetworkDiagnosticsPacketMulticastRxCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "packet-multicast-rx-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -75083,6 +81524,9 @@ class ReadWiFiNetworkDiagnosticsPacketMulticastRxCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastRxCount : public ModelCommand { @@ -75093,6 +81537,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastRxCount : public Mo AddArgument("attr-name", "packet-multicast-rx-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -75107,6 +81552,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastRxCount : public Mo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePacketMulticastRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -75128,6 +81574,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastRxCount : public Mo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -75142,6 +81589,7 @@ class ReadWiFiNetworkDiagnosticsPacketMulticastTxCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "packet-multicast-tx-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -75165,6 +81613,9 @@ class ReadWiFiNetworkDiagnosticsPacketMulticastTxCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastTxCount : public ModelCommand { @@ -75175,6 +81626,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastTxCount : public Mo AddArgument("attr-name", "packet-multicast-tx-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -75189,6 +81641,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastTxCount : public Mo endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePacketMulticastTxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -75210,6 +81663,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastTxCount : public Mo } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -75224,6 +81678,7 @@ class ReadWiFiNetworkDiagnosticsPacketUnicastRxCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "packet-unicast-rx-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -75247,6 +81702,9 @@ class ReadWiFiNetworkDiagnosticsPacketUnicastRxCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastRxCount : public ModelCommand { @@ -75257,6 +81715,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastRxCount : public Mode AddArgument("attr-name", "packet-unicast-rx-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -75271,6 +81730,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastRxCount : public Mode endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePacketUnicastRxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -75292,6 +81752,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastRxCount : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -75306,6 +81767,7 @@ class ReadWiFiNetworkDiagnosticsPacketUnicastTxCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "packet-unicast-tx-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -75329,6 +81791,9 @@ class ReadWiFiNetworkDiagnosticsPacketUnicastTxCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastTxCount : public ModelCommand { @@ -75339,6 +81804,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastTxCount : public Mode AddArgument("attr-name", "packet-unicast-tx-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -75353,6 +81819,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastTxCount : public Mode endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributePacketUnicastTxCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -75374,6 +81841,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastTxCount : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -75388,6 +81856,7 @@ class ReadWiFiNetworkDiagnosticsCurrentMaxRate : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-max-rate"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -75411,6 +81880,9 @@ class ReadWiFiNetworkDiagnosticsCurrentMaxRate : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsCurrentMaxRate : public ModelCommand { @@ -75421,6 +81893,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsCurrentMaxRate : public ModelComma AddArgument("attr-name", "current-max-rate"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -75435,6 +81908,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsCurrentMaxRate : public ModelComma endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentMaxRateWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -75456,6 +81930,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsCurrentMaxRate : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -75470,6 +81945,7 @@ class ReadWiFiNetworkDiagnosticsOverrunCount : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "overrun-count"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -75493,6 +81969,9 @@ class ReadWiFiNetworkDiagnosticsOverrunCount : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsOverrunCount : public ModelCommand { @@ -75503,6 +81982,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsOverrunCount : public ModelCommand AddArgument("attr-name", "overrun-count"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -75517,6 +81997,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsOverrunCount : public ModelCommand endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOverrunCountWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -75537,6 +82018,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsOverrunCount : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -75551,6 +82033,7 @@ class ReadWiFiNetworkDiagnosticsGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -75574,6 +82057,9 @@ class ReadWiFiNetworkDiagnosticsGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsGeneratedCommandList : public ModelCommand { @@ -75584,6 +82070,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsGeneratedCommandList : public Mode AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -75598,6 +82085,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsGeneratedCommandList : public Mode endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -75619,6 +82107,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsGeneratedCommandList : public Mode } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -75633,6 +82122,7 @@ class ReadWiFiNetworkDiagnosticsAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -75656,6 +82146,9 @@ class ReadWiFiNetworkDiagnosticsAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsAcceptedCommandList : public ModelCommand { @@ -75666,6 +82159,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsAcceptedCommandList : public Model AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -75680,6 +82174,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsAcceptedCommandList : public Model endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -75701,6 +82196,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsAcceptedCommandList : public Model } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -75715,6 +82211,7 @@ class ReadWiFiNetworkDiagnosticsAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -75738,6 +82235,9 @@ class ReadWiFiNetworkDiagnosticsAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsAttributeList : public ModelCommand { @@ -75748,6 +82248,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsAttributeList : public ModelComman AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -75762,6 +82263,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsAttributeList : public ModelComman endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -75783,6 +82285,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsAttributeList : public ModelComman } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -75797,6 +82300,7 @@ class ReadWiFiNetworkDiagnosticsFeatureMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "feature-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -75820,6 +82324,9 @@ class ReadWiFiNetworkDiagnosticsFeatureMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsFeatureMap : public ModelCommand { @@ -75830,6 +82337,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsFeatureMap : public ModelCommand { AddArgument("attr-name", "feature-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -75844,6 +82352,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsFeatureMap : public ModelCommand { endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -75864,6 +82373,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsFeatureMap : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -75878,6 +82388,7 @@ class ReadWiFiNetworkDiagnosticsClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -75901,6 +82412,9 @@ class ReadWiFiNetworkDiagnosticsClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWiFiNetworkDiagnosticsClusterRevision : public ModelCommand { @@ -75911,6 +82425,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsClusterRevision : public ModelComm AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -75925,6 +82440,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsClusterRevision : public ModelComm endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -75946,6 +82462,7 @@ class SubscribeAttributeWiFiNetworkDiagnosticsClusterRevision : public ModelComm } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -76003,6 +82520,7 @@ class WindowCoveringDownOrClose : public ModelCommand { WindowCoveringDownOrClose() : ModelCommand("down-or-close") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -76013,6 +82531,9 @@ class WindowCoveringDownOrClose : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPWindowCoveringClusterDownOrCloseParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster downOrCloseWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -76022,6 +82543,7 @@ class WindowCoveringDownOrClose : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -76034,6 +82556,7 @@ class WindowCoveringGoToLiftPercentage : public ModelCommand { { AddArgument("LiftPercentageValue", 0, UINT8_MAX, &mLiftPercentageValue); AddArgument("LiftPercent100thsValue", 0, UINT16_MAX, &mLiftPercent100thsValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -76045,9 +82568,9 @@ class WindowCoveringGoToLiftPercentage : public ModelCommand { CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftPercentageParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.liftPercentageValue = [NSNumber numberWithUnsignedChar:mLiftPercentageValue]; - params.liftPercent100thsValue = [NSNumber numberWithUnsignedShort:mLiftPercent100thsValue]; [cluster goToLiftPercentageWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -76059,6 +82582,7 @@ class WindowCoveringGoToLiftPercentage : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::Percent mLiftPercentageValue; chip::Percent100ths mLiftPercent100thsValue; }; @@ -76072,6 +82596,7 @@ class WindowCoveringGoToLiftValue : public ModelCommand { : ModelCommand("go-to-lift-value") { AddArgument("LiftValue", 0, UINT16_MAX, &mLiftValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -76083,7 +82608,8 @@ class WindowCoveringGoToLiftValue : public ModelCommand { CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPWindowCoveringClusterGoToLiftValueParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.liftValue = [NSNumber numberWithUnsignedShort:mLiftValue]; [cluster goToLiftValueWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -76095,6 +82621,7 @@ class WindowCoveringGoToLiftValue : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mLiftValue; }; @@ -76108,6 +82635,7 @@ class WindowCoveringGoToTiltPercentage : public ModelCommand { { AddArgument("TiltPercentageValue", 0, UINT8_MAX, &mTiltPercentageValue); AddArgument("TiltPercent100thsValue", 0, UINT16_MAX, &mTiltPercent100thsValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -76119,9 +82647,9 @@ class WindowCoveringGoToTiltPercentage : public ModelCommand { CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltPercentageParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.tiltPercentageValue = [NSNumber numberWithUnsignedChar:mTiltPercentageValue]; - params.tiltPercent100thsValue = [NSNumber numberWithUnsignedShort:mTiltPercent100thsValue]; [cluster goToTiltPercentageWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -76133,6 +82661,7 @@ class WindowCoveringGoToTiltPercentage : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; chip::Percent mTiltPercentageValue; chip::Percent100ths mTiltPercent100thsValue; }; @@ -76146,6 +82675,7 @@ class WindowCoveringGoToTiltValue : public ModelCommand { : ModelCommand("go-to-tilt-value") { AddArgument("TiltValue", 0, UINT16_MAX, &mTiltValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -76157,7 +82687,8 @@ class WindowCoveringGoToTiltValue : public ModelCommand { CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; __auto_type * params = [[CHIPWindowCoveringClusterGoToTiltValueParams alloc] init]; - + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.tiltValue = [NSNumber numberWithUnsignedShort:mTiltValue]; [cluster goToTiltValueWithParams:params completionHandler:^(NSError * _Nullable error) { @@ -76169,6 +82700,7 @@ class WindowCoveringGoToTiltValue : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint16_t mTiltValue; }; @@ -76180,6 +82712,7 @@ class WindowCoveringStopMotion : public ModelCommand { WindowCoveringStopMotion() : ModelCommand("stop-motion") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -76190,6 +82723,9 @@ class WindowCoveringStopMotion : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPWindowCoveringClusterStopMotionParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster stopMotionWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -76199,6 +82735,7 @@ class WindowCoveringStopMotion : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -76209,6 +82746,7 @@ class WindowCoveringUpOrOpen : public ModelCommand { WindowCoveringUpOrOpen() : ModelCommand("up-or-open") { + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -76219,6 +82757,9 @@ class WindowCoveringUpOrOpen : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; + __auto_type * params = [[CHIPWindowCoveringClusterUpOrOpenParams alloc] init]; + params.timedInvokeTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; [cluster upOrOpenWithCompletionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogProgress(chipTool, "Error: %s", chip::ErrorStr(chipError)); @@ -76228,6 +82769,7 @@ class WindowCoveringUpOrOpen : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; }; /* @@ -76239,6 +82781,7 @@ class ReadWindowCoveringType : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "type"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -76260,6 +82803,9 @@ class ReadWindowCoveringType : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringType : public ModelCommand { @@ -76270,6 +82816,7 @@ class SubscribeAttributeWindowCoveringType : public ModelCommand { AddArgument("attr-name", "type"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -76282,6 +82829,7 @@ class SubscribeAttributeWindowCoveringType : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -76302,6 +82850,7 @@ class SubscribeAttributeWindowCoveringType : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -76316,6 +82865,7 @@ class ReadWindowCoveringCurrentPositionLift : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-position-lift"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -76337,6 +82887,9 @@ class ReadWindowCoveringCurrentPositionLift : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringCurrentPositionLift : public ModelCommand { @@ -76347,6 +82900,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionLift : public ModelCommand AddArgument("attr-name", "current-position-lift"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -76359,6 +82913,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionLift : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentPositionLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -76380,6 +82935,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionLift : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -76394,6 +82950,7 @@ class ReadWindowCoveringCurrentPositionTilt : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-position-tilt"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -76415,6 +82972,9 @@ class ReadWindowCoveringCurrentPositionTilt : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringCurrentPositionTilt : public ModelCommand { @@ -76425,6 +82985,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionTilt : public ModelCommand AddArgument("attr-name", "current-position-tilt"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -76437,6 +82998,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionTilt : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentPositionTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -76458,6 +83020,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionTilt : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -76472,6 +83035,7 @@ class ReadWindowCoveringConfigStatus : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "config-status"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -76493,6 +83057,9 @@ class ReadWindowCoveringConfigStatus : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringConfigStatus : public ModelCommand { @@ -76503,6 +83070,7 @@ class SubscribeAttributeWindowCoveringConfigStatus : public ModelCommand { AddArgument("attr-name", "config-status"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -76515,6 +83083,7 @@ class SubscribeAttributeWindowCoveringConfigStatus : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeConfigStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -76535,6 +83104,7 @@ class SubscribeAttributeWindowCoveringConfigStatus : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -76549,6 +83119,7 @@ class ReadWindowCoveringCurrentPositionLiftPercentage : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-position-lift-percentage"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -76571,6 +83142,9 @@ class ReadWindowCoveringCurrentPositionLiftPercentage : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringCurrentPositionLiftPercentage : public ModelCommand { @@ -76581,6 +83155,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionLiftPercentage : public Mod AddArgument("attr-name", "current-position-lift-percentage"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -76593,6 +83168,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionLiftPercentage : public Mod dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentPositionLiftPercentageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -76616,6 +83192,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionLiftPercentage : public Mod } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -76630,6 +83207,7 @@ class ReadWindowCoveringCurrentPositionTiltPercentage : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-position-tilt-percentage"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -76652,6 +83230,9 @@ class ReadWindowCoveringCurrentPositionTiltPercentage : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringCurrentPositionTiltPercentage : public ModelCommand { @@ -76662,6 +83243,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionTiltPercentage : public Mod AddArgument("attr-name", "current-position-tilt-percentage"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -76674,6 +83256,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionTiltPercentage : public Mod dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentPositionTiltPercentageWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -76697,6 +83280,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionTiltPercentage : public Mod } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -76711,6 +83295,7 @@ class ReadWindowCoveringOperationalStatus : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "operational-status"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -76732,6 +83317,9 @@ class ReadWindowCoveringOperationalStatus : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringOperationalStatus : public ModelCommand { @@ -76742,6 +83330,7 @@ class SubscribeAttributeWindowCoveringOperationalStatus : public ModelCommand { AddArgument("attr-name", "operational-status"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -76754,6 +83343,7 @@ class SubscribeAttributeWindowCoveringOperationalStatus : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeOperationalStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -76775,6 +83365,7 @@ class SubscribeAttributeWindowCoveringOperationalStatus : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -76789,6 +83380,7 @@ class ReadWindowCoveringTargetPositionLiftPercent100ths : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "target-position-lift-percent100ths"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -76811,6 +83403,9 @@ class ReadWindowCoveringTargetPositionLiftPercent100ths : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringTargetPositionLiftPercent100ths : public ModelCommand { @@ -76821,6 +83416,7 @@ class SubscribeAttributeWindowCoveringTargetPositionLiftPercent100ths : public M AddArgument("attr-name", "target-position-lift-percent100ths"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -76833,6 +83429,7 @@ class SubscribeAttributeWindowCoveringTargetPositionLiftPercent100ths : public M dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTargetPositionLiftPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -76857,6 +83454,7 @@ class SubscribeAttributeWindowCoveringTargetPositionLiftPercent100ths : public M } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -76871,6 +83469,7 @@ class ReadWindowCoveringTargetPositionTiltPercent100ths : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "target-position-tilt-percent100ths"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -76893,6 +83492,9 @@ class ReadWindowCoveringTargetPositionTiltPercent100ths : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringTargetPositionTiltPercent100ths : public ModelCommand { @@ -76903,6 +83505,7 @@ class SubscribeAttributeWindowCoveringTargetPositionTiltPercent100ths : public M AddArgument("attr-name", "target-position-tilt-percent100ths"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -76915,6 +83518,7 @@ class SubscribeAttributeWindowCoveringTargetPositionTiltPercent100ths : public M dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeTargetPositionTiltPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -76939,6 +83543,7 @@ class SubscribeAttributeWindowCoveringTargetPositionTiltPercent100ths : public M } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -76953,6 +83558,7 @@ class ReadWindowCoveringEndProductType : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "end-product-type"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -76974,6 +83580,9 @@ class ReadWindowCoveringEndProductType : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringEndProductType : public ModelCommand { @@ -76984,6 +83593,7 @@ class SubscribeAttributeWindowCoveringEndProductType : public ModelCommand { AddArgument("attr-name", "end-product-type"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -76996,6 +83606,7 @@ class SubscribeAttributeWindowCoveringEndProductType : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeEndProductTypeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -77016,6 +83627,7 @@ class SubscribeAttributeWindowCoveringEndProductType : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -77030,6 +83642,7 @@ class ReadWindowCoveringCurrentPositionLiftPercent100ths : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-position-lift-percent100ths"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -77052,6 +83665,9 @@ class ReadWindowCoveringCurrentPositionLiftPercent100ths : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringCurrentPositionLiftPercent100ths : public ModelCommand { @@ -77062,6 +83678,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionLiftPercent100ths : public AddArgument("attr-name", "current-position-lift-percent100ths"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -77074,6 +83691,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionLiftPercent100ths : public dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentPositionLiftPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -77098,6 +83716,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionLiftPercent100ths : public } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -77112,6 +83731,7 @@ class ReadWindowCoveringCurrentPositionTiltPercent100ths : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "current-position-tilt-percent100ths"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -77134,6 +83754,9 @@ class ReadWindowCoveringCurrentPositionTiltPercent100ths : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringCurrentPositionTiltPercent100ths : public ModelCommand { @@ -77144,6 +83767,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionTiltPercent100ths : public AddArgument("attr-name", "current-position-tilt-percent100ths"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -77156,6 +83780,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionTiltPercent100ths : public dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeCurrentPositionTiltPercent100thsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -77180,6 +83805,7 @@ class SubscribeAttributeWindowCoveringCurrentPositionTiltPercent100ths : public } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -77194,6 +83820,7 @@ class ReadWindowCoveringInstalledOpenLimitLift : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "installed-open-limit-lift"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -77215,6 +83842,9 @@ class ReadWindowCoveringInstalledOpenLimitLift : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringInstalledOpenLimitLift : public ModelCommand { @@ -77225,6 +83855,7 @@ class SubscribeAttributeWindowCoveringInstalledOpenLimitLift : public ModelComma AddArgument("attr-name", "installed-open-limit-lift"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -77237,6 +83868,7 @@ class SubscribeAttributeWindowCoveringInstalledOpenLimitLift : public ModelComma dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInstalledOpenLimitLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -77258,6 +83890,7 @@ class SubscribeAttributeWindowCoveringInstalledOpenLimitLift : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -77272,6 +83905,7 @@ class ReadWindowCoveringInstalledClosedLimitLift : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "installed-closed-limit-lift"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -77294,6 +83928,9 @@ class ReadWindowCoveringInstalledClosedLimitLift : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringInstalledClosedLimitLift : public ModelCommand { @@ -77304,6 +83941,7 @@ class SubscribeAttributeWindowCoveringInstalledClosedLimitLift : public ModelCom AddArgument("attr-name", "installed-closed-limit-lift"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -77316,6 +83954,7 @@ class SubscribeAttributeWindowCoveringInstalledClosedLimitLift : public ModelCom dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInstalledClosedLimitLiftWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -77338,6 +83977,7 @@ class SubscribeAttributeWindowCoveringInstalledClosedLimitLift : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -77352,6 +83992,7 @@ class ReadWindowCoveringInstalledOpenLimitTilt : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "installed-open-limit-tilt"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -77373,6 +84014,9 @@ class ReadWindowCoveringInstalledOpenLimitTilt : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringInstalledOpenLimitTilt : public ModelCommand { @@ -77383,6 +84027,7 @@ class SubscribeAttributeWindowCoveringInstalledOpenLimitTilt : public ModelComma AddArgument("attr-name", "installed-open-limit-tilt"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -77395,6 +84040,7 @@ class SubscribeAttributeWindowCoveringInstalledOpenLimitTilt : public ModelComma dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInstalledOpenLimitTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -77416,6 +84062,7 @@ class SubscribeAttributeWindowCoveringInstalledOpenLimitTilt : public ModelComma } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -77430,6 +84077,7 @@ class ReadWindowCoveringInstalledClosedLimitTilt : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "installed-closed-limit-tilt"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -77452,6 +84100,9 @@ class ReadWindowCoveringInstalledClosedLimitTilt : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringInstalledClosedLimitTilt : public ModelCommand { @@ -77462,6 +84113,7 @@ class SubscribeAttributeWindowCoveringInstalledClosedLimitTilt : public ModelCom AddArgument("attr-name", "installed-closed-limit-tilt"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -77474,6 +84126,7 @@ class SubscribeAttributeWindowCoveringInstalledClosedLimitTilt : public ModelCom dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeInstalledClosedLimitTiltWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] @@ -77496,6 +84149,7 @@ class SubscribeAttributeWindowCoveringInstalledClosedLimitTilt : public ModelCom } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -77510,6 +84164,7 @@ class ReadWindowCoveringMode : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "mode"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -77531,6 +84186,9 @@ class ReadWindowCoveringMode : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class WriteWindowCoveringMode : public ModelCommand { @@ -77540,6 +84198,7 @@ class WriteWindowCoveringMode : public ModelCommand { { AddArgument("attr-name", "mode"); AddArgument("attr-value", 0, UINT8_MAX, &mValue); + AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs); ModelCommand::AddArguments(); } @@ -77551,10 +84210,13 @@ class WriteWindowCoveringMode : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; - + CHIPWriteParams * params = [[CHIPWriteParams alloc] init]; + params.timedWriteTimeoutMs + = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue]; [cluster writeAttributeModeWithValue:value + params:params completionHandler:^(NSError * _Nullable error) { chipError = [CHIPError errorToCHIPErrorCode:error]; ChipLogError(chipTool, "WindowCovering Mode Error: %s", chip::ErrorStr(chipError)); @@ -77564,6 +84226,7 @@ class WriteWindowCoveringMode : public ModelCommand { } private: + chip::Optional mTimedInteractionTimeoutMs; uint8_t mValue; }; @@ -77575,6 +84238,7 @@ class SubscribeAttributeWindowCoveringMode : public ModelCommand { AddArgument("attr-name", "mode"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -77587,6 +84251,7 @@ class SubscribeAttributeWindowCoveringMode : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeModeWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -77607,6 +84272,7 @@ class SubscribeAttributeWindowCoveringMode : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -77621,6 +84287,7 @@ class ReadWindowCoveringSafetyStatus : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "safety-status"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -77642,6 +84309,9 @@ class ReadWindowCoveringSafetyStatus : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringSafetyStatus : public ModelCommand { @@ -77652,6 +84322,7 @@ class SubscribeAttributeWindowCoveringSafetyStatus : public ModelCommand { AddArgument("attr-name", "safety-status"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -77664,6 +84335,7 @@ class SubscribeAttributeWindowCoveringSafetyStatus : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeSafetyStatusWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -77684,6 +84356,7 @@ class SubscribeAttributeWindowCoveringSafetyStatus : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -77698,6 +84371,7 @@ class ReadWindowCoveringGeneratedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "generated-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -77719,6 +84393,9 @@ class ReadWindowCoveringGeneratedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringGeneratedCommandList : public ModelCommand { @@ -77729,6 +84406,7 @@ class SubscribeAttributeWindowCoveringGeneratedCommandList : public ModelCommand AddArgument("attr-name", "generated-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -77741,6 +84419,7 @@ class SubscribeAttributeWindowCoveringGeneratedCommandList : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeGeneratedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -77762,6 +84441,7 @@ class SubscribeAttributeWindowCoveringGeneratedCommandList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -77776,6 +84456,7 @@ class ReadWindowCoveringAcceptedCommandList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "accepted-command-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -77797,6 +84478,9 @@ class ReadWindowCoveringAcceptedCommandList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringAcceptedCommandList : public ModelCommand { @@ -77807,6 +84491,7 @@ class SubscribeAttributeWindowCoveringAcceptedCommandList : public ModelCommand AddArgument("attr-name", "accepted-command-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -77819,6 +84504,7 @@ class SubscribeAttributeWindowCoveringAcceptedCommandList : public ModelCommand dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAcceptedCommandListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -77840,6 +84526,7 @@ class SubscribeAttributeWindowCoveringAcceptedCommandList : public ModelCommand } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -77854,6 +84541,7 @@ class ReadWindowCoveringAttributeList : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "attribute-list"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -77875,6 +84563,9 @@ class ReadWindowCoveringAttributeList : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringAttributeList : public ModelCommand { @@ -77885,6 +84576,7 @@ class SubscribeAttributeWindowCoveringAttributeList : public ModelCommand { AddArgument("attr-name", "attribute-list"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -77897,6 +84589,7 @@ class SubscribeAttributeWindowCoveringAttributeList : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeAttributeListWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -77917,6 +84610,7 @@ class SubscribeAttributeWindowCoveringAttributeList : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -77931,6 +84625,7 @@ class ReadWindowCoveringFeatureMap : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "feature-map"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -77952,6 +84647,9 @@ class ReadWindowCoveringFeatureMap : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringFeatureMap : public ModelCommand { @@ -77962,6 +84660,7 @@ class SubscribeAttributeWindowCoveringFeatureMap : public ModelCommand { AddArgument("attr-name", "feature-map"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -77974,6 +84673,7 @@ class SubscribeAttributeWindowCoveringFeatureMap : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeFeatureMapWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -77994,6 +84694,7 @@ class SubscribeAttributeWindowCoveringFeatureMap : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait; @@ -78008,6 +84709,7 @@ class ReadWindowCoveringClusterRevision : public ModelCommand { : ModelCommand("read") { AddArgument("attr-name", "cluster-revision"); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); ModelCommand::AddArguments(); } @@ -78029,6 +84731,9 @@ class ReadWindowCoveringClusterRevision : public ModelCommand { }]; return err; } + +private: + chip::Optional mFabricFiltered; }; class SubscribeAttributeWindowCoveringClusterRevision : public ModelCommand { @@ -78039,6 +84744,7 @@ class SubscribeAttributeWindowCoveringClusterRevision : public ModelCommand { AddArgument("attr-name", "cluster-revision"); AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval); AddArgument("max-interval", 0, UINT16_MAX, &mMaxInterval); + AddArgument("fabric-filtered", 0, 1, &mFabricFiltered); AddArgument("wait", 0, 1, &mWait); ModelCommand::AddArguments(); } @@ -78051,6 +84757,7 @@ class SubscribeAttributeWindowCoveringClusterRevision : public ModelCommand { dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPWindowCovering * cluster = [[CHIPWindowCovering alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; + params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; [cluster subscribeAttributeClusterRevisionWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params @@ -78071,6 +84778,7 @@ class SubscribeAttributeWindowCoveringClusterRevision : public ModelCommand { } private: + chip::Optional mFabricFiltered; uint16_t mMinInterval; uint16_t mMaxInterval; bool mWait;