Merge pull request #664 from SmartThingsCommunity/staging

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

build.gradle

@@ -52,6 +52,9 @@ hipchatShareFile {
 hipchatSendNotification {
     String branch = project.hasProperty('branch') ? project.property('branch') : 'unknown'
     message = "Began executable deploy of SmartThingsPublic(${branch})."
+    if (branch == 'master') {
+      message += ' (dev shards)'
+    }
     color = branch == 'master' ? 'yellow' : 'red'
     notify = true
 }

devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy

@@ -379,12 +379,16 @@ def getDataByName(String name) {
 	state[name] ?: device.getDataValue(name)
 }
 
-def setThermostatMode(String value) {
+def setThermostatMode(String mode) {
-	log.debug "setThermostatMode({$value})"
+	log.debug "setThermostatMode($mode)"
+	mode = mode.toLowerCase()
+	switchToMode(mode)
 }
 
-def setThermostatFanMode(String value) {
+def setThermostatFanMode(String mode) {
-	log.debug "setThermostatFanMode({$value})"
+	log.debug "setThermostatFanMode($mode)"
+	mode = mode.toLowerCase()
+	switchToFanMode(mode)
 }
 
 def generateModeEvent(mode) {

devicetypes/smartthings/smartpower-outlet.src/i18n/messages.properties

@@ -23,6 +23,7 @@
 # Korean (ko)
 # Device Preferences
 '''Give your device a name'''.ko=기기 이름 바꾸기
+'''Outlet'''.ko=플러그
 # Events descriptionText
 '''{{ device.displayName }} is On'''.ko={{ device.displayName }}켜졌습니다.
 '''{{ device.displayName }} is Off'''.ko={{ device.displayName }}꺼졌습니다.

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

@@ -22,7 +22,6 @@
  *  1. 20160117 TW - Update/Edit to support i18n translations
 ===============================================================================
  */
-
 metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "SmartPower Outlet", namespace: "smartthings", author: "SmartThings") {
@@ -104,8 +103,8 @@ def parse(String description) {
 			log.info "$device updates: ${finalResult.value}"
 		}
 		else if (finalResult.type == "power") {
-			def value = (finalResult.value as Integer)/10
+			def powerValue = (finalResult.value as Integer)/10
-			createEvent(name: "power", value: value, descriptionText: '{{ device.displayName }} power is {{ value }} Watts', translatable: true )
+			sendEvent(name: "power", value: powerValue, descriptionText: '{{ device.displayName }} power is {{ value }} Watts', translatable: true )
 			/*
 				Dividing by 10 as the Divisor is 10000 and unit is kW for the device. AttrId: 0302 and 0300. Simplifying to 10
 				power level is an integer. The exact power level with correct units needs to be handled in the device type
@@ -113,10 +112,8 @@ def parse(String description) {
 			*/
 		}
 		else {
-        	if ( finalResult.value == "on" )
+			def descriptionText = finalResult.value == "on" ? '{{ device.displayName }} is On' : '{{ device.displayName }} is Off'
-				createEvent(name: finalResult.type, value: finalResult.value, descriptionText: '{{ device.displayName }} is On', translatable: true)
+			sendEvent(name: finalResult.type, value: finalResult.value, descriptionText: descriptionText, translatable: true)
-            else
-            	createEvent(name: finalResult.type, value: finalResult.value, descriptionText: '{{ device.displayName }} is Off', translatable: true)
 		}
 	}
 	else {

devicetypes/smartthings/smartsense-moisture-sensor.src/i18n/messages.properties

@@ -30,11 +30,12 @@
 '''Degrees'''.ko=온도
 '''Adjust temperature by this many degrees'''.ko=몇 도씩 온도를 조절하십시오
 '''Give your device a name'''.ko=기기 이름 바꾸기
+'''Water Leak Sensor'''.ko=누수센서
 # Events descriptionText
 '''{{ device.displayName }} is dry'''.ko={{ device.displayName }}가 건조
 '''{{ device.displayName }} is wet'''.ko={{ device.displayName }}누수
 '''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가) {{ value }}°C였습니다
 '''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다
 '''{{ device.displayName }} battery has too much power: (> 3.5) volts.'''.ko={{ device.displayName }} 배터리 전력이 너무 높습니다(3.5볼트 초과).
-'''{{ device.displayName }} battery was {{ value }}'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}입니다.
+'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}%입니다.
 #==============================================================================

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

@@ -32,7 +32,8 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Water Sensor"
 
-        command "enrollResponse"
+		command "enrollResponse"
+
 
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315-S", deviceJoinName: "Water Leak Sensor"
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315"
@@ -66,7 +67,7 @@ metadata {
 			}
 		}
 		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
-			state "temperature", label:'${currentValue}°',
+			state "temperature", label:'${currentValue}°',
 				backgroundColors:[
 					[value: 31, color: "#153591"],
 					[value: 44, color: "#1e9cbb"],
@@ -102,29 +103,29 @@ def parse(String description) {
 	else if (description?.startsWith('temperature: ')) {
 		map = parseCustomMessage(description)
 	}
-    else if (description?.startsWith('zone status')) {
+	else if (description?.startsWith('zone status')) {
-	    map = parseIasMessage(description)
+		map = parseIasMessage(description)
-    }
+	}
 
 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : null
 
-    if (description?.startsWith('enroll request')) {
+	if (description?.startsWith('enroll request')) {
-    	List cmds = enrollResponse()
+		List cmds = enrollResponse()
-        log.debug "enroll response: ${cmds}"
+		log.debug "enroll response: ${cmds}"
-        result = cmds?.collect { new physicalgraph.device.HubAction(it) }
+		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
-    }
+	}
-    return result
+	return result
 }
 
 private Map parseCatchAllMessage(String description) {
-    Map resultMap = [:]
+	Map resultMap = [:]
-    def cluster = zigbee.parse(description)
+	def cluster = zigbee.parse(description)
-    if (shouldProcessMessage(cluster)) {
+	if (shouldProcessMessage(cluster)) {
-        switch(cluster.clusterId) {
+		switch(cluster.clusterId) {
-            case 0x0001:
+			case 0x0001:
-            	resultMap = getBatteryResult(cluster.data.last())
+				resultMap = getBatteryResult(cluster.data.last())
-                break
+				break
 
             case 0x0402:
                 // temp is last 2 data values. reverse to swap endian
@@ -139,13 +140,13 @@ private Map parseCatchAllMessage(String description) {
 }
 
 private boolean shouldProcessMessage(cluster) {
-    // 0x0B is default response indicating message got through
+	// 0x0B is default response indicating message got through
-    // 0x07 is bind message
+	// 0x07 is bind message
-    boolean ignoredMessage = cluster.profileId != 0x0104 || 
+	boolean ignoredMessage = cluster.profileId != 0x0104 ||
-        cluster.command == 0x0B ||
+		cluster.command == 0x0B ||
-        cluster.command == 0x07 ||
+		cluster.command == 0x07 ||
-        (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
+		(cluster.data.size() > 0 && cluster.data.first() == 0x3e)
-    return !ignoredMessage
+	return !ignoredMessage
 }
 
 private Map parseReportAttributeMessage(String description) {
@@ -177,42 +178,42 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-    List parsedMsg = description.split(' ')
+	List parsedMsg = description.split(' ')
-    String msgCode = parsedMsg[2]
+	String msgCode = parsedMsg[2]
 
-    Map resultMap = [:]
+	Map resultMap = [:]
-    switch(msgCode) {
+	switch(msgCode) {
-        case '0x0020': // Closed/No Motion/Dry
+		case '0x0020': // Closed/No Motion/Dry
-        	resultMap = getMoistureResult('dry')
+			resultMap = getMoistureResult('dry')
-            break
+			break
 
-        case '0x0021': // Open/Motion/Wet
+		case '0x0021': // Open/Motion/Wet
-        	resultMap = getMoistureResult('wet')
+			resultMap = getMoistureResult('wet')
-            break
+			break
 
-        case '0x0022': // Tamper Alarm
+		case '0x0022': // Tamper Alarm
-            break
+			break
 
-        case '0x0023': // Battery Alarm
+		case '0x0023': // Battery Alarm
-            break
+			break
 
-        case '0x0024': // Supervision Report
+		case '0x0024': // Supervision Report
-        	 log.debug 'dry with tamper alarm'
+			 log.debug 'dry with tamper alarm'
-        	resultMap = getMoistureResult('dry')
+			resultMap = getMoistureResult('dry')
-            break
+			break
 
-        case '0x0025': // Restore Report
+		case '0x0025': // Restore Report
-        	log.debug 'water with tamper alarm'
+			log.debug 'water with tamper alarm'
-        	resultMap = getMoistureResult('wet')
+			resultMap = getMoistureResult('wet')
-            break
+			break
 
-        case '0x0026': // Trouble/Failure
+		case '0x0026': // Trouble/Failure
-            break
+			break
 
-        case '0x0028': // Test Mode
+		case '0x0028': // Test Mode
-            break
+			break
-    }
+	}
-    return resultMap
+	return resultMap
 }
 
 def getTemperature(value) {
@@ -256,8 +257,7 @@ private Map getBatteryResult(rawValue) {
 				def pct = batteryMap[volts]
 				if (pct != null) {
 					result.value = pct
-                    def value = pct
+					result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
-					result.descriptionText = "{{ device.displayName }} battery was {{ value }}"
 				}
 			}
 			else {
@@ -265,13 +265,14 @@ private Map getBatteryResult(rawValue) {
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				result.value = Math.min(100, (int) pct * 100)
-				result.descriptionText = "{{ device.displayName }} battery was {{ value }}"
+				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}
 		}
 	}
 
 	return result
 }
+
 private Map getTemperatureResult(value) {
 	log.debug 'TEMP'
 	if (tempOffset) {
@@ -281,9 +282,9 @@ private Map getTemperatureResult(value) {
 	}
     def descriptionText
     if ( temperatureScale == 'C' )
-    	descriptionText = '{{ device.displayName }} was {{ value }}°C'
+    	descriptionText = '{{ device.displayName }} was {{ value }}°C'
     else
-    	descriptionText = '{{ device.displayName }} was {{ value }}°F'
+    	descriptionText = '{{ device.displayName }} was {{ value }}°F'
 
 	return [
 		name: 'temperature',
@@ -311,7 +312,7 @@ private Map getMoistureResult(value) {
 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
 	def refreshCmds = [
-        "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
+		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
 		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
 	]
 
@@ -327,26 +328,26 @@ def configure() {
 
 		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 1 {${device.zigbeeId}} {}", "delay 500",
 		"zcl global send-me-a-report 1 0x20 0x20 30 21600 {01}",		//checkin time 6 hrs
-        "send 0x${device.deviceNetworkId} 1 1", "delay 500",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 500",
 
 		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0x402 {${device.zigbeeId}} {}", "delay 500",
-        "zcl global send-me-a-report 0x402 0 0x29 30 3600 {6400}",
+		"zcl global send-me-a-report 0x402 0 0x29 30 3600 {6400}",
-        "send 0x${device.deviceNetworkId} 1 1", "delay 500"
+		"send 0x${device.deviceNetworkId} 1 1", "delay 500"
 	]
-    return configCmds + refresh() // send refresh cmds as part of config
+	return configCmds + refresh() // send refresh cmds as part of config
 }
 
 def enrollResponse() {
 	log.debug "Sending enroll response"
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
-    [
+	[
 		//Resending the CIE in case the enroll request is sent before CIE is written
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 		//Enroll Response
 		"raw 0x500 {01 23 00 00 00}",
 		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
-    ]
+	]
 }
 
 private getEndpointId() {
@@ -358,19 +359,19 @@ private hex(value) {
 }
 
 private String swapEndianHex(String hex) {
-    reverseArray(hex.decodeHex()).encodeHex()
+	reverseArray(hex.decodeHex()).encodeHex()
 }
 
 private byte[] reverseArray(byte[] array) {
-    int i = 0;
+	int i = 0;
-    int j = array.length - 1;
+	int j = array.length - 1;
-    byte tmp;
+	byte tmp;
-    while (j > i) {
+	while (j > i) {
-        tmp = array[j];
+		tmp = array[j];
-        array[j] = array[i];
+		array[j] = array[i];
-        array[i] = tmp;
+		array[i] = tmp;
-        j--;
+		j--;
-        i++;
+		i++;
-    }
+	}
-    return array
+	return array
 }

devicetypes/smartthings/smartsense-motion-sensor.src/i18n/messages.properties

@@ -29,11 +29,12 @@
 '''Degrees'''.ko=온도
 '''Adjust temperature by this many degrees'''.ko=몇 도씩 온도를 조절하십시오
 '''Give your device a name'''.ko=기기 이름 바꾸기
+'''Motion Sensor'''.ko=모션 센서
 # Events descriptionText
 '''{{ device.displayName }} detected motion'''.ko={{ device.displayName }} 가 움직임을 감지하였습니다.
 '''{{ device.displayName }} motion has stopped'''.ko={{ device.displayName }}움직임이 중단되었습니다
 '''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가){{ value }}°C였습니다.
 '''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다
 '''{{ device.displayName }} battery has too much power: (> 3.5) volts.'''.ko={{ device.displayName }} 배터리 전력이 너무 높습니다(3.5볼트 초과).
-'''{{ device.displayName }} battery was {{ value }}'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}입니다.
+'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}%입니다.
 #==============================================================================

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

@@ -29,17 +29,18 @@ metadata {
 		capability "Motion Sensor"
 		capability "Configuration"
 		capability "Battery"
-        capability "Temperature Measurement"
+		capability "Temperature Measurement"
 		capability "Refresh"
 
-        command "enrollResponse"
+		command "enrollResponse"
 
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3305-S"
-        fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3325-S", deviceJoinName: "Motion Sensor"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3325-S", deviceJoinName: "Motion Sensor"
-        fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3305"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3305"
-        fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3325"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3325"
-        fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3326"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3326"
-        fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "motionv4", deviceJoinName: "Motion Sensor"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3326-L", deviceJoinName: "Iris Motion Sensor"
+		fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "motionv4", deviceJoinName: "Motion Sensor"
 	}
 
 	simulator {
@@ -106,55 +107,55 @@ def parse(String description) {
 	else if (description?.startsWith('temperature: ')) {
 		map = parseCustomMessage(description)
 	}
-    else if (description?.startsWith('zone status')) {
+	else if (description?.startsWith('zone status')) {
-	    map = parseIasMessage(description)
+		map = parseIasMessage(description)
-    }
+	}
 
 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : null
 
-    if (description?.startsWith('enroll request')) {
+	if (description?.startsWith('enroll request')) {
-    	List cmds = enrollResponse()
+		List cmds = enrollResponse()
-        log.debug "enroll response: ${cmds}"
+		log.debug "enroll response: ${cmds}"
-        result = cmds?.collect { new physicalgraph.device.HubAction(it) }
+		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
-    }
+	}
-    return result
+	return result
 }
 
 private Map parseCatchAllMessage(String description) {
-    Map resultMap = [:]
+	Map resultMap = [:]
-    def cluster = zigbee.parse(description)
+	def cluster = zigbee.parse(description)
-    if (shouldProcessMessage(cluster)) {
+	if (shouldProcessMessage(cluster)) {
-        switch(cluster.clusterId) {
+		switch(cluster.clusterId) {
-            case 0x0001:
+			case 0x0001:
-            	resultMap = getBatteryResult(cluster.data.last())
+				resultMap = getBatteryResult(cluster.data.last())
-                break
+				break
 
-            case 0x0402:
+			case 0x0402:
-                // temp is last 2 data values. reverse to swap endian
+				// temp is last 2 data values. reverse to swap endian
-                String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
+				String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
-                def value = getTemperature(temp)
+				def value = getTemperature(temp)
-                resultMap = getTemperatureResult(value)
+				resultMap = getTemperatureResult(value)
-                break
+				break
 
 			case 0x0406:
-            	log.debug 'motion'
+				log.debug 'motion'
-                resultMap.name = 'motion'
+				resultMap.name = 'motion'
-                break
+				break
-        }
+		}
-    }
+	}
 
-    return resultMap
+	return resultMap
 }
 
 private boolean shouldProcessMessage(cluster) {
-    // 0x0B is default response indicating message got through
+	// 0x0B is default response indicating message got through
-    // 0x07 is bind message
+	// 0x07 is bind message
-    boolean ignoredMessage = cluster.profileId != 0x0104 || 
+	boolean ignoredMessage = cluster.profileId != 0x0104 ||
-        cluster.command == 0x0B ||
+		cluster.command == 0x0B ||
-        cluster.command == 0x07 ||
+		cluster.command == 0x07 ||
-        (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
+		(cluster.data.size() > 0 && cluster.data.first() == 0x3e)
-    return !ignoredMessage
+	return !ignoredMessage
 }
 
 private Map parseReportAttributeMessage(String description) {
@@ -172,10 +173,10 @@ private Map parseReportAttributeMessage(String description) {
 	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
 		resultMap = getBatteryResult(Integer.parseInt(descMap.value, 16))
 	}
-    else if (descMap.cluster == "0406" && descMap.attrId == "0000") {
+	else if (descMap.cluster == "0406" && descMap.attrId == "0000") {
-    	def value = descMap.value.endsWith("01") ? "active" : "inactive"
+		def value = descMap.value.endsWith("01") ? "active" : "inactive"
-    	resultMap = getMotionResult(value)
+		resultMap = getMotionResult(value)
-    } 
+	}
 
 	return resultMap
 }
@@ -190,44 +191,44 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-    List parsedMsg = description.split(' ')
+	List parsedMsg = description.split(' ')
-    String msgCode = parsedMsg[2]
+	String msgCode = parsedMsg[2]
 
-    Map resultMap = [:]
+	Map resultMap = [:]
-    switch(msgCode) {
+	switch(msgCode) {
-        case '0x0020': // Closed/No Motion/Dry
+		case '0x0020': // Closed/No Motion/Dry
-        	resultMap = getMotionResult('inactive')
+			resultMap = getMotionResult('inactive')
-            break
+			break
 
-        case '0x0021': // Open/Motion/Wet
+		case '0x0021': // Open/Motion/Wet
-        	resultMap = getMotionResult('active')
+			resultMap = getMotionResult('active')
-            break
+			break
 
-        case '0x0022': // Tamper Alarm
+		case '0x0022': // Tamper Alarm
-        	log.debug 'motion with tamper alarm'
+			log.debug 'motion with tamper alarm'
-        	resultMap = getMotionResult('active')
+			resultMap = getMotionResult('active')
-            break
+			break
 
-        case '0x0023': // Battery Alarm
+		case '0x0023': // Battery Alarm
-            break
+			break
 
-        case '0x0024': // Supervision Report
+		case '0x0024': // Supervision Report
-        	log.debug 'no motion with tamper alarm'
+			log.debug 'no motion with tamper alarm'
-        	resultMap = getMotionResult('inactive')
+			resultMap = getMotionResult('inactive')
-            break
+			break
 
-        case '0x0025': // Restore Report
+		case '0x0025': // Restore Report
-            break
+			break
 
-        case '0x0026': // Trouble/Failure
+		case '0x0026': // Trouble/Failure
-        	log.debug 'motion with failure alarm'
+			log.debug 'motion with failure alarm'
-        	resultMap = getMotionResult('active')
+			resultMap = getMotionResult('active')
-            break
+			break
 
-        case '0x0028': // Test Mode
+		case '0x0028': // Test Mode
-            break
+			break
-    }
+	}
-    return resultMap
+	return resultMap
 }
 
 def getTemperature(value) {
@@ -272,7 +273,7 @@ private Map getBatteryResult(rawValue) {
 				if (pct != null) {
 					result.value = pct
                     def value = pct
-					result.descriptionText = "{{ device.displayName }} battery was {{ value }}"
+					result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 				}
 			}
 			else {
@@ -280,7 +281,7 @@ private Map getBatteryResult(rawValue) {
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				result.value = Math.min(100, (int) pct * 100)
-				result.descriptionText = "{{ device.displayName }} battery was {{ value }}"
+				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}
 		}
 	}
@@ -312,7 +313,6 @@ private Map getTemperatureResult(value) {
 private Map getMotionResult(value) {
 	log.debug 'motion'
 	String descriptionText = value == 'active' ? "{{ device.displayName }} detected motion" : "{{ device.displayName }} motion has stopped"
-    //String descriptionText = '{{ device.displayName }} is {{ value | translate }}'
 	return [
 		name: 'motion',
 		value: value,
@@ -322,7 +322,7 @@ private Map getMotionResult(value) {
 }
 
 def refresh() {
-	log.debug "refresh executed"
+	log.debug "refresh called"
 	def refreshCmds = [
 		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
 		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
@@ -372,19 +372,19 @@ private hex(value) {
 }
 
 private String swapEndianHex(String hex) {
-    reverseArray(hex.decodeHex()).encodeHex()
+	reverseArray(hex.decodeHex()).encodeHex()
 }
 
 private byte[] reverseArray(byte[] array) {
-    int i = 0;
+	int i = 0;
-    int j = array.length - 1;
+	int j = array.length - 1;
-    byte tmp;
+	byte tmp;
-    while (j > i) {
+	while (j > i) {
-        tmp = array[j];
+		tmp = array[j];
-        array[j] = array[i];
+		array[j] = array[i];
-        array[i] = tmp;
+		array[i] = tmp;
-        j--;
+		j--;
-        i++;
+		i++;
-    }
+	}
-    return array
+	return array
 }

devicetypes/smartthings/smartsense-multi-sensor.src/i18n/messages.properties

@@ -32,6 +32,7 @@
 '''Do you want to use this sensor on a garage door?'''.ko=차고 문의 센서 사용 설정하기
 '''Tap to set'''.ko=눌러서 설정
 '''Give your device a name'''.ko=기기 이름 바꾸기
+'''Multipurpose Sensor'''.ko=멀티 센서
 # Events descriptionText
 '''{{ device.displayName }} was opened'''.ko={{ device.displayName }}열림을 감지하였습니다.
 '''{{ device.displayName }} was closed'''.ko={{ device.displayName }}닫혔습니다.
@@ -39,8 +40,6 @@
 '''{{ device.displayName }} was inactive'''.ko={{ device.displayName }}비활성화되었습니다.
 '''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가){{ value }}°C였습니다.
 '''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다
-'''{{ device.displayName }} battery was {{ value }}'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}입니다.
+'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}%입니다.
 '''Updating device to garage sensor'''.ko=기기-차고 센서 업데이트 중
 '''Updating device to open/close sensor'''.ko=기기-열림/닫힘 센서 업데이트 중
-'''{{ device.displayName }} status was closed'''.ko={{ device.displayName }}은(는) 닫힌 상태입니다
-'''{{ device.displayName }} status was opened'''.ko={{ device.displayName }}은(는) 열린 상태입니다

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

@@ -24,12 +24,13 @@
 ===============================================================================
  */
 
- metadata {
+metadata {
- 	definition (name: "SmartSense Multi Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "SmartSense Multi Sensor", namespace: "smartthings", author: "SmartThings") {
-        capability "Three Axis"
+
+		capability "Three Axis"
 		capability "Battery"
- 		capability "Configuration"
+		capability "Configuration"
-        capability "Sensor"
+		capability "Sensor"
  		capability "Contact Sensor"
  		capability "Acceleration Sensor"
  		capability "Refresh"
@@ -38,13 +39,13 @@
  		command "enrollResponse"
  		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05,FC02", outClusters: "0019", manufacturer: "CentraLite", model: "3320"
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05,FC02", outClusters: "0019", manufacturer: "CentraLite", model: "3321"
-        fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05,FC02", outClusters: "0019", manufacturer: "CentraLite", model: "3321-S", deviceJoinName: "Multipurpose Sensor"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05,FC02", outClusters: "0019", manufacturer: "CentraLite", model: "3321-S", deviceJoinName: "Multipurpose Sensor"
-        fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500,FC02", outClusters: "0019", manufacturer: "SmartThings", model: "multiv4", deviceJoinName: "Multipurpose Sensor"
+		fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500,FC02", outClusters: "0019", manufacturer: "SmartThings", model: "multiv4", deviceJoinName: "Multipurpose Sensor"
 
 		attribute "status", "string"
- 	}
+	}
 
- 	simulator {
+	simulator {
 		status "open": "zone report :: type: 19 value: 0031"
 		status "closed": "zone report :: type: 19 value: 0030"
 
@@ -61,7 +62,7 @@
 		status "x,y,z: 0,1000,0": "x: 0, y: 1000, z: 0"
 		status "x,y,z: 0,0,1000": "x: 0, y: 0, z: 1000"
 	}
- 	preferences {
+	preferences {
 		section {
 			image(name: 'educationalcontent', multiple: true, images: [
 				"http://cdn.device-gse.smartthings.com/Multi/Multi1.jpg",
@@ -75,9 +76,9 @@
 			input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 		}
 		section {
- 			input("garageSensor", "enum", title: "Do you want to use this sensor on a garage door?", translatable: true, description: "Tap to set", options: ["Yes","No"], defaultValue: "No", required: false, displayDuringSetup: false)
+			input("garageSensor", "enum", title: "Do you want to use this sensor on a garage door?", description: "Tap to set", options: ["Yes", "No"], defaultValue: "No", required: false, displayDuringSetup: false)
 		}
- 	}
+	}
 
 	tiles(scale: 2) {
 		multiAttributeTile(name:"status", type: "generic", width: 6, height: 4){
@@ -109,19 +110,16 @@
 				]
 			)
 		}
-		valueTile("3axis", "device.threeAxis", decoration: "flat", wordWrap: false, width: 2, height: 2) {
-			state("threeAxis", label:'${currentValue}', unit:"", backgroundColor:"#ffffff")
-		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
 			state "battery", label:'${currentValue}% battery', unit:""
 		}
- 		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
- 			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
+			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
- 		}
+		}
 
 
 		main(["status", "acceleration", "temperature"])
-		details(["status", "acceleration", "temperature", "3axis", "battery", "refresh"])
+		details(["status", "acceleration", "temperature", "battery", "refresh"])
 	}
  }
 
@@ -130,61 +128,61 @@ def parse(String description) {
 	if (description?.startsWith('catchall:')) {
 		map = parseCatchAllMessage(description)
 	}
-    else if (description?.startsWith('temperature: ')) {
+	else if (description?.startsWith('temperature: ')) {
 		map = parseCustomMessage(description)
 	}
 	else if (description?.startsWith('zone status')) {
 		map = parseIasMessage(description)
 	}
 
- 	def result = map ? createEvent(map) : null
+	def result = map ? createEvent(map) : null
 
 	if (description?.startsWith('enroll request')) {
 		List cmds = enrollResponse()
 		log.debug "enroll response: ${cmds}"
 		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
 	}
-    else if (description?.startsWith('read attr -')) {
+	else if (description?.startsWith('read attr -')) {
-        result = parseReportAttributeMessage(description).each { createEvent(it) }
+		result = parseReportAttributeMessage(description).each { createEvent(it) }
-    }
+	}
 	return result
 }
 
- private Map parseCatchAllMessage(String description) {
+private Map parseCatchAllMessage(String description) {
- 	Map resultMap = [:]
+	Map resultMap = [:]
- 	def cluster = zigbee.parse(description)
+	def cluster = zigbee.parse(description)
-    log.debug cluster
+	log.debug cluster
- 	if (shouldProcessMessage(cluster)) {
+	if (shouldProcessMessage(cluster)) {
- 		switch(cluster.clusterId) {
+		switch(cluster.clusterId) {
- 			case 0x0001:
+			case 0x0001:
- 			resultMap = getBatteryResult(cluster.data.last())
+			resultMap = getBatteryResult(cluster.data.last())
- 			break
+			break
 
- 			case 0xFC02:
+			case 0xFC02:
-            log.debug 'ACCELERATION'
+			log.debug 'ACCELERATION'
- 			break
+			break
 
- 			case 0x0402:
+			case 0x0402:
- 			log.debug 'TEMP'
+			log.debug 'TEMP'
-                // temp is last 2 data values. reverse to swap endian
+				// temp is last 2 data values. reverse to swap endian
-                String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
+				String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
-                def value = getTemperature(temp)
+				def value = getTemperature(temp)
-                resultMap = getTemperatureResult(value)
+				resultMap = getTemperatureResult(value)
-                break
+				break
-            }
+		}
-        }
+	}
 
-        return resultMap
+	return resultMap
-    }
+}
 
 private boolean shouldProcessMessage(cluster) {
-    // 0x0B is default response indicating message got through
+	// 0x0B is default response indicating message got through
-    // 0x07 is bind message
+	// 0x07 is bind message
-    boolean ignoredMessage = cluster.profileId != 0x0104 ||
+	boolean ignoredMessage = cluster.profileId != 0x0104 ||
-    cluster.command == 0x0B ||
+	cluster.command == 0x0B ||
-    cluster.command == 0x07 ||
+	cluster.command == 0x07 ||
-    (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
+	(cluster.data.size() > 0 && cluster.data.first() == 0x3e)
-    return !ignoredMessage
+	return !ignoredMessage
 }
 
 private List parseReportAttributeMessage(String description) {
@@ -211,10 +209,12 @@ private List parseReportAttributeMessage(String description) {
 			result << parseAxis(threeAxisAttributes)
 			descMap.value = descMap.value[-2..-1]
 		}
-        result << getAccelerationResult(descMap.value)
+		result << getAccelerationResult(descMap.value)
 	}
 	else if (descMap.cluster == "FC02" && descMap.attrId == "0012" && descMap.value.size() == 24) {
-        result << parseAxis(descMap.value)
+		// The size is checked to ensure the attribute report contains X, Y and Z values
+		// If all three axis are not included then the attribute report is ignored
+		result << parseAxis(descMap.value)
 	}
 	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
 		result << getBatteryResult(Integer.parseInt(descMap.value, 16))
@@ -238,43 +238,43 @@ private Map parseIasMessage(String description) {
 
 	Map resultMap = [:]
 	switch(msgCode) {
-        case '0x0020': // Closed/No Motion/Dry
+		case '0x0020': // Closed/No Motion/Dry
 			if (garageSensor != "Yes"){
 				resultMap = getContactResult('closed')
 			}
-        break
+		break
 
-        case '0x0021': // Open/Motion/Wet
+		case '0x0021': // Open/Motion/Wet
 			if (garageSensor != "Yes"){
 				resultMap = getContactResult('open')
 			}
-        break
+		break
 
-        case '0x0022': // Tamper Alarm
+		case '0x0022': // Tamper Alarm
-        break
+		break
 
-        case '0x0023': // Battery Alarm
+		case '0x0023': // Battery Alarm
-        break
+		break
 
-        case '0x0024': // Supervision Report
+		case '0x0024': // Supervision Report
 			if (garageSensor != "Yes"){
 				resultMap = getContactResult('closed')
 			}
-        break
+		break
 
-        case '0x0025': // Restore Report
+		case '0x0025': // Restore Report
 			if (garageSensor != "Yes"){
 				resultMap = getContactResult('open')
 			}
-        break
+		break
 
-        case '0x0026': // Trouble/Failure
+		case '0x0026': // Trouble/Failure
-        break
+		break
 
-        case '0x0028': // Test Mode
+		case '0x0028': // Test Mode
-        break
+		break
-    }
+	}
-    return resultMap
+	return resultMap
 }
 
 def updated() {
@@ -311,7 +311,6 @@ def getTemperature(value) {
 
 private Map getBatteryResult(rawValue) {
 	log.debug "Battery rawValue = ${rawValue}"
-	def linkText = getLinkText(device)
 
 	def result = [
 		name: 'battery',
@@ -341,8 +340,7 @@ private Map getBatteryResult(rawValue) {
 				def pct = batteryMap[volts]
 				if (pct != null) {
 					result.value = pct
-                    def value = pct
+					result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
-					result.descriptionText = "{{ device.displayName }} battery was {{ value }}"
 				}
 			}
 			else {
@@ -350,7 +348,7 @@ private Map getBatteryResult(rawValue) {
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				result.value = Math.min(100, (int) pct * 100)
-				result.descriptionText = "{{ device.displayName }} battery was {{ value }}"
+				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}
 		}
 	}
@@ -359,52 +357,32 @@ private Map getBatteryResult(rawValue) {
 }
 
 private Map getTemperatureResult(value) {
-	log.debug 'TEMP'
+	log.debug "Temperature"
-    def name = "temperature"
 	if (tempOffset) {
 		def offset = tempOffset as int
 		def v = value as int
 		value = v + offset
 	}
-    
+	def descriptionText = temperatureScale == 'C' ? '{{ device.displayName }} was {{ value }}°C':
-    def descriptionText
+			'{{ device.displayName }} was {{ value }}°F'
-    if ( temperatureScale == 'C' )
-    	descriptionText = '{{ device.displayName }} was {{ value }}°C'
-    else
-    	descriptionText = '{{ device.displayName }} was {{ value }}°F'
 
 	return [
-		name: name,
+	name: 'temperature',
-		value: value,
+	value: value,
-		descriptionText: descriptionText,
+	descriptionText: descriptionText,
-        translatable: true
+    translatable: true
 	]
 }
 
 private Map getContactResult(value) {
 	log.debug "Contact: ${device.displayName} value = ${value}"
-    def name = "contact"
+	def descriptionText = value == 'open' ? '{{ device.displayName }} was opened' : '{{ device.displayName }} was closed'
-    
+	sendEvent(name: 'contact', value: value, descriptionText: descriptionText, displayed: false, translatable: true)
-    def descriptionText    
+	sendEvent(name: 'status', value: value, descriptionText: descriptionText, translatable: true)
-    if ( value == 'open' )    
-		descriptionText = '{{ device.displayName }} was opened'
-    else
-    	descriptionText = '{{ device.displayName }} was closed'
-        
-    sendEvent(name: 'status', value: value, descriptionText: descriptionText, displayed: false)
-    def isStateChange = isStateChange(device, name, value)
-	return [
-		name: name,
-		value: value,
-		descriptionText: descriptionText,
-        isStateChange: isStateChange,
-        translatable: true
-	]
-	
 }
 
 private getAccelerationResult(numValue) {
-	log.debug "Acceleration is $value"
+	log.debug "Acceleration"
 	def name = "acceleration"
     def value
     def descriptionText
@@ -473,37 +451,38 @@ def refresh() {
 
 def configure() {
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
-	log.debug "Configuring Device Reporting"
+	log.debug "Configuring Reporting"
 
 	def configCmds = [
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
 		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 1 {${device.zigbeeId}} {}", "delay 200",
-		"zcl global send-me-a-report 1 0x20 0x20 30 21600 {01}",		//checkin time 6 hrs
+		"zcl global send-me-a-report 1 0x20 0x20 30 21600 {01}", "delay 200",		//checkin time 6 hrs
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
 		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0x402 {${device.zigbeeId}} {}", "delay 200",
-		"zcl global send-me-a-report 0x402 0 0x29 30 3600 {6400}",
+		"zcl global send-me-a-report 0x402 0 0x29 30 3600 {6400}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
 		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0xFC02 {${device.zigbeeId}} {}", "delay 200",
-		"zcl mfg-code ${manufacturerCode}",
+		"zcl mfg-code ${manufacturerCode}", "delay 200",
-		"zcl global send-me-a-report 0xFC02 0x0010 0x18 10 3600 {01}",
+		"zcl global send-me-a-report 0xFC02 0x0010 0x18 10 3600 {01}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
-		"zcl mfg-code ${manufacturerCode}",
+		"zcl mfg-code ${manufacturerCode}", "delay 200",
-		"zcl global send-me-a-report 0xFC02 0x0012 0x29 1 3600 {01}",
+		"zcl global send-me-a-report 0xFC02 0x0012 0x29 1 3600 {0100}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
-		"zcl mfg-code ${manufacturerCode}",
+		"zcl mfg-code ${manufacturerCode}", "delay 200",
-		"zcl global send-me-a-report 0xFC02 0x0013 0x29 1 3600 {01}",
+		"zcl global send-me-a-report 0xFC02 0x0013 0x29 1 3600 {0100}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
-		"zcl mfg-code ${manufacturerCode}",
+		"zcl mfg-code ${manufacturerCode}", "delay 200",
-		"zcl global send-me-a-report 0xFC02 0x0014 0x29 1 3600 {01}",
+		"zcl global send-me-a-report 0xFC02 0x0014 0x29 1 3600 {0100}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
-	]
+		]
+
 	return configCmds + refresh()
 }
 
@@ -519,17 +498,12 @@ def enrollResponse() {
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 		//Enroll Response
-		"raw 0x500 {01 23 00 00 00}",
+		"raw 0x500 {01 23 00 00 00}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
 	]
 }
 
 private Map parseAxis(String description) {
-	def hexToSignedInt = { hexVal ->
-		def unsignedVal = hexToInt(hexVal)
-		unsignedVal > 32767 ? unsignedVal - 65536 : unsignedVal
-	}
-
 	def z = hexToSignedInt(description[0..3])
 	def y = hexToSignedInt(description[10..13])
 	def x = hexToSignedInt(description[20..23])
@@ -556,6 +530,11 @@ private Map parseAxis(String description) {
 	getXyzResult(xyzResults, description)
 }
 
+private hexToSignedInt(hexVal) {
+	def unsignedVal = hexToInt(hexVal)
+	unsignedVal > 32767 ? unsignedVal - 65536 : unsignedVal
+}
+
 def garageEvent(zValue) {
 	def absValue = zValue.abs()
 	def contactValue = null
@@ -569,15 +548,9 @@ def garageEvent(zValue) {
 		garageValue = 'garage-open'
 	}
 	if (contactValue != null){
-		def linkText = getLinkText(device)
+		def descriptionText = contactValue == 'open' ? '{{ device.displayName }} was opened' :'{{ device.displayName }} was closed'
-        if ( contactValue == 'open' ) {
+		sendEvent(name: 'contact', value: contactValue, descriptionText: descriptionText, displayed:false, translatable: true)
-        	descriptionText: '{{ device.displayName }} was opened'
+		sendEvent(name: 'status', value: garageValue, descriptionText: descriptionText, translatable: true)
-            sendEvent(name: 'contact', value: contactValue, descriptionText: '{{ device.displayName }} was opened', displayed:false, translatable: true)
-            sendEvent(name: 'status', value: garageValue, descriptionText: '{{ device.displayName }} status was opened', translatable: true)
-        } else {
-			sendEvent(name: 'contact', value: contactValue, descriptionText: '{{ device.displayName }} was closed', displayed:false, translatable: true)
-            sendEvent(name: 'status', value: garageValue, descriptionText: '{{ device.displayName }} status was closed', translatable: true)
-        }
 	}
 }
 

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

@@ -203,7 +203,7 @@ private List parseContactMessage(String description) {
 	parts.each { part ->
 		part = part.trim()
 		if (part.startsWith('contactState:')) {
-			results << getContactResult(part, description)
+			results.addAll(getContactResult(part, description))
 		}
 		else if (part.startsWith('accelerationState:')) {
 			results << getAccelerationResult(part, description)
@@ -316,7 +316,7 @@ private List getContactResult(part, description) {
 	results
 }
 
-private getAccelerationResult(part, description) {
+private Map getAccelerationResult(part, description) {
 	def name = "acceleration"
 	def value = part.endsWith("1") ? "active" : "inactive"
 	def linkText = getLinkText(device)
@@ -335,7 +335,7 @@ private getAccelerationResult(part, description) {
 	]
 }
 
-private getTempResult(part, description) {
+private Map getTempResult(part, description) {
 	def name = "temperature"
 	def temperatureScale = getTemperatureScale()
 	def value = zigbee.parseSmartThingsTemperatureValue(part, "temp: ", temperatureScale)
@@ -360,7 +360,7 @@ private getTempResult(part, description) {
 	]
 }
 
-private getXyzResult(results, description) {
+private Map getXyzResult(results, description) {
 	def name = "threeAxis"
 	def value = "${results.x},${results.y},${results.z}"
 	def linkText = getLinkText(device)
@@ -379,7 +379,7 @@ private getXyzResult(results, description) {
 	]
 }
 
-private getBatteryResult(part, description) {
+private Map getBatteryResult(part, description) {
 	def batteryDivisor = description.split(",").find {it.split(":")[0].trim() == "batteryDivisor"} ? description.split(",").find {it.split(":")[0].trim() == "batteryDivisor"}.split(":")[1].trim() : null
 	def name = "battery"
 	def value = zigbee.parseSmartThingsBatteryValue(part, batteryDivisor)
@@ -400,7 +400,7 @@ private getBatteryResult(part, description) {
 	]
 }
 
-private getRssiResult(part, description, lastHop=false) {
+private Map getRssiResult(part, description, lastHop=false) {
 	def name = lastHop ? "lastHopRssi" : "rssi"
 	def valueString = part.split(":")[1].trim()
 	def value = (Integer.parseInt(valueString) - 128).toString()
@@ -431,7 +431,7 @@ private getRssiResult(part, description, lastHop=false) {
  * Note: To make the signal strength indicator more accurate, we could combine
  * LQI with RSSI.
  */
-private getLqiResult(part, description, lastHop=false) {
+private Map getLqiResult(part, description, lastHop=false) {
 	def name = lastHop ? "lastHopLqi" : "lqi"
 	def valueString = part.split(":")[1].trim()
 	def percentageOf = 255

smartapps/com-vinli-smartthings/vinli-home-connect.src/vinli-home-connect.groovy

@@ -67,11 +67,11 @@ mappings {
 def listAllDevices() {
    	def resp = []
    	switches.each {
-      resp << [name: it.name, label: it.label, value: it.currentValue("switch"), type: "switch", id: it.id, hub: it.hub.name]
+      resp << [name: it.name, label: it.label, value: it.currentValue("switch"), type: "switch", id: it.id, hub: it.hub?.name]
     }
     
     locks.each {
-      resp << [name: it.name, label: it.label, value: it.currentValue("lock"), type: "lock", id: it.id, hub: it.hub.name]
+      resp << [name: it.name, label: it.label, value: it.currentValue("lock"), type: "lock", id: it.id, hub: it.hub?.name]
     }
     return resp
 }

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

@@ -469,7 +469,6 @@ def pollChild(){
 
 	if (pollChildren()){
 		devices.each { child ->
-			log.info "***found $child"
 			if (!child.device.deviceNetworkId.startsWith("ecobee_sensor")){
 				if(atomicState.thermostats[child.device.deviceNetworkId] != null) {
 					def tData = atomicState.thermostats[child.device.deviceNetworkId]

smartapps/smartthings/speaker-notify-with-sound.src/speaker-notify-with-sound.groovy

@@ -76,7 +76,7 @@ def mainPage() {
 		}
 		section{
 			input "actionType", "enum", title: "Action?", required: true, defaultValue: "Bell 1", options: [
-				//"Custom Message",
+				"Custom Message",
 				"Bell 1",
 				"Bell 2",
 				"Dogs Barking",
@@ -89,7 +89,7 @@ def mainPage() {
 				"Someone is arriving",
 				"Piano",
 				"Lightsaber"]
-			//input "message","text",title:"Play this message", required:false, multiple: false
+			input "message","text",title:"Play this message", required:false, multiple: false
 		}
 		section {
 			input "sonos", "capability.musicPlayer", title: "On this Speaker player", required: true
@@ -408,13 +408,15 @@ private loadText() {
 		case "Lightsaber":
 			state.sound = [uri: "http://s3.amazonaws.com/smartapp-media/sonos/lightsaber.mp3", duration: "10"]
 			break;
-		default:
+		case "Custom Message":
-			/*if (message) {
+			if (message) {
 				state.sound = textToSpeech(message instanceof List ? message[0] : message) // not sure why this is (sometimes) needed)
 			}
 			else {
 				state.sound = textToSpeech("You selected the custom message option but did not enter a message in the $app.label Smart App")
-			}*/
+			}
+			break;
+		default:
 			state.sound = [uri: "http://s3.amazonaws.com/smartapp-media/sonos/bell1.mp3", duration: "10"]
 			break;
 	}

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

@@ -234,7 +234,7 @@ def addSwitches() {
 		def d
 		if (selectedSwitch) {
 			d = getChildDevices()?.find {
-				it.dni == selectedSwitch.value.mac || it.device.getDataValue("mac") == selectedSwitch.value.mac
+				it.deviceNetworkId == selectedSwitch.value.mac || it.device.getDataValue("mac") == selectedSwitch.value.mac
 			}
 		}
 
@@ -265,7 +265,7 @@ def addMotions() {
 		def d
 		if (selectedMotion) {
 			d = getChildDevices()?.find {
-				it.dni == selectedMotion.value.mac || it.device.getDataValue("mac") == selectedMotion.value.mac
+				it.deviceNetworkId == selectedMotion.value.mac || it.device.getDataValue("mac") == selectedMotion.value.mac
 			}
 		}
 
@@ -296,7 +296,7 @@ def addLightSwitches() {
 		def d
 		if (selectedLightSwitch) {
 			d = getChildDevices()?.find {
-				it.dni == selectedLightSwitch.value.mac || it.device.getDataValue("mac") == selectedLightSwitch.value.mac
+				it.deviceNetworkId == selectedLightSwitch.value.mac || it.device.getDataValue("mac") == selectedLightSwitch.value.mac
 			}
 		}