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: Make ICD parameters dynamically configurable

Browse Source
This commit is contained in:
WanqQixiang
2025-02-21 10:44:38 +08:00
parent c5ff70c393
commit e9132a538c
5 changed files with 172 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter/esp_matter_core.cpp
+5
View File
@@ -845,6 +845,11 @@ static esp_err_t chip_init(event_callback_t callback, intptr_t callback_arg)
return ESP_OK;
}
bool is_started()
{
return esp_matter_started;
}
esp_err_t start(event_callback_t callback, intptr_t callback_arg)
{
VerifyOrReturnError(!esp_matter_started, ESP_ERR_INVALID_STATE, ESP_LOGE(TAG, "esp_matter has started"));
components/esp_matter/esp_matter_core.h
+7
View File
@@ -53,6 +53,13 @@ typedef handle_t event_t;
/** TODO: Change this */
typedef void (*event_callback_t)(const ChipDeviceEvent *event, intptr_t arg);
/** Return whether the Matter is intialized and started
*
* @return true if Matter is started
* @return false if Matter is not started
*/
bool is_started();
/** ESP Matter Start
*
* Initialize and start the matter thread.
components/esp_matter/esp_matter_icd_configuration.cpp
+125
View File
@@ -0,0 +1,125 @@
// Copyright 2025 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include <esp_check.h>
#include <esp_err.h>
#include <esp_matter_core.h>
#include <esp_matter_icd_configuration.h>
#include <app/icd/server/ICDConfigurationData.h>
#include <lib/core/Optional.h>
#include <system/SystemClock.h>
using namespace chip::System::Clock;
static constexpr char *TAG = "icd";
namespace chip {
namespace Test {
class ICDConfigurationDataTestAccess {
// This class is a friend class for ICDConfigurationData, so it can access private members of ICDConfigurationData.
public:
static void SetFastPollingInterval(Milliseconds32 pollInterval)
{
ICDConfigurationData::GetInstance().SetFastPollingInterval(pollInterval);
}
static void SetSlowPollingInterval(Milliseconds32 pollInterval)
{
ICDConfigurationData::GetInstance().SetSlowPollingInterval(pollInterval);
if (pollInterval >= Milliseconds32(15000)) {
// Active Threshold SHALL NOT be smaller than 5 seconds for LIT ICD.
ICDConfigurationData::GetInstance().SetICDMode(ICDConfigurationData::ICDMode::LIT);
if (ICDConfigurationData::GetInstance().mActiveThreshold < Milliseconds32(5000)) {
ICDConfigurationData::GetInstance().mActiveThreshold = Milliseconds32(5000);
}
}
}
static esp_err_t SetModeDurations(Optional<Milliseconds32> activeModeDuration, Optional<Seconds32> idleModeDuration)
{
Optional<Milliseconds32> idleModeDurationMs = chip::NullOptional;
if (idleModeDuration.HasValue()) {
idleModeDurationMs = MakeOptional(std::chrono::duration_cast<Milliseconds32>(idleModeDuration.Value()));
}
CHIP_ERROR err = ICDConfigurationData::GetInstance().SetModeDurations(activeModeDuration, idleModeDurationMs);
return err == CHIP_NO_ERROR ? ESP_OK : ESP_ERR_INVALID_ARG;
}
static esp_err_t SetActiveThreshold(Milliseconds32 activeThreshold)
{
if (ICDConfigurationData::GetInstance().GetICDMode() == ICDConfigurationData::ICDMode::LIT &&
activeThreshold < Milliseconds32(5000)) {
return ESP_ERR_INVALID_ARG;
}
ICDConfigurationData::GetInstance().mActiveThreshold = activeThreshold;
return ESP_OK;
}
};
} // namespace Test
} // namespace chip
namespace esp_matter {
namespace icd {
static esp_err_t set_polling_intervals(std::optional<uint32_t> fast_interval_ms,
std::optional<uint32_t> slow_interval_ms)
{
if (slow_interval_ms.has_value()) {
#if !CHIP_CONFIG_ENABLE_ICD_LIT
if (slow_interval_ms.value() > 15000) {
return ESP_ERR_INVALID_ARG;
}
#endif
chip::Test::ICDConfigurationDataTestAccess::SetSlowPollingInterval(Milliseconds32(slow_interval_ms.value()));
}
if (fast_interval_ms.has_value()) {
chip::Test::ICDConfigurationDataTestAccess::SetFastPollingInterval(Milliseconds32(fast_interval_ms.value()));
}
return ESP_OK;
}
static esp_err_t set_mode_durations(std::optional<uint32_t> active_mode_duration_ms,
std::optional<uint32_t> idle_mode_duration_s)
{
Milliseconds32 active_mode_duration = active_mode_duration_ms.has_value()
? Milliseconds32(active_mode_duration_ms.value())
: chip::ICDConfigurationData::GetInstance().GetActiveModeDuration();
Seconds32 idle_mode_duration = idle_mode_duration_s.has_value()
? Seconds32(idle_mode_duration_s.value())
: chip::ICDConfigurationData::GetInstance().GetIdleModeDuration();
return chip::Test::ICDConfigurationDataTestAccess::SetModeDurations(chip::MakeOptional(active_mode_duration),
chip::MakeOptional(idle_mode_duration));
}
static esp_err_t set_active_threshold(uint32_t active_threshold_ms)
{
return chip::Test::ICDConfigurationDataTestAccess::SetActiveThreshold(Milliseconds32(active_threshold_ms));
}
esp_err_t set_configuration_data(config_t *config)
{
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");
return ESP_OK;
}
} // namespace icd
} // namespace esp_matter
components/esp_matter/esp_matter_icd_configuration.h
+32
View File
@@ -0,0 +1,32 @@
// Copyright 2025 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include <esp_err.h>
#include <optional>
namespace esp_matter {
namespace icd {
typedef struct config {
std::optional<uint32_t> fast_interval_ms;
std::optional<uint32_t> slow_interval_ms;
std::optional<uint32_t> active_mode_duration_ms;
std::optional<uint32_t> idle_mode_duration_s;
std::optional<uint32_t> active_threshold_ms;
} config_t;
esp_err_t set_configuration_data(config_t *config);
} // namespace icd
} // namespace esp_matter
components/esp_matter/zap_common/zap-generated/access.h
+3
View File
@@ -15,6 +15,7 @@
0x00000030, /* Cluster: General Commissioning, Attribute: TCMinRequiredVersion, Privilege: administer */ \
0x00000030, /* Cluster: General Commissioning, Attribute: TCAcknowledgements, Privilege: administer */ \
0x00000030, /* Cluster: General Commissioning, Attribute: TCAcknowledgementsRequired, Privilege: administer */ \
0x00000030, /* Cluster: General Commissioning, Attribute: TCUpdateDeadline, Privilege: administer */ \
0x00000031, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
0x00000031, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
0x00000031, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
@@ -47,6 +48,7 @@
0x00000006, /* Cluster: General Commissioning, Attribute: TCMinRequiredVersion, Privilege: administer */ \
0x00000007, /* Cluster: General Commissioning, Attribute: TCAcknowledgements, Privilege: administer */ \
0x00000008, /* Cluster: General Commissioning, Attribute: TCAcknowledgementsRequired, Privilege: administer */ \
0x00000009, /* Cluster: General Commissioning, Attribute: TCUpdateDeadline, Privilege: administer */ \
0x00000000, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
0x00000001, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
0x00000005, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \
@@ -79,6 +81,7 @@
chip::Access::Privilege::kAdminister, /* Cluster: General Commissioning, Attribute: TCMinRequiredVersion, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: General Commissioning, Attribute: TCAcknowledgements, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: General Commissioning, Attribute: TCAcknowledgementsRequired, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: General Commissioning, Attribute: TCUpdateDeadline, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Network Commissioning, Attribute: MaxNetworks, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Network Commissioning, Attribute: Networks, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Network Commissioning, Attribute: LastNetworkingStatus, Privilege: administer */ \