mtan93/SmartThingsPublic
1
0
Fork 0
mirror of https://github.com/mtan93/SmartThingsPublic.git synced 2026-03-08 21:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2209 from SmartThingsCommunity/staging

Browse Source 
Rolling down staging to master
This commit is contained in:
Vinay Rao
2017-08-01 13:52:23 -07:00
committed by GitHub
parent 215253d6d3 8bd02707f4
commit dadefdfda2
3 changed files with 52 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
View File

@@ -173,11 +173,27 @@ private Map getBatteryResult(rawValue) {
} else { } else {
def minVolts = 2.4 def minVolts = 2.4
def maxVolts = 2.7 def maxVolts = 2.7
def pct = (volts - minVolts) / (maxVolts - minVolts) // Get the current battery percentage as a multiplier 0 - 1
def roundedPct = Math.round(pct * 100) def curValVolts = Integer.parseInt(device.currentState("battery")?.value ?: "100") / 100.0
if (roundedPct <= 0) // Find the corresponding voltage from our range
roundedPct = 1 curValVolts = curValVolts * (maxVolts - minVolts) + minVolts
result.value = Math.min(100, roundedPct) // 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
} }
} }

26
devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
View File

@@ -275,11 +275,27 @@ private Map getBatteryResult(rawValue) {
} else { } else {
def minVolts = 2.1 def minVolts = 2.1
def maxVolts = 2.7 def maxVolts = 2.7
def pct = (volts - minVolts) / (maxVolts - minVolts) // Get the current battery percentage as a multiplier 0 - 1
def roundedPct = Math.round(pct * 100) def curValVolts = Integer.parseInt(device.currentState("battery")?.value ?: "100") / 100.0
if (roundedPct <= 0) // Find the corresponding voltage from our range
roundedPct = 1 curValVolts = curValVolts * (maxVolts - minVolts) + minVolts
result.value = Math.min(100, roundedPct) // 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
} }
} }

18
devicetypes/smartthings/zwave-lock.src/zwave-lock.groovy
View File

@@ -88,19 +88,21 @@ import physicalgraph.zwave.commands.usercodev1.*
def installed() { def installed() {
// Device-Watch pings if no device events received for 1 hour (checkInterval) // 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]) 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() { def updated() {
// Device-Watch pings if no device events received for 1 hour (checkInterval) // 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]) 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) { def parse(String description) {