X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=TemperatureMeasurement%2FTemperatureMeasurements.groovy;h=608d18b1dc88df40cdd5690b6d8771eb1324a509;hb=47a60f9140ddae0ad03dde9f2ecca3666a315546;hp=31ba842155c964f2da0b8140c6ffe03863ba9924;hpb=9a9f34091fe2231e5f0010987ac3a24800aaae78;p=smartthings-infrastructure.git

diff --git a/TemperatureMeasurement/TemperatureMeasurements.groovy b/TemperatureMeasurement/TemperatureMeasurements.groovy
index 31ba842..608d18b 100644
--- a/TemperatureMeasurement/TemperatureMeasurements.groovy
+++ b/TemperatureMeasurement/TemperatureMeasurements.groovy
@@ -14,17 +14,21 @@ public class TemperatureMeasurements {
 	private String id = "temperatureMeasurementID0"
 	private String label = "temperatureMeasurement0"
 	private String displayName = "temperatureMeasurement0"
-	private int temperature = 50
-	private int currentTemperature = 50
+	private int temperature = 40
+	private int currentTemperature = 40
 
-	TemperatureMeasurements(Closure sendEvent, int deviceNumbers) {
+	TemperatureMeasurements(Closure sendEvent, int deviceNumbers, boolean init) {
 		this.sendEvent = sendEvent		
 		this.deviceNumbers = deviceNumbers
 		this.temperatureMeasurements = []
 
-		//def initTemp = Verify.getIntFromList(30, 50, 70)
-		//this.temperature = initTemp
-	
+		if (init) {
+			this.temperature = 40
+			this.currentTemperature = 40
+		} else {
+			this.temperature = 60
+			this.currentTemperature = 60
+		}	
 		temperatureMeasurements.add(new TemperatureMeasurement(id, label, displayName, this.temperature))
 	}
 
@@ -38,6 +42,10 @@ public class TemperatureMeasurements {
 		}
 	}
 
+	def eventsSince(Date dateObj) {
+		return temperatureMeasurements[0].eventsSince()
+	}
+
 	//Methods for closures
 	def count(Closure Input) {
 		temperatureMeasurements.count(Input)