Merge pull request #690 from larsfinander/DVCSMP-1615-Improve-Hue-error-handling

DVCSMP-1615 Hue setColor throws exceptions when missing parameters

devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy

@@ -103,62 +103,104 @@ void nextLevel() {
 }
 
 void setLevel(percent) {
-	log.debug "Executing 'setLevel'"
+    log.debug "Executing 'setLevel'"
-	parent.setLevel(this, percent)
+    if (verifyPercent(percent)) {
-	sendEvent(name: "level", value: percent, descriptionText: "Level has changed to ${percent}%")
+        parent.setLevel(this, percent)
+        sendEvent(name: "level", value: percent, descriptionText: "Level has changed to ${percent}%")
+        sendEvent(name: "switch", value: "on")
+    }
 }
 
 void setSaturation(percent) {
-	log.debug "Executing 'setSaturation'"
+    log.debug "Executing 'setSaturation'"
-	parent.setSaturation(this, percent)
+    if (verifyPercent(percent)) {
-	sendEvent(name: "saturation", value: percent, displayed: false)
+        parent.setSaturation(this, percent)
+        sendEvent(name: "saturation", value: percent, displayed: false)
+    }
 }
 
 void setHue(percent) {
-	log.debug "Executing 'setHue'"
+    log.debug "Executing 'setHue'"
-	parent.setHue(this, percent)
+    if (verifyPercent(percent)) {
-	sendEvent(name: "hue", value: percent, displayed: false)
+        parent.setHue(this, percent)
+        sendEvent(name: "hue", value: percent, displayed: false)
+    }
 }
 
 void setColor(value) {
-	log.debug "setColor: ${value}, $this"
+    log.debug "setColor: ${value}, $this"
-	parent.setColor(this, value)
+    def events = []
-	if (value.hue) { sendEvent(name: "hue", value: value.hue, displayed: false)}
+    def validValues = [:]
-	if (value.saturation) { sendEvent(name: "saturation", value: value.saturation, displayed: false)}
+
-	if (value.hex) { sendEvent(name: "color", value: value.hex)}
+    if (verifyPercent(value.hue)) {
-	if (value.level) { sendEvent(name: "level", value: value.level, descriptionText: "Level has changed to ${value.level}%")}
+        events << createEvent(name: "hue", value: value.hue, displayed: false)
-	sendEvent(name: "switch", value: "on")
+        validValues.hue = value.hue
+    }
+    if (verifyPercent(value.saturation)) {
+        events << createEvent(name: "saturation", value: value.saturation, displayed: false)
+        validValues.saturation = value.saturation
+    }
+    if (value.hex != null) {
+        if (value.hex ==~ /^\#([A-Fa-f0-9]){6}$/) {
+            events << createEvent(name: "color", value: value.hex)
+            validValues.hex = value.hex
+        } else {
+            log.warn "$value.hex is not a valid color"
+        }
+    }
+    if (verifyPercent(value.level)) {
+        events << createEvent(name: "level", value: value.level, descriptionText: "Level has changed to ${value.level}%")
+        validValues.level = value.level
+    }
+    if (value.switch == "off" || (value.level != null && value.level <= 0)) {
+        events << createEvent(name: "switch", value: "off")
+        validValues.switch = "off"
+    } else {
+        events << createEvent(name: "switch", value: "on")
+        validValues.switch = "on"
+    }
+    if (!events.isEmpty()) {
+        parent.setColor(this, validValues)
+    }
+    events.each {
+        sendEvent(it)
+    }
 }
 
 void reset() {
-	log.debug "Executing 'reset'"
+    log.debug "Executing 'reset'"
     def value = [level:100, saturation:56, hue:23]
     setAdjustedColor(value)
-	parent.poll()
+    parent.poll()
 }
 
 void setAdjustedColor(value) {
-	if (value) {
+    if (value) {
         log.trace "setAdjustedColor: ${value}"
         def adjusted = value + [:]
         adjusted.hue = adjustOutgoingHue(value.hue)
         // Needed because color picker always sends 100
         adjusted.level = null
         setColor(adjusted)
+    } else {
+        log.warn "Invalid color input"
     }
 }
 
 void setColorTemperature(value) {
-	if (value) {
+    if (value) {
         log.trace "setColorTemperature: ${value}k"
         parent.setColorTemperature(this, value)
         sendEvent(name: "colorTemperature", value: value)
-	}
+        sendEvent(name: "switch", value: "on")
+    } else {
+        log.warn "Invalid color temperature"
+    }
 }
 
 void refresh() {
-	log.debug "Executing 'refresh'"
+    log.debug "Executing 'refresh'"
-	parent.manualRefresh()
+    parent.manualRefresh()
 }
 
 def adjustOutgoingHue(percent) {
@@ -177,3 +219,14 @@ def adjustOutgoingHue(percent) {
 	log.info "percent: $percent, adjusted: $adjusted"
 	adjusted
 }
+
+def verifyPercent(percent) {
+    if (percent == null)
+        return false
+    else if (percent >= 0 && percent <= 100) {
+        return true
+    } else {
+        log.warn "$percent is not 0-100"
+        return false
+    }
+}

devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy

@@ -79,8 +79,12 @@ void off() {
 
 void setLevel(percent) {
 	log.debug "Executing 'setLevel'"
-	parent.setLevel(this, percent)
+    if (percent != null && percent >= 0 && percent <= 100) {
-	sendEvent(name: "level", value: percent)
+		parent.setLevel(this, percent)
+		sendEvent(name: "level", value: percent)
+	} else {
+    	log.warn "$percent is not 0-100"
+    }
 }
 
 void refresh() {

smartapps/smartthings/hue-connect.src/hue-connect.groovy

@@ -657,39 +657,53 @@ def setColorTemperature(childDevice, huesettings) {
 }
 
 def setColor(childDevice, huesettings) {
-	log.debug "Executing 'setColor($huesettings)'"
+    log.debug "Executing 'setColor($huesettings)'"
+    
+    def value = [:]
     def hue = null
     def sat = null
     def xy = null
-    if (huesettings.hex) {
+    
-    	xy = getHextoXY(huesettings.hex)
+    if (huesettings.hex != null) {
-    } else if (huesettings.hue && huesettings.saturation) {
+        value.xy = getHextoXY(huesettings.hex)
-		hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535)
+    } else {
-		sat = Math.min(Math.round(huesettings.saturation * 255 / 100), 255)
+        if (huesettings.hue != null)
+            value.hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535)
+        if (huesettings.saturation != null)   
+            value.sat = Math.min(Math.round(huesettings.saturation * 255 / 100), 255)
     }
-    def alert = huesettings.alert ? huesettings.alert : "none"
-    def transition = huesettings.transition ? huesettings.transition : 4
     
-	def value = [xy: xy, sat: sat, hue: hue, alert: alert, transitiontime: transition, on: true]
+    // Default behavior is to turn light on 
+    value.on = true
 
-	if (huesettings.level != null) {
+    if (huesettings.level != null) {
-        if (huesettings.level == 1) value.bri = 1 else value.bri = Math.min(Math.round(huesettings.level * 255 / 100), 255)
+        if (huesettings.level <= 0)
-		value.on = value.bri > 0
+            value.on = false
-	}
+        else if (huesettings.level == 1)
+            value.bri = 1
+        else 
+            value.bri = Math.min(Math.round(huesettings.level * 255 / 100), 255)
+    }
+    value.alert = huesettings.alert ? huesettings.alert : "none"
+    value.transition = huesettings.transition ? huesettings.transition : 4
 
-	log.debug "sending command $value"
+    // Make sure to turn off light if requested
-	put("lights/${getId(childDevice)}/state", value)
+    if (huesettings.switch == "off")
+        value.on = false
+
+    log.debug "sending command $value"
+    put("lights/${getId(childDevice)}/state", value)
+    return "Color set to $value"
 }
 
 def nextLevel(childDevice) {
-	def level = device.latestValue("level") as Integer ?: 0
+    def level = device.latestValue("level") as Integer ?: 0
-	if (level < 100) {
+    if (level < 100) {
-		level = Math.min(25 * (Math.round(level / 25) + 1), 100) as Integer
+        level = Math.min(25 * (Math.round(level / 25) + 1), 100) as Integer
-	}
+    } else {
-	else {
+        level = 25
-		level = 25
+    }
-	}
+    setLevel(childDevice,level)
-	setLevel(childDevice,level)
 }
 
 private getId(childDevice) {
@@ -788,16 +802,14 @@ private getHextoXY(String colorStr) {
 
     // Make green more vivid
     if (normalizedToOne[1] > 0.04045) {
-        green = (float) Math.pow((normalizedToOne[1] + 0.055)
+        green = (float) Math.pow((normalizedToOne[1] + 0.055) / (1.0 + 0.055), 2.4);
-                / (1.0 + 0.055), 2.4);
     } else {
         green = (float) (normalizedToOne[1] / 12.92);
     }
 
     // Make blue more vivid
     if (normalizedToOne[2] > 0.04045) {
-        blue = (float) Math.pow((normalizedToOne[2] + 0.055)
+        blue = (float) Math.pow((normalizedToOne[2] + 0.055) / (1.0 + 0.055), 2.4);
-                / (1.0 + 0.055), 2.4);
     } else {
         blue = (float) (normalizedToOne[2] / 12.92);
     }
@@ -806,8 +818,8 @@ private getHextoXY(String colorStr) {
     float Y = (float) (red * 0.234327 + green * 0.743075 + blue * 0.022598);
     float Z = (float) (red * 0.0000000 + green * 0.053077 + blue * 1.035763);
 
-    float x = X / (X + Y + Z);
+    float x = (X != 0 ? X / (X + Y + Z) : 0);
-    float y = Y / (X + Y + Z);
+    float y = (Y != 0 ? Y / (X + Y + Z) : 0);
 
     double[] xy = new double[2];
     xy[0] = x;