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

esp-zboss-lib: release/v1.5.0(6bd34178) See merge request espressif/esp-zboss-lib!71
espressif · Aug 28, 2024 · 2abb29f · 2abb29f
2 parents 1bc3ee8 + bb3533a
commit 2abb29f
Show file tree

Hide file tree

Showing 34 changed files with 19 additions and 13 deletions.
diff --git a/idf_component.yml b/idf_component.yml
@@ -1,4 +1,4 @@
-version: 1.4.1
+version: 1.5.0
 description: esp-zboss library component
 url: https://github.com/espressif/esp-zboss-lib
 dependencies:

diff --git a/include/zb_config_common.h b/include/zb_config_common.h
@@ -1750,7 +1750,7 @@ request command frame.
 #define ZB_ASDU_MAX_LEN_MULTIPLIER ((ZB_APS_MSG_MAX_SIZE + sizeof(zb_apsde_data_indication_t) + ZB_APS_HEADER_MAX_LEN)/ZB_IO_BUF_SIZE + 1U)
 #define ZB_ASDU_MAX_FRAG_LEN (ZB_ASDU_MAX_LEN_MULTIPLIER*ZB_IO_BUF_SIZE - sizeof(zb_apsde_data_indication_t) - ZB_APS_HEADER_MAX_LEN)
 #define ZB_APS_MAX_WINDOW_SIZE 8U
-#define ZB_APS_INTERFRAME_DELAY 50U /* milliseconds */
+#define ZB_APS_INTERFRAME_DELAY 0U /* milliseconds */
 
 #if defined(ZB_SE_ENABLE_SERVICE_DISCOVERY_PROCESSING)
 

diff --git a/include/zb_config_platform.h b/include/zb_config_platform.h
@@ -95,9 +95,9 @@ typedef enum {
 
 typedef struct {
     uart_port_t port;               /*!< UART port number */
-    uart_config_t uart_config;      /*!< UART configuration, see uart_config_t docs */
     gpio_num_t rx_pin;              /*!< UART RX pin */
     gpio_num_t tx_pin;              /*!< UART TX pin */
+    uart_config_t uart_config;      /*!< UART configuration, see uart_config_t docs */
 } esp_zb_uart_config_t;
 
 typedef struct {

diff --git a/include/zboss_api_zcl.h b/include/zboss_api_zcl.h
@@ -1995,13 +1995,16 @@ typedef struct zb_zcl_device_callback_param_s
   ((ZB_ZCL_DEVICE_CMD_PARAM(_param))->cb_param.gnr.out = _pvalue)
 
 /** Init all fields of device callback params. */
-#define ZB_ZCL_DEVICE_CMD_PARAM_INIT_WITH(_param, _cb_id, _status, _cmd_info, _in, _out) \
-  (ZB_BZERO(ZB_ZCL_DEVICE_CMD_PARAM(_param), sizeof(*ZB_ZCL_DEVICE_CMD_PARAM(_param))), \
-   (ZB_ZCL_DEVICE_CMD_PARAM_CB_ID(_param) = _cb_id, \
-    (ZB_ZCL_DEVICE_CMD_PARAM_STATUS(_param) = _status, \
-     (ZB_ZCL_DEVICE_CMD_PARAM_CMD_INFO(_param) = _cmd_info, \
-      (ZB_ZCL_DEVICE_CMD_PARAM_IN_SET(_param, _in), \
-       (ZB_ZCL_DEVICE_CMD_PARAM_OUT_SET(_param, _out)))))))
+#define ZB_ZCL_DEVICE_CMD_PARAM_INIT_WITH(_param, _cb_id, _status, _cmd_info, _in, _out)                              \
+  (ZB_BZERO(ZB_ZCL_DEVICE_CMD_PARAM(_param), sizeof(*ZB_ZCL_DEVICE_CMD_PARAM(_param))),                               \
+    (ZB_ZCL_DEVICE_CMD_PARAM_CB_ID(_param) = _cb_id,                                                                  \
+      (ZB_ZCL_DEVICE_CMD_PARAM_ENDPOINT(_param) = (_cmd_info != NULL ?                                                \
+       ZB_ZCL_PARSED_HDR_SHORT_DATA((typeof(ZB_ZCL_DEVICE_CMD_PARAM_CMD_INFO(_param)))_cmd_info).dst_endpoint : 0x00),\
+        (ZB_ZCL_DEVICE_CMD_PARAM_STATUS(_param) = _status,                                                            \
+         (ZB_ZCL_DEVICE_CMD_PARAM_CMD_INFO(_param) = _cmd_info,                                                       \
+          (ZB_ZCL_DEVICE_CMD_PARAM_IN_SET(_param, _in),                                                               \
+           (ZB_ZCL_DEVICE_CMD_PARAM_OUT_SET(_param, _out))))))))
+
 /** @endcond */ /* internals_doc */
 
 /** Get INPUT device callback parameter from buffer reference.
@@ -2041,6 +2044,10 @@ typedef struct zb_zcl_device_callback_param_s
 #define ZB_ZCL_DEVICE_CMD_PARAM_STATUS(_param) \
   ((ZB_ZCL_DEVICE_CMD_PARAM(_param))->status)
 
+/* Set ENDPOINT device callback parameter with specific value. */
+#define ZB_ZCL_DEVICE_CMD_PARAM_ENDPOINT(_param) \
+     ((ZB_ZCL_DEVICE_CMD_PARAM(_param))->endpoint)
+
 /** @cond internals_doc */
 /** @brief ZCL default handler.
   *

diff --git a/include/zcl/zb_zcl_common.h b/include/zcl/zb_zcl_common.h
@@ -1118,6 +1118,8 @@ typedef ZB_PACKED_PRE  struct zb_zcl_frame_hdr_full_s
 } ZB_PACKED_STRUCT
 zb_zcl_frame_hdr_full_t;
 
+#define ZB_ZCL_FULL_HDR_SIZE sizeof(zb_zcl_frame_hdr_full_t)
+
 /*! @brief ZCL frame header without manufacturer code
     @see ZCL spec, subclause 2.3.1
 */

diff --git a/include/zcl/zb_zcl_ota_upgrade.h b/include/zcl/zb_zcl_ota_upgrade.h
@@ -329,9 +329,6 @@ typedef ZB_PACKED_PRE struct zb_zcl_ota_upgrade_ecdsa_certificate_s
 /** @brief Default value for OTA Upgrade cluster revision global attribute */
 #define ZB_ZCL_OTA_UPGRADE_CLUSTER_REVISION_DEFAULT ((zb_uint16_t)0x0004u)
 
-/*! @brief Maximum size data for Query Image Block Request */
-#define ZB_ZCL_OTA_UPGRADE_QUERY_IMAGE_BLOCK_DATA_SIZE_MAX   64
-
 /*! @brief Callback function for send next data portion
  *
  */

diff --git a/lib/esp32/libzboss_port.a b/lib/esp32/libzboss_port.a
diff --git a/lib/esp32/libzboss_port.debug.a b/lib/esp32/libzboss_port.debug.a
diff --git a/lib/esp32/libzboss_stack.zczr.a b/lib/esp32/libzboss_stack.zczr.a
diff --git a/lib/esp32/libzboss_stack.zczr.debug.a b/lib/esp32/libzboss_stack.zczr.debug.a
diff --git a/lib/esp32c3/libzboss_port.a b/lib/esp32c3/libzboss_port.a
diff --git a/lib/esp32c3/libzboss_port.debug.a b/lib/esp32c3/libzboss_port.debug.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.debug.a b/lib/esp32c3/libzboss_stack.zczr.debug.a
diff --git a/lib/esp32c6/libzboss_port.a b/lib/esp32c6/libzboss_port.a
diff --git a/lib/esp32c6/libzboss_port.debug.a b/lib/esp32c6/libzboss_port.debug.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.debug.a b/lib/esp32c6/libzboss_stack.ed.debug.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.debug.a b/lib/esp32c6/libzboss_stack.zczr.debug.a
diff --git a/lib/esp32h2/libzboss_port.a b/lib/esp32h2/libzboss_port.a
diff --git a/lib/esp32h2/libzboss_port.debug.a b/lib/esp32h2/libzboss_port.debug.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.debug.a b/lib/esp32h2/libzboss_stack.ed.debug.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.debug.a b/lib/esp32h2/libzboss_stack.zczr.debug.a
diff --git a/lib/esp32s2/libzboss_port.a b/lib/esp32s2/libzboss_port.a
diff --git a/lib/esp32s2/libzboss_port.debug.a b/lib/esp32s2/libzboss_port.debug.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.debug.a b/lib/esp32s2/libzboss_stack.zczr.debug.a
diff --git a/lib/esp32s3/libzboss_port.a b/lib/esp32s3/libzboss_port.a
diff --git a/lib/esp32s3/libzboss_port.debug.a b/lib/esp32s3/libzboss_port.debug.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.debug.a b/lib/esp32s3/libzboss_stack.zczr.debug.a