From 0d0a3f5ebbb5ed577ef3e33ba01eaaefc32b5c87 Mon Sep 17 00:00:00 2001 From: "Donald C. Kirker" Date: Tue, 26 Jul 2016 06:32:23 -0700 Subject: [PATCH] Protect ternary operations in configure Protect ternary operations against order of operations, resulting in incorrect math and math against null values. --- .../aeon-multisensor-6.src/aeon-multisensor-6.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy b/devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy index 1c6d959..7ff06b6 100644 --- a/devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy +++ b/devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy @@ -329,7 +329,7 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) { def configure() { // allow device user configured or default 16 min to check in; double the periodic reporting interval - sendEvent(name: "checkInterval", value: 2* timeOptionValueMap[reportInterval] ?: 2*8*60, displayed: false) + sendEvent(name: "checkInterval", value: 2* (timeOptionValueMap[reportInterval] ?: (2*8*60)), displayed: false) // This sensor joins as a secure device if you double-click the button to include it log.debug "${device.displayName} is configuring its settings" @@ -357,7 +357,7 @@ def configure() { motionSensitivity == "minimum" ? 0 : 64) //5. report every x minutes (threshold reports don't work on battery power, default 8 mins) - request << zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: timeOptionValueMap[reportInterval] ?: 8*60) //association group 1 + request << zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: timeOptionValueMap[reportInterval] ?: (8*60)) //association group 1 request << zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 6*60*60) //association group 2