Skip to content

Commit 8f349a2

Browse files
committed
Fix name conflicts in chef: Add namespace for chef window covering.
1 parent cfcfef3 commit 8f349a2

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

examples/chef/common/clusters/window-covering/chef-window-covering.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ using namespace chip;
2929
using namespace chip::app::Clusters;
3030
using chip::Protocols::InteractionModel::Status;
3131

32+
namespace ChefWindowCovering {
33+
3234
constexpr size_t kWindowCoveringDelegateTableSize = MATTER_DM_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT;
3335
static_assert(kWindowCoveringDelegateTableSize <= kEmberInvalidEndpointIndex, "WindowCovering Delegate table size error");
3436

@@ -68,6 +70,7 @@ void InitChefWindowCoveringCluster()
6870
WindowCovering::SetDefaultDelegate(endpointId, gDelegateTable[epIndex].get());
6971
}
7072
}
73+
} // namespace ChefWindowCovering
7174

7275
CHIP_ERROR WindowCovering::ChefDelegate::HandleMovement(WindowCoveringType type)
7376
{

examples/chef/common/clusters/window-covering/chef-window-covering.h

+2
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,6 @@ class ChefDelegate : public Delegate
6565
} // namespace app
6666
} // namespace chip
6767

68+
namespace ChefWindowCovering {
6869
void InitChefWindowCoveringCluster();
70+
} // namespace ChefWindowCovering

examples/chef/common/stubs.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ void ApplicationInit()
362362

363363
#ifdef MATTER_DM_PLUGIN_WINDOW_COVERING_SERVER
364364
ChipLogProgress(NotSpecified, "Initializing WindowCovering cluster delegate.");
365-
InitChefWindowCoveringCluster();
365+
ChefWindowCovering::InitChefWindowCoveringCluster();
366366
#endif // MATTER_DM_PLUGIN_WINDOW_COVERING_SERVER
367367
}
368368

0 commit comments

Comments
 (0)