From a33ed54ac3d6f0cfa43b28e979f2b62d15c8441f Mon Sep 17 00:00:00 2001 From: chendejin Date: Fri, 20 Sep 2024 16:31:05 +0800 Subject: [PATCH] Added secondary network interface device type in esp-matter --- components/esp_matter/esp_matter_endpoint.cpp | 31 +++++++++++++++++++ components/esp_matter/esp_matter_endpoint.h | 14 +++++++++ 2 files changed, 45 insertions(+) diff --git a/components/esp_matter/esp_matter_endpoint.cpp b/components/esp_matter/esp_matter_endpoint.cpp index a4521f9fd..1d683d452 100644 --- a/components/esp_matter/esp_matter_endpoint.cpp +++ b/components/esp_matter/esp_matter_endpoint.cpp @@ -1919,6 +1919,37 @@ esp_err_t add(endpoint_t *endpoint, config_t *config) } /* thread_border_router */ +namespace secondary_network_interface { +uint32_t get_device_type_id() +{ + return ESP_MATTER_SECONDARY_NETWORK_INTERFACE_DEVICE_TYPE_ID; +} + +uint8_t get_device_type_version() +{ + return ESP_MATTER_SECONDARY_NETWORK_INTERFACE_DEVICE_TYPE_VERSION; +} + +endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_data) +{ + return common::create(node, config, flags, priv_data, add); +} + +esp_err_t add(endpoint_t *endpoint, config_t *config) +{ + VerifyOrReturnError(endpoint != nullptr, ESP_ERR_INVALID_ARG, ESP_LOGE(TAG, "Endpoint cannot be NULL")); + esp_err_t err = add_device_type(endpoint, get_device_type_id(), get_device_type_version()); + if (err != ESP_OK) { + ESP_LOGE(TAG, "Failed to add device type id:%" PRIu32 ",err: %d", get_device_type_id(), err); + return err; + } + + network_commissioning::create(endpoint, &(config->network_commissioning), CLUSTER_FLAG_SERVER); + + return ESP_OK; +} +} /* secondary_network_interface */ + } /* endpoint */ namespace node { diff --git a/components/esp_matter/esp_matter_endpoint.h b/components/esp_matter/esp_matter_endpoint.h index e5b0c0efb..fca41c387 100644 --- a/components/esp_matter/esp_matter_endpoint.h +++ b/components/esp_matter/esp_matter_endpoint.h @@ -130,6 +130,8 @@ #define ESP_MATTER_WATER_VALVE_DEVICE_TYPE_VERSION 1 #define ESP_MATTER_DEVICE_ENERGY_MANAGEMENT_DEVICE_TYPE_ID 0x050D #define ESP_MATTER_DEVICE_ENERGY_MANAGEMENT_DEVICE_TYPE_VERSION 1 +#define ESP_MATTER_SECONDARY_NETWORK_INTERFACE_DEVICE_TYPE_ID 0x0019 +#define ESP_MATTER_SECONDARY_NETWORK_INTERFACE_DEVICE_TYPE_VERSION 1 #define ESP_MATTER_THREAD_BORDER_ROUTER_DEVICE_TYPE_ID 0x0091 #define ESP_MATTER_THREAD_BORDER_ROUTER_DEVICE_TYPE_VERSION 1 @@ -869,6 +871,18 @@ endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_dat esp_err_t add(endpoint_t *endpoint, config_t *config); } /* thread_border_router */ +namespace secondary_network_interface { +typedef struct config { + cluster::descriptor::config_t descriptor; + cluster::network_commissioning::config_t network_commissioning; +} config_t; + +uint32_t get_device_type_id(); +uint8_t get_device_type_version(); +endpoint_t *create(node_t *node, config_t *config, uint8_t flags, void *priv_data); +esp_err_t add(endpoint_t *endpoint, config_t *config); +} /* secondary_network_interface */ + } /* endpoint */ namespace node {