MSA-925: Device Type has Buttons to test each of the 5 sounds as well as the usual capability alarm functions. The default sound for the siren can be changed via the device parameters (Defaults to the Emergency Sound)

This Siren is a re-branded Phileo PH-PSE02-EU siren. the device handler works with both devices. Phileo Support provided the correct method for sounding the different sounds.

devicetypes/fuzzysb/zipato-ph-pse02-eu.src/zipato-ph-pse02-eu.groovy

@@ -0,0 +1,262 @@
+/**
+ *  Copyright 2015 Stuart Buchanan
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ *	Zipato/Phileo PH-PSE02-EU Siren
+ *
+ *	Author: fuzzysb
+ *	Date: 2015-01-05
+ */
+ preferences {
+ input "defaultSound", "enum", title: "Default Sound to use for the Siren?", options: ["Emergency","FireAlarm","Ambulance","PoliceCar","DoorChime"], required: false, defaultValue: "Emergency"
+}
+ 
+ 
+metadata {
+ definition (name: "Zipato PH-PSE02-EU", namespace: "fuzzysb", author: "Stuart Buchanan") {
+	capability "Actuator"
+	capability "Alarm"
+	capability "Switch"
+	capability "Configuration"
+
+	command "Emergency"
+	command "FireAlarm"
+	command "Ambulance"
+	command "PoliceCar"
+	command "DoorChime"
+    
+	fingerprint deviceId: "0x1005", inClusters: "0x5E,0x71,0x20,0x25,0x85,0x70,0x72,0x86,0x30,0x59,0x73,0x5A,0x98,0x7A"
+ }
+
+simulator {
+
+}
+
+ tiles(scale: 2) {
+	multiAttributeTile(name:"alarm", type: "generic", width: 6, height: 4){
+		tileAttribute ("device.alarm", key: "PRIMARY_CONTROL") {
+			attributeState "off", label:'off', action:'alarm.siren', icon:"st.alarm.alarm.alarm", backgroundColor:"#ffffff"
+			attributeState "both", label:'alarm!', action:'alarm.off', icon:"st.alarm.alarm.alarm", backgroundColor:"#e86d13"
+		}
+	}
+	standardTile("Emergency", "device.button", inactiveLabel: false, decoration: "flat", width: 1, height: 1) {
+		state "default", label:'Emergency', action:"Emergency", icon:"st.Weather.weather1"
+	}
+	standardTile("FireAlarm", "device.button", inactiveLabel: false, decoration: "flat", width: 1, height: 1) {
+		state "default", label:'Fire Alarm', action:"FireAlarm", icon:"st.Outdoor.outdoor10"
+	}
+	standardTile("Ambulance", "device.button", inactiveLabel: false, decoration: "flat", width: 1, height: 1) {
+		state "default", label:'Ambulance', action:"Ambulance", icon:"st.Transportation.transportation2"
+	}
+	standardTile("PoliceCar", "device.button", inactiveLabel: false, decoration: "flat", width: 1, height: 1) {
+		state "default", label:'Police Car', action:"PoliceCar", icon:"st.Transportation.transportation8"
+	}
+	standardTile("DoorChime", "device.button", inactiveLabel: false, decoration: "flat", width: 1, height: 1) {
+		state "default", label:'Door Chime', action:"DoorChime", icon:"st.Home.home30"
+	}
+	standardTile("off", "device.button", inactiveLabel: false, decoration: "flat", width: 1, height: 1) {
+		state "default", label:'', action:"alarm.off", icon:"st.secondary.off"
+	}
+	main "alarm"
+	details(["alarm", "Emergency", "FireAlarm", "Ambulance", "PoliceCar", "DoorChime", "off"])
+ }
+}
+
+def parse(String description)
+{
+	def result = null
+	if (description.startsWith("Err 106")) {
+		state.sec = 0
+		result = createEvent( name: "secureInclusion", value: "failed", isStateChange: true,
+			descriptionText: "This sensor failed to complete the network security key exchange. If you are unable to control it via SmartThings, you must remove it from your network and add it again.")
+	} else if (description != "updated") {
+		def cmd = zwave.parse(description, [0x20: 1, 0x25: 1, 0x26: 1, 0x70: 1, 0x80: 1])
+		if (cmd) {
+			result = zwaveEvent(cmd)
+            log.debug "Parse returned ${result?.inspect()}"
+            		} else {
+			log.debug("Couldn't zwave.parse '$description'")
+			null
+		}
+		
+	}
+	log.debug "Parsed '${description}' to ${result.inspect()}"
+	return result
+}
+
+
+
+def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulation cmd) {
+	def encapsulatedCommand = cmd.encapsulatedCommand([0x20: 1, 0x25: 3, 0x26: 3, 0x70: 1, 0x80: 1])
+	state.sec = 1
+	log.debug "encapsulated: ${encapsulatedCommand}"
+	if (encapsulatedCommand) {
+		zwaveEvent(encapsulatedCommand)
+	} else {
+		log.warn "Unable to extract encapsulated cmd from $cmd"
+		createEvent(descriptionText: cmd.toString())
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityCommandsSupportedReport cmd) {
+	response(configure())
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.configurationv1.ConfigurationReport cmd) {
+    log.debug "---CONFIGURATION REPORT V2--- ${device.displayName} parameter ${cmd.parameterNumber} with a byte size of ${cmd.size} is set to ${cmd.configurationValue}"
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.switchbinaryv1.SwitchBinaryReport cmd)
+{
+	[name: "switch", value: cmd.value ? "on" : "off", type: "digital", displayed: true, isStateChange: true]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
+	log.debug "rx $cmd"
+	[
+		createEvent([name: "switch", value: cmd.value ? "on" : "off", displayed: false]),
+		createEvent([name: "alarm", value: cmd.value ? "both" : "off"])
+	]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.sensorbinaryv2.SensorBinaryReport cmd) {
+	createEvent(name:"Alarm", cmd.sensorValue ? "on" : "off")
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cmd) {
+if (cmd.notificationType == 6 && cmd.event == 22) {
+		log.debug "Playing Door Chime"
+	} else if (cmd.notificationType == 10 && cmd.event == 1) {
+		log.debug "Playing Police Car"
+	} else if (cmd.notificationType == 10 && cmd.event == 3) {
+    	log.debug "Playing Ambulance"
+    } else if (cmd.notificationType == 10 && cmd.event == 2) {
+    	log.debug "Playing Fire Alarm"
+    } else if (cmd.notificationType == 7 && cmd.event == 1) {
+    	log.debug "Playing Emergency"
+    }
+}
+
+def zwaveEvent(physicalgraph.zwave.Command cmd) {
+	log.debug "Unhandled: $cmd"
+    createEvent(descriptionText: cmd.toString(), isStateChange: false)
+}
+
+def strobe() {
+	on()
+}
+
+def siren() {
+	on()
+}
+
+def both() {
+	on()
+}
+
+
+def on() {
+	log.debug("Sounding Siren")
+	switch ( settings.defaultSound ) {
+		case "Emergency":
+		Emergency()
+		break
+		
+		case "FireAlarm":
+		FireAlarm()
+		break
+		
+		case "Ambulance":
+		Ambulance()
+		break
+		
+		case "PoliceCar":
+		PoliceCar()
+		break
+		
+		case "DoorChime":
+		DoorChime()
+		break
+		
+		default:
+		Emergency()
+		break
+	}
+}
+
+def off() {
+	log.debug "sending off"
+	[
+		secure(zwave.basicV1.basicSet(value: 0x00)),
+		secure(zwave.basicV1.basicGet())
+	]
+}
+
+def Emergency() {
+	log.debug "Sounding Siren With Emergency"
+	[
+		secure(zwave.notificationV3.notificationReport(event: 0x01, notificationType: 0x07)),
+		secure(zwave.basicV1.basicGet())
+	]
+}
+
+def FireAlarm() {
+	log.debug "Sounding Siren With Fire Alarm"
+	[
+		secure(zwave.notificationV3.notificationReport(event: 0x02, notificationType: 0x0A)),
+        secure(zwave.basicV1.basicGet())
+	]
+}
+
+def Ambulance() {
+	log.debug "Sounding Siren With Ambulance"
+	[
+		secure(zwave.notificationV3.notificationReport(event: 0x03, notificationType: 0x0A)),
+        secure(zwave.basicV1.basicGet())
+	]
+}
+
+def PoliceCar() {
+	log.debug "Sounding Siren With Police Car"
+	[
+		secure(zwave.notificationV3.notificationReport(event: 0x01, notificationType: 0x0A)),
+        secure(zwave.basicV1.basicGet())
+	]
+}
+
+def DoorChime() {
+	log.debug "Sounding Siren With Door Chime"
+	[
+		secure(zwave.notificationV3.notificationReport(event: 0x16, notificationType: 0x06)),
+        secure(zwave.basicV1.basicGet())
+	]
+}
+
+def configure() {
+	log.debug "Resetting Siren Parameters to SmartThings Compatible Defaults"
+	def cmds = []
+    
+	cmds << zwave.configurationV1.configurationSet(configurationValue: [0], parameterNumber: 4, size: 1)
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [0], parameterNumber: 29, size: 1)
+    cmds << zwave.configurationV1.configurationSet(configurationValue: [6], parameterNumber: 31, size: 1)
+    
+    delayBetween(cmds, 500)
+}
+
+private secure(physicalgraph.zwave.Command cmd) {
+	if (state.sec) {
+         log.debug "Sending Secure Command $cmd"
+		zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
+	} else {
+    	log.debug "Sending Insecure Command $cmd"
+		cmd.format()
+	}
+}

devicetypes/mitchpond/iris-care-pendant.src/iris-care-pendant.groovy

@@ -1,225 +0,0 @@
-/**
- *  Iris Care Pendant
- *	
- *  Copyright 2015 Mitch Pond
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
- 
-metadata {
-	definition (name: "Iris Care Pendant", namespace: "mitchpond", author: "Mitch Pond") {
-    	capability "Sensor"
-    	capability "Battery"
-		capability "Configuration"
-        capability "Button"
-        
-        command "enrollResponse"
-
-		fingerprint endpointId: "01", inClusters: "0000,0001,0003,0020,0500", outClusters: "0003,0019", manufacturer: "CentraLite", model: "3455-L"
-	}
-
-	preferences {}
- 
-	tiles(scale: 2) {
-    	standardTile("button", "device.button", decoration: "flat", width: 2, height:2) {
-        	state "default", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffffff"
-            state "pushed", backgroundColor: "#79b821"
-        }
-		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
-			state "battery", label:'${currentValue}% battery', unit:""
-		}
-
-		main (["battery"])
-		details(["button","battery"])
-	}
-}
- 
-def parse(String description) {
-	//log.debug "description: $description"
-    
-	def results = []
-	if (description?.startsWith('catchall:')) {
-		results = parseCatchAllMessage(description)
-	}
-	else if (description?.startsWith('read attr -')) {
-		results = parseReportAttributeMessage(description)
-	}
-    else if (description?.startsWith('zone status')) {
-    	results = parseIasMessage(description)
-    }
-    
-    if (description?.startsWith('enroll request')) {
-    	List cmds = enrollResponse()
-        log.debug "enroll response: ${cmds}"
-        results = cmds?.collect { new physicalgraph.device.HubAction(it) }
-    }
-    return results
-}
- 
-private Map parseCatchAllMessage(String description) {
-    Map resultMap = [:]
-    def cluster = zigbee.parse(description)
-    if (shouldProcessMessage(cluster)) {
-        switch(cluster.clusterId) {
-            case 0x0001:
-            	resultMap = getBatteryResult(cluster.data.last())
-                break
-        }
-    }
-
-    return resultMap
-}
-
-private boolean shouldProcessMessage(cluster) {
-    // 0x0B is default response indicating message got through
-    // 0x07 is bind message
-    boolean ignoredMessage = cluster.profileId != 0x0104 || 
-        cluster.command == 0x0B ||
-        cluster.command == 0x07 ||
-        (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
-    return !ignoredMessage
-}
- 
-private parseReportAttributeMessage(String description) {
-	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
-		def nameAndValue = param.split(":")
-		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-	}
-
-	def results = []
-    
-	if (descMap.cluster == "0001" && descMap.attrId == "0020") {
-		log.debug "Received battery level report"
-		results = createEvent(getBatteryResult(Integer.parseInt(descMap.value, 16)))
-	}
-
-	return results
-}
-
-private parseIasMessage(String description) {
-	List parsedMsg = description.split(' ')
-	String msgCode = parsedMsg[2]
-	int status = Integer.decode(msgCode)
-	def linkText = getLinkText(device)
-
-	def results = []
-	//log.debug(description)
-	if (status & 0b00000010) {results << createEvent(getButtonResult('pushed'))}
-	else if (~status & 0b00000010) results << createEvent(getButtonResult('released'))
-
-	if (status & 0b00000100) {
-    	//tampered
-	}
-	else if (~status & 0b00000100) {
-		//not tampered
-	}
-	
-	if (status & 0b00001000) {
-	}
-	else if (~status & 0b00001000) {
-		//log.debug "${linkText} battery OK"
-	}
-	//log.debug results
-	return results
-}
-
-private Map getBatteryResult(rawValue) {
-	log.debug 'Battery'
-	def linkText = getLinkText(device)
-    
-    def result = [
-    	name: 'battery'
-    ]
-    
-	def volts = rawValue / 10
-	def descriptionText
-	if (volts > 3.5) {
-		result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
-	}
-	else {
-		def minVolts = 2.1
-    	def maxVolts = 3.0
-		def pct = (volts - minVolts) / (maxVolts - minVolts)
-		result.value = Math.min(100, (int) pct * 100)
-		result.descriptionText = "${linkText} battery was ${result.value}%"
-	}
-
-	return result
-}
-
-private Map getButtonResult(value) {
-	//log.debug 'Button Status'
-	def linkText = getLinkText(device)
-	def descriptionText = "${linkText} was ${value == 'pushed' ? 'pushed' : 'released'}"
-	return [
-		name: 'button',
-		value: value,
-        data: [buttonNumber: 1],
-		descriptionText: descriptionText,
-        displayed: true,
-        isStateChange: true
-	]
-}
-
-def configure() {
-
-	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
-	log.debug "Configuring Reporting, IAS CIE, and Bindings."
-	def configCmds = [
-		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 100",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 500",
-
-		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 1 {${device.zigbeeId}} {}", "delay 200",
-		"zcl global send-me-a-report 1 0x20 0x20 3600 21600 {01}",		//checkin time 6 hrs
-		"send 0x${device.deviceNetworkId} 1 1", "delay 500",
-        "st rattr 0x${device.deviceNetworkId} 1 1 0x20"
-	]
-    return configCmds
-}
-
-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() {
-	new BigInteger(device.endpointId, 16).toString()
-}
-
-private hex(value) {
-	new BigInteger(Math.round(value).toString()).toString(16)
-}
-
-private String swapEndianHex(String hex) {
-    reverseArray(hex.decodeHex()).encodeHex()
-}
-
-private byte[] reverseArray(byte[] array) {
-    int i = 0;
-    int j = array.length - 1;
-    byte tmp;
-    while (j > i) {
-        tmp = array[j];
-        array[j] = array[i];
-        array[i] = tmp;
-        j--;
-        i++;
-    }
-    return array
-}

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

@@ -1,7 +1,5 @@
 /**
- *  Ecobee Sensor
- *
- *  Copyright 2015 Juan Risso
+ *  Copyright 2015 SmartThings
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  *  in compliance with the License. You may obtain a copy of the License at:
@@ -12,6 +10,9 @@
  *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
  *  for the specific language governing permissions and limitations under the License.
  *
+ *	Ecobee Sensor
+ *
+ *	Author: SmartThings
  */
 metadata {
 	definition (name: "Ecobee Sensor", namespace: "smartthings", author: "SmartThings") {
@@ -26,7 +27,16 @@ metadata {
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
 			state("temperature", label:'${currentValue}°', unit:"F",
 					backgroundColors:[
-							[value: 31, color: "#153591"],
+							// Celsius
+							[value: 0, color: "#153591"],
+							[value: 7, color: "#1e9cbb"],
+							[value: 15, color: "#90d2a7"],
+							[value: 23, color: "#44b621"],
+							[value: 28, color: "#f1d801"],
+							[value: 35, color: "#d04e00"],
+							[value: 37, color: "#bc2323"],
+							// Fahrenheit
+							[value: 40, color: "#153591"],
 							[value: 44, color: "#1e9cbb"],
 							[value: 59, color: "#90d2a7"],
 							[value: 74, color: "#44b621"],
@@ -38,8 +48,8 @@ metadata {
 		}
 
 		standardTile("motion", "device.motion") {
-			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
 			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff")
+			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
 		}
 
 		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat") {

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

@@ -16,8 +16,8 @@ metadata {
 		capability "Sensor"
 
 		command "setAdjustedColor"
-                command "reset"        
-                command "refresh"
+		command "reset"
+		command "refresh"
 	}
 
 	simulator {
@@ -68,17 +68,17 @@ def parse(description) {
 }
 
 // handle commands
-def on() {
+void on() {
 	log.trace parent.on(this)
 	sendEvent(name: "switch", value: "on")
 }
 
-def off() {
+void off() {
 	log.trace parent.off(this)
 	sendEvent(name: "switch", value: "off")
 }
 
-def nextLevel() {
+void nextLevel() {
 	def level = device.latestValue("level") as Integer ?: 0
 	if (level <= 100) {
 		level = Math.min(25 * (Math.round(level / 25) + 1), 100) as Integer
@@ -89,25 +89,25 @@ def nextLevel() {
 	setLevel(level)
 }
 
-def setLevel(percent) {
+void setLevel(percent) {
 	log.debug "Executing 'setLevel'"
 	parent.setLevel(this, percent)
 	sendEvent(name: "level", value: percent)
 }
 
-def setSaturation(percent) {
+void setSaturation(percent) {
 	log.debug "Executing 'setSaturation'"
 	parent.setSaturation(this, percent)
 	sendEvent(name: "saturation", value: percent)
 }
 
-def setHue(percent) {
+void setHue(percent) {
 	log.debug "Executing 'setHue'"
 	parent.setHue(this, percent)
 	sendEvent(name: "hue", value: percent)
 }
 
-def setColor(value) {
+void setColor(value) {
 	log.debug "setColor: ${value}, $this"
 	parent.setColor(this, value)
 	if (value.hue) { sendEvent(name: "hue", value: value.hue)}
@@ -117,25 +117,25 @@ def setColor(value) {
 	if (value.switch) { sendEvent(name: "switch", value: value.switch)}
 }
 
-def reset() {
+void reset() {
 	log.debug "Executing 'reset'"
-    def value = [level:100, hex:"#90C638", saturation:56, hue:23]
-    setAdjustedColor(value)
+	def value = [level:100, hex:"#90C638", saturation:56, hue:23]
+	setAdjustedColor(value)
 	parent.poll()
 }
 
-def setAdjustedColor(value) {
+void setAdjustedColor(value) {
 	if (value) {
-        log.trace "setAdjustedColor: ${value}"
-        def adjusted = value + [:]
-        adjusted.hue = adjustOutgoingHue(value.hue)
-        // Needed because color picker always sends 100
-        adjusted.level = null 
-        setColor(adjusted)
-    }
+		log.trace "setAdjustedColor: ${value}"
+		def adjusted = value + [:]
+		adjusted.hue = adjustOutgoingHue(value.hue)
+		// Needed because color picker always sends 100
+		adjusted.level = null
+		setColor(adjusted)
+	}
 }
 
-def refresh() {
+void refresh() {
 	log.debug "Executing 'refresh'"
 	parent.manualRefresh()
 }

devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy

@@ -12,48 +12,48 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
-       
-        command "refresh"       
+
+		command "refresh"
 	}
 
 	simulator {
 		// TODO: define status and reply messages here
 	}
-    
-    tiles(scale: 2) {
-        multiAttributeTile(name:"rich-control", type: "lighting", canChangeIcon: true){
-            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-              attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-              attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-              attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-              attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-            }
-            tileAttribute ("device.level", key: "SLIDER_CONTROL") {
-              attributeState "level", action:"switch level.setLevel", range:"(0..100)"
-            }
-            tileAttribute ("device.level", key: "SECONDARY_CONTROL") {
-	            attributeState "level", label: 'Level ${currentValue}%'
+
+	tiles(scale: 2) {
+		multiAttributeTile(name:"rich-control", type: "lighting", canChangeIcon: true){
+			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
-        }
-    
+			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
+				attributeState "level", action:"switch level.setLevel", range:"(0..100)"
+			}
+			tileAttribute ("device.level", key: "SECONDARY_CONTROL") {
+				attributeState "level", label: 'Level ${currentValue}%'
+			}
+		}
+
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 			state "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 			state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 			state "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-        }
-        
-        controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {
-            state "level", action:"switch level.setLevel"
-        }
-           
-        standardTile("refresh", "device.switch", inactiveLabel: false, height: 2, width: 2, decoration: "flat") {
-            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-        }        
+		}
 
-        main(["switch"])
-        details(["rich-control", "refresh"])
-    }    
+		controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {
+			state "level", action:"switch level.setLevel"
+		}
+
+		standardTile("refresh", "device.switch", inactiveLabel: false, height: 2, width: 2, decoration: "flat") {
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+
+		main(["switch"])
+		details(["rich-control", "refresh"])
+	}
 }
 
 // parse events into attributes
@@ -74,23 +74,23 @@ def parse(description) {
 }
 
 // handle commands
-def on() {
+void on() {
 	parent.on(this)
 	sendEvent(name: "switch", value: "on")
 }
 
-def off() {
+void off() {
 	parent.off(this)
 	sendEvent(name: "switch", value: "off")
 }
 
-def setLevel(percent) {
+void setLevel(percent) {
 	log.debug "Executing 'setLevel'"
 	parent.setLevel(this, percent)
 	sendEvent(name: "level", value: percent)
 }
 
-def refresh() {
+void refresh() {
 	log.debug "Executing 'refresh'"
 	parent.manualRefresh()
 }

devicetypes/smartthings/mobile-presence.src/i18n/messages.properties

@@ -0,0 +1,31 @@
+#==============================================================================
+#  Copyright 2016 SmartThings
+#
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may not 
+#  use this file except in compliance with the License. You may obtain a copy 
+#  of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software 
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
+#  License for the specific language governing permissions and limitations 
+#  under the License.
+#==============================================================================
+# Purpose: Mobile Presence i18n Translation File
+#
+# Filename: mobile-presence.src/i18n/messages.properties
+#
+# Change History:
+#	1. 20160205 TW Initial release with informal Korean translation.
+#==============================================================================
+# Korean (ko)
+# Device Preferences
+'''Give your device a name'''.ko=기기 이름 바꾸기
+'''Set Device Image'''.ko=디바이스 이미지 설정
+# Events / Notifications
+'''{{ linkText }} has left'''.ko={{ linkText }}님이 나갔습니다
+'''{{ linkText }} has arrived'''.ko={{ linkText }}님이 도착했습니다
+'''present'''.ko=집안
+'''not present'''.ko=부재중

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

@@ -0,0 +1,14 @@
+
+# Generated on Wed Feb 24 14:28:26 CST 2016 by dylan
+'''Adjust temperature by this many degrees'''.ko=몇 도씩 온도를 조절하십시오
+'''Degrees'''.ko=온도
+'''Temperature Offset'''.ko=온도 직접 설정
+'''This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter '-5'. If 3 degrees too cold, enter '+3'.'''.ko=기준 온도를 원하는대로 몇 도 올리거나 내려서 설정할 수 있습니다. 
+'''battery'''.ko=배터리
+'''dry'''.ko=건조
+'''wet'''.ko=누수
+'''{{ 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 }} is {{ value | translate }}'''.ko={{ device.displayName }}이(가) {{ value | translate }}입니다
+'''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가) {{ value }}°C였습니다
+'''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다

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

@@ -0,0 +1,13 @@
+
+# Generated on Wed Feb 24 14:28:26 CST 2016 by dylan
+'''Adjust temperature by this many degrees'''.ko=몇 도씩 온도를 조절하십시오
+'''Degrees'''.ko=온도
+'''Temperature Offset'''.ko=온도 직접 설정
+'''This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter '-5'. If 3 degrees too cold, enter '+3'.'''.ko=기준 온도를 원하는대로 몇 도 올리거나 내려서 설정할 수 있습니다. 
+'''battery'''.ko=배터리
+'''{{ 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 }} 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였습니다

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

@@ -14,6 +14,8 @@
  *
  */
 
+//DEPRECATED - Using the smartsense-motion-sensor.groovy DTH for this device. Users need to be moved before deleting this DTH
+
 metadata {
 	definition (name: "SmartSense Motion/Temp Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Motion Sensor"
@@ -25,10 +27,6 @@ metadata {
         
         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: "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: "3326"
 	}
 
 	simulator {
@@ -233,7 +231,7 @@ private Map getBatteryResult(rawValue) {
 	def volts = rawValue / 10
 	def descriptionText
 
-	if (rawValue == 0) {}
+    if (rawValue == 0 || rawValue == 255) {}
 	else {
 		if (volts > 3.5) {
 			result.descriptionText = "${linkText} battery has too much power (${volts} volts)."

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

@@ -0,0 +1,20 @@
+
+# Generated on Wed Feb 24 14:28:26 CST 2016 by dylan
+'''Adjust temperature by this many degrees'''.ko=몇 도씩 온도를 조절하십시오
+'''Degrees'''.ko=온도
+'''Do you want to use this sensor on a garage door?'''.ko=차고 문의 센서 사용 설정하기
+'''No'''.ko=아니요
+'''Tap to set'''.ko=눌러서 설정
+'''Temperature Offset'''.ko=온도 직접 설정
+'''This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter '-5'. If 3 degrees too cold, enter '+3'.'''.ko=기준 온도를 원하는대로 몇 도 올리거나 내려서 설정할 수 있습니다.
+'''Updating device to garage sensor'''.ko=기기-차고 센서 업데이트 중
+'''Updating device to open/close sensor'''.ko=기기-열림/닫힘 센서 업데이트 중
+'''Yes'''.ko=예
+'''{{ device.displayName }} status was closed'''.ko={{ device.displayName }}은(는) 닫힌 상태입니다
+'''{{ device.displayName }} status was opened'''.ko={{ device.displayName }}은(는) 열린 상태입니다
+'''{{ device.displayName }} was active'''.ko={{ device.displayName }}이(가) 활성화되었습니다
+'''{{ device.displayName }} was closed'''.ko={{ device.displayName }}이(가) 닫혔습니다
+'''{{ device.displayName }} was inactive'''.ko={{ device.displayName }}이(가) 비활성화되었습니다
+'''{{ device.displayName }} was opened'''.ko={{ device.displayName }}이(가) 열렸습니다
+'''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가) {{ value }}°C였습니다
+'''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다

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

@@ -72,15 +72,12 @@ metadata {
 				]
 			)
 		}
-		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:""
 		}
 
 		main(["contact", "acceleration", "temperature"])
-		details(["contact", "acceleration", "temperature", "3axis", "battery"])
+		details(["contact", "acceleration", "temperature", "battery"])
 	}
 }
 

devicetypes/smartthings/smartsense-open-closed-accelerometer-sensor.src/smartsense-open-closed-accelerometer-sensor.groovy

@@ -13,6 +13,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+//DEPRECATED - Using the smartsense-multi-sensor.groovy DTH for this device. Users need to be moved before deleting this DTH
 
  metadata {
  	definition (name: "SmartSense Open/Closed Accelerometer Sensor", namespace: "smartthings", author: "SmartThings") {
@@ -23,8 +24,7 @@
  		capability "Refresh"
  		capability "Temperature Measurement"
  		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"
+
  	}
 
  	simulator {
@@ -225,7 +225,8 @@ def getTemperature(value) {
 
 		def volts = rawValue / 10
 		def descriptionText
-		if (volts > 3.5) {
+        if (rawValue == 0 || rawValue == 255) {}
+		else if (volts > 3.5) {
 			result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
 		}
 		else {

devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy

@@ -220,7 +220,8 @@ private Map getBatteryResult(rawValue) {
     
 	def volts = rawValue / 10
 	def descriptionText
-	if (volts > 3.5) {
+    if (rawValue == 0 || rawValue == 255) {}
+    else if (volts > 3.5) {
 		result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
 	}
 	else {

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

@@ -196,7 +196,8 @@ private Map getBatteryResult(rawValue) {
 
 	def volts = rawValue / 10
 	def descriptionText
-	if (volts > 3.5) {
+    if (rawValue == 0 || rawValue == 255) {}
+    else if (volts > 3.5) {
 		result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
 	}
 	else {

devicetypes/smartthings/zigbee-dimmer-power.src/zigbee-dimmer-power.groovy

@@ -44,7 +44,7 @@ metadata {
                 attributeState "power", label:'${currentValue} W'
             }
         }
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
         main "switch"

devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy

@@ -39,7 +39,7 @@ metadata {
                 attributeState "level", action:"switch level.setLevel"
             }
         }
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
         main "switch"

devicetypes/smartthings/zigbee-hue-bulb.src/zigbee-hue-bulb.groovy

@@ -63,7 +63,7 @@ metadata {
 			state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 			state "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
 		}
-		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
+		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat") {
 			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 		controlTile("rgbSelector", "device.color", "color", height: 3, width: 3, inactiveLabel: false) {

devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy

@@ -52,7 +52,7 @@
 		valueTile("battery", "device.battery", inactiveLabel:false, decoration:"flat", width:2, height:2) {
 			state "battery", label:'${currentValue}% battery', unit:""
 		}
-		standardTile("refresh", "device.lock", inactiveLabel:false, decoration:"flat", width:2, height:2) {
+		standardTile("refresh", "device.refresh", inactiveLabel:false, decoration:"flat", width:2, height:2) {
 			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 

devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy

@@ -57,7 +57,7 @@ metadata {
         valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "colorTemperature", label: '${currentValue} K'
         }
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
 

devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy

@@ -40,7 +40,7 @@ metadata {
                 attributeState "power", label:'${currentValue} W'
             }
         }
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
         main "switch"

devicetypes/smartthings/zigbee-switch.src/zigbee-switch.groovy

@@ -42,7 +42,7 @@ metadata {
                 attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
             }
         }
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
         main "switch"

devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy

@@ -54,7 +54,7 @@ metadata {
             }
         }
 
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
 

smartapps/mitchpond/3400-x-keypad-manager.src/3400-x-keypad-manager.groovy

@@ -1,129 +0,0 @@
-/**
- *  3400-X Keypad Manager
- *
- *  Copyright 2015 Mitch Pond
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-definition(
-    name: "3400-X Keypad Manager",
-    namespace: "mitchpond",
-    author: "Mitch Pond",
-    description: "Service manager for Centralite 3400-X security keypad. Keeps keypad state in sync with Smart Home Monitor",
-    category: "My Apps",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    singleInstance: false)
-
-
-preferences {
-	page(name: "setupPage")
-}
-
-def setupPage() {
-	dynamicPage(name: "setupPage",title: "3400-X Keypad Manager", install: true, uninstall: true) {
-        section("Settings") {
-            input(name: "keypad", title: "Keypad", type: "capability.lockCodes", multiple: false, required: true)
-            input(name: "pin"	, title: "PIN code", type: "number", range: "0000..9999", required: true)
-            paragraph "PIN should be four digits. Shorter PINs will be padded with leading zeroes. (42 becomes 0042)"
-            label(title: "Assign a name", required: false)
-        }
-        def routines = location.helloHome?.getPhrases()*.label
-        routines?.sort()
-        section("Routines", hideable: true, hidden: true) {
-        	input(name: "armRoutine", title: "Arm/Away routine", type: "enum", options: routines, required: false)
-            input(name: "disarmRoutine", title: "Disarm routine", type: "enum", options: routines, required: false)
-            input(name: "stayRoutine", title: "Arm/Stay routine", type: "enum", options: routines, required: false)
-            //input(name: "nightRoutine", title: "Arm/Night routine", type: "enum", options: routines, required: false)
-        }
-    }
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-	initialize()
-}
-
-def initialize() {
-	// TODO: subscribe to attributes, devices, locations, etc.
-    subscribe(location,"alarmSystemStatus",alarmStatusHandler)
-    subscribe(keypad,"codeEntered",codeEntryHandler)   
-
-    //initialize keypad to correct state
-    def event = [name:"alarmSystemStatus", value: location.currentState("alarmSystemStatus").value, 
-    			displayed: true, description: "System Status is ${shmState}"]
-    alarmStatusHandler(event)
-}
-
-//Returns the PIN padded with zeroes to 4 digits
-private String getPIN(){
-	return settings.pin.value.toString().padLeft(4,'0')
-}
-
-// TODO: implement event handlers
-def alarmStatusHandler(event) {
-	log.debug "Keypad manager caught alarm status change: "+event.value
-    if (event.value == "off") keypad?.setDisarmed()
-    else if (event.value == "away") keypad?.setArmedAway()
-    else if (event.value == "stay") keypad?.setArmedStay()
-}
-
-private sendSHMEvent(String shmState){
-	def event = [name:"alarmSystemStatus", value: shmState, 
-    			displayed: true, description: "System Status is ${shmState}"]
-    sendLocationEvent(event)
-}
-
-private execRoutine(armMode) {
-	if (armMode == 'away') location.helloHome?.execute(settings.armRoutine)
-    else if (armMode == 'stay') location.helloHome?.execute(settings.stayRoutine)
-    else if (armMode == 'off') location.helloHome?.execute(settings.disarmRoutine)    
-}
-
-def codeEntryHandler(evt){
-	//do stuff
-    log.debug "Caught code entry event! ${evt.value.value}"
-    
-    def codeEntered = evt.value as String
-    def correctCode = getPIN()
-    def data = evt.data as String
-    def armMode = ''
-    
-    if (data == '0') armMode = 'off'
-    else if (data == '3') armMode = 'away'
-    else if (data == '1') armMode = 'stay'
-    else if (data == '2') armMode = 'stay'	//Currently no separate night mode for SHM, set to 'stay'
-    else {
-    	log.error "${app.label}: Unexpected arm mode sent by keypad!: "+data
-        return []
-        }
-    
-    if (codeEntered == correctCode) {
-    	log.debug "Correct PIN entered. Change SHM state to ${armMode}"
-        keypad.acknowledgeArmRequest(data)
-        sendSHMEvent(armMode)
-		execRoutine(armMode)
-    }
-    else {
-    	log.debug "Invalid PIN"
-        //Could also call acknowledgeArmRequest() with a parameter of 4 to report invalid code. Opportunity to simplify code?
-    	keypad.sendInvalidKeycodeResponse()
-    }
-}

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

@@ -235,6 +235,7 @@ def connectionStatus(message, redirectUrl = null) {
 
 def getEcobeeThermostats() {
 	log.debug "getting device list"
+	atomicState.remoteSensors = []
 
 	def requestBody = '{"selection":{"selectionType":"registered","selectionMatch":"","includeRuntime":true,"includeSensors":true}}'
 
@@ -251,7 +252,7 @@ def getEcobeeThermostats() {
 
 			if (resp.status == 200) {
 				resp.data.thermostatList.each { stat ->
-					atomicState.remoteSensors = stat.remoteSensors
+					atomicState.remoteSensors = atomicState.remoteSensors == null ? stat.remoteSensors : atomicState.remoteSensors <<  stat.remoteSensors
 					def dni = [app.id, stat.identifier].join('.')
 					stats[dni] = getThermostatDisplayName(stat)
 				}
@@ -273,11 +274,14 @@ def getEcobeeThermostats() {
 
 Map sensorsDiscovered() {
 	def map = [:]
-	atomicState.remoteSensors.each {
-		if (it.type != "thermostat") {
-			def value = "${it?.name}"
-			def key = "ecobee_sensor-"+ it?.id + "-" + it?.code
-			map["${key}"] = value
+	log.info "list ${atomicState.remoteSensors}"
+	atomicState.remoteSensors.each { sensors ->
+		sensors.each {
+			if (it.type != "thermostat") {
+				def value = "${it?.name}"
+				def key = "ecobee_sensor-"+ it?.id + "-" + it?.code
+				map["${key}"] = value
+			}
 		}
 	}
 	atomicState.sensors = map
@@ -541,10 +545,15 @@ def updateSensorData() {
 				def occupancy = ""
 				it.capability.each {
 					if (it.type == "temperature") {
-						if (location.temperatureScale == "F") {
-							temperature = Math.round(it.value.toDouble() / 10)
+						if (it.value == "unknown") {
+							temperature = "--"
 						} else {
-							temperature = convertFtoC(it.value.toDouble() / 10)
+							if (location.temperatureScale == "F") {
+								temperature = Math.round(it.value.toDouble() / 10)
+							} else {
+								temperature = convertFtoC(it.value.toDouble() / 10)
+							}
+
 						}
 
 					} else if (it.type == "occupancy") {

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

@@ -455,7 +455,7 @@ def locationHandler(evt) {
 					log.error "/description.xml returned a bridge that didn't exist"
 				}
 			}
-		} else if(headerString?.contains("json")) {
+		} else if(headerString?.contains("json") && isValidSource(parsedEvent.mac)) {
             log.trace "description.xml response (application/json)"
 			def body = new groovy.json.JsonSlurper().parseText(parsedEvent.body)
 			if (body.success != null) {
@@ -494,6 +494,11 @@ def doDeviceSync(){
 	discoverBridges()
 }
 
+def isValidSource(macAddress) {
+	def vbridges = getVerifiedHueBridges()
+	return (vbridges?.find {"${it.value.mac}" == macAddress}) != null
+}
+
 /////////////////////////////////////
 //CHILD DEVICE METHODS
 /////////////////////////////////////