Merge pull request #1706 from SmartThingsCommunity/staging

Rolling up staging to production for deploy

devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy

@@ -7,6 +7,7 @@
 metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Hue Bridge", namespace: "smartthings", author: "SmartThings") {
+		capability "Bridge"
 		capability "Health Check"
 
 		attribute "networkAddress", "string"

devicetypes/smartthings/smartpower-dimming-outlet.src/smartpower-dimming-outlet.groovy

@@ -24,6 +24,7 @@ metadata {
 		capability "Refresh"
 		capability "Actuator"
 		capability "Sensor"
+		capability "Outlet"
 
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "4257050-ZHAC"
 
@@ -79,7 +80,8 @@ def parse(String description) {
 		*/
 		event.value = event.value / 10
 	}
-	return event
+
+	return event ? createEvent(event) : event
 }
 
 def setLevel(value) {

devicetypes/smartthings/smartpower-outlet-v1.src/smartpower-outlet-v1.groovy

@@ -4,6 +4,7 @@ metadata {
 		capability "Actuator"
 		capability "Switch"
 		capability "Sensor"
+		capability "Outlet"
 
 		fingerprint profileId: "0104", inClusters: "0006, 0004, 0003, 0000, 0005", outClusters: "0019", manufacturer: "Compacta International, Ltd", model: "ZBMPlug15", deviceJoinName: "SmartPower Outlet V1"
 	}

devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy

@@ -83,9 +83,8 @@ def parse(String description) {
 
 	if (event) {
 		if (event.name == "power") {
-			event.value = event.value / 10
+			def value = (event.value as Integer) / 10
-			event.descriptionText = '{{ device.displayName }} power is {{ value }} Watts'
+			event = createEvent(name: event.name, value: value, descriptionText: '{{ device.displayName }} power is {{ value }} Watts', translatable: true)
-			event.translatable = true
 		} else if (event.name == "switch") {
 			def descriptionText = event.value == "on" ? '{{ device.displayName }} is On' : '{{ device.displayName }} is Off'
 			event = createEvent(name: event.name, value: event.value, descriptionText: descriptionText, translatable: true)
@@ -106,7 +105,7 @@ def parse(String description) {
 			log.debug "${cluster}"
 		}
 	}
-	return event
+	return event ? createEvent(event) : event
 }
 
 def off() {

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

@@ -85,7 +85,8 @@ def bridgeDiscovery(params=[:])
 	}
 
 	return dynamicPage(name:"bridgeDiscovery", title:"Discovery Started!", nextPage:"bridgeBtnPush", refreshInterval:refreshInterval, uninstall: true) {
-		section("Please wait while we discover your Hue Bridge. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
+		section("Please wait while we discover your Hue Bridge. Kindly note that you must first configure your Hue Bridge and Lights using the Philips Hue application. " +
+				"Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
 			input "selectedHue", "enum", required:false, title:"Select Hue Bridge (${numFound} found)", multiple:false, options:options, submitOnChange: true
 		}
 	}
@@ -178,7 +179,7 @@ def bulbDiscovery() {
 	}
 
 	if (bulbRefreshCount > 200 && numFound == 0) {
-		// Time out to avoid endless discovery
+		// Time out after 10 minutes
 		state.inBulbDiscovery = false
 		bulbRefreshCount = 0
 		return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Failed!", nextPage:"", refreshInterval:0, install:true, uninstall: true) {
@@ -1151,7 +1152,7 @@ def setColorTemperature(childDevice, huesettings) {
 	def ct = hueSettings == 6500 ? 153 : Math.round(1000000/huesettings)
 	createSwitchEvent(childDevice, "on")
 	put("lights/$id/state", [ct: ct, on: true])
-	return "Setting color temperature to $percent"
+	return "Setting color temperature to $ct"
 }
 
 def setColor(childDevice, huesettings) {

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

@@ -346,7 +346,7 @@ def devicesList(selector = '') {
 		if (resp.status == 200) {
 			return resp.data
 		} else {
-			log.error("Non-200 from device list call. ${resp.status} ${resp.data}")
+			log.debug("No response from device list call. ${resp.status} ${resp.data}")
 			return []
 		}
 	}
@@ -418,9 +418,15 @@ def updateDevices() {
 	}
 	getChildDevices().findAll { !selectors.contains("${it.deviceNetworkId}") }.each {
 		log.info("Deleting ${it.deviceNetworkId}")
+		if (state.devices[it.deviceNetworkId])
 			state.devices[it.deviceNetworkId] = null
+		// The reason the implementation is trying to delete this bulb is because it is not longer connected to the LIFX location.
+		// Adding "try" will prevent this exception from happening.
+		// Ideally device health would show to the user that the device is not longer accessible so that the user can either force delete it or remove it from the SmartApp.
+		try {
 			deleteChildDevice(it.deviceNetworkId)
+		} catch (Exception e) {
+			log.debug("Can't remove this device because it's being used by an SmartApp")
+		}
 	}
 }
-
-