mtan93/SmartThingsPublic
1
0
Fork 0
mirror of https://github.com/mtan93/SmartThingsPublic.git synced 2026-04-12 22:05:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fibaro Smoke Sensor: send commands to update tiles during joining process, add save nav operator to MSR

Browse Source
This commit is contained in:
Warodom Khamphanchai
2015-10-08 15:29:27 -07:00
parent f6791d1744
commit 9ff67e9e17
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
devicetypes/smartthings/fibaro-smoke-sensor.src/fibaro-smoke-sensor.groovy
View File

@@ -177,7 +177,7 @@ def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityCommandsSupported
log.info "Executing zwaveEvent 98 (SecurityV1): 03 (SecurityCommandsSupportedReport) with cmd: $cmd" log.info "Executing zwaveEvent 98 (SecurityV1): 03 (SecurityCommandsSupportedReport) with cmd: $cmd"
setSecured() setSecured()
log.info "checking this MSR : ${getDataValue("MSR")} before sending configuration to device" log.info "checking this MSR : ${getDataValue("MSR")} before sending configuration to device"
if (getDataValue("MSR").startsWith("010F-0C02")){ if (getDataValue("MSR")?.startsWith("010F-0C02")){
response(configure()) //configure device using SmartThings default settings response(configure()) //configure device using SmartThings default settings
} }
} }
@@ -188,7 +188,7 @@ def zwaveEvent(physicalgraph.zwave.commands.securityv1.NetworkKeyVerify cmd) {
//after device securely joined the network, call configure() to config device //after device securely joined the network, call configure() to config device
setSecured() setSecured()
log.info "checking this MSR : ${getDataValue("MSR")} before sending configuration to device" log.info "checking this MSR : ${getDataValue("MSR")} before sending configuration to device"
if (getDataValue("MSR").startsWith("010F-0C02")){ if (getDataValue("MSR")?.startsWith("010F-0C02")){
response(configure()) //configure device using SmartThings default settings response(configure()) //configure device using SmartThings default settings
} }
} }
@@ -267,17 +267,17 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd) {
log.info "checking this MSR : ${getDataValue("MSR")} before sending configuration to device" log.info "checking this MSR : ${getDataValue("MSR")} before sending configuration to device"
def result = [createEvent(descriptionText: "${device.displayName} woke up", isStateChange: false)] def result = [createEvent(descriptionText: "${device.displayName} woke up", isStateChange: false)]
/* check MSR = "manufacturerId-productTypeId" to make sure configuration commands are sent to the right model */ /* check MSR = "manufacturerId-productTypeId" to make sure configuration commands are sent to the right model */
if (!isConfigured() && getDataValue("MSR").startsWith("010F-0C02")) { if (!isConfigured() && getDataValue("MSR")?.startsWith("010F-0C02")) {
result += response(configure()) // configure a newly joined device or joined device with preference update result << response(configure()) // configure a newly joined device or joined device with preference update
} else { } else {
//Only ask for battery if we havn't had a BatteryReport in a while //Only ask for battery if we havn't had a BatteryReport in a while
if (!state.lastbatt || (new Date().time) - state.lastbatt > 24*60*60*1000) { if (!state.lastbatt || (new Date().time) - state.lastbatt > 24*60*60*1000) {
log.debug("Device has been configured sending >> batteryGet()") log.debug("Device has been configured sending >> batteryGet()")
result += response(zwave.batteryV1.batteryGet()) result << response(zwave.securityV1.securityMessageEncapsulation().encapsulate(zwave.batteryV1.batteryGet()).format())
result += response("delay 1200") // leave time for device to respond to batteryGet result << response("delay 1200") // leave time for device to respond to batteryGet
} }
log.debug("Device has been configured sending >> wakeUpNoMoreInformation()") log.debug("Device has been configured sending >> wakeUpNoMoreInformation()")
result += response(zwave.wakeUpV1.wakeUpNoMoreInformation()) //tell device back to sleep result << response(zwave.wakeUpV1.wakeUpNoMoreInformation().format()) //tell device back to sleep
} }
result result
} }
@@ -312,8 +312,11 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
def result = [] def result = []
def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId) def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId)
updateDataValue("MSR", msr) updateDataValue("MSR", msr)
result << createEvent(descriptionText: "$device.displayName MSR: $msr", isStateChange: false) log.debug "After device is securely joined, send commands to update tiles"
result result << zwave.batteryV1.batteryGet()
result << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 0x01)
result << zwave.wakeUpV1.wakeUpNoMoreInformation()
[[descriptionText:"${device.displayName} MSR report"], response(commands(result, 5000))]
} }
def zwaveEvent(physicalgraph.zwave.commands.associationv2.AssociationReport cmd) { def zwaveEvent(physicalgraph.zwave.commands.associationv2.AssociationReport cmd) {