Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[hue] Improve color setting #16436

Merged
merged 10 commits into from
Apr 3, 2024
Merged

[hue] Improve color setting #16436

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9e307c2
[hue] fix xy conversion when B is 0
andrewfg Feb 21, 2024
ef92a7a
Merge branch 'openhab:main' into hue-fix-b-zero
andrewfg Mar 4, 2024
ae2d449
[hue] remove gamut correction; let Hue bridge do it instead
andrewfg Mar 8, 2024
e5e2117
[hue] use revised default gamut
andrewfg Mar 9, 2024
e996534
[hue] fix silly bug
andrewfg Mar 12, 2024
5c38692
[hue] fix gamma round trips; modernize instanceof syntax
andrewfg Mar 15, 2024
b1347bf
[hue] remove unnecessary revised gamut
andrewfg Mar 17, 2024
c8ef3ca
Merge branch 'openhab:main' into hue-fix-b-zero
andrewfg Mar 17, 2024
f0edf16
[hue] remove todos
andrewfg Mar 22, 2024
e2ae1a7
Merge branch 'openhab:main' into hue-fix-b-zero
andrewfg Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...ding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/helper/Setters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,12 @@ public static Resource setColorTemperaturePercent(Resource target, Command comma
* @return the target resource.
*/
public static Resource setColorXy(Resource target, Command command, @Nullable Resource source) {
if (command instanceof HSBType) {
if (command instanceof HSBType cmdHsb) {
Gamut gamut = target.getGamut();
gamut = Objects.nonNull(gamut) ? gamut : Objects.nonNull(source) ? source.getGamut() : null;
gamut = Objects.nonNull(gamut) ? gamut : ColorUtil.DEFAULT_GAMUT;
HSBType hsb = (HSBType) command;
HSBType hsb = cmdHsb.getBrightness().doubleValue() >= 0.1 ? cmdHsb
: new HSBType(cmdHsb.getHue(), cmdHsb.getBrightness(), new PercentType(BigDecimal.valueOf(0.1)));
andrewfg marked this conversation as resolved.
Show resolved Hide resolved
ColorXy color = target.getColorXy();
target.setColorXy((Objects.nonNull(color) ? color : new ColorXy()).setXY(ColorUtil.hsbToXY(hsb, gamut)));
}
Expand Down