Merge pull request #443 from tpmanley/feature/sensor_updates

Feature/sensor updates

devicetypes/smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy

@@ -88,31 +88,37 @@ private handleReportAttributeMessage(String description) {
     }
 }
 
-private handleBatteryEvent(rawValue) {
+/**
-    def linkText = getLinkText(device)
+ * Create battery event from reported battery voltage.
-
+ *
-    def eventMap = [
+ * @param volts Battery voltage in .1V increments
-        name: 'battery',
+ */
-        value: '--'
+private handleBatteryEvent(volts) {
-    ]
+    if (volts == 0 || volts == 255) {
-
+        log.debug "Ignoring invalid value for voltage (${volts/10}V)"
-    def volts = rawValue / 10
+    }
-    if (volts > 0){
+    else {
-        def minVolts = 2.0
+        def batteryMap = [28:100, 27:100, 26:100, 25:90, 24:90, 23:70,
-        def maxVolts = 2.8
+                          22:70, 21:50, 20:50, 19:30, 18:30, 17:15, 16:1, 15:0]
+        def minVolts = 15
+        def maxVolts = 28
 
         if (volts < minVolts)
             volts = minVolts
         else if (volts > maxVolts)
             volts = maxVolts
-        def pct = (volts - minVolts) / (maxVolts - minVolts)
+        def pct = batteryMap[volts]
-
+        if (pct != null) {
-        eventMap.value = Math.round(pct * 100)
+            def linkText = getLinkText(device)
-        eventMap.descriptionText = "${linkText} battery was ${eventMap.value}%"
+            def eventMap = [
-    }
+                name: 'battery',
-
+                value: pct,
-    log.debug "Creating battery event: ${eventMap}"
+                descriptionText: "${linkText} battery was ${pct}%"
+            ]
+            log.debug "Creating battery event for voltage=${volts/10}V: ${eventMap}"
             sendEvent(eventMap)
+        }
+    }
 }
 
 private handlePresenceEvent(present) {

devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy

@@ -215,18 +215,39 @@ def getTemperature(value) {
 }
 
 private Map getBatteryResult(rawValue) {
-	log.debug 'Battery'
+	log.debug "Battery rawValue = ${rawValue}"
 	def linkText = getLinkText(device)
 
 	def result = [
-    	name: 'battery'
+		name: 'battery',
+		value: '--'
 	]
 
 	def volts = rawValue / 10
-	def descriptionText
+
+	if (rawValue == 0 || rawValue == 255) {}
+	else {
 		if (volts > 3.5) {
 			result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
 		}
+		else {
+			if (device.getDataValue("manufacturer") == "SmartThings") {
+				volts = rawValue // For the batteryMap to work the key needs to be an int
+				def batteryMap = [28:100, 27:100, 26:100, 25:90, 24:90, 23:70,
+								  22:70, 21:50, 20:50, 19:30, 18:30, 17:15, 16:1, 15:0]
+				def minVolts = 15
+				def maxVolts = 28
+
+				if (volts < minVolts)
+					volts = minVolts
+				else if (volts > maxVolts)
+					volts = maxVolts
+				def pct = batteryMap[volts]
+				if (pct != null) {
+					result.value = pct
+					result.descriptionText = "${linkText} battery was ${result.value}%"
+				}
+			}
 			else {
 				def minVolts = 2.1
 				def maxVolts = 3.0
@@ -234,6 +255,8 @@ private Map getBatteryResult(rawValue) {
 				result.value = Math.min(100, (int) pct * 100)
 				result.descriptionText = "${linkText} battery was ${result.value}%"
 			}
+		}
+	}
 
 	return result
 }

devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy

@@ -230,25 +230,40 @@ def getTemperature(value) {
 }
 
 private Map getBatteryResult(rawValue) {
-	log.debug 'Battery'
+	log.debug "Battery rawValue = ${rawValue}"
 	def linkText = getLinkText(device)
 
-	log.debug rawValue
-
 	def result = [
 		name: 'battery',
 		value: '--'
 	]
 
 	def volts = rawValue / 10
-	def descriptionText
 
-	if (rawValue == 0) {}
+	if (rawValue == 0 || rawValue == 255) {}
 	else {
 		if (volts > 3.5) {
 			result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
 		}
-		else if (volts > 0){
+		else {
+			if (device.getDataValue("manufacturer") == "SmartThings") {
+				volts = rawValue // For the batteryMap to work the key needs to be an int
+				def batteryMap = [28:100, 27:100, 26:100, 25:90, 24:90, 23:70,
+								  22:70, 21:50, 20:50, 19:30, 18:30, 17:15, 16:1, 15:0]
+				def minVolts = 15
+				def maxVolts = 28
+
+				if (volts < minVolts)
+					volts = minVolts
+				else if (volts > maxVolts)
+					volts = maxVolts
+				def pct = batteryMap[volts]
+				if (pct != null) {
+					result.value = pct
+					result.descriptionText = "${linkText} battery was ${result.value}%"
+				}
+			}
+			else {
 				def minVolts = 2.1
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
@@ -256,6 +271,7 @@ private Map getBatteryResult(rawValue) {
 				result.descriptionText = "${linkText} battery was ${result.value}%"
 			}
 		}
+	}
 
 	return result
 }

devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy

@@ -14,7 +14,7 @@
  *
  */
 
- metadata {
+metadata {
 	definition (name: "SmartSense Multi Sensor", namespace: "smartthings", author: "SmartThings") {
 
 		capability "Three Axis"
@@ -141,7 +141,7 @@ def parse(String description) {
 	return result
 }
 
- private Map parseCatchAllMessage(String description) {
+private Map parseCatchAllMessage(String description) {
 	Map resultMap = [:]
 	def cluster = zigbee.parse(description)
 	log.debug cluster
@@ -166,7 +166,7 @@ def parse(String description) {
 	}
 
 	return resultMap
-    }
+}
 
 private boolean shouldProcessMessage(cluster) {
 	// 0x0B is default response indicating message got through
@@ -302,9 +302,8 @@ def getTemperature(value) {
 		}
 	}
 
-	private Map getBatteryResult(rawValue) {
+private Map getBatteryResult(rawValue) {
-		log.debug "Battery"
+	log.debug "Battery rawValue = ${rawValue}"
-        log.debug rawValue
 	def linkText = getLinkText(device)
 
 	def result = [
@@ -313,26 +312,44 @@ def getTemperature(value) {
 	]
 
 	def volts = rawValue / 10
-		def descriptionText
 
-        if (rawValue == 255) {}
+	if (rawValue == 0 || rawValue == 255) {}
 	else {
-		
 		if (volts > 3.5) {
 			result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
 		}
+		else {
+			if (device.getDataValue("manufacturer") == "SmartThings") {
+				volts = rawValue // For the batteryMap to work the key needs to be an int
+				def batteryMap = [28:100, 27:100, 26:100, 25:90, 24:90, 23:70,
+								  22:70, 21:50, 20:50, 19:30, 18:30, 17:15, 16:1, 15:0]
+				def minVolts = 15
+				def maxVolts = 28
+
+				if (volts < minVolts)
+					volts = minVolts
+				else if (volts > maxVolts)
+					volts = maxVolts
+				def pct = batteryMap[volts]
+				if (pct != null) {
+					result.value = pct
+					result.descriptionText = "${linkText} battery was ${result.value}%"
+				}
+			}
 			else {
 				def minVolts = 2.1
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				result.value = Math.min(100, (int) pct * 100)
 				result.descriptionText = "${linkText} battery was ${result.value}%"
-		}}
+			}
-
+		}
-		return result
 	}
 
-	private Map getTemperatureResult(value) {
+	return result
+}
+
+private Map getTemperatureResult(value) {
 	log.debug "Temperature"
 	def linkText = getLinkText(device)
 	if (tempOffset) {
@@ -346,17 +363,17 @@ def getTemperature(value) {
 	value: value,
 	descriptionText: descriptionText
 	]
-	}
+}
 
-	private Map getContactResult(value) {
+private Map getContactResult(value) {
 	log.debug "Contact"
 	def linkText = getLinkText(device)
 	def descriptionText = "${linkText} was ${value == 'open' ? 'opened' : 'closed'}"
 	sendEvent(name: 'contact', value: value, descriptionText: descriptionText, displayed:false)
 	sendEvent(name: 'status', value: value, descriptionText: descriptionText)
-	}
+}
 
-	private getAccelerationResult(numValue) {
+private getAccelerationResult(numValue) {
 	log.debug "Acceleration"
 	def name = "acceleration"
 	def value = numValue.endsWith("1") ? "active" : "inactive"
@@ -369,18 +386,16 @@ def getTemperature(value) {
 		descriptionText: descriptionText,
 		isStateChange: isStateChange
 	]
-	}
+}
 
-	def refresh() {
+def refresh() {
 	log.debug "Refreshing Values "
 
 	def refreshCmds = []
 
 	if (device.getDataValue("manufacturer") == "SmartThings") {
-        	
 		log.debug "Refreshing Values for manufacturer: SmartThings "
 		refreshCmds = refreshCmds + [
-
 			/* These values of Motion Threshold Multiplier(01) and Motion Threshold (7602)
 				seem to be giving pretty accurate results for the XYZ co-ordinates for this manufacturer.
 				Separating these out in a separate if-else because I do not want to touch Centralite part
@@ -394,13 +409,9 @@ def getTemperature(value) {
 			"zcl mfg-code ${manufacturerCode}", "delay 200",
 			"zcl global write 0xFC02 2 0x21 {7602}", "delay 200",
 			"send 0x${device.deviceNetworkId} 1 1", "delay 400",
-                
 		]
-            
-        
 	} else {
 		refreshCmds = refreshCmds + [
-
 			/* sensitivity - default value (8) */
 			"zcl mfg-code ${manufacturerCode}", "delay 200",
 			"zcl global write 0xFC02 0 0x20 {02}", "delay 200",
@@ -419,15 +430,13 @@ def getTemperature(value) {
 	]
 
 	return refreshCmds + enrollResponse()
-	}
+}
-
-	def configure() {
 
+def configure() {
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting"
 
 	def configCmds = [
-
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
@@ -455,7 +464,6 @@ def getTemperature(value) {
 		"zcl mfg-code ${manufacturerCode}",
 		"zcl global send-me-a-report 0xFC02 0x0014 0x29 1 3600 {01}",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
-
 		]
 
 	return configCmds + refresh()
@@ -582,5 +590,3 @@ private byte[] reverseArray(byte[] array) {
 	}
 	return array
 }
-
-