Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rolling up master to staging #41315

Merged
merged 3 commits into from
Aug 18, 2020
Merged

Rolling up master to staging #41315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e63468d
update parseAduroSmartButtonMessage function (#40488)
adurosmart Aug 12, 2020
22dc733
[ICP-13162] Add alarm event when tamper is triggered (#36895)
MGoralczykS Aug 13, 2020
bf3dc62
Merge pull request #41314 from SmartThingsCommunity/staging
greens Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions devicetypes/smartthings/aeotec-doorbell-siren-6.src/aeotec-doorbell-siren-6.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ def both() {
on()
}

def chime() {
on()
}

def ping() {
def cmds = [
encap(zwave.basicV1.basicGet())
Expand Down Expand Up @@ -201,26 +205,30 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm
switch (cmd.event) {
case 0x09: //TAMPER
sendEvent(name: "tamper", value: "detected")
runIn(10, "clearTamper")
sendEvent(name: "alarm", value: "both")
runIn(2, "clearTamperAndAlarm")
break
case 0x01: //ON
if (state.lastTriggeredSound == 1) {
createEvent([name: "alarm", value: "both"])
createEvent([name: "chime", value: "chime"])
sendEvent(name: "chime", value: "chime")
sendEvent(name: "alarm", value: "both")
} else {
setActiveSound(state.lastTriggeredSound)
}
break
case 0x00: //OFF
resetActiveSound()
createEvent([name: "tamper", value: "clear"])
sendEvent(name: "tamper", value: "clear")
sendEvent(name: "alarm", value: "off")
sendEvent(name: "chime", value: "off")
break
}
}
}

def clearTamper() {
def clearTamperAndAlarm() {
sendEvent(name: "tamper", value: "clear")
sendEvent(name: "alarm", value: "off")
}

def setOnChild(deviceDni) {
Expand Down Expand Up @@ -252,7 +260,7 @@ def resetActiveSound() {
def setActiveSound(soundId) {
String childDni = "${device.deviceNetworkId}:${soundId}"
def child = childDevices.find { it.deviceNetworkId == childDni }
child?.sendEvent(name: "chime", value: "on")
child?.sendEvent(name: "chime", value: "chime")
child?.sendEvent(name: "alarm", value: "both")
}

Expand Down
8 changes: 7 additions & 1 deletion devicetypes/smartthings/zigbee-multi-button.src/zigbee-multi-button.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,13 @@ private getButtonName() {
private Map parseAduroSmartButtonMessage(Map descMap){
def buttonState = "pushed"
def buttonNumber = 0
if (descMap.clusterInt == ADUROSMART_SPECIFIC_CLUSTER) {
if (descMap.clusterInt == zigbee.ONOFF_CLUSTER) {
if (descMap.command == "01") {
buttonNumber = 1
} else if (descMap.command == "00") {
buttonNumber = 4
}
} else if (descMap.clusterInt == ADUROSMART_SPECIFIC_CLUSTER) {
def list2 = descMap.data
buttonNumber = (list2[1] as int) + 1
}
Expand Down