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-04-28 22:06:21 +01: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
2 changed files with 4 additions and 3 deletions
@@ -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

@@ -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)
 			}
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