Changing Verify API call scheme for device handlers.

[smartthings-infrastructure.git] / CarbonMonoxideDetector / CarbonMonoxideDetectors.groovy

diff --git a/CarbonMonoxideDetector/CarbonMonoxideDetectors.groovy b/CarbonMonoxideDetector/CarbonMonoxideDetectors.groovy
index 21aa5921e70436446e84caf2b5dca80c093c5f57..ba828d7d0542a73be5dee54e167adceb4f14e84f 100644 (file)
--- a/CarbonMonoxideDetector/CarbonMonoxideDetectors.groovy
+++ b/CarbonMonoxideDetector/CarbonMonoxideDetectors.groovy
@@ -2,9 +2,6 @@
 package CarbonMonoxideDetector
 import Timer.SimulatedTimer
 
-//JPF's Verify API
-import gov.nasa.jpf.vm.Verify
-
 public class CarbonMonoxideDetectors {
        private int deviceNumbers
        private List carbonMonoxideDetectors
@@ -19,22 +16,20 @@ public class CarbonMonoxideDetectors {
        private String carbonMonoxideLatestValue = "clear"
 
                
-       CarbonMonoxideDetectors(Closure sendEvent, int deviceNumbers) {
+       CarbonMonoxideDetectors(Closure sendEvent, int deviceNumbers, boolean init) {
                this.sendEvent = sendEvent              
                this.deviceNumbers = deviceNumbers
                this.carbonMonoxideDetectors = []
                
-               /*def init = Verify.getInt(0,2)
-               if (init == 0) {
+               if (init) {
                        this.carbonMonoxide = "clear"
+                       this.currentCarbonMonoxideValue = "clear"
                        this.carbonMonoxideLatestValue = "clear"
                } else if (init == 1) {
                        this.carbonMonoxide = "detected"
+                       this.currentCarbonMonoxideValue = "detected"
                        this.carbonMonoxideLatestValue = "detected"
-               } else {
-                       this.carbonMonoxide = "tested"
-                       this.carbonMonoxideLatestValue = "tested"               
-               }*/
+               }
                carbonMonoxideDetectors.add(new CarbonMonoxideDetector(id, label, displayName, this.currentCarbonMonoxideValue, this.carbonMonoxideLatestValue))
        }