Skip to content

Commit 305d81f

Browse files
committedDec 31, 2024·
Merge branch 'remove-log' into 'main'
components/esp-matter: remove the unnecessary debug log See merge request app-frameworks/esp-matter!996
2 parents a07c312 + f4df4be commit 305d81f

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed
 

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Espressif's SDK for Matter is the official Matter development framework for ESP3
1717
| v1.1 | [release/v1.1](https://github.com/espressif/esp-matter/tree/release/v1.1) |
1818
| v1.2 | [release/v1.2](https://github.com/espressif/esp-matter/tree/release/v1.2) |
1919
| v1.3 | [release/v1.3](https://github.com/espressif/esp-matter/tree/release/v1.3) |
20-
| v1.4 (Ongoing effort) | [main](https://github.com/espressif/esp-matter/tree/main) |
21-
20+
| v1.4 | [release/v1.4](https://github.com/espressif/esp-matter/tree/release/v1.4) |
21+
| v1.5 (Ongoing effort) | [main](https://github.com/espressif/esp-matter/tree/main) |
2222

2323
## Getting the repositories
2424

‎components/esp_matter/esp_matter_cluster.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -1390,8 +1390,8 @@ const int function_flags = CLUSTER_FLAG_NONE;
13901390

13911391
cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
13921392
{
1393-
cluster_t *cluster = cluster::create(endpoint, HepaFilterMonitoring::Id, flags);
1394-
VerifyOrReturnValue(cluster, NULL, ESP_LOGE(TAG, "Could not create cluster. cluster_id: 0x%08" PRIX32, HepaFilterMonitoring::Id));
1393+
cluster_t *cluster = cluster::create(endpoint, ActivatedCarbonFilterMonitoring::Id, flags);
1394+
VerifyOrReturnValue(cluster, NULL, ESP_LOGE(TAG, "Could not create cluster. cluster_id: 0x%08" PRIX32, ActivatedCarbonFilterMonitoring::Id));
13951395

13961396
if (flags & CLUSTER_FLAG_SERVER) {
13971397
if (config -> delegate != nullptr) {
@@ -2029,21 +2029,21 @@ const function_generic_t function_list[] = {
20292029
const int function_flags = CLUSTER_FLAG_INIT_FUNCTION;
20302030

20312031
static bool check_feature_map(uint32_t features) {
2032-
if((features & feature::other::get_id()) == feature::other::get_id())
2032+
if((features & feature::other::get_id()) == feature::other::get_id())
20332033
return true;
2034-
if((features & feature::passive_infrared::get_id()) == feature::passive_infrared::get_id())
2034+
if((features & feature::passive_infrared::get_id()) == feature::passive_infrared::get_id())
20352035
return true;
2036-
if((features & feature::ultrasonic::get_id()) == feature::ultrasonic::get_id())
2036+
if((features & feature::ultrasonic::get_id()) == feature::ultrasonic::get_id())
20372037
return true;
2038-
if((features & feature::physical_contact::get_id()) == feature::physical_contact::get_id())
2038+
if((features & feature::physical_contact::get_id()) == feature::physical_contact::get_id())
20392039
return true;
2040-
if((features & feature::active_infrared::get_id()) == feature::active_infrared::get_id())
2040+
if((features & feature::active_infrared::get_id()) == feature::active_infrared::get_id())
20412041
return true;
2042-
if((features & feature::radar::get_id()) == feature::radar::get_id())
2042+
if((features & feature::radar::get_id()) == feature::radar::get_id())
20432043
return true;
2044-
if((features & feature::rf_sensing::get_id()) == feature::rf_sensing::get_id())
2044+
if((features & feature::rf_sensing::get_id()) == feature::rf_sensing::get_id())
20452045
return true;
2046-
if((features & feature::vision::get_id()) == feature::vision::get_id())
2046+
if((features & feature::vision::get_id()) == feature::vision::get_id())
20472047
return true;
20482048
return false;
20492049
}

‎components/esp_matter/esp_matter_core.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -1720,8 +1720,6 @@ endpoint_t *resume(node_t *node, uint8_t flags, uint16_t endpoint_id, void *priv
17201720
return NULL;
17211721
}
17221722

1723-
ESP_LOGE(TAG, "cluster in endpoint type:%p", endpoint->endpoint_type->cluster);
1724-
17251723
/* Set */
17261724
endpoint->endpoint_id = endpoint_id;
17271725
endpoint->device_type_count = 0;
@@ -1917,7 +1915,7 @@ esp_err_t set_parent_endpoint(endpoint_t *endpoint, endpoint_t *parent_endpoint)
19171915
void *get_priv_data(uint16_t endpoint_id)
19181916
{
19191917
node_t *node = node::get();
1920-
/* This is not an error, since the node will not be initialized for application using the data model from zap */
1918+
/* This is not an error, since the node will not be initialized for application using the data model from zap */
19211919
VerifyOrReturnValue(node, NULL, ESP_LOGE(TAG, "Node not found"));
19221920
endpoint_t *endpoint = get(node, endpoint_id);
19231921
VerifyOrReturnValue(endpoint, NULL, ESP_LOGE(TAG, "Endpoint not found"));

0 commit comments

Comments
 (0)
Please sign in to comment.