From 10300202c5715d39968b7bf8280123cf6a18f8c4 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Mon, 14 Nov 2022 08:18:46 -0500 Subject: [PATCH] Fix a few issues with subscriptions in darwin-framework-tool. (#23560) 1) When doing a "clustername subscribe attributename", the optional --autoResubscribe argument was ignored (so auto-resubscribe) was always enabled. The change in templates/commands.zapt fixes that. 2) When running YAML tests in darwin-framework-tool, the "fabricFiltered" and "keepSubscriptions" annotations in the YAML were ignoring, defaulting to "true" and "false" respectively. The change in templates/tests/partials/test_cluster.zapt fixes that. --- .../templates/commands.zapt | 3 + .../tests/partials/test_cluster.zapt | 2 + .../zap-generated/cluster/Commands.h | 3261 +++++++++++++++++ .../zap-generated/test/Commands.h | 12 + 4 files changed, 3278 insertions(+) diff --git a/examples/darwin-framework-tool/templates/commands.zapt b/examples/darwin-framework-tool/templates/commands.zapt index aaf3add5046705..be91419dcd835b 100644 --- a/examples/darwin-framework-tool/templates/commands.zapt +++ b/examples/darwin-framework-tool/templates/commands.zapt @@ -225,6 +225,9 @@ public: if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribe{{>attribute}}WithParams:params subscriptionEstablished:^(){ mSubscriptionEstablished=YES; } reportHandler:^({{asObjectiveCClass type parent.name}} * _Nullable value, NSError * _Nullable error) { diff --git a/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt b/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt index 4bcd47c9ac1724..b364cc98f6e2a5 100644 --- a/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt +++ b/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt @@ -155,6 +155,8 @@ class {{filename}}: public TestCommandBridge {{asObjectiveCBasicType type}} {{asLowerCamelCase name}}Argument = {{asTypedLiteral definedValue type}}; {{/chip_tests_item_parameters}} MTRSubscribeParams * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(minIntervalArgument) maxInterval:@(maxIntervalArgument)]; + params.filterByFabric = {{#if fabricFiltered}}true{{else}}false{{/if}}; + params.replaceExistingSubscriptions = {{#if keepSubscriptions}}false{{else}}true{{/if}}; [cluster subscribeAttribute{{asUpperCamelCase attribute}}WithParams:params subscriptionEstablished:^{ VerifyOrReturn(testSendCluster{{parent.filename}}_{{waitForReport.index}}_{{asUpperCamelCase waitForReport.command}}_Fulfilled, SetCommandExitStatus(CHIP_ERROR_INCORRECT_STATE)); diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index 808b78302f6335..847b38554d8c7b 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -315,6 +315,9 @@ class SubscribeAttributeIdentifyIdentifyTime : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeIdentifyTimeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -382,6 +385,9 @@ class SubscribeAttributeIdentifyIdentifyType : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeIdentifyTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -449,6 +455,9 @@ class SubscribeAttributeIdentifyGeneratedCommandList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -516,6 +525,9 @@ class SubscribeAttributeIdentifyAcceptedCommandList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -583,6 +595,9 @@ class SubscribeAttributeIdentifyAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -650,6 +665,9 @@ class SubscribeAttributeIdentifyFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -717,6 +735,9 @@ class SubscribeAttributeIdentifyClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -1103,6 +1124,9 @@ class SubscribeAttributeGroupsNameSupport : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNameSupportWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -1170,6 +1194,9 @@ class SubscribeAttributeGroupsGeneratedCommandList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -1237,6 +1264,9 @@ class SubscribeAttributeGroupsAcceptedCommandList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -1304,6 +1334,9 @@ class SubscribeAttributeGroupsAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -1371,6 +1404,9 @@ class SubscribeAttributeGroupsFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -1438,6 +1474,9 @@ class SubscribeAttributeGroupsClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -2129,6 +2168,9 @@ class SubscribeAttributeScenesSceneCount : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSceneCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -2196,6 +2238,9 @@ class SubscribeAttributeScenesCurrentScene : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentSceneWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -2263,6 +2308,9 @@ class SubscribeAttributeScenesCurrentGroup : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentGroupWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -2330,6 +2378,9 @@ class SubscribeAttributeScenesSceneValid : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSceneValidWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -2397,6 +2448,9 @@ class SubscribeAttributeScenesNameSupport : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNameSupportWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -2464,6 +2518,9 @@ class SubscribeAttributeScenesLastConfiguredBy : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLastConfiguredByWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -2531,6 +2588,9 @@ class SubscribeAttributeScenesGeneratedCommandList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -2598,6 +2658,9 @@ class SubscribeAttributeScenesAcceptedCommandList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -2665,6 +2728,9 @@ class SubscribeAttributeScenesAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -2732,6 +2798,9 @@ class SubscribeAttributeScenesFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -2799,6 +2868,9 @@ class SubscribeAttributeScenesClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -3162,6 +3234,9 @@ class SubscribeAttributeOnOffOnOff : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOnOffWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -3229,6 +3304,9 @@ class SubscribeAttributeOnOffGlobalSceneControl : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGlobalSceneControlWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -3336,6 +3414,9 @@ class SubscribeAttributeOnOffOnTime : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOnTimeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -3443,6 +3524,9 @@ class SubscribeAttributeOnOffOffWaitTime : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOffWaitTimeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -3550,6 +3634,9 @@ class SubscribeAttributeOnOffStartUpOnOff : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeStartUpOnOffWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -3617,6 +3704,9 @@ class SubscribeAttributeOnOffGeneratedCommandList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -3684,6 +3774,9 @@ class SubscribeAttributeOnOffAcceptedCommandList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -3751,6 +3844,9 @@ class SubscribeAttributeOnOffAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -3818,6 +3914,9 @@ class SubscribeAttributeOnOffFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -3885,6 +3984,9 @@ class SubscribeAttributeOnOffClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -3967,6 +4069,9 @@ class SubscribeAttributeOnOffSwitchConfigurationSwitchType : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSwitchTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -4071,6 +4176,9 @@ class SubscribeAttributeOnOffSwitchConfigurationSwitchActions : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSwitchActionsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -4136,6 +4244,9 @@ class SubscribeAttributeOnOffSwitchConfigurationGeneratedCommandList : public Su if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -4201,6 +4312,9 @@ class SubscribeAttributeOnOffSwitchConfigurationAcceptedCommandList : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -4266,6 +4380,9 @@ class SubscribeAttributeOnOffSwitchConfigurationAttributeList : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -4331,6 +4448,9 @@ class SubscribeAttributeOnOffSwitchConfigurationFeatureMap : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -4396,6 +4516,9 @@ class SubscribeAttributeOnOffSwitchConfigurationClusterRevision : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -4983,6 +5106,9 @@ class SubscribeAttributeLevelControlCurrentLevel : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentLevelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -5050,6 +5176,9 @@ class SubscribeAttributeLevelControlRemainingTime : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRemainingTimeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -5117,6 +5246,9 @@ class SubscribeAttributeLevelControlMinLevel : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinLevelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -5184,6 +5316,9 @@ class SubscribeAttributeLevelControlMaxLevel : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxLevelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -5251,6 +5386,9 @@ class SubscribeAttributeLevelControlCurrentFrequency : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentFrequencyWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -5318,6 +5456,9 @@ class SubscribeAttributeLevelControlMinFrequency : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinFrequencyWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -5385,6 +5526,9 @@ class SubscribeAttributeLevelControlMaxFrequency : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxFrequencyWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -5492,6 +5636,9 @@ class SubscribeAttributeLevelControlOptions : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOptionsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -5599,6 +5746,9 @@ class SubscribeAttributeLevelControlOnOffTransitionTime : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOnOffTransitionTimeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -5706,6 +5856,9 @@ class SubscribeAttributeLevelControlOnLevel : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOnLevelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -5813,6 +5966,9 @@ class SubscribeAttributeLevelControlOnTransitionTime : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOnTransitionTimeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -5920,6 +6076,9 @@ class SubscribeAttributeLevelControlOffTransitionTime : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOffTransitionTimeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -6027,6 +6186,9 @@ class SubscribeAttributeLevelControlDefaultMoveRate : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDefaultMoveRateWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -6134,6 +6296,9 @@ class SubscribeAttributeLevelControlStartUpCurrentLevel : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeStartUpCurrentLevelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -6201,6 +6366,9 @@ class SubscribeAttributeLevelControlGeneratedCommandList : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -6268,6 +6436,9 @@ class SubscribeAttributeLevelControlAcceptedCommandList : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -6335,6 +6506,9 @@ class SubscribeAttributeLevelControlAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -6402,6 +6576,9 @@ class SubscribeAttributeLevelControlFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -6469,6 +6646,9 @@ class SubscribeAttributeLevelControlClusterRevision : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -6602,6 +6782,9 @@ class SubscribeAttributeBinaryInputBasicActiveText : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActiveTextWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -6711,6 +6894,9 @@ class SubscribeAttributeBinaryInputBasicDescription : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDescriptionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -6820,6 +7006,9 @@ class SubscribeAttributeBinaryInputBasicInactiveText : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInactiveTextWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -6927,6 +7116,9 @@ class SubscribeAttributeBinaryInputBasicOutOfService : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOutOfServiceWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -6994,6 +7186,9 @@ class SubscribeAttributeBinaryInputBasicPolarity : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePolarityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -7101,6 +7296,9 @@ class SubscribeAttributeBinaryInputBasicPresentValue : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePresentValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -7208,6 +7406,9 @@ class SubscribeAttributeBinaryInputBasicReliability : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeReliabilityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -7275,6 +7476,9 @@ class SubscribeAttributeBinaryInputBasicStatusFlags : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeStatusFlagsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -7342,6 +7546,9 @@ class SubscribeAttributeBinaryInputBasicApplicationType : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeApplicationTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -7409,6 +7616,9 @@ class SubscribeAttributeBinaryInputBasicGeneratedCommandList : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -7476,6 +7686,9 @@ class SubscribeAttributeBinaryInputBasicAcceptedCommandList : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -7543,6 +7756,9 @@ class SubscribeAttributeBinaryInputBasicAttributeList : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -7610,6 +7826,9 @@ class SubscribeAttributeBinaryInputBasicFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -7677,6 +7896,9 @@ class SubscribeAttributeBinaryInputBasicClusterRevision : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -7763,6 +7985,9 @@ class SubscribeAttributeDescriptorDeviceTypeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDeviceTypeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -7830,6 +8055,9 @@ class SubscribeAttributeDescriptorServerList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeServerListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -7897,6 +8125,9 @@ class SubscribeAttributeDescriptorClientList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClientListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -7964,6 +8195,9 @@ class SubscribeAttributeDescriptorPartsList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePartsListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -8031,6 +8265,9 @@ class SubscribeAttributeDescriptorGeneratedCommandList : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -8098,6 +8335,9 @@ class SubscribeAttributeDescriptorAcceptedCommandList : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -8165,6 +8405,9 @@ class SubscribeAttributeDescriptorAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -8232,6 +8475,9 @@ class SubscribeAttributeDescriptorFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -8299,6 +8545,9 @@ class SubscribeAttributeDescriptorClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -8459,6 +8708,9 @@ class SubscribeAttributeBindingBinding : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBindingWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -8526,6 +8778,9 @@ class SubscribeAttributeBindingGeneratedCommandList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -8593,6 +8848,9 @@ class SubscribeAttributeBindingAcceptedCommandList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -8660,6 +8918,9 @@ class SubscribeAttributeBindingAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -8727,6 +8988,9 @@ class SubscribeAttributeBindingFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -8794,6 +9058,9 @@ class SubscribeAttributeBindingClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -8984,6 +9251,9 @@ class SubscribeAttributeAccessControlAcl : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAclWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -9110,6 +9380,9 @@ class SubscribeAttributeAccessControlExtension : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeExtensionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -9177,6 +9450,9 @@ class SubscribeAttributeAccessControlSubjectsPerAccessControlEntry : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSubjectsPerAccessControlEntryWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -9244,6 +9520,9 @@ class SubscribeAttributeAccessControlTargetsPerAccessControlEntry : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTargetsPerAccessControlEntryWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -9311,6 +9590,9 @@ class SubscribeAttributeAccessControlAccessControlEntriesPerFabric : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAccessControlEntriesPerFabricWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -9378,6 +9660,9 @@ class SubscribeAttributeAccessControlGeneratedCommandList : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -9445,6 +9730,9 @@ class SubscribeAttributeAccessControlAcceptedCommandList : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -9512,6 +9800,9 @@ class SubscribeAttributeAccessControlAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -9579,6 +9870,9 @@ class SubscribeAttributeAccessControlFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -9646,6 +9940,9 @@ class SubscribeAttributeAccessControlClusterRevision : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -10379,6 +10676,9 @@ class SubscribeAttributeActionsActionList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActionListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -10446,6 +10746,9 @@ class SubscribeAttributeActionsEndpointLists : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEndpointListsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -10513,6 +10816,9 @@ class SubscribeAttributeActionsSetupURL : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSetupURLWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -10580,6 +10886,9 @@ class SubscribeAttributeActionsGeneratedCommandList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -10647,6 +10956,9 @@ class SubscribeAttributeActionsAcceptedCommandList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -10714,6 +11026,9 @@ class SubscribeAttributeActionsAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -10781,6 +11096,9 @@ class SubscribeAttributeActionsFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -10848,6 +11166,9 @@ class SubscribeAttributeActionsClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -10998,6 +11319,9 @@ class SubscribeAttributeBasicDataModelRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDataModelRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -11065,6 +11389,9 @@ class SubscribeAttributeBasicVendorName : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeVendorNameWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -11132,6 +11459,9 @@ class SubscribeAttributeBasicVendorID : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeVendorIDWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -11199,6 +11529,9 @@ class SubscribeAttributeBasicProductName : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeProductNameWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -11266,6 +11599,9 @@ class SubscribeAttributeBasicProductID : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeProductIDWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -11375,6 +11711,9 @@ class SubscribeAttributeBasicNodeLabel : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNodeLabelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -11484,6 +11823,9 @@ class SubscribeAttributeBasicLocation : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLocationWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -11551,6 +11893,9 @@ class SubscribeAttributeBasicHardwareVersion : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeHardwareVersionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -11618,6 +11963,9 @@ class SubscribeAttributeBasicHardwareVersionString : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeHardwareVersionStringWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -11685,6 +12033,9 @@ class SubscribeAttributeBasicSoftwareVersion : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSoftwareVersionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -11752,6 +12103,9 @@ class SubscribeAttributeBasicSoftwareVersionString : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSoftwareVersionStringWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -11819,6 +12173,9 @@ class SubscribeAttributeBasicManufacturingDate : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeManufacturingDateWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -11886,6 +12243,9 @@ class SubscribeAttributeBasicPartNumber : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePartNumberWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -11953,6 +12313,9 @@ class SubscribeAttributeBasicProductURL : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeProductURLWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -12020,6 +12383,9 @@ class SubscribeAttributeBasicProductLabel : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeProductLabelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -12087,6 +12453,9 @@ class SubscribeAttributeBasicSerialNumber : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSerialNumberWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -12194,6 +12563,9 @@ class SubscribeAttributeBasicLocalConfigDisabled : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLocalConfigDisabledWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -12261,6 +12633,9 @@ class SubscribeAttributeBasicReachable : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeReachableWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -12328,6 +12703,9 @@ class SubscribeAttributeBasicUniqueID : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUniqueIDWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -12396,6 +12774,9 @@ class SubscribeAttributeBasicCapabilityMinima : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCapabilityMinimaWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -12463,6 +12844,9 @@ class SubscribeAttributeBasicGeneratedCommandList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -12530,6 +12914,9 @@ class SubscribeAttributeBasicAcceptedCommandList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -12597,6 +12984,9 @@ class SubscribeAttributeBasicAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -12664,6 +13054,9 @@ class SubscribeAttributeBasicFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -12731,6 +13124,9 @@ class SubscribeAttributeBasicClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -13001,6 +13397,9 @@ class SubscribeAttributeOtaSoftwareUpdateProviderGeneratedCommandList : public S if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -13066,6 +13465,9 @@ class SubscribeAttributeOtaSoftwareUpdateProviderAcceptedCommandList : public Su if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -13131,6 +13533,9 @@ class SubscribeAttributeOtaSoftwareUpdateProviderAttributeList : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -13196,6 +13601,9 @@ class SubscribeAttributeOtaSoftwareUpdateProviderFeatureMap : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -13261,6 +13669,9 @@ class SubscribeAttributeOtaSoftwareUpdateProviderClusterRevision : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -13470,6 +13881,9 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorDefaultOtaProviders : public S if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDefaultOtaProvidersWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -13535,6 +13949,9 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdatePossible : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUpdatePossibleWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -13600,6 +14017,9 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateState : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUpdateStateWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -13665,6 +14085,9 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorUpdateStateProgress : public S if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUpdateStateProgressWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -13730,6 +14153,9 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorGeneratedCommandList : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -13795,6 +14221,9 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorAcceptedCommandList : public S if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -13860,6 +14289,9 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorAttributeList : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -13925,6 +14357,9 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorFeatureMap : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -13990,6 +14425,9 @@ class SubscribeAttributeOtaSoftwareUpdateRequestorClusterRevision : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -14113,6 +14551,9 @@ class SubscribeAttributeLocalizationConfigurationActiveLocale : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActiveLocaleWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -14178,6 +14619,9 @@ class SubscribeAttributeLocalizationConfigurationSupportedLocales : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSupportedLocalesWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -14243,6 +14687,9 @@ class SubscribeAttributeLocalizationConfigurationGeneratedCommandList : public S if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -14308,6 +14755,9 @@ class SubscribeAttributeLocalizationConfigurationAcceptedCommandList : public Su if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -14373,6 +14823,9 @@ class SubscribeAttributeLocalizationConfigurationAttributeList : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -14438,6 +14891,9 @@ class SubscribeAttributeLocalizationConfigurationFeatureMap : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -14503,6 +14959,9 @@ class SubscribeAttributeLocalizationConfigurationClusterRevision : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -14625,6 +15084,9 @@ class SubscribeAttributeTimeFormatLocalizationHourFormat : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeHourFormatWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -14729,6 +15191,9 @@ class SubscribeAttributeTimeFormatLocalizationActiveCalendarType : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActiveCalendarTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -14794,6 +15259,9 @@ class SubscribeAttributeTimeFormatLocalizationSupportedCalendarTypes : public Su if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSupportedCalendarTypesWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -14859,6 +15327,9 @@ class SubscribeAttributeTimeFormatLocalizationGeneratedCommandList : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -14924,6 +15395,9 @@ class SubscribeAttributeTimeFormatLocalizationAcceptedCommandList : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -14989,6 +15463,9 @@ class SubscribeAttributeTimeFormatLocalizationAttributeList : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -15054,6 +15531,9 @@ class SubscribeAttributeTimeFormatLocalizationFeatureMap : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -15119,6 +15599,9 @@ class SubscribeAttributeTimeFormatLocalizationClusterRevision : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -15242,6 +15725,9 @@ class SubscribeAttributeUnitLocalizationTemperatureUnit : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTemperatureUnitWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -15309,6 +15795,9 @@ class SubscribeAttributeUnitLocalizationGeneratedCommandList : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -15376,6 +15865,9 @@ class SubscribeAttributeUnitLocalizationAcceptedCommandList : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -15443,6 +15935,9 @@ class SubscribeAttributeUnitLocalizationAttributeList : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -15510,6 +16005,9 @@ class SubscribeAttributeUnitLocalizationFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -15577,6 +16075,9 @@ class SubscribeAttributeUnitLocalizationClusterRevision : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -15658,6 +16159,9 @@ class SubscribeAttributePowerSourceConfigurationSources : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSourcesWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -15723,6 +16227,9 @@ class SubscribeAttributePowerSourceConfigurationGeneratedCommandList : public Su if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -15788,6 +16295,9 @@ class SubscribeAttributePowerSourceConfigurationAcceptedCommandList : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -15853,6 +16363,9 @@ class SubscribeAttributePowerSourceConfigurationAttributeList : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -15918,6 +16431,9 @@ class SubscribeAttributePowerSourceConfigurationFeatureMap : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -15983,6 +16499,9 @@ class SubscribeAttributePowerSourceConfigurationClusterRevision : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -16096,6 +16615,9 @@ class SubscribeAttributePowerSourceStatus : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeStatusWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -16163,6 +16685,9 @@ class SubscribeAttributePowerSourceOrder : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOrderWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -16230,6 +16755,9 @@ class SubscribeAttributePowerSourceDescription : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDescriptionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -16297,6 +16825,9 @@ class SubscribeAttributePowerSourceWiredAssessedInputVoltage : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWiredAssessedInputVoltageWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -16364,6 +16895,9 @@ class SubscribeAttributePowerSourceWiredAssessedInputFrequency : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWiredAssessedInputFrequencyWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -16431,6 +16965,9 @@ class SubscribeAttributePowerSourceWiredCurrentType : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWiredCurrentTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -16498,6 +17035,9 @@ class SubscribeAttributePowerSourceWiredAssessedCurrent : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWiredAssessedCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -16565,6 +17105,9 @@ class SubscribeAttributePowerSourceWiredNominalVoltage : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWiredNominalVoltageWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -16632,6 +17175,9 @@ class SubscribeAttributePowerSourceWiredMaximumCurrent : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWiredMaximumCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -16699,6 +17245,9 @@ class SubscribeAttributePowerSourceWiredPresent : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWiredPresentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -16766,6 +17315,9 @@ class SubscribeAttributePowerSourceActiveWiredFaults : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActiveWiredFaultsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -16833,6 +17385,9 @@ class SubscribeAttributePowerSourceBatVoltage : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatVoltageWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -16900,6 +17455,9 @@ class SubscribeAttributePowerSourceBatPercentRemaining : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatPercentRemainingWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -16967,6 +17525,9 @@ class SubscribeAttributePowerSourceBatTimeRemaining : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatTimeRemainingWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -17034,6 +17595,9 @@ class SubscribeAttributePowerSourceBatChargeLevel : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatChargeLevelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -17101,6 +17665,9 @@ class SubscribeAttributePowerSourceBatReplacementNeeded : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatReplacementNeededWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -17168,6 +17735,9 @@ class SubscribeAttributePowerSourceBatReplaceability : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatReplaceabilityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -17235,6 +17805,9 @@ class SubscribeAttributePowerSourceBatPresent : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatPresentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -17302,6 +17875,9 @@ class SubscribeAttributePowerSourceActiveBatFaults : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActiveBatFaultsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -17369,6 +17945,9 @@ class SubscribeAttributePowerSourceBatReplacementDescription : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatReplacementDescriptionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -17436,6 +18015,9 @@ class SubscribeAttributePowerSourceBatCommonDesignation : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatCommonDesignationWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -17503,6 +18085,9 @@ class SubscribeAttributePowerSourceBatANSIDesignation : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatANSIDesignationWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -17570,6 +18155,9 @@ class SubscribeAttributePowerSourceBatIECDesignation : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatIECDesignationWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -17637,6 +18225,9 @@ class SubscribeAttributePowerSourceBatApprovedChemistry : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatApprovedChemistryWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -17704,6 +18295,9 @@ class SubscribeAttributePowerSourceBatCapacity : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatCapacityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -17771,6 +18365,9 @@ class SubscribeAttributePowerSourceBatQuantity : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatQuantityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -17838,6 +18435,9 @@ class SubscribeAttributePowerSourceBatChargeState : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatChargeStateWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -17905,6 +18505,9 @@ class SubscribeAttributePowerSourceBatTimeToFullCharge : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatTimeToFullChargeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -17972,6 +18575,9 @@ class SubscribeAttributePowerSourceBatFunctionalWhileCharging : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatFunctionalWhileChargingWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -18039,6 +18645,9 @@ class SubscribeAttributePowerSourceBatChargingCurrent : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBatChargingCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -18106,6 +18715,9 @@ class SubscribeAttributePowerSourceActiveBatChargeFaults : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActiveBatChargeFaultsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -18173,6 +18785,9 @@ class SubscribeAttributePowerSourceGeneratedCommandList : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -18240,6 +18855,9 @@ class SubscribeAttributePowerSourceAcceptedCommandList : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -18307,6 +18925,9 @@ class SubscribeAttributePowerSourceAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -18374,6 +18995,9 @@ class SubscribeAttributePowerSourceFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -18441,6 +19065,9 @@ class SubscribeAttributePowerSourceClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -18722,6 +19349,9 @@ class SubscribeAttributeGeneralCommissioningBreadcrumb : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBreadcrumbWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -18790,6 +19420,9 @@ class SubscribeAttributeGeneralCommissioningBasicCommissioningInfo : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBasicCommissioningInfoWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -18857,6 +19490,9 @@ class SubscribeAttributeGeneralCommissioningRegulatoryConfig : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRegulatoryConfigWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -18924,6 +19560,9 @@ class SubscribeAttributeGeneralCommissioningLocationCapability : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLocationCapabilityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -18991,6 +19630,9 @@ class SubscribeAttributeGeneralCommissioningSupportsConcurrentConnection : publi if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSupportsConcurrentConnectionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -19058,6 +19700,9 @@ class SubscribeAttributeGeneralCommissioningGeneratedCommandList : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -19125,6 +19770,9 @@ class SubscribeAttributeGeneralCommissioningAcceptedCommandList : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -19192,6 +19840,9 @@ class SubscribeAttributeGeneralCommissioningAttributeList : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -19259,6 +19910,9 @@ class SubscribeAttributeGeneralCommissioningFeatureMap : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -19326,6 +19980,9 @@ class SubscribeAttributeGeneralCommissioningClusterRevision : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -19762,6 +20419,9 @@ class SubscribeAttributeNetworkCommissioningMaxNetworks : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxNetworksWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -19829,6 +20489,9 @@ class SubscribeAttributeNetworkCommissioningNetworks : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNetworksWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -19896,6 +20559,9 @@ class SubscribeAttributeNetworkCommissioningScanMaxTimeSeconds : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeScanMaxTimeSecondsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -19963,6 +20629,9 @@ class SubscribeAttributeNetworkCommissioningConnectMaxTimeSeconds : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeConnectMaxTimeSecondsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -20070,6 +20739,9 @@ class SubscribeAttributeNetworkCommissioningInterfaceEnabled : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInterfaceEnabledWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -20137,6 +20809,9 @@ class SubscribeAttributeNetworkCommissioningLastNetworkingStatus : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLastNetworkingStatusWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -20204,6 +20879,9 @@ class SubscribeAttributeNetworkCommissioningLastNetworkID : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLastNetworkIDWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -20271,6 +20949,9 @@ class SubscribeAttributeNetworkCommissioningLastConnectErrorValue : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLastConnectErrorValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -20338,6 +21019,9 @@ class SubscribeAttributeNetworkCommissioningGeneratedCommandList : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -20405,6 +21089,9 @@ class SubscribeAttributeNetworkCommissioningAcceptedCommandList : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -20472,6 +21159,9 @@ class SubscribeAttributeNetworkCommissioningAttributeList : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -20539,6 +21229,9 @@ class SubscribeAttributeNetworkCommissioningFeatureMap : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -20606,6 +21299,9 @@ class SubscribeAttributeNetworkCommissioningClusterRevision : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -20742,6 +21438,9 @@ class SubscribeAttributeDiagnosticLogsGeneratedCommandList : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -20809,6 +21508,9 @@ class SubscribeAttributeDiagnosticLogsAcceptedCommandList : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -20876,6 +21578,9 @@ class SubscribeAttributeDiagnosticLogsAttributeList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -20943,6 +21648,9 @@ class SubscribeAttributeDiagnosticLogsFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -21010,6 +21718,9 @@ class SubscribeAttributeDiagnosticLogsClusterRevision : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -21154,6 +21865,9 @@ class SubscribeAttributeGeneralDiagnosticsNetworkInterfaces : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNetworkInterfacesWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -21221,6 +21935,9 @@ class SubscribeAttributeGeneralDiagnosticsRebootCount : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRebootCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -21288,6 +22005,9 @@ class SubscribeAttributeGeneralDiagnosticsUpTime : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUpTimeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -21355,6 +22075,9 @@ class SubscribeAttributeGeneralDiagnosticsTotalOperationalHours : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTotalOperationalHoursWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -21422,6 +22145,9 @@ class SubscribeAttributeGeneralDiagnosticsBootReasons : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBootReasonsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -21489,6 +22215,9 @@ class SubscribeAttributeGeneralDiagnosticsActiveHardwareFaults : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActiveHardwareFaultsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -21556,6 +22285,9 @@ class SubscribeAttributeGeneralDiagnosticsActiveRadioFaults : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActiveRadioFaultsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -21623,6 +22355,9 @@ class SubscribeAttributeGeneralDiagnosticsActiveNetworkFaults : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActiveNetworkFaultsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -21690,6 +22425,9 @@ class SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTestEventTriggersEnabledWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -21757,6 +22495,9 @@ class SubscribeAttributeGeneralDiagnosticsGeneratedCommandList : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -21824,6 +22565,9 @@ class SubscribeAttributeGeneralDiagnosticsAcceptedCommandList : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -21891,6 +22635,9 @@ class SubscribeAttributeGeneralDiagnosticsAttributeList : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -21958,6 +22705,9 @@ class SubscribeAttributeGeneralDiagnosticsFeatureMap : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -22025,6 +22775,9 @@ class SubscribeAttributeGeneralDiagnosticsClusterRevision : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -22156,6 +22909,9 @@ class SubscribeAttributeSoftwareDiagnosticsThreadMetrics : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeThreadMetricsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -22223,6 +22979,9 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapFree : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentHeapFreeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -22290,6 +23049,9 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapUsed : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentHeapUsedWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -22357,6 +23119,9 @@ class SubscribeAttributeSoftwareDiagnosticsCurrentHeapHighWatermark : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentHeapHighWatermarkWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -22424,6 +23189,9 @@ class SubscribeAttributeSoftwareDiagnosticsGeneratedCommandList : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -22491,6 +23259,9 @@ class SubscribeAttributeSoftwareDiagnosticsAcceptedCommandList : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -22558,6 +23329,9 @@ class SubscribeAttributeSoftwareDiagnosticsAttributeList : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -22625,6 +23399,9 @@ class SubscribeAttributeSoftwareDiagnosticsFeatureMap : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -22692,6 +23469,9 @@ class SubscribeAttributeSoftwareDiagnosticsClusterRevision : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -22880,6 +23660,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsChannel : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeChannelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -22945,6 +23728,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRoutingRole : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRoutingRoleWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23010,6 +23796,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsNetworkName : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNetworkNameWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23075,6 +23864,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsPanId : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePanIdWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23140,6 +23932,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsExtendedPanId : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeExtendedPanIdWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23205,6 +24000,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsMeshLocalPrefix : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeshLocalPrefixWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23270,6 +24068,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsOverrunCount : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOverrunCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23335,6 +24136,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsNeighborTableList : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNeighborTableListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23400,6 +24204,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRouteTableList : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRouteTableListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23465,6 +24272,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsPartitionId : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePartitionIdWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23530,6 +24340,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsWeighting : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWeightingWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23595,6 +24408,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsDataVersion : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDataVersionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23660,6 +24476,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsStableDataVersion : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeStableDataVersionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23725,6 +24544,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsLeaderRouterId : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLeaderRouterIdWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23790,6 +24612,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsDetachedRoleCount : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDetachedRoleCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23855,6 +24680,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsChildRoleCount : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeChildRoleCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23920,6 +24748,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRouterRoleCount : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRouterRoleCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -23985,6 +24816,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsLeaderRoleCount : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLeaderRoleCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -24050,6 +24884,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsAttachAttemptCount : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttachAttemptCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -24115,6 +24952,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsPartitionIdChangeCount : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePartitionIdChangeCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -24181,6 +25021,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsBetterPartitionAttachAttemptCoun if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBetterPartitionAttachAttemptCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -24246,6 +25089,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsParentChangeCount : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeParentChangeCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -24311,6 +25157,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxTotalCount : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxTotalCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -24376,6 +25225,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxUnicastCount : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxUnicastCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -24441,6 +25293,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBroadcastCount : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxBroadcastCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -24506,6 +25361,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxAckRequestedCount : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxAckRequestedCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -24571,6 +25429,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxAckedCount : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxAckedCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -24636,6 +25497,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxNoAckRequestedCount : public S if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxNoAckRequestedCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -24701,6 +25565,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDataCount : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxDataCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -24766,6 +25633,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDataPollCount : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxDataPollCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -24831,6 +25701,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconCount : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxBeaconCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -24896,6 +25769,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxBeaconRequestCount : public Su if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxBeaconRequestCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -24961,6 +25837,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxOtherCount : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxOtherCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -25026,6 +25905,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxRetryCount : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxRetryCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -25091,6 +25973,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxDirectMaxRetryExpiryCount : pu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxDirectMaxRetryExpiryCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -25156,6 +26041,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxIndirectMaxRetryExpiryCount : if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxIndirectMaxRetryExpiryCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -25221,6 +26109,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrCcaCount : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxErrCcaCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -25286,6 +26177,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrAbortCount : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxErrAbortCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -25351,6 +26245,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsTxErrBusyChannelCount : public S if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxErrBusyChannelCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -25416,6 +26313,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxTotalCount : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxTotalCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -25481,6 +26381,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxUnicastCount : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxUnicastCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -25546,6 +26449,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBroadcastCount : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxBroadcastCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -25611,6 +26517,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDataCount : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxDataCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -25676,6 +26585,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDataPollCount : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxDataPollCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -25741,6 +26653,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconCount : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxBeaconCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -25806,6 +26721,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxBeaconRequestCount : public Su if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxBeaconRequestCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -25871,6 +26789,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxOtherCount : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxOtherCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -25936,6 +26857,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxAddressFilteredCount : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxAddressFilteredCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26001,6 +26925,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDestAddrFilteredCount : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxDestAddrFilteredCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26066,6 +26993,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxDuplicatedCount : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxDuplicatedCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26131,6 +27061,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrNoFrameCount : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxErrNoFrameCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26196,6 +27129,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrUnknownNeighborCount : publ if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxErrUnknownNeighborCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26261,6 +27197,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrInvalidSrcAddrCount : publi if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxErrInvalidSrcAddrCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26326,6 +27265,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrSecCount : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxErrSecCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26391,6 +27333,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrFcsCount : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxErrFcsCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26456,6 +27401,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsRxErrOtherCount : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRxErrOtherCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26521,6 +27469,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsActiveTimestamp : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActiveTimestampWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26586,6 +27537,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsPendingTimestamp : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePendingTimestampWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26651,6 +27605,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsDelay : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDelayWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26717,6 +27674,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsSecurityPolicy : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSecurityPolicyWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26782,6 +27742,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsChannelPage0Mask : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeChannelPage0MaskWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26848,6 +27811,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsOperationalDatasetComponents : p if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOperationalDatasetComponentsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26914,6 +27880,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsActiveNetworkFaultsList : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActiveNetworkFaultsListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -26979,6 +27948,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsGeneratedCommandList : public Su if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -27044,6 +28016,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsAcceptedCommandList : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -27109,6 +28084,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsAttributeList : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -27174,6 +28152,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsFeatureMap : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -27239,6 +28220,9 @@ class SubscribeAttributeThreadNetworkDiagnosticsClusterRevision : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -27378,6 +28362,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBssid : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBssidWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -27443,6 +28430,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsSecurityType : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSecurityTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -27508,6 +28498,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsWiFiVersion : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWiFiVersionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -27573,6 +28566,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsChannelNumber : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeChannelNumberWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -27638,6 +28634,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsRssi : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRssiWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -27703,6 +28702,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBeaconLostCount : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBeaconLostCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -27768,6 +28770,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsBeaconRxCount : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBeaconRxCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -27833,6 +28838,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastRxCount : public Su if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePacketMulticastRxCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -27898,6 +28906,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketMulticastTxCount : public Su if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePacketMulticastTxCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -27963,6 +28974,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastRxCount : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePacketUnicastRxCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -28028,6 +29042,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsPacketUnicastTxCount : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePacketUnicastTxCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -28093,6 +29110,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsCurrentMaxRate : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentMaxRateWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -28158,6 +29178,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsOverrunCount : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOverrunCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -28223,6 +29246,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsGeneratedCommandList : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -28288,6 +29314,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsAcceptedCommandList : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -28353,6 +29382,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsAttributeList : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -28418,6 +29450,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsFeatureMap : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -28483,6 +29518,9 @@ class SubscribeAttributeWiFiNetworkDiagnosticsClusterRevision : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -28615,6 +29653,9 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPHYRate : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePHYRateWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -28680,6 +29721,9 @@ class SubscribeAttributeEthernetNetworkDiagnosticsFullDuplex : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFullDuplexWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -28745,6 +29789,9 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPacketRxCount : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePacketRxCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -28810,6 +29857,9 @@ class SubscribeAttributeEthernetNetworkDiagnosticsPacketTxCount : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePacketTxCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -28875,6 +29925,9 @@ class SubscribeAttributeEthernetNetworkDiagnosticsTxErrCount : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTxErrCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -28940,6 +29993,9 @@ class SubscribeAttributeEthernetNetworkDiagnosticsCollisionCount : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCollisionCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -29005,6 +30061,9 @@ class SubscribeAttributeEthernetNetworkDiagnosticsOverrunCount : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOverrunCountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -29070,6 +30129,9 @@ class SubscribeAttributeEthernetNetworkDiagnosticsCarrierDetect : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCarrierDetectWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -29135,6 +30197,9 @@ class SubscribeAttributeEthernetNetworkDiagnosticsTimeSinceReset : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTimeSinceResetWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -29200,6 +30265,9 @@ class SubscribeAttributeEthernetNetworkDiagnosticsGeneratedCommandList : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -29265,6 +30333,9 @@ class SubscribeAttributeEthernetNetworkDiagnosticsAcceptedCommandList : public S if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -29330,6 +30401,9 @@ class SubscribeAttributeEthernetNetworkDiagnosticsAttributeList : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -29395,6 +30469,9 @@ class SubscribeAttributeEthernetNetworkDiagnosticsFeatureMap : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -29460,6 +30537,9 @@ class SubscribeAttributeEthernetNetworkDiagnosticsClusterRevision : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -29561,6 +30641,9 @@ class SubscribeAttributeBridgedDeviceBasicVendorName : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeVendorNameWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -29628,6 +30711,9 @@ class SubscribeAttributeBridgedDeviceBasicVendorID : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeVendorIDWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -29695,6 +30781,9 @@ class SubscribeAttributeBridgedDeviceBasicProductName : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeProductNameWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -29804,6 +30893,9 @@ class SubscribeAttributeBridgedDeviceBasicNodeLabel : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNodeLabelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -29871,6 +30963,9 @@ class SubscribeAttributeBridgedDeviceBasicHardwareVersion : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeHardwareVersionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -29938,6 +31033,9 @@ class SubscribeAttributeBridgedDeviceBasicHardwareVersionString : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeHardwareVersionStringWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -30005,6 +31103,9 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersion : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSoftwareVersionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -30072,6 +31173,9 @@ class SubscribeAttributeBridgedDeviceBasicSoftwareVersionString : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSoftwareVersionStringWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -30139,6 +31243,9 @@ class SubscribeAttributeBridgedDeviceBasicManufacturingDate : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeManufacturingDateWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -30206,6 +31313,9 @@ class SubscribeAttributeBridgedDeviceBasicPartNumber : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePartNumberWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -30273,6 +31383,9 @@ class SubscribeAttributeBridgedDeviceBasicProductURL : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeProductURLWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -30340,6 +31453,9 @@ class SubscribeAttributeBridgedDeviceBasicProductLabel : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeProductLabelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -30407,6 +31523,9 @@ class SubscribeAttributeBridgedDeviceBasicSerialNumber : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSerialNumberWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -30474,6 +31593,9 @@ class SubscribeAttributeBridgedDeviceBasicReachable : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeReachableWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -30541,6 +31663,9 @@ class SubscribeAttributeBridgedDeviceBasicUniqueID : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUniqueIDWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -30608,6 +31733,9 @@ class SubscribeAttributeBridgedDeviceBasicGeneratedCommandList : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -30675,6 +31803,9 @@ class SubscribeAttributeBridgedDeviceBasicAcceptedCommandList : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -30742,6 +31873,9 @@ class SubscribeAttributeBridgedDeviceBasicAttributeList : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -30809,6 +31943,9 @@ class SubscribeAttributeBridgedDeviceBasicFeatureMap : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -30876,6 +32013,9 @@ class SubscribeAttributeBridgedDeviceBasicClusterRevision : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -30968,6 +32108,9 @@ class SubscribeAttributeSwitchNumberOfPositions : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNumberOfPositionsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -31035,6 +32178,9 @@ class SubscribeAttributeSwitchCurrentPosition : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentPositionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -31102,6 +32248,9 @@ class SubscribeAttributeSwitchMultiPressMax : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMultiPressMaxWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -31169,6 +32318,9 @@ class SubscribeAttributeSwitchGeneratedCommandList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -31236,6 +32388,9 @@ class SubscribeAttributeSwitchAcceptedCommandList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -31303,6 +32458,9 @@ class SubscribeAttributeSwitchAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -31370,6 +32528,9 @@ class SubscribeAttributeSwitchFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -31437,6 +32598,9 @@ class SubscribeAttributeSwitchClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -31663,6 +32827,9 @@ class SubscribeAttributeAdministratorCommissioningWindowStatus : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWindowStatusWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -31728,6 +32895,9 @@ class SubscribeAttributeAdministratorCommissioningAdminFabricIndex : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAdminFabricIndexWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -31793,6 +32963,9 @@ class SubscribeAttributeAdministratorCommissioningAdminVendorId : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAdminVendorIdWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -31858,6 +33031,9 @@ class SubscribeAttributeAdministratorCommissioningGeneratedCommandList : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -31923,6 +33099,9 @@ class SubscribeAttributeAdministratorCommissioningAcceptedCommandList : public S if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -31988,6 +33167,9 @@ class SubscribeAttributeAdministratorCommissioningAttributeList : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -32053,6 +33235,9 @@ class SubscribeAttributeAdministratorCommissioningFeatureMap : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -32118,6 +33303,9 @@ class SubscribeAttributeAdministratorCommissioningClusterRevision : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -32618,6 +33806,9 @@ class SubscribeAttributeOperationalCredentialsNOCs : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNOCsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -32688,6 +33879,9 @@ class SubscribeAttributeOperationalCredentialsFabrics : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFabricsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -32753,6 +33947,9 @@ class SubscribeAttributeOperationalCredentialsSupportedFabrics : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSupportedFabricsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -32818,6 +34015,9 @@ class SubscribeAttributeOperationalCredentialsCommissionedFabrics : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCommissionedFabricsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -32883,6 +34083,9 @@ class SubscribeAttributeOperationalCredentialsTrustedRootCertificates : public S if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTrustedRootCertificatesWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -32948,6 +34151,9 @@ class SubscribeAttributeOperationalCredentialsCurrentFabricIndex : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentFabricIndexWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -33013,6 +34219,9 @@ class SubscribeAttributeOperationalCredentialsGeneratedCommandList : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -33078,6 +34287,9 @@ class SubscribeAttributeOperationalCredentialsAcceptedCommandList : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -33143,6 +34355,9 @@ class SubscribeAttributeOperationalCredentialsAttributeList : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -33208,6 +34423,9 @@ class SubscribeAttributeOperationalCredentialsFeatureMap : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -33273,6 +34491,9 @@ class SubscribeAttributeOperationalCredentialsClusterRevision : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -33661,6 +34882,9 @@ class SubscribeAttributeGroupKeyManagementGroupKeyMap : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGroupKeyMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -33733,6 +34957,9 @@ class SubscribeAttributeGroupKeyManagementGroupTable : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGroupTableWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -33800,6 +35027,9 @@ class SubscribeAttributeGroupKeyManagementMaxGroupsPerFabric : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxGroupsPerFabricWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -33867,6 +35097,9 @@ class SubscribeAttributeGroupKeyManagementMaxGroupKeysPerFabric : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxGroupKeysPerFabricWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -33934,6 +35167,9 @@ class SubscribeAttributeGroupKeyManagementGeneratedCommandList : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -34001,6 +35237,9 @@ class SubscribeAttributeGroupKeyManagementAcceptedCommandList : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -34068,6 +35307,9 @@ class SubscribeAttributeGroupKeyManagementAttributeList : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -34135,6 +35377,9 @@ class SubscribeAttributeGroupKeyManagementFeatureMap : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -34202,6 +35447,9 @@ class SubscribeAttributeGroupKeyManagementClusterRevision : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -34285,6 +35533,9 @@ class SubscribeAttributeFixedLabelLabelList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLabelListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -34352,6 +35603,9 @@ class SubscribeAttributeFixedLabelGeneratedCommandList : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -34419,6 +35673,9 @@ class SubscribeAttributeFixedLabelAcceptedCommandList : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -34486,6 +35743,9 @@ class SubscribeAttributeFixedLabelAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -34553,6 +35813,9 @@ class SubscribeAttributeFixedLabelFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -34620,6 +35883,9 @@ class SubscribeAttributeFixedLabelClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -34760,6 +36026,9 @@ class SubscribeAttributeUserLabelLabelList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLabelListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -34827,6 +36096,9 @@ class SubscribeAttributeUserLabelGeneratedCommandList : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -34894,6 +36166,9 @@ class SubscribeAttributeUserLabelAcceptedCommandList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -34961,6 +36236,9 @@ class SubscribeAttributeUserLabelAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -35028,6 +36306,9 @@ class SubscribeAttributeUserLabelFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -35095,6 +36376,9 @@ class SubscribeAttributeUserLabelClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -35179,6 +36463,9 @@ class SubscribeAttributeBooleanStateStateValue : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeStateValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -35246,6 +36533,9 @@ class SubscribeAttributeBooleanStateGeneratedCommandList : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -35313,6 +36603,9 @@ class SubscribeAttributeBooleanStateAcceptedCommandList : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -35380,6 +36673,9 @@ class SubscribeAttributeBooleanStateAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -35447,6 +36743,9 @@ class SubscribeAttributeBooleanStateFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -35514,6 +36813,9 @@ class SubscribeAttributeBooleanStateClusterRevision : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -35649,6 +36951,9 @@ class SubscribeAttributeModeSelectDescription : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDescriptionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -35716,6 +37021,9 @@ class SubscribeAttributeModeSelectStandardNamespace : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeStandardNamespaceWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -35783,6 +37091,9 @@ class SubscribeAttributeModeSelectSupportedModes : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSupportedModesWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -35850,6 +37161,9 @@ class SubscribeAttributeModeSelectCurrentMode : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -35957,6 +37271,9 @@ class SubscribeAttributeModeSelectStartUpMode : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeStartUpModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -36064,6 +37381,9 @@ class SubscribeAttributeModeSelectOnMode : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOnModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -36131,6 +37451,9 @@ class SubscribeAttributeModeSelectGeneratedCommandList : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -36198,6 +37521,9 @@ class SubscribeAttributeModeSelectAcceptedCommandList : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -36265,6 +37591,9 @@ class SubscribeAttributeModeSelectAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -36332,6 +37661,9 @@ class SubscribeAttributeModeSelectFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -36399,6 +37731,9 @@ class SubscribeAttributeModeSelectClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -37501,6 +38836,9 @@ class SubscribeAttributeDoorLockLockState : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLockStateWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -37568,6 +38906,9 @@ class SubscribeAttributeDoorLockLockType : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLockTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -37635,6 +38976,9 @@ class SubscribeAttributeDoorLockActuatorEnabled : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActuatorEnabledWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -37702,6 +39046,9 @@ class SubscribeAttributeDoorLockDoorState : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDoorStateWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -37809,6 +39156,9 @@ class SubscribeAttributeDoorLockDoorOpenEvents : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDoorOpenEventsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -37916,6 +39266,9 @@ class SubscribeAttributeDoorLockDoorClosedEvents : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDoorClosedEventsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -38023,6 +39376,9 @@ class SubscribeAttributeDoorLockOpenPeriod : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOpenPeriodWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -38090,6 +39446,9 @@ class SubscribeAttributeDoorLockNumberOfTotalUsersSupported : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNumberOfTotalUsersSupportedWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -38157,6 +39516,9 @@ class SubscribeAttributeDoorLockNumberOfPINUsersSupported : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNumberOfPINUsersSupportedWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -38224,6 +39586,9 @@ class SubscribeAttributeDoorLockNumberOfRFIDUsersSupported : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNumberOfRFIDUsersSupportedWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -38292,6 +39657,9 @@ class SubscribeAttributeDoorLockNumberOfWeekDaySchedulesSupportedPerUser : publi if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -38360,6 +39728,9 @@ class SubscribeAttributeDoorLockNumberOfYearDaySchedulesSupportedPerUser : publi if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNumberOfYearDaySchedulesSupportedPerUserWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -38428,6 +39799,9 @@ class SubscribeAttributeDoorLockNumberOfHolidaySchedulesSupported : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNumberOfHolidaySchedulesSupportedWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -38495,6 +39869,9 @@ class SubscribeAttributeDoorLockMaxPINCodeLength : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxPINCodeLengthWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -38562,6 +39939,9 @@ class SubscribeAttributeDoorLockMinPINCodeLength : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinPINCodeLengthWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -38629,6 +40009,9 @@ class SubscribeAttributeDoorLockMaxRFIDCodeLength : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxRFIDCodeLengthWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -38696,6 +40079,9 @@ class SubscribeAttributeDoorLockMinRFIDCodeLength : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinRFIDCodeLengthWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -38763,6 +40149,9 @@ class SubscribeAttributeDoorLockCredentialRulesSupport : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCredentialRulesSupportWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -38831,6 +40220,9 @@ class SubscribeAttributeDoorLockNumberOfCredentialsSupportedPerUser : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNumberOfCredentialsSupportedPerUserWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -38940,6 +40332,9 @@ class SubscribeAttributeDoorLockLanguage : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLanguageWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -39047,6 +40442,9 @@ class SubscribeAttributeDoorLockLEDSettings : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLEDSettingsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -39154,6 +40552,9 @@ class SubscribeAttributeDoorLockAutoRelockTime : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAutoRelockTimeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -39261,6 +40662,9 @@ class SubscribeAttributeDoorLockSoundVolume : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSoundVolumeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -39368,6 +40772,9 @@ class SubscribeAttributeDoorLockOperatingMode : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOperatingModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -39435,6 +40842,9 @@ class SubscribeAttributeDoorLockSupportedOperatingModes : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSupportedOperatingModesWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -39502,6 +40912,9 @@ class SubscribeAttributeDoorLockDefaultConfigurationRegister : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDefaultConfigurationRegisterWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -39609,6 +41022,9 @@ class SubscribeAttributeDoorLockEnableLocalProgramming : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEnableLocalProgrammingWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -39716,6 +41132,9 @@ class SubscribeAttributeDoorLockEnableOneTouchLocking : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEnableOneTouchLockingWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -39823,6 +41242,9 @@ class SubscribeAttributeDoorLockEnableInsideStatusLED : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEnableInsideStatusLEDWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -39930,6 +41352,9 @@ class SubscribeAttributeDoorLockEnablePrivacyModeButton : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEnablePrivacyModeButtonWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -40037,6 +41462,9 @@ class SubscribeAttributeDoorLockLocalProgrammingFeatures : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLocalProgrammingFeaturesWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -40144,6 +41572,9 @@ class SubscribeAttributeDoorLockWrongCodeEntryLimit : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWrongCodeEntryLimitWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -40252,6 +41683,9 @@ class SubscribeAttributeDoorLockUserCodeTemporaryDisableTime : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUserCodeTemporaryDisableTimeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -40359,6 +41793,9 @@ class SubscribeAttributeDoorLockSendPINOverTheAir : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSendPINOverTheAirWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -40467,6 +41904,9 @@ class SubscribeAttributeDoorLockRequirePINforRemoteOperation : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRequirePINforRemoteOperationWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -40574,6 +42014,9 @@ class SubscribeAttributeDoorLockExpiringUserTimeout : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeExpiringUserTimeoutWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -40641,6 +42084,9 @@ class SubscribeAttributeDoorLockGeneratedCommandList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -40708,6 +42154,9 @@ class SubscribeAttributeDoorLockAcceptedCommandList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -40775,6 +42224,9 @@ class SubscribeAttributeDoorLockAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -40842,6 +42294,9 @@ class SubscribeAttributeDoorLockFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -40909,6 +42364,9 @@ class SubscribeAttributeDoorLockClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -41333,6 +42791,9 @@ class SubscribeAttributeWindowCoveringType : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -41400,6 +42861,9 @@ class SubscribeAttributeWindowCoveringPhysicalClosedLimitLift : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePhysicalClosedLimitLiftWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -41467,6 +42931,9 @@ class SubscribeAttributeWindowCoveringPhysicalClosedLimitTilt : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePhysicalClosedLimitTiltWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -41534,6 +43001,9 @@ class SubscribeAttributeWindowCoveringCurrentPositionLift : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentPositionLiftWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -41601,6 +43071,9 @@ class SubscribeAttributeWindowCoveringCurrentPositionTilt : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentPositionTiltWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -41668,6 +43141,9 @@ class SubscribeAttributeWindowCoveringNumberOfActuationsLift : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNumberOfActuationsLiftWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -41735,6 +43211,9 @@ class SubscribeAttributeWindowCoveringNumberOfActuationsTilt : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNumberOfActuationsTiltWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -41802,6 +43281,9 @@ class SubscribeAttributeWindowCoveringConfigStatus : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeConfigStatusWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -41869,6 +43351,9 @@ class SubscribeAttributeWindowCoveringCurrentPositionLiftPercentage : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentPositionLiftPercentageWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -41936,6 +43421,9 @@ class SubscribeAttributeWindowCoveringCurrentPositionTiltPercentage : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentPositionTiltPercentageWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -42003,6 +43491,9 @@ class SubscribeAttributeWindowCoveringOperationalStatus : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOperationalStatusWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -42071,6 +43562,9 @@ class SubscribeAttributeWindowCoveringTargetPositionLiftPercent100ths : public S if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTargetPositionLiftPercent100thsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -42139,6 +43633,9 @@ class SubscribeAttributeWindowCoveringTargetPositionTiltPercent100ths : public S if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTargetPositionTiltPercent100thsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -42206,6 +43703,9 @@ class SubscribeAttributeWindowCoveringEndProductType : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEndProductTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -42274,6 +43774,9 @@ class SubscribeAttributeWindowCoveringCurrentPositionLiftPercent100ths : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentPositionLiftPercent100thsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -42342,6 +43845,9 @@ class SubscribeAttributeWindowCoveringCurrentPositionTiltPercent100ths : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentPositionTiltPercent100thsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -42409,6 +43915,9 @@ class SubscribeAttributeWindowCoveringInstalledOpenLimitLift : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInstalledOpenLimitLiftWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -42476,6 +43985,9 @@ class SubscribeAttributeWindowCoveringInstalledClosedLimitLift : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInstalledClosedLimitLiftWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -42543,6 +44055,9 @@ class SubscribeAttributeWindowCoveringInstalledOpenLimitTilt : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInstalledOpenLimitTiltWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -42610,6 +44125,9 @@ class SubscribeAttributeWindowCoveringInstalledClosedLimitTilt : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInstalledClosedLimitTiltWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -42717,6 +44235,9 @@ class SubscribeAttributeWindowCoveringMode : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -42784,6 +44305,9 @@ class SubscribeAttributeWindowCoveringSafetyStatus : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSafetyStatusWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -42851,6 +44375,9 @@ class SubscribeAttributeWindowCoveringGeneratedCommandList : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -42918,6 +44445,9 @@ class SubscribeAttributeWindowCoveringAcceptedCommandList : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -42985,6 +44515,9 @@ class SubscribeAttributeWindowCoveringAttributeList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -43052,6 +44585,9 @@ class SubscribeAttributeWindowCoveringFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -43119,6 +44655,9 @@ class SubscribeAttributeWindowCoveringClusterRevision : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -43302,6 +44841,9 @@ class SubscribeAttributeBarrierControlBarrierMovingState : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBarrierMovingStateWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -43369,6 +44911,9 @@ class SubscribeAttributeBarrierControlBarrierSafetyStatus : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBarrierSafetyStatusWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -43436,6 +44981,9 @@ class SubscribeAttributeBarrierControlBarrierCapabilities : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBarrierCapabilitiesWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -43543,6 +45091,9 @@ class SubscribeAttributeBarrierControlBarrierOpenEvents : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBarrierOpenEventsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -43650,6 +45201,9 @@ class SubscribeAttributeBarrierControlBarrierCloseEvents : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBarrierCloseEventsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -43758,6 +45312,9 @@ class SubscribeAttributeBarrierControlBarrierCommandOpenEvents : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBarrierCommandOpenEventsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -43866,6 +45423,9 @@ class SubscribeAttributeBarrierControlBarrierCommandCloseEvents : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBarrierCommandCloseEventsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -43973,6 +45533,9 @@ class SubscribeAttributeBarrierControlBarrierOpenPeriod : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBarrierOpenPeriodWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -44080,6 +45643,9 @@ class SubscribeAttributeBarrierControlBarrierClosePeriod : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBarrierClosePeriodWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -44147,6 +45713,9 @@ class SubscribeAttributeBarrierControlBarrierPosition : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBarrierPositionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -44214,6 +45783,9 @@ class SubscribeAttributeBarrierControlGeneratedCommandList : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -44281,6 +45853,9 @@ class SubscribeAttributeBarrierControlAcceptedCommandList : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -44348,6 +45923,9 @@ class SubscribeAttributeBarrierControlAttributeList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -44415,6 +45993,9 @@ class SubscribeAttributeBarrierControlFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -44482,6 +46063,9 @@ class SubscribeAttributeBarrierControlClusterRevision : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -44602,6 +46186,9 @@ class SubscribeAttributePumpConfigurationAndControlMaxPressure : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxPressureWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -44667,6 +46254,9 @@ class SubscribeAttributePumpConfigurationAndControlMaxSpeed : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxSpeedWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -44732,6 +46322,9 @@ class SubscribeAttributePumpConfigurationAndControlMaxFlow : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxFlowWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -44797,6 +46390,9 @@ class SubscribeAttributePumpConfigurationAndControlMinConstPressure : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinConstPressureWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -44862,6 +46458,9 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstPressure : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxConstPressureWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -44927,6 +46526,9 @@ class SubscribeAttributePumpConfigurationAndControlMinCompPressure : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinCompPressureWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -44992,6 +46594,9 @@ class SubscribeAttributePumpConfigurationAndControlMaxCompPressure : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxCompPressureWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -45057,6 +46662,9 @@ class SubscribeAttributePumpConfigurationAndControlMinConstSpeed : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinConstSpeedWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -45122,6 +46730,9 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstSpeed : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxConstSpeedWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -45187,6 +46798,9 @@ class SubscribeAttributePumpConfigurationAndControlMinConstFlow : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinConstFlowWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -45252,6 +46866,9 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstFlow : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxConstFlowWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -45317,6 +46934,9 @@ class SubscribeAttributePumpConfigurationAndControlMinConstTemp : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinConstTempWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -45382,6 +47002,9 @@ class SubscribeAttributePumpConfigurationAndControlMaxConstTemp : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxConstTempWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -45447,6 +47070,9 @@ class SubscribeAttributePumpConfigurationAndControlPumpStatus : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePumpStatusWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -45512,6 +47138,9 @@ class SubscribeAttributePumpConfigurationAndControlEffectiveOperationMode : publ if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEffectiveOperationModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -45577,6 +47206,9 @@ class SubscribeAttributePumpConfigurationAndControlEffectiveControlMode : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEffectiveControlModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -45642,6 +47274,9 @@ class SubscribeAttributePumpConfigurationAndControlCapacity : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCapacityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -45707,6 +47342,9 @@ class SubscribeAttributePumpConfigurationAndControlSpeed : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSpeedWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -45812,6 +47450,9 @@ class SubscribeAttributePumpConfigurationAndControlLifetimeRunningHours : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLifetimeRunningHoursWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -45877,6 +47518,9 @@ class SubscribeAttributePumpConfigurationAndControlPower : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePowerWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -45983,6 +47627,9 @@ class SubscribeAttributePumpConfigurationAndControlLifetimeEnergyConsumed : publ if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLifetimeEnergyConsumedWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -46087,6 +47734,9 @@ class SubscribeAttributePumpConfigurationAndControlOperationMode : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOperationModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -46191,6 +47841,9 @@ class SubscribeAttributePumpConfigurationAndControlControlMode : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeControlModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -46256,6 +47909,9 @@ class SubscribeAttributePumpConfigurationAndControlGeneratedCommandList : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -46321,6 +47977,9 @@ class SubscribeAttributePumpConfigurationAndControlAcceptedCommandList : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -46386,6 +48045,9 @@ class SubscribeAttributePumpConfigurationAndControlAttributeList : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -46451,6 +48113,9 @@ class SubscribeAttributePumpConfigurationAndControlFeatureMap : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -46516,6 +48181,9 @@ class SubscribeAttributePumpConfigurationAndControlClusterRevision : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -46867,6 +48535,9 @@ class SubscribeAttributeThermostatLocalTemperature : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLocalTemperatureWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -46934,6 +48605,9 @@ class SubscribeAttributeThermostatOutdoorTemperature : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOutdoorTemperatureWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -47001,6 +48675,9 @@ class SubscribeAttributeThermostatOccupancy : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOccupancyWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -47068,6 +48745,9 @@ class SubscribeAttributeThermostatAbsMinHeatSetpointLimit : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAbsMinHeatSetpointLimitWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -47135,6 +48815,9 @@ class SubscribeAttributeThermostatAbsMaxHeatSetpointLimit : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAbsMaxHeatSetpointLimitWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -47202,6 +48885,9 @@ class SubscribeAttributeThermostatAbsMinCoolSetpointLimit : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAbsMinCoolSetpointLimitWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -47269,6 +48955,9 @@ class SubscribeAttributeThermostatAbsMaxCoolSetpointLimit : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAbsMaxCoolSetpointLimitWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -47336,6 +49025,9 @@ class SubscribeAttributeThermostatPICoolingDemand : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePICoolingDemandWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -47403,6 +49095,9 @@ class SubscribeAttributeThermostatPIHeatingDemand : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePIHeatingDemandWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -47511,6 +49206,9 @@ class SubscribeAttributeThermostatHVACSystemTypeConfiguration : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeHVACSystemTypeConfigurationWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -47619,6 +49317,9 @@ class SubscribeAttributeThermostatLocalTemperatureCalibration : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLocalTemperatureCalibrationWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -47726,6 +49427,9 @@ class SubscribeAttributeThermostatOccupiedCoolingSetpoint : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOccupiedCoolingSetpointWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -47833,6 +49537,9 @@ class SubscribeAttributeThermostatOccupiedHeatingSetpoint : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOccupiedHeatingSetpointWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -47941,6 +49648,9 @@ class SubscribeAttributeThermostatUnoccupiedCoolingSetpoint : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUnoccupiedCoolingSetpointWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -48049,6 +49759,9 @@ class SubscribeAttributeThermostatUnoccupiedHeatingSetpoint : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUnoccupiedHeatingSetpointWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -48156,6 +49869,9 @@ class SubscribeAttributeThermostatMinHeatSetpointLimit : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinHeatSetpointLimitWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -48263,6 +49979,9 @@ class SubscribeAttributeThermostatMaxHeatSetpointLimit : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxHeatSetpointLimitWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -48370,6 +50089,9 @@ class SubscribeAttributeThermostatMinCoolSetpointLimit : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinCoolSetpointLimitWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -48477,6 +50199,9 @@ class SubscribeAttributeThermostatMaxCoolSetpointLimit : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxCoolSetpointLimitWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -48584,6 +50309,9 @@ class SubscribeAttributeThermostatMinSetpointDeadBand : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinSetpointDeadBandWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -48691,6 +50419,9 @@ class SubscribeAttributeThermostatRemoteSensing : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRemoteSensingWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -48799,6 +50530,9 @@ class SubscribeAttributeThermostatControlSequenceOfOperation : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeControlSequenceOfOperationWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -48906,6 +50640,9 @@ class SubscribeAttributeThermostatSystemMode : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSystemModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -48973,6 +50710,9 @@ class SubscribeAttributeThermostatThermostatRunningMode : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeThermostatRunningModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -49040,6 +50780,9 @@ class SubscribeAttributeThermostatStartOfWeek : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeStartOfWeekWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -49107,6 +50850,9 @@ class SubscribeAttributeThermostatNumberOfWeeklyTransitions : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNumberOfWeeklyTransitionsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -49174,6 +50920,9 @@ class SubscribeAttributeThermostatNumberOfDailyTransitions : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNumberOfDailyTransitionsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -49281,6 +51030,9 @@ class SubscribeAttributeThermostatTemperatureSetpointHold : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTemperatureSetpointHoldWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -49391,6 +51143,9 @@ class SubscribeAttributeThermostatTemperatureSetpointHoldDuration : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTemperatureSetpointHoldDurationWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -49502,6 +51257,9 @@ class SubscribeAttributeThermostatThermostatProgrammingOperationMode : public Su if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeThermostatProgrammingOperationModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -49569,6 +51327,9 @@ class SubscribeAttributeThermostatThermostatRunningState : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeThermostatRunningStateWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -49636,6 +51397,9 @@ class SubscribeAttributeThermostatSetpointChangeSource : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSetpointChangeSourceWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -49703,6 +51467,9 @@ class SubscribeAttributeThermostatSetpointChangeAmount : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSetpointChangeAmountWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -49770,6 +51537,9 @@ class SubscribeAttributeThermostatSetpointChangeSourceTimestamp : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSetpointChangeSourceTimestampWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -49877,6 +51647,9 @@ class SubscribeAttributeThermostatOccupiedSetback : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOccupiedSetbackWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -49944,6 +51717,9 @@ class SubscribeAttributeThermostatOccupiedSetbackMin : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOccupiedSetbackMinWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -50011,6 +51787,9 @@ class SubscribeAttributeThermostatOccupiedSetbackMax : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOccupiedSetbackMaxWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -50118,6 +51897,9 @@ class SubscribeAttributeThermostatUnoccupiedSetback : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUnoccupiedSetbackWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -50185,6 +51967,9 @@ class SubscribeAttributeThermostatUnoccupiedSetbackMin : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUnoccupiedSetbackMinWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -50252,6 +52037,9 @@ class SubscribeAttributeThermostatUnoccupiedSetbackMax : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUnoccupiedSetbackMaxWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -50359,6 +52147,9 @@ class SubscribeAttributeThermostatEmergencyHeatDelta : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEmergencyHeatDeltaWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -50466,6 +52257,9 @@ class SubscribeAttributeThermostatACType : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeACTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -50573,6 +52367,9 @@ class SubscribeAttributeThermostatACCapacity : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeACCapacityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -50680,6 +52477,9 @@ class SubscribeAttributeThermostatACRefrigerantType : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeACRefrigerantTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -50787,6 +52587,9 @@ class SubscribeAttributeThermostatACCompressorType : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeACCompressorTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -50894,6 +52697,9 @@ class SubscribeAttributeThermostatACErrorCode : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeACErrorCodeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -51001,6 +52807,9 @@ class SubscribeAttributeThermostatACLouverPosition : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeACLouverPositionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -51068,6 +52877,9 @@ class SubscribeAttributeThermostatACCoilTemperature : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeACCoilTemperatureWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -51175,6 +52987,9 @@ class SubscribeAttributeThermostatACCapacityformat : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeACCapacityformatWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -51242,6 +53057,9 @@ class SubscribeAttributeThermostatGeneratedCommandList : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -51309,6 +53127,9 @@ class SubscribeAttributeThermostatAcceptedCommandList : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -51376,6 +53197,9 @@ class SubscribeAttributeThermostatAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -51443,6 +53267,9 @@ class SubscribeAttributeThermostatFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -51510,6 +53337,9 @@ class SubscribeAttributeThermostatClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -51643,6 +53473,9 @@ class SubscribeAttributeFanControlFanMode : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFanModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -51750,6 +53583,9 @@ class SubscribeAttributeFanControlFanModeSequence : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFanModeSequenceWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -51857,6 +53693,9 @@ class SubscribeAttributeFanControlPercentSetting : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePercentSettingWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -51924,6 +53763,9 @@ class SubscribeAttributeFanControlPercentCurrent : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePercentCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -51991,6 +53833,9 @@ class SubscribeAttributeFanControlSpeedMax : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSpeedMaxWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -52098,6 +53943,9 @@ class SubscribeAttributeFanControlSpeedSetting : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSpeedSettingWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -52165,6 +54013,9 @@ class SubscribeAttributeFanControlSpeedCurrent : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSpeedCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -52232,6 +54083,9 @@ class SubscribeAttributeFanControlRockSupport : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRockSupportWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -52339,6 +54193,9 @@ class SubscribeAttributeFanControlRockSetting : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRockSettingWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -52406,6 +54263,9 @@ class SubscribeAttributeFanControlWindSupport : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWindSupportWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -52513,6 +54373,9 @@ class SubscribeAttributeFanControlWindSetting : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWindSettingWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -52580,6 +54443,9 @@ class SubscribeAttributeFanControlGeneratedCommandList : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -52647,6 +54513,9 @@ class SubscribeAttributeFanControlAcceptedCommandList : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -52714,6 +54583,9 @@ class SubscribeAttributeFanControlAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -52781,6 +54653,9 @@ class SubscribeAttributeFanControlFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -52848,6 +54723,9 @@ class SubscribeAttributeFanControlClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -52978,6 +54856,9 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationTemperatureDisplayMo if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTemperatureDisplayModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -53089,6 +54970,9 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationKeypadLockout : publ if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeKeypadLockoutWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -53201,6 +55085,9 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationScheduleProgrammingV if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeScheduleProgrammingVisibilityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -53270,6 +55157,9 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationGeneratedCommandList if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -53339,6 +55229,9 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationAcceptedCommandList if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -53408,6 +55301,9 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationAttributeList : publ if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -53477,6 +55373,9 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationFeatureMap : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -53546,6 +55445,9 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision : pu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -54717,6 +56619,9 @@ class SubscribeAttributeColorControlCurrentHue : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentHueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -54784,6 +56689,9 @@ class SubscribeAttributeColorControlCurrentSaturation : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentSaturationWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -54851,6 +56759,9 @@ class SubscribeAttributeColorControlRemainingTime : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRemainingTimeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -54918,6 +56829,9 @@ class SubscribeAttributeColorControlCurrentX : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentXWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -54985,6 +56899,9 @@ class SubscribeAttributeColorControlCurrentY : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentYWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -55052,6 +56969,9 @@ class SubscribeAttributeColorControlDriftCompensation : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDriftCompensationWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -55119,6 +57039,9 @@ class SubscribeAttributeColorControlCompensationText : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCompensationTextWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -55186,6 +57109,9 @@ class SubscribeAttributeColorControlColorTemperatureMireds : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorTemperatureMiredsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -55253,6 +57179,9 @@ class SubscribeAttributeColorControlColorMode : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -55360,6 +57289,9 @@ class SubscribeAttributeColorControlOptions : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOptionsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -55427,6 +57359,9 @@ class SubscribeAttributeColorControlNumberOfPrimaries : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNumberOfPrimariesWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -55494,6 +57429,9 @@ class SubscribeAttributeColorControlPrimary1X : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary1XWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -55561,6 +57499,9 @@ class SubscribeAttributeColorControlPrimary1Y : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary1YWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -55628,6 +57569,9 @@ class SubscribeAttributeColorControlPrimary1Intensity : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary1IntensityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -55695,6 +57639,9 @@ class SubscribeAttributeColorControlPrimary2X : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary2XWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -55762,6 +57709,9 @@ class SubscribeAttributeColorControlPrimary2Y : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary2YWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -55829,6 +57779,9 @@ class SubscribeAttributeColorControlPrimary2Intensity : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary2IntensityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -55896,6 +57849,9 @@ class SubscribeAttributeColorControlPrimary3X : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary3XWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -55963,6 +57919,9 @@ class SubscribeAttributeColorControlPrimary3Y : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary3YWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -56030,6 +57989,9 @@ class SubscribeAttributeColorControlPrimary3Intensity : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary3IntensityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -56097,6 +58059,9 @@ class SubscribeAttributeColorControlPrimary4X : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary4XWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -56164,6 +58129,9 @@ class SubscribeAttributeColorControlPrimary4Y : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary4YWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -56231,6 +58199,9 @@ class SubscribeAttributeColorControlPrimary4Intensity : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary4IntensityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -56298,6 +58269,9 @@ class SubscribeAttributeColorControlPrimary5X : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary5XWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -56365,6 +58339,9 @@ class SubscribeAttributeColorControlPrimary5Y : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary5YWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -56432,6 +58409,9 @@ class SubscribeAttributeColorControlPrimary5Intensity : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary5IntensityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -56499,6 +58479,9 @@ class SubscribeAttributeColorControlPrimary6X : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary6XWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -56566,6 +58549,9 @@ class SubscribeAttributeColorControlPrimary6Y : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary6YWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -56633,6 +58619,9 @@ class SubscribeAttributeColorControlPrimary6Intensity : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePrimary6IntensityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -56740,6 +58729,9 @@ class SubscribeAttributeColorControlWhitePointX : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWhitePointXWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -56847,6 +58839,9 @@ class SubscribeAttributeColorControlWhitePointY : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWhitePointYWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -56954,6 +58949,9 @@ class SubscribeAttributeColorControlColorPointRX : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorPointRXWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -57061,6 +59059,9 @@ class SubscribeAttributeColorControlColorPointRY : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorPointRYWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -57168,6 +59169,9 @@ class SubscribeAttributeColorControlColorPointRIntensity : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorPointRIntensityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -57275,6 +59279,9 @@ class SubscribeAttributeColorControlColorPointGX : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorPointGXWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -57382,6 +59389,9 @@ class SubscribeAttributeColorControlColorPointGY : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorPointGYWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -57489,6 +59499,9 @@ class SubscribeAttributeColorControlColorPointGIntensity : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorPointGIntensityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -57596,6 +59609,9 @@ class SubscribeAttributeColorControlColorPointBX : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorPointBXWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -57703,6 +59719,9 @@ class SubscribeAttributeColorControlColorPointBY : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorPointBYWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -57810,6 +59829,9 @@ class SubscribeAttributeColorControlColorPointBIntensity : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorPointBIntensityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -57877,6 +59899,9 @@ class SubscribeAttributeColorControlEnhancedCurrentHue : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEnhancedCurrentHueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -57944,6 +59969,9 @@ class SubscribeAttributeColorControlEnhancedColorMode : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEnhancedColorModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -58011,6 +60039,9 @@ class SubscribeAttributeColorControlColorLoopActive : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorLoopActiveWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -58078,6 +60109,9 @@ class SubscribeAttributeColorControlColorLoopDirection : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorLoopDirectionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -58145,6 +60179,9 @@ class SubscribeAttributeColorControlColorLoopTime : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorLoopTimeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -58212,6 +60249,9 @@ class SubscribeAttributeColorControlColorLoopStartEnhancedHue : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorLoopStartEnhancedHueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -58279,6 +60319,9 @@ class SubscribeAttributeColorControlColorLoopStoredEnhancedHue : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorLoopStoredEnhancedHueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -58346,6 +60389,9 @@ class SubscribeAttributeColorControlColorCapabilities : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorCapabilitiesWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -58413,6 +60459,9 @@ class SubscribeAttributeColorControlColorTempPhysicalMinMireds : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorTempPhysicalMinMiredsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -58480,6 +60529,9 @@ class SubscribeAttributeColorControlColorTempPhysicalMaxMireds : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeColorTempPhysicalMaxMiredsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -58548,6 +60600,9 @@ class SubscribeAttributeColorControlCoupleColorTempToLevelMinMireds : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCoupleColorTempToLevelMinMiredsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -58657,6 +60712,9 @@ class SubscribeAttributeColorControlStartUpColorTemperatureMireds : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeStartUpColorTemperatureMiredsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -58724,6 +60782,9 @@ class SubscribeAttributeColorControlGeneratedCommandList : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -58791,6 +60852,9 @@ class SubscribeAttributeColorControlAcceptedCommandList : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -58858,6 +60922,9 @@ class SubscribeAttributeColorControlAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -58925,6 +60992,9 @@ class SubscribeAttributeColorControlFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -58992,6 +61062,9 @@ class SubscribeAttributeColorControlClusterRevision : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -59088,6 +61161,9 @@ class SubscribeAttributeBallastConfigurationPhysicalMinLevel : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePhysicalMinLevelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -59155,6 +61231,9 @@ class SubscribeAttributeBallastConfigurationPhysicalMaxLevel : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePhysicalMaxLevelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -59222,6 +61301,9 @@ class SubscribeAttributeBallastConfigurationBallastStatus : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBallastStatusWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -59329,6 +61411,9 @@ class SubscribeAttributeBallastConfigurationMinLevel : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinLevelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -59436,6 +61521,9 @@ class SubscribeAttributeBallastConfigurationMaxLevel : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxLevelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -59544,6 +61632,9 @@ class SubscribeAttributeBallastConfigurationIntrinsicBalanceFactor : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeIntrinsicBalanceFactorWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -59652,6 +61743,9 @@ class SubscribeAttributeBallastConfigurationBallastFactorAdjustment : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBallastFactorAdjustmentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -59719,6 +61813,9 @@ class SubscribeAttributeBallastConfigurationLampQuantity : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLampQuantityWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -59828,6 +61925,9 @@ class SubscribeAttributeBallastConfigurationLampType : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLampTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -59937,6 +62037,9 @@ class SubscribeAttributeBallastConfigurationLampManufacturer : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLampManufacturerWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -60044,6 +62147,9 @@ class SubscribeAttributeBallastConfigurationLampRatedHours : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLampRatedHoursWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -60151,6 +62257,9 @@ class SubscribeAttributeBallastConfigurationLampBurnHours : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLampBurnHoursWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -60258,6 +62367,9 @@ class SubscribeAttributeBallastConfigurationLampAlarmMode : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLampAlarmModeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -60366,6 +62478,9 @@ class SubscribeAttributeBallastConfigurationLampBurnHoursTripPoint : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLampBurnHoursTripPointWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -60433,6 +62548,9 @@ class SubscribeAttributeBallastConfigurationGeneratedCommandList : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -60500,6 +62618,9 @@ class SubscribeAttributeBallastConfigurationAcceptedCommandList : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -60567,6 +62688,9 @@ class SubscribeAttributeBallastConfigurationAttributeList : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -60634,6 +62758,9 @@ class SubscribeAttributeBallastConfigurationFeatureMap : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -60701,6 +62828,9 @@ class SubscribeAttributeBallastConfigurationClusterRevision : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -60786,6 +62916,9 @@ class SubscribeAttributeIlluminanceMeasurementMeasuredValue : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasuredValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -60851,6 +62984,9 @@ class SubscribeAttributeIlluminanceMeasurementMinMeasuredValue : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinMeasuredValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -60916,6 +63052,9 @@ class SubscribeAttributeIlluminanceMeasurementMaxMeasuredValue : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxMeasuredValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -60981,6 +63120,9 @@ class SubscribeAttributeIlluminanceMeasurementTolerance : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeToleranceWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -61046,6 +63188,9 @@ class SubscribeAttributeIlluminanceMeasurementLightSensorType : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLightSensorTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -61111,6 +63256,9 @@ class SubscribeAttributeIlluminanceMeasurementGeneratedCommandList : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -61176,6 +63324,9 @@ class SubscribeAttributeIlluminanceMeasurementAcceptedCommandList : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -61241,6 +63392,9 @@ class SubscribeAttributeIlluminanceMeasurementAttributeList : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -61306,6 +63460,9 @@ class SubscribeAttributeIlluminanceMeasurementFeatureMap : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -61371,6 +63528,9 @@ class SubscribeAttributeIlluminanceMeasurementClusterRevision : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -61455,6 +63615,9 @@ class SubscribeAttributeTemperatureMeasurementMeasuredValue : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasuredValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -61520,6 +63683,9 @@ class SubscribeAttributeTemperatureMeasurementMinMeasuredValue : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinMeasuredValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -61585,6 +63751,9 @@ class SubscribeAttributeTemperatureMeasurementMaxMeasuredValue : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxMeasuredValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -61650,6 +63819,9 @@ class SubscribeAttributeTemperatureMeasurementTolerance : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeToleranceWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -61715,6 +63887,9 @@ class SubscribeAttributeTemperatureMeasurementGeneratedCommandList : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -61780,6 +63955,9 @@ class SubscribeAttributeTemperatureMeasurementAcceptedCommandList : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -61845,6 +64023,9 @@ class SubscribeAttributeTemperatureMeasurementAttributeList : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -61910,6 +64091,9 @@ class SubscribeAttributeTemperatureMeasurementFeatureMap : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -61975,6 +64159,9 @@ class SubscribeAttributeTemperatureMeasurementClusterRevision : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -62066,6 +64253,9 @@ class SubscribeAttributePressureMeasurementMeasuredValue : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasuredValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -62133,6 +64323,9 @@ class SubscribeAttributePressureMeasurementMinMeasuredValue : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinMeasuredValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -62200,6 +64393,9 @@ class SubscribeAttributePressureMeasurementMaxMeasuredValue : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxMeasuredValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -62267,6 +64463,9 @@ class SubscribeAttributePressureMeasurementTolerance : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeToleranceWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -62334,6 +64533,9 @@ class SubscribeAttributePressureMeasurementScaledValue : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeScaledValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -62401,6 +64603,9 @@ class SubscribeAttributePressureMeasurementMinScaledValue : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinScaledValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -62468,6 +64673,9 @@ class SubscribeAttributePressureMeasurementMaxScaledValue : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxScaledValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -62535,6 +64743,9 @@ class SubscribeAttributePressureMeasurementScaledTolerance : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeScaledToleranceWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -62602,6 +64813,9 @@ class SubscribeAttributePressureMeasurementScale : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeScaleWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -62669,6 +64883,9 @@ class SubscribeAttributePressureMeasurementGeneratedCommandList : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -62736,6 +64953,9 @@ class SubscribeAttributePressureMeasurementAcceptedCommandList : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -62803,6 +65023,9 @@ class SubscribeAttributePressureMeasurementAttributeList : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -62870,6 +65093,9 @@ class SubscribeAttributePressureMeasurementFeatureMap : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -62937,6 +65163,9 @@ class SubscribeAttributePressureMeasurementClusterRevision : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -63023,6 +65252,9 @@ class SubscribeAttributeFlowMeasurementMeasuredValue : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasuredValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -63090,6 +65322,9 @@ class SubscribeAttributeFlowMeasurementMinMeasuredValue : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinMeasuredValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -63157,6 +65392,9 @@ class SubscribeAttributeFlowMeasurementMaxMeasuredValue : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxMeasuredValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -63224,6 +65462,9 @@ class SubscribeAttributeFlowMeasurementTolerance : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeToleranceWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -63291,6 +65532,9 @@ class SubscribeAttributeFlowMeasurementGeneratedCommandList : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -63358,6 +65602,9 @@ class SubscribeAttributeFlowMeasurementAcceptedCommandList : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -63425,6 +65672,9 @@ class SubscribeAttributeFlowMeasurementAttributeList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -63492,6 +65742,9 @@ class SubscribeAttributeFlowMeasurementFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -63559,6 +65812,9 @@ class SubscribeAttributeFlowMeasurementClusterRevision : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -63643,6 +65899,9 @@ class SubscribeAttributeRelativeHumidityMeasurementMeasuredValue : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasuredValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -63708,6 +65967,9 @@ class SubscribeAttributeRelativeHumidityMeasurementMinMeasuredValue : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMinMeasuredValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -63773,6 +66035,9 @@ class SubscribeAttributeRelativeHumidityMeasurementMaxMeasuredValue : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMaxMeasuredValueWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -63838,6 +66103,9 @@ class SubscribeAttributeRelativeHumidityMeasurementTolerance : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeToleranceWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -63903,6 +66171,9 @@ class SubscribeAttributeRelativeHumidityMeasurementGeneratedCommandList : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -63968,6 +66239,9 @@ class SubscribeAttributeRelativeHumidityMeasurementAcceptedCommandList : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -64033,6 +66307,9 @@ class SubscribeAttributeRelativeHumidityMeasurementAttributeList : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -64098,6 +66375,9 @@ class SubscribeAttributeRelativeHumidityMeasurementFeatureMap : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -64163,6 +66443,9 @@ class SubscribeAttributeRelativeHumidityMeasurementClusterRevision : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -64257,6 +66540,9 @@ class SubscribeAttributeOccupancySensingOccupancy : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOccupancyWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -64324,6 +66610,9 @@ class SubscribeAttributeOccupancySensingOccupancySensorType : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOccupancySensorTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -64391,6 +66680,9 @@ class SubscribeAttributeOccupancySensingOccupancySensorTypeBitmap : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOccupancySensorTypeBitmapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -64500,6 +66792,9 @@ class SubscribeAttributeOccupancySensingPirOccupiedToUnoccupiedDelay : public Su if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePirOccupiedToUnoccupiedDelayWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -64609,6 +66904,9 @@ class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedDelay : public Su if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePirUnoccupiedToOccupiedDelayWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -64719,6 +67017,9 @@ class SubscribeAttributeOccupancySensingPirUnoccupiedToOccupiedThreshold : publi if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePirUnoccupiedToOccupiedThresholdWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -64830,6 +67131,9 @@ class SubscribeAttributeOccupancySensingUltrasonicOccupiedToUnoccupiedDelay : pu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUltrasonicOccupiedToUnoccupiedDelayWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -64941,6 +67245,9 @@ class SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedDelay : pu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUltrasonicUnoccupiedToOccupiedDelayWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -65053,6 +67360,9 @@ class SubscribeAttributeOccupancySensingUltrasonicUnoccupiedToOccupiedThreshold if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -65165,6 +67475,9 @@ class SubscribeAttributeOccupancySensingPhysicalContactOccupiedToUnoccupiedDelay if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePhysicalContactOccupiedToUnoccupiedDelayWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -65277,6 +67590,9 @@ class SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedDelay if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePhysicalContactUnoccupiedToOccupiedDelayWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -65388,6 +67704,9 @@ class SubscribeAttributeOccupancySensingPhysicalContactUnoccupiedToOccupiedThres if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -65455,6 +67774,9 @@ class SubscribeAttributeOccupancySensingGeneratedCommandList : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -65522,6 +67844,9 @@ class SubscribeAttributeOccupancySensingAcceptedCommandList : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -65589,6 +67914,9 @@ class SubscribeAttributeOccupancySensingAttributeList : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -65656,6 +67984,9 @@ class SubscribeAttributeOccupancySensingFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -65723,6 +68054,9 @@ class SubscribeAttributeOccupancySensingClusterRevision : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -65806,6 +68140,9 @@ class SubscribeAttributeWakeOnLanMACAddress : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMACAddressWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -65873,6 +68210,9 @@ class SubscribeAttributeWakeOnLanGeneratedCommandList : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -65940,6 +68280,9 @@ class SubscribeAttributeWakeOnLanAcceptedCommandList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -66007,6 +68350,9 @@ class SubscribeAttributeWakeOnLanAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -66074,6 +68420,9 @@ class SubscribeAttributeWakeOnLanFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -66141,6 +68490,9 @@ class SubscribeAttributeWakeOnLanClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -66373,6 +68725,9 @@ class SubscribeAttributeChannelChannelList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeChannelListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -66440,6 +68795,9 @@ class SubscribeAttributeChannelLineup : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLineupWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -66508,6 +68866,9 @@ class SubscribeAttributeChannelCurrentChannel : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentChannelWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -66575,6 +68936,9 @@ class SubscribeAttributeChannelGeneratedCommandList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -66642,6 +69006,9 @@ class SubscribeAttributeChannelAcceptedCommandList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -66709,6 +69076,9 @@ class SubscribeAttributeChannelAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -66776,6 +69146,9 @@ class SubscribeAttributeChannelFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -66843,6 +69216,9 @@ class SubscribeAttributeChannelClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -66984,6 +69360,9 @@ class SubscribeAttributeTargetNavigatorTargetList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTargetListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -67051,6 +69430,9 @@ class SubscribeAttributeTargetNavigatorCurrentTarget : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentTargetWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -67118,6 +69500,9 @@ class SubscribeAttributeTargetNavigatorGeneratedCommandList : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -67185,6 +69570,9 @@ class SubscribeAttributeTargetNavigatorAcceptedCommandList : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -67252,6 +69640,9 @@ class SubscribeAttributeTargetNavigatorAttributeList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -67319,6 +69710,9 @@ class SubscribeAttributeTargetNavigatorFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -67386,6 +69780,9 @@ class SubscribeAttributeTargetNavigatorClusterRevision : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -67987,6 +70384,9 @@ class SubscribeAttributeMediaPlaybackCurrentState : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentStateWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -68054,6 +70454,9 @@ class SubscribeAttributeMediaPlaybackStartTime : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeStartTimeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -68121,6 +70524,9 @@ class SubscribeAttributeMediaPlaybackDuration : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDurationWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -68189,6 +70595,9 @@ class SubscribeAttributeMediaPlaybackSampledPosition : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSampledPositionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -68256,6 +70665,9 @@ class SubscribeAttributeMediaPlaybackPlaybackSpeed : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePlaybackSpeedWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -68323,6 +70735,9 @@ class SubscribeAttributeMediaPlaybackSeekRangeEnd : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSeekRangeEndWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -68390,6 +70805,9 @@ class SubscribeAttributeMediaPlaybackSeekRangeStart : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSeekRangeStartWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -68457,6 +70875,9 @@ class SubscribeAttributeMediaPlaybackGeneratedCommandList : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -68524,6 +70945,9 @@ class SubscribeAttributeMediaPlaybackAcceptedCommandList : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -68591,6 +71015,9 @@ class SubscribeAttributeMediaPlaybackAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -68658,6 +71085,9 @@ class SubscribeAttributeMediaPlaybackFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -68725,6 +71155,9 @@ class SubscribeAttributeMediaPlaybackClusterRevision : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -68995,6 +71428,9 @@ class SubscribeAttributeMediaInputInputList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInputListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -69062,6 +71498,9 @@ class SubscribeAttributeMediaInputCurrentInput : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentInputWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -69129,6 +71568,9 @@ class SubscribeAttributeMediaInputGeneratedCommandList : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -69196,6 +71638,9 @@ class SubscribeAttributeMediaInputAcceptedCommandList : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -69263,6 +71708,9 @@ class SubscribeAttributeMediaInputAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -69330,6 +71778,9 @@ class SubscribeAttributeMediaInputFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -69397,6 +71848,9 @@ class SubscribeAttributeMediaInputClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -69523,6 +71977,9 @@ class SubscribeAttributeLowPowerGeneratedCommandList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -69590,6 +72047,9 @@ class SubscribeAttributeLowPowerAcceptedCommandList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -69657,6 +72117,9 @@ class SubscribeAttributeLowPowerAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -69724,6 +72187,9 @@ class SubscribeAttributeLowPowerFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -69791,6 +72257,9 @@ class SubscribeAttributeLowPowerClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -69921,6 +72390,9 @@ class SubscribeAttributeKeypadInputGeneratedCommandList : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -69988,6 +72460,9 @@ class SubscribeAttributeKeypadInputAcceptedCommandList : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -70055,6 +72530,9 @@ class SubscribeAttributeKeypadInputAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -70122,6 +72600,9 @@ class SubscribeAttributeKeypadInputFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -70189,6 +72670,9 @@ class SubscribeAttributeKeypadInputClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -70603,6 +73087,9 @@ class SubscribeAttributeContentLauncherAcceptHeader : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptHeaderWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -70712,6 +73199,9 @@ class SubscribeAttributeContentLauncherSupportedStreamingProtocols : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeSupportedStreamingProtocolsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -70779,6 +73269,9 @@ class SubscribeAttributeContentLauncherGeneratedCommandList : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -70846,6 +73339,9 @@ class SubscribeAttributeContentLauncherAcceptedCommandList : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -70913,6 +73409,9 @@ class SubscribeAttributeContentLauncherAttributeList : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -70980,6 +73479,9 @@ class SubscribeAttributeContentLauncherFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -71047,6 +73549,9 @@ class SubscribeAttributeContentLauncherClusterRevision : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -71229,6 +73734,9 @@ class SubscribeAttributeAudioOutputOutputList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOutputListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -71296,6 +73804,9 @@ class SubscribeAttributeAudioOutputCurrentOutput : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentOutputWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -71363,6 +73874,9 @@ class SubscribeAttributeAudioOutputGeneratedCommandList : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -71430,6 +73944,9 @@ class SubscribeAttributeAudioOutputAcceptedCommandList : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -71497,6 +74014,9 @@ class SubscribeAttributeAudioOutputAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -71564,6 +74084,9 @@ class SubscribeAttributeAudioOutputFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -71631,6 +74154,9 @@ class SubscribeAttributeAudioOutputClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -71886,6 +74412,9 @@ class SubscribeAttributeApplicationLauncherCatalogList : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCatalogListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -72012,6 +74541,9 @@ class SubscribeAttributeApplicationLauncherCurrentApp : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentAppWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -72079,6 +74611,9 @@ class SubscribeAttributeApplicationLauncherGeneratedCommandList : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -72146,6 +74681,9 @@ class SubscribeAttributeApplicationLauncherAcceptedCommandList : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -72213,6 +74751,9 @@ class SubscribeAttributeApplicationLauncherAttributeList : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -72280,6 +74821,9 @@ class SubscribeAttributeApplicationLauncherFeatureMap : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -72347,6 +74891,9 @@ class SubscribeAttributeApplicationLauncherClusterRevision : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -72437,6 +74984,9 @@ class SubscribeAttributeApplicationBasicVendorName : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeVendorNameWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -72504,6 +75054,9 @@ class SubscribeAttributeApplicationBasicVendorID : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeVendorIDWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -72571,6 +75124,9 @@ class SubscribeAttributeApplicationBasicApplicationName : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeApplicationNameWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -72638,6 +75194,9 @@ class SubscribeAttributeApplicationBasicProductID : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeProductIDWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -72706,6 +75265,9 @@ class SubscribeAttributeApplicationBasicApplication : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeApplicationWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -72773,6 +75335,9 @@ class SubscribeAttributeApplicationBasicStatus : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeStatusWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -72840,6 +75405,9 @@ class SubscribeAttributeApplicationBasicApplicationVersion : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeApplicationVersionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -72907,6 +75475,9 @@ class SubscribeAttributeApplicationBasicAllowedVendorList : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAllowedVendorListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -72974,6 +75545,9 @@ class SubscribeAttributeApplicationBasicGeneratedCommandList : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -73041,6 +75615,9 @@ class SubscribeAttributeApplicationBasicAcceptedCommandList : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -73108,6 +75685,9 @@ class SubscribeAttributeApplicationBasicAttributeList : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -73175,6 +75755,9 @@ class SubscribeAttributeApplicationBasicFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -73242,6 +75825,9 @@ class SubscribeAttributeApplicationBasicClusterRevision : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -73472,6 +76058,9 @@ class SubscribeAttributeAccountLoginGeneratedCommandList : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -73539,6 +76128,9 @@ class SubscribeAttributeAccountLoginAcceptedCommandList : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -73606,6 +76198,9 @@ class SubscribeAttributeAccountLoginAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -73673,6 +76268,9 @@ class SubscribeAttributeAccountLoginFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -73740,6 +76338,9 @@ class SubscribeAttributeAccountLoginClusterRevision : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -74045,6 +76646,9 @@ class SubscribeAttributeElectricalMeasurementMeasurementType : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasurementTypeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -74112,6 +76716,9 @@ class SubscribeAttributeElectricalMeasurementDcVoltage : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDcVoltageWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -74179,6 +76786,9 @@ class SubscribeAttributeElectricalMeasurementDcVoltageMin : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDcVoltageMinWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -74246,6 +76856,9 @@ class SubscribeAttributeElectricalMeasurementDcVoltageMax : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDcVoltageMaxWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -74313,6 +76926,9 @@ class SubscribeAttributeElectricalMeasurementDcCurrent : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDcCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -74380,6 +76996,9 @@ class SubscribeAttributeElectricalMeasurementDcCurrentMin : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDcCurrentMinWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -74447,6 +77066,9 @@ class SubscribeAttributeElectricalMeasurementDcCurrentMax : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDcCurrentMaxWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -74514,6 +77136,9 @@ class SubscribeAttributeElectricalMeasurementDcPower : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDcPowerWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -74581,6 +77206,9 @@ class SubscribeAttributeElectricalMeasurementDcPowerMin : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDcPowerMinWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -74648,6 +77276,9 @@ class SubscribeAttributeElectricalMeasurementDcPowerMax : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDcPowerMaxWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -74715,6 +77346,9 @@ class SubscribeAttributeElectricalMeasurementDcVoltageMultiplier : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDcVoltageMultiplierWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -74782,6 +77416,9 @@ class SubscribeAttributeElectricalMeasurementDcVoltageDivisor : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDcVoltageDivisorWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -74849,6 +77486,9 @@ class SubscribeAttributeElectricalMeasurementDcCurrentMultiplier : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDcCurrentMultiplierWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -74916,6 +77556,9 @@ class SubscribeAttributeElectricalMeasurementDcCurrentDivisor : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDcCurrentDivisorWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -74983,6 +77626,9 @@ class SubscribeAttributeElectricalMeasurementDcPowerMultiplier : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDcPowerMultiplierWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -75050,6 +77696,9 @@ class SubscribeAttributeElectricalMeasurementDcPowerDivisor : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeDcPowerDivisorWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -75117,6 +77766,9 @@ class SubscribeAttributeElectricalMeasurementAcFrequency : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcFrequencyWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -75184,6 +77836,9 @@ class SubscribeAttributeElectricalMeasurementAcFrequencyMin : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcFrequencyMinWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -75251,6 +77906,9 @@ class SubscribeAttributeElectricalMeasurementAcFrequencyMax : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcFrequencyMaxWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -75318,6 +77976,9 @@ class SubscribeAttributeElectricalMeasurementNeutralCurrent : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNeutralCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -75385,6 +78046,9 @@ class SubscribeAttributeElectricalMeasurementTotalActivePower : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTotalActivePowerWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -75452,6 +78116,9 @@ class SubscribeAttributeElectricalMeasurementTotalReactivePower : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTotalReactivePowerWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -75519,6 +78186,9 @@ class SubscribeAttributeElectricalMeasurementTotalApparentPower : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTotalApparentPowerWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -75586,6 +78256,9 @@ class SubscribeAttributeElectricalMeasurementMeasured1stHarmonicCurrent : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasured1stHarmonicCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -75653,6 +78326,9 @@ class SubscribeAttributeElectricalMeasurementMeasured3rdHarmonicCurrent : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasured3rdHarmonicCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -75720,6 +78396,9 @@ class SubscribeAttributeElectricalMeasurementMeasured5thHarmonicCurrent : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasured5thHarmonicCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -75787,6 +78466,9 @@ class SubscribeAttributeElectricalMeasurementMeasured7thHarmonicCurrent : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasured7thHarmonicCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -75854,6 +78536,9 @@ class SubscribeAttributeElectricalMeasurementMeasured9thHarmonicCurrent : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasured9thHarmonicCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -75921,6 +78606,9 @@ class SubscribeAttributeElectricalMeasurementMeasured11thHarmonicCurrent : publi if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasured11thHarmonicCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -75989,6 +78677,9 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase1stHarmonicCurrent : p if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasuredPhase1stHarmonicCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -76057,6 +78748,9 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase3rdHarmonicCurrent : p if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasuredPhase3rdHarmonicCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -76125,6 +78819,9 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase5thHarmonicCurrent : p if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasuredPhase5thHarmonicCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -76193,6 +78890,9 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase7thHarmonicCurrent : p if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasuredPhase7thHarmonicCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -76261,6 +78961,9 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase9thHarmonicCurrent : p if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasuredPhase9thHarmonicCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -76329,6 +79032,9 @@ class SubscribeAttributeElectricalMeasurementMeasuredPhase11thHarmonicCurrent : if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeMeasuredPhase11thHarmonicCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -76396,6 +79102,9 @@ class SubscribeAttributeElectricalMeasurementAcFrequencyMultiplier : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcFrequencyMultiplierWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -76463,6 +79172,9 @@ class SubscribeAttributeElectricalMeasurementAcFrequencyDivisor : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcFrequencyDivisorWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -76530,6 +79242,9 @@ class SubscribeAttributeElectricalMeasurementPowerMultiplier : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePowerMultiplierWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -76597,6 +79312,9 @@ class SubscribeAttributeElectricalMeasurementPowerDivisor : public SubscribeAttr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePowerDivisorWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -76664,6 +79382,9 @@ class SubscribeAttributeElectricalMeasurementHarmonicCurrentMultiplier : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeHarmonicCurrentMultiplierWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -76732,6 +79453,9 @@ class SubscribeAttributeElectricalMeasurementPhaseHarmonicCurrentMultiplier : pu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePhaseHarmonicCurrentMultiplierWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -76799,6 +79523,9 @@ class SubscribeAttributeElectricalMeasurementInstantaneousVoltage : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInstantaneousVoltageWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -76866,6 +79593,9 @@ class SubscribeAttributeElectricalMeasurementInstantaneousLineCurrent : public S if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInstantaneousLineCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -76933,6 +79663,9 @@ class SubscribeAttributeElectricalMeasurementInstantaneousActiveCurrent : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInstantaneousActiveCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -77000,6 +79733,9 @@ class SubscribeAttributeElectricalMeasurementInstantaneousReactiveCurrent : publ if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInstantaneousReactiveCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -77067,6 +79803,9 @@ class SubscribeAttributeElectricalMeasurementInstantaneousPower : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInstantaneousPowerWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -77134,6 +79873,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltage : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltageWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -77201,6 +79943,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMin : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltageMinWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -77268,6 +80013,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMax : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltageMaxWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -77335,6 +80083,9 @@ class SubscribeAttributeElectricalMeasurementRmsCurrent : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsCurrentWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -77402,6 +80153,9 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMin : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsCurrentMinWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -77469,6 +80223,9 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMax : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsCurrentMaxWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -77536,6 +80293,9 @@ class SubscribeAttributeElectricalMeasurementActivePower : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActivePowerWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -77603,6 +80363,9 @@ class SubscribeAttributeElectricalMeasurementActivePowerMin : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActivePowerMinWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -77670,6 +80433,9 @@ class SubscribeAttributeElectricalMeasurementActivePowerMax : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActivePowerMaxWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -77737,6 +80503,9 @@ class SubscribeAttributeElectricalMeasurementReactivePower : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeReactivePowerWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -77804,6 +80573,9 @@ class SubscribeAttributeElectricalMeasurementApparentPower : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeApparentPowerWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -77871,6 +80643,9 @@ class SubscribeAttributeElectricalMeasurementPowerFactor : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePowerFactorWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -77981,6 +80756,9 @@ class SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriod if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAverageRmsVoltageMeasurementPeriodWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -78091,6 +80869,9 @@ class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounter : pub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAverageRmsUnderVoltageCounterWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -78201,6 +80982,9 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriod : publi if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsExtremeOverVoltagePeriodWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -78311,6 +81095,9 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriod : publ if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsExtremeUnderVoltagePeriodWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -78418,6 +81205,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriod : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltageSagPeriodWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -78526,6 +81316,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriod : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltageSwellPeriodWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -78593,6 +81386,9 @@ class SubscribeAttributeElectricalMeasurementAcVoltageMultiplier : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcVoltageMultiplierWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -78660,6 +81456,9 @@ class SubscribeAttributeElectricalMeasurementAcVoltageDivisor : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcVoltageDivisorWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -78727,6 +81526,9 @@ class SubscribeAttributeElectricalMeasurementAcCurrentMultiplier : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcCurrentMultiplierWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -78794,6 +81596,9 @@ class SubscribeAttributeElectricalMeasurementAcCurrentDivisor : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcCurrentDivisorWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -78861,6 +81666,9 @@ class SubscribeAttributeElectricalMeasurementAcPowerMultiplier : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcPowerMultiplierWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -78928,6 +81736,9 @@ class SubscribeAttributeElectricalMeasurementAcPowerDivisor : public SubscribeAt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcPowerDivisorWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -79035,6 +81846,9 @@ class SubscribeAttributeElectricalMeasurementOverloadAlarmsMask : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOverloadAlarmsMaskWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -79102,6 +81916,9 @@ class SubscribeAttributeElectricalMeasurementVoltageOverload : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeVoltageOverloadWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -79169,6 +81986,9 @@ class SubscribeAttributeElectricalMeasurementCurrentOverload : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCurrentOverloadWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -79277,6 +82097,9 @@ class SubscribeAttributeElectricalMeasurementAcOverloadAlarmsMask : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcOverloadAlarmsMaskWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -79344,6 +82167,9 @@ class SubscribeAttributeElectricalMeasurementAcVoltageOverload : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcVoltageOverloadWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -79411,6 +82237,9 @@ class SubscribeAttributeElectricalMeasurementAcCurrentOverload : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcCurrentOverloadWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -79478,6 +82307,9 @@ class SubscribeAttributeElectricalMeasurementAcActivePowerOverload : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcActivePowerOverloadWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -79545,6 +82377,9 @@ class SubscribeAttributeElectricalMeasurementAcReactivePowerOverload : public Su if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcReactivePowerOverloadWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -79612,6 +82447,9 @@ class SubscribeAttributeElectricalMeasurementAverageRmsOverVoltage : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAverageRmsOverVoltageWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -79679,6 +82517,9 @@ class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltage : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAverageRmsUnderVoltageWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -79746,6 +82587,9 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltage : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsExtremeOverVoltageWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -79813,6 +82657,9 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltage : public Sub if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsExtremeUnderVoltageWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -79880,6 +82727,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSag : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltageSagWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -79947,6 +82797,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSwell : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltageSwellWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -80014,6 +82867,9 @@ class SubscribeAttributeElectricalMeasurementLineCurrentPhaseB : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLineCurrentPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -80081,6 +82937,9 @@ class SubscribeAttributeElectricalMeasurementActiveCurrentPhaseB : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActiveCurrentPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -80148,6 +83007,9 @@ class SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseB : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeReactiveCurrentPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -80215,6 +83077,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltagePhaseB : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltagePhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -80282,6 +83147,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseB : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltageMinPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -80349,6 +83217,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseB : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltageMaxPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -80416,6 +83287,9 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentPhaseB : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsCurrentPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -80483,6 +83357,9 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseB : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsCurrentMinPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -80550,6 +83427,9 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseB : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsCurrentMaxPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -80617,6 +83497,9 @@ class SubscribeAttributeElectricalMeasurementActivePowerPhaseB : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActivePowerPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -80684,6 +83567,9 @@ class SubscribeAttributeElectricalMeasurementActivePowerMinPhaseB : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActivePowerMinPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -80751,6 +83637,9 @@ class SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseB : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActivePowerMaxPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -80818,6 +83707,9 @@ class SubscribeAttributeElectricalMeasurementReactivePowerPhaseB : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeReactivePowerPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -80885,6 +83777,9 @@ class SubscribeAttributeElectricalMeasurementApparentPowerPhaseB : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeApparentPowerPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -80952,6 +83847,9 @@ class SubscribeAttributeElectricalMeasurementPowerFactorPhaseB : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePowerFactorPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -81020,6 +83918,9 @@ class SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodP if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -81088,6 +83989,9 @@ class SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseB if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAverageRmsOverVoltageCounterPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -81156,6 +84060,9 @@ class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseB if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAverageRmsUnderVoltageCounterPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -81224,6 +84131,9 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseB : if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsExtremeOverVoltagePeriodPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -81292,6 +84202,9 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseB if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -81359,6 +84272,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseB : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltageSagPeriodPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -81426,6 +84342,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseB : publi if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltageSwellPeriodPhaseBWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -81493,6 +84412,9 @@ class SubscribeAttributeElectricalMeasurementLineCurrentPhaseC : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLineCurrentPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -81560,6 +84482,9 @@ class SubscribeAttributeElectricalMeasurementActiveCurrentPhaseC : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActiveCurrentPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -81627,6 +84552,9 @@ class SubscribeAttributeElectricalMeasurementReactiveCurrentPhaseC : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeReactiveCurrentPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -81694,6 +84622,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltagePhaseC : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltagePhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -81761,6 +84692,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMinPhaseC : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltageMinPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -81828,6 +84762,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageMaxPhaseC : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltageMaxPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -81895,6 +84832,9 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentPhaseC : public Subscribe if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsCurrentPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -81962,6 +84902,9 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMinPhaseC : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsCurrentMinPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -82029,6 +84972,9 @@ class SubscribeAttributeElectricalMeasurementRmsCurrentMaxPhaseC : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsCurrentMaxPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -82096,6 +85042,9 @@ class SubscribeAttributeElectricalMeasurementActivePowerPhaseC : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActivePowerPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -82163,6 +85112,9 @@ class SubscribeAttributeElectricalMeasurementActivePowerMinPhaseC : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActivePowerMinPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -82230,6 +85182,9 @@ class SubscribeAttributeElectricalMeasurementActivePowerMaxPhaseC : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeActivePowerMaxPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -82297,6 +85252,9 @@ class SubscribeAttributeElectricalMeasurementReactivePowerPhaseC : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeReactivePowerPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -82364,6 +85322,9 @@ class SubscribeAttributeElectricalMeasurementApparentPowerPhaseC : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeApparentPowerPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -82431,6 +85392,9 @@ class SubscribeAttributeElectricalMeasurementPowerFactorPhaseC : public Subscrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributePowerFactorPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -82499,6 +85463,9 @@ class SubscribeAttributeElectricalMeasurementAverageRmsVoltageMeasurementPeriodP if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAverageRmsVoltageMeasurementPeriodPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -82567,6 +85534,9 @@ class SubscribeAttributeElectricalMeasurementAverageRmsOverVoltageCounterPhaseC if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAverageRmsOverVoltageCounterPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -82635,6 +85605,9 @@ class SubscribeAttributeElectricalMeasurementAverageRmsUnderVoltageCounterPhaseC if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAverageRmsUnderVoltageCounterPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -82703,6 +85676,9 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeOverVoltagePeriodPhaseC : if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsExtremeOverVoltagePeriodPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -82771,6 +85747,9 @@ class SubscribeAttributeElectricalMeasurementRmsExtremeUnderVoltagePeriodPhaseC if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsExtremeUnderVoltagePeriodPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -82838,6 +85817,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSagPeriodPhaseC : public if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltageSagPeriodPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -82905,6 +85887,9 @@ class SubscribeAttributeElectricalMeasurementRmsVoltageSwellPeriodPhaseC : publi if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRmsVoltageSwellPeriodPhaseCWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -82972,6 +85957,9 @@ class SubscribeAttributeElectricalMeasurementGeneratedCommandList : public Subsc if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -83039,6 +86027,9 @@ class SubscribeAttributeElectricalMeasurementAcceptedCommandList : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -83106,6 +86097,9 @@ class SubscribeAttributeElectricalMeasurementAttributeList : public SubscribeAtt if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -83173,6 +86167,9 @@ class SubscribeAttributeElectricalMeasurementFeatureMap : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -83240,6 +86237,9 @@ class SubscribeAttributeElectricalMeasurementClusterRevision : public SubscribeA if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -85034,6 +88034,9 @@ class SubscribeAttributeTestClusterBoolean : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBooleanWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -85141,6 +88144,9 @@ class SubscribeAttributeTestClusterBitmap8 : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBitmap8WithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -85248,6 +88254,9 @@ class SubscribeAttributeTestClusterBitmap16 : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBitmap16WithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -85355,6 +88364,9 @@ class SubscribeAttributeTestClusterBitmap32 : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBitmap32WithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -85462,6 +88474,9 @@ class SubscribeAttributeTestClusterBitmap64 : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeBitmap64WithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -85569,6 +88584,9 @@ class SubscribeAttributeTestClusterInt8u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt8uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -85676,6 +88694,9 @@ class SubscribeAttributeTestClusterInt16u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt16uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -85783,6 +88804,9 @@ class SubscribeAttributeTestClusterInt24u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt24uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -85890,6 +88914,9 @@ class SubscribeAttributeTestClusterInt32u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt32uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -85997,6 +89024,9 @@ class SubscribeAttributeTestClusterInt40u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt40uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -86104,6 +89134,9 @@ class SubscribeAttributeTestClusterInt48u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt48uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -86211,6 +89244,9 @@ class SubscribeAttributeTestClusterInt56u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt56uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -86318,6 +89354,9 @@ class SubscribeAttributeTestClusterInt64u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt64uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -86425,6 +89464,9 @@ class SubscribeAttributeTestClusterInt8s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt8sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -86532,6 +89574,9 @@ class SubscribeAttributeTestClusterInt16s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt16sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -86639,6 +89684,9 @@ class SubscribeAttributeTestClusterInt24s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt24sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -86746,6 +89794,9 @@ class SubscribeAttributeTestClusterInt32s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt32sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -86853,6 +89904,9 @@ class SubscribeAttributeTestClusterInt40s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt40sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -86960,6 +90014,9 @@ class SubscribeAttributeTestClusterInt48s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt48sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -87067,6 +90124,9 @@ class SubscribeAttributeTestClusterInt56s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt56sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -87174,6 +90234,9 @@ class SubscribeAttributeTestClusterInt64s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeInt64sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -87281,6 +90344,9 @@ class SubscribeAttributeTestClusterEnum8 : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEnum8WithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -87388,6 +90454,9 @@ class SubscribeAttributeTestClusterEnum16 : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEnum16WithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -87495,6 +90564,9 @@ class SubscribeAttributeTestClusterFloatSingle : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFloatSingleWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -87602,6 +90674,9 @@ class SubscribeAttributeTestClusterFloatDouble : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFloatDoubleWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -87709,6 +90784,9 @@ class SubscribeAttributeTestClusterOctetString : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeOctetStringWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -87827,6 +90905,9 @@ class SubscribeAttributeTestClusterListInt8u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeListInt8uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -87945,6 +91026,9 @@ class SubscribeAttributeTestClusterListOctetString : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeListOctetStringWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -88066,6 +91150,9 @@ class SubscribeAttributeTestClusterListStructOctetString : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeListStructOctetStringWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -88173,6 +91260,9 @@ class SubscribeAttributeTestClusterLongOctetString : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLongOctetStringWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -88282,6 +91372,9 @@ class SubscribeAttributeTestClusterCharString : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeCharStringWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -88391,6 +91484,9 @@ class SubscribeAttributeTestClusterLongCharString : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeLongCharStringWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -88498,6 +91594,9 @@ class SubscribeAttributeTestClusterEpochUs : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEpochUsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -88605,6 +91704,9 @@ class SubscribeAttributeTestClusterEpochS : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEpochSWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -88712,6 +91814,9 @@ class SubscribeAttributeTestClusterVendorId : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeVendorIdWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -88986,6 +92091,9 @@ class SubscribeAttributeTestClusterListNullablesAndOptionalsStruct : public Subs if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeListNullablesAndOptionalsStructWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -89093,6 +92201,9 @@ class SubscribeAttributeTestClusterEnumAttr : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeEnumAttrWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -89212,6 +92323,9 @@ class SubscribeAttributeTestClusterStructAttr : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeStructAttrWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -89319,6 +92433,9 @@ class SubscribeAttributeTestClusterRangeRestrictedInt8u : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRangeRestrictedInt8uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -89426,6 +92543,9 @@ class SubscribeAttributeTestClusterRangeRestrictedInt8s : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRangeRestrictedInt8sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -89533,6 +92653,9 @@ class SubscribeAttributeTestClusterRangeRestrictedInt16u : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRangeRestrictedInt16uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -89640,6 +92763,9 @@ class SubscribeAttributeTestClusterRangeRestrictedInt16s : public SubscribeAttri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeRangeRestrictedInt16sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -89758,6 +92884,9 @@ class SubscribeAttributeTestClusterListLongOctetString : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeListLongOctetStringWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -89931,6 +93060,9 @@ class SubscribeAttributeTestClusterListFabricScoped : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeListFabricScopedWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -90038,6 +93170,9 @@ class SubscribeAttributeTestClusterTimedWriteBoolean : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeTimedWriteBooleanWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -90145,6 +93280,9 @@ class SubscribeAttributeTestClusterGeneralErrorBoolean : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneralErrorBooleanWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -90252,6 +93390,9 @@ class SubscribeAttributeTestClusterClusterErrorBoolean : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterErrorBooleanWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -90359,6 +93500,9 @@ class SubscribeAttributeTestClusterUnsupported : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeUnsupportedWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -90466,6 +93610,9 @@ class SubscribeAttributeTestClusterNullableBoolean : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableBooleanWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -90573,6 +93720,9 @@ class SubscribeAttributeTestClusterNullableBitmap8 : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableBitmap8WithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -90680,6 +93830,9 @@ class SubscribeAttributeTestClusterNullableBitmap16 : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableBitmap16WithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -90787,6 +93940,9 @@ class SubscribeAttributeTestClusterNullableBitmap32 : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableBitmap32WithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -90894,6 +94050,9 @@ class SubscribeAttributeTestClusterNullableBitmap64 : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableBitmap64WithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -91001,6 +94160,9 @@ class SubscribeAttributeTestClusterNullableInt8u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt8uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -91108,6 +94270,9 @@ class SubscribeAttributeTestClusterNullableInt16u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt16uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -91215,6 +94380,9 @@ class SubscribeAttributeTestClusterNullableInt24u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt24uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -91322,6 +94490,9 @@ class SubscribeAttributeTestClusterNullableInt32u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt32uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -91429,6 +94600,9 @@ class SubscribeAttributeTestClusterNullableInt40u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt40uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -91536,6 +94710,9 @@ class SubscribeAttributeTestClusterNullableInt48u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt48uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -91643,6 +94820,9 @@ class SubscribeAttributeTestClusterNullableInt56u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt56uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -91750,6 +94930,9 @@ class SubscribeAttributeTestClusterNullableInt64u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt64uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -91857,6 +95040,9 @@ class SubscribeAttributeTestClusterNullableInt8s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt8sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -91964,6 +95150,9 @@ class SubscribeAttributeTestClusterNullableInt16s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt16sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -92071,6 +95260,9 @@ class SubscribeAttributeTestClusterNullableInt24s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt24sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -92178,6 +95370,9 @@ class SubscribeAttributeTestClusterNullableInt32s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt32sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -92285,6 +95480,9 @@ class SubscribeAttributeTestClusterNullableInt40s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt40sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -92392,6 +95590,9 @@ class SubscribeAttributeTestClusterNullableInt48s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt48sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -92499,6 +95700,9 @@ class SubscribeAttributeTestClusterNullableInt56s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt56sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -92606,6 +95810,9 @@ class SubscribeAttributeTestClusterNullableInt64s : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableInt64sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -92713,6 +95920,9 @@ class SubscribeAttributeTestClusterNullableEnum8 : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableEnum8WithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -92820,6 +96030,9 @@ class SubscribeAttributeTestClusterNullableEnum16 : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableEnum16WithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -92927,6 +96140,9 @@ class SubscribeAttributeTestClusterNullableFloatSingle : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableFloatSingleWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -93034,6 +96250,9 @@ class SubscribeAttributeTestClusterNullableFloatDouble : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableFloatDoubleWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -93141,6 +96360,9 @@ class SubscribeAttributeTestClusterNullableOctetString : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableOctetStringWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -93250,6 +96472,9 @@ class SubscribeAttributeTestClusterNullableCharString : public SubscribeAttribut if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableCharStringWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -93357,6 +96582,9 @@ class SubscribeAttributeTestClusterNullableEnumAttr : public SubscribeAttribute if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableEnumAttrWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -93482,6 +96710,9 @@ class SubscribeAttributeTestClusterNullableStruct : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableStructWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -93590,6 +96821,9 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt8u : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableRangeRestrictedInt8uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -93698,6 +96932,9 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt8s : public Subscri if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableRangeRestrictedInt8sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -93807,6 +97044,9 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt16u : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableRangeRestrictedInt16uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -93916,6 +97156,9 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt16s : public Subscr if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeNullableRangeRestrictedInt16sWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -94023,6 +97266,9 @@ class SubscribeAttributeTestClusterWriteOnlyInt8u : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeWriteOnlyInt8uWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -94090,6 +97336,9 @@ class SubscribeAttributeTestClusterGeneratedCommandList : public SubscribeAttrib if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeGeneratedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -94157,6 +97406,9 @@ class SubscribeAttributeTestClusterAcceptedCommandList : public SubscribeAttribu if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAcceptedCommandListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -94224,6 +97476,9 @@ class SubscribeAttributeTestClusterAttributeList : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeAttributeListWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -94291,6 +97546,9 @@ class SubscribeAttributeTestClusterFeatureMap : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeFeatureMapWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; @@ -94358,6 +97616,9 @@ class SubscribeAttributeTestClusterClusterRevision : public SubscribeAttribute { if (mFabricFiltered.HasValue()) { params.filterByFabric = mFabricFiltered.Value(); } + if (mAutoResubscribe.HasValue()) { + params.resubscribeIfLost = mAutoResubscribe.Value(); + } [cluster subscribeAttributeClusterRevisionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index eaa0c9fa0efbbb..071d53cc8ac407 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -62684,6 +62684,8 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { uint16_t maxIntervalArgument = 5U; MTRSubscribeParams * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(minIntervalArgument) maxInterval:@(maxIntervalArgument)]; + params.filterByFabric = true; + params.replaceExistingSubscriptions = true; [cluster subscribeAttributeOperationalStatusWithParams:params subscriptionEstablished:^{ VerifyOrReturn( @@ -63686,6 +63688,8 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { uint16_t maxIntervalArgument = 5U; MTRSubscribeParams * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(minIntervalArgument) maxInterval:@(maxIntervalArgument)]; + params.filterByFabric = true; + params.replaceExistingSubscriptions = true; [cluster subscribeAttributeOperationalStatusWithParams:params subscriptionEstablished:^{ VerifyOrReturn( @@ -64491,6 +64495,8 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { uint16_t maxIntervalArgument = 5U; MTRSubscribeParams * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(minIntervalArgument) maxInterval:@(maxIntervalArgument)]; + params.filterByFabric = true; + params.replaceExistingSubscriptions = true; [cluster subscribeAttributeOperationalStatusWithParams:params subscriptionEstablished:^{ VerifyOrReturn( @@ -84651,6 +84657,8 @@ class TestCluster : public TestCommandBridge { uint16_t maxIntervalArgument = 5U; MTRSubscribeParams * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(minIntervalArgument) maxInterval:@(maxIntervalArgument)]; + params.filterByFabric = true; + params.replaceExistingSubscriptions = true; [cluster subscribeAttributeListInt8uWithParams:params subscriptionEstablished:^{ VerifyOrReturn( @@ -93483,6 +93491,8 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { uint16_t maxIntervalArgument = 5U; MTRSubscribeParams * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(minIntervalArgument) maxInterval:@(maxIntervalArgument)]; + params.filterByFabric = true; + params.replaceExistingSubscriptions = true; [cluster subscribeAttributeFabricsWithParams:params subscriptionEstablished:^{ VerifyOrReturn(testSendClusterTestFabricRemovalWhileSubscribed_6_WaitForReport_Fulfilled, @@ -102097,6 +102107,8 @@ class TestSubscribe_OnOff : public TestCommandBridge { uint16_t maxIntervalArgument = 5U; MTRSubscribeParams * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(minIntervalArgument) maxInterval:@(maxIntervalArgument)]; + params.filterByFabric = true; + params.replaceExistingSubscriptions = true; [cluster subscribeAttributeOnOffWithParams:params subscriptionEstablished:^{ VerifyOrReturn(