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

matter_command: Add callback support for custom commands.

Browse Source
This commit is contained in:
Chirag Atal
2022-01-18 15:17:28 +05:30
parent bb1e9aa101
commit dec7e3cf7f
4 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter/esp_matter_command.cpp
+22 -5
View File
@@ -34,6 +34,16 @@ using chip::TLV::TLVReader;
static const char *TAG = "esp_matter_command";
static esp_matter_command_custom_callback_t custom_callback = NULL;
static void *custom_callback_priv_data = NULL;
esp_err_t esp_matter_command_set_custom_callback(esp_matter_command_custom_callback_t callback, void *priv_data)
{
custom_callback = callback;
custom_callback_priv_data = priv_data;
return ESP_OK;
}
void DispatchSingleClusterCommandCommon(const ConcreteCommandPath &command_path, TLVReader &tlv_data, void *command_obj)
{
int endpoint_id = command_path.mEndpointId;
@@ -49,8 +59,15 @@ void DispatchSingleClusterCommandCommon(const ConcreteCommandPath &command_path,
ESP_LOGE(TAG, "Command 0x%04X not found", command_id);
return;
}
esp_matter_command_callback_t callback = esp_matter_command_get_callback(command);
callback(command_obj, command_path, tlv_data);
int flags = esp_matter_command_get_flags(command);
if (flags & COMMAND_MASK_CUSTOM) {
if (custom_callback) {
custom_callback(endpoint_id, cluster_id, command_id, tlv_data, custom_callback_priv_data);
}
} else {
esp_matter_command_callback_t callback = esp_matter_command_get_callback(command);
callback(command_obj, command_path, tlv_data);
}
}
namespace chip {
@@ -781,7 +798,7 @@ void esp_matter_command_callback_key_set_read_all_indices_response(void *command
}
}
emberAfGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback(command_path.mEndpointId,
emberAfGroupKeyManagementClusterKeySetReadAllIndicesResponseCallback(command_path.mEndpointId,
(CommandSender *)command_obj,
group_key_set_indices);
*/
@@ -939,7 +956,7 @@ void esp_matter_command_callback_network_config_response(void *command_obj, cons
}
}
emberAfNetworkCommissioningClusterNetworkConfigResponseCallback(command_path.mEndpointId,
emberAfNetworkCommissioningClusterNetworkConfigResponseCallback(command_path.mEndpointId,
(CommandSender *)command_obj, networking_status,
debug_text);
}
@@ -1176,7 +1193,7 @@ void esp_matter_command_callback_apply_update_response(void *command_obj, const
}
}
emberAfOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback(command_path.mEndpointId,
emberAfOtaSoftwareUpdateProviderClusterApplyUpdateResponseCallback(command_path.mEndpointId,
(CommandSender *)command_obj, action,
delayed_action_time);
}
components/esp_matter/esp_matter_command.h
+5
View File
@@ -19,6 +19,11 @@
using chip::app::ConcreteCommandPath;
using chip::TLV::TLVReader;
#define COMMAND_MASK_CUSTOM 0x80
typedef esp_err_t (*esp_matter_command_custom_callback_t)(int endpoint_id, int cluster_id, int command_id,
TLVReader &tlv_data, void *priv_data);
typedef void (*esp_matter_command_callback_t)(void *command_obj, const ConcreteCommandPath &command_path,
TLVReader &tlv_data);
components/esp_matter/esp_matter_core.cpp
+10
View File
@@ -474,6 +474,16 @@ esp_matter_command_callback_t esp_matter_command_get_callback(esp_matter_command
return current_command->callback;
}
int esp_matter_command_get_flags(esp_matter_command_t *command)
{
if (!command) {
ESP_LOGE(TAG, "Command cannot be NULL");
return 0;
}
_esp_matter_command_t *current_command = (_esp_matter_command_t *)command;
return current_command->flags;
}
esp_matter_attribute_t *esp_matter_attribute_create(esp_matter_cluster_t *cluster, int attribute_id, uint8_t flags,
esp_matter_attr_val_t val)
{
components/esp_matter/esp_matter_core.h
+2
View File
@@ -89,3 +89,5 @@ esp_matter_command_t *esp_matter_command_get_first(esp_matter_cluster_t *cluster
esp_matter_command_t *esp_matter_command_get_next(esp_matter_command_t *command);
int esp_matter_command_get_id(esp_matter_command_t *command);
esp_matter_command_callback_t esp_matter_command_get_callback(esp_matter_command_t *command);
int esp_matter_command_get_flags(esp_matter_command_t *command);
esp_err_t esp_matter_command_set_custom_callback(esp_matter_command_custom_callback_t callback, void *priv_data);