From d777bd96c8c7931093f7af89ad6ffc7b38bdbfb4 Mon Sep 17 00:00:00 2001 From: chendejin Date: Thu, 23 May 2024 21:14:49 +0800 Subject: [PATCH] Removed zigbee endpoint in zigbee bridge example --- examples/zigbee_bridge/main/app_zboss.cpp | 15 --------------- examples/zigbee_bridge/main/app_zboss.h | 1 - examples/zigbee_bridge/main/zigbee_bridge.cpp | 3 +-- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/examples/zigbee_bridge/main/app_zboss.cpp b/examples/zigbee_bridge/main/app_zboss.cpp index 6d3839fca..70b7a6efa 100644 --- a/examples/zigbee_bridge/main/app_zboss.cpp +++ b/examples/zigbee_bridge/main/app_zboss.cpp @@ -103,21 +103,6 @@ static void zboss_task(void *pvParameters) /* initialize Zigbee stack with Zigbee coordinator config */ esp_zb_cfg_t zb_nwk_cfg = ESP_ZB_ZC_CONFIG(); esp_zb_init(&zb_nwk_cfg); - - // TODO: Send Zigbee command without client data model (TZ-883) - /* add an onoff endpoint to send the Zigbee onoff command through esp_zb_zcl_on_off_cmd_req */ - esp_zb_cluster_list_t *cluster_list = esp_zb_zcl_cluster_list_create(); - esp_zb_cluster_list_add_on_off_cluster(cluster_list, esp_zb_on_off_cluster_create(NULL), - ESP_ZB_ZCL_CLUSTER_CLIENT_ROLE); - esp_zb_endpoint_config_t endpoint_config = { - .endpoint = ESP_BRIDGE_ON_OFF_ENDPOINT, - .app_profile_id = ESP_ZB_AF_HA_PROFILE_ID, - .app_device_id = ESP_ZB_HA_ON_OFF_OUTPUT_DEVICE_ID, - }; - esp_zb_ep_list_t *endpoint_list = esp_zb_ep_list_create(); - esp_zb_ep_list_add_ep(endpoint_list, cluster_list, endpoint_config); - esp_zb_device_register(endpoint_list); - /* initiate Zigbee Stack start without zb_send_no_autostart_signal auto-start */ esp_zb_set_primary_network_channel_set(ESP_ZB_PRIMARY_CHANNEL_MASK); ESP_ERROR_CHECK(esp_zb_start(false)); diff --git a/examples/zigbee_bridge/main/app_zboss.h b/examples/zigbee_bridge/main/app_zboss.h index 04d9dbfba..4739a63a0 100644 --- a/examples/zigbee_bridge/main/app_zboss.h +++ b/examples/zigbee_bridge/main/app_zboss.h @@ -15,7 +15,6 @@ #define MAX_CHILDREN 10 /* the max amount of connected devices */ #define INSTALLCODE_POLICY_ENABLE false /* enable the install code policy for security */ #define ESP_ZB_PRIMARY_CHANNEL_MASK (1l << 13) /* Zigbee primary channel mask use in the example */ -#define ESP_BRIDGE_ON_OFF_ENDPOINT (2) /* esp onoff device endpoint, used to send onoff controlling commands */ #define ESP_ZB_ZC_CONFIG() \ { \ diff --git a/examples/zigbee_bridge/main/zigbee_bridge.cpp b/examples/zigbee_bridge/main/zigbee_bridge.cpp index bb62c5977..b3dba754c 100644 --- a/examples/zigbee_bridge/main/zigbee_bridge.cpp +++ b/examples/zigbee_bridge/main/zigbee_bridge.cpp @@ -13,7 +13,6 @@ #include #include #include -#include static const char *TAG = "zigbee_bridge"; @@ -61,7 +60,7 @@ esp_err_t zigbee_bridge_attribute_update(uint16_t endpoint_id, uint32_t cluster_ esp_zb_zcl_on_off_cmd_t cmd_req; cmd_req.zcl_basic_cmd.dst_addr_u.addr_short = zigbee_device->dev_addr.zigbee_shortaddr; cmd_req.zcl_basic_cmd.dst_endpoint = zigbee_device->dev_addr.zigbee_endpointid; - cmd_req.zcl_basic_cmd.src_endpoint = ESP_BRIDGE_ON_OFF_ENDPOINT; + cmd_req.zcl_basic_cmd.src_endpoint = esp_matter::endpoint::get_id(zigbee_device->dev->endpoint); cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_16_ENDP_PRESENT; cmd_req.on_off_cmd_id = val->val.b ? ESP_ZB_ZCL_CMD_ON_OFF_ON_ID : ESP_ZB_ZCL_CMD_ON_OFF_OFF_ID; if (esp_zb_lock_acquire(portMAX_DELAY)) {