X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=ColorControl%2FColorControls.groovy;h=adac0b8e82c12980af1ab7e684e456dabbb420ef;hb=d0b538d93e64c63d2673796db08570953b57f947;hp=a2c93de0049933825c71eb151b9b857806f20588;hpb=2932def9bb947d617975235763f7338360f0e5a4;p=smartthings-infrastructure.git

diff --git a/ColorControl/ColorControls.groovy b/ColorControl/ColorControls.groovy
index a2c93de..adac0b8 100644
--- a/ColorControl/ColorControls.groovy
+++ b/ColorControl/ColorControls.groovy
@@ -1,271 +1,85 @@
 //Create a class for color control
 package ColorControl
-import Timer.SimulatedTimer
+import SmartThing.SmartThings
 
-public class ColorControls {
-	private int deviceNumbers
-	private List colorControls
-	def sendEvent
-
-	//For one device(We cannot have obj.id)-> We should have obj[0].id
-	private String id = "colorControlID0"
-	private String label = "colorControl0"
-	private String displayName = "colorControl0"
-	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
+public class ColorControls extends SmartThings {
+	List colorControls = new ArrayList()
 	
-
-	ColorControls(Closure sendEvent, int deviceNumbers, boolean init) {
-		this.sendEvent = sendEvent
-		this.deviceNumbers = deviceNumbers
-		this.colorControls = []
+	ColorControls(Closure sendEvent, boolean init) {
+		// Only initialize one time since we only have one device for each capability
+		colorControls = smartThings
+
+		// Initialization
+		StringBuilder id = new StringBuilder("colorControlID0")
+		StringBuilder label = new StringBuilder("colorControl")
+		StringBuilder displayName = new StringBuilder("colorControl0")
+		StringBuilder color = new StringBuilder()
+		MutableInteger hue = new MutableInteger()
+		MutableInteger saturation = new MutableInteger()
 
 		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 = "on"
-		} else {
-			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 = "off"
+			color.append("Red")
+			hue.setValue(30)
+			saturation.setValue(40)
+		} else {		
+			color.append("Blue")
+			hue.setValue(50)
+			saturation.setValue(50)
 		}
-		colorControls.add(new ColorControl(sendEvent, id, label, displayName, this.color, this.hue, this.saturation, this.level, this.currentSwitch, this.colorTemperature))
-	}
 
-	//Methods for closures
-	def count(Closure Input) {
-		colorControls.count(Input)
-	}
-	def size() {
-		colorControls.size()
-	}
-	def each(Closure Input) {
-		colorControls.each(Input)
-	}
-	def find(Closure Input) {
-		colorControls.find(Input)
-	}
-	def sort(Closure Input) {
-		colorControls.sort(Input)
-	}
-	def collect(Closure Input) {
-		colorControls.collect(Input)
+		colorControls.add(new ColorControl(sendEvent, id, label, displayName, color, hue,
+						   saturation))
 	}
 
-	//By model checker
-	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)
-			}	
-		} 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)
-			}
-		} else if (eventDataMap["name"] == "switch") {
-			if (eventDataMap["value"] != colorControls[0].currentSwitch) {
-				this.currentSwitch = eventDataMap["value"]
-				colorControls[0].setValue(eventDataMap["value"], "switch")
-				sendEvent(eventDataMap)
-			}
-		} else if (eventDataMap["name"] == "colorTemperature") {
-			if (eventDataMap["value"].toInteger() != colorControls[0].colorTemperature) {
-				this.colorTemperature = eventDataMap["value"].toInteger()
-				colorControls[0].setValue(eventDataMap["value"], "colorTemperature")
-				sendEvent(eventDataMap)
-			}
-		} 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)
-			}
-		}
-	}
-
-
-	//methods
+	// Methods to set values
 	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)
-		}
+		colorControls[0].setColor(metaData)
 	}
 
 	def setColor(String color) {
-		if (color != this.color) {
-			this.currentColor = color
-			this.color = color
-			colorControls[0].setColor(color)			
-		}
+		colorControls[0].setColor(color)
 	}
 
 	def setHue(int hue) {
-		if (hue != this.hue) {
-			this.hue = hue
-			this.currentHue = hue
-			colorControls[0].setHue(hue)
-		}
+		colorControls[0].setHue(hue)
 	}
 	
 	def setHue(double hue) {
-		if (hue != this.hue) {
-			this.hue = hue
-			this.currentHue = hue
-			colorControls[0].setHue((int) hue)
-		}
+		colorControls[0].setHue((int) hue)
 	}
 
 	def setSaturation(int saturation) {
-		if (saturation != this.saturation) {
-			this.currentSaturation = saturation
-			this.saturation = saturation
-			colorControls[0].setSaturation(saturation)			
-		}	
+		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) {
-			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(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)			
-		}
+		colorControls[0].setSaturation((int) saturation)
 	}
 
 	def on() {
-		if (this.currentSwitch != "on") {
-			this.currentSwitch = "on"
-			colorControls[0].on()			
-		}
+		colorControls[0].on()
 	}
 
 	def off() {
-		if (this.currentSwitch != "off") {
-			this.currentSwitch = "off"
-			colorControls[0].off()
-		}
+		colorControls[0].off()
 	}
 
-	def currentValue(String deviceFeature) {
-		colorControls[0].currentValue(deviceFeature)
+	// Methods to return values
+	def getCurrentHue() {
+		List tmpValues = new ArrayList()
+		tmpValues.add(colorControls[0].getCurrentHue())
+		return tmpValues
 	}
 
-	def latestValue(String deviceFeature) {
-		colorControls[0].latestValue(deviceFeature)
-	}	
-
-	def getAt(int ix) {
-		colorControls[ix]
+	def getCurrentSaturation() {
+		List tmpValues = new ArrayList()
+		tmpValues.add(colorControls[0].getCurrentSaturation())
+		return tmpValues
+	}
+	
+	def getCurrentColor() {
+		List tmpValues = new ArrayList()
+		tmpValues.add(colorControls[0].getCurrentColor())
+		return tmpValues
 	}
 }