Merge branch 'remove-diag-logs-from-eg' into 'main'

Revert "Support diagnostic logs cluster in light example"

See merge request app-frameworks/esp-matter!710

Author: chshu

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")

examples/light/main/app_main.cpp

@@ -11,7 +11,6 @@
 #include <nvs_flash.h>
 
 #include <esp_matter.h>
-#include <esp_matter_cluster.h>
 #include <esp_matter_console.h>
 #include <esp_matter_ota.h>
 
@@ -23,8 +22,6 @@
 #endif
 
 #include <app/server/CommissioningWindowManager.h>
-#include <app/clusters/diagnostic-logs-server/diagnostic-logs-server.h>
-#include <diagnostic-logs-provider-delegate-impl.h>
 #include <app/server/Server.h>
 
 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);
-}

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

examples/light/sdkconfig.defaults

@@ -53,10 +53,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