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

Browse Source 
controller_cluster: fix errors after submodule update

See merge request app-frameworks/esp-matter!492
This commit is contained in:
Shu Chen
2023-09-18 16:51:06 +08:00
parent 10b745c44e 3084a11f08
commit 499eaddb59
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter_controller/Kconfig
+1 -1
View File
@@ -22,7 +22,7 @@ menu "ESP Matter Controller"
config ESP_MATTER_CONTROLLER_CUSTOM_CLUSTER_ENABLE
bool "Enable controller custom cluster"
depends on !ESP_MATTER_COMMISSIONER_ENABLE
depends on ESP_MATTER_CONTROLLER_ENABLE && !ESP_MATTER_COMMISSIONER_ENABLE
default y
help
Enable the custom cluster of matter controller in the ESP Matter controller for Rainmaker Fabric suppport.
components/esp_matter_controller/controller_custom_cluster/matter_controller_cluster.cpp
+1 -1
View File
@@ -378,7 +378,7 @@ cleanup:
static esp_err_t generate_user_noc_csr(ScopedMemoryBufferWithSize<char> &csr_pem, uint8_t fabric_index, size_t &out_len)
{
uint8_t csr_der_buf[chip::Crypto::kMAX_CSR_Length];
uint8_t csr_der_buf[chip::Crypto::kMIN_CSR_Buffer_Size];
MutableByteSpan csr_span(csr_der_buf);
chip::Server::GetInstance().GetFabricTable().AllocatePendingOperationalKey(chip::MakeOptional(fabric_index),
csr_span);
components/esp_matter_controller/controller_custom_cluster/matter_controller_device_mgr.cpp
+9 -1
View File
@@ -35,6 +35,7 @@ namespace device_mgr {
static matter_device_t *s_matter_device_list = NULL;
static device_list_update_callback_t s_device_list_update_cb = NULL;
static QueueHandle_t s_task_queue = NULL;
static TaskHandle_t s_device_mgr_task = NULL;
static SemaphoreHandle_t s_device_mgr_mutex = NULL;
typedef esp_err_t (*esp_matter_device_mgr_task_t)(void *);
@@ -454,6 +455,10 @@ static esp_err_t update_device_list_task(void *endpoint_id_ptr)
esp_err_t update_device_list(uint16_t endpoint_id)
{
if (!s_task_queue) {
ESP_LOGE(TAG, "Failed to update device list as the task queue is not initialized");
return ESP_ERR_INVALID_STATE;
}
uint16_t *endpoint_id_ptr = (uint16_t *)malloc(sizeof(uint16_t));
*endpoint_id_ptr = endpoint_id;
task_post_t task_post = {
@@ -494,10 +499,13 @@ static void device_mgr_task(void *aContext)
esp_err_t init(uint16_t endpoint_id, device_list_update_callback_t dev_list_update_cb)
{
if (s_device_mgr_task) {
return ESP_OK;
}
uint8_t fabric_index;
bool user_noc_installed = false;
s_device_list_update_cb = dev_list_update_cb;
if (xTaskCreate(device_mgr_task, "device_mgr", 4096, NULL, 5, NULL) != pdTRUE) {
if (xTaskCreate(device_mgr_task, "device_mgr", 4096, NULL, 5, &s_device_mgr_task) != pdTRUE) {
ESP_LOGE(TAG, "Failed to create device mgr task");
return ESP_ERR_NO_MEM;
}