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

Update subscription_command callbacks

Browse Source
This commit is contained in:
Tomas McGuinness
2026-03-05 09:42:50 +00:00
parent bd5fb3a500
commit d87aea1b84
5 changed files with 89 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter_controller/commands/esp_matter_controller_subscribe_command.cpp
+9 -4
View File
@@ -159,6 +159,11 @@ void subscribe_command::OnSubscriptionEstablished(chip::SubscriptionId subscript
m_subscription_id = subscriptionId;
m_resubscribe_retries = 0;
ESP_LOGI(TAG, "Subscription 0x%" PRIx32 " established", subscriptionId);
if (subscription_established_cb) {
// This will be called when the subscription is established.
subscription_established_cb(m_node_id, m_subscription_id);
}
}
CHIP_ERROR subscribe_command::OnResubscriptionNeeded(ReadClient *apReadClient, CHIP_ERROR aTerminationCause)
@@ -175,9 +180,9 @@ CHIP_ERROR subscribe_command::OnResubscriptionNeeded(ReadClient *apReadClient, C
void subscribe_command::OnDone(ReadClient *apReadClient)
{
ESP_LOGI(TAG, "Subscription 0x%" PRIx32 " Done for remote node 0x%" PRIx64, m_subscription_id, m_node_id);
if (subscribe_done_cb) {
if (subscription_terminated_cb) {
// This will be called when the subscription is terminated.
subscribe_done_cb(m_node_id, m_subscription_id);
subscription_terminated_cb(m_node_id, m_subscription_id);
}
chip::Platform::Delete(this);
}
@@ -207,7 +212,7 @@ esp_err_t send_subscribe_attr_command(uint64_t node_id, ScopedMemoryBufferWithSi
subscribe_command *cmd = chip::Platform::New<subscribe_command>(
node_id, std::move(attr_paths), std::move(event_paths), min_interval, max_interval, auto_resubscribe, nullptr,
nullptr, nullptr, nullptr, keep_subscription);
nullptr, nullptr, nullptr, nullptr, keep_subscription);
if (!cmd) {
ESP_LOGE(TAG, "Failed to alloc memory for subscribe_command");
return ESP_ERR_NO_MEM;
@@ -240,7 +245,7 @@ esp_err_t send_subscribe_event_command(uint64_t node_id, ScopedMemoryBufferWithS
subscribe_command *cmd = chip::Platform::New<subscribe_command>(
node_id, std::move(attr_paths), std::move(event_paths), min_interval, max_interval, auto_resubscribe, nullptr,
nullptr, nullptr, nullptr, keep_subscription);
nullptr, nullptr, nullptr, nullptr, keep_subscription);
if (!cmd) {
ESP_LOGE(TAG, "Failed to alloc memory for subscribe_command");
return ESP_ERR_NO_MEM;
components/esp_matter_controller/commands/esp_matter_controller_subscribe_command.h
+67 -5
View File
@@ -45,7 +45,31 @@ public:
subscribe_command(uint64_t node_id, ScopedMemoryBufferWithSize<AttributePathParams> &&attr_paths,
ScopedMemoryBufferWithSize<EventPathParams> &&event_paths, uint16_t min_interval,
uint16_t max_interval, bool auto_resubscribe = true, attribute_report_cb_t attribute_cb = nullptr,
event_report_cb_t event_cb = nullptr, subscribe_done_cb_t done_cb = nullptr,
event_report_cb_t event_cb = nullptr, subscription_established_cb_t established_cb = nullptr,
subscription_terminated_cb_t terminated_cb = nullptr, subscribe_failure_cb_t connect_failure_cb = nullptr, bool keep_subscription = true)
: m_node_id(node_id)
, m_min_interval(min_interval)
, m_max_interval(max_interval)
, m_auto_resubscribe(auto_resubscribe)
, m_keep_subscription(keep_subscription)
, m_buffered_read_cb(*this)
, m_attr_paths(std::move(attr_paths))
, m_event_paths(std::move(event_paths))
, on_device_connected_cb(on_device_connected_fcn, this)
, on_device_connection_failure_cb(on_device_connection_failure_fcn, this)
, attribute_data_cb(attribute_cb)
, event_data_cb(event_cb)
, subscription_established_cb(established_cb)
, subscription_terminated_cb(terminated_cb)
, subscribe_failure_cb(connect_failure_cb)
{
}
/** Constructor for command with multiple paths**/
subscribe_command(uint64_t node_id, ScopedMemoryBufferWithSize<AttributePathParams> &&attr_paths,
ScopedMemoryBufferWithSize<EventPathParams> &&event_paths, uint16_t min_interval,
uint16_t max_interval, bool auto_resubscribe = true, attribute_report_cb_t attribute_cb = nullptr,
event_report_cb_t event_cb = nullptr, subscription_terminated_cb_t terminated_cb = nullptr,
subscribe_failure_cb_t connect_failure_cb = nullptr, bool keep_subscription = true)
: m_node_id(node_id)
, m_min_interval(min_interval)
@@ -59,7 +83,7 @@ public:
, on_device_connection_failure_cb(on_device_connection_failure_fcn, this)
, attribute_data_cb(attribute_cb)
, event_data_cb(event_cb)
, subscribe_done_cb(done_cb)
, subscription_terminated_cb(terminated_cb)
, subscribe_failure_cb(connect_failure_cb)
{
}
@@ -71,7 +95,44 @@ public:
subscribe_command(uint64_t node_id, uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_or_event_id,
subscribe_command_type_t command_type, uint16_t min_interval, uint16_t max_interval,
bool auto_resubscribe = true, attribute_report_cb_t attribute_cb = nullptr,
event_report_cb_t event_cb = nullptr, subscribe_done_cb_t done_cb = nullptr,
event_report_cb_t event_cb = nullptr, subscription_established_cb_t established_cb = nullptr,
subscription_terminated_cb_t terminated_cb = nullptr, subscribe_failure_cb_t connect_failure_cb = nullptr,
bool keep_subscription = true)
: m_node_id(node_id)
, m_min_interval(min_interval)
, m_max_interval(max_interval)
, m_auto_resubscribe(auto_resubscribe)
, m_keep_subscription(keep_subscription)
, m_buffered_read_cb(*this)
, on_device_connected_cb(on_device_connected_fcn, this)
, on_device_connection_failure_cb(on_device_connection_failure_fcn, this)
, attribute_data_cb(attribute_cb)
, event_data_cb(event_cb)
, subscription_established_cb(established_cb)
, subscription_terminated_cb(terminated_cb)
, subscribe_failure_cb(connect_failure_cb)
{
if (command_type == SUBSCRIBE_ATTRIBUTE) {
m_attr_paths.Alloc(1);
if (m_attr_paths.Get()) {
m_attr_paths[0] = AttributePathParams(endpoint_id, cluster_id, attribute_or_event_id);
}
} else if (command_type == SUBSCRIBE_EVENT) {
m_event_paths.Alloc(1);
if (m_event_paths.Get()) {
m_event_paths[0] = EventPathParams(endpoint_id, cluster_id, attribute_or_event_id);
}
}
}
/** Constructor for command with single path.
* @note 0xFFFF could be used as wildcard EndpointId
* @note 0xFFFFFFFF could be used as wildcard ClusterId/AttributeId/EventId
*/
subscribe_command(uint64_t node_id, uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_or_event_id,
subscribe_command_type_t command_type, uint16_t min_interval, uint16_t max_interval,
bool auto_resubscribe = true, attribute_report_cb_t attribute_cb = nullptr,
event_report_cb_t event_cb = nullptr, subscription_terminated_cb_t terminated_cb = nullptr,
subscribe_failure_cb_t connect_failure_cb = nullptr, bool keep_subscription = true)
: m_node_id(node_id)
, m_min_interval(min_interval)
@@ -83,7 +144,7 @@ public:
, on_device_connection_failure_cb(on_device_connection_failure_fcn, this)
, attribute_data_cb(attribute_cb)
, event_data_cb(event_cb)
, subscribe_done_cb(done_cb)
, subscription_terminated_cb(terminated_cb)
, subscribe_failure_cb(connect_failure_cb)
{
if (command_type == SUBSCRIBE_ATTRIBUTE) {
@@ -145,7 +206,8 @@ private:
chip::Callback::Callback<chip::OnDeviceConnectionFailure> on_device_connection_failure_cb;
attribute_report_cb_t attribute_data_cb;
event_report_cb_t event_data_cb;
subscribe_done_cb_t subscribe_done_cb;
subscription_established_cb_t subscription_established_cb;
subscription_terminated_cb_t subscription_terminated_cb;
subscribe_failure_cb_t subscribe_failure_cb;
};
components/esp_matter_controller/core/esp_matter_controller_utils.h
+2 -1
View File
@@ -31,7 +31,8 @@ using attribute_report_cb_t = void (*)(uint64_t remote_node_id, const chip::app:
chip::TLV::TLVReader *data);
using event_report_cb_t = void (*)(uint64_t remote_node_id, const chip::app::EventHeader &header,
chip::TLV::TLVReader *data);
using subscribe_done_cb_t = void (*)(uint64_t remote_node_id, uint32_t subscription_id);
using subscription_established_cb_t = void (*)(uint64_t remote_node_id, uint32_t subscription_id);
using subscription_terminated_cb_t = void (*)(uint64_t remote_node_id, uint32_t subscription_id);
using subscribe_failure_cb_t = void (*)(void *subscribe_command);
using read_done_cb_t = void (*)(uint64_t remote_node_id,
const ScopedMemoryBufferWithSize<AttributePathParams> &attr_paths,