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

Merge branch 'bugfix/light' into 'main'

Browse Source 
[examples/light] Add the missing xy feature of the color control cluster.

See merge request app-frameworks/esp-matter!1165
This commit is contained in:
Hrishikesh Dhayagude
2025-06-10 17:54:47 +08:00
parent 78d3def625 640d5d8dc5
commit 080c9e7efc
9 changed files with 121 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/light/main/app_driver.cpp
+24
View File
@@ -23,6 +23,10 @@ using namespace esp_matter;
static const char *TAG = "app_driver";
extern uint16_t light_endpoint_id;
// Global variables to store current XY color coordinates
static uint16_t current_x = 0;
static uint16_t current_y = 0;
/* Do any conversions/remapping for the actual value here */
static esp_err_t app_driver_light_set_power(led_driver_handle_t handle, esp_matter_attr_val_t *val)
{
@@ -53,6 +57,11 @@ static esp_err_t app_driver_light_set_temperature(led_driver_handle_t handle, es
return led_driver_set_temperature(handle, value);
}
static esp_err_t app_driver_light_set_xy(led_driver_handle_t handle, uint16_t x, uint16_t y)
{
return led_driver_set_xy(handle, x, y);
}
static void app_driver_button_toggle_cb(void *arg, void *data)
{
ESP_LOGI(TAG, "Toggle button pressed");
@@ -89,6 +98,12 @@ esp_err_t app_driver_attribute_update(app_driver_handle_t driver_handle, uint16_
err = app_driver_light_set_saturation(handle, val);
} else if (attribute_id == ColorControl::Attributes::ColorTemperatureMireds::Id) {
err = app_driver_light_set_temperature(handle, val);
} else if (attribute_id == ColorControl::Attributes::CurrentX::Id) {
current_x = val->val.u16;
err = app_driver_light_set_xy(handle, current_x, current_y);
} else if (attribute_id == ColorControl::Attributes::CurrentY::Id) {
current_y = val->val.u16;
err = app_driver_light_set_xy(handle, current_x, current_y);
}
}
}
@@ -124,6 +139,15 @@ esp_err_t app_driver_light_set_defaults(uint16_t endpoint_id)
attribute = attribute::get(endpoint_id, ColorControl::Id, ColorControl::Attributes::ColorTemperatureMireds::Id);
attribute::get_val(attribute, &val);
err |= app_driver_light_set_temperature(handle, &val);
} else if (val.val.u8 == (uint8_t)ColorControl::ColorMode::kCurrentXAndCurrentY) {
/* Setting XY coordinates */
attribute = attribute::get(endpoint_id, ColorControl::Id, ColorControl::Attributes::CurrentX::Id);
attribute::get_val(attribute, &val);
current_x = val.val.u16;
attribute = attribute::get(endpoint_id, ColorControl::Id, ColorControl::Attributes::CurrentY::Id);
attribute::get_val(attribute, &val);
current_y = val.val.u16;
err |= app_driver_light_set_xy(handle, current_x, current_y);
} else {
ESP_LOGE(TAG, "Color mode not supported");
}
examples/light/main/app_main.cpp
+1 -1
View File
@@ -201,7 +201,7 @@ extern "C" void app_main()
light_config.on_off.feature_flags = cluster::on_off::feature::lighting::get_id();
light_config.level_control.feature_flags = cluster::level_control::feature::lighting::get_id();
light_config.color_control.feature_flags = cluster::color_control::feature::color_temperature::get_id();
light_config.color_control.feature_flags = cluster::color_control::feature::color_temperature::get_id() | cluster::color_control::feature::xy::get_id();
// endpoint handles can be used to add/modify clusters.
endpoint_t *endpoint = extended_color_light::create(node, &light_config, ENDPOINT_FLAG_NONE, light_handle);