X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=ColorControl%2FColorControls.groovy;h=a2c93de0049933825c71eb151b9b857806f20588;hb=4e6463b38690279fa3ea38f4d8ef09827d8d6b09;hp=5eb237bec7fcec7482bc42751373d05c1676885d;hpb=b30c5b2dd2567206e9b19313610fbd104ebdb373;p=smartthings-infrastructure.git

diff --git a/ColorControl/ColorControls.groovy b/ColorControl/ColorControls.groovy
index 5eb237b..a2c93de 100644
--- a/ColorControl/ColorControls.groovy
+++ b/ColorControl/ColorControls.groovy
@@ -38,7 +38,7 @@ public class ColorControls {
 			this.currentSaturation = 40
 			this.colorTemperature = 10000
 			this.color = "Red"
-			this.currentSwitch = "off"
+			this.currentSwitch = "on"
 		} else {
 			this.level = 50
 			this.currentLevel = 50
@@ -48,7 +48,7 @@ public class ColorControls {
 			this.currentSaturation = 50
 			this.colorTemperature = 15000
 			this.color = "Blue"
-			this.currentSwitch = "on"
+			this.currentSwitch = "off"
 		}
 		colorControls.add(new ColorControl(sendEvent, id, label, displayName, this.color, this.hue, this.saturation, this.level, this.currentSwitch, this.colorTemperature))
 	}
@@ -193,7 +193,7 @@ public class ColorControls {
 		if (hue != this.hue) {
 			this.hue = hue
 			this.currentHue = hue
-			colorControls[0].setHue(hue)
+			colorControls[0].setHue((int) hue)
 		}
 	}
 
@@ -204,6 +204,14 @@ public class ColorControls {
 			colorControls[0].setSaturation(saturation)			
 		}	
 	}
+	
+	def setSaturation(double saturation) {
+		if (saturation != this.saturation) {
+			this.currentSaturation = saturation
+			this.saturation = saturation
+			colorControls[0].setSaturation(saturation)			
+		}	
+	}
 
 	def setLevel(int level) {
 		if (level != this.level) {