Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

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

diff --git a/SmokeDetector/SmokeDetectors.groovy b/SmokeDetector/SmokeDetectors.groovy
index d2a9290744b79363fe8fb92b1b6037fd461aaa0a..94c6176d2e79272524931b0b7a8bee1ce1a45736 100644 (file)
--- a/SmokeDetector/SmokeDetectors.groovy
+++ b/SmokeDetector/SmokeDetectors.groovy
@@ -29,12 +29,17 @@ public class SmokeDetectors {
                this.deviceNumbers = deviceNumbers
                this.smokeDetectors = []
 
+<<<<<<< HEAD
                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) {
+>>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
                        this.currentSmokeValue = "clear"
                        this.smokeLatestValue = "clear"
                } else if (initSmoke == 1) {
@@ -43,6 +48,7 @@ public class SmokeDetectors {
                } else {
                        this.currentSmokeValue = "tested"
                        this.smokeLatestValue = "tested"                
+<<<<<<< HEAD
                }
 
                def initCarbonMonoxide = Verify.getInt(0,2)
@@ -58,6 +64,10 @@ public class SmokeDetectors {
                }
                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))
+>>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
        }
 
        //By Model Checker