Commit #9: extension to the infrastructure with more devices + minor changes in extra...

[smartthings-infrastructure.git] / PresenceSensor / PresenceSensors.groovy

diff --git a/PresenceSensor/PresenceSensors.groovy b/PresenceSensor/PresenceSensors.groovy
index 44328d6661432899d9aa31153fcd56de7624b0b9..cc5c820224096561a360009ca11ff1f5a39f0599 100644 (file)
--- a/PresenceSensor/PresenceSensors.groovy
+++ b/PresenceSensor/PresenceSensors.groovy
@@ -8,9 +8,9 @@ public class PresenceSensors {
        def sendEvent
 
        //For one device(We cannot have obj.id)-> We should have obj[0].id
-       private int id = 0
-       private String label = "presenceSensor"
-       private String displayName = "presenceSensor"
+       private String id = "presenceSensorID0"
+       private String label = "presenceSensor0"
+       private String displayName = "presenceSensor0"
        private String presenceState = "not present"
        private String currentPresence = "not present"
        private String presenceLatestValue = "not present"
@@ -21,18 +21,16 @@ public class PresenceSensors {
                this.deviceNumbers = deviceNumbers
                this.presenceSensors = []
 
-               for (int i = 0;i < deviceNumbers;i++) {
-                       presenceSensors.add(new PresenceSensor(i+30, label+i.toString(), displayName+i.toString(), this.presenceState, this.presenceLatestValue))
-               }
+               presenceSensors.add(new PresenceSensor(id, label, displayName, this.presenceState, this.presenceLatestValue))
        }
 
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
-               presenceSensors[eventDataMap["deviceId"]].setValue(eventDataMap["value"])
+               presenceSensors[0].setValue(eventDataMap["value"])
                if (deviceNumbers == 1)
-                       this.presenceLatestValue = presenceSensors[eventDataMap["deviceId"]].presenceLatestValue
-                       this.presenceState = presenceSensors[eventDataMap["deviceId"]].presenceState
-                       this.currentPresence = presenceSensors[eventDataMap["deviceId"]].presenceState
+                       this.presenceLatestValue = presenceSensors[0].presenceLatestValue
+                       this.presenceState = presenceSensors[0].presenceState
+                       this.currentPresence = presenceSensors[0].presenceState
                sendEvent(eventDataMap)
        }
 
@@ -46,20 +44,20 @@ public class PresenceSensors {
        def each(Closure Input) {
                presenceSensors.each(Input)
        }
+       def find(Closure Input) {
+               presenceSensors.find(Input)
+       }
+       def collect(Closure Input) {
+               presenceSensors.collect(Input)
+       }
 
 
        def currentValue(String deviceFeature) {
-               if (deviceNumbers == 1)
-                       presenceSensors[0].currentValue(deviceFeature)//It is called if we have only one device
-               else
-                       presenceSensors*.currentValue(deviceFeature)
+               presenceSensors[0].currentValue(deviceFeature)//It is called if we have only one device
        }
 
        def latestValue(String deviceFeature) {
-               if (deviceNumbers == 1)
-                       presenceSensors[0].latestValue(deviceFeature)//It is called if we have only one device
-               else
-                       presenceSensors*.latestValue(deviceFeature)
+               presenceSensors[0].latestValue(deviceFeature)//It is called if we have only one device
        }
 
        def getAt(int ix) {