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 444154da8319bd8a20615aaf75e59e02c4d15137..e8e067a5e7966060e586e2b6a65f07374fc2f72b 100644 (file)
--- a/DoorControl/DoorControls.groovy
+++ b/DoorControl/DoorControls.groovy
@@ -23,7 +23,11 @@ public class DoorControls {
                this.timers = new SimulatedTimer()
                this.deviceNumbers = deviceNumbers
                this.doorControls = []
+<<<<<<< HEAD
+               
+=======
 
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c
                def init = Verify.getBoolean()
                if (init) {
                        this.doorState = "closed"
@@ -54,22 +58,28 @@ public class DoorControls {
 
        //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()
+                       }
                }
        }