Merge pull request #842 from SmartThingsCommunity/staging

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

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"
 	}

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

@@ -824,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")

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"
 		}
 	}
 }