Merge pull request #842 from SmartThingsCommunity/staging

Rolling up changes to production from staging 2016-05-03 Release

build.gradle

@@ -9,7 +9,7 @@ apply plugin: 'smartthings-slack'
 
 buildscript {
     dependencies {
-        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.7"
+        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.8"
     }
     repositories {
         mavenLocal()

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

@@ -24,6 +24,7 @@ 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/smartpower-outlet.src/smartpower-outlet.groovy

@@ -31,6 +31,7 @@ metadata {
 		capability "Configuration"
 		capability "Refresh"
 		capability "Sensor"
+		capability "Health Check"
 
 		// indicates that device keeps track of heartbeat (in state.heartbeat)
 		attribute "heartbeat", "string"

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

@@ -31,6 +31,7 @@ metadata {
 		capability "Refresh"
 		capability "Temperature Measurement"
 		capability "Water Sensor"
+		capability "Health Check"
 
 		command "enrollResponse"
 

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

@@ -31,6 +31,7 @@ metadata {
 		capability "Battery"
 		capability "Temperature Measurement"
 		capability "Refresh"
+		capability "Health Check"
 
 		command "enrollResponse"
 

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

@@ -35,6 +35,7 @@ metadata {
  		capability "Acceleration Sensor"
  		capability "Refresh"
  		capability "Temperature Measurement"
+		capability "Health Check"
 
  		command "enrollResponse"
  		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05,FC02", outClusters: "0019", manufacturer: "CentraLite", model: "3320"

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

@@ -23,8 +23,9 @@
  		capability "Acceleration Sensor"
  		capability "Refresh"
  		capability "Temperature Measurement"
- 		command "enrollResponse"
+		capability "Health Check"
 
+		command "enrollResponse"
  	}
 
  	simulator {

devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy

@@ -20,6 +20,7 @@ metadata {
 		capability "Refresh"
 		capability "Temperature Measurement"
 		capability "Relative Humidity Measurement"
+		capability "Health Check"
 
 		fingerprint endpointId: "01", inClusters: "0001,0003,0020,0402,0B05,FC45", outClusters: "0019,0003"
 	}

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"

devicetypes/smartthings/zwave-door-window-sensor.src/zwave-door-window-sensor.groovy

@@ -25,7 +25,10 @@ metadata {
 
 		fingerprint deviceId: "0x2001", inClusters: "0x30,0x80,0x84,0x85,0x86,0x72"
 		fingerprint deviceId: "0x07", inClusters: "0x30"
+		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x98"
 		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x86,0x72,0x98", outClusters: "0x5A,0x82"
+		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x80,0x71,0x85,0x70,0x72,0x86,0x30,0x31,0x84,0x59,0x73,0x5A,0x8F,0x98,0x7A", outClusters:"0x20" // Philio multi+
+		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x72,0x5A,0x80,0x73,0x86,0x84,0x85,0x59,0x71,0x70,0x7A,0x98" // Vision door/window
 	}
 
 	// simulator metadata
@@ -240,7 +243,7 @@ def batteryGetCommand() {
 def retypeBasedOnMSR() {
 	switch (state.MSR) {
 		case "0086-0002-002D":
-			log.debug("Changing device type to Z-Wave Water Sensor")
+			log.debug "Changing device type to Z-Wave Water Sensor"
 			setDeviceType("Z-Wave Water Sensor")
 			break
 		case "011F-0001-0001":  // Schlage motion
@@ -249,9 +252,16 @@ def retypeBasedOnMSR() {
 		case "0060-0001-0002":  // Everspring SP814
 		case "0060-0001-0003":  // Everspring HSP02
 		case "011A-0601-0901":  // Enerwave ZWN-BPC
-			log.debug("Changing device type to Z-Wave Motion Sensor")
+			log.debug "Changing device type to Z-Wave Motion Sensor"
 			setDeviceType("Z-Wave Motion Sensor")
 			break
-		
+		case "013C-0002-000D":  // Philio multi +
+			log.debug "Changing device type to 3-in-1 Multisensor Plus (SG)"
+			setDeviceType("3-in-1 Multisensor Plus (SG)")
+			break
+		case "0109-2001-0106":  // Vision door/window
+			log.debug "Changing device type to Door / Window Sensor Plus (SG)"
+			setDeviceType("Door / Window Sensor Plus (SG)")
+			break
 	}
 }

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

@@ -60,7 +60,7 @@ def bridgeDiscovery(params=[:])
         app.updateSetting("selectedHue", "")
     }
 
-	subscribe(location, null, locationHandler, [filterEvents:false])
+	ssdpSubscribe()
 
 	//bridge discovery request every 15 //25 seconds
 	if((bridgeRefreshCount % 5) == 0) {
@@ -152,6 +152,10 @@ 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()
@@ -161,7 +165,7 @@ private sendDeveloperReq() {
 		headers: [
 			HOST: host
 		],
-		body: [devicetype: "$token-0"]], "${selectedHue}"))
+		body: [devicetype: "$token-0"]], "${selectedHue}", [callback: "usernameHandler"]))
 }
 
 private discoverHueBulbs() {
@@ -171,7 +175,7 @@ private discoverHueBulbs() {
 		path: "/api/${state.username}/lights",
 		headers: [
 			HOST: host
-		]], "${selectedHue}"))
+		]], "${selectedHue}", [callback: "lightsHandler"]))
 }
 
 private verifyHueBridge(String deviceNetworkId, String host) {
@@ -181,7 +185,7 @@ private verifyHueBridge(String deviceNetworkId, String host) {
 		path: "/description.xml",
 		headers: [
 			HOST: host
-		]], deviceNetworkId))
+		]], deviceNetworkId, [callback: "bridgeDescriptionHandler"]))
 }
 
 private verifyHueBridges() {
@@ -293,8 +297,9 @@ def bulbListHandler(hub, data = "") {
         }
     }
     def bridge = null
-	if (selectedHue)
+	if (selectedHue) {
-        bridge = getChildDevice(selectedHue)
+		bridge = getChildDevice(selectedHue)
+	}
     bridge.sendEvent(name: "bulbList", value: hub, data: bulbs, isStateChange: true, displayed: false)
     msg = "${bulbs.size()} bulbs found. ${bulbs}"
 	return msg
@@ -382,8 +387,9 @@ 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)
+						if (oldDNI == selectedHue) {
-                        	app.updateSetting("selectedHue", newDNI)
+							app.updateSetting("selectedHue", newDNI)
+						}
                         newbridge = false
                     }
                 }
@@ -412,6 +418,111 @@ 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"
@@ -447,17 +558,19 @@ 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)
+							if (oldDNI == selectedHue) {
-                                app.updateSetting("selectedHue", newDNI)
+								app.updateSetting("selectedHue", newDNI)
+							}
                             doDeviceSync()
                         }
                     }
                 }
 			} else {
-            	if (d.getDeviceDataByName("networkAddress"))
+				if (d.getDeviceDataByName("networkAddress")) {
-                	networkAddress = d.getDeviceDataByName("networkAddress")
+					networkAddress = d.getDeviceDataByName("networkAddress")
-            	else
+				} else {
-                	networkAddress = d.latestState('networkAddress').stringValue
+					networkAddress = d.latestState('networkAddress').stringValue
+				}
                 log.trace "Host: $host - $networkAddress"
                 if(host != networkAddress) {
                     log.debug "Device's port or ip changed for device $d..."
@@ -490,8 +603,9 @@ 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...
@@ -516,11 +630,7 @@ def doDeviceSync(){
 	log.trace "Doing Hue Device Sync!"
 	convertBulbListToMap()
 	poll()
-    try {
+	ssdpSubscribe()
-		subscribe(location, null, locationHandler, [filterEvents:false])
-    } catch (all) {
-    	log.trace "Subscription already exist"
- 	}
 	discoverBridges()
 }
 
@@ -714,7 +824,7 @@ def setColor(childDevice, huesettings) {
             value.bri = Math.min(Math.round(huesettings.level * 255 / 100), 255)
     }
     value.alert = huesettings.alert ? huesettings.alert : "none"
-    value.transition = huesettings.transition ? huesettings.transition : 4
+    value.transitiontime = huesettings.transitiontime ? huesettings.transitiontime : 4
 
     // Make sure to turn off light if requested
     if (huesettings.switch == "off")
@@ -747,15 +857,11 @@ private getId(childDevice) {
 private poll() {
 	def host = getBridgeIP()
 	def uri = "/api/${state.username}/lights/"
-    try {
+	log.debug "GET: $host$uri"
-		sendHubCommand(new physicalgraph.device.HubAction("""GET ${uri} HTTP/1.1
+	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/wemo-connect.src/wemo-connect.groovy

@@ -236,23 +236,22 @@ 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}"
-		if (!d) {
+				d = addChildDevice("smartthings", "Wemo Switch", selectedSwitch.value.mac, selectedSwitch?.value.hub, [
-			log.debug "Creating WeMo Switch with dni: ${selectedSwitch.value.mac}"
+					"label": selectedSwitch?.value?.name ?: "Wemo Switch",
-			d = addChildDevice("smartthings", "Wemo Switch", selectedSwitch.value.mac, selectedSwitch?.value.hub, [
+					"data": [
-				"label": selectedSwitch?.value?.name ?: "Wemo Switch",
+						"mac": selectedSwitch.value.mac,
-				"data": [
+						"ip": selectedSwitch.value.ip,
-					"mac": selectedSwitch.value.mac,
+						"port": selectedSwitch.value.port
-					"ip": selectedSwitch.value.ip,
+					]
-					"port": selectedSwitch.value.port
+				])
-				]
+				def ipvalue = convertHexToIP(selectedSwitch.value.ip)
-			])
+				d.sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP is ${ipvalue}")
-			def ipvalue = convertHexToIP(selectedSwitch.value.ip)
+				log.debug "Created ${d.displayName} with id: ${d.id}, dni: ${d.deviceNetworkId}"
-			d.sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP is ${ipvalue}")
+			} else {
-			log.debug "Created ${d.displayName} with id: ${d.id}, dni: ${d.deviceNetworkId}"
+				log.debug "found ${d.displayName} with id $dni already exists"
-		} else {
+			}
-			log.debug "found ${d.displayName} with id $dni already exists"
 		}
 	}
 }
@@ -267,23 +266,22 @@ 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}"
-		if (!d) {
+				d = addChildDevice("smartthings", "Wemo Motion", selectedMotion.value.mac, selectedMotion?.value.hub, [
-			log.debug "Creating WeMo Motion with dni: ${selectedMotion.value.mac}"
+					"label": selectedMotion?.value?.name ?: "Wemo Motion",
-			d = addChildDevice("smartthings", "Wemo Motion", selectedMotion.value.mac, selectedMotion?.value.hub, [
+					"data": [
-				"label": selectedMotion?.value?.name ?: "Wemo Motion",
+						"mac": selectedMotion.value.mac,
-				"data": [
+						"ip": selectedMotion.value.ip,
-					"mac": selectedMotion.value.mac,
+						"port": selectedMotion.value.port
-					"ip": selectedMotion.value.ip,
+					]
-					"port": selectedMotion.value.port
+				])
-				]
+				def ipvalue = convertHexToIP(selectedMotion.value.ip)
-			])
+				d.sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP is ${ipvalue}")
-			def ipvalue = convertHexToIP(selectedMotion.value.ip)
+				log.debug "Created ${d.displayName} with id: ${d.id}, dni: ${d.deviceNetworkId}"
-			d.sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP is ${ipvalue}")
+			} else {
-			log.debug "Created ${d.displayName} with id: ${d.id}, dni: ${d.deviceNetworkId}"
+				log.debug "found ${d.displayName} with id $dni already exists"
-		} else {
+			}
-			log.debug "found ${d.displayName} with id $dni already exists"
 		}
 	}
 }
@@ -298,23 +296,22 @@ 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}"
-		if (!d) {
+				d = addChildDevice("smartthings", "Wemo Light Switch", selectedLightSwitch.value.mac, selectedLightSwitch?.value.hub, [
-			log.debug "Creating WeMo Light Switch with dni: ${selectedLightSwitch.value.mac}"
+					"label": selectedLightSwitch?.value?.name ?: "Wemo Light Switch",
-			d = addChildDevice("smartthings", "Wemo Light Switch", selectedLightSwitch.value.mac, selectedLightSwitch?.value.hub, [
+					"data": [
-				"label": selectedLightSwitch?.value?.name ?: "Wemo Light Switch",
+						"mac": selectedLightSwitch.value.mac,
-				"data": [
+						"ip": selectedLightSwitch.value.ip,
-					"mac": selectedLightSwitch.value.mac,
+						"port": selectedLightSwitch.value.port
-					"ip": selectedLightSwitch.value.ip,
+					]
-					"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)
+				log.debug "created ${d.displayName} with id $dni"
-			d.sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP is ${ipvalue}")
+			} else {
-			log.debug "created ${d.displayName} with id $dni"
+				log.debug "found ${d.displayName} with id $dni already exists"
-		} else {
+			}
-			log.debug "found ${d.displayName} with id $dni already exists"
 		}
 	}
 }