Merge branch 'remove-log' into 'main'

components/esp-matter: remove the unnecessary debug log See merge request app-frameworks/esp-matter!996
espressif · Dec 31, 2024 · 305d81f · 305d81f
2 parents a07c312 + f4df4be
commit 305d81f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -17,8 +17,8 @@ Espressif's SDK for Matter is the official Matter development framework for ESP3
 |             v1.1             | [release/v1.1](https://github.com/espressif/esp-matter/tree/release/v1.1) |
 |             v1.2             | [release/v1.2](https://github.com/espressif/esp-matter/tree/release/v1.2) |
 |             v1.3             | [release/v1.3](https://github.com/espressif/esp-matter/tree/release/v1.3) |
-|     v1.4 (Ongoing effort)    |         [main](https://github.com/espressif/esp-matter/tree/main)         |
-
+|             v1.4             | [release/v1.4](https://github.com/espressif/esp-matter/tree/release/v1.4) |
+|     v1.5 (Ongoing effort)    |         [main](https://github.com/espressif/esp-matter/tree/main)         |
 
 ## Getting the repositories
 

diff --git a/components/esp_matter/esp_matter_cluster.cpp b/components/esp_matter/esp_matter_cluster.cpp
@@ -1390,8 +1390,8 @@ const int function_flags = CLUSTER_FLAG_NONE;
 
 cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
 {
-    cluster_t *cluster = cluster::create(endpoint, HepaFilterMonitoring::Id, flags);
-    VerifyOrReturnValue(cluster, NULL, ESP_LOGE(TAG, "Could not create cluster. cluster_id: 0x%08" PRIX32, HepaFilterMonitoring::Id));
+    cluster_t *cluster = cluster::create(endpoint, ActivatedCarbonFilterMonitoring::Id, flags);
+    VerifyOrReturnValue(cluster, NULL, ESP_LOGE(TAG, "Could not create cluster. cluster_id: 0x%08" PRIX32, ActivatedCarbonFilterMonitoring::Id));
 
     if (flags & CLUSTER_FLAG_SERVER) {
         if (config -> delegate != nullptr) {
@@ -2029,21 +2029,21 @@ const function_generic_t function_list[] = {
 const int function_flags = CLUSTER_FLAG_INIT_FUNCTION;
 
 static bool check_feature_map(uint32_t features) {
-    if((features & feature::other::get_id()) == feature::other::get_id()) 
+    if((features & feature::other::get_id()) == feature::other::get_id())
         return true;
-    if((features & feature::passive_infrared::get_id()) == feature::passive_infrared::get_id()) 
+    if((features & feature::passive_infrared::get_id()) == feature::passive_infrared::get_id())
         return true;
-    if((features & feature::ultrasonic::get_id()) == feature::ultrasonic::get_id()) 
+    if((features & feature::ultrasonic::get_id()) == feature::ultrasonic::get_id())
         return true;
-    if((features & feature::physical_contact::get_id()) == feature::physical_contact::get_id()) 
+    if((features & feature::physical_contact::get_id()) == feature::physical_contact::get_id())
         return true;
-    if((features & feature::active_infrared::get_id()) == feature::active_infrared::get_id()) 
+    if((features & feature::active_infrared::get_id()) == feature::active_infrared::get_id())
         return true;
-    if((features & feature::radar::get_id()) == feature::radar::get_id()) 
+    if((features & feature::radar::get_id()) == feature::radar::get_id())
         return true;
-    if((features & feature::rf_sensing::get_id()) == feature::rf_sensing::get_id()) 
+    if((features & feature::rf_sensing::get_id()) == feature::rf_sensing::get_id())
         return true;
-    if((features & feature::vision::get_id()) == feature::vision::get_id()) 
+    if((features & feature::vision::get_id()) == feature::vision::get_id())
         return true;
     return false;
 }

diff --git a/components/esp_matter/esp_matter_core.cpp b/components/esp_matter/esp_matter_core.cpp
@@ -1720,8 +1720,6 @@ endpoint_t *resume(node_t *node, uint8_t flags, uint16_t endpoint_id, void *priv
         return NULL;
     }
 
-    ESP_LOGE(TAG, "cluster in endpoint type:%p", endpoint->endpoint_type->cluster);
-
      /* Set */
      endpoint->endpoint_id = endpoint_id;
      endpoint->device_type_count = 0;
@@ -1917,7 +1915,7 @@ esp_err_t set_parent_endpoint(endpoint_t *endpoint, endpoint_t *parent_endpoint)
 void *get_priv_data(uint16_t endpoint_id)
 {
     node_t *node = node::get();
-    /* This is not an error, since the node will not be initialized for application using the data model from zap */ 
+    /* This is not an error, since the node will not be initialized for application using the data model from zap */
     VerifyOrReturnValue(node, NULL, ESP_LOGE(TAG, "Node not found"));
     endpoint_t *endpoint = get(node, endpoint_id);
     VerifyOrReturnValue(endpoint, NULL, ESP_LOGE(TAG, "Endpoint not found"));