Merge pull request #2208 from SmartThingsCommunity/staging

Rolling up staging to production
Merge pull request #2196 from varzac/smartsense-battery-smoothing
2026-03-09 21:03:00 +00:00 · 2017-08-01 12:24:56 -07:00 · 2017-07-27 13:11:04 -07:00 · 2017-07-27 11:19:31 -05:00 · 2017-07-26 14:27:39 -07:00 · 2017-07-25 16:47:54 -07:00
3 changed files with 52 additions and 18 deletions
--- a/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
+++ b/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
 		}
 	}

--- a/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
+++ b/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
 		}
 	}

--- a/devicetypes/smartthings/zwave-lock.src/zwave-lock.groovy
+++ b/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) {
Author	SHA1	Message	Date
Vinay Rao	1977b5c2cc	Merge pull request #2208 from SmartThingsCommunity/staging Rolling up staging to production	2017-08-01 12:24:56 -07:00
Vinay Rao	8bd02707f4	Merge pull request #2196 from varzac/smartsense-battery-smoothing Smooth battery values for smartsense devices	2017-07-27 13:11:04 -07:00
Zach Varberg	c86d61a862	Smooth battery values for smartsense devices Since we have been receiving a lot of reports and complaints about the battery readings on the smartsense devices that received battery updates (multi and motion), we are adding this code to smooth out the readings so it doesn't constantly oscillate between two values. The basic logic is, only create an event if we have two readings in a row that are the same, or a reading is more than 100 millivolts off of the current battery percentage.	2017-07-27 11:19:31 -05:00
Vinay Rao	8126203164	Merge pull request #2156 from dkirker/ICP-1267 ICP-1267 Move lock state check code from updated() to installed() to reduce chance that hub has gone back to pjoin mode thus blocking Z-Wave.	2017-07-26 14:27:39 -07:00
Vinay Rao	04f56060c9	Merge pull request #2194 from SmartThingsCommunity/master Rolling up master to staging	2017-07-25 16:47:54 -07:00
Vinay Rao	f6e99745ce	Merge pull request #2192 from SmartThingsCommunity/staging Rolling up staging to production	2017-07-25 15:39:20 -07:00
Donald Kirker	f1a8d58c40	ICP-1267 Call lock state check code from installed() with precise timing to threduce chance that hub has gone back to pjoin mode thus blocking Z-Wave.	2017-07-21 21:44:44 -07:00
Vinay Rao	fc70b5ce55	Merge pull request #2167 from SmartThingsCommunity/staging Rolling up staging to production	2017-07-18 11:43:24 -07:00
Vinay Rao	6996a07969	Merge pull request #2153 from SmartThingsCommunity/staging Rolling up staging to production	2017-07-11 13:59:29 -07:00
Vinay Rao	728b169a08	Merge pull request #2143 from SmartThingsCommunity/staging Rolling up staging to production	2017-07-05 14:16:16 -07:00