Merge pull request #1728 from SmartThingsCommunity/staging

Rolling up staging to production

devicetypes/smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy

@@ -11,7 +11,6 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
- 
 metadata {
     definition (name: "Arrival Sensor HA", namespace: "smartthings", author: "SmartThings") {
         capability "Tone"
@@ -60,7 +59,7 @@ def updated() {
 }
 
 def configure() {
-    def cmds = zigbee.configureReporting(0x0001, 0x0020, 0x20, 20, 20, 0x01)
+    def cmds = zigbee.batteryConfig(20, 20, 0x01)
     log.debug "configure -- cmds: ${cmds}"
     return cmds
 }

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

@@ -81,51 +81,47 @@ metadata {
 // parse events into attributes
 def parse(String description) {
 	log.debug "Parse description $description"
-	def map = [:]
-	if (description?.startsWith("read attr -")) {
-		def descMap = parseDescriptionAsMap(description)
-		log.debug "Desc Map: $descMap"
-		if (descMap.cluster == "0201" && descMap.attrId == "0000") {
+	List result = []
+	def descMap = zigbee.parseDescriptionAsMap(description)
+	log.debug "Desc Map: $descMap"
+	List attrData = [[cluster: descMap.cluster ,attrId: descMap.attrId, value: descMap.value]]
+	descMap.additionalAttrs.each {
+	    attrData << [cluster: descMap.cluster, attrId: it.attrId, value: it.value]
+	}
+	attrData.each {
+		def map = [:]
+		if (it.cluster == "0201" && it.attrId == "0000") {
 			log.debug "TEMP"
 			map.name = "temperature"
-			map.value = getTemperature(descMap.value)
+			map.value = getTemperature(it.value)
 			map.unit = temperatureScale
-		} else if (descMap.cluster == "0201" && descMap.attrId == "0011") {
+		} else if (it.cluster == "0201" && it.attrId == "0011") {
 			log.debug "COOLING SETPOINT"
 			map.name = "coolingSetpoint"
-			map.value = getTemperature(descMap.value)
+			map.value = getTemperature(it.value)
 			map.unit = temperatureScale
-		} else if (descMap.cluster == "0201" && descMap.attrId == "0012") {
+		} else if (it.cluster == "0201" && it.attrId == "0012") {
 			log.debug "HEATING SETPOINT"
 			map.name = "heatingSetpoint"
-			map.value = getTemperature(descMap.value)
+			map.value = getTemperature(it.value)
 			map.unit = temperatureScale
-		} else if (descMap.cluster == "0201" && descMap.attrId == "001c") {
+		} else if (it.cluster == "0201" && it.attrId == "001c") {
 			log.debug "MODE"
 			map.name = "thermostatMode"
-			map.value = getModeMap()[descMap.value]
-		} else if (descMap.cluster == "0202" && descMap.attrId == "0000") {
+			map.value = getModeMap()[it.value]
+		} else if (it.cluster == "0202" && it.attrId == "0000") {
 			log.debug "FAN MODE"
 			map.name = "thermostatFanMode"
-			map.value = getFanModeMap()[descMap.value]
+			map.value = getFanModeMap()[it.value]
 		}
+		if (map) {
+			result << createEvent(map)
+		}
+		log.debug "Parse returned $map"
 	}
-
-	def result = null
-	if (map) {
-		result = createEvent(map)
-	}
-	log.debug "Parse returned $map"
 	return result
 }
 
-def parseDescriptionAsMap(description) {
-	(description - "read attr - ").split(",").inject([:]) { map, param ->
-		def nameAndValue = param.split(":")
-		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-	}
-}
-
 def getModeMap() { [
 	"00":"off",
 	"03":"cool",

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

@@ -23,6 +23,7 @@ metadata {
         capability "Switch"
         capability "Switch Level"
         capability "Health Check"
+        capability "Light"
 
         fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019"
     }
@@ -82,7 +83,7 @@ def on() {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value) + ["delay 500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()       //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
 /**

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

@@ -21,10 +21,12 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
+		capability "Light"
 
-		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "Z-Wave Wall Dimmer"
-		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "Z-Wave Wall Dimmer"
-		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "Z-Wave Plug-In Dimmer"
+		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "GE In-Wall Smart Dimmer "
+		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "GE In-Wall Smart Dimmer "
+		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "GE Plug-In Smart Dimmer "
+		fingerprint mfr:"0063", prod:"4944", model:"3034", deviceJoinName: "GE In-Wall Smart Fan Control"
 	}
 
 	simulator {

devicetypes/smartthings/ge-link-bulb.src/ge-link-bulb.groovy

@@ -99,7 +99,7 @@ def parse(String description) {
 
 def poll() {
     def refreshCmds = [
-        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
+        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 2000"
     ]
 
     return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh()
@@ -197,7 +197,7 @@ def off() {
 
 def refresh() {
     def refreshCmds = [
-        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
+        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 2000"
     ]
 
     return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig()

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

@@ -17,6 +17,7 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
+		capability "Light"
 
 		command "setAdjustedColor"
         command "reset"
@@ -57,7 +58,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
 }
 
 // parse events into attributes

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

@@ -7,6 +7,7 @@
 metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Hue Bridge", namespace: "smartthings", author: "SmartThings") {
+		capability "Bridge"
 		capability "Health Check"
 
 		attribute "networkAddress", "string"
@@ -45,7 +46,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
 }
 
 // parse events into attributes

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

@@ -18,6 +18,7 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
+		capability "Light"
 
 		command "setAdjustedColor"
         command "reset"
@@ -66,7 +67,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
 }
 
 // parse events into attributes

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

@@ -14,7 +14,8 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
-        capability "Health Check"
+		capability "Health Check"
+		capability "Light"
 
         command "refresh"
 	}
@@ -50,7 +51,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
 }
 
 // parse events into attributes

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

@@ -16,6 +16,7 @@ metadata {
         capability "Switch"
         capability "Refresh"
         capability "Health Check"
+        capability "Light"
 
         command "refresh"
     }
@@ -55,7 +56,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
 }
 
 // parse events into attributes

devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy

@@ -14,6 +14,7 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
+		capability "Light"
 	}
 
 	simulator {

devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy

@@ -13,6 +13,7 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
+		capability "Light"
 	}
 
 	simulator {

devicetypes/smartthings/mimolite-garage-door-controller.src/mimolite-garage-door-controller.groovy

@@ -36,6 +36,7 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Contact Sensor"
+		capability "Light"
 
 		attribute "powered", "string"
 

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

@@ -40,14 +40,11 @@ metadata {
 
 // Parse incoming device messages to generate events
 def parse(String description) {
-	def name = null
-	def value = description
-	if (zigbee.isZoneType19(description)) {
-		name = "contact"
-		value = zigbee.translateStatusZoneType19(description) ? "open" : "closed"
+	def resMap
+	if (description.startsWith("zone")) {
+		resMap = createEvent(name: "contact", value: zigbee.parseZoneStatus(description).isAlarm1Set() ? "open" : "closed")
 	}
 	
-	def result = createEvent(name: name, value: value)
-	log.debug "Parse returned ${result?.descriptionText}"
-	return result
+	log.debug "Parse returned $resMap"
+	return resMap
 }

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

@@ -24,6 +24,7 @@ metadata {
 		capability "Refresh"
 		capability "Actuator"
 		capability "Sensor"
+		capability "Outlet"
 
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "4257050-ZHAC"
 
@@ -69,288 +70,36 @@ metadata {
 def parse(String description) {
 	log.debug "description is $description"
 
-	def event = [:]
-	def finalResult = isKnownDescription(description)
-	if (finalResult) {
-		log.info finalResult
-		if (finalResult.type == "update") {
-			log.info "$device updates: ${finalResult.value}"
-			event = null
-		}
-		else if (finalResult.type == "power") {
-			def powerValue = (finalResult.value as Integer)/10
-			event = createEvent(name: "power", value: powerValue)
-
-			/*
-				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
-				to account for the different Divisor value (AttrId: 0302) and POWER Unit (AttrId: 0300). CLUSTER for simple metering is 0702
-			*/
-		}
-		else {
-			event = createEvent(name: finalResult.type, value: finalResult.value)
-		}
-	}
-	else {
+	def event = zigbee.getEvent(description)
+	if (!event) {
 		log.warn "DID NOT PARSE MESSAGE for description : $description"
-		log.debug parseDescriptionAsMap(description)
+		log.debug zigbee.parseDescriptionAsMap(description)
+	} else if (event.name == "power") {
+		/*
+			Dividing by 10 as the Divisor is 10000 and unit is kW for the device. Simplifying to 10 power level is an integer.
+		*/
+		event.value = event.value / 10
 	}
-	return event
-}
 
-// Commands to device
-def zigbeeCommand(cluster, attribute){
-	"st cmd 0x${device.deviceNetworkId} ${endpointId} ${cluster} ${attribute} {}"
-}
-
-def off() {
-	zigbeeCommand("6", "0")
-}
-
-def on() {
-	zigbeeCommand("6", "1")
+	return event ? createEvent(event) : event
 }
 
 def setLevel(value) {
-	value = value as Integer
-	if (value == 0) {
-		off()
-	}
-	else {
-		if (device.latestValue("switch") == "off") {
-			sendEvent(name: "switch", value: "on")
-		}
-		sendEvent(name: "level", value: value)
-		setLevelWithRate(value, "0000")		//value is between 0 to 100
-	}
+	zigbee.setLevel(value)
+}
+
+def off() {
+	zigbee.off()
+}
+
+def on() {
+	zigbee.on()
 }
 
 def refresh() {
-	[
-			"st rattr 0x${device.deviceNetworkId} ${endpointId} 6 0", "delay 500",
-			"st rattr 0x${device.deviceNetworkId} ${endpointId} 8 0", "delay 500",
-			"st rattr 0x${device.deviceNetworkId} ${endpointId} 0x0B04 0x050B", "delay 500"
-	]
-
+	zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.electricMeasurementPowerRefresh()
 }
 
 def configure() {
-	refresh() + onOffConfig() + levelConfig() + powerConfig()
-}
-
-
-private getEndpointId() {
-	new BigInteger(device.endpointId, 16).toString()
-}
-
-private hex(value, width=2) {
-	def s = new BigInteger(Math.round(value).toString()).toString(16)
-	while (s.size() < width) {
-		s = "0" + s
-	}
-	s
-}
-
-private String swapEndianHex(String hex) {
-	reverseArray(hex.decodeHex()).encodeHex()
-}
-
-private Integer convertHexToInt(hex) {
-	Integer.parseInt(hex,16)
-}
-
-//Need to reverse array of size 2
-private byte[] reverseArray(byte[] array) {
-	byte tmp;
-	tmp = array[1];
-	array[1] = array[0];
-	array[0] = tmp;
-	return array
-}
-
-def parseDescriptionAsMap(description) {
-	if (description?.startsWith("read attr -")) {
-		(description - "read attr - ").split(",").inject([:]) { map, param ->
-			def nameAndValue = param.split(":")
-			map += [(nameAndValue[0].trim()): nameAndValue[1].trim()]
-		}
-	}
-	else if (description?.startsWith("catchall: ")) {
-		def seg = (description - "catchall: ").split(" ")
-		def zigbeeMap = [:]
-		zigbeeMap += [raw: (description - "catchall: ")]
-		zigbeeMap += [profileId: seg[0]]
-		zigbeeMap += [clusterId: seg[1]]
-		zigbeeMap += [sourceEndpoint: seg[2]]
-		zigbeeMap += [destinationEndpoint: seg[3]]
-		zigbeeMap += [options: seg[4]]
-		zigbeeMap += [messageType: seg[5]]
-		zigbeeMap += [dni: seg[6]]
-		zigbeeMap += [isClusterSpecific: Short.valueOf(seg[7], 16) != 0]
-		zigbeeMap += [isManufacturerSpecific: Short.valueOf(seg[8], 16) != 0]
-		zigbeeMap += [manufacturerId: seg[9]]
-		zigbeeMap += [command: seg[10]]
-		zigbeeMap += [direction: seg[11]]
-		zigbeeMap += [data: seg.size() > 12 ? seg[12].split("").findAll { it }.collate(2).collect {
-			it.join('')
-		} : []]
-
-		zigbeeMap
-	}
-}
-
-def isKnownDescription(description) {
-	if ((description?.startsWith("catchall:")) || (description?.startsWith("read attr -"))) {
-		def descMap = parseDescriptionAsMap(description)
-		if (descMap.cluster == "0006" || descMap.clusterId == "0006") {
-			isDescriptionOnOff(descMap)
-		}
-		else if (descMap.cluster == "0008" || descMap.clusterId == "0008"){
-			isDescriptionLevel(descMap)
-		}
-		else if (descMap.cluster == "0B04" || descMap.clusterId == "0B04"){
-			isDescriptionPower(descMap)
-		}
-		else {
-			return [:]
-		}
-	}
-	else if(description?.startsWith("on/off:")) {
-		def switchValue = description?.endsWith("1") ? "on" : "off"
-		return	[type: "switch", value : switchValue]
-	}
-	else {
-		return [:]
-	}
-}
-
-def isDescriptionOnOff(descMap) {
-	def switchValue = "undefined"
-	if (descMap.cluster == "0006") {				//cluster info from read attr
-		value = descMap.value
-		if (value == "01"){
-			switchValue = "on"
-		}
-		else if (value == "00"){
-			switchValue = "off"
-		}
-	}
-	else if (descMap.clusterId == "0006") {
-		//cluster info from catch all
-		//command 0B is Default response and the last two bytes are [on/off][success]. on/off=00, success=00
-		//command 01 is Read attr response. the last two bytes are [datatype][value]. boolean datatype=10; on/off value = 01/00
-		if ((descMap.command=="0B" && descMap.raw.endsWith("0100")) || (descMap.command=="01" && descMap.raw.endsWith("1001"))){
-			switchValue = "on"
-		}
-		else if ((descMap.command=="0B" && descMap.raw.endsWith("0000")) || (descMap.command=="01" && descMap.raw.endsWith("1000"))){
-			switchValue = "off"
-		}
-		else if(descMap.command=="07"){
-			return	[type: "update", value : "switch (0006) capability configured successfully"]
-		}
-	}
-
-	if (switchValue != "undefined"){
-		return	[type: "switch", value : switchValue]
-	}
-	else {
-		return [:]
-	}
-
-}
-
-//@return - false or "success" or level [0-100]
-def isDescriptionLevel(descMap) {
-	def dimmerValue = -1
-	if (descMap.cluster == "0008"){
-		//TODO: the message returned with catchall is command 0B with clusterId 0008. That is just a confirmation message
-		def value = convertHexToInt(descMap.value)
-		dimmerValue = Math.round(value * 100 / 255)
-		if(dimmerValue==0 && value > 0) {
-			dimmerValue = 1						//handling for non-zero hex value less than 3
-		}
-	}
-	else if(descMap.clusterId == "0008") {
-		if(descMap.command=="0B"){
-			return	[type: "update", value : "level updated successfully"]					//device updating the level change was successful. no value sent.
-		}
-		else if(descMap.command=="07"){
-			return	[type: "update", value : "level (0008) capability configured successfully"]
-		}
-	}
-
-	if (dimmerValue != -1){
-		return	[type: "level", value : dimmerValue]
-	}
-	else {
-		return [:]
-	}
-}
-
-def isDescriptionPower(descMap) {
-	def powerValue = "undefined"
-	if (descMap.cluster == "0B04") {
-		if (descMap.attrId == "050b") {
-			if(descMap.value!="ffff")
-				powerValue = convertHexToInt(descMap.value)
-		}
-	}
-	else if (descMap.clusterId == "0B04") {
-		if(descMap.command=="07"){
-			return	[type: "update", value : "power (0B04) capability configured successfully"]
-		}
-	}
-
-	if (powerValue != "undefined"){
-		return	[type: "power", value : powerValue]
-	}
-	else {
-		return [:]
-	}
-}
-
-
-def onOffConfig() {
-	[
-			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 6 {${device.zigbeeId}} {}", "delay 200",
-			"zcl global send-me-a-report 6 0 0x10 0 600 {01}",
-			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
-	]
-}
-
-//level config for devices with min reporting interval as 5 seconds and reporting interval if no activity as 1hour (3600s)
-//min level change is 01
-def levelConfig() {
-	[
-			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 8 {${device.zigbeeId}} {}", "delay 200",
-			"zcl global send-me-a-report 8 0 0x20 5 3600 {01}",
-			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
-	]
-}
-
-//power config for devices with min reporting interval as 1 seconds and reporting interval if no activity as 10min (600s)
-//min change in value is 05
-def powerConfig() {
-	[
-		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
-		"zcl global send-me-a-report 0x0B04 0x050B 0x29 1 600 {05 00}",				//The send-me-a-report is custom to the attribute type for CentraLite
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
-	]
-}
-
-def setLevelWithRate(level, rate) {
-	if(rate == null){
-		rate = "0000"
-	}
-	level = convertToHexString(level * 255 / 100) 				//Converting the 0-100 range to 0-FF range in hex
-	"st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {$level $rate}"
-}
-
-String convertToHexString(value, width=2) {
-	def s = new BigInteger(Math.round(value).toString()).toString(16)
-	while (s.size() < width) {
-		s = "0" + s
-	}
-	s
+	refresh() + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.electricMeasurementPowerConfig()
 }

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

@@ -4,6 +4,7 @@ metadata {
 		capability "Actuator"
 		capability "Switch"
 		capability "Sensor"
+		capability "Outlet"
 
 		fingerprint profileId: "0104", inClusters: "0006, 0004, 0003, 0000, 0005", outClusters: "0019", manufacturer: "Compacta International, Ltd", model: "ZBMPlug15", deviceJoinName: "SmartPower Outlet V1"
 	}
@@ -51,7 +52,7 @@ def on() {
 			'zcl on-off on',
 			'delay 200',
 			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 500'
+			'delay 2000'
 
 	]
 
@@ -62,6 +63,6 @@ def off() {
 			'zcl on-off off',
 			'delay 200',
 			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 500'
+			'delay 2000'
 	]
 }

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

@@ -13,10 +13,9 @@
  *  License for the specific language governing permissions and limitations
  *  under the License.
  */
-
 metadata {
 	// Automatically generated. Make future change here.
-	definition (name: "SmartPower Outlet", namespace: "smartthings", author: "SmartThings") {
+	definition(name: "SmartPower Outlet", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Switch"
 		capability "Power Meter"
@@ -24,10 +23,12 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
+		capability "Light"
+		capability "Outlet"
 
-		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3200", deviceJoinName: "Outlet"
-		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3200-Sgb", deviceJoinName: "Outlet"
-		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "4257050-RZHAC", deviceJoinName: "Outlet"
+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3200", deviceJoinName: "Outlet"
+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3200-Sgb", deviceJoinName: "Outlet"
+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "4257050-RZHAC", deviceJoinName: "Outlet"
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019"
 	}
 
@@ -45,32 +46,32 @@ metadata {
 	preferences {
 		section {
 			image(name: 'educationalcontent', multiple: true, images: [
-				"http://cdn.device-gse.smartthings.com/Outlet/US/OutletUS1.jpg",
-				"http://cdn.device-gse.smartthings.com/Outlet/US/OutletUS2.jpg"
-				])
+					"http://cdn.device-gse.smartthings.com/Outlet/US/OutletUS1.jpg",
+					"http://cdn.device-gse.smartthings.com/Outlet/US/OutletUS2.jpg"
+			])
 		}
 	}
 
 	// UI tile definitions
 	tiles(scale: 2) {
-		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
-			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
+		multiAttributeTile(name: "switch", type: "lighting", width: 6, height: 4, canChangeIcon: true) {
+			tileAttribute("device.switch", key: "PRIMARY_CONTROL") {
 				attributeState "on", label: 'On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "turningOff"
 				attributeState "off", label: 'Off', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "turningOn"
 				attributeState "turningOn", label: 'Turning On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "turningOff"
 				attributeState "turningOff", label: 'Turning Off', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "turningOn"
 			}
-			tileAttribute ("power", key: "SECONDARY_CONTROL") {
-				attributeState "power", label:'${currentValue} W'
+			tileAttribute("power", key: "SECONDARY_CONTROL") {
+				attributeState "power", label: '${currentValue} W'
 			}
 		}
 
 		standardTile("refresh", "device.power", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
+			state "default", label: '', action: "refresh.refresh", icon: "st.secondary.refresh"
 		}
 
 		main "switch"
-		details(["switch","refresh"])
+		details(["switch", "refresh"])
 	}
 }
 
@@ -78,52 +79,33 @@ metadata {
 def parse(String description) {
 	log.debug "description is $description"
 
-	def finalResult = zigbee.getKnownDescription(description)
-	def event = [:]
+	def event = zigbee.getEvent(description)
 
-	//TODO: Remove this after getKnownDescription can parse it automatically
-	if (!finalResult && description!="updated")
-		finalResult = getPowerDescription(zigbee.parseDescriptionAsMap(description))
-
-	if (finalResult) {
-		log.info "final result = $finalResult"
-		if (finalResult.type == "update") {
-			log.info "$device updates: ${finalResult.value}"
-			event = null
+	if (event) {
+		if (event.name == "power") {
+			def value = (event.value as Integer) / 10
+			event = createEvent(name: event.name, value: value, descriptionText: '{{ device.displayName }} power is {{ value }} Watts', translatable: true)
+		} else if (event.name == "switch") {
+			def descriptionText = event.value == "on" ? '{{ device.displayName }} is On' : '{{ device.displayName }} is Off'
+			event = createEvent(name: event.name, value: event.value, descriptionText: descriptionText, translatable: true)
 		}
-		else if (finalResult.type == "power") {
-			def powerValue = (finalResult.value as Integer)/10
-			event = createEvent(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
-				to account for the different Divisor value (AttrId: 0302) and POWER Unit (AttrId: 0300). CLUSTER for simple metering is 0702
-			*/
-		}
-		else {
-			def descriptionText = finalResult.value == "on" ? '{{ device.displayName }} is On' : '{{ device.displayName }} is Off'
-			event = createEvent(name: finalResult.type, value: finalResult.value, descriptionText: descriptionText, translatable: true)
-		}
-	}
-	else {
+	} else {
 		def cluster = zigbee.parse(description)
 
-		if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07){
+		if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
 			if (cluster.data[0] == 0x00) {
 				log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
 				event = createEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-			}
-			else {
+			} else {
 				log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
 				event = null
 			}
-		}
-		else {
+		} else {
 			log.warn "DID NOT PARSE MESSAGE for description : $description"
 			log.debug "${cluster}"
 		}
 	}
-	return event
+	return event ? createEvent(event) : event
 }
 
 def off() {
@@ -150,42 +132,6 @@ def configure() {
 	sendEvent(name: "checkInterval", value: 2 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 
 	// OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
-	refresh() + zigbee.onOffConfig(0, 300) + powerConfig()
+	refresh() + zigbee.onOffConfig(0, 300) + zigbee.electricMeasurementPowerConfig()
 }
 
-//power config for devices with min reporting interval as 1 seconds and reporting interval if no activity as 10min (600s)
-//min change in value is 01
-def powerConfig() {
-	[
-		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
-		"zcl global send-me-a-report 0x0B04 0x050B 0x29 1 600 {05 00}",				//The send-me-a-report is custom to the attribute type for CentraLite
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
-	]
-}
-
-private getEndpointId() {
-	new BigInteger(device.endpointId, 16).toString()
-}
-
-//TODO: Remove this after getKnownDescription can parse it automatically
-def getPowerDescription(descMap) {
-	def powerValue = "undefined"
-	if (descMap.cluster == "0B04") {
-		if (descMap.attrId == "050b") {
-			if(descMap.value!="ffff")
-				powerValue = zigbee.convertHexToInt(descMap.value)
-		}
-	}
-	else if (descMap.clusterId == "0B04") {
-		if(descMap.command=="07"){
-			return	[type: "update", value : "power (0B04) capability configured successfully"]
-		}
-	}
-
-	if (powerValue != "undefined"){
-		return	[type: "power", value : powerValue]
-	}
-	else {
-		return [:]
-	}
-}

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

@@ -88,7 +88,7 @@ def parse(String description) {
 	log.debug "parse($description)"
 	def results = [:]
 
-	if (!isSupportedDescription(description) || zigbee.isZoneType19(description)) {
+	if (!isSupportedDescription(description) || description.startsWith("zone")) {
 		// Ignore this in favor of orientation-based state
 		// results = parseSingleMessage(description)
 	}

devicetypes/smartthings/smartsense-garage-door-sensor-button.src/smartsense-garage-door-sensor-button.groovy

@@ -117,7 +117,7 @@ def parse(String description) {
 	log.debug "parse($description)"
 	def results = null
 
-	if (!isSupportedDescription(description) || zigbee.isZoneType19(description)) {
+	if (!isSupportedDescription(description) || description.startsWith("zone")) {
 		// Ignore this in favor of orientation-based state
 		// results = parseSingleMessage(description)
 	}

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

@@ -17,7 +17,7 @@ import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 
 metadata {
-	definition (name: "SmartSense Moisture Sensor",namespace: "smartthings", author: "SmartThings") {
+	definition(name: "SmartSense Moisture Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Configuration"
 		capability "Battery"
 		capability "Refresh"
@@ -29,9 +29,10 @@ metadata {
 		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"
-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315-Seu", deviceJoinName: "Water Leak Sensor"
+		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"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-Seu", deviceJoinName: "Water Leak Sensor"
+		fingerprint inClusters: "0000,0001,0003,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-L", deviceJoinName: "Iris Smart Water Sensor"
 		fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "moisturev4", deviceJoinName: "Water Leak Sensor"
 	}
 
@@ -42,10 +43,10 @@ metadata {
 	preferences {
 		section {
 			image(name: 'educationalcontent', multiple: true, images: [
-				"http://cdn.device-gse.smartthings.com/Moisture/Moisture1.png",
-				"http://cdn.device-gse.smartthings.com/Moisture/Moisture2.png",
-				"http://cdn.device-gse.smartthings.com/Moisture/Moisture3.png"
-				])
+					"http://cdn.device-gse.smartthings.com/Moisture/Moisture1.png",
+					"http://cdn.device-gse.smartthings.com/Moisture/Moisture2.png",
+					"http://cdn.device-gse.smartthings.com/Moisture/Moisture3.png"
+			])
 		}
 		section {
 			input title: "Temperature Offset", description: "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'.", displayDuringSetup: false, type: "paragraph", element: "paragraph"
@@ -54,32 +55,32 @@ metadata {
 	}
 
 	tiles(scale: 2) {
-		multiAttributeTile(name:"water", type: "generic", width: 6, height: 4){
-			tileAttribute ("device.water", key: "PRIMARY_CONTROL") {
-				attributeState "dry", label: "Dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff"
-				attributeState "wet", label: "Wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0"
+		multiAttributeTile(name: "water", type: "generic", width: 6, height: 4) {
+			tileAttribute("device.water", key: "PRIMARY_CONTROL") {
+				attributeState "dry", label: "Dry", icon: "st.alarm.water.dry", backgroundColor: "#ffffff"
+				attributeState "wet", label: "Wet", icon: "st.alarm.water.wet", backgroundColor: "#53a7c0"
 			}
 		}
 		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
-			state "temperature", label:'${currentValue}°',
-				backgroundColors:[
-					[value: 31, color: "#153591"],
-					[value: 44, color: "#1e9cbb"],
-					[value: 59, color: "#90d2a7"],
-					[value: 74, color: "#44b621"],
-					[value: 84, color: "#f1d801"],
-					[value: 95, color: "#d04e00"],
-					[value: 96, color: "#bc2323"]
-				]
+			state "temperature", label: '${currentValue}°',
+					backgroundColors: [
+							[value: 31, color: "#153591"],
+							[value: 44, color: "#1e9cbb"],
+							[value: 59, color: "#90d2a7"],
+							[value: 74, color: "#44b621"],
+							[value: 84, color: "#f1d801"],
+							[value: 95, color: "#d04e00"],
+							[value: 96, color: "#bc2323"]
+					]
 		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
-			state "battery", label:'${currentValue}% battery', unit:""
+			state "battery", label: '${currentValue}% battery', unit: ""
 		}
 		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 (["water", "temperature"])
+		main(["water", "temperature"])
 		details(["water", "temperature", "battery", "refresh"])
 	}
 }
@@ -87,117 +88,43 @@ metadata {
 def parse(String description) {
 	log.debug "description: $description"
 
-	Map map = [:]
-	if (description?.startsWith('catchall:')) {
-		map = parseCatchAllMessage(description)
-	}
-	else if (description?.startsWith('read attr -')) {
-		map = parseReportAttributeMessage(description)
-	}
-	else if (description?.startsWith('temperature: ')) {
-		map = parseCustomMessage(description)
-	}
-	else if (description?.startsWith('zone status')) {
-		map = parseIasMessage(description)
+	// getEvent will handle temperature and humidity
+	Map map = zigbee.getEvent(description)
+	if (!map) {
+		if (description?.startsWith('zone status')) {
+			map = parseIasMessage(description)
+		} else {
+			Map descMap = zigbee.parseDescriptionAsMap(description)
+			if (descMap.clusterInt == 0x0001 && descMap.commandInt != 0x07 && descMap?.value) {
+				map = getBatteryResult(Integer.parseInt(descMap.value, 16))
+			} else if (descMap?.clusterInt == zigbee.TEMPERATURE_MEASUREMENT_CLUSTER && descMap.commandInt == 0x07) {
+				if (descMap.data[0] == "00") {
+					log.debug "TEMP REPORTING CONFIG RESPONSE: $descMap"
+					sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+				} else {
+					log.warn "TEMP REPORTING CONFIG FAILED- error code: ${descMap.data[0]}"
+				}
+			}
+		}
 	}
 
 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : [:]
 
 	if (description?.startsWith('enroll request')) {
-		List cmds = enrollResponse()
+		List cmds = zigbee.enrollResponse()
 		log.debug "enroll response: ${cmds}"
 		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
 	}
 	return result
 }
 
-private Map parseCatchAllMessage(String description) {
-	Map resultMap = [:]
-	def cluster = zigbee.parse(description)
-	if (shouldProcessMessage(cluster)) {
-		switch(cluster.clusterId) {
-			case 0x0001:
-				// 0x07 - configure reporting
-				if (cluster.command != 0x07) {
-					resultMap = getBatteryResult(cluster.data.last())
-				}
-				break
-
-            case 0x0402:
-				if (cluster.command == 0x07) {
-					if (cluster.data[0] == 0x00){
-						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
-					}
-					else {
-						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
-					}
-				}
-				else {
-					// temp is last 2 data values. reverse to swap endian
-					String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
-					def value = getTemperature(temp)
-					resultMap = getTemperatureResult(value)
-				}
-                break
-        }
-    }
-
-    return resultMap
-}
-
-private boolean shouldProcessMessage(cluster) {
-	// 0x0B is default response indicating message got through
-	boolean ignoredMessage = cluster.profileId != 0x0104 ||
-		cluster.command == 0x0B ||
-		(cluster.data.size() > 0 && cluster.data.first() == 0x3e)
-	return !ignoredMessage
-}
-
-private Map parseReportAttributeMessage(String description) {
-	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
-		def nameAndValue = param.split(":")
-		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-	}
-	log.debug "Desc Map: $descMap"
-
-	Map resultMap = [:]
-	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
-		def value = getTemperature(descMap.value)
-		resultMap = getTemperatureResult(value)
-	}
-	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
-		resultMap = getBatteryResult(Integer.parseInt(descMap.value, 16))
-	}
-
-	return resultMap
-}
-
-private Map parseCustomMessage(String description) {
-	Map resultMap = [:]
-	if (description?.startsWith('temperature: ')) {
-		def value = zigbee.parseHATemperatureValue(description, "temperature: ", getTemperatureScale())
-		resultMap = getTemperatureResult(value)
-	}
-	return resultMap
-}
-
 private Map parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)
 
 	return zs.isAlarm1Set() ? getMoistureResult('wet') : getMoistureResult('dry')
 }
 
-def getTemperature(value) {
-	def celsius = Integer.parseInt(value, 16).shortValue() / 100
-	if(getTemperatureScale() == "C"){
-		return Math.round(celsius)
-	} else {
-		return Math.round(celsiusToFahrenheit(celsius))
-	}
-}
-
 private Map getBatteryResult(rawValue) {
 	log.debug "Battery rawValue = ${rawValue}"
 	def linkText = getLinkText(device)
@@ -238,40 +165,18 @@ private Map getBatteryResult(rawValue) {
 	return result
 }
 
-private Map getTemperatureResult(value) {
-	log.debug 'TEMP'
-	if (tempOffset) {
-		def offset = tempOffset as int
-		def v = value as int
-		value = v + offset
-	}
-    def descriptionText
-    if ( temperatureScale == 'C' )
-    	descriptionText = '{{ device.displayName }} was {{ value }}°C'
-    else
-    	descriptionText = '{{ device.displayName }} was {{ value }}°F'
-
-	return [
-		name: 'temperature',
-		value: value,
-		descriptionText: descriptionText,
-		translatable: true,
-		unit: temperatureScale
-	]
-}
-
 private Map getMoistureResult(value) {
 	log.debug "water"
-    def descriptionText
-    if ( value == "wet" )
-    	descriptionText = '{{ device.displayName }} is wet'
-    else
-    	descriptionText = '{{ device.displayName }} is dry'
+	def descriptionText
+	if (value == "wet")
+		descriptionText = '{{ device.displayName }} is wet'
+	else
+		descriptionText = '{{ device.displayName }} is dry'
 	return [
-		name: 'water',
-		value: value,
-		descriptionText: descriptionText,
-        translatable: true
+			name           : 'water',
+			value          : value,
+			descriptionText: descriptionText,
+			translatable   : true
 	]
 }
 
@@ -284,12 +189,10 @@ def ping() {
 
 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 1 0x20", "delay 200"
-	]
+	def refreshCmds = zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000) +
+			zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020)
 
-	return refreshCmds + enrollResponse()
+	return refreshCmds + zigbee.enrollResponse()
 }
 
 def configure() {
@@ -301,42 +204,3 @@ def configure() {
 	// battery minReport 30 seconds, maxReportTime 6 hrs by default
 	return refresh() + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) // 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() {
-	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/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy

@@ -17,7 +17,7 @@ import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 
 metadata {
-	definition (name: "SmartSense Motion Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition(name: "SmartSense Motion Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Motion Sensor"
 		capability "Configuration"
 		capability "Battery"
@@ -45,10 +45,10 @@ metadata {
 	preferences {
 		section {
 			image(name: 'educationalcontent', multiple: true, images: [
-				"http://cdn.device-gse.smartthings.com/Motion/Motion1.jpg",
-				"http://cdn.device-gse.smartthings.com/Motion/Motion2.jpg",
-				"http://cdn.device-gse.smartthings.com/Motion/Motion3.jpg"
-				])
+					"http://cdn.device-gse.smartthings.com/Motion/Motion1.jpg",
+					"http://cdn.device-gse.smartthings.com/Motion/Motion2.jpg",
+					"http://cdn.device-gse.smartthings.com/Motion/Motion3.jpg"
+			])
 		}
 		section {
 			input title: "Temperature Offset", description: "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'.", displayDuringSetup: false, type: "paragraph", element: "paragraph"
@@ -57,30 +57,30 @@ metadata {
 	}
 
 	tiles(scale: 2) {
-		multiAttributeTile(name:"motion", type: "generic", width: 6, height: 4){
-			tileAttribute ("device.motion", key: "PRIMARY_CONTROL") {
-				attributeState "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0"
-				attributeState "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff"
+		multiAttributeTile(name: "motion", type: "generic", width: 6, height: 4) {
+			tileAttribute("device.motion", key: "PRIMARY_CONTROL") {
+				attributeState "active", label: 'motion', icon: "st.motion.motion.active", backgroundColor: "#53a7c0"
+				attributeState "inactive", label: 'no motion', icon: "st.motion.motion.inactive", backgroundColor: "#ffffff"
 			}
 		}
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
-			state("temperature", label:'${currentValue}°', unit:"F",
-				backgroundColors:[
-					[value: 31, color: "#153591"],
-					[value: 44, color: "#1e9cbb"],
-					[value: 59, color: "#90d2a7"],
-					[value: 74, color: "#44b621"],
-					[value: 84, color: "#f1d801"],
-					[value: 95, color: "#d04e00"],
-					[value: 96, color: "#bc2323"]
-				]
+			state("temperature", label: '${currentValue}°', unit: "F",
+					backgroundColors: [
+							[value: 31, color: "#153591"],
+							[value: 44, color: "#1e9cbb"],
+							[value: 59, color: "#90d2a7"],
+							[value: 74, color: "#44b621"],
+							[value: 84, color: "#f1d801"],
+							[value: 95, color: "#d04e00"],
+							[value: 96, color: "#bc2323"]
+					]
 			)
 		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
-			state "battery", label:'${currentValue}% battery', unit:""
+			state "battery", label: '${currentValue}% battery', unit: ""
 		}
 		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(["motion", "temperature"])
@@ -90,116 +90,40 @@ metadata {
 
 def parse(String description) {
 	log.debug "description: $description"
-
-	Map map = [:]
-	if (description?.startsWith('catchall:')) {
-		map = parseCatchAllMessage(description)
-	}
-	else if (description?.startsWith('read attr -')) {
-		map = parseReportAttributeMessage(description)
-	}
-	else if (description?.startsWith('temperature: ')) {
-		map = parseCustomMessage(description)
-	}
-	else if (description?.startsWith('zone status')) {
-		map = parseIasMessage(description)
+	Map map = zigbee.getEvent(description)
+	if (!map) {
+		if (description?.startsWith('zone status')) {
+			map = parseIasMessage(description)
+		} else {
+			Map descMap = zigbee.parseDescriptionAsMap(description)
+			if (descMap?.clusterInt == 0x0001 && descMap.commandInt != 0x07 && descMap?.value) {
+				map = getBatteryResult(Integer.parseInt(descMap.value, 16))
+			} else if (descMap?.clusterInt == zigbee.TEMPERATURE_MEASUREMENT_CLUSTER && descMap.commandInt == 0x07) {
+				if (descMap.data[0] == "00") {
+					log.debug "TEMP REPORTING CONFIG RESPONSE: $descMap"
+					sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+				} else {
+					log.warn "TEMP REPORTING CONFIG FAILED- error code: ${descMap.data[0]}"
+				}
+			} else if (descMap.clusterInt == 0x0406 && descMap.attrInt == 0x0000) {
+				def value = descMap.value.endsWith("01") ? "active" : "inactive"
+				log.warn "Doing a read attr motion event"
+				resultMap = getMotionResult(value)
+			}
+		}
 	}
 
 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : [:]
 
 	if (description?.startsWith('enroll request')) {
-		List cmds = enrollResponse()
+		List cmds = zigbee.enrollResponse()
 		log.debug "enroll response: ${cmds}"
 		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
 	}
 	return result
 }
 
-private Map parseCatchAllMessage(String description) {
-	Map resultMap = [:]
-	def cluster = zigbee.parse(description)
-	if (shouldProcessMessage(cluster)) {
-		switch(cluster.clusterId) {
-			case 0x0001:
-				// 0x07 - configure reporting
-				if (cluster.command != 0x07) {
-					resultMap = getBatteryResult(cluster.data.last())
-				}
-				break
-
-			case 0x0402:
-				if (cluster.command == 0x07) {
-					if (cluster.data[0] == 0x00) {
-						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
-					}
-					else {
-						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
-					}
-
-				}
-				else {
-					// temp is last 2 data values. reverse to swap endian
-					String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
-					def value = getTemperature(temp)
-					resultMap = getTemperatureResult(value)
-				}
-				break
-
-			case 0x0406:
-				// 0x07 - configure reporting
-				if (cluster.command != 0x07) {
-					log.debug 'motion'
-					resultMap.name = 'motion'
-				}
-				break
-		}
-	}
-
-	return resultMap
-}
-
-private boolean shouldProcessMessage(cluster) {
-	// 0x0B is default response indicating message got through
-	boolean ignoredMessage = cluster.profileId != 0x0104 ||
-		cluster.command == 0x0B ||
-		(cluster.data.size() > 0 && cluster.data.first() == 0x3e)
-	return !ignoredMessage
-}
-
-private Map parseReportAttributeMessage(String description) {
-	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
-		def nameAndValue = param.split(":")
-		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-	}
-	log.debug "Desc Map: $descMap"
-
-	Map resultMap = [:]
-	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
-		def value = getTemperature(descMap.value)
-		resultMap = getTemperatureResult(value)
-	}
-	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
-		resultMap = getBatteryResult(Integer.parseInt(descMap.value, 16))
-	}
-	else if (descMap.cluster == "0406" && descMap.attrId == "0000") {
-		def value = descMap.value.endsWith("01") ? "active" : "inactive"
-		resultMap = getMotionResult(value)
-	}
-
-	return resultMap
-}
-
-private Map parseCustomMessage(String description) {
-	Map resultMap = [:]
-	if (description?.startsWith('temperature: ')) {
-		def value = zigbee.parseHATemperatureValue(description, "temperature: ", getTemperatureScale())
-		resultMap = getTemperatureResult(value)
-	}
-	return resultMap
-}
-
 private Map parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)
 
@@ -207,15 +131,6 @@ private Map parseIasMessage(String description) {
 	return (zs.isAlarm1Set() || zs.isAlarm2Set()) ? getMotionResult('active') : getMotionResult('inactive')
 }
 
-def getTemperature(value) {
-	def celsius = Integer.parseInt(value, 16).shortValue() / 100
-	if(getTemperatureScale() == "C"){
-		return Math.round(celsius)
-	} else {
-		return Math.round(celsiusToFahrenheit(celsius))
-	}
-}
-
 private Map getBatteryResult(rawValue) {
 	log.debug "Battery rawValue = ${rawValue}"
 	def linkText = getLinkText(device)
@@ -255,36 +170,14 @@ private Map getBatteryResult(rawValue) {
 	return result
 }
 
-private Map getTemperatureResult(value) {
-	log.debug 'TEMP'
-	if (tempOffset) {
-		def offset = tempOffset as int
-		def v = value as int
-		value = v + offset
-	}
-    def descriptionText
-    if ( temperatureScale == 'C' )
-    	descriptionText = '{{ device.displayName }} was {{ value }}°C'
-    else
-    	descriptionText = '{{ device.displayName }} was {{ value }}°F'
-
-	return [
-		name: 'temperature',
-		value: value,
-		descriptionText: descriptionText,
-		translatable: true,
-		unit: temperatureScale
-	]
-}
-
 private Map getMotionResult(value) {
 	log.debug 'motion'
 	String descriptionText = value == 'active' ? "{{ device.displayName }} detected motion" : "{{ device.displayName }} motion has stopped"
 	return [
-		name: 'motion',
-		value: value,
-		descriptionText: descriptionText,
-        translatable: true
+			name           : 'motion',
+			value          : value,
+			descriptionText: descriptionText,
+			translatable   : true
 	]
 }
 
@@ -292,17 +185,16 @@ private Map getMotionResult(value) {
  * PING is used by Device-Watch in attempt to reach the Device
  * */
 def ping() {
-	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
+	return zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020) // Read the Battery Level
 }
 
 def refresh() {
 	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"
-	]
 
-	return refreshCmds + enrollResponse()
+	def refreshCmds = zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020) +
+			zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000)
+
+	return refreshCmds + zigbee.enrollResponse()
 }
 
 def configure() {
@@ -314,42 +206,3 @@ def configure() {
 	// battery minReport 30 seconds, maxReportTime 6 hrs by default
 	return refresh() + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) // 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() {
-	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/smartsense-motion.src/smartsense-motion.groovy

@@ -45,7 +45,7 @@ metadata {
 
 def parse(String description) {
 	def results = [:]
-	if (isZoneType19(description) || !isSupportedDescription(description)) {
+	if (description.startsWith("zone") || !isSupportedDescription(description)) {
 		results = parseBasicMessage(description)
 	}
 	else if (isMotionStatusMessage(description)){
@@ -87,16 +87,12 @@ private String parseName(String description) {
 }
 
 private String parseValue(String description) {
-	if (isZoneType19(description)) {
-		if (translateStatusZoneType19(description)) {
-			return "active"
-		}
-		else {
-			return "inactive"
-		}
+	def zs = zigbee.parseZoneStatus(description)
+	if (zs) {
+		zs.isAlarm1Set() ? "active" : "inactive"
+	} else {
+		description
 	}
-
-	description
 }
 
 private parseDescriptionText(String linkText, String value, String description) {

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

@@ -14,22 +14,23 @@
  *  under the License.
  */
 import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
+import physicalgraph.zigbee.zcl.DataType
 
 metadata {
-	definition (name: "SmartSense Multi Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition(name: "SmartSense Multi Sensor", namespace: "smartthings", author: "SmartThings") {
 
 		capability "Three Axis"
 		capability "Battery"
 		capability "Configuration"
 		capability "Sensor"
- 		capability "Contact Sensor"
- 		capability "Acceleration Sensor"
- 		capability "Refresh"
- 		capability "Temperature Measurement"
+		capability "Contact Sensor"
+		capability "Acceleration Sensor"
+		capability "Refresh"
+		capability "Temperature Measurement"
 		capability "Health Check"
 
- 		command "enrollResponse"
- 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05,FC02", outClusters: "0019", manufacturer: "CentraLite", model: "3320"
+		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,000F,0020,0402,0500,FC02", outClusters: "0019", manufacturer: "SmartThings", model: "multiv4", deviceJoinName: "Multipurpose Sensor"
@@ -57,11 +58,11 @@ metadata {
 	preferences {
 		section {
 			image(name: 'educationalcontent', multiple: true, images: [
-				"http://cdn.device-gse.smartthings.com/Multi/Multi1.jpg",
-				"http://cdn.device-gse.smartthings.com/Multi/Multi2.jpg",
-				"http://cdn.device-gse.smartthings.com/Multi/Multi3.jpg",
-				"http://cdn.device-gse.smartthings.com/Multi/Multi4.jpg"
-				])
+					"http://cdn.device-gse.smartthings.com/Multi/Multi1.jpg",
+					"http://cdn.device-gse.smartthings.com/Multi/Multi2.jpg",
+					"http://cdn.device-gse.smartthings.com/Multi/Multi3.jpg",
+					"http://cdn.device-gse.smartthings.com/Multi/Multi4.jpg"
+			])
 		}
 		section {
 			input title: "Temperature Offset", description: "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'.", displayDuringSetup: false, type: "paragraph", element: "paragraph"
@@ -73,211 +74,170 @@ metadata {
 	}
 
 	tiles(scale: 2) {
-		multiAttributeTile(name:"status", type: "generic", width: 6, height: 4){
-			tileAttribute ("device.status", key: "PRIMARY_CONTROL") {
-				attributeState "open", label:'Open', icon:"st.contact.contact.open", backgroundColor:"#ffa81e"
-				attributeState "closed", label:'Closed', icon:"st.contact.contact.closed", backgroundColor:"#79b821"
-				attributeState "garage-open", label:'Open', icon:"st.doors.garage.garage-open", backgroundColor:"#ffa81e"
-				attributeState "garage-closed", label:'Closed', icon:"st.doors.garage.garage-closed", backgroundColor:"#79b821"
+		multiAttributeTile(name: "status", type: "generic", width: 6, height: 4) {
+			tileAttribute("device.status", key: "PRIMARY_CONTROL") {
+				attributeState "open", label: 'Open', icon: "st.contact.contact.open", backgroundColor: "#ffa81e"
+				attributeState "closed", label: 'Closed', icon: "st.contact.contact.closed", backgroundColor: "#79b821"
+				attributeState "garage-open", label: 'Open', icon: "st.doors.garage.garage-open", backgroundColor: "#ffa81e"
+				attributeState "garage-closed", label: 'Closed', icon: "st.doors.garage.garage-closed", backgroundColor: "#79b821"
 			}
 		}
 		standardTile("contact", "device.contact", width: 2, height: 2) {
-			state("open", label:'Open', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
-			state("closed", label:'Closed', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
+			state("open", label: 'Open', icon: "st.contact.contact.open", backgroundColor: "#ffa81e")
+			state("closed", label: 'Closed', icon: "st.contact.contact.closed", backgroundColor: "#79b821")
 		}
 		standardTile("acceleration", "device.acceleration", width: 2, height: 2) {
-			state("active", label:'Active', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
-			state("inactive", label:'Inactive', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff")
+			state("active", label: 'Active', icon: "st.motion.acceleration.active", backgroundColor: "#53a7c0")
+			state("inactive", label: 'Inactive', icon: "st.motion.acceleration.inactive", backgroundColor: "#ffffff")
 		}
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
-			state("temperature", label:'${currentValue}°',
-				backgroundColors:[
-					[value: 31, color: "#153591"],
-					[value: 44, color: "#1e9cbb"],
-					[value: 59, color: "#90d2a7"],
-					[value: 74, color: "#44b621"],
-					[value: 84, color: "#f1d801"],
-					[value: 95, color: "#d04e00"],
-					[value: 96, color: "#bc2323"]
-				]
+			state("temperature", label: '${currentValue}°',
+					backgroundColors: [
+							[value: 31, color: "#153591"],
+							[value: 44, color: "#1e9cbb"],
+							[value: 59, color: "#90d2a7"],
+							[value: 74, color: "#44b621"],
+							[value: 84, color: "#f1d801"],
+							[value: 95, color: "#d04e00"],
+							[value: 96, color: "#bc2323"]
+					]
 			)
 		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
-			state "battery", label:'${currentValue}% battery', unit:""
+			state "battery", label: '${currentValue}% battery', unit: ""
 		}
 		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", "battery", "refresh"])
 	}
- }
+}
 
 def parse(String description) {
-	Map map = [:]
-	if (description?.startsWith('catchall:')) {
-		map = parseCatchAllMessage(description)
-	}
-	else if (description?.startsWith('temperature: ')) {
-		map = parseCustomMessage(description)
-	}
-	else if (description?.startsWith('zone status')) {
-		map = parseIasMessage(description)
+	def maps = []
+	maps << zigbee.getEvent(description)
+	if (!maps[0]) {
+		maps = []
+		if (description?.startsWith('zone status')) {
+			maps += parseIasMessage(description)
+		} else {
+			Map descMap = zigbee.parseDescriptionAsMap(description)
+			if (descMap?.clusterInt == 0x0001 && descMap.commandInt != 0x07 && descMap?.value) {
+				maps << getBatteryResult(Integer.parseInt(descMap.value, 16))
+			} else if (descMap?.clusterInt == zigbee.TEMPERATURE_MEASUREMENT_CLUSTER && descMap.commandInt == 0x07) {
+				if (descMap.data[0] == "00") {
+					log.debug "TEMP REPORTING CONFIG RESPONSE: $descMap"
+					sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+				} else {
+					log.warn "TEMP REPORTING CONFIG FAILED- error code: ${descMap.data[0]}"
+				}
+			} else {
+
+				maps += handleAcceleration(descMap)
+			}
+		}
+	} else if (maps[0].name == "temperature") {
+		def map = maps[0]
+		if (tempOffset) {
+			map.value = (int) map.value + (int) tempOffset
+		}
+		map.descriptionText = temperatureScale == 'C' ? '{{ device.displayName }} was {{ value }}°C' : '{{ device.displayName }} was {{ value }}°F'
+		map.translatable = true
 	}
 
-	def result = map ? createEvent(map) : [:]
-
+	def result = maps.inject([]) {acc, it ->
+		if (it) {
+			acc << createEvent(it)
+		}
+	}
 	if (description?.startsWith('enroll request')) {
-		List cmds = enrollResponse()
+		List cmds = zigbee.enrollResponse()
 		log.debug "enroll response: ${cmds}"
 		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
 	}
-	else if (description?.startsWith('read attr -')) {
-		result = parseReportAttributeMessage(description).each { createEvent(it) }
+	return result
+}
+
+private List<Map> handleAcceleration(descMap) {
+	def result = []
+	if (descMap.clusterInt == 0xFC02 && descMap.attrInt == 0x0010) {
+		def value = descMap.value == "01" ? "active" : "inactive"
+		log.debug "Acceleration $value"
+		result << [
+				name           : "acceleration",
+				value          : value,
+				descriptionText: "{{ device.displayName }} was $value",
+				isStateChange  : isStateChange(device, "acceleration", value),
+				translatable   : true
+		]
+
+		if (descMap.additionalAttrs) {
+			result += parseAxis(descMap.additionalAttrs)
+		}
+	} else if (descMap.clusterInt == 0xFC02 && descMap.attrInt == 0x0012) {
+		def addAttrs = descMap.additionalAttrs
+		addAttrs << ["attrInt": descMap.attrInt, "value": descMap.value]
+		result += parseAxis(addAttrs)
 	}
 	return result
 }
 
-private Map parseCatchAllMessage(String description) {
-	Map resultMap = [:]
-	def cluster = zigbee.parse(description)
-	log.debug cluster
-	if (shouldProcessMessage(cluster)) {
-		switch(cluster.clusterId) {
-			case 0x0001:
-				// 0x07 - configure reporting
-				if (cluster.command != 0x07) {
-					resultMap = getBatteryResult(cluster.data.last())
-				}
-			break
+private List<Map> parseAxis(List<Map> attrData) {
+	def results = []
+	def x = hexToSignedInt(attrData.find { it.attrInt == 0x0012 }?.value)
+	def y = hexToSignedInt(attrData.find { it.attrInt == 0x0013 }?.value)
+	def z = hexToSignedInt(attrData.find { it.attrInt == 0x0014 }?.value)
 
-			case 0xFC02:
-				log.debug 'ACCELERATION'
-			break
-
-			case 0x0402:
-				if (cluster.command == 0x07) {
-					if(cluster.data[0] == 0x00) {
-						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
-					}
-					else {
-						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
-					}
-				}
-				else {
-					// temp is last 2 data values. reverse to swap endian
-					String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
-					def value = getTemperature(temp)
-					resultMap = getTemperatureResult(value)
-				}
-			break
-		}
+	def xyzResults = [:]
+	if (device.getDataValue("manufacturer") == "SmartThings") {
+		// This mapping matches the current behavior of the Device Handler for the Centralite sensors
+		xyzResults.x = z
+		xyzResults.y = y
+		xyzResults.z = -x
+	} else {
+		// The axises reported by the Device Handler differ from the axises reported by the sensor
+		// This may change in the future
+		xyzResults.x = z
+		xyzResults.y = x
+		xyzResults.z = y
 	}
 
-	return resultMap
+	log.debug "parseAxis -- ${xyzResults}"
+
+	if (garageSensor == "Yes")
+		results += garageEvent(xyzResults.z)
+
+	def value = "${xyzResults.x},${xyzResults.y},${xyzResults.z}"
+	results << [
+			name           : "threeAxis",
+			value          : value,
+			linkText       : getLinkText(device),
+			descriptionText: "${getLinkText(device)} was ${value}",
+			handlerName    : name,
+			isStateChange  : isStateChange(device, "threeAxis", value),
+			displayed      : false
+	]
+	results
 }
 
-private boolean shouldProcessMessage(cluster) {
-	// 0x0B is default response indicating message got through
-	boolean ignoredMessage = cluster.profileId != 0x0104 ||
-	cluster.command == 0x0B ||
-	(cluster.data.size() > 0 && cluster.data.first() == 0x3e)
-	return !ignoredMessage
-}
-
-private List parseReportAttributeMessage(String description) {
-	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
-		def nameAndValue = param.split(":")
-		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-	}
-
-	List result = []
-	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
-		def value = getTemperature(descMap.value)
-		result << getTemperatureResult(value)
-	}
-	else if (descMap.cluster == "FC02" && descMap.attrId == "0010") {
-		if (descMap.value.size() == 32) {
-			// value will look like 00ae29001403e2290013001629001201
-			// breaking this apart and swapping byte order where appropriate, this breaks down to:
-			//   X (0x0012) = 0x0016
-			//   Y (0x0013) = 0x03E2
-			//   Z (0x0014) = 0x00AE
-			// note that there is a known bug in that the x,y,z attributes are interpreted in the wrong order
-			// this will be fixed in a future update
-			def threeAxisAttributes = descMap.value[0..-9]
-			result << parseAxis(threeAxisAttributes)
-			descMap.value = descMap.value[-2..-1]
-		}
-		result << getAccelerationResult(descMap.value)
-	}
-	else if (descMap.cluster == "FC02" && descMap.attrId == "0012" && descMap.value.size() == 24) {
-		// 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))
-	}
-
-	return result
-}
-
-private Map parseCustomMessage(String description) {
-	Map resultMap = [:]
-	if (description?.startsWith('temperature: ')) {
-		def value = zigbee.parseHATemperatureValue(description, "temperature: ", getTemperatureScale())
-		resultMap = getTemperatureResult(value)
-	}
-	return resultMap
-}
-
-private Map parseIasMessage(String description) {
+private List<Map> parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)
-	Map resultMap = [:]
+	List<Map> results = []
 
-			if (garageSensor != "Yes"){
-		resultMap = zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
-			}
+	if (garageSensor != "Yes") {
+		def value = zs.isAlarm1Set() ? 'open' : 'closed'
+		log.debug "Contact: ${device.displayName} value = ${value}"
+		def descriptionText = value == 'open' ? '{{ device.displayName }} was opened' : '{{ device.displayName }} was closed'
+		results << [name: 'contact', value: value, descriptionText: descriptionText, displayed: false, translatable: true]
+		results << [name: 'status', value: value, descriptionText: descriptionText, translatable: true]
+	}
 
-	return resultMap
+	return results
 }
 
-def updated() {
-	log.debug "updated called"
-	log.info "garage value : $garageSensor"
-	if (garageSensor == "Yes") {
-		def descriptionText = "Updating device to garage sensor"
-		if (device.latestValue("status") == "open") {
-			sendEvent(name: 'status', value: 'garage-open', descriptionText: descriptionText, translatable: true)
-		}
-		else if (device.latestValue("status") == "closed") {
-			sendEvent(name: 'status', value: 'garage-closed', descriptionText: descriptionText, translatable: true)
-		}
-	}
-	else {
-		def descriptionText = "Updating device to open/close sensor"
-		if (device.latestValue("status") == "garage-open") {
-			sendEvent(name: 'status', value: 'open', descriptionText: descriptionText, translatable: true)
-		}
-		else if (device.latestValue("status") == "garage-closed") {
-			sendEvent(name: 'status', value: 'closed', descriptionText: descriptionText, translatable: true)
-		}
-	}
-}
-
-def getTemperature(value) {
-	def celsius = Integer.parseInt(value, 16).shortValue() / 100
-	if(getTemperatureScale() == "C"){
-		return Math.round(celsius)
-		} else {
-			return Math.round(celsiusToFahrenheit(celsius))
-		}
-	}
-
 private Map getBatteryResult(rawValue) {
 	log.debug "Battery rawValue = ${rawValue}"
 
@@ -316,54 +276,24 @@ private Map getBatteryResult(rawValue) {
 	return result
 }
 
-private Map getTemperatureResult(value) {
-	log.debug "Temperature"
-	if (tempOffset) {
-		def offset = tempOffset as int
-		def v = value as int
-		value = v + offset
+List<Map> garageEvent(zValue) {
+	List<Map> results = []
+	def absValue = zValue.abs()
+	def contactValue = null
+	def garageValue = null
+	if (absValue > 900) {
+		contactValue = 'closed'
+		garageValue = 'garage-closed'
+	} else if (absValue < 100) {
+		contactValue = 'open'
+		garageValue = 'garage-open'
 	}
-	def descriptionText = temperatureScale == 'C' ? '{{ device.displayName }} was {{ value }}°C':
-			'{{ device.displayName }} was {{ value }}°F'
-
-	return [
-		name: 'temperature',
-		value: value,
-		descriptionText: descriptionText,
-		translatable: true,
-		unit: temperatureScale
-	]
-}
-
-private Map getContactResult(value) {
-	log.debug "Contact: ${device.displayName} value = ${value}"
-	def descriptionText = value == 'open' ? '{{ device.displayName }} was opened' : '{{ device.displayName }} was closed'
-	sendEvent(name: 'contact', value: value, descriptionText: descriptionText, displayed: false, translatable: true)
-	return [name: 'status', value: value, descriptionText: descriptionText, translatable: true]
-}
-
-private getAccelerationResult(numValue) {
-	log.debug "Acceleration"
-	def name = "acceleration"
-    def value
-    def descriptionText
-
-	if ( numValue.endsWith("1") ) {
-    	value = "active"
-        descriptionText = '{{ device.displayName }} was active'
-    } else {
-    	value = "inactive"
-        descriptionText = '{{ device.displayName }} was inactive'
-    }
-
-	def isStateChange = isStateChange(device, name, value)
-	return [
-		name: name,
-		value: value,
-		descriptionText: descriptionText,
-		isStateChange: isStateChange,
-		translatable: true
-	]
+	if (contactValue != null) {
+		def descriptionText = contactValue == 'open' ? '{{ device.displayName }} was opened' : '{{ device.displayName }} was closed'
+		results << [name: 'contact', value: contactValue, descriptionText: descriptionText, displayed: false, translatable: true]
+		results << [name: 'status', value: garageValue, descriptionText: descriptionText, translatable: true]
+	}
+	results
 }
 
 /**
@@ -376,27 +306,12 @@ def ping() {
 def refresh() {
 	log.debug "Refreshing Values "
 
-	def refreshCmds = []
+	def refreshCmds = zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000) +
+			zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020) +
+			zigbee.readAttribute(0xFC02, 0x0010, [mfgCode: manufacturerCode]) +
+			zigbee.enrollResponse()
 
-	if (device.getDataValue("manufacturer") == "SmartThings") {
-		log.debug "Refreshing Values for manufacturer: SmartThings "
-		/* These values of Motion Threshold Multiplier(0x01) and Motion Threshold (0x0276)
-            seem to be giving pretty accurate results for the XYZ co-ordinates for this manufacturer.
-            Separating these out in a separate if-else because I do not want to touch Centralite part
-            as of now.
-        */
-		refreshCmds += zigbee.writeAttribute(0xFC02, 0x0000, 0x20, 0x01, [mfgCode: manufacturerCode])
-		refreshCmds += zigbee.writeAttribute(0xFC02, 0x0002, 0x21, 0x0276, [mfgCode: manufacturerCode])
-	} else {
-		refreshCmds += zigbee.writeAttribute(0xFC02, 0x0000, 0x20, 0x02, [mfgCode: manufacturerCode])
-	}
-
-	//Common refresh commands
-	refreshCmds += zigbee.readAttribute(0x0402, 0x0000) +
-			zigbee.readAttribute(0x0001, 0x0020) +
-			zigbee.readAttribute(0xFC02, 0x0010, [mfgCode: manufacturerCode])
-
-	return refreshCmds + enrollResponse()
+	return refreshCmds
 }
 
 def configure() {
@@ -405,61 +320,54 @@ def configure() {
 	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 
 	log.debug "Configuring Reporting"
+	def configCmds = []
+
+	if (device.getDataValue("manufacturer") == "SmartThings") {
+		log.debug "Refreshing Values for manufacturer: SmartThings "
+		/* These values of Motion Threshold Multiplier(0x01) and Motion Threshold (0x0276)
+            seem to be giving pretty accurate results for the XYZ co-ordinates for this manufacturer.
+            Separating these out in a separate if-else because I do not want to touch Centralite part
+            as of now.
+        */
+		configCmds += zigbee.writeAttribute(0xFC02, 0x0000, 0x20, 0x01, [mfgCode: manufacturerCode])
+		configCmds += zigbee.writeAttribute(0xFC02, 0x0002, 0x21, 0x0276, [mfgCode: manufacturerCode])
+	} else {
+		// Write a motion threshold of 2 * .063g = .126g
+		// Currently due to a Centralite firmware issue, this will cause a read attribute response that
+		// indicates acceleration even when there isn't.
+		configCmds += zigbee.writeAttribute(0xFC02, 0x0000, 0x20, 0x02, [mfgCode: manufacturerCode])
+	}
 
 	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
 	// battery minReport 30 seconds, maxReportTime 6 hrs by default
-	def configCmds = zigbee.batteryConfig() +
+	configCmds += zigbee.batteryConfig() +
 			zigbee.temperatureConfig(30, 300) +
-			zigbee.configureReporting(0xFC02, 0x0010, 0x18, 10, 3600, 0x01, [mfgCode: manufacturerCode]) +
-			zigbee.configureReporting(0xFC02, 0x0012, 0x29, 1, 3600, 0x0001, [mfgCode: manufacturerCode]) +
-			zigbee.configureReporting(0xFC02, 0x0013, 0x29, 1, 3600, 0x0001, [mfgCode: manufacturerCode]) +
-			zigbee.configureReporting(0xFC02, 0x0014, 0x29, 1, 3600, 0x0001, [mfgCode: manufacturerCode])
+			zigbee.configureReporting(0xFC02, 0x0010, DataType.BITMAP8, 10, 3600, 0x01, [mfgCode: manufacturerCode]) +
+			zigbee.configureReporting(0xFC02, 0x0012, DataType.INT16, 1, 3600, 0x0001, [mfgCode: manufacturerCode]) +
+			zigbee.configureReporting(0xFC02, 0x0013, DataType.INT16, 1, 3600, 0x0001, [mfgCode: manufacturerCode]) +
+			zigbee.configureReporting(0xFC02, 0x0014, DataType.INT16, 1, 3600, 0x0001, [mfgCode: manufacturerCode])
 
 	return refresh() + configCmds
 }
 
-private getEndpointId() {
-	new BigInteger(device.endpointId, 16).toString()
-}
-
-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}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
-	]
-}
-
-private Map parseAxis(String description) {
-	def z = hexToSignedInt(description[0..3])
-	def y = hexToSignedInt(description[10..13])
-	def x = hexToSignedInt(description[20..23])
-	def xyzResults = [x: x, y: y, z: z]
-
-	if (device.getDataValue("manufacturer") == "SmartThings") {
-		// This mapping matches the current behavior of the Device Handler for the Centralite sensors
-		xyzResults.x = z
-		xyzResults.y = y
-		xyzResults.z = -x
+def updated() {
+	log.debug "updated called"
+	log.info "garage value : $garageSensor"
+	if (garageSensor == "Yes") {
+		def descriptionText = "Updating device to garage sensor"
+		if (device.latestValue("status") == "open") {
+			sendEvent(name: 'status', value: 'garage-open', descriptionText: descriptionText, translatable: true)
+		} else if (device.latestValue("status") == "closed") {
+			sendEvent(name: 'status', value: 'garage-closed', descriptionText: descriptionText, translatable: true)
+		}
 	} else {
-		// The axises reported by the Device Handler differ from the axises reported by the sensor
-		// This may change in the future
-		xyzResults.x = z
-		xyzResults.y = x
-		xyzResults.z = y
+		def descriptionText = "Updating device to open/close sensor"
+		if (device.latestValue("status") == "garage-open") {
+			sendEvent(name: 'status', value: 'open', descriptionText: descriptionText, translatable: true)
+		} else if (device.latestValue("status") == "garage-closed") {
+			sendEvent(name: 'status', value: 'closed', descriptionText: descriptionText, translatable: true)
+		}
 	}
-
-	log.debug "parseAxis -- ${xyzResults}"
-
-	if (garageSensor == "Yes")
-		garageEvent(xyzResults.z)
-
-	getXyzResult(xyzResults, description)
 }
 
 private hexToSignedInt(hexVal) {
@@ -467,44 +375,6 @@ private hexToSignedInt(hexVal) {
 	unsignedVal > 32767 ? unsignedVal - 65536 : unsignedVal
 }
 
-def garageEvent(zValue) {
-	def absValue = zValue.abs()
-	def contactValue = null
-	def garageValue = null
-	if (absValue>900) {
-		contactValue = 'closed'
-		garageValue = 'garage-closed'
-	}
-	else if (absValue < 100) {
-		contactValue = 'open'
-		garageValue = 'garage-open'
-	}
-	if (contactValue != null){
-		def descriptionText = contactValue == 'open' ? '{{ device.displayName }} was opened' :'{{ device.displayName }} was closed'
-		sendEvent(name: 'contact', value: contactValue, descriptionText: descriptionText, displayed:false, translatable: true)
-		sendEvent(name: 'status', value: garageValue, descriptionText: descriptionText, translatable: true)
-	}
-}
-
-private Map getXyzResult(results, description) {
-	def name = "threeAxis"
-	def value = "${results.x},${results.y},${results.z}"
-	def linkText = getLinkText(device)
-	def descriptionText = "$linkText was $value"
-	def isStateChange = isStateChange(device, name, value)
-
-	[
-		name: name,
-		value: value,
-		unit: null,
-		linkText: linkText,
-		descriptionText: descriptionText,
-		handlerName: name,
-		isStateChange: isStateChange,
-		displayed: false
-	]
-}
-
 private getManufacturerCode() {
 	if (device.getDataValue("manufacturer") == "SmartThings") {
 		return "0x110A"
@@ -516,25 +386,3 @@ private getManufacturerCode() {
 private hexToInt(value) {
 	new BigInteger(value, 16)
 }
-
-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/smartsense-multi.src/smartsense-multi.groovy

@@ -86,7 +86,7 @@ metadata {
 def parse(String description) {
 	def results
 
-	if (!isSupportedDescription(description) || zigbee.isZoneType19(description)) {
+	if (!isSupportedDescription(description) || description.startsWith("zone")) {
 		results = parseSingleMessage(description)
 	}
 	else if (description == 'updated') {
@@ -488,12 +488,7 @@ private String parseValue(String description) {
 	if (!isSupportedDescription(description)) {
 		return description
 	}
-	else if (zigbee.translateStatusZoneType19(description)) {
-		return "open"
-	}
-	else {
-		return "closed"
-	}
+	return zigbee.parseZoneStatus(description)?.isAlarm1Set() ? "open" : "closed"
 }
 
 private parseDescriptionText(String linkText, String value, String description) {

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

@@ -16,7 +16,7 @@
 import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 metadata {
-	definition (name: "SmartSense Open/Closed Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition(name: "SmartSense Open/Closed Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Battery"
 		capability "Configuration"
 		capability "Contact Sensor"
@@ -43,155 +43,77 @@ metadata {
 	}
 
 	tiles(scale: 2) {
-		multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4){
-			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
-				attributeState "open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e"
-				attributeState "closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821"
+		multiAttributeTile(name: "contact", type: "generic", width: 6, height: 4) {
+			tileAttribute("device.contact", key: "PRIMARY_CONTROL") {
+				attributeState "open", label: '${name}', icon: "st.contact.contact.open", backgroundColor: "#ffa81e"
+				attributeState "closed", label: '${name}', icon: "st.contact.contact.closed", backgroundColor: "#79b821"
 			}
 		}
 
 		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
-			state "temperature", label:'${currentValue}°',
-				backgroundColors:[
-					[value: 31, color: "#153591"],
-					[value: 44, color: "#1e9cbb"],
-					[value: 59, color: "#90d2a7"],
-					[value: 74, color: "#44b621"],
-					[value: 84, color: "#f1d801"],
-					[value: 95, color: "#d04e00"],
-					[value: 96, color: "#bc2323"]
-				]
+			state "temperature", label: '${currentValue}°',
+					backgroundColors: [
+							[value: 31, color: "#153591"],
+							[value: 44, color: "#1e9cbb"],
+							[value: 59, color: "#90d2a7"],
+							[value: 74, color: "#44b621"],
+							[value: 84, color: "#f1d801"],
+							[value: 95, color: "#d04e00"],
+							[value: 96, color: "#bc2323"]
+					]
 		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
-			state "battery", label:'${currentValue}% battery', unit:""
+			state "battery", label: '${currentValue}% battery', unit: ""
 		}
 
 		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 (["contact", "temperature"])
-		details(["contact","temperature","battery","refresh"])
+		main(["contact", "temperature"])
+		details(["contact", "temperature", "battery", "refresh"])
 	}
 }
 
 def parse(String description) {
 	log.debug "description: $description"
 
-	Map map = [:]
-	if (description?.startsWith('catchall:')) {
-		map = parseCatchAllMessage(description)
+	Map map = zigbee.getEvent(description)
+	if (!map) {
+		if (description?.startsWith('zone status')) {
+			map = parseIasMessage(description)
+		} else {
+			Map descMap = zigbee.parseDescriptionAsMap(description)
+			if (descMap?.clusterInt == 0x0001 && descMap.commandInt != 0x07 && descMap?.value) {
+				map = getBatteryResult(Integer.parseInt(descMap.value, 16))
+			} else if (descMap?.clusterInt == zigbee.TEMPERATURE_MEASUREMENT_CLUSTER && descMap.commandInt == 0x07) {
+				if (descMap.data[0] == "00") {
+					log.debug "TEMP REPORTING CONFIG RESPONSE: $descMap"
+					sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+				} else {
+					log.warn "TEMP REPORTING CONFIG FAILED- error code: ${descMap.data[0]}"
+				}
+			}
+		}
 	}
-	else if (description?.startsWith('read attr -')) {
-		map = parseReportAttributeMessage(description)
-	}
-	else if (description?.startsWith('temperature: ')) {
-		map = parseCustomMessage(description)
-	}
-    else if (description?.startsWith('zone status')) {
-    	map = parseIasMessage(description)
-    }
 
 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : [:]
 
-    if (description?.startsWith('enroll request')) {
-    	List cmds = enrollResponse()
-        log.debug "enroll response: ${cmds}"
-        result = cmds?.collect { new physicalgraph.device.HubAction(it) }
-    }
-    return result
-}
-
-private Map parseCatchAllMessage(String description) {
-    Map resultMap = [:]
-    def cluster = zigbee.parse(description)
-    if (shouldProcessMessage(cluster)) {
-        switch(cluster.clusterId) {
-            case 0x0001:
-				// 0x07 - configure reporting
-				if (cluster.command != 0x07) {
-					resultMap = getBatteryResult(cluster.data.last())
-				}
-                break
-
-            case 0x0402:
-				if (cluster.command == 0x07){
-					if (cluster.data[0] == 0x00) {
-						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
-					}
-					else {
-						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
-					}
-				}
-				else {
-					// temp is last 2 data values. reverse to swap endian
-					String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
-					def value = getTemperature(temp)
-					resultMap = getTemperatureResult(value)
-				}
-                break
-        }
-    }
-
-    return resultMap
-}
-
-private boolean shouldProcessMessage(cluster) {
-    // 0x0B is default response indicating message got through
-    boolean ignoredMessage = cluster.profileId != 0x0104 ||
-        cluster.command == 0x0B ||
-        (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
-    return !ignoredMessage
-}
-
-private int getHumidity(value) {
-    return Math.round(Double.parseDouble(value))
-}
-
-private Map parseReportAttributeMessage(String description) {
-	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
-		def nameAndValue = param.split(":")
-		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
+	if (description?.startsWith('enroll request')) {
+		List cmds = zigbee.enrollResponse()
+		log.debug "enroll response: ${cmds}"
+		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
 	}
-	log.debug "Desc Map: $descMap"
-
-	Map resultMap = [:]
-	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
-		def value = getTemperature(descMap.value)
-		resultMap = getTemperatureResult(value)
-	}
-	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
-		resultMap = getBatteryResult(Integer.parseInt(descMap.value, 16))
-	}
-
-	return resultMap
+	return result
 }
 
-private Map parseCustomMessage(String description) {
-	Map resultMap = [:]
-	if (description?.startsWith('temperature: ')) {
-		def value = zigbee.parseHATemperatureValue(description, "temperature: ", getTemperatureScale())
-		resultMap = getTemperatureResult(value)
-	}
-	return resultMap
-}
 
 private Map parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)
 	return zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
 }
 
-def getTemperature(value) {
-	def celsius = Integer.parseInt(value, 16).shortValue() / 100
-	if(getTemperatureScale() == "C"){
-		return celsius
-	} else {
-		return celsiusToFahrenheit(celsius) as Integer
-	}
-}
-
 private Map getBatteryResult(rawValue) {
 	log.debug 'Battery'
 	def linkText = getLinkText(device)
@@ -204,8 +126,8 @@ private Map getBatteryResult(rawValue) {
 		def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
 		def roundedPct = Math.round(pct * 100)
-	    if (roundedPct <= 0)
-		    roundedPct = 1
+		if (roundedPct <= 0)
+			roundedPct = 1
 		result.value = Math.min(100, roundedPct)
 		result.descriptionText = "${linkText} battery was ${result.value}%"
 		result.name = 'battery'
@@ -214,31 +136,14 @@ private Map getBatteryResult(rawValue) {
 	return result
 }
 
-private Map getTemperatureResult(value) {
-	log.debug 'TEMP'
-	def linkText = getLinkText(device)
-	if (tempOffset) {
-		def offset = tempOffset as int
-		def v = value as int
-		value = v + offset
-	}
-	def descriptionText = "${linkText} was ${value}°${temperatureScale}"
-	return [
-		name: 'temperature',
-		value: value,
-		descriptionText: descriptionText,
-		unit: temperatureScale
-	]
-}
-
 private Map getContactResult(value) {
 	log.debug 'Contact Status'
 	def linkText = getLinkText(device)
 	def descriptionText = "${linkText} was ${value == 'open' ? 'opened' : 'closed'}"
 	return [
-		name: 'contact',
-		value: value,
-		descriptionText: descriptionText
+			name           : 'contact',
+			value          : value,
+			descriptionText: descriptionText
 	]
 }
 
@@ -251,12 +156,10 @@ def ping() {
 
 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 1 0x20", "delay 200"
-	]
+	def refreshCmds = zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000) +
+			zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020)
 
-	return refreshCmds + enrollResponse()
+	return refreshCmds + zigbee.enrollResponse()
 }
 
 def configure() {
@@ -268,44 +171,5 @@ def configure() {
 
 	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
 	// battery minReport 30 seconds, maxReportTime 6 hrs by default
-    return refresh() + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) // 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() {
-	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
+	return refresh() + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) // send refresh cmds as part of config
 }

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

@@ -13,8 +13,10 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+import physicalgraph.zigbee.zcl.DataType
+
 metadata {
-	definition (name: "SmartSense Temp/Humidity Sensor",namespace: "smartthings", author: "SmartThings") {
+	definition(name: "SmartSense Temp/Humidity Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Configuration"
 		capability "Battery"
 		capability "Refresh"
@@ -31,7 +33,7 @@ metadata {
 		status 'H 45': 'catchall: 0104 FC45 01 01 0140 00 D9B9 00 04 C2DF 0A 01 0000218911'
 		status 'H 57': 'catchall: 0104 FC45 01 01 0140 00 4E55 00 04 C2DF 0A 01 0000211316'
 		status 'H 53': 'catchall: 0104 FC45 01 01 0140 00 20CD 00 04 C2DF 0A 01 0000219814'
-		status 'H 43':  'read attr - raw: BF7601FC450C00000021A410, dni: BF76, endpoint: 01, cluster: FC45, size: 0C, attrId: 0000, result: success, encoding: 21, value: 10a4'
+		status 'H 43': 'read attr - raw: BF7601FC450C00000021A410, dni: BF76, endpoint: 01, cluster: FC45, size: 0C, attrId: 0000, result: success, encoding: 21, value: 10a4'
 	}
 
 	preferences {
@@ -40,28 +42,28 @@ metadata {
 	}
 
 	tiles(scale: 2) {
-		multiAttributeTile(name:"temperature", type: "generic", width: 6, height: 4){
-			tileAttribute ("device.temperature", key: "PRIMARY_CONTROL") {
-				attributeState "temperature", label:'${currentValue}°',
-					backgroundColors:[
-						[value: 31, color: "#153591"],
-						[value: 44, color: "#1e9cbb"],
-						[value: 59, color: "#90d2a7"],
-						[value: 74, color: "#44b621"],
-						[value: 84, color: "#f1d801"],
-						[value: 95, color: "#d04e00"],
-						[value: 96, color: "#bc2323"]
-					]
+		multiAttributeTile(name: "temperature", type: "generic", width: 6, height: 4) {
+			tileAttribute("device.temperature", key: "PRIMARY_CONTROL") {
+				attributeState "temperature", label: '${currentValue}°',
+						backgroundColors: [
+								[value: 31, color: "#153591"],
+								[value: 44, color: "#1e9cbb"],
+								[value: 59, color: "#90d2a7"],
+								[value: 74, color: "#44b621"],
+								[value: 84, color: "#f1d801"],
+								[value: 95, color: "#d04e00"],
+								[value: 96, color: "#bc2323"]
+						]
 			}
 		}
 		valueTile("humidity", "device.humidity", inactiveLabel: false, width: 2, height: 2) {
-			state "humidity", label:'${currentValue}% humidity', unit:""
+			state "humidity", label: '${currentValue}% humidity', unit: ""
 		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
-			state "battery", label:'${currentValue}% battery'
+			state "battery", label: '${currentValue}% battery'
 		}
 		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 "temperature", "humidity"
@@ -72,142 +74,31 @@ metadata {
 def parse(String description) {
 	log.debug "description: $description"
 
-	Map map = [:]
-	if (description?.startsWith('catchall:')) {
-		map = parseCatchAllMessage(description)
-	}
-	else if (description?.startsWith('read attr -')) {
-		map = parseReportAttributeMessage(description)
-	}
-	else if (description?.startsWith('temperature: ') || description?.startsWith('humidity: ')) {
-		map = parseCustomMessage(description)
+	// getEvent will handle temperature and humidity
+	Map map = zigbee.getEvent(description)
+	if (!map) {
+		Map descMap = zigbee.parseDescriptionAsMap(description)
+		if (descMap.clusterInt == 0x0001 && descMap.commandInt != 0x07 && descMap?.value) {
+			map = getBatteryResult(Integer.parseInt(descMap.value, 16))
+		} else if (descMap?.clusterInt == zigbee.TEMPERATURE_MEASUREMENT_CLUSTER && descMap.commandInt == 0x07) {
+			if (descMap.data[0] == "00") {
+				log.debug "TEMP REPORTING CONFIG RESPONSE: $descMap"
+				sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+			} else {
+				log.warn "TEMP REPORTING CONFIG FAILED- error code: ${descMap.data[0]}"
+			}
+		}
 	}
 
 	log.debug "Parse returned $map"
 	return map ? createEvent(map) : [:]
 }
 
-private Map parseCatchAllMessage(String description) {
-    Map resultMap = [:]
-    def cluster = zigbee.parse(description)
-    if (shouldProcessMessage(cluster)) {
-        switch(cluster.clusterId) {
-            case 0x0001:
-				// 0x07 - configure reporting
-				if (cluster.command != 0x07) {
-					resultMap = getBatteryResult(cluster.data.last())
-				}
-                break
-
-            case 0x0402:
-				if (cluster.command == 0x07) {
-					if (cluster.data[0] == 0x00){
-						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
-					}
-					else {
-						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
-					}
-				}
-				else {
-					// temp is last 2 data values. reverse to swap endian
-					String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
-					def value = getTemperature(temp)
-					resultMap = getTemperatureResult(value)
-				}
-				break
-
-			case 0xFC45:
-				// 0x07 - configure reporting
-				if (cluster.command != 0x07) {
-					String pctStr = cluster.data[-1, -2].collect { Integer.toHexString(it) }.join('')
-					String display = Math.round(Integer.valueOf(pctStr, 16) / 100)
-					resultMap = getHumidityResult(display)
-				}
-                break
-        }
-    }
-
-    return resultMap
-}
-
-private boolean shouldProcessMessage(cluster) {
-    // 0x0B is default response indicating message got through
-    boolean ignoredMessage = cluster.profileId != 0x0104 ||
-        cluster.command == 0x0B ||
-        (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
-    return !ignoredMessage
-}
-
-private Map parseReportAttributeMessage(String description) {
-	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
-		def nameAndValue = param.split(":")
-		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-	}
-	log.debug "Desc Map: $descMap"
-
-	Map resultMap = [:]
-	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
-		def value = getTemperature(descMap.value)
-		resultMap = getTemperatureResult(value)
-	}
-	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
-		resultMap = getBatteryResult(Integer.parseInt(descMap.value, 16))
-	}
-	else if (descMap.cluster == "FC45" && descMap.attrId == "0000") {
-		def value = getReportAttributeHumidity(descMap.value)
-		resultMap = getHumidityResult(value)
-	}
-
-	return resultMap
-}
-
-def getReportAttributeHumidity(String value) {
-    def humidity = null
-    if (value?.trim()) {
-        try {
-        	// value is hex with no decimal
-            def pct = Integer.parseInt(value.trim(), 16) / 100
-            humidity = String.format('%.0f', pct)
-        } catch(NumberFormatException nfe) {
-            log.debug "Error converting $value to humidity"
-        }
-    }
-    return humidity
-}
-
-private Map parseCustomMessage(String description) {
-	Map resultMap = [:]
-	if (description?.startsWith('temperature: ')) {
-		def value = zigbee.parseHATemperatureValue(description, "temperature: ", getTemperatureScale())
-		resultMap = getTemperatureResult(value)
-	}
-	else if (description?.startsWith('humidity: ')) {
-		def pct = (description - "humidity: " - "%").trim()
-		if (pct.isNumber()) {
-			def value = Math.round(new BigDecimal(pct)).toString()
-			resultMap = getHumidityResult(value)
-		} else {
-			log.error "invalid humidity: ${pct}"
-		}
-	}
-	return resultMap
-}
-
-def getTemperature(value) {
-	def celsius = Integer.parseInt(value, 16).shortValue() / 100
-	if(getTemperatureScale() == "C"){
-		return celsius
-	} else {
-		return celsiusToFahrenheit(celsius) as Integer
-	}
-}
-
 private Map getBatteryResult(rawValue) {
 	log.debug 'Battery'
 	def linkText = getLinkText(device)
 
-    def result = [:]
+  def result = [:]
 
 	def volts = rawValue / 10
 	if (!(rawValue == 0 || rawValue == 255)) {
@@ -226,41 +117,22 @@ private Map getBatteryResult(rawValue) {
 	return result
 }
 
-private Map getTemperatureResult(value) {
-	log.debug 'TEMP'
-	def linkText = getLinkText(device)
-	if (tempOffset) {
-		def offset = tempOffset as int
-		def v = value as int
-		value = v + offset
-	}
-	def descriptionText = "${linkText} was ${value}°${temperatureScale}"
-	return [
-		name: 'temperature',
-		value: value,
-		descriptionText: descriptionText,
-		unit: temperatureScale
-	]
-}
-
-private Map getHumidityResult(value) {
-	log.debug 'Humidity'
-	return value ? [name: 'humidity', value: value, unit: '%'] : [:]
-}
-
 /**
  * PING is used by Device-Watch in attempt to reach the Device
  * */
 def ping() {
-	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
+	return zigbee.readAttribute(0x0001, 0x0020) // Read the Battery Level
 }
 
-def refresh()
-{
+def refresh() {
 	log.debug "refresh temperature, humidity, and battery"
-	return zigbee.readAttribute(0xFC45, 0x0000, ["mfgCode": 0xC2DF]) +   // Original firmware
-			zigbee.readAttribute(0x0402, 0x0000) +
-			zigbee.readAttribute(0x0001, 0x0020)
+	return zigbee.readAttribute(0xFC45, 0x0000, ["mfgCode": 0x104E]) +   // New firmware
+			zigbee.readAttribute(0xFC45, 0x0000, ["mfgCode": 0xC2DF]) +   // Original firmware
+			zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000) +
+			zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020) +
+			zigbee.configureReporting(0xFC45, 0x0000, DataType.INT16, 30, 3600, 100) +
+			zigbee.batteryConfig() +
+			zigbee.temperatureConfig(30, 300)
 }
 
 def configure() {
@@ -269,35 +141,8 @@ def configure() {
 	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 
 	log.debug "Configuring Reporting and Bindings."
-	def humidityConfigCmds = [
-		"zdo bind 0x${device.deviceNetworkId} 1 1 0xFC45 {${device.zigbeeId}} {}", "delay 500",
-		"zcl global send-me-a-report 0xFC45 0 0x29 30 3600 {6400}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 500"
-	]
 
 	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
 	// battery minReport 30 seconds, maxReportTime 6 hrs by default
-	return refresh() + humidityConfigCmds + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300)  // send refresh cmds as part of config
-}
-
-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
+	return refresh()
 }

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

@@ -96,7 +96,7 @@ metadata {
 def parse(String description) {
 	def results
 
-	if (!isSupportedDescription(description) || zigbee.isZoneType19(description)) {
+	if (!isSupportedDescription(description) || description.startsWith("zone")) {
 		// Ignore this in favor of orientation-based state
 		// results = parseSingleMessage(description)
 	}

devicetypes/smartthings/testing/simulated-switch.src/simulated-switch.groovy

@@ -12,7 +12,7 @@
  *
  */
 metadata {
-	
+
     definition (name: "Simulated Switch", namespace: "smartthings/testing", author: "bob") {
 		capability "Switch"
         capability "Relay Switch"
@@ -39,9 +39,7 @@ metadata {
 	}
 }
 
-def parse(String description) {
-	def pair = description.split(":")
-	createEvent(name: pair[0].trim(), value: pair[1].trim())
+def parse(description) {
 }
 
 def on() {

devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy

@@ -86,7 +86,7 @@ def parse(String description) {
 	def bodyString = msg.body
 	if (bodyString) {
 		unschedule("setOffline")
-		def body = new XmlSlurper().parseText(bodyString)
+        def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", ""))
 
 		if (body?.property?.TimeSyncRequest?.text()) {
 			log.trace "Got TimeSyncRequest"

devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy

@@ -78,7 +78,7 @@ def parse(String description) {
 	def bodyString = msg.body
 	if (bodyString) {
     	unschedule("setOffline")
-		def body = new XmlSlurper().parseText(bodyString)
+        def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", ""))
 		if (body?.property?.TimeSyncRequest?.text()) {
 			log.trace "Got TimeSyncRequest"
 			result << timeSyncResponse()

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

@@ -84,7 +84,7 @@ def parse(String description) {
     def bodyString = msg.body
     if (bodyString) {
     	unschedule("setOffline")
-        def body = new XmlSlurper().parseText(bodyString)
+        def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", ""))
  		if (body?.property?.TimeSyncRequest?.text()) {
         	log.trace "Got TimeSyncRequest"
         	result << timeSyncResponse()
@@ -208,7 +208,7 @@ def subscribe(ip, port) {
     def existingIp = getDataValue("ip")
     def existingPort = getDataValue("port")
     if (ip && ip != existingIp) {
-         log.debug "Updating ip from $existingIp to $ip"    
+         log.debug "Updating ip from $existingIp to $ip"
     	 updateDataValue("ip", ip)
     	 def ipvalue = convertHexToIP(getDataValue("ip"))
          sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP changed to ${ipvalue}")
@@ -291,4 +291,4 @@ User-Agent: CyberGarage-HTTP/1.0
 </u:GetBinaryState>
 </s:Body>
 </s:Envelope>""", physicalgraph.device.Protocol.LAN)
-}
+}

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

@@ -13,6 +13,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+import physicalgraph.zigbee.zcl.DataType
 
 metadata {
     definition (name: "ZigBee Button", namespace: "smartthings", author: "Mitch Pond") {
@@ -28,8 +29,8 @@ metadata {
 
         fingerprint inClusters: "0000, 0001, 0003, 0020, 0402, 0B05", outClusters: "0003, 0006, 0008, 0019", manufacturer: "OSRAM", model: "LIGHTIFY Dimming Switch", deviceJoinName: "OSRAM LIGHTIFY Dimming Switch"
         //fingerprint inClusters: "0000, 0001, 0003, 0020, 0500", outClusters: "0003,0019", manufacturer: "CentraLite", model: "3455-L", deviceJoinName: "Iris Care Pendant"
-        //fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0402, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model: "3460-L", deviceJoinName: "Iris Smart Button"
-        //fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model:"3450-L", deviceJoinName: "Iris KeyFob"
+        fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0402, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model: "3460-L", deviceJoinName: "Iris Smart Button"
+        fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model:"3450-L", deviceJoinName: "Iris KeyFob"
     }
 
     simulator {}
@@ -82,7 +83,7 @@ def parse(String description) {
         def result = event ? createEvent(event) : []
 
         if (description?.startsWith('enroll request')) {
-            List cmds = enrollResponse()
+            List cmds = zigbee.enrollResponse()
             result = cmds?.collect { new physicalgraph.device.HubAction(it) }
         }
         return result
@@ -117,15 +118,38 @@ private Map getBatteryResult(rawValue) {
 private Map parseNonIasButtonMessage(Map descMap){
     def buttonState = ""
     def buttonNumber = 0
-    if (((device.getDataValue("model") == "3460-L") || (device.getDataValue("model") == "3450-L"))
-            &&(descMap.clusterInt == 0x0006)) {
-        if (descMap.command == "01") {
+    if ((device.getDataValue("model") == "3460-L") &&(descMap.clusterInt == 0x0006)) {
+        if (descMap.commandInt == 1) {
             getButtonResult("press")
         }
-        else if (descMap.command == "00") {
+        else if (descMap.commandInt == 0) {
             getButtonResult("release")
         }
     }
+    else if ((device.getDataValue("model") == "3450-L") && (descMap.clusterInt == 0x0006)) {
+        if (descMap.commandInt == 1) {
+            getButtonResult("press")
+        }
+        else if (descMap.commandInt == 0) {
+            def button = 1
+            switch(descMap.sourceEndpoint) {
+                case "01":
+                    button = 4
+                    break
+                case "02":
+                    button = 3
+                    break
+                case "03":
+                    button = 1
+                    break
+                case "04":
+                    button = 2
+                    break
+            }
+        
+            getButtonResult("release", button)
+        }
+    }
     else if (descMap.clusterInt == 0x0006) {
         buttonState = "pushed"
         if (descMap.command == "01") {
@@ -160,7 +184,7 @@ private Map parseNonIasButtonMessage(Map descMap){
 def refresh() {
     log.debug "Refreshing Battery"
 
-    return zigbee.readAttribute(0x0001, 0x20) +
+    return zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x20) +
             zigbee.enrollResponse()
 }
 
@@ -177,9 +201,9 @@ def configure() {
     }
     return zigbee.onOffConfig() +
             zigbee.levelConfig() +
-            zigbee.configureReporting(0x0001, 0x20, 0x20, 30, 21600, 0x01) +
+            zigbee.configureReporting(zigbee.POWER_CONFIGURATION_CLUSTER, 0x20, DataType.UINT8, 30, 21600, 0x01) +
             zigbee.enrollResponse() +
-            zigbee.readAttribute(0x0001, 0x20) +
+            zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x20) +
             cmds
 
 }

devicetypes/smartthings/zigbee-dimmer-power.src/README.md

@@ -23,6 +23,7 @@ Works with:
 * **Switch** - can detect state (possible values: on/off)
 * **Switch Level** - represents current light level, usually 0-100 in percent
 * **Health Check** - indicates ability to get device health notifications
+* **Light** - indicates that the device belongs to Light category.
 
 ## Device Health
 

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

@@ -22,6 +22,7 @@ metadata {
         capability "Switch"
         capability "Switch Level"
         capability "Health Check"
+        capability "Light"
 
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0702"
@@ -97,7 +98,7 @@ def on() {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value)
+    zigbee.setLevel(value) + (value?.toInteger() > 0 ? zigbee.on() : [])
 }
 
 /**

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

@@ -20,6 +20,7 @@ metadata {
         capability "Switch"
         capability "Switch Level"
         capability "Health Check"
+        capability "Light"
 
 
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008"
@@ -28,6 +29,10 @@ metadata {
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B05", outClusters: "0019", manufacturer: "OSRAM SYLVANIA", model: "iQBR30", deviceJoinName: "Sylvania Ultra iQ"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY PAR38 ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart PAR38 Soft White"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart BR30 Soft White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0702, 0B05", outClusters: "0019", manufacturer: "sengled", model: "E11-G13", deviceJoinName: "Sengled Element Classic"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL6HD", deviceJoinName: "Leviton Dimmer Switch"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL3HL", deviceJoinName: "Leviton Lumina RF Plug-In Dimmer"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL1KD", deviceJoinName: "Leviton Lumina RF Dimmer Switch"
     }
 
     tiles(scale: 2) {
@@ -89,7 +94,13 @@ def on() {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value)
+    def additionalCmds = []
+    if (device.getDataValue("model") == "iQBR30" && value.toInteger() > 0) { // Handle iQ bulb not following spec
+        additionalCmds = zigbee.on()
+    } else if (device.getDataValue("manufacturer") == "MRVL") { // Handle marvel stack not reporting
+        additionalCmds = refresh()
+    }
+    zigbee.setLevel(value) + additionalCmds
 }
 /**
  * PING is used by Device-Watch in attempt to reach the Device
@@ -99,7 +110,15 @@ def ping() {
 }
 
 def refresh() {
-    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig(0, 300) + zigbee.levelConfig()
+    zigbee.onOffRefresh() + zigbee.levelRefresh()
+}
+
+def installed() {
+    if (((device.getDataValue("manufacturer") == "MRVL") && (device.getDataValue("model") == "MZ100")) || (device.getDataValue("manufacturer") == "OSRAM SYLVANIA") || (device.getDataValue("manufacturer") == "OSRAM")) {
+        if ((device.currentState("level")?.value == null) || (device.currentState("level")?.value == 0)) {
+            sendEvent(name: "level", value: 100)
+        }
+    }
 }
 
 def configure() {
@@ -109,5 +128,5 @@ def configure() {
     sendEvent(name: "checkInterval", value: 2 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 
     // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
-    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig(0, 300) + zigbee.levelConfig()
+    refresh() + zigbee.onOffConfig(0, 300) + zigbee.levelConfig()
 }

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

@@ -13,6 +13,8 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+import physicalgraph.zigbee.zcl.DataType
+
  metadata {
     definition (name: "ZigBee Lock", namespace: "smartthings", author: "SmartThings")
     {
@@ -71,9 +73,6 @@ private getDOORLOCK_CMD_UNLOCK_DOOR() { 0x01 }
 private getDOORLOCK_ATTR_LOCKSTATE() { 0x0000 }
 private getPOWER_ATTR_BATTERY_PERCENTAGE_REMAINING() { 0x0021 }
 
-private getTYPE_U8() { 0x20 }
-private getTYPE_ENUM8() { 0x30 }
-
 // Public methods
 def installed() {
     log.trace "installed()"
@@ -86,9 +85,9 @@ def uninstalled() {
 def configure() {
     def cmds =
         zigbee.configureReporting(CLUSTER_DOORLOCK, DOORLOCK_ATTR_LOCKSTATE,
-                                  TYPE_ENUM8, 0, 3600, null) +
+                                  DataType.ENUM8, 0, 3600, null) +
         zigbee.configureReporting(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING,
-                                  TYPE_U8, 600, 21600, 0x01)
+                                  DataType.UINT8, 600, 21600, 0x01)
     log.info "configure() --- cmds: $cmds"
     return refresh() + cmds // send refresh cmds as part of config
 }

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

@@ -15,6 +15,7 @@
  *
  *  This DTH should serve as the generic DTH to handle RGB ZigBee HA devices (For color bulbs with no color temperature)
  */
+import physicalgraph.zigbee.zcl.DataType
 
 metadata {
 	definition (name: "ZigBee RGB Bulb", namespace: "smartthings", author: "SmartThings") {
@@ -27,6 +28,7 @@ metadata {
 		capability "Switch"
 		capability "Switch Level"
 		capability "Health Check"
+		capability "Light"
 
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Gardenspot RGB", deviceJoinName: "SYLVANIA Smart Gardenspot mini RGB"
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Gardenspot RGB", deviceJoinName: "SYLVANIA Smart Gardenspot mini RGB"
@@ -121,7 +123,7 @@ def ping() {
 }
 
 def refresh() {
-	zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) + zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01)
+	zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) + zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, DataType.UINT8, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, DataType.UINT8, 1, 3600, 0x01)
 }
 
 def configure() {
@@ -131,7 +133,7 @@ def configure() {
 	sendEvent(name: "checkInterval", value: 3 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 
 	// OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
-	zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01) + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+	zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, DataType.UINT8, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, DataType.UINT8, 1, 3600, 0x01) + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 
 def setLevel(value) {

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

@@ -15,6 +15,7 @@
  *
  *  This DTH should serve as the generic DTH to handle RGBW ZigBee HA devices
  */
+import physicalgraph.zigbee.zcl.DataType
 
 metadata {
     definition (name: "ZigBee RGBW Bulb", namespace: "smartthings", author: "SmartThings") {
@@ -28,6 +29,7 @@ metadata {
         capability "Switch"
         capability "Switch Level"
         capability "Health Check"
+        capability "Light"
 
         attribute "colorName", "string"
         command "setGenericName"
@@ -139,7 +141,7 @@ def ping() {
 }
 
 def refresh() {
-    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) + zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01)
+    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) + zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, DataType.UINT8, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, DataType.UINT8, 1, 3600, 0x01)
 }
 
 def configure() {

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

@@ -21,6 +21,7 @@ metadata {
         capability "Sensor"
         capability "Switch"
         capability "Health Check"
+        capability "Light"
 
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0B04"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702"

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

@@ -22,6 +22,8 @@ metadata {
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0006", outClusters: "0003, 0006, 0019, 0406", manufacturer: "Leviton", model: "ZSS-10", deviceJoinName: "Leviton Switch"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0006", outClusters: "000A", manufacturer: "HAI", model: "65A21-1", deviceJoinName: "Leviton Wireless Load Control Module-30amp"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL15A", deviceJoinName: "Leviton Lumina RF Plug-In Appliance Module"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL15S", deviceJoinName: "Leviton Lumina RF Switch"
     }
 
     // simulator metadata

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

@@ -11,6 +11,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+import physicalgraph.zigbee.zcl.DataType
 
 metadata {
     definition (name: "ZigBee Valve", namespace: "smartthings", author: "SmartThings") {
@@ -66,8 +67,6 @@ private getCLUSTER_BASIC() { 0x0000 }
 private getBASIC_ATTR_POWER_SOURCE() { 0x0007 }
 private getCLUSTER_POWER() { 0x0001 }
 private getPOWER_ATTR_BATTERY_PERCENTAGE_REMAINING() { 0x0021 }
-private getTYPE_U8() { 0x20 }
-private getTYPE_ENUM8() { 0x30 }
 
 // Parse incoming device messages to generate events
 def parse(String description) {
@@ -128,8 +127,8 @@ def refresh() {
     zigbee.readAttribute(CLUSTER_BASIC, BASIC_ATTR_POWER_SOURCE) +
     zigbee.readAttribute(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING) +
     zigbee.onOffConfig() +
-    zigbee.configureReporting(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING, TYPE_U8, 600, 21600, 1) +
-    zigbee.configureReporting(CLUSTER_BASIC, BASIC_ATTR_POWER_SOURCE, TYPE_ENUM8, 5, 21600, 1)
+    zigbee.configureReporting(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING, DataType.UINT8, 600, 21600, 1) +
+    zigbee.configureReporting(CLUSTER_BASIC, BASIC_ATTR_POWER_SOURCE, DataType.ENUM8, 5, 21600, 1)
 }
 
 def configure() {

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

@@ -26,6 +26,7 @@ metadata {
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
+        capability "Light"
 
         attribute "colorName", "string"
         command "setGenericName"

devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy

@@ -89,7 +89,7 @@ def on() {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
 def refresh() {

devicetypes/smartthings/zll-rgb-bulb.src/zll-rgb-bulb.groovy

@@ -11,6 +11,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+import physicalgraph.zigbee.zcl.DataType
 
 metadata {
 	definition (name: "ZLL RGB Bulb", namespace: "smartthings", author: "SmartThings") {
@@ -107,7 +108,7 @@ def configure() {
 }
 
 def configureAttributes() {
-	zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01)
+	zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, DataType.UINT8, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, DataType.UINT8, 1, 3600, 0x01)
 }
 
 def refreshAttributes() {
@@ -115,7 +116,7 @@ def refreshAttributes() {
 }
 
 def setLevel(value) {
-	zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+	zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
 def setColor(value){

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

@@ -11,6 +11,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+import physicalgraph.zigbee.zcl.DataType
 
 metadata {
     definition (name: "ZLL RGBW Bulb", namespace: "smartthings", author: "SmartThings") {
@@ -123,7 +124,7 @@ def configure() {
 }
 
 def configureAttributes() {
-    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01)
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, DataType.UINT8, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, DataType.UINT8, 1, 3600, 0x01)
 }
 
 def refreshAttributes() {
@@ -135,7 +136,7 @@ def setColorTemperature(value) {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()        //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
 def setColor(value){

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

@@ -90,7 +90,7 @@ def on() {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()
+    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }
 
 def refresh() {

devicetypes/smartthings/zwave-dimmer-switch-generic.src/README.md

@@ -6,6 +6,12 @@ Works with:
 
 * [Leviton Plug-in Lamp Dimmer Module (DZPD3-1LW)](https://www.smartthings.com/works-with-smartthings/outlets/leviton-plug-in-lamp-dimmer-module)
 * [Leviton Universal Dimmer (DZMX1-LZ)](https://www.smartthings.com/works-with-smartthings/switches-and-dimmers/leviton-universal-dimmer)
+* [Leviton 1000W Incandescent Dimmer](https://www.smartthings.com/works-with-smartthings/leviton/leviton-1000w-incandescent-dimmer)
+* [Leviton 600W Incandescent Dimmer](https://www.smartthings.com/works-with-smartthings/leviton/leviton-600w-incandescent-dimmer)
+* [Enerwave In-Wall Dimmer](https://www.smartthings.com/works-with-smartthings/enerwave/enerwave-in-wall-dimmer-zw500d)
+* [Leviton 3-Speed Fan Controller](https://www.smartthings.com/works-with-smartthings/leviton/leviton-3-speed-fan-controller)
+* [Leviton Magnetic Low Voltage Dimmer](https://www.smartthings.com/works-with-smartthings/leviton/leviton-magnetic-low-voltage-dimmer)
+* [Remotec Technology Plug-In Dimmer](https://www.smartthings.com/works-with-smartthings/remotec-technology/remotec-technology-plug-in-dimmer)
 
 ## Table of contents
 
@@ -40,4 +46,9 @@ If the device doesn't pair when trying from the SmartThings mobile app, it is po
 Pairing needs to be tried again by placing the device closer to the hub.
 Instructions related to pairing, resetting and removing the device from SmartThings can be found in the following link:
 * [Leviton Plug-in Lamp Dimmer Module (DZPD3-1LW) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices)
-* [Leviton Universal Dimmer (DZMX1-LZ) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices)
+* [Leviton Universal Dimmer (DZMX1-LZ) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices)
+* [Leviton 1000W Incandescent Dimmer Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices)
+* [Leviton 600W Incandescent Dimmer Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices)
+* [Leviton 3-Speed Fan Controller Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices)
+* [Enerwave In-Wall Dimmer Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/204854176-How-to-connect-Enerwave-switches-and-dimmers)
+* [Remotec Technology Plug-In Dimmer Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202295150-Remotec-Technology-Plug-In-Dimmer-ZDS-100-)

devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy

@@ -20,10 +20,17 @@ metadata {
 		capability "Polling"
 		capability "Refresh"
 		capability "Sensor"
+		capability "Light"
 
 		fingerprint inClusters: "0x26", deviceJoinName: "Z-Wave Dimmer"
 		fingerprint mfr:"001D", prod:"1902", deviceJoinName: "Z-Wave Dimmer"
 		fingerprint mfr:"001D", prod:"1B03", model:"0334", deviceJoinName: "Leviton Universal Dimmer"
+		fingerprint mfr:"011A", prod:"0102", model:"0201", deviceJoinName: "Enerwave In-Wall Dimmer"
+		fingerprint mfr:"001D", prod:"1001", model:"0334", deviceJoinName: "Leviton 3-Speed Fan Controller"
+		fingerprint mfr:"001D", prod:"0602", model:"0334", deviceJoinName: "Leviton Magnetic Low Voltage Dimmer"
+		fingerprint mfr:"001D", prod:"0401", model:"0334", deviceJoinName: "Leviton 600W Incandescent Dimmer"
+		fingerprint mfr:"0111", prod:"8200", model:"0200", deviceJoinName: "Remotec Technology Plug-In Dimmer"
+		fingerprint mfr:"1104", prod:"001D", model:"0501", deviceJoinName: "Leviton 1000W Incandescant Dimmer"
 	}
 
 	simulator {

devicetypes/smartthings/zwave-metering-dimmer.src/zwave-metering-dimmer.groovy

@@ -25,6 +25,7 @@ metadata {
 		capability "Switch Level"
 		capability "Sensor"
 		capability "Actuator"
+		capability "Light"
 
 		command "reset"
 

devicetypes/smartthings/zwave-metering-switch.src/zwave-metering-switch.groovy

@@ -21,6 +21,7 @@ metadata {
 		capability "Refresh"
 		capability "Configuration"
 		capability "Sensor"
+		capability "Light"
 
 		command "reset"
 

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

@@ -28,6 +28,7 @@ metadata {
 		fingerprint mfr: "0060", prod: "0001", model: "0002", deviceJoinName: "Everspring Motion Sensor"  // Everspring SP814
 		fingerprint mfr: "0060", prod: "0001", model: "0003", deviceJoinName: "Everspring Motion Sensor"  // Everspring HSP02
 		fingerprint mfr: "011A", prod: "0601", model: "0901", deviceJoinName: "Enerwave Motion Sensor"  // Enerwave ZWN-BPC
+		fingerprint mfr: "0063", prod: "4953", model: "3133", deviceJoinName: "GE Smart Motion Sensor"
 	}
 
 	simulator {

devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy

@@ -19,12 +19,18 @@ metadata {
 		capability "Polling"
 		capability "Refresh"
 		capability "Sensor"
+		capability "Light"
 
 		fingerprint inClusters: "0x25", deviceJoinName: "Z-Wave Switch"
 		fingerprint mfr:"001D", prod:"1A02", model:"0334", deviceJoinName: "Leviton Appliance Module"
 		fingerprint mfr:"0063", prod:"4F50", model:"3031", deviceJoinName: "GE Plug-in Outdoor Switch"
 		fingerprint mfr:"001D", prod:"1D04", model:"0334", deviceJoinName: "Leviton Outlet"
 		fingerprint mfr:"001D", prod:"1C02", model:"0334", deviceJoinName: "Leviton Switch"
+		fingerprint mfr:"001D", prod:"0301", model:"0334", deviceJoinName: "Leviton 15A Switch"
+		fingerprint mfr:"001D", prod:"0F01", model:"0334", deviceJoinName: "Leviton 5A Incandescent Switch"
+		fingerprint mfr:"001D", prod:"1603", model:"0334", deviceJoinName: "Leviton 15A Split Duplex Receptacle"
+		fingerprint mfr:"011A", prod:"0101", model:"0102", deviceJoinName: "Enerwave On/Off Switch"
+		fingerprint mfr:"011A", prod:"0101", model:"0603", deviceJoinName: "Enerwave Duplex Receptacle"
 	}
 
 	// simulator metadata

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

@@ -20,6 +20,7 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
+		capability "Light"
 
 		fingerprint mfr:"0063", prod:"4952", deviceJoinName: "Z-Wave Wall Switch"
 		fingerprint mfr:"0063", prod:"5257", deviceJoinName: "Z-Wave Wall Switch"

smartapps/dianoga/netatmo-connect.src/netatmo-connect.groovy

@@ -5,7 +5,6 @@ import java.text.DecimalFormat
 import groovy.json.JsonSlurper
 
 private getApiUrl()			{ "https://api.netatmo.com" }
-private getVendorName()		{ "netatmo" }
 private getVendorAuthPath()	{ "${apiUrl}/oauth2/authorize?" }
 private getVendorTokenPath(){ "${apiUrl}/oauth2/token" }
 private getVendorIcon()		{ "https://s3.amazonaws.com/smartapp-icons/Partner/netamo-icon-1%402x.png" }
@@ -14,14 +13,13 @@ private getClientSecret()	{ appSettings.clientSecret }
 private getServerUrl() 		{ appSettings.serverUrl }
 private getShardUrl()		{ return getApiServerUrl() }
 private getCallbackUrl()	{ "${serverUrl}/oauth/callback" }
-private getBuildRedirectUrl() { "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${state.accessToken}&apiServerUrl=${shardUrl}" }
+private getBuildRedirectUrl() { "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${atomicState.accessToken}&apiServerUrl=${shardUrl}" }
 
-// Automatically generated. Make future change here.
 definition(
 	name: "Netatmo (Connect)",
 	namespace: "dianoga",
 	author: "Brian Steere",
-	description: "Netatmo Integration",
+	description: "Integrate your Netatmo devices with SmartThings",
 	category: "SmartThings Labs",
 	iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/netamo-icon-1.png",
 	iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/netamo-icon-1%402x.png",
@@ -44,15 +42,16 @@ mappings {
 }
 
 def authPage() {
-	log.debug "In authPage"
+	// log.debug "running authPage()"
 
 	def description
 	def uninstallAllowed = false
 	def oauthTokenProvided = false
 
-	if (!state.accessToken) {
-		log.debug "About to create access token."
-		state.accessToken = createAccessToken()
+	// If an access token doesn't exist, create one
+	if (!atomicState.accessToken) {
+		atomicState.accessToken = createAccessToken()
+        log.debug "Created access token"
 	}
 
 	if (canInstallLabs()) {
@@ -60,36 +59,32 @@ def authPage() {
 		def redirectUrl = getBuildRedirectUrl()
 		// log.debug "Redirect url = ${redirectUrl}"
 
-		if (state.authToken) {
-			description = "Tap 'Next' to proceed"
+		if (atomicState.authToken) {
+			description = "Tap 'Next' to select devices"
 			uninstallAllowed = true
 			oauthTokenProvided = true
 		} else {
-			description = "Click to enter Credentials."
+			description = "Tap to enter credentials"
 		}
 
 		if (!oauthTokenProvided) {
-			log.debug "Show the login page"
+			log.debug "Showing the login page"
 			return dynamicPage(name: "Credentials", title: "Authorize Connection", nextPage:"listDevices", uninstall: uninstallAllowed, install:false) {
 				section() {
-					paragraph "Tap below to log in to the netatmo and authorize SmartThings access."
-					href url:redirectUrl, style:"embedded", required:false, title:"Connect to ${getVendorName()}:", description:description
+					paragraph "Tap below to login to Netatmo and authorize SmartThings access"
+					href url:redirectUrl, style:"embedded", required:false, title:"Connect to Netatmo", description:description
 				}
 			}
 		} else {
-			log.debug "Show the devices page"
-			return dynamicPage(name: "Credentials", title: "Credentials Accepted!", nextPage:"listDevices", uninstall: uninstallAllowed, install:false) {
+			log.debug "Showing the devices page"
+			return dynamicPage(name: "Credentials", title: "Connected", nextPage:"listDevices", uninstall: uninstallAllowed, install:false) {
 				section() {
-					input(name:"Devices", style:"embedded", required:false, title:"${getVendorName()} is now connected to SmartThings!", description:description) 
+					input(name:"Devices", style:"embedded", required:false, title:"Netatmo is connected to SmartThings", description:description) 
 				}
 			}
 		}
 	} else {
-		def upgradeNeeded = """To use SmartThings Labs, your Hub should be completely up to date.
-
-To update your Hub, access Location Settings in the Main Menu (tap the gear next to your location name), select your Hub, and choose "Update Hub"."""
-
-
+		def upgradeNeeded = """To use SmartThings Labs, your Hub should be completely up to date. To update your Hub, access Location Settings in the Main Menu (tap the gear next to your location name), select your Hub, and choose "Update Hub"."""
 		return dynamicPage(name:"Credentials", title:"Upgrade needed!", nextPage:"", install:false, uninstall: true) {
 			section {
 				paragraph "$upgradeNeeded"
@@ -100,15 +95,15 @@ To update your Hub, access Location Settings in the Main Menu (tap the gear next
 }
 
 def oauthInitUrl() {
-	log.debug "In oauthInitUrl"
+	// log.debug "runing oauthInitUrl()"
 
-	state.oauthInitState = UUID.randomUUID().toString()
+	atomicState.oauthInitState = UUID.randomUUID().toString()
 
 	def oauthParams = [
 		response_type: "code",
 		client_id: getClientId(),
 		client_secret: getClientSecret(),
-		state: state.oauthInitState,
+		state: atomicState.oauthInitState,
 		redirect_uri: getCallbackUrl(),
 		scope: "read_station"
 	]
@@ -119,73 +114,72 @@ def oauthInitUrl() {
 }
 
 def callback() {
-	// log.debug "callback()>> params: $params, params.code ${params.code}"
+	// log.debug "running callback()"
 
 	def code = params.code
 	def oauthState = params.state
 
-	if (oauthState == state.oauthInitState) {
+	if (oauthState == atomicState.oauthInitState) {
 
 		def tokenParams = [
+        	grant_type: "authorization_code",
 			client_secret: getClientSecret(),
 			client_id : getClientId(),
-			grant_type: "authorization_code",
-			redirect_uri: getCallbackUrl(),
 			code: code,
-			scope: "read_station"
+			scope: "read_station",
+            redirect_uri: getCallbackUrl()
 		]
 
 		// log.debug "TOKEN URL: ${getVendorTokenPath() + toQueryString(tokenParams)}"
 
 		def tokenUrl = getVendorTokenPath()
-		def params = [
+		def requestTokenParams = [
 			uri: tokenUrl,
-			contentType: 'application/x-www-form-urlencoded',
+			requestContentType: 'application/x-www-form-urlencoded',
 			body: tokenParams
 		]
+    
+		// log.debug "PARAMS: ${requestTokenParams}"
 
-		// log.debug "PARAMS: ${params}"
+		try {
+            httpPost(requestTokenParams) { resp ->
+                //log.debug "Data: ${resp.data}"
+                atomicState.refreshToken = resp.data.refresh_token
+                atomicState.authToken = resp.data.access_token
+                // resp.data.expires_in is in milliseconds so we need to convert it to seconds
+                atomicState.tokenExpires = now() + (resp.data.expires_in * 1000)
+            }
+        } catch (e) {
+			      log.debug "callback() failed: $e"
+        }
 
-		httpPost(params) { resp ->
-
-			def slurper = new JsonSlurper()
-
-			resp.data.each { key, value ->
-				def data = slurper.parseText(key)
-
-				state.refreshToken = data.refresh_token
-				state.authToken = data.access_token
-				state.tokenExpires = now() + (data.expires_in * 1000)
-				// log.debug "swapped token: $resp.data"
-			}
-		}
-
-		// Handle success and failure here, and render stuff accordingly
-		if (state.authToken) {
+		// If we successfully got an authToken run sucess(), else fail()
+		if (atomicState.authToken) {
 			success()
 		} else {
 			fail()
 		}
 
 	} else {
-		log.error "callback() failed oauthState != state.oauthInitState"
+		log.error "callback() failed oauthState != atomicState.oauthInitState"
 	}
 }
 
 def success() {
-	log.debug "in success"
+	log.debug "OAuth flow succeeded"
 	def message = """
-	<p>We have located your """ + getVendorName() + """ account.</p>
-	<p>Tap 'Done' to continue to Devices.</p>
+	<p>Success!</p>
+	<p>Tap 'Done' to continue</p>
 	"""
 	connectionStatus(message)
 }
 
 def fail() {
-	log.debug "in fail"
+	log.debug "OAuth flow failed"
+    atomicState.authToken = null
 	def message = """
-	<p>The connection could not be established!</p>
-	<p>Click 'Done' to return to the menu.</p>
+	<p>Error</p>
+	<p>Tap 'Done' to return</p>
 	"""
 	connectionStatus(message)
 }
@@ -197,13 +191,12 @@ def connectionStatus(message, redirectUrl = null) {
 			<meta http-equiv="refresh" content="3; url=${redirectUrl}" />
 		"""
 	}
-
 	def html = """
 		<!DOCTYPE html>
 		<html>
 		<head>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<title>${getVendorName()} Connection</title>
+		<title>Netatmo Connection</title>
 		<style type="text/css">
 			* { box-sizing: border-box; }
 			@font-face {
@@ -229,7 +222,6 @@ def connectionStatus(message, redirectUrl = null) {
 			.container {
 				width: 100%;
 				padding: 40px;
-				/*background: #eee;*/
 				text-align: center;
 			}
 			img {
@@ -245,14 +237,9 @@ def connectionStatus(message, redirectUrl = null) {
 				color: #666666;
 				margin-bottom: 0;
 			}
-			/*
-			p:last-child {
-				margin-top: 0px;
-			}
-			*/
 			span {
 				font-family: 'Swiss 721 W01 Light';
-				}
+			}
 		</style>
 		</head>
 		<body>
@@ -269,46 +256,47 @@ def connectionStatus(message, redirectUrl = null) {
 }
 
 def refreshToken() {
-	log.debug "In refreshToken"
+	// Check if atomicState has a refresh token
+	if (atomicState.refreshToken) {
+        log.debug "running refreshToken()"
 
-	def oauthParams = [
-		client_secret: getClientSecret(),
-		client_id: getClientId(),
-		grant_type: "refresh_token",
-		refresh_token: state.refreshToken
-	]
+        def oauthParams = [
+            grant_type: "refresh_token",
+            refresh_token: atomicState.refreshToken,
+            client_secret: getClientSecret(),
+            client_id: getClientId(),
+        ]
 
-	def tokenUrl = getVendorTokenPath()
-	def params = [
-		uri: tokenUrl,
-		contentType: 'application/x-www-form-urlencoded',
-		body: oauthParams,
-	]
+        def tokenUrl = getVendorTokenPath()
+        
+        def requestOauthParams = [
+            uri: tokenUrl,
+            requestContentType: 'application/x-www-form-urlencoded',
+            body: oauthParams
+        ]
+        
+        // log.debug "PARAMS: ${requestOauthParams}"
 
-	// OAuth Step 2: Request access token with our client Secret and OAuth "Code"
-	try {
-		httpPost(params) { response ->
-			def slurper = new JsonSlurper();
+        try {
+            httpPost(requestOauthParams) { resp ->
+            	//log.debug "Data: ${resp.data}"
+                atomicState.refreshToken = resp.data.refresh_token
+                atomicState.authToken = resp.data.access_token
+                // resp.data.expires_in is in milliseconds so we need to convert it to seconds
+                atomicState.tokenExpires = now() + (resp.data.expires_in * 1000)
+                return true
+            }
+        } catch (e) {
+            log.debug "refreshToken() failed: $e"
+        }
 
-			response.data.each {key, value ->
-				def data = slurper.parseText(key);
-				// log.debug "Data: $data"
-
-				state.refreshToken = data.refresh_token
-				state.accessToken = data.access_token
-				state.tokenExpires = now() + (data.expires_in * 1000)
-				return true
-			}
-
-		}
-	} catch (Exception e) {
-		log.debug "Error: $e"
-	}
-
-	// We didn't get an access token
-	if ( !state.accessToken ) {
-		return false
-	}
+        // If we didn't get an authToken
+        if (!atomicState.authToken) {
+            return false
+        }
+	} else {
+    	return false
+    }
 }
 
 String toQueryString(Map m) {
@@ -317,13 +305,11 @@ String toQueryString(Map m) {
 
 def installed() {
 	log.debug "Installed with settings: ${settings}"
-
 	initialize()
 }
 
 def updated() {
 	log.debug "Updated with settings: ${settings}"
-
 	unsubscribe()
 	unschedule()
 	initialize()
@@ -331,9 +317,9 @@ def updated() {
 
 def initialize() {
 	log.debug "Initialized with settings: ${settings}"
-
+    
 	// Pull the latest device info into state
-	getDeviceList();
+	getDeviceList()
 
 	settings.devices.each {
 		def deviceId = it
@@ -367,57 +353,56 @@ def initialize() {
 	def delete = getChildDevices().findAll { !settings.devices.contains(it.deviceNetworkId) }
 	log.debug "Delete: $delete"
 	delete.each { deleteChildDevice(it.deviceNetworkId) }
-
-	// Do the initial poll
+    
+	// Run initial poll and schedule future polls
 	poll()
-	// Schedule it to run every 5 minutes
 	runEvery5Minutes("poll")
 }
 
 def uninstalled() {
-	log.debug "In uninstalled"
-
+	log.debug "Uninstalling"
 	removeChildDevices(getChildDevices())
 }
 
 def getDeviceList() {
-	log.debug "In getDeviceList"
+	if (atomicState.authToken) {
+    
+        log.debug "Getting stations data"
 
-	def deviceList = [:]
-	state.deviceDetail = [:]
-	state.deviceState = [:]
+        def deviceList = [:]
+        state.deviceDetail = [:]
+        state.deviceState = [:]
 
-	apiGet("/api/devicelist") { response ->
-		response.data.body.devices.each { value ->
-			def key = value._id
-			deviceList[key] = "${value.station_name}: ${value.module_name}"
-			state.deviceDetail[key] = value
-            state.deviceState[key] = value.dashboard_data
-		}
-		response.data.body.modules.each { value ->
-			def key = value._id
-			deviceList[key] = "${state.deviceDetail[value.main_device].station_name}: ${value.module_name}"
-			state.deviceDetail[key] = value
-            state.deviceState[key] = value.dashboard_data
-		}
-	}
-
-	return deviceList.sort() { it.value.toLowerCase() }
+        apiGet("/api/getstationsdata") { resp ->
+            resp.data.body.devices.each { value ->
+                def key = value._id
+                deviceList[key] = "${value.station_name}: ${value.module_name}"
+                state.deviceDetail[key] = value
+                state.deviceState[key] = value.dashboard_data
+                value.modules.each { value2 ->            
+                    def key2 = value2._id
+                    deviceList[key2] = "${value.station_name}: ${value2.module_name}"
+                    state.deviceDetail[key2] = value2
+                    state.deviceState[key2] = value2.dashboard_data            
+                }
+            }
+        }
+        
+        return deviceList.sort() { it.value.toLowerCase() }
+        
+	} else {
+    	return null
+  }
 }
 
 private removeChildDevices(delete) {
-	log.debug "In removeChildDevices"
-
-	log.debug "deleting ${delete.size()} devices"
-
+	log.debug "Removing ${delete.size()} devices"
 	delete.each {
 		deleteChildDevice(it.deviceNetworkId)
 	}
 }
 
 def createChildDevice(deviceFile, dni, name, label) {
-	log.debug "In createChildDevice"
-
 	try {
 		def existingDevice = getChildDevice(dni)
 		if(!existingDevice) {
@@ -432,13 +417,13 @@ def createChildDevice(deviceFile, dni, name, label) {
 }
 
 def listDevices() {
-	log.debug "In listDevices"
+	log.debug "Listing devices"
 
 	def devices = getDeviceList()
 
-	dynamicPage(name: "listDevices", title: "Choose devices", install: true) {
+	dynamicPage(name: "listDevices", title: "Choose Devices", install: true) {
 		section("Devices") {
-			input "devices", "enum", title: "Select Device(s)", required: false, multiple: true, options: devices
+			input "devices", "enum", title: "Select Devices", required: false, multiple: true, options: devices
 		}
 
         section("Preferences") {
@@ -448,30 +433,36 @@ def listDevices() {
 }
 
 def apiGet(String path, Map query, Closure callback) {
-	if(now() >= state.tokenExpires) {
-		refreshToken();
+	log.debug "running apiGet()"
+    
+    // If the current time is over the expiration time, request a new token
+	if(now() >= atomicState.tokenExpires) {
+    	atomicState.authToken = null
+		refreshToken()
 	}
 
-	query['access_token'] = state.accessToken
-	def params = [
+	def queryParam = [
+    	access_token: atomicState.authToken
+    ]
+    
+	def apiGetParams = [
 		uri: getApiUrl(),
 		path: path,
-		'query': query
+		query: queryParam
 	]
-	// log.debug "API Get: $params"
+    
+	// log.debug "apiGet(): $apiGetParams"
 
 	try {
-		httpGet(params)	{ response ->
-			callback.call(response)
+		httpGet(apiGetParams) { resp ->
+			callback.call(resp)
 		}
-	} catch (Exception e) {
-		// This is most likely due to an invalid token. Try to refresh it and try again.
-		log.debug "apiGet: Call failed $e"
-		if(refreshToken()) {
-			log.debug "apiGet: Trying again after refreshing token"
-			httpGet(params)	{ response ->
-				callback.call(response)
-			}
+	} catch (e) {
+		log.debug "apiGet() failed: $e"
+        // Netatmo API has rate limits so a failure here doesn't necessarily mean our token has expired, but we will check anyways
+        if(now() >= atomicState.tokenExpires) {
+    		atomicState.authToken = null
+			refreshToken()
 		}
 	}
 }
@@ -481,10 +472,12 @@ def apiGet(String path, Closure callback) {
 }
 
 def poll() {
-	log.debug "In Poll"
-	getDeviceList();
+	log.debug "Polling..."
+    
+	getDeviceList()
+    
 	def children = getChildDevices()
-    log.debug "State: ${state.deviceState}"
+    //log.debug "State: ${state.deviceState}"
 
 	settings.devices.each { deviceId ->
 		def detail = state?.deviceDetail[deviceId]
@@ -540,15 +533,13 @@ def rainToPref(rain) {
 }
 
 def debugEvent(message, displayEvent) {
-
 	def results = [
 		name: "appdebug",
 		descriptionText: message,
 		displayed: displayEvent
 	]
 	log.debug "Generating AppDebug Event: ${results}"
-	sendEvent (results)
-
+	sendEvent(results)
 }
 
 private Boolean canInstallLabs() {
@@ -561,4 +552,4 @@ private Boolean hasAllHubsOver(String desiredFirmware) {
 
 private List getRealHubFirmwareVersions() {
 	return location.hubs*.firmwareVersionString.findAll { it }
-}
+}

smartapps/michaelstruck/color-coordinator.src/color-coordinator.groovy

@@ -1,10 +1,11 @@
 /**
  * 	Color Coordinator 
- *  Version 1.1.0 - 11/9/16
+ *  Version 1.1.1 - 11/9/16
  *  By Michael Struck
  *
  *  1.0.0 - Initial release
  *  1.1.0 - Fixed issue where master can be part of slaves. This causes a loop that impacts SmartThings. 
+ *  1.1.1 - Fix NPE being thrown for slave/master inputs being empty.
  *
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -33,17 +34,17 @@ preferences {
 
 def mainPage() {
 	dynamicPage(name: "mainPage", title: "", install: true, uninstall: false) {
-		def masterInList = slaves.id.find{it==master.id}
+		def masterInList = slaves?.id?.find{it==master?.id}
         if (masterInList) {
         	section ("**WARNING**"){
             	paragraph "You have included the Master Light in the Slave Group. This will cause a loop in execution. Please remove this device from the Slave Group.", image: "https://raw.githubusercontent.com/MichaelStruck/SmartThingsPublic/master/img/caution.png"
             }
         }
         section("Master Light") {
-			input "master", "capability.colorControl", title: "Colored Light"
+			input "master", "capability.colorControl", title: "Colored Light", required: true
 		}
 		section("Lights that follow the master settings") {
-			input "slaves", "capability.colorControl", title: "Colored Lights",  multiple: true, required: false, submitOnChange: true
+			input "slaves", "capability.colorControl", title: "Colored Lights",  multiple: true, required: true, submitOnChange: true
 		}
     	section([mobileOnly:true], "Options") {
 			input "randomYes", "bool",title: "When Master Turned On, Randomize Color", defaultValue: false
@@ -81,40 +82,44 @@ def init() {
 }
 //-----------------------------------
 def onOffHandler(evt){
-	if (!slaves.id.find{it==master.id}){
-        if (master.currentValue("switch") == "on"){
-            if (randomYes) getRandomColorMaster()
-			else slaves?.on()
-        }
-        else {
-            slaves?.off()  
-        }
+	if (slaves && master) {
+		if (!slaves?.id.find{it==master?.id}){
+		if (master?.currentValue("switch") == "on"){
+		    if (randomYes) getRandomColorMaster()
+				else slaves?.on()
+		}
+		else {
+		    slaves?.off()  
+		}
+		}
 	}
 }
 
 def colorHandler(evt) {
-   	if (!slaves.id.find{it==master.id} && master.currentValue("switch") == "on"){
-		log.debug "Changing Slave units H,S,L"
-    	def dimLevel = master.currentValue("level")
-    	def hueLevel = master.currentValue("hue")
-    	def saturationLevel = master.currentValue("saturation")
-		def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer]
-    	slaves?.setColor(newValue)
-    	try {
-    		log.debug "Changing Slave color temp"
-        	def tempLevel = master.currentValue("colorTemperature")
-    		slaves?.setColorTemperature(tempLevel)
-    	}
-   		catch (e){
-    		log.debug "Color temp for master --"
-    	}
+	if (slaves && master) {
+		if (!slaves?.id?.find{it==master?.id} && master?.currentValue("switch") == "on"){
+			log.debug "Changing Slave units H,S,L"
+		def dimLevel = master?.currentValue("level")
+		def hueLevel = master?.currentValue("hue")
+		def saturationLevel = master.currentValue("saturation")
+			def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer]
+		slaves?.setColor(newValue)
+		try {
+			log.debug "Changing Slave color temp"
+			def tempLevel = master?.currentValue("colorTemperature")
+			slaves?.setColorTemperature(tempLevel)
+		}
+			catch (e){
+			log.debug "Color temp for master --"
+		}
+		}
 	}
 }
 
 def getRandomColorMaster(){
     def hueLevel = Math.floor(Math.random() *1000)
     def saturationLevel = Math.floor(Math.random() * 100)
-    def dimLevel = master.currentValue("level")
+    def dimLevel = master?.currentValue("level")
 	def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer]
     log.debug hueLevel
     log.debug saturationLevel
@@ -123,12 +128,14 @@ def getRandomColorMaster(){
 }
 
 def tempHandler(evt){
-    if (!slaves.id.find{it==master.id} && master.currentValue("switch") == "on"){
-        if (evt.value != "--") {
-            log.debug "Changing Slave color temp based on Master change"
-            def tempLevel = master.currentValue("colorTemperature")
-            slaves?.setColorTemperature(tempLevel)
-        }
+	if (slaves && master) {
+	    if (!slaves?.id?.find{it==master?.id} && master?.currentValue("switch") == "on"){
+		if (evt.value != "--") {
+		    log.debug "Changing Slave color temp based on Master change"
+		    def tempLevel = master.currentValue("colorTemperature")
+		    slaves?.setColorTemperature(tempLevel)
+		}
+		}
 	}
 }
 
@@ -139,7 +146,7 @@ private def textAppName() {
 }	
 
 private def textVersion() {
-    def text = "Version 1.1.0 (11/09/2016)"
+    def text = "Version 1.1.1 (12/13/2016)"
 }
 
 private def textCopyright() {
@@ -166,4 +173,4 @@ private def textHelp() {
     	"This application will allow you to control the settings of multiple colored lights with one control. " +
         "Simply choose a master control light, and then choose the lights that will follow the settings of the master, "+
         "including on/off conditions, hue, saturation, level and color temperature. Also includes a random color feature."
-}
+}

smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy

@@ -0,0 +1,465 @@
+/**
+ *  OpenT2T SmartApp Test
+ *
+ *  Copyright 2016 OpenT2T
+ *
+ *  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: "OpenT2T SmartApp Test",
+		namespace: "opent2t",
+		author: "OpenT2T",
+		description: "Test app to test end to end SmartThings scenarios via OpenT2T",
+		category: "SmartThings Labs",
+		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")
+
+/** --------------------+---------------+-----------------------+------------------------------------
+ *  Device Type         | Attribute Name| Commands              | Attribute Values
+ *  --------------------+---------------+-----------------------+------------------------------------
+ *  switches            | switch        | on, off               | on, off
+ *  motionSensors       | motion        |                       | active, inactive
+ *  contactSensors      | contact       |                       | open, closed
+ *  presenceSensors     | presence      |                       | present, 'not present'
+ *  temperatureSensors  | temperature   |                       | <numeric, F or C according to unit>
+ *  accelerationSensors | acceleration  |                       | active, inactive
+ *  waterSensors        | water         |                       | wet, dry
+ *  lightSensors        | illuminance   |                       | <numeric, lux>
+ *  humiditySensors     | humidity      |                       | <numeric, percent>
+ *  locks               | lock          | lock, unlock          | locked, unlocked
+ *  garageDoors         | door          | open, close           | unknown, closed, open, closing, opening
+ *  cameras             | image         | take                  | <String>
+ *  thermostats         | thermostat    | setHeatingSetpoint,   | temperature, heatingSetpoint, coolingSetpoint,
+ * 	                    |				| setCoolingSetpoint,   | thermostatSetpoint, thermostatMode,
+ *                      |				| off, heat, cool, auto,| thermostatFanMode, thermostatOperatingState
+ *                      |				| emergencyHeat,        |
+ *                      |				| setThermostatMode,    |
+ *                      |				| fanOn, fanAuto,       |
+ *                      |				| fanCirculate,         |
+ *                      |				| setThermostatFanMode  |
+ *  --------------------+---------------+-----------------------+------------------------------------
+ */
+
+//Device Inputs
+preferences {
+	section("Allow OpenT2T to control these things...") {
+		input "contactSensors", "capability.contactSensor", title: "Which Contact Sensors", multiple: true, required: false
+		input "garageDoors", "capability.garageDoorControl", title: "Which Garage Doors?", multiple: true, required: false
+		input "locks", "capability.lock", title: "Which Locks?", multiple: true, required: false
+		input "cameras", "capability.videoCapture", title: "Which Cameras?", multiple: true, required: false
+		input "motionSensors", "capability.motionSensor", title: "Which Motion Sensors?", multiple: true, required: false
+		input "presenceSensors", "capability.presenceSensor", title: "Which Presence Sensors", multiple: true, required: false
+		input "switches", "capability.switch", title: "Which Switches and Lights?", multiple: true, required: false
+		input "thermostats", "capability.thermostat", title: "Which Thermostat?", multiple: true, required: false
+		input "waterSensors", "capability.waterSensor", title: "Which Water Leak Sensors?", multiple: true, required: false
+	}
+}
+
+def getInputs() {
+	def inputList = []
+	inputList += contactSensors ?: []
+	inputList += garageDoors ?: []
+	inputList += locks ?: []
+	inputList += cameras ?: []
+	inputList += motionSensors ?: []
+	inputList += presenceSensors ?: []
+	inputList += switches ?: []
+	inputList += thermostats ?: []
+	inputList += waterSensors ?: []
+	return inputList
+}
+
+//API external Endpoints
+mappings {
+	path("/subscriptionURL/:url") {
+		action:
+		[
+				PUT: "updateEndpointURL"
+		]
+	}
+	path("/connectionId/:connId") {
+		action:
+		[
+				PUT: "updateConnectionId"
+		]
+	}
+	path("/devices") {
+		action:
+		[
+				GET: "getDevices"
+		]
+	}
+	path("/devices/:id") {
+		action:
+		[
+				GET: "getDevice"
+		]
+	}
+	path("/update/:id") {
+		action:
+		[
+				PUT: "updateDevice"
+		]
+	}
+	path("/subscription/:id") {
+		action:
+		[
+				POST  : "registerDeviceChange",
+				DELETE: "unregisterDeviceChange"
+		]
+	}
+}
+
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+	initialize()
+}
+
+def updated() {
+	log.debug "Updated with settings: ${settings}"
+	unsubscribe()
+	registerSubscriptions()
+}
+
+def initialize() {
+	state.connectionId = ""
+	state.endpointURL = "https://ifs.windows-int.com/v1/cb/81C7E77B-EABC-488A-B2BF-FEC42F0DABD2/notify"
+	registerSubscriptions()
+}
+
+//Subscribe events for all devices
+def registerSubscriptions() {
+	registerChangeHandler(inputs)
+}
+
+//Subscribe to events from a list of devices
+def registerChangeHandler(myList) {
+	myList.each { myDevice ->
+		def theAtts = myDevice.supportedAttributes
+		theAtts.each { att ->
+			subscribe(myDevice, att.name, eventHandler)
+			log.info "Registering ${myDevice.displayName}.${att.name}"
+		}
+	}
+}
+
+//Endpoints function: Subscribe to events from a specific device
+def registerDeviceChange() {
+	def myDevice = findDevice(params.id)
+	def theAtts = myDevice.supportedAttributes
+	try {
+		theAtts.each { att ->
+			subscribe(myDevice, att.name, eventHandler)
+			log.info "Registering ${myDevice.displayName}.${att.name}"
+		}
+		return ["succeed"]
+	} catch (e) {
+		httpError(500, "something went wrong: $e")
+	}
+}
+
+//Endpoints function: Unsubscribe to events from a specific device
+def unregisterDeviceChange() {
+	def myDevice = findDevice(params.id)
+	try {
+		unsubscribe(myDevice)
+		log.info "Unregistering ${myDevice.displayName}"
+		return ["succeed"]
+	} catch (e) {
+		httpError(500, "something went wrong: $e")
+	}
+}
+
+//When events are triggered, send HTTP post to web socket servers
+def eventHandler(evt) {
+	def evt_device_id = evt.deviceId
+	def evt_device_value = evt.value
+	def evt_name = evt.name
+	def evt_device = evt.device
+	def evt_deviceType = getDeviceType(evt_device);
+	def params = [
+			uri : "${state.endpointURL}/${state.connectionId}",
+			body: [
+					name        : evt_device.displayName,
+					id          : evt_device.id,
+					deviceType  : evt_deviceType,
+					manufacturer: evt_device.getManufacturerName(),
+					model       : evt_device.getModelName(),
+					attributes  : deviceAttributeList(evt_device)
+			]
+	]
+	try {
+		log.trace "POST URI: ${params.uri}"
+		log.trace "Payload: ${params.body}"
+		httpPostJson(params) { resp ->
+			resp.headers.each {
+				log.debug "${it.name} : ${it.value}"
+			}
+			log.trace "response status code: ${resp.status}"
+			log.trace "response data: ${resp.data}"
+		}
+	} catch (e) {
+		log.debug "something went wrong: $e"
+	}
+}
+
+//Endpoints function: update subcription endpoint url [state.endpoint]
+void updateEndpointURL() {
+	state.endpointURL = params.url
+	log.info "Updated EndpointURL to ${state.endpointURL}"
+}
+
+//Endpoints function: update global variable [state.connectionId]
+void updateConnectionId() {
+	def connId = params.connId
+	state.connectionId = connId
+	log.info "Updated ConnectionID to ${state.connectionId}"
+}
+
+//Endpoints function: return all device data in json format
+def getDevices() {
+	def deviceData = []
+	inputs?.each {
+		def deviceType = getDeviceType(it)
+		if (deviceType == "thermostat") {
+			deviceData << [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it), locationMode: getLocationModeInfo()]
+		} else {
+			deviceData << [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it)]
+		}
+	}
+
+	log.debug "getDevices, return: ${deviceData}"
+	return deviceData
+}
+
+//Endpoints function: get device data
+def getDevice() {
+	def it = findDevice(params.id)
+	def deviceType = getDeviceType(it)
+	def device
+	if (deviceType == "thermostat") {
+		device = [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it), locationMode: getLocationModeInfo()]
+	} else {
+		device = [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it)]
+	}
+	log.debug "getDevice, return: ${device}"
+	return device
+}
+
+//Endpoints function: update device data
+void updateDevice() {
+	def device = findDevice(params.id)
+	request.JSON.each {
+		def command = it.key
+		def value = it.value
+		if (command) {
+			def commandList = mapDeviceCommands(command, value)
+			command = commandList[0]
+			value = commandList[1]
+
+			if (command == "setAwayMode") {
+				log.info "Setting away mode to ${value}"
+				if (location.modes?.find { it.name == value }) {
+					location.setMode(value)
+				}
+			} else if (command == "thermostatSetpoint") {
+				switch (device.currentThermostatMode) {
+					case "cool":
+						log.info "Update: ${device.displayName}, [${command}, ${value}]"
+						device.setCoolingSetpoint(value)
+						break
+					case "heat":
+					case "emergency heat":
+						log.info "Update: ${device.displayName}, [${command}, ${value}]"
+						device.setHeatingSetpoint(value)
+						break
+					default:
+						httpError(501, "this mode: ${device.currentThermostatMode} does not allow changing thermostat setpoint.")
+						break
+				}
+			} else if (!device) {
+				log.error "updateDevice, Device not found"
+				httpError(404, "Device not found")
+			} else if (!device.hasCommand(command)) {
+				log.error "updateDevice, Device does not have the command"
+				httpError(404, "Device does not have such command")
+			} else {
+				if (command == "setColor") {
+					log.info "Update: ${device.displayName}, [${command}, ${value}]"
+					device."$command"(hex: value)
+				} else if (value.isNumber()) {
+					def intValue = value as Integer
+					log.info "Update: ${device.displayName}, [${command}, ${intValue}(int)]"
+					device."$command"(intValue)
+				} else if (value) {
+					log.info "Update: ${device.displayName}, [${command}, ${value}]"
+					device."$command"(value)
+				} else {
+					log.info "Update: ${device.displayName}, [${command}]"
+					device."$command"()
+				}
+			}
+		}
+	}
+}
+
+/*** Private Functions ***/
+
+//Return current location mode info
+private getLocationModeInfo() {
+	return [mode: location.mode, supported: location.modes.name]
+}
+
+//Map each device to a type given it's capabilities
+private getDeviceType(device) {
+	def deviceType
+	def caps = device.capabilities
+	log.debug "capabilities: [${device}, ${caps}]"
+	log.debug "supported commands: [${device}, ${device.supportedCommands}]"
+	caps.each {
+		switch (it.name.toLowerCase()) {
+			case "switch":
+				deviceType = "switch"
+				if (caps.any { it.name.toLowerCase() == "power meter" }) {
+					return deviceType
+				}
+				if (caps.any { it.name.toLowerCase() == "switch level" }) {
+					deviceType = "light"
+					return deviceType
+				}
+				break
+			case "contact sensor":
+				deviceType = "contactSensor"
+				return deviceType
+			case "garageDoorControl":
+				deviceType = "garageDoor"
+				return deviceType
+			case "lock":
+				deviceType = "lock"
+				return deviceType
+			case "video camera":
+				deviceType = "camera"
+				return deviceType
+			case "motion sensor":
+				deviceType = "motionSensor"
+				return deviceType
+			case "presence sensor":
+				deviceType = "presenceSensor"
+				return deviceType
+			case "thermostat":
+				deviceType = "thermostat"
+				return deviceType
+			case "water sensor":
+				deviceType = "waterSensor"
+				return deviceType
+			default:
+				break
+		}
+	}
+	return deviceType
+}
+
+//Return a specific device give the device ID.
+private findDevice(deviceId) {
+	return inputs?.find { it.id == deviceId }
+}
+
+//Return a list of device attributes
+private deviceAttributeList(device) {
+	device.supportedAttributes.collectEntries { attribute ->
+		try {
+			[(attribute.name): device.currentValue(attribute.name)]
+		} catch (e) {
+			[(attribute.name): null]
+		}
+	}
+}
+
+//Map device command and value.
+//input command and value are from UWP,
+//returns resultCommand and resultValue that corresponds with function and value in SmartApps
+private mapDeviceCommands(command, value) {
+	log.debug "mapDeviceCommands: [${command}, ${value}]"
+	def resultCommand = command
+	def resultValue = value
+	switch (command) {
+		case "switch":
+			if (value == 1 || value == "1" || value == "on") {
+				resultCommand = "on"
+				resultValue = ""
+			} else if (value == 0 || value == "0" || value == "off") {
+				resultCommand = "off"
+				resultValue = ""
+			}
+			break
+	// light attributes
+		case "level":
+			resultCommand = "setLevel"
+			resultValue = value
+			break
+		case "hue":
+			resultCommand = "setHue"
+			resultValue = value
+			break
+		case "saturation":
+			resultCommand = "setSaturation"
+			resultValue = value
+			break
+		case "ct":
+			resultCommand = "setColorTemperature"
+			resultValue = value
+			break
+		case "color":
+			resultCommand = "setColor"
+			resultValue = value
+	// thermostat attributes
+		case "hvacMode":
+			resultCommand = "setThermostatMode"
+			resultValue = value
+			break
+		case "fanMode":
+			resultCommand = "setThermostatFanMode"
+			resultValue = value
+			break
+		case "awayMode":
+			resultCommand = "setAwayMode"
+			resultValue = value
+			break
+		case "coolingSetpoint":
+			resultCommand = "setCoolingSetpoint"
+			resultValue = value
+			break
+		case "heatingSetpoint":
+			resultCommand = "setHeatingSetpoint"
+			resultValue = value
+			break
+		case "thermostatSetpoint":
+			resultCommand = "thermostatSetpoint"
+			resultValue = value
+			break
+	// lock attributes
+		case "locked":
+			if (value == 1 || value == "1" || value == "lock") {
+				resultCommand = "lock"
+				resultValue = ""
+			} else if (value == 0 || value == "0" || value == "unlock") {
+				resultCommand = "unlock"
+				resultValue = ""
+			}
+			break
+		default:
+			break
+	}
+
+	return [resultCommand, resultValue]
+}
+

smartapps/osotech/plantlink-connector.src/plantlink-connector.groovy

@@ -57,7 +57,7 @@ def authPage(){
         atomicState.accessToken = state.accessToken
     }
 
-	def redirectUrl = oauthInitUrl()
+    def redirectUrl = oauthInitUrl()
     def uninstallAllowed = false
     def oauthTokenProvided = false
     if(atomicState.authToken){
@@ -78,9 +78,9 @@ def authPage(){
         }
     }else{
         return dynamicPage(name: "auth", title: "Step 1 of 2 - Completed", nextPage:"deviceList", uninstall:uninstallAllowed) {
-	        section(){
+            section(){
                paragraph "You are logged in to myplantlink.com, tap next to continue", image: iconUrl
- 			   href(url:redirectUrl, title:"Or", description:"tap to switch accounts")
+               href(url:redirectUrl, title:"Or", description:"tap to switch accounts")
             }
         }
     }
@@ -137,36 +137,44 @@ def dock_sensor(device_serial, expected_plant_name) {
             contentType: "application/json",
     ]
     log.debug "Creating new plant on myplantlink.com - ${expected_plant_name}"
-    httpPost(docking_params) { docking_response ->
-        if (parse_api_response(docking_response, "Docking a link")) {
-            if (docking_response.data.plants.size() == 0) {
-                log.debug "creating plant for - ${expected_plant_name}"
-                plant_post_body_map["name"] = expected_plant_name
-                plant_post_body_map['links_key'] = [docking_response.data.key]
-                def plant_post_body_json_builder = new JsonBuilder(plant_post_body_map)
-                plant_post_params["body"] = plant_post_body_json_builder.toString()
-                httpPost(plant_post_params) { plant_post_response ->
-                    if(parse_api_response(plant_post_response, 'creating plant')){
-                        def attached_map = atomicState.attached_sensors
-                        attached_map[device_serial] = plant_post_response.data
-                        atomicState.attached_sensors = attached_map
+    try {
+        httpPost(docking_params) { docking_response ->
+            if (parse_api_response(docking_response, "Docking a link")) {
+                if (docking_response.data.plants.size() == 0) {
+                    log.debug "creating plant for - ${expected_plant_name}"
+                    plant_post_body_map["name"] = expected_plant_name
+                    plant_post_body_map['links_key'] = [docking_response.data.key]
+                    def plant_post_body_json_builder = new JsonBuilder(plant_post_body_map)
+                    plant_post_params["body"] = plant_post_body_json_builder.toString()
+                    try {
+                        httpPost(plant_post_params) { plant_post_response ->
+                            if(parse_api_response(plant_post_response, 'creating plant')){
+                                def attached_map = atomicState.attached_sensors
+                                attached_map[device_serial] = plant_post_response.data
+                                atomicState.attached_sensors = attached_map
+                            }
+                        }
+                    } catch (Exception f) {
+                        log.debug "call failed $f"
                     }
+                } else {
+                    def plant = docking_response.data.plants[0]
+                    def attached_map = atomicState.attached_sensors
+                    attached_map[device_serial] = plant
+                    atomicState.attached_sensors = attached_map
+                    checkAndUpdatePlantIfNeeded(plant, expected_plant_name)
                 }
-            } else {
-                def plant = docking_response.data.plants[0]
-                def attached_map = atomicState.attached_sensors
-                attached_map[device_serial] = plant
-                atomicState.attached_sensors = attached_map
-                checkAndUpdatePlantIfNeeded(plant, expected_plant_name)
             }
         }
+    } catch (Exception e) {
+        log.debug "call failed $e"
     }
     return true
 }
 
 def checkAndUpdatePlantIfNeeded(plant, expected_plant_name){
     def plant_put_params = [
-		uri : appSettings.https_plantLinkServer,
+        uri : appSettings.https_plantLinkServer,
         headers : ["Content-Type": "application/json", "Authorization": "Bearer ${atomicState.authToken}"],
         contentType : "application/json"
     ]
@@ -174,12 +182,16 @@ def checkAndUpdatePlantIfNeeded(plant, expected_plant_name){
         log.debug "updating plant for - ${expected_plant_name}"
         plant_put_params["path"] = "/api/v1/plants/${plant.key}"
         def plant_put_body_map = [
-			name: expected_plant_name
+            name: expected_plant_name
         ]
         def plant_put_body_json_builder = new JsonBuilder(plant_put_body_map)
         plant_put_params["body"] = plant_put_body_json_builder.toString()
-        httpPut(plant_put_params) { plant_put_response ->
-            parse_api_response(plant_put_response, 'updating plant name')
+        try {
+            httpPut(plant_put_params) { plant_put_response ->
+                parse_api_response(plant_put_response, 'updating plant name')
+            }
+        } catch (Exception e) {
+            log.debug "call failed $e"
         }
     }
 }
@@ -198,25 +210,29 @@ def moistureHandler(event){
                 contentType: "application/json",
                 body: event.value
         ]
-        httpPost(measurement_post_params) { measurement_post_response ->
-            if (parse_api_response(measurement_post_response, 'creating moisture measurement') &&
-                    measurement_post_response.data.size() >0){
-                def measurement = measurement_post_response.data[0]
-                def plant =  measurement.plant
-                log.debug plant
-                checkAndUpdatePlantIfNeeded(plant, expected_plant_name)
-                plantlinksensors.each{ sensor_device ->
-                    if (sensor_device.id == event.deviceId){
-                        sensor_device.setStatusIcon(plant.status)
-                        if (plant.last_measurements && plant.last_measurements[0].moisture){
-                            sensor_device.setPlantFuelLevel(plant.last_measurements[0].moisture * 100 as int)
-                        }
-                        if (plant.last_measurements && plant.last_measurements[0].battery){
-                            sensor_device.setBatteryLevel(plant.last_measurements[0].battery * 100 as int)
+        try {
+            httpPost(measurement_post_params) { measurement_post_response ->
+                if (parse_api_response(measurement_post_response, 'creating moisture measurement') &&
+                        measurement_post_response.data.size() >0){
+                    def measurement = measurement_post_response.data[0]
+                    def plant =  measurement.plant
+                    log.debug plant
+                    checkAndUpdatePlantIfNeeded(plant, expected_plant_name)
+                    plantlinksensors.each{ sensor_device ->
+                        if (sensor_device.id == event.deviceId){
+                            sensor_device.setStatusIcon(plant.status)
+                            if (plant.last_measurements && plant.last_measurements[0].moisture){
+                                sensor_device.setPlantFuelLevel(plant.last_measurements[0].moisture * 100 as int)
+                            }
+                            if (plant.last_measurements && plant.last_measurements[0].battery){
+                                sensor_device.setBatteryLevel(plant.last_measurements[0].battery * 100 as int)
+                            }
                         }
                     }
                 }
             }
+        } catch (Exception e) {
+            log.debug "call failed $e"
         }
     }
 }
@@ -235,8 +251,12 @@ def batteryHandler(event){
                 contentType: "application/json",
                 body: event.value
         ]
-        httpPost(measurement_post_params) { measurement_post_response ->
-            parse_api_response(measurement_post_response, 'creating battery measurement')
+        try {
+            httpPost(measurement_post_params) { measurement_post_response ->
+                parse_api_response(measurement_post_response, 'creating battery measurement')
+            }
+        } catch (Exception e) {
+            log.debug "call failed $e"
         }
     }
 }
@@ -248,7 +268,7 @@ def getDeviceSerialFromEvent(event){
 }
 
 def oauthInitUrl(){
-	atomicState.oauthInitState = UUID.randomUUID().toString()
+    atomicState.oauthInitState = UUID.randomUUID().toString()
     def oauthParams = [
             response_type: "code",
             client_id: appSettings.client_id,
@@ -275,8 +295,12 @@ def swapToken(){
     ]
 
     def jsonMap
-    httpPost(postParams) { resp ->
-        jsonMap = resp.data
+    try {
+        httpPost(postParams) { resp ->
+            jsonMap = resp.data
+        }
+    } catch (Exception e) {
+        log.debug "call failed $e"
     }
 
     atomicState.refreshToken = jsonMap.refresh_token
@@ -287,33 +311,33 @@ def swapToken(){
 <head>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <style>
-	.container {
-		padding:25px;
-	}
-	.flex1 {
-    	width:33%;
-		float:left;
-		text-align: center;
-	}
-	p {
-		font-size: 2em;
-		font-family: Verdana, Geneva, sans-serif;
-		text-align: center;
-		color: #777;
-	}
+    .container {
+        padding:25px;
+    }
+    .flex1 {
+        width:33%;
+        float:left;
+        text-align: center;
+    }
+    p {
+        font-size: 2em;
+        font-family: Verdana, Geneva, sans-serif;
+        text-align: center;
+        color: #777;
+    }
 </style>
 </head>
 <body>
-	<div class="container">
-		<div class="flex1"><img src="https://dashboard.myplantlink.com/images/PLlogo.png" alt="PlantLink" height="75"/></div>
-		<div class="flex1"><img src="https://s3.amazonaws.com/smartapp-icons/Partner/support/connected-device-icn%402x.png" alt="connected to"  height="25" style="padding-top:25px;" /></div>
-		<div class="flex1"><img src="https://s3.amazonaws.com/smartapp-icons/Partner/support/st-logo%402x.png" alt="SmartThings" height="75"/></div>
-		<br clear="all">
+    <div class="container">
+        <div class="flex1"><img src="https://dashboard.myplantlink.com/images/PLlogo.png" alt="PlantLink" height="75"/></div>
+        <div class="flex1"><img src="https://s3.amazonaws.com/smartapp-icons/Partner/support/connected-device-icn%402x.png" alt="connected to"  height="25" style="padding-top:25px;" /></div>
+        <div class="flex1"><img src="https://s3.amazonaws.com/smartapp-icons/Partner/support/st-logo%402x.png" alt="SmartThings" height="75"/></div>
+        <br clear="all">
   </div>
   <div class="container">
-		<p>Your PlantLink Account is now connected to SmartThings!</p>
-		<p style="color:green;">Click <strong>Done</strong> at the top right to finish setup.</p>
-	</div>
+        <p>Your PlantLink Account is now connected to SmartThings!</p>
+        <p style="color:green;">Click <strong>Done</strong> at the top right to finish setup.</p>
+    </div>
 </body>
 </html>
 """

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

@@ -20,6 +20,9 @@
  *      JLH - 02-15-2014 - Fuller use of ecobee API
  *      10-28-2015 DVCSMP-604 - accessory sensor, DVCSMP-1174, DVCSMP-1111 - not respond to routines
  */
+
+include 'localization'
+
 definition(
 		name: "Ecobee (Connect)",
 		namespace: "smartthings",
@@ -78,7 +81,7 @@ def authPage() {
 		return dynamicPage(name: "auth", title: "Select Your Thermostats", uninstall: true) {
 			section("") {
 				paragraph "Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings."
-				input(name: "thermostats", title:"", type: "enum", required:true, multiple:true, description: "Tap to choose", metadata:[values:stats])
+				input(name: "thermostats", title:"Select Your Thermostats", type: "enum", required:true, multiple:true, description: "Tap to choose", metadata:[values:stats])
 			}
 
 			def options = sensorsDiscovered() ?: []
@@ -86,7 +89,7 @@ def authPage() {
 			if (numFound > 0)  {
 				section("") {
 					paragraph "Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings."
-					input(name: "ecobeesensors", title:"Select Ecobee Sensors (${numFound} found)", type: "enum", required:false, description: "Tap to choose", multiple:true, options:options)
+					input(name: "ecobeesensors", title: "Select Ecobee Sensors ({{numFound}} found)", messageArgs: [numFound: numFound], type: "enum", required:false, description: "Tap to choose", multiple:true, options:options)
 				}
 			}
 		}

smartapps/smartthings/ecobee-connect.src/i18n/ar-AE.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=قم بتوصيل ثرموستات Ecobee بـ SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=أنت متصل.
+'''Click to enter Ecobee Credentials'''=النقر لإدخال بيانات اعتماد Ecobee
+'''Login'''=تسجيل الدخول
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=انقر أدناه لتسجيل الدخول إلى خدمة ecobee والمصادقة على الوصول إلى SmartThings. تأكد من التمرير للأسفل على الصفحة ٢ والضغط على زر ”السماح“.
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=تحديد أجهزة الثرموستات
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=انقر أدناه لرؤية قائمة أجهزة ثرموستات ecobee المتوفرة في حساب ecobee، وحدد الأجهزة التي ترغب في توصيلها بـ SmartThings.
+'''Tap to choose'''=النقر لاختيار <device name>
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=انقر أدناه لرؤية قائمة مستشعرات ecobee المتوفرة في حساب ecobee، وحدد الأجهزة التي ترغب في توصيلها بـ SmartThings.
+'''Tap to choose'''=النقر لاختيار <device name>
+'''Select Ecobee Sensors ({{numFound}} found)'''=تحديد مستشعرات Ecobee‏ ‎({{numFound}} found)
+'''Your ecobee Account is now connected to SmartThings!'''=حساب ecobee متصل الآن بـ SmartThings!
+'''Click 'Done' to finish setup.'''=انقر فوق ”تم“ لإنهاء الإعداد.
+'''The connection could not be established!'''=يتعذر إنشاء الاتصال!
+'''Click 'Done' to return to the menu.'''=انقر فوق ”تم“ للعودة إلى القائمة.
+'''is connected to SmartThings'''={{deviceName}} متصل بـ SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=تم قطع اتصال {{deviceName}} بـ SmartThings، لأن بيانات اعتماد الوصول قد تغيرت أو فُقدت. يُرجى الانتقال إلى التطبيق الذكي Ecobee (Connect)‎ وإعادة إدخال بيانات اعتماد تسجيل الدخول إلى حسابك.
+'''Your Ecobee thermostat '''=ثرموستات Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/bg-BG.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Свържете термостата Ecobee към SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Свързани сте.
+'''Click to enter Ecobee Credentials'''=Щракнете, за да въведете идентификационни данни за Ecobee
+'''Login'''=Вход
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Докоснете по-долу, за да влезете в услугата ecobee и да упълномощите достъпа на SmartThings. Превъртете надолу в страница 2 и натиснете бутона Allow (Позволяване).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Избор на термостати
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Докоснете по-долу, за да видите списък с термостатите ecobee във вашия ecobee акаунт, и изберете онези, които искате да свържете към SmartThings.
+'''Tap to choose'''=Докосване за избор
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Докоснете по-долу, за да видите списък със сензорите ecobee във вашия ecobee акаунт, и изберете онези, които искате да свържете към SmartThings.
+'''Tap to choose'''=Докосване за избор
+'''Select Ecobee Sensors ({{numFound}} found)'''=Избор на сензори Ecobee ({{numFound}} с намерени)
+'''Your ecobee Account is now connected to SmartThings!'''=Вашият ecobee акаунт вече е свързан към SmartThings!
+'''Click 'Done' to finish setup.'''=Щракнете върху Done (Готово), за да завършите настройката.
+'''The connection could not be established!'''=Връзката не може да се осъществи!
+'''Click 'Done' to return to the menu.'''=Щракнете върху Done (Готово), за да се върнете към менюто.
+'''is connected to SmartThings'''=е свързан към SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=е прекъснат от SmartThings, тъй като идентификационните данни за достъп са променени или изгубени. Отидете в Ecobee (Connect) SmartApp и въведете отново идентификационните си данни за влизане в акаунта.
+'''Your Ecobee thermostat '''=Вашият термостат Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/cs-CZ.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Připojte termostat Ecobee k systému SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Jste připojeni.
+'''Click to enter Ecobee Credentials'''=Klepněte a zadejte přihlašovací údaje Ecobee
+'''Login'''=Přihlásit
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Klepnutím na následující tlačítko se přihlásíte ke službě ecobee a autorizujete přístup pro systém SmartThings. Posuňte se dolů na stránku 2 a stiskněte tlačítko „Allow“ (Povolit).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Vyberte termostaty
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Klepnutím na následující tlačítko zobrazte seznam termostatů ecobee dostupných na vašem účtu ecobee a vyberte ty, které chcete připojit k systému SmartThings.
+'''Tap to choose'''=Klepnutím zvolte
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Klepnutím na následující tlačítko zobrazte seznam senzorů ecobee dostupných na vašem účtu ecobee a vyberte ty, které chcete připojit k systému SmartThings.
+'''Tap to choose'''=Klepnutím zvolte
+'''Select Ecobee Sensors ({{numFound}} found)'''=Vyberte senzory Ecobee (nalezeno {{numFound}})
+'''Your ecobee Account is now connected to SmartThings!'''=Účet ecobee je nyní připojen k systému SmartThings!
+'''Click 'Done' to finish setup.'''=Dokončete nastavení klepnutím na tlačítko „Done“ (Hotovo).
+'''The connection could not be established!'''=Připojení nelze navázat!
+'''Click 'Done' to return to the menu.'''=Klepnutím na tlačítko „Done“ (Hotovo) se vrátíte do menu.
+'''is connected to SmartThings'''=je připojen ke SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=byl odpojen od systému SmartThings, protože přístupové přihlašovací údaje byly změněny nebo ztraceny. Přejděte do Ecobee (Connect) SmartApp a znovu zadejte své přihlašovací údaje k účtu.
+'''Your Ecobee thermostat '''=Termostat Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/da-DK.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Forbind din Ecobee-termostat med SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Du er nu forbundet.
+'''Click to enter Ecobee Credentials'''=Klik for at indtaste Ecobee-legitimationsoplysninger
+'''Login'''=Log ind
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Tryk nedenfor for at logge ind på din ecobee-tjeneste og godkende SmartThings-adgang. Sørg for at rulle ned på side 2 og trykke på knappen “Allow” (Tillad).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Vælg dine termostater
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Tryk herunder for at se listen over ecobee-termostater, der er tilgængelige på din ecobee-konto, og vælg dem, du vil forbinde med SmartThings.
+'''Tap to choose'''=Tryk for at vælge
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Tryk herunder for at se listen over ecobee-sensorer, der er tilgængelige på din ecobee-konto, og vælg dem, du vil forbinde med SmartThings.
+'''Tap to choose'''=Tryk for at vælge
+'''Select Ecobee Sensors ({{numFound}} found)'''=Vælg Ecobee-sensorer ({{numFound}} fundet)
+'''Your ecobee Account is now connected to SmartThings!'''=Din ecobee-konto er nu forbundet med SmartThings!
+'''Click 'Done' to finish setup.'''=Klik på “Done” (Udført) for at afslutte konfigurationen.
+'''The connection could not be established!'''=Der kunne ikke oprettes forbindelse!
+'''Click 'Done' to return to the menu.'''=Klik på “Done” (Udført) for at vende tilbage til menuen.
+'''is connected to SmartThings'''=er forbundet med SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=er koblet fra SmartThings, fordi adgangslegitimationsoplysningerne er ændret eller gået tabt. Gå til Ecobee (Connect (Forbind)) SmartApp, og indtast dine kontologinoplysninger igen.
+'''Your Ecobee thermostat '''=Din Ecobee-termostat

smartapps/smartthings/ecobee-connect.src/i18n/de-DE.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Verbinden Sie Ihr Ecobee-Thermostat mit SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Sie sind verbunden.
+'''Click to enter Ecobee Credentials'''=Hier klicken, um die ecobee-Zugangsdaten einzugeben.
+'''Login'''=Anmeldung
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Tippen Sie unten, um sich am ecobee-Dienst anzumelden und den SmartThings-Zugriff zu autorisieren. Stellen Sie sicher, dass Sie bis auf Seite 2 herunterscrollen und auf die Schaltfläche „Allow“ (Zulassen) tippen.
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Ihre Thermostate auswählen
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Tippen Sie unten, um eine Liste der ecobee-Thermostate anzuzeigen, die in Ihrem ecobee-Konto verfügbar sind, und wählen Sie diejenigen aus, mit denen Sie eine Verbindung zu SmartThings herstellen möchten.
+'''Tap to choose'''=Zur Auswahl tippen
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Tippen Sie unten, um eine Liste der ecobee-Sensoren anzuzeigen, die in Ihrem ecobee-Konto verfügbar sind, und wählen Sie diejenigen aus, mit denen Sie eine Verbindung zu SmartThings herstellen möchten.
+'''Tap to choose'''=Zur Auswahl tippen
+'''Select Ecobee Sensors ({{numFound}} found)'''=ecobee-Sensoren auswählen ({{numFound}} gefunden)
+'''Your ecobee Account is now connected to SmartThings!'''=Ihr ecobee-Konto ist jetzt mit SmartThings verbunden!
+'''Click 'Done' to finish setup.'''=Klicken Sie auf „Done“ (OK), um die Einrichtung abzuschließen.
+'''The connection could not be established!'''=Es konnte keine Verbindung hergestellt werden!
+'''Click 'Done' to return to the menu.'''=Klicken Sie auf „Done“ (OK), um zum Menü zurückzukehren.
+'''is connected to SmartThings'''=ist mit SmartThings verbunden
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=ist von SmartThings getrennt, da die Zugangsdaten für den Zugriff geändert wurden oder verloren gingen. Wechseln Sie zur ecobee (Connect)-SmartApp und geben Sie Ihre Kontozugangsdaten erneut ein.
+'''Your Ecobee thermostat '''=Ihr ecobee-Thermostat

smartapps/smartthings/ecobee-connect.src/i18n/el-GR.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Συνδέστε το θερμοστάτη Ecobee στο SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Έχετε συνδεθεί.
+'''Click to enter Ecobee Credentials'''=Κάντε κλικ για να καταχωρήσετε διαπιστευτήρια Ecobee
+'''Login'''=Σύνδεση
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Πατήστε παρακάτω για να συνδεθείτε στην υπηρεσία ecobee και να δώσετε εξουσιοδότηση πρόσβασης για το SmartThings. Κάνετε κύλιση προς τα κάτω στη σελίδα 2 και πατήστε το κουμπί "Επιτρ.".
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Επιλέξτε τους θερμοστάτες σας
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Πατήστε παρακάτω για να δείτε τη λίστα με τους θερμοστάτες ecobee που είναι διαθέσιμοι στο λογαριασμό ecobee και να επιλέξετε αυτούς που θέλετε να συνδέσετε στο SmartThings.
+'''Tap to choose'''=Πατήστε για να επιλέξετε
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Πατήστε παρακάτω για να δείτε τη λίστα με τους αισθητήρες ecobee που είναι διαθέσιμοι στο λογαριασμό ecobee και να επιλέξετε αυτούς που θέλετε να συνδέσετε στο SmartThings.
+'''Tap to choose'''=Πατήστε για να επιλέξετε
+'''Select Ecobee Sensors ({{numFound}} found)'''=Επιλογή αισθητήρων Ecobee (βρέθηκαν {{numFound}})
+'''Your ecobee Account is now connected to SmartThings!'''=Ο λογαριασμός σας στο ecobee έχει τώρα συνδεθεί στο SmartThings!
+'''Click 'Done' to finish setup.'''=Πατήστε "Done" (Τέλος) για να ολοκληρωθεί η ρύθμιση.
+'''The connection could not be established!'''=Δεν ήταν δυνατή η δημιουργία σύνδεσης!
+'''Click 'Done' to return to the menu.'''=Κάντε κλικ στο "Done" (Τέλος) για να επιστρέψετε στο μενού.
+'''is connected to SmartThings'''=συνδέθηκε στο SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=αποσυνδέθηκε από το SmartThings, επειδή τα διαπιστευτήρια πρόσβασης άλλαξαν ή έχουν χαθεί. Μεταβείτε στην εφαρμογή Ecobee (Connect) SmartApp και καταχωρήστε ξανά τα διαπιστευτήρια σύνδεσης για το λογαριασμό σας.
+'''Your Ecobee thermostat '''=Θερμοστάτης Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/en-GB.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Connect your Ecobee thermostat to SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=You are connected.
+'''Click to enter Ecobee Credentials'''=Click to enter Ecobee Credentials
+'''Login'''=Login
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Tap below to log in to the ecobee service and authorise SmartThings access. Be sure to scroll down on page 2 and press the ’Allow’ button.
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Select Your Thermostats
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.
+'''Tap to choose'''=Tap to choose
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.
+'''Tap to choose'''=Tap to choose
+'''Select Ecobee Sensors ({{numFound}} found)'''=Select Ecobee Sensors ({{numFound}} found)
+'''Your ecobee Account is now connected to SmartThings!'''=Your ecobee Account is now connected to SmartThings!
+'''Click 'Done' to finish setup.'''=Click ’Done’ to finish setup.
+'''The connection could not be established!'''=The connection could not be established!
+'''Click 'Done' to return to the menu.'''=Click ’Done’ to return to the menu.
+'''is connected to SmartThings'''=is connected to SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.
+'''Your Ecobee thermostat '''=Your Ecobee thermostat

smartapps/smartthings/ecobee-connect.src/i18n/es-ES.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Conecte su termostato Ecobee a SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Está conectado.
+'''Click to enter Ecobee Credentials'''=Haga clic para introducir las credenciales de Ecobee
+'''Login'''=Inicio de sesión
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Pulse a continuación para iniciar sesión en el servicio de ecobee y autorizar el acceso a SmartThings. Asegúrese de desplazarse hacia abajo a la página 2 y pulsar el botón “Allow” (Permitir).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Seleccionar los termostatos
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Pulse a continuación para ver la lista de termostatos ecobee disponibles en su cuenta de ecobee y seleccione los que quiera conectar a SmartThings.
+'''Tap to choose'''=Pulsar para seleccionar
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Pulse a continuación para ver la lista de sensores ecobee disponibles en su cuenta de ecobee y seleccione los que quiera conectar a SmartThings.
+'''Tap to choose'''=Pulsar para seleccionar
+'''Select Ecobee Sensors ({{numFound}} found)'''=Seleccionar sensores de Ecobee ({{numFound}} encontrados)
+'''Your ecobee Account is now connected to SmartThings!'''=¡Su cuenta de ecobee ya está conectada a SmartThings!
+'''Click 'Done' to finish setup.'''=Haga clic en “Done” (Hecho) para finalizar la configuración.
+'''The connection could not be established!'''=¡No se ha podido establecer la conexión!
+'''Click 'Done' to return to the menu.'''=Haga clic en “Done” (Hecho) para volver al menú.
+'''is connected to SmartThings'''=está conectado a SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=está desconectado de SmartThings porque se han cambiado o perdido las credenciales de acceso. Vaya a la aplicación inteligente de Ecobee (Conectar) y vuelva a introducir las credenciales de inicio de sesión de su cuenta.
+'''Your Ecobee thermostat '''=Su termostato Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/es-US.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Conecte el termostato Ecobee a SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Está conectado.
+'''Click to enter Ecobee Credentials'''=Haga clic para introducir las credenciales de Ecobee
+'''Login'''=Inicio de sesión
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Pulse a continuación para iniciar sesión en el servicio de ecobee y otorgar acceso a SmartThings. Asegúrese de desplazarse hacia abajo en la página 2 y de presionar el botón 'Allow' ('Permitir').
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Seleccionar Your Thermostats (Sus termostatos)
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Pulse a continuación para ver la lista de termostatos ecobee disponibles en su cuenta de ecobee y seleccione los que desea conectar a SmartThings.
+'''Tap to choose'''=Pulsar para elegir
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Pulse a continuación para ver la lista de sensores ecobee disponibles en su cuenta de ecobee y seleccione los que desea conectar a SmartThings.
+'''Tap to choose'''=Pulsar para elegir
+'''Select Ecobee Sensors ({{numFound}} found)'''=Seleccionar sensores Ecobee (hay {{numFound}})
+'''Your ecobee Account is now connected to SmartThings!'''=¡Su cuenta de ecobee ahora está conectada a SmartThings!
+'''Click 'Done' to finish setup.'''=Haga clic en 'Done' ('Listo') para finalizar la configuración.
+'''The connection could not be established!'''=¡No fue posible establecer la conexión!
+'''Click 'Done' to return to the menu.'''=Haga clic en 'Done' ('Listo') para volver al menú.
+'''is connected to SmartThings'''=está conectado a SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=no está conectado a SmartThings debido a que la credencial de acceso se cambió o se perdió. Vaya a la SmartApp de Ecobee (Connect) y vuelva a introducir las credenciales de inicio de sesión de su cuenta.
+'''Your Ecobee thermostat '''=Su termostato Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/et-EE.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Ühendage oma termostaat Ecobee teenusega SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Ühendus on loodud.
+'''Click to enter Ecobee Credentials'''=Klõpsake, et sisestada teenuse Ecobee volitused
+'''Login'''=Sisselogimine
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Toksake all, et logida sisse teenusesse ecobee ja autoriseerida teenuse SmartThings juurdepääs. Kerige kindlasti alla lehele 2 ja vajutage nuppu Luba.
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Valige oma termostaadid
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Toksake all, et näha oma ecobee kontole registreeritud ecobee termostaate ja valige need, mida soovite ühendada teenusega SmartThings.
+'''Tap to choose'''=Toksake, et valida
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Toksake all, et näha oma ecobee kontole registreeritud ecobee andureid ja valige need, mida soovite ühendada teenusega SmartThings.
+'''Tap to choose'''=Toksake, et valida
+'''Select Ecobee Sensors ({{numFound}} found)'''=Valige Ecobee andurid (leiti {{numFound}})
+'''Your ecobee Account is now connected to SmartThings!'''=Teie ecobee konto on nüüd ühendatud teenusega SmartThings!
+'''Click 'Done' to finish setup.'''=Klõpsake valikut Valmis, et seadistamine lõpule viia.
+'''The connection could not be established!'''=Ühenduse loomine nurjus!
+'''Click 'Done' to return to the menu.'''=Klõpsake valikut Valmis, et naasta menüüsse.
+'''is connected to SmartThings'''=on ühendatud teenusega SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=on teenusest SmartThings lahti ühendatud, kuna juurdepääsu volitus muutus või kadus. Avage rakendus Ecobee (Connect) SmartApp ja sisestage uuesti oma konto sisselogimisandmed.
+'''Your Ecobee thermostat '''=Teie Ecobee termostaat

smartapps/smartthings/ecobee-connect.src/i18n/fi-FI.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Yhdistä Ecobee-termostaattisi SmartThingsiin.
+'''ecobee'''=ecobee
+'''You are connected.'''=Yhteys muodostettu.
+'''Click to enter Ecobee Credentials'''=Napsauta ja anna Ecobee-tunnistetiedot
+'''Login'''=Kirjautuminen
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Kirjaudu ecobee-palveluun ja myönnä SmartThingsille käyttöoikeudet napauttamalla alla. Vieritä alas sivulle 2 ja paina Allow (Salli) -painiketta.
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Valitse termostaatit
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Napauttamalla alla voit tuoda ecobee-tililläsi käytettävissä olevien ecobee-termostaattien luettelon näyttöön ja valita SmartThingsiin yhdistettävät laitteet.
+'''Tap to choose'''=Valitse napauttamalla
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Napauttamalla alla voit tuoda ecobee-tililläsi käytettävissä olevien ecobee-tunnistimien luettelon näyttöön ja valita SmartThingsiin yhdistettävät laitteet.
+'''Tap to choose'''=Valitse napauttamalla
+'''Select Ecobee Sensors ({{numFound}} found)'''=Valitse Ecobee-tunnistimet ({{numFound}} löydetty)
+'''Your ecobee Account is now connected to SmartThings!'''=ecobee-tilisi on nyt yhdistetty SmartThingsiin!
+'''Click 'Done' to finish setup.'''=Viimeistele asennus napsauttamalla Done (Valmis).
+'''The connection could not be established!'''=Yhteyden muodostaminen epäonnistui!
+'''Click 'Done' to return to the menu.'''=Palaa valikkoon napsauttamalla Done (Valmis).
+'''is connected to SmartThings'''=on yhdistetty SmartThingsiin
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=ei enää ole yhteydessä SmartThingsiin, sillä käyttötunnukset ovat muuttuneet tai kadonneet. Siirry Ecobee (Connect) SmartAppiin ja anna tilisi kirjautumistiedot uudelleen.
+'''Your Ecobee thermostat '''=Ecobee-termostaattisi

smartapps/smartthings/ecobee-connect.src/i18n/fr-CA.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Connectez votre thermostat Ecobee à SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Vous êtes connecté.
+'''Click to enter Ecobee Credentials'''=Cliquez pour saisir les informations d'identification Ecobee
+'''Login'''=Connexion
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Appuyez ci-dessous pour vous connecter au service ecobee et autoriser l'accès pour SmartThings. Faites défiler l'écran jusqu'en bas de la page 2 et appuyez sur le bouton Allow (Autoriser).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Sélection de vos thermostats
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Appuyez ci-dessous pour afficher la liste des thermostats ecobee disponibles dans votre compte ecobee et sélectionner ceux que vous souhaitez connecter à SmartThings.
+'''Tap to choose'''=Appuyez pour sélectionner
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Appuyez ci-dessous pour afficher la liste des capteurs ecobee disponibles dans votre compte ecobee et sélectionner ceux que vous souhaitez connecter à SmartThings.
+'''Tap to choose'''=Appuyez pour sélectionner
+'''Select Ecobee Sensors ({{numFound}} found)'''=Sélection des capteurs Ecobee ({{numFound}} trouvé(s))
+'''Your ecobee Account is now connected to SmartThings!'''=Votre compte ecobee est maintenant connecté à SmartThings !
+'''Click 'Done' to finish setup.'''=Cliquez sur Done (Terminé) pour terminer la configuration.
+'''The connection could not be established!'''=La connexion n'a pas pu être établie !
+'''Click 'Done' to return to the menu.'''=Cliquez sur Done (Terminé) pour revenir au menu.
+'''is connected to SmartThings'''=est connecté à SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=est déconnecté de SmartThings, car les identifiants d'accès ont été modifiés ou perdus. Accédez à la SmartApp Ecobee (Connect) et saisissez à nouveau les informations de connexion à votre compte.
+'''Your Ecobee thermostat '''=Votre thermostat Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/fr-FR.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Connectez votre thermostat Ecobee à SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Vous êtes connecté.
+'''Click to enter Ecobee Credentials'''=Cliquez pour saisir les informations d'identification Ecobee
+'''Login'''=Connexion
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Appuyez ci-dessous pour vous connecter au service ecobee et autoriser l'accès pour SmartThings. Faites défiler l'écran jusqu'en bas de la page 2 et appuyez sur le bouton Allow (Autoriser).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Sélection de vos thermostats
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Appuyez ci-dessous pour afficher la liste des thermostats ecobee disponibles dans votre compte ecobee et sélectionner ceux que vous souhaitez connecter à SmartThings.
+'''Tap to choose'''=Appuyez pour sélectionner
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Appuyez ci-dessous pour afficher la liste des capteurs ecobee disponibles dans votre compte ecobee et sélectionner ceux que vous souhaitez connecter à SmartThings.
+'''Tap to choose'''=Appuyez pour sélectionner
+'''Select Ecobee Sensors ({{numFound}} found)'''=Sélection des capteurs Ecobee ({{numFound}} trouvé(s))
+'''Your ecobee Account is now connected to SmartThings!'''=Votre compte ecobee est maintenant connecté à SmartThings !
+'''Click 'Done' to finish setup.'''=Cliquez sur Done (Terminé) pour terminer la configuration.
+'''The connection could not be established!'''=La connexion n'a pas pu être établie !
+'''Click 'Done' to return to the menu.'''=Cliquez sur Done (Terminé) pour revenir au menu.
+'''is connected to SmartThings'''=est connecté à SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=est déconnecté de SmartThings, car les identifiants d'accès ont été modifiés ou perdus. Accédez à la SmartApp Ecobee (Connect) et saisissez à nouveau les informations de connexion à votre compte.
+'''Your Ecobee thermostat '''=Votre thermostat Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/hr-HR.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Povežite termostat Ecobee s uslugom SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Povezani ste.
+'''Click to enter Ecobee Credentials'''=Kliknite za unos podataka za prijavu za Ecobee
+'''Login'''=Prijava
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Dodirnite u nastavku da biste se prijavili u uslugu ecobee i odobrili pristup za SmartThings. Na 2. se stranici pomaknite prema dolje i pritisnite gumb „Allow” (Dopusti).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Odaberite termostate
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Dodirnite u nastavku da biste vidjeli popis termostata ecobee dostupnih na vašem računu za ecobee i odaberite one koje želite povezati s uslugom SmartThings.
+'''Tap to choose'''=Dodirnite za odabir
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Dodirnite u nastavku da biste vidjeli popis senzora ecobee dostupnih na vašem računu za ecobee i odaberite one koje želite povezati s uslugom SmartThings.
+'''Tap to choose'''=Dodirnite za odabir
+'''Select Ecobee Sensors ({{numFound}} found)'''=Odaberite senzore Ecobee (pronađeno: {{numFound}})
+'''Your ecobee Account is now connected to SmartThings!'''=Račun za ecobee sada je povezan s uslugom SmartThings!
+'''Click 'Done' to finish setup.'''=Kliknite „Done” (Gotovo) da biste dovršili postavljanje.
+'''The connection could not be established!'''=Veza se nije uspostavila!
+'''Click 'Done' to return to the menu.'''=Kliknite „Done” (Gotovo) za vraćanje na izbornik.
+'''is connected to SmartThings'''=povezan je s uslugom SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=nije povezan s uslugom SmartThings jer su se pristupni podaci promijenili ili izgubili. Idite na Ecobee (Connect) SmartApp i ponovno unesite podatke za prijavu na račun.
+'''Your Ecobee thermostat '''=Termostat Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/hu-HU.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Ecobee termosztátot csatlakoztathat a SmartThings rendszerhez.
+'''ecobee'''=ecobee
+'''You are connected.'''=Kapcsolódott.
+'''Click to enter Ecobee Credentials'''=Kattintson az Ecobee-hitelesítőadatok megadásához
+'''Login'''=Bejelentkezés
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Az alábbi hivatkozás megérintésével bejelentkezhet az ecobee szolgáltatásba, és engedélyezheti a SmartThings-hozzáférést. Görgessen le a 2. oldalon, és nyomja meg az „Allow” (Engedélyezés) gombot.
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=A termosztátok kiválasztása
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Az alábbi hivatkozás megérintésével megjelenítheti az ecobee-fiókjában rendelkezésre álló ecobee termosztátok listáját, és kiválaszthatja azokat, amelyeket csatlakoztatni szeretne a SmartThings rendszerhez.
+'''Tap to choose'''=Érintse meg a kiválasztáshoz
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Az alábbi hivatkozás megérintésével megjelenítheti az ecobee-fiókjában rendelkezésre álló ecobee érzékelők listáját, és kiválaszthatja azokat, amelyeket csatlakoztatni szeretne a SmartThings rendszerhez.
+'''Tap to choose'''=Érintse meg a kiválasztáshoz
+'''Select Ecobee Sensors ({{numFound}} found)'''=Ecobee érzékelők kiválasztása ({{numFound}} találat)
+'''Your ecobee Account is now connected to SmartThings!'''=Csatlakoztatta ecobee-fiókját a SmartThings rendszerhez!
+'''Click 'Done' to finish setup.'''=A telepítés befejezéséhez kattintson a „Done” (Kész) gombra.
+'''The connection could not be established!'''=Nem sikerült kapcsolatot létesíteni!
+'''Click 'Done' to return to the menu.'''=A menühöz való visszatéréshez kattintson a „Done” (Kész) gombra.
+'''is connected to SmartThings'''=kapcsolódott a SmartThings rendszerhez
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=le lett választva a SmartThings rendszerről, mert megváltoztak vagy elvesztek a hozzáférési hitelesítő adatok. Adja meg újra a fiókja bejelentkezési hitelesítő adatait a Ecobee (Connect) SmartApp segítségével.
+'''Your Ecobee thermostat '''=Az Ön Ecobee termosztátja

smartapps/smartthings/ecobee-connect.src/i18n/it-IT.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Connettete il termostato Ecobee a SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Connessione effettuata.
+'''Click to enter Ecobee Credentials'''=Fate clic per inserire le credenziali Ecobee
+'''Login'''=Accesso
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Toccate di seguito per accedere al servizio ecobee e autorizzare l'accesso a SmartThings. Scorrete fino in fondo alla pagina 2 e premete il pulsante “Allow” (Consenti).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Selezionate i termostati
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Toccate di seguito per visualizzare l'elenco dei termostati ecobee disponibili nell'account ecobee e selezionate quelli che volete connettere a SmartThings.
+'''Tap to choose'''=Toccate per scegliere
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Toccate di seguito per visualizzare l'elenco dei sensori ecobee disponibili nell'account ecobee e selezionate quelli che volete connettere a SmartThings.
+'''Tap to choose'''=Toccate per scegliere
+'''Select Ecobee Sensors ({{numFound}} found)'''=Selezionate i sensori Ecobee ({{numFound}} trovati)
+'''Your ecobee Account is now connected to SmartThings!'''=L'account ecobee è ora connesso a SmartThings.
+'''Click 'Done' to finish setup.'''=Fate clic su “Done” (Fatto) per terminare la configurazione.
+'''The connection could not be established!'''=Non è stato possibile stabilire la connessione.
+'''Click 'Done' to return to the menu.'''=Fate clic su “Done” (Fatto) per tornare al menu.
+'''is connected to SmartThings'''=connesso a SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=disconnesso da SmartThings. Le credenziali di accesso sono state modificate o sono andate perse. Andate alla SmartApp di Ecobee (Connect) e inserite nuovamente le credenziali di accesso all'account.
+'''Your Ecobee thermostat '''=Il termostato Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/ko-KR.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Ecobee 온도조절기를 SmartThings에 연결하세요.
+'''ecobee'''=Ecobee
+'''You are connected.'''=연결되었습니다.
+'''Click to enter Ecobee Credentials'''=Ecobee 로그인 정보를 입력하려면 클릭하세요
+'''Login'''=로그인
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Ecobee 서비스에 로그인하여 SmartThings를 사용할 수 있도록 인증하려면 아래를 누르세요. 2페이지에서 아래로 스크롤한 후 [허용]을 누르세요.
+'''ecobee'''=Ecobee
+'''Select Your Thermostats'''=온도조절기 선택
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Ecobee 계정에 등록된 Ecobee 온도조절기 목록을 확인하고 SmartThings에 연결할 기기를 선택하려면 아래를 누르세요.
+'''Tap to choose'''=눌러서 선택
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Ecobee 계정에 등록된 Ecobee 센서 목록을 확인하고 SmartThings에 연결할 기기를 선택하려면 아래를 누르세요.
+'''Tap to choose'''=눌러서 선택
+'''Select Ecobee Sensors ({{numFound}} found)'''=Ecobee 센서 선택 ({{numFound}}개 찾음)
+'''Your ecobee Account is now connected to SmartThings!'''=Ecobee 계정이 SmartThings에 연결되었습니다!
+'''Click 'Done' to finish setup.'''=설정을 완료하려면 [완료]를 클릭하세요.
+'''The connection could not be established!'''=연결을 실행할 수 없습니다!
+'''Click 'Done' to return to the menu.'''=메뉴로 돌아가려면 [완료]를 클릭하세요.
+'''is connected to SmartThings'''=이(가) SmartThings에 연결되었습니다
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=이(가) SmartThings에서 연결 해제되었습니다. 로그인 정보가 변경되었거나 유실되었습니다. Ecobee (연결) 스마트앱에서 계정의 로그인 정보를 다시 입력하세요.
+'''Your Ecobee thermostat '''=Ecobee 온도조절기

smartapps/smartthings/ecobee-connect.src/i18n/nl-NL.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Verbind uw Ecobee-thermostaat met SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=U bent verbonden.
+'''Click to enter Ecobee Credentials'''=Klik om Ecobee-inloggegevens in te voeren
+'''Login'''=Inloggen
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Tik hieronder om in te loggen bij uw ecobee-service en toegang door SmartThings toe te staan. Scrol naar beneden op pagina 2 en druk op de knop Allow (Toestaan).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Selecteer uw thermostaten
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Tik hieronder om de lijst met ecobee-thermostaten in uw ecobee-account weer te geven en de apparaten te selecteren die u wilt verbinden met SmartThings.
+'''Tap to choose'''=Tik om te kiezen
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Tik hieronder om de lijst met ecobee-sensoren in uw ecobee-account weer te geven en de apparaten te selecteren die u wilt verbinden met SmartThings.
+'''Tap to choose'''=Tik om te kiezen
+'''Select Ecobee Sensors ({{numFound}} found)'''=Selecteer Ecobee-sensoren ({{numFound}} gevonden)
+'''Your ecobee Account is now connected to SmartThings!'''=Uw ecobee-account is nu verbonden met SmartThings.
+'''Click 'Done' to finish setup.'''=Klik op Done (Gereed) om het instellen te voltooien.
+'''The connection could not be established!'''=Er kan geen verbinding worden gemaakt.
+'''Click 'Done' to return to the menu.'''=Klik op Done (Gereed) om terug te gaan naar het menu.
+'''is connected to SmartThings'''=is verbonden met SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=-verbinding met SmartThings is verbroken, omdat de inloggegevens zijn gewijzigd of verloren zijn gegaan. Ga naar de Ecobee (Connect) SmartApp en voer de inloggegevens voor uw account opnieuw in.
+'''Your Ecobee thermostat '''=Uw Ecobee-thermostaat

smartapps/smartthings/ecobee-connect.src/i18n/no-NO.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Koble Ecobee-termostaten til SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Du er tilkoblet.
+'''Click to enter Ecobee Credentials'''=Klikk for å angi Ecobee-informasjon
+'''Login'''=Logg på
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Trykk nedenfor for å logge på ecobee-tjenesten og godkjenne SmartThings-tilgang. Pass på å bla ned på side 2 og trykke på Allow (Tillat)-knappen.
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Velg termostatene dine
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Trykk nedenfor for å se listen over ecobee-termostatene som er tilgjengelige i ecobee-kontoen din, og velg de du vil koble til SmartThings.
+'''Tap to choose'''=Trykk for å velge
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Trykk nedenfor for å se listen over ecobee-sensorene som er tilgjengelige i ecobee-kontoen din, og velg de du vil koble til SmartThings.
+'''Tap to choose'''=Trykk for å velge
+'''Select Ecobee Sensors ({{numFound}} found)'''=Velg Ecobee-sensorer (fant {{numFound}})
+'''Your ecobee Account is now connected to SmartThings!'''=ecobee-kontoen din er nå koblet til SmartThings!
+'''Click 'Done' to finish setup.'''=Klikk på Done (Ferdig) for å fullføre oppsettet.
+'''The connection could not be established!'''=Kunne ikke opprette tilkoblingen!
+'''Click 'Done' to return to the menu.'''=Klikk på Done (Ferdig) for å gå tilbake til menyen.
+'''is connected to SmartThings'''=er koblet til SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=er koblet fra SmartThings fordi tilgangsinformasjonen ble endret eller mistet. Gå til Ecobee (Connect) SmartApp, og angi påloggingsinformasjonen for kontoen på nytt.
+'''Your Ecobee thermostat '''=Ecobee-termostaten

smartapps/smartthings/ecobee-connect.src/i18n/pl-PL.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Połącz termostat Ecobee ze SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Połączono.
+'''Click to enter Ecobee Credentials'''=Kliknij, aby wprowadzić poświadczenia Ecobee
+'''Login'''=Logowanie
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Dotknij poniżej, aby zalogować się do usługi ecobee i autoryzować dostęp SmartThings. Przewiń w dół na stronie 2 i naciśnij przycisk „Allow” (Zezwól).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Wybierz termostaty
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Dotknij poniżej, aby wyświetlić listę termostatów ecobee dostępnych na koncie ecobee, i wybierz te, które chcesz połączyć ze SmartThings.
+'''Tap to choose'''=Dotknij, aby wybrać
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Dotknij poniżej, aby wyświetlić listę czujników ecobee dostępnych na koncie ecobee, i wybierz te, które chcesz połączyć ze SmartThings.
+'''Tap to choose'''=Dotknij, aby wybrać
+'''Select Ecobee Sensors ({{numFound}} found)'''=Wybierz czujniki Ecobee (znaleziono {{numFound}})
+'''Your ecobee Account is now connected to SmartThings!'''=Konto ecobee jest teraz połączone ze SmartThings.
+'''Click 'Done' to finish setup.'''=Kliknij opcję „Done” (Gotowe), aby ukończyć instalację.
+'''The connection could not be established!'''=Nie można ustanowić połączenia.
+'''Click 'Done' to return to the menu.'''=Kliknij opcję „Done” (Gotowe), aby powrócić do menu.
+'''is connected to SmartThings'''=jest połączony ze SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=jest odłączony od SmartThings, ponieważ poświadczenie dostępu zostało zmienione lub utracone. Przejdź do aplikacji Ecobee (Connect) SmartApp i wprowadź ponownie poświadczenia logowania konta.
+'''Your Ecobee thermostat '''=Termostat Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/pt-BR.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Conecte seu termostato Ecobee ao SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Você está conectado.
+'''Click to enter Ecobee Credentials'''=Clique para inserir as credenciais do Ecobee
+'''Login'''=Conectar
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Toque abaixo para entrar no serviço ecobee e autorizar o acesso ao SmartThings. Certifique-se de rolar para baixo na página 2 e pressionar o botão 'Allow' (Permitir).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Selecionar seus termostatos
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Toque abaixo para ver a lista de termostatos ecobee disponíveis na sua conta ecobee e selecione os que deseja conectar ao SmartThings.
+'''Tap to choose'''=Tocar para escolher
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Toque abaixo para ver a lista de sensores ecobee disponíveis na sua conta ecobee e selecione os que deseja conectar ao SmartThings.
+'''Tap to choose'''=Tocar para escolher
+'''Select Ecobee Sensors ({{numFound}} found)'''=Selecionar sensores Ecobee ({{numFound}} encontrado(s))
+'''Your ecobee Account is now connected to SmartThings!'''=Agora sua conta ecobee está conectada ao SmartThings!
+'''Click 'Done' to finish setup.'''=Clique em 'Done' (Concluído) para concluir a configuração.
+'''The connection could not be established!'''=Não foi possível estabelecer a conexão!
+'''Click 'Done' to return to the menu.'''=Clique em 'Done' (Concluído) para retornar ao menu.
+'''is connected to SmartThings'''=está conectado ao SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=foi desconectado do SmartThings, pois a credencial de acesso foi alterada ou perdida. Vá para Ecobee (Connect) SmartApp e insira novamente suas credenciais de acesso à conta.
+'''Your Ecobee thermostat '''=Seu termostato Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/pt-PT.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Ligue o seu termóstato Ecobee ao SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Está ligado.
+'''Click to enter Ecobee Credentials'''=Clique para introduzir as Credenciais da Ecobee
+'''Login'''=Iniciar Sessão
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Toque abaixo para iniciar sessão no serviço ecobee e autorizar o acesso ao SmartThings. Certifique-se de que se desloca para baixo na página 2 e prime o botão "Allow" (Permitir).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Seleccionar os seus Termóstatos
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Toque abaixo para ver a lista de termóstatos da ecobee disponíveis na sua conta ecobee e seleccione aqueles que pretende ligar ao SmartThings.
+'''Tap to choose'''=Toque para escolher
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Toque abaixo para ver a lista de sensores da ecobee disponíveis na sua conta ecobee e seleccione aqueles que pretende ligar ao SmartThings.
+'''Tap to choose'''=Toque para escolher
+'''Select Ecobee Sensors ({{numFound}} found)'''=Seleccionar sensores da Ecobee ({{numFound}} encontrado)
+'''Your ecobee Account is now connected to SmartThings!'''=Agora, a sua Conta ecobee está ligada ao SmartThings!
+'''Click 'Done' to finish setup.'''=Clique em "Done" (Concluir) para terminar a configuração.
+'''The connection could not be established!'''=Não foi possível estabelecer a ligação!
+'''Click 'Done' to return to the menu.'''=Clique em "Done" (Concluir) para regressar ao menu.
+'''is connected to SmartThings'''=está ligado ao SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=foi desligado do SmartThings, porque a credencial de acesso foi alterada ou perdida. Vá para Ecobee (Connect) SmartApp e introduza novamente as suas credenciais de início de sessão na conta.
+'''Your Ecobee thermostat '''=O seu termóstato Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/ro-RO.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Conectați termostatul Ecobee la SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Sunteți conectat.
+'''Click to enter Ecobee Credentials'''=Faceți clic pentru a introduce acreditările Ecobee
+'''Login'''=Conectare
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Atingeți mai jos pentru a vă conecta la serviciul ecobee și a autoriza accesul la SmartThings. Asigurați-vă că ați derulat în jos până la pagina 2 și apăsați butonul „Allow” (Permitere).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Selectați termostatele
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Atingeți mai jos pentru a vizualiza o listă de termostate ecobee disponibile în contul dvs. ecobee și selectați-le pe cele pe care doriți să le conectați la SmartThings.
+'''Tap to choose'''=Atingeți pentru a selecta
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Atingeți mai jos pentru a vizualiza o listă de senzori ecobee disponibili în contul dvs. ecobee și selectați-i pe cei pe care doriți să îi conectați la SmartThings.
+'''Tap to choose'''=Atingeți pentru a selecta
+'''Select Ecobee Sensors ({{numFound}} found)'''=Selectare senzori Ecobee ({{numFound}} găsiți)
+'''Your ecobee Account is now connected to SmartThings!'''=Contul dvs. ecobee este acum conectat la SmartThings!
+'''Click 'Done' to finish setup.'''=Faceți clic pe „Done” (Efectuat) pentru a finaliza configurarea.
+'''The connection could not be established!'''=Nu a putut fi stabilită conexiunea!
+'''Click 'Done' to return to the menu.'''=Faceți clic pe „Done” (Efectuat) pentru a reveni la meniu.
+'''is connected to SmartThings'''=este conectat la SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=este deconectat de la SmartThings, deoarece acreditările de acces au fost schimbate sau pierdute. Accesați aplicația Ecobee (Connect) SmartApp și reintroduceți acreditările de conectare la cont.
+'''Your Ecobee thermostat '''=Termostatul dvs. Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/ru-RU.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Подключите свой термостат Ecobee к SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Подключено.
+'''Click to enter Ecobee Credentials'''=Нажмите для ввода учетных данных Ecobee
+'''Login'''=Вход
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Коснитесь ниже, чтобы войти в службу ecobee и предоставить доступ SmartThings. Обязательно прокрутите страницу 2 до самого низа и нажмите кнопку «Разрешить».
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Выберите свои термостаты
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Коснитесь ниже, чтобы отобразить список доступных термостатов ecobee в вашей учетной записи ecobee, и выберите те, которые нужно подключить к SmartThings.
+'''Tap to choose'''=Коснитесь, чтобы выбрать
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Коснитесь ниже, чтобы отобразить список доступных датчиков ecobee в вашей учетной записи ecobee, и выберите те, которые нужно подключить к SmartThings.
+'''Tap to choose'''=Коснитесь, чтобы выбрать
+'''Select Ecobee Sensors ({{numFound}} found)'''=Выбрать датчики Ecobee (найдено {{numFound}})
+'''Your ecobee Account is now connected to SmartThings!'''=Теперь ваша учетная запись ecobee подключена к SmartThings!
+'''Click 'Done' to finish setup.'''=Для завершения настройки нажмите «Готово».
+'''The connection could not be established!'''=Не удалось установить соединение!
+'''Click 'Done' to return to the menu.'''=Чтобы вернуться в меню, нажмите «Готово».
+'''is connected to SmartThings'''=подключено к SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=отключено от SmartThings, поскольку данные для доступа были изменены или потеряны. Перейдите в Ecobee (Подключить) SmartApp и повторно введите регистрационные данные своей учетной записи.
+'''Your Ecobee thermostat '''=Ваш термостат Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/sk-SK.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Pripojte termostat Ecobee k systému SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Ste pripojení.
+'''Click to enter Ecobee Credentials'''=Kliknite a zadajte poverenia pre Ecobee
+'''Login'''=Prihlásiť sa
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Ťuknutím nižšie sa prihláste k službe ecobee a autorizujte prístup do systému SmartThings. Prejdite nadol na stránku 2 a stlačte tlačidlo Allow (Povoliť).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Vyberte termostaty
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Ťuknutím nižšie môžete zobraziť zoznam termostatov ecobee dostupných vo vašom konte ecobee a vybrať tie, ktoré chcete pripojiť k systému SmartThings.
+'''Tap to choose'''=Ťuknutím vyberte
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Ťuknutím nižšie môžete zobraziť zoznam senzorov ecobee dostupných vo vašom konte ecobee a vybrať tie, ktoré chcete pripojiť k systému SmartThings.
+'''Tap to choose'''=Ťuknutím vyberte
+'''Select Ecobee Sensors ({{numFound}} found)'''=Vyberte senzory Ecobee (nájdené: {{numFound}})
+'''Your ecobee Account is now connected to SmartThings!'''=Vaše konto ecobee je teraz prepojené so systémom SmartThings.
+'''Click 'Done' to finish setup.'''=Kliknutím na tlačidlo Done (Hotovo) dokončite inštaláciu.
+'''The connection could not be established!'''=Nepodarilo sa nadviazať spojenie.
+'''Click 'Done' to return to the menu.'''=Kliknutím na tlačidlo Done (Hotovo) sa vráťte do menu.
+'''is connected to SmartThings'''=je pripojený k systému SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=je odpojený od systému SmartThings, pretože prístupové poverenia boli zmenené alebo stratené. Prejdite do aplikácie Ecobee (Connect) SmartApp a znova zadajte prihlasovacie poverenia pre konto.
+'''Your Ecobee thermostat '''=Váš termostat Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/sl-SI.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Povežite termostat Ecobee s storitvijo SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Povezani ste.
+'''Click to enter Ecobee Credentials'''=Kliknite za vnos poverilnic Ecobee
+'''Login'''=Prijava
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Pritisnite spodaj, da se prijavite v storitev ecobee in odobrite dostop do storitve SmartThings. Pomaknite se na 2. stran in pritisnite gumb »Allow« (Dovoli).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Izberite svoje termostate
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Pritisnite spodaj za prikaz seznama termostatov ecobee, ki so na voljo v vašem računu ecobee, in izberite tiste, ki jih želite povezati s storitvijo SmartThings.
+'''Tap to choose'''=Pritisnite za izbiranje
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Pritisnite spodaj za prikaz seznama senzorjev ecobee, ki so na voljo v vašem računu ecobee, in izberite tiste, ki jih želite povezati s storitvijo SmartThings.
+'''Tap to choose'''=Pritisnite za izbiranje
+'''Select Ecobee Sensors ({{numFound}} found)'''=Izberite senzorje Ecobee (št. najdenih: {{numFound}})
+'''Your ecobee Account is now connected to SmartThings!'''=Vaš račun ecobee je zdaj povezan s storitvijo SmartThings!
+'''Click 'Done' to finish setup.'''=Kliknite »Done« (Končano), da zaključite nastavitev.
+'''The connection could not be established!'''=Povezave ni bilo mogoče vzpostaviti!
+'''Click 'Done' to return to the menu.'''=Kliknite »Done« (Končano), da se vrnete v meni.
+'''is connected to SmartThings'''=je povezan s storitvijo SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=ni povezan s storitvijo SmartThings, ker so bile poverilnice za dostop spremenjene ali izgubljene. Pojdite v aplikacijo Ecobee (Connect) SmartApp in znova vnesite poverilnice za prijavo v račun.
+'''Your Ecobee thermostat '''=Vaš termostat Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/sq-AL.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Lidh termostatin Ecobee me SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Je lidhur.
+'''Click to enter Ecobee Credentials'''=Kliko për të futur kredencialet Ecobee
+'''Login'''=Login
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Trokit më poshtë për t’u loguar në shërbimin ecobee dhe autorizuar aksesin në SmartThings. Sigurohu që të lundrosh poshtë në faqen 2 dhe të shtypësh butonin ‘Allow’ (Lejo).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Përzgjidh termostatet e tua
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Trokit më poshtë për të parë listën e termostateve ecobee që janë në dispozicion në llogarinë tënde ecobee dhe përzgjidh ato që dëshiron të lidhen me SmartThings.
+'''Tap to choose'''=Trokit për të zgjedhur
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Trokit më poshtë për të parë listën e sensorëve ecobee që janë në dispozicion në llogarinë tënde ecobee dhe përzgjidh ato që dëshiron të lidhen me SmartThings.
+'''Tap to choose'''=Trokit për të zgjedhur
+'''Select Ecobee Sensors ({{numFound}} found)'''=Përzgjidh sensorët Ecobee (u gjet {{numFound}})
+'''Your ecobee Account is now connected to SmartThings!'''=Llogaria jote ecobee tani është lidhur me SmartThings!
+'''Click 'Done' to finish setup.'''=Kliko mbi ‘Done’ (U krye) për ta mbaruar konfigurimin.
+'''The connection could not be established!'''=Lidhja nuk u vendos dot!
+'''Click 'Done' to return to the menu.'''=Kliko mbi ‘Done’ (U krye) për t’u kthyer në meny.
+'''is connected to SmartThings'''=është lidhur me SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=është shkëputur nga SmartThings, sepse kredenciali i aksesit ka ndryshuar ose ka humbur. Shko te Ecobee (Connect) SmartApp dhe futi sërish kredencialet e logimit në llogari.
+'''Your Ecobee thermostat '''=Termostati yt Ecobee

smartapps/smartthings/ecobee-connect.src/i18n/sr-RS.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Povežite Ecobee termostat na SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Povezani ste.
+'''Click to enter Ecobee Credentials'''=Kliknite da biste uneli Ecobee akreditive
+'''Login'''=Login (Prijava)
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Kucnite ispod da biste se prijavili na uslugu ecobee i odobrili pristup aplikaciji SmartThings. Obavezno listajte nadole do stranice broj 2 i pritisnite dugme „Allow” (Dozvoli).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Izaberite termostate
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Kucnite ispod da biste videli listu dostupnih ecobee termostata na svom ecobee nalogu i izaberite one koje želite da povežete na SmartThings.
+'''Tap to choose'''=Kucnite da biste odabrali
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Kucnite ispod da biste videli listu dostupnih senzora na svom ecobee nalogu i izaberite one koje želite da povežete na SmartThings.
+'''Tap to choose'''=Kucnite da biste odabrali
+'''Select Ecobee Sensors ({{numFound}} found)'''=Izaberite Ecobee senzore ({{numFound}} pronađeno)
+'''Your ecobee Account is now connected to SmartThings!'''=Vaš ecobee nalog je sada povezan na SmartThings!
+'''Click 'Done' to finish setup.'''=Kliknite na „Done” (Gotovo) za kraj konfiguracije.
+'''The connection could not be established!'''=Veza nije uspostavljena!
+'''Click 'Done' to return to the menu.'''=Kliknite na „Done” (Gotovo) da biste se vratili na meni.
+'''is connected to SmartThings'''=je povezan na SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=je prekinuo vezu sa aplikacijom SmartThings zato što su akreditivi za pristup promenjeni ili izgubljeni. Idite na aplikaciju Ecobee (Connect) SmartApp i ponovo unesite akreditive za prijavljivanje na nalog.
+'''Your Ecobee thermostat '''=Vaš Ecobee termostat

smartapps/smartthings/ecobee-connect.src/i18n/sv-SE.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Anslut din Ecobee-termostat till SmartThings.
+'''ecobee'''=ecobee
+'''You are connected.'''=Du är ansluten.
+'''Click to enter Ecobee Credentials'''=Klicka för att ange dina Ecobee-inloggningsuppgifter
+'''Login'''=Logga in
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Tryck nedan för att logga in på ecobee-tjänsten och ge SmartThings åtkomst. Rulla ned till sidan 2 och tryck på knappen Allow (Tillåt).
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Välj dina termostater
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Tryck nedan om du vill se listan med ecobee-termostater som är tillgängliga i ditt ecobee-konto och välj dem du vill ansluta till SmartThings.
+'''Tap to choose'''=Tryck för att välja
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Tryck nedan om du vill se listan med ecobee-givare som är tillgängliga i ditt ecobee-konto och välj dem du vill ansluta till SmartThings.
+'''Tap to choose'''=Tryck för att välja
+'''Select Ecobee Sensors ({{numFound}} found)'''=Välj Ecobee-givare ({{numFound}} hittades)
+'''Your ecobee Account is now connected to SmartThings!'''=Ditt ecobee-konto är nu anslutet till SmartThings!
+'''Click 'Done' to finish setup.'''=Klicka på Done (Klart) för att slutföra konfigurationen.
+'''The connection could not be established!'''=Det gick inte att upprätta anslutningen!
+'''Click 'Done' to return to the menu.'''=Klicka på Done (Klart) för att återgå till menyn.
+'''is connected to SmartThings'''=är ansluten till SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=är frånkopplad från SmartThings, eftersom inloggningsuppgifterna har ändrats eller gått förlorade. Starta Ecobee (Connect) SmartApp och ange kontots inloggningsuppgifter igen.
+'''Your Ecobee thermostat '''=Din Ecobee-termostat

smartapps/smartthings/ecobee-connect.src/i18n/th-TH.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=เชื่อมต่อตัวควบคุมอุณหภูมิ Ecobee ของคุณเข้ากับ SmartThings
+'''ecobee'''=Ecobee
+'''You are connected.'''=คุณได้เชื่อมต่อแล้ว
+'''Click to enter Ecobee Credentials'''=คลิกเพื่อใส่ ข้อมูลยืนยันตัวตน Ecobee
+'''Login'''=เข้าสู่ระบบ
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=แตะด้านล่างเพื่อเข้าสู่บริการ Ecobee และอนุญาตการเข้าถึงของ SmartThings ดูให้แน่ใจว่าได้เลื่อนลงมาที่หน้า 2 แล้วกดปุ่ม 'อนุญาต'
+'''ecobee'''=Ecobee
+'''Select Your Thermostats'''=เลือกตัวควบคุมอุณหภูมิของคุณ
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=แตะที่ด้านล่างเพื่อดูรายการตัวควบคุมอุณหภูมิ Ecobee ที่มีอยู่ในบัญชีผู้ใช้ Ecobee ของคุณ และเลือกตัวควบคุมอุณหภูมิที่คุณต้องการจะเชื่อมต่อกับ SmartThings
+'''Tap to choose'''=แตะเพื่อเลือก <device name>
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=แตะที่ด้านล่างเพื่อดูรายการเซ็นเซอร์ Ecobee ที่มีอยู่ในบัญชีผู้ใช้ Ecobee ของคุณ และเลือกเซ็นเซอร์ที่คุณต้องการจะเชื่อมต่อกับ SmartThings
+'''Tap to choose'''=แตะเพื่อเลือก <device name>
+'''Select Ecobee Sensors ({{numFound}} found)'''=เลือกเซ็นเซอร์ Ecobee ({{numFound}} found)
+'''Your ecobee Account is now connected to SmartThings!'''=ตอนนี้บัญชีผู้ใช้ Ecobee ของคุณเชื่อมต่อกับ SmartThings แล้ว
+'''Click 'Done' to finish setup.'''=คลิก 'เสร็จสิ้น' เพื่อทำการตั้งค่าให้เสร็จสิ้น
+'''The connection could not be established!'''=ไม่สามารถสร้างการเชื่อมต่อได้!
+'''Click 'Done' to return to the menu.'''=คลิก 'เสร็จสิ้น' เพื่อกลับไปยังเมนู
+'''is connected to SmartThings'''={{deviceName}} เชื่อมต่อกับ SmartThings แล้ว
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''={{deviceName}} ถูกตัดการเชื่อมต่อจาก SmartThings เนื่องจากข้อมูลการเข้าถึงถูกเปลี่ยนแปลงหรือหายไป กรุณาไปที่ Ecobee (การเชื่อมต่อ) SmartApp และใส่ข้อมูลยืนยันตัวตนการเข้าสู่บัญชีผู้ใช้ของคุณอีกครั้ง
+'''Your Ecobee thermostat '''=ตัวควบคุมอุณหภูมิ Ecobee ของคุณ

smartapps/smartthings/ecobee-connect.src/i18n/tr-TR.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=Ecobee termostatınızı SmartThings'e bağlayın.
+'''ecobee'''=ecobee
+'''You are connected.'''=Bağlantı kurdunuz.
+'''Click to enter Ecobee Credentials'''=Ecobee Kimlik Bilgilerinizi girmek için tıklayın
+'''Login'''=Oturum aç
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=Ecobee servisinde oturum açmak ve SmartThings erişimine izin vermek için aşağıya dokunun. Ekranı 2. sayfaya kaydırdığınızdan emin olun ve 'İzin Ver' tuşuna basın.
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=Termostatlarınızı Seçin
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=Ecobee hesabınızda mevcut olan ecobee termostatlarının listesini görüntülemek için aşağıya dokunun ve SmartThings'e bağlamak istediklerinizi seçin.
+'''Tap to choose'''=<cihaz ismi> seçmek için dokunun
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=Ecobee hesabınızda mevcut olan ecobee sensörlerinin listesini görüntülemek için aşağıya dokunun ve SmartThings'e bağlamak istediklerinizi seçin.
+'''Tap to choose'''=<cihaz ismi> seçmek için dokunun
+'''Select Ecobee Sensors ({{numFound}} found)'''=Ecobee Sensörlerini seçin ({{numFound}} bulundu)
+'''Your ecobee Account is now connected to SmartThings!'''=Ecobee Hesabınız artık SmartThings'e bağlandı!
+'''Click 'Done' to finish setup.'''=Kurulumu bitirmek için 'Bitti' öğesine tıklayın.
+'''The connection could not be established!'''=Bağlantı kurulamadı!
+'''Click 'Done' to return to the menu.'''=Menüye dönmek için 'Bitti' öğesine tıklayın.
+'''is connected to SmartThings'''={{cihazİsmi}} SmartThings'e bağlandı
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=Erişim kimlik doğruları değiştirildiğinden veya kaybolduğundan {{cihazİsmi}} ile SmartThings arasındaki bağlantı kesildi. Lütfen Ecobee (Connect) SmartApp'e gidin ve hesabınızın oturum açma kimlik bilgilerini tekrar girin.
+'''Your Ecobee thermostat '''=Ecobee termostatınız

smartapps/smartthings/ecobee-connect.src/i18n/zh-CN.properties

@@ -0,0 +1,20 @@
+'''Connect your Ecobee thermostat to SmartThings.'''=将 Ecobee 恒温器连接至 SmartThings。
+'''ecobee'''=ecobee
+'''You are connected.'''=已连接。
+'''Click to enter Ecobee Credentials'''=点击以输入 Ecobee 凭据
+'''Login'''=登录
+'''Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button.'''=点击下方以登录 ecobee 服务并授予 SmartThings 访问权限。务必在第 2 页上向下滚动，然后按下“允许”按钮。
+'''ecobee'''=ecobee
+'''Select Your Thermostats'''=选择恒温器
+'''Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings.'''=点击下方以查看 ecobee 帐户中可用 ecobee 恒温器的列表，然后选择要连接至 SmartThings 的恒温器。
+'''Tap to choose'''=点击以选择
+'''Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings.'''=点击下方以查看 ecobee 帐户中可用 ecobee 传感器的列表，然后选择要连接至 SmartThings 的传感器。
+'''Tap to choose'''=点击以选择
+'''Select Ecobee Sensors ({{numFound}} found)'''=选择 Ecobee 传感器 (发现 {{numFound}} 个)
+'''Your ecobee Account is now connected to SmartThings!'''=ecobee 帐户现在已连接至 SmartThings！
+'''Click 'Done' to finish setup.'''=单击“完成”以完成设置。
+'''The connection could not be established!'''=无法建立连接！
+'''Click 'Done' to return to the menu.'''=单击“完成”返回菜单。
+'''is connected to SmartThings'''=已连接至 SmartThings
+'''is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials.'''=已从 SmartThings 断开，因为访问凭据已更改或丢失。请转到 Ecobee (连接) SmartApp，然后重新输入您的帐户登录凭据。
+'''Your Ecobee thermostat '''=您的 Ecobee 恒温器

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

@@ -21,7 +21,7 @@ definition(
     namespace: "smartthings",
     author: "SmartThings",
     description: "Connect and take pictures using your Foscam camera from inside the Smartthings app.",
-    category: "SmartThings Labs",
+    category: "SmartThings Internal",
     iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/foscam.png",
     iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/foscam@2x.png",
     singleInstance: true
@@ -245,4 +245,4 @@ private String hexToString(String txtInHex)
 			txtInByte[j++] = Byte.parseByte(txtInHex.substring(i, i + 2), 16);
 	}
 	return new String(txtInByte);
-}
+}

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

@@ -17,14 +17,14 @@
  */
 
 definition(
-	name: "Hue (Connect)",
-	namespace: "smartthings",
-	author: "SmartThings",
-	description: "Allows you to connect your Philips Hue lights with SmartThings and control them from your Things area or Dashboard in the SmartThings Mobile app. Adjust colors by going to the Thing detail screen for your Hue lights (tap the gear on Hue tiles).\n\nPlease update your Hue Bridge first, outside of the SmartThings app, using the Philips Hue app.",
-	category: "SmartThings Labs",
-	iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/hue.png",
-	iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/hue@2x.png",
-	singleInstance: true
+		name: "Hue (Connect)",
+		namespace: "smartthings",
+		author: "SmartThings",
+		description: "Allows you to connect your Philips Hue lights with SmartThings and control them from your Things area or Dashboard in the SmartThings Mobile app. Adjust colors by going to the Thing detail screen for your Hue lights (tap the gear on Hue tiles).\n\nPlease update your Hue Bridge first, outside of the SmartThings app, using the Philips Hue app.",
+		category: "SmartThings Labs",
+		iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/hue.png",
+		iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/hue@2x.png",
+		singleInstance: true
 )
 
 preferences {
@@ -85,7 +85,8 @@ def bridgeDiscovery(params=[:])
 	}
 
 	return dynamicPage(name:"bridgeDiscovery", title:"Discovery Started!", nextPage:"bridgeBtnPush", refreshInterval:refreshInterval, uninstall: true) {
-		section("Please wait while we discover your Hue Bridge. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
+		section("Please wait while we discover your Hue Bridge. Kindly note that you must first configure your Hue Bridge and Lights using the Philips Hue application. " +
+				"Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
 			input "selectedHue", "enum", required:false, title:"Select Hue Bridge (${numFound} found)", multiple:false, options:options, submitOnChange: true
 		}
 	}
@@ -172,18 +173,34 @@ def bulbDiscovery() {
 			if (existingLightsDescription.isEmpty()) {
 				existingLightsDescription += it.value
 			} else {
-				 existingLightsDescription += ", ${it.value}"
+				existingLightsDescription += ", ${it.value}"
 			}
 		}
 	}
 
-	return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Started!", nextPage:"", refreshInterval:refreshInterval, install:true, uninstall: true) {
-		section("Please wait while we discover your Hue Lights. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
-			input "selectedBulbs", "enum", required:false, title:"Select Hue Lights to add (${numFound} found)", multiple:true, submitOnChange: true, options:newLights
-			paragraph title: "Previously added Hue Lights (${existingLights.size()} added)", existingLightsDescription
+	if (bulbRefreshCount > 200 && numFound == 0) {
+		// Time out after 10 minutes
+		state.inBulbDiscovery = false
+		bulbRefreshCount = 0
+		return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Failed!", nextPage:"", refreshInterval:0, install:true, uninstall: true) {
+			section("Failed to discover any lights, please try again later. Click Done to exit.") {
+				//input "selectedBulbs", "enum", required:false, title:"Select Hue Lights to add (${numFound} found)", multiple:true, submitOnChange: true, options:newLights
+				paragraph title: "Previously added Hue Lights (${existingLights.size()} added)", existingLightsDescription
+			}
+			section {
+				href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
+			}
 		}
-		section {
-			href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
+
+	} else {
+		return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Started!", nextPage:"", refreshInterval:refreshInterval, install:true, uninstall: true) {
+			section("Please wait while we discover your Hue Lights. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
+				input "selectedBulbs", "enum", required:false, title:"Select Hue Lights to add (${numFound} found)", multiple:true, submitOnChange: true, options:newLights
+				paragraph title: "Previously added Hue Lights (${existingLights.size()} added)", existingLightsDescription
+			}
+			section {
+				href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
+			}
 		}
 	}
 }
@@ -200,32 +217,32 @@ private sendDeveloperReq() {
 	def token = app.id
 	def host = getBridgeIP()
 	sendHubCommand(new physicalgraph.device.HubAction([
-		method: "POST",
-		path: "/api",
-		headers: [
-			HOST: host
-		],
-		body: [devicetype: "$token-0"]], "${selectedHue}", [callback: "usernameHandler"]))
+			method: "POST",
+			path: "/api",
+			headers: [
+					HOST: host
+			],
+			body: [devicetype: "$token-0"]], "${selectedHue}", [callback: "usernameHandler"]))
 }
 
 private discoverHueBulbs() {
 	def host = getBridgeIP()
 	sendHubCommand(new physicalgraph.device.HubAction([
-		method: "GET",
-		path: "/api/${state.username}/lights",
-		headers: [
-			HOST: host
-		]], "${selectedHue}", [callback: "lightsHandler"]))
+			method: "GET",
+			path: "/api/${state.username}/lights",
+			headers: [
+					HOST: host
+			]], "${selectedHue}", [callback: "lightsHandler"]))
 }
 
 private verifyHueBridge(String deviceNetworkId, String host) {
 	log.trace "Verify Hue Bridge $deviceNetworkId"
 	sendHubCommand(new physicalgraph.device.HubAction([
-		method: "GET",
-		path: "/description.xml",
-		headers: [
-			HOST: host
-		]], deviceNetworkId, [callback: "bridgeDescriptionHandler"]))
+			method: "GET",
+			path: "/description.xml",
+			headers: [
+					HOST: host
+			]], deviceNetworkId, [callback: "bridgeDescriptionHandler"]))
 }
 
 private verifyHueBridges() {
@@ -383,7 +400,7 @@ def addBulbs() {
 					log.debug "$dni in not longer paired to the Hue Bridge or ID changed"
 				}
 			} else {
-			 	//backwards compatable
+				//backwards compatable
 				newHueBulb = bulbs.find { (app.id + "/" + it.id) == dni }
 				d = addChildBulb(dni, "Extended Color Light", newHueBulb?.value?.name, newHueBulb?.value?.hub)
 				d?.completedSetup = true
@@ -407,7 +424,7 @@ def addBridge() {
 	if(vbridge) {
 		def d = getChildDevice(selectedHue)
 		if(!d) {
-	 		// compatibility with old devices
+			// compatibility with old devices
 			def newbridge = true
 			childDevices.each {
 				if (it.getDeviceDataByName("mac")) {
@@ -593,7 +610,7 @@ def locationHandler(evt) {
 	log.trace "Location: $description"
 
 	def hub = evt?.hubId
- 	def parsedEvent = parseLanMessage(description)
+	def parsedEvent = parseLanMessage(description)
 	parsedEvent << ["hub":hub]
 
 	if (parsedEvent?.ssdpTerm?.contains("urn:schemas-upnp-org:device:basic:1")) {
@@ -819,8 +836,7 @@ def parse(childDevice, description) {
 			try {
 				body = new groovy.json.JsonSlurper().parseText(bodyString)
 			} catch (all) {
-				log.warn "Parsing Body failed - trying again..."
-				poll()
+				log.warn "Parsing Body failed"
 			}
 			if (body instanceof java.util.Map) {
 				// get (poll) reponse
@@ -844,7 +860,7 @@ private sendColorEvents(device, xy, hue, sat, ct, colormode = null) {
 
 	def events = [:]
 	// For now, only care about changing color temperature if requested by user
-	if (ct != null && (colormode == "ct" || (xy == null && hue == null && sat == null))) {
+	if (ct != null && ct != 0 && (colormode == "ct" || (xy == null && hue == null && sat == null))) {
 		// for some reason setting Hue to their specified minimum off 153 yields 154, dealt with below
 		// 153 (6500K) to 500 (2000K)
 		def temp = (ct == 154) ? 6500 : Math.round(1000000 / ct)
@@ -1136,7 +1152,7 @@ def setColorTemperature(childDevice, huesettings) {
 	def ct = hueSettings == 6500 ? 153 : Math.round(1000000/huesettings)
 	createSwitchEvent(childDevice, "on")
 	put("lights/$id/state", [ct: ct, on: true])
-	return "Setting color temperature to $percent"
+	return "Setting color temperature to $ct"
 }
 
 def setColor(childDevice, huesettings) {
@@ -1211,7 +1227,7 @@ private poll() {
 	def uri = "/api/${state.username}/lights/"
 	log.debug "GET: $host$uri"
 	sendHubCommand(new physicalgraph.device.HubAction("GET ${uri} HTTP/1.1\r\n" +
-		"HOST: ${host}\r\n\r\n", physicalgraph.device.Protocol.LAN, selectedHue))
+			"HOST: ${host}\r\n\r\n", physicalgraph.device.Protocol.LAN, selectedHue))
 }
 
 private isOnline(id) {
@@ -1228,10 +1244,10 @@ private put(path, body) {
 	log.debug "BODY: ${bodyJSON}"
 
 	sendHubCommand(new physicalgraph.device.HubAction("PUT $uri HTTP/1.1\r\n" +
-		"HOST: ${host}\r\n" +
-		"Content-Length: ${length}\r\n" +
-		"\r\n" +
-		"${bodyJSON}", physicalgraph.device.Protocol.LAN, "${selectedHue}"))
+			"HOST: ${host}\r\n" +
+			"Content-Length: ${length}\r\n" +
+			"\r\n" +
+			"${bodyJSON}", physicalgraph.device.Protocol.LAN, "${selectedHue}"))
 }
 
 /*
@@ -1252,7 +1268,7 @@ private getBridgeIP() {
 		if (d) {
 			if (d.getDeviceDataByName("networkAddress"))
 				host =  d.getDeviceDataByName("networkAddress")
-		else
+			else
 				host = d.latestState('networkAddress').stringValue
 		}
 		if (host == null || host == "") {

smartapps/smartthings/lifx-connect.src/i18n/ar-AE.properties

@@ -0,0 +1,15 @@
+'''Allows you to use LIFX smart light bulbs with SmartThings.'''=يتيح لك استخدام مصابيح LIFX الذكية من خلال SmartThings.
+'''LIFX'''=LIFX
+'''Tap to enter LIFX credentials'''=النقر لإدخال بيانات اعتماد LIFX
+'''Connect to LIFX'''=الاتصال بـ LIFX
+'''Tap here to connect your LIFX account'''=النقر هنا لتوصيل حساب LIFX
+'''Connect to LIFX'''=الاتصال بـ LIFX
+'''Select your location'''=تحديد موقعك
+'''Select location ({{count}} found)'''=تحديد الموقع (‎{{count}} found)
+'''Your LIFX Account is now connected to SmartThings!'''=حساب LIFX متصل الآن بـ SmartThings!
+'''Click 'Done' to finish setup.'''=انقر فوق ”تم“ لإنهاء الإعداد.
+'''The connection could not be established!'''=يتعذر إنشاء الاتصال!
+'''Click 'Done' to return to the menu.'''=انقر فوق ”تم“ للعودة إلى القائمة.
+'''Your LIFX Account is already connected to SmartThings!'''=حساب LIFX متصل بالفعل بـ SmartThings!
+'''Click 'Done' to finish setup.'''=انقر فوق ”تم“ لإنهاء الإعداد.
+'''SmartThings Connection'''=اتصال SmartThings

smartapps/smartthings/lifx-connect.src/i18n/bg-BG.properties

@@ -0,0 +1,15 @@
+'''Allows you to use LIFX smart light bulbs with SmartThings.'''=Позволява да използвате интелигентни ел. крушки LIFX със SmartThings.
+'''LIFX'''=LIFX
+'''Tap to enter LIFX credentials'''=Докоснете за въвеждане на идентификационни данни за LIFX
+'''Connect to LIFX'''=Свързване към LIFX
+'''Tap here to connect your LIFX account'''=Докоснете тук за свързване на вашия LIFX акаунт
+'''Connect to LIFX'''=Свързване към LIFX
+'''Select your location'''=Избор на местоположение
+'''Select location ({{count}} found)'''=Избор на местоположение ({{count}} са намерени)
+'''Your LIFX Account is now connected to SmartThings!'''=Вашият LIFX акаунт вече е свързан към SmartThings!
+'''Click 'Done' to finish setup.'''=Щракнете върху Done (Готово), за да завършите настройката.
+'''The connection could not be established!'''=Връзката не може да се осъществи!
+'''Click 'Done' to return to the menu.'''=Щракнете върху Done (Готово), за да се върнете към менюто.
+'''Your LIFX Account is already connected to SmartThings!'''=Вашият LIFX акаунт вече е свързан към SmartThings!
+'''Click 'Done' to finish setup.'''=Щракнете върху Done (Готово), за да завършите настройката.
+'''SmartThings Connection'''=Свързване на SmartThings

smartapps/smartthings/lifx-connect.src/i18n/cs-CZ.properties

@@ -0,0 +1,15 @@
+'''Allows you to use LIFX smart light bulbs with SmartThings.'''=Umožní vám použít inteligentní žárovky LIFX se systémem SmartThings.
+'''LIFX'''=LIFX
+'''Tap to enter LIFX credentials'''=Klepněte a zadejte přihlašovací údaje LIFX
+'''Connect to LIFX'''=Připojit k LIFX
+'''Tap here to connect your LIFX account'''=Klepnutím sem se připojíte k účtu LIFX
+'''Connect to LIFX'''=Připojit k LIFX
+'''Select your location'''=Vyberte vaši polohu
+'''Select location ({{count}} found)'''=Vyberte polohu (nalezeno {{count}})
+'''Your LIFX Account is now connected to SmartThings!'''=Účet LIFX Account je nyní připojen k systému SmartThings!
+'''Click 'Done' to finish setup.'''=Dokončete nastavení klepnutím na tlačítko „Done“ (Hotovo).
+'''The connection could not be established!'''=Připojení nelze navázat!
+'''Click 'Done' to return to the menu.'''=Klepnutím na tlačítko „Done“ (Hotovo) se vrátíte do menu.
+'''Your LIFX Account is already connected to SmartThings!'''=Účet LIFX Account je již připojen k systému SmartThings!
+'''Click 'Done' to finish setup.'''=Dokončete nastavení klepnutím na tlačítko „Done“ (Hotovo).
+'''SmartThings Connection'''=Připojení SmartThings

smartapps/smartthings/lifx-connect.src/i18n/da-DK.properties

@@ -0,0 +1,15 @@
+'''Allows you to use LIFX smart light bulbs with SmartThings.'''=Giver dig mulighed for at bruge LIFX-smartpærer sammen med SmartThings.
+'''LIFX'''=LIFX
+'''Tap to enter LIFX credentials'''=Tryk for at indtaste LIFX-legitimationsoplysninger
+'''Connect to LIFX'''=Forbind med LIFX
+'''Tap here to connect your LIFX account'''=Tryk her for at forbinde din LIFX-konto
+'''Connect to LIFX'''=Forbind med LIFX
+'''Select your location'''=Vælg din placering
+'''Select location ({{count}} found)'''=Vælg placering ({{count}} fundet)
+'''Your LIFX Account is now connected to SmartThings!'''=Din LIFX-konto er nu forbundet med SmartThings!
+'''Click 'Done' to finish setup.'''=Klik på “Done” (Udført) for at afslutte konfigurationen.
+'''The connection could not be established!'''=Der kunne ikke oprettes forbindelse!
+'''Click 'Done' to return to the menu.'''=Klik på “Done” (Udført) for at vende tilbage til menuen.
+'''Your LIFX Account is already connected to SmartThings!'''=Din LIFX-konto er allerede forbundet med SmartThings!
+'''Click 'Done' to finish setup.'''=Klik på “Done” (Udført) for at afslutte konfigurationen.
+'''SmartThings Connection'''=SmartThings-forbindelse

smartapps/smartthings/lifx-connect.src/i18n/de-DE.properties

@@ -0,0 +1,15 @@
+'''Allows you to use LIFX smart light bulbs with SmartThings.'''=Ermöglicht die Verwendung intelligenter Glühbirnen von LIFX mit SmartThings.
+'''LIFX'''=LIFX
+'''Tap to enter LIFX credentials'''=Tippen, um LIFX-Zugangsdaten einzugeben
+'''Connect to LIFX'''=Mit LIFX verbinden
+'''Tap here to connect your LIFX account'''=Hier tippen, um Ihr LIFX-Konto zu verbinden.
+'''Connect to LIFX'''=Mit LIFX verbinden
+'''Select your location'''=Ihren Standort auswählen
+'''Select location ({{count}} found)'''=Standortauswahl ({{count}} gefunden)
+'''Your LIFX Account is now connected to SmartThings!'''=Ihr LIFX-Konto ist jetzt mit SmartThings verbunden!
+'''Click 'Done' to finish setup.'''=Klicken Sie auf „Done“ (OK), um die Einrichtung abzuschließen.
+'''The connection could not be established!'''=Es konnte keine Verbindung hergestellt werden!
+'''Click 'Done' to return to the menu.'''=Klicken Sie auf „Done“ (OK), um zum Menü zurückzukehren.
+'''Your LIFX Account is already connected to SmartThings!'''=Ihr LIFX-Konto ist bereits mit SmartThings verbunden!
+'''Click 'Done' to finish setup.'''=Klicken Sie auf „Done“ (OK), um die Einrichtung abzuschließen.
+'''SmartThings Connection'''=SmartThings-Verbindung

smartapps/smartthings/lifx-connect.src/i18n/el-GR.properties

@@ -0,0 +1,15 @@
+'''Allows you to use LIFX smart light bulbs with SmartThings.'''=Σας επιτρέπει να χρησιμοποιείτε έξυπνους λαμπτήρες LIFX με το SmartThings.
+'''LIFX'''=LIFX
+'''Tap to enter LIFX credentials'''=Πατήστε για να καταχωρήσετε διαπιστευτήρια LIFX
+'''Connect to LIFX'''=Σύνδεση στο LIFX
+'''Tap here to connect your LIFX account'''=Πατήστε εδώ για να συνδέσετε το λογαριασμό σας LIFX
+'''Connect to LIFX'''=Σύνδεση στο LIFX
+'''Select your location'''=Επιλέξτε την τοποθεσία σας
+'''Select location ({{count}} found)'''=Επιλογή τοποθεσίας (βρέθηκαν {{count}})
+'''Your LIFX Account is now connected to SmartThings!'''=Ο λογαριασμός σας στο LIFX έχει τώρα συνδεθεί στο SmartThings!
+'''Click 'Done' to finish setup.'''=Πατήστε "Done" (Τέλος) για να ολοκληρωθεί η ρύθμιση.
+'''The connection could not be established!'''=Δεν ήταν δυνατή η δημιουργία σύνδεσης!
+'''Click 'Done' to return to the menu.'''=Κάντε κλικ στο "Done" (Τέλος) για να επιστρέψετε στο μενού.
+'''Your LIFX Account is already connected to SmartThings!'''=Ο λογαριασμός σας στο LIFX έχει ήδη συνδεθεί στο SmartThings!
+'''Click 'Done' to finish setup.'''=Πατήστε "Done" (Τέλος) για να ολοκληρωθεί η ρύθμιση.
+'''SmartThings Connection'''=Σύνδεση SmartThings

smartapps/smartthings/lifx-connect.src/i18n/en-GB.properties

@@ -0,0 +1,15 @@
+'''Allows you to use LIFX smart light bulbs with SmartThings.'''=Allows you to use LIFX smart light bulbs with SmartThings.
+'''LIFX'''=LIFX
+'''Tap to enter LIFX credentials'''=Tap to enter LIFX credentials
+'''Connect to LIFX'''=Connect to LIFX
+'''Tap here to connect your LIFX account'''=Tap here to connect your LIFX account
+'''Connect to LIFX'''=Connect to LIFX
+'''Select your location'''=Select your location
+'''Select location ({{count}} found)'''=Select location ({{count}} found)
+'''Your LIFX Account is now connected to SmartThings!'''=Your LIFX Account is now connected to SmartThings!
+'''Click 'Done' to finish setup.'''=Click ’Done’ to exit setup.
+'''The connection could not be established!'''=The connection could not be established!
+'''Click 'Done' to return to the menu.'''=Click ’Done’ to return to the menu.
+'''Your LIFX Account is already connected to SmartThings!'''=Your LIFX Account is already connected to SmartThings!
+'''Click 'Done' to finish setup.'''=Click ’Done’ to finish setup.
+'''SmartThings Connection'''=SmartThings Connection

smartapps/smartthings/lifx-connect.src/i18n/es-ES.properties

@@ -0,0 +1,15 @@
+'''Allows you to use LIFX smart light bulbs with SmartThings.'''=Le permite utilizar bombillas de luz inteligente LIFX con SmartThings.
+'''LIFX'''=LIFX
+'''Tap to enter LIFX credentials'''=Pulsar para introducir credenciales de LIFX
+'''Connect to LIFX'''=Conectar a LIFX
+'''Tap here to connect your LIFX account'''=Pulsar aquí para conectar la cuenta LIFX
+'''Connect to LIFX'''=Conectar a LIFX
+'''Select your location'''=Seleccionar ubicación
+'''Select location ({{count}} found)'''=Seleccionar ubicación ({{count}} encontrado)
+'''Your LIFX Account is now connected to SmartThings!'''=¡Su cuenta de LIFX ya está conectada a SmartThings!
+'''Click 'Done' to finish setup.'''=Haga clic en “Done” (Hecho) para finalizar la configuración.
+'''The connection could not be established!'''=¡No se ha podido establecer la conexión!
+'''Click 'Done' to return to the menu.'''=Haga clic en “Done” (Hecho) para volver al menú.
+'''Your LIFX Account is already connected to SmartThings!'''=¡Su cuenta de LIFX ya está conectada a SmartThings!
+'''Click 'Done' to finish setup.'''=Haga clic en “Done” (Hecho) para finalizar la configuración.
+'''SmartThings Connection'''=Conexión de SmartThings