mirror of
https://github.com/mtan93/SmartThingsPublic.git
synced 2026-03-18 05:10:52 +00:00
Compare commits
31 Commits
PROD_2016.
...
MSA-1399-1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9a2eb5fa5d | ||
|
|
2b3a4e1278 | ||
|
|
825e693efd | ||
|
|
686c8f7337 | ||
|
|
11f4e42fe9 | ||
|
|
bc459ae178 | ||
|
|
1392b6e1a5 | ||
|
|
3db96faa00 | ||
|
|
399fbcb676 | ||
|
|
eed1ced71b | ||
|
|
d080833d5c | ||
|
|
e998528e8e | ||
|
|
3472ee329d | ||
|
|
577b127287 | ||
|
|
d85566bb98 | ||
|
|
5f41af35e2 | ||
|
|
e1a5b4dd27 | ||
|
|
a2baa37901 | ||
|
|
922ab45343 | ||
|
|
962774996e | ||
|
|
d79594cbcb | ||
|
|
bf8fe4cad7 | ||
|
|
65752ce378 | ||
|
|
95f08aeb3d | ||
|
|
cd7bc1b262 | ||
|
|
be7f6a76a9 | ||
|
|
10e5b7e9d7 | ||
|
|
fc38c534f9 | ||
|
|
fd47bcb8a8 | ||
|
|
972599b1b5 | ||
|
|
f5d3cca6a0 |
@@ -0,0 +1,350 @@
|
|||||||
|
/**
|
||||||
|
* LANnouncer Alerter (Formerly LANdroid - but Google didn't like that much.)
|
||||||
|
*
|
||||||
|
* Requires the LANnouncer android app; https://play.google.com/store/apps/details?id=com.keybounce.lannouncer
|
||||||
|
* See http://www.keybounce.com/LANdroidHowTo/LANdroid.html for full downloads and instructions.
|
||||||
|
* SmartThings thread: https://community.smartthings.com/t/android-as-a-speech-alarm-device-released/30282/12
|
||||||
|
*
|
||||||
|
* Note: Only Siren and Strobe from the U.I. or Alarm capabilities default to continuous.
|
||||||
|
*
|
||||||
|
* Version 1.24 16 July 2016
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* Copyright 2015-2016 Tony McNamara
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*
|
||||||
|
* To Do: Add string return to Image Capture attribute
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
metadata {
|
||||||
|
definition (name: "LANnouncer Alerter", namespace: "KeyBounce", author: "Tony McNamara") {
|
||||||
|
capability "Alarm"
|
||||||
|
capability "Speech Synthesis"
|
||||||
|
capability "Notification"
|
||||||
|
capability "Tone"
|
||||||
|
capability "Image Capture"
|
||||||
|
attribute "LANdroidSMS","string"
|
||||||
|
/* Per http://docs.smartthings.com/en/latest/device-type-developers-guide/overview.html#actuator-and-sensor */
|
||||||
|
capability "Sensor"
|
||||||
|
capability "Actuator"
|
||||||
|
|
||||||
|
// Custom Commands
|
||||||
|
/** Retrieve image, formatted for SmartThings, from camera by name. */
|
||||||
|
command "chime"
|
||||||
|
command "doorbell"
|
||||||
|
command "ipCamSequence", ["number"]
|
||||||
|
command "retrieveAndWait", ["string"]
|
||||||
|
command "retrieveFirstAndWait"
|
||||||
|
command "retrieveSecondAndWait"
|
||||||
|
}
|
||||||
|
preferences {
|
||||||
|
input("DeviceLocalLan", "string", title:"Android IP Address", description:"Please enter your tablet's I.P. address", defaultValue:"" , required: false, displayDuringSetup: true)
|
||||||
|
input("DevicePort", "string", title:"Android Port", description:"Port the Android device listens on", defaultValue:"1035", required: false, displayDuringSetup: true)
|
||||||
|
input("ReplyOnEmpty", "bool", title:"Say Nothing", description:"When no speech is found, announce LANdroid? (Needed for the speech and notify tiles to work)", defaultValue: true, displayDuringSetup: true)
|
||||||
|
input("AlarmContinuous", "bool", title:"Continuous Alarm (vs 10 sec.)", description: "When on, the alarm will sound until Stop is issued.", defaultValue: false, displayDuringSetup: true)
|
||||||
|
}
|
||||||
|
|
||||||
|
simulator {
|
||||||
|
// reply messages
|
||||||
|
["strobe","siren","both","off"].each
|
||||||
|
{
|
||||||
|
reply "$it": "alarm:$it"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tiles {
|
||||||
|
standardTile("alarm", "device.alarm", width: 2, height: 2) {
|
||||||
|
state "off", label:'off', action:'alarm.both', icon:"st.alarm.alarm.alarm", backgroundColor:"#ffffff"
|
||||||
|
state "strobe", label:'strobe!', action:'alarm.off', icon:"st.Lighting.light11", backgroundColor:"#e86d13"
|
||||||
|
state "siren", label:'siren!', action:'alarm.off', icon:"st.alarm.alarm.alarm", backgroundColor:"#e86d13"
|
||||||
|
state "both", label:'alarm!', action:'alarm.off', icon:"st.alarm.alarm.alarm", backgroundColor:"#e86d13"
|
||||||
|
}
|
||||||
|
standardTile("strobe", "device.alarm", inactiveLabel: false, decoration: "flat") {
|
||||||
|
state "default", label:'', action:"alarm.strobe", icon:"st.secondary.strobe"
|
||||||
|
}
|
||||||
|
|
||||||
|
standardTile("siren", "device.alarm", inactiveLabel: false, decoration: "flat") {
|
||||||
|
state "default", label:'', action:"alarm.siren", icon:"st.secondary.siren"
|
||||||
|
}
|
||||||
|
standardTile("off", "device.alarm", inactiveLabel: false, decoration: "flat") {
|
||||||
|
state "default", label:'Off', action:"alarm.off", icon:"st.quirky.spotter.quirky-spotter-sound-off"
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Apparently can't show image attributes on tiles. */
|
||||||
|
standardTile("take", "device.image", width: 1, height: 1, canChangeIcon: false, canChangeBackground: false)
|
||||||
|
{
|
||||||
|
state "take", label: "Take", action: "Image Capture.take", icon: "st.camera.camera", backgroundColor: "#FFFFFF", nextState:"taking"
|
||||||
|
state "taking", label:'Taking', action: "", icon: "st.camera.take-photo", backgroundColor: "#53a7c0"
|
||||||
|
state "image", label: "Take", action: "Image Capture.take", icon: "st.camera.camera", backgroundColor: "#FFFFFF", nextState:"taking"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
standardTile("speak", "device.speech", inactiveLabel: false, decoration: "flat")
|
||||||
|
{
|
||||||
|
state "default", label:'Speak', action:"Speech Synthesis.speak", icon:"st.Electronics.electronics13"
|
||||||
|
}
|
||||||
|
standardTile("toast", "device.notification", inactiveLabel: false, decoration: "flat") {
|
||||||
|
state "default", label:'Notify', action:"notification.deviceNotification", icon:"st.Kids.kids1"
|
||||||
|
}
|
||||||
|
standardTile("beep", "device.tone", inactiveLabel: false, decoration: "flat") {
|
||||||
|
state "default", label:'Tone', action:"tone.beep", icon:"st.Entertainment.entertainment2"
|
||||||
|
}
|
||||||
|
carouselTile("cameraDetails", "device.image", width: 3, height: 2) { }
|
||||||
|
|
||||||
|
main (["alarm", "take"]);
|
||||||
|
details(["alarm","strobe","siren","off","speak", "take","toast","beep", "cameraDetails"]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Generally matches TTSServer/app/build.gradle */
|
||||||
|
String getVersion() {return "24 built July 2016";}
|
||||||
|
|
||||||
|
|
||||||
|
// handle commands
|
||||||
|
def off() {
|
||||||
|
log.debug "Executing 'off'"
|
||||||
|
sendEvent(name:"alarm", value:"off")
|
||||||
|
def command="&ALARM=STOP&FLASH=STOP&"+getDoneString();
|
||||||
|
sendCommands(command)
|
||||||
|
}
|
||||||
|
|
||||||
|
def strobe() {
|
||||||
|
log.debug "Executing 'strobe'"
|
||||||
|
// TODO: handle 'strobe' command
|
||||||
|
sendEvent(name:"alarm", value:"strobe")
|
||||||
|
def command="&FLASH=STROBE&"+getDoneString()
|
||||||
|
if (AlarmContinuous)
|
||||||
|
{
|
||||||
|
command="&FLASH=CONTINUOUS&"+getDoneString()
|
||||||
|
}
|
||||||
|
sendCommands(command)
|
||||||
|
}
|
||||||
|
|
||||||
|
def siren() {
|
||||||
|
log.debug "Executing 'siren'"
|
||||||
|
sendEvent(name:"alarm", value:"siren")
|
||||||
|
def command="&ALARM=SIREN&"+getDoneString()
|
||||||
|
if (AlarmContinuous)
|
||||||
|
{
|
||||||
|
command="&ALARM=SIREN:CONTINUOUS&"+getDoneString()
|
||||||
|
}
|
||||||
|
sendCommands(command)
|
||||||
|
}
|
||||||
|
|
||||||
|
def beep() {
|
||||||
|
log.debug "Executing 'beep'"
|
||||||
|
def command="&ALARM=CHIME&"+getDoneString()
|
||||||
|
sendCommands(command)
|
||||||
|
}
|
||||||
|
|
||||||
|
def both() {
|
||||||
|
log.debug "Executing 'both'"
|
||||||
|
sendEvent(name:"alarm", value:"both")
|
||||||
|
def command="&ALARM=ON&FLASH=ON&"+getDoneString()
|
||||||
|
if (AlarmContinuous)
|
||||||
|
{
|
||||||
|
command="&ALARM=SIREN:CONTINUOUS&FLASH=CONTINUOUS&"+getDoneString()
|
||||||
|
}
|
||||||
|
sendCommands(command)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def speak(toSay) {
|
||||||
|
log.debug "Executing 'speak'"
|
||||||
|
if (!toSay?.trim()) {
|
||||||
|
if (ReplyOnEmpty) {
|
||||||
|
toSay = "LANnouncer Version ${version}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (toSay?.trim()) {
|
||||||
|
def command="&SPEAK="+toSay+"&"+getDoneString()
|
||||||
|
sendCommands(command)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def deviceNotification(toToast) {
|
||||||
|
log.debug "Executing notification with "+toToast
|
||||||
|
if (!toToast?.trim()) {
|
||||||
|
if (ReplyOnEmpty) {
|
||||||
|
toToast = "LANnouncer Version ${version}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (toToast?.trim()) {
|
||||||
|
def command="&TOAST="+toToast+"&"+getDoneString()
|
||||||
|
sendCommands(command)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def chime() {
|
||||||
|
log.debug "Executing 'chime'"
|
||||||
|
// TODO: handle 'siren' command
|
||||||
|
def command="&ALARM=CHIME&"+getDoneString()
|
||||||
|
sendCommands(command)
|
||||||
|
}
|
||||||
|
|
||||||
|
def doorbell() {
|
||||||
|
log.debug "Executing 'doorbell'"
|
||||||
|
// TODO: handle 'siren' command
|
||||||
|
def command="&ALARM=DOORBELL&"+getDoneString()
|
||||||
|
sendCommands(command)
|
||||||
|
}
|
||||||
|
|
||||||
|
def ipCamSequence(cameraNumber) {
|
||||||
|
if (cameraNumber == 1) {
|
||||||
|
def command="&RETRIEVESEQ=FIRST&"+getDoneString()
|
||||||
|
sendIPCommand(command, true)
|
||||||
|
|
||||||
|
} else {
|
||||||
|
def command="&RETRIEVESEQ=SECOND&"+getDoneString()
|
||||||
|
sendIPCommand(command, true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def retrieveFirstAndWait() {
|
||||||
|
retrieveAndWait("FIRST");
|
||||||
|
}
|
||||||
|
def retrieveSecondAndWait() {
|
||||||
|
retrieveAndWait("SECOND");
|
||||||
|
}
|
||||||
|
def retrieveAndWait(cameraName) {
|
||||||
|
log.info("Requesting image from camera ${cameraName}");
|
||||||
|
def command="&RETRIEVE="+cameraName+"&STSHRINK=TRUE&"+getDoneString()
|
||||||
|
sendIPCommand(command, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def take() {
|
||||||
|
// This won't result in received file. Can't handle large or binaries in hub.
|
||||||
|
log.debug "Executing 'take'"
|
||||||
|
def command="&PHOTO=BACK&STSHRINK=TRUE&"+getDoneString()
|
||||||
|
sendIPCommand(command, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Send to IP and to SMS as appropriate */
|
||||||
|
private sendCommands(command) {
|
||||||
|
log.info "Command request: "+command
|
||||||
|
sendSMSCommand(command)
|
||||||
|
sendIPCommand(command)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private sendIPCommand(commandString, sendToS3 = false) {
|
||||||
|
log.info "Sending command "+ commandString+" to "+DeviceLocalLan+":"+DevicePort
|
||||||
|
if (DeviceLocalLan?.trim()) {
|
||||||
|
def hosthex = convertIPtoHex(DeviceLocalLan)
|
||||||
|
def porthex = convertPortToHex(DevicePort)
|
||||||
|
device.deviceNetworkId = "$hosthex:$porthex"
|
||||||
|
|
||||||
|
def headers = [:]
|
||||||
|
headers.put("HOST", "$DeviceLocalLan:$DevicePort")
|
||||||
|
|
||||||
|
def method = "GET"
|
||||||
|
|
||||||
|
def hubAction = new physicalgraph.device.HubAction(
|
||||||
|
method: method,
|
||||||
|
path: "/"+commandString,
|
||||||
|
headers: headers
|
||||||
|
);
|
||||||
|
if (sendToS3 == true)
|
||||||
|
{
|
||||||
|
hubAction.options = [outputMsgToS3:true];
|
||||||
|
}
|
||||||
|
log.debug hubActionw
|
||||||
|
hubAction;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private sendSMSCommand(commandString) {
|
||||||
|
def preface = "+@TTSSMS@+"
|
||||||
|
def smsValue = preface+"&"+commandString
|
||||||
|
state.lastsmscommand = smsValue
|
||||||
|
sendEvent(name: "LANdroidSMS", value: smsValue, isStateChange: true)
|
||||||
|
/*
|
||||||
|
if (SMSPhone?.trim()) {
|
||||||
|
sendSmsMessage(SMSPhone, preface+"&"+commandString)
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getDoneString() {
|
||||||
|
return "@DONE@"
|
||||||
|
}
|
||||||
|
|
||||||
|
def parse(String description) {
|
||||||
|
log.debug "Parsing '${description}'"
|
||||||
|
def map = parseLanMessage(description);
|
||||||
|
log.debug "As LAN: " + map;
|
||||||
|
if ((map.headers) && (map.headers.'Content-Type' != null) && (map.headers.'Content-Type'.contains("image/jpeg")) )
|
||||||
|
{ // Store the file
|
||||||
|
if(map.body)
|
||||||
|
{
|
||||||
|
storeImage(getPictureName(), map.body);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* 'index:0F, mac:0073E023A13A, ip:C0A80114, port:040B, requestId:f9036fb2-9637-40b8-b2c5-71ba5a09fd3e, bucket:smartthings-device-conn-temp, key:fc8e3dfd-5035-40a2-8adc-a312926f9034' */
|
||||||
|
|
||||||
|
else if (map.bucket && map.key)
|
||||||
|
{ // S3 pointer; retrieve image from it to store.
|
||||||
|
try {
|
||||||
|
def s3ObjectContent; // Needed for scope of try-catch
|
||||||
|
def imageBytes = getS3Object(map.bucket, map.key + ".jpg")
|
||||||
|
|
||||||
|
if(imageBytes)
|
||||||
|
{
|
||||||
|
log.info ("Got image bytes; saving them.")
|
||||||
|
s3ObjectContent = imageBytes.getObjectContent()
|
||||||
|
def bytes = new ByteArrayInputStream(s3ObjectContent.bytes)
|
||||||
|
storeImage(getPictureName(), bytes)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch(Exception e)
|
||||||
|
{
|
||||||
|
log.error e
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
//explicitly close the stream
|
||||||
|
if (s3ObjectContent) { s3ObjectContent.close() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Image Capture handling
|
||||||
|
/* Note that images are stored in https://graph.api.smartthings.com/api/s3/smartthings-smartsense-camera/[IMAGE-ID4],
|
||||||
|
* where [IMAGE-ID] is listed in the IDE under My Devices > [Camera] > Current States: Image. That page is updated as pictures are taken.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
private getPictureName() {
|
||||||
|
def pictureUuid = java.util.UUID.randomUUID().toString().replaceAll('-', '')
|
||||||
|
log.debug pictureUuid
|
||||||
|
def picName = device.deviceNetworkId.replaceAll(':', '') + "_$pictureUuid" + ".jpg"
|
||||||
|
return picName
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private String convertIPtoHex(ipAddress) {
|
||||||
|
String hex = ipAddress.tokenize( '.' ).collect { String.format( '%02X', it.toInteger() ) }.join()
|
||||||
|
log.debug "IP address entered is $ipAddress and the converted hex code is $hex"
|
||||||
|
return hex
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private String convertPortToHex(port) {
|
||||||
|
String hexport = port.toString().format( '%04X', port.toInteger() )
|
||||||
|
log.debug hexport
|
||||||
|
return hexport
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -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}%"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -229,7 +229,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}%"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ metadata {
|
|||||||
fingerprint deviceId: "0x0701", inClusters: "0x5E,0x98"
|
fingerprint deviceId: "0x0701", inClusters: "0x5E,0x98"
|
||||||
fingerprint deviceId: "0x0701", inClusters: "0x5E,0x86,0x72,0x98", outClusters: "0x5A,0x82"
|
fingerprint deviceId: "0x0701", inClusters: "0x5E,0x86,0x72,0x98", outClusters: "0x5A,0x82"
|
||||||
fingerprint deviceId: "0x0701", inClusters: "0x5E,0x80,0x71,0x85,0x70,0x72,0x86,0x30,0x31,0x84,0x59,0x73,0x5A,0x8F,0x98,0x7A", outClusters:"0x20" // Philio multi+
|
fingerprint deviceId: "0x0701", inClusters: "0x5E,0x80,0x71,0x85,0x70,0x72,0x86,0x30,0x31,0x84,0x59,0x73,0x5A,0x8F,0x98,0x7A", outClusters:"0x20" // Philio multi+
|
||||||
fingerprint deviceId: "0x0701", inClusters: "0x5E,0x72,0x5A,0x80,0x73,0x84,0x85,0x59,0x71,0x70,0x7A,0x98" // Vision door/window
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// simulator metadata
|
// simulator metadata
|
||||||
@@ -83,12 +82,12 @@ def updated() {
|
|||||||
cmds = [
|
cmds = [
|
||||||
command(zwave.manufacturerSpecificV2.manufacturerSpecificGet()),
|
command(zwave.manufacturerSpecificV2.manufacturerSpecificGet()),
|
||||||
"delay 1200",
|
"delay 1200",
|
||||||
zwave.wakeUpV1.wakeUpNoMoreInformation()
|
zwave.wakeUpV1.wakeUpNoMoreInformation().format()
|
||||||
]
|
]
|
||||||
} else if (!state.lastbat) {
|
} else if (!state.lastbat) {
|
||||||
cmds = []
|
cmds = []
|
||||||
} else {
|
} else {
|
||||||
cmds = [zwave.wakeUpV1.wakeUpNoMoreInformation()]
|
cmds = [zwave.wakeUpV1.wakeUpNoMoreInformation().format()]
|
||||||
}
|
}
|
||||||
response(cmds)
|
response(cmds)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ preferences {
|
|||||||
page(name: "completionPage")
|
page(name: "completionPage")
|
||||||
page(name: "numbersPage")
|
page(name: "numbersPage")
|
||||||
page(name: "controllerExplanationPage")
|
page(name: "controllerExplanationPage")
|
||||||
|
page(name: "unsupportedDevicesPage")
|
||||||
}
|
}
|
||||||
|
|
||||||
def rootPage() {
|
def rootPage() {
|
||||||
@@ -47,6 +48,9 @@ def rootPage() {
|
|||||||
section("What to dim") {
|
section("What to dim") {
|
||||||
input(name: "dimmers", type: "capability.switchLevel", title: "Dimmers", description: null, multiple: true, required: true, submitOnChange: true)
|
input(name: "dimmers", type: "capability.switchLevel", title: "Dimmers", description: null, multiple: true, required: true, submitOnChange: true)
|
||||||
if (dimmers) {
|
if (dimmers) {
|
||||||
|
if (dimmersContainUnsupportedDevices()) {
|
||||||
|
href(name: "toUnsupportedDevicesPage", page: "unsupportedDevicesPage", title: "Some of your selected dimmers don't seem to be supported", description: "Tap here to fix it", required: true)
|
||||||
|
}
|
||||||
href(name: "toNumbersPage", page: "numbersPage", title: "Duration & Direction", description: numbersPageHrefDescription(), state: "complete")
|
href(name: "toNumbersPage", page: "numbersPage", title: "Duration & Direction", description: numbersPageHrefDescription(), state: "complete")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -71,6 +75,31 @@ def rootPage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def unsupportedDevicesPage() {
|
||||||
|
|
||||||
|
def unsupportedDimmers = dimmers.findAll { !hasSetLevelCommand(it) }
|
||||||
|
|
||||||
|
dynamicPage(name: "unsupportedDevicesPage") {
|
||||||
|
if (unsupportedDimmers) {
|
||||||
|
section("These devices do not support the setLevel command") {
|
||||||
|
unsupportedDimmers.each {
|
||||||
|
paragraph deviceLabel(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
section {
|
||||||
|
input(name: "dimmers", type: "capability.sensor", title: "Please remove the above devices from this list.", submitOnChange: true, multiple: true)
|
||||||
|
}
|
||||||
|
section {
|
||||||
|
paragraph "If you think there is a mistake here, please contact support."
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
section {
|
||||||
|
paragraph "You're all set. You can hit the back button, now. Thanks for cleaning up your settings :)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
def controllerExplanationPage() {
|
def controllerExplanationPage() {
|
||||||
dynamicPage(name: "controllerExplanationPage", title: "How To Control Gentle Wake Up") {
|
dynamicPage(name: "controllerExplanationPage", title: "How To Control Gentle Wake Up") {
|
||||||
|
|
||||||
@@ -528,14 +557,16 @@ def updateDimmers(percentComplete) {
|
|||||||
} else {
|
} else {
|
||||||
|
|
||||||
def shouldChangeColors = (colorize && colorize != "false")
|
def shouldChangeColors = (colorize && colorize != "false")
|
||||||
def canChangeColors = hasSetColorCommand(dimmer)
|
|
||||||
|
|
||||||
log.debug "Setting ${deviceLabel(dimmer)} to ${nextLevel}"
|
if (shouldChangeColors && hasSetColorCommand(dimmer)) {
|
||||||
|
def hue = getHue(dimmer, nextLevel)
|
||||||
if (shouldChangeColors && canChangeColors) {
|
log.debug "Setting ${deviceLabel(dimmer)} level to ${nextLevel} and hue to ${hue}"
|
||||||
dimmer.setColor([hue: getHue(dimmer, nextLevel), saturation: 100, level: nextLevel])
|
dimmer.setColor([hue: hue, saturation: 100, level: nextLevel])
|
||||||
} else {
|
} else if (hasSetLevelCommand(dimmer)) {
|
||||||
|
log.debug "Setting ${deviceLabel(dimmer)} level to ${nextLevel}"
|
||||||
dimmer.setLevel(nextLevel)
|
dimmer.setLevel(nextLevel)
|
||||||
|
} else {
|
||||||
|
log.warn "${deviceLabel(dimmer)} does not have setColor or setLevel commands."
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -689,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}"
|
||||||
|
|
||||||
@@ -817,24 +848,21 @@ private getRedHue(level) {
|
|||||||
if (level >= 96) return 17
|
if (level >= 96) return 17
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private dimmersContainUnsupportedDevices() {
|
||||||
|
def found = dimmers.find { hasSetLevelCommand(it) == false }
|
||||||
|
return found != null
|
||||||
|
}
|
||||||
|
|
||||||
private hasSetLevelCommand(device) {
|
private hasSetLevelCommand(device) {
|
||||||
def isDimmer = false
|
return hasCommand(device, "setLevel")
|
||||||
device.supportedCommands.each {
|
|
||||||
if (it.name.contains("setLevel")) {
|
|
||||||
isDimmer = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return isDimmer
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private hasSetColorCommand(device) {
|
private hasSetColorCommand(device) {
|
||||||
def hasColor = false
|
return hasCommand(device, "setColor")
|
||||||
device.supportedCommands.each {
|
}
|
||||||
if (it.name.contains("setColor")) {
|
|
||||||
hasColor = true
|
private hasCommand(device, String command) {
|
||||||
}
|
return (device.supportedCommands.find { it.name == command } != null)
|
||||||
}
|
|
||||||
return hasColor
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private dimmersWithSetColorCommand() {
|
private dimmersWithSetColorCommand() {
|
||||||
|
|||||||
@@ -689,7 +689,7 @@ def parse(childDevice, description) {
|
|||||||
log.warn "Parsing Body failed - trying again..."
|
log.warn "Parsing Body failed - trying again..."
|
||||||
poll()
|
poll()
|
||||||
}
|
}
|
||||||
if (body instanceof java.util.HashMap) {
|
if (body instanceof java.util.Map) {
|
||||||
//poll response
|
//poll response
|
||||||
def bulbs = getChildDevices()
|
def bulbs = getChildDevices()
|
||||||
for (bulb in body) {
|
for (bulb in body) {
|
||||||
|
|||||||
@@ -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.")
|
||||||
@@ -823,8 +823,8 @@ def deviceHandler(evt) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
def sendToHarmony(evt, String callbackUrl) {
|
def sendToHarmony(evt, String callbackUrl) {
|
||||||
def callback = new URI(callbackUrl)
|
def callback = new URI(callbackUrl)
|
||||||
if(isIP(callback.host)){
|
if (callback.port != -1) {
|
||||||
def host = callback.port != -1 ? "${callback.host}:${callback.port}" : callback.host
|
def host = callback.port != -1 ? "${callback.host}:${callback.port}" : callback.host
|
||||||
def path = callback.query ? "${callback.path}?${callback.query}".toString() : callback.path
|
def path = callback.query ? "${callback.path}?${callback.query}".toString() : callback.path
|
||||||
sendHubCommand(new physicalgraph.device.HubAction(
|
sendHubCommand(new physicalgraph.device.HubAction(
|
||||||
@@ -852,25 +852,6 @@ def sendToHarmony(evt, String callbackUrl) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isIP(String str) {
|
|
||||||
try {
|
|
||||||
String[] parts = str.split("\\.");
|
|
||||||
if (parts.length != 4) return false;
|
|
||||||
for (int i = 0; i < 4; ++i) {
|
|
||||||
int p
|
|
||||||
try {
|
|
||||||
p = Integer.parseInt(parts[i]);
|
|
||||||
} catch (Exception e) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (p > 255 || p < 0) return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
def listHubs() {
|
def listHubs() {
|
||||||
location.hubs?.findAll { it.type.toString() == "PHYSICAL" }?.collect { hubItem(it) }
|
location.hubs?.findAll { it.type.toString() == "PHYSICAL" }?.collect { hubItem(it) }
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user