MSA-884: This is a quick update to a previously published device handler to accept the "update" packet that occurs when the zigbee pairs with the hub to stop an exception due to it not being in the map format that other packets are in.

devicetypes/nodon/nodon-octan-remote.src/nodon-octan-remote.groovy

@@ -1,201 +0,0 @@
-/**
- *  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)
-}

devicetypes/osotech/plantlink.src/plantlink.groovy

@@ -120,7 +120,7 @@ def setInstallSmartApp(value){
 }
 
 def parse(String description) {
-
+	log.debug description
 	def description_map = parseDescriptionAsMap(description)
     def event_name = ""
     def measurement_map = [
@@ -129,10 +129,7 @@ def parse(String description) {
             zigbeedeviceid: device.zigbeeId,
             created: new Date().time /1000 as int
     ]
-    if (description_map.cluster == "0000"){
+    if (description_map.cluster == "0001"){
-    	/* version number, not used */
-        
-    } else if (description_map.cluster == "0001"){
         /* battery voltage in mV (device needs minimium 2.1v to run) */
         log.debug "PlantLink - id ${device.zigbeeId} battery ${description_map.value}"
         event_name = "battery_status"
@@ -158,6 +155,10 @@ def parse(String description) {
 def parseDescriptionAsMap(description) {
     (description - "read attr - ").split(",").inject([:]) { map, param ->
         def nameAndValue = param.split(":")
+        if(nameAndValue.length == 2){
 	        map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
+        }else{
+        	map += []
+        }
     }
 }

devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy

@@ -103,7 +103,7 @@ metadata {
 			state "humidity", label:'${currentValue}%'
 		}
 		main "temperature"
-		details(["temperature", "upButtonControl", "thermostatSetpoint", "currentStatus", "downButtonControl", "mode", "fanMode","humidity", "resumeProgram", "refresh"])
+		details(["temperature", "upButtonControl", "thermostatSetpoint", "currentStatus", "downButtonControl", "mode", "fanMode","resumeProgram", "humidity", "refresh"])
 	}
 
 	preferences {
@@ -204,11 +204,11 @@ private getThermostatDescriptionText(name, value, linkText) {
 
 void setHeatingSetpoint(setpoint) {
 	log.debug "***heating setpoint $setpoint"
-	def heatingSetpoint = setpoint
+	def heatingSetpoint = setpoint.toDouble()
-	def coolingSetpoint = device.currentValue("coolingSetpoint")
+	def coolingSetpoint = device.currentValue("coolingSetpoint").toDouble()
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	def maxHeatingSetpoint = device.currentValue("maxHeatingSetpoint")
+	def maxHeatingSetpoint = device.currentValue("maxHeatingSetpoint").toDouble()
-	def minHeatingSetpoint = device.currentValue("minHeatingSetpoint")
+	def minHeatingSetpoint = device.currentValue("minHeatingSetpoint").toDouble()
 
 	//enforce limits of heatingSetpoint
 	if (heatingSetpoint > maxHeatingSetpoint) {
@@ -241,11 +241,11 @@ void setHeatingSetpoint(setpoint) {
 
 void setCoolingSetpoint(setpoint) {
 	log.debug "***cooling setpoint $setpoint"
-	def heatingSetpoint = device.currentValue("heatingSetpoint")
+	def heatingSetpoint = device.currentValue("heatingSetpoint").toDouble()
-	def coolingSetpoint = setpoint
+	def coolingSetpoint = setpoint.toDouble()
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	def maxCoolingSetpoint = device.currentValue("maxCoolingSetpoint")
+	def maxCoolingSetpoint = device.currentValue("maxCoolingSetpoint").toDouble()
-	def minCoolingSetpoint = device.currentValue("minCoolingSetpoint")
+	def minCoolingSetpoint = device.currentValue("minCoolingSetpoint").toDouble()
 
 
 	if (coolingSetpoint > maxCoolingSetpoint) {
@@ -505,6 +505,9 @@ def fanAuto() {
 	}
 }
 
+
+
+
 def generateSetpointEvent() {
 
 	log.debug "Generate SetPoint Event"
@@ -533,7 +536,6 @@ def generateSetpointEvent() {
 		coolingSetpoint = roundC(coolingSetpoint)
 	}
 
-
 	sendEvent("name":"maxHeatingSetpoint", "value":maxHeatingSetpoint, "unit":location.temperatureScale)
 	sendEvent("name":"maxCoolingSetpoint", "value":maxCoolingSetpoint, "unit":location.temperatureScale)
 	sendEvent("name":"minHeatingSetpoint", "value":minHeatingSetpoint, "unit":location.temperatureScale)

devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy

@@ -29,7 +29,6 @@ metadata {
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3305"
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3325"
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3326"
-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3326-L", deviceJoinName: "Iris Motion Sensor"
 		fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "motionv4", deviceJoinName: "Motion Sensor"
 	}
 

devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy

@@ -27,7 +27,6 @@ metadata {
  
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3300-S"
         fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3300"
-		fingerprint inClusters: "0000,0001,0003,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3320-L", deviceJoinName: "Iris Contact Sensor"
 	}
  
 	simulator {

devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy

@@ -25,7 +25,6 @@ metadata {
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702, 0B05", outClusters: "0003, 000A, 0019", manufacturer: "Jasco Products", model: "45853", deviceJoinName: "GE ZigBee Plug-In Switch"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702, 0B05", outClusters: "000A, 0019", manufacturer: "Jasco Products", model: "45856", deviceJoinName: "GE ZigBee In-Wall Switch"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 000F, 0B04", outClusters: "0019", manufacturer: "SmartThings", model: "outletv4", deviceJoinName: "Outlet"
     }
 
     tiles(scale: 2) {

smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy

@@ -257,16 +257,21 @@ def getEcobeeThermostats() {
 				}
 			} else {
 				log.debug "http status: ${resp.status}"
-			}
+				//refresh the auth token
-		}
+				if (resp.data.status.code == 14) {
-	} catch (groovyx.net.http.HttpResponseException e) {
+					log.debug "Storing the failed action to try later"
-        log.trace "Exception polling children: " + e.response.data.status
-        if (e.response.data.status.code == 14) {
 					atomicState.action = "getEcobeeThermostats"
 					log.debug "Refreshing your auth_token!"
 					refreshAuthToken()
+				} else {
+					log.error "Authentication error, invalid authentication method, lack of credentials, etc."
 				}
 			}
+		}
+	} catch(Exception e) {
+		log.debug "___exception getEcobeeThermostats(): " + e
+		refreshAuthToken()
+	}
 	atomicState.thermostats = stats
 	return stats
 }
@@ -445,15 +450,23 @@ def pollChildren(child = null) {
 				}
 				result = true
 				log.debug "updated ${atomicState.thermostats?.size()} stats: ${atomicState.thermostats}"
-			}
+			} else {
-		}
+				log.error "polling children & got http status ${resp.status}"
-	} catch (groovyx.net.http.HttpResponseException e) {
+
-		log.trace "Exception polling children: " + e.response.data.status
+				//refresh the auth token
-        if (e.response.data.status.code == 14) {
+				if (resp.data.status.code == 14) {
 					atomicState.action = "pollChildren"
 					log.debug "Refreshing your auth_token!"
 					refreshAuthToken()
 				}
+				else {
+					log.error "Authentication error, invalid authentication method, lack of credentials, etc."
+				}
+			}
+		}
+	} catch(Exception e) {
+		log.debug "___exception polling children: " + e
+		refreshAuthToken()
 	}
 	return result
 }
@@ -629,6 +642,8 @@ private refreshAuthToken() {
 
 					}
 					atomicState.action = ""
+				} else {
+					log.debug "refresh failed ${resp.status} : ${resp.status.code}"
 				}
 			}
 		} catch (groovyx.net.http.HttpResponseException e) {
@@ -636,7 +651,7 @@ private refreshAuthToken() {
 			def reAttemptPeriod = 300 // in sec
 			if (e.statusCode != 401) { //this issue might comes from exceed 20sec app execution, connectivity issue etc.
 				runIn(reAttemptPeriod, "refreshAuthToken")
-			} else if (e.statusCode == 401) { // unauthorized
+			} else if (e.statusCode == 401) { //refresh token is expired
 				atomicState.reAttempt = atomicState.reAttempt + 1
 				log.warn "reAttempt refreshAuthToken to try = ${atomicState.reAttempt}"
 				if (atomicState.reAttempt <= 3) {
@@ -709,21 +724,29 @@ def sendJson(child = null, String jsonBody) {
 					log.debug "Error return code = ${resp.data.status.code}"
 					debugEvent("Error return code = ${resp.data.status.code}")
 				}
-			}
+			} else {
-		}
+				log.error "sent Json & got http status ${resp.status} - ${resp.status.code}"
-	} catch (groovyx.net.http.HttpResponseException e) {
+				debugEvent ("sent Json & got http status ${resp.status} - ${resp.status.code}")
-        log.trace "Exception Sending Json: " + e.response.data.status
+
-        debugEvent ("sent Json & got http status ${e.statusCode} - ${e.response.data.status.code}")
+				//refresh the auth token
-        if (e.response.data.status.code == 14) {
+				if (resp.status.code == 14) {
-            atomicState.action = "pollChildren"
 					log.debug "Refreshing your auth_token!"
+					debugEvent ("Refreshing OAUTH Token")
 					refreshAuthToken()
-        }
+					return false
-        else {
+				} else {
 					debugEvent ("Authentication error, invalid authentication method, lack of credentials, etc.")
 					log.error "Authentication error, invalid authentication method, lack of credentials, etc."
+					return false
 				}
 			}
+		}
+	} catch(Exception e) {
+		log.debug "Exception Sending Json: " + e
+		debugEvent ("Exception Sending JSON: " + e)
+		refreshAuthToken()
+		return false
+	}
 
 	if (returnStatus == 0)
 		return true

smartapps/smartthings/wemo-connect.src/wemo-connect.groovy

@@ -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}", [callback: "setupHandler"]))
+""", physicalgraph.device.Protocol.LAN, "${deviceNetworkId}"))
 }
 
 private verifyDevices() {
@@ -52,13 +52,6 @@ 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())
@@ -69,7 +62,7 @@ def firstPage()
 
 		log.debug "REFRESH COUNT :: ${refreshCount}"
 
-		ssdpSubscribe()
+		subscribe(location, null, locationHandler, [filterEvents:false])
 
 		//ssdp request every 25 seconds
 		if((refreshCount % 5) == 0) {
@@ -112,7 +105,9 @@ def devicesDiscovered() {
 	def motions = getWemoMotions()
 	def lightSwitches = getWemoLightSwitches()
 	def devices = switches + motions + lightSwitches
-	devices?.collect{ [app.id, it.ssdpUSN].join('.') }
+	def list = []
+
+	list = devices?.collect{ [app.id, it.ssdpUSN].join('.') }
 }
 
 def switchesDiscovered() {
@@ -181,8 +176,7 @@ def updated() {
 def initialize() {
 	unsubscribe()
     unschedule()
-
+	subscribe(location, null, locationHandler, [filterEvents:false])
-	ssdpSubscribe()
 
 	if (selectedSwitches)
 		addSwitches()
@@ -319,127 +313,6 @@ def addLightSwitches() {
 	}
 }
 
-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
@@ -586,7 +459,6 @@ def locationHandler(evt) {
 	}
 }
 
-@Deprecated
 private def parseXmlBody(def body) {
 	def decodedBytes = body.decodeBase64()
 	def bodyString