projects
/
smartthings-infrastructure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor bug in events for button device
[smartthings-infrastructure.git]
/
DoorControl
/
DoorControls.groovy
diff --git
a/DoorControl/DoorControls.groovy
b/DoorControl/DoorControls.groovy
index 921089977d70655e594c2363ba63bf9cc519dc21..5327be01e731bec554808bb79b3ab406318940fb 100644
(file)
--- a/
DoorControl/DoorControls.groovy
+++ b/
DoorControl/DoorControls.groovy
@@
-15,12
+15,19
@@
public class DoorControls {
private String doorState = "closed"
private String doorLatestValue = "closed"
private String doorState = "closed"
private String doorLatestValue = "closed"
- DoorControls(Closure sendEvent, int deviceNumbers) {
+ DoorControls(Closure sendEvent, int deviceNumbers
, boolean init
) {
this.sendEvent = sendEvent
this.timers = new SimulatedTimer()
this.deviceNumbers = deviceNumbers
this.doorControls = []
this.sendEvent = sendEvent
this.timers = new SimulatedTimer()
this.deviceNumbers = deviceNumbers
this.doorControls = []
+ if (init) {
+ this.doorState = "closed"
+ this.doorLatestValue = "closed"
+ } else {
+ this.doorState = "open"
+ this.doorLatestValue = "open"
+ }
doorControls.add(new DoorControl(sendEvent, id, label, displayName, this.doorState, this.doorLatestValue))
}
doorControls.add(new DoorControl(sendEvent, id, label, displayName, this.doorState, this.doorLatestValue))
}
@@
-37,36
+44,46
@@
public class DoorControls {
def find(Closure Input) {
doorControls.find(Input)
}
def find(Closure Input) {
doorControls.find(Input)
}
+ def sort(Closure Input) {
+ doorControls.sort(Input)
+ }
def collect(Closure Input) {
doorControls.collect(Input)
}
//By Apps
def open() {
def collect(Closure Input) {
doorControls.collect(Input)
}
//By Apps
def open() {
- doorControls[0].on()
+ if (doorState != "open")
+ doorControls[0].open()
}
def open(LinkedHashMap metaData) {
}
def open(LinkedHashMap metaData) {
- def task = timers.runAfter(metaData["delay"]) {
- doorControls[0].on()
+ if (doorState != "open") {
+ def task = timers.runAfter(metaData["delay"]) {
+ doorControls[0].open()
+ }
}
}
def close() {
}
}
def close() {
- doorControls[0].off()
+ if (doorState != "closed")
+ doorControls[0].close()
}
def close(LinkedHashMap metaData) {
}
def close(LinkedHashMap metaData) {
- def task = timers.runAfter(metaData["delay"]) {
- doorControls[0].off()
+ if (doorState != "closed") {
+ def task = timers.runAfter(metaData["delay"]) {
+ doorControls[0].close()
+ }
}
}
//By Model Checker
def setValue(LinkedHashMap eventDataMap) {
if (eventDataMap["value"] != doorControls[0].doorState) {
}
}
//By Model Checker
def setValue(LinkedHashMap eventDataMap) {
if (eventDataMap["value"] != doorControls[0].doorState) {
+ this.doorState = eventDataMap["value"]
+ this.doorLatestValue = eventDataMap["value"]
doorControls[0].setValue(eventDataMap["value"])
doorControls[0].setValue(eventDataMap["value"])
- this.doorState = doorControls[0].doorState
sendEvent(eventDataMap)
}
}
sendEvent(eventDataMap)
}
}