mirror of
https://github.com/espressif/esp-matter.git
synced 2026-04-27 19:13:13 +00:00
Merge branch 'fix/compile_icd_without_data_model' into 'main'
components/esp_matter: fix compile error for icd without esp data model See merge request app-frameworks/esp-matter!1353
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user