projects
/
smartthings-infrastructure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding speechesAppList
[smartthings-infrastructure.git]
/
EnergyMeter
/
EnergyMeters.groovy
diff --git
a/EnergyMeter/EnergyMeters.groovy
b/EnergyMeter/EnergyMeters.groovy
index 907ec6680065932c3f48f59e65cbc1e5e660b17f..d5a7aea62e626dbb07e35b433d82b52ccd396cff 100644
(file)
--- a/
EnergyMeter/EnergyMeters.groovy
+++ b/
EnergyMeter/EnergyMeters.groovy
@@
-2,9
+2,6
@@
package EnergyMeter
import Timer.SimulatedTimer
package EnergyMeter
import Timer.SimulatedTimer
-//JPF's Verify API
-import gov.nasa.jpf.vm.Verify
-
public class EnergyMeters {
private int deviceNumbers
private List energyMeters
public class EnergyMeters {
private int deviceNumbers
private List energyMeters
@@
-18,14
+15,18
@@
public class EnergyMeters {
private int currentEnergy = 50
private int currentEnergy = 50
- EnergyMeters(Closure sendEvent, int deviceNumbers) {
+ EnergyMeters(Closure sendEvent, int deviceNumbers
, boolean init
) {
this.sendEvent = sendEvent
this.deviceNumbers = deviceNumbers
this.energyMeters = []
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))
}
energyMeters.add(new EnergyMeter(id, label, displayName, this.energy))
}