From 7fe4abc8155fe0b5dc856fdd2546ef324f794272 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 20 Jan 2023 15:43:30 -0500 Subject: [PATCH] Remove dependency of libChipController on app-specific codegen. (#24555) * Remove dependency of libChipController on app-specific codegen. * Remove the unused cluster id member from ClusterBase. * Make ClusterBase constructor public. * Use ClusterBase instead of generated cluster structs in src/controller. * Remove the CHIPClusters.h includes and codegen dependency. * Revert the non-workflow changes from PR ##24539, since those are not needed anymore. * Regenerate generated files. --- .../tv-casting-common/include/MediaBase.h | 4 +- .../include/MediaCommandBase.h | 3 +- .../tv-casting-common/include/MediaReadBase.h | 3 +- .../include/MediaSubscriptionBase.h | 3 +- scripts/codepregen.py | 7 +- scripts/pregenerate/__init__.py | 4 +- scripts/pregenerate/using_codegen.py | 13 +- scripts/pregenerate/using_zap.py | 2 +- .../app-templates/CHIPClusters.h | 2 +- .../lighting-app/app-templates/CHIPClusters.h | 2 +- scripts/tools/zap_regen_all.py | 43 +- .../templates/app/CHIPClusters.zapt | 2 +- src/controller/AutoCommissioner.cpp | 1 - src/controller/BUILD.gn | 13 +- src/controller/CHIPCluster.h | 13 +- src/controller/CHIPDeviceController.cpp | 42 +- src/controller/CHIPDeviceController.h | 8 +- src/controller/CommissioneeDeviceProxy.cpp | 2 - src/controller/CommissioningWindowOpener.cpp | 15 +- src/controller/CurrentFabricRemover.cpp | 7 +- .../Matter.xcodeproj/project.pbxproj | 4 +- .../Framework/chip_xcode_build_connector.sh | 1 - .../zap-generated/CHIPClientCallbacks.h | 0 .../zap-generated/CHIPClusters.h | 132 ++--- .../zap-generated/IMClusterCommandHandler.cpp | 0 .../zap-generated/access.h | 0 .../zap-generated/endpoint_config.h | 0 .../zap-generated/gen_config.h | 0 .../cpp-app/app/PluginApplicationCallbacks.h | 5 - .../codegen/cpp-app/app/callback-stub.cpp | 545 ------------------ 30 files changed, 125 insertions(+), 751 deletions(-) rename zzz_generated/darwin/{src/controller/data_model/controller-clusters/zap/app-templates => controller-clusters}/zap-generated/CHIPClientCallbacks.h (100%) rename zzz_generated/darwin/{src/controller/data_model/controller-clusters/zap/app-templates => controller-clusters}/zap-generated/CHIPClusters.h (74%) rename zzz_generated/darwin/{src/controller/data_model/controller-clusters/zap/app-templates => controller-clusters}/zap-generated/IMClusterCommandHandler.cpp (100%) rename zzz_generated/darwin/{src/controller/data_model/controller-clusters/zap/app-templates => controller-clusters}/zap-generated/access.h (100%) rename zzz_generated/darwin/{src/controller/data_model/controller-clusters/zap/app-templates => controller-clusters}/zap-generated/endpoint_config.h (100%) rename zzz_generated/darwin/{src/controller/data_model/controller-clusters/zap/app-templates => controller-clusters}/zap-generated/gen_config.h (100%) delete mode 100644 zzz_generated/darwin/src/controller/data_model/controller-clusters/codegen/cpp-app/app/PluginApplicationCallbacks.h delete mode 100644 zzz_generated/darwin/src/controller/data_model/controller-clusters/codegen/cpp-app/app/callback-stub.cpp diff --git a/examples/tv-casting-app/tv-casting-common/include/MediaBase.h b/examples/tv-casting-app/tv-casting-common/include/MediaBase.h index 6a30c3c83f1224..1e924b862b3f75 100644 --- a/examples/tv-casting-app/tv-casting-common/include/MediaBase.h +++ b/examples/tv-casting-app/tv-casting-common/include/MediaBase.h @@ -46,8 +46,8 @@ class MediaBase { public: MediaClusterBase(chip::Messaging::ExchangeManager & exchangeManager, const chip::SessionHandle & session, - chip::ClusterId cluster, chip::EndpointId endpoint) : - ClusterBase(exchangeManager, session, cluster, endpoint) + chip::EndpointId endpoint) : + ClusterBase(exchangeManager, session, endpoint) {} }; diff --git a/examples/tv-casting-app/tv-casting-common/include/MediaCommandBase.h b/examples/tv-casting-app/tv-casting-common/include/MediaCommandBase.h index 1b9c3d28929d3c..87ddf70ef2effd 100644 --- a/examples/tv-casting-app/tv-casting-common/include/MediaCommandBase.h +++ b/examples/tv-casting-app/tv-casting-common/include/MediaCommandBase.h @@ -36,8 +36,7 @@ class MediaCommandBase : public MediaBase sResponseCallback = responseCallback; - MediaClusterBase cluster(*deviceProxy->GetExchangeManager(), deviceProxy->GetSecureSession().Value(), mClusterId, - mTvEndpoint); + MediaClusterBase cluster(*deviceProxy->GetExchangeManager(), deviceProxy->GetSecureSession().Value(), mTvEndpoint); return cluster.InvokeCommand(request, nullptr, OnSuccess, OnFailure); } diff --git a/examples/tv-casting-app/tv-casting-common/include/MediaReadBase.h b/examples/tv-casting-app/tv-casting-common/include/MediaReadBase.h index 3003a08a348f70..e7e99e3d7ec662 100644 --- a/examples/tv-casting-app/tv-casting-common/include/MediaReadBase.h +++ b/examples/tv-casting-app/tv-casting-common/include/MediaReadBase.h @@ -34,8 +34,7 @@ class MediaReadBase : public MediaBase auto deviceProxy = mTargetVideoPlayerInfo->GetOperationalDeviceProxy(); ReturnErrorCodeIf(deviceProxy == nullptr || !deviceProxy->ConnectionReady(), CHIP_ERROR_PEER_NODE_NOT_FOUND); - MediaClusterBase cluster(*deviceProxy->GetExchangeManager(), deviceProxy->GetSecureSession().Value(), mClusterId, - mTvEndpoint); + MediaClusterBase cluster(*deviceProxy->GetExchangeManager(), deviceProxy->GetSecureSession().Value(), mTvEndpoint); return cluster.template ReadAttribute(context, successFn, failureFn); } diff --git a/examples/tv-casting-app/tv-casting-common/include/MediaSubscriptionBase.h b/examples/tv-casting-app/tv-casting-common/include/MediaSubscriptionBase.h index 73e4eb49c43921..65b91b175f7b9d 100644 --- a/examples/tv-casting-app/tv-casting-common/include/MediaSubscriptionBase.h +++ b/examples/tv-casting-app/tv-casting-common/include/MediaSubscriptionBase.h @@ -35,8 +35,7 @@ class MediaSubscriptionBase : public MediaBase auto deviceProxy = mTargetVideoPlayerInfo->GetOperationalDeviceProxy(); ReturnErrorCodeIf(deviceProxy == nullptr || !deviceProxy->ConnectionReady(), CHIP_ERROR_PEER_NODE_NOT_FOUND); - MediaClusterBase cluster(*deviceProxy->GetExchangeManager(), deviceProxy->GetSecureSession().Value(), mClusterId, - mTvEndpoint); + MediaClusterBase cluster(*deviceProxy->GetExchangeManager(), deviceProxy->GetSecureSession().Value(), mTvEndpoint); return cluster.template SubscribeAttribute(context, successFn, failureFn, minInterval, maxInterval, onSubscriptionEstablished, nullptr /* resubscribeCb */, diff --git a/scripts/codepregen.py b/scripts/codepregen.py index 2f99243f30c5a3..7c5bfd747295cd 100755 --- a/scripts/codepregen.py +++ b/scripts/codepregen.py @@ -74,7 +74,7 @@ def _ParallelGenerateOne(arg): @click.option( '--generator', default='all', - type=click.Choice(['all', 'zap', 'codegen', 'codegen-cpp-only']), + type=click.Choice(['all', 'zap', 'codegen']), help='To what code generator to restrict the generation.') @click.option( '--input-glob', @@ -119,12 +119,9 @@ def main(log_level, parallel, dry_run, generator, input_glob, sdk_root, output_d if generator == 'zap': filter.file_type = IdlFileType.ZAP - elif generator == 'codegen' or generator == 'codegen-cpp-only': + elif generator == 'codegen': filter.file_type = IdlFileType.MATTER - if generator == 'codegen-cpp-only': - filter.cpp_only = True - targets = FindPregenerationTargets(sdk_root, filter, runner) runner.ensure_directory_exists(output_dir) diff --git a/scripts/pregenerate/__init__.py b/scripts/pregenerate/__init__.py index d5e28c750eb99d..c5033f406fdf7c 100644 --- a/scripts/pregenerate/__init__.py +++ b/scripts/pregenerate/__init__.py @@ -55,8 +55,6 @@ class TargetFilter: # If non-empty only the given paths will be code-generated path_glob: List[str] = field(default_factory=list) - cpp_only: bool = False - # TODO: the build GlobMatcher is more complete by supporting `{}` grouping # For now this limited glob seems sufficient. @@ -100,5 +98,5 @@ def FindPregenerationTargets(sdk_root: str, filter: TargetFilter, runner): continue for generator in generators: - if generator.Accept(idl, filter.cpp_only): + if generator.Accept(idl): yield generator.CreateTarget(idl, runner=runner) diff --git a/scripts/pregenerate/using_codegen.py b/scripts/pregenerate/using_codegen.py index 60070237b0cc11..0ca159704b6f4a 100644 --- a/scripts/pregenerate/using_codegen.py +++ b/scripts/pregenerate/using_codegen.py @@ -64,7 +64,7 @@ class CodegenBridgePregenerator: def __init__(self, sdk_root): self.sdk_root = sdk_root - def Accept(self, idl: InputIdlFile, cpp_only: bool): + def Accept(self, idl: InputIdlFile): # Bridge is highly specific, a single path is acceptable for dynamic # bridge codegen return idl.relative_path == "examples/dynamic-bridge-app/bridge-common/bridge-app.matter" @@ -79,12 +79,9 @@ class CodegenJavaPregenerator: def __init__(self, sdk_root): self.sdk_root = sdk_root - def Accept(self, idl: InputIdlFile, cpp_only: bool): - if cpp_only: - return False - - # Java is highly specific, a single path is acceptable for java - # codegen + def Accept(self, idl: InputIdlFile): + # Java is highly specific, a single path is acceptable for dynamic + # bridge codegen return idl.relative_path == "src/controller/data_model/controller-clusters.matter" def CreateTarget(self, idl: InputIdlFile, runner): @@ -97,7 +94,7 @@ class CodegenCppAppPregenerator: def __init__(self, sdk_root): self.sdk_root = sdk_root - def Accept(self, idl: InputIdlFile, cpp_only: bool): + def Accept(self, idl: InputIdlFile): if idl.file_type != IdlFileType.MATTER: return False diff --git a/scripts/pregenerate/using_zap.py b/scripts/pregenerate/using_zap.py index 67a05bca9f7a5b..4d28f213370655 100644 --- a/scripts/pregenerate/using_zap.py +++ b/scripts/pregenerate/using_zap.py @@ -77,7 +77,7 @@ class ZapApplicationPregenerator: def __init__(self, sdk_root): self.sdk_root = sdk_root - def Accept(self, idl: InputIdlFile, cpp_only: bool): + def Accept(self, idl: InputIdlFile): if idl.file_type != IdlFileType.ZAP: return False diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h index fffb265ae9c797..9af15232480836 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/CHIPClusters.h @@ -35,7 +35,7 @@ class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase public: OtaSoftwareUpdateProviderCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::OtaSoftwareUpdateProvider::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~OtaSoftwareUpdateProviderCluster() {} }; diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClusters.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClusters.h index fffb265ae9c797..9af15232480836 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClusters.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/CHIPClusters.h @@ -35,7 +35,7 @@ class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase public: OtaSoftwareUpdateProviderCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::OtaSoftwareUpdateProvider::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~OtaSoftwareUpdateProviderCluster() {} }; diff --git a/scripts/tools/zap_regen_all.py b/scripts/tools/zap_regen_all.py index bd5c9d8e68bee9..8e2e4a9a52e94e 100755 --- a/scripts/tools/zap_regen_all.py +++ b/scripts/tools/zap_regen_all.py @@ -113,41 +113,6 @@ def generate(self) -> TargetRunStats: ) -class ZAPPregenerateTarget: - def __init__(self, input_glob, output_dir, generator=None): - self.input_glob = input_glob - self.output_dir = output_dir - self.script = "./scripts/codepregen.py" - self.command = [self.script, "--input-glob", input_glob] - self.generator = generator - - if generator is not None: - self.command.extend(["--generator", generator]) - self.command.append(output_dir) - - def distinct_output(self): - input_template = self.input_glob - if self.generator is not None: - input_template += " " + self.generator - return ZapDistinctOutput(input_template=input_template, output_directory=self.output_dir) - - def log_command(self): - logging.info(" %s" % " ".join(self.command)) - - def generate(self) -> TargetRunStats: - logging.info("Generating target: %s" % " ".join(self.command)) - - generate_start = time.time() - subprocess.check_call(self.command) - generate_end = time.time() - - return TargetRunStats( - generate_time=generate_end - generate_start, - config=self.script, - template=self.script, - ) - - def checkPythonVersion(): if sys.version_info[0] < 3: print('Must use Python 3. Current version is ' + @@ -235,10 +200,10 @@ def getGlobalTemplatesTargets(): # # TODO: These files can be code generated at compile time, we should figure # out a path for this codegen to not be required. - targets.append(ZAPPregenerateTarget( - "*controller-clusters*", "zzz_generated/darwin", generator="zap")) - targets.append(ZAPPregenerateTarget( - "*controller-clusters*", "zzz_generated/darwin", generator="codegen-cpp-only")) + targets.append(ZAPGenerateTarget( + 'src/controller/data_model/controller-clusters.zap', + template="src/app/zap-templates/app-templates.json", + output_dir=os.path.join('zzz_generated/darwin/controller-clusters/zap-generated'))) return targets diff --git a/src/app/zap-templates/templates/app/CHIPClusters.zapt b/src/app/zap-templates/templates/app/CHIPClusters.zapt index 6ecf0d333a3fee..ecd9d1a349f1c0 100644 --- a/src/app/zap-templates/templates/app/CHIPClusters.zapt +++ b/src/app/zap-templates/templates/app/CHIPClusters.zapt @@ -18,7 +18,7 @@ namespace Controller { class DLL_EXPORT {{asUpperCamelCase name}}Cluster : public ClusterBase { public: - {{asUpperCamelCase name}}Cluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : ClusterBase(exchangeManager, session, app::Clusters::{{asUpperCamelCase name}}::Id, endpoint) {} + {{asUpperCamelCase name}}Cluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : ClusterBase(exchangeManager, session, endpoint) {} ~{{asUpperCamelCase name}}Cluster() {} }; diff --git a/src/controller/AutoCommissioner.cpp b/src/controller/AutoCommissioner.cpp index 1f0c930383d90a..c83d561391b5b2 100644 --- a/src/controller/AutoCommissioner.cpp +++ b/src/controller/AutoCommissioner.cpp @@ -22,7 +22,6 @@ #include #include #include -#include namespace chip { namespace Controller { diff --git a/src/controller/BUILD.gn b/src/controller/BUILD.gn index 5e123cef227aaa..797d09b24f0b1b 100644 --- a/src/controller/BUILD.gn +++ b/src/controller/BUILD.gn @@ -67,18 +67,7 @@ static_library("controller") { "${chip_root}/src/transport", ] - deps = [ - # NOTE: - # awkward zapgen_zapgen dependency to get access to generated headers - # but NOT to include generated CPP files (IMCommandHandler.cpp) - "${chip_root}/src/controller/data_model:data_model_zapgen_files", - "${chip_root}/src/lib/address_resolve", - ] - - configs += [ - # Get access to zzz_generated/CHIPClusters.h - "${chip_root}/src/controller/data_model:data_model_zapgen_config", - ] + deps = [ "${chip_root}/src/lib/address_resolve" ] defines = [] } diff --git a/src/controller/CHIPCluster.h b/src/controller/CHIPCluster.h index 99afac63a6bb03..f3e198d1f278fd 100644 --- a/src/controller/CHIPCluster.h +++ b/src/controller/CHIPCluster.h @@ -57,6 +57,10 @@ using SubscriptionOnDoneCallback = std::function; class DLL_EXPORT ClusterBase { public: + ClusterBase(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : + mExchangeManager(exchangeManager), mSession(session), mEndpoint(endpoint) + {} + virtual ~ClusterBase() {} // Temporary function to set command timeout before we move over to InvokeCommand @@ -69,8 +73,6 @@ class DLL_EXPORT ClusterBase */ Optional GetCommandTimeout() { return mTimeout; } - ClusterId GetClusterId() const { return mClusterId; } - /* * This function permits sending an invoke request using cluster objects that represent the request and response data payloads. * @@ -397,12 +399,6 @@ class DLL_EXPORT ClusterBase } protected: - ClusterBase(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, ClusterId cluster, - EndpointId endpoint) : - mExchangeManager(exchangeManager), - mSession(session), mClusterId(cluster), mEndpoint(endpoint) - {} - Messaging::ExchangeManager & mExchangeManager; // Since cluster object is ephemeral, the session shall be valid during the entire lifespan, so we do not need to check the @@ -410,7 +406,6 @@ class DLL_EXPORT ClusterBase // can't use SessionHandle here, in such case, the cluster object must be freed when the session is released. SessionHolder mSession; - const ClusterId mClusterId; EndpointId mEndpoint; Optional mTimeout; }; diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp index 12b2fe80ea87b9..2d78993a69ad48 100644 --- a/src/controller/CHIPDeviceController.cpp +++ b/src/controller/CHIPDeviceController.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #include @@ -969,8 +968,7 @@ CHIP_ERROR DeviceCommissioner::SendCertificateChainRequestCommand(DeviceProxy * OperationalCredentials::Commands::CertificateChainRequest::Type request; request.certificateType = static_cast(certificateType); - return SendCommand(device, request, OnCertificateChainResponse, - OnCertificateChainFailureResponse, timeout); + return SendCommand(device, request, OnCertificateChainResponse, OnCertificateChainFailureResponse, timeout); return CHIP_NO_ERROR; } @@ -1006,8 +1004,7 @@ CHIP_ERROR DeviceCommissioner::SendAttestationRequestCommand(DeviceProxy * devic OperationalCredentials::Commands::AttestationRequest::Type request; request.attestationNonce = attestationNonce; - ReturnErrorOnFailure( - SendCommand(device, request, OnAttestationResponse, OnAttestationFailureResponse, timeout)); + ReturnErrorOnFailure(SendCommand(device, request, OnAttestationResponse, OnAttestationFailureResponse, timeout)); ChipLogDetail(Controller, "Sent Attestation request, waiting for the Attestation Information"); return CHIP_NO_ERROR; } @@ -1140,7 +1137,7 @@ void DeviceCommissioner::ExtendArmFailSafe(DeviceProxy * proxy, CommissioningSta request.expiryLengthSeconds = armFailSafeTimeout; request.breadcrumb = breadcrumb; ChipLogProgress(Controller, "Arming failsafe (%u seconds)", request.expiryLengthSeconds); - SendCommand(proxy, request, onSuccess, onFailure, kRootEndpointId, commandTimeout); + SendCommand(proxy, request, onSuccess, onFailure, kRootEndpointId, commandTimeout); } void DeviceCommissioner::ExtendArmFailSafeForDeviceAttestation(const Credentials::DeviceAttestationVerifier::AttestationInfo & info, @@ -1162,9 +1159,8 @@ void DeviceCommissioner::ExtendArmFailSafeForDeviceAttestation(const Credentials ChipLogProgress(Controller, "Changing fail-safe timer to %u seconds to handle DA failure", request.expiryLengthSeconds); // Per spec, anything we do with the fail-safe armed must not time out // in less than kMinimumCommissioningStepTimeout. - SendCommand(mDeviceBeingCommissioned, request, OnArmFailSafeExtendedForDeviceAttestation, - OnFailedToExtendedArmFailSafeDeviceAttestation, - MakeOptional(kMinimumCommissioningStepTimeout)); + SendCommand(mDeviceBeingCommissioned, request, OnArmFailSafeExtendedForDeviceAttestation, + OnFailedToExtendedArmFailSafeDeviceAttestation, MakeOptional(kMinimumCommissioningStepTimeout)); } else { @@ -1217,8 +1213,7 @@ CHIP_ERROR DeviceCommissioner::SendOperationalCertificateSigningRequestCommand(D OperationalCredentials::Commands::CSRRequest::Type request; request.CSRNonce = csrNonce; - ReturnErrorOnFailure(SendCommand(device, request, OnOperationalCertificateSigningRequest, - OnCSRFailureResponse, timeout)); + ReturnErrorOnFailure(SendCommand(device, request, OnOperationalCertificateSigningRequest, OnCSRFailureResponse, timeout)); ChipLogDetail(Controller, "Sent CSR request, waiting for the CSR"); return CHIP_NO_ERROR; } @@ -1340,8 +1335,7 @@ CHIP_ERROR DeviceCommissioner::SendOperationalCertificate(DeviceProxy * device, request.caseAdminSubject = adminSubject; request.adminVendorId = mVendorId; - ReturnErrorOnFailure(SendCommand(device, request, OnOperationalCertificateAddResponse, - OnAddNOCFailureResponse, timeout)); + ReturnErrorOnFailure(SendCommand(device, request, OnOperationalCertificateAddResponse, OnAddNOCFailureResponse, timeout)); ChipLogProgress(Controller, "Sent operational certificate to the device"); @@ -1425,8 +1419,7 @@ CHIP_ERROR DeviceCommissioner::SendTrustedRootCertificate(DeviceProxy * device, OperationalCredentials::Commands::AddTrustedRootCertificate::Type request; request.rootCACertificate = rcac; - ReturnErrorOnFailure( - SendCommand(device, request, OnRootCertSuccessResponse, OnRootCertFailureResponse, timeout)); + ReturnErrorOnFailure(SendCommand(device, request, OnRootCertSuccessResponse, OnRootCertFailureResponse, timeout)); ChipLogProgress(Controller, "Sent root certificate to the device"); @@ -1576,8 +1569,8 @@ void DeviceCommissioner::CleanupCommissioning(DeviceProxy * proxy, NodeId nodeId ChipLogProgress(Controller, "Expiring failsafe on proxy %p", proxy); mDeviceBeingCommissioned = proxy; // We actually want to do the same thing on success or failure because we're already in a failure state - SendCommand(proxy, request, OnDisarmFailsafe, OnDisarmFailsafeFailure, - /* timeout = */ NullOptional); + SendCommand(proxy, request, OnDisarmFailsafe, OnDisarmFailsafeFailure, + /* timeout = */ NullOptional); } } @@ -2187,7 +2180,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio request.ssid.Emplace(params.GetWiFiCredentials().Value().ssid); } request.breadcrumb.Emplace(breadcrumb); - SendCommand(proxy, request, OnScanNetworksResponse, OnScanNetworksFailure, endpoint, timeout); + SendCommand(proxy, request, OnScanNetworksResponse, OnScanNetworksFailure, endpoint, timeout); break; } case CommissioningStage::kNeedsNetworkCreds: { @@ -2253,7 +2246,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio request.newRegulatoryConfig = regulatoryConfig; request.countryCode = countryCode; request.breadcrumb = breadcrumb; - SendCommand(proxy, request, OnSetRegulatoryConfigResponse, OnBasicFailure, endpoint, timeout); + SendCommand(proxy, request, OnSetRegulatoryConfigResponse, OnBasicFailure, endpoint, timeout); } break; case CommissioningStage::kSendPAICertificateRequest: @@ -2398,7 +2391,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio request.ssid = params.GetWiFiCredentials().Value().ssid; request.credentials = params.GetWiFiCredentials().Value().credentials; request.breadcrumb.Emplace(breadcrumb); - SendCommand(proxy, request, OnNetworkConfigResponse, OnBasicFailure, endpoint, timeout); + SendCommand(proxy, request, OnNetworkConfigResponse, OnBasicFailure, endpoint, timeout); } break; case CommissioningStage::kThreadNetworkSetup: { @@ -2411,7 +2404,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio NetworkCommissioning::Commands::AddOrUpdateThreadNetwork::Type request; request.operationalDataset = params.GetThreadOperationalDataset().Value(); request.breadcrumb.Emplace(breadcrumb); - SendCommand(proxy, request, OnNetworkConfigResponse, OnBasicFailure, endpoint, timeout); + SendCommand(proxy, request, OnNetworkConfigResponse, OnBasicFailure, endpoint, timeout); } break; case CommissioningStage::kWiFiNetworkEnable: { @@ -2424,7 +2417,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio NetworkCommissioning::Commands::ConnectNetwork::Type request; request.networkID = params.GetWiFiCredentials().Value().ssid; request.breadcrumb.Emplace(breadcrumb); - SendCommand(proxy, request, OnConnectNetworkResponse, OnBasicFailure, endpoint, timeout); + SendCommand(proxy, request, OnConnectNetworkResponse, OnBasicFailure, endpoint, timeout); } break; case CommissioningStage::kThreadNetworkEnable: { @@ -2441,7 +2434,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio NetworkCommissioning::Commands::ConnectNetwork::Type request; request.networkID = extendedPanId; request.breadcrumb.Emplace(breadcrumb); - SendCommand(proxy, request, OnConnectNetworkResponse, OnBasicFailure, endpoint, timeout); + SendCommand(proxy, request, OnConnectNetworkResponse, OnBasicFailure, endpoint, timeout); } break; case CommissioningStage::kFindOperational: { @@ -2453,8 +2446,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio break; case CommissioningStage::kSendComplete: { GeneralCommissioning::Commands::CommissioningComplete::Type request; - SendCommand(proxy, request, OnCommissioningCompleteResponse, OnBasicFailure, endpoint, - timeout); + SendCommand(proxy, request, OnCommissioningCompleteResponse, OnBasicFailure, endpoint, timeout); } break; case CommissioningStage::kCleanup: diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h index 43007178b55609..d73950fd110b75 100644 --- a/src/controller/CHIPDeviceController.h +++ b/src/controller/CHIPDeviceController.h @@ -861,20 +861,20 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController, CommissioneeDeviceProxy * FindCommissioneeDevice(const Transport::PeerAddress & peerAddress); void ReleaseCommissioneeDevice(CommissioneeDeviceProxy * device); - template + template CHIP_ERROR SendCommand(DeviceProxy * device, const RequestObjectT & request, CommandResponseSuccessCallback successCb, CommandResponseFailureCallback failureCb, Optional timeout) { - return SendCommand(device, request, successCb, failureCb, 0, timeout); + return SendCommand(device, request, successCb, failureCb, 0, timeout); } - template + template CHIP_ERROR SendCommand(DeviceProxy * device, const RequestObjectT & request, CommandResponseSuccessCallback successCb, CommandResponseFailureCallback failureCb, EndpointId endpoint, Optional timeout) { - ClusterObjectT cluster(*device->GetExchangeManager(), device->GetSecureSession().Value(), endpoint); + ClusterBase cluster(*device->GetExchangeManager(), device->GetSecureSession().Value(), endpoint); cluster.SetCommandTimeout(timeout); return cluster.InvokeCommand(request, this, successCb, failureCb); diff --git a/src/controller/CommissioneeDeviceProxy.cpp b/src/controller/CommissioneeDeviceProxy.cpp index 1bd2952e72a9d4..f809c3785094a3 100644 --- a/src/controller/CommissioneeDeviceProxy.cpp +++ b/src/controller/CommissioneeDeviceProxy.cpp @@ -26,8 +26,6 @@ #include -#include - #include #include #include diff --git a/src/controller/CommissioningWindowOpener.cpp b/src/controller/CommissioningWindowOpener.cpp index 0687ec15889339..cfe0fe6bc03864 100644 --- a/src/controller/CommissioningWindowOpener.cpp +++ b/src/controller/CommissioningWindowOpener.cpp @@ -22,7 +22,6 @@ #include #include #include -#include using namespace chip::app::Clusters; using namespace chip::System::Clock; @@ -131,7 +130,7 @@ CHIP_ERROR CommissioningWindowOpener::OpenCommissioningWindowInternal(Messaging: constexpr EndpointId kAdministratorCommissioningClusterEndpoint = 0; - AdministratorCommissioningCluster cluster(exchangeMgr, sessionHandle, kAdministratorCommissioningClusterEndpoint); + ClusterBase cluster(exchangeMgr, sessionHandle, kAdministratorCommissioningClusterEndpoint); if (mCommissioningWindowOption != CommissioningWindowOption::kOriginalSetupCode) { @@ -271,18 +270,18 @@ void CommissioningWindowOpener::OnDeviceConnectedCallback(void * context, Messag switch (self->mNextStep) { case Step::kReadVID: { - BasicInformationCluster cluster(exchangeMgr, sessionHandle, kRootEndpointId); - err = cluster.ReadAttribute(context, OnVIDReadResponse, - OnVIDPIDReadFailureResponse); + ClusterBase cluster(exchangeMgr, sessionHandle, kRootEndpointId); + err = cluster.ReadAttribute(context, OnVIDReadResponse, + OnVIDPIDReadFailureResponse); #if CHIP_ERROR_LOGGING messageIfError = "Could not read VID for opening commissioning window"; #endif // CHIP_ERROR_LOGGING break; } case Step::kReadPID: { - BasicInformationCluster cluster(exchangeMgr, sessionHandle, kRootEndpointId); - err = cluster.ReadAttribute(context, OnPIDReadResponse, - OnVIDPIDReadFailureResponse); + ClusterBase cluster(exchangeMgr, sessionHandle, kRootEndpointId); + err = cluster.ReadAttribute(context, OnPIDReadResponse, + OnVIDPIDReadFailureResponse); #if CHIP_ERROR_LOGGING messageIfError = "Could not read PID for opening commissioning window"; #endif // CHIP_ERROR_LOGGING diff --git a/src/controller/CurrentFabricRemover.cpp b/src/controller/CurrentFabricRemover.cpp index 6ed3af2a4aaa20..805504cb3708e1 100644 --- a/src/controller/CurrentFabricRemover.cpp +++ b/src/controller/CurrentFabricRemover.cpp @@ -19,7 +19,6 @@ #include #include -#include using namespace chip::app::Clusters; @@ -38,8 +37,8 @@ CHIP_ERROR CurrentFabricRemover::RemoveCurrentFabric(NodeId remoteNodeId, Callba CHIP_ERROR CurrentFabricRemover::ReadCurrentFabricIndex(Messaging::ExchangeManager & exchangeMgr, const SessionHandle & sessionHandle) { - using TypeInfo = chip::app::Clusters::OperationalCredentials::Attributes::CurrentFabricIndex::TypeInfo; - OperationalCredentialsCluster cluster(exchangeMgr, sessionHandle, kRootEndpointId); + using TypeInfo = OperationalCredentials::Attributes::CurrentFabricIndex::TypeInfo; + ClusterBase cluster(exchangeMgr, sessionHandle, kRootEndpointId); return cluster.ReadAttribute(this, OnSuccessReadCurrentFabricIndex, OnReadAttributeFailure); } @@ -55,7 +54,7 @@ CHIP_ERROR CurrentFabricRemover::SendRemoveFabricIndex(Messaging::ExchangeManage OperationalCredentials::Commands::RemoveFabric::Type request; request.fabricIndex = mFabricIndex; - OperationalCredentialsCluster cluster(exchangeMgr, sessionHandle, 0); + ClusterBase cluster(exchangeMgr, sessionHandle, 0); return cluster.InvokeCommand(request, this, OnSuccessRemoveFabric, OnCommandFailure); } diff --git a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj index 2ffb4a32b0827a..6369a943c8ec7e 100644 --- a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj +++ b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj @@ -1016,7 +1016,7 @@ "$(CHIP_ROOT)/zzz_generated/app-common", "$(CHIP_ROOT)/zzz_generated/controller-clusters", /* darwin-specific bypassing compile time codegen for header inclusion */ - "$(CHIP_ROOT)/zzz_generated/darwin/src/controller/data_model/controller-clusters/zap/app-templates", + "$(CHIP_ROOT)/zzz_generated/darwin/controller-clusters", ); INFOPLIST_FILE = CHIP/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1172,7 +1172,7 @@ "$(CHIP_ROOT)/zzz_generated/app-common", "$(CHIP_ROOT)/zzz_generated/controller-clusters", /* darwin-specific bypassing compile time codegen for header inclusion */ - "$(CHIP_ROOT)/zzz_generated/darwin/src/controller/data_model/controller-clusters/zap/app-templates", + "$(CHIP_ROOT)/zzz_generated/darwin/controller-clusters", ); INFOPLIST_FILE = CHIP/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; diff --git a/src/darwin/Framework/chip_xcode_build_connector.sh b/src/darwin/Framework/chip_xcode_build_connector.sh index 013f01c9c782a8..5d8459b835681b 100755 --- a/src/darwin/Framework/chip_xcode_build_connector.sh +++ b/src/darwin/Framework/chip_xcode_build_connector.sh @@ -96,7 +96,6 @@ declare -a args=( "target_defines=$target_defines" "target_cflags=[$target_cflags]" "mac_target_arch=\"$target_arch\"" - "chip_code_pre_generated_directory=\"$CHIP_ROOT/zzz_generated/darwin\"" "mac_deployment_target=\"$LLVM_TARGET_TRIPLE_OS_VERSION$LLVM_TARGET_TRIPLE_SUFFIX\"" ) diff --git a/zzz_generated/darwin/src/controller/data_model/controller-clusters/zap/app-templates/zap-generated/CHIPClientCallbacks.h b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h similarity index 100% rename from zzz_generated/darwin/src/controller/data_model/controller-clusters/zap/app-templates/zap-generated/CHIPClientCallbacks.h rename to zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h diff --git a/zzz_generated/darwin/src/controller/data_model/controller-clusters/zap/app-templates/zap-generated/CHIPClusters.h b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h similarity index 74% rename from zzz_generated/darwin/src/controller/data_model/controller-clusters/zap/app-templates/zap-generated/CHIPClusters.h rename to zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h index bce0b37f930e41..bc03b37dc2ac4a 100644 --- a/zzz_generated/darwin/src/controller/data_model/controller-clusters/zap/app-templates/zap-generated/CHIPClusters.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h @@ -34,7 +34,7 @@ class DLL_EXPORT IdentifyCluster : public ClusterBase { public: IdentifyCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::Identify::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~IdentifyCluster() {} }; @@ -43,7 +43,7 @@ class DLL_EXPORT GroupsCluster : public ClusterBase { public: GroupsCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::Groups::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~GroupsCluster() {} }; @@ -52,7 +52,7 @@ class DLL_EXPORT ScenesCluster : public ClusterBase { public: ScenesCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::Scenes::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~ScenesCluster() {} }; @@ -61,7 +61,7 @@ class DLL_EXPORT OnOffCluster : public ClusterBase { public: OnOffCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::OnOff::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~OnOffCluster() {} }; @@ -71,7 +71,7 @@ class DLL_EXPORT OnOffSwitchConfigurationCluster : public ClusterBase public: OnOffSwitchConfigurationCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::OnOffSwitchConfiguration::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~OnOffSwitchConfigurationCluster() {} }; @@ -80,7 +80,7 @@ class DLL_EXPORT LevelControlCluster : public ClusterBase { public: LevelControlCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::LevelControl::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~LevelControlCluster() {} }; @@ -89,7 +89,7 @@ class DLL_EXPORT BinaryInputBasicCluster : public ClusterBase { public: BinaryInputBasicCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::BinaryInputBasic::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~BinaryInputBasicCluster() {} }; @@ -98,7 +98,7 @@ class DLL_EXPORT DescriptorCluster : public ClusterBase { public: DescriptorCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::Descriptor::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~DescriptorCluster() {} }; @@ -107,7 +107,7 @@ class DLL_EXPORT BindingCluster : public ClusterBase { public: BindingCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::Binding::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~BindingCluster() {} }; @@ -116,7 +116,7 @@ class DLL_EXPORT AccessControlCluster : public ClusterBase { public: AccessControlCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::AccessControl::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~AccessControlCluster() {} }; @@ -125,7 +125,7 @@ class DLL_EXPORT ActionsCluster : public ClusterBase { public: ActionsCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::Actions::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~ActionsCluster() {} }; @@ -134,7 +134,7 @@ class DLL_EXPORT BasicInformationCluster : public ClusterBase { public: BasicInformationCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::BasicInformation::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~BasicInformationCluster() {} }; @@ -144,7 +144,7 @@ class DLL_EXPORT OtaSoftwareUpdateProviderCluster : public ClusterBase public: OtaSoftwareUpdateProviderCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::OtaSoftwareUpdateProvider::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~OtaSoftwareUpdateProviderCluster() {} }; @@ -154,7 +154,7 @@ class DLL_EXPORT OtaSoftwareUpdateRequestorCluster : public ClusterBase public: OtaSoftwareUpdateRequestorCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::OtaSoftwareUpdateRequestor::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~OtaSoftwareUpdateRequestorCluster() {} }; @@ -164,7 +164,7 @@ class DLL_EXPORT LocalizationConfigurationCluster : public ClusterBase public: LocalizationConfigurationCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::LocalizationConfiguration::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~LocalizationConfigurationCluster() {} }; @@ -174,7 +174,7 @@ class DLL_EXPORT TimeFormatLocalizationCluster : public ClusterBase public: TimeFormatLocalizationCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::TimeFormatLocalization::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~TimeFormatLocalizationCluster() {} }; @@ -183,7 +183,7 @@ class DLL_EXPORT UnitLocalizationCluster : public ClusterBase { public: UnitLocalizationCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::UnitLocalization::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~UnitLocalizationCluster() {} }; @@ -193,7 +193,7 @@ class DLL_EXPORT PowerSourceConfigurationCluster : public ClusterBase public: PowerSourceConfigurationCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::PowerSourceConfiguration::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~PowerSourceConfigurationCluster() {} }; @@ -202,7 +202,7 @@ class DLL_EXPORT PowerSourceCluster : public ClusterBase { public: PowerSourceCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::PowerSource::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~PowerSourceCluster() {} }; @@ -211,7 +211,7 @@ class DLL_EXPORT GeneralCommissioningCluster : public ClusterBase { public: GeneralCommissioningCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::GeneralCommissioning::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~GeneralCommissioningCluster() {} }; @@ -220,7 +220,7 @@ class DLL_EXPORT NetworkCommissioningCluster : public ClusterBase { public: NetworkCommissioningCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::NetworkCommissioning::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~NetworkCommissioningCluster() {} }; @@ -229,7 +229,7 @@ class DLL_EXPORT DiagnosticLogsCluster : public ClusterBase { public: DiagnosticLogsCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::DiagnosticLogs::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~DiagnosticLogsCluster() {} }; @@ -238,7 +238,7 @@ class DLL_EXPORT GeneralDiagnosticsCluster : public ClusterBase { public: GeneralDiagnosticsCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::GeneralDiagnostics::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~GeneralDiagnosticsCluster() {} }; @@ -247,7 +247,7 @@ class DLL_EXPORT SoftwareDiagnosticsCluster : public ClusterBase { public: SoftwareDiagnosticsCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::SoftwareDiagnostics::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~SoftwareDiagnosticsCluster() {} }; @@ -257,7 +257,7 @@ class DLL_EXPORT ThreadNetworkDiagnosticsCluster : public ClusterBase public: ThreadNetworkDiagnosticsCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::ThreadNetworkDiagnostics::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~ThreadNetworkDiagnosticsCluster() {} }; @@ -267,7 +267,7 @@ class DLL_EXPORT WiFiNetworkDiagnosticsCluster : public ClusterBase public: WiFiNetworkDiagnosticsCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::WiFiNetworkDiagnostics::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~WiFiNetworkDiagnosticsCluster() {} }; @@ -277,7 +277,7 @@ class DLL_EXPORT EthernetNetworkDiagnosticsCluster : public ClusterBase public: EthernetNetworkDiagnosticsCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::EthernetNetworkDiagnostics::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~EthernetNetworkDiagnosticsCluster() {} }; @@ -287,7 +287,7 @@ class DLL_EXPORT BridgedDeviceBasicInformationCluster : public ClusterBase public: BridgedDeviceBasicInformationCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::BridgedDeviceBasicInformation::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~BridgedDeviceBasicInformationCluster() {} }; @@ -296,7 +296,7 @@ class DLL_EXPORT SwitchCluster : public ClusterBase { public: SwitchCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::Switch::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~SwitchCluster() {} }; @@ -306,7 +306,7 @@ class DLL_EXPORT AdministratorCommissioningCluster : public ClusterBase public: AdministratorCommissioningCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::AdministratorCommissioning::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~AdministratorCommissioningCluster() {} }; @@ -316,7 +316,7 @@ class DLL_EXPORT OperationalCredentialsCluster : public ClusterBase public: OperationalCredentialsCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::OperationalCredentials::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~OperationalCredentialsCluster() {} }; @@ -325,7 +325,7 @@ class DLL_EXPORT GroupKeyManagementCluster : public ClusterBase { public: GroupKeyManagementCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::GroupKeyManagement::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~GroupKeyManagementCluster() {} }; @@ -334,7 +334,7 @@ class DLL_EXPORT FixedLabelCluster : public ClusterBase { public: FixedLabelCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::FixedLabel::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~FixedLabelCluster() {} }; @@ -343,7 +343,7 @@ class DLL_EXPORT UserLabelCluster : public ClusterBase { public: UserLabelCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::UserLabel::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~UserLabelCluster() {} }; @@ -352,7 +352,7 @@ class DLL_EXPORT BooleanStateCluster : public ClusterBase { public: BooleanStateCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::BooleanState::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~BooleanStateCluster() {} }; @@ -361,7 +361,7 @@ class DLL_EXPORT ModeSelectCluster : public ClusterBase { public: ModeSelectCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::ModeSelect::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~ModeSelectCluster() {} }; @@ -370,7 +370,7 @@ class DLL_EXPORT DoorLockCluster : public ClusterBase { public: DoorLockCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::DoorLock::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~DoorLockCluster() {} }; @@ -379,7 +379,7 @@ class DLL_EXPORT WindowCoveringCluster : public ClusterBase { public: WindowCoveringCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::WindowCovering::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~WindowCoveringCluster() {} }; @@ -388,7 +388,7 @@ class DLL_EXPORT BarrierControlCluster : public ClusterBase { public: BarrierControlCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::BarrierControl::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~BarrierControlCluster() {} }; @@ -398,7 +398,7 @@ class DLL_EXPORT PumpConfigurationAndControlCluster : public ClusterBase public: PumpConfigurationAndControlCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::PumpConfigurationAndControl::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~PumpConfigurationAndControlCluster() {} }; @@ -407,7 +407,7 @@ class DLL_EXPORT ThermostatCluster : public ClusterBase { public: ThermostatCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::Thermostat::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~ThermostatCluster() {} }; @@ -416,7 +416,7 @@ class DLL_EXPORT FanControlCluster : public ClusterBase { public: FanControlCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::FanControl::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~FanControlCluster() {} }; @@ -426,7 +426,7 @@ class DLL_EXPORT ThermostatUserInterfaceConfigurationCluster : public ClusterBas public: ThermostatUserInterfaceConfigurationCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::ThermostatUserInterfaceConfiguration::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~ThermostatUserInterfaceConfigurationCluster() {} }; @@ -435,7 +435,7 @@ class DLL_EXPORT ColorControlCluster : public ClusterBase { public: ColorControlCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::ColorControl::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~ColorControlCluster() {} }; @@ -444,7 +444,7 @@ class DLL_EXPORT BallastConfigurationCluster : public ClusterBase { public: BallastConfigurationCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::BallastConfiguration::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~BallastConfigurationCluster() {} }; @@ -454,7 +454,7 @@ class DLL_EXPORT IlluminanceMeasurementCluster : public ClusterBase public: IlluminanceMeasurementCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::IlluminanceMeasurement::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~IlluminanceMeasurementCluster() {} }; @@ -464,7 +464,7 @@ class DLL_EXPORT TemperatureMeasurementCluster : public ClusterBase public: TemperatureMeasurementCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::TemperatureMeasurement::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~TemperatureMeasurementCluster() {} }; @@ -473,7 +473,7 @@ class DLL_EXPORT PressureMeasurementCluster : public ClusterBase { public: PressureMeasurementCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::PressureMeasurement::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~PressureMeasurementCluster() {} }; @@ -482,7 +482,7 @@ class DLL_EXPORT FlowMeasurementCluster : public ClusterBase { public: FlowMeasurementCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::FlowMeasurement::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~FlowMeasurementCluster() {} }; @@ -492,7 +492,7 @@ class DLL_EXPORT RelativeHumidityMeasurementCluster : public ClusterBase public: RelativeHumidityMeasurementCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::RelativeHumidityMeasurement::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~RelativeHumidityMeasurementCluster() {} }; @@ -501,7 +501,7 @@ class DLL_EXPORT OccupancySensingCluster : public ClusterBase { public: OccupancySensingCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::OccupancySensing::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~OccupancySensingCluster() {} }; @@ -510,7 +510,7 @@ class DLL_EXPORT WakeOnLanCluster : public ClusterBase { public: WakeOnLanCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::WakeOnLan::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~WakeOnLanCluster() {} }; @@ -519,7 +519,7 @@ class DLL_EXPORT ChannelCluster : public ClusterBase { public: ChannelCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::Channel::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~ChannelCluster() {} }; @@ -528,7 +528,7 @@ class DLL_EXPORT TargetNavigatorCluster : public ClusterBase { public: TargetNavigatorCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::TargetNavigator::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~TargetNavigatorCluster() {} }; @@ -537,7 +537,7 @@ class DLL_EXPORT MediaPlaybackCluster : public ClusterBase { public: MediaPlaybackCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::MediaPlayback::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~MediaPlaybackCluster() {} }; @@ -546,7 +546,7 @@ class DLL_EXPORT MediaInputCluster : public ClusterBase { public: MediaInputCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::MediaInput::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~MediaInputCluster() {} }; @@ -555,7 +555,7 @@ class DLL_EXPORT LowPowerCluster : public ClusterBase { public: LowPowerCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::LowPower::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~LowPowerCluster() {} }; @@ -564,7 +564,7 @@ class DLL_EXPORT KeypadInputCluster : public ClusterBase { public: KeypadInputCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::KeypadInput::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~KeypadInputCluster() {} }; @@ -573,7 +573,7 @@ class DLL_EXPORT ContentLauncherCluster : public ClusterBase { public: ContentLauncherCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::ContentLauncher::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~ContentLauncherCluster() {} }; @@ -582,7 +582,7 @@ class DLL_EXPORT AudioOutputCluster : public ClusterBase { public: AudioOutputCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::AudioOutput::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~AudioOutputCluster() {} }; @@ -591,7 +591,7 @@ class DLL_EXPORT ApplicationLauncherCluster : public ClusterBase { public: ApplicationLauncherCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::ApplicationLauncher::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~ApplicationLauncherCluster() {} }; @@ -600,7 +600,7 @@ class DLL_EXPORT ApplicationBasicCluster : public ClusterBase { public: ApplicationBasicCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::ApplicationBasic::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~ApplicationBasicCluster() {} }; @@ -609,7 +609,7 @@ class DLL_EXPORT AccountLoginCluster : public ClusterBase { public: AccountLoginCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::AccountLogin::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~AccountLoginCluster() {} }; @@ -618,7 +618,7 @@ class DLL_EXPORT ElectricalMeasurementCluster : public ClusterBase { public: ElectricalMeasurementCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::ElectricalMeasurement::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~ElectricalMeasurementCluster() {} }; @@ -627,7 +627,7 @@ class DLL_EXPORT ClientMonitoringCluster : public ClusterBase { public: ClientMonitoringCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::ClientMonitoring::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~ClientMonitoringCluster() {} }; @@ -636,7 +636,7 @@ class DLL_EXPORT UnitTestingCluster : public ClusterBase { public: UnitTestingCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : - ClusterBase(exchangeManager, session, app::Clusters::UnitTesting::Id, endpoint) + ClusterBase(exchangeManager, session, endpoint) {} ~UnitTestingCluster() {} }; diff --git a/zzz_generated/darwin/src/controller/data_model/controller-clusters/zap/app-templates/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/darwin/controller-clusters/zap-generated/IMClusterCommandHandler.cpp similarity index 100% rename from zzz_generated/darwin/src/controller/data_model/controller-clusters/zap/app-templates/zap-generated/IMClusterCommandHandler.cpp rename to zzz_generated/darwin/controller-clusters/zap-generated/IMClusterCommandHandler.cpp diff --git a/zzz_generated/darwin/src/controller/data_model/controller-clusters/zap/app-templates/zap-generated/access.h b/zzz_generated/darwin/controller-clusters/zap-generated/access.h similarity index 100% rename from zzz_generated/darwin/src/controller/data_model/controller-clusters/zap/app-templates/zap-generated/access.h rename to zzz_generated/darwin/controller-clusters/zap-generated/access.h diff --git a/zzz_generated/darwin/src/controller/data_model/controller-clusters/zap/app-templates/zap-generated/endpoint_config.h b/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h similarity index 100% rename from zzz_generated/darwin/src/controller/data_model/controller-clusters/zap/app-templates/zap-generated/endpoint_config.h rename to zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h diff --git a/zzz_generated/darwin/src/controller/data_model/controller-clusters/zap/app-templates/zap-generated/gen_config.h b/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h similarity index 100% rename from zzz_generated/darwin/src/controller/data_model/controller-clusters/zap/app-templates/zap-generated/gen_config.h rename to zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h diff --git a/zzz_generated/darwin/src/controller/data_model/controller-clusters/codegen/cpp-app/app/PluginApplicationCallbacks.h b/zzz_generated/darwin/src/controller/data_model/controller-clusters/codegen/cpp-app/app/PluginApplicationCallbacks.h deleted file mode 100644 index 3a068016e2970e..00000000000000 --- a/zzz_generated/darwin/src/controller/data_model/controller-clusters/codegen/cpp-app/app/PluginApplicationCallbacks.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define MATTER_PLUGINS_INIT \ - (void)0; /* No server side clusters */ - diff --git a/zzz_generated/darwin/src/controller/data_model/controller-clusters/codegen/cpp-app/app/callback-stub.cpp b/zzz_generated/darwin/src/controller/data_model/controller-clusters/codegen/cpp-app/app/callback-stub.cpp deleted file mode 100644 index 3ded47fafc54b4..00000000000000 --- a/zzz_generated/darwin/src/controller/data_model/controller-clusters/codegen/cpp-app/app/callback-stub.cpp +++ /dev/null @@ -1,545 +0,0 @@ -#include -#include -#include -#include - -using namespace chip; - -// Cluster Init Functions -void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) -{ - switch (clusterId) - { - case app::Clusters::AccessControl::Id: - emberAfAccessControlClusterInitCallback(endpoint); - break; - case app::Clusters::AccountLogin::Id: - emberAfAccountLoginClusterInitCallback(endpoint); - break; - case app::Clusters::Actions::Id: - emberAfActionsClusterInitCallback(endpoint); - break; - case app::Clusters::AdministratorCommissioning::Id: - emberAfAdministratorCommissioningClusterInitCallback(endpoint); - break; - case app::Clusters::ApplicationBasic::Id: - emberAfApplicationBasicClusterInitCallback(endpoint); - break; - case app::Clusters::ApplicationLauncher::Id: - emberAfApplicationLauncherClusterInitCallback(endpoint); - break; - case app::Clusters::AudioOutput::Id: - emberAfAudioOutputClusterInitCallback(endpoint); - break; - case app::Clusters::BallastConfiguration::Id: - emberAfBallastConfigurationClusterInitCallback(endpoint); - break; - case app::Clusters::BarrierControl::Id: - emberAfBarrierControlClusterInitCallback(endpoint); - break; - case app::Clusters::BasicInformation::Id: - emberAfBasicInformationClusterInitCallback(endpoint); - break; - case app::Clusters::BinaryInputBasic::Id: - emberAfBinaryInputBasicClusterInitCallback(endpoint); - break; - case app::Clusters::Binding::Id: - emberAfBindingClusterInitCallback(endpoint); - break; - case app::Clusters::BooleanState::Id: - emberAfBooleanStateClusterInitCallback(endpoint); - break; - case app::Clusters::BridgedDeviceBasicInformation::Id: - emberAfBridgedDeviceBasicInformationClusterInitCallback(endpoint); - break; - case app::Clusters::Channel::Id: - emberAfChannelClusterInitCallback(endpoint); - break; - case app::Clusters::ClientMonitoring::Id: - emberAfClientMonitoringClusterInitCallback(endpoint); - break; - case app::Clusters::ColorControl::Id: - emberAfColorControlClusterInitCallback(endpoint); - break; - case app::Clusters::ContentLauncher::Id: - emberAfContentLauncherClusterInitCallback(endpoint); - break; - case app::Clusters::Descriptor::Id: - emberAfDescriptorClusterInitCallback(endpoint); - break; - case app::Clusters::DiagnosticLogs::Id: - emberAfDiagnosticLogsClusterInitCallback(endpoint); - break; - case app::Clusters::DoorLock::Id: - emberAfDoorLockClusterInitCallback(endpoint); - break; - case app::Clusters::ElectricalMeasurement::Id: - emberAfElectricalMeasurementClusterInitCallback(endpoint); - break; - case app::Clusters::EthernetNetworkDiagnostics::Id: - emberAfEthernetNetworkDiagnosticsClusterInitCallback(endpoint); - break; - case app::Clusters::FanControl::Id: - emberAfFanControlClusterInitCallback(endpoint); - break; - case app::Clusters::FixedLabel::Id: - emberAfFixedLabelClusterInitCallback(endpoint); - break; - case app::Clusters::FlowMeasurement::Id: - emberAfFlowMeasurementClusterInitCallback(endpoint); - break; - case app::Clusters::GeneralCommissioning::Id: - emberAfGeneralCommissioningClusterInitCallback(endpoint); - break; - case app::Clusters::GeneralDiagnostics::Id: - emberAfGeneralDiagnosticsClusterInitCallback(endpoint); - break; - case app::Clusters::GroupKeyManagement::Id: - emberAfGroupKeyManagementClusterInitCallback(endpoint); - break; - case app::Clusters::Groups::Id: - emberAfGroupsClusterInitCallback(endpoint); - break; - case app::Clusters::Identify::Id: - emberAfIdentifyClusterInitCallback(endpoint); - break; - case app::Clusters::IlluminanceMeasurement::Id: - emberAfIlluminanceMeasurementClusterInitCallback(endpoint); - break; - case app::Clusters::KeypadInput::Id: - emberAfKeypadInputClusterInitCallback(endpoint); - break; - case app::Clusters::LevelControl::Id: - emberAfLevelControlClusterInitCallback(endpoint); - break; - case app::Clusters::LocalizationConfiguration::Id: - emberAfLocalizationConfigurationClusterInitCallback(endpoint); - break; - case app::Clusters::LowPower::Id: - emberAfLowPowerClusterInitCallback(endpoint); - break; - case app::Clusters::MediaInput::Id: - emberAfMediaInputClusterInitCallback(endpoint); - break; - case app::Clusters::MediaPlayback::Id: - emberAfMediaPlaybackClusterInitCallback(endpoint); - break; - case app::Clusters::ModeSelect::Id: - emberAfModeSelectClusterInitCallback(endpoint); - break; - case app::Clusters::NetworkCommissioning::Id: - emberAfNetworkCommissioningClusterInitCallback(endpoint); - break; - case app::Clusters::OccupancySensing::Id: - emberAfOccupancySensingClusterInitCallback(endpoint); - break; - case app::Clusters::OnOff::Id: - emberAfOnOffClusterInitCallback(endpoint); - break; - case app::Clusters::OnOffSwitchConfiguration::Id: - emberAfOnOffSwitchConfigurationClusterInitCallback(endpoint); - break; - case app::Clusters::OperationalCredentials::Id: - emberAfOperationalCredentialsClusterInitCallback(endpoint); - break; - case app::Clusters::OtaSoftwareUpdateProvider::Id: - emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); - break; - case app::Clusters::OtaSoftwareUpdateRequestor::Id: - emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); - break; - case app::Clusters::PowerSource::Id: - emberAfPowerSourceClusterInitCallback(endpoint); - break; - case app::Clusters::PowerSourceConfiguration::Id: - emberAfPowerSourceConfigurationClusterInitCallback(endpoint); - break; - case app::Clusters::PressureMeasurement::Id: - emberAfPressureMeasurementClusterInitCallback(endpoint); - break; - case app::Clusters::PumpConfigurationAndControl::Id: - emberAfPumpConfigurationAndControlClusterInitCallback(endpoint); - break; - case app::Clusters::RelativeHumidityMeasurement::Id: - emberAfRelativeHumidityMeasurementClusterInitCallback(endpoint); - break; - case app::Clusters::Scenes::Id: - emberAfScenesClusterInitCallback(endpoint); - break; - case app::Clusters::SoftwareDiagnostics::Id: - emberAfSoftwareDiagnosticsClusterInitCallback(endpoint); - break; - case app::Clusters::Switch::Id: - emberAfSwitchClusterInitCallback(endpoint); - break; - case app::Clusters::TargetNavigator::Id: - emberAfTargetNavigatorClusterInitCallback(endpoint); - break; - case app::Clusters::TemperatureMeasurement::Id: - emberAfTemperatureMeasurementClusterInitCallback(endpoint); - break; - case app::Clusters::Thermostat::Id: - emberAfThermostatClusterInitCallback(endpoint); - break; - case app::Clusters::ThermostatUserInterfaceConfiguration::Id: - emberAfThermostatUserInterfaceConfigurationClusterInitCallback(endpoint); - break; - case app::Clusters::ThreadNetworkDiagnostics::Id: - emberAfThreadNetworkDiagnosticsClusterInitCallback(endpoint); - break; - case app::Clusters::TimeFormatLocalization::Id: - emberAfTimeFormatLocalizationClusterInitCallback(endpoint); - break; - case app::Clusters::UnitLocalization::Id: - emberAfUnitLocalizationClusterInitCallback(endpoint); - break; - case app::Clusters::UnitTesting::Id: - emberAfUnitTestingClusterInitCallback(endpoint); - break; - case app::Clusters::UserLabel::Id: - emberAfUserLabelClusterInitCallback(endpoint); - break; - case app::Clusters::WakeOnLan::Id: - emberAfWakeOnLanClusterInitCallback(endpoint); - break; - case app::Clusters::WiFiNetworkDiagnostics::Id: - emberAfWiFiNetworkDiagnosticsClusterInitCallback(endpoint); - break; - case app::Clusters::WindowCovering::Id: - emberAfWindowCoveringClusterInitCallback(endpoint); - break; - default: - // Unrecognized cluster ID - break; - } -} -void __attribute__((weak)) emberAfAccessControlClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfAccountLoginClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfActionsClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfAdministratorCommissioningClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfApplicationBasicClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfApplicationLauncherClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfAudioOutputClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfBallastConfigurationClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfBarrierControlClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfBasicInformationClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfBinaryInputBasicClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfBindingClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfBooleanStateClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfBridgedDeviceBasicInformationClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfChannelClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfClientMonitoringClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfColorControlClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfContentLauncherClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfDescriptorClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfDiagnosticLogsClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfDoorLockClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfElectricalMeasurementClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfEthernetNetworkDiagnosticsClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfFanControlClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfFixedLabelClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfFlowMeasurementClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfGeneralCommissioningClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfGeneralDiagnosticsClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfGroupKeyManagementClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfGroupsClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfIdentifyClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfIlluminanceMeasurementClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfKeypadInputClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfLevelControlClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfLocalizationConfigurationClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfLowPowerClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfMediaInputClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfMediaPlaybackClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfModeSelectClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfNetworkCommissioningClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfOccupancySensingClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfOnOffClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfOnOffSwitchConfigurationClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfOperationalCredentialsClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfOtaSoftwareUpdateProviderClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfOtaSoftwareUpdateRequestorClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfPowerSourceClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfPowerSourceConfigurationClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfPressureMeasurementClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfPumpConfigurationAndControlClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfRelativeHumidityMeasurementClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfScenesClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfSoftwareDiagnosticsClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfSwitchClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfTargetNavigatorClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfTemperatureMeasurementClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfThermostatClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfThermostatUserInterfaceConfigurationClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfThreadNetworkDiagnosticsClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfTimeFormatLocalizationClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfUnitLocalizationClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfUnitTestingClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfUserLabelClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfWakeOnLanClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -} -void __attribute__((weak)) emberAfWindowCoveringClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void) endpoint; -}