diff --git a/components/esp_matter/esp_matter_attribute.cpp b/components/esp_matter/esp_matter_attribute.cpp index 86517d6d7..d0933d4de 100644 --- a/components/esp_matter/esp_matter_attribute.cpp +++ b/components/esp_matter/esp_matter_attribute.cpp @@ -929,7 +929,7 @@ attribute_t *create_color_capabilities(cluster_t *cluster, uint16_t value) attribute_t *create_color_temperature_mireds(cluster_t *cluster, uint16_t value) { - return esp_matter::attribute::create(cluster, ColorControl::Attributes::ColorTemperature::Id, ATTRIBUTE_FLAG_NONE, + return esp_matter::attribute::create(cluster, ColorControl::Attributes::ColorTemperatureMireds::Id, ATTRIBUTE_FLAG_NONE, esp_matter_uint16(value)); } diff --git a/connectedhomeip/connectedhomeip b/connectedhomeip/connectedhomeip index 0e6d7bbdd..b89aa66d9 160000 --- a/connectedhomeip/connectedhomeip +++ b/connectedhomeip/connectedhomeip @@ -1 +1 @@ -Subproject commit 0e6d7bbdd688a17d0cb3e9fa854a1541d7c42b54 +Subproject commit b89aa66d9c6b67424577554641ff2d771e9b4877 diff --git a/examples/light/main/app_driver.cpp b/examples/light/main/app_driver.cpp index 9ea1baa5c..1216e81b1 100644 --- a/examples/light/main/app_driver.cpp +++ b/examples/light/main/app_driver.cpp @@ -90,7 +90,7 @@ esp_err_t app_driver_attribute_update(app_driver_handle_t driver_handle, uint16_ err = app_driver_light_set_hue(handle, val); } else if (attribute_id == ColorControl::Attributes::CurrentSaturation::Id) { err = app_driver_light_set_saturation(handle, val); - } else if (attribute_id == ColorControl::Attributes::ColorTemperature::Id) { + } else if (attribute_id == ColorControl::Attributes::ColorTemperatureMireds::Id) { err = app_driver_light_set_temperature(handle, val); } } @@ -130,7 +130,7 @@ esp_err_t app_driver_light_set_defaults(uint16_t endpoint_id) err |= app_driver_light_set_saturation(handle, &val); } else if (val.val.u8 == EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE) { /* Setting temperature */ - attribute = attribute::get(cluster, ColorControl::Attributes::ColorTemperature::Id); + attribute = attribute::get(cluster, ColorControl::Attributes::ColorTemperatureMireds::Id); attribute::get_val(attribute, &val); err |= app_driver_light_set_temperature(handle, &val); } else { diff --git a/examples/zap_light/main/app_driver.cpp b/examples/zap_light/main/app_driver.cpp index 9aaf14e16..a2527d18f 100644 --- a/examples/zap_light/main/app_driver.cpp +++ b/examples/zap_light/main/app_driver.cpp @@ -87,7 +87,7 @@ esp_err_t app_driver_attribute_update(app_driver_handle_t driver_handle, uint16_ err = app_driver_light_set_hue(handle, val); } else if (attribute_id == ColorControl::Attributes::CurrentSaturation::Id) { err = app_driver_light_set_saturation(handle, val); - } else if (attribute_id == ColorControl::Attributes::ColorTemperature::Id) { + } else if (attribute_id == ColorControl::Attributes::ColorTemperatureMireds::Id) { err = app_driver_light_set_temperature(handle, val); } } @@ -132,7 +132,7 @@ esp_err_t app_driver_light_set_defaults(uint16_t endpoint_id) err |= app_driver_light_set_saturation(handle, &val); } else if (value == EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE) { /* Setting temperature */ - attribute_id = ColorControl::Attributes::ColorTemperature::Id; + attribute_id = ColorControl::Attributes::ColorTemperatureMireds::Id; attribute::get_val_raw(endpoint_id, cluster_id, attribute_id, (uint8_t *)&value_u16, sizeof(uint16_t)); val = esp_matter_uint16(value_u16); err |= app_driver_light_set_temperature(handle, &val);