espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 19:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/compile_icd_without_data_model_1_5' into 'release/v1.5'

Browse Source 
components/esp_matter: fix compile error for icd without esp data model (v1.5)

See merge request app-frameworks/esp-matter!1361
This commit is contained in:
Shu Chen
2026-01-07 08:05:00 +00:00
parent 8648887f8a b3d1b4060a
commit 30a88d1665
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter/esp_matter_icd_configuration.cpp
+1 -3
View File
@@ -110,14 +110,12 @@ static esp_err_t set_active_threshold(uint32_t active_threshold_ms)
return chip::Test::ICDConfigurationDataTestAccess::SetActiveThreshold(Milliseconds32(active_threshold_ms));
}
#ifdef CONFIG_ESP_MATTER_ENABLE_DATA_MODEL
static bool s_enable_icd_server = true;
static bool s_enable_icd_server = CHIP_CONFIG_ENABLE_ICD_SERVER;
bool get_icd_server_enabled()
{
return s_enable_icd_server;
}
#endif // CONFIG_ESP_MATTER_ENABLE_DATA_MODEL
esp_err_t set_configuration_data(config_t *config)
{
components/esp_matter/esp_matter_icd_configuration.h
-2
View File
@@ -29,11 +29,9 @@ typedef struct config {
std::optional<uint32_t> active_threshold_ms;
} config_t;
#ifdef CONFIG_ESP_MATTER_ENABLE_DATA_MODEL
/** Get whether ICD server is enabled for Matter end-device
*/
bool get_icd_server_enabled();
#endif
/** Set ICD configuration data
*