espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 11:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update matter submodule to b89aa66d9c

Browse Source
This commit is contained in:
WanqQixiang
2022-09-16 14:28:01 +08:00
parent f5649e5274
commit 32ec5c5ae8
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter/esp_matter_attribute.cpp
+1 -1
View File
@@ -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));
}
connectedhomeip/connectedhomeip
+1 -1
Submodule connectedhomeip/connectedhomeip updated: 0e6d7bbdd6...b89aa66d9c
examples/light/main/app_driver.cpp
+2 -2
View File
@@ -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 {
examples/zap_light/main/app_driver.cpp
+2 -2
View File
@@ -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);