alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-09 20:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Zigbee: Zigbee example update

Browse Source 
* minor update for the zigbee example
This commit is contained in:
likunqiao
2022-01-11 15:52:34 +08:00
parent 3ba47f1628
commit 2c7f950084
14 changed files with 41 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/zigbee/light_sample/light_bulb/main/esp_zb_light.c
View File

@@ -106,7 +106,7 @@ static void bdb_start_top_level_commissioning_cb(zb_uint8_t mode_mask)
*
* @param bufid Zigbee zboss stack buffer id used to pass signal.
*/
void zboss_signal_handler(zb_uint8_t bufid)
void zboss_signal_handler(zb_bufid_t bufid)
{
zb_uint8_t status = ZB_GET_APP_SIGNAL_STATUS(bufid);
zb_zdo_app_signal_type_t sig = zb_get_app_signal(bufid, NULL);
@@ -212,7 +212,7 @@ static void esp_zb_light_cb(zb_bufid_t bufid)
}
}
void app_main()
void app_main(void)
{
zb_ret_t zb_err_code;
zb_esp_platform_config_t config = {

13
examples/zigbee/light_sample/light_bulb/main/idf_component.yml
View File

@@ -3,15 +3,4 @@ dependencies:
espressif/esp-zboss-lib: "~=0.0.4"
## Required IDF version
idf:
version: ">=4.1.0"
# # Put list of dependencies here
# # For components maintained by Espressif:
# component: "~1.0.0"
# # For 3rd party components:
# username/component: ">=1.0.0,<2.0.0"
# username2/component2:
# version: "~1.0.0"
# # For transient dependencies `public` flag can be set.
# # `public` flag doesn't have an effect dependencies of the `main` component.
# # All dependencies of `main` are public by default.
# public: true
version: ">=5.0.0"

6
examples/zigbee/light_sample/light_bulb/sdkconfig.defaults
View File

@@ -1,11 +1,5 @@
CONFIG_IDF_TARGET="esp32h2"
#
# libsodium
#
CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
# end of libsodium
#
# Partition Table
#

11
examples/zigbee/light_sample/light_coordinator/main/esp_zb_coordinator.c
View File

@@ -60,6 +60,7 @@ void zboss_signal_handler(zb_bufid_t bufid)
zb_zdo_app_signal_hdr_t *p_sg_p = NULL;
zb_zdo_app_signal_type_t sig = zb_get_app_signal(bufid, &p_sg_p);
zb_ret_t status = ZB_GET_APP_SIGNAL_STATUS(bufid);
zb_zdo_signal_device_annce_params_t *dev_annce_params = NULL;
switch (sig) {
case ZB_ZDO_SIGNAL_SKIP_STARTUP:
@@ -97,11 +98,11 @@ void zboss_signal_handler(zb_bufid_t bufid)
}
break;
case ZB_ZDO_SIGNAL_DEVICE_ANNCE: {
zb_zdo_signal_device_annce_params_t *dev_annce_params = ZB_ZDO_SIGNAL_GET_PARAMS(p_sg_p, zb_zdo_signal_device_annce_params_t);
case ZB_ZDO_SIGNAL_DEVICE_ANNCE:
dev_annce_params = ZB_ZDO_SIGNAL_GET_PARAMS(p_sg_p, zb_zdo_signal_device_annce_params_t);
ESP_LOGI(TAG, "New device commissioned or rejoined (short: 0x%04hx)", dev_annce_params->device_short_addr);
}
break;
break;
default:
ESP_LOGI(TAG, "status: %d", status);
break;
@@ -112,7 +113,7 @@ void zboss_signal_handler(zb_bufid_t bufid)
}
}
void app_main()
void app_main(void)
{
zb_ret_t zb_err_code;
zb_esp_platform_config_t config = {

13
examples/zigbee/light_sample/light_coordinator/main/idf_component.yml
View File

@@ -3,15 +3,4 @@ dependencies:
espressif/esp-zboss-lib: "~=0.0.4"
## Required IDF version
idf:
version: ">=4.1.0"
# # Put list of dependencies here
# # For components maintained by Espressif:
# component: "~1.0.0"
# # For 3rd party components:
# username/component: ">=1.0.0,<2.0.0"
# username2/component2:
# version: "~1.0.0"
# # For transient dependencies `public` flag can be set.
# # `public` flag doesn't have an effect dependencies of the `main` component.
# # All dependencies of `main` are public by default.
# public: true
version: ">=5.0.0"

6
examples/zigbee/light_sample/light_coordinator/sdkconfig.defaults
View File

@@ -1,11 +1,5 @@
CONFIG_IDF_TARGET="esp32h2"
#
# libsodium
#
CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
# end of libsodium
#
# Partition Table
#

4
examples/zigbee/light_sample/light_switch/main/esp_zb_switch.c
View File

@@ -231,7 +231,7 @@ static void bdb_start_top_level_commissioning_cb(zb_uint8_t mode_mask)
*
* @param bufid Zigbee zboss stack buffer id used to pass signal.
*/
void zboss_signal_handler(zb_uint8_t bufid)
void zboss_signal_handler(zb_bufid_t bufid)
{
zb_zdo_app_signal_hdr_t *p_sg_p = NULL;
zb_zdo_app_signal_type_t sig = zb_get_app_signal(bufid, &p_sg_p);
@@ -281,7 +281,7 @@ void zboss_signal_handler(zb_uint8_t bufid)
}
}
void app_main()
void app_main(void)
{
zb_ret_t zb_err_code;
zb_esp_platform_config_t config = {

13
examples/zigbee/light_sample/light_switch/main/idf_component.yml
View File

@@ -3,15 +3,4 @@ dependencies:
espressif/esp-zboss-lib: "~=0.0.4"
## Required IDF version
idf:
version: ">=4.1.0"
# # Put list of dependencies here
# # For components maintained by Espressif:
# component: "~1.0.0"
# # For 3rd party components:
# username/component: ">=1.0.0,<2.0.0"
# username2/component2:
# version: "~1.0.0"
# # For transient dependencies `public` flag can be set.
# # `public` flag doesn't have an effect dependencies of the `main` component.
# # All dependencies of `main` are public by default.
# public: true
version: ">=5.0.0"

6
examples/zigbee/light_sample/light_switch/sdkconfig.defaults
View File

@@ -1,11 +1,5 @@
CONFIG_IDF_TARGET="esp32h2"
#
# libsodium
#
CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
# end of libsodium
#
# Partition Table
#