Merge pull request #2208 from SmartThingsCommunity/staging

Rolling up staging to production

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

@@ -173,11 +173,27 @@ private Map getBatteryResult(rawValue) {
 		} else {
 			def minVolts = 2.4
 			def maxVolts = 2.7
-			def pct = (volts - minVolts) / (maxVolts - minVolts)
-			def roundedPct = Math.round(pct * 100)
-			if (roundedPct <= 0)
-				roundedPct = 1
-			result.value = Math.min(100, roundedPct)
+			// Get the current battery percentage as a multiplier 0 - 1
+			def curValVolts = Integer.parseInt(device.currentState("battery")?.value ?: "100") / 100.0
+			// Find the corresponding voltage from our range
+			curValVolts = curValVolts * (maxVolts - minVolts) + minVolts
+			// Round to the nearest 10th of a volt
+			curValVolts = Math.round(10 * curValVolts) / 10.0
+			// Only update the battery reading if we don't have a last reading,
+			// OR we have received the same reading twice in a row
+			// OR we don't currently have a battery reading
+			// OR the value we just received is at least 2 steps off from the last reported value
+			if(state?.lastVolts == null || state?.lastVolts == volts || device.currentState("battery")?.value == null || Math.abs(curValVolts - volts) > 0.1) {
+				def pct = (volts - minVolts) / (maxVolts - minVolts)
+				def roundedPct = Math.round(pct * 100)
+				if (roundedPct <= 0)
+					roundedPct = 1
+				result.value = Math.min(100, roundedPct)
+			} else {
+				// Don't update as we want to smooth the battery values
+				result = null
+			}
+			state.lastVolts = volts
 		}
 	}
 

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

@@ -275,11 +275,27 @@ private Map getBatteryResult(rawValue) {
 		} else {
 			def minVolts = 2.1
 			def maxVolts = 2.7
-			def pct = (volts - minVolts) / (maxVolts - minVolts)
-			def roundedPct = Math.round(pct * 100)
-			if (roundedPct <= 0)
-				roundedPct = 1
-			result.value = Math.min(100, roundedPct)
+			// Get the current battery percentage as a multiplier 0 - 1
+			def curValVolts = Integer.parseInt(device.currentState("battery")?.value ?: "100") / 100.0
+			// Find the corresponding voltage from our range
+			curValVolts = curValVolts * (maxVolts - minVolts) + minVolts
+			// Round to the nearest 10th of a volt
+			curValVolts = Math.round(10 * curValVolts) / 10.0
+			// Only update the battery reading if we don't have a last reading,
+			// OR we have received the same reading twice in a row
+			// OR we don't currently have a battery reading
+			// OR the value we just received is at least 2 steps off from the last reported value
+			if(state?.lastVolts == null || state?.lastVolts == volts || device.currentState("battery")?.value == null || Math.abs(curValVolts - volts) > 0.1) {
+				def pct = (volts - minVolts) / (maxVolts - minVolts)
+				def roundedPct = Math.round(pct * 100)
+				if (roundedPct <= 0)
+					roundedPct = 1
+				result.value = Math.min(100, roundedPct)
+			} else {
+				// Don't update as we want to smooth the battery values
+				result = null
+			}
+			state.lastVolts = volts
 		}
 	}
 

devicetypes/smartthings/zwave-lock.src/zwave-lock.groovy

@@ -88,19 +88,21 @@ import physicalgraph.zwave.commands.usercodev1.*
 def installed() {
 	// Device-Watch pings if no device events received for 1 hour (checkInterval)
 	sendEvent(name: "checkInterval", value: 1 * 60 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+
+	try {
+		if (!state.init) {
+			state.init = true
+			// Wait long enough for behind-the-scenes z-wave magic to finish, but be quick enough before hub goes back into inclusion and blocks us
+			response(["delay 2000"] + secureSequence([zwave.doorLockV1.doorLockOperationGet(), zwave.batteryV1.batteryGet()], 2200))
+		}
+	} catch (e) {
+		log.warn "installed() threw $e"
+	}
 }
 
 def updated() {
 	// Device-Watch pings if no device events received for 1 hour (checkInterval)
 	sendEvent(name: "checkInterval", value: 1 * 60 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-	try {
-		if (!state.init) {
-			state.init = true
-			response(secureSequence([zwave.doorLockV1.doorLockOperationGet(), zwave.batteryV1.batteryGet()]))
-		}
-	} catch (e) {
-		log.warn "updated() threw $e"
-	}
 }
 
 def parse(String description) {

smartapps/smartthings/text-me-when-theres-motion-and-im-not-here.src/text-me-when-theres-motion-and-im-not-here.groovy

@@ -1,77 +1,77 @@
-/**
- *  Copyright 2015 SmartThings
- *
- *  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.
- *
- *  Text Me When There's Motion and I'm Not Here
- *
- *  Author: SmartThings
- */
-
-definition(
-    name: "Text Me When There's Motion and I'm Not Here",
-    namespace: "smartthings",
-    author: "SmartThings",
-    description: "Send a text message when there is motion while you are away.",
-    category: "Convenience",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Meta/intruder_motion-presence.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Meta/intruder_motion-presence@2x.png"
-)
-
-preferences {
-	section("When there's movement...") {
-		input "motion1", "capability.motionSensor", title: "Where?"
-	}
-	section("While I'm out...") {
-		input "presence1", "capability.presenceSensor", title: "Who?"
-	}
-	section("Text me at...") {
-        input("recipients", "contact", title: "Send notifications to") {
-            input "phone1", "phone", title: "Phone number?"
-        }
-	}
-}
-
-def installed() {
-	subscribe(motion1, "motion.active", motionActiveHandler)
-}
-
-def updated() {
-	unsubscribe()
-	subscribe(motion1, "motion.active", motionActiveHandler)
-}
-
-def motionActiveHandler(evt) {
-	log.trace "$evt.value: $evt, $settings"
-
-	if (presence1.latestValue("presence") == "not present") {
-		// Don't send a continuous stream of text messages
-		def deltaSeconds = 10
-		def timeAgo = new Date(now() - (1000 * deltaSeconds))
-		def recentEvents = motion1.eventsSince(timeAgo)
-		log.debug "Found ${recentEvents?.size() ?: 0} events in the last $deltaSeconds seconds"
-		def alreadySentSms = recentEvents.count { it.value && it.value == "active" } > 1
-
-		if (alreadySentSms) {
-			log.debug "SMS already sent within the last $deltaSeconds seconds"
-		} else {
-            if (location.contactBookEnabled) {
-                log.debug "$motion1 has moved while you were out, sending notifications to: ${recipients?.size()}"
-                sendNotificationToContacts("${motion1.label} ${motion1.name} moved while you were out", recipients)
-            }
-            else {
-                log.debug "$motion1 has moved while you were out, sending text"
-                sendSms(phone1, "${motion1.label} ${motion1.name} moved while you were out")
-            }
-		}
-	} else {
-		log.debug "Motion detected, but presence sensor indicates you are present"
-	}
-}
+/**
+ *  Copyright 2015 SmartThings
+ *
+ *  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.
+ *
+ *  Text Me When There's Motion and I'm Not Here
+ *
+ *  Author: SmartThings
+ */
+
+definition(
+    name: "Text Me When There's Motion and I'm Not Here",
+    namespace: "smartthings",
+    author: "SmartThings",
+    description: "Send a text message when there is motion while you are away.",
+    category: "Convenience",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Meta/intruder_motion-presence.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Meta/intruder_motion-presence@2x.png"
+)
+
+preferences {
+	section("When there's movement...") {
+		input "motion1", "capability.motionSensor", title: "Where?"
+	}
+	section("While I'm out...") {
+		input "presence1", "capability.presenceSensor", title: "Who?"
+	}
+	section("Text me at...") {
+        input("recipients", "contact", title: "Send notifications to") {
+            input "phone1", "phone", title: "Phone number?"
+        }
+	}
+}
+
+def installed() {
+	subscribe(motion1, "motion.active", motionActiveHandler)
+}
+
+def updated() {
+	unsubscribe()
+	subscribe(motion1, "motion.active", motionActiveHandler)
+}
+
+def motionActiveHandler(evt) {
+	log.trace "$evt.value: $evt, $settings"
+
+	if (presence1.latestValue("presence") == "not present") {
+		// Don't send a continuous stream of text messages
+		def deltaSeconds = 10
+		def timeAgo = new Date(now() - (1000 * deltaSeconds))
+		def recentEvents = motion1.eventsSince(timeAgo)
+		log.debug "Found ${recentEvents?.size() ?: 0} events in the last $deltaSeconds seconds"
+		def alreadySentSms = recentEvents.count { it.value && it.value == "active" } > 1
+
+		if (alreadySentSms) {
+			log.debug "SMS already sent within the last $deltaSeconds seconds"
+		} else {
+            if (location.contactBookEnabled) {
+                log.debug "$motion1 has moved while you were out, sending notifications to: ${recipients?.size()}"
+                sendNotificationToContacts("${motion1.label} ${motion1.name} moved while you were out", recipients)
+            }
+            else {
+                log.debug "$motion1 has moved while you were out, sending text"
+                sendSms(phone1, "${motion1.label} ${motion1.name} moved while you were out")
+            }
+		}
+	} else {
+		log.debug "Motion detected, but presence sensor indicates you are present"
+	}
+}