From 4a675b503a39a7ffdcd26b6226c7cd2e4281a245 Mon Sep 17 00:00:00 2001 From: Shubham Patil Date: Fri, 19 Apr 2024 17:26:58 +0530 Subject: [PATCH] Revert "Support diagnostic logs cluster in light example" This reverts commit 9998ef3cb6f8cb127f6700f29a59a69ec3e3df32. --- examples/light/main/CMakeLists.txt | 13 ++----------- examples/light/main/app_main.cpp | 15 --------------- examples/light/partitions.csv | 1 - examples/light/sdkconfig.defaults | 7 ------- 4 files changed, 2 insertions(+), 34 deletions(-) diff --git a/examples/light/main/CMakeLists.txt b/examples/light/main/CMakeLists.txt index fca218870..43626a795 100644 --- a/examples/light/main/CMakeLists.txt +++ b/examples/light/main/CMakeLists.txt @@ -1,14 +1,5 @@ -idf_component_register(SRCS - "app_driver.cpp" - "app_main.cpp" - "${MATTER_SDK_PATH}/examples/temperature-measurement-app/esp32/main/diagnostic-logs-provider-delegate-impl.cpp" - PRIV_INCLUDE_DIRS - "." - "${ESP_MATTER_PATH}/examples/common/utils" - "${MATTER_SDK_PATH}/examples/temperature-measurement-app/esp32/main/include" - EMBED_FILES - "${MATTER_SDK_PATH}/examples/temperature-measurement-app/esp32/main/diagnostic_logs/end_user_support.log" - "${MATTER_SDK_PATH}/examples/temperature-measurement-app/esp32/main/diagnostic_logs/network_diag.log") +idf_component_register(SRC_DIRS "." + PRIV_INCLUDE_DIRS "." "${ESP_MATTER_PATH}/examples/common/utils") set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17) target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H") diff --git a/examples/light/main/app_main.cpp b/examples/light/main/app_main.cpp index 245fa09e2..1d61acb2b 100644 --- a/examples/light/main/app_main.cpp +++ b/examples/light/main/app_main.cpp @@ -11,7 +11,6 @@ #include #include -#include #include #include @@ -23,8 +22,6 @@ #endif #include -#include -#include #include static const char *TAG = "app_main"; @@ -165,11 +162,6 @@ extern "C" void app_main() node_t *node = node::create(&node_config, app_attribute_update_cb, app_identification_cb); ABORT_APP_ON_FAILURE(node != nullptr, ESP_LOGE(TAG, "Failed to create Matter node")); - // add diagnostic logs cluster on root endpoint - cluster::diagnostic_logs::config_t diag_logs_config; - endpoint_t *root_ep = endpoint::get(node, 0); // get the root node ep - cluster::diagnostic_logs::create(root_ep, &diag_logs_config, CLUSTER_FLAG_SERVER); - extended_color_light::config_t light_config; light_config.on_off.on_off = DEFAULT_POWER; light_config.on_off.lighting.start_up_on_off = nullptr; @@ -230,10 +222,3 @@ extern "C" void app_main() esp_matter::console::init(); #endif } - -using namespace chip::app::Clusters::DiagnosticLogs; -void emberAfDiagnosticLogsClusterInitCallback(chip::EndpointId endpoint) -{ - auto & logProvider = LogProvider::GetInstance(); - DiagnosticLogsServer::Instance().SetDiagnosticLogsProviderDelegate(endpoint, &logProvider); -} diff --git a/examples/light/partitions.csv b/examples/light/partitions.csv index 428705154..ffe5f242e 100644 --- a/examples/light/partitions.csv +++ b/examples/light/partitions.csv @@ -8,4 +8,3 @@ phy_init, data, phy, , 0x1000, ota_0, app, ota_0, 0x20000, 0x1E0000, ota_1, app, ota_1, 0x200000, 0x1E0000, fctry, data, nvs, 0x3E0000, 0x6000 -coredump, data, coredump,, 64K diff --git a/examples/light/sdkconfig.defaults b/examples/light/sdkconfig.defaults index 9b6905016..4dd60fc42 100644 --- a/examples/light/sdkconfig.defaults +++ b/examples/light/sdkconfig.defaults @@ -56,10 +56,3 @@ CONFIG_BSP_BUTTON_1_GPIO=0 CONFIG_BSP_BUTTON_1_LEVEL=0 # LEDs CONFIG_BSP_LEDS_NUM=0 - -# configurations required for diagnostic logs cluster -# Enable the diagnostic logs transfer over BDX protocol -CONFIG_CHIP_ENABLE_BDX_LOG_TRANSFER=y - -CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=y -CONFIG_ESP32_COREDUMP_DATA_FORMAT_ELF=y