mirror of
https://github.com/mtan93/SmartThingsPublic.git
synced 2026-03-17 05:10:50 +00:00
Compare commits
22 Commits
PROD_2017.
...
PROD_2017.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ea3abb26c0 | ||
|
|
16f41bddae | ||
|
|
117adea586 | ||
|
|
783538e36d | ||
|
|
6110aaa0fa | ||
|
|
c391ce4b43 | ||
|
|
073bac8dac | ||
|
|
c4c2a3ffd7 | ||
|
|
3c83bfb53b | ||
|
|
6325101f52 | ||
|
|
945a972082 | ||
|
|
535fc112de | ||
|
|
a844e85c47 | ||
|
|
b65acdb91f | ||
|
|
4067e6e7e2 | ||
|
|
4c6d1eddb2 | ||
|
|
10d2097ebe | ||
|
|
d3728d95b2 | ||
|
|
60f6e9c02c | ||
|
|
74a35eeddb | ||
|
|
8aceef9be4 | ||
|
|
a1f39849ed |
@@ -26,7 +26,9 @@ metadata {
|
|||||||
capability "Polling"
|
capability "Polling"
|
||||||
capability "Refresh"
|
capability "Refresh"
|
||||||
capability "Health Check"
|
capability "Health Check"
|
||||||
fingerprint manufacturer: "015D", prod: "0221", model: "251C"
|
|
||||||
|
fingerprint manufacturer: "015D", prod: "0221", model: "251C", deviceJoinName: "Show Home 2-Channel Smart Plug"
|
||||||
|
fingerprint manufacturer: "0312", prod: "B221", model: "251C", deviceJoinName: "Inovelli 2-Channel Smart Plug"
|
||||||
}
|
}
|
||||||
simulator {}
|
simulator {}
|
||||||
preferences {}
|
preferences {}
|
||||||
|
|||||||
@@ -22,8 +22,6 @@ metadata {
|
|||||||
capability "Battery"
|
capability "Battery"
|
||||||
capability "Health Check"
|
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"
|
||||||
fingerprint mfr:"0086", prod:"0102", model:"004A", deviceJoinName: "Aeon Labs MultiSensor (Gen 5)"
|
fingerprint mfr:"0086", prod:"0102", model:"004A", deviceJoinName: "Aeon Labs MultiSensor (Gen 5)"
|
||||||
}
|
}
|
||||||
@@ -91,12 +89,12 @@ metadata {
|
|||||||
valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
|
valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
|
||||||
state "battery", label:'${currentValue}% battery', unit:""
|
state "battery", label:'${currentValue}% battery', unit:""
|
||||||
}
|
}
|
||||||
standardTile("configureAfterSecure", "device.configure", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
|
standardTile("configure", "device.configure", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
|
||||||
state "configure", label:'', action:"configureAfterSecure", icon:"st.secondary.configure"
|
state "configure", label:'', action:"configure", icon:"st.secondary.configure"
|
||||||
}
|
}
|
||||||
|
|
||||||
main(["motion", "temperature", "humidity", "illuminance"])
|
main(["motion", "temperature", "humidity", "illuminance"])
|
||||||
details(["motion", "temperature", "humidity", "illuminance", "battery", "configureAfterSecure"])
|
details(["motion", "temperature", "humidity", "illuminance", "battery", "configure"])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -131,8 +129,8 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd)
|
|||||||
|
|
||||||
if (!isConfigured()) {
|
if (!isConfigured()) {
|
||||||
// we're still in the process of configuring a newly joined device
|
// we're still in the process of configuring a newly joined device
|
||||||
log.debug("not sending wakeUpNoMoreInformation yet")
|
log.debug("not sending wakeUpNoMoreInformation yet: late configure")
|
||||||
result += response(configureAfterSecure())
|
result += response(configure())
|
||||||
} else {
|
} else {
|
||||||
result += response(zwave.wakeUpV1.wakeUpNoMoreInformation())
|
result += response(zwave.wakeUpV1.wakeUpNoMoreInformation())
|
||||||
}
|
}
|
||||||
@@ -150,11 +148,6 @@ def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulat
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityCommandsSupportedReport cmd) {
|
|
||||||
// log.debug "Received SecurityCommandsSupportedReport"
|
|
||||||
response(configureAfterSecure())
|
|
||||||
}
|
|
||||||
|
|
||||||
def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
|
def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
|
||||||
def map = [ name: "battery", unit: "%" ]
|
def map = [ name: "battery", unit: "%" ]
|
||||||
if (cmd.batteryLevel == 0xFF) {
|
if (cmd.batteryLevel == 0xFF) {
|
||||||
@@ -226,36 +219,6 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
|||||||
createEvent(descriptionText: cmd.toString(), isStateChange: false)
|
createEvent(descriptionText: cmd.toString(), isStateChange: false)
|
||||||
}
|
}
|
||||||
|
|
||||||
def configureAfterSecure() {
|
|
||||||
// log.debug "configureAfterSecure()"
|
|
||||||
|
|
||||||
def request = [
|
|
||||||
// send temperature, humidity, and illuminance every 8 minutes
|
|
||||||
zwave.configurationV1.configurationSet(parameterNumber: 101, size: 4, scaledConfigurationValue: 128|64|32),
|
|
||||||
zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: 8*60),
|
|
||||||
|
|
||||||
// send battery every 20 hours
|
|
||||||
zwave.configurationV1.configurationSet(parameterNumber: 102, size: 4, scaledConfigurationValue: 1),
|
|
||||||
zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 20*60*60),
|
|
||||||
|
|
||||||
// send no-motion report 60 seconds after motion stops
|
|
||||||
zwave.configurationV1.configurationSet(parameterNumber: 3, size: 2, scaledConfigurationValue: 60),
|
|
||||||
|
|
||||||
// send binary sensor report instead of basic set for motion
|
|
||||||
zwave.configurationV1.configurationSet(parameterNumber: 5, size: 1, scaledConfigurationValue: 2),
|
|
||||||
|
|
||||||
// disable notification-style motion events
|
|
||||||
zwave.notificationV3.notificationSet(notificationType: 7, notificationStatus: 0),
|
|
||||||
|
|
||||||
zwave.batteryV1.batteryGet(),
|
|
||||||
zwave.sensorBinaryV2.sensorBinaryGet(sensorType:0x0C)
|
|
||||||
]
|
|
||||||
|
|
||||||
setConfigured()
|
|
||||||
|
|
||||||
secureSequence(request) + ["delay 20000", zwave.wakeUpV1.wakeUpNoMoreInformation().format()]
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* PING is used by Device-Watch in attempt to reach the Device
|
* PING is used by Device-Watch in attempt to reach the Device
|
||||||
* */
|
* */
|
||||||
@@ -265,7 +228,36 @@ def ping() {
|
|||||||
|
|
||||||
def configure() {
|
def configure() {
|
||||||
// log.debug "configure()"
|
// log.debug "configure()"
|
||||||
//["delay 30000"] + secure(zwave.securityV1.securityCommandsSupportedGet())
|
def request = []
|
||||||
|
// send temperature, humidity, and illuminance every 8 minutes
|
||||||
|
request << zwave.configurationV1.configurationSet(parameterNumber: 101, size: 4, scaledConfigurationValue: 128|64|32)
|
||||||
|
request << zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: 8*60)
|
||||||
|
|
||||||
|
// send battery every 20 hours
|
||||||
|
request << zwave.configurationV1.configurationSet(parameterNumber: 102, size: 4, scaledConfigurationValue: 1)
|
||||||
|
request << zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 20*60*60)
|
||||||
|
|
||||||
|
// send no-motion report 60 seconds after motion stops
|
||||||
|
request << zwave.configurationV1.configurationSet(parameterNumber: 3, size: 2, scaledConfigurationValue: 60)
|
||||||
|
|
||||||
|
// send binary sensor report instead of basic set for motion
|
||||||
|
request << zwave.configurationV1.configurationSet(parameterNumber: 5, size: 1, scaledConfigurationValue: 2)
|
||||||
|
|
||||||
|
// Turn on the Multisensor Gen5 PIR sensor
|
||||||
|
request << zwave.configurationV1.configurationSet(parameterNumber: 4, size: 1, scaledConfigurationValue: 1)
|
||||||
|
|
||||||
|
// disable notification-style motion events
|
||||||
|
request << zwave.notificationV3.notificationSet(notificationType: 7, notificationStatus: 0)
|
||||||
|
|
||||||
|
request << zwave.batteryV1.batteryGet()
|
||||||
|
request << zwave.sensorBinaryV2.sensorBinaryGet(sensorType: 0x0C) //motion
|
||||||
|
request << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 0x01) //temperature
|
||||||
|
request << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 0x03) //illuminance
|
||||||
|
request << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 0x05) //humidity
|
||||||
|
|
||||||
|
setConfigured()
|
||||||
|
|
||||||
|
secureSequence(request) + ["delay 20000", zwave.wakeUpV1.wakeUpNoMoreInformation().format()]
|
||||||
}
|
}
|
||||||
|
|
||||||
private setConfigured() {
|
private setConfigured() {
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Bose SoundTouch
|
* Bose SoundTouch
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -108,11 +108,20 @@ def updated(){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def getCommandClassVersions() {
|
||||||
|
[
|
||||||
|
0x20: 1, // Basic
|
||||||
|
0x26: 1, // SwitchMultilevel
|
||||||
|
0x56: 1, // Crc16Encap
|
||||||
|
0x70: 1, // Configuration
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
def parse(String description) {
|
def parse(String description) {
|
||||||
def result = null
|
def result = null
|
||||||
if (description != "updated") {
|
if (description != "updated") {
|
||||||
log.debug "parse() >> zwave.parse($description)"
|
log.debug "parse() >> zwave.parse($description)"
|
||||||
def cmd = zwave.parse(description, [0x20: 1, 0x26: 1, 0x70: 1])
|
def cmd = zwave.parse(description, commandClassVersions)
|
||||||
if (cmd) {
|
if (cmd) {
|
||||||
result = zwaveEvent(cmd)
|
result = zwaveEvent(cmd)
|
||||||
}
|
}
|
||||||
@@ -179,6 +188,16 @@ def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv1.SwitchMultilevelS
|
|||||||
[createEvent(name:"switch", value:"on"), response(zwave.switchMultilevelV1.switchMultilevelGet().format())]
|
[createEvent(name:"switch", value:"on"), response(zwave.switchMultilevelV1.switchMultilevelGet().format())]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
|
||||||
|
def versions = commandClassVersions
|
||||||
|
def version = versions[cmd.commandClass as Integer]
|
||||||
|
def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
|
||||||
|
def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
|
||||||
|
if (encapsulatedCommand) {
|
||||||
|
zwaveEvent(encapsulatedCommand)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
||||||
// Handles all Z-Wave commands we aren't interested in
|
// Handles all Z-Wave commands we aren't interested in
|
||||||
[:]
|
[:]
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hue Bloom
|
* Hue Bloom
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hue Bridge
|
* Hue Bridge
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hue Bulb
|
* Hue Bulb
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hue Lux Bulb
|
* Hue Lux Bulb
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hue White Ambiance Bulb
|
* Hue White Ambiance Bulb
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Copyright 2015 SmartThings
|
* Copyright 2015 SmartThings
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Copyright 2015 SmartThings
|
* Copyright 2015 SmartThings
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Copyright 2015 SmartThings
|
* Copyright 2015 SmartThings
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -66,22 +66,29 @@ def parse(String description) {
|
|||||||
else {
|
else {
|
||||||
sendEvent(event)
|
sendEvent(event)
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
def descMap = zigbee.parseDescriptionAsMap(description)
|
||||||
def cluster = zigbee.parse(description)
|
if (descMap && descMap.clusterInt == 0x0006 && descMap.commandInt == 0x07) {
|
||||||
|
if (descMap.data[0] == "00") {
|
||||||
if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
|
|
||||||
if (cluster.data[0] == 0x00) {
|
|
||||||
log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
|
log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
|
||||||
sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
|
sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
|
log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
|
||||||
}
|
}
|
||||||
}
|
} else if (device.getDataValue("manufacturer") == "sengled" && descMap && descMap.clusterInt == 0x0008 && descMap.attrInt == 0x0000) {
|
||||||
else {
|
// This is being done because the sengled element touch/classic incorrectly uses the value 0xFF for the max level.
|
||||||
|
// Per the ZCL spec for the UINT8 data type 0xFF is an invalid value, and 0xFE should be the max. Here we
|
||||||
|
// manually handle the invalid attribute value since it will be ignored by getEvent as an invalid value.
|
||||||
|
// We also set the level of the bulb to 0xFE so future level reports will be 0xFE until it is changed by
|
||||||
|
// something else.
|
||||||
|
if (descMap.value.toUpperCase() == "FF") {
|
||||||
|
descMap.value = "FE"
|
||||||
|
}
|
||||||
|
sendHubCommand(zigbee.command(zigbee.LEVEL_CONTROL_CLUSTER, 0x00, "FE0000").collect { new physicalgraph.device.HubAction(it) }, 0)
|
||||||
|
sendEvent(zigbee.getEventFromAttrData(descMap.clusterInt, descMap.attrInt, descMap.encoding, descMap.value))
|
||||||
|
} else {
|
||||||
log.warn "DID NOT PARSE MESSAGE for description : $description"
|
log.warn "DID NOT PARSE MESSAGE for description : $description"
|
||||||
log.debug "${cluster}"
|
log.debug "${descMap}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -103,12 +103,12 @@ def parse(String description) {
|
|||||||
|
|
||||||
if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
|
if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
|
||||||
if(zigbeeMap.attrInt == ATTRIBUTE_HUE){ //Hue Attribute
|
if(zigbeeMap.attrInt == ATTRIBUTE_HUE){ //Hue Attribute
|
||||||
def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
|
state.hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
|
||||||
sendEvent(name: "hue", value: hueValue, descriptionText: "Color has changed")
|
runIn(5, updateColor, [overwrite: true])
|
||||||
}
|
}
|
||||||
else if(zigbeeMap.attrInt == ATTRIBUTE_SATURATION){ //Saturation Attribute
|
else if(zigbeeMap.attrInt == ATTRIBUTE_SATURATION){ //Saturation Attribute
|
||||||
def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
|
state.saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
|
||||||
sendEvent(name: "saturation", value: saturationValue, descriptionText: "Color has changed", displayed: false)
|
runIn(5, updateColor, [overwrite: true])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
|
else if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
|
||||||
@@ -127,6 +127,11 @@ def parse(String description) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def updateColor() {
|
||||||
|
sendEvent(name: "hue", value: state.hueValue, descriptionText: "Color has changed")
|
||||||
|
sendEvent(name: "saturation", value: state.saturationValue, descriptionText: "Color has changed", displayed: false)
|
||||||
|
}
|
||||||
|
|
||||||
def on() {
|
def on() {
|
||||||
zigbee.on()
|
zigbee.on()
|
||||||
}
|
}
|
||||||
@@ -204,9 +209,9 @@ def setColor(value){
|
|||||||
log.trace "setColor($value)"
|
log.trace "setColor($value)"
|
||||||
zigbee.on() +
|
zigbee.on() +
|
||||||
zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_HUE_AND_SATURATION_COMMAND,
|
zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_HUE_AND_SATURATION_COMMAND,
|
||||||
getScaledHue(value.hue), getScaledSaturation(value.saturation), "0000") +
|
getScaledHue(value.hue), getScaledSaturation(value.saturation), "0000") +
|
||||||
zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
|
zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) +
|
||||||
zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
|
zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE)
|
||||||
}
|
}
|
||||||
|
|
||||||
def setHue(value) {
|
def setHue(value) {
|
||||||
|
|||||||
@@ -88,11 +88,20 @@ def updated(){
|
|||||||
sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
|
sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def getCommandClassVersions() {
|
||||||
|
[
|
||||||
|
0x20: 1, // Basic
|
||||||
|
0x26: 1, // SwitchMultilevel
|
||||||
|
0x56: 1, // Crc16Encap
|
||||||
|
0x70: 1, // Configuration
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
def parse(String description) {
|
def parse(String description) {
|
||||||
def result = null
|
def result = null
|
||||||
if (description != "updated") {
|
if (description != "updated") {
|
||||||
log.debug "parse() >> zwave.parse($description)"
|
log.debug "parse() >> zwave.parse($description)"
|
||||||
def cmd = zwave.parse(description, [0x20: 1, 0x26: 1, 0x70: 1])
|
def cmd = zwave.parse(description, commandClassVersions)
|
||||||
if (cmd) {
|
if (cmd) {
|
||||||
result = zwaveEvent(cmd)
|
result = zwaveEvent(cmd)
|
||||||
}
|
}
|
||||||
@@ -159,6 +168,16 @@ def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv1.SwitchMultilevelS
|
|||||||
[createEvent(name:"switch", value:"on"), response(zwave.switchMultilevelV1.switchMultilevelGet().format())]
|
[createEvent(name:"switch", value:"on"), response(zwave.switchMultilevelV1.switchMultilevelGet().format())]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
|
||||||
|
def versions = commandClassVersions
|
||||||
|
def version = versions[cmd.commandClass as Integer]
|
||||||
|
def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
|
||||||
|
def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
|
||||||
|
if (encapsulatedCommand) {
|
||||||
|
zwaveEvent(encapsulatedCommand)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
||||||
// Handles all Z-Wave commands we aren't interested in
|
// Handles all Z-Wave commands we aren't interested in
|
||||||
[:]
|
[:]
|
||||||
|
|||||||
@@ -85,11 +85,21 @@ metadata {
|
|||||||
details(["switch", "power", "energy", "levelSliderControl", "refresh", "reset"])
|
details(["switch", "power", "energy", "levelSliderControl", "refresh", "reset"])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def getCommandClassVersions() {
|
||||||
|
[
|
||||||
|
0x20: 1, // Basic
|
||||||
|
0x26: 3, // SwitchMultilevel
|
||||||
|
0x56: 1, // Crc16Encap
|
||||||
|
0x70: 1, // Configuration
|
||||||
|
0x32: 3, // Meter
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
// parse events into attributes
|
// parse events into attributes
|
||||||
def parse(String description) {
|
def parse(String description) {
|
||||||
def result = null
|
def result = null
|
||||||
if (description != "updated") {
|
if (description != "updated") {
|
||||||
def cmd = zwave.parse(description, [0x20: 1, 0x26: 3, 0x70: 1, 0x32:3])
|
def cmd = zwave.parse(description, commandClassVersions)
|
||||||
if (cmd) {
|
if (cmd) {
|
||||||
result = zwaveEvent(cmd)
|
result = zwaveEvent(cmd)
|
||||||
log.debug("'$description' parsed to $result")
|
log.debug("'$description' parsed to $result")
|
||||||
@@ -124,6 +134,21 @@ def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv3.SwitchMultilevelR
|
|||||||
dimmerEvents(cmd)
|
dimmerEvents(cmd)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
|
||||||
|
def versions = commandClassVersions
|
||||||
|
def version = versions[cmd.commandClass as Integer]
|
||||||
|
def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
|
||||||
|
def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
|
||||||
|
if (encapsulatedCommand) {
|
||||||
|
zwaveEvent(encapsulatedCommand)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
||||||
|
// Handles all Z-Wave commands we aren't interested in
|
||||||
|
[:]
|
||||||
|
}
|
||||||
|
|
||||||
def dimmerEvents(physicalgraph.zwave.Command cmd) {
|
def dimmerEvents(physicalgraph.zwave.Command cmd) {
|
||||||
def result = []
|
def result = []
|
||||||
def value = (cmd.value ? "on" : "off")
|
def value = (cmd.value ? "on" : "off")
|
||||||
|
|||||||
@@ -89,10 +89,19 @@ def updated() {
|
|||||||
} catch (e) { log.debug e }
|
} catch (e) { log.debug e }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def getCommandClassVersions() {
|
||||||
|
[
|
||||||
|
0x20: 1, // Basic
|
||||||
|
0x32: 1, // SwitchMultilevel
|
||||||
|
0x56: 1, // Crc16Encap
|
||||||
|
0x72: 2, // ManufacturerSpecific
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
def parse(String description) {
|
def parse(String description) {
|
||||||
def result = null
|
def result = null
|
||||||
if(description == "updated") return
|
if(description == "updated") return
|
||||||
def cmd = zwave.parse(description, [0x20: 1, 0x32: 1, 0x72: 2])
|
def cmd = zwave.parse(description, commandClassVersions)
|
||||||
if (cmd) {
|
if (cmd) {
|
||||||
result = zwaveEvent(cmd)
|
result = zwaveEvent(cmd)
|
||||||
}
|
}
|
||||||
@@ -157,6 +166,16 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
|
|||||||
result
|
result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
|
||||||
|
def versions = commandClassVersions
|
||||||
|
def version = versions[cmd.commandClass as Integer]
|
||||||
|
def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
|
||||||
|
def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
|
||||||
|
if (encapsulatedCommand) {
|
||||||
|
zwaveEvent(encapsulatedCommand)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
||||||
log.debug "$device.displayName: Unhandled: $cmd"
|
log.debug "$device.displayName: Unhandled: $cmd"
|
||||||
[:]
|
[:]
|
||||||
|
|||||||
@@ -71,9 +71,17 @@ def updated(){
|
|||||||
sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
|
sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def getCommandClassVersions() {
|
||||||
|
[
|
||||||
|
0x20: 1, // Basic
|
||||||
|
0x56: 1, // Crc16Encap
|
||||||
|
0x70: 1, // Configuration
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
def parse(String description) {
|
def parse(String description) {
|
||||||
def result = null
|
def result = null
|
||||||
def cmd = zwave.parse(description, [0x20: 1, 0x70: 1])
|
def cmd = zwave.parse(description, commandClassVersions)
|
||||||
if (cmd) {
|
if (cmd) {
|
||||||
result = createEvent(zwaveEvent(cmd))
|
result = createEvent(zwaveEvent(cmd))
|
||||||
}
|
}
|
||||||
@@ -120,6 +128,15 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
|
|||||||
createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
|
createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
|
||||||
|
def versions = commandClassVersions
|
||||||
|
def version = versions[cmd.commandClass as Integer]
|
||||||
|
def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
|
||||||
|
def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
|
||||||
|
if (encapsulatedCommand) {
|
||||||
|
zwaveEvent(encapsulatedCommand)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
||||||
// Handles all Z-Wave commands we aren't interested in
|
// Handles all Z-Wave commands we aren't interested in
|
||||||
|
|||||||
@@ -89,9 +89,17 @@ def updated(){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def getCommandClassVersions() {
|
||||||
|
[
|
||||||
|
0x20: 1, // Basic
|
||||||
|
0x56: 1, // Crc16Encap
|
||||||
|
0x70: 1, // Configuration
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
def parse(String description) {
|
def parse(String description) {
|
||||||
def result = null
|
def result = null
|
||||||
def cmd = zwave.parse(description, [0x20: 1, 0x70: 1])
|
def cmd = zwave.parse(description, commandClassVersions)
|
||||||
if (cmd) {
|
if (cmd) {
|
||||||
result = createEvent(zwaveEvent(cmd))
|
result = createEvent(zwaveEvent(cmd))
|
||||||
}
|
}
|
||||||
@@ -138,6 +146,16 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
|
|||||||
createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
|
createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
|
||||||
|
def versions = commandClassVersions
|
||||||
|
def version = versions[cmd.commandClass as Integer]
|
||||||
|
def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
|
||||||
|
def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
|
||||||
|
if (encapsulatedCommand) {
|
||||||
|
zwaveEvent(encapsulatedCommand)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
def zwaveEvent(physicalgraph.zwave.Command cmd) {
|
||||||
// Handles all Z-Wave commands we aren't interested in
|
// Handles all Z-Wave commands we aren't interested in
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Bose SoundTouch (Connect)
|
* Bose SoundTouch (Connect)
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hue Service Manager
|
* Hue Service Manager
|
||||||
*
|
*
|
||||||
@@ -1083,7 +1085,6 @@ def on(childDevice) {
|
|||||||
log.debug "Executing 'on'"
|
log.debug "Executing 'on'"
|
||||||
def id = getId(childDevice)
|
def id = getId(childDevice)
|
||||||
updateInProgress()
|
updateInProgress()
|
||||||
createSwitchEvent(childDevice, "on")
|
|
||||||
put("lights/$id/state", [on: true])
|
put("lights/$id/state", [on: true])
|
||||||
return "Bulb is turning On"
|
return "Bulb is turning On"
|
||||||
}
|
}
|
||||||
@@ -1092,7 +1093,6 @@ def off(childDevice) {
|
|||||||
log.debug "Executing 'off'"
|
log.debug "Executing 'off'"
|
||||||
def id = getId(childDevice)
|
def id = getId(childDevice)
|
||||||
updateInProgress()
|
updateInProgress()
|
||||||
createSwitchEvent(childDevice, "off")
|
|
||||||
put("lights/$id/state", [on: false])
|
put("lights/$id/state", [on: false])
|
||||||
return "Bulb is turning Off"
|
return "Bulb is turning Off"
|
||||||
}
|
}
|
||||||
@@ -1108,8 +1108,6 @@ def setLevel(childDevice, percent) {
|
|||||||
else
|
else
|
||||||
level = Math.min(Math.round(percent * 254 / 100), 254)
|
level = Math.min(Math.round(percent * 254 / 100), 254)
|
||||||
|
|
||||||
createSwitchEvent(childDevice, level > 0, percent)
|
|
||||||
|
|
||||||
// For Zigbee lights, if level is set to 0 ST just turns them off without changing level
|
// For Zigbee lights, if level is set to 0 ST just turns them off without changing level
|
||||||
// that means that the light will still be on when on is called next time
|
// that means that the light will still be on when on is called next time
|
||||||
// Lets emulate that here
|
// Lets emulate that here
|
||||||
@@ -1128,7 +1126,6 @@ def setSaturation(childDevice, percent) {
|
|||||||
// 0 - 254
|
// 0 - 254
|
||||||
def level = Math.min(Math.round(percent * 254 / 100), 254)
|
def level = Math.min(Math.round(percent * 254 / 100), 254)
|
||||||
// TODO should this be done by app only or should we default to on?
|
// TODO should this be done by app only or should we default to on?
|
||||||
createSwitchEvent(childDevice, "on")
|
|
||||||
put("lights/$id/state", [sat: level, on: true])
|
put("lights/$id/state", [sat: level, on: true])
|
||||||
return "Setting saturation to $percent"
|
return "Setting saturation to $percent"
|
||||||
}
|
}
|
||||||
@@ -1140,7 +1137,6 @@ def setHue(childDevice, percent) {
|
|||||||
// 0 - 65535
|
// 0 - 65535
|
||||||
def level = Math.min(Math.round(percent * 65535 / 100), 65535)
|
def level = Math.min(Math.round(percent * 65535 / 100), 65535)
|
||||||
// TODO should this be done by app only or should we default to on?
|
// TODO should this be done by app only or should we default to on?
|
||||||
createSwitchEvent(childDevice, "on")
|
|
||||||
put("lights/$id/state", [hue: level, on: true])
|
put("lights/$id/state", [hue: level, on: true])
|
||||||
return "Setting hue to $percent"
|
return "Setting hue to $percent"
|
||||||
}
|
}
|
||||||
@@ -1151,7 +1147,6 @@ def setColorTemperature(childDevice, huesettings) {
|
|||||||
updateInProgress()
|
updateInProgress()
|
||||||
// 153 (6500K) to 500 (2000K)
|
// 153 (6500K) to 500 (2000K)
|
||||||
def ct = hueSettings == 6500 ? 153 : Math.round(1000000 / huesettings)
|
def ct = hueSettings == 6500 ? 153 : Math.round(1000000 / huesettings)
|
||||||
createSwitchEvent(childDevice, "on")
|
|
||||||
put("lights/$id/state", [ct: ct, on: true])
|
put("lights/$id/state", [ct: ct, on: true])
|
||||||
return "Setting color temperature to $ct"
|
return "Setting color temperature to $ct"
|
||||||
}
|
}
|
||||||
@@ -1210,7 +1205,6 @@ def setColor(childDevice, huesettings) {
|
|||||||
if (huesettings.switch == "off")
|
if (huesettings.switch == "off")
|
||||||
value.on = false
|
value.on = false
|
||||||
|
|
||||||
createSwitchEvent(childDevice, value.on ? "on" : "off")
|
|
||||||
put("lights/$id/state", value)
|
put("lights/$id/state", value)
|
||||||
return "Setting color to $value"
|
return "Setting color to $value"
|
||||||
}
|
}
|
||||||
@@ -1322,32 +1316,6 @@ private List getRealHubFirmwareVersions() {
|
|||||||
return location.hubs*.firmwareVersionString.findAll { it }
|
return location.hubs*.firmwareVersionString.findAll { it }
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Sends appropriate turningOn/turningOff state events depending on switch or level changes.
|
|
||||||
*
|
|
||||||
* @param childDevice device to send event for
|
|
||||||
* @param setSwitch The new switch state, "on" or "off"
|
|
||||||
* @param setLevel Optional, switchLevel between 0-100, used if you set level to 0 for example since
|
|
||||||
* that should generate "off" instead of level change
|
|
||||||
*/
|
|
||||||
private void createSwitchEvent(childDevice, setSwitch, setLevel = null) {
|
|
||||||
|
|
||||||
if (setLevel == null) {
|
|
||||||
setLevel = childDevice.device?.currentValue("level")
|
|
||||||
}
|
|
||||||
// Create on, off, turningOn or turningOff event as necessary
|
|
||||||
def currentState = childDevice.device?.currentValue("switch")
|
|
||||||
if ((currentState == "off" || currentState == "turningOff")) {
|
|
||||||
if (setSwitch == "on" || setLevel > 0) {
|
|
||||||
childDevice.sendEvent(name: "switch", value: "turningOn", displayed: false)
|
|
||||||
}
|
|
||||||
} else if ((currentState == "on" || currentState == "turningOn")) {
|
|
||||||
if (setSwitch == "off" || setLevel == 0) {
|
|
||||||
childDevice.sendEvent(name: "switch", value: "turningOff", displayed: false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the supported color range for different Hue lights. If model is not specified
|
* Return the supported color range for different Hue lights. If model is not specified
|
||||||
* it defaults to the smallest Gamut (B) to ensure that colors set on a mix of devices
|
* it defaults to the smallest Gamut (B) to ensure that colors set on a mix of devices
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Copyright 2015 SmartThings
|
* Copyright 2015 SmartThings
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user