ifdefing scenes table and server to allow building without the scenes cluster (#33641)

lpbeliveau-silabs · web-flow · commit 6d51857f9f6f · 2024-05-29T13:30:52.000Z
diff --git a/examples/lighting-app/silabs/src/AppTask.cpp b/examples/lighting-app/silabs/src/AppTask.cpp
@@ -24,7 +24,6 @@
 #include "LEDWidget.h"
 
 #include <app/clusters/on-off-server/on-off-server.h>
-#include <app/clusters/scenes-server/scenes-server.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp
@@ -431,15 +431,16 @@ ColorControlServer & ColorControlServer::Instance()
     return instance;
 }
 
+#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
 chip::scenes::SceneHandler * ColorControlServer::GetSceneHandler()
 {
-
-#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
+#if CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
     return &sColorControlSceneHandler;
 #else
     return nullptr;
-#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
+#endif // CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
 }
+#endif // ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
 
 bool ColorControlServer::HasFeature(chip::EndpointId endpoint, Feature feature)
 {
diff --git a/src/app/clusters/color-control-server/color-control-server.h b/src/app/clusters/color-control-server/color-control-server.h
@@ -20,14 +20,17 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
-#include <app/clusters/scenes-server/SceneTable.h>
 #include <app/util/af-types.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/basic-types.h>
 #include <app/util/config.h>
 #include <platform/CHIPDeviceConfig.h>
 #include <protocols/interaction_model/StatusCode.h>
 
+#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
+#include <app/clusters/scenes-server/SceneTable.h>
+#endif
+
 /**********************************************************
  * Defines and Macros
  *********************************************************/
@@ -134,7 +137,9 @@ class ColorControlServer
      *********************************************************/
     static ColorControlServer & Instance();
 
+#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
     chip::scenes::SceneHandler * GetSceneHandler();
+#endif
 
     bool HasFeature(chip::EndpointId endpoint, Feature feature);
     chip::Protocols::InteractionModel::Status stopAllColorTransitions(chip::EndpointId endpoint);
@@ -272,7 +277,9 @@ class ColorControlServer
 
     EmberEventControl eventControls[kColorControlClusterServerMaxEndpointCount];
 
+#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
     friend class DefaultColorControlSceneHandler;
+#endif
 };
 
 /**********************************************************
diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp
@@ -608,14 +608,16 @@ Status MoveToLevel(EndpointId endpointId, const Commands::MoveToLevel::Decodable
                               INVALID_STORED_LEVEL); // Don't revert to the stored level
 }
 
+#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
 chip::scenes::SceneHandler * GetSceneHandler()
 {
-#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
+#if CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
     return &sLevelControlSceneHandler;
 #else
     return nullptr;
-#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
+#endif // CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
 }
+#endif // ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
 
 } // namespace LevelControlServer
 
diff --git a/src/app/clusters/level-control/level-control.h b/src/app/clusters/level-control/level-control.h
@@ -28,9 +28,12 @@
 
 #include <app-common/zap-generated/cluster-enums.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app/clusters/scenes-server/SceneTable.h>
 #include <app/util/basic-types.h>
 
+#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
+#include <app/clusters/scenes-server/SceneTable.h>
+#endif
+
 /** @brief Level Control Cluster Server Post Init
  *
  * Following resolution of the Level Control state at startup for this endpoint, perform any
@@ -53,6 +56,8 @@ chip::Protocols::InteractionModel::Status
 MoveToLevel(chip::EndpointId endpointId,
             const chip::app::Clusters::LevelControl::Commands::MoveToLevel::DecodableType & commandData);
 
+#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
 chip::scenes::SceneHandler * GetSceneHandler();
+#endif
 
 } // namespace LevelControlServer
diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp
@@ -15,6 +15,8 @@
  *    limitations under the License.
  */
 
+#include <app/util/config.h>
+
 #include "on-off-server.h"
 
 #include <app-common/zap-generated/attributes/Accessors.h>
@@ -299,15 +301,16 @@ OnOffServer & OnOffServer::Instance()
     return instance;
 }
 
+#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
 chip::scenes::SceneHandler * OnOffServer::GetSceneHandler()
 {
-
-#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
+#if CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
     return &sOnOffSceneHandler;
 #else
     return nullptr;
-#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
+#endif // CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
 }
+#endif // ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
 
 bool OnOffServer::HasFeature(chip::EndpointId endpoint, Feature feature)
 {
diff --git a/src/app/clusters/on-off-server/on-off-server.h b/src/app/clusters/on-off-server/on-off-server.h
@@ -20,12 +20,15 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
-#include <app/clusters/scenes-server/SceneTable.h>
 #include <app/util/af-types.h>
 #include <app/util/basic-types.h>
 #include <platform/CHIPDeviceConfig.h>
 #include <protocols/interaction_model/StatusCode.h>
 
+#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
+#include <app/clusters/scenes-server/SceneTable.h>
+#endif
+
 /**********************************************************
  * Defines and Macros
  *********************************************************/
@@ -50,7 +53,9 @@ class OnOffServer
 
     static OnOffServer & Instance();
 
+#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
     chip::scenes::SceneHandler * GetSceneHandler();
+#endif
 
     bool offCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath);
     bool onCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath);
@@ -97,7 +102,9 @@ class OnOffServer
     static OnOffServer instance;
     chip::System::Clock::Timestamp nextDesiredOnWithTimedOffTimestamp;
 
+#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
     friend class DefaultOnOffSceneHandler;
+#endif
 };
 
 struct OnOffEffect

Original file line number	Diff line number	Diff line change
`@@ -431,15 +431,16 @@ ColorControlServer & ColorControlServer::Instance()`
`431`	`431`	`return instance;`
`432`	`432`	`}`
`433`	`433`
	`434`	`+#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT`
`434`	`435`	`chip::scenes::SceneHandler * ColorControlServer::GetSceneHandler()`
`435`	`436`	`{`
`436`		`-`
`437`		`-#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS`
	`437`	`+#if CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS`
`438`	`438`	`return &sColorControlSceneHandler;`
`439`	`439`	`#else`
`440`	`440`	`return nullptr;`
`441`		`-#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS`
	`441`	`+#endif // CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS`
`442`	`442`	`}`
	`443`	`+#endif // ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT`
`443`	`444`
`444`	`445`	`bool ColorControlServer::HasFeature(chip::EndpointId endpoint, Feature feature)`
`445`	`446`	`{`
Original file line number	Diff line number	Diff line change
`@@ -608,14 +608,16 @@ Status MoveToLevel(EndpointId endpointId, const Commands::MoveToLevel::Decodable`
`608`	`608`	`INVALID_STORED_LEVEL); // Don't revert to the stored level`
`609`	`609`	`}`
`610`	`610`
	`611`	`+#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT`
`611`	`612`	`chip::scenes::SceneHandler * GetSceneHandler()`
`612`	`613`	`{`
`613`		`-#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS`
	`614`	`+#if CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS`
`614`	`615`	`return &sLevelControlSceneHandler;`
`615`	`616`	`#else`
`616`	`617`	`return nullptr;`
`617`		`-#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS`
	`618`	`+#endif // CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS`
`618`	`619`	`}`
	`620`	`+#endif // ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT`
`619`	`621`
`620`	`622`	`} // namespace LevelControlServer`
`621`	`623`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`* limitations under the License.`
`16`	`16`	`*/`
`17`	`17`
	`18`	`+#include <app/util/config.h>`
	`19`	`+`
`18`	`20`	`#include "on-off-server.h"`
`19`	`21`
`20`	`22`	`#include <app-common/zap-generated/attributes/Accessors.h>`
`@@ -299,15 +301,16 @@ OnOffServer & OnOffServer::Instance()`
`299`	`301`	`return instance;`
`300`	`302`	`}`
`301`	`303`
	`304`	`+#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT`
`302`	`305`	`chip::scenes::SceneHandler * OnOffServer::GetSceneHandler()`
`303`	`306`	`{`
`304`		`-`
`305`		`-#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS`
	`307`	`+#if CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS`
`306`	`308`	`return &sOnOffSceneHandler;`
`307`	`309`	`#else`
`308`	`310`	`return nullptr;`
`309`		`-#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS`
	`311`	`+#endif // CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS`
`310`	`312`	`}`
	`313`	`+#endif // ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT`
`311`	`314`
`312`	`315`	`bool OnOffServer::HasFeature(chip::EndpointId endpoint, Feature feature)`
`313`	`316`	`{`