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

Add ICDConfigurationData to app sources when ICD management server cluster is included #37653

Merged
merged 2 commits into from
Feb 19, 2025
Merged

Add ICDConfigurationData to app sources when ICD management server cluster is included #37653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3eb687c
Fix ICD management server cluster dependecies
adigie Feb 19, 2025
b877df0
Add TODO comments for #32321
adigie Feb 19, 2025
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
10 changes: 10 additions & 0 deletions src/app/chip_data_model.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@ include("${CHIP_ROOT}/src/data-model-providers/codegen/model.cmake")
function(chip_configure_cluster APP_TARGET CLUSTER)
file(GLOB CLUSTER_SOURCES "${CHIP_APP_BASE_DIR}/clusters/${CLUSTER}/*.cpp")
target_sources(${APP_TARGET} PRIVATE ${CLUSTER_SOURCES})

# Add clusters dependencies
if (CLUSTER STREQUAL "icd-management-server")
# TODO(#32321): Remove after issue is resolved
# Add ICDConfigurationData when ICD management server cluster is included,
# but ICD support is disabled, e.g. lock-app on some platforms
if(NOT CONFIG_CHIP_ENABLE_ICD_SUPPORT)
target_sources(${APP_TARGET} PRIVATE ${CHIP_APP_BASE_DIR}/icd/server/ICDConfigurationData.cpp)
endif()
endif()
endfunction()

#
Expand Down
1 change: 1 addition & 0 deletions src/app/clusters/icd-management-server/icd-management-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,7 @@ bool emberAfIcdManagementClusterUnregisterClientCallback(CommandHandler * comman
bool emberAfIcdManagementClusterStayActiveRequestCallback(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
const Commands::StayActiveRequest::DecodableType & commandData)
{
// TODO(#32321): Remove #if after issue is resolved
// Note: We only need this #if statement for platform examples that enable the ICD management server without building the sample
// as an ICD. Since this is not spec compliant, we should remove this #if statement once we stop compiling the ICD management
// server in those examples.
Expand Down
Loading