Merge branch 'release/v0.9.4' into 'main'

esp-zigbee-sdk: release/v0.9.4(89250ad3)

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

RELEASE_NOTES.txt

@@ -1,3 +1,27 @@
+# 8-Sep-2023
+
+Versions
+--------
+0.9.4 version release of ESP-ZIGBEE-SDK
+
+Features
+--------
+* Update esp-zboss-lib to v0.7.0 
+* Add zigbee discover attribtues support
+* Fix Typo for words
+
+Known Issues
+------------
+
+New Changes
+-----------
+
+Bug Fixes
+---------
+Closes: https://github.com/espressif/esp-zigbee-sdk/issues/91
+Closes: https://github.com/espressif/esp-zigbee-sdk/issues/55
+
+
 # 30-Aug-2023
 
 Versions

components/esp-zigbee-lib/idf_component.yml

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

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

@@ -74,6 +74,7 @@ typedef enum esp_zb_core_action_callback_id_s {
     ESP_ZB_CORE_CMD_WRITE_ATTR_RESP_CB_ID               = 0x1001,   /*!< Write attribute response, refer to esp_zb_zcl_cmd_write_attr_resp_message_t */
     ESP_ZB_CORE_CMD_REPORT_CONFIG_RESP_CB_ID            = 0x1002,   /*!< Configure reprot response, refer to esp_zb_zcl_cmd_config_report_resp_message_t */
     ESP_ZB_CORE_CMD_READ_REPORT_CFG_RESP_CB_ID          = 0x1003,   /*!< Read report configuration response, refer to esp_zb_zcl_cmd_read_report_config_resp_message_t */
+    ESP_ZB_CORE_CMD_DISC_ATTR_RESP_CB_ID                = 0x1004,   /*!< Discover attributes response, refer to esp_zb_zcl_cmd_discover_attributes_resp_message_t */
     ESP_ZB_CORE_CMD_OPERATE_GROUP_RESP_CB_ID            = 0x1010,   /*!< Group add group response, refer to esp_zb_zcl_groups_operate_group_resp_message_t */
     ESP_ZB_CORE_CMD_VIEW_GROUP_RESP_CB_ID               = 0x1011,   /*!< Group view response, refer to esp_zb_zcl_groups_view_group_resp_message_t */
     ESP_ZB_CORE_CMD_GET_GROUP_MEMBERSHIP_RESP_CB_ID     = 0x1012,   /*!< Group get membership response, refer to esp_zb_zcl_groups_get_group_membership_resp_message_t */
@@ -155,7 +156,7 @@ typedef bool (*esp_zb_zcl_device_cb_id_callback_t)(uint8_t bufid);
  *      -   True: processed
  *      -   False: unprocessed
  */
-typedef bool (*esp_zb_zcl_raw_command_callbcak_t)(uint8_t bufid);
+typedef bool (*esp_zb_zcl_raw_command_callback_t)(uint8_t bufid);
 
 /** CLI response callback
  *
@@ -190,10 +191,10 @@ void esp_zb_device_cb_id_handler_register(esp_zb_zcl_device_cb_id_callback_t cb)
 /**
  * @brief Register the raw Zigbee command handler
  *
- * @param[in] cb A callback that user can handle the Zigbee raw command buffer id, refer to esp_zb_zcl_raw_command_callbcak_t
+ * @param[in] cb A callback that user can handle the Zigbee raw command buffer id, refer to esp_zb_zcl_raw_command_callback_t
  *
  */
-void esp_zb_raw_command_handler_register(esp_zb_zcl_raw_command_callbcak_t cb);
+void esp_zb_raw_command_handler_register(esp_zb_zcl_raw_command_callback_t cb);
 
 /**
  * @brief   Set the Command line interface (CLI) handler callback.

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

@@ -24,6 +24,15 @@ typedef enum {
     ESP_ZB_APS_ADDR_MODE_64_ENDP_PRESENT =                  0x3,            /*!< 64-bit extended address for DstAddress and DstEndpoint present */
 } esp_zb_zcl_address_mode_t;
 
+/**
+ * @brief ZCL command direction enum
+ * @anchor esp_zb_zcl_cmd_direction
+ */
+typedef enum {
+    ESP_ZB_ZCL_CMD_DIRECTION_TO_SRV = 0x00U, /*!< Command for cluster server side */
+    ESP_ZB_ZCL_CMD_DIRECTION_TO_CLI = 0x01U, /*!< Command for cluster client side */
+} esp_zb_zcl_cmd_direction_t;
+
 /**
  * @brief The Zigbee ZCL basic command info
  *
@@ -87,6 +96,19 @@ typedef struct esp_zb_zcl_report_attr_cmd_s {
 
 /* ZCL basic cluster */
 
+/**
+ * @brief The Zigbee ZCL configure report command struct
+ *
+ */
+typedef struct esp_zb_zcl_disc_attr_cmd_s {
+    esp_zb_zcl_basic_cmd_t zcl_basic_cmd;   /*!< Basic command info */
+    esp_zb_zcl_address_mode_t address_mode; /*!< APS addressing mode constants refer to esp_zb_zcl_address_mode_t */
+    uint16_t cluster_id;                    /*!< The cluster identifier for which the attribute is discovered. */
+    uint16_t start_attr_id;                 /*!< The attribute identifier at which to begin the attribute discover */
+    uint8_t max_attr_number;                /*!< The maximum number of attribute identifiers that are to be returned in the resulting Discover Attributes Response command*/
+    esp_zb_zcl_cmd_direction_t direction;   /*!< The command direction, refer to esp_zb_zcl_cmd_direction_t */
+} esp_zb_zcl_disc_attr_cmd_t;
+
 /**
  * @brief The Zigbee ZCL basic reset factory default command struct
  *
@@ -383,7 +405,7 @@ typedef struct esp_zb_zcl_color_move_color_temperature_cmd_s {
     esp_zb_zcl_basic_cmd_t zcl_basic_cmd;   /*!< Basic command info */
     esp_zb_zcl_address_mode_t address_mode; /*!< APS addressing mode constants refer to esp_zb_zcl_address_mode_t */
     uint8_t move_mode;                      /*!< The Move Mode field of the Move Hue command, if the Move Mode field is equal to 0x00, the Rate field SHALL be ignored. */
-    uint16_t rate;                          /*!< The Rate filed specifies the rate of movement in steps per second */
+    uint16_t rate;                          /*!< The Rate field specifies the rate of movement in steps per second */
     uint16_t color_temperature_minimum;     /*!< The field specifies a lower bound on the Color-Temperature attribute */
     uint16_t color_temperature_maximum;     /*!< The field specifies a upper bound on the Color-Temperature attribute */
 } esp_zb_zcl_color_move_color_temperature_cmd_t;
@@ -701,7 +723,7 @@ typedef struct esp_zb_zcl_recall_scene_message_s {
     uint16_t group_id;                              /*!< The group id of Zigbee scenes cluster */
     uint8_t scene_id;                               /*!< The scene id of Zigbee scenes cluster */
     uint16_t transition_time;                       /*!< The recall transition time of Zigbee scenes cluster */
-    esp_zb_zcl_scenes_extension_field_t *field_set; /*!< The extension filed of Zigbee scenes cluster,{{cluster_id, length, value},..., {cluster_id,
+    esp_zb_zcl_scenes_extension_field_t *field_set; /*!< The extension field of Zigbee scenes cluster,{{cluster_id, length, value},..., {cluster_id,
                                                        length, value}}, note that the `NULL` is the end of field */
 } esp_zb_zcl_recall_scene_message_t;
 
@@ -800,6 +822,26 @@ typedef struct esp_zb_zcl_cmd_read_report_config_resp_message_s {
     };
 } esp_zb_zcl_cmd_read_report_config_resp_message_t;
 
+/**
+ * @brief Attribute information field for discovering attribtues response struct
+ *
+ */
+typedef struct esp_zb_zcl_attr_info_field_s {
+    uint16_t attr_id;                                   /*!< The attribute identifier */
+    esp_zb_zcl_attr_type_t data_type;                   /*!< The data type of attribute */
+    struct esp_zb_zcl_attr_info_field_s *next;          /*!< Next field */
+} esp_zb_zcl_attr_info_field_t;
+
+/**
+ * @brief The Zigbee zcl discover attribute response struct
+ *
+ */
+typedef struct esp_zb_zcl_cmd_discover_attributes_resp_message_s {
+    esp_zb_zcl_cmd_info_t info;                     /*!< The basic information of configuring report response message that refers to esp_zb_zcl_cmd_info_t */
+    uint8_t is_completed;                           /*!< A value of 0 indicates that there are more attributes to be discovered, otherwise, it is completed */
+    esp_zb_zcl_attr_info_field_t *field_set;        /*!< The attribute information field set, which can refer to esp_zb_zcl_attr_info_field_t */
+} esp_zb_zcl_cmd_discover_attributes_resp_message_t;
+
 /**
  * @brief The Zigbee zcl group operation response struct
  *
@@ -943,6 +985,14 @@ esp_err_t esp_zb_zcl_report_attr_cmd_req(esp_zb_zcl_report_attr_cmd_t *cmd_req);
  */
 void esp_zb_zcl_config_report_cmd_req(esp_zb_zcl_config_report_cmd_t *cmd_req);
 
+/**
+ * @brief Send discover attributes command
+ *
+ * @param[in] cmd_req pointer to the discover attributes command @ref esp_zb_zcl_disc_attr_cmd_s
+ *
+ */
+void esp_zb_zcl_disc_attr_cmd_req(esp_zb_zcl_disc_attr_cmd_t *cmd_req);
+
 /* ZCL basic cluster list command */
 
 /**

examples/esp_zigbee_HA_sample/HA_color_dimmable_light/main/idf_component.yml

@@ -1,6 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zboss-lib: "~0.6.0"
+  espressif/esp-zboss-lib: "~0.7.0"
   espressif/esp-zigbee-lib: "~0.9.0"
   espressif/led_strip: "~2.0.0"
   ## Required IDF version

examples/esp_zigbee_HA_sample/HA_color_dimmable_light/partitions.csv

@@ -2,6 +2,6 @@
 # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap
 nvs,        data, nvs,      0x9000,  0x6000,
 phy_init,   data, phy,      0xf000,  0x1000,
-factory,    app,  factory,  0x10000, 650K,
-zb_storage, data, fat,      0xb3000, 16K,
-zb_fct,     data, fat,      0xb7000, 1K,
+factory,    app,  factory,  0x10000, 680K,
+zb_storage, data, fat,      0xba000, 16K,
+zb_fct,     data, fat,      0xbe000, 1K,

examples/esp_zigbee_HA_sample/HA_color_dimmable_switch/main/idf_component.yml

@@ -1,6 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zboss-lib: "~0.6.0"
+  espressif/esp-zboss-lib: "~0.7.0"
   espressif/esp-zigbee-lib: "~0.9.0"
   ## Required IDF version
   idf:

examples/esp_zigbee_HA_sample/HA_on_off_light/main/idf_component.yml

@@ -1,6 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zboss-lib: "~0.6.0"
+  espressif/esp-zboss-lib: "~0.7.0"
   espressif/esp-zigbee-lib: "~0.9.0"
   espressif/led_strip: "~2.0.0"
   ## Required IDF version

examples/esp_zigbee_HA_sample/HA_on_off_switch/main/idf_component.yml

@@ -1,6 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zboss-lib: "~0.6.0"
+  espressif/esp-zboss-lib: "~0.7.0"
   espressif/esp-zigbee-lib: "~0.9.0"
   ## Required IDF version
   idf:

examples/esp_zigbee_cli/main/idf_component.yml

@@ -1,6 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zboss-lib: "~0.6.0"
+  espressif/esp-zboss-lib: "~0.7.0"
   espressif/esp-zigbee-lib: "~0.9.0"
   ## Required IDF version
   idf:

examples/esp_zigbee_customized_devices/customized_client/main/idf_component.yml

@@ -1,6 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zboss-lib: "~0.6.0"
+  espressif/esp-zboss-lib: "~0.7.0"
   espressif/esp-zigbee-lib: "~0.9.0"
   ## Required IDF version
   idf:

examples/esp_zigbee_customized_devices/customized_server/main/idf_component.yml

@@ -1,6 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zboss-lib: "~0.6.0"
+  espressif/esp-zboss-lib: "~0.7.0"
   espressif/esp-zigbee-lib: "~0.9.0"
   espressif/led_strip: "~2.0.0"
   ## Required IDF version

examples/esp_zigbee_gateway/main/idf_component.yml

@@ -1,6 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zboss-lib: "~0.6.0"
+  espressif/esp-zboss-lib: "~0.7.0"
   espressif/esp-zigbee-lib: "~0.9.0"
   espressif/esp_rcp_update: "~0.3.0"
   espressif/esp-serial-flasher: "~0.0.4"

examples/esp_zigbee_ota/ota_client/main/idf_component.yml

@@ -1,6 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zboss-lib: "~0.6.0"
+  espressif/esp-zboss-lib: "~0.7.0"
   espressif/esp-zigbee-lib: "~0.9.0"
   ## Required IDF version
   idf:

examples/esp_zigbee_ota/ota_server/main/idf_component.yml

@@ -1,6 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zboss-lib: "~0.6.0"
+  espressif/esp-zboss-lib: "~0.7.0"
   espressif/esp-zigbee-lib: "~0.9.0"
   ## Required IDF version
   idf:

examples/esp_zigbee_rcp/main/idf_component.yml

@@ -1,6 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zboss-lib: "~0.6.0"
+  espressif/esp-zboss-lib: "~0.7.0"
   espressif/esp-zigbee-lib: "~0.9.0"
   ## Required IDF version
   idf:

examples/esp_zigbee_sleep/sleepy_end_device/main/idf_component.yml

@@ -1,6 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zboss-lib: "~0.6.0"
+  espressif/esp-zboss-lib: "~0.7.0"
   espressif/esp-zigbee-lib: "~0.9.0"
   # Required IDF version
   idf:

examples/esp_zigbee_touchlink/touchlink_light/main/idf_component.yml

@@ -1,6 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zboss-lib: "~0.6.0"
+  espressif/esp-zboss-lib: "~0.7.0"
   espressif/esp-zigbee-lib: "~0.9.0"
   espressif/led_strip: "~2.0.0"
   ## Required IDF version

examples/esp_zigbee_touchlink/touchlink_switch/main/idf_component.yml

@@ -1,6 +1,6 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zboss-lib: "~0.6.0"
+  espressif/esp-zboss-lib: "~0.7.0"
   espressif/esp-zigbee-lib: "~0.9.0"
   ## Required IDF version
   idf: