projects
/
smartthings-infrastructure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing conflicting files.
[smartthings-infrastructure.git]
/
SmokeDetector
/
SmokeDetectors.groovy
diff --git
a/SmokeDetector/SmokeDetectors.groovy
b/SmokeDetector/SmokeDetectors.groovy
index 94c6176d2e79272524931b0b7a8bee1ce1a45736..e7aec2f7aa5279456a837eb2af5f219026802670 100644
(file)
--- a/
SmokeDetector/SmokeDetectors.groovy
+++ b/
SmokeDetector/SmokeDetectors.groovy
@@
-29,17
+29,8
@@
public class SmokeDetectors {
this.deviceNumbers = deviceNumbers
this.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) {
/*def init = Verify.getInt(0,2)
if (init == 0) {
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
this.currentSmokeValue = "clear"
this.smokeLatestValue = "clear"
} else if (initSmoke == 1) {
this.currentSmokeValue = "clear"
this.smokeLatestValue = "clear"
} else if (initSmoke == 1) {
@@
-48,7
+39,6
@@
public class SmokeDetectors {
} else {
this.currentSmokeValue = "tested"
this.smokeLatestValue = "tested"
} else {
this.currentSmokeValue = "tested"
this.smokeLatestValue = "tested"
-<<<<<<< HEAD
}
def initCarbonMonoxide = Verify.getInt(0,2)
}
def initCarbonMonoxide = Verify.getInt(0,2)
@@
-62,12
+52,8
@@
public class SmokeDetectors {
this.currentCarbonMonoxideValue = "tested"
this.carbonMonoxideLatestValue = "tested"
}
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))
}*/
smokeDetectors.add(new SmokeDetector(id, label, displayName, this.currentSmokeValue, this.smokeLatestValue))
->>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
}
//By Model Checker
}
//By Model Checker