From 1b01f34ad8d60ae994e68964b94450a04d0a09ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Proch=C3=A1zka?= <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:50:59 +0100 Subject: [PATCH] fix(zigbee): Bump zigbee version and use 1.6.0 --- idf_component.yml | 4 ++-- libraries/Zigbee/src/ep/ZigbeeTempSensor.cpp | 1 - libraries/Zigbee/src/ep/ZigbeeThermostat.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/idf_component.yml b/idf_component.yml index abacb442ef2..7ff776536f4 100644 --- a/idf_component.yml +++ b/idf_component.yml @@ -52,11 +52,11 @@ dependencies: espressif/network_provisioning: version: "~1.0.0" espressif/esp-zboss-lib: - version: "^1.0.1" + version: "==1.6.0" rules: - if: "target != esp32c2" espressif/esp-zigbee-lib: - version: "^1.0.1" + version: "==1.6.0" rules: - if: "target != esp32c2" espressif/esp-dsp: diff --git a/libraries/Zigbee/src/ep/ZigbeeTempSensor.cpp b/libraries/Zigbee/src/ep/ZigbeeTempSensor.cpp index e0dba03da5c..9ae79ccacca 100644 --- a/libraries/Zigbee/src/ep/ZigbeeTempSensor.cpp +++ b/libraries/Zigbee/src/ep/ZigbeeTempSensor.cpp @@ -80,7 +80,6 @@ void ZigbeeTempSensor::reportTemperature() { esp_zb_zcl_report_attr_cmd_t report_attr_cmd; report_attr_cmd.address_mode = ESP_ZB_APS_ADDR_MODE_DST_ADDR_ENDP_NOT_PRESENT; report_attr_cmd.attributeID = ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_VALUE_ID; - report_attr_cmd.cluster_role = ESP_ZB_ZCL_CLUSTER_SERVER_ROLE; report_attr_cmd.clusterID = ESP_ZB_ZCL_CLUSTER_ID_TEMP_MEASUREMENT; report_attr_cmd.zcl_basic_cmd.src_endpoint = _endpoint; diff --git a/libraries/Zigbee/src/ep/ZigbeeThermostat.cpp b/libraries/Zigbee/src/ep/ZigbeeThermostat.cpp index 28ed2a70cd2..232af7ddca1 100644 --- a/libraries/Zigbee/src/ep/ZigbeeThermostat.cpp +++ b/libraries/Zigbee/src/ep/ZigbeeThermostat.cpp @@ -185,7 +185,7 @@ void ZigbeeThermostat::setTemperatureReporting(uint16_t min_interval, uint16_t m int16_t report_change = (int16_t)delta * 100; esp_zb_zcl_config_report_record_t records[] = { { - .direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_SRV, + .direction = ESP_ZB_ZCL_REPORT_DIRECTION_SEND, .attributeID = ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_VALUE_ID, .attrType = ESP_ZB_ZCL_ATTR_TYPE_S16, .min_interval = min_interval,