Skip to content

Commit 91bf33f

Browse files
committed
Merge branch 'little_typo_fix' into 'main'
esp-matter: typo fix for CONFIG_ESP_MATTER_ENABLE_DATA_MODEL See merge request app-frameworks/esp-matter!706
2 parents 4774993 + ac3e087 commit 91bf33f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

components/esp_matter/esp_matter_core.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ namespace node {
224224

225225
static _node_t *node = NULL;
226226

227-
#if defined(CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER) && defined(CONFIG_ESP_MATTE_ENABLE_DATA_MODEL)
227+
#if defined(CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER) && defined(CONFIG_ESP_MATTER_ENABLE_DATA_MODEL)
228228
// If Matter server or ESP-Matter data model is not enabled. we will never use minimum unused endpoint id.
229229
static esp_err_t store_min_unused_endpoint_id()
230230
{
@@ -289,7 +289,7 @@ static esp_err_t read_min_unused_endpoint_id()
289289
}
290290
return err;
291291
}
292-
#endif // defined(CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER) && defined(CONFIG_ESP_MATTE_ENABLE_DATA_MODEL)
292+
#endif // defined(CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER) && defined(CONFIG_ESP_MATTER_ENABLE_DATA_MODEL)
293293
} /* node */
294294

295295
namespace cluster {
@@ -1085,13 +1085,13 @@ esp_err_t start(event_callback_t callback, intptr_t callback_arg)
10851085
return err;
10861086
}
10871087
esp_matter_started = true;
1088-
#if defined(CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER) && defined(CONFIG_ESP_MATTE_ENABLE_DATA_MODEL)
1088+
#if defined(CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER) && defined(CONFIG_ESP_MATTER_ENABLE_DATA_MODEL)
10891089
err = node::read_min_unused_endpoint_id();
10901090
// If the min_unused_endpoint_id is not found, we will write the current min_unused_endpoint_id in nvs.
10911091
if (err == ESP_ERR_NVS_NOT_FOUND) {
10921092
err = node::store_min_unused_endpoint_id();
10931093
}
1094-
#endif // defined(CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER) && defined(CONFIG_ESP_MATTE_ENABLE_DATA_MODEL)
1094+
#endif // defined(CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER) && defined(CONFIG_ESP_MATTER_ENABLE_DATA_MODEL)
10951095
return err;
10961096
}
10971097

@@ -1931,12 +1931,12 @@ endpoint_t *create(node_t *node, uint8_t flags, void *priv_data)
19311931
endpoint->parent_endpoint_id = chip::kInvalidEndpointId;
19321932
endpoint->flags = flags;
19331933
endpoint->priv_data = priv_data;
1934-
#if defined(CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER) && defined(CONFIG_ESP_MATTE_ENABLE_DATA_MODEL)
1934+
#if defined(CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER) && defined(CONFIG_ESP_MATTER_ENABLE_DATA_MODEL)
19351935
/* Store */
19361936
if (esp_matter_started) {
19371937
node::store_min_unused_endpoint_id();
19381938
}
1939-
#endif // defined(CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER) && defined(CONFIG_ESP_MATTE_ENABLE_DATA_MODEL)
1939+
#endif // defined(CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER) && defined(CONFIG_ESP_MATTER_ENABLE_DATA_MODEL)
19401940

19411941
/* Add */
19421942
_endpoint_t *previous_endpoint = NULL;

0 commit comments

Comments
 (0)