mirror of
https://github.com/mtan93/SmartThingsPublic.git
synced 2026-04-03 22:04:41 +01:00
Compare commits
1 Commits
MSA-1631-2
...
revert-141
| Author | SHA1 | Date | |
|---|---|---|---|
|
76b3c34d5f |
@@ -120,15 +120,6 @@ def configure() {
|
||||
return cmd
|
||||
}
|
||||
|
||||
|
||||
def installed() {
|
||||
initialize()
|
||||
}
|
||||
|
||||
def updated() {
|
||||
initialize()
|
||||
}
|
||||
|
||||
def initialize() {
|
||||
sendEvent(name: "numberOfButtons", value: 4)
|
||||
}
|
||||
|
||||
@@ -109,15 +109,6 @@ def configure() {
|
||||
return cmds
|
||||
}
|
||||
|
||||
|
||||
def installed() {
|
||||
initialize()
|
||||
}
|
||||
|
||||
def updated() {
|
||||
initialize()
|
||||
}
|
||||
|
||||
def initialize() {
|
||||
sendEvent(name: "numberOfButtons", value: 4)
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ metadata {
|
||||
capability "Switch"
|
||||
capability "Refresh"
|
||||
capability "Music Player"
|
||||
capability "Health Check"
|
||||
capability "Polling"
|
||||
|
||||
/**
|
||||
* Define all commands, ie, if you have a custom action not
|
||||
@@ -236,33 +236,7 @@ def parse(String event) {
|
||||
* @return action(s) to take or null
|
||||
*/
|
||||
def installed() {
|
||||
// Notify health check about this device with timeout interval 12 minutes
|
||||
sendEvent(name: "checkInterval", value: 12 * 60, data: [protocol: "lan", hubHardwareId: device.hub.hardwareID], displayed: false)
|
||||
startPoll()
|
||||
}
|
||||
|
||||
/**
|
||||
* Called by health check if no events been generated in the last 12 minutes
|
||||
* If device doesn't respond it will be marked offline (not available)
|
||||
*/
|
||||
def ping() {
|
||||
TRACE("ping")
|
||||
boseSendGetNowPlaying()
|
||||
}
|
||||
|
||||
/**
|
||||
* Schedule a 2 minute poll of the device to refresh the
|
||||
* tiles so the user gets the correct information.
|
||||
*/
|
||||
def startPoll() {
|
||||
TRACE("startPoll")
|
||||
unschedule()
|
||||
// Schedule 2 minute polling of speaker status (song average length is 3-4 minutes)
|
||||
def sec = Math.round(Math.floor(Math.random() * 60))
|
||||
//def cron = "$sec 0/5 * * * ?" // every 5 min
|
||||
def cron = "$sec 0/2 * * * ?" // every 2 min
|
||||
log.debug "schedule('$cron', boseSendGetNowPlaying)"
|
||||
schedule(cron, boseSendGetNowPlaying)
|
||||
onAction("refresh")
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -342,6 +316,14 @@ def onAction(String user, data=null) {
|
||||
return actions
|
||||
}
|
||||
|
||||
/**
|
||||
* Called every so often (every 5 minutes actually) to refresh the
|
||||
* tiles so the user gets the correct information.
|
||||
*/
|
||||
def poll() {
|
||||
return boseRefreshNowPlaying()
|
||||
}
|
||||
|
||||
/**
|
||||
* Joins this speaker into the everywhere zone
|
||||
*/
|
||||
@@ -855,10 +837,6 @@ def boseRefreshNowPlaying(delay=0) {
|
||||
return boseGET("/now_playing")
|
||||
}
|
||||
|
||||
def boseSendGetNowPlaying() {
|
||||
sendHubCommand(boseGET("/now_playing"))
|
||||
}
|
||||
|
||||
/**
|
||||
* Requests the list of presets
|
||||
*
|
||||
@@ -1036,8 +1014,4 @@ def boseGetDeviceID() {
|
||||
*/
|
||||
def getDeviceIP() {
|
||||
return parent.resolveDNI2Address(device.deviceNetworkId)
|
||||
}
|
||||
|
||||
def TRACE(text) {
|
||||
log.trace "${text}"
|
||||
}
|
||||
@@ -183,15 +183,6 @@ def updateState(String name, String value) {
|
||||
device.updateDataValue(name, value)
|
||||
}
|
||||
|
||||
|
||||
def installed() {
|
||||
initialize()
|
||||
}
|
||||
|
||||
def updated() {
|
||||
initialize()
|
||||
}
|
||||
|
||||
def initialize() {
|
||||
sendEvent(name: "numberOfButtons", value: 3)
|
||||
}
|
||||
|
||||
@@ -23,7 +23,6 @@ metadata {
|
||||
capability "Sensor"
|
||||
capability "Refresh"
|
||||
capability "Relative Humidity Measurement"
|
||||
capability "Health Check"
|
||||
|
||||
command "generateEvent"
|
||||
command "raiseSetpoint"
|
||||
@@ -39,7 +38,6 @@ metadata {
|
||||
attribute "maxCoolingSetpoint", "number"
|
||||
attribute "minCoolingSetpoint", "number"
|
||||
attribute "deviceTemperatureUnit", "string"
|
||||
attribute "deviceAlive", "enum", ["true", "false"]
|
||||
}
|
||||
|
||||
tiles {
|
||||
@@ -122,21 +120,6 @@ metadata {
|
||||
|
||||
}
|
||||
|
||||
void installed() {
|
||||
// The device refreshes every 5 minutes by default so if we miss 2 refreshes we can consider it offline
|
||||
// Using 12 minutes because in testing, device health team found that there could be "jitter"
|
||||
sendEvent(name: "checkInterval", value: 60 * 12, data: [protocol: "cloud"], displayed: false)
|
||||
}
|
||||
|
||||
// Device Watch will ping the device to proactively determine if the device has gone offline
|
||||
// If the device was online the last time we refreshed, trigger another refresh as part of the ping.
|
||||
def ping() {
|
||||
def isAlive = device.currentValue("deviceAlive") == "true" ? true : false
|
||||
if (isAlive) {
|
||||
refresh()
|
||||
}
|
||||
}
|
||||
|
||||
// parse events into attributes
|
||||
def parse(String description) {
|
||||
log.debug "Parsing '${description}'"
|
||||
@@ -181,11 +164,7 @@ def generateEvent(Map results) {
|
||||
} else if (name=="humidity") {
|
||||
isChange = isStateChange(device, name, value.toString())
|
||||
event << [value: value.toString(), isStateChange: isChange, displayed: false, unit: "%"]
|
||||
} else if (name == "deviceAlive") {
|
||||
isChange = isStateChange(device, name, value.toString())
|
||||
event['isStateChange'] = isChange
|
||||
event['displayed'] = false
|
||||
} else {
|
||||
} else {
|
||||
isChange = isStateChange(device, name, value.toString())
|
||||
isDisplayed = isChange
|
||||
event << [value: value.toString(), isStateChange: isChange, displayed: isDisplayed]
|
||||
|
||||
@@ -71,7 +71,7 @@ def parse(String description) {
|
||||
|
||||
def event = [:]
|
||||
def finalResult = isKnownDescription(description)
|
||||
if (finalResult) {
|
||||
if (finalResult != "false") {
|
||||
log.info finalResult
|
||||
if (finalResult.type == "update") {
|
||||
log.info "$device updates: ${finalResult.value}"
|
||||
@@ -212,16 +212,13 @@ def isKnownDescription(description) {
|
||||
else if (descMap.cluster == "0B04" || descMap.clusterId == "0B04"){
|
||||
isDescriptionPower(descMap)
|
||||
}
|
||||
else {
|
||||
return [:]
|
||||
}
|
||||
}
|
||||
else if(description?.startsWith("on/off:")) {
|
||||
def switchValue = description?.endsWith("1") ? "on" : "off"
|
||||
return [type: "switch", value : switchValue]
|
||||
}
|
||||
else {
|
||||
return [:]
|
||||
return "false"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -255,7 +252,7 @@ def isDescriptionOnOff(descMap) {
|
||||
return [type: "switch", value : switchValue]
|
||||
}
|
||||
else {
|
||||
return [:]
|
||||
return "false"
|
||||
}
|
||||
|
||||
}
|
||||
@@ -282,9 +279,10 @@ def isDescriptionLevel(descMap) {
|
||||
|
||||
if (dimmerValue != -1){
|
||||
return [type: "level", value : dimmerValue]
|
||||
|
||||
}
|
||||
else {
|
||||
return [:]
|
||||
return "false"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -306,7 +304,7 @@ def isDescriptionPower(descMap) {
|
||||
return [type: "power", value : powerValue]
|
||||
}
|
||||
else {
|
||||
return [:]
|
||||
return "false"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,6 @@ def parse(String description) {
|
||||
|
||||
private Map parseBasicMessage(description) {
|
||||
def name = parseName(description)
|
||||
def results = [:]
|
||||
if (name != null) {
|
||||
def value = parseValue(description)
|
||||
def linkText = getLinkText(device)
|
||||
@@ -65,7 +64,7 @@ private Map parseBasicMessage(description) {
|
||||
def handlerName = value
|
||||
def isStateChange = isStateChange(device, name, value)
|
||||
|
||||
results = [
|
||||
def results = [
|
||||
name : name,
|
||||
value : value,
|
||||
linkText : linkText,
|
||||
@@ -74,6 +73,8 @@ private Map parseBasicMessage(description) {
|
||||
isStateChange : isStateChange,
|
||||
displayed : displayed(description, isStateChange)
|
||||
]
|
||||
} else {
|
||||
results = [:]
|
||||
}
|
||||
log.debug "Parse returned $results.descriptionText"
|
||||
return results
|
||||
|
||||
@@ -126,15 +126,6 @@ private hold(button) {
|
||||
sendEvent(name: "button", value: "held", data: [buttonNumber: button], descriptionText: "$device.displayName button $button was held", isStateChange: true)
|
||||
}
|
||||
|
||||
|
||||
def installed() {
|
||||
initialize()
|
||||
}
|
||||
|
||||
def updated() {
|
||||
initialize()
|
||||
}
|
||||
|
||||
def initialize() {
|
||||
sendEvent(name: "numberOfButtons", value: 4)
|
||||
}
|
||||
|
||||
@@ -23,11 +23,9 @@ metadata {
|
||||
|
||||
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart A19 Soft White"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 ON/OFF/DIM", deviceJoinName: "OSRAM LIGHTIFY LED Smart Connected Light"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FF00", outClusters: "0019", manufacturer: "MRVL", model: "MZ100", deviceJoinName: "Wemo Bulb"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B05", outClusters: "0019", manufacturer: "OSRAM SYLVANIA", model: "iQBR30", deviceJoinName: "Sylvania Ultra iQ"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY PAR38 ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart PAR38 Soft White"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart BR30 Soft White"
|
||||
}
|
||||
|
||||
tiles(scale: 2) {
|
||||
|
||||
@@ -28,8 +28,8 @@ metadata {
|
||||
capability "Switch Level"
|
||||
capability "Health Check"
|
||||
|
||||
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Gardenspot RGB", deviceJoinName: "SYLVANIA Smart Gardenspot mini RGB"
|
||||
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Gardenspot RGB", deviceJoinName: "SYLVANIA Smart Gardenspot mini RGB"
|
||||
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Gardenspot RGB", deviceJoinName: "OSRAM LIGHTIFY Gardenspot mini RGB"
|
||||
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Gardenspot RGB", deviceJoinName: "OSRAM LIGHTIFY Gardenspot mini RGB"
|
||||
}
|
||||
|
||||
// UI tile definitions
|
||||
|
||||
@@ -32,12 +32,11 @@ metadata {
|
||||
attribute "colorName", "string"
|
||||
command "setGenericName"
|
||||
|
||||
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Flex RGBW", deviceJoinName: "SYLVANIA Smart Flex RGBW"
|
||||
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY Flex RGBW"
|
||||
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 RGBW", deviceJoinName: "SYLVANIA Smart A19 RGBW"
|
||||
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR RGBW", deviceJoinName: "SYLVANIA Smart BR30 RGBW"
|
||||
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT RGBW", deviceJoinName: "SYLVANIA Smart RT5/6 RGBW"
|
||||
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY FLEX OUTDOOR RGBW", deviceJoinName: "SYLVANIA Smart Outdoor RGBW Flex"
|
||||
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
|
||||
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
|
||||
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 RGBW", deviceJoinName: "OSRAM LIGHTIFY LED A19 RGBW"
|
||||
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR RGBW", deviceJoinName: "OSRAM LIGHTIFY LED BR30 RGBW"
|
||||
fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT RGBW", deviceJoinName: "OSRAM LIGHTIFY LED RT 5/6 RGBW"
|
||||
}
|
||||
|
||||
// UI tile definitions
|
||||
|
||||
@@ -32,12 +32,11 @@ metadata {
|
||||
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300", outClusters: "0019"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04", outClusters: "0019"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR Tunable White", deviceJoinName: "SYLVANIA Smart BR30 Tunable White"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT Tunable White", deviceJoinName: "SYLVANIA Smart RT5/6 Tunable White"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 TW", deviceJoinName: "OSRAM LIGHTIFY LED Classic A60 Tunable White"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 Tunable White", deviceJoinName: "SYLVANIA Smart A19 Tunable White"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Flood BR30 Tunable White"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT Tunable White", deviceJoinName: "OSRAM LIGHTIFY RT5/6 Tunable White"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 TW", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic B40 TW - LIGHTIFY", deviceJoinName: "OSRAM LIGHTIFY Classic B40 Tunable White"
|
||||
fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0702, 0B05", outClusters: "0019", manufacturer: "sengled", model: "Z01-A19NAE26", deviceJoinName: "Sengled Element plus"
|
||||
}
|
||||
|
||||
// UI tile definitions
|
||||
@@ -84,24 +83,105 @@ def parse(String description) {
|
||||
}
|
||||
}
|
||||
else {
|
||||
def cluster = zigbee.parse(description)
|
||||
Map bindingTable = parseBindingTableResponse(description)
|
||||
if (bindingTable) {
|
||||
List<String> cmds = []
|
||||
bindingTable.table_entries.inject(cmds) { acc, entry ->
|
||||
// The binding entry is not for our hub and should be deleted
|
||||
if (entry["dstAddr"] != zigbeeEui) {
|
||||
acc.addAll(removeBinding(entry.clusterId, entry.srcAddr, entry.srcEndpoint, entry.dstAddr, entry.dstEndpoint))
|
||||
}
|
||||
acc
|
||||
}
|
||||
// There are more entries that we haven't examined yet
|
||||
if (bindingTable.numTableEntries > bindingTable.startIndex + bindingTable.numEntriesReturned) {
|
||||
def startPos
|
||||
if (cmds) {
|
||||
log.warn "Removing binding entries for other devices: $cmds"
|
||||
// Since we are removing some entries, we should start in the same spot as we just read since values
|
||||
// will fill in the newly vacated spots
|
||||
startPos = bindingTable.startIndex
|
||||
} else {
|
||||
// Since we aren't removing anything we move forward to the next set of table entries
|
||||
startPos = bindingTable.startIndex + bindingTable.numEntriesReturned
|
||||
}
|
||||
cmds.addAll(requestBindingTable(startPos))
|
||||
}
|
||||
sendHubCommand(cmds.collect { it ->
|
||||
new physicalgraph.device.HubAction(it)
|
||||
}, 2000)
|
||||
} else {
|
||||
def cluster = zigbee.parse(description)
|
||||
|
||||
if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
|
||||
if (cluster.data[0] == 0x00) {
|
||||
log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
|
||||
sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
|
||||
if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
|
||||
if (cluster.data[0] == 0x00) {
|
||||
log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
|
||||
sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
|
||||
}
|
||||
else {
|
||||
log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
|
||||
}
|
||||
}
|
||||
else {
|
||||
log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
|
||||
log.warn "DID NOT PARSE MESSAGE for description : $description"
|
||||
log.debug "${cluster}"
|
||||
}
|
||||
}
|
||||
else {
|
||||
log.warn "DID NOT PARSE MESSAGE for description : $description"
|
||||
log.debug "${cluster}"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
def parseBindingTableResponse(description) {
|
||||
Map descMap = zigbee.parseDescriptionAsMap(description)
|
||||
if (descMap["clusterInt"] == 0x8033) {
|
||||
def header_field_lengths = ["transactionSeqNo": 1, "status": 1, "numTableEntries": 1, "startIndex": 1, "numEntriesReturned": 1]
|
||||
def field_values = [:]
|
||||
def data = descMap["data"]
|
||||
header_field_lengths.each { k, v ->
|
||||
field_values[k] = Integer.parseInt(data.take(v).join(""), 16);
|
||||
data = data.drop(v);
|
||||
}
|
||||
|
||||
List<Map> table = []
|
||||
if (field_values.numEntriesReturned) {
|
||||
def table_entry_lengths = ["srcAddr": 8, "srcEndpoint": 1, "clusterId": 2, "dstAddrMode": 1]
|
||||
for (def i : 0..(field_values.numEntriesReturned - 1)) {
|
||||
def entryMap = [:]
|
||||
table_entry_lengths.each { k, v ->
|
||||
def val = data.take(v).reverse().join("")
|
||||
entryMap[k] = val.length() < 8 ? Integer.parseInt(val, 16) : val
|
||||
data = data.drop(v)
|
||||
}
|
||||
|
||||
switch (entryMap.dstAddrMode) {
|
||||
case 0x01:
|
||||
entryMap["dstAddr"] = data.take(2).reverse().join("")
|
||||
data = data.drop(2)
|
||||
break
|
||||
case 0x03:
|
||||
entryMap["dstAddr"] = data.take(8).reverse().join("")
|
||||
data = data.drop(8)
|
||||
entryMap["dstEndpoint"] = Integer.parseInt(data.take(1).join(""), 16)
|
||||
data = data.drop(1)
|
||||
break
|
||||
}
|
||||
table << entryMap
|
||||
}
|
||||
}
|
||||
field_values["table_entries"] = table
|
||||
return field_values
|
||||
}
|
||||
return [:]
|
||||
}
|
||||
|
||||
def requestBindingTable(startPos=0) {
|
||||
return ["zdo mgmt-bind 0x${zigbee.deviceNetworkId} $startPos"]
|
||||
}
|
||||
|
||||
def removeBinding(cluster, srcAddr, srcEndpoint, destAddr, destEndpoint) {
|
||||
return ["zdo unbind unicast 0x${zigbee.deviceNetworkId} {${srcAddr}} $srcEndpoint $cluster {${destAddr}} $destEndpoint"]
|
||||
}
|
||||
|
||||
|
||||
def off() {
|
||||
zigbee.off()
|
||||
}
|
||||
@@ -131,8 +211,7 @@ def configure() {
|
||||
// enrolls with default periodic reporting until newer 5 min interval is confirmed
|
||||
sendEvent(name: "checkInterval", value: 2 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
|
||||
|
||||
// OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
|
||||
refresh()
|
||||
refresh() + requestBindingTable(0) + ["delay 2000"]
|
||||
}
|
||||
|
||||
def setColorTemperature(value) {
|
||||
|
||||
@@ -127,8 +127,8 @@ def configureHealthCheck() {
|
||||
|
||||
def configure() {
|
||||
log.debug "configure()"
|
||||
configureHealthCheck()
|
||||
zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
|
||||
configureHealthCheck()
|
||||
}
|
||||
|
||||
def updated() {
|
||||
|
||||
@@ -27,10 +27,6 @@ metadata {
|
||||
fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300", outClusters: "0019"
|
||||
fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 1000", outClusters: "0019"
|
||||
fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 1000", outClusters: "0019", "manufacturer":"OSRAM", "model":"Classic A60 RGBW", deviceJoinName: "OSRAM LIGHTIFY LED Classic A60 RGBW"
|
||||
fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "PAR 16 50 RGBW - LIGHTIFY", deviceJoinName: "OSRAM LIGHTIFY RGBW PAR 16 50"
|
||||
fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,0300,1000,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY Flex RGBW"
|
||||
fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,0300,1000,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Gardenpole RGBW-Lightify", deviceJoinName: "OSRAM LIGHTIFY Gardenpole RGBW"
|
||||
fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,0300,1000,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Outdoor Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY Outdoor Flex RGBW"
|
||||
}
|
||||
|
||||
// UI tile definitions
|
||||
|
||||
@@ -32,7 +32,6 @@ metadata {
|
||||
|
||||
fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 1000, 0B04, FC0F", outClusters: "0019", "manufacturer":"OSRAM", "model":"Classic A60 TW", deviceJoinName: "OSRAM LIGHTIFY LED Classic A60 Tunable White"
|
||||
fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 1000, FC0F", outClusters: "0019", "manufacturer":"OSRAM", "model":"PAR16 50 TW", deviceJoinName: "OSRAM LIGHTIFY LED PAR16 50 Tunable White"
|
||||
fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 1000, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic B40 TW - LIGHTIFY", deviceJoinName: "OSRAM LIGHTIFY Classic B40 Tunable White"
|
||||
}
|
||||
|
||||
// UI tile definitions
|
||||
|
||||
@@ -1,327 +0,0 @@
|
||||
/**
|
||||
* Cubic Home
|
||||
* sdfssdfsfsdfsdfdsf
|
||||
* Copyright 2016 Nikolay Zenovkin
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
|
||||
* in compliance with the License. You may obtain a copy of the License at:
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
|
||||
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing permissions and limitations under the License.
|
||||
*
|
||||
*/
|
||||
definition(
|
||||
name: "Cubic Butler for Smart Home",
|
||||
namespace: "cubicrobotics",
|
||||
author: "Cubic Robotics",
|
||||
description: "Hey, I’m Cubic, AI butler for smart home! \n" +
|
||||
"I am the one and only app you need to control an entire home. \n" +
|
||||
"Right now I can help you to control your SmartThings devices via natural speech and dashboard.\n" +
|
||||
"Speak naturally, don’t learn robot! My A.I. is designed for a smart home control.\n" +
|
||||
"- You don’t have to remember exact commands and phrases.\n" +
|
||||
"- I have memory, and every new request will be processed in the context of previous ones.\n" +
|
||||
"- I can ask clarifying questions, if I’m not sure what you mean.",
|
||||
category: "Convenience",
|
||||
iconUrl: "https://lh3.googleusercontent.com/GX5BRhaFq22HpAEU6tD4JXvizlxWFuB9zjyZE39-pLpZvQvvUmVpWXa0v4-oaxz4tg=w300-rw",
|
||||
iconX2Url: "https://lh3.googleusercontent.com/GX5BRhaFq22HpAEU6tD4JXvizlxWFuB9zjyZE39-pLpZvQvvUmVpWXa0v4-oaxz4tg=w300-rw",
|
||||
iconX3Url: "https://lh3.googleusercontent.com/GX5BRhaFq22HpAEU6tD4JXvizlxWFuB9zjyZE39-pLpZvQvvUmVpWXa0v4-oaxz4tg=w300-rw",
|
||||
oauth: [displayName: "Cubic Home", displayLink: "http://cubic.ai/"])
|
||||
|
||||
|
||||
preferences {
|
||||
section("Welcome to Cubic") {
|
||||
// TODO: put inputs here
|
||||
}
|
||||
section("Allow Cubic to control these switches") {
|
||||
input "switches", "capability.switch", multiple: true, required: false
|
||||
}
|
||||
|
||||
section("Allow Cubic to control these motion sensors") {
|
||||
input "motionSensors", "capability.motionSensor", multiple: true, required: false
|
||||
}
|
||||
|
||||
section("Allow Cubic to control these bulbs") {
|
||||
input "lamps", "capability.colorControl", multiple: true, required: false
|
||||
}
|
||||
|
||||
section("Allow Cubic to control these thermostats") {
|
||||
input "thermostats", "capability.thermostat", multiple: true, required: false
|
||||
}
|
||||
|
||||
section("Allow Cubic to control these water sensors") {
|
||||
input "waterSensors", "capability.waterSensor", multiple: true, required: false
|
||||
}
|
||||
|
||||
section("Allow Cubic to control these CO sensors") {
|
||||
input "smokeSensors", "capability.carbonMonoxideDetector", multiple: true, required: false
|
||||
}
|
||||
|
||||
section("Allow Cubic to control these door controls") {
|
||||
input "doorControls", "capability.doorControl", multiple: true, required: false
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
mappings {
|
||||
path("/devices") {
|
||||
action:
|
||||
[
|
||||
GET: "getDevices"
|
||||
]
|
||||
}
|
||||
path("/devices/:id") {
|
||||
action:
|
||||
[
|
||||
PUT: "updateDevice",
|
||||
GET: "getDevice"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
def installed() {
|
||||
log.debug "Installed with settings: ${settings}"
|
||||
|
||||
initialize()
|
||||
}
|
||||
|
||||
def updated() {
|
||||
log.debug "Updated with settings: ${settings}"
|
||||
|
||||
unsubscribe()
|
||||
initialize()
|
||||
}
|
||||
|
||||
def initialize() {
|
||||
subscribe(motionSensors, "motion", motionHandler)
|
||||
subscribe(switches, "switch", switchHandler)
|
||||
subscribe(thermostats, "thermostat.temperature", thermostatHandler)
|
||||
subscribe(waterSensors, "waterSensor", waterHandler)
|
||||
subscribe(smokeSensors, "carbonMonoxideDetector", smokeHandler)
|
||||
subscribe(doorControls, "doorControl", doorControlHandler)
|
||||
}
|
||||
|
||||
def doorControlHandler(evt) {
|
||||
if (evt.isStateChanged()) {
|
||||
sendPushEvent(evt.deviceId,
|
||||
"DOOR_CONTROL_SMART_THINGS",
|
||||
evt.value
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
def smokeHandler(evt) {
|
||||
if (evt.isStateChanged()) {
|
||||
sendPushEvent(evt.deviceId,
|
||||
"SMOKE_CO_SENSOR_SMART_THINGS",
|
||||
evt.value
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
def thermostatHandler(evt) {
|
||||
if (evt.isStateChanged()) {
|
||||
sendPushEvent(evt.deviceId,
|
||||
"THERMOSTAT_SMART_THINGS",
|
||||
evt.value
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
def waterHandler(evt) {
|
||||
if (evt.isStateChanged()) {
|
||||
sendPushEvent(evt.deviceId,
|
||||
"WATER_SENSOR_SMART_THINGS",
|
||||
evt.value
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
def motionHandler(evt) {
|
||||
if ("active" == evt.value) {
|
||||
sendPushEvent(evt.deviceId,
|
||||
"MOTION_SENSOR_SMART_THINGS",
|
||||
evt.value)
|
||||
}
|
||||
}
|
||||
|
||||
def switchHandler(evt) {
|
||||
log.debug "$evt.deviceId switch changed state to $evt.value"
|
||||
}
|
||||
|
||||
def getDevices() {
|
||||
def resp = []
|
||||
switches.each {
|
||||
resp << extractSwitch(it)
|
||||
}
|
||||
motionSensors.each {
|
||||
resp << extractMotionSensor(it)
|
||||
}
|
||||
|
||||
lamps.each {
|
||||
resp << extractLamp(it)
|
||||
}
|
||||
|
||||
thermostats.each {
|
||||
resp << extractThermostat(it)
|
||||
}
|
||||
|
||||
return resp
|
||||
}
|
||||
|
||||
def getDevice() {
|
||||
def id = params.id
|
||||
log.info "Getting device by id " + id
|
||||
def device = findDeviceById(id);
|
||||
if (device == null) {
|
||||
httpError(400, "$id is not a valid id for switch specified")
|
||||
} else if (device.type == "SWITCH_SMART_THINGS") {
|
||||
return extractSwitch(device.device);
|
||||
} else if (device.type == "THERMOSTAT_SMART_THINGS") {
|
||||
return extractThermostat(device.device);
|
||||
} else if (device.type == "LAMP_SMART_THINGS") {
|
||||
return extractLamp(device.device);
|
||||
} else if (device.type == "MOTION_SENSOR_SMART_THINGS") {
|
||||
return extractMotionSensor(device.device);
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
void updateDevice() {
|
||||
def id = params.id
|
||||
def device = findDeviceById(id)
|
||||
|
||||
if (device == null) {
|
||||
httpError(400, "$id is not a valid switch id")
|
||||
} else if (device.type == "SWITCH_SMART_THINGS") {
|
||||
changeSwitchState(device, request.JSON?.powered)
|
||||
} else if (device.type == "THERMOSTAT_SMART_THINGS") {
|
||||
def heating_setpoint = request.JSON?.heating_setpoint
|
||||
def cooling_setpoint = request.JSON?.cooling_setpoint
|
||||
def thermostat_setpoint = request.JSON?.thermostat_setpoint
|
||||
if (heating_setpoint != null) {
|
||||
device.device.setHeatingSetpoint(heating_setpoint)
|
||||
}
|
||||
if (cooling_setpoint != null) {
|
||||
device.device.setCoolingSetpoint(cooling_setpoint)
|
||||
}
|
||||
//if (thermostat_setpoint != null) {
|
||||
// device.device.setThermostatSetpoint(thermostat_setpoint)
|
||||
//}
|
||||
} else if (device.type == "LAMP_SMART_THINGS") {
|
||||
def powered = request.JSON?.powered
|
||||
def color_h = request.JSON?.color_h
|
||||
def color_s = request.JSON?.color_s
|
||||
def color_b = request.JSON?.color_b
|
||||
def color_temperature = request.JSON?.color_temperature
|
||||
if (powered != null) {
|
||||
changeSwitchState(device, request.JSON?.powered)
|
||||
}
|
||||
if (color_h != null) {
|
||||
device.device.setHue(color_h)
|
||||
}
|
||||
if (color_b != null) {
|
||||
device.device.setLevel(color_b)
|
||||
}
|
||||
if (color_s != null) {
|
||||
device.device.setSaturation(color_s)
|
||||
}
|
||||
if (color_temperature != null) {
|
||||
device.device.setColorTemperature(color_temperature)
|
||||
}
|
||||
} else if (device.type == "MOTION_SENSOR_SMART_THINGS") {
|
||||
httpError(400, "Unable to control motion sensor")
|
||||
}
|
||||
}
|
||||
|
||||
def findDeviceById(id) {
|
||||
def device = switches.find { it.id == id }
|
||||
def type = "SWITCH_SMART_THINGS"
|
||||
if (device == null) {
|
||||
device = thermostats.find { it.id == id }
|
||||
type = "THERMOSTAT_SMART_THINGS"
|
||||
}
|
||||
if (device == null) {
|
||||
device = lamps.find { it.id == id }
|
||||
type = "LAMP_SMART_THINGS"
|
||||
}
|
||||
if (device == null) {
|
||||
device = motionSensors.find { it.id == id }
|
||||
type = "MOTION_SENSOR_SMART_THINGS"
|
||||
}
|
||||
if (device == null) {
|
||||
return null;
|
||||
}
|
||||
return [device: device, type: type];
|
||||
}
|
||||
|
||||
|
||||
def extractSwitch(it) {
|
||||
return [id: it.id, type: "SWITCH_SMART_THINGS", state: [name: it.displayName, powered: it.currentValue("switch") == "on" ? true : false]]
|
||||
}
|
||||
|
||||
def extractMotionSensor(it) {
|
||||
return [id: it.id, type: "MOTION_SENSOR_SMART_THINGS", state: [name: it.displayName, state: it.currentValue("motion")]]
|
||||
}
|
||||
|
||||
def extractLamp(it) {
|
||||
return [id: it.id, type: "LAMP_SMART_THINGS", state: [name : it.displayName,
|
||||
color_h : it.currentValue("hue"), color_s: it.currentValue("saturation"), color_b: it.currentValue("level"),
|
||||
color_temperature: it.currentValue("colorTemperature"), powered: it.currentValue("switch") == "on" ? true : false]]
|
||||
}
|
||||
|
||||
def extractThermostat(it) {
|
||||
return [id: it.id, type: "THERMOSTAT_SMART_THINGS", state: [name : it.displayName,
|
||||
temperature : it.currentValue("temperature"),
|
||||
heating_setpoint : it.currentValue("heatingSetpoint"),
|
||||
cooling_setpoint : it.currentValue("coolingSetpoint"),
|
||||
thermostat_setpoint : it.currentValue("thermostatSetpoint"),
|
||||
thermostat_mode : it.currentValue("thermostatMode"),
|
||||
thermostat_fan_mode : it.currentValue("thermostatFanMode"),
|
||||
thermostat_operating_state: it.currentValue("thermostatOperatingState")]]
|
||||
}
|
||||
|
||||
def changeSwitchState(device, powered) {
|
||||
log.info "Updating device " + device.device.displayName + " to state $powered"
|
||||
switch (powered) {
|
||||
case "true":
|
||||
device.device.on()
|
||||
break
|
||||
case "false":
|
||||
device.device.off()
|
||||
break
|
||||
default:
|
||||
httpError(400, "$powered is not a valid power state for switch specified")
|
||||
}
|
||||
}
|
||||
|
||||
def sendPushEvent(pushEvent) {
|
||||
def params = [
|
||||
uri : "https://intent-processor-stage.cubic.ai/api/v1/pushEvent",
|
||||
headers : [
|
||||
Authorization: "Bearer -gm-IOuQR3W2Gim8Tjwsuw",
|
||||
Accept : "/"
|
||||
],
|
||||
body : pushEvent,
|
||||
requestContentType: "application/json"
|
||||
]
|
||||
try {
|
||||
httpPost(params) { resp ->
|
||||
log.debug "response data: ${resp.data}"
|
||||
log.debug "response contentType: ${resp.contentType}"
|
||||
}
|
||||
} catch (e) {
|
||||
log.debug "something went wrong: $e"
|
||||
}
|
||||
}
|
||||
|
||||
def sendPushEvent(id, type, state) {
|
||||
sendPushEvent(
|
||||
[device_id : id,
|
||||
device_type: type,
|
||||
state : state]
|
||||
)
|
||||
}
|
||||
@@ -19,9 +19,9 @@
|
||||
author: "SmartThings",
|
||||
description: "Control your Bose SoundTouch speakers",
|
||||
category: "SmartThings Labs",
|
||||
iconUrl: "https://d3azp77rte0gip.cloudfront.net/smartapps/fcf1d93a-ba0b-4324-b96f-e5b5487dfaf5/images/BoseST_icon.png",
|
||||
iconX2Url: "https://d3azp77rte0gip.cloudfront.net/smartapps/fcf1d93a-ba0b-4324-b96f-e5b5487dfaf5/images/BoseST_icon@2x.png",
|
||||
iconX3Url: "https://d3azp77rte0gip.cloudfront.net/smartapps/fcf1d93a-ba0b-4324-b96f-e5b5487dfaf5/images/BoseST_icon@2x-1.png",
|
||||
iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
|
||||
iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
|
||||
iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
|
||||
singleInstance: true
|
||||
)
|
||||
|
||||
@@ -104,7 +104,7 @@ def deviceDiscovery()
|
||||
|
||||
return dynamicPage(name:"deviceDiscovery", title:"Discovery Started!", nextPage:"", refreshInterval:refreshInterval, install:true, uninstall: true) {
|
||||
section("Please wait while we discover your ${getDeviceName()}. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
|
||||
input "selecteddevice", "enum", required:false, title:"Select ${getDeviceName()} (${numFound} found)", multiple:true, options:devices, submitOnChange: true
|
||||
input "selecteddevice", "enum", required:false, title:"Select ${getDeviceName()} (${numFound} found)", multiple:true, options:devices
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -196,8 +196,6 @@ def addDevice(){
|
||||
d = addChildDevice(getNameSpace(), getDeviceName(), dni, newDevice?.value.hub, [label:"${deviceName}"])
|
||||
d.boseSetDeviceID(newDevice.value.deviceID)
|
||||
log.trace "Created ${d.displayName} with id $dni"
|
||||
// sync DTH with device, done here as it currently don't work from the DTH's installed() method
|
||||
d.refresh()
|
||||
} else {
|
||||
log.trace "${d.displayName} with id $dni already exists"
|
||||
}
|
||||
|
||||
@@ -842,7 +842,6 @@ private void storeThermostatData(thermostats) {
|
||||
minCoolingSetpoint: (stat.settings.coolRangeLow / 10),
|
||||
maxCoolingSetpoint: (stat.settings.coolRangeHigh / 10),
|
||||
autoMode: stat.settings.autoHeatCoolFeatureEnabled,
|
||||
deviceAlive: stat.runtime.connected == true ? "true" : "false",
|
||||
auxHeatMode: (stat.settings.hasHeatPump) && (stat.settings.hasForcedAir || stat.settings.hasElectric || stat.settings.hasBoiler),
|
||||
temperature: (stat.runtime.actualTemperature / 10),
|
||||
heatingSetpoint: stat.runtime.desiredHeat / 10,
|
||||
|
||||
Reference in New Issue
Block a user