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 'controller/add_icd_callback' into 'main'

Browse Source 
esp_matter_controller: Add API to register callbacks for ICD client

Closes CON-1925

See merge request app-frameworks/esp-matter!1410
This commit is contained in:
Shu Chen
2026-01-30 12:31:21 +00:00
parent ccad0a93a8 97f93519c6
commit 6825f894d4
1 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter_controller/core/esp_matter_controller_client.h
+46 -3
View File
@@ -35,13 +35,13 @@
#include <lib/core/CHIPError.h>
#include <lib/core/CHIPPersistentStorageDelegate.h>
#include <lib/core/DataModelTypes.h>
#include <lib/support/CodeUtils.h>
#include <lib/support/Span.h>
#include <platform/CHIPDeviceLayer.h>
#include <platform/KeyValueStoreManager.h>
#include <platform/PlatformManager.h>
#include <stdint.h>
#include <transport/TransportMgr.h>
#include "support/CodeUtils.h"
#if CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY
#include <controller/CommissionerDiscoveryController.h>
@@ -73,7 +73,9 @@ public:
auto_fabric_remover(chip::Controller::DeviceController *controller, remove_fabric_callback callback)
: chip::Controller::CurrentFabricRemover(controller)
, m_matter_callback(on_remove_current_fabric, this)
, m_remove_fabric_callback(callback) {}
, m_remove_fabric_callback(callback)
{
}
private:
static void on_remove_current_fabric(void *context, chip::NodeId remote_node, CHIP_ERROR status)
@@ -88,6 +90,42 @@ private:
remove_fabric_callback m_remove_fabric_callback;
};
class controller_check_in_delegate : public chip::app::DefaultCheckInDelegate {
public:
using check_in_complete_callback = void (*)(const chip::app::ICDClientInfo &clientInfo);
using key_refresh_done_callback = void (*)(const chip::app::RefreshKeySender *refreshKeySender, CHIP_ERROR error);
CHIP_ERROR Init(chip::app::ICDClientStorage *storage, chip::app::InteractionModelEngine *engine)
{
return chip::app::DefaultCheckInDelegate::Init(storage, engine);
}
void SetICDDelegateCallback(check_in_complete_callback check_in_complete_cb,
key_refresh_done_callback key_refresh_done_cb)
{
m_check_in_complete_cb = check_in_complete_cb;
m_key_refresh_done_cb = key_refresh_done_cb;
}
void OnCheckInComplete(const chip::app::ICDClientInfo &clientInfo) override
{
if (m_check_in_complete_cb) {
m_check_in_complete_cb(clientInfo);
}
}
void OnKeyRefreshDone(chip::app::RefreshKeySender *refreshKeySender, CHIP_ERROR error) override
{
if (m_key_refresh_done_cb) {
m_key_refresh_done_cb(refreshKeySender, error);
}
chip::app::DefaultCheckInDelegate::OnKeyRefreshDone(refreshKeySender, error);
}
private:
check_in_complete_callback m_check_in_complete_cb;
key_refresh_done_callback m_key_refresh_done_cb;
};
class matter_controller_client {
public:
class controller_storage_delegate : public chip::PersistentStorageDelegate {
@@ -133,6 +171,11 @@ public:
esp_err_t init(NodeId node_id, FabricId fabric_id, uint16_t listen_port);
chip::app::DefaultICDClientStorage &get_icd_client_storage() { return m_icd_client_storage; }
void set_icd_client_callback(controller_check_in_delegate::check_in_complete_callback check_in_complete_cb,
controller_check_in_delegate::key_refresh_done_callback key_refresh_done_cb)
{
m_icd_check_in_delegate.SetICDDelegateCallback(check_in_complete_cb, key_refresh_done_cb);
}
#ifdef CONFIG_ESP_MATTER_COMMISSIONER_ENABLE
esp_err_t setup_commissioner();
@@ -227,7 +270,7 @@ private:
NodeId m_controller_node_id;
FabricId m_controller_fabric_id;
chip::app::DefaultICDClientStorage m_icd_client_storage;
chip::app::DefaultCheckInDelegate m_icd_check_in_delegate;
controller_check_in_delegate m_icd_check_in_delegate;
chip::app::CheckInHandler m_check_in_handler;
#ifdef CONFIG_ESP_MATTER_COMMISSIONER_ENABLE