Solving the conflicts

[smartthings-infrastructure.git] / SmokeDetector / SmokeDetectors.groovy

diff --git a/SmokeDetector/SmokeDetectors.groovy b/SmokeDetector/SmokeDetectors.groovy
index d2a9290744b79363fe8fb92b1b6037fd461aaa0a..768f53acb1ed9e1e7c77ba67b2022bc00339c9e6 100644 (file)
--- a/SmokeDetector/SmokeDetectors.groovy
+++ b/SmokeDetector/SmokeDetectors.groovy
@@ -29,12 +29,8 @@ public class SmokeDetectors {
                this.deviceNumbers = deviceNumbers
                this.smokeDetectors = []
 
-               def initBattery = Verify.getIntFromList(30, 50, 70)
-               this.battery = initBattery
-               this.batteryLatestValue = initBattery
-
-               def initSmoke = Verify.getInt(0,2)
-               if (initSmoke == 0) {
+               /*def init = Verify.getInt(0,2)
+               if (init == 0) {
                        this.currentSmokeValue = "clear"
                        this.smokeLatestValue = "clear"
                } else if (initSmoke == 1) {
@@ -56,8 +52,8 @@ public class SmokeDetectors {
                        this.currentCarbonMonoxideValue = "tested"
                        this.carbonMonoxideLatestValue = "tested"               
                }
-               smokeDetectors.add(new SmokeDetector(id, label, displayName, this.currentSmokeValue, this.smokeLatestValue, this.currentCarbonMonoxideValue,
-                                                     this.carbonMonoxideLatestValue, this.battery))
+               }*/
+               smokeDetectors.add(new SmokeDetector(id, label, displayName, this.currentSmokeValue, this.smokeLatestValue, this.carbonMonoxide, this.carbonMonoxideLatestValue, this.battery))
        }
 
        //By Model Checker