feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

zigbee: example API update

Browse Source
This commit is contained in:
likunqiao
2023-01-11 14:39:57 +08:00
parent 57c4508eb3
commit fde11f6e2b
9 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/zigbee/esp_zigbee_gateway/main/idf_component.yml
View File

@@ -1,7 +1,7 @@
## IDF Component Manager Manifest File ## IDF Component Manager Manifest File
dependencies: dependencies:
espressif/esp-zboss-lib: "~0.3.0" espressif/esp-zboss-lib: "~0.3.0"
espressif/esp-zigbee-lib: "~0.4.1" espressif/esp-zigbee-lib: "~0.5.0"
## Required IDF version ## Required IDF version
idf: idf:
version: ">=5.0.0" version: ">=5.0.0"

4
examples/zigbee/esp_zigbee_gateway/partitions.csv
View File

@@ -3,5 +3,5 @@
nvs, data, nvs, 0x9000, 0x6000, nvs, data, nvs, 0x9000, 0x6000,
phy_init, data, phy, 0xf000, 0x1000, phy_init, data, phy, 0xf000, 0x1000,
factory, app, factory, 0x10000, 550K, factory, app, factory, 0x10000, 550K,
zb_storage, data, fat, 0x9a000, 128K, zb_storage, data, fat, 0x9a000, 16K,
zb_fct, data, fat, 0xba000, 1K, zb_fct, data, fat, 0x9e000, 1K,
1 # Name, Type, SubType, Offset, Size, Flags
3 nvs, data, nvs, 0x9000, 0x6000,
4 phy_init, data, phy, 0xf000, 0x1000,
5 factory, app, factory, 0x10000, 550K,
6 zb_storage, data, fat, 0x9a000, 128K, zb_storage, data, fat, 0x9a000, 16K,
7 zb_fct, data, fat, 0xba000, 1K, zb_fct, data, fat, 0x9e000, 1K,

2
examples/zigbee/esp_zigbee_rcp/main/idf_component.yml
View File

@@ -1,7 +1,7 @@
## IDF Component Manager Manifest File ## IDF Component Manager Manifest File
dependencies: dependencies:
espressif/esp-zboss-lib: "~0.3.0" espressif/esp-zboss-lib: "~0.3.0"
espressif/esp-zigbee-lib: "~0.4.1" espressif/esp-zigbee-lib: "~0.5.0"
## Required IDF version ## Required IDF version
idf: idf:
version: ">=5.0.0" version: ">=5.0.0"

2
examples/zigbee/esp_zigbee_rcp/partitions.csv
View File

@@ -3,4 +3,4 @@
nvs, data, nvs, 0x9000, 0x6000, nvs, data, nvs, 0x9000, 0x6000,
phy_init, data, phy, 0xf000, 0x1000, phy_init, data, phy, 0xf000, 0x1000,
factory, app, factory, 0x10000, 550K, factory, app, factory, 0x10000, 550K,
zb_storage, data, fat, 0x9a000, 128K, zb_storage, data, fat, 0x9a000, 16K,
1 # Name, Type, SubType, Offset, Size, Flags
3 nvs, data, nvs, 0x9000, 0x6000,
4 phy_init, data, phy, 0xf000, 0x1000,
5 factory, app, factory, 0x10000, 550K,
6 zb_storage, data, fat, 0x9a000, 128K, zb_storage, data, fat, 0x9a000, 16K,

2
examples/zigbee/light_sample/HA_on_off_light/main/idf_component.yml
View File

@@ -1,6 +1,6 @@
## IDF Component Manager Manifest File ## IDF Component Manager Manifest File
dependencies: dependencies:
espressif/esp-zigbee-lib: "~0.4.1" espressif/esp-zigbee-lib: "~0.5.0"
espressif/esp-zboss-lib: "~0.3.0" espressif/esp-zboss-lib: "~0.3.0"
espressif/led_strip: "~2.0.0" espressif/led_strip: "~2.0.0"
## Required IDF version ## Required IDF version

4
examples/zigbee/light_sample/HA_on_off_light/partitions.csv
View File

@@ -3,5 +3,5 @@
nvs, data, nvs, 0x9000, 0x6000, nvs, data, nvs, 0x9000, 0x6000,
phy_init, data, phy, 0xf000, 0x1000, phy_init, data, phy, 0xf000, 0x1000,
factory, app, factory, 0x10000, 550K, factory, app, factory, 0x10000, 550K,
zb_storage, data, fat, 0x9a000, 128K, zb_storage, data, fat, 0x9a000, 16K,
zb_fct, data, fat, 0xba000, 1K, zb_fct, data, fat, 0x9e000, 1K,
1 # Name, Type, SubType, Offset, Size, Flags
3 nvs, data, nvs, 0x9000, 0x6000,
4 phy_init, data, phy, 0xf000, 0x1000,
5 factory, app, factory, 0x10000, 550K,
6 zb_storage, data, fat, 0x9a000, 128K, zb_storage, data, fat, 0x9a000, 16K,
7 zb_fct, data, fat, 0xba000, 1K, zb_fct, data, fat, 0x9e000, 1K,

6
examples/zigbee/light_sample/HA_on_off_switch/main/esp_zb_switch.c
View File

@@ -91,9 +91,9 @@ static void bdb_start_top_level_commissioning_cb(uint8_t mode_mask)
ESP_ERROR_CHECK(esp_zb_bdb_start_top_level_commissioning(mode_mask)); ESP_ERROR_CHECK(esp_zb_bdb_start_top_level_commissioning(mode_mask));
} }
void user_find_cb(uint8_t zdo_status, uint16_t addr, uint8_t endpoint) void user_find_cb(esp_zb_zdp_status_t zdo_status, uint16_t addr, uint8_t endpoint, void *user_ctx)
{ {
ESP_LOGI(TAG, "User find cb: address:0x%x, endpoint:%d, response_status:%d", addr, endpoint, zdo_status); 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) { if (zdo_status == ESP_ZB_ZDP_STATUS_SUCCESS) {
on_off_light.endpoint = endpoint; on_off_light.endpoint = endpoint;
on_off_light.short_addr = addr; on_off_light.short_addr = addr;
@@ -145,7 +145,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct)
esp_zb_zdo_match_desc_req_param_t cmd_req; esp_zb_zdo_match_desc_req_param_t cmd_req;
cmd_req.dst_nwk_addr = dev_annce_params->device_short_addr; cmd_req.dst_nwk_addr = dev_annce_params->device_short_addr;
cmd_req.addr_of_interest = dev_annce_params->device_short_addr; cmd_req.addr_of_interest = dev_annce_params->device_short_addr;
esp_zb_zdo_find_on_off_light(&cmd_req, user_find_cb); esp_zb_zdo_find_on_off_light(&cmd_req, user_find_cb, NULL);
break; break;
default: default:
ESP_LOGI(TAG, "ZDO signal: %d, status: %d", sig_type, err_status); ESP_LOGI(TAG, "ZDO signal: %d, status: %d", sig_type, err_status);

2
examples/zigbee/light_sample/HA_on_off_switch/main/idf_component.yml
View File

@@ -1,6 +1,6 @@
## IDF Component Manager Manifest File ## IDF Component Manager Manifest File
dependencies: dependencies:
espressif/esp-zigbee-lib: "~0.4.1" espressif/esp-zigbee-lib: "~0.5.0"
espressif/esp-zboss-lib: "~0.3.0" espressif/esp-zboss-lib: "~0.3.0"
## Required IDF version ## Required IDF version
idf: idf:

4
examples/zigbee/light_sample/HA_on_off_switch/partitions.csv
View File

@@ -3,5 +3,5 @@
nvs, data, nvs, 0x9000, 0x6000, nvs, data, nvs, 0x9000, 0x6000,
phy_init, data, phy, 0xf000, 0x1000, phy_init, data, phy, 0xf000, 0x1000,
factory, app, factory, 0x10000, 550K, factory, app, factory, 0x10000, 550K,
zb_storage, data, fat, 0x9a000, 128K, zb_storage, data, fat, 0x9a000, 16K,
zb_fct, data, fat, 0xba000, 1K, zb_fct, data, fat, 0x9e000, 1K,
1 # Name, Type, SubType, Offset, Size, Flags
3 nvs, data, nvs, 0x9000, 0x6000,
4 phy_init, data, phy, 0xf000, 0x1000,
5 factory, app, factory, 0x10000, 550K,
6 zb_storage, data, fat, 0x9a000, 128K, zb_storage, data, fat, 0x9a000, 16K,
7 zb_fct, data, fat, 0xba000, 1K, zb_fct, data, fat, 0x9e000, 1K,