Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

[smartthings-infrastructure.git] / AccelerationSensor / AccelerationSensors.groovy

diff --git a/AccelerationSensor/AccelerationSensors.groovy b/AccelerationSensor/AccelerationSensors.groovy
index db90c564479fd7d837faeb91818dfd4822582c45..bf24508f6eaa6d0064a55864d42123d79b1564f2 100644 (file)
--- a/AccelerationSensor/AccelerationSensors.groovy
+++ b/AccelerationSensor/AccelerationSensors.groovy
@@ -17,6 +17,7 @@ public class AccelerationSensors {
        private String acceleration = "inactive"
        private String currentAcceleration = "inactive"
        private String accelerationLatestValue = "inactive"
        private String acceleration = "inactive"
        private String currentAcceleration = "inactive"
        private String accelerationLatestValue = "inactive"

+       

 
                
        AccelerationSensors(Closure sendEvent, int deviceNumbers) {
 
                
        AccelerationSensors(Closure sendEvent, int deviceNumbers) {


@@ -38,10 +39,10 @@ public class AccelerationSensors {
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
                if (eventDataMap["value"] != accelerationSensors[0].acceleration) {
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
                if (eventDataMap["value"] != accelerationSensors[0].acceleration) {

+                       this.accelerationLatestValue = eventDataMap["value"]
+                       this.acceleration = eventDataMap["value"]
+                       this.currentAcceleration = eventDataMap["value"]

                        accelerationSensors[0].setValue(eventDataMap["value"])
                        accelerationSensors[0].setValue(eventDataMap["value"])

-                       this.accelerationLatestValue = accelerationSensors[0].accelerationLatestValue
-                       this.acceleration = accelerationSensors[0].acceleration
-                       this.currentAcceleration = accelerationSensors[0].acceleration

                        sendEvent(eventDataMap)
                }
        }
                        sendEvent(eventDataMap)
                }
        }


@@ -56,6 +57,9 @@ public class AccelerationSensors {
        def each(Closure Input) {
                accelerationSensors.each(Input)
        }
        def each(Closure Input) {
                accelerationSensors.each(Input)
        }

+       def sort(Closure Input) {
+               accelerationSensors.each(Input)
+       }

        def find(Closure Input) {
                accelerationSensors.find(Input)
        }
        def find(Closure Input) {
                accelerationSensors.find(Input)
        }