mirror of
https://github.com/mtan93/SmartThingsPublic.git
synced 2026-03-09 21:03:00 +00:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7650e0ebed | ||
|
|
85175eb298 | ||
|
|
c75568bcf1 | ||
|
|
fb6cbcc35e | ||
|
|
097584944e | ||
|
|
9263107f0e |
@@ -0,0 +1,201 @@
|
||||
/**
|
||||
* Copyright 2015 NodOn
|
||||
*
|
||||
* 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: "Nodon Octan Remote", namespace: "NodOn", author: "Alexis Lutun") {
|
||||
capability "Actuator"
|
||||
capability "Button"
|
||||
capability "Configuration"
|
||||
capability "Sleep Sensor"
|
||||
capability "Battery"
|
||||
|
||||
command "pushButtonOne"
|
||||
command "pushButtonTwo"
|
||||
command "pushButtonThree"
|
||||
command "pushButtonFour"
|
||||
command "buttonEvent"
|
||||
command "buttonPushed"
|
||||
command "buttonPushed", [int]
|
||||
command "refresh"
|
||||
|
||||
fingerprint deviceId: "0x0101", inClusters: "0x5E,0x85,0x59,0x80,0x5B,0x70,0x5A,0x72,0x73,0x86,0x84,0xEF,0x5E,0x5B,0x2B,0x27,0x22,0x20,0x26,0x84"
|
||||
}
|
||||
tiles(scale: 2) {
|
||||
standardTile("Octan", "device.button", width: 1, height: 1)
|
||||
{
|
||||
state "default", label: "", icon:"http://nodon.fr/smarthings/octan-remote/octanfullicon.png", backgroundColor: "#ffffff"
|
||||
}
|
||||
multiAttributeTile(name:"BatteryTile", type: "generic", width: 6, height: 4)
|
||||
{
|
||||
tileAttribute ("device.battery", key: "PRIMARY_CONTROL")
|
||||
{
|
||||
attributeState "default", icon:"http://nodon.fr/smarthings/octan-remote/octanfullicon.png" , backgroundColor: "#f58220", decoration: "flat"
|
||||
}
|
||||
tileAttribute ("device.battery", key: "SECONDARY_CONTROL")
|
||||
{
|
||||
attributeState "default", label:'${currentValue}% battery', unit:"%"
|
||||
}
|
||||
}
|
||||
standardTile("button One", "device.button", width: 2, height: 2, decoration: "flat")
|
||||
{
|
||||
state "default", label: "", action: "pushButtonOne", icon:"http://nodon.fr/smarthings/octan-remote/1line.png",defaultState: true, backgroundColor: "#ffffff"
|
||||
state "pushed", label: "", action: "pushButtonOne", icon:"http://nodon.fr/smarthings/octan-remote/1fill.png", backgroundColor: "#ffffff"
|
||||
}
|
||||
standardTile("button Two", "device.button", width: 2, height: 2, decoration: "flat")
|
||||
{
|
||||
state "default", label: "",action: "pushButtonTwo", icon:"http://nodon.fr/smarthings/octan-remote/2line.png", defaultState: true, backgroundColor: "#ffffff"
|
||||
state "pushed", label: "",action: "pushButtonTwo", icon:"http://nodon.fr/smarthings/octan-remote/2fill.png", backgroundColor: "#ffffff"
|
||||
}
|
||||
standardTile("button Three", "device.button", width: 2, height: 2, decoration: "flat")
|
||||
{
|
||||
state "default", label: "", action: "pushButtonThree", icon: "http://nodon.fr/smarthings/octan-remote/3line.png", defaultState: true, backgroundColor: "#ffffff"
|
||||
state "pushed", label: "", action: "pushButtonThree", icon: "http://nodon.fr/smarthings/octan-remote/3fill.png", backgroundColor: "#ffffff"
|
||||
}
|
||||
standardTile("button Four", "device.button", width: 2, height: 2,decoration: "flat")
|
||||
{
|
||||
state "default", label: "",action: "pushButtonFour", icon:"http://nodon.fr/smarthings/octan-remote/4line.png", defaultState: true, backgroundColor: "#ffffff"
|
||||
state "pushed", label: "",action: "pushButtonFour", icon:"http://nodon.fr/smarthings/octan-remote/4fill.png", backgroundColor: "#ffffff"
|
||||
}
|
||||
standardTile("refresh", "generic", inactiveLabel: false, decoration: "flat", width: 2, height: 2)
|
||||
{
|
||||
state "default", label:'', action: "refresh", icon:"st.secondary.refresh"
|
||||
}
|
||||
|
||||
standardTile("configure", "device.Configuration", decoration: "flat", width: 2, height: 2)
|
||||
{
|
||||
state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
|
||||
}
|
||||
main "Octan"
|
||||
details(["BatteryTile", "button One", "button Two", "configure", "button Three", "button Four", "refresh"])
|
||||
}
|
||||
}
|
||||
|
||||
def parse(String description)
|
||||
{
|
||||
def results = []
|
||||
if (description.startsWith("Err"))
|
||||
{
|
||||
results = createEvent(descriptionText:description, displayed:true)
|
||||
}
|
||||
else
|
||||
{
|
||||
def cmd = zwave.parse(description, [0x5B: 1, 0x80: 1, 0x84: 1]) //Central Scene , battery, wake up
|
||||
if(cmd) results += zwaveEvent(cmd)
|
||||
if(!results) results = [ descriptionText: cmd, displayed: false ]
|
||||
}
|
||||
//log.debug("Parsed '$description' to $results")
|
||||
return results
|
||||
}
|
||||
|
||||
def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd)
|
||||
{
|
||||
def results = [createEvent(descriptionText: "$device.displayName woke up", isStateChange: false)]
|
||||
def prevBattery = device.currentState("battery")
|
||||
if (!prevBattery || (new Date().time - prevBattery.date.time)/60000 >= 60 * 53) //
|
||||
{
|
||||
results << response(zwave.batteryV1.batteryGet().format())
|
||||
createEvent(name: "battery", value: "10", descriptionText: "battery is now ${currentValue}%", isStateChange: true, displayed: true)
|
||||
}
|
||||
results << response(zwave.wakeUpV1.wakeUpNoMoreInformation().format())
|
||||
//log.debug("Wake up")
|
||||
return results
|
||||
}
|
||||
|
||||
def buttonEvent(button, attribute)
|
||||
{
|
||||
if (attribute)
|
||||
{
|
||||
createEvent(name: "button", value: "pushed", data: [buttonNumber: button, action: "held"] ,descriptionText: "$device.displayName button $button was held", icon:"http://nodon.fr/smarthings/octan-remote/octandiskfill.png", isStateChange: true, displayed: true)
|
||||
}
|
||||
else
|
||||
{
|
||||
createEvent(name: "button", value: "pushed", data: [buttonNumber: button, action: "pushed"] ,descriptionText: "$device.displayName button $button was pressed", icon:"http://nodon.fr/smarthings/octan-remote/octandiskfill.png", isStateChange: true, displayed: true)
|
||||
}
|
||||
}
|
||||
|
||||
def zwaveEvent(physicalgraph.zwave.commands.centralscenev1.CentralSceneNotification cmd)
|
||||
{
|
||||
Integer sceneNumber = cmd.sceneNumber as Integer
|
||||
Integer keyAttributes = cmd.keyAttributes as Integer
|
||||
Integer sequenceNumber = cmd.sequenceNumber as Integer
|
||||
|
||||
buttonEvent(sceneNumber, keyAttributes)
|
||||
}
|
||||
|
||||
def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd)
|
||||
{
|
||||
def map = [ name: "battery", unit: "%" ]
|
||||
if (cmd.batteryLevel == 0xFF)
|
||||
{
|
||||
map.value = 1
|
||||
map.descriptionText = "${device.displayName} has a low battery"
|
||||
}
|
||||
else
|
||||
{
|
||||
map.value = cmd.batteryLevel
|
||||
}
|
||||
createEvent(map)
|
||||
}
|
||||
|
||||
def zwaveEvent(physicalgraph.zwave.Command cmd)
|
||||
{
|
||||
[ descriptionText: "$device.displayName: $cmd", linkText:device.displayName, displayed: false ]
|
||||
}
|
||||
|
||||
def configurationCmds()
|
||||
{
|
||||
[
|
||||
zwave.configurationV1.configurationSet(parameterNumber: 8, scaledConfigurationValue:2).format(), //Configure LED to feedback user when command of button has been acknowloedge by the static controller
|
||||
zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:zwaveHubNodeId).format() // Set hub id in lifeline of product so product know the destination of the central scene notification command
|
||||
]
|
||||
}
|
||||
|
||||
def refresh()
|
||||
{
|
||||
def cmd = zwave.batteryV1.batteryGet().format()
|
||||
|
||||
return (response(cmd))
|
||||
}
|
||||
|
||||
def configure()
|
||||
{
|
||||
def cmd = configurationCmds()
|
||||
log.debug("Sending configuration: $cmd")
|
||||
return response(cmd)
|
||||
}
|
||||
|
||||
def pushButtonOne()
|
||||
{
|
||||
buttonPushed(1)
|
||||
}
|
||||
|
||||
def pushButtonTwo()
|
||||
{
|
||||
buttonPushed(2)
|
||||
}
|
||||
|
||||
def buttonPushed(button)
|
||||
{
|
||||
sendEvent(name: "button", value: "pushed", data: [buttonNumber: button, action: "pushed"], descriptionText: "$device.displayName button $button was pushed", icon:"http://nodon.fr/smarthings/octan-remote/octanfullicon.png", isStateChange: true)
|
||||
}
|
||||
|
||||
def pushButtonThree()
|
||||
{
|
||||
buttonPushed(3)
|
||||
}
|
||||
|
||||
def pushButtonFour()
|
||||
{
|
||||
buttonPushed(4)
|
||||
}
|
||||
@@ -103,7 +103,7 @@ metadata {
|
||||
state "humidity", label:'${currentValue}%'
|
||||
}
|
||||
main "temperature"
|
||||
details(["temperature", "upButtonControl", "thermostatSetpoint", "currentStatus", "downButtonControl", "mode", "fanMode","resumeProgram", "humidity", "refresh"])
|
||||
details(["temperature", "upButtonControl", "thermostatSetpoint", "currentStatus", "downButtonControl", "mode", "fanMode","humidity", "resumeProgram", "refresh"])
|
||||
}
|
||||
|
||||
preferences {
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
* Date: 2013-09-06
|
||||
*/
|
||||
definition(
|
||||
name: "Wemo (Connect)",
|
||||
namespace: "smartthings",
|
||||
author: "SmartThings",
|
||||
description: "Allows you to integrate your WeMo Switch and Wemo Motion sensor with SmartThings.",
|
||||
category: "SmartThings Labs",
|
||||
iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/wemo.png",
|
||||
iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/wemo@2x.png",
|
||||
singleInstance: true
|
||||
name: "Wemo (Connect)",
|
||||
namespace: "smartthings",
|
||||
author: "SmartThings",
|
||||
description: "Allows you to integrate your WeMo Switch and Wemo Motion sensor with SmartThings.",
|
||||
category: "SmartThings Labs",
|
||||
iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/wemo.png",
|
||||
iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/wemo@2x.png",
|
||||
singleInstance: true
|
||||
)
|
||||
|
||||
preferences {
|
||||
@@ -39,7 +39,7 @@ private getFriendlyName(String deviceNetworkId) {
|
||||
sendHubCommand(new physicalgraph.device.HubAction("""GET /setup.xml HTTP/1.1
|
||||
HOST: ${deviceNetworkId}
|
||||
|
||||
""", physicalgraph.device.Protocol.LAN, "${deviceNetworkId}"))
|
||||
""", physicalgraph.device.Protocol.LAN, "${deviceNetworkId}", [callback: "setupHandler"]))
|
||||
}
|
||||
|
||||
private verifyDevices() {
|
||||
@@ -52,6 +52,13 @@ private verifyDevices() {
|
||||
}
|
||||
}
|
||||
|
||||
void ssdpSubscribe() {
|
||||
subscribe(location, "ssdpTerm.urn:Belkin:device:insight:1", ssdpSwitchHandler)
|
||||
subscribe(location, "ssdpTerm.urn:Belkin:device:controllee:1", ssdpSwitchHandler)
|
||||
subscribe(location, "ssdpTerm.urn:Belkin:device:sensor:1", ssdpMotionHandler)
|
||||
subscribe(location, "ssdpTerm.urn:Belkin:device:lightswitch:1", ssdpLightSwitchHandler)
|
||||
}
|
||||
|
||||
def firstPage()
|
||||
{
|
||||
if(canInstallLabs())
|
||||
@@ -62,7 +69,7 @@ def firstPage()
|
||||
|
||||
log.debug "REFRESH COUNT :: ${refreshCount}"
|
||||
|
||||
subscribe(location, null, locationHandler, [filterEvents:false])
|
||||
ssdpSubscribe()
|
||||
|
||||
//ssdp request every 25 seconds
|
||||
if((refreshCount % 5) == 0) {
|
||||
@@ -105,9 +112,7 @@ def devicesDiscovered() {
|
||||
def motions = getWemoMotions()
|
||||
def lightSwitches = getWemoLightSwitches()
|
||||
def devices = switches + motions + lightSwitches
|
||||
def list = []
|
||||
|
||||
list = devices?.collect{ [app.id, it.ssdpUSN].join('.') }
|
||||
devices?.collect{ [app.id, it.ssdpUSN].join('.') }
|
||||
}
|
||||
|
||||
def switchesDiscovered() {
|
||||
@@ -175,8 +180,9 @@ def updated() {
|
||||
|
||||
def initialize() {
|
||||
unsubscribe()
|
||||
unschedule()
|
||||
subscribe(location, null, locationHandler, [filterEvents:false])
|
||||
unschedule()
|
||||
|
||||
ssdpSubscribe()
|
||||
|
||||
if (selectedSwitches)
|
||||
addSwitches()
|
||||
@@ -189,7 +195,7 @@ def initialize() {
|
||||
|
||||
runIn(5, "subscribeToDevices") //initial subscriptions delayed by 5 seconds
|
||||
runIn(10, "refreshDevices") //refresh devices, delayed by 10 seconds
|
||||
runEvery5Minutes("refresh")
|
||||
runEvery5Minutes("refresh")
|
||||
}
|
||||
|
||||
def resubscribe() {
|
||||
@@ -199,7 +205,7 @@ def resubscribe() {
|
||||
|
||||
def refresh() {
|
||||
log.debug "refresh() called"
|
||||
doDeviceSync()
|
||||
doDeviceSync()
|
||||
refreshDevices()
|
||||
}
|
||||
|
||||
@@ -235,14 +241,14 @@ def addSwitches() {
|
||||
if (!d) {
|
||||
log.debug "Creating WeMo Switch with dni: ${selectedSwitch.value.mac}"
|
||||
d = addChildDevice("smartthings", "Wemo Switch", selectedSwitch.value.mac, selectedSwitch?.value.hub, [
|
||||
"label": selectedSwitch?.value?.name ?: "Wemo Switch",
|
||||
"data": [
|
||||
"mac": selectedSwitch.value.mac,
|
||||
"ip": selectedSwitch.value.ip,
|
||||
"port": selectedSwitch.value.port
|
||||
]
|
||||
"label": selectedSwitch?.value?.name ?: "Wemo Switch",
|
||||
"data": [
|
||||
"mac": selectedSwitch.value.mac,
|
||||
"ip": selectedSwitch.value.ip,
|
||||
"port": selectedSwitch.value.port
|
||||
]
|
||||
])
|
||||
def ipvalue = convertHexToIP(selectedSwitch.value.ip)
|
||||
def ipvalue = convertHexToIP(selectedSwitch.value.ip)
|
||||
d.sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP is ${ipvalue}")
|
||||
log.debug "Created ${d.displayName} with id: ${d.id}, dni: ${d.deviceNetworkId}"
|
||||
} else {
|
||||
@@ -273,9 +279,9 @@ def addMotions() {
|
||||
"port": selectedMotion.value.port
|
||||
]
|
||||
])
|
||||
def ipvalue = convertHexToIP(selectedMotion.value.ip)
|
||||
d.sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP is ${ipvalue}")
|
||||
log.debug "Created ${d.displayName} with id: ${d.id}, dni: ${d.deviceNetworkId}"
|
||||
def ipvalue = convertHexToIP(selectedMotion.value.ip)
|
||||
d.sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP is ${ipvalue}")
|
||||
log.debug "Created ${d.displayName} with id: ${d.id}, dni: ${d.deviceNetworkId}"
|
||||
} else {
|
||||
log.debug "found ${d.displayName} with id $dni already exists"
|
||||
}
|
||||
@@ -304,26 +310,147 @@ def addLightSwitches() {
|
||||
"port": selectedLightSwitch.value.port
|
||||
]
|
||||
])
|
||||
def ipvalue = convertHexToIP(selectedLightSwitch.value.ip)
|
||||
d.sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP is ${ipvalue}")
|
||||
def ipvalue = convertHexToIP(selectedLightSwitch.value.ip)
|
||||
d.sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP is ${ipvalue}")
|
||||
log.debug "created ${d.displayName} with id $dni"
|
||||
} else {
|
||||
log.debug "found ${d.displayName} with id $dni already exists"
|
||||
log.debug "found ${d.displayName} with id $dni already exists"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
def ssdpSwitchHandler(evt) {
|
||||
def description = evt.description
|
||||
def hub = evt?.hubId
|
||||
def parsedEvent = parseDiscoveryMessage(description)
|
||||
parsedEvent << ["hub":hub]
|
||||
log.debug parsedEvent
|
||||
|
||||
def switches = getWemoSwitches()
|
||||
if (!(switches."${parsedEvent.ssdpUSN.toString()}")) {
|
||||
//if it doesn't already exist
|
||||
switches << ["${parsedEvent.ssdpUSN.toString()}":parsedEvent]
|
||||
} else {
|
||||
log.debug "Device was already found in state..."
|
||||
def d = switches."${parsedEvent.ssdpUSN.toString()}"
|
||||
boolean deviceChangedValues = false
|
||||
log.debug "$d.ip <==> $parsedEvent.ip"
|
||||
if(d.ip != parsedEvent.ip || d.port != parsedEvent.port) {
|
||||
d.ip = parsedEvent.ip
|
||||
d.port = parsedEvent.port
|
||||
deviceChangedValues = true
|
||||
log.debug "Device's port or ip changed..."
|
||||
def child = getChildDevice(parsedEvent.mac)
|
||||
child.subscribe(parsedEvent.ip, parsedEvent.port)
|
||||
child.poll()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
def ssdpMotionHandler(evt) {
|
||||
log.info("ssdpMotionHandler")
|
||||
def description = evt.description
|
||||
def hub = evt?.hubId
|
||||
def parsedEvent = parseDiscoveryMessage(description)
|
||||
parsedEvent << ["hub":hub]
|
||||
log.debug parsedEvent
|
||||
|
||||
def motions = getWemoMotions()
|
||||
if (!(motions."${parsedEvent.ssdpUSN.toString()}")) {
|
||||
//if it doesn't already exist
|
||||
motions << ["${parsedEvent.ssdpUSN.toString()}":parsedEvent]
|
||||
} else { // just update the values
|
||||
log.debug "Device was already found in state..."
|
||||
|
||||
def d = motions."${parsedEvent.ssdpUSN.toString()}"
|
||||
boolean deviceChangedValues = false
|
||||
|
||||
if(d.ip != parsedEvent.ip || d.port != parsedEvent.port) {
|
||||
d.ip = parsedEvent.ip
|
||||
d.port = parsedEvent.port
|
||||
deviceChangedValues = true
|
||||
log.debug "Device's port or ip changed..."
|
||||
}
|
||||
|
||||
if (deviceChangedValues) {
|
||||
def children = getChildDevices()
|
||||
log.debug "Found children ${children}"
|
||||
children.each {
|
||||
if (it.getDeviceDataByName("mac") == parsedEvent.mac) {
|
||||
log.debug "updating ip and port, and resubscribing, for device ${it} with mac ${parsedEvent.mac}"
|
||||
it.subscribe(parsedEvent.ip, parsedEvent.port)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
def ssdpLightSwitchHandler(evt) {
|
||||
log.info("ssdpLightSwitchHandler")
|
||||
def description = evt.description
|
||||
def hub = evt?.hubId
|
||||
def parsedEvent = parseDiscoveryMessage(description)
|
||||
parsedEvent << ["hub":hub]
|
||||
log.debug parsedEvent
|
||||
|
||||
def lightSwitches = getWemoLightSwitches()
|
||||
|
||||
if (!(lightSwitches."${parsedEvent.ssdpUSN.toString()}")) {
|
||||
//if it doesn't already exist
|
||||
lightSwitches << ["${parsedEvent.ssdpUSN.toString()}":parsedEvent]
|
||||
} else {
|
||||
log.debug "Device was already found in state..."
|
||||
|
||||
def d = lightSwitches."${parsedEvent.ssdpUSN.toString()}"
|
||||
boolean deviceChangedValues = false
|
||||
|
||||
if(d.ip != parsedEvent.ip || d.port != parsedEvent.port) {
|
||||
d.ip = parsedEvent.ip
|
||||
d.port = parsedEvent.port
|
||||
deviceChangedValues = true
|
||||
log.debug "Device's port or ip changed..."
|
||||
def child = getChildDevice(parsedEvent.mac)
|
||||
log.debug "updating ip and port, and resubscribing, for device with mac ${parsedEvent.mac}"
|
||||
child.subscribe(parsedEvent.ip, parsedEvent.port)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void setupHandler(hubResponse) {
|
||||
String contentType = hubResponse?.headers['Content-Type']
|
||||
if (contentType != null && contentType == 'text/xml') {
|
||||
def body = hubResponse.xml
|
||||
def wemoDevices = []
|
||||
String deviceType = body?.device?.deviceType?.text() ?: ""
|
||||
if (deviceType.startsWith("urn:Belkin:device:controllee:1") || deviceType.startsWith("urn:Belkin:device:insight:1")) {
|
||||
wemoDevices = getWemoSwitches()
|
||||
} else if (deviceType.startsWith("urn:Belkin:device:sensor")) {
|
||||
wemoDevices = getWemoMotions()
|
||||
} else if (deviceType.startsWith("urn:Belkin:device:lightswitch")) {
|
||||
wemoDevices = getWemoLightSwitches()
|
||||
}
|
||||
|
||||
def wemoDevice = wemoDevices.find {it?.key?.contains(body?.device?.UDN?.text())}
|
||||
if (wemoDevice) {
|
||||
wemoDevice.value << [name:body?.device?.friendlyName?.text(), verified: true]
|
||||
} else {
|
||||
log.error "/setup.xml returned a wemo device that didn't exist"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
def locationHandler(evt) {
|
||||
def description = evt.description
|
||||
def hub = evt?.hubId
|
||||
def parsedEvent = parseDiscoveryMessage(description)
|
||||
parsedEvent << ["hub":hub]
|
||||
log.debug parsedEvent
|
||||
log.debug parsedEvent
|
||||
|
||||
if (parsedEvent?.ssdpTerm?.contains("Belkin:device:controllee") || parsedEvent?.ssdpTerm?.contains("Belkin:device:insight")) {
|
||||
def switches = getWemoSwitches()
|
||||
if (!(switches."${parsedEvent.ssdpUSN.toString()}")) {
|
||||
//if it doesn't already exist
|
||||
//if it doesn't already exist
|
||||
switches << ["${parsedEvent.ssdpUSN.toString()}":parsedEvent]
|
||||
} else {
|
||||
log.debug "Device was already found in state..."
|
||||
@@ -335,16 +462,16 @@ def locationHandler(evt) {
|
||||
d.port = parsedEvent.port
|
||||
deviceChangedValues = true
|
||||
log.debug "Device's port or ip changed..."
|
||||
def child = getChildDevice(parsedEvent.mac)
|
||||
def child = getChildDevice(parsedEvent.mac)
|
||||
child.subscribe(parsedEvent.ip, parsedEvent.port)
|
||||
child.poll()
|
||||
child.poll()
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (parsedEvent?.ssdpTerm?.contains("Belkin:device:sensor")) {
|
||||
def motions = getWemoMotions()
|
||||
if (!(motions."${parsedEvent.ssdpUSN.toString()}")) {
|
||||
//if it doesn't already exist
|
||||
//if it doesn't already exist
|
||||
motions << ["${parsedEvent.ssdpUSN.toString()}":parsedEvent]
|
||||
} else { // just update the values
|
||||
log.debug "Device was already found in state..."
|
||||
@@ -459,6 +586,7 @@ def locationHandler(evt) {
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
private def parseXmlBody(def body) {
|
||||
def decodedBytes = body.decodeBase64()
|
||||
def bodyString
|
||||
@@ -540,4 +668,4 @@ private Boolean hasAllHubsOver(String desiredFirmware) {
|
||||
|
||||
private List getRealHubFirmwareVersions() {
|
||||
return location.hubs*.firmwareVersionString.findAll { it }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user