sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 07:03:55 +00:00
Code Issues Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
J. Nick Koston
2025-07-26 21:24:24 -10:00
parent 92e9383164
commit 10434ac2a3
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
esphome/components/light/light_json_schema.cpp
View File

@@ -12,14 +12,14 @@ namespace light {
static inline uint8_t to_uint8_scaled(float value) { return uint8_t(value * 255); } static inline uint8_t to_uint8_scaled(float value) { return uint8_t(value * 255); }
// Helper to parse color component from JSON // Helper to parse color component from JSON
static float parse_color_component(JsonObject &color, const char *key, LightCall &call, static bool parse_color_component(JsonObject &color, const char *key, LightCall &call,
LightCall &(LightCall::*setter)(float) ) { LightCall &(LightCall::*setter)(float), float &out_value) {
if (color[key].is<uint8_t>()) { if (color[key].is<uint8_t>()) {
float val = float(color[key]) / 255.0f; out_value = float(color[key]) / 255.0f;
(call.*setter)(val); (call.*setter)(out_value);
return val; return true;
} }
return 0.0f; return false;
} }
// Lookup table for color mode strings // Lookup table for color mode strings
@@ -115,16 +115,23 @@ void LightJSONSchema::parse_color_json(LightState &state, LightCall &call, JsonO
JsonObject color = root["color"]; JsonObject color = root["color"];
// HA also encodes brightness information in the r, g, b values, so extract that and set it as color brightness. // HA also encodes brightness information in the r, g, b values, so extract that and set it as color brightness.
float max_rgb = 0.0f; float max_rgb = 0.0f;
bool has_rgb = false;
float r, g, b;
float r = parse_color_component(color, "r", call, &LightCall::set_red); if (parse_color_component(color, "r", call, &LightCall::set_red, r)) {
float g = parse_color_component(color, "g", call, &LightCall::set_green); max_rgb = fmaxf(max_rgb, r);
float b = parse_color_component(color, "b", call, &LightCall::set_blue); has_rgb = true;
}
if (parse_color_component(color, "g", call, &LightCall::set_green, g)) {
max_rgb = fmaxf(max_rgb, g);
has_rgb = true;
}
if (parse_color_component(color, "b", call, &LightCall::set_blue, b)) {
max_rgb = fmaxf(max_rgb, b);
has_rgb = true;
}
max_rgb = fmaxf(max_rgb, r); if (has_rgb) {
max_rgb = fmaxf(max_rgb, g);
max_rgb = fmaxf(max_rgb, b);
if (max_rgb > 0.0f) {
call.set_color_brightness(max_rgb); call.set_color_brightness(max_rgb);
} }