projects
/
smartthings-infrastructure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding events to emulate values above and below thresholds.
[smartthings-infrastructure.git]
/
TemperatureMeasurement
/
TemperatureMeasurements.groovy
diff --git
a/TemperatureMeasurement/TemperatureMeasurements.groovy
b/TemperatureMeasurement/TemperatureMeasurements.groovy
index 18602034e8771a7e2d07407ec2269d74c43d1b8b..608d18b1dc88df40cdd5690b6d8771eb1324a509 100644
(file)
--- a/
TemperatureMeasurement/TemperatureMeasurements.groovy
+++ b/
TemperatureMeasurement/TemperatureMeasurements.groovy
@@
-14,28
+14,38
@@
public class TemperatureMeasurements {
private String id = "temperatureMeasurementID0"
private String label = "temperatureMeasurement0"
private String displayName = "temperatureMeasurement0"
private String id = "temperatureMeasurementID0"
private String label = "temperatureMeasurement0"
private String displayName = "temperatureMeasurement0"
- private int temperature = 50
-
- TemperatureMeasurements(Closure sendEvent, int deviceNumbers) {
+ private int temperature = 40
+ private int currentTemperature = 40
+
+ TemperatureMeasurements(Closure sendEvent, int deviceNumbers, boolean init) {
this.sendEvent = sendEvent
this.deviceNumbers = deviceNumbers
this.temperatureMeasurements = []
this.sendEvent = sendEvent
this.deviceNumbers = deviceNumbers
this.temperatureMeasurements = []
- def initTemp = Verify.getIntFromList(30, 50, 70)
- this.temperature = initTemp
-
+ if (init) {
+ this.temperature = 40
+ this.currentTemperature = 40
+ } else {
+ this.temperature = 60
+ this.currentTemperature = 60
+ }
temperatureMeasurements.add(new TemperatureMeasurement(id, label, displayName, this.temperature))
}
//By Model Checker
def setValue(LinkedHashMap eventDataMap) {
temperatureMeasurements.add(new TemperatureMeasurement(id, label, displayName, this.temperature))
}
//By Model Checker
def setValue(LinkedHashMap eventDataMap) {
- if (eventDataMap["value"] != temperatureMeasurements[0].temperature) {
+ if (eventDataMap["value"].toInteger() != temperatureMeasurements[0].temperature) {
+ this.temperature = eventDataMap["value"].toInteger()
+ this.currentTemperature = eventDataMap["value"].toInteger()
temperatureMeasurements[0].setValue(eventDataMap["value"])
temperatureMeasurements[0].setValue(eventDataMap["value"])
- this.temperature = temperatureMeasurements[0].temperature
sendEvent(eventDataMap)
}
}
sendEvent(eventDataMap)
}
}
+ def eventsSince(Date dateObj) {
+ return temperatureMeasurements[0].eventsSince()
+ }
+
//Methods for closures
def count(Closure Input) {
temperatureMeasurements.count(Input)
//Methods for closures
def count(Closure Input) {
temperatureMeasurements.count(Input)
@@
-49,6
+59,9
@@
public class TemperatureMeasurements {
def find(Closure Input) {
temperatureMeasurements.find(Input)
}
def find(Closure Input) {
temperatureMeasurements.find(Input)
}
+ def sort(Closure Input) {
+ temperatureMeasurements.sort(Input)
+ }
def collect(Closure Input) {
temperatureMeasurements.collect(Input)
}
def collect(Closure Input) {
temperatureMeasurements.collect(Input)
}