X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=RelativeHumidityMeasurement%2FRelativeHumidityMeasurements.groovy;h=d4f13e0d2869589d7d2c71becdfb637725eb2382;hb=f04c0d554014884a077470b372be0e0c7d3398fe;hp=7bee67627e85557eb190e36908c7c0001747396d;hpb=de35dfa319418baf7ba4bc2eeb4dbfc0fd20230a;p=smartthings-infrastructure.git

diff --git a/RelativeHumidityMeasurement/RelativeHumidityMeasurements.groovy b/RelativeHumidityMeasurement/RelativeHumidityMeasurements.groovy
index 7bee676..d4f13e0 100644
--- a/RelativeHumidityMeasurement/RelativeHumidityMeasurements.groovy
+++ b/RelativeHumidityMeasurement/RelativeHumidityMeasurements.groovy
@@ -18,14 +18,18 @@ public class RelativeHumidityMeasurements {
 	private int currentHumidity = 50
 
 		
-	RelativeHumidityMeasurements(Closure sendEvent, int deviceNumbers) {
+	RelativeHumidityMeasurements(Closure sendEvent, int deviceNumbers, boolean init) {
 		this.sendEvent = sendEvent		
 		this.deviceNumbers = deviceNumbers
 		this.humidityMeasurements = []
 
-		//def init = Verify.getIntFromList(30, 50, 70)
-		//this.humidity = init
-
+		if (init) {
+			this.humidity = 50
+			this.currentHumidity = 50
+		} else {
+			this.humidity = 60
+			this.currentHumidity = 60
+		}
 		humidityMeasurements.add(new RelativeHumidityMeasurement(id, label, displayName, this.humidity))
 	}
 
@@ -39,6 +43,10 @@ public class RelativeHumidityMeasurements {
 		}
 	}
 
+	def eventsSince(Date dateObj) {
+		return humidityMeasurements[0].eventsSince()
+	}
+
 	//Methods for closures
 	def count(Closure Input) {
 		humidityMeasurements.count(Input)