mirror of
https://github.com/mtan93/SmartThingsPublic.git
synced 2026-03-19 05:10:51 +00:00
Compare commits
1 Commits
PROD_2016.
...
MSA-1383-1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
179500f40b |
@@ -22,7 +22,6 @@ 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"
|
||||||
@@ -327,9 +326,6 @@ 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,9 +20,6 @@ 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"
|
||||||
}
|
}
|
||||||
@@ -248,8 +245,6 @@ 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,7 +20,6 @@ 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"
|
||||||
}
|
}
|
||||||
@@ -181,9 +180,6 @@ 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,8 +255,7 @@ 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)
|
||||||
def roundedPct = Math.round(pct * 100)
|
result.value = Math.min(100, (int) pct * 100)
|
||||||
result.value = Math.min(100, roundedPct)
|
|
||||||
result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
|
result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -271,8 +271,7 @@ 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)
|
||||||
def roundedPct = Math.round(pct * 100)
|
result.value = Math.min(100, (int) pct * 100)
|
||||||
result.value = Math.min(100, roundedPct)
|
|
||||||
result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
|
result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -240,8 +240,7 @@ 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)
|
||||||
def roundedPct = Math.round(pct * 100)
|
result.value = Math.min(100, (int) pct * 100)
|
||||||
result.value = Math.min(100, roundedPct)
|
|
||||||
result.descriptionText = "${linkText} battery was ${result.value}%"
|
result.descriptionText = "${linkText} battery was ${result.value}%"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -338,8 +338,7 @@ 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)
|
||||||
def roundedPct = Math.round(pct * 100)
|
result.value = Math.min(100, (int) pct * 100)
|
||||||
result.value = Math.min(100, roundedPct)
|
|
||||||
result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
|
result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -234,8 +234,7 @@ 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)
|
||||||
def roundedPct = Math.round(pct * 100)
|
result.value = Math.min(100, (int) pct * 100)
|
||||||
result.value = Math.min(100, roundedPct)
|
|
||||||
result.descriptionText = "${linkText} battery was ${result.value}%"
|
result.descriptionText = "${linkText} battery was ${result.value}%"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ metadata {
|
|||||||
capability "Refresh"
|
capability "Refresh"
|
||||||
capability "Temperature Measurement"
|
capability "Temperature Measurement"
|
||||||
capability "Health Check"
|
capability "Health Check"
|
||||||
capability "Sensor"
|
|
||||||
|
|
||||||
command "enrollResponse"
|
command "enrollResponse"
|
||||||
|
|
||||||
@@ -230,8 +229,7 @@ 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)
|
||||||
def roundedPct = Math.round(pct * 100)
|
result.value = Math.min(100, (int) pct * 100)
|
||||||
result.value = Math.min(100, roundedPct)
|
|
||||||
result.descriptionText = "${linkText} battery was ${result.value}%"
|
result.descriptionText = "${linkText} battery was ${result.value}%"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -205,8 +205,7 @@ 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)
|
||||||
def roundedPct = Math.round(pct * 100)
|
result.value = Math.min(100, (int) pct * 100)
|
||||||
result.value = Math.min(100, roundedPct)
|
|
||||||
result.descriptionText = "${linkText} battery was ${result.value}%"
|
result.descriptionText = "${linkText} battery was ${result.value}%"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -223,8 +223,7 @@ 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)
|
||||||
def roundedPct = Math.round(pct * 100)
|
result.value = Math.min(100, (int) pct * 100)
|
||||||
result.value = Math.min(100, roundedPct)
|
|
||||||
result.descriptionText = "${linkText} battery was ${result.value}%"
|
result.descriptionText = "${linkText} battery was ${result.value}%"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ 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
|
||||||
@@ -35,7 +36,6 @@ 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
|
||||||
@@ -83,12 +83,12 @@ def updated() {
|
|||||||
cmds = [
|
cmds = [
|
||||||
command(zwave.manufacturerSpecificV2.manufacturerSpecificGet()),
|
command(zwave.manufacturerSpecificV2.manufacturerSpecificGet()),
|
||||||
"delay 1200",
|
"delay 1200",
|
||||||
zwave.wakeUpV1.wakeUpNoMoreInformation().format()
|
zwave.wakeUpV1.wakeUpNoMoreInformation()
|
||||||
]
|
]
|
||||||
} else if (!state.lastbat) {
|
} else if (!state.lastbat) {
|
||||||
cmds = []
|
cmds = []
|
||||||
} else {
|
} else {
|
||||||
cmds = [zwave.wakeUpV1.wakeUpNoMoreInformation().format()]
|
cmds = [zwave.wakeUpV1.wakeUpNoMoreInformation()]
|
||||||
}
|
}
|
||||||
response(cmds)
|
response(cmds)
|
||||||
}
|
}
|
||||||
@@ -175,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().format()
|
cmds << zwave.wakeUpV1.wakeUpNoMoreInformation()
|
||||||
}
|
}
|
||||||
[event, response(cmds)]
|
[event, response(cmds)]
|
||||||
}
|
}
|
||||||
|
|||||||
178
smartapps/gr8gitsby/timer-light.src/timer-light.groovy
Normal file
178
smartapps/gr8gitsby/timer-light.src/timer-light.groovy
Normal file
@@ -0,0 +1,178 @@
|
|||||||
|
/**
|
||||||
|
* Timer Light
|
||||||
|
*
|
||||||
|
* Copyright 2016 Kevin Hill
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
import groovy.time.*
|
||||||
|
|
||||||
|
definition(
|
||||||
|
name: "Timer Light",
|
||||||
|
namespace: "gr8gitsby",
|
||||||
|
author: "Kevin Hill",
|
||||||
|
description: "This puts outside lights on a timer",
|
||||||
|
category: "Convenience",
|
||||||
|
iconUrl: "https://source.unsplash.com/category/nature/60x60",
|
||||||
|
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 {
|
||||||
|
// Use a light swtich
|
||||||
|
section("Light Switch") {
|
||||||
|
// Capabilities link: http://docs.smartthings.com/en/latest/capabilities-reference.html
|
||||||
|
// Input data types: http://docs.smartthings.com/en/latest/device-type-developers-guide/device-preferences.html?highlight=input#supported-input-types
|
||||||
|
input "theSwitch", "capability.switch", title: "Pick your light switch"
|
||||||
|
input "confirmationSwitch", "capability.switch", title: "Pick the notification switch"
|
||||||
|
input "minutes", "number", title: "Enter the number of minutes you'd like the lights on"
|
||||||
|
input "person", "capability.presenceSensor", title: "When who arrives?"
|
||||||
|
|
||||||
|
// When arrival is detected, if it is dark, turn on the outside lights
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def installed() {
|
||||||
|
log.debug "Installed with settings: ${settings}"
|
||||||
|
subscribe(theSwitch, "switch", switchHandler)
|
||||||
|
subscribe(confirmationSwitch, "switch", confirmationSwitchHandler)
|
||||||
|
initialize()
|
||||||
|
}
|
||||||
|
|
||||||
|
def updated() {
|
||||||
|
log.debug "Updated with settings: ${settings}"
|
||||||
|
unsubscribe()
|
||||||
|
initialize()
|
||||||
|
}
|
||||||
|
|
||||||
|
def initialize() {
|
||||||
|
// This method sets up the app
|
||||||
|
subscribe(person, "presence", presenceChange)
|
||||||
|
state.Flashes = 4
|
||||||
|
initialSunPosition()
|
||||||
|
}
|
||||||
|
|
||||||
|
def presenceChange(evt){
|
||||||
|
log.debug("presenceChange")
|
||||||
|
// if someone arrives at night the lights will turn on
|
||||||
|
if("present" == evt.value){
|
||||||
|
timerLight()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Function to set lights on timer for person arriving
|
||||||
|
def timerLight() {
|
||||||
|
log.debug(state.sunPosition)
|
||||||
|
if(state.sunPosition == "down"){
|
||||||
|
light.on()
|
||||||
|
runIn(60 * minutes, turnOff)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def turnOff(){
|
||||||
|
// This method turns off the ligt
|
||||||
|
theSwitch.off()
|
||||||
|
confirmationSwitch.off()
|
||||||
|
}
|
||||||
|
|
||||||
|
def initialSunPosition() {
|
||||||
|
// This method determines if sun is down at time of initializtion and run sunsetHandler() if so
|
||||||
|
|
||||||
|
def s = getSunriseAndSunset(zipCode: "98052")
|
||||||
|
def now = new Date()
|
||||||
|
def riseTime = s.sunrise
|
||||||
|
def setTime = s.sunset
|
||||||
|
|
||||||
|
if(setTime.before(now)) {
|
||||||
|
sunsetHandler()
|
||||||
|
log.info "Sun is already down, run sunsetHandler"
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{ if (riseTime.after(now)) {
|
||||||
|
sunriseHandler()
|
||||||
|
log.info "Sun is up, run sunriseHandler"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def sunriseHandler() {
|
||||||
|
// method to set the sun position when the sun rises
|
||||||
|
state.sunPosition = "up"
|
||||||
|
}
|
||||||
|
|
||||||
|
def sunsetHandler() {
|
||||||
|
// method to set the sun position when the sunsets
|
||||||
|
state.sunPosition = "down"
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
def switchHandler(evt) {
|
||||||
|
log.debug("switch Handler Fired")
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
def confirmationSwitchHandler(evt) {
|
||||||
|
state.Flashes = state.Flashes - 1
|
||||||
|
log.debug("Flashes: ${state.Flashes}")
|
||||||
|
log.debug("Event State: ${evt.value}")
|
||||||
|
if(evt.value == "on" && state.Flashes > 0) {
|
||||||
|
runIn(2, turnOffConfirmationSwitch)
|
||||||
|
} else if(evt.value == "off" && state.Flashes > 0) {
|
||||||
|
runIn(2, turnOnConfirmationSwitch)
|
||||||
|
}
|
||||||
|
|
||||||
|
if(state.Flashes == 0){
|
||||||
|
state.Flashes = 4
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def turnOnConfirmationSwitch(){
|
||||||
|
confirmationSwitch.on()
|
||||||
|
}
|
||||||
|
|
||||||
|
def turnOffConfirmationSwitch(){
|
||||||
|
confirmationSwitch.off()
|
||||||
|
}
|
||||||
|
|
||||||
|
def switchHandler(evt){
|
||||||
|
log.debug("light Event handler fired")
|
||||||
|
// use Event rather than DeviceState because we may be changing DeviceState to only store changed values
|
||||||
|
def recentStates = theSwitch.eventsSince(new Date(now() - 4000), [all:true, max: 10]).findAll{it.name == "switch"}
|
||||||
|
log.debug "${recentStates?.size()} STATES FOUND, LAST AT ${recentStates ? recentStates[0].dateCreated : ''}"
|
||||||
|
//sendPush("Attempting to check light presses")
|
||||||
|
|
||||||
|
if (evt.value == "on") {
|
||||||
|
log.debug("==== ON ====")
|
||||||
|
}
|
||||||
|
|
||||||
|
log.debug(recentStates.size())
|
||||||
|
//if (evt.isPhysical()) {
|
||||||
|
|
||||||
|
if (recentStates.size() >= 2) {
|
||||||
|
|
||||||
|
log.debug "Outside light timer mode engaged"
|
||||||
|
def switchattr = confirmationSwitch.currentValue("switch")
|
||||||
|
log.debug "confirmationSwitch: $switchattr"
|
||||||
|
|
||||||
|
confirmationSwitch.on()
|
||||||
|
|
||||||
|
//alternativeSwitch.off()
|
||||||
|
//def message = "${location.name} executed ${settings.onPhrase} because ${evt.title} was tapped twice."
|
||||||
|
runIn(60 * minutes, turnOff)
|
||||||
|
} else {
|
||||||
|
log.trace "Skipping digital on/off event"
|
||||||
|
}
|
||||||
|
|
||||||
|
//log.debug("switch is on, turn off in $minutes")
|
||||||
|
//runIn(60*minutes, turnOff)
|
||||||
|
|
||||||
|
//}
|
||||||
|
}
|
||||||
@@ -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() ?: 1
|
def totalRunTime = totalRunTimeMillis()
|
||||||
def percentComplete = timeElapsed / totalRunTime * 100
|
def percentComplete = timeElapsed / totalRunTime * 100
|
||||||
log.debug "percentComplete: ${percentComplete}"
|
log.debug "percentComplete: ${percentComplete}"
|
||||||
|
|
||||||
|
|||||||
@@ -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.Map) {
|
if (body instanceof java.util.HashMap) {
|
||||||
//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] || (currentDeviceCapability == "Switch" && command == "setLevel" && device.hasCommand("setLevel"))) ? true : false
|
return command in capabilityCommands[currentDeviceCapability] ? 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 (callback.port != -1) {
|
if(isIP(callback.host)){
|
||||||
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,6 +852,25 @@ 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