Adding speechesAppList

[smartthings-infrastructure.git] / EnergyMeter / EnergyMeters.groovy

diff --git a/EnergyMeter/EnergyMeters.groovy b/EnergyMeter/EnergyMeters.groovy
index 296cdaad7b5e820e1838990846eeaaeb8918d308..d5a7aea62e626dbb07e35b433d82b52ccd396cff 100644 (file)
--- a/EnergyMeter/EnergyMeters.groovy
+++ b/EnergyMeter/EnergyMeters.groovy
@@ -2,9 +2,6 @@
 package EnergyMeter
 import Timer.SimulatedTimer
 
-//JPF's Verify API
-import gov.nasa.jpf.vm.Verify
-
 public class EnergyMeters {
        private int deviceNumbers
        private List energyMeters
@@ -18,14 +15,18 @@ public class EnergyMeters {
        private int currentEnergy = 50
 
                
-       EnergyMeters(Closure sendEvent, int deviceNumbers) {
+       EnergyMeters(Closure sendEvent, int deviceNumbers, boolean init) {
                this.sendEvent = sendEvent              
                this.deviceNumbers = deviceNumbers
                this.energyMeters = []
 
-               def init = Verify.getIntFromList(30, 50, 70)
-               this.energy = init
-
+               if (init) {
+                       this.energy = 50
+                       this.currentEnergy = 50
+               } else {
+                       this.energy = 60
+                       this.currentEnergy = 60
+               }
                energyMeters.add(new EnergyMeter(id, label, displayName, this.energy))
        }