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

esp-zboss-lib: release/v1.1.1(0cd72dc5) See merge request espressif/esp-zboss-lib!59
espressif · Feb 6, 2024 · 3b20a39 · 3b20a39
2 parents ca1c3ed + 69d3fef
commit 3b20a39
Show file tree

Hide file tree

Showing 28 changed files with 11 additions and 218 deletions.
diff --git a/idf_component.yml b/idf_component.yml
@@ -1,4 +1,4 @@
-version: 1.1.0
+version: 1.1.1
 description: esp-zboss library component
 url: https://github.com/espressif/esp-zboss-lib
 dependencies:

diff --git a/include/zb_vendor_host.h b/include/zb_vendor_host.h
diff --git a/include/zb_vendor_rcp.h b/include/zb_vendor_rcp.h
diff --git a/include/zcl/zb_zcl_touchlink_commissioning.h b/include/zcl/zb_zcl_touchlink_commissioning.h
@@ -1597,11 +1597,12 @@ typedef ZB_PACKED_PRE struct zb_zll_commissioning_get_group_ids_req_s
     callback)                                                    \
 {                                                                \
   zb_uint8_t* data_ptr = ZB_ZCL_START_PACKET((buffer));          \
-  ZB_ZCL_CONSTRUCT_SPECIFIC_COMMAND_RES_FRAME_CONTROL(data_ptr); \
+  ZB_ZCL_CONSTRUCT_SPECIFIC_COMMAND_RESP_FRAME_CONTROL_A(data_ptr,\
+      ZB_ZCL_FRAME_DIRECTION_TO_SRV, ZB_ZCL_NOT_MANUFACTURER_SPECIFIC);\
   ZB_ZCL_CONSTRUCT_COMMAND_HEADER(                               \
       data_ptr,                                                  \
       ZB_ZCL_GET_SEQ_NUM(),                                      \
-      ZB_ZLL_CMD_COMMISSIONING_NETWORK_UPDATE_REQ);              \
+      ZB_ZLL_CMD_COMMISSIONING_GET_GROUP_IDENTIFIERS_REQUEST);   \
   ZB_ZCL_PACKET_PUT_DATA8(data_ptr, (start_index));              \
   ZB_ZCL_FINISH_PACKET((buffer), data_ptr)                       \
   ZB_ZCL_SEND_COMMAND_SHORT(                                     \
@@ -1788,7 +1789,8 @@ typedef ZB_PACKED_PRE struct zb_zll_commissioning_get_endpoint_list_req_s
     callback)                                                    \
 {                                                                \
   zb_uint8_t* data_ptr = ZB_ZCL_START_PACKET((buffer));          \
-  ZB_ZCL_CONSTRUCT_SPECIFIC_COMMAND_RES_FRAME_CONTROL(data_ptr); \
+  ZB_ZCL_CONSTRUCT_SPECIFIC_COMMAND_RESP_FRAME_CONTROL_A(data_ptr,\
+  ZB_ZCL_FRAME_DIRECTION_TO_SRV, ZB_ZCL_NOT_MANUFACTURER_SPECIFIC);\
   ZB_ZCL_CONSTRUCT_COMMAND_HEADER(                               \
       data_ptr,                                                  \
       ZB_ZCL_GET_SEQ_NUM(),                                      \
@@ -1889,7 +1891,6 @@ typedef ZB_PACKED_PRE struct zb_zll_commissioning_endpoint_info_record_s
 {                                                         \
   zb_zll_commissioning_endpoint_info_record_t *res_data =               \
     (zb_zll_commissioning_endpoint_info_record_t*)data_ptr;             \
-  res_data = (zb_zll_commissioning_get_endpoint_list_res_t*)data_ptr;   \
   ZB_HTOLE16_VAL(&(res_data->addr_short), (addr));                      \
   res_data->endpoint = (ep);                                            \
   ZB_HTOLE16_VAL(&(res_data->profile_id), (profile));                   \
@@ -1936,7 +1937,7 @@ typedef ZB_PACKED_PRE struct zb_zll_commissioning_endpoint_info_record_s
     zb_zll_commissioning_get_endpoint_list_res_t* src_ptr =                           \
       (zb_zll_commissioning_get_endpoint_list_res_t*)zb_buf_begin((buffer));          \
     (status) = ZB_ZCL_PARSE_STATUS_SUCCESS;                                           \
-    ZB_MEMCPY((data_ptr)), src_ptr, sizeof(zb_zll_commissioning_get_endpoint_list_res_t)); \
+    ZB_MEMCPY((data_ptr), src_ptr, sizeof(zb_zll_commissioning_get_endpoint_list_res_t)); \
     (void)zb_buf_cut_left((buffer), sizeof(zb_zll_commissioning_get_endpoint_list_res_t)); \
   }                                                                                   \
 }
@@ -1963,7 +1964,7 @@ typedef ZB_PACKED_PRE struct zb_zll_commissioning_endpoint_info_record_s
     ZB_LETOH16(&((data_ptr)->addr_short), &(src_ptr->addr_short));                      \
     (data_ptr)->endpoint = src_ptr->endpoint;                                           \
     ZB_LETOH16(&((data_ptr)->profile_id), &(src_ptr->profile_id));                      \
-    ZB_LETOH16(&((data_ptr)->device_id), &(src_ptr_device_id));                         \
+    ZB_LETOH16(&((data_ptr)->device_id), &(src_ptr->device_id));                         \
     (data_ptr)->version = src_ptr->version;                                             \
     (void)zb_buf_cut_left((buffer), sizeof(zb_zll_commissioning_endpoint_info_record_t)); \
   }                                                                                     \
@@ -2008,11 +2009,12 @@ typedef ZB_PACKED_PRE struct zb_zll_commissioning_endpoint_information_s
 {                                                                        \
   zb_uint8_t* data_ptr = ZB_ZCL_START_PACKET((buffer));                  \
   zb_zll_commissioning_endpoint_information_t *req_data;                 \
-  ZB_ZCL_CONSTRUCT_SPECIFIC_COMMAND_RES_FRAME_CONTROL(data_ptr);         \
+  ZB_ZCL_CONSTRUCT_SPECIFIC_COMMAND_REQ_FRAME_CONTROL_A(data_ptr,            \
+  ZB_ZCL_FRAME_DIRECTION_TO_CLI, ZB_ZCL_NOT_MANUFACTURER_SPECIFIC, ZB_ZCL_ENABLE_DEFAULT_RESPONSE);       \
   ZB_ZCL_CONSTRUCT_COMMAND_HEADER(                                       \
       data_ptr,                                                          \
       ZB_ZCL_GET_SEQ_NUM(),                                              \
-      ZB_ZLL_CMD_COMMISSIONING_NETWORK_UPDATE_REQ);                      \
+      ZB_ZLL_CMD_COMMISSIONING_ENDPOINT_INFORMATION);                      \
   req_data = (zb_zll_commissioning_endpoint_information_t*)(data_ptr);   \
   ZB_IEEE_ADDR_COPY(req_data->addr_long, ZB_PIBCACHE_EXTENDED_ADDRESS());\
   ZB_HTOLE16_VAL(&(req_data->addr_short), ZB_PIBCACHE_NETWORK_ADDRESS());\

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