X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=blobdiff_plain;f=ColorControl%2FColorControls.groovy;h=5eb237bec7fcec7482bc42751373d05c1676885d;hp=5262e91b64b9c9fa69a0dcf87b3041d94f3ec9eb;hb=b30c5b2dd2567206e9b19313610fbd104ebdb373;hpb=21d738a5813bcb99b370ad3559584cfd8d219f6b

diff --git a/ColorControl/ColorControls.groovy b/ColorControl/ColorControls.groovy
index 5262e91..5eb237b 100644
--- a/ColorControl/ColorControls.groovy
+++ b/ColorControl/ColorControls.groovy
@@ -2,9 +2,6 @@
 package ColorControl
 import Timer.SimulatedTimer
 
-//JPF's Verify API
-import gov.nasa.jpf.vm.Verify
-
 public class ColorControls {
 	private int deviceNumbers
 	private List colorControls
@@ -14,32 +11,45 @@ public class ColorControls {
 	private String id = "colorControlID0"
 	private String label = "colorControl0"
 	private String displayName = "colorControl0"
-	private String color = "red"
-	private String currentSwitch = "off"
+	private String color = "Red"
+	private String currentColor = "Red"
+	private String currentSwitch = "on"
 	private int level = 50
+	private int currentLevel = 50
 	private int hue = 50
+	private int currentHue = 50
 	private int saturation = 50
+	private int currentSaturation = 50
 	private int colorTemperature = 15000
+	private boolean colorChanged = false
 	
 
-	ColorControls(Closure sendEvent, int deviceNumbers) {
+	ColorControls(Closure sendEvent, int deviceNumbers, boolean init) {
 		this.sendEvent = sendEvent
 		this.deviceNumbers = deviceNumbers
 		this.colorControls = []
 
-		/*def initHue = Verify.getIntFromList(30, 50, 70)
-		this.hue = initHue
-		def initSat = Verify.getIntFromList(40, 50, 60)
-		this.saturation = initSat
-		def init = Verify.getInt(0,2)
-		if (init == 0) {
-			this.color = "red"
-		} else if (init == 1) {
-			this.color = "green"
+		if (init) {
+			this.level = 20
+			this.currentLevel = 20
+			this.hue = 30
+			this.currentHue = 30
+			this.saturation = 40
+			this.currentSaturation = 40
+			this.colorTemperature = 10000
+			this.color = "Red"
+			this.currentSwitch = "off"
 		} else {
-			this.color = "blue"
-		}*/
-
+			this.level = 50
+			this.currentLevel = 50
+			this.hue = 50
+			this.currentHue = 50
+			this.saturation = 50
+			this.currentSaturation = 50
+			this.colorTemperature = 15000
+			this.color = "Blue"
+			this.currentSwitch = "on"
+		}
 		colorControls.add(new ColorControl(sendEvent, id, label, displayName, this.color, this.hue, this.saturation, this.level, this.currentSwitch, this.colorTemperature))
 	}
 
@@ -67,6 +77,7 @@ public class ColorControls {
 	def setValue(LinkedHashMap eventDataMap) {
 		if (eventDataMap["name"] == "color") {
 			if (eventDataMap["value"] != colorControls[0].color) {
+				this.currentColor = eventDataMap["value"]
 				this.color = eventDataMap["value"]
 				colorControls[0].setValue(eventDataMap["value"], "color")
 				sendEvent(eventDataMap)
@@ -74,12 +85,14 @@ public class ColorControls {
 		} else if (eventDataMap["name"] == "hue") {
 			if (eventDataMap["value"].toInteger() != colorControls[0].hue) {
 				this.hue = eventDataMap["value"].toInteger()
+				this.currentHue = eventDataMap["value"].toInteger()
 				colorControls[0].setValue(eventDataMap["value"], "hue")
 				sendEvent(eventDataMap)
 			}
 		} else if (eventDataMap["name"] == "saturation") {
 			if (eventDataMap["value"].toInteger() != colorControls[0].saturation) {
 				this.saturation = eventDataMap["value"].toInteger()
+				this.currentSaturation = eventDataMap["value"].toInteger()
 				colorControls[0].setValue(eventDataMap["value"], "saturation")
 				sendEvent(eventDataMap)
 			}
@@ -97,6 +110,7 @@ public class ColorControls {
 			}
 		} else if (eventDataMap["name"] == "level") {
 			if (eventDataMap["value"].toInteger() != colorControls[0].level) {
+				this.currentLevel = eventDataMap["value"].toInteger() 
 				this.level = eventDataMap["value"].toInteger()
 				colorControls[0].setValue(eventDataMap["value"], "level")
 				sendEvent(eventDataMap)
@@ -106,8 +120,62 @@ public class ColorControls {
 
 
 	//methods
+	def setColor(LinkedHashMap metaData) {
+		def hexColor = metaData.hex
+		def newColor
+		switch (hexColor) {
+			case "#0000FF":
+				newColor = "Blue"
+				break;
+			case "#00FF00":
+				newColor = "Green"
+				break;
+			case "#FFFF00":
+				newColor = "Yellow"
+				break;
+			case "#FF6000":
+				newColor = "Orange"
+				break;
+			case "#BF7FBF":
+				newColor = "Purple"
+				break;
+			case "#FF5F5F":
+				newColor = "Pink"
+				break;
+			case "#FF0000":
+				newColor = "Red"
+				break;
+			default:
+				newColor = "Blue"
+				break;
+		}
+		if (newColor != this.color) {
+			this.currentColor = newColor
+			this.color = newColor
+			colorControls[0].setColor(newColor)
+			if (this.colorChanged) {
+				this.colorChanged = false
+			} else {
+				this.colorChanged = true
+			}
+		}
+		def newLevel = metaData.level
+		def newHue = metaData.hue
+		def newSaturation = metaData.saturation
+		if (newLevel != null) {
+			setLevel(newLevel)
+		}
+		if (newHue != null) {
+			setHue(newHue)
+		}
+		if (newSaturation != null) {
+			setSaturation(newSaturation)
+		}
+	}
+
 	def setColor(String color) {
 		if (color != this.color) {
+			this.currentColor = color
 			this.color = color
 			colorControls[0].setColor(color)			
 		}
@@ -115,13 +183,23 @@ public class ColorControls {
 
 	def setHue(int hue) {
 		if (hue != this.hue) {
-			this.hue = hue	
+			this.hue = hue
+			this.currentHue = hue
+			colorControls[0].setHue(hue)
+		}
+	}
+	
+	def setHue(double hue) {
+		if (hue != this.hue) {
+			this.hue = hue
+			this.currentHue = hue
 			colorControls[0].setHue(hue)
 		}
 	}
 
 	def setSaturation(int saturation) {
 		if (saturation != this.saturation) {
+			this.currentSaturation = saturation
 			this.saturation = saturation
 			colorControls[0].setSaturation(saturation)			
 		}	
@@ -129,29 +207,45 @@ public class ColorControls {
 
 	def setLevel(int level) {
 		if (level != this.level) {
+			this.currentLevel = level
+			this.level = level
+			colorControls[0].setLevel(level)
+		}
+	}
+
+	def setLevel(long level) {
+		if (level != this.level) {
+			this.currentLevel = level
 			this.level = level
 			colorControls[0].setLevel(level)
 		}
 	}
 
-	def setColorTemperature(String colorTemperature) {
+	def setColorTemperature(int colorTemperature) {
+		if (colorTemperature != this.colorTemperature) {
+			this.colorTemperature = colorTemperature
+			colorControls[0].setColorTemperature(colorTemperature)			
+		}
+	}
+
+	def setColorTemperature(long colorTemperature) {
 		if (colorTemperature != this.colorTemperature) {
 			this.colorTemperature = colorTemperature
 			colorControls[0].setColorTemperature(colorTemperature)			
 		}
 	}
 
-	def on(String currentSwitch) {
-		if (currentSwitch != this.currentSwitch) {
-			this.currentSwitch = currentSwitch
-			colorControls[0].on(currentSwitch)			
+	def on() {
+		if (this.currentSwitch != "on") {
+			this.currentSwitch = "on"
+			colorControls[0].on()			
 		}
 	}
 
-	def off(String currentSwitch) {
-		if (currentSwitch != this.currentSwitch) {
-			this.currentSwitch = currentSwitch
-			colorControls[0].off(currentSwitch)			
+	def off() {
+		if (this.currentSwitch != "off") {
+			this.currentSwitch = "off"
+			colorControls[0].off()
 		}
 	}