mirror of
https://github.com/mtan93/SmartThingsPublic.git
synced 2026-03-29 22:04:19 +01:00
Compare commits
1 Commits
MSA-1398-1
...
MSA-1391-1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d7754e9f93 |
@@ -1,47 +0,0 @@
|
|||||||
/**
|
|
||||||
* Fan
|
|
||||||
*
|
|
||||||
* Copyright 2016 Mike
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
metadata {
|
|
||||||
definition (name: "Fan", namespace: "Living Room", author: "Mike") {
|
|
||||||
capability "Switch"
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
simulator {
|
|
||||||
// TODO: define status and reply messages here
|
|
||||||
}
|
|
||||||
|
|
||||||
tiles {
|
|
||||||
// TODO: define your main and details tiles here
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// parse events into attributes
|
|
||||||
def parse(String description) {
|
|
||||||
log.debug "Parsing '${description}'"
|
|
||||||
// TODO: handle 'switch' attribute
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// handle commands
|
|
||||||
def on() {
|
|
||||||
log.debug "Executing 'on'"
|
|
||||||
// TODO: handle 'on' command
|
|
||||||
}
|
|
||||||
|
|
||||||
def off() {
|
|
||||||
log.debug "Executing 'off'"
|
|
||||||
// TODO: handle 'off' command
|
|
||||||
}
|
|
||||||
@@ -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(),
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -82,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)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/**
|
/**
|
||||||
* Fan
|
* Use Switch to Control Outlets
|
||||||
*
|
*
|
||||||
* Copyright 2016 Mike
|
* Copyright 2016 Mark Vickstrom
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
|
* 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:
|
* in compliance with the License. You may obtain a copy of the License at:
|
||||||
@@ -14,10 +14,10 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
definition(
|
definition(
|
||||||
name: "Fan",
|
name: "Use Switch to Control Outlets",
|
||||||
namespace: "Living Room",
|
namespace: "mdvickst",
|
||||||
author: "Mike",
|
author: "Mark Vickstrom",
|
||||||
description: "Turn Fan on/off",
|
description: "Use a Switch to control multiple outlets",
|
||||||
category: "Convenience",
|
category: "Convenience",
|
||||||
iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
|
iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
|
||||||
iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
|
iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
|
||||||
@@ -25,9 +25,12 @@ definition(
|
|||||||
|
|
||||||
|
|
||||||
preferences {
|
preferences {
|
||||||
section("Title") {
|
section("Use this Switch") {
|
||||||
// TODO: put inputs here
|
input "triggerSwitch", "capability.switch", title: "Which Switch?", required: true
|
||||||
}
|
}
|
||||||
|
section("To Control these Devices") {
|
||||||
|
input "switchesToControl", "capability.switch", title: "Which Outlets/Switches?", multiple: true, required: true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
def installed() {
|
def installed() {
|
||||||
@@ -44,7 +47,15 @@ def updated() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
def initialize() {
|
def initialize() {
|
||||||
// TODO: subscribe to attributes, devices, locations, etc.
|
subscribe(triggerSwitch, "switch", triggerSwitchPressed)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: implement event handlers
|
def triggerSwitchPressed(evt){
|
||||||
|
if (evt.value == "on") {
|
||||||
|
log.debug "swtich pressed On"
|
||||||
|
switchesToControl?.on()
|
||||||
|
} else if (evt.value == "off") {
|
||||||
|
log.debug "swtich pressed Off"
|
||||||
|
switchesToControl?.off()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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) {
|
||||||
@@ -830,22 +830,22 @@ def setColorTemperature(childDevice, huesettings) {
|
|||||||
|
|
||||||
def setColor(childDevice, huesettings) {
|
def setColor(childDevice, huesettings) {
|
||||||
log.debug "Executing 'setColor($huesettings)'"
|
log.debug "Executing 'setColor($huesettings)'"
|
||||||
|
|
||||||
def value = [:]
|
def value = [:]
|
||||||
def hue = null
|
def hue = null
|
||||||
def sat = null
|
def sat = null
|
||||||
def xy = null
|
def xy = null
|
||||||
|
|
||||||
if (huesettings.hex != null) {
|
if (huesettings.hex != null) {
|
||||||
value.xy = getHextoXY(huesettings.hex)
|
value.xy = getHextoXY(huesettings.hex)
|
||||||
} else {
|
} else {
|
||||||
if (huesettings.hue != null)
|
if (huesettings.hue != null)
|
||||||
value.hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535)
|
value.hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535)
|
||||||
if (huesettings.saturation != null)
|
if (huesettings.saturation != null)
|
||||||
value.sat = Math.min(Math.round(huesettings.saturation * 255 / 100), 255)
|
value.sat = Math.min(Math.round(huesettings.saturation * 255 / 100), 255)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default behavior is to turn light on
|
// Default behavior is to turn light on
|
||||||
value.on = true
|
value.on = true
|
||||||
|
|
||||||
if (huesettings.level != null) {
|
if (huesettings.level != null) {
|
||||||
@@ -853,7 +853,7 @@ def setColor(childDevice, huesettings) {
|
|||||||
value.on = false
|
value.on = false
|
||||||
else if (huesettings.level == 1)
|
else if (huesettings.level == 1)
|
||||||
value.bri = 1
|
value.bri = 1
|
||||||
else
|
else
|
||||||
value.bri = Math.min(Math.round(huesettings.level * 255 / 100), 255)
|
value.bri = Math.min(Math.round(huesettings.level * 255 / 100), 255)
|
||||||
}
|
}
|
||||||
value.alert = huesettings.alert ? huesettings.alert : "none"
|
value.alert = huesettings.alert ? huesettings.alert : "none"
|
||||||
|
|||||||
@@ -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.")
|
||||||
|
|||||||
Reference in New Issue
Block a user