From ae72e1d3a66db1c246d0a7ec55aed0e5dbdf56b5 Mon Sep 17 00:00:00 2001 From: Shubham Patil Date: Wed, 2 Aug 2023 13:37:54 +0530 Subject: [PATCH] cmake: get cluster dir list rather than individually specifying it --- components/esp_matter/CMakeLists.txt | 64 ++----------------- .../zap_common/zap-generated/gen_config.h | 3 +- examples/zap_light/CMakeLists.txt | 2 + 3 files changed, 8 insertions(+), 61 deletions(-) diff --git a/components/esp_matter/CMakeLists.txt b/components/esp_matter/CMakeLists.txt index 5820f2d10..6206fe188 100644 --- a/components/esp_matter/CMakeLists.txt +++ b/components/esp_matter/CMakeLists.txt @@ -1,3 +1,6 @@ +# Get the list of cluster directories present in ${MATTER_SDK_PATH}/src/app/clusters +file(GLOB CLUSTER_DIR_LIST true ${MATTER_SDK_PATH}/src/app/clusters ${MATTER_SDK_PATH}/src/app/clusters/*) + set(SRC_DIRS_LIST "." "private" "${MATTER_SDK_PATH}/zzz_generated/app-common/app-common/zap-generated/attributes" @@ -5,66 +8,7 @@ set(SRC_DIRS_LIST "." "${MATTER_SDK_PATH}/src/app/server" "${MATTER_SDK_PATH}/src/app/util" "${MATTER_SDK_PATH}/src/app/reporting" - "${MATTER_SDK_PATH}/src/app/clusters/access-control-server" - "${MATTER_SDK_PATH}/src/app/clusters/account-login-server" - "${MATTER_SDK_PATH}/src/app/clusters/administrator-commissioning-server" - "${MATTER_SDK_PATH}/src/app/clusters/application-basic-server" - "${MATTER_SDK_PATH}/src/app/clusters/application-launcher-server" - "${MATTER_SDK_PATH}/src/app/clusters/audio-output-server" - "${MATTER_SDK_PATH}/src/app/clusters/barrier-control-server" - "${MATTER_SDK_PATH}/src/app/clusters/basic-information" - "${MATTER_SDK_PATH}/src/app/clusters/bindings" - "${MATTER_SDK_PATH}/src/app/clusters/bridged-device-basic-information-server" - "${MATTER_SDK_PATH}/src/app/clusters/channel-server" - "${MATTER_SDK_PATH}/src/app/clusters/color-control-server" - "${MATTER_SDK_PATH}/src/app/clusters/content-launch-server" - "${MATTER_SDK_PATH}/src/app/clusters/descriptor" - "${MATTER_SDK_PATH}/src/app/clusters/diagnostic-logs-server" - "${MATTER_SDK_PATH}/src/app/clusters/door-lock-server" - "${MATTER_SDK_PATH}/src/app/clusters/ethernet-network-diagnostics-server" - "${MATTER_SDK_PATH}/src/app/clusters/fan-control-server" - "${MATTER_SDK_PATH}/src/app/clusters/fault-injection-server" - "${MATTER_SDK_PATH}/src/app/clusters/fixed-label-server" - "${MATTER_SDK_PATH}/src/app/clusters/general-commissioning-server" - "${MATTER_SDK_PATH}/src/app/clusters/general-diagnostics-server" - "${MATTER_SDK_PATH}/src/app/clusters/group-key-mgmt-server" - "${MATTER_SDK_PATH}/src/app/clusters/groups-server" - "${MATTER_SDK_PATH}/src/app/clusters/icd-management-server" - "${MATTER_SDK_PATH}/src/app/clusters/identify-server" - "${MATTER_SDK_PATH}/src/app/clusters/keypad-input-server" - "${MATTER_SDK_PATH}/src/app/clusters/level-control" - "${MATTER_SDK_PATH}/src/app/clusters/localization-configuration-server" - "${MATTER_SDK_PATH}/src/app/clusters/low-power-server" - "${MATTER_SDK_PATH}/src/app/clusters/media-input-server" - "${MATTER_SDK_PATH}/src/app/clusters/media-playback-server" - "${MATTER_SDK_PATH}/src/app/clusters/mode-select-server" - "${MATTER_SDK_PATH}/src/app/clusters/network-commissioning" - "${MATTER_SDK_PATH}/src/app/clusters/occupancy-sensor-server" - "${MATTER_SDK_PATH}/src/app/clusters/on-off-server" - "${MATTER_SDK_PATH}/src/app/clusters/operational-credentials-server" - "${MATTER_SDK_PATH}/src/app/clusters/ota-provider" - "${MATTER_SDK_PATH}/src/app/clusters/ota-requestor" - "${MATTER_SDK_PATH}/src/app/clusters/power-source-configuration-server" - "${MATTER_SDK_PATH}/src/app/clusters/power-source-server" - "${MATTER_SDK_PATH}/src/app/clusters/pump-configuration-and-control-client" - "${MATTER_SDK_PATH}/src/app/clusters/pump-configuration-and-control-server" - "${MATTER_SDK_PATH}/src/app/clusters/scenes-server" - "${MATTER_SDK_PATH}/src/app/clusters/software-diagnostics-server" - "${MATTER_SDK_PATH}/src/app/clusters/switch-server" - "${MATTER_SDK_PATH}/src/app/clusters/target-navigator-server" - "${MATTER_SDK_PATH}/src/app/clusters/test-cluster-server" - "${MATTER_SDK_PATH}/src/app/clusters/thermostat-client" - "${MATTER_SDK_PATH}/src/app/clusters/thermostat-server" - "${MATTER_SDK_PATH}/src/app/clusters/thermostat-user-interface-configuration-server" - "${MATTER_SDK_PATH}/src/app/clusters/thread-network-diagnostics-server" - "${MATTER_SDK_PATH}/src/app/clusters/time-format-localization-server" - "${MATTER_SDK_PATH}/src/app/clusters/user-label-server" - "${MATTER_SDK_PATH}/src/app/clusters/wake-on-lan-server" - "${MATTER_SDK_PATH}/src/app/clusters/wifi-network-diagnostics-server" - "${MATTER_SDK_PATH}/src/app/clusters/window-covering-server" - "${MATTER_SDK_PATH}/src/app/clusters/mode-select-server" - "${MATTER_SDK_PATH}/src/app/clusters/refrigerator-alarm-server" - "${MATTER_SDK_PATH}/src/app/clusters/temperature-control-server" + "${CLUSTER_DIR_LIST}" ) set(INCLUDE_DIRS_LIST "." diff --git a/components/esp_matter/zap_common/zap-generated/gen_config.h b/components/esp_matter/zap_common/zap-generated/gen_config.h index 6272a2746..215afd6cd 100644 --- a/components/esp_matter/zap_common/zap-generated/gen_config.h +++ b/components/esp_matter/zap_common/zap-generated/gen_config.h @@ -191,7 +191,8 @@ #define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT FIXED_ENDPOINT_COUNT // used in window covering #define EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT FIXED_ENDPOINT_COUNT // used in door lock #define EMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT FIXED_ENDPOINT_COUNT // used in fan control - +#define EMBER_AF_DISHWASHER_ALARM_CLUSTER_SERVER_ENDPOINT_COUNT FIXED_ENDPOINT_COUNT // used in dishwasher +#define EMBER_AF_LAUNDRY_WASHER_CONTROLS_CLUSTER_SERVER_ENDPOINT_COUNT FIXED_ENDPOINT_COUNT // used in washer control #define EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT CONFIG_ESP_MATTER_MODE_SELECT_CLUSTER_ENDPOINT_COUNT // used in mode select #define EMBER_AF_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT CONFIG_ESP_MATTER_TEMPERATURE_CONTROL_CLUSTER_ENDPOINT_COUNT // used in temperature control diff --git a/examples/zap_light/CMakeLists.txt b/examples/zap_light/CMakeLists.txt index e2690486a..d910b0b75 100644 --- a/examples/zap_light/CMakeLists.txt +++ b/examples/zap_light/CMakeLists.txt @@ -70,4 +70,6 @@ idf_build_set_property(CXX_COMPILE_OPTIONS "-DEMBER_AF_TARGET_NAVIGATOR_CLUSTER_ idf_build_set_property(CXX_COMPILE_OPTIONS "-DEMBER_AF_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT=1" APPEND) idf_build_set_property(CXX_COMPILE_OPTIONS "-DEMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT=1" APPEND) idf_build_set_property(CXX_COMPILE_OPTIONS "-DEMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT=1" APPEND) +idf_build_set_property(CXX_COMPILE_OPTIONS "-DEMBER_AF_DISHWASHER_ALARM_CLUSTER_SERVER_ENDPOINT_COUNT=1" APPEND) +idf_build_set_property(CXX_COMPILE_OPTIONS "-DEMBER_AF_LAUNDRY_WASHER_CONTROLS_CLUSTER_SERVER_ENDPOINT_COUNT=1" APPEND) idf_build_set_property(CXX_COMPILE_OPTIONS "-DMATTER_SCENES_TABLE_SIZE=CONFIG_ESP_MATTER_SCENES_TABLE_SIZE" APPEND)