mirror of
https://github.com/mtan93/SmartThingsPublic.git
synced 2026-03-20 21:03:46 +00:00
Compare commits
20 Commits
PROD_2016.
...
MSA-1413-1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
58ae4e9721 | ||
|
|
f0e87fa5e9 | ||
|
|
1b385afa5b | ||
|
|
863c49ffd4 | ||
|
|
2f0d8d814b | ||
|
|
a86eba494f | ||
|
|
2549372bb7 | ||
|
|
38cdde7479 | ||
|
|
853f616cc8 | ||
|
|
2b3a4e1278 | ||
|
|
825e693efd | ||
|
|
686c8f7337 | ||
|
|
11f4e42fe9 | ||
|
|
bc459ae178 | ||
|
|
1392b6e1a5 | ||
|
|
3db96faa00 | ||
|
|
399fbcb676 | ||
|
|
3472ee329d | ||
|
|
577b127287 | ||
|
|
5f41af35e2 |
@@ -22,6 +22,7 @@ metadata {
|
|||||||
capability "Configuration"
|
capability "Configuration"
|
||||||
capability "Sensor"
|
capability "Sensor"
|
||||||
capability "Battery"
|
capability "Battery"
|
||||||
|
capability "Health Check"
|
||||||
|
|
||||||
attribute "tamper", "enum", ["detected", "clear"]
|
attribute "tamper", "enum", ["detected", "clear"]
|
||||||
attribute "batteryStatus", "string"
|
attribute "batteryStatus", "string"
|
||||||
@@ -326,6 +327,9 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
def configure() {
|
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
|
// This sensor joins as a secure device if you double-click the button to include it
|
||||||
log.debug "${device.displayName} is configuring its settings"
|
log.debug "${device.displayName} is configuring its settings"
|
||||||
def request = []
|
def request = []
|
||||||
|
|||||||
@@ -20,6 +20,9 @@ metadata {
|
|||||||
capability "Configuration"
|
capability "Configuration"
|
||||||
capability "Sensor"
|
capability "Sensor"
|
||||||
capability "Battery"
|
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"
|
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() {
|
def configure() {
|
||||||
// log.debug "configure()"
|
// log.debug "configure()"
|
||||||
//["delay 30000"] + secure(zwave.securityV1.securityCommandsSupportedGet())
|
//["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() {
|
private setConfigured() {
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ metadata {
|
|||||||
capability "Illuminance Measurement"
|
capability "Illuminance Measurement"
|
||||||
capability "Sensor"
|
capability "Sensor"
|
||||||
capability "Battery"
|
capability "Battery"
|
||||||
|
capability "Health Check"
|
||||||
|
|
||||||
fingerprint deviceId: "0x2001", inClusters: "0x30,0x31,0x80,0x84,0x70,0x85,0x72,0x86"
|
fingerprint deviceId: "0x2001", inClusters: "0x30,0x31,0x80,0x84,0x70,0x85,0x72,0x86"
|
||||||
}
|
}
|
||||||
@@ -180,6 +181,9 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
def configure() {
|
def configure() {
|
||||||
|
// allow device 10 min to check in; double the periodic reporting interval
|
||||||
|
sendEvent(name: "checkInterval", value: 2*5*60, displayed: false)
|
||||||
|
|
||||||
delayBetween([
|
delayBetween([
|
||||||
// send binary sensor report instead of basic set for motion
|
// send binary sensor report instead of basic set for motion
|
||||||
zwave.configurationV1.configurationSet(parameterNumber: 5, size: 1, scaledConfigurationValue: 2).format(),
|
zwave.configurationV1.configurationSet(parameterNumber: 5, size: 1, scaledConfigurationValue: 2).format(),
|
||||||
|
|||||||
@@ -255,7 +255,8 @@ private Map getBatteryResult(rawValue) {
|
|||||||
def minVolts = 2.1
|
def minVolts = 2.1
|
||||||
def maxVolts = 3.0
|
def maxVolts = 3.0
|
||||||
def pct = (volts - minVolts) / (maxVolts - minVolts)
|
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 }}%"
|
result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -271,7 +271,8 @@ private Map getBatteryResult(rawValue) {
|
|||||||
def minVolts = 2.1
|
def minVolts = 2.1
|
||||||
def maxVolts = 3.0
|
def maxVolts = 3.0
|
||||||
def pct = (volts - minVolts) / (maxVolts - minVolts)
|
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 }}%"
|
result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -240,7 +240,8 @@ private Map getBatteryResult(rawValue) {
|
|||||||
def minVolts = 2.1
|
def minVolts = 2.1
|
||||||
def maxVolts = 3.0
|
def maxVolts = 3.0
|
||||||
def pct = (volts - minVolts) / (maxVolts - minVolts)
|
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}%"
|
result.descriptionText = "${linkText} battery was ${result.value}%"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -338,7 +338,8 @@ private Map getBatteryResult(rawValue) {
|
|||||||
def minVolts = 2.1
|
def minVolts = 2.1
|
||||||
def maxVolts = 3.0
|
def maxVolts = 3.0
|
||||||
def pct = (volts - minVolts) / (maxVolts - minVolts)
|
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 }}%"
|
result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -234,7 +234,8 @@ def getTemperature(value) {
|
|||||||
def minVolts = 2.1
|
def minVolts = 2.1
|
||||||
def maxVolts = 3.0
|
def maxVolts = 3.0
|
||||||
def pct = (volts - minVolts) / (maxVolts - minVolts)
|
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}%"
|
result.descriptionText = "${linkText} battery was ${result.value}%"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ metadata {
|
|||||||
capability "Refresh"
|
capability "Refresh"
|
||||||
capability "Temperature Measurement"
|
capability "Temperature Measurement"
|
||||||
capability "Health Check"
|
capability "Health Check"
|
||||||
|
capability "Sensor"
|
||||||
|
|
||||||
command "enrollResponse"
|
command "enrollResponse"
|
||||||
|
|
||||||
@@ -229,7 +230,8 @@ private Map getBatteryResult(rawValue) {
|
|||||||
def minVolts = 2.1
|
def minVolts = 2.1
|
||||||
def maxVolts = 3.0
|
def maxVolts = 3.0
|
||||||
def pct = (volts - minVolts) / (maxVolts - minVolts)
|
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}%"
|
result.descriptionText = "${linkText} battery was ${result.value}%"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -205,7 +205,8 @@ private Map getBatteryResult(rawValue) {
|
|||||||
def minVolts = 2.1
|
def minVolts = 2.1
|
||||||
def maxVolts = 3.0
|
def maxVolts = 3.0
|
||||||
def pct = (volts - minVolts) / (maxVolts - minVolts)
|
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}%"
|
result.descriptionText = "${linkText} battery was ${result.value}%"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -223,7 +223,8 @@ private Map getBatteryResult(rawValue) {
|
|||||||
def minVolts = 2.1
|
def minVolts = 2.1
|
||||||
def maxVolts = 3.0
|
def maxVolts = 3.0
|
||||||
def pct = (volts - minVolts) / (maxVolts - minVolts)
|
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}%"
|
result.descriptionText = "${linkText} battery was ${result.value}%"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ metadata {
|
|||||||
// status messages
|
// status messages
|
||||||
status "open": "command: 2001, payload: FF"
|
status "open": "command: 2001, payload: FF"
|
||||||
status "closed": "command: 2001, payload: 00"
|
status "closed": "command: 2001, payload: 00"
|
||||||
|
status "wake up": "command: 8407, payload: "
|
||||||
}
|
}
|
||||||
|
|
||||||
// UI tile definitions
|
// UI tile definitions
|
||||||
@@ -174,7 +175,7 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd)
|
|||||||
if (!state.lastbat || now() - state.lastbat > 53*60*60*1000) {
|
if (!state.lastbat || now() - state.lastbat > 53*60*60*1000) {
|
||||||
cmds << command(zwave.batteryV1.batteryGet())
|
cmds << command(zwave.batteryV1.batteryGet())
|
||||||
} else {
|
} else {
|
||||||
cmds << zwave.wakeUpV1.wakeUpNoMoreInformation()
|
cmds << zwave.wakeUpV1.wakeUpNoMoreInformation().format()
|
||||||
}
|
}
|
||||||
[event, response(cmds)]
|
[event, response(cmds)]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
/**
|
||||||
|
* SmartLock Notification
|
||||||
|
*
|
||||||
|
* Copyright 2016 Someone
|
||||||
|
*
|
||||||
|
* 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: "SmartLock Notification",
|
||||||
|
namespace: "nirajbhatt7",
|
||||||
|
author: "Someone",
|
||||||
|
description: "Sends push notification on the lock/unlock.",
|
||||||
|
category: "Safety & Security",
|
||||||
|
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("Select Smart Lock/s") {
|
||||||
|
input "theLock", "capability.lock", title:"door lock", required: true, multiple: true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def installed() {
|
||||||
|
log.debug "Installed with settings: ${settings}"
|
||||||
|
|
||||||
|
initialize()
|
||||||
|
}
|
||||||
|
|
||||||
|
def updated() {
|
||||||
|
log.debug "Updated with settings: ${settings}"
|
||||||
|
|
||||||
|
unsubscribe()
|
||||||
|
initialize()
|
||||||
|
}
|
||||||
|
|
||||||
|
def initialize() {
|
||||||
|
// TODO: subscribe to attributes, devices, locations, etc.
|
||||||
|
subscribe(theLock, "lock", lockHandler)
|
||||||
|
}
|
||||||
|
|
||||||
|
def lockHandler(evt) {
|
||||||
|
sendPush("The ${evt.displayName} is ${evt.value}!")
|
||||||
|
|
||||||
|
// just for debugging
|
||||||
|
log.debug "lock is ${evt.name}"
|
||||||
|
log.debug "event data: ${evt.data}"
|
||||||
|
log.debug "event display name: ${evt.displayName}"
|
||||||
|
log.debug "Is this event a state change? ${evt.isStateChange()}"
|
||||||
|
try {
|
||||||
|
log.debug "The jsonValue of this event is ${evt.jsonValue}"
|
||||||
|
} catch (e) {
|
||||||
|
log.debug "Trying to get the jsonValue for ${evt.name} threw an exception: $e"
|
||||||
|
}
|
||||||
|
|
||||||
|
log.debug "The source of this event is: ${evt.source}"
|
||||||
|
log.debug "event from physical actuation? ${evt.isPhysical()}"
|
||||||
|
|
||||||
|
log.debug "lock status changed to ${evt.value}"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@@ -237,7 +237,7 @@ def completionPage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
section("Notifications") {
|
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: "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)
|
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 now = new Date().getTime()
|
||||||
def timeElapsed = now - atomicState.start
|
def timeElapsed = now - atomicState.start
|
||||||
def totalRunTime = totalRunTimeMillis()
|
def totalRunTime = totalRunTimeMillis() ?: 1
|
||||||
def percentComplete = timeElapsed / totalRunTime * 100
|
def percentComplete = timeElapsed / totalRunTime * 100
|
||||||
log.debug "percentComplete: ${percentComplete}"
|
log.debug "percentComplete: ${percentComplete}"
|
||||||
|
|
||||||
|
|||||||
@@ -688,7 +688,7 @@ def validateCommand(device, command) {
|
|||||||
def capabilityCommands = getDeviceCapabilityCommands(device.capabilities)
|
def capabilityCommands = getDeviceCapabilityCommands(device.capabilities)
|
||||||
def currentDeviceCapability = getCapabilityName(device)
|
def currentDeviceCapability = getCapabilityName(device)
|
||||||
if (currentDeviceCapability != "" && capabilityCommands[currentDeviceCapability]) {
|
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 {
|
} else {
|
||||||
// Handling other device types here, which don't accept commands
|
// Handling other device types here, which don't accept commands
|
||||||
httpError(400, "Bad request.")
|
httpError(400, "Bad request.")
|
||||||
|
|||||||
Reference in New Issue
Block a user