Merge pull request #1439 from SmartThingsCommunity/staging

Rolling up staging to production for deploy

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

@@ -28,17 +28,6 @@ metadata {
 
 	}
 
-	// simulator metadata
-	simulator {
-		// status messages
-		status "on": "on/off: 1"
-		status "off": "on/off: 0"
-
-		// reply messages
-		reply "zcl on-off on": "on/off: 1"
-		reply "zcl on-off off": "on/off: 0"
-	}
-
 	tiles(scale: 2) {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
@@ -54,103 +43,54 @@ metadata {
 				attributeState "power", label:'${currentValue} W'
 			}
 		}
-		
+		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-		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"])
 	}
 }
 
 // Parse incoming device messages to generate events
 def parse(String description) {
-	log.debug "Parse description $description"
+	log.debug "description is $description"
-	def name = null
+
-	def value = null
+	def event = zigbee.getEvent(description)
-	if (description?.startsWith("catchall:")) {
+	if (event) {
-		def msg = zigbee.parse(description)
+		log.info event
-		log.trace msg
+		if (event.name == "power") {
-		log.trace "data: $msg.data"
+			if (device.getDataValue("manufacturer") != "OSRAM") {       //OSRAM devices do not reliably update power
-	} else if (description?.startsWith("read attr -")) {
+				event.value = (event.value as Integer) / 10             //TODO: The divisor value needs to be set as part of configuration
-		def descMap = parseDescriptionAsMap(description)
+				sendEvent(event)
-		log.debug "Read attr: $description"
+			}
-		if (descMap.cluster == "0006" && descMap.attrId == "0000") {
+		}
-			name = "switch"
+		else {
-			value = descMap.value.endsWith("01") ? "on" : "off"
+			sendEvent(event)
-		} else {
-			def reportValue = description.split(",").find {it.split(":")[0].trim() == "value"}?.split(":")[1].trim()
-			name = "power"
-			// assume 16 bit signed for encoding and power divisor is 10
-			value = Integer.parseInt(reportValue, 16) / 10
 		}
-	} else if (description?.startsWith("on/off:")) {
-		log.debug "Switch command"
-		name = "switch"
-		value = description?.endsWith(" 1") ? "on" : "off"
 	}
-
+	else {
-	def result = createEvent(name: name, value: value)
+		log.warn "DID NOT PARSE MESSAGE for description : $description"
-	log.debug "Parse returned ${result?.descriptionText}"
+		log.debug zigbee.parseDescriptionAsMap(description)
-	return result
-}
-
-def parseDescriptionAsMap(description) {
-	(description - "read attr - ").split(",").inject([:]) { map, param ->
-		def nameAndValue = param.split(":")
-		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
 	}
 }
 
-// Commands to device
-def on() {
-	[
-			'zcl on-off on',
-			'delay 200',
-			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 500'
-	]
-}
-
 def off() {
-	[
+	zigbee.off()
-			'zcl on-off off',
+}
-			'delay 200',
+
-			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
+def on() {
-			'delay 500'
+	zigbee.on()
-	]
 }
 
 def setLevel(value) {
-	log.trace "setLevel($value)"
+	zigbee.setLevel(value)
-	sendEvent(name: "level", value: value)
-    def level = hexString(Math.round(value * 255/100))
-	def cmd = "st cmd 0x${device.deviceNetworkId} 1 8 4 {${level} 2000}"
-	log.debug cmd
-	cmd
-}
-
-def meter() {
-	"st rattr 0x${device.deviceNetworkId} 1 0xB04 0x50B"
 }
 
 def refresh() {
-	"st rattr 0x${device.deviceNetworkId} 1 0xB04 0x50B"
+	zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.simpleMeteringPowerRefresh() + zigbee.electricMeasurementPowerRefresh() + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.simpleMeteringPowerConfig() + zigbee.electricMeasurementPowerConfig()
 }
 
 def configure() {
-	[
+	log.debug "Configuring Reporting and Bindings."
-		"zdo bind 0x${device.deviceNetworkId} 1 1 8 {${device.zigbeeId}} {}", "delay 200",
+	refresh()
-		"zdo bind 0x${device.deviceNetworkId} 1 1 6 {${device.zigbeeId}} {}", "delay 200",
-		"zdo bind 0x${device.deviceNetworkId} 1 1 0xB04 {${device.zigbeeId}} {}"
-	]
-}
-
-private hex(value, width=2) {
-    def s = new BigInteger(Math.round(value).toString()).toString(16)
-    while (s.size() < width) {
-        s = "0" + s
-    }
-    s
 }

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

@@ -59,15 +59,6 @@ metadata {
     }
 }
 
-def installed() {
-    log.debug "${device} installed"
-}
-
-def updated() {
-    log.debug "${device} updated"
-    configureHealthCheck()
-}
-
 // Parse incoming device messages to generate events
 def parse(String description) {
     log.debug "description is $description"
@@ -105,14 +96,6 @@ def refresh() {
     zigbee.onOffRefresh() + zigbee.levelRefresh()
 }
 
-def configureHealthCheck() {
-    log.debug "configureHealthCheck"
-    unschedule("healthPoll")
-    runEvery5Minutes("healthPoll")
-    // Device-Watch allows 2 check-in misses from device
-    sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-}
-
 def healthPoll() {
     log.debug "healthPoll()"
     def cmds = zigbee.onOffRefresh() + zigbee.levelRefresh()
@@ -120,5 +103,9 @@ def healthPoll() {
 }
 
 def configure() {
-    refresh()
+    unschedule()
+    runEvery5Minutes("healthPoll")
+    // Device-Watch allows 2 check-in misses from device
+    sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+    zigbee.onOffRefresh() + zigbee.levelRefresh()
 }

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

@@ -28,17 +28,6 @@ metadata {
 
 	}
 
-	// simulator metadata
-	simulator {
-		// status messages
-		status "on": "on/off: 1"
-		status "off": "on/off: 0"
-
-		// reply messages
-		reply "zcl on-off on": "on/off: 1"
-		reply "zcl on-off off": "on/off: 0"
-	}
-
 	tiles(scale: 2) {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
@@ -50,18 +39,15 @@ metadata {
 			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
 				attributeState "level", action:"switch level.setLevel"
 			}
+			tileAttribute ("power", key: "SECONDARY_CONTROL") {
+				attributeState "power", label:'${currentValue} W'
+			}
 		}
-		valueTile("level", "device.level", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "level", label: 'Level ${currentValue}%'
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
-		valueTile("power", "device.power", decoration: "flat", width: 2, height: 2) {
-			state "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"
 		}
 		main "switch"
-		details(["switch", "level", "power","levelSliderControl","refresh"])
+		details(["switch", "refresh"])
 	}
 }
 
@@ -69,283 +55,42 @@ metadata {
 def parse(String description) {
 	log.debug "description is $description"
 
-	def finalResult = isKnownDescription(description)
+	def event = zigbee.getEvent(description)
-	if (finalResult != "false") {
+	if (event) {
-		log.info finalResult
+		log.info event
-		if (finalResult.type == "update") {
+		if (event.name == "power") {
-			log.info "$device updates: ${finalResult.value}"
+			if (device.getDataValue("manufacturer") != "OSRAM") {       //OSRAM devices do not reliably update power
-		}
+				event.value = (event.value as Integer) / 10             //TODO: The divisor value needs to be set as part of configuration
-		else if (finalResult.type == "power") {
+				sendEvent(event)
-			def powerValue = (finalResult.value as Integer)/10
+			}
-			sendEvent(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 {
-			sendEvent(name: finalResult.type, value: finalResult.value)
+			sendEvent(event)
 		}
 	}
 	else {
 		log.warn "DID NOT PARSE MESSAGE for description : $description"
-		log.debug parseDescriptionAsMap(description)
+		log.debug zigbee.parseDescriptionAsMap(description)
 	}
 }
 
-// Commands to device
-def zigbeeCommand(cluster, attribute){
-	["st cmd 0x${device.deviceNetworkId} ${endpointId} ${cluster} ${attribute} {}"]
-}
-
 def off() {
-	zigbeeCommand("6", "0")
+	zigbee.off()
 }
 
 def on() {
-	zigbeeCommand("6", "1")
+	zigbee.on()
 }
 
 def setLevel(value) {
-	value = value as Integer
+	zigbee.setLevel(value)
-	if (value == 0) {
-		off()
-	}
-	else {
-		sendEvent(name: "level", value: value)
-		setLevelWithRate(value, "0000") + ["delay 1000"] + on()	//value is between 0 to 100; GE does NOT switch on if OFF
-	}
 }
 
 def refresh() {
-	[
+	zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.simpleMeteringPowerRefresh() + zigbee.electricMeasurementPowerRefresh() + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.simpleMeteringPowerConfig() + zigbee.electricMeasurementPowerConfig()
-			"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} 0x0702 0x0400", "delay 500"
-	]
-
 }
 
 def configure() {
-	onOffConfig() + levelConfig() + powerConfig() + refresh()
+	log.debug "Configuring Reporting and Bindings."
-}
+	refresh()
-
-
-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 == "0702" || descMap.clusterId == "0702"){
-			isDescriptionPower(descMap)
-		}
-		else {
-			return "false"
-		}
-	}
-	else if(description?.startsWith("on/off:")) {
-		def switchValue = description?.endsWith("1") ? "on" : "off"
-		return	[type: "switch", value : switchValue]
-	}
-	else {
-		return "false"
-	}
-}
-
-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 "false"
-	}
-
-}
-
-//@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 "false"
-	}
-}
-
-def isDescriptionPower(descMap) {
-	def powerValue = "undefined"
-	if (descMap.cluster == "0702") {
-		if (descMap.attrId == "0400") {
-			powerValue = convertHexToInt(descMap.value)
-		}
-	}
-	else if (descMap.clusterId == "0702") {
-		if(descMap.command=="07"){
-			return	[type: "update", value : "power (0702) capability configured successfully"]
-		}
-	}
-
-	if (powerValue != "undefined"){
-		return	[type: "power", value : powerValue]
-	}
-	else {
-		return "false"
-	}
-}
-
-
-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 1 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() {
-	[
-			//Meter (Power) Reporting
-			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0702 {${device.zigbeeId}} {}", "delay 200",
-			"zcl global send-me-a-report 0x0702 0x0400 0x2A 1 600 {05}",
-			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
-	]
-}
-
-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
 }

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

@@ -28,17 +28,6 @@ metadata {
 
 	}
 
-	// simulator metadata
-	simulator {
-		// status messages
-		status "on": "on/off: 1"
-		status "off": "on/off: 0"
-
-		// reply messages
-		reply "zcl on-off on": "on/off: 1"
-		reply "zcl on-off off": "on/off: 0"
-	}
-
 	tiles(scale: 2) {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
@@ -47,238 +36,51 @@ metadata {
 				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
+			tileAttribute ("power", key: "SECONDARY_CONTROL") {
+				attributeState "power", label:'${currentValue} W'
+			}
 		}
-		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
 			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
-		valueTile("power", "device.power", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "power", label:'${currentValue} Watts'
-		}
 		main "switch"
-		details(["switch", "power", "refresh"])
+		details(["switch", "refresh"])
 	}
 }
 
 // Parse incoming device messages to generate events
 def parse(String description) {
 	log.debug "description is $description"
-
+	def event = zigbee.getEvent(description)
-	def finalResult = isKnownDescription(description)
+	if (event) {
-	if (finalResult != "false") {
+		if (event.name == "power") {
-		log.info finalResult
+			def powerValue
-		if (finalResult.type == "update") {
+			powerValue = (event.value as Integer)/10            //TODO: The divisor value needs to be set as part of configuration
-			log.info "$device updates: ${finalResult.value}"
-		}
-		else if (finalResult.type == "power") {
-			def powerValue = (finalResult.value as Integer)/10
 			sendEvent(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 {
-			sendEvent(name: finalResult.type, value: finalResult.value)
+			sendEvent(event)
 		}
 	}
 	else {
 		log.warn "DID NOT PARSE MESSAGE for description : $description"
-		log.debug parseDescriptionAsMap(description)
+		log.debug zigbee.parseDescriptionAsMap(description)
 	}
 }
 
-// Commands to device
-def zigbeeCommand(cluster, attribute){
-	"st cmd 0x${device.deviceNetworkId} ${endpointId} ${cluster} ${attribute} {}"
-}
-
 def off() {
-	zigbeeCommand("6", "0")
+	zigbee.off()
 }
 
 def on() {
-	zigbeeCommand("6", "1")
+	zigbee.on()
 }
 
 def refresh() {
-	[
+	zigbee.onOffRefresh() + zigbee.simpleMeteringPowerRefresh() + zigbee.electricMeasurementPowerRefresh() + zigbee.onOffConfig() + zigbee.simpleMeteringPowerConfig() + zigbee.electricMeasurementPowerConfig()
-			"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} 0x0702 0x0400", "delay 500"
-	]
-
 }
 
 def configure() {
-	onOffConfig() + powerConfig() + refresh()
+	log.debug "Configuring Reporting and Bindings."
-}
+	refresh()
-
-
-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 == "0702" || descMap.clusterId == "0702"){
-			isDescriptionPower(descMap)
-		}
-		else {
-			return "false"
-		}
-	}
-	else if(description?.startsWith("on/off:")) {
-		def switchValue = description?.endsWith("1") ? "on" : "off"
-		return	[type: "switch", value : switchValue]
-	}
-	else {
-		return "false"
-	}
-}
-
-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 "false"
-	}
-
-}
-
-def isDescriptionPower(descMap) {
-	def powerValue = "undefined"
-	if (descMap.cluster == "0702") {
-		if (descMap.attrId == "0400") {
-			powerValue = convertHexToInt(descMap.value)
-		}
-	}
-	else if (descMap.clusterId == "0702") {
-		if(descMap.command=="07"){
-			return	[type: "update", value : "power (0702) capability configured successfully"]
-		}
-	}
-
-	if (powerValue != "undefined"){
-		return	[type: "power", value : powerValue]
-	}
-	else {
-		return "false"
-	}
-}
-
-
-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"
-	]
-}
-
-//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() {
-	[
-			//Meter (Power) Reporting
-			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0702 {${device.zigbeeId}} {}", "delay 200",
-			"zcl global send-me-a-report 0x0702 0x0400 0x2A 1 600 {05}",
-			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
-	]
-}
-
-String convertToHexString(value, width=2) {
-	def s = new BigInteger(Math.round(value).toString()).toString(16)
-	while (s.size() < width) {
-		s = "0" + s
-	}
-	s
 }

devicetypes/smartthings/osram-lightify-gardenspot-mini-rgb.src/osram-lightify-gardenspot-mini-rgb.groovy

@@ -23,359 +23,123 @@ metadata {
         command "setAdjustedColor"
     }
 
-    // simulator metadata
-    simulator {
-        // status messages
-        status "on": "on/off: 1"
-        status "off": "on/off: 0"
-
-        // reply messages
-        reply "zcl on-off on": "on/off: 1"
-        reply "zcl on-off off": "on/off: 0"
-    }
-
     // UI tile definitions
-    tiles {
+    tiles(scale: 2) {
-        standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
+        multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
-            state "on", label: '${name}', action: "switch.off", icon: "st.switches.light.on", backgroundColor: "#79b821"
+            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-            state "off", label: '${name}', action: "switch.on", icon: "st.switches.light.off", backgroundColor: "#ffffff"
+                attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+                attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+                attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+                attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+            }
+            tileAttribute ("device.level", key: "SLIDER_CONTROL") {
+                attributeState "level", action:"switch level.setLevel"
+            }
+            tileAttribute ("device.color", key: "COLOR_CONTROL") {
+                attributeState "color", action:"color control.setColor"
+            }
         }
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
 
-        controlTile("rgbSelector", "device.color", "color", height: 3, width: 3, inactiveLabel: false) {
-            state "color", action:"setAdjustedColor"
-        }
-        valueTile("colorName", "device.colorName", inactiveLabel: false, decoration: "flat") {
-            state "colorName", label: '${currentValue}'
-        }
-
-        controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {
-            state "level", action:"switch level.setLevel"
-        }
-        valueTile("level", "device.level", inactiveLabel: false, decoration: "flat") {
-            state "level", label: 'Level ${currentValue}%'
-        }
-
         main(["switch"])
-        details(["switch", "refresh", "colorName", "levelSliderControl", "level", "rgbSelector"])
+        details(["switch", "refresh"])
     }
 }
 
+//Globals
+private getATTRIBUTE_HUE() { 0x0000 }
+private getATTRIBUTE_SATURATION() { 0x0001 }
+private getHUE_COMMAND() { 0x00 }
+private getSATURATION_COMMAND() { 0x03 }
+private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
+
 // Parse incoming device messages to generate events
 def parse(String description) {
-    //log.info "description is $description"
+    log.debug "description is $description"
-    if (description?.startsWith("catchall:")) {
-        if(description?.endsWith("0100") ||description?.endsWith("1001") || description?.matches("on/off\\s*:\\s*1"))
-        {
-            def result = createEvent(name: "switch", value: "on")
-            log.debug "Parse returned ${result?.descriptionText}"
-            return result
-        }
-        else if(description?.endsWith("0000") || description?.endsWith("1000") || description?.matches("on/off\\s*:\\s*0"))
-        {
-            if(!(description?.startsWith("catchall: 0104 0300"))){
-                def result = createEvent(name: "switch", value: "off")
-                log.debug "Parse returned ${result?.descriptionText}"
-                return result
-            }
-        }
-    }
-    else if (description?.startsWith("read attr -")) {
-        def descMap = parseDescriptionAsMap(description)
-        log.trace "descMap : $descMap"
 
-        if (descMap.cluster == "0300") {
+    def event = zigbee.getEvent(description)
-            if(descMap.attrId == "0000"){  //Hue Attribute
+    if (event) {
-                def hueValue = Math.round(convertHexToInt(descMap.value) / 255 * 100)
+        log.debug event
-                log.debug "Hue value returned is $hueValue"
+        if (event.name=="level" && event.value==0) {}
-                sendEvent(name: "hue", value: hueValue, displayed:false)
+        else {
-            }
+            sendEvent(event)
-            else if(descMap.attrId == "0001"){ //Saturation Attribute
-                def saturationValue = Math.round(convertHexToInt(descMap.value) / 255 * 100)
-                log.debug "Saturation from refresh is $saturationValue"
-                sendEvent(name: "saturation", value: saturationValue, displayed:false)
-            }
-        }
-        else if(descMap.cluster == "0008"){
-            def dimmerValue = Math.round(convertHexToInt(descMap.value) * 100 / 255)
-            log.debug "dimmer value is $dimmerValue"
-            sendEvent(name: "level", value: dimmerValue)
         }
     }
     else {
-        def name = description?.startsWith("on/off: ") ? "switch" : null
+        def zigbeeMap = zigbee.parseDescriptionAsMap(description)
-        def value = name == "switch" ? (description?.endsWith(" 1") ? "on" : "off") : null
+        def cluster = zigbee.parse(description)
-        def result = createEvent(name: name, value: value)
+
-        log.debug "Parse returned ${result?.descriptionText}"
+        if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
-        return result
+            if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
+                def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
+                sendEvent(name: "hue", value: hueValue, descriptionText: "Color has changed")
+            }
+            else if(zigbeeMap.attrInt == ATTRIBUTE_SATURATION){ //Saturation Attribute
+                def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
+                sendEvent(name: "saturation", value: saturationValue, descriptionText: "Color has changed", displayed: false)
+            }
+        }
+        else if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
+            if (cluster.data[0] == 0x00){
+                log.debug "ON/OFF REPORTING CONFIG RESPONSE: $cluster"
+                sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+            }
+            else {
+                log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
+            }
+        }
+        else {
+            log.info "DID NOT PARSE MESSAGE for description : $description"
+            log.debug zigbeeMap
+        }
     }
-
-
 }
 
 def on() {
-    log.debug "on()"
+    zigbee.on()
-    sendEvent(name: "switch", value: "on")
-    setLevel(state?.levelValue)
-}
-
-def zigbeeOff() {
-    "st cmd 0x${device.deviceNetworkId} ${endpointId} 6 0 {}"
 }
 
 def off() {
-    log.debug "off()"
+    zigbee.off()
-    sendEvent(name: "switch", value: "off")
+}
-    zigbeeOff()
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+    return zigbee.onOffRefresh()
 }
 
 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)
-            "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} 0x0300 0", "delay 500",
-            "st rattr 0x${device.deviceNetworkId} ${endpointId} 0x0300 1"
-    ]
-
 }
 
 def configure() {
-    state.levelValue = 100
     log.debug "Configuring Reporting and Bindings."
-    def configCmds = [
+    // Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
+    // enrolls with default periodic reporting until newer 5 min interval is confirmed
+    sendEvent(name: "checkInterval", value: 3 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 
-            //Switch Reporting
+    // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
-            "zcl global send-me-a-report 6 0 0x10 0 3600 {01}", "delay 500",
+    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)
-            "send 0x${device.deviceNetworkId} ${endpointId} 1", "delay 1000",
-
-            //Level Control Reporting
-            "zcl global send-me-a-report 8 0 0x20 5 3600 {0010}", "delay 200",
-            "send 0x${device.deviceNetworkId} ${endpointId} 1", "delay 1500",
-
-            "zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 6 {${device.zigbeeId}} {}", "delay 1000",
-            "zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 8 {${device.zigbeeId}} {}", "delay 500",
-            "zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0x0300 {${device.zigbeeId}} {}", "delay 500"
-    ]
-    return configCmds + refresh() // send refresh cmds as part of config
-}
-
-def parseDescriptionAsMap(description) {
-    (description - "read attr - ").split(",").inject([:]) { map, param ->
-        def nameAndValue = param.split(":")
-        map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-    }
-}
-
-def poll(){
-    log.debug "Poll is calling refresh"
-    refresh()
-}
-
-def zigbeeSetLevel(level) {
-    "st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {${level} 0000}"
 }
 
 def setLevel(value) {
-	state.levelValue = (value==null) ? 100 : value
+    zigbee.setLevel(value)
-    log.trace "setLevel($value)"
-    def cmds = []
-
-    if (value == 0) {
-        sendEvent(name: "switch", value: "off")
-        cmds << zigbeeOff()
-    }
-    else if (device.latestValue("switch") == "off") {
-        sendEvent(name: "switch", value: "on")
-    }
-
-    sendEvent(name: "level", value: state.levelValue)
-    def level = hex(state.levelValue * 255 / 100)
-    cmds << zigbeeSetLevel(level)
-
-    //log.debug cmds
-    cmds
-}
-
-//input Hue Integer values; returns color name for saturation 100%
-private getColorName(hueValue){
-    if(hueValue>100 || hueValue<0)
-        return
-
-    hueValue = Math.round(hueValue / 100 * 360)
-
-    log.debug "hue value is $hueValue"
-
-    def colorName = "Color Mode"
-    if(hueValue>=0 && hueValue <= 4){
-        colorName = "Red"
-    }
-    else if (hueValue>=5 && hueValue <=21 ){
-        colorName = "Brick Red"
-    }
-    else if (hueValue>=22 && hueValue <=30 ){
-        colorName = "Safety Orange"
-    }
-    else if (hueValue>=31 && hueValue <=40 ){
-        colorName = "Dark Orange"
-    }
-    else if (hueValue>=41 && hueValue <=49 ){
-        colorName = "Amber"
-    }
-    else if (hueValue>=50 && hueValue <=56 ){
-        colorName = "Gold"
-    }
-    else if (hueValue>=57 && hueValue <=65 ){
-        colorName = "Yellow"
-    }
-    else if (hueValue>=66 && hueValue <=83 ){
-        colorName = "Electric Lime"
-    }
-    else if (hueValue>=84 && hueValue <=93 ){
-        colorName = "Lawn Green"
-    }
-    else if (hueValue>=94 && hueValue <=112 ){
-        colorName = "Bright Green"
-    }
-    else if (hueValue>=113 && hueValue <=135 ){
-        colorName = "Lime"
-    }
-    else if (hueValue>=136 && hueValue <=166 ){
-        colorName = "Spring Green"
-    }
-    else if (hueValue>=167 && hueValue <=171 ){
-        colorName = "Turquoise"
-    }
-    else if (hueValue>=172 && hueValue <=187 ){
-        colorName = "Aqua"
-    }
-    else if (hueValue>=188 && hueValue <=203 ){
-        colorName = "Sky Blue"
-    }
-    else if (hueValue>=204 && hueValue <=217 ){
-        colorName = "Dodger Blue"
-    }
-    else if (hueValue>=218 && hueValue <=223 ){
-        colorName = "Navy Blue"
-    }
-    else if (hueValue>=224 && hueValue <=251 ){
-        colorName = "Blue"
-    }
-    else if (hueValue>=252 && hueValue <=256 ){
-        colorName = "Han Purple"
-    }
-    else if (hueValue>=257 && hueValue <=274 ){
-        colorName = "Electric Indigo"
-    }
-    else if (hueValue>=275 && hueValue <=289 ){
-        colorName = "Electric Purple"
-    }
-    else if (hueValue>=290 && hueValue <=300 ){
-        colorName = "Orchid Purple"
-    }
-    else if (hueValue>=301 && hueValue <=315 ){
-        colorName = "Magenta"
-    }
-    else if (hueValue>=316 && hueValue <=326 ){
-        colorName = "Hot Pink"
-    }
-    else if (hueValue>=327 && hueValue <=335 ){
-        colorName = "Deep Pink"
-    }
-    else if (hueValue>=336 && hueValue <=339 ){
-        colorName = "Raspberry"
-    }
-    else if (hueValue>=340 && hueValue <=352 ){
-        colorName = "Crimson"
-    }
-    else if (hueValue>=353 && hueValue <=360 ){
-        colorName = "Red"
-    }
-
-    colorName
-}
-
-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 evenHex(value){
-    def s = new BigInteger(Math.round(value).toString()).toString(16)
-    while (s.size() % 2 != 0) {
-        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 setAdjustedColor(value) {
-	log.debug "setAdjustedColor: ${value}"
-	def adjusted = value + [:]
-	adjusted.level = null // needed because color picker always sends 100
-	setColor(adjusted)
 }
 
 def setColor(value){
     log.trace "setColor($value)"
-    def max = 0xfe
+    zigbee.on() + setHue(value.hue) + "delay 500" + setSaturation(value.saturation)
-
+}
-    if (value.hex) { sendEvent(name: "color", value: value.hex, displayed:false)}
+
-
+def setHue(value) {
-    def colorName = getColorName(value.hue)
+    def scaledHueValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-    sendEvent(name: "colorName", value: colorName)
+    zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, scaledHueValue, "00", "0500")       //payload-> hue value, direction (00-> shortest distance), transition time (1/10th second) (0500 in U16 reads 5)
-
+}
-    log.debug "color name is : $colorName"
+
-    sendEvent(name: "hue", value: value.hue, displayed:false)
+def setSaturation(value) {
-    sendEvent(name: "saturation", value: value.saturation, displayed:false)
+    def scaledSatValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-    def scaledHueValue = evenHex(Math.round(value.hue * max / 100.0))
+    zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, scaledSatValue, "0500") + "delay 1000" + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
-    def scaledSatValue = evenHex(Math.round(value.saturation * max / 100.0))
-
-    def cmd = []
-    if (value.switch != "off" && device.latestValue("switch") == "off") {
-        cmd << "st cmd 0x${device.deviceNetworkId} ${endpointId} 6 1 {}"
-        cmd << "delay 150"
-    }
-
-    cmd << "st cmd 0x${device.deviceNetworkId} ${endpointId} 0x300 0x00 {${scaledHueValue} 00 0000}"
-    cmd << "delay 150"
-    cmd << "st cmd 0x${device.deviceNetworkId} ${endpointId} 0x300 0x03 {${scaledSatValue} 0000}"
-    
-    if (value.level) {
-        state.levelValue = value.level
-        sendEvent(name: "level", value: value.level)
-        def level = hex(value.level * 255 / 100)
-        cmd << zigbeeSetLevel(level)
-    }
-    
-    if (value.switch == "off") {
-        cmd << "delay 150"
-        cmd << off()
-    }
-
-    cmd
 }

devicetypes/smartthings/osram-lightify-led-flexible-strip-rgbw.src/osram-lightify-led-flexible-strip-rgbw.groovy

@@ -29,431 +29,155 @@ metadata {
 
     }
 
-	// simulator metadata
+    // UI tile definitions
-	simulator {
+    tiles(scale: 2) {
-		// status messages
+        multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
-		status "on": "on/off: 1"
+            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-		status "off": "on/off: 0"
+                attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+                attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+                attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+                attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+            }
+            tileAttribute ("device.level", key: "SLIDER_CONTROL") {
+                attributeState "level", action:"switch level.setLevel"
+            }
+            tileAttribute ("device.color", key: "COLOR_CONTROL") {
+                attributeState "color", action:"color control.setColor"
+            }
+        }
+        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2700..6500)") {
+            state "colorTemperature", action:"color temperature.setColorTemperature"
+        }
+        valueTile("colorName", "device.colorName", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+            state "colorName", label: '${currentValue}'
+        }
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+        }
 
-		// reply messages
+        main(["switch"])
-		reply "zcl on-off on": "on/off: 1"
+        details(["switch", "colorTempSliderControl", "colorName", "refresh"])
-		reply "zcl on-off off": "on/off: 0"
+    }
-	}
-
-	// UI tile definitions
-	tiles {
-		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-            state "on", label: '${name}', action: "switch.off", icon: "st.switches.light.on", backgroundColor: "#79b821"
-			state "off", label: '${name}', action: "switch.on", icon: "st.switches.light.off", backgroundColor: "#ffffff"
-		}
-		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
-			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
-
-        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", height: 1, width: 2, inactiveLabel: false, range:"(2700..6500)") {
-			state "colorTemperature", action:"color temperature.setColorTemperature"
-		}
-        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat") {
-			state "colorTemperature", label: '${currentValue} K'
-		}
-        valueTile("colorName", "device.colorName", inactiveLabel: false, decoration: "flat") {
-			state "colorName", label: '${currentValue}'
-		}
-
-        controlTile("rgbSelector", "device.color", "color", height: 3, width: 3, inactiveLabel: false) {
-			state "color", action:"setAdjustedColor"
-		}
-
-        controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {
-			state "level", action:"switch level.setLevel"
-		}
-		valueTile("level", "device.level", inactiveLabel: false, decoration: "flat") {
-			state "level", label: 'Level ${currentValue}%'
-		}
-
-
-		main(["switch"])
-		details(["switch", "refresh", "colorName", "levelSliderControl", "level", "colorTempSliderControl", "colorTemp", "rgbSelector"])
-	}
 }
 
+//Globals
+private getATTRIBUTE_HUE() { 0x0000 }
+private getATTRIBUTE_SATURATION() { 0x0001 }
+private getHUE_COMMAND() { 0x00 }
+private getSATURATION_COMMAND() { 0x03 }
+private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
+private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
+
 // Parse incoming device messages to generate events
 def parse(String description) {
-	//log.info "description is $description"
+    log.debug "description is $description"
-	if (description?.startsWith("catchall:")) {
-		if(description?.endsWith("0100") ||description?.endsWith("1001") || description?.matches("on/off\\s*:\\s*1"))
-        {
-        	def result = createEvent(name: "switch", value: "on")
-            log.debug "Parse returned ${result?.descriptionText}"
-            return result
-        }
-        else if(description?.endsWith("0000") || description?.endsWith("1000") || description?.matches("on/off\\s*:\\s*0"))
-        {
-            if(!(description?.startsWith("catchall: 0104 0300"))){
-                def result = createEvent(name: "switch", value: "off")
-                log.debug "Parse returned ${result?.descriptionText}"
-                return result
-            }
-        }
 
-	}
+    def event = zigbee.getEvent(description)
-    else if (description?.startsWith("read attr -")) {	//for values returned after hitting refresh
+    if (event) {
-        def descMap = parseDescriptionAsMap(description)
+        log.debug event
-        log.trace "descMap : $descMap"
+        if (event.name=="level" && event.value==0) {}
-
+        else {
-        if (descMap.cluster == "0300") {
+            if (event.name=="colorTemperature") {
-            if(descMap.attrId == "0007"){
+                setGenericName(event.value)
-                log.debug "in read attr"
-                log.debug descMap.value
-                def tempInMired = convertHexToInt(descMap.value)
-                def tempInKelvin = Math.round(1000000/tempInMired)
-                log.trace "temp in kelvin: $tempInKelvin"
-                sendEvent(name: "colorTemperature", value: tempInKelvin, displayed:false)
             }
-            else if(descMap.attrId == "0008"){  //Color mode attribute
+            sendEvent(event)
-                if(descMap.value == "00"){
-                    state.colorType = "rgb"
-                }else if(descMap.value == "02"){
-                    state.colorType = "white"
-                }
-            }
-            else if(descMap.attrId == "0000"){  //Hue Attribute
-                def hueValue = Math.round(convertHexToInt(descMap.value) / 255 * 100)
-                log.debug "Hue value returned is $hueValue"
-                sendEvent(name: "hue", value: hueValue, displayed:false)
-            }
-            else if(descMap.attrId == "0001"){ //Saturation Attribute
-                def saturationValue = Math.round(convertHexToInt(descMap.value) / 255 * 100)
-                log.debug "Saturation from refresh is $saturationValue"
-                sendEvent(name: "saturation", value: saturationValue, displayed:false)
-            }
-        }
-        else if(descMap.cluster == "0008"){
-        	def dimmerValue = Math.round(convertHexToInt(descMap.value) * 100 / 255)
-        	log.debug "dimmer value is $dimmerValue"
-            sendEvent(name: "level", value: dimmerValue)
         }
     }
-	else {
+    else {
-		def name = description?.startsWith("on/off: ") ? "switch" : null
+        def zigbeeMap = zigbee.parseDescriptionAsMap(description)
-		def value = name == "switch" ? (description?.endsWith(" 1") ? "on" : "off") : null
+        def cluster = zigbee.parse(description)
-		def result = createEvent(name: name, value: value)
-        log.debug "description is $description"
-		return result
-	}
-
 
+        if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
+            if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
+                def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
+                sendEvent(name: "hue", value: hueValue, descriptionText: "Color has changed")
+            }
+            else if(zigbeeMap.attrInt == ATTRIBUTE_SATURATION){ //Saturation Attribute
+                def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
+                sendEvent(name: "saturation", value: saturationValue, descriptionText: "Color has changed", displayed: false)
+            }
+        }
+        else if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
+            if (cluster.data[0] == 0x00){
+                log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
+                sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+            }
+            else {
+                log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
+            }
+        }
+        else {
+            log.info "DID NOT PARSE MESSAGE for description : $description"
+            log.debug zigbeeMap
+        }
+    }
 }
 
 def on() {
-	log.debug "on()"
+    zigbee.on()
-	sendEvent(name: "switch", value: "on")
-    setLevel(state?.levelValue)
-}
-
-def zigbeeOff() {
-    "st cmd 0x${device.deviceNetworkId} ${endpointId} 6 0 {}"
 }
 
 def off() {
-	log.debug "off()"
+    zigbee.off()
-	sendEvent(name: "switch", value: "off")
+}
-	zigbeeOff()
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+    return zigbee.onOffRefresh()
 }
 
 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)
-        "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} 0x0300 0", "delay 500",
-        "st rattr 0x${device.deviceNetworkId} ${endpointId} 0x0300 1", "delay 500",
-        "st rattr 0x${device.deviceNetworkId} ${endpointId} 0x0300 7", "delay 500",
-        "st rattr 0x${device.deviceNetworkId} ${endpointId} 0x0300 8"
-    ]
-
 }
 
 def configure() {
-    state.levelValue = 100
+    log.debug "Configuring Reporting and Bindings."
-    state.colorType = "white"
+    // Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
-	log.debug "Configuring Reporting and Bindings."
+    // enrolls with default periodic reporting until newer 5 min interval is confirmed
-	def configCmds = [
+    sendEvent(name: "checkInterval", value: 3 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 
-        //Switch Reporting
+    // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
-        "zcl global send-me-a-report 6 0 0x10 0 3600 {01}", "delay 500",
+    refresh()
-        "send 0x${device.deviceNetworkId} ${endpointId} 1", "delay 1000",
-
-        //Level Control Reporting
-        "zcl global send-me-a-report 8 0 0x20 5 3600 {0010}", "delay 200",
-        "send 0x${device.deviceNetworkId} ${endpointId} 1", "delay 1500",
-
-        "zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 6 {${device.zigbeeId}} {}", "delay 1000",
-		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 8 {${device.zigbeeId}} {}", "delay 500",
-        "zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0x0300 {${device.zigbeeId}} {}", "delay 500"
-	]
-    return configCmds + refresh() // send refresh cmds as part of config
 }
 
 def setColorTemperature(value) {
-    state?.colorType = "white"
+    setGenericName(value)
-	if(value<101){
+    zigbee.setColorTemperature(value)
-    	value = (value*38) + 2700		//Calculation of mapping 0-100 to 2700-6500
-    }
-
-    def tempInMired = Math.round(1000000/value)
-    def finalHex = swapEndianHex(hex(tempInMired, 4))
-    def genericName = getGenericName(value)
-    log.debug "generic name is : $genericName"
-
-    def cmds = []
-    sendEvent(name: "colorTemperature", value: value, displayed:false)
-    sendEvent(name: "colorName", value: genericName)
-
-	cmds << "st cmd 0x${device.deviceNetworkId} ${endpointId} 0x0300 0x0a {${finalHex} 2000}"
-
-    cmds
-}
-
-def parseDescriptionAsMap(description) {
-    (description - "read attr - ").split(",").inject([:]) { map, param ->
-        def nameAndValue = param.split(":")
-        map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-    }
-}
-
-def poll(){
-	log.debug "Poll is calling refresh"
-	refresh()
-}
-
-def zigbeeSetLevel(level) {
-    "st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {${level} 0000}"
-}
-
-def setLevel(value) {
-	state.levelValue = (value==null) ? 100 : value
-	log.trace "setLevel($value)"
-	def cmds = []
-
-	if (value == 0) {
-		sendEvent(name: "switch", value: "off")
-		cmds << zigbeeOff()
-	}
-	else if (device.latestValue("switch") == "off") {
-		sendEvent(name: "switch", value: "on")
-	}
-
-	sendEvent(name: "level", value: state.levelValue)
-	def level = hex(state.levelValue * 255 / 100)
-	cmds << zigbeeSetLevel(level)
-
-	//log.debug cmds
-	cmds
 }
 
 //Naming based on the wiki article here: http://en.wikipedia.org/wiki/Color_temperature
-private getGenericName(value){
+def setGenericName(value){
-    def genericName = "White"
+    if (value != null) {
-    if(state?.colorType == "rgb"){
+        def genericName = "White"
-        genericName = "Color Mode"
+        if (value < 3300) {
-    }
-	else{
-        if(value < 3300){
             genericName = "Soft White"
-        } else if(value < 4150){
+        } else if (value < 4150) {
             genericName = "Moonlight"
-        } else if(value < 5000){
+        } else if (value <= 5000) {
             genericName = "Cool White"
-        } else if(value <= 6500){
+        } else if (value >= 5000) {
             genericName = "Daylight"
         }
+        sendEvent(name: "colorName", value: genericName)
     }
-
-    genericName
 }
 
-//input Hue Integer values; returns color name for saturation 100%
+def setLevel(value) {
-private getColorName(hueValue){
+    zigbee.setLevel(value)
-    if(hueValue>100 || hueValue<0)
-        return
-
-    hueValue = Math.round(hueValue / 100 * 360)
-
-    log.debug "hue value is $hueValue"
-
-    def colorName = "Color Mode"
-    if(hueValue>=0 && hueValue <= 4){
-        colorName = "Red"
-    }
-    else if (hueValue>=5 && hueValue <=21 ){
-        colorName = "Brick Red"
-    }
-    else if (hueValue>=22 && hueValue <=30 ){
-        colorName = "Safety Orange"
-    }
-    else if (hueValue>=31 && hueValue <=40 ){
-        colorName = "Dark Orange"
-    }
-    else if (hueValue>=41 && hueValue <=49 ){
-        colorName = "Amber"
-    }
-    else if (hueValue>=50 && hueValue <=56 ){
-        colorName = "Gold"
-    }
-    else if (hueValue>=57 && hueValue <=65 ){
-        colorName = "Yellow"
-    }
-    else if (hueValue>=66 && hueValue <=83 ){
-        colorName = "Electric Lime"
-    }
-    else if (hueValue>=84 && hueValue <=93 ){
-        colorName = "Lawn Green"
-    }
-    else if (hueValue>=94 && hueValue <=112 ){
-        colorName = "Bright Green"
-    }
-    else if (hueValue>=113 && hueValue <=135 ){
-        colorName = "Lime"
-    }
-    else if (hueValue>=136 && hueValue <=166 ){
-        colorName = "Spring Green"
-    }
-    else if (hueValue>=167 && hueValue <=171 ){
-        colorName = "Turquoise"
-    }
-    else if (hueValue>=172 && hueValue <=187 ){
-        colorName = "Aqua"
-    }
-    else if (hueValue>=188 && hueValue <=203 ){
-        colorName = "Sky Blue"
-    }
-    else if (hueValue>=204 && hueValue <=217 ){
-        colorName = "Dodger Blue"
-    }
-    else if (hueValue>=218 && hueValue <=223 ){
-        colorName = "Navy Blue"
-    }
-    else if (hueValue>=224 && hueValue <=251 ){
-        colorName = "Blue"
-    }
-    else if (hueValue>=252 && hueValue <=256 ){
-        colorName = "Han Purple"
-    }
-    else if (hueValue>=257 && hueValue <=274 ){
-        colorName = "Electric Indigo"
-    }
-    else if (hueValue>=275 && hueValue <=289 ){
-        colorName = "Electric Purple"
-    }
-    else if (hueValue>=290 && hueValue <=300 ){
-        colorName = "Orchid Purple"
-    }
-    else if (hueValue>=301 && hueValue <=315 ){
-        colorName = "Magenta"
-    }
-    else if (hueValue>=316 && hueValue <=326 ){
-        colorName = "Hot Pink"
-    }
-    else if (hueValue>=327 && hueValue <=335 ){
-        colorName = "Deep Pink"
-    }
-    else if (hueValue>=336 && hueValue <=339 ){
-        colorName = "Raspberry"
-    }
-    else if (hueValue>=340 && hueValue <=352 ){
-        colorName = "Crimson"
-    }
-    else if (hueValue>=353 && hueValue <=360 ){
-        colorName = "Red"
-    }
-
-    colorName
-}
-
-
-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 evenHex(value){
-    def s = new BigInteger(Math.round(value).toString()).toString(16)
-    while (s.size() % 2 != 0) {
-        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 setAdjustedColor(value) {
-	log.debug "setAdjustedColor: ${value}"
-	def adjusted = value + [:]
-	adjusted.level = null // needed because color picker always sends 100
-	setColor(adjusted)
 }
 
 def setColor(value){
-    state?.colorType = "rgb"
+    log.trace "setColor($value)"
-	log.trace "setColor($value)"
+    zigbee.on() + setHue(value.hue) + "delay 300" + setSaturation(value.saturation)
-	def max = 0xfe
-
-    if (value.hex) { sendEvent(name: "color", value: value.hex, displayed:false)}
-
-    def colorName = getColorName(value.hue)
-    log.debug "color name is : $colorName"
-    sendEvent(name: "colorName", value: colorName)
-    sendEvent(name: "colorTemperature", value: "--", displayed:false)
-
-
-    sendEvent(name: "hue", value: value.hue, displayed:false)
-	sendEvent(name: "saturation", value: value.saturation, displayed:false)
-	def scaledHueValue = evenHex(Math.round(value.hue * max / 100.0))
-	def scaledSatValue = evenHex(Math.round(value.saturation * max / 100.0))
-
-	def cmd = []
-	if (value.switch != "off" && device.latestValue("switch") == "off") {
-		cmd << "st cmd 0x${device.deviceNetworkId} ${endpointId} 6 1 {}"
-		cmd << "delay 150"
-	}
-
-	cmd << "st cmd 0x${device.deviceNetworkId} ${endpointId} 0x300 0x00 {${scaledHueValue} 00 0000}"
-	cmd << "delay 150"
-	cmd << "st cmd 0x${device.deviceNetworkId} ${endpointId} 0x300 0x03 {${scaledSatValue} 0000}"
-
-    if (value.level) {
-        state.levelValue = value.level
-        sendEvent(name: "level", value: value.level)
-        def level = hex(value.level * 255 / 100)
-        cmd << zigbeeSetLevel(level)
-    }
-
-	if (value.switch == "off") {
-		cmd << "delay 150"
-		cmd << off()
-	}
-
-	cmd
 }
+
+def setHue(value) {
+    def scaledHueValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
+    zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, scaledHueValue, "00", "0500")       //payload-> hue value, direction (00-> shortest distance), transition time (1/10th second) (0500 in U16 reads 5)
+}
+
+def setSaturation(value) {
+    def scaledSatValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
+    zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, scaledSatValue, "0500") + "delay 1000" + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+}

devicetypes/smartthings/osram-lightify-led-tunable-white-60w.src/osram-lightify-led-tunable-white-60w.groovy

@@ -21,232 +21,119 @@ metadata {
         attribute "colorName", "string"
     }
 
-    // simulator metadata
-    simulator {
-        // status messages
-        status "on": "on/off: 1"
-        status "off": "on/off: 0"
-
-        // reply messages
-        reply "zcl on-off on": "on/off: 1"
-        reply "zcl on-off off": "on/off: 0"
-    }
-
     // UI tile definitions
-    tiles {
+    tiles(scale: 2) {
-        standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
+        multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
-            state "on", label: '${name}', action: "switch.off", icon: "st.switches.light.on", backgroundColor: "#79b821"
+            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-            state "off", label: '${name}', action: "switch.on", icon: "st.switches.light.off", backgroundColor: "#ffffff"
+                attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff"
+                attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
+                attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff"
+                attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
+            }
+            tileAttribute ("device.level", key: "SLIDER_CONTROL") {
+                attributeState "level", action:"switch level.setLevel"
+            }
         }
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
+
+        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
 
-        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", height: 1, width: 2, inactiveLabel: false, range:"(2700..6500)") {
+        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2700..6500)") {
             state "colorTemperature", action:"color temperature.setColorTemperature"
         }
-        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat") {
+        valueTile("colorName", "device.colorName", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorTemperature", label: '${currentValue} K'
-        }
-        valueTile("colorName", "device.colorName", inactiveLabel: false, decoration: "flat") {
             state "colorName", label: '${currentValue}'
         }
 
-
-        controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {
-            state "level", action:"switch level.setLevel"
-        }
-        valueTile("level", "device.level", inactiveLabel: false, decoration: "flat") {
-            state "level", label: 'Level ${currentValue}%'
-        }
-
-
         main(["switch"])
-        details(["switch", "refresh", "colorName", "levelSliderControl", "level", "colorTempSliderControl", "colorTemp"])
+        details(["switch", "colorTempSliderControl", "colorName", "refresh"])
     }
 }
 
 // Parse incoming device messages to generate events
 def parse(String description) {
-    //log.trace description
+    log.debug "description is $description"
-
+    def event = zigbee.getEvent(description)
-    if (description?.startsWith("catchall:")) {
+    if (event) {
-        if(description?.endsWith("0100") ||description?.endsWith("1001") || description?.matches("on/off\\s*:\\s*1"))
+        if (event.name=="level" && event.value==0) {}
-        {
+        else {
-            def result = createEvent(name: "switch", value: "on")
+            if (event.name=="colorTemperature") {
-            log.debug "Parse returned ${result?.descriptionText}"
+                setGenericName(event.value)
-            return result
+            }
-        }
+            sendEvent(event)
-        else if(description?.endsWith("0000") || description?.endsWith("1000") || description?.matches("on/off\\s*:\\s*0"))
-        {
-            def result = createEvent(name: "switch", value: "off")
-            log.debug "Parse returned ${result?.descriptionText}"
-            return result
-        }
-
-    }
-    else if (description?.startsWith("read attr -")) {
-        def descMap = parseDescriptionAsMap(description)
-        log.trace "descMap : $descMap"
-
-        if (descMap.cluster == "0300") {
-            log.debug descMap.value
-            def tempInMired = convertHexToInt(descMap.value)
-            def tempInKelvin = Math.round(1000000/tempInMired)
-            log.trace "temp in kelvin: $tempInKelvin"
-            sendEvent(name: "colorTemperature", value: tempInKelvin, displayed:false)
-        }
-        else if(descMap.cluster == "0008"){
-            def dimmerValue = Math.round(convertHexToInt(descMap.value) * 100 / 255)
-            log.debug "dimmer value is $dimmerValue"
-            sendEvent(name: "level", value: dimmerValue)
         }
     }
     else {
-        def name = description?.startsWith("on/off: ") ? "switch" : null
+        def cluster = zigbee.parse(description)
-        def value = name == "switch" ? (description?.endsWith(" 1") ? "on" : "off") : null
-        def result = createEvent(name: name, value: value)
-        log.debug "Parse returned ${result?.descriptionText}"
-        return result
-    }
-}
 
-def on() {
+        if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
-    log.debug "on()"
+            if (cluster.data[0] == 0x00) {
-    sendEvent(name: "switch", value: "on")
+                log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
-    setLevel(state?.levelValue)
+                sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+            }
+            else {
+                log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
+            }
+        }
+        else {
+            log.warn "DID NOT PARSE MESSAGE for description : $description"
+            log.debug "${cluster}"
+        }
+    }
 }
 
 def off() {
-    log.debug "off()"
+    zigbee.off()
-    sendEvent(name: "switch", value: "off")
-    "st cmd 0x${device.deviceNetworkId} ${endpointId} 6 0 {}"
 }
 
-def refresh() {
+def on() {
-    [
+    zigbee.on()
-            "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} 0x0300 7"
-    ]
-
-}
-
-def configure() {
-    state.levelValue = 100
-    log.debug "Configuring Reporting and Bindings."
-    def configCmds = [
-            "zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0x0300 {${device.zigbeeId}} {}", "delay 500"
-    ]
-    return onOffConfig() + levelConfig() + configCmds + refresh() // send refresh cmds as part of config
-}
-
-def onOffConfig() {
-    [
-            "zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 6 {${device.zigbeeId}} {}", "delay 200",
-            "zcl global send-me-a-report 6 0 0x10 0 300 {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} ${endpointId} 1 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"
-    ]
-}
-
-def setColorTemperature(value) {
-    if(value<101){
-        value = (value*38) + 2700		//Calculation of mapping 0-100 to 2700-6500
-    }
-
-    def tempInMired = Math.round(1000000/value)
-    def finalHex = swapEndianHex(hex(tempInMired, 4))
-    def genericName = getGenericName(value)
-    log.debug "generic name is : $genericName"
-
-    def cmds = []
-    sendEvent(name: "colorTemperature", value: value, displayed:false)
-    sendEvent(name: "colorName", value: genericName)
-
-    cmds << "st cmd 0x${device.deviceNetworkId} ${endpointId} 0x0300 0x0a {${finalHex} 2000}"
-
-    cmds
-}
-
-def parseDescriptionAsMap(description) {
-    (description - "read attr - ").split(",").inject([:]) { map, param ->
-        def nameAndValue = param.split(":")
-        map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-    }
 }
 
 def setLevel(value) {
-    state.levelValue = (value==null) ? 100 : value
+    zigbee.setLevel(value)
-    log.trace "setLevel($value)"
+}
-    def cmds = []
 
-    if (value == 0) {
+/**
-        sendEvent(name: "switch", value: "off")
+ * PING is used by Device-Watch in attempt to reach the Device
-        cmds << "st cmd 0x${device.deviceNetworkId} ${endpointId} 6 0 {}"
+ * */
-    }
+def ping() {
-    else if (device.latestValue("switch") == "off") {
+    return zigbee.onOffRefresh()
-        sendEvent(name: "switch", value: "on")
+}
-    }
 
-    sendEvent(name: "level", value: state.levelValue)
+def refresh() {
-    def level = hex(state.levelValue * 254 / 100)
+    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh() + zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.colorTemperatureConfig()
-    cmds << "st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {${level} 0000}"
+}
 
-    //log.debug cmds
+def configure() {
-    cmds
+    log.debug "Configuring Reporting and Bindings."
+    // Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
+    // enrolls with default periodic reporting until newer 5 min interval is confirmed
+    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
+    refresh()
+}
+
+def setColorTemperature(value) {
+    setGenericName(value)
+    zigbee.setColorTemperature(value)
 }
 
 //Naming based on the wiki article here: http://en.wikipedia.org/wiki/Color_temperature
-private getGenericName(value){
+def setGenericName(value){
-    def genericName = "White"
+    if (value != null) {
-    if(value < 3300){
+        def genericName = "White"
-        genericName = "Soft White"
+        if (value < 3300) {
-    } else if(value < 4150){
+            genericName = "Soft White"
-        genericName = "Moonlight"
+        } else if (value < 4150) {
-    } else if(value < 5000){
+            genericName = "Moonlight"
-        genericName = "Cool White"
+        } else if (value <= 5000) {
-    } else if(value <= 6500){
+            genericName = "Cool White"
-        genericName = "Daylight"
+        } else if (value >= 5000) {
+            genericName = "Daylight"
+        }
+        sendEvent(name: "colorName", value: genericName)
     }
-
-    genericName
-}
-
-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
 }

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

@@ -74,15 +74,6 @@ metadata {
 	}
 }
 
-def installed() {
-	log.debug "${device} installed"
-}
-
-def updated() {
-	log.debug "${device} updated"
-	configureHealthCheck()
-}
-
 // Parse incoming device messages to generate events
 def parse(String description) {
 	log.debug "description is $description"
@@ -149,14 +140,10 @@ def refresh() {
 	zigbee.onOffRefresh() + zigbee.electricMeasurementPowerRefresh()
 }
 
-def configureHealthCheck() {
+def configure() {
 	// Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
 	// enrolls with default periodic reporting until newer 5 min interval is confirmed
 	sendEvent(name: "checkInterval", value: 3 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-}
-
-def configure() {
-
 
 	// OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
 	refresh() + zigbee.onOffConfig(0, 300) + powerConfig()

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

@@ -84,15 +84,6 @@ metadata {
 	}
 }
 
-def installed() {
-	log.debug "${device} installed"
-}
-
-def updated() {
-	log.debug "${device} updated"
-	configureHealthCheck()
-}
-
 def parse(String description) {
 	log.debug "description: $description"
 
@@ -211,48 +202,37 @@ private Map getBatteryResult(rawValue) {
 	log.debug "Battery rawValue = ${rawValue}"
 	def linkText = getLinkText(device)
 
-	def result = [
+	def result = [:]
-		name: 'battery',
-		value: '--',
-		translatable: true
-	]
 
 	def volts = rawValue / 10
 
-	if (rawValue == 0 || rawValue == 255) {}
+	if (!(rawValue == 0 || rawValue == 255)) {
-	else {
+		result.name = 'battery'
-		if (volts > 3.5) {
+		result.translatable = true
-			result.descriptionText = "{{ device.displayName }} battery has too much power: (> 3.5) volts."
+		result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
-		}
+		if (device.getDataValue("manufacturer") == "SmartThings") {
-		else {
+			volts = rawValue // For the batteryMap to work the key needs to be an int
-			if (device.getDataValue("manufacturer") == "SmartThings") {
+			def batteryMap = [28: 100, 27: 100, 26: 100, 25: 90, 24: 90, 23: 70,
-				volts = rawValue // For the batteryMap to work the key needs to be an int
+							  22: 70, 21: 50, 20: 50, 19: 30, 18: 30, 17: 15, 16: 1, 15: 0]
-				def batteryMap = [28:100, 27:100, 26:100, 25:90, 24:90, 23:70,
+			def minVolts = 15
-								  22:70, 21:50, 20:50, 19:30, 18:30, 17:15, 16:1, 15:0]
+			def maxVolts = 28
-				def minVolts = 15
-				def maxVolts = 28
 
-				if (volts < minVolts)
+			if (volts < minVolts)
-					volts = minVolts
+				volts = minVolts
-				else if (volts > maxVolts)
+			else if (volts > maxVolts)
-					volts = maxVolts
+				volts = maxVolts
-				def pct = batteryMap[volts]
+			def pct = batteryMap[volts]
-				if (pct != null) {
+			result.value = pct
-					result.value = pct
+		} else {
-					result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
+			def minVolts = 2.1
-				}
+			def maxVolts = 3.0
-			}
+			def pct = (volts - minVolts) / (maxVolts - minVolts)
-			else {
+			def roundedPct = Math.round(pct * 100)
-				def minVolts = 2.1
+			if (roundedPct <= 0)
-				def maxVolts = 3.0
+				roundedPct = 1
-				def pct = (volts - minVolts) / (maxVolts - minVolts)
+			result.value = Math.min(100, roundedPct)
-				def roundedPct = Math.round(pct * 100)
-				if (roundedPct <= 0)
-					roundedPct = 1
-				result.value = Math.min(100, roundedPct)
-				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
-			}
 		}
+
 	}
 
 	return result
@@ -312,13 +292,11 @@ def refresh() {
 	return refreshCmds + enrollResponse()
 }
 
-def configureHealthCheck() {
+def configure() {
 	// Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
 	// enrolls with default periodic reporting until newer 5 min interval is confirmed
 	sendEvent(name: "checkInterval", value: 3 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-}
 
-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

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

@@ -88,15 +88,6 @@ metadata {
 	}
 }
 
-def installed() {
-	log.debug "${device} installed"
-}
-
-def updated() {
-	log.debug "${device} updated"
-	configureHealthCheck()
-}
-
 def parse(String description) {
 	log.debug "description: $description"
 
@@ -229,48 +220,35 @@ private Map getBatteryResult(rawValue) {
 	log.debug "Battery rawValue = ${rawValue}"
 	def linkText = getLinkText(device)
 
-	def result = [
+	def result = [:]
-		name: 'battery',
-		value: '--',
-		translatable: true
-	]
 
 	def volts = rawValue / 10
 
-	if (rawValue == 0 || rawValue == 255) {}
+	if (!(rawValue == 0 || rawValue == 255)) {
-	else {
+		result.name = 'battery'
-		if (volts > 3.5) {
+		result.translatable = true
-			result.descriptionText = "{{ device.displayName }} battery has too much power: (> 3.5) volts."
+		result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
-		}
+		if (device.getDataValue("manufacturer") == "SmartThings") {
-		else {
+			volts = rawValue // For the batteryMap to work the key needs to be an int
-			if (device.getDataValue("manufacturer") == "SmartThings") {
+			def batteryMap = [28: 100, 27: 100, 26: 100, 25: 90, 24: 90, 23: 70,
-				volts = rawValue // For the batteryMap to work the key needs to be an int
+							  22: 70, 21: 50, 20: 50, 19: 30, 18: 30, 17: 15, 16: 1, 15: 0]
-				def batteryMap = [28:100, 27:100, 26:100, 25:90, 24:90, 23:70,
+			def minVolts = 15
-								  22:70, 21:50, 20:50, 19:30, 18:30, 17:15, 16:1, 15:0]
+			def maxVolts = 28
-				def minVolts = 15
-				def maxVolts = 28
 
-				if (volts < minVolts)
+			if (volts < minVolts)
-					volts = minVolts
+				volts = minVolts
-				else if (volts > maxVolts)
+			else if (volts > maxVolts)
-					volts = maxVolts
+				volts = maxVolts
-				def pct = batteryMap[volts]
+			def pct = batteryMap[volts]
-				if (pct != null) {
+			result.value = pct
-					result.value = pct
+		} else {
-                    def value = pct
+			def minVolts = 2.1
-					result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
+			def maxVolts = 3.0
-				}
+			def pct = (volts - minVolts) / (maxVolts - minVolts)
-			}
+			def roundedPct = Math.round(pct * 100)
-			else {
+			if (roundedPct <= 0)
-				def minVolts = 2.1
+				roundedPct = 1
-				def maxVolts = 3.0
+			result.value = Math.min(100, roundedPct)
-				def pct = (volts - minVolts) / (maxVolts - minVolts)
-				def roundedPct = Math.round(pct * 100)
-				if (roundedPct <= 0)
-					roundedPct = 1
-				result.value = Math.min(100, roundedPct)
-				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
-			}
 		}
 	}
 
@@ -327,13 +305,11 @@ def refresh() {
 	return refreshCmds + enrollResponse()
 }
 
-def configureHealthCheck() {
+def configure() {
 	// Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
 	// enrolls with default periodic reporting until newer 5 min interval is confirmed
 	sendEvent(name: "checkInterval", value: 3 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-}
 
-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

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

@@ -30,14 +30,18 @@ metadata {
 
 	}
 
-	simulator {
-		status "active": "zone report :: type: 19 value: 0031"
-		status "inactive": "zone report :: type: 19 value: 0030"
-	}
-
 	preferences {
-		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"
+		section {
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+			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"
+			])
+		}
+		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"
+			input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		}
 	}
 
 	tiles(scale: 2) {
@@ -49,15 +53,15 @@ metadata {
 		}
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
 			state("temperature", label:'${currentValue}°', unit:"F",
-				backgroundColors:[
+					backgroundColors:[
-					[value: 31, color: "#153591"],
+							[value: 31, color: "#153591"],
-					[value: 44, color: "#1e9cbb"],
+							[value: 44, color: "#1e9cbb"],
-					[value: 59, color: "#90d2a7"],
+							[value: 59, color: "#90d2a7"],
-					[value: 74, color: "#44b621"],
+							[value: 74, color: "#44b621"],
-					[value: 84, color: "#f1d801"],
+							[value: 84, color: "#f1d801"],
-					[value: 95, color: "#d04e00"],
+							[value: 95, color: "#d04e00"],
-					[value: 96, color: "#bc2323"]
+							[value: 96, color: "#bc2323"]
-				]
+					]
 			)
 		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
@@ -85,55 +89,71 @@ def parse(String description) {
 	else if (description?.startsWith('temperature: ')) {
 		map = parseCustomMessage(description)
 	}
-    else if (description?.startsWith('zone status')) {
+	else if (description?.startsWith('zone status')) {
-	    map = parseIasMessage(description)
+		map = parseIasMessage(description)
-    }
+	}
 
 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : null
 
-    if (description?.startsWith('enroll request')) {
+	if (description?.startsWith('enroll request')) {
-    	List cmds = enrollResponse()
+		List cmds = enrollResponse()
-        log.debug "enroll response: ${cmds}"
+		log.debug "enroll response: ${cmds}"
-        result = cmds?.collect { new physicalgraph.device.HubAction(it) }
+		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
-    }
+	}
-    return result
+	return result
 }
 
 private Map parseCatchAllMessage(String description) {
-    Map resultMap = [:]
+	Map resultMap = [:]
-    def cluster = zigbee.parse(description)
+	def cluster = zigbee.parse(description)
-    if (shouldProcessMessage(cluster)) {
+	if (shouldProcessMessage(cluster)) {
-        switch(cluster.clusterId) {
+		switch(cluster.clusterId) {
-            case 0x0001:
+			case 0x0001:
-            	resultMap = getBatteryResult(cluster.data.last())
+				// 0x07 - configure reporting
-                break
+				if (cluster.command != 0x07) {
+					resultMap = getBatteryResult(cluster.data.last())
+				}
+				break
 
-            case 0x0402:
+			case 0x0402:
-                // temp is last 2 data values. reverse to swap endian
+				if (cluster.command == 0x07) {
-                String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
+					if (cluster.data[0] == 0x00) {
-                def value = getTemperature(temp)
+						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-                resultMap = getTemperatureResult(value)
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-                break
+					}
+					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:
-            	log.debug 'motion'
+				// 0x07 - configure reporting
-                resultMap.name = 'motion'
+				if (cluster.command != 0x07) {
-                break
+					log.debug 'motion'
-        }
+					resultMap.name = 'motion'
-    }
+				}
+				break
+		}
+	}
 
-    return resultMap
+	return resultMap
 }
 
 private boolean shouldProcessMessage(cluster) {
-    // 0x0B is default response indicating message got through
+	// 0x0B is default response indicating message got through
-    // 0x07 is bind message
+	boolean ignoredMessage = cluster.profileId != 0x0104 ||
-    boolean ignoredMessage = cluster.profileId != 0x0104 ||
+			cluster.command == 0x0B ||
-        cluster.command == 0x0B ||
+			(cluster.data.size() > 0 && cluster.data.first() == 0x3e)
-        cluster.command == 0x07 ||
+	return !ignoredMessage
-        (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
-    return !ignoredMessage
 }
 
 private Map parseReportAttributeMessage(String description) {
@@ -151,10 +171,10 @@ private Map parseReportAttributeMessage(String description) {
 	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
 		resultMap = getBatteryResult(Integer.parseInt(descMap.value, 16))
 	}
-    else if (descMap.cluster == "0406" && descMap.attrId == "0000") {
+	else if (descMap.cluster == "0406" && descMap.attrId == "0000") {
-    	def value = descMap.value.endsWith("01") ? "active" : "inactive"
+		def value = descMap.value.endsWith("01") ? "active" : "inactive"
-    	resultMap = getMotionResult(value)
+		resultMap = getMotionResult(value)
-    }
+	}
 
 	return resultMap
 }
@@ -170,15 +190,17 @@ private Map parseCustomMessage(String description) {
 
 private Map parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)
+
+	// Some sensor models that use this DTH use alarm1 and some use alarm2 to signify motion
 	return (zs.isAlarm1Set() || zs.isAlarm2Set()) ? getMotionResult('active') : getMotionResult('inactive')
 }
 
 def getTemperature(value) {
 	def celsius = Integer.parseInt(value, 16).shortValue() / 100
 	if(getTemperatureScale() == "C"){
-		return celsius
+		return Math.round(celsius)
 	} else {
-		return celsiusToFahrenheit(celsius) as Integer
+		return Math.round(celsiusToFahrenheit(celsius))
 	}
 }
 
@@ -186,31 +208,21 @@ private Map getBatteryResult(rawValue) {
 	log.debug 'Battery'
 	def linkText = getLinkText(device)
 
-	log.debug rawValue
+	def result = [:]
-
-	def result = [
-		name: 'battery',
-		value: '--'
-	]
 
 	def volts = rawValue / 10
-	def descriptionText
 
-    if (rawValue == 0 || rawValue == 255) {}
+	if (!(rawValue == 0 || rawValue == 255)) {
-	else {
+		def minVolts = 2.1
-		if (volts > 3.5) {
+		def maxVolts = 3.0
-			result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
+		def pct = (volts - minVolts) / (maxVolts - minVolts)
-		}
+		def roundedPct = Math.round(pct * 100)
-		else if (volts > 0){
+		if (roundedPct <= 0)
-			def minVolts = 2.1
+			roundedPct = 1
-			def maxVolts = 3.0
+		result.name = 'battery'
-			def pct = (volts - minVolts) / (maxVolts - minVolts)
+		result.value = Math.min(100, roundedPct)
-			def roundedPct = Math.round(pct * 100)
+		result.descriptionText = "${linkText} battery was ${result.value}%"
-			if (roundedPct <= 0)
+
-				roundedPct = 1
-			result.value = Math.min(100, roundedPct)
-			result.descriptionText = "${linkText} battery was ${result.value}%"
-		}
 	}
 
 	return result
@@ -218,68 +230,75 @@ private Map getBatteryResult(rawValue) {
 
 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}"
+	def descriptionText
+	if ( temperatureScale == 'C' )
+		descriptionText = '{{ device.displayName }} was {{ value }}°C'
+	else
+		descriptionText = '{{ device.displayName }} was {{ value }}°F'
+
 	return [
-		name: 'temperature',
+			name: 'temperature',
-		value: value,
+			value: value,
-		descriptionText: descriptionText,
+			descriptionText: descriptionText,
-		unit: temperatureScale
+			translatable: true,
+			unit: temperatureScale
 	]
 }
 
 private Map getMotionResult(value) {
 	log.debug 'motion'
-	String linkText = getLinkText(device)
+	String descriptionText = value == 'active' ? "{{ device.displayName }} detected motion" : "{{ device.displayName }} motion has stopped"
-	String descriptionText = value == 'active' ? "${linkText} detected motion" : "${linkText} motion has stopped"
 	return [
-		name: 'motion',
+			name: 'motion',
-		value: value,
+			value: value,
-		descriptionText: descriptionText
+			descriptionText: descriptionText,
+			translatable: true
 	]
 }
 
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+	return zigbee.readAttribute(0x001, 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 0x402 0", "delay 200",
-		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
+			"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
 	]
 
 	return refreshCmds + enrollResponse()
 }
 
 def configure() {
-	log.debug "Configuring Reporting, IAS CIE, and Bindings."
+	// Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
+	// enrolls with default periodic reporting until newer 5 min interval is confirmed
+	sendEvent(name: "checkInterval", value: 3 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 
-	def configCmds = [
+	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
-		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 1 {${device.zigbeeId}} {}", "delay 200",
+	// battery minReport 30 seconds, maxReportTime 6 hrs by default
-		"zcl global send-me-a-report 1 0x20 0x20 30 21600 {01}",		//checkin time 6 hrs
+	return refresh() + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) // send refresh cmds as part of config
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
-
-		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0x402 {${device.zigbeeId}} {}", "delay 200",
-		"zcl global send-me-a-report 0x402 0 0x29 30 3600 {6400}",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
-	]
-    return refresh() + configCmds  // 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
+			//Resending the CIE in case the enroll request is sent before CIE is written
-		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
+			"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
-		//Enroll Response
+			//Enroll Response
-		"raw 0x500 {01 23 00 00 00}",
+			"raw 0x500 {01 23 00 00 00}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+			"send 0x${device.deviceNetworkId} 1 1", "delay 200"
-    ]
+	]
 }
 
 private getEndpointId() {
@@ -291,19 +310,19 @@ private hex(value) {
 }
 
 private String swapEndianHex(String hex) {
-    reverseArray(hex.decodeHex()).encodeHex()
+	reverseArray(hex.decodeHex()).encodeHex()
 }
 
 private byte[] reverseArray(byte[] array) {
-    int i = 0;
+	int i = 0;
-    int j = array.length - 1;
+	int j = array.length - 1;
-    byte tmp;
+	byte tmp;
-    while (j > i) {
+	while (j > i) {
-        tmp = array[j];
+		tmp = array[j];
-        array[j] = array[i];
+		array[j] = array[i];
-        array[i] = tmp;
+		array[i] = tmp;
-        j--;
+		j--;
-        i++;
+		i++;
-    }
+	}
-    return array
+	return array
 }

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

@@ -115,34 +115,6 @@ metadata {
 	}
  }
 
-def installed() {
-	log.debug "${device} installed"
-}
-
-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)
-		}
-	}
-	configureHealthCheck()
-}
-
 def parse(String description) {
 	Map map = [:]
 	if (description?.startsWith('catchall:')) {
@@ -274,6 +246,29 @@ private Map parseIasMessage(String description) {
 	return resultMap
 }
 
+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"){
@@ -286,47 +281,35 @@ def getTemperature(value) {
 private Map getBatteryResult(rawValue) {
 	log.debug "Battery rawValue = ${rawValue}"
 
-	def result = [
+	def result = [:]
-		name: 'battery',
-		value: '--',
-		translatable: true
-	]
 
 	def volts = rawValue / 10
 
-	if (rawValue == 0 || rawValue == 255) {}
+	if (!(rawValue == 0 || rawValue == 255)) {
-	else {
+		result.name = 'battery'
-		if (volts > 3.5) {
+		result.translatable = true
-			result.descriptionText = "{{ device.displayName }} battery has too much power: (> 3.5) volts."
+		result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
-		}
+		if (device.getDataValue("manufacturer") == "SmartThings") {
-		else {
+			volts = rawValue // For the batteryMap to work the key needs to be an int
-			if (device.getDataValue("manufacturer") == "SmartThings") {
+			def batteryMap = [28: 100, 27: 100, 26: 100, 25: 90, 24: 90, 23: 70,
-				volts = rawValue // For the batteryMap to work the key needs to be an int
+							  22: 70, 21: 50, 20: 50, 19: 30, 18: 30, 17: 15, 16: 1, 15: 0]
-				def batteryMap = [28:100, 27:100, 26:100, 25:90, 24:90, 23:70,
+			def minVolts = 15
-								  22:70, 21:50, 20:50, 19:30, 18:30, 17:15, 16:1, 15:0]
+			def maxVolts = 28
-				def minVolts = 15
-				def maxVolts = 28
 
-				if (volts < minVolts)
+			if (volts < minVolts)
-					volts = minVolts
+				volts = minVolts
-				else if (volts > maxVolts)
+			else if (volts > maxVolts)
-					volts = maxVolts
+				volts = maxVolts
-				def pct = batteryMap[volts]
+			def pct = batteryMap[volts]
-				if (pct != null) {
+			result.value = pct
-					result.value = pct
+		} else {
-					result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
+			def minVolts = 2.1
-				}
+			def maxVolts = 3.0
-			}
+			def pct = (volts - minVolts) / (maxVolts - minVolts)
-			else {
+			def roundedPct = Math.round(pct * 100)
-				def minVolts = 2.1
+			if (roundedPct <= 0)
-				def maxVolts = 3.0
+				roundedPct = 1
-				def pct = (volts - minVolts) / (maxVolts - minVolts)
+			result.value = Math.min(100, roundedPct)
-				def roundedPct = Math.round(pct * 100)
-				if (roundedPct <= 0)
-					roundedPct = 1
-				result.value = Math.min(100, roundedPct)
-				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
-			}
 		}
 	}
 
@@ -416,13 +399,11 @@ def refresh() {
 	return refreshCmds + enrollResponse()
 }
 
-def configureHealthCheck(){
+def configure() {
 	// Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
 	// enrolls with default periodic reporting until newer 5 min interval is confirmed
 	sendEvent(name: "checkInterval", value: 3 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-}
 
-def configure() {
 	log.debug "Configuring Reporting"
 
 	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity

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

@@ -16,51 +16,68 @@
 //DEPRECATED - Using the smartsense-multi-sensor.groovy DTH for this device. Users need to be moved before deleting this DTH
 import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
- metadata {
+metadata {
- 	definition (name: "SmartSense Open/Closed Accelerometer Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
+	definition (name: "SmartSense Open/Closed Accelerometer Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
- 		capability "Battery"
+		capability "Battery"
- 		capability "Configuration"
+		capability "Configuration"
- 		capability "Contact Sensor"
+		capability "Contact Sensor"
- 		capability "Acceleration Sensor"
+		capability "Acceleration Sensor"
- 		capability "Refresh"
+		capability "Refresh"
- 		capability "Temperature Measurement"
+		capability "Temperature Measurement"
 		capability "Health Check"
 		capability "Sensor"
 
 		command "enrollResponse"
- 	}
+		attribute "status", "string"
+	}
 
- 	simulator {
+	preferences {
-
+		section {
- 	}
+			image(name: 'educationalcontent', multiple: true, images: [
-
+					"http://cdn.device-gse.smartthings.com/Multi/Multi1.jpg",
- 	preferences {
+					"http://cdn.device-gse.smartthings.com/Multi/Multi2.jpg",
- 		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"
+					"http://cdn.device-gse.smartthings.com/Multi/Multi3.jpg",
- 		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+					"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"
+			input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		}
+		section {
+			input("garageSensor", "enum", title: "Do you want to use this sensor on a garage door?", description: "Tap to set", options: ["Yes", "No"], defaultValue: "No", required: false, displayDuringSetup: false)
+		}
+	}
 
 	tiles(scale: 2) {
-		multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4){
+		multiAttributeTile(name:"status", type: "generic", width: 6, height: 4){
-			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
+			tileAttribute ("device.status", key: "PRIMARY_CONTROL") {
-				attributeState "open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e"
+				attributeState "open", label:'Open', icon:"st.contact.contact.open", backgroundColor:"#ffa81e"
-				attributeState "closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821"
+				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("acceleration", "device.acceleration", width: 2, height: 2) {
+		standardTile("contact", "device.contact", width: 2, height: 2) {
-			state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
+			state("open", label:'Open', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
-			state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff")
+			state("closed", label:'Closed', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
 		}
-		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
+		standardTile("acceleration", "device.acceleration", width: 2, height: 2) {
-			state "temperature", label:'${currentValue}°',
+			state("active", label:'Active', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
-				backgroundColors:[
+			state("inactive", label:'Inactive', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff")
-					[value: 31, color: "#153591"],
+		}
-					[value: 44, color: "#1e9cbb"],
+		valueTile("temperature", "device.temperature", width: 2, height: 2) {
-					[value: 59, color: "#90d2a7"],
+			state("temperature", label:'${currentValue}°',
-					[value: 74, color: "#44b621"],
+					backgroundColors:[
-					[value: 84, color: "#f1d801"],
+							[value: 31, color: "#153591"],
-					[value: 95, color: "#d04e00"],
+							[value: 44, color: "#1e9cbb"],
-					[value: 96, color: "#bc2323"]
+							[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:""
@@ -69,98 +86,121 @@ import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 
-		main (["contact", "acceleration", "temperature"])
+
-		details(["contact", "acceleration", "temperature", "battery", "refresh"])
+		main(["status", "acceleration", "temperature"])
+		details(["status", "acceleration", "temperature", "battery", "refresh"])
 	}
- }
-
- 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)
- 	}
-
- 	log.debug "Parse returned $map"
- 	def result = map ? createEvent(map) : null
-
- 	if (description?.startsWith('enroll request')) {
- 		List cmds = enrollResponse()
- 		log.debug "enroll response: ${cmds}"
- 		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
- 	}
- 	return result
- }
-
- private Map parseCatchAllMessage(String description) {
- 	Map resultMap = [:]
- 	def cluster = zigbee.parse(description)
- 	if (shouldProcessMessage(cluster)) {
- 		switch(cluster.clusterId) {
- 			case 0x0001:
- 			resultMap = getBatteryResult(cluster.data.last())
- 			break
-
- 			case 0xFC02:
- 			break
-
- 			case 0x0402:
- 			log.debug 'TEMP'
-                // 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
-    // 0x07 is bind message
-    boolean ignoredMessage = cluster.profileId != 0x0104 ||
-    cluster.command == 0x0B ||
-    cluster.command == 0x07 ||
-    (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
-    return !ignoredMessage
 }
 
-private int getHumidity(value) {
+def parse(String description) {
-	return Math.round(Double.parseDouble(value))
+	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 result = map ? createEvent(map) : null
+
+	if (description?.startsWith('enroll request')) {
+		List cmds = enrollResponse()
+		log.debug "enroll response: ${cmds}"
+		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
+	}
+	else if (description?.startsWith('read attr -')) {
+		result = parseReportAttributeMessage(description).each { createEvent(it) }
+	}
+	return result
 }
 
-private Map parseReportAttributeMessage(String description) {
+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
+
+			case 0xFC02:
+				log.debug 'ACCELERATION'
+				break
+
+			case 0x0402:
+				if (cluster.command == 0x07) {
+					if(cluster.data[0] == 0x00) {
+						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
+						sendEvent(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 List 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 = [:]
+	List result = []
 	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
 		def value = getTemperature(descMap.value)
-		resultMap = getTemperatureResult(value)
+		result << getTemperatureResult(value)
 	}
-	else if (descMap.cluster == "FC02" && descMap.attrId == "0002") {
+	else if (descMap.cluster == "FC02" && descMap.attrId == "0010") {
-		Integer.parseInt(descMap.value,8)
+		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") {
-		resultMap = getBatteryResult(Integer.parseInt(descMap.value, 16))
+		result << getBatteryResult(Integer.parseInt(descMap.value, 16))
 	}
 
-	return resultMap
+	return result
 }
 
 private Map parseCustomMessage(String description) {
@@ -174,141 +214,270 @@ private Map parseCustomMessage(String description) {
 
 private Map parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)
+	Map resultMap = [:]
 
-	return zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
+	if (garageSensor != "Yes"){
+		resultMap = zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
+	}
+
+	return resultMap
+}
+
+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 celsius
+		return Math.round(celsius)
-		} else {
+	} else {
-			return celsiusToFahrenheit(celsius) as Integer
+		return Math.round(celsiusToFahrenheit(celsius))
-		}
+	}
+}
+
+private Map getBatteryResult(rawValue) {
+	log.debug 'Battery'
+	def linkText = getLinkText(device)
+
+	def result = [:]
+
+	def volts = rawValue / 10
+
+	if (!(rawValue == 0 || rawValue == 255)) {
+		def minVolts = 2.1
+		def maxVolts = 3.0
+		def pct = (volts - minVolts) / (maxVolts - minVolts)
+		def roundedPct = Math.round(pct * 100)
+		if (roundedPct <= 0)
+			roundedPct = 1
+		result.name = 'battery'
+		result.value = Math.min(100, roundedPct)
+		result.descriptionText = "${linkText} battery was ${result.value}%"
+
 	}
 
-	private Map getBatteryResult(rawValue) {
+	return result
-		log.debug 'Battery'
+}
-		def linkText = getLinkText(device)
 
-		def result = [
+private Map getTemperatureResult(value) {
-		name: 'battery'
+	log.debug "Temperature"
-		]
+	if (tempOffset) {
-
+		def offset = tempOffset as int
-		def volts = rawValue / 10
+		def v = value as int
-		def descriptionText
+		value = v + offset
-        if (rawValue == 0 || rawValue == 255) {}
-		else if (volts > 3.5) {
-			result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
-		}
-		else {
-			def minVolts = 2.1
-			def maxVolts = 3.0
-			def pct = (volts - minVolts) / (maxVolts - minVolts)
-			def roundedPct = Math.round(pct * 100)
-	        if (roundedPct <= 0)
-		        roundedPct = 1
-			result.value = Math.min(100, roundedPct)
-			result.descriptionText = "${linkText} battery was ${result.value}%"
-		}
-
-		return result
 	}
+	def descriptionText = temperatureScale == 'C' ? '{{ device.displayName }} was {{ value }}°C':
+			'{{ device.displayName }} was {{ value }}°F'
 
-	private Map getTemperatureResult(value) {
+	return [
-		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,
+			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)
+	sendEvent(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'
 	}
 
-	private Map getContactResult(value) {
+	def isStateChange = isStateChange(device, name, value)
-		log.debug 'Contact Status'
+	return [
-		def linkText = getLinkText(device)
-		def descriptionText = "${linkText} was ${value == 'open' ? 'opened' : 'closed'}"
-		return [
-		name: 'contact',
-		value: value,
-		descriptionText: descriptionText
-		]
-	}
-
-	private getAccelerationResult(numValue) {
-		def name = "acceleration"
-		def value = numValue.endsWith("1") ? "active" : "inactive"
-		//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: value,
+			isStateChange: isStateChange,
-			isStateChange: isStateChange
+			translatable: true
-		//	displayed: displayed(description, isStateChange)
+	]
-		]
+}
+
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
+}
+
+def refresh() {
+	log.debug "Refreshing Values "
+
+	def refreshCmds = []
+
+	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])
 	}
 
-	def refresh() {
+	//Common refresh commands
-		log.debug "Refreshing Temperature and Battery "
+	refreshCmds += zigbee.readAttribute(0x0402, 0x0000) +
-		def refreshCmds = [
+			zigbee.readAttribute(0x0001, 0x0020) +
+			zigbee.readAttribute(0xFC02, 0x0010, [mfgCode: manufacturerCode])
 
-		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
+	return refreshCmds + enrollResponse()
-		//"st rattr 0x${device.deviceNetworkId} 1 0xFC02 2", "delay 200",
+}
-		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
-
-		]
-
-		return refreshCmds + enrollResponse()
-	}
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false)
+	// Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
+	// enrolls with default periodic reporting until newer 5 min interval is confirmed
+	sendEvent(name: "checkInterval", value: 3 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 
-	log.debug "Configuring Reporting, IAS CIE, and Bindings."
+	log.debug "Configuring Reporting"
-	def configCmds = [
-		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 1 {${device.zigbeeId}} {}", "delay 200",
-		"zcl global send-me-a-report 1 0x20 0x20 30 21600 {01}",		//checkin time 6 hrs
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
-		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0x402 {${device.zigbeeId}} {}", "delay 500",
+	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
-		"zcl global send-me-a-report 0x402 0 0x29 30 3600 {6400}",
+	// battery minReport 30 seconds, maxReportTime 6 hrs by default
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+	def 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])
 
-		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0xFC02 {${device.zigbeeId}} {}", "delay 500",
+	return refresh() + configCmds
-		"zcl global send-me-a-report 0xFC02 2 0x18 30 3600 {01}",
+}
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
+
-	]
+private getEndpointId() {
-	return refresh() + configCmds // send refresh cmds as part of config
+	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
+			//Resending the CIE in case the enroll request is sent before CIE is written
-		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
+			"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
-		//Enroll Response
+			//Enroll Response
-		"raw 0x500 {01 23 00 00 00}",
+			"raw 0x500 {01 23 00 00 00}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+			"send 0x${device.deviceNetworkId} 1 1", "delay 200"
 	]
 }
 
-private getEndpointId() {
+private Map parseAxis(String description) {
-	new BigInteger(device.endpointId, 16).toString()
+	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
+	} 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
+	}
+
+	log.debug "parseAxis -- ${xyzResults}"
+
+	if (garageSensor == "Yes")
+		garageEvent(xyzResults.z)
+
+	getXyzResult(xyzResults, description)
+}
+
+private hexToSignedInt(hexVal) {
+	def unsignedVal = hexToInt(hexVal)
+	unsignedVal > 32767 ? unsignedVal - 65536 : unsignedVal
+}
+
+def garageEvent(zValue) {
+	def absValue = zValue.abs()
+	def contactValue = null
+	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"
+	} else {
+		return "0x104E"
+	}
+}
+
+private hexToInt(value) {
+	new BigInteger(value, 16)
 }
 
 private hex(value) {

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

@@ -75,15 +75,6 @@ metadata {
 	}
 }
 
-def installed() {
-	log.debug "${device} installed"
-}
-
-def updated() {
-	log.debug "${device} updated"
-	configureHealthCheck()
-}
-
 def parse(String description) {
 	log.debug "description: $description"
 
@@ -205,25 +196,19 @@ private Map getBatteryResult(rawValue) {
 	log.debug 'Battery'
 	def linkText = getLinkText(device)
 
-    def result = [
+    def result = [:]
-    	name: 'battery'
-    ]
 
 	def volts = rawValue / 10
-	def descriptionText
+	if (!(rawValue == 0 || rawValue == 255)) {
-    if (rawValue == 0 || rawValue == 255) {}
-    else if (volts > 3.5) {
-		result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
-	}
-	else {
 		def minVolts = 2.1
-    	def maxVolts = 3.0
+		def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
 		def roundedPct = Math.round(pct * 100)
 	    if (roundedPct <= 0)
 		    roundedPct = 1
 		result.value = Math.min(100, roundedPct)
 		result.descriptionText = "${linkText} battery was ${result.value}%"
+		result.name = 'battery'
 	}
 
 	return result
@@ -274,12 +259,11 @@ def refresh() {
 	return refreshCmds + enrollResponse()
 }
 
-def configureHealthCheck() {
+def configure() {
 	// Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
 	// enrolls with default periodic reporting until newer 5 min interval is confirmed
 	sendEvent(name: "checkInterval", value: 3 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-}
+
-def configure() {
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."
 
 	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity

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

@@ -69,15 +69,6 @@ metadata {
 	}
 }
 
-def installed() {
-	log.debug "${device} installed"
-}
-
-def updated() {
-	log.debug "${device} updated"
-	configureHealthCheck()
-}
-
 def parse(String description) {
 	log.debug "description: $description"
 
@@ -216,25 +207,20 @@ private Map getBatteryResult(rawValue) {
 	log.debug 'Battery'
 	def linkText = getLinkText(device)
 
-    def result = [
+    def result = [:]
-    	name: 'battery'
-    ]
 
 	def volts = rawValue / 10
-	def descriptionText
+	if (!(rawValue == 0 || rawValue == 255)) {
-    if (rawValue == 0 || rawValue == 255) {}
-    else if (volts > 3.5) {
-		result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
-	}
-	else {
 		def minVolts = 2.1
-    	def maxVolts = 3.0
+		def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
 		def roundedPct = Math.round(pct * 100)
-	    if (roundedPct <= 0)
+		if (roundedPct <= 0)
-		    roundedPct = 1
+			roundedPct = 1
 		result.value = Math.min(100, roundedPct)
 		result.descriptionText = "${linkText} battery was ${result.value}%"
+		result.name = 'battery'
+
 	}
 
 	return result
@@ -277,13 +263,11 @@ def refresh()
 			zigbee.readAttribute(0x0001, 0x0020)
 }
 
-def configureHealthCheck() {
+def configure() {
 	// Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
 	// enrolls with default periodic reporting until newer 5 min interval is confirmed
 	sendEvent(name: "checkInterval", value: 3 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-}
 
-def configure() {
 	log.debug "Configuring Reporting and Bindings."
 	def humidityConfigCmds = [
 		"zdo bind 0x${device.deviceNetworkId} 1 1 0xFC45 {${device.zigbeeId}} {}", "delay 500",

devicetypes/smartthings/tyco-door-window-sensor.src/tyco-door-window-sensor.groovy

@@ -181,22 +181,17 @@ private Map getBatteryResult(rawValue) {
 	log.debug 'Battery'
 	def linkText = getLinkText(device)
 
-    def result = [
+    def result = [:]
-    	name: 'battery'
-    ]
 
-	def volts = rawValue / 10
+	if (!(rawValue == 0 || rawValue == 255)) {
-	def descriptionText
+		def volts = rawValue / 10
-	if (volts > 3.5) {
-		result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
-	}
-	else {
 		def minVolts = 2.1
-    	def maxVolts = 3.0
+		def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
 		def roundedPct = Math.round(pct * 100)
 		result.value = Math.min(100, roundedPct)
 		result.descriptionText = "${linkText} battery was ${result.value}%"
+		result.name = 'battery'
 	}
 
 	return result

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

@@ -48,15 +48,6 @@ metadata {
     }
 }
 
-def installed() {
-    log.debug "${device} installed"
-}
-
-def updated() {
-    log.debug "${device} updated"
-    configureHealthCheck()
-}
-
 // Parse incoming device messages to generate events
 def parse(String description) {
     log.debug "description is $description"
@@ -109,13 +100,12 @@ def refresh() {
     zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig(0, 300) + zigbee.levelConfig()
 }
 
-def configureHealthCheck() {
+def configure() {
+    log.debug "Configuring Reporting and Bindings."
     // Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
     // enrolls with default periodic reporting until newer 5 min interval is confirmed
     sendEvent(name: "checkInterval", value: 3 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-}
 
-def configure() {
     // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
     zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig(0, 300) + zigbee.levelConfig()
 }

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

@@ -47,197 +47,122 @@ metadata {
 		//fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,0300,1000", outClusters: "0019"
 	}
 
-	// simulator metadata
-	simulator {
-		// status messages
-		status "on": "on/off: 1"
-		status "off": "on/off: 0"
-
-		// reply messages
-		reply "zcl on-off on": "on/off: 1"
-		reply "zcl on-off off": "on/off: 0"
-	}
-
 	// UI tile definitions
-	tiles {
+	tiles(scale: 2) {
-		standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
+		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
-			state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
+			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-			state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-			state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
+				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-			state "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+			}
+			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
+				attributeState "level", action:"switch level.setLevel"
+			}
+			tileAttribute ("device.color", key: "COLOR_CONTROL") {
+				attributeState "color", action:"color control.setColor"
+			}
 		}
-		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat") {
+		controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2700..6500)") {
+			state "colorTemperature", action:"color temperature.setColorTemperature"
+		}
+		valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+			state "colorTemperature", label: '${currentValue} K'
+		}
+		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
 			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
-		controlTile("rgbSelector", "device.color", "color", height: 3, width: 3, inactiveLabel: false) {
-			state "color", action:"setAdjustedColor"
-		}
-		controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "level", action:"switch level.setLevel"
-		}
-		valueTile("level", "device.level", inactiveLabel: false, decoration: "flat") {
-			state "level", label: 'Level ${currentValue}%'
-		}
-		controlTile("saturationSliderControl", "device.saturation", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "saturation", action:"color control.setSaturation"
-		}
-		valueTile("saturation", "device.saturation", inactiveLabel: false, decoration: "flat") {
-			state "saturation", label: 'Sat ${currentValue}    '
-		}
-		controlTile("hueSliderControl", "device.hue", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "hue", action:"color control.setHue"
-		}
 
 		main(["switch"])
-		details(["switch", "levelSliderControl", "rgbSelector", "refresh"])
+		details(["switch", "colorTempSliderControl", "colorTemp", "refresh"])
 	}
 }
 
+//Globals
+private getATTRIBUTE_HUE() { 0x0000 }
+private getATTRIBUTE_SATURATION() { 0x0001 }
+private getHUE_COMMAND() { 0x00 }
+private getSATURATION_COMMAND() { 0x03 }
+private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
+private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
+
 // Parse incoming device messages to generate events
 def parse(String description) {
-	//log.trace description
+	log.debug "description is $description"
-	if (description?.startsWith("catchall:")) {
+
-		def msg = zigbee.parse(description)
+	def finalResult = zigbee.getEvent(description)
-		//log.trace msg
+	if (finalResult) {
-		//log.trace "data: $msg.data"
+		log.debug finalResult
+		sendEvent(finalResult)
 	}
 	else {
-		def name = description?.startsWith("on/off: ") ? "switch" : null
+		def zigbeeMap = zigbee.parseDescriptionAsMap(description)
-		def value = name == "switch" ? (description?.endsWith(" 1") ? "on" : "off") : null
+		log.trace "zigbeeMap : $zigbeeMap"
-		def result = createEvent(name: name, value: value)
+
-		log.debug "Parse returned ${result?.descriptionText}"
+		if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
-		return result
+			if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
+				def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 360)
+				sendEvent(name: "hue", value: hueValue, displayed:false)
+			}
+			else if(zigbeeMap.attrInt == ATTRIBUTE_SATURATION){ //Saturation Attribute
+				def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
+				sendEvent(name: "saturation", value: saturationValue, displayed:false)
+			}
+		}
+		else {
+			log.info "DID NOT PARSE MESSAGE for description : $description"
+		}
 	}
 }
 
 def on() {
-	// just assume it works for now
+	zigbee.on() + ["delay 1500"] + zigbee.onOffRefresh()
-	log.debug "on()"
-	sendEvent(name: "switch", value: "on")
-	"st cmd 0x${device.deviceNetworkId} ${endpointId} 6 1 {}"
 }
 
 def off() {
-	// just assume it works for now
+	zigbee.off() + ["delay 1500"] + zigbee.onOffRefresh()
-	log.debug "off()"
-	sendEvent(name: "switch", value: "off")
-	"st cmd 0x${device.deviceNetworkId} ${endpointId} 6 0 {}"
 }
 
-def setHue(value) {
+def refresh() {
-	def max = 0xfe
+	refreshAttributes() + configureAttributes()
-	log.trace "setHue($value)"
-	sendEvent(name: "hue", value: value)
-	def scaledValue = Math.round(value * max / 100.0)
-	def cmd = "st cmd 0x${device.deviceNetworkId} ${endpointId} 0x300 0x00 {${hex(scaledValue)} 00 0000}"
-	//log.info cmd
-	cmd
 }
 
-def setAdjustedColor(value) {
+def poll() {
-	log.debug "setAdjustedColor: ${value}"
+	refreshAttributes()
-	def adjusted = value + [:]
+}
-	adjusted.hue = adjustOutgoingHue(value.hue)
+
-	adjusted.level = null // needed because color picker always sends 100
+def configure() {
-	setColor(adjusted)
+	log.debug "Configuring Reporting and Bindings."
+	configureAttributes() + refreshAttributes()
+}
+
+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)
+}
+
+def refreshAttributes() {
+	zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+}
+
+def setColorTemperature(value) {
+	zigbee.setColorTemperature(value) + ["delay 1500"] + zigbee.colorTemperatureRefresh()
+}
+
+def setLevel(value) {
+	zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
 def setColor(value){
 	log.trace "setColor($value)"
-	def max = 0xfe
+	zigbee.on() + setHue(value.hue) + ["delay 300"] + setSaturation(value.saturation) + ["delay 2000"] + refreshAttributes()
+}
 
-	sendEvent(name: "hue", value: value.hue)
+def setHue(value) {
-	sendEvent(name: "saturation", value: value.saturation)
+	def scaledHueValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-	def scaledHueValue = Math.round(value.hue * max / 100.0)
+	zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, scaledHueValue, "00", "0500") + ["delay 1500"] + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE)       //payload-> hue value, direction (00-> shortest distance), transition time (1/10th second) (0500 in U16 reads 5)
-	def scaledSatValue = Math.round(value.saturation * max / 100.0)
-
-	def cmd = []
-	if (value.switch != "off" && device.latestValue("switch") == "off") {
-		cmd << "st cmd 0x${device.deviceNetworkId} ${endpointId} 6 1 {}"
-		cmd << "delay 150"
-	}
-
-	cmd << "st cmd 0x${device.deviceNetworkId} ${endpointId} 0x300 0x00 {${hex(scaledHueValue)} 00 0000}"
-	cmd << "delay 150"
-	cmd << "st cmd 0x${device.deviceNetworkId} ${endpointId} 0x300 0x03 {${hex(scaledSatValue)} 0000}"
-
-	if (value.level != null) {
-		cmd << "delay 150"
-		cmd.addAll(setLevel(value.level))
-	}
-
-	if (value.switch == "off") {
-		cmd << "delay 150"
-		cmd << off()
-	}
-	log.info cmd
-	cmd
 }
 
 def setSaturation(value) {
-	def max = 0xfe
+	def scaledSatValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-	log.trace "setSaturation($value)"
+	zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, scaledSatValue, "0500") + ["delay 1500"] + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)      //payload-> sat value, transition time
-	sendEvent(name: "saturation", value: value)
-	def scaledValue = Math.round(value * max / 100.0)
-	def cmd = "st cmd 0x${device.deviceNetworkId} ${endpointId} 0x300 0x03 {${hex(scaledValue)} 0000}"
-	//log.info cmd
-	cmd
-}
-
-def refresh() {
-	"st rattr 0x${device.deviceNetworkId} 1 6 0"
-}
-
-def poll(){
-	log.debug "Poll is calling refresh"
-	refresh()
-}
-
-def setLevel(value) {
-	log.trace "setLevel($value)"
-	def cmds = []
-
-	if (value == 0) {
-		sendEvent(name: "switch", value: "off")
-		cmds << "st cmd 0x${device.deviceNetworkId} ${endpointId} 6 0 {}"
-	}
-	else if (device.latestValue("switch") == "off") {
-		sendEvent(name: "switch", value: "on")
-	}
-
-	sendEvent(name: "level", value: value)
-    def level = hexString(Math.round(value * 255/100))
-	cmds << "st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {${level} 0000}"
-
-	//log.debug cmds
-	cmds
-}
-
-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 adjustOutgoingHue(percent) {
-	def adjusted = percent
-	if (percent > 31) {
-		if (percent < 63.0) {
-			adjusted = percent + (7 * (percent -30 ) / 32)
-		}
-		else if (percent < 73.0) {
-			adjusted = 69 + (5 * (percent - 62) / 10)
-		}
-		else {
-			adjusted = percent + (2 * (100 - percent) / 28)
-		}
-	}
-	log.info "percent: $percent, adjusted: $adjusted"
-	adjusted
 }

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

@@ -70,16 +70,6 @@ metadata {
     }
 }
 
-
-def installed() {
-    log.debug "${device} installed"
-}
-
-def updated() {
-    log.debug "${device} updated"
-    configureHealthCheck()
-}
-
 //Globals
 private getATTRIBUTE_HUE() { 0x0000 }
 private getATTRIBUTE_SATURATION() { 0x0001 }
@@ -148,17 +138,16 @@ def ping() {
 }
 
 def refresh() {
-    // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
     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)
 }
 
-def configureHealthCheck() {
+def configure() {
+    log.debug "Configuring Reporting and Bindings."
     // Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
     // enrolls with default periodic reporting until newer 5 min interval is confirmed
     sendEvent(name: "checkInterval", value: 3 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-}
 
-def configure() {
+    // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
     refresh()
 }
 

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

@@ -84,18 +84,20 @@ def refresh() {
 
 def configure() {
     log.debug "in configure()"
-    configureHealthCheck()
+    return configureHealthCheck()
 }
 
 def configureHealthCheck() {
     Integer hcIntervalMinutes = 12
-    refresh()
     sendEvent(name: "checkInterval", value: hcIntervalMinutes * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+    return refresh()
 }
 
 def updated() {
     log.debug "in updated()"
-    configureHealthCheck()
+    // updated() doesn't have it's return value processed as hub commands, so we have to send them explicitly
+    def cmds = configureHealthCheck()
+    cmds.each{ sendHubCommand(new physicalgraph.device.HubAction(it)) }
 }
 
 def ping() {

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

@@ -69,15 +69,6 @@ metadata {
     }
 }
 
-def installed() {
-    log.debug "${device} installed"
-}
-
-def updated() {
-    log.debug "${device} updated"
-    configureHealthCheck()
-}
-
 // Parse incoming device messages to generate events
 def parse(String description) {
     log.debug "description is $description"
@@ -130,17 +121,16 @@ def ping() {
 }
 
 def refresh() {
-    // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
     zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh() + zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.colorTemperatureConfig()
 }
 
-def configureHealthCheck() {
+def configure() {
+    log.debug "Configuring Reporting and Bindings."
     // Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
     // enrolls with default periodic reporting until newer 5 min interval is confirmed
     sendEvent(name: "checkInterval", value: 3 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-}
 
-def configure() {
+    // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
     refresh()
 }
 

devicetypes/smartthings/zwave-switch-generic.src/.st-ignore

@@ -1,2 +0,0 @@
-.st-ignore
-README.md

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

@@ -1,39 +0,0 @@
-# Z-wave Switch
-
-
-
-Works with: 
-
-* [Leviton Appliance Module (DZPA1-1LW)](https://support.smartthings.com/hc/en-us/articles/205881176-Leviton-Appliance-Module-DZPA1-1LW-)
-* [GE Plug-In Outdoor Smart Switch (GE 12720) (Z-Wave)](https://support.smartthings.com/hc/en-us/articles/200903080-GE-Plug-In-Outdoor-Smart-Switch-GE-12720-Z-Wave-)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-
-## Capabilities
-
-* **Actuator** - represents that a Device has commands
-* **Health Check** - indicates ability to get device health notifications
-* **Switch** - can detect state (possible values: on/off)
-* **Polling** - represents that poll() can be implemented for the device
-* **Refresh** - _refresh()_ command for status updates
-* **Sensor** - detects sensor events
-
-## Device Health
-
-A Category C5 Leviton Appliance Module (DZPA1-1LW) and GE Plug-In Outdoor Smart Switch (GE 12720) (Z-Wave) polled by the hub.
-As of hubCore version 0.14.38 the hub sends up reports every 15 minutes regardless of whether the state changed.
-Device-Watch allows 2 check-in misses from device plus some lag time. So Check-in interval = (2*15 + 2)mins = 32 mins.
-Not to mention after going OFFLINE when the device is plugged back in, it might take a considerable amount of time for
-the device to appear as ONLINE again. This is because if this listening device does not respond to two poll requests in a row,
-it is not polled for 5 minutes by the hub. This can delay up the process of being marked ONLINE by quite some time.
-
-## Troubleshooting
-
-If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the device is out of range.
-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 Appliance Module (DZPA1-1LW) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/205881176-Leviton-Appliance-Module-DZPA1-1LW-)
-* [GE Plug-In Outdoor Smart Switch (GE 12720) (Z-Wave) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200903080-GE-Plug-In-Outdoor-Smart-Switch-GE-12720-Z-Wave-)

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

@@ -14,15 +14,12 @@
 metadata {
 	definition (name: "Z-Wave Switch Generic", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
-		capability "Health Check"
  		capability "Switch"
 		capability "Polling"
 		capability "Refresh"
 		capability "Sensor"
 
 		fingerprint inClusters: "0x25", deviceJoinName: "Z-Wave Switch"
-		fingerprint mfr:"001D", prod:"1A02", deviceJoinName: "Z-Wave Switch"
-		fingerprint mfr:"0063", prod:"4F50", deviceJoinName: "Z-Wave Switch"
 	}
 
 	// simulator metadata
@@ -53,11 +50,6 @@ metadata {
 	}
 }
 
-def updated(){
-// Device-Watch simply pings if no device events received for checkInterval duration of 32min = 2 * 15min + 2min lag time
-	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-}
-
 def parse(String description) {
 	def result = null
 	def cmd = zwave.parse(description, [0x20: 1, 0x70: 1])
@@ -134,13 +126,6 @@ def poll() {
 	])
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	refresh()
-}
-
 def refresh() {
 	delayBetween([
 		zwave.switchBinaryV1.switchBinaryGet().format(),

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

@@ -381,38 +381,28 @@ def updateDevices() {
 		selectors.add("${device.id}")
 		if (!childDevice) {
 			// log.info("Adding device ${device.id}: ${device.product}")
-			def data = [
-					label: device.label,
-					level: Math.round((device.brightness ?: 1) * 100),
-					switch: device.power,
-					colorTemperature: device.color.kelvin
-			]
 			if (device.product.capabilities.has_color) {
-				data["color"] = colorUtil.hslToHex((device.color.hue / 3.6) as int, (device.color.saturation * 100) as int)
+				childDevice = addChildDevice(app.namespace, "LIFX Color Bulb", device.id, null, ["label": device.label, "completedSetup": true])
-				data["hue"] = device.color.hue / 3.6
-				data["saturation"] = device.color.saturation * 100
-				childDevice = addChildDevice(app.namespace, "LIFX Color Bulb", device.id, null, data)
 			} else {
-				childDevice = addChildDevice(app.namespace, "LIFX White Bulb", device.id, null, data)
+				childDevice = addChildDevice(app.namespace, "LIFX White Bulb", device.id, null, ["label": device.label, "completedSetup": true])
 			}
-			childDevice?.completedSetup = true
-		} else {
-			if (device.product.capabilities.has_color) {
-				sendEvent(name: "color", value: colorUtil.hslToHex((device.color.hue / 3.6) as int, (device.color.saturation * 100) as int))
-				sendEvent(name: "hue", value: device.color.hue / 3.6)
-				sendEvent(name: "saturation", value: device.color.saturation * 100)
-			}
-			childDevice.sendEvent(name: "label", value: device.label)
-			childDevice.sendEvent(name: "level", value: Math.round((device.brightness ?: 1) * 100))
-			childDevice.sendEvent(name: "switch.setLevel", value: Math.round((device.brightness ?: 1) * 100))
-			childDevice.sendEvent(name: "switch", value: device.power)
-			childDevice.sendEvent(name: "colorTemperature", value: device.color.kelvin)
-			childDevice.sendEvent(name: "model", value: device.product.name)
 		}
 
+		if (device.product.capabilities.has_color) {
+			childDevice.sendEvent(name: "color", value: colorUtil.hslToHex((device.color.hue / 3.6) as int, (device.color.saturation * 100) as int))
+			childDevice.sendEvent(name: "hue", value: device.color.hue / 3.6)
+			childDevice.sendEvent(name: "saturation", value: device.color.saturation * 100)
+		}
+		childDevice.sendEvent(name: "label", value: device.label)
+		childDevice.sendEvent(name: "level", value: Math.round((device.brightness ?: 1) * 100))
+		childDevice.sendEvent(name: "switch.setLevel", value: Math.round((device.brightness ?: 1) * 100))
+		childDevice.sendEvent(name: "switch", value: device.power)
+		childDevice.sendEvent(name: "colorTemperature", value: device.color.kelvin)
+		childDevice.sendEvent(name: "model", value: device.product.name)
+
 		if (state.devices[device.id] == null) {
 			// State missing, add it and set it to opposite status as current status to provoke event below
-			state.devices[device.id] = [online : !device.connected]
+			state.devices[device.id] = [online: !device.connected]
 		}
 
 		if (!state.devices[device.id]?.online && device.connected) {