Merge branch 'release/esp-zigbee-sdk-v1.6.8' into 'main'

release/esp-zigbee-sdk-v1.6.8(79cb709a)

See merge request espressif/esp-zigbee-sdk!210

Author: chshu

.gitlab/ci/common.yml

@@ -5,5 +5,5 @@ stages:
   - docs
 
 variables:
-    DOCKER_ENV_FOR_GENERATE: "v5.3:1"
-    DOCKER_ENV_FOR_DOCS: "v5.3:1-1"
+    DOCKER_ENV_FOR_GENERATE: "v5.5:3"
+    DOCKER_ENV_FOR_DOCS: "v5.5:3-1"

.gitlab/ci/generate_build_test_jobs.yml

@@ -14,21 +14,23 @@ generate_child_pipeline:
     - |
       python3 tools/ci/dynamic_pipelines/generate_child_pipeline.py \
         --result child_pipeline_default.yml \
-        --idf_version v5.3.2 \
-        --chips esp32h2 esp32c6 esp32s3 \
+        --idf_version v5.5.1 \
+        --chips esp32h2 esp32c6 esp32s3 esp32c5\
         --job_templates build_pytest_template_sdk_example build_non_pytest_template_sdk_example build_pytest_gateway_template_sdk_example pytest_template_sdk_example
     - |
       python3 tools/ci/dynamic_pipelines/generate_child_pipeline.py \
         --result child_pipeline_lts.yml \
-        --idf_version v5.1.4 v5.2.3 \
+        --idf_version v5.1.6 v5.2.5 v5.3.4 v5.4.2 \
         --chips esp32h2 esp32c6 esp32s3 \
-        --job_templates build_pytest_template_sdk_example build_non_pytest_template_sdk_example build_pytest_gateway_template_sdk_example pytest_template_sdk_example
+        --job_templates build_pytest_template_sdk_example build_non_pytest_template_sdk_example build_pytest_gateway_template_sdk_example pytest_template_sdk_example \
+        --manual_pytest
     - |
       python3 tools/ci/dynamic_pipelines/generate_child_pipeline.py \
         --result child_pipeline_idf_example.yml \
-        --idf_version v5.3.2 master \
-        --chips esp32h2 esp32c6 esp32s3 \
-        --job_templates build_pytest_template_idf_example build_pytest_gateway_template_idf_example pytest_template_idf_example
+        --idf_version v5.5.1 master \
+        --chips esp32h2 esp32c6 esp32s3 esp32c5 \
+        --job_templates build_pytest_template_idf_example build_pytest_gateway_template_idf_example pytest_template_idf_example \
+        --manual_pytest
 
 build_and_test_pipeline_default:
   stage: build
@@ -64,7 +66,6 @@ build_and_test_pipeline_idf_example:
     - generate_child_pipeline
   inherit:
     variables: true
-  when: manual
   trigger:
     include:
       - artifact: child_pipeline_idf_example.yml

.gitlab/ci/templates.yml

@@ -32,8 +32,8 @@ include:
   extends:
     - .build_pytest_template_base
   script:
-    - build_example ${CI_PROJECT_DIR}/examples/esp_zigbee_all_device_types_app esp32h2 esp32c6
-    - update_idf_cmake_list_for_master
+    - build_example ${CI_PROJECT_DIR}/examples/esp_zigbee_all_device_types_app esp32h2 esp32c6 esp32c5
+    - update_idf_cmake_list
     - update_gateway_wifi_config ${IDF_PATH}/examples/zigbee/esp_zigbee_gateway
     - cd ${IDF_PATH}
     # Skip using IDF build app configuration
@@ -81,7 +81,7 @@ include:
     - .build_pytest_gateway_template_base
   script:
     - build_example ${CI_PROJECT_DIR}/examples/esp_zigbee_all_device_types_app esp32h2
-    - update_idf_cmake_list_for_master
+    - update_idf_cmake_list
     # false means not enable rcp update
     - build_rcp_gateway ${IDF_PATH}/examples/zigbee/esp_zigbee_gateway false
 

RELEASE_NOTES.md

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 if (CONFIG_ZB_ENABLED)
-    set(src_dirs "")
+    set(src_dirs "src/compat")
     set(include_dirs include)
 endif()
 
@@ -53,9 +53,10 @@ if(CONFIG_ZB_ENABLED)
     target_link_libraries(${COMPONENT_LIB} INTERFACE ${ESP_ZIGBEE_API_LIBS})
     target_compile_options(${COMPONENT_LIB} INTERFACE $<$<COMPILE_LANGUAGE:C>:-Wno-strict-prototypes>)
 
+    target_link_libraries(${COMPONENT_LIB} INTERFACE zboss_port_lib $<TARGET_FILE:${COMPONENT_LIB}>)
     if (CONFIG_ZB_RADIO_SPINEL_UART)
         idf_component_get_property(openthread_lib openthread COMPONENT_LIB)
-        idf_component_get_property(zigbee_lib espressif__esp-zigbee-lib COMPONENT_LIB)
-        target_link_libraries(${COMPONENT_LIB} INTERFACE zboss_port_lib $<TARGET_FILE:${zigbee_lib}> $<TARGET_FILE:${openthread_lib}> zboss_port_lib)
+        target_link_libraries(${COMPONENT_LIB} INTERFACE $<TARGET_FILE:${openthread_lib}>)
     endif()
+
 endif()

components/esp-zigbee-lib/CMakeLists.txt

@@ -1,4 +1,4 @@
-version: "1.6.7"
+version: "1.6.8"
 description: esp-zigbee library component
 url: https://github.com/espressif/esp-zigbee-sdk
 dependencies:

components/esp-zigbee-lib/idf_component.yml

@@ -271,6 +271,20 @@ esp_err_t esp_zb_aps_set_fragment_interframe_delay(uint8_t delay_ms);
  */
 uint8_t esp_zb_aps_get_fragment_interframe_delay(void);
 
+/**
+ * @brief Set the authenticated state of the device in the APS layer.
+ *
+ * @param[in] authenticated The authenticated state to be set.
+ */
+void esp_zb_aps_set_authenticated(bool authenticated);
+
+/**
+ * @brief Check whether the device is authenticated.
+ *
+ * @return true if authenticated, otherwise false.
+ */
+bool esp_zb_aps_is_authenticated();
+
 #ifdef __cplusplus
 }
 #endif

components/esp-zigbee-lib/include/aps/esp_zigbee_aps.h

@@ -15,5 +15,5 @@
 #endif
 
 #ifndef ESP_ZB_VER_PATCH
-#define ESP_ZB_VER_PATCH 7
+#define ESP_ZB_VER_PATCH 8
 #endif

components/esp-zigbee-lib/include/esp_zigbee_version.h

@@ -244,14 +244,14 @@ void esp_zb_get_long_address(esp_zb_ieee_addr_t addr);
 uint16_t esp_zb_get_short_address(void);
 
 /**
- * @brief Set the Zigbee network extended PAN ID.
+ * @brief Set the extended PAN ID used by the Zigbee device for joining or forming a network.
  *
  * @param ext_pan_id An 64-bit of extended PAN ID, which is presented in little-endian.
  */
 void esp_zb_set_extended_pan_id(const esp_zb_ieee_addr_t ext_pan_id);
 
 /**
- * @brief   Get the Zigbee network extended PAN ID.
+ * @brief Get the extended PAN ID of Zigbee device.
  *
  * @note This function will return back a pointer to 64-bit of extended PAN ID.
  *
@@ -379,6 +379,22 @@ uint8_t esp_zb_nwk_get_link_status_period(void);
  */
 esp_err_t esp_zb_nwk_set_link_status_period(uint8_t period);
 
+/**
+ * @brief Set the nwkExtendedPANID attribute in the NIB.
+ *
+ * @param[in] ext_pan_id A 64-bit extended PAN ID in little-endian format to be set in the NIB.
+ */
+void esp_zb_nwk_set_extended_pan_id(esp_zb_ext_pan_id_t ext_pan_id);
+
+/**
+ * @brief Get the nwkExtendedPANID attribute from the NIB.
+ *
+ * @param[out] ext_pan_id A 64-bit extended PAN ID in little-endian format retrieved from the NIB,
+ *                        which represents the extended PAN ID of the network to which the device is joined.
+ *                        If the value is 0x0000000000000000, the device is not connected to any network.
+ */
+void esp_zb_nwk_get_extended_pan_id(esp_zb_ext_pan_id_t ext_pan_id);
+
 #ifdef __cplusplus
 }
 #endif

components/esp-zigbee-lib/include/nwk/esp_zigbee_nwk.h

@@ -127,8 +127,6 @@ typedef void (*esp_zb_zdo_node_desc_callback_t)(esp_zb_zdp_status_t zdo_status,
  *
  * @note User's callback get response from the remote device that local node wants to get power descriptor response.
  *
- * @param[in] zdo_status    The ZDO response status, refer to `esp_zb_zdp_status`
- * @param[in] addr          A short address of the device response, 0xFFFF - invalid address
  * @param[in] power_desc    A pointer to the power desc, refer to esp_zb_af_node_power_desc_t
  * @param[in] user_ctx      User information context, set in `esp_zb_zdo_power_desc_req()`
  *
@@ -472,7 +470,7 @@ typedef void (*esp_zb_zdo_scan_complete_callback_t)(esp_zb_zdp_status_t zdo_stat
  *
  * @param[in] status  The status of callback, refer to esp_zb_zdp_status_t
  * @param[in] count   The size of energy detect list
- * @param[in] ed_list The list of energy detect information, refer to esp_zb_energy_detect_channel_info_t
+ * @param[in] channel_info The energy detect information of channels, refer to esp_zb_energy_detect_channel_info_t
  *
  */
 typedef void (*esp_zb_zdo_energy_detect_callback_t)(esp_zb_zdp_status_t status, uint16_t count,
@@ -501,7 +499,8 @@ typedef void (*esp_zb_zdo_mgmt_lqi_rsp_callback_t)(const esp_zb_zdo_mgmt_lqi_rsp
  *
  * @brief A ZDO  Mgmt_NWK_Update_req callback for user to get status of request.
  *
- * @param[in] zdo_status    The ZDO response status, refer to `esp_zb_zdp_status`
+ * @param[in] notify    The notification structure of ZDO mgmt nwk update, refer to esp_zb_zdo_mgmt_update_notify_t
+ * @param[in] user_ctx  User information context, set in `esp_zb_zdo_mgmt_nwk_update_req()`
  *
  */
 typedef void (*esp_zb_zdo_mgmt_nwk_update_notify_callback_t)(const esp_zb_zdo_mgmt_update_notify_t *notify, void *user_ctx);