From a831d40b52284f6fbc5009588ef32d9cfdbda36f Mon Sep 17 00:00:00 2001 From: xieqinan Date: Tue, 29 Aug 2023 15:58:44 +0800 Subject: [PATCH] feat(zigbee): optimize Zigbee example implementation --- .../main/esp_zigbee_gateway.c | 26 +++---- .../esp_zigbee_gateway/main/idf_component.yml | 4 +- .../esp_zigbee_rcp/main/esp_zigbee_rcp.c | 4 +- .../esp_zigbee_rcp/main/idf_component.yml | 4 +- .../HA_on_off_light/main/esp_zb_light.c | 74 ++++++++++++------- .../HA_on_off_light/main/idf_component.yml | 4 +- .../HA_on_off_light/partitions.csv | 6 +- .../HA_on_off_switch/main/esp_zb_switch.c | 70 ++++++++++-------- .../HA_on_off_switch/main/idf_component.yml | 4 +- .../HA_on_off_switch/partitions.csv | 6 +- 10 files changed, 114 insertions(+), 88 deletions(-) diff --git a/examples/zigbee/esp_zigbee_gateway/main/esp_zigbee_gateway.c b/examples/zigbee/esp_zigbee_gateway/main/esp_zigbee_gateway.c index a6777d90b7..52d61945b8 100644 --- a/examples/zigbee/esp_zigbee_gateway/main/esp_zigbee_gateway.c +++ b/examples/zigbee/esp_zigbee_gateway/main/esp_zigbee_gateway.c @@ -34,23 +34,23 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - #include -#include "esp_log.h" +#include #include "freertos/FreeRTOS.h" #include "freertos/task.h" +#include "driver/usb_serial_jtag.h" +#include "esp_coexist_internal.h" +#include "esp_log.h" #include "esp_netif.h" +#include "esp_spiffs.h" #include "esp_vfs_eventfd.h" +#include "esp_vfs_dev.h" +#include "esp_vfs_usb_serial_jtag.h" #include "esp_wifi.h" #include "nvs_flash.h" #include "protocol_examples_common.h" -#include "esp_coexist_internal.h" #include "esp_zigbee_gateway.h" -#include "esp_vfs_dev.h" -#include "esp_vfs_usb_serial_jtag.h" -#include "driver/usb_serial_jtag.h" - #if (!defined ZB_MACSPLIT_HOST && defined ZB_MACSPLIT_DEVICE) #error Only Zigbee gateway host device should be defined #endif @@ -82,7 +82,6 @@ esp_err_t esp_zb_gateway_console_init(void) } #endif -/********************* Define functions **************************/ static void bdb_start_top_level_commissioning_cb(uint8_t mode_mask) { ESP_ERROR_CHECK(esp_zb_bdb_start_top_level_commissioning(mode_mask)); @@ -103,8 +102,8 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct) break; case ESP_ZB_MACSPLIT_DEVICE_BOOT: ESP_LOGI(TAG, "Zigbee rcp device booted"); - rcp_version = (esp_zb_zdo_signal_macsplit_dev_boot_params_t*)esp_zb_app_signal_get_params(p_sg_p); - ESP_LOGI(TAG, "Running RCP Version:%s", rcp_version->version_str); + rcp_version = (esp_zb_zdo_signal_macsplit_dev_boot_params_t *)esp_zb_app_signal_get_params(p_sg_p); + ESP_LOGI(TAG, "Running RCP Version: %s", rcp_version->version_str); break; case ESP_ZB_BDB_SIGNAL_DEVICE_FIRST_START: case ESP_ZB_BDB_SIGNAL_DEVICE_REBOOT: @@ -112,7 +111,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct) ESP_LOGI(TAG, "Start network formation"); esp_zb_bdb_start_top_level_commissioning(ESP_ZB_BDB_MODE_NETWORK_FORMATION); } else { - ESP_LOGE(TAG, "Failed to initialize Zigbee stack (status: %d)", err_status); + ESP_LOGE(TAG, "Failed to initialize Zigbee stack (status: %s)", esp_err_to_name(err_status)); } break; case ESP_ZB_BDB_SIGNAL_FORMATION: @@ -125,7 +124,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct) esp_zb_get_pan_id(), esp_zb_get_current_channel()); esp_zb_bdb_start_top_level_commissioning(ESP_ZB_BDB_MODE_NETWORK_STEERING); } else { - ESP_LOGI(TAG, "Restart network formation (status: %d)", err_status); + ESP_LOGI(TAG, "Restart network formation (status: %s)", esp_err_to_name(err_status)); esp_zb_scheduler_alarm((esp_zb_callback_t)bdb_start_top_level_commissioning_cb, ESP_ZB_BDB_MODE_NETWORK_FORMATION, 1000); } break; @@ -139,7 +138,8 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct) ESP_LOGI(TAG, "New device commissioned or rejoined (short: 0x%04hx)", dev_annce_params->device_short_addr); break; default: - ESP_LOGI(TAG, "ZDO signal: %d, status: %d", sig_type, err_status); + ESP_LOGI(TAG, "ZDO signal: %s (0x%x), status: %s", esp_zb_zdo_signal_to_string(sig_type), sig_type, + esp_err_to_name(err_status)); break; } } diff --git a/examples/zigbee/esp_zigbee_gateway/main/idf_component.yml b/examples/zigbee/esp_zigbee_gateway/main/idf_component.yml index 1d60ab3792..aa99452a45 100644 --- a/examples/zigbee/esp_zigbee_gateway/main/idf_component.yml +++ b/examples/zigbee/esp_zigbee_gateway/main/idf_component.yml @@ -1,7 +1,7 @@ ## IDF Component Manager Manifest File dependencies: - espressif/esp-zboss-lib: "~0.5.0" - espressif/esp-zigbee-lib: "~0.7.0" + espressif/esp-zboss-lib: "~0.7.0" + espressif/esp-zigbee-lib: "~0.9.0" ## Required IDF version idf: version: ">=5.0.0" diff --git a/examples/zigbee/esp_zigbee_rcp/main/esp_zigbee_rcp.c b/examples/zigbee/esp_zigbee_rcp/main/esp_zigbee_rcp.c index 966baf32df..d264f25e43 100644 --- a/examples/zigbee/esp_zigbee_rcp/main/esp_zigbee_rcp.c +++ b/examples/zigbee/esp_zigbee_rcp/main/esp_zigbee_rcp.c @@ -35,12 +35,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "esp_log.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" +#include "esp_log.h" +#include "nvs_flash.h" #include "zb_scheduler.h" #include "esp_zigbee_rcp.h" -#include "nvs_flash.h" #if (defined ZB_MACSPLIT_HOST && !defined ZB_MACSPLIT_DEVICE) #error Only Zigbee rcp device should be defined diff --git a/examples/zigbee/esp_zigbee_rcp/main/idf_component.yml b/examples/zigbee/esp_zigbee_rcp/main/idf_component.yml index 1d60ab3792..aa99452a45 100644 --- a/examples/zigbee/esp_zigbee_rcp/main/idf_component.yml +++ b/examples/zigbee/esp_zigbee_rcp/main/idf_component.yml @@ -1,7 +1,7 @@ ## IDF Component Manager Manifest File dependencies: - espressif/esp-zboss-lib: "~0.5.0" - espressif/esp-zigbee-lib: "~0.7.0" + espressif/esp-zboss-lib: "~0.7.0" + espressif/esp-zigbee-lib: "~0.9.0" ## Required IDF version idf: version: ">=5.0.0" diff --git a/examples/zigbee/light_sample/HA_on_off_light/main/esp_zb_light.c b/examples/zigbee/light_sample/HA_on_off_light/main/esp_zb_light.c index 391d115b54..e2fef6a8fa 100644 --- a/examples/zigbee/light_sample/HA_on_off_light/main/esp_zb_light.c +++ b/examples/zigbee/light_sample/HA_on_off_light/main/esp_zb_light.c @@ -35,16 +35,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "esp_log.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" +#include "esp_check.h" +#include "esp_log.h" +#include "nvs_flash.h" #include "ha/esp_zigbee_ha_standard.h" #include "esp_zb_light.h" -#include "nvs_flash.h" -/** - * @note Make sure set idf.py menuconfig in zigbee component as zigbee end device! -*/ #if !defined ZB_ED_ROLE #error Define ZB_ED_ROLE in idf.py menuconfig to compile light (End Device) source code. #endif @@ -56,21 +54,6 @@ static void bdb_start_top_level_commissioning_cb(uint8_t mode_mask) ESP_ERROR_CHECK(esp_zb_bdb_start_top_level_commissioning(mode_mask)); } -void attr_cb(uint8_t status, uint8_t endpoint, uint16_t cluster_id, uint16_t attr_id, void *new_value) -{ - if (cluster_id == ESP_ZB_ZCL_CLUSTER_ID_ON_OFF) { - uint8_t value = *(uint8_t *)new_value; - if (attr_id == ESP_ZB_ZCL_ATTR_ON_OFF_ON_OFF_ID) { - /* implemented light on/off control */ - ESP_LOGI(TAG, "on/off light set to %hd", value); - light_driver_set_power((bool)value); - } - } else { - /* Implement some actions if needed when other cluster changed */ - ESP_LOGI(TAG, "cluster:0x%x, attribute:0x%x changed ", cluster_id, attr_id); - } -} - void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct) { uint32_t *p_sg_p = signal_struct->p_app_signal; @@ -88,7 +71,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct) esp_zb_bdb_start_top_level_commissioning(ESP_ZB_BDB_MODE_NETWORK_STEERING); } else { /* commissioning failed */ - ESP_LOGW(TAG, "Failed to initialize Zigbee stack (status: %d)", err_status); + ESP_LOGW(TAG, "Failed to initialize Zigbee stack (status: %s)", esp_err_to_name(err_status)); } break; case ESP_ZB_BDB_SIGNAL_STEERING: @@ -100,26 +83,63 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct) extended_pan_id[3], extended_pan_id[2], extended_pan_id[1], extended_pan_id[0], esp_zb_get_pan_id(), esp_zb_get_current_channel()); } else { - ESP_LOGI(TAG, "Network steering was not successful (status: %d)", err_status); + ESP_LOGI(TAG, "Network steering was not successful (status: %s)", esp_err_to_name(err_status)); esp_zb_scheduler_alarm((esp_zb_callback_t)bdb_start_top_level_commissioning_cb, ESP_ZB_BDB_MODE_NETWORK_STEERING, 1000); } break; default: - ESP_LOGI(TAG, "ZDO signal: %d, status: %d", sig_type, err_status); + ESP_LOGI(TAG, "ZDO signal: %s (0x%x), status: %s", esp_zb_zdo_signal_to_string(sig_type), sig_type, + esp_err_to_name(err_status)); break; } } +static esp_err_t zb_attribute_handler(const esp_zb_zcl_set_attr_value_message_t *message) +{ + esp_err_t ret = ESP_OK; + bool light_state = 0; + + ESP_RETURN_ON_FALSE(message, ESP_FAIL, TAG, "Empty message"); + ESP_RETURN_ON_FALSE(message->info.status == ESP_ZB_ZCL_STATUS_SUCCESS, ESP_ERR_INVALID_ARG, TAG, + "Received message: error status(%d)", message->info.status); + ESP_LOGI(TAG, "Received message: endpoint(%d), cluster(0x%x), attribute(0x%x), data size(%d)", + message->info.dst_endpoint, message->info.cluster, message->attribute.id, message->attribute.data.size); + if (message->info.dst_endpoint == HA_ESP_LIGHT_ENDPOINT) { + if (message->info.cluster == ESP_ZB_ZCL_CLUSTER_ID_ON_OFF) { + if (message->attribute.id == ESP_ZB_ZCL_ATTR_ON_OFF_ON_OFF_ID && + message->attribute.data.type == ESP_ZB_ZCL_ATTR_TYPE_BOOL) { + light_state = message->attribute.data.value ? *(bool *)message->attribute.data.value : light_state; + ESP_LOGI(TAG, "Light sets to %s", light_state ? "On" : "Off"); + light_driver_set_power(light_state); + } + } + } + return ret; +} + +static esp_err_t zb_action_handler(esp_zb_core_action_callback_id_t callback_id, const void *message) +{ + esp_err_t ret = ESP_OK; + switch (callback_id) { + case ESP_ZB_CORE_SET_ATTR_VALUE_CB_ID: + ret = zb_attribute_handler((esp_zb_zcl_set_attr_value_message_t *)message); + break; + default: + ESP_LOGW(TAG, "Receive Zigbee action(0x%x) callback", callback_id); + break; + } + return ret; +} + static void esp_zb_task(void *pvParameters) { - /* initialize Zigbee stack with Zigbee end-device config */ + /* initialize Zigbee stack */ esp_zb_cfg_t zb_nwk_cfg = ESP_ZB_ZED_CONFIG(); esp_zb_init(&zb_nwk_cfg); - /* set the on-off light device config */ esp_zb_on_off_light_cfg_t light_cfg = ESP_ZB_DEFAULT_ON_OFF_LIGHT_CONFIG(); esp_zb_ep_list_t *esp_zb_on_off_light_ep = esp_zb_on_off_light_ep_create(HA_ESP_LIGHT_ENDPOINT, &light_cfg); esp_zb_device_register(esp_zb_on_off_light_ep); - esp_zb_device_add_set_attr_value_cb(attr_cb); + esp_zb_core_action_handler_register(zb_action_handler); esp_zb_set_primary_network_channel_set(ESP_ZB_PRIMARY_CHANNEL_MASK); ESP_ERROR_CHECK(esp_zb_start(false)); esp_zb_main_loop_iteration(); @@ -132,9 +152,7 @@ void app_main(void) .host_config = ESP_ZB_DEFAULT_HOST_CONFIG(), }; ESP_ERROR_CHECK(nvs_flash_init()); - /* load Zigbee light_bulb platform config to initialization */ ESP_ERROR_CHECK(esp_zb_platform_config(&config)); - /* hardware related and device init */ light_driver_init(LIGHT_DEFAULT_OFF); xTaskCreate(esp_zb_task, "Zigbee_main", 4096, NULL, 5, NULL); } diff --git a/examples/zigbee/light_sample/HA_on_off_light/main/idf_component.yml b/examples/zigbee/light_sample/HA_on_off_light/main/idf_component.yml index 0799daf730..0fb287d698 100644 --- a/examples/zigbee/light_sample/HA_on_off_light/main/idf_component.yml +++ b/examples/zigbee/light_sample/HA_on_off_light/main/idf_component.yml @@ -1,7 +1,7 @@ ## IDF Component Manager Manifest File dependencies: - espressif/esp-zigbee-lib: "~0.7.0" - espressif/esp-zboss-lib: "~0.5.0" + espressif/esp-zigbee-lib: "~0.9.0" + espressif/esp-zboss-lib: "~0.7.0" espressif/led_strip: "~2.0.0" ## Required IDF version idf: diff --git a/examples/zigbee/light_sample/HA_on_off_light/partitions.csv b/examples/zigbee/light_sample/HA_on_off_light/partitions.csv index d8dcfcdf6b..24bb3132a4 100644 --- a/examples/zigbee/light_sample/HA_on_off_light/partitions.csv +++ b/examples/zigbee/light_sample/HA_on_off_light/partitions.csv @@ -2,6 +2,6 @@ # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap nvs, data, nvs, 0x9000, 0x6000, phy_init, data, phy, 0xf000, 0x1000, -factory, app, factory, 0x10000, 550K, -zb_storage, data, fat, 0x9a000, 16K, -zb_fct, data, fat, 0x9e000, 1K, +factory, app, factory, 0x10000, 650K, +zb_storage, data, fat, 0xb3000, 16K, +zb_fct, data, fat, 0xb7000, 1K, diff --git a/examples/zigbee/light_sample/HA_on_off_switch/main/esp_zb_switch.c b/examples/zigbee/light_sample/HA_on_off_switch/main/esp_zb_switch.c index a2ee868e6a..2fdaa82172 100644 --- a/examples/zigbee/light_sample/HA_on_off_switch/main/esp_zb_switch.c +++ b/examples/zigbee/light_sample/HA_on_off_switch/main/esp_zb_switch.c @@ -35,53 +35,38 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "esp_log.h" +#include "string.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" +#include "esp_log.h" +#include "nvs_flash.h" #include "ha/esp_zigbee_ha_standard.h" #include "esp_zb_switch.h" -#include "nvs_flash.h" -/** - * @note Make sure set idf.py menuconfig in zigbee component as zigbee coordinator device! -*/ #if defined ZB_ED_ROLE #error Define ZB_COORDINATOR_ROLE in idf.py menuconfig to compile light switch source code. #endif - -/* define a single remote device struct for managing */ typedef struct light_bulb_device_params_s { esp_zb_ieee_addr_t ieee_addr; uint8_t endpoint; uint16_t short_addr; } light_bulb_device_params_t; -/* define Button function currently only 1 switch define */ static switch_func_pair_t button_func_pair[] = { {GPIO_INPUT_IO_TOGGLE_SWITCH, SWITCH_ONOFF_TOGGLE_CONTROL} }; static const char *TAG = "ESP_ZB_ON_OFF_SWITCH"; -/* remote device struct for recording and managing node info */ -light_bulb_device_params_t on_off_light; -/********************* Define functions **************************/ -/** - * @brief Callback for button events, currently only toggle event available - * - * @param button_func_pair Incoming event from the button_pair. - */ static void esp_zb_buttons_handler(switch_func_pair_t *button_func_pair) { if (button_func_pair->func == SWITCH_ONOFF_TOGGLE_CONTROL) { /* implemented light switch toggle functionality */ esp_zb_zcl_on_off_cmd_t cmd_req; - cmd_req.zcl_basic_cmd.dst_addr_u.addr_short = on_off_light.short_addr; - cmd_req.zcl_basic_cmd.dst_endpoint = on_off_light.endpoint; cmd_req.zcl_basic_cmd.src_endpoint = HA_ONOFF_SWITCH_ENDPOINT; - cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_16_ENDP_PRESENT; + cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_DST_ADDR_ENDP_NOT_PRESENT; cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_TOGGLE_ID; - ESP_EARLY_LOGI(TAG, "send 'on_off toggle' command"); + ESP_EARLY_LOGI(TAG, "Send 'on_off toggle' command"); esp_zb_zcl_on_off_cmd_req(&cmd_req); } } @@ -91,12 +76,37 @@ static void bdb_start_top_level_commissioning_cb(uint8_t mode_mask) ESP_ERROR_CHECK(esp_zb_bdb_start_top_level_commissioning(mode_mask)); } -void user_find_cb(esp_zb_zdp_status_t zdo_status, uint16_t addr, uint8_t endpoint, void *user_ctx) +static void bind_cb(esp_zb_zdp_status_t zdo_status, void *user_ctx) { - ESP_LOGI(TAG, "User find cb: response_status:%d, address:0x%x, endpoint:%d", zdo_status, addr, endpoint); if (zdo_status == ESP_ZB_ZDP_STATUS_SUCCESS) { - on_off_light.endpoint = endpoint; - on_off_light.short_addr = addr; + ESP_LOGI(TAG, "Bound successfully!"); + if (user_ctx) { + light_bulb_device_params_t *light = (light_bulb_device_params_t *)user_ctx; + ESP_LOGI(TAG, "The light originating from address(0x%x) on endpoint(%d)", light->short_addr, + light->endpoint); + free(light); + } + } +} + +static void user_find_cb(esp_zb_zdp_status_t zdo_status, uint16_t addr, uint8_t endpoint, void *user_ctx) +{ + if (zdo_status == ESP_ZB_ZDP_STATUS_SUCCESS) { + ESP_LOGI(TAG, "Found light"); + esp_zb_zdo_bind_req_param_t bind_req; + light_bulb_device_params_t *light = (light_bulb_device_params_t *)malloc(sizeof(light_bulb_device_params_t)); + light->endpoint = endpoint; + light->short_addr = addr; + esp_zb_ieee_address_by_short(light->short_addr, light->ieee_addr); + esp_zb_get_long_address(bind_req.src_address); + bind_req.src_endp = HA_ONOFF_SWITCH_ENDPOINT; + bind_req.cluster_id = ESP_ZB_ZCL_CLUSTER_ID_ON_OFF; + bind_req.dst_addr_mode = ESP_ZB_ZDO_BIND_DST_ADDR_MODE_64_BIT_EXTENDED; + memcpy(bind_req.dst_address_u.addr_long, light->ieee_addr, sizeof(esp_zb_ieee_addr_t)); + bind_req.dst_endp = endpoint; + bind_req.req_dst_addr = esp_zb_get_short_address(); + ESP_LOGI(TAG, "Try to bind On/Off"); + esp_zb_zdo_device_bind_req(&bind_req, bind_cb, (void *)light); } } @@ -117,7 +127,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct) ESP_LOGI(TAG, "Start network formation"); esp_zb_bdb_start_top_level_commissioning(ESP_ZB_BDB_MODE_NETWORK_FORMATION); } else { - ESP_LOGE(TAG, "Failed to initialize Zigbee stack (status: %d)", err_status); + ESP_LOGE(TAG, "Failed to initialize Zigbee stack (status: %s)", esp_err_to_name(err_status)); } break; case ESP_ZB_BDB_SIGNAL_FORMATION: @@ -130,7 +140,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct) esp_zb_get_pan_id(), esp_zb_get_current_channel()); esp_zb_bdb_start_top_level_commissioning(ESP_ZB_BDB_MODE_NETWORK_STEERING); } else { - ESP_LOGI(TAG, "Restart network formation (status: %d)", err_status); + ESP_LOGI(TAG, "Restart network formation (status: %s)", esp_err_to_name(err_status)); esp_zb_scheduler_alarm((esp_zb_callback_t)bdb_start_top_level_commissioning_cb, ESP_ZB_BDB_MODE_NETWORK_FORMATION, 1000); } break; @@ -148,17 +158,17 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct) esp_zb_zdo_find_on_off_light(&cmd_req, user_find_cb, NULL); break; default: - ESP_LOGI(TAG, "ZDO signal: %d, status: %d", sig_type, err_status); + ESP_LOGI(TAG, "ZDO signal: %s (0x%x), status: %s", esp_zb_zdo_signal_to_string(sig_type), sig_type, + esp_err_to_name(err_status)); break; } } static void esp_zb_task(void *pvParameters) { - /* initialize Zigbee stack with Zigbee coordinator config */ + /* initialize Zigbee stack */ esp_zb_cfg_t zb_nwk_cfg = ESP_ZB_ZC_CONFIG(); esp_zb_init(&zb_nwk_cfg); - /* set the on-off switch device config */ esp_zb_on_off_switch_cfg_t switch_cfg = ESP_ZB_DEFAULT_ON_OFF_SWITCH_CONFIG(); esp_zb_ep_list_t *esp_zb_on_off_switch_ep = esp_zb_on_off_switch_ep_create(HA_ONOFF_SWITCH_ENDPOINT, &switch_cfg); esp_zb_device_register(esp_zb_on_off_switch_ep); @@ -174,9 +184,7 @@ void app_main(void) .host_config = ESP_ZB_DEFAULT_HOST_CONFIG(), }; ESP_ERROR_CHECK(nvs_flash_init()); - /* load Zigbee switch platform config to initialization */ ESP_ERROR_CHECK(esp_zb_platform_config(&config)); - /* hardware related and device init */ switch_driver_init(button_func_pair, PAIR_SIZE(button_func_pair), esp_zb_buttons_handler); xTaskCreate(esp_zb_task, "Zigbee_main", 4096, NULL, 5, NULL); } diff --git a/examples/zigbee/light_sample/HA_on_off_switch/main/idf_component.yml b/examples/zigbee/light_sample/HA_on_off_switch/main/idf_component.yml index 0a20539842..479a89e4fc 100644 --- a/examples/zigbee/light_sample/HA_on_off_switch/main/idf_component.yml +++ b/examples/zigbee/light_sample/HA_on_off_switch/main/idf_component.yml @@ -1,7 +1,7 @@ ## IDF Component Manager Manifest File dependencies: - espressif/esp-zigbee-lib: "~0.7.0" - espressif/esp-zboss-lib: "~0.5.0" + espressif/esp-zigbee-lib: "~0.9.0" + espressif/esp-zboss-lib: "~0.7.0" ## Required IDF version idf: version: ">=5.0.0" diff --git a/examples/zigbee/light_sample/HA_on_off_switch/partitions.csv b/examples/zigbee/light_sample/HA_on_off_switch/partitions.csv index d8dcfcdf6b..24bb3132a4 100644 --- a/examples/zigbee/light_sample/HA_on_off_switch/partitions.csv +++ b/examples/zigbee/light_sample/HA_on_off_switch/partitions.csv @@ -2,6 +2,6 @@ # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap nvs, data, nvs, 0x9000, 0x6000, phy_init, data, phy, 0xf000, 0x1000, -factory, app, factory, 0x10000, 550K, -zb_storage, data, fat, 0x9a000, 16K, -zb_fct, data, fat, 0x9e000, 1K, +factory, app, factory, 0x10000, 650K, +zb_storage, data, fat, 0xb3000, 16K, +zb_fct, data, fat, 0xb7000, 1K,