Checking device handlers.

[smartthings-infrastructure.git] / TemperatureMeasurement / TemperatureMeasurements.groovy

diff --git a/TemperatureMeasurement/TemperatureMeasurements.groovy b/TemperatureMeasurement/TemperatureMeasurements.groovy
index 20d1f5af01bd44c3dd2259eff76a0a8e044edd86..608d18b1dc88df40cdd5690b6d8771eb1324a509 100644 (file)
--- a/TemperatureMeasurement/TemperatureMeasurements.groovy
+++ b/TemperatureMeasurement/TemperatureMeasurements.groovy
@@ -14,21 +14,21 @@ public class TemperatureMeasurements {
        private String id = "temperatureMeasurementID0"
        private String label = "temperatureMeasurement0"
        private String displayName = "temperatureMeasurement0"
-       private int temperature = 50
-<<<<<<< HEAD
-       private int currentTemperature = 50
+       private int temperature = 40
+       private int currentTemperature = 40
 
-=======
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
-       
-       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))
        }
 
@@ -42,6 +42,10 @@ public class TemperatureMeasurements {
                }
        }
 
+       def eventsSince(Date dateObj) {
+               return temperatureMeasurements[0].eventsSince()
+       }
+
        //Methods for closures
        def count(Closure Input) {
                temperatureMeasurements.count(Input)