Infrastructure compatible with 2 types of switches.(Normal switches and otherVsGeneri...

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

diff --git a/EnergyMeter/EnergyMeters.groovy b/EnergyMeter/EnergyMeters.groovy
index d5a7aea62e626dbb07e35b433d82b52ccd396cff..5d8b74aa73146c8ee7106b8ce993639984354f09 100644 (file)
--- a/EnergyMeter/EnergyMeters.groovy
+++ b/EnergyMeter/EnergyMeters.groovy
@@ -13,6 +13,7 @@ public class EnergyMeters {
        private String displayName = "energyMeter0"
        private int energy = 50
        private int currentEnergy = 50
+       private String status = "off"
 
                
        EnergyMeters(Closure sendEvent, int deviceNumbers, boolean init) {
@@ -27,7 +28,7 @@ public class EnergyMeters {
                        this.energy = 60
                        this.currentEnergy = 60
                }
-               energyMeters.add(new EnergyMeter(id, label, displayName, this.energy))
+               energyMeters.add(new EnergyMeter(id, label, displayName, this.energy, this.status))
        }
 
        //By Model Checker
@@ -60,6 +61,19 @@ public class EnergyMeters {
                energyMeters.collect(Input)
        }
 
+       def reset() {
+               if (status != "on") {
+                       status = "on"
+                       energyMeters[0].reset()
+               }
+       }
+       
+       def off() {
+               if (status != "off") {
+                       status = "off"
+                       energyMeters[0].off()
+               }
+       }
 
        def currentValue(String deviceFeature) {
                energyMeters[0].currentValue(deviceFeature)//It is called if we have only one device