Update deps

ChadiEM · Jun 17, 2024 · 3f9d2a5 · 3f9d2a5
1 parent ce0b55f
commit 3f9d2a5
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 19 deletions.
diff --git a/.clang-tidy b/.clang-tidy
diff --git a/dependencies.lock b/dependencies.lock
@@ -1,21 +1,21 @@
 dependencies:
   espressif/esp-zboss-lib:
-    component_hash: 98b68ccd1540e3d0d1884eb134951de66752bde85eb826a885021fa3a54517bf
+    component_hash: c7020f631cd4ad25e159ddb812bdc80906b5b424457abc81c9b8b0e92687837a
     source:
       service_url: https://api.components.espressif.com/
       type: service
-    version: 1.0.5
+    version: 1.3.2
   espressif/esp-zigbee-lib:
-    component_hash: 44ae761cec4adcfcc198db4785a9415703b66b78f0a0e96ebec5cbde2045cc6a
+    component_hash: 752dbc8abb2befd2d49ee902051699fac5e32c6962950d64cd888d75d6566ca0
     source:
       service_url: https://api.components.espressif.com/
       type: service
-    version: 1.0.5
+    version: 1.3.2
   idf:
     component_hash: null
     source:
       type: idf
     version: 5.1.2
-manifest_hash: bdae0e9065c831ad3f589dc0b3b7c1026841c9f08023f94867cee8a8f3bf184b
+manifest_hash: f511410f44045864bc2eaad2d780f320bd8ec88449a8e04f704358c0641c2b34
 target: esp32c6
 version: 1.0.0
diff --git a/main/esp_zb_bed.c b/main/esp_zb_bed.c
@@ -19,7 +19,7 @@ static const uint16_t THRESHOLD = 175;
 
 // Define channels and endpoints here
 channel_definition channel_definitions[] = {{.channel = ADC_CHANNEL_2, .endpoint = ENDPOINT_BED_SIDE1, .threshold = THRESHOLD},
-                                            {.channel = ADC_CHANNEL_3, .endpoint = ENDPOINT_BED_SIDE2, .threshold = THRESHOLD}};
+                                                  {.channel = ADC_CHANNEL_3, .endpoint = ENDPOINT_BED_SIDE2, .threshold = THRESHOLD}};
 
 static const uint8_t channel_definitions_size = sizeof(channel_definitions) / sizeof(channel_definition);
 
@@ -200,13 +200,15 @@ static void esp_zb_task(void *pvParameters)
     esp_zb_cluster_list_add_basic_cluster(esp_zb_cluster_list, esp_zb_basic_cluster, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
     esp_zb_cluster_list_add_identify_cluster(esp_zb_cluster_list, esp_zb_identify_cluster, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
 
-    esp_zb_ep_list_add_ep(esp_zb_ep_list, esp_zb_cluster_list, ENDPOINT_INIT, ESP_ZB_AF_HA_PROFILE_ID, ESP_ZB_HA_CUSTOM_ATTR_DEVICE_ID);
+    esp_zb_endpoint_config_t endpoint_config = {.endpoint = ENDPOINT_INIT, .app_profile_id = ESP_ZB_AF_HA_PROFILE_ID, .app_device_id = ESP_ZB_HA_CUSTOM_ATTR_DEVICE_ID};
+    esp_zb_ep_list_add_ep(esp_zb_ep_list, esp_zb_cluster_list, endpoint_config);
 
     for (int i = 0; i < channel_definitions_size; i++) {
         esp_zb_cluster_list_t *esp_zb_cluster_list = esp_zb_zcl_cluster_list_create();
         esp_zb_cluster_list_add_binary_input_cluster(esp_zb_cluster_list, esp_zb_binary_input_clusters[i], ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
 
-        esp_zb_ep_list_add_ep(esp_zb_ep_list, esp_zb_cluster_list, channel_definitions[i].endpoint, ESP_ZB_AF_HA_PROFILE_ID, ESP_ZB_HA_CUSTOM_ATTR_DEVICE_ID);
+        esp_zb_endpoint_config_t endpoint_config = {.endpoint = channel_definitions[i].endpoint, .app_profile_id = ESP_ZB_AF_HA_PROFILE_ID, .app_device_id = ESP_ZB_HA_CUSTOM_ATTR_DEVICE_ID};
+        esp_zb_ep_list_add_ep(esp_zb_ep_list, esp_zb_cluster_list, endpoint_config);
     }
 
     /* Register device */

diff --git a/main/esp_zb_bed.h b/main/esp_zb_bed.h
@@ -18,12 +18,12 @@
 
 #define ESP_ZB_DEFAULT_RADIO_CONFIG()                           \
     {                                                           \
-        .radio_mode = RADIO_MODE_NATIVE,                        \
+        .radio_mode = ZB_RADIO_MODE_NATIVE,                        \
     }
 
 #define ESP_ZB_DEFAULT_HOST_CONFIG()                            \
     {                                                           \
-        .host_connection_mode = HOST_CONNECTION_MODE_NONE,      \
+        .host_connection_mode = ZB_HOST_CONNECTION_MODE_NONE,      \
     }
 
 typedef enum {

diff --git a/main/idf_component.yml b/main/idf_component.yml
@@ -1,7 +1,7 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zigbee-lib: "1.0.5"
-  espressif/esp-zboss-lib: "1.0.5"
+  espressif/esp-zigbee-lib: "1.3.2"
+  espressif/esp-zboss-lib: "1.3.2"
   ## Required IDF version
   idf:
-    version: "5.1.2"
+    version: ">=5.0.0"
diff --git a/sdkconfig b/sdkconfig
@@ -1728,15 +1728,16 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
 CONFIG_ZB_ENABLED=y
 # CONFIG_ZB_ZCZR is not set
 CONFIG_ZB_ZED=y
-# CONFIG_ZB_RCP is not set
+# CONFIG_ZB_ZGPD is not set
 CONFIG_ZB_RADIO_NATIVE=y
-# CONFIG_ZB_RADIO_MACSPLIT_UART is not set
+# CONFIG_ZB_RADIO_SPINEL_UART is not set
 
 #
-# Zigbee trace log option
+# Zigbee Example
 #
-# CONFIG_ESP_ZB_TRACE_ENABLE is not set
-# end of Zigbee trace log option
+# end of Zigbee Example
+
+# CONFIG_ZB_DEBUG_MODE is not set
 # end of Zigbee
 # end of Component config