diff --git a/idf_component.yml b/idf_component.yml index d1f1918..611411b 100644 --- a/idf_component.yml +++ b/idf_component.yml @@ -1,4 +1,4 @@ -version: 1.0.8 +version: 1.0.9 description: esp-zboss library component url: https://github.com/espressif/esp-zboss-lib dependencies: diff --git a/include/zb_vendor.h b/include/zb_vendor.h index b22e45e..4bff8c2 100644 --- a/include/zb_vendor.h +++ b/include/zb_vendor.h @@ -52,6 +52,9 @@ #include "zb_vendor_host.h" #endif +#define ZB_IOBUF_POOL_SIZE 80 +#define ZB_SCHEDULER_Q_SIZE 80 + #if CONFIG_ZB_R22_ENABLE #define ZB_ENABLE_SE #define ZB_ENABLE_ZGP diff --git a/include/zb_vendor_default.h b/include/zb_vendor_default.h index 678169d..53859cd 100644 --- a/include/zb_vendor_default.h +++ b/include/zb_vendor_default.h @@ -54,14 +54,6 @@ #define ZB_DISTRIBUTED_SECURITY_ON #define ZB_SECURITY_INSTALLCODES -#ifndef ZB_ED_ROLE -#define ZB_IOBUF_POOL_SIZE 80 -#define ZB_SCHEDULER_Q_SIZE 80 -#else -#define ZB_IOBUF_POOL_SIZE 80 -#define ZB_SCHEDULER_Q_SIZE 80 -#endif - /* ZGP */ #ifdef CONFIG_ZB_GP_ENABLED #define ZB_ENABLE_ZGP diff --git a/include/zb_vendor_rcp.h b/include/zb_vendor_rcp.h index fc9d83f..e2fa16c 100644 --- a/include/zb_vendor_rcp.h +++ b/include/zb_vendor_rcp.h @@ -46,8 +46,6 @@ #define ZB_SEND_BEACON_IMMEDIATELY #define ZB_CB_QUANT 1 -#define ZB_IOBUF_POOL_SIZE 60 -#define ZB_SCHEDULER_Q_SIZE 60 #define ZB_MACSPLIT_FW_UPGRADE #define ZB_USE_OSIF_OTA_ROUTINES diff --git a/include/zb_vendor_zgpd.h b/include/zb_vendor_zgpd.h index 41be67a..5943e65 100644 --- a/include/zb_vendor_zgpd.h +++ b/include/zb_vendor_zgpd.h @@ -53,9 +53,6 @@ #define ZB_DISTRIBUTED_SECURITY_ON #define ZB_SECURITY_INSTALLCODES -#define ZB_IOBUF_POOL_SIZE 60 -#define ZB_SCHEDULER_Q_SIZE 60 - /* ZGP */ #define ZB_ENABLE_ZGP #define ZB_ENABLE_ZGP_GPCB diff --git a/include/zboss_api_aps.h b/include/zboss_api_aps.h index 5b9bcb5..5c358d7 100644 --- a/include/zboss_api_aps.h +++ b/include/zboss_api_aps.h @@ -512,6 +512,17 @@ zb_uint8_t zb_aps_get_max_buffer_size(zb_uint16_t short_addr); */ typedef void (*zb_aps_user_payload_callback_t)(zb_uint8_t param); +/** + * @brief NLDE-DATA.indication data callback + * + * @param[in] param index of buffer with an APS indication + * + * @return + * - true: Processed + * - false: Not processed +*/ +typedef zb_bool_t (*zb_aps_indication_data_callback_t)(zb_uint8_t param); + /*! * @brief * APS user payload transmission status @@ -581,6 +592,13 @@ zb_uint8_t *zb_aps_get_aps_payload(zb_uint8_t param, zb_uint8_t *aps_payload_siz */ void zb_aps_set_user_data_tx_cb(zb_aps_user_payload_callback_t cb); +/** + * @brief Set callback to notify information of APS frame + * + * @param cb - pointer to a callback + */ +void zb_aps_set_indication_data_rx_cb(zb_aps_indication_data_callback_t cb); + /*! * @brief Set callback to be called when ZDO command packet is sent. * diff --git a/lib/esp32/libzboss_stack.zczr.a b/lib/esp32/libzboss_stack.zczr.a index 9717fe7..a235a7e 100644 Binary files a/lib/esp32/libzboss_stack.zczr.a and b/lib/esp32/libzboss_stack.zczr.a differ diff --git a/lib/esp32/libzboss_stack.zczr.trace.a b/lib/esp32/libzboss_stack.zczr.trace.a index 7d54dcc..4c60269 100644 Binary files a/lib/esp32/libzboss_stack.zczr.trace.a and b/lib/esp32/libzboss_stack.zczr.trace.a differ diff --git a/lib/esp32c3/libzboss_stack.zczr.a b/lib/esp32c3/libzboss_stack.zczr.a index d89e90c..658a7c7 100644 Binary files a/lib/esp32c3/libzboss_stack.zczr.a and b/lib/esp32c3/libzboss_stack.zczr.a differ diff --git a/lib/esp32c3/libzboss_stack.zczr.trace.a b/lib/esp32c3/libzboss_stack.zczr.trace.a index d1c58b9..31307eb 100644 Binary files a/lib/esp32c3/libzboss_stack.zczr.trace.a and b/lib/esp32c3/libzboss_stack.zczr.trace.a differ diff --git a/lib/esp32c6/libzboss_stack.ed.a b/lib/esp32c6/libzboss_stack.ed.a index 6ed2e0b..6cb8667 100644 Binary files a/lib/esp32c6/libzboss_stack.ed.a and b/lib/esp32c6/libzboss_stack.ed.a differ diff --git a/lib/esp32c6/libzboss_stack.ed.trace.a b/lib/esp32c6/libzboss_stack.ed.trace.a index a555321..f222dd4 100644 Binary files a/lib/esp32c6/libzboss_stack.ed.trace.a and b/lib/esp32c6/libzboss_stack.ed.trace.a differ diff --git a/lib/esp32c6/libzboss_stack.gpd.a b/lib/esp32c6/libzboss_stack.gpd.a index 5b8e8cf..c54e808 100644 Binary files a/lib/esp32c6/libzboss_stack.gpd.a and b/lib/esp32c6/libzboss_stack.gpd.a differ diff --git a/lib/esp32c6/libzboss_stack.rcp.a b/lib/esp32c6/libzboss_stack.rcp.a index 6345e91..99ee212 100644 Binary files a/lib/esp32c6/libzboss_stack.rcp.a and b/lib/esp32c6/libzboss_stack.rcp.a differ diff --git a/lib/esp32c6/libzboss_stack.zczr.a b/lib/esp32c6/libzboss_stack.zczr.a index 398e4dc..4780f70 100644 Binary files a/lib/esp32c6/libzboss_stack.zczr.a and b/lib/esp32c6/libzboss_stack.zczr.a differ diff --git a/lib/esp32c6/libzboss_stack.zczr.trace.a b/lib/esp32c6/libzboss_stack.zczr.trace.a index 37f4192..1cdd0ef 100644 Binary files a/lib/esp32c6/libzboss_stack.zczr.trace.a and b/lib/esp32c6/libzboss_stack.zczr.trace.a differ diff --git a/lib/esp32h2/libzboss_stack.ed.a b/lib/esp32h2/libzboss_stack.ed.a index 6ed2e0b..6cb8667 100644 Binary files a/lib/esp32h2/libzboss_stack.ed.a and b/lib/esp32h2/libzboss_stack.ed.a differ diff --git a/lib/esp32h2/libzboss_stack.ed.trace.a b/lib/esp32h2/libzboss_stack.ed.trace.a index a555321..f222dd4 100644 Binary files a/lib/esp32h2/libzboss_stack.ed.trace.a and b/lib/esp32h2/libzboss_stack.ed.trace.a differ diff --git a/lib/esp32h2/libzboss_stack.gpd.a b/lib/esp32h2/libzboss_stack.gpd.a index 5b8e8cf..c54e808 100644 Binary files a/lib/esp32h2/libzboss_stack.gpd.a and b/lib/esp32h2/libzboss_stack.gpd.a differ diff --git a/lib/esp32h2/libzboss_stack.rcp.a b/lib/esp32h2/libzboss_stack.rcp.a index 6345e91..99ee212 100644 Binary files a/lib/esp32h2/libzboss_stack.rcp.a and b/lib/esp32h2/libzboss_stack.rcp.a differ diff --git a/lib/esp32h2/libzboss_stack.zczr.a b/lib/esp32h2/libzboss_stack.zczr.a index 398e4dc..4780f70 100644 Binary files a/lib/esp32h2/libzboss_stack.zczr.a and b/lib/esp32h2/libzboss_stack.zczr.a differ diff --git a/lib/esp32h2/libzboss_stack.zczr.trace.a b/lib/esp32h2/libzboss_stack.zczr.trace.a index 37f4192..1cdd0ef 100644 Binary files a/lib/esp32h2/libzboss_stack.zczr.trace.a and b/lib/esp32h2/libzboss_stack.zczr.trace.a differ diff --git a/lib/esp32s2/libzboss_stack.zczr.a b/lib/esp32s2/libzboss_stack.zczr.a index c72d94f..5fe08ad 100644 Binary files a/lib/esp32s2/libzboss_stack.zczr.a and b/lib/esp32s2/libzboss_stack.zczr.a differ diff --git a/lib/esp32s2/libzboss_stack.zczr.trace.a b/lib/esp32s2/libzboss_stack.zczr.trace.a index 083c345..171b44e 100644 Binary files a/lib/esp32s2/libzboss_stack.zczr.trace.a and b/lib/esp32s2/libzboss_stack.zczr.trace.a differ diff --git a/lib/esp32s3/libzboss_stack.zczr.a b/lib/esp32s3/libzboss_stack.zczr.a index 9717fe7..a235a7e 100644 Binary files a/lib/esp32s3/libzboss_stack.zczr.a and b/lib/esp32s3/libzboss_stack.zczr.a differ diff --git a/lib/esp32s3/libzboss_stack.zczr.trace.a b/lib/esp32s3/libzboss_stack.zczr.trace.a index 7d54dcc..4c60269 100644 Binary files a/lib/esp32s3/libzboss_stack.zczr.trace.a and b/lib/esp32s3/libzboss_stack.zczr.trace.a differ