feat(zigbee): move the zcl_utility into the examples_utils of zb_common_components

2025-09-18 21:05:02 +08:00
parent 4fcab14568
commit da54e34dbb
11 changed files with 32 additions and 23 deletions
@@ -1,5 +1,5 @@
 idf_component_register(
-    SRC_DIRS  "." "../../../common/zcl_utility/src"
-    INCLUDE_DIRS "." "../../../common/zcl_utility/include"
+    SRC_DIRS  "."
+    INCLUDE_DIRS "."
    PRIV_REQUIRES nvs_flash esp_driver_uart ieee802154
 )
@@ -17,6 +17,7 @@
 #include "esp_log.h"
 #include "nvs_flash.h"
 #include "ha/esp_zigbee_ha_standard.h"
+#include "zcl_utility.h"
 #include "esp_zb_light.h"

 #if !defined ZB_ED_ROLE
@@ -14,7 +14,6 @@

 #include "esp_zigbee_core.h"
 #include "light_driver.h"
-#include "zcl_utility.h"

 /* Zigbee configuration */
 #define INSTALLCODE_POLICY_ENABLE       false                                /* enable the install code policy for security */
@@ -6,3 +6,5 @@ dependencies:
  ## Required IDF version
  idf:
    version: ">=5.0.0"
+  examples_utils:
+    path: ${IDF_PATH}/examples/zigbee/zb_common_components/examples_utils
@@ -1,5 +1,5 @@
 idf_component_register(
-    SRC_DIRS  "." "../../../common/zcl_utility/src"
-    INCLUDE_DIRS "." "../../../common/zcl_utility/include"
+    SRC_DIRS  "."
+    INCLUDE_DIRS "."
    PRIV_REQUIRES nvs_flash esp_driver_gpio esp_driver_uart ieee802154
 )
@@ -20,6 +20,7 @@
 #include "esp_log.h"
 #include "nvs_flash.h"
 #include "ha/esp_zigbee_ha_standard.h"
+#include "zcl_utility.h"
 #include "esp_zb_switch.h"

 #if defined ZB_ED_ROLE
@@ -13,7 +13,6 @@
 */
 #include "esp_zigbee_core.h"
 #include "switch_driver.h"
-#include "zcl_utility.h"

 /* Zigbee configuration */
 #define MAX_CHILDREN                    10         /* the max amount of connected devices */
@@ -5,3 +5,5 @@ dependencies:
  ## Required IDF version
  idf:
    version: ">=5.0.0"
+  examples_utils:
+    path: ${IDF_PATH}/examples/zigbee/zb_common_components/examples_utils