Merge branch 'release/esp-zigbee-sdk-v1.0.9' into 'master'

esp-zboss-lib: release/v1.0.9(c44d420e) See merge request espressif/esp-zboss-lib!57
espressif · Jan 19, 2024 · edc7b72 · edc7b72
2 parents f0e12dc + 8a57aa4
commit edc7b72
Show file tree

Hide file tree

Showing 26 changed files with 22 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/lib/esp32/libzboss_stack.zczr.trace.a b/lib/esp32/libzboss_stack.zczr.trace.a
diff --git a/lib/esp32c3/libzboss_stack.zczr.a b/lib/esp32c3/libzboss_stack.zczr.a
diff --git a/lib/esp32c3/libzboss_stack.zczr.trace.a b/lib/esp32c3/libzboss_stack.zczr.trace.a
diff --git a/lib/esp32c6/libzboss_stack.ed.a b/lib/esp32c6/libzboss_stack.ed.a
diff --git a/lib/esp32c6/libzboss_stack.ed.trace.a b/lib/esp32c6/libzboss_stack.ed.trace.a
diff --git a/lib/esp32c6/libzboss_stack.gpd.a b/lib/esp32c6/libzboss_stack.gpd.a
diff --git a/lib/esp32c6/libzboss_stack.rcp.a b/lib/esp32c6/libzboss_stack.rcp.a
diff --git a/lib/esp32c6/libzboss_stack.zczr.a b/lib/esp32c6/libzboss_stack.zczr.a
diff --git a/lib/esp32c6/libzboss_stack.zczr.trace.a b/lib/esp32c6/libzboss_stack.zczr.trace.a
diff --git a/lib/esp32h2/libzboss_stack.ed.a b/lib/esp32h2/libzboss_stack.ed.a
diff --git a/lib/esp32h2/libzboss_stack.ed.trace.a b/lib/esp32h2/libzboss_stack.ed.trace.a
diff --git a/lib/esp32h2/libzboss_stack.gpd.a b/lib/esp32h2/libzboss_stack.gpd.a
diff --git a/lib/esp32h2/libzboss_stack.rcp.a b/lib/esp32h2/libzboss_stack.rcp.a
diff --git a/lib/esp32h2/libzboss_stack.zczr.a b/lib/esp32h2/libzboss_stack.zczr.a
diff --git a/lib/esp32h2/libzboss_stack.zczr.trace.a b/lib/esp32h2/libzboss_stack.zczr.trace.a
diff --git a/lib/esp32s2/libzboss_stack.zczr.a b/lib/esp32s2/libzboss_stack.zczr.a
diff --git a/lib/esp32s2/libzboss_stack.zczr.trace.a b/lib/esp32s2/libzboss_stack.zczr.trace.a
diff --git a/lib/esp32s3/libzboss_stack.zczr.a b/lib/esp32s3/libzboss_stack.zczr.a
diff --git a/lib/esp32s3/libzboss_stack.zczr.trace.a b/lib/esp32s3/libzboss_stack.zczr.trace.a