Updated All-cluster app

Author: lpbeliveau-silabs

examples/all-clusters-app/all-clusters-common/src/fan-stub.cpp

@@ -19,7 +19,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
-#include <app/AttributeAccessInterface.h>
 #include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/clusters/fan-control-server/fan-control-server.h>
 #include <app/util/attribute-storage.h>
@@ -34,13 +33,11 @@ using namespace chip::app::Clusters::FanControl::Attributes;
 using Protocols::InteractionModel::Status;
 
 namespace {
-class FanControlManager : public AttributeAccessInterface, public Delegate
+class FanControlManager : public FanControlAttributeAccessInterface, public Delegate
 {
 public:
     // Register for the FanControl cluster on all endpoints.
-    FanControlManager(EndpointId aEndpointId) :
-        AttributeAccessInterface(Optional<EndpointId>(aEndpointId), FanControl::Id), Delegate(aEndpointId)
-    {}
+    FanControlManager(EndpointId aEndpointId) : FanControlAttributeAccessInterface(aEndpointId), Delegate(aEndpointId) {}
 
     CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
     Status HandleStep(StepDirectionEnum aDirection, bool aWrap, bool aLowestOff) override;

src/app/clusters/fan-control-server/fan-control-server.cpp

@@ -51,8 +51,6 @@ static_assert(kFanControlDelegateTableSize <= kEmberInvalidEndpointIndex, "FanCo
 
 Delegate * gDelegateTable[kFanControlDelegateTableSize] = { nullptr };
 
-FanControlAttributeAccessInterface gFanControlAttributeAccess;
-
 } // anonymous namespace
 
 namespace chip {
@@ -522,8 +520,3 @@ bool emberAfFanControlClusterStepCallback(app::CommandHandler * commandObj, cons
     commandObj->AddStatus(commandPath, status);
     return true;
 }
-
-void MatterFanControlPluginServerInitCallback()
-{
-    AttributeAccessInterfaceRegistry::Instance().Register(&gFanControlAttributeAccess);
-}

src/app/clusters/fan-control-server/fan-control-server.h

@@ -18,8 +18,8 @@
 #pragma once
 
 #include "fan-control-delegate.h"
-#include <app-common/zap-generated/cluster-objects.h>
 #include <app/AttributeAccessInterface.h>
+#include <app-common/zap-generated/cluster-objects.h>
 #include <app/util/af-types.h>
 
 namespace chip {
@@ -30,7 +30,7 @@ namespace FanControl {
 class FanControlAttributeAccessInterface : public AttributeAccessInterface
 {
 public:
-    FanControlAttributeAccessInterface() : AttributeAccessInterface(Optional<EndpointId>(), Id) {}
+    FanControlAttributeAccessInterface(EndpointId aEndpoint) : AttributeAccessInterface(Optional<EndpointId>(aEndpoint), Id) {}
 
     CHIP_ERROR Write(const ConcreteDataAttributePath & aPath, AttributeValueDecoder & aDecoder) override;
     CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override { return CHIP_NO_ERROR; }

src/app/util/util.cpp

@@ -110,6 +110,7 @@ void MatterProxyConfigurationPluginServerInitCallback() {}
 void MatterActivatedCarbonFilterMonitoringPluginServerInitCallback() {}
 void MatterHepaFilterMonitoringPluginServerInitCallback() {}
 void MatterAirQualityPluginServerInitCallback() {}
+void MatterFanControlPluginServerInitCallback() {}
 void MatterCarbonMonoxideConcentrationMeasurementPluginServerInitCallback() {}
 void MatterCarbonDioxideConcentrationMeasurementPluginServerInitCallback() {}
 void MatterFormaldehydeConcentrationMeasurementPluginServerInitCallback() {}