Infrastructure now works for: locks, alarms, thermostats, and non-hue lights.

[smartthings-infrastructure.git] / Valve / Valves.groovy

diff --git a/Valve/Valves.groovy b/Valve/Valves.groovy
index f12bffd66dbd259ad7bc625d2cfe9f4866248659..0bf0bbce18669e7b7f7489028ff0fe949417bb04 100644 (file)
--- a/Valve/Valves.groovy
+++ b/Valve/Valves.groovy
@@ -24,14 +24,14 @@ public class Valves {
                this.deviceNumbers = deviceNumbers
                this.valves = []
                
-               def init = Verify.getBoolean()
+               /*def init = Verify.getBoolean()
                if (init) {
                        this.valve = "closed"
                        this.valveLatestValue = "closed"
                } else {
                        this.valve = "open"
                        this.valveLatestValue = "open"
-               }
+               }*/
                valves.add(new Valve(sendEvent, id, label, displayName, this.valve, this.valveLatestValue))
        }
 
@@ -48,32 +48,45 @@ public class Valves {
        def find(Closure Input) {
                valves.find(Input)
        }
+       def sort(Closure Input) {
+               valves.sort(Input)
+       }
        def collect(Closure Input) {
                valves.collect(Input)
        }
 
        //By Apps
        def open() {
-               if (valve != "open")
+               if (valve != "open") {
+                       this.valve = "open"
+                       this.valveLatestValue = "open"
                        valves[0].open()
+               }
        }
 
        def open(LinkedHashMap metaData) {
                if (valve != "open") {
                        def task = timers.runAfter(metaData["delay"]) {
+                               this.valve = "open"
+                               this.valveLatestValue = "open"
                                valves[0].open()
                        }
                }
        }
 
        def close() {
-               if (valve != "closed")
+               if (valve != "closed") {
+                       this.valve = "closed"
+                       this.valveLatestValue = "closed"                        
                        valves[0].close()
+               }
        }
 
        def close(LinkedHashMap metaData) {
                if (valve != "closed") {
                        def task = timers.runAfter(metaData["delay"]) {
+                               this.valve = "closed"
+                               this.valveLatestValue = "closed"
                                valves[0].close()
                        }
                }
@@ -82,8 +95,8 @@ public class Valves {
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
                if (eventDataMap["value"] != valves[0].valve) {
+                       this.valve = eventDataMap["value"]
                        valves[0].setValue(eventDataMap["value"])
-                       this.valve = valves[0].valve
                }
        }