diff --git a/idf_component.yml b/idf_component.yml index 4dbc4c9..5635ef4 100644 --- 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 index 7aa1ae4..528329c 100644 --- 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 index 0feacb4..7e7906d 100644 --- 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 index 46eaf4a..a90316d 100644 --- 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 index 46bef7d..9ea7a44 100644 --- 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 index 20100d5..c5cc593 100644 --- 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 index 174d475..49e6c33 100644 Binary files a/lib/esp32/libzboss_port.a and b/lib/esp32/libzboss_port.a differ diff --git a/lib/esp32/libzboss_port.debug.a b/lib/esp32/libzboss_port.debug.a index a7a50c4..4e34969 100644 Binary files a/lib/esp32/libzboss_port.debug.a and b/lib/esp32/libzboss_port.debug.a differ diff --git a/lib/esp32/libzboss_stack.zczr.a b/lib/esp32/libzboss_stack.zczr.a index cded738..7a71f2e 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.debug.a b/lib/esp32/libzboss_stack.zczr.debug.a index 956e09f..28b5e23 100644 Binary files a/lib/esp32/libzboss_stack.zczr.debug.a and b/lib/esp32/libzboss_stack.zczr.debug.a differ diff --git a/lib/esp32c3/libzboss_port.a b/lib/esp32c3/libzboss_port.a index ba26ecb..0b50930 100644 Binary files a/lib/esp32c3/libzboss_port.a and b/lib/esp32c3/libzboss_port.a differ diff --git a/lib/esp32c3/libzboss_port.debug.a b/lib/esp32c3/libzboss_port.debug.a index ce4c194..e4a8a48 100644 Binary files a/lib/esp32c3/libzboss_port.debug.a and b/lib/esp32c3/libzboss_port.debug.a differ diff --git a/lib/esp32c3/libzboss_stack.zczr.a b/lib/esp32c3/libzboss_stack.zczr.a index e46f544..948fd19 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.debug.a b/lib/esp32c3/libzboss_stack.zczr.debug.a index 04ca31b..7076ba9 100644 Binary files a/lib/esp32c3/libzboss_stack.zczr.debug.a and b/lib/esp32c3/libzboss_stack.zczr.debug.a differ diff --git a/lib/esp32c6/libzboss_port.a b/lib/esp32c6/libzboss_port.a index d9ab9d0..7ab63de 100644 Binary files a/lib/esp32c6/libzboss_port.a and b/lib/esp32c6/libzboss_port.a differ diff --git a/lib/esp32c6/libzboss_port.debug.a b/lib/esp32c6/libzboss_port.debug.a index 8f74e62..8c1c794 100644 Binary files a/lib/esp32c6/libzboss_port.debug.a and b/lib/esp32c6/libzboss_port.debug.a differ diff --git a/lib/esp32c6/libzboss_stack.ed.a b/lib/esp32c6/libzboss_stack.ed.a index f5969e2..a91928f 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.debug.a b/lib/esp32c6/libzboss_stack.ed.debug.a index 91310dc..cf2be47 100644 Binary files a/lib/esp32c6/libzboss_stack.ed.debug.a and b/lib/esp32c6/libzboss_stack.ed.debug.a differ diff --git a/lib/esp32c6/libzboss_stack.zczr.a b/lib/esp32c6/libzboss_stack.zczr.a index 023a5f5..1506a6e 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.debug.a b/lib/esp32c6/libzboss_stack.zczr.debug.a index 566694e..147c507 100644 Binary files a/lib/esp32c6/libzboss_stack.zczr.debug.a and b/lib/esp32c6/libzboss_stack.zczr.debug.a differ diff --git a/lib/esp32h2/libzboss_port.a b/lib/esp32h2/libzboss_port.a index d9ab9d0..7ab63de 100644 Binary files a/lib/esp32h2/libzboss_port.a and b/lib/esp32h2/libzboss_port.a differ diff --git a/lib/esp32h2/libzboss_port.debug.a b/lib/esp32h2/libzboss_port.debug.a index 8f74e62..8c1c794 100644 Binary files a/lib/esp32h2/libzboss_port.debug.a and b/lib/esp32h2/libzboss_port.debug.a differ diff --git a/lib/esp32h2/libzboss_stack.ed.a b/lib/esp32h2/libzboss_stack.ed.a index f5969e2..a91928f 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.debug.a b/lib/esp32h2/libzboss_stack.ed.debug.a index 91310dc..cf2be47 100644 Binary files a/lib/esp32h2/libzboss_stack.ed.debug.a and b/lib/esp32h2/libzboss_stack.ed.debug.a differ diff --git a/lib/esp32h2/libzboss_stack.zczr.a b/lib/esp32h2/libzboss_stack.zczr.a index 023a5f5..1506a6e 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.debug.a b/lib/esp32h2/libzboss_stack.zczr.debug.a index 566694e..147c507 100644 Binary files a/lib/esp32h2/libzboss_stack.zczr.debug.a and b/lib/esp32h2/libzboss_stack.zczr.debug.a differ diff --git a/lib/esp32s2/libzboss_port.a b/lib/esp32s2/libzboss_port.a index 8343cd9..88953d6 100644 Binary files a/lib/esp32s2/libzboss_port.a and b/lib/esp32s2/libzboss_port.a differ diff --git a/lib/esp32s2/libzboss_port.debug.a b/lib/esp32s2/libzboss_port.debug.a index a7a50c4..4e34969 100644 Binary files a/lib/esp32s2/libzboss_port.debug.a and b/lib/esp32s2/libzboss_port.debug.a differ diff --git a/lib/esp32s2/libzboss_stack.zczr.a b/lib/esp32s2/libzboss_stack.zczr.a index 1b9134a..4f95925 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.debug.a b/lib/esp32s2/libzboss_stack.zczr.debug.a index 478a319..d776bb1 100644 Binary files a/lib/esp32s2/libzboss_stack.zczr.debug.a and b/lib/esp32s2/libzboss_stack.zczr.debug.a differ diff --git a/lib/esp32s3/libzboss_port.a b/lib/esp32s3/libzboss_port.a index 174d475..49e6c33 100644 Binary files a/lib/esp32s3/libzboss_port.a and b/lib/esp32s3/libzboss_port.a differ diff --git a/lib/esp32s3/libzboss_port.debug.a b/lib/esp32s3/libzboss_port.debug.a index a7a50c4..4e34969 100644 Binary files a/lib/esp32s3/libzboss_port.debug.a and b/lib/esp32s3/libzboss_port.debug.a differ diff --git a/lib/esp32s3/libzboss_stack.zczr.a b/lib/esp32s3/libzboss_stack.zczr.a index cded738..7a71f2e 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.debug.a b/lib/esp32s3/libzboss_stack.zczr.debug.a index 956e09f..28b5e23 100644 Binary files a/lib/esp32s3/libzboss_stack.zczr.debug.a and b/lib/esp32s3/libzboss_stack.zczr.debug.a differ