mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-22 09:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1028 from 20goto10/feature/hsl-support

Browse Source 
HSL color integration merge to target_5_2_next
This commit is contained in:
BWS Systems
2019-05-21 09:57:43 -05:00
committed by GitHub
parent 063055f5c8 56481f3f72
commit b6b9089ec4
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/bwssystems/HABridge/hue/ColorDecode.java
View File

@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.awt.Color;
import org.slf4j.Logger;
@@ -20,6 +21,7 @@ public class ColorDecode {
private static final String COLOR_GX = "${color.gx}";
private static final String COLOR_BX = "${color.bx}";
private static final String COLOR_RGBX = "${color.rgbx}";
private static final String COLOR_HSL = "${color.hsl}";
private static final Pattern COLOR_MILIGHT = Pattern.compile("\\$\\{color.milight\\:([01234])\\}");
public static List<Integer> convertCIEtoRGB(List<Double> xy, int brightness) {
@@ -197,8 +199,18 @@ public class ColorDecode {
if (request.contains(COLOR_RGBX)) {
request = request.replace(COLOR_RGBX, String.format("%02X%02X%02X", rgb.get(0), rgb.get(1), rgb.get(2)));
notDone = true;
}
}
if (request.contains(COLOR_HSL)) {
float[] hsb = new float[3];
Color.RGBtoHSB(rgb.get(0),rgb.get(1),rgb.get(2),hsb);
float hue = hsb[0] * (float) 360.0;
float sat = hsb[1] * (float) 100.0;
float bright = hsb[2] * (float) 100.0;
request = request.replace(COLOR_HSL, String.format("%f,%f,%f", hue, sat, bright));
notDone = true;
}
Matcher m = COLOR_MILIGHT.matcher(request);
while (m.find()) {
int group = Integer.parseInt(m.group(1));