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

[smartthings-infrastructure.git] / DoorControl / DoorControls.groovy

diff --git a/DoorControl/DoorControls.groovy b/DoorControl/DoorControls.groovy
index 19cc18b8af5a13d6d7684b6bffea224f8384408f..5327be01e731bec554808bb79b3ab406318940fb 100644 (file)
--- a/DoorControl/DoorControls.groovy
+++ b/DoorControl/DoorControls.groovy
@@ -15,12 +15,19 @@ public class DoorControls {
        private String doorState = "closed"
        private String doorLatestValue = "closed"
 
-       DoorControls(Closure sendEvent, int deviceNumbers) {
+       DoorControls(Closure sendEvent, int deviceNumbers, boolean init) {
                this.sendEvent = sendEvent
                this.timers = new SimulatedTimer()
                this.deviceNumbers = deviceNumbers
                this.doorControls = []
                
+               if (init) {
+                       this.doorState = "closed"
+                       this.doorLatestValue = "closed"
+               } else {
+                       this.doorState = "open"
+                       this.doorLatestValue = "open"
+               }
                doorControls.add(new DoorControl(sendEvent, id, label, displayName, this.doorState, this.doorLatestValue))
        }
 
@@ -37,36 +44,48 @@ public class DoorControls {
        def find(Closure Input) {
                doorControls.find(Input)
        }
+       def sort(Closure Input) {
+               doorControls.sort(Input)
+       }
        def collect(Closure Input) {
                doorControls.collect(Input)
        }
 
        //By Apps
        def open() {
-               doorControls[0].on()
+               if (doorState != "open")
+                       doorControls[0].open()
        }
 
        def open(LinkedHashMap metaData) {
-               def task = timers.runAfter(metaData["delay"]) {
-                       doorControls[0].on()
+               if (doorState != "open") {
+                       def task = timers.runAfter(metaData["delay"]) {
+                               doorControls[0].open()
+                       }
                }
        }
 
        def close() {
-               doorControls[0].off()
+               if (doorState != "closed")
+                       doorControls[0].close()
        }
 
        def close(LinkedHashMap metaData) {
-               def task = timers.runAfter(metaData["delay"]) {
-                       doorControls[0].off()
+               if (doorState != "closed") {
+                       def task = timers.runAfter(metaData["delay"]) {
+                               doorControls[0].close()
+                       }
                }
        }
 
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
-               doorControls[0].setValue(eventDataMap["value"])
-               this.doorState = doorControls[0].doorState
-               sendEvent(eventDataMap)
+               if (eventDataMap["value"] != doorControls[0].doorState) {
+                       this.doorState = eventDataMap["value"]
+                       this.doorLatestValue = eventDataMap["value"]
+                       doorControls[0].setValue(eventDataMap["value"])
+                       sendEvent(eventDataMap)
+               }
        }