Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix name conflicts in chef: Add namespace for chef window covering. #37910

Merged
merged 1 commit into from
Mar 7, 2025
Merged

Fix name conflicts in chef: Add namespace for chef window covering. #37910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions examples/chef/common/clusters/window-covering/chef-window-covering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ using namespace chip;
using namespace chip::app::Clusters;
using chip::Protocols::InteractionModel::Status;

namespace ChefWindowCovering {

constexpr size_t kWindowCoveringDelegateTableSize = MATTER_DM_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT;
static_assert(kWindowCoveringDelegateTableSize <= kEmberInvalidEndpointIndex, "WindowCovering Delegate table size error");

Expand Down Expand Up @@ -68,6 +70,7 @@ void InitChefWindowCoveringCluster()
WindowCovering::SetDefaultDelegate(endpointId, gDelegateTable[epIndex].get());
}
}
} // namespace ChefWindowCovering

CHIP_ERROR WindowCovering::ChefDelegate::HandleMovement(WindowCoveringType type)
{
Expand Down
2 changes: 2 additions & 0 deletions examples/chef/common/clusters/window-covering/chef-window-covering.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,6 @@ class ChefDelegate : public Delegate
} // namespace app
} // namespace chip

namespace ChefWindowCovering {
void InitChefWindowCoveringCluster();
} // namespace ChefWindowCovering
2 changes: 1 addition & 1 deletion examples/chef/common/stubs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ void ApplicationInit()

#ifdef MATTER_DM_PLUGIN_WINDOW_COVERING_SERVER
ChipLogProgress(NotSpecified, "Initializing WindowCovering cluster delegate.");
InitChefWindowCoveringCluster();
ChefWindowCovering::InitChefWindowCoveringCluster();
#endif // MATTER_DM_PLUGIN_WINDOW_COVERING_SERVER
}

Expand Down
Loading