Fixing conflicting files.

[smartthings-infrastructure.git] / Lock / Lock.groovy

diff --git a/Lock/Lock.groovy b/Lock/Lock.groovy
index 4b84497003b6696d86c74eacdcc6567f32766919..0271050af9dd100f9bedc0c430caa4fe3ea8a765 100644 (file)
--- a/Lock/Lock.groovy
+++ b/Lock/Lock.groovy
@@ -28,10 +28,6 @@ public class Lock {
        def lock() {
                if (lockState != "locked") {
                        println("the door with id:$id is locked!")
        def lock() {
                if (lockState != "locked") {
                        println("the door with id:$id is locked!")

-<<<<<<< HEAD
-=======
-                       //this.lockLatestValue = this.lockState
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049

                        this.lockLatestValue = "locked"
                        this.lockState = "locked"
                        this.currentLock = "locked"
                        this.lockLatestValue = "locked"
                        this.lockState = "locked"
                        this.currentLock = "locked"


@@ -46,10 +42,6 @@ public class Lock {
                if (lockState != "locked") {
                        def task = timers.runAfter(metaData["delay"]) {
                                println("the door with id:$id is locked!")
                if (lockState != "locked") {
                        def task = timers.runAfter(metaData["delay"]) {
                                println("the door with id:$id is locked!")

-<<<<<<< HEAD
-=======
-                               //this.lockLatestValue = this.lockState
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049

                                this.lockLatestValue = "locked"
                                this.lockState = "locked"
                                this.currentLock = "locked"
                                this.lockLatestValue = "locked"
                                this.lockState = "locked"
                                this.currentLock = "locked"


@@ -64,10 +56,6 @@ public class Lock {
        def unlock() {
                if (lockState != "unlocked") {
                        println("the door with id:$id is unlocked!")
        def unlock() {
                if (lockState != "unlocked") {
                        println("the door with id:$id is unlocked!")

-<<<<<<< HEAD
-=======
-                       //this.lockLatestValue = this.lockState
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049

                        this.lockLatestValue = "unlocked"
                        this.lockState = "unlocked"
                        this.currentLock = "unlocked"
                        this.lockLatestValue = "unlocked"
                        this.lockState = "unlocked"
                        this.currentLock = "unlocked"


@@ -75,11 +63,8 @@ public class Lock {
                                  displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                        sendEvent([name: "lock", value: "unlocked", deviceId: this.id, descriptionText: "",
                                  displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                                  displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                        sendEvent([name: "lock", value: "unlocked", deviceId: this.id, descriptionText: "",
                                  displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])

-<<<<<<< HEAD

                        sendEvent([name: "lock.unlocked", value: "unlocked", deviceId: this.id, descriptionText: "",
                                  displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                        sendEvent([name: "lock.unlocked", value: "unlocked", deviceId: this.id, descriptionText: "",
                                  displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])

-=======
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049

                }
        }
 
                }
        }
 


@@ -87,7 +72,6 @@ public class Lock {
                if (lockState != "unlocked") {
                        def task = timers.runAfter(metaData["delay"]) {
                                println("the door with id:$id is locked!")
                if (lockState != "unlocked") {
                        def task = timers.runAfter(metaData["delay"]) {
                                println("the door with id:$id is locked!")

-<<<<<<< HEAD

                                this.lockLatestValue = "unlocked"
                                this.lockState = "unlocked"
                                this.currentLock = "unlocked"
                                this.lockLatestValue = "unlocked"
                                this.lockState = "unlocked"
                                this.currentLock = "unlocked"


@@ -97,16 +81,6 @@ public class Lock {
                                          displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                                sendEvent([name: "lock.unlocked", value: "unlocked", deviceId: this.id, descriptionText: "",
                                          displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])                             
                                          displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                                sendEvent([name: "lock.unlocked", value: "unlocked", deviceId: this.id, descriptionText: "",
                                          displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])                             

-=======
-                               //this.lockLatestValue = this.lockState
-                               this.lockLatestValue = "locked"
-                               this.lockState = "locked"
-                               this.currentLock = "locked"
-                               sendEvent([name: "unlock", value: "unlocked", deviceId: this.id, descriptionText: "",
-                                         displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-                               sendEvent([name: "lock", value: "unlocked", deviceId: this.id, descriptionText: "",
-                                               displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049

                        }
                }
        }
                        }
                }
        }