Changes in classes: new concept for latest value + all types of events generated...

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

diff --git a/Battery/Batteries.groovy b/Battery/Batteries.groovy
index 8aca5e2a66c50bee42ff20a8ce466299101a855b..36a203f2f996d3664062498f5646258c6fa0d130 100644 (file)
--- a/Battery/Batteries.groovy
+++ b/Battery/Batteries.groovy
@@ -16,6 +16,7 @@ public class Batteries {
        private String displayName = "battery0"
        private int battery = 50
        private int currentBattery = 50
+       private int batteryLatestValue = 50
 
                
        Batteries(Closure sendEvent, int deviceNumbers) {
@@ -31,10 +32,11 @@ public class Batteries {
 
        //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)
                }
        }
@@ -49,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)
        }
@@ -61,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]
        }