From 90e91e9231c3668efd67f09cbb027fde2ba6c4ec Mon Sep 17 00:00:00 2001 From: Konrad Klimczuk Date: Fri, 4 Sep 2020 10:37:36 +0200 Subject: [PATCH 1/4] ICP-11574_2 - query device for current status in response to WakeUpNotification. --- .../zwave-basic-smoke-alarm.groovy | 4 ++-- .../zwave-smoke-alarm.src/zwave-smoke-alarm.groovy | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy b/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy index 3d4dd97e472..5f7d1db7632 100644 --- a/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy +++ b/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy @@ -195,12 +195,12 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd, res zwave.notificationV3.notificationGet(notificationType: 0x01).format(), zwave.batteryV1.batteryGet().format(), zwave.wakeUpV1.wakeUpNoMoreInformation().format() - ]), 2000 ) + ], 2000)) } else { results << response(delayBetween([ zwave.notificationV3.notificationGet(notificationType: 0x01).format(), zwave.wakeUpV1.wakeUpNoMoreInformation().format() - ]), 2000 ) + ], 2000)) } } diff --git a/devicetypes/smartthings/zwave-smoke-alarm.src/zwave-smoke-alarm.groovy b/devicetypes/smartthings/zwave-smoke-alarm.src/zwave-smoke-alarm.groovy index ab720ea56c3..e09023afd4f 100644 --- a/devicetypes/smartthings/zwave-smoke-alarm.src/zwave-smoke-alarm.groovy +++ b/devicetypes/smartthings/zwave-smoke-alarm.src/zwave-smoke-alarm.groovy @@ -195,12 +195,12 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd, res zwave.notificationV3.notificationGet(notificationType: 0x01).format(), zwave.batteryV1.batteryGet().format(), zwave.wakeUpV1.wakeUpNoMoreInformation().format() - ]), 2000 ) + ], 2000)) } else { results << response(delayBetween([ zwave.notificationV3.notificationGet(notificationType: 0x01).format(), zwave.wakeUpV1.wakeUpNoMoreInformation().format() - ]), 2000 ) + ], 2000)) } } From ede653fe80f2b87b3d84e1485dde05d0f2d3e486 Mon Sep 17 00:00:00 2001 From: Konrad Klimczuk Date: Fri, 4 Sep 2020 10:37:36 +0200 Subject: [PATCH 2/4] ICP-11574_2 - query device for current status in response to WakeUpNotification. --- .../zwave-basic-smoke-alarm.groovy | 4 ++-- .../zwave-smoke-alarm.src/zwave-smoke-alarm.groovy | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy b/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy index 3d4dd97e472..5f7d1db7632 100644 --- a/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy +++ b/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy @@ -195,12 +195,12 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd, res zwave.notificationV3.notificationGet(notificationType: 0x01).format(), zwave.batteryV1.batteryGet().format(), zwave.wakeUpV1.wakeUpNoMoreInformation().format() - ]), 2000 ) + ], 2000)) } else { results << response(delayBetween([ zwave.notificationV3.notificationGet(notificationType: 0x01).format(), zwave.wakeUpV1.wakeUpNoMoreInformation().format() - ]), 2000 ) + ], 2000)) } } diff --git a/devicetypes/smartthings/zwave-smoke-alarm.src/zwave-smoke-alarm.groovy b/devicetypes/smartthings/zwave-smoke-alarm.src/zwave-smoke-alarm.groovy index ab720ea56c3..e09023afd4f 100644 --- a/devicetypes/smartthings/zwave-smoke-alarm.src/zwave-smoke-alarm.groovy +++ b/devicetypes/smartthings/zwave-smoke-alarm.src/zwave-smoke-alarm.groovy @@ -195,12 +195,12 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd, res zwave.notificationV3.notificationGet(notificationType: 0x01).format(), zwave.batteryV1.batteryGet().format(), zwave.wakeUpV1.wakeUpNoMoreInformation().format() - ]), 2000 ) + ], 2000)) } else { results << response(delayBetween([ zwave.notificationV3.notificationGet(notificationType: 0x01).format(), zwave.wakeUpV1.wakeUpNoMoreInformation().format() - ]), 2000 ) + ], 2000)) } } From d2fce3a5be0de67b23501c7d244a37f8c0e03bab Mon Sep 17 00:00:00 2001 From: "k.klimczuk2" Date: Mon, 7 Sep 2020 11:38:55 +0200 Subject: [PATCH 3/4] ICP-11574 - configure wake up interval --- .../zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy b/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy index 5f7d1db7632..bd567d45c20 100644 --- a/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy +++ b/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy @@ -252,5 +252,6 @@ def initialPoll() { // check initial battery and smoke sensor state request << zwave.batteryV1.batteryGet() request << zwave.sensorBinaryV2.sensorBinaryGet(sensorType: zwave.sensorBinaryV2.SENSOR_TYPE_SMOKE) + request << zwave.wakeUpV1.wakeUpIntervalSet(seconds: 3600, nodeid: zwaveHubNodeId) commands(request, 500) + ["delay 6000", command(zwave.wakeUpV1.wakeUpNoMoreInformation())] } From 6cc7cd60a7dbc0a00f7c60bf550ca2414b4a6265 Mon Sep 17 00:00:00 2001 From: Steven Green Date: Tue, 8 Sep 2020 10:48:25 -0700 Subject: [PATCH 4/4] remove wakeup interval set --- .../zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy b/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy index bd567d45c20..5f7d1db7632 100644 --- a/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy +++ b/devicetypes/smartthings/zwave-basic-smoke-alarm.src/zwave-basic-smoke-alarm.groovy @@ -252,6 +252,5 @@ def initialPoll() { // check initial battery and smoke sensor state request << zwave.batteryV1.batteryGet() request << zwave.sensorBinaryV2.sensorBinaryGet(sensorType: zwave.sensorBinaryV2.SENSOR_TYPE_SMOKE) - request << zwave.wakeUpV1.wakeUpIntervalSet(seconds: 3600, nodeid: zwaveHubNodeId) commands(request, 500) + ["delay 6000", command(zwave.wakeUpV1.wakeUpNoMoreInformation())] }