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

Browse Source 
controller: Decode the custom controller cluster command data field as TLV structure

See merge request app-frameworks/esp-matter!516
This commit is contained in:
Shu Chen
2023-10-23 17:07:23 +08:00
parent df8ed2de08 0d1b506846
commit 3d32807c72
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter_controller/controller_custom_cluster/matter_controller_cluster.cpp
+17 -2
View File
@@ -259,8 +259,23 @@ namespace command {
esp_err_t parse_string_from_tlv(TLVReader &tlv_data, ScopedMemoryBufferWithSize<char> &str)
{
chip::TLV::TLVType outer;
chip::CharSpan str_span;
chip::app::DataModel::Decode(tlv_data, str_span);
if (chip::TLV::kTLVType_Structure != tlv_data.GetType()) {
return ESP_FAIL;
}
if (tlv_data.EnterContainer(outer) != CHIP_NO_ERROR) {
return ESP_FAIL;
}
while (tlv_data.Next() == CHIP_NO_ERROR) {
if (!chip::TLV::IsContextTag(tlv_data.GetTag())) {
continue;
}
if (chip::TLV::TagNumFromTag(tlv_data.GetTag()) == 0) {
chip::app::DataModel::Decode(tlv_data, str_span);
}
}
tlv_data.ExitContainer(outer);
ESP_RETURN_ON_FALSE(str_span.data() && str_span.size() > 0, ESP_FAIL, TAG, "Failed to decode the tlv_data");
strncpy(str.Get(), str_span.data(), str_span.size());
str[str_span.size()] = '\0';
@@ -864,7 +879,7 @@ cluster_t *create(endpoint_t *endpoint, uint8_t flags)
set_plugin_server_init_callback(cluster, NULL);
add_function_list(cluster, NULL, 0);
global::attribute::create_cluster_revision(cluster, 1);
global::attribute::create_cluster_revision(cluster, 2);
global::attribute::create_feature_map(cluster, 0);
{
char *_refresh_token = (char *)calloc(ESP_MATTER_RAINMAKER_MAX_REFRESH_TOKEN_LEN, sizeof(char));