Skip to content

Commit

Permalink
Merge branch 'release/esp-zigbee-sdk-v1.2.3' into 'main'
Browse files Browse the repository at this point in the history
esp-zigbee-sdk: release/v1.2.3(042315bf)

See merge request espressif/esp-zigbee-sdk!122
  • Loading branch information
chshu committed Apr 12, 2024
2 parents 3fbf232 + e28462a commit 1efb22b
Show file tree
Hide file tree
Showing 39 changed files with 216 additions and 21 deletions.
20 changes: 20 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
# Espressif Zigbee SDK Release Notes

## 12-Apr-2024
1.2.3 version release of ESP-ZIGBEE-SDK is based on esp-idf v5.1.3

### Features
- Updated esp-zboss-lib to v1.2.3
- Updated esp-zigbee-lib to v1.2.3
- Added flow measurement cluster support
- Added ZCL manufacturer attribute settings
- Optimized the accuracy for stack timer
- Optimized device handler and endpoint handler for code size
- Optimized ZCL hue and saturation movement method

### Bug Fixes
- Fixed the empty zdo binding table issue
- Fixed the user callback for writing ZCL attributes
- Fixed the enumerated member of pressure measurement cluster
- Closes: https://github.com/espressif/esp-zigbee-sdk/issues/305
- Closes: https://github.com/espressif/esp-zigbee-sdk/issues/307
- Closes: https://github.com/espressif/esp-zigbee-sdk/issues/315

## 29-Mar-2024
1.2.2 version release of ESP-ZIGBEE-SDK is based on esp-idf v5.1.3

Expand Down
2 changes: 1 addition & 1 deletion components/esp-zigbee-lib/idf_component.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "1.2.2"
version: "1.2.3"
description: esp-zigbee library component
url: https://github.com/espressif/esp-zigbee-sdk
dependencies:
Expand Down
54 changes: 48 additions & 6 deletions components/esp-zigbee-lib/include/esp_zigbee_attribute.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,34 @@ esp_zb_zcl_attr_t *esp_zb_zcl_get_attribute(uint8_t endpoint, uint16_t cluster_i
esp_zb_zcl_status_t esp_zb_zcl_set_attribute_val(uint8_t endpoint, uint16_t cluster_id, uint8_t cluster_role,
uint16_t attr_id, void *value_p, bool check);

/**
* @brief Get the manufacturer attribute descriptor
*
* @param endpoint The endpoint identifier where the attribute is located
* @param cluster_id The cluster identifier where the attribute is located
* @param cluster_role The role of cluster
* @param attr_id The attribute identifier
* @param manuf_code The manufacturer code
* @return A pointer to @ref esp_zb_zcl_attr_s for attribute descriptor
*/
esp_zb_zcl_attr_t *esp_zb_zcl_get_manufacturer_attribute(uint8_t endpoint, uint16_t cluster_id, uint8_t cluster_role, uint16_t attr_id,
uint16_t manuf_code);

/**
* @brief Set the manufacturer attribute value
*
* @param endpoint The endpoint identifier where the attribute is located
* @param cluster_id The cluster identifier where the attribute is located
* @param cluster_role The role of cluster
* @param manuf_code The manufacturer code
* @param attr_id The attribute identifier
* @param value_p The value of attribute expected to set
* @param check The access method of attribute whether is required to check or not
* @return The zcl status refer to esp_zb_zcl_status_t
*/
esp_zb_zcl_status_t esp_zb_zcl_set_manufacturer_attribute_val(uint8_t endpoint, uint16_t cluster_id, uint8_t cluster_role, uint16_t manuf_code,
uint16_t attr_id, void *value_p, bool check);

/**
* @brief Add an attribute in basic cluster.
*
Expand Down Expand Up @@ -258,13 +286,13 @@ esp_err_t esp_zb_ias_zone_cluster_add_attr(esp_zb_attribute_list_t *attr_list, u

/**
* @brief Set the IAS zone CIE address for IAS zone server
*
*
* @param[in] endpoint A 8-bit endpoint ID which the IAS zone cluster attach
* @param[in] cie_ieee_addr The 8-byte IEEE address will be regarded as the IAS message destination address
* @return
* @param[in] cie_ieee_addr The 8-byte IEEE address will be regarded as the IAS message destination address
* @return
* - ESP_OK on success
* - ESP_FAIL The CIE address has been set, invalid argument or IAS zone cluster does not exist
*
*
*/
esp_err_t esp_zb_ias_zone_cluster_set_cie_address(uint8_t endpoint, esp_zb_ieee_addr_t cie_ieee_addr);
/**
Expand Down Expand Up @@ -337,6 +365,20 @@ esp_err_t esp_zb_illuminance_meas_cluster_add_attr(esp_zb_attribute_list_t *attr
*/
esp_err_t esp_zb_pressure_meas_cluster_add_attr(esp_zb_attribute_list_t *attr_list, uint16_t attr_id, void *value_p);

/**
* @brief Add an attribute in flow measurement 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_flow_meas_cluster_add_attr(esp_zb_attribute_list_t *attr_list, uint16_t attr_id, void *value_p);

/**
* @brief Add an attribute in electrical measurement cluster
*
Expand Down Expand Up @@ -367,15 +409,15 @@ esp_err_t esp_zb_window_covering_cluster_add_attr(esp_zb_attribute_list_t *attr_

/**
* @brief Add an attribute in occupancy sensor 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_occupancy_sensing_cluster_add_attr(esp_zb_attribute_list_t *attr_list, uint16_t attr_id, void *value_p);

Expand Down
38 changes: 38 additions & 0 deletions components/esp-zigbee-lib/include/esp_zigbee_cluster.h
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,16 @@ esp_zb_attribute_list_t *esp_zb_illuminance_meas_cluster_create(esp_zb_illuminan
*/
esp_zb_attribute_list_t *esp_zb_pressure_meas_cluster_create(esp_zb_pressure_meas_cluster_cfg_t *pressure_cfg);

/**
* @brief Create a standard flow measurement cluster attribute list.
*
* @param[in] flow_meas_cfg Configuration parameters for this cluster defined by @ref esp_zb_flow_meas_cluster_cfg_s
*
* @return Pointer to attribute list @ref esp_zb_attribute_list_s
*
*/
esp_zb_attribute_list_t *esp_zb_flow_meas_cluster_create(esp_zb_flow_meas_cluster_cfg_t *flow_meas_cfg);

/**
* @brief Create a standard electrical measurement cluster attribute list.
*
Expand Down Expand Up @@ -663,6 +673,20 @@ esp_err_t esp_zb_cluster_list_add_illuminance_meas_cluster(esp_zb_cluster_list_t
*/
esp_err_t esp_zb_cluster_list_add_pressure_meas_cluster(esp_zb_cluster_list_t *cluster_list, esp_zb_attribute_list_t *attr_list, uint8_t role_mask);

/**
* @brief Add flow measurement 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_flow_meas_cluster(esp_zb_cluster_list_t *cluster_list, esp_zb_attribute_list_t *attr_list, uint8_t role_mask);

/**
* @brief Add electrical measurement cluster (attribute list) in a cluster list.
*
Expand Down Expand Up @@ -1186,6 +1210,20 @@ esp_err_t esp_zb_cluster_list_update_illuminance_meas_cluster(esp_zb_cluster_lis
*/
esp_err_t esp_zb_cluster_list_update_pressure_meas_cluster(esp_zb_cluster_list_t *cluster_list, esp_zb_attribute_list_t *attr_list, uint8_t role_mask);

/**
* @brief Update flow measurement 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 update
* @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_update_flow_meas_cluster(esp_zb_cluster_list_t *cluster_list, esp_zb_attribute_list_t *attr_list, uint8_t role_mask);

/**
* @brief Update electrical measurement cluster (attribute list) in a cluster list.
*
Expand Down
17 changes: 8 additions & 9 deletions components/esp-zigbee-lib/include/esp_zigbee_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ extern "C" {
#define ESP_ZB_TRANSCEIVER_ALL_CHANNELS_MASK 0x07FFF800U /*!< channel 11-26 for compatibility with 2.4GHZ*/

#ifdef CONFIG_ZB_ZED
#define ESP_ZB_SLEEP_MINIMUM_THRESHOLD_MS 20U /*! Default sleep threshold. Do not sleep when it is less then 1 Beacon Interval to wake up*/
#define ESP_ZB_SLEEP_MAXIMUM_THRESHOLD_MS 86400000U /*! Maximum sleep threshold*/
#endif /** CONFIG_ZB_ZED */

Expand Down Expand Up @@ -436,16 +435,16 @@ void esp_zb_set_rx_on_when_idle(bool rx_on);
bool esp_zb_bdb_is_factory_new(void);

/**
* @brief Get the scan duration of beacon
* @brief Get the scan duration time
*
* @return Scan duration
* @return Scan duration is in beacon intervals (15.36 ms)
*/
uint8_t esp_zb_bdb_get_scan_duration(void);

/**
* @brief Set the scan duration of beacon
* @brief Set the scan duration time
*
* @param[in] duration Scan time is ((1 << duration) + 1) * 15.36 ms
* @param[in] duration The scan duration time is in beacon intervals, defined as ((1 << duration) + 1) * 15.36 ms
*/
void esp_zb_bdb_set_scan_duration(uint8_t duration);

Expand Down Expand Up @@ -874,14 +873,14 @@ bool esp_zb_joining_to_distributed_network_enabled(void);
#endif

/**
* @brief Set the sleep threshold on the device. When the scheduler detects that the device can enter sleep mode, it will notify the application with the signal ESP_ZB_COMMON_SIGNAL_CAN_SLEEP.
* The device cannot enter sleep mode when the sleep interval is less than this threshold.
* Default sleep threshold is 20 milliseconds, because do not sleep when it is less then 1 Beacon Interval to wake up.
* @brief Set the sleep threshold on the device. When the scheduler detects that the device can enter sleep mode,
* it will notify the application with the signal ESP_ZB_COMMON_SIGNAL_CAN_SLEEP.
* The default sleep threshold is 20 milliseconds.
*
* @param[in] threshold_ms Sleep threshold in milliseconds
*
* @return ESP_OK if new threshold is valid and applied.
* @return ESP_FAIL if the user attempts to set a threshold greater than ESP_ZB_SLEEP_MAXIMUM_THRESHOLD_MS or less than ESP_ZB_SLEEP_MINIMUM_THRESHOLD_MS.
* @return ESP_FAIL if the user attempts to set a threshold greater than ESP_ZB_SLEEP_MAXIMUM_THRESHOLD_MS.
*
*/
esp_err_t esp_zb_sleep_set_threshold(uint32_t threshold_ms);
Expand Down
14 changes: 12 additions & 2 deletions components/esp-zigbee-lib/include/esp_zigbee_type.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ union esp_zb_zcl_attr_var_u {

/**
* @brief Type to represent ZCL attribute reporting info structure
*
*
*/
typedef struct esp_zb_zcl_reporting_info_s {
uint8_t direction; /*!< Direction: report is send or received */
Expand Down Expand Up @@ -429,7 +429,7 @@ typedef struct esp_zb_binary_input_cluster_cfg_s {

/**
* @brief The IAS zone application callback
*
*
*/
typedef void (* esp_zb_ias_zone_app_callback_t)(uint8_t param, uint16_t general_val);

Expand Down Expand Up @@ -522,6 +522,16 @@ typedef struct esp_zb_pressure_meas_cluster_cfg_s {
int16_t max_value; /*!< The attribute indicates maximum value of the measured value */
} esp_zb_pressure_meas_cluster_cfg_t;

/**
* @brief Zigbee standard mandatory attribute for flow measurement cluster
*
*/
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 */
} esp_zb_flow_meas_cluster_cfg_t;

/**
* @brief Zigbee standard mandatory attribute for electrical measurement cluster
*
Expand Down
2 changes: 2 additions & 0 deletions components/esp-zigbee-lib/include/zcl/esp_zigbee_zcl_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ extern "C" {
#include "esp_zigbee_zcl_electrical_meas.h"
#include "esp_zigbee_zcl_illuminance_meas.h"
#include "esp_zigbee_zcl_pressure_meas.h"
#include "esp_zigbee_zcl_flow_meas.h"
#include "esp_zigbee_zcl_occupancy_sensing.h"
#include "esp_zigbee_zcl_window_covering.h"
#include "esp_zigbee_zcl_thermostat.h"
Expand Down Expand Up @@ -162,6 +163,7 @@ typedef enum {
ESP_ZB_ZCL_CLUSTER_ID_ILLUMINANCE_MEASUREMENT = 0x0400U, /*!< Illuminance measurement */
ESP_ZB_ZCL_CLUSTER_ID_TEMP_MEASUREMENT = 0x0402U, /*!< Temperature measurement */
ESP_ZB_ZCL_CLUSTER_ID_PRESSURE_MEASUREMENT = 0x0403U, /*!< Pressure measurement */
ESP_ZB_ZCL_CLUSTER_ID_FLOW_MEASUREMENT = 0x0404U, /*!< Flow measurement */
ESP_ZB_ZCL_CLUSTER_ID_REL_HUMIDITY_MEASUREMENT = 0x0405U, /*!< Relative humidity measurement */
ESP_ZB_ZCL_CLUSTER_ID_OCCUPANCY_SENSING = 0x0406U, /*!< Occupancy sensing */
ESP_ZB_ZCL_CLUSTER_ID_CARBON_DIOXIDE_MEASUREMENT = 0x040dU, /*!< Carbon dioxide measurement */
Expand Down
65 changes: 65 additions & 0 deletions components/esp-zigbee-lib/include/zcl/esp_zigbee_zcl_flow_meas.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/

#pragma once
#ifdef __cplusplus
extern "C" {
#endif

#include "esp_zigbee_type.h"

/** @brief Flow measurement cluster attribute identifiers */
typedef enum {
ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_VALUE_ID = 0x0000, /*!< MeasuredValue attribute */
ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_MIN_VALUE_ID = 0x0001, /*!< MinMeasuredValue attribute */
ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_MAX_VALUE_ID = 0x0002, /*!< MaxMeasuredValue attribute */
ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_TOLERANCE_ID = 0x0003, /*!< Tolerance attribute */
} esp_zb_zcl_flow_measurement_attr_t;

/** @brief MeasuredValue attribute unknown value */
#define ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_VALUE_UNKNOWN ((uint16_t)0xffff)

/** @brief MinMeasuredValue attribute minimum value */
#define ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_MIN_VALUE_MIN_VALUE ((uint16_t)0x0000)

/** @brief MinMeasuredValue attribute maximum value */
#define ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_MIN_VALUE_MAX_VALUE ((uint16_t)0xfffd)

/** @brief MinMeasuredValue attribute invalid value */
#define ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_MIN_VALUE_INVALID ((uint16_t)0xffff)

/** @brief MaxMeasuredValue attribute minimum value */
#define ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_MAX_VALUE_MIN_VALUE ((uint16_t)0x0001)

/** @brief MaxMeasuredValue attribute maximum value */
#define ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_MAX_VALUE_MAX_VALUE ((uint16_t)0xfffe)

/** @brief MaxMeasuredValue attribute invalid value */
#define ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_MAX_VALUE_INVALID ((uint16_t)0xffff)

/** @brief Tolerance attribute minimum value */
#define ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_TOLERANCE_MIN_VALUE ((uint16_t)0x0000)

/** @brief Tolerance attribute maximum value */
#define ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_TOLERANCE_MAX_VALUE ((uint16_t)0x0800)

/** @brief Default value for MeasuredValue attribute */
#define ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_VALUE_DEFAULT_VALUE ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_VALUE_UNKNOWN

/** @brief Default value for MinMeasuredValue attribute */
#define ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_MIN_VALUE_DEFAULT_VALUE ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_MIN_VALUE_INVALID

/** @brief Default value for MaxMeasuredValue attribute */
#define ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_MAX_VALUE_DEFAULT_VALUE ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_MAX_VALUE_INVALID

void esp_zb_zcl_flow_measurement_init_server(void);
void esp_zb_zcl_flow_measurement_init_client(void);
#define ESP_ZB_ZCL_CLUSTER_ID_FLOW_MEASUREMENT_SERVER_ROLE_INIT esp_zb_zcl_flow_measurement_init_server
#define ESP_ZB_ZCL_CLUSTER_ID_FLOW_MEASUREMENT_CLIENT_ROLE_INIT esp_zb_zcl_flow_measurement_init_client

#ifdef __cplusplus
}
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ typedef enum
ESP_ZB_ZCL_ATTR_PRESSURE_MEASUREMENT_VALUE_ID = 0x0000, /*!< MeasuredValue */
ESP_ZB_ZCL_ATTR_PRESSURE_MEASUREMENT_MIN_VALUE_ID = 0x0001, /*!< MinMeasuredValue */
ESP_ZB_ZCL_ATTR_PRESSURE_MEASUREMENT_MAX_VALUE_ID = 0x0002, /*!< MaxMeasuredValue */
ESP_ZB_ZCL_ATTR_PRESSURE_MEASUREMENT_TOLERANCE_ID = 0x0003, /*!< MeasuredTolerance */
ESP_ZB_ZCL_ATTR_PRESSURE_MEASUREMENT_SCALED_VALUE_ID = 0x0010, /*!< ScaledValue */
ESP_ZB_ZCL_ATTR_PRESSURE_MEASUREMENT_MIN_SCALED_VALUE_ID = 0x0011, /*!< MinScaledValue */
ESP_ZB_ZCL_ATTR_PRESSURE_MEASUREMENT_MAX_SACLED_VALUE_ID = 0x0012, /*!< MaxScaledValue */
ESP_ZB_ZCL_ATTR_PRESSURE_MEASUREMENT_MAX_SCALED_VALUE_ID = 0x0012, /*!< MaxScaledValue */
ESP_ZB_ZCL_ATTR_PRESSURE_MEASUREMENT_SCALED_TOLERANCE_ID = 0x0013, /*!< ScaledTolerance */
ESP_ZB_ZCL_ATTR_PRESSURE_MEASUREMENT_SCALE_ID = 0x0014, /*!< Scale */
}esp_zb_zcl_pressure_measurement_attr_t;
Expand Down
Binary file modified components/esp-zigbee-lib/lib/esp32/libesp_zb_api_zczr.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32/libesp_zb_api_zczr.debug.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32/libesp_zb_cli_command.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32c3/libesp_zb_api_zczr.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32c3/libesp_zb_api_zczr.debug.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32c3/libesp_zb_cli_command.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32c6/libesp_zb_api_ed.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32c6/libesp_zb_api_ed.debug.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32c6/libesp_zb_api_gpd.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32c6/libesp_zb_api_zczr.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32c6/libesp_zb_api_zczr.debug.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32c6/libesp_zb_cli_command.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32h2/libesp_zb_api_ed.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32h2/libesp_zb_api_ed.debug.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32h2/libesp_zb_api_gpd.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32h2/libesp_zb_api_zczr.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32h2/libesp_zb_api_zczr.debug.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32h2/libesp_zb_cli_command.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32s2/libesp_zb_api_zczr.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32s2/libesp_zb_api_zczr.debug.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32s2/libesp_zb_cli_command.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32s3/libesp_zb_api_zczr.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32s3/libesp_zb_api_zczr.debug.a
Binary file not shown.
Binary file modified components/esp-zigbee-lib/lib/esp32s3/libesp_zb_cli_command.a
Binary file not shown.
1 change: 1 addition & 0 deletions docs/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ INPUT = \
$(PROJECT_PATH)/components/esp-zigbee-lib/include/zcl/esp_zigbee_zcl_green_power.h \
$(PROJECT_PATH)/components/esp-zigbee-lib/include/zcl/esp_zigbee_zcl_diagnostics.h \
$(PROJECT_PATH)/components/esp-zigbee-lib/include/zcl/esp_zigbee_zcl_meter_identification.h \
$(PROJECT_PATH)/components/esp-zigbee-lib/include/zcl/esp_zigbee_zcl_flow_meas.h \
$(PROJECT_PATH)/components/esp-zigbee-lib/include/zcl/esp_zigbee_zcl_price.h \
$(PROJECT_PATH)/components/esp-zigbee-lib/include/zdo/esp_zigbee_zdo_command.h \
$(PROJECT_PATH)/components/esp-zigbee-lib/include/zdo/esp_zigbee_zdo_common.h \
Expand Down
7 changes: 7 additions & 0 deletions docs/en/api-reference/zcl/esp_zigbee_zcl_flow_measurement.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Flow Measurement
================

Zigbee Cluster Library (ZCL) Flow measurement cluster usage definition for ESP Zigbee SDK.


.. include-build-file:: inc/esp_zigbee_zcl_flow_meas.inc
1 change: 1 addition & 0 deletions docs/en/api-reference/zcl/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ This section provides the ESP Zigbee SDK's APIs that support different kind of Z
esp_zigbee_zcl_diagnostics
esp_zigbee_zcl_meter_identification
esp_zigbee_zcl_price
esp_zigbee_zcl_flow_measurement
1 change: 1 addition & 0 deletions docs/en/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ The supported features in current ESP Zigbee SDK are listed below:
illuminance_measurement 0x0400
temperature_measurement 0x0402
pressure_measurement 0x0403
flow_measurement 0x0404
humidity_measurement 0x0405
occupancy_sensing 0x0406
carbon_dioxide_measurement 0x040d
Expand Down
2 changes: 1 addition & 1 deletion examples/esp_zigbee_sleep/light_sleep/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ I (65371) ESP_ZB_SLEEP: Zigbee can sleep

Please note that due to the default sleep threshold of 20 milliseconds, the device may enter sleep mode frequently and print log `Zigbee can sleep`. If you want to reduce the number of sleep occurrences, you can adjust the sleep threshold using the function `esp_zb_sleep_set_threshold(uint32_t threshold_ms)`. For example, you can set the threshold to a higher value like `esp_zb_sleep_set_threshold(2000); // 2000 milliseconds` after initializing Zigbee with `esp_zb_init(&zb_nwk_cfg);`.

During the deep sleep, a typical power consumption is shown below:
During the light sleep, a typical power consumption is shown below:
![H2-light-sleep-power-consumption](image/ESP32H2-light-sleep-power-consumption.png)

## Troubleshooting
Expand Down
Loading

0 comments on commit 1efb22b

Please sign in to comment.