Pulled updates from current running code

Hue SmartApps and Devices/zp_hue_bulb_device.groovy

@@ -122,7 +122,7 @@ def off(transitiontime)
 }
 
 def poll() {
-	parent.poll(this)
+	parent.poll()
 }
 
 def nextLevel() {
@@ -139,10 +139,16 @@ def nextLevel() {
 def setLevel(percent) 
 {
 	def transitiontime = 4
+	if(device.latestValue("level") as Integer == 0)
+    (
+    	transitiontime = 0
+    )
+
 	log.debug "Executing 'setLevel'"
 	parent.setLevel(this, percent, transitiontime)
 	sendEvent(name: "level", value: percent)
 	sendEvent(name: "transitiontime", value: transitiontime)
+    sendEvent(name: "switch", value: "on")
 
 }
 def setLevel(percent, transitiontime) 
@@ -188,6 +194,7 @@ def setHue(percent, transitiontime)
 
 def setColor(value) {
 	log.debug "setColor: ${value}"
+    def isOff = false
 
 	// TODO: convert hue and saturation to hex and just send a color event
 	if(value.transitiontime)
@@ -213,12 +220,24 @@ def setColor(value) {
 	{
 		sendEvent(name: "level", value: value.level)
 	}
+    else
+    {
+    	// sendEvent(name: "level", value: 1)
+        value.level = 1
+        value.transitiontime = 0
+        isOff = true
+    }
 	if (value.switch) 
 	{
 		sendEvent(name: "switch", value: value.switch)
 	}
 
 	parent.setColor(this, value)
+    if (isOff) 
+    {
+    	parent.off(this, 0)
+    }
+
 }
 
 def setAdjustedColor(value) {

Hue SmartApps and Devices/zp_hue_group_device.groovy

@@ -54,9 +54,14 @@ metadata {
 	valueTile("transitiontime", "device.transitiontime", inactiveLabel: false, decoration: "flat") {
 		state "transitiontime", label: 'Transitiontime ${currentValue}   '
 	}
+    valueTile("color", "device.color", inactiveLabel: false, decoration: "flat") {
+		state "color", label: 'color ${currentValue}   '
+	}
+
+
 
 	main(["switch"])
-	details(["switch", "levelSliderControl", "rgbSelector", "refresh","transitiontime"])
+	details(["switch", "levelSliderControl", "rgbSelector", "refresh","transitiontime","color","saturation","level","hue"])
 
 }
 
@@ -121,7 +126,7 @@ def off(transitiontime)
 }
 
 def poll() {
-	parent.poll(this)
+	parent.poll()
 }
 
 def nextLevel() {
@@ -188,7 +193,7 @@ def setHue(percent, transitiontime)
 def setColor(value) {
 	log.debug "setColor: ${value}"
 
-	// TODO: convert hue and saturation to hex and just send a color event
+
 	if(value.transitiontime)
 	{
 		sendEvent(name: "transitiontime", value: value.transitiontime)
@@ -201,13 +206,18 @@ def setColor(value) {
 	if (value.hex) 
 	{
 		sendEvent(name: "color", value: value.hex)
+
 	} 
 	else if (value.hue && value.saturation) 
 	{
 		def hex = colorUtil.hslToHex(value.hue, value.saturation)
 		sendEvent(name: "color", value: hex)
 	}
-
+    if (value.hue && value.saturation) 
+	{
+		sendEvent(name: "saturation", value:  value.saturation)
+        sendEvent(name: "hue", value:  value.hue)
+	}
 	if (value.level) 
 	{
 		sendEvent(name: "level", value: value.level)
@@ -233,7 +243,7 @@ def save() {
 
 def refresh() {
 	log.debug "Executing 'refresh'"
-	parent.poll(this)
+	parent.poll()
 }
 
 def adjustOutgoingHue(percent) {
@@ -257,3 +267,4 @@ def adjustOutgoingHue(percent) {
 
 
 
+