mtan93/SmartThingsPublic
1
0
Fork 0
mirror of https://github.com/mtan93/SmartThingsPublic.git synced 2026-04-02 22:04:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1293 from larsfinander/DVCSMP-2081_Philips_Hue_650k_exceptions_staging

Browse Source 
DVCSMP-2081 Philips Hue: Bridge is throwing 650k exceptions a day
This commit is contained in:
Lars Finander
2016-09-26 11:52:12 -06:00
committed by GitHub
parent 30993aa218 f5c3997679
commit 5e3aaa3270
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
smartapps/smartthings/hue-connect.src/hue-connect.groovy
View File

@@ -1120,7 +1120,7 @@ def setColor(childDevice, huesettings) {
value.hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535) value.hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535)
if (huesettings.saturation != null) if (huesettings.saturation != null)
value.sat = Math.min(Math.round(huesettings.saturation * 254 / 100), 254) value.sat = Math.min(Math.round(huesettings.saturation * 254 / 100), 254)
} else if (huesettings.hex != null && false) { } else if (huesettings.hex != null) {
// For now ignore model to get a consistent color if same color is set across multiple devices // For now ignore model to get a consistent color if same color is set across multiple devices
// def model = state.bulbs[getId(childDevice)]?.modelid // def model = state.bulbs[getId(childDevice)]?.modelid
// value.xy = calculateXY(huesettings.hex, model) // value.xy = calculateXY(huesettings.hex, model)
@@ -1663,7 +1663,7 @@ private boolean checkPointInLampsReach(p, colorPoints) {
} }
/** /**
* Converts an RGB color in hex to HSV. * Converts an RGB color in hex to HSV/HSB.
* Algorithm based on http://en.wikipedia.org/wiki/HSV_color_space. * Algorithm based on http://en.wikipedia.org/wiki/HSV_color_space.
* *
* @param colorStr color value in hex (#ff03d3) * @param colorStr color value in hex (#ff03d3)
@@ -1673,32 +1673,32 @@ private boolean checkPointInLampsReach(p, colorPoints) {
def hexToHsv(colorStr){ def hexToHsv(colorStr){
def r = Integer.valueOf( colorStr.substring( 1, 3 ), 16 ) / 255 def r = Integer.valueOf( colorStr.substring( 1, 3 ), 16 ) / 255
def g = Integer.valueOf( colorStr.substring( 3, 5 ), 16 ) / 255 def g = Integer.valueOf( colorStr.substring( 3, 5 ), 16 ) / 255
def b = Integer.valueOf( colorStr.substring( 5, 7 ), 16 ) / 255; def b = Integer.valueOf( colorStr.substring( 5, 7 ), 16 ) / 255
def max = Math.max(Math.max(r, g), b) def max = Math.max(Math.max(r, g), b)
def min = Math.min(Math.min(r, g), b) def min = Math.min(Math.min(r, g), b)
def h, s, v = max; def h, s, v = max
def d = max - min; def d = max - min
s = max == 0 ? 0 : d / max; s = max == 0 ? 0 : d / max
if(max == min){ if(max == min){
h = 0; h = 0
}else{ }else{
switch(max){ switch(max){
case r: h = (g - b) / d + (g < b ? 6 : 0); break; case r: h = (g - b) / d + (g < b ? 6 : 0); break
case g: h = (b - r) / d + 2; break; case g: h = (b - r) / d + 2; break
case b: h = (r - g) / d + 4; break; case b: h = (r - g) / d + 4; break
} }
h /= 6; h /= 6;
} }
return [(h * 100).round(), (s * 100).round(), (v * 100).round()]; return [Math.round(h * 100), Math.round(s * 100), Math.round(v * 100)]
} }
/** /**
* Converts HSV color to RGB in hex. * Converts HSV/HSB color to RGB in hex.
* Algorithm based on http://en.wikipedia.org/wiki/HSV_color_space. * Algorithm based on http://en.wikipedia.org/wiki/HSV_color_space.
* *
* @param hue hue 0-100 * @param hue hue 0-100
@@ -1713,11 +1713,11 @@ def hsvToHex(hue, sat, value = 100){
def s = sat / 100 def s = sat / 100
def v = value / 100 def v = value / 100
def i = Math.floor(h * 6); def i = Math.floor(h * 6)
def f = h * 6 - i; def f = h * 6 - i
def p = v * (1 - s); def p = v * (1 - s)
def q = v * (1 - f * s); def q = v * (1 - f * s)
def t = v * (1 - (1 - f) * s); def t = v * (1 - (1 - f) * s)
switch (i % 6) { switch (i % 6) {
case 0: case 0:
@@ -1753,9 +1753,9 @@ def hsvToHex(hue, sat, value = 100){
} }
// Converting float components to int components. // Converting float components to int components.
def r1 = String.format("%02X", (int) (r * 255.0f)); def r1 = String.format("%02X", (int) (r * 255.0f))
def g1 = String.format("%02X", (int) (g * 255.0f)); def g1 = String.format("%02X", (int) (g * 255.0f))
def b1 = String.format("%02X", (int) (b * 255.0f)); def b1 = String.format("%02X", (int) (b * 255.0f))
return "#$r1$g1$b1" return "#$r1$g1$b1"
} }