Merge pull request #1706 from SmartThingsCommunity/staging

Rolling up staging to production for deploy

devicetypes/besense-sensors/besense-motion-sensor.src/besense-motion-sensor.groovy

@@ -1,145 +0,0 @@
-/**
- *  
- *
- *  BeSense Z-Wave Motion Sensor
- *
- *  
- */
-
-metadata {
-	definition (name: "BeSense Motion Sensor", namespace: "BeSense Sensors", author: "BeSense") {
-		capability "Motion Sensor"
-		capability "Sensor"
-		capability "Battery"
-        capability "Tamper Alert"
-
-    
-    
-
-		
-		fingerprint mfr: "0214", prod: "0002", model: "0002", deviceJoinName: "Besense Motion Sensor"  // Besense motion sensor
-		
-	}
-
-	simulator {
-		status "inactive": "command: 3003, payload: 00"
-		status "active": "command: 3003, payload: FF"
-        
-       
-	}
-	
-	tiles(scale: 1) {
-		standardTile("motion", "device.motion", width: 3, height: 3, canChangeIcon: true) {
-			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#ea0f46", nextState:"inactive")
-			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#27CC73", nextState:"active")
-			
-        }
-        	
-			
-        
-		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat") {
-			state("battery", label:'${currentValue}% battery', unit:"")
-		}
-		
-		main "motion"
-		details(["motion", "battery", "tamper"])
-	}
-}
-
-def parse(String description) {
-	def result = null
-	if (description.startsWith("Err")) {
-	    result = createEvent(descriptionText:description)
-	} else {
-		def cmd = zwave.parse(description, [0x20: 1, 0x30:1, 0x80: 1, 0x84: 1, 0x71: 6, 0x9C: 1])
-		if (cmd) {
-			result = zwaveEvent(cmd)
-		} else {
-			result = createEvent(value: description, descriptionText: description, isStateChange: false)
-		}
-	}
-	return result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd)
-{
-def map = [:]
-map.name = "tamper"
-map.value = cmd.alarmLevel == 255 ? "tampered" : "secured"
-if (map.value == "tampered") {
-map.value = "tampered"
-map.descriptionText = "$device.displayName has been tampered with"
-map.isStateChange = "true"
-map.display = "true"
-log.debug "tampered: $map"
-}
-else {
-map.value = "secured"
-map.descriptionText = "$device.displayName is secured"
-map.isStateChange = "true"
-map.display = "true"
-log.debug "secure: $map"
-
-   	}
-    
-createEvent(map)
-}
-
-def sensorValueEvent(value) {
-	if (value) {
-		createEvent(name: "motion", value: "active", descriptionText: "$device.displayName detected motion")
-	} else {
-		createEvent(name: "motion", value: "inactive", descriptionText: "$device.displayName motion has stopped")
-	}
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd)
-{
-	sensorValueEvent(cmd.value)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd)
-{
-	sensorValueEvent(cmd.value)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.switchbinaryv1.SwitchBinaryReport cmd)
-{
-	sensorValueEvent(cmd.value)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.sensorbinaryv1.SensorBinaryReport cmd)
-{
-	sensorValueEvent(cmd.sensorValue)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.sensoralarmv1.SensorAlarmReport cmd)
-{
-	sensorValueEvent(cmd.sensorState)
-}
-
-
-def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd)
-{
-	def result = [createEvent(descriptionText: "${device.displayName} woke up", isStateChange: false)]
-
-	if (!state.lastbat || (new Date().time) - state.lastbat > 53*60*60*1000) {
-		result << response(zwave.batteryV1.batteryGet())
-	} else {
-		result << response(zwave.wakeUpV1.wakeUpNoMoreInformation())
-	}
-	result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
-	def map = [ name: "battery", unit: "%" ]
-	if (cmd.batteryLevel == 0xFF) {
-		map.value = 1
-		map.descriptionText = "${device.displayName} has a low battery"
-		map.isStateChange = true
-	} else {
-		map.value = cmd.batteryLevel
-	}
-	state.lastbat = new Date().time
-	[createEvent(map), response(zwave.wakeUpV1.wakeUpNoMoreInformation())]
-}

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
-			event.descriptionText = '{{ device.displayName }} power is {{ value }} Watts'
-			event.translatable = true
+			def value = (event.value as Integer) / 10
+			event = createEvent(name: event.name, value: value, descriptionText: '{{ device.displayName }} power is {{ value }} Watts', 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")
+		}
 	}
 }
-
-