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-26 22:06:14 +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 · 2016-07-19 15:55:53 -07:00
16 changed files with 115 additions and 153 deletions
@@ -22,12 +22,14 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
+		capability "Health Check"

 		attribute "tamper", "enum", ["detected", "clear"]
 		attribute "batteryStatus", "string"
 		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 {
@@ -326,6 +328,9 @@ 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)
+
 	// This sensor joins as a secure device if you double-click the button to include it
 	log.debug "${device.displayName} is configuring its settings"
 	def request = []
@@ -352,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

@@ -20,6 +20,9 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
+		capability "Health Check"
+
+		command "configureAfterSecure"

 		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x98,0x7A", outClusters:"0x5A"
 	}
@@ -245,6 +248,8 @@ def configureAfterSecure() {
 def configure() {
 	// log.debug "configure()"
    //["delay 30000"] + secure(zwave.securityV1.securityCommandsSupportedGet())
+	// allow device 16 min to check in; double the periodic reporting interval
+	sendEvent(name: "checkInterval", value: 2*8*60, displayed: false)
 }

 private setConfigured() {
@@ -20,6 +20,7 @@ metadata {
 		capability "Illuminance Measurement"
 		capability "Sensor"
 		capability "Battery"
+		capability "Health Check"

 		fingerprint deviceId: "0x2001", inClusters: "0x30,0x31,0x80,0x84,0x70,0x85,0x72,0x86"
 	}
@@ -180,6 +181,9 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }

 def configure() {
+	// allow device 10 min to check in; double the periodic reporting interval
+	sendEvent(name: "checkInterval", value: 2*5*60, displayed: false)
+
 	delayBetween([
 		// send binary sensor report instead of basic set for motion
 		zwave.configurationV1.configurationSet(parameterNumber: 5, size: 1, scaledConfigurationValue: 2).format(),
@@ -255,7 +255,8 @@ private Map getBatteryResult(rawValue) {
 				def minVolts = 2.1
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
-				result.value = Math.min(100, (int) pct * 100)
+				def roundedPct = Math.round(pct * 100)
+				result.value = Math.min(100, roundedPct)
 				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}
 		}
@@ -271,7 +271,8 @@ private Map getBatteryResult(rawValue) {
 				def minVolts = 2.1
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
-				result.value = Math.min(100, (int) pct * 100)
+				def roundedPct = Math.round(pct * 100)
+				result.value = Math.min(100, roundedPct)
 				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}
 		}
@@ -240,7 +240,8 @@ private Map getBatteryResult(rawValue) {
 			def minVolts = 2.1
 			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
-			result.value = Math.min(100, (int) pct * 100)
+			def roundedPct = Math.round(pct * 100)
+			result.value = Math.min(100, roundedPct)
 			result.descriptionText = "${linkText} battery was ${result.value}%"
 		}
 	}
@@ -338,7 +338,8 @@ private Map getBatteryResult(rawValue) {
 				def minVolts = 2.1
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
-				result.value = Math.min(100, (int) pct * 100)
+				def roundedPct = Math.round(pct * 100)
+				result.value = Math.min(100, roundedPct)
 				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}
 		}
@@ -234,7 +234,8 @@ def getTemperature(value) {
 			def minVolts = 2.1
 			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
-			result.value = Math.min(100, (int) pct * 100)
+			def roundedPct = Math.round(pct * 100)
+			result.value = Math.min(100, roundedPct)
 			result.descriptionText = "${linkText} battery was ${result.value}%"
 		}

@@ -22,6 +22,7 @@ metadata {
 		capability "Refresh"
 		capability "Temperature Measurement"
 		capability "Health Check"
+		capability "Sensor"

 		command "enrollResponse"

@@ -229,7 +230,8 @@ private Map getBatteryResult(rawValue) {
 		def minVolts = 2.1
    	def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
-		result.value = Math.min(100, (int) pct * 100)
+		def roundedPct = Math.round(pct * 100)
+		result.value = Math.min(100, roundedPct)
 		result.descriptionText = "${linkText} battery was ${result.value}%"
 	}

@@ -205,7 +205,8 @@ private Map getBatteryResult(rawValue) {
 		def minVolts = 2.1
    	def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
-		result.value = Math.min(100, (int) pct * 100)
+		def roundedPct = Math.round(pct * 100)
+		result.value = Math.min(100, roundedPct)
 		result.descriptionText = "${linkText} battery was ${result.value}%"
 	}

@@ -223,7 +223,8 @@ private Map getBatteryResult(rawValue) {
 		def minVolts = 2.1
    	def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
-		result.value = Math.min(100, (int) pct * 100)
+		def roundedPct = Math.round(pct * 100)
+		result.value = Math.min(100, roundedPct)
 		result.descriptionText = "${linkText} battery was ${result.value}%"
 	}

@@ -28,7 +28,6 @@ metadata {
 		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x98"
 		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x86,0x72,0x98", outClusters: "0x5A,0x82"
 		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x80,0x71,0x85,0x70,0x72,0x86,0x30,0x31,0x84,0x59,0x73,0x5A,0x8F,0x98,0x7A", outClusters:"0x20" // Philio multi+
-		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x72,0x5A,0x80,0x73,0x84,0x85,0x59,0x71,0x70,0x7A,0x98" // Vision door/window
 	}

 	// simulator metadata
@@ -36,6 +35,7 @@ metadata {
 		// status messages
 		status "open":  "command: 2001, payload: FF"
 		status "closed": "command: 2001, payload: 00"
+		status "wake up": "command: 8407, payload: "
 	}

 	// UI tile definitions
@@ -83,12 +83,12 @@ def updated() {
 		cmds = [
 			command(zwave.manufacturerSpecificV2.manufacturerSpecificGet()),
 			"delay 1200",
-			zwave.wakeUpV1.wakeUpNoMoreInformation()
+			zwave.wakeUpV1.wakeUpNoMoreInformation().format()
 		]
 	} else if (!state.lastbat) {
 		cmds = []
 	} else {
-		cmds = [zwave.wakeUpV1.wakeUpNoMoreInformation()]
+		cmds = [zwave.wakeUpV1.wakeUpNoMoreInformation().format()]
 	}
 	response(cmds)
 }
@@ -175,7 +175,7 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd)
 	if (!state.lastbat || now() - state.lastbat > 53*60*60*1000) {
 		cmds << command(zwave.batteryV1.batteryGet())
 	} else {
-		cmds << zwave.wakeUpV1.wakeUpNoMoreInformation()
+		cmds << zwave.wakeUpV1.wakeUpNoMoreInformation().format()
 	}
 	[event, response(cmds)]
 }
@@ -1,61 +0,0 @@
-/**
- *  Use Switch to Control Outlets
- *
- *  Copyright 2016 Mark Vickstrom
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-definition(
-    name: "Use Switch to Control Outlets",
-    namespace: "mdvickst",
-    author: "Mark Vickstrom",
-    description: "Use a Switch to control multiple outlets",
-    category: "Convenience",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
-
-
-preferences {
-	section("Use this Switch") {
-		input "triggerSwitch", "capability.switch", title: "Which Switch?", required: true
-	}
-    section("To Control these Devices") {
-    	input "switchesToControl", "capability.switch", title: "Which Outlets/Switches?", multiple: true, required: true
-    }
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-	initialize()
-}
-
-def initialize() {
-	subscribe(triggerSwitch, "switch", triggerSwitchPressed)
-}
-
-def triggerSwitchPressed(evt){
-    if (evt.value == "on") {
-        log.debug "swtich pressed On"
-        switchesToControl?.on()
-    } else if (evt.value == "off") {
-        log.debug "swtich pressed Off"
-        switchesToControl?.off()
-    }
-}
@@ -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}"

@@ -689,7 +689,7 @@ def parse(childDevice, description) {
            	log.warn "Parsing Body failed - trying again..."
                poll()
            }
-            if (body instanceof java.util.HashMap) {
+            if (body instanceof java.util.Map) {
            	//poll response
                def bulbs = getChildDevices()
                for (bulb in body) {
@@ -688,7 +688,7 @@ def validateCommand(device, command) {
 	def capabilityCommands = getDeviceCapabilityCommands(device.capabilities)
 	def currentDeviceCapability = getCapabilityName(device)
 	if (currentDeviceCapability != "" && capabilityCommands[currentDeviceCapability]) {
-		return command in capabilityCommands[currentDeviceCapability] ? true : false
+    return (command in capabilityCommands[currentDeviceCapability] || (currentDeviceCapability == "Switch" && command == "setLevel" && device.hasCommand("setLevel"))) ? true : false
 	} else {
 		// Handling other device types here, which don't accept commands
 		httpError(400, "Bad request.")
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	2f0d8d814b	Merge pull request #1064 from SmartThingsCommunity/production Rolling down production hotfix to staging	2016-07-19 15:06:43 -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	38cdde7479	Merge pull request #1057 from SmartThingsCommunity/DVCSMP-1892 DVCSMP-1892 Fix error in Z-Wave Door/Window Sensor wake up handler	2016-07-14 10:54:36 -07:00
Duncan McKee	853f616cc8	DVCSMP-1892 Fix error in Z-Wave Door/Window Sensor wake up handler	2016-07-14 13:51:36 -04: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
Vinay Rao	825e693efd	Merge pull request #1054 from SmartThingsCommunity/production Rolling down prod hotfix to staging	2016-07-13 19:44:57 -07:00
Vinay Rao	686c8f7337	Merge pull request #1053 from rappleg/FixFalseBatteryNotificationOnNewerGroovyVersion PRP-192 Fix false low battery notifications on Groovy 2.4.4	2016-07-13 19:40:55 -07:00
rappleg	11f4e42fe9	PRP-192 Fix false low battery notifications on Groovy 2.4.4	2016-07-13 21:22:57 -05: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
Vinay Rao	3db96faa00	Merge pull request #1049 from SmartThingsCommunity/master Rolling up master to staging	2016-07-12 15:04:26 -07:00
Vinay Rao	399fbcb676	Merge pull request #1048 from SmartThingsCommunity/staging Rolling down staging hotfix to master	2016-07-12 15:03:28 -07:00
Vinay Rao	eed1ced71b	Merge pull request #1047 from SmartThingsCommunity/staging Rolling up staging for production deploy	2016-07-12 14:33:19 -07:00
Vinay Rao	d080833d5c	Merge pull request #1046 from SmartThingsCommunity/production Rolling down production hotfix to staging	2016-07-12 14:26:10 -07:00
Vinay Rao	e998528e8e	Merge pull request #1041 from rappleg/ProductionFixJsonSlurperHashMap PRP-172 Fix Hue Connect parse errors on newer versions of Groovy	2016-07-11 23:49:10 -07:00
Jack Chi	3472ee329d	Merge pull request #1036 from jackchi/healthcheck-zwave-aeon [CHF-138] Adds HealthCheck to Z-Wave Sensors	2016-07-11 11:21:30 -07:00
Juan Pablo Risso	577b127287	PRP-151 Harmony cloud fix + PENG-161 - Allow setLevel (#1035 ) * PRP-151 - Harmony Cloud Added is IP Try around Integer.parseInt declare int p outside try * Remove unsubscribe & unschedule * PENG-161 - Allow setLevel for switch capability Last version	2016-07-11 10:04:32 -04:00
rappleg	d85566bb98	PRP-172 Fix Hue Connect parse errors on newer versions of Groovy	2016-07-10 15:35:12 -05:00
jackchi	5f41af35e2	[CHF-138] Adds HealthCheck to Z-Wave Sensors	2016-07-08 15:36:58 -07:00
Duncan McKee	e1a5b4dd27	Merge pull request #1034 from SmartThingsCommunity/DVCSMP-1879 DVCSMP-1879 Fix error in Z-Wave Door/Window Sensor throwing exceptions on update	2016-07-06 17:43:42 -04:00
Duncan McKee	a2baa37901	DVCSMP-1879 Fix error in Z-Wave Door/Window Sensor throwing exceptions on update	2016-07-06 17:08:15 -04:00
Vinay Rao	922ab45343	Merge pull request #1033 from SmartThingsCommunity/master Rolling up master to staging for deploy	2016-07-06 13:59:03 -07:00