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

esp_matter: Add support for disabling/enabling ICD server dynamically

Browse Source
This commit is contained in:
WanqQixiang
2025-05-16 19:00:40 +08:00
parent 057ac6a3e0
commit a416a3ec44
4 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter/esp_matter_core.cpp
+22 -2
View File
@@ -16,6 +16,7 @@
#include <esp_log.h>
#include <esp_matter.h>
#include <esp_matter_core.h>
#include <esp_matter_icd_configuration.h>
#include <esp_matter_test_event_trigger.h>
#include <nvs.h>
@@ -782,6 +783,20 @@ static void esp_matter_chip_init_task(intptr_t context)
if (GetDiagnosticDataProvider().GetBootReason(bootReason) == CHIP_NO_ERROR) {
chip::app::Clusters::GeneralDiagnosticsServer::Instance().OnDeviceReboot(bootReason);
}
#if CHIP_CONFIG_ENABLE_ICD_SERVER
if (!icd::get_icd_server_enabled()) {
// ICD server has been initialized in chip::Server::GetInstance().Init(). disable it here if
// icd_server_enabled is set to false.
chip::app::InteractionModelEngine::GetInstance()->SetICDManager(nullptr);
chip::app::DnssdServer::Instance().SetICDManager(nullptr);
chip::TestEventTriggerDelegate *test_event_trigger = chip::Server::GetInstance().GetTestEventTriggerDelegate();
if (test_event_trigger) {
test_event_trigger->RemoveHandler(&chip::Server::GetInstance().GetICDManager());
}
chip::Server::GetInstance().GetICDManager().Shutdown();
}
#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
PlatformMgr().ScheduleWork(deinit_ble_if_commissioned, reinterpret_cast<intptr_t>(nullptr));
xTaskNotifyGive(task_to_notify);
}
@@ -827,8 +842,13 @@ static esp_err_t init_thread_stack_and_start_thread_task()
VerifyOrReturnError(ThreadStackMgr().InitThreadStack() == CHIP_NO_ERROR, ESP_FAIL,
ESP_LOGE(TAG, "Failed to initialize Thread stack"));
#if CHIP_CONFIG_ENABLE_ICD_SERVER
VerifyOrReturnError(ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice) == CHIP_NO_ERROR,
ESP_FAIL, ESP_LOGE(TAG, "Failed to set the Thread device type"));
if (icd::get_icd_server_enabled()) {
VerifyOrReturnError(ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_SleepyEndDevice) == CHIP_NO_ERROR,
ESP_FAIL, ESP_LOGE(TAG, "Failed to set the Thread device type"));
} else {
VerifyOrReturnError(ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_MinimalEndDevice) == CHIP_NO_ERROR,
ESP_FAIL, ESP_LOGE(TAG, "Failed to set the Thread device type"));
}
#elif CHIP_DEVICE_CONFIG_THREAD_FTD
VerifyOrReturnError(ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router) == CHIP_NO_ERROR,
components/esp_matter/esp_matter_endpoint.cpp
+7 -4
View File
@@ -15,6 +15,7 @@
#include <esp_log.h>
#include <esp_matter.h>
#include <esp_matter_endpoint.h>
#include <esp_matter_icd_configuration.h>
static const char *TAG = "esp_matter_endpoint";
@@ -76,17 +77,19 @@ esp_err_t add(endpoint_t *endpoint, config_t *config)
group_key_management::create(endpoint, CLUSTER_FLAG_SERVER);
#if CHIP_CONFIG_ENABLE_ICD_SERVER
icd_management::create(endpoint, &(config->icd_management), CLUSTER_FLAG_SERVER,
if (icd::get_icd_server_enabled()) {
icd_management::create(endpoint, &(config->icd_management), CLUSTER_FLAG_SERVER,
#if CHIP_CONFIG_ENABLE_ICD_LIT
icd_management::feature::long_idle_time_support::get_id() |
icd_management::feature::long_idle_time_support::get_id() |
#if CHIP_CONFIG_ENABLE_ICD_CIP
icd_management::feature::check_in_protocol_support::get_id() |
icd_management::feature::check_in_protocol_support::get_id() |
#endif // CHIP_CONFIG_ENABLE_ICD_CIP
#if CHIP_CONFIG_ENABLE_ICD_UAT
icd_management::feature::user_active_mode_trigger::get_id() |
icd_management::feature::user_active_mode_trigger::get_id() |
#endif // CHIP_CONFIG_ENABLE_ICD_UAT
#endif // CHIP_CONFIG_ENABLE_ICD_LIT
0);
}
#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
return ESP_OK;
}
components/esp_matter/esp_matter_icd_configuration.cpp
+17 -3
View File
@@ -107,17 +107,31 @@ static esp_err_t set_active_threshold(uint32_t active_threshold_ms)
return chip::Test::ICDConfigurationDataTestAccess::SetActiveThreshold(Milliseconds32(active_threshold_ms));
}
static bool s_enable_icd_server = true;
bool get_icd_server_enabled()
{
return s_enable_icd_server;
}
esp_err_t set_configuration_data(config_t *config)
{
ESP_RETURN_ON_FALSE(config, ESP_ERR_INVALID_ARG, TAG, "config cannot be NULL");
if (!config->enable_icd_server) {
ESP_RETURN_ON_FALSE(!node::get(), ESP_ERR_INVALID_STATE, TAG,
"Could not disable ICD server after data model is created");
}
s_enable_icd_server = config->enable_icd_server;
ESP_RETURN_ON_FALSE(!is_started(), ESP_ERR_INVALID_STATE, TAG,
"Could not change ICD configuration data after Matter is started");
ESP_RETURN_ON_FALSE(config, ESP_ERR_INVALID_ARG, TAG, "config cannot be NULL");
ESP_RETURN_ON_ERROR(set_polling_intervals(config->fast_interval_ms, config->slow_interval_ms), TAG,
"Failed to set polling intervals");
ESP_RETURN_ON_ERROR(set_mode_durations(config->active_mode_duration_ms, config->idle_mode_duration_s), TAG,
"Failed to set mode durations");
ESP_RETURN_ON_ERROR(set_active_threshold(config->active_threshold_ms.value()), TAG,
"Failed to set active threshold");
if (config->active_threshold_ms.has_value()) {
ESP_RETURN_ON_ERROR(set_active_threshold(config->active_threshold_ms.value()), TAG,
"Failed to set active threshold");
}
return ESP_OK;
}
components/esp_matter/esp_matter_icd_configuration.h
+9
View File
@@ -19,6 +19,7 @@ namespace esp_matter {
namespace icd {
typedef struct config {
bool enable_icd_server;
std::optional<uint32_t> fast_interval_ms;
std::optional<uint32_t> slow_interval_ms;
std::optional<uint32_t> active_mode_duration_ms;
@@ -26,6 +27,14 @@ typedef struct config {
std::optional<uint32_t> active_threshold_ms;
} config_t;
/** Get whether ICD server is enabled for Matter end-device
*/
bool get_icd_server_enabled();
/** Set ICD configuration data
*
* This function allows the user to enable or disable the ICD server and configure its settings at runtime, before creating the Matter data model.
*/
esp_err_t set_configuration_data(config_t *config);
} // namespace icd