Add setter API for SupportedModesManager

Author: jadhavrohit924

examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h

@@ -31,7 +31,7 @@ namespace ModeSelect {
  * This implementation statically defines the options.
  */
 
-class StaticSupportedModesManager : public chip::app::Clusters::ModeSelect::SupportedModesManager
+class StaticSupportedModesManager : public SupportedModesManager
 {
     using ModeOptionStructType = Structs::ModeOptionStruct::Type;
     using storage_value_type   = const ModeOptionStructType;
@@ -52,8 +52,6 @@ class StaticSupportedModesManager : public chip::app::Clusters::ModeSelect::Supp
     static const EndpointSpanPair supportedOptionsByEndpoints[MATTER_DM_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT];
 
 public:
-    static const StaticSupportedModesManager instance;
-
     SupportedModesManager::ModeOptionsProvider getModeOptionsProvider(EndpointId endpointId) const override;
 
     Protocols::InteractionModel::Status getModeOptionByMode(EndpointId endpointId, uint8_t mode,
@@ -62,12 +60,8 @@ class StaticSupportedModesManager : public chip::app::Clusters::ModeSelect::Supp
     ~StaticSupportedModesManager(){};
 
     StaticSupportedModesManager() {}
-
-    static inline const StaticSupportedModesManager & getStaticSupportedModesManagerInstance() { return instance; }
 };
 
-const SupportedModesManager * getSupportedModesManager();
-
 } // namespace ModeSelect
 } // namespace Clusters
 } // namespace app

examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp

@@ -39,8 +39,6 @@ const StaticSupportedModesManager::EndpointSpanPair
         EndpointSpanPair(1, Span<storage_value_type>(StaticSupportedModesManager::coffeeOptions)) // Options for Endpoint 1
     };
 
-const StaticSupportedModesManager StaticSupportedModesManager::instance = StaticSupportedModesManager();
-
 SupportedModesManager::ModeOptionsProvider StaticSupportedModesManager::getModeOptionsProvider(EndpointId endpointId) const
 {
     for (auto & endpointSpanPair : supportedOptionsByEndpoints)
@@ -76,8 +74,3 @@ Status StaticSupportedModesManager::getModeOptionByMode(unsigned short endpointI
     ChipLogProgress(Zcl, "Cannot find the mode %u", mode);
     return Status::InvalidCommand;
 }
-
-const ModeSelect::SupportedModesManager * ModeSelect::getSupportedModesManager()
-{
-    return &StaticSupportedModesManager::instance;
-}

examples/all-clusters-app/linux/main-common.cpp

@@ -58,6 +58,7 @@
 #include <platform/DeviceInstanceInfoProvider.h>
 #include <platform/DiagnosticDataProvider.h>
 #include <platform/PlatformManager.h>
+#include <static-supported-modes-manager.h>
 #include <static-supported-temperature-levels.h>
 #include <system/SystemPacketBuffer.h>
 #include <transport/SessionManager.h>
@@ -80,6 +81,7 @@ AllClustersCommandDelegate sAllClustersCommandDelegate;
 Clusters::WindowCovering::WindowCoveringManager sWindowCoveringManager;
 
 Clusters::TemperatureControl::AppSupportedTemperatureLevelsDelegate sAppSupportedTemperatureLevelsDelegate;
+Clusters::ModeSelect::StaticSupportedModesManager sStaticSupportedModesManager;
 Clusters::ValveConfigurationAndControl::ValveControlDelegate sValveDelegate;
 Clusters::TimeSynchronization::ExtendedTimeSyncDelegate sTimeSyncDelegate;
 
@@ -246,6 +248,8 @@ void ApplicationInit()
     MatterDishwasherAlarmServerInit();
 #endif
     Clusters::TemperatureControl::SetInstance(&sAppSupportedTemperatureLevelsDelegate);
+    Clusters::ModeSelect::setSupportedModesManager(&sStaticSupportedModesManager);
+    ;
 
     Clusters::ValveConfigurationAndControl::SetDefaultDelegate(chip::EndpointId(1), &sValveDelegate);
     Clusters::TimeSynchronization::SetDefaultDelegate(&sTimeSyncDelegate);

src/app/clusters/mode-select-server/mode-select-server.cpp

@@ -49,6 +49,17 @@ using BootReasonType = GeneralDiagnostics::BootReasonEnum;
 
 static InteractionModel::Status verifyModeValue(const EndpointId endpointId, const uint8_t newMode);
 
+ModeSelect::SupportedModesManager *sSupportedModesManager = nullptr;
+
+const SupportedModesManager * ModeSelect::getSupportedModesManager()
+{
+    return sSupportedModesManager;
+}
+
+void ModeSelect::setSupportedModesManager(ModeSelect::SupportedModesManager * aSupportedModesManager)
+{
+    sSupportedModesManager = aSupportedModesManager;
+}
 namespace {
 
 inline bool areStartUpModeAndCurrentModeNonVolatile(EndpointId endpoint);

src/app/clusters/mode-select-server/supported-modes-manager.h

@@ -34,7 +34,6 @@ class SupportedModesManager
 {
 
     using ModeOptionStructType = Structs::ModeOptionStruct::Type;
-
 public:
     /**
      * A class that can return the supported ModeOptions for a specific endpoint.
@@ -80,10 +79,13 @@ class SupportedModesManager
                                                                     const ModeOptionStructType ** dataPtr) const = 0;
 
     virtual ~SupportedModesManager() {}
+
 };
 
 const SupportedModesManager * getSupportedModesManager();
 
+void setSupportedModesManager(SupportedModesManager * aSupportedModesManager);
+
 } // namespace ModeSelect
 } // namespace Clusters
 } // namespace app