X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=blobdiff_plain;f=SmokeDetector%2FSmokeDetectors.groovy;h=e7aec2f7aa5279456a837eb2af5f219026802670;hp=94c6176d2e79272524931b0b7a8bee1ce1a45736;hb=9a9f34091fe2231e5f0010987ac3a24800aaae78;hpb=de35dfa319418baf7ba4bc2eeb4dbfc0fd20230a

diff --git a/SmokeDetector/SmokeDetectors.groovy b/SmokeDetector/SmokeDetectors.groovy
index 94c6176..e7aec2f 100644
--- a/SmokeDetector/SmokeDetectors.groovy
+++ b/SmokeDetector/SmokeDetectors.groovy
@@ -29,17 +29,8 @@ 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) {
@@ -48,7 +39,6 @@ public class SmokeDetectors {
 		} else {
 			this.currentSmokeValue = "tested"
 			this.smokeLatestValue = "tested"		
-<<<<<<< HEAD
 		}
 
 		def initCarbonMonoxide = Verify.getInt(0,2)
@@ -62,12 +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))
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
 	}
 
 	//By Model Checker