fix(zigbee): Bump zigbee version and use 1.6.0 (#10563)

P-R-O-C-H-Y · me-no-dev · me-no-dev · commit 7ae2553e46a7 · 2024-11-06T11:44:37.000+02:00
Co-authored-by: Me No Dev &lt;me-no-dev@users.noreply.github.com&gt;
diff --git a/idf_component.yml b/idf_component.yml
@@ -52,11 +52,11 @@ dependencies:
   espressif/esp_modem:
     version: "^1.1.0"
   espressif/esp-zboss-lib:
-    version: "^1.0.1"
+    version: "==1.6.0"
     rules:
       - if: "target not in [esp32c2, esp32p4]"
   espressif/esp-zigbee-lib:
-    version: "^1.0.1"
+    version: "==1.6.0"
     rules:
       - if: "target not in [esp32c2, esp32p4]"
   espressif/esp-dsp:
diff --git 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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ void ZigbeeThermostat::setTemperatureReporting(uint16_t min_interval, uint16_t m`
`185`	`185`	`int16_t report_change = (int16_t)delta * 100;`
`186`	`186`	`esp_zb_zcl_config_report_record_t records[] = {`
`187`	`187`	`{`
`188`		`- .direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_SRV,`
	`188`	`+ .direction = ESP_ZB_ZCL_REPORT_DIRECTION_SEND,`
`189`	`189`	`.attributeID = ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_VALUE_ID,`
`190`	`190`	`.attrType = ESP_ZB_ZCL_ATTR_TYPE_S16,`
`191`	`191`	`.min_interval = min_interval,`