From 33e1193c589a38e36d05e723017eeed258777af8 Mon Sep 17 00:00:00 2001 From: Shubham Patil Date: Mon, 30 Dec 2024 12:27:46 +0530 Subject: [PATCH 1/3] components/esp-matter: remove the unnecessary debug log Fixes https://github.com/espressif/esp-matter/issues/1221 --- components/esp_matter/esp_matter_core.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/components/esp_matter/esp_matter_core.cpp b/components/esp_matter/esp_matter_core.cpp index 528730336..9f9babb6e 100644 --- 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")); From 057ae41082d4be6c15ceec340fe30ce548a2ef61 Mon Sep 17 00:00:00 2001 From: Shubham Patil Date: Mon, 30 Dec 2024 15:14:27 +0530 Subject: [PATCH 2/3] docs: add link of release/v1.4 to top level readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 31bb668aa..db7da241a 100644 --- 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 From f4df4bea8657b935cb5a3568133d9726269168fb Mon Sep 17 00:00:00 2001 From: Shubham Patil Date: Mon, 30 Dec 2024 20:32:06 +0530 Subject: [PATCH 3/3] components/esp-matter: fix cluster-id when creating activated carbon filter monitoring cluster. --- components/esp_matter/esp_matter_cluster.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/components/esp_matter/esp_matter_cluster.cpp b/components/esp_matter/esp_matter_cluster.cpp index a79f7262d..9215e72b4 100644 --- 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; }