diff --git a/components/esp_matter/CMakeLists.txt b/components/esp_matter/CMakeLists.txt index 9c4c268fc..adf316d49 100644 --- a/components/esp_matter/CMakeLists.txt +++ b/components/esp_matter/CMakeLists.txt @@ -1,67 +1,20 @@ +# 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/*) + set(SRC_DIRS_LIST "." "${MATTER_SDK_PATH}/zzz_generated/app-common/app-common/zap-generated/attributes" - "${MATTER_SDK_PATH}/src/app" "${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/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" - "${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" ) +foreach(CLUSTER_DIR ${CLUSTER_DIR_LIST}) + file(GLOB_RECURSE C_CPP_FILES "${CLUSTER_DIR}/*.c" "${CLUSTER_DIR}/*.cpp") + if (C_CPP_FILES) + list(APPEND SRC_DIRS_LIST "${CLUSTER_DIR}") + endif() +endforeach() + set(INCLUDE_DIRS_LIST "." "${MATTER_SDK_PATH}/zzz_generated/app-common" "${MATTER_SDK_PATH}/third_party/nlfaultinjection/repo/include" @@ -72,7 +25,7 @@ if (CONFIG_ESP_MATTER_ENABLE_DATA_MODEL) list(APPEND INCLUDE_DIRS_LIST "zap_common") endif() -set(REQUIRES_LIST chip bt esp_matter_console nvs_flash app_update esp_secure_cert_mgr mbedtls esp_system openthread) +set(REQUIRES_LIST chip bt esp_matter_console nvs_flash app_update esp_secure_cert_mgr mbedtls esp_system openthread json) idf_component_register( SRC_DIRS ${SRC_DIRS_LIST} INCLUDE_DIRS ${INCLUDE_DIRS_LIST} @@ -97,3 +50,8 @@ if (CONFIG_IDF_TARGET_ARCH_XTENSA AND (${IDF_VERSION_MAJOR} LESS 5)) endif() target_compile_options(${COMPONENT_LIB} PUBLIC "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=") + +# Time sync client feature depends on read client, disable it when read client is disabled. +if (CONFIG_DISABLE_READ_CLIENT) + target_compile_options(${COMPONENT_LIB} PUBLIC "-DTIME_SYNC_ENABLE_TSC_FEATURE=0") +endif() diff --git a/connectedhomeip/connectedhomeip b/connectedhomeip/connectedhomeip index 001813681..32992decc 160000 --- a/connectedhomeip/connectedhomeip +++ b/connectedhomeip/connectedhomeip @@ -1 +1 @@ -Subproject commit 00181368119726dfacf6ef4a5fb222f6aba2fb4a +Subproject commit 32992decc576355eb7bedc97c3e18c8efdd58e6c diff --git a/tools/ci/build_apps.py b/tools/ci/build_apps.py index b3071817a..320ea066f 100644 --- a/tools/ci/build_apps.py +++ b/tools/ci/build_apps.py @@ -9,7 +9,10 @@ import sys from pathlib import Path from typing import List -from idf_build_apps import LOGGER, App, build_apps, find_apps, setup_logging +import logging + +idf_build_apps_logger = logging.getLogger('idf_build_apps') +from idf_build_apps import App, build_apps, find_apps, setup_logging # from idf_ci_utils import IDF_PATH, get_pytest_app_paths, get_pytest_cases, get_ttfw_app_paths @@ -38,9 +41,9 @@ MAINFEST_FILES = [ ] def _is_c6_pytest_app(app: App) -> bool: - print(app.name , app.target) + print(app.name, app.target) for pytest_app in PYTEST_C6_APPS: - print(pytest_app["name"] , pytest_app["target"]) + print(pytest_app["name"], pytest_app["target"]) if app.name == pytest_app["name"] and app.target == pytest_app["target"]: return True return False @@ -68,15 +71,14 @@ def get_cmake_apps( target=target, build_dir='build_@t_@w', config_rules_str=config_rules_str, - build_log_path='build_log.txt', - size_json_path='size.json', + build_log_filename='build_log.txt', + size_json_filename='size.json', check_warnings=False, preserve=True, manifest_files=MAINFEST_FILES, ) return apps - def main(args: argparse.Namespace) -> None: apps = get_cmake_apps(args.paths, args.target, args.config) @@ -93,8 +95,8 @@ def main(args: argparse.Namespace) -> None: else: apps_for_build = apps[:] - LOGGER.info('Found %d apps after filtering', len(apps_for_build)) - LOGGER.info( + idf_build_apps_logger.info('Found %d apps after filtering', len(apps_for_build)) + idf_build_apps_logger.info( 'Suggest setting the parallel count to %d for this build job', len(apps_for_build) // APPS_BUILD_PER_JOB + 1, ) @@ -113,7 +115,6 @@ def main(args: argparse.Namespace) -> None: sys.exit(ret_code) - if __name__ == '__main__': parser = argparse.ArgumentParser( description='Build all the apps for different test types. Will auto remove those non-test apps binaries', @@ -176,4 +177,5 @@ if __name__ == '__main__': if not arguments.paths: arguments.paths = [DEF_APP_PATH] setup_logging(verbose=1) # Info - main(arguments) \ No newline at end of file + main(arguments) +