Merge pull request #830 from SmartThingsCommunity/staging

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

devicetypes/smartthings/light-sensor.src/light-sensor.groovy

@@ -58,4 +58,4 @@ def parse(String description) {
 	}
 	log.debug "Parse returned ${result?.descriptionText}"
 	return result
-}
+}

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/smartpower-outlet.src/smartpower-outlet.groovy

@@ -31,7 +31,6 @@ 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,7 +31,6 @@ 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,7 +31,6 @@ metadata {
 		capability "Battery"
 		capability "Temperature Measurement"
 		capability "Refresh"
-		capability "Health Check"
 
 		command "enrollResponse"
 

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

@@ -35,7 +35,6 @@ 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,9 +23,8 @@
  		capability "Acceleration Sensor"
  		capability "Refresh"
  		capability "Temperature Measurement"
-		capability "Health Check"
+ 		command "enrollResponse"
 
-		command "enrollResponse"
  	}
 
  	simulator {

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

@@ -20,7 +20,6 @@ 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/tile-ux/tile-basic-standard.src/tile-basic-standard.groovy

@@ -80,31 +80,19 @@ metadata {
 			state "default", label:''
 		}
 
-		// multi-line text (explicit newlines)
-		standardTile("multiLine", "device.multiLine", width: 2, height: 2) {
-			state "default", label: '${currentValue}'
-		}
-
-		standardTile("multiLineWithIcon", "device.multiLine", width: 2, height: 2) {
-			state "default", label: '${currentValue}', icon: "st.switches.switch.off"
-		}
-
-		main("actionRings")
+		main("standard1")
 		details([
 			"actionRings", "actionFlat", "noActionFlat",
 
 			"flatLabel", "flatIconLabel", "flatIcon",
 
 			"flatDefaultState", "flatImplicitDefaultState1", "flatImplicitDefaultState2",
-
-			"multiLine", "multiLineWithIcon"
 		])
 	}
 }
 
 def installed() {
 	sendEvent(name: "switch", value: "off")
-	sendEvent(name: "multiLine", value: "Line 1\nLine 2\nLine 3")
 }
 
 def parse(String description) {

devicetypes/smartthings/tile-ux/tile-basic-value.src/tile-basic-value.groovy

@@ -69,25 +69,16 @@ metadata {
 			]
 		}
 
-		valueTile("noValue", "device.nada", width: 4, height: 2) {
+		valueTile("noValue", "device.nada", width: 2, height: 2) {
 			state "default", label:'${currentValue}'
 		}
 
-		valueTile("multiLine", "device.multiLine", width: 3, height: 2) {
-			state "default", label: '${currentValue}'
-		}
-
-		valueTile("multiLineWithIcon", "device.multiLine", width: 3, height: 2) {
-			state "default", label: '${currentValue}', icon: "st.switches.switch.off"
-		}
-
 		main("text")
 		details([
 			"text", "longText", "integer", 
             "integerFloat", "pi", "floatAsText",
             "bgColor", "bgColorRange", "bgColorRangeSingleItem",
-            "bgColorRangeConflict", "noValue",
-            "multiLine", "multiLineWithIcon"
+            "bgColorRangeConflict", "noValue"
 		])
 	}
 }
@@ -99,7 +90,6 @@ def installed() {
 	sendEvent(name: "integerFloat", value: 47.0)
 	sendEvent(name: "pi", value: 3.14159)
 	sendEvent(name: "floatAsText", value: "3.14159")
-	sendEvent(name: "multiLine", value: "Line 1\nLine 2\nLine 3")
 }
 
 def parse(String description) {

devicetypes/smartthings/tile-ux/tile-multiattribute-generic.src/tile-multiattribute-generic.groovy

@@ -67,47 +67,14 @@ metadata {
 				attributeState "VALUE_DOWN", action: "levelDown"
 			}
 		}
-		multiAttributeTile(name:"lengthyTile", type:"generic", width:6, height:4) {
-			tileAttribute("device.lengthyText", key: "PRIMARY_CONTROL") {
-				attributeState "default", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821"
-			}
-			tileAttribute("device.lengthyText", key: "SECONDARY_CONTROL") {
-				attributeState "default", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821"
-			}
-		}
-		multiAttributeTile(name:"multilineTile", type:"generic", width:6, height:4) {
-			tileAttribute("device.multilineText", key: "PRIMARY_CONTROL") {
-				attributeState "default", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821"
-			}
-			tileAttribute("device.multilineText", key: "SECONDARY_CONTROL") {
-				attributeState "default", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821"
-			}
-		}
-		multiAttributeTile(name:"lengthyTileWithIcon", type:"generic", width:6, height:4) {
-			tileAttribute("device.lengthyText", key: "PRIMARY_CONTROL") {
-				attributeState "default", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821", icon: "st.switches.switch.on"
-			}
-			tileAttribute("device.lengthyText", key: "SECONDARY_CONTROL") {
-				attributeState "default", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821", icon: "st.switches.switch.on"
-			}
-		}
-		multiAttributeTile(name:"multilineTileWithIcon", type:"generic", width:6, height:4) {
-			tileAttribute("device.multilineText", key: "PRIMARY_CONTROL") {
-				attributeState "default", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821", icon: "st.switches.switch.on"
-			}
-			tileAttribute("device.multilineText", key: "SECONDARY_CONTROL") {
-				attributeState "default", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821", icon: "st.switches.switch.on"
-			}
-		}
 
 		main(["basicTile"])
-		details(["basicTile", "sliderTile", "valueTile", "lengthyTile", "multilineTile", "lengthyTileWithIcon", "multilineTileWithIcon"])
+		details(["basicTile", "sliderTile", "valueTile"])
 	}
 }
 
 def installed() {
-	sendEvent(name: "lengthyText", value: "The value of this tile is long and should wrap to two lines")
-	sendEvent(name: "multilineText", value: "Line 1 YES\nLine 2 YES\nLine 3 NO")
+
 }
 
 def parse() {

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

@@ -332,7 +332,8 @@ private addChildBulb(dni, hueType, name, hub, update=false, device = null) {
 
 	if (deviceType) {
 		return addChildDevice("smartthings", deviceType, dni, hub, ["label": name])
-	} else {
+	}
+	else {
 		log.warn "Device type $hueType not supported"
 		return null
 	}
@@ -348,10 +349,8 @@ def addBulbs() {
 				newHueBulb = bulbs.find { (app.id + "/" + it.value.id) == dni }
                 if (newHueBulb != null) {
                     d = addChildBulb(dni, newHueBulb?.value?.type, newHueBulb?.value?.name, newHueBulb?.value?.hub)
-					if (d) {
-						log.debug "created ${d.displayName} with id $dni"
-						d.refresh()
-					}
+                    log.debug "created ${d.displayName} with id $dni"
+                    d.refresh()
                 } else {
                 	log.debug "$dni in not longer paired to the Hue Bridge or ID changed"
                 }
@@ -359,7 +358,7 @@ def addBulbs() {
             	//backwards compatable
 				newHueBulb = bulbs.find { (app.id + "/" + it.id) == dni }
 				d = addChildBulb(dni, "Extended Color Light", newHueBulb?.value?.name, newHueBulb?.value?.hub)
-				d?.refresh()
+                d.refresh()
 			}
 		} else {
 			log.debug "found ${d.displayName} with id $dni already exists, type: '$d.typeName'"
@@ -825,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.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")

smartapps/smartthings/speaker-mood-music.src/speaker-mood-music.groovy

@@ -335,4 +335,5 @@ private timeIntervalLabel()
 {
 	(starting && ending) ? hhmm(starting) + "-" + hhmm(ending, "h:mm a z") : ""
 }
-// TODO - End Centralize
+// TODO - End Centralize
+

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