Protect ternary operations in configure

Protect ternary operations against order of operations, resulting in incorrect math and math against null values.
Add updated Aeon Multisensor 6 fingerprint
2026-03-10 21:03:04 +00:00 · 2016-07-26 06:32:23 -07:00 · 2016-07-26 05:30:31 -07:00 · 2016-07-22 08:23:51 -05:00 · 2016-07-22 08:16:42 -05:00 · 2016-07-19 15:55:53 -07:00
3 changed files with 6 additions and 4 deletions
--- a/devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy
+++ b/devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy
@@ -29,6 +29,7 @@ metadata {
 		attribute "powerSupply", "enum", ["USB Cable", "Battery"]

 		fingerprint deviceId: "0x2101", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x7A", outClusters: "0x5A"
+		fingerprint deviceId: "0x2101", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x7A,0x5A"
 	}

 	simulator {
@@ -328,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"
@@ -356,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

--- a/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy
@@ -22,6 +22,7 @@ metadata {
 		capability "Refresh"
 		capability "Temperature Measurement"
 		capability "Health Check"
+		capability "Sensor"

 		command "enrollResponse"

--- a/smartapps/smartthings/gentle-wake-up.src/gentle-wake-up.groovy
+++ b/smartapps/smartthings/gentle-wake-up.src/gentle-wake-up.groovy
@@ -237,7 +237,7 @@ def completionPage() {
 		}

 		section("Notifications") {
-			input("recipients", "contact", title: "Send notifications to") {
+			input("recipients", "contact", title: "Send notifications to", required: false) {
 				input(name: "completionPhoneNumber", type: "phone", title: "Text This Number", description: "Phone number", required: false)
 				input(name: "completionPush", type: "bool", title: "Send A Push Notification", description: "Phone number", required: false)
 			}
@@ -720,7 +720,7 @@ def completionPercentage() {

 	def now = new Date().getTime()
 	def timeElapsed = now - atomicState.start
-	def totalRunTime = totalRunTimeMillis()
+	def totalRunTime = totalRunTimeMillis() ?: 1
 	def percentComplete = timeElapsed / totalRunTime * 100
 	log.debug "percentComplete: ${percentComplete}"
Author	SHA1	Message	Date
Donald C. Kirker	0d0a3f5ebb	Protect ternary operations in configure Protect ternary operations against order of operations, resulting in incorrect math and math against null values.	2016-07-26 06:32:23 -07:00
Donald C. Kirker	be7fad76fc	Add updated Aeon Multisensor 6 fingerprint	2016-07-26 05:30:31 -07:00
Steve Vlaminck	f0e87fa5e9	Merge pull request #1070 from vlaminck/DVCSMP-1904 Fix: Gentle Wake Up requires contact input for Contact Book users [DVCSMP-1904]	2016-07-22 08:23:51 -05:00
vlaminck	1b385afa5b	Fix: Gentle Wake Up requires contact input for Contact Book users	2016-07-22 08:16:42 -05:00
Vinay Rao	863c49ffd4	Merge pull request #1066 from SmartThingsCommunity/staging Rolling down staging hotfix to production	2016-07-19 15:55:53 -07:00
Vinay Rao	a86eba494f	Merge pull request #1063 from tslagle13/add-capability-SS-open/closed Add capability sensor to SS Open/Closed	2016-07-18 15:46:21 -07:00
tslagle13	2549372bb7	Add capability sensor to SS Open/Closed There are some integrations out there using the "Actuator" and "Sensor" Capabilities and this doesn't show up for them.	2016-07-18 15:20:06 -07:00
Vinay Rao	2b3a4e1278	Merge pull request #1055 from SmartThingsCommunity/staging Rolling down staging hotfix to master	2016-07-13 19:45:29 -07:00
Steve Vlaminck	bc459ae178	Merge pull request #1051 from vlaminck/GWU-exception-fix fix divide by zero exception [DVCSMP-1891]	2016-07-13 10:01:10 -05:00
vlaminck	1392b6e1a5	fix divide by zero exception	2016-07-13 09:27:23 -05:00