Merge pull request #797 from SmartThingsCommunity/staging

Rolling up changes to production from staging 2016-04-19 Release

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

@@ -24,7 +24,6 @@ metadata {
         command "enrollResponse"
  
  
- 		fingerprint inClusters: "0000,0001,0003,0500,0020", manufacturer: "NYCE", model: "3010", deviceJoinName: "NYCE Door Hinge Sensor"
 		fingerprint inClusters: "0000,0001,0003,0406,0500,0020", manufacturer: "NYCE", model: "3011", deviceJoinName: "NYCE Door/Window Sensor"
         fingerprint inClusters: "0000,0001,0003,0500,0020", manufacturer: "NYCE", model: "3011", deviceJoinName: "NYCE Door/Window Sensor"
         fingerprint inClusters: "0000,0001,0003,0406,0500,0020", manufacturer: "NYCE", model: "3014", deviceJoinName: "NYCE Tilt Sensor"

devicetypes/smartthings/wattvision.src/wattvision.groovy

@@ -33,7 +33,7 @@ metadata {
 			state "power", label: '${currentValue} W'
 		}
 
-		htmlTile(name: "powerContent", attribute: "powerContent", type: "HTML", whitelist: ["www.wattvision.com"] , url: '${currentValue}', width: 3, height: 2)
+		htmlTile(name: "powerContent", attribute: "powerContent", type: "HTML", whitelist: "www.wattvision.com" , url: '${currentValue}', width: 3, height: 2)
 
 		standardTile("refresh", "device.power", inactiveLabel: false, decoration: "flat") {
 			state "default", label: '', action: "refresh.refresh", icon: "st.secondary.refresh"

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

@@ -60,7 +60,7 @@ def bridgeDiscovery(params=[:])
         app.updateSetting("selectedHue", "")
     }
 
-	ssdpSubscribe()
+	subscribe(location, null, locationHandler, [filterEvents:false])
 
 	//bridge discovery request every 15 //25 seconds
 	if((bridgeRefreshCount % 5) == 0) {
@@ -152,10 +152,6 @@ private discoverBridges() {
 	sendHubCommand(new physicalgraph.device.HubAction("lan discovery urn:schemas-upnp-org:device:basic:1", physicalgraph.device.Protocol.LAN))
 }
 
-void ssdpSubscribe() {
-	subscribe(location, "ssdpTerm.urn:schemas-upnp-org:device:basic:1", ssdpBridgeHandler)
-}
-
 private sendDeveloperReq() {
 	def token = app.id
     def host = getBridgeIP()
@@ -165,7 +161,7 @@ private sendDeveloperReq() {
 		headers: [
 			HOST: host
 		],
-		body: [devicetype: "$token-0"]], "${selectedHue}", [callback: "usernameHandler"]))
+		body: [devicetype: "$token-0"]], "${selectedHue}"))
 }
 
 private discoverHueBulbs() {
@@ -175,7 +171,7 @@ private discoverHueBulbs() {
 		path: "/api/${state.username}/lights",
 		headers: [
 			HOST: host
-		]], "${selectedHue}", [callback: "lightsHandler"]))
+		]], "${selectedHue}"))
 }
 
 private verifyHueBridge(String deviceNetworkId, String host) {
@@ -185,7 +181,7 @@ private verifyHueBridge(String deviceNetworkId, String host) {
 		path: "/description.xml",
 		headers: [
 			HOST: host
-		]], deviceNetworkId, [callback: "bridgeDescriptionHandler"]))
+		]], deviceNetworkId))
 }
 
 private verifyHueBridges() {
@@ -297,9 +293,8 @@ def bulbListHandler(hub, data = "") {
         }
     }
     def bridge = null
-	if (selectedHue) {
-		bridge = getChildDevice(selectedHue)
-	}
+	if (selectedHue)
+        bridge = getChildDevice(selectedHue)
     bridge.sendEvent(name: "bulbList", value: hub, data: bulbs, isStateChange: true, displayed: false)
     msg = "${bulbs.size()} bulbs found. ${bulbs}"
 	return msg
@@ -387,9 +382,8 @@ def addBridge() {
                     	def oldDNI = it.deviceNetworkId
                         log.debug "updating dni for device ${it} with $newDNI - previous DNI = ${it.deviceNetworkId}"
                         it.setDeviceNetworkId("${newDNI}")
-						if (oldDNI == selectedHue) {
-							app.updateSetting("selectedHue", newDNI)
-						}
+                        if (oldDNI == selectedHue)
+                        	app.updateSetting("selectedHue", newDNI)
                         newbridge = false
                     }
                 }
@@ -418,111 +412,6 @@ def addBridge() {
 	}
 }
 
-def ssdpBridgeHandler(evt) {
-	def description = evt.description
-	log.trace "Location: $description"
-
-	def hub = evt?.hubId
-	def parsedEvent = parseLanMessage(description)
-	parsedEvent << ["hub":hub]
-
-	def bridges = getHueBridges()
-	log.trace bridges.toString()
-	if (!(bridges."${parsedEvent.ssdpUSN.toString()}")) {
-		//bridge does not exist
-		log.trace "Adding bridge ${parsedEvent.ssdpUSN}"
-		bridges << ["${parsedEvent.ssdpUSN.toString()}":parsedEvent]
-	} else {
-		// update the values
-		def ip = convertHexToIP(parsedEvent.networkAddress)
-		def port = convertHexToInt(parsedEvent.deviceAddress)
-		def host = ip + ":" + port
-		log.debug "Device ($parsedEvent.mac) was already found in state with ip = $host."
-		def dstate = bridges."${parsedEvent.ssdpUSN.toString()}"
-		def dni = "${parsedEvent.mac}"
-		def d = getChildDevice(dni)
-		def networkAddress = null
-		if (!d) {
-			childDevices.each {
-				if (it.getDeviceDataByName("mac")) {
-					def newDNI = "${it.getDeviceDataByName("mac")}"
-					if (newDNI != it.deviceNetworkId) {
-						def oldDNI = it.deviceNetworkId
-						log.debug "updating dni for device ${it} with $newDNI - previous DNI = ${it.deviceNetworkId}"
-						it.setDeviceNetworkId("${newDNI}")
-						if (oldDNI == selectedHue) {
-							app.updateSetting("selectedHue", newDNI)
-						}
-						doDeviceSync()
-					}
-				}
-			}
-		} else {
-			if (d.getDeviceDataByName("networkAddress")) {
-				networkAddress = d.getDeviceDataByName("networkAddress")
-			} else {
-				networkAddress = d.latestState('networkAddress').stringValue
-			}
-			log.trace "Host: $host - $networkAddress"
-			if (host != networkAddress) {
-				log.debug "Device's port or ip changed for device $d..."
-				dstate.ip = ip
-				dstate.port = port
-				dstate.name = "Philips hue ($ip)"
-				d.sendEvent(name:"networkAddress", value: host)
-				d.updateDataValue("networkAddress", host)
-			}
-		}
-	}
-}
-
-void bridgeDescriptionHandler(physicalgraph.device.HubResponse hubResponse) {
-	log.trace "description.xml response (application/xml)"
-	def body = hubResponse.xml
-	if (body?.device?.modelName?.text().startsWith("Philips hue bridge")) {
-		def bridges = getHueBridges()
-		def bridge = bridges.find {it?.key?.contains(body?.device?.UDN?.text())}
-		if (bridge) {
-			bridge.value << [name:body?.device?.friendlyName?.text(), serialNumber:body?.device?.serialNumber?.text(), verified: true]
-		} else {
-			log.error "/description.xml returned a bridge that didn't exist"
-		}
-	}
-}
-
-void lightsHandler(physicalgraph.device.HubResponse hubResponse) {
-	if (isValidSource(hubResponse.mac)) {
-		def body = hubResponse.json
-		if (!body?.state?.on) { //check if first time poll made it here by mistake
-			def bulbs = getHueBulbs()
-			log.debug "Adding bulbs to state!"
-			body.each { k, v ->
-				bulbs[k] = [id: k, name: v.name, type: v.type, modelid: v.modelid, hub: hubResponse.hubId]
-			}
-		}
-	}
-}
-
-void usernameHandler(physicalgraph.device.HubResponse hubResponse) {
-	if (isValidSource(hubResponse.mac)) {
-		def body = hubResponse.json
-		if (body.success != null) {
-			if (body.success[0] != null) {
-				if (body.success[0].username)
-					state.username = body.success[0].username
-			}
-		} else if (body.error != null) {
-			//TODO: handle retries...
-			log.error "ERROR: application/json ${body.error}"
-		}
-	}
-}
-
-/**
- * @deprecated This has been replaced by the combination of {@link #ssdpBridgeHandler()}, {@link #bridgeDescriptionHandler()},
- * {@link #lightsHandler()}, and {@link #usernameHandler()}. After a pending event subscription migration, it can be removed.
- */
-@Deprecated
 def locationHandler(evt) {
 	def description = evt.description
     log.trace "Location: $description"
@@ -558,19 +447,17 @@ def locationHandler(evt) {
                             def oldDNI = it.deviceNetworkId
                             log.debug "updating dni for device ${it} with $newDNI - previous DNI = ${it.deviceNetworkId}"
                             it.setDeviceNetworkId("${newDNI}")
-							if (oldDNI == selectedHue) {
-								app.updateSetting("selectedHue", newDNI)
-							}
+                            if (oldDNI == selectedHue)
+                                app.updateSetting("selectedHue", newDNI)
                             doDeviceSync()
                         }
                     }
                 }
 			} else {
-				if (d.getDeviceDataByName("networkAddress")) {
-					networkAddress = d.getDeviceDataByName("networkAddress")
-				} else {
-					networkAddress = d.latestState('networkAddress').stringValue
-				}
+            	if (d.getDeviceDataByName("networkAddress"))
+                	networkAddress = d.getDeviceDataByName("networkAddress")
+            	else
+                	networkAddress = d.latestState('networkAddress').stringValue
                 log.trace "Host: $host - $networkAddress"
                 if(host != networkAddress) {
                     log.debug "Device's port or ip changed for device $d..."
@@ -603,9 +490,8 @@ def locationHandler(evt) {
 			def body = new groovy.json.JsonSlurper().parseText(parsedEvent.body)
 			if (body.success != null) {
 				if (body.success[0] != null) {
-					if (body.success[0].username) {
+					if (body.success[0].username)
 						state.username = body.success[0].username
-					}
 				}
 			} else if (body.error != null) {
 				//TODO: handle retries...
@@ -630,7 +516,11 @@ def doDeviceSync(){
 	log.trace "Doing Hue Device Sync!"
 	convertBulbListToMap()
 	poll()
-	ssdpSubscribe()
+    try {
+		subscribe(location, null, locationHandler, [filterEvents:false])
+    } catch (all) {
+    	log.trace "Subscription already exist"
+ 	}
 	discoverBridges()
 }
 
@@ -824,7 +714,7 @@ def setColor(childDevice, huesettings) {
             value.bri = Math.min(Math.round(huesettings.level * 255 / 100), 255)
     }
     value.alert = huesettings.alert ? huesettings.alert : "none"
-    value.transitiontime = huesettings.transitiontime ? huesettings.transitiontime : 4
+    value.transition = huesettings.transition ? huesettings.transition : 4
 
     // Make sure to turn off light if requested
     if (huesettings.switch == "off")
@@ -857,11 +747,15 @@ private getId(childDevice) {
 private poll() {
 	def host = getBridgeIP()
 	def uri = "/api/${state.username}/lights/"
-	log.debug "GET: $host$uri"
-	sendHubCommand(new physicalgraph.device.HubAction("""GET ${uri} HTTP/1.1
+    try {
+		sendHubCommand(new physicalgraph.device.HubAction("""GET ${uri} HTTP/1.1
 HOST: ${host}
 
 """, physicalgraph.device.Protocol.LAN, selectedHue))
+	} catch (all) {
+        log.warn "Parsing Body failed - trying again..."
+        doDeviceSync()
+    }
 }
 
 private put(path, body) {

smartapps/smartthings/simulated-device-manager.src/simulated-device-manager.groovy

@@ -1,132 +0,0 @@
-/**
- *  Simulated Device Manager
- *
- *  Author: SmartThings (Juan Risso - juan@smartthings.com)
- */
- 
-definition(
-	name: "Simulated Device Manager",
-	namespace: "smartthings",
-	author: "SmartThings",
-	description: "Allows you to create virtual devices to populate your account.",
-	category: "SmartThings Labs",
-    iconUrl: "https://d3abxbgmpfhmxi.cloudfront.net/assets/downloads/smartthings-logo-ring.7311e9df.png",
-    iconX2Url: "https://d3abxbgmpfhmxi.cloudfront.net/assets/downloads/smartthings-logo-ring.7311e9df.png",
-    singleInstance: true
-)
-
-preferences {
-	page(name:"selectDevices", title:"Simulated Device Manager") 
-}
-
-//PAGES
-def selectDevices() {
-    return dynamicPage(name:"selectDevices", title:"Simulated Device Manager", nextPage:"", install:true, uninstall: true) {
-    	def options = [1,2,3,4,5]
-        section("Please select the number of virtual devices you want to install") {
-            input "selectedswitch", "enum", required:false, title:"Select number of Simulated Switches", multiple:false, options:options
-            input "selectedmotion", "enum", required:false, title:"Select number of Simulated Motion Sensors", multiple:false, options:options
-            input "selectedpresence", "enum", required:false, title:"Select number of Simulated Presence Sensors", multiple:false, options:options
-			input "selectedsmoke", "enum", required:false, title:"Select number of Simulated Smoke Alarms", multiple:false, options:options
-            input "selectedleak", "enum", required:false, title:"Select number of Simulated Water Sensors", multiple:false, options:options
-            input "selectedalarm", "enum", required:false, title:"Select number of Simulated Alarms", multiple:false, options:options
-            input "selectedbutton", "enum", required:false, title:"Select number of Simulated Buttons", multiple:false, options:options
-            input "selectedcontact", "enum", required:false, title:"Select number of Simulated Contact Sensors", multiple:false, options:options
-            input "selectedlock", "enum", required:false, title:"Select number of Simulated Locks", multiple:false, options:options
-            input "selectedtemperature", "enum", required:false, title:"Select number of Simulated Temperature Sensors", multiple:false, options:options
-            input "selectedthermostat", "enum", required:false, title:"Select number of Simulated Thermostats", multiple:false, options:options
-			input "selectedvalve", "enum", required:false, title:"Select number of Simulated Valves", multiple:false, options:options
-		}
-    }
-}
-
-def installed() {
-	log.trace "Installed with settings: ${settings}"   
-	initialize()
-}
-
-def updated() {
-	log.trace "Updated with settings: ${settings}"
-	initialize()
-}
-
-def uninstalled() {
-	def devices = getChildDevices()
-	log.trace "deleting ${devices.size()} device"
-	devices.each {
-		deleteChildDevice(it.deviceNetworkId)
-	}
-}
-
-def initialize() {
-	addDevice()
-}
-
-//CHILD DEVICE METHODS
-def addDevice(){
-    log.trace "addDevice()"
- 	def type = [selectedswitch: selectedswitch,selectedmotion: selectedmotion,selectedpresence: selectedpresence,selectedsmoke: selectedsmoke,selectedleak: selectedleak,selectedalarm: selectedalarm,selectedbutton: selectedbutton,selectedcontact: selectedcontact,selectedlock: selectedlock,selectedtemperature: selectedtemperature,selectedthermostat: selectedthermostat,selectedvalve: selectedvalve] 
-	type.each {key, value -> 
-        if (value > 0) {
-        	def deviceName = getDeviceName(key)
-        	log.trace "Adding ${deviceName}" 
-            def aux
-            for (aux = 1; aux <= value; aux++) {
-            	def dni = "$key$aux"
-                def d = getChildDevice(dni)
-                if(!d) {
-                    d = addChildDevice("smartthings/testing", deviceName, dni, null, [label:"${deviceName} ${aux}"])
-                    log.trace "Created ${deviceName} with id ${dni}"
-                } else {
-                    log.trace "${dni} already exists"
-                }
-            }  
-    	}        
-	}
-}
-
-def getDeviceName(type) {
-    def result
-    switch (type) {
-        case 'selectedswitch':
-            result = 'Simulated Switch'
-            break
-        case 'selectedmotion':
-            result = 'Simulated Motion Sensor'
-            break
-        case 'selectedpresence':
-            result = 'Simulated Presence Sensor'
-            break
-        case 'selectedsmoke':
-            result = 'Simulated Smoke Alarm'
-            break
-        case 'selectedleak':
-            result = 'Simulated Water Sensor'
-            break
-        case 'selectedalarm':
-            result = 'Simulated Alarm'
-            break
-        case 'selectedbutton':
-            result = 'Simulated Button'
-            break
-        case 'selectedcontact':
-            result = 'Simulated Contact Sensor'
-            break
-        case 'selectedlock':
-            result = 'Simulated Lock'
-            break
-        case 'selectedtemperature':
-            result = 'Simulated Temperature Sensor'
-            break
-        case 'selectedthermostat':
-            result = 'Simulated Thermostat'
-            break
-        case 'selectedvalve':
-            result = 'Simulated Water Valve'
-            break
-        default:
-            result = ''
-            break
-    }    
-    result
-}

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

@@ -236,22 +236,23 @@ def addSwitches() {
 			d = getChildDevices()?.find {
 				it.deviceNetworkId == selectedSwitch.value.mac || it.device.getDataValue("mac") == selectedSwitch.value.mac
 			}
-			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
-					]
-				])
-				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 {
-				log.debug "found ${d.displayName} with id $dni already exists"
-			}
+		}
+
+		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
+				]
+			])
+			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 {
+			log.debug "found ${d.displayName} with id $dni already exists"
 		}
 	}
 }
@@ -266,22 +267,23 @@ def addMotions() {
 			d = getChildDevices()?.find {
 				it.deviceNetworkId == selectedMotion.value.mac || it.device.getDataValue("mac") == selectedMotion.value.mac
 			}
-			if (!d) {
-				log.debug "Creating WeMo Motion with dni: ${selectedMotion.value.mac}"
-				d = addChildDevice("smartthings", "Wemo Motion", selectedMotion.value.mac, selectedMotion?.value.hub, [
-					"label": selectedMotion?.value?.name ?: "Wemo Motion",
-					"data": [
-						"mac": selectedMotion.value.mac,
-						"ip": selectedMotion.value.ip,
-						"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}"
-			} else {
-				log.debug "found ${d.displayName} with id $dni already exists"
-			}
+		}
+
+		if (!d) {
+			log.debug "Creating WeMo Motion with dni: ${selectedMotion.value.mac}"
+			d = addChildDevice("smartthings", "Wemo Motion", selectedMotion.value.mac, selectedMotion?.value.hub, [
+				"label": selectedMotion?.value?.name ?: "Wemo Motion",
+				"data": [
+					"mac": selectedMotion.value.mac,
+					"ip": selectedMotion.value.ip,
+					"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}"
+		} else {
+			log.debug "found ${d.displayName} with id $dni already exists"
 		}
 	}
 }
@@ -296,22 +298,23 @@ def addLightSwitches() {
 			d = getChildDevices()?.find {
 				it.deviceNetworkId == selectedLightSwitch.value.mac || it.device.getDataValue("mac") == selectedLightSwitch.value.mac
 			}
-			if (!d) {
-				log.debug "Creating WeMo Light Switch with dni: ${selectedLightSwitch.value.mac}"
-				d = addChildDevice("smartthings", "Wemo Light Switch", selectedLightSwitch.value.mac, selectedLightSwitch?.value.hub, [
-					"label": selectedLightSwitch?.value?.name ?: "Wemo Light Switch",
-					"data": [
-						"mac": selectedLightSwitch.value.mac,
-						"ip": selectedLightSwitch.value.ip,
-						"port": selectedLightSwitch.value.port
-					]
-				])
-				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"
-			}
+		}
+
+		if (!d) {
+			log.debug "Creating WeMo Light Switch with dni: ${selectedLightSwitch.value.mac}"
+			d = addChildDevice("smartthings", "Wemo Light Switch", selectedLightSwitch.value.mac, selectedLightSwitch?.value.hub, [
+				"label": selectedLightSwitch?.value?.name ?: "Wemo Light Switch",
+				"data": [
+					"mac": selectedLightSwitch.value.mac,
+					"ip": selectedLightSwitch.value.ip,
+					"port": selectedLightSwitch.value.port
+				]
+			])
+			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"
 		}
 	}
 }