creating eventsSince for ContactSensor and AeonKeyFobs + commenting runAfter method...

[smartthings-infrastructure.git] / Battery / Batteries.groovy

diff --git a/Battery/Batteries.groovy b/Battery/Batteries.groovy
index ce4a187d3a4b06040fc940f902b73b39b6805fa6..d7d8f1b348e314ae440019b989d6a4d74ac6e9d6 100644 (file)
--- a/Battery/Batteries.groovy
+++ b/Battery/Batteries.groovy
@@ -2,6 +2,9 @@
 package Battery
 import Timer.SimulatedTimer
 
+//JPF's Verify API
+import gov.nasa.jpf.vm.Verify
+
 public class Batteries {
        private int deviceNumbers
        private List batteries
@@ -12,7 +15,8 @@ public class Batteries {
        private String label = "battery0"
        private String displayName = "battery0"
        private int battery = 50
-       private String currentBattery = 50
+       private int currentBattery = 50
+       private int batteryLatestValue = 50
 
                
        Batteries(Closure sendEvent, int deviceNumbers) {
@@ -20,15 +24,19 @@ public class Batteries {
                this.deviceNumbers = deviceNumbers
                this.batteries = []
 
+               //def init = Verify.getIntFromList(30, 50, 70)
+               //this.battery = init
+
                batteries.add(new Battery(id, label, displayName, this.battery))
        }
 
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
-               if (eventDataMap["value"] != batteries[0].battery) {
+               if (eventDataMap["value"].toInteger() != batteries[0].battery) {
+                       this.battery = eventDataMap["value"].toInteger()
+                       this.currentBattery = eventDataMap["value"].toInteger()
+                       this.batteryLatestValue = eventDataMap["value"].toInteger()
                        batteries[0].setValue(eventDataMap["value"])
-                       this.battery = batteries[0].battery
-                       this.currentBattery = batteries[0].battery
                        sendEvent(eventDataMap)
                }
        }
@@ -43,6 +51,9 @@ public class Batteries {
        def each(Closure Input) {
                batteries.each(Input)
        }
+       def sort(Closure Input) {
+               batteries.sort(Input)
+       }
        def find(Closure Input) {
                batteries.find(Input)
        }
@@ -55,6 +66,10 @@ public class Batteries {
                batteries[0].currentValue(deviceFeature)//It is called if we have only one device
        }
 
+       def latestValue(String deviceFeature) {
+               batteries[0].latestValue(deviceFeature)//It is called if we have only one device
+       }
+
        def getAt(int ix) {
                batteries[ix]
        }