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

release/esp-zigbee-sdk-v1.6.7(0166821f)

Closes TZ-1938, TZ-1929, TZ-1989, and TZ-1991

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

Author: chshu

RELEASE_NOTES.md

@@ -1,5 +1,28 @@
 # Espressif Zigbee SDK Release Notes
 
+## 29-Aug-2025
+1.6.7 version release of ESP-ZIGBEE-SDK is based on esp-idf v5.3.2
+
+### Features
+- Added support for ZCL Alarms Cluster
+- Added support for ZCL Device temperature Configuration Cluster
+- Added support for the `ESP_ZB_ZCL_ATTR_COLOR_CONTROL_DRIFT_COMPENSATION_ID` and `ESP_ZB_ZCL_ATTR_COLOR_CONTROL_COMPENSATION_TEXT_ID` attributes in `esp_zb_color_control_cluster_add_attr()`
+- Added support for the `ESP_ZB_ZCL_ATTR_ELECTRICAL_MEASUREMENT_POWER_FACTOR_ID` attribute in `esp_zb_electrical_meas_cluster_add_attr()`
+- Added `esp_zb_zcl_scenes_table_set_size()` to configure the capacity of scene table in ZCL scenes cluster
+
+### Bug Fixes
+- Corrected the document for `ESP_ZB_NLME_STATUS_INDICATION`, `ESP_ZB_BDB_SIGNAL_TC_REJOIN_DONE`, and `ESP_ZB_NWK_SIGNAL_PERMIT_JOIN_STATUS` application signals.
+- Corrected the attribute type and access in `esp_zb_xxx_cluster_add_attr()`.
+- Fixed the ambiguous definition of `app_cluster_list`, clarifying it as a dynamic array of input and output cluster IDs
+- Fixed a link issue when using ZCL multistate input cluster
+- Fixed the incorrect check of the `present_value` attribute in the ZCL Multistate Input, Output, and Value clusters when it is written.
+- Fixed a crash that occurred when an attribute with an extremely large value was reported via `esp_zb_zcl_report_attr_cmd_req()`.
+- Fixed a crash that occurred when the stack handled a manufacturer-specific command with a unrecognized payload.
+
+### Changes
+- Updated esp-zigbee-lib to v1.6.7
+
+
 ## 25-Jul-2025
 1.6.6 version release of ESP-ZIGBEE-SDK is based on esp-idf v5.3.2
 

components/esp-zigbee-console/src/zb_data/zcl.c

@@ -74,28 +74,28 @@ typedef struct esp_zcl_cluster_fn_s {
 const static esp_zcl_cluster_fn_t s_cluster_fn_table[] = {
     CLUSTER_FN_ENTRY(basic, ESP_ZB_ZCL_CLUSTER_ID_BASIC),
     CLUSTER_FN_ENTRY(power_config, ESP_ZB_ZCL_CLUSTER_ID_POWER_CONFIG),
-    CLUSTER_NON_SUPPORT_FN_ENTRY(device_temp_config, ESP_ZB_ZCL_CLUSTER_ID_DEVICE_TEMP_CONFIG),
+    CLUSTER_FN_ENTRY(device_temp_config, ESP_ZB_ZCL_CLUSTER_ID_DEVICE_TEMP_CONFIG),
     CLUSTER_FN_ENTRY(identify, ESP_ZB_ZCL_CLUSTER_ID_IDENTIFY),
     CLUSTER_FN_ENTRY(groups, ESP_ZB_ZCL_CLUSTER_ID_GROUPS),
     CLUSTER_FN_ENTRY(scenes, ESP_ZB_ZCL_CLUSTER_ID_SCENES),
     CLUSTER_FN_ENTRY(on_off, ESP_ZB_ZCL_CLUSTER_ID_ON_OFF),
     CLUSTER_FN_ENTRY(on_off_switch_config, ESP_ZB_ZCL_CLUSTER_ID_ON_OFF_SWITCH_CONFIG),
     CLUSTER_FN_ENTRY(level, ESP_ZB_ZCL_CLUSTER_ID_LEVEL_CONTROL),
-    CLUSTER_NON_SUPPORT_FN_ENTRY(alarms, ESP_ZB_ZCL_CLUSTER_ID_ALARMS),
+    CLUSTER_FN_ENTRY(alarms, ESP_ZB_ZCL_CLUSTER_ID_ALARMS),
     CLUSTER_FN_ENTRY(time, ESP_ZB_ZCL_CLUSTER_ID_TIME),
     CLUSTER_NON_SUPPORT_FN_ENTRY(rssi_location, ESP_ZB_ZCL_CLUSTER_ID_RSSI_LOCATION),
     CLUSTER_FN_ENTRY(analog_input, ESP_ZB_ZCL_CLUSTER_ID_ANALOG_INPUT),
     CLUSTER_FN_ENTRY(analog_output, ESP_ZB_ZCL_CLUSTER_ID_ANALOG_OUTPUT),
     CLUSTER_FN_ENTRY(analog_value, ESP_ZB_ZCL_CLUSTER_ID_ANALOG_VALUE),
     CLUSTER_FN_ENTRY(binary_input, ESP_ZB_ZCL_CLUSTER_ID_BINARY_INPUT),
-    CLUSTER_NON_SUPPORT_FN_ENTRY(binary_output, ESP_ZB_ZCL_CLUSTER_ID_BINARY_OUTPUT),
-    CLUSTER_NON_SUPPORT_FN_ENTRY(binary_value, ESP_ZB_ZCL_CLUSTER_ID_BINARY_VALUE),
-    CLUSTER_NON_SUPPORT_FN_ENTRY(multistate_input, ESP_ZB_ZCL_CLUSTER_ID_MULTI_INPUT),
-    CLUSTER_NON_SUPPORT_FN_ENTRY(multistate_output, ESP_ZB_ZCL_CLUSTER_ID_MULTI_OUTPUT),
+    CLUSTER_FN_ENTRY(binary_output, ESP_ZB_ZCL_CLUSTER_ID_BINARY_OUTPUT),
+    CLUSTER_FN_ENTRY(binary_value, ESP_ZB_ZCL_CLUSTER_ID_BINARY_VALUE),
+    CLUSTER_FN_ENTRY(multistate_input, ESP_ZB_ZCL_CLUSTER_ID_MULTI_INPUT),
+    CLUSTER_FN_ENTRY(multistate_output, ESP_ZB_ZCL_CLUSTER_ID_MULTI_OUTPUT),
     CLUSTER_FN_ENTRY(multistate_value, ESP_ZB_ZCL_CLUSTER_ID_MULTI_VALUE),
     CLUSTER_FN_ENTRY(commissioning, ESP_ZB_ZCL_CLUSTER_ID_COMMISSIONING),
     CLUSTER_FN_ENTRY(ota, ESP_ZB_ZCL_CLUSTER_ID_OTA_UPGRADE),
-    CLUSTER_NON_SUPPORT_FN_ENTRY(poll_control, ESP_ZB_ZCL_CLUSTER_ID_POLL_CONTROL),
+    CLUSTER_FN_ENTRY(poll_control, ESP_ZB_ZCL_CLUSTER_ID_POLL_CONTROL),
     CLUSTER_NON_SUPPORT_FN_ENTRY(green_power, ESP_ZB_ZCL_CLUSTER_ID_GREEN_POWER), /* No API provided */
     CLUSTER_NON_SUPPORT_FN_ENTRY(keep_alive, ESP_ZB_ZCL_CLUSTER_ID_KEEP_ALIVE),
     CLUSTER_FN_ENTRY(shade_config, ESP_ZB_ZCL_CLUSTER_ID_SHADE_CONFIG),

components/esp-zigbee-lib/idf_component.yml

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

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

@@ -834,6 +834,34 @@ esp_err_t esp_zb_binary_value_cluster_add_attr(esp_zb_attribute_list_t *attr_lis
  */
 esp_err_t esp_zb_poll_control_cluster_add_attr(esp_zb_attribute_list_t *attr_list, uint16_t attr_id, void *value_p);
 
+/**
+ * @brief Add an attribute in device temperature configuration cluster.
+ *
+ * @param[in] attr_list A pointer to attribute list @ref esp_zb_attribute_list_s
+ * @param[in] attr_id  An attribute id to be added
+ * @param[in] value_p A pointer to attribute value wants to add
+ *
+ * @return
+ *      - ESP_OK on success
+ *      - ESP_ERR_INVALID_ARG if attribute is existed or unsupported
+ *
+ */
+esp_err_t esp_zb_device_temp_config_cluster_add_attr(esp_zb_attribute_list_t *attr_list, uint16_t attr_id, void *value_p);
+
+/**
+ * @brief Add an attribute in alarms cluster.
+ *
+ * @param[in] attr_list A pointer to attribute list @ref esp_zb_attribute_list_s
+ * @param[in] attr_id  An attribute id to be added
+ * @param[in] value_p A pointer to attribute value wants to add
+ *
+ * @return
+ *      - ESP_OK on success
+ *      - ESP_ERR_INVALID_ARG if attribute is existed or unsupported
+ *
+ */
+esp_err_t esp_zb_alarms_cluster_add_attr(esp_zb_attribute_list_t *attr_list, uint16_t attr_id, void *value_p);
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -565,6 +565,28 @@ esp_zb_attribute_list_t *esp_zb_binary_value_cluster_create(esp_zb_binary_value_
  */
 esp_zb_attribute_list_t *esp_zb_poll_control_cluster_create(esp_zb_poll_control_cluster_cfg_t *poll_control_cfg);
 
+/**
+ * @brief  Create a standard device temperature configuration attribute list
+ *
+ * @param[in] cfg  Configuration parameters for this cluster defined by @ref esp_zb_device_temp_config_cluster_cfg_s
+ *
+ * @return pointer to attribute list @ref esp_zb_attribute_list_s
+ *
+ */
+esp_zb_attribute_list_t *esp_zb_device_temp_config_cluster_create(esp_zb_device_temp_config_cluster_cfg_t *cfg);
+
+/**
+ * @brief  Create a standard alarms attribute list
+ *
+ * If the alarm_table_size is not zero, the alarm_count attribute will be added by this function
+ *
+ * @param[in] cfg  Configuration parameters for this cluster defined by @ref esp_zb_alarms_cluster_cfg_s
+ *
+ * @return pointer to attribute list @ref esp_zb_attribute_list_s
+ *
+ */
+esp_zb_attribute_list_t *esp_zb_alarms_cluster_create(esp_zb_alarms_cluster_cfg_t *cfg);
+
 /**************************************** ADD CLUSTER ***********************************/
 /**
  * @brief Add basic cluster (attribute list) in a cluster list.
@@ -1285,6 +1307,34 @@ esp_err_t esp_zb_cluster_list_add_custom_cluster(esp_zb_cluster_list_t *cluster_
  */
 esp_err_t esp_zb_cluster_list_add_poll_control_cluster(esp_zb_cluster_list_t *cluster_list, esp_zb_attribute_list_t *attr_list, uint8_t role_mask);
 
+/**
+ * @brief Add device temperature configuration cluster (attribute list) in a cluster list.
+ *
+ * @param[in] cluster_list A pointer to cluster list @ref esp_zb_cluster_list_s
+ * @param[in] attr_list  An attribute list which wants to add
+ * @param[in] role_mask  A role of server or client for this cluster (attribute list) refer to esp_zb_zcl_cluster_role_t
+ *
+ * @return
+ *      - ESP_OK on success
+ *      - ESP_ERR_INVALID_ARG if cluster list not initialized
+ *
+ */
+esp_err_t esp_zb_cluster_list_add_device_temp_config_cluster(esp_zb_cluster_list_t *cluster_list, esp_zb_attribute_list_t *attr_list, uint8_t role_mask);
+
+/**
+ * @brief Add device alarms (attribute list) in a cluster list.
+ *
+ * @param[in] cluster_list A pointer to cluster list @ref esp_zb_cluster_list_s
+ * @param[in] attr_list  An attribute list which wants to add
+ * @param[in] role_mask  A role of server or client for this cluster (attribute list) refer to esp_zb_zcl_cluster_role_t
+ *
+ * @return
+ *      - ESP_OK on success
+ *      - ESP_ERR_INVALID_ARG if cluster list not initialized
+ *
+ */
+esp_err_t esp_zb_cluster_list_add_alarms_cluster(esp_zb_cluster_list_t *cluster_list, esp_zb_attribute_list_t *attr_list, uint8_t role_mask);
+
 /**
  * @brief Get cluster (attribute list) from a cluster list.
  *

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

@@ -337,7 +337,10 @@ typedef struct esp_zb_af_simple_desc_1_1_s {
     uint32_t   reserved: 4;                     /*!< Reserved */
     uint8_t    app_input_cluster_count;         /*!< Application input cluster count */
     uint8_t    app_output_cluster_count;        /*!< Application output cluster count */
-    uint16_t   app_cluster_list[2];             /*!< Application input and output cluster list */
+    uint16_t   *app_cluster_list;               /*!< Pointer to an array of uint16_t cluster IDs whose total length is
+                                                     (app_input_cluster_count + app_output_cluster_count).
+                                                     Input cluster IDs start from index 0.
+                                                     Output cluster IDs start from index app_input_cluster_count. */
 } ESP_ZB_PACKED_STRUCT
 esp_zb_af_simple_desc_1_1_t;
 
@@ -666,9 +669,9 @@ typedef struct esp_zb_pressure_meas_cluster_cfg_s {
  *
  */
 typedef struct esp_zb_flow_meas_cluster_cfg_s {
-    int16_t measured_value;                     /*!<  The attribute indicates the flow from 0x0000 to 0xffff */
-    int16_t min_value;                          /*!<  The attribute indicates minimum value of the measured value */
-    int16_t max_value;                          /*!<  The attribute indicates maximum value of the measured value */
+    uint16_t measured_value;                    /*!<  The attribute indicates the flow from 0x0000 to 0xffff */
+    uint16_t min_value;                         /*!<  The attribute indicates minimum value of the measured value */
+    uint16_t max_value;                         /*!<  The attribute indicates maximum value of the measured value */
 } esp_zb_flow_meas_cluster_cfg_t;
 
 /**
@@ -927,6 +930,22 @@ typedef struct esp_zb_poll_control_cluster_cfg_s {
     uint16_t fast_poll_timeout_max; /*!< The Poll Control Server MAY optionally provide its own maximum value for the FastPollTimeout*/
 } esp_zb_poll_control_cluster_cfg_t;
 
+/**
+ * @brief Zigbee standard mandatory attribute for device temperature configuration cluster
+ *
+ */
+typedef struct esp_zb_device_temp_config_cluster_cfg_s {
+    int16_t current_temperature;     /*!< The CurrentTemperature attribute specifies the current internal temperature, in degrees Celsius. */
+} esp_zb_device_temp_config_cluster_cfg_t;
+
+/**
+ * @brief Zigbee standard mandatory attribute for device temperature configuration cluster
+ *
+ */
+typedef struct esp_zb_alarms_cluster_cfg_s {
+    uint16_t alarm_table_size;  /*!< The AlarmTableSize attribute specifies the maximum number of entries that can be stored in the alarm table. */
+} esp_zb_alarms_cluster_cfg_t;
+
 /****************** standard device config *********************/
 /**
  * @brief Zigbee HA standard on-off light device clusters.

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

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

components/esp-zigbee-lib/include/zcl/esp_zigbee_zcl_alarms.h

@@ -0,0 +1,64 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include "esp_err.h"
+#include "esp_zigbee_type.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @brief Alarms cluster attribute identifiers */
+typedef enum esp_zb_zcl_alarms_attr_e {
+  ESP_ZB_ZCL_ATTR_ALARMS_ALARM_COUNT_ID      = 0x0000, /*!< AlarmCount attribute */
+  ESP_ZB_ZCL_ATTR_ALARMS_ALARM_TABLE_SIZE_ID = 0xEFFE, /*!< Internal AlarmTable size attribute */
+  ESP_ZB_ZCL_ATTR_ALARMS_ALARM_TABLE_ID      = 0xEFFF, /*!< Internal AlarmTable attribute */
+} esp_zb_zcl_alarms_attr_t;
+
+/** @brief Minimum value for AlarmCount attribute */
+#define ESP_ZB_ZCL_ALARMS_ALARM_COUNT_MIN_VALUE      (0x0000)
+/** @brief Maximum value for AlarmCount attribute */
+#define ESP_ZB_ZCL_ALARMS_ALARM_COUNT_MAX_VALUE      (0x00FF)
+/** @brief Default value for AlarmCount attribute */
+#define ESP_ZB_ZCL_ALARMS_ALARM_COUNT_DEFAULT_VALUE  (0x0000)
+
+/** @brief Default value for AlarmTableSize attribute */
+#define ESP_ZB_ZCL_ALARMS_ALARM_TABLE_SIZE_DEFAULT_VALUE  (0x000F)
+
+/** @brief Alarms cluster command identifiers */
+typedef enum esp_zb_zcl_alarms_cmd_req_e {
+  ESP_ZB_ZCL_CMD_ALARMS_RESET_ALARM_ID         = 0x00, /*!< Reset alarm command. */
+  ESP_ZB_ZCL_CMD_ALARMS_RESET_ALL_ALARMS_ID    = 0x01, /*!< Reset all alarms command. */
+  ESP_ZB_ZCL_CMD_ALARMS_GET_ALARM_ID           = 0x02, /*!< Get alarms command. */
+  ESP_ZB_ZCL_CMD_ALARMS_RESET_ALARM_LOG_ID     = 0x03  /*!< Reset alarm log command. */
+} esp_zb_zcl_alarms_cmd_req_t;
+
+/** @brief Alarms cluster command identifiers */
+typedef enum esp_zb_zcl_alarms_cmd_resp_e {
+  ESP_ZB_ZCL_CMD_ALARMS_ALARM_ID             = 0x00, /*!< Alarm command. */
+  ESP_ZB_ZCL_CMD_ALARMS_GET_ALARM_RESP_ID    = 0x01, /*!< Get alarm response command. */
+} esp_zb_zcl_alarms_cmd_resp_t;
+
+/**
+ * @brief Alarm cluster server initialization
+ * 
+ */
+void esp_zb_zcl_alarms_init_server(void);
+
+/**
+ * @brief Alarm cluster client initialization
+ * 
+ */
+void esp_zb_zcl_alarms_init_client(void);
+
+#define ESP_ZB_ZCL_CLUSTER_ID_ALARMS_SERVER_ROLE_INIT esp_zb_zcl_alarms_init_server
+#define ESP_ZB_ZCL_CLUSTER_ID_ALARMS_CLIENT_ROLE_INIT esp_zb_zcl_alarms_init_client
+
+#ifdef __cplusplus
+}
+#endif