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

devicetypes/fuzzysb/dlink-dch-z510.src/dlink-dch-z510.groovy

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

devicetypes/smartthings/-.src/-.groovy

@@ -1,412 +0,0 @@
-/**
- *  Copyright 2015 SmartThings
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- *  SmartSense Virtual OpenClosed
- *
- *  Author: SmartThings
- *  Date: 2013-03-07
- */
-metadata {
-	definition (name: "가상열기닫기센서", namespace: "smartthings", author: "SmartThings") {
-		capability "Three Axis"
-		capability "Contact Sensor"
-		capability "Acceleration Sensor"
-		capability "Signal Strength"
-		capability "Temperature Measurement"
-		capability "Sensor"
-		capability "Battery"
-	}
-
-	simulator {
-		status "open": "zone report :: type: 19 value: 0031"
-		status "closed": "zone report :: type: 19 value: 0030"
-
-		status "acceleration": "acceleration: 1, rssi: 0, lqi: 0"
-		status "no acceleration": "acceleration: 0, rssi: 0, lqi: 0"
-
-		for (int i = 20; i <= 100; i += 10) {
-			status "${i}F": "contactState: 0, accelerationState: 0, temp: $i F, battery: 100, rssi: 100, lqi: 255"
-		}
-
-		// kinda hacky because it depends on how it is installed
-		status "x,y,z: 0,0,0": "x: 0, y: 0, z: 0, rssi: 100, lqi: 255"
-		status "x,y,z: 1000,0,0": "x: 1000, y: 0, z: 0, rssi: 100, lqi: 255"
-		status "x,y,z: 0,1000,0": "x: 0, y: 1000, z: 0, rssi: 100, lqi: 255"
-		status "x,y,z: 0,0,1000": "x: 0, y: 0, z: 1000, rssi: 100, lqi: 255"
-	}
-    
-	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"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
-	}    
-
-	tiles {
-		standardTile("contact", "device.contact", width: 2, height: 2) {
-			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
-			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
-		}
-		standardTile("acceleration", "device.acceleration") {
-			state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
-			state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff")
-		}
-		valueTile("temperature", "device.temperature") {
-			state("temperature", label:'${currentValue}°',
-				backgroundColors:[
-					[value: 31, color: "#153591"],
-					[value: 44, color: "#1e9cbb"],
-					[value: 59, color: "#90d2a7"],
-					[value: 74, color: "#44b621"],
-					[value: 84, color: "#f1d801"],
-					[value: 95, color: "#d04e00"],
-					[value: 96, color: "#bc2323"]
-				]
-			)
-		}
-		valueTile("3axis", "device.threeAxis", decoration: "flat", wordWrap: false) {
-			state("threeAxis", label:'${currentValue}', unit:"", backgroundColor:"#ffffff")
-		}
-		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false) {
-			state "battery", label:'${currentValue}% battery', unit:""/*, backgroundColors:[
-				[value: 5, color: "#BC2323"],
-				[value: 10, color: "#D04E00"],
-				[value: 15, color: "#F1D801"],
-				[value: 16, color: "#FFFFFF"]
-			]*/
-		}
-		/*
-		valueTile("lqi", "device.lqi", decoration: "flat", inactiveLabel: false) {
-			state "lqi", label:'${currentValue}% signal', unit:""
-		}
-		*/
-		
-		main(["contact", "acceleration", "temperature"])
-		details(["contact", "acceleration", "temperature", "3axis", "battery"/*, "lqi"*/])
-	}
-}
-
-def parse(String description) {
-	def results
-
-	if (!isSupportedDescription(description) || zigbee.isZoneType19(description)) {
-		// Ignore this in favor of orientation-based state
-		// results = parseSingleMessage(description)
-	}
-	else {
-		results = parseMultiSensorMessage(description)
-	}
-	log.debug "Parse returned $results.descriptionText"
-	return results
-
-}
-
-private List parseMultiSensorMessage(description) {
-	def results = []
-	if (isAccelerationMessage(description)) {
-		results = parseAccelerationMessage(description)
-	}
-	else if (isContactMessage(description)) {
-		results = parseContactMessage(description)
-	}
-	else if (isRssiLqiMessage(description)) {
-		results = parseRssiLqiMessage(description)
-	}
-	else if (isOrientationMessage(description)) {
-		results = parseOrientationMessage(description)
-	}
-
-	results
-}
-
-private List parseAccelerationMessage(String description) {
-	def results = []
-	def parts = description.split(',')
-	parts.each { part ->
-		part = part.trim()
-		if (part.startsWith('acceleration:')) {
-			results << getAccelerationResult(part, description)
-		}
-		/*
-		// TEMPORARILY THROW RSSI & LQI ON THE FLOOR TO SAVE PROCESSING
-		else if (part.startsWith('rssi:')) {
-			results << getRssiResult(part, description)
-		}
-		else if (part.startsWith('lqi:')) {
-			results << getLqiResult(part, description)
-		}
-		*/
-	}
-
-	results
-}
-
-private List parseContactMessage(String description) {
-	def results = []
-	def parts = description.split(',')
-	parts.each { part ->
-		part = part.trim()
-		if (part.startsWith('accelerationState:')) {
-			results << getAccelerationResult(part, description)
-		}
-		else if (part.startsWith('temp:')) {
-			results << getTempResult(part, description)
-		}
-		else if (part.startsWith('battery:')) {
-			results << getBatteryResult(part, description)
-		}
-		/*
-		// TEMPORARILY THROW RSSI & LQI ON THE FLOOR TO SAVE PROCESSING
-		else if (part.startsWith('rssi:')) {
-			results << getRssiResult(part, description)
-		}
-		else if (part.startsWith('lqi:')) {
-			results << getLqiResult(part, description)
-		}
-		*/
-	}
-
-	results
-}
-
-private List parseOrientationMessage(String description) {
-	def results = []
-	def xyzResults = [x: 0, y: 0, z: 0]
-	def parts = description.split(',')
-	parts.each { part ->
-		part = part.trim()
-		if (part.startsWith('x:')) {
-			def unsignedX = part.split(":")[1].trim().toInteger()
-			def signedX = unsignedX > 32767 ? unsignedX - 65536 : unsignedX
-			xyzResults.x = signedX
-		}
-		else if (part.startsWith('y:')) {
-			def unsignedY = part.split(":")[1].trim().toInteger()
-			def signedY = unsignedY > 32767 ? unsignedY - 65536 : unsignedY
-			xyzResults.y = signedY
-		}
-		else if (part.startsWith('z:')) {
-			def unsignedZ = part.split(":")[1].trim().toInteger()
-			def signedZ = unsignedZ > 32767 ? unsignedZ - 65536 : unsignedZ
-			xyzResults.z = signedZ
-		}
-		/*
-		// TEMPORARILY THROW RSSI & LQI ON THE FLOOR TO SAVE PROCESSING
-		else if (part.startsWith('rssi:')) {
-			results << getRssiResult(part, description)
-		}
-		else if (part.startsWith('lqi:')) {
-			results << getLqiResult(part, description)
-		}
-		*/
-	}
-
-	def xyz = getXyzResult(xyzResults, description)
-	results << xyz
-
-	// Looks for Z-axis orientation as virtual contact state
-	def a = xyz.value.split(',').collect{it.toInteger()}
-	def absValueXY = Math.max(Math.abs(a[0]), Math.abs(a[1]))
-	def absValueZ = Math.abs(a[2])
-	log.debug "absValueXY: $absValueXY, absValueZ: $absValueZ"
-
-
-	if (absValueZ > 825 && absValueXY < 175) {
-		results << createEvent(name: "contact", value: "open", unit: "")
-		results << createEvent(name: "status", value: "open", unit: "")
-		log.debug "STATUS: open"
-	}
-	else if (absValueZ < 75 && absValueXY > 825) {
-		results << createEvent(name: "contact", value: "closed", unit: "")
-		results << createEvent(name: "status", value: "closed", unit: "")
-		log.debug "STATUS: closed"
-	}
-
-	results
-}
-
-private List parseRssiLqiMessage(String description) {
-	def results = []
-	// "lastHopRssi: 91, lastHopLqi: 255, rssi: 91, lqi: 255"
-	def parts = description.split(',')
-	parts.each { part ->
-		part = part.trim()
-		if (part.startsWith('lastHopRssi:')) {
-			results << getRssiResult(part, description, true)
-		}
-		else if (part.startsWith('lastHopLqi:')) {
-			results << getLqiResult(part, description, true)
-		}
-		else if (part.startsWith('rssi:')) {
-			results << getRssiResult(part, description)
-		}
-		else if (part.startsWith('lqi:')) {
-			results << getLqiResult(part, description)
-		}
-	}
-
-	results
-}
-
-private getAccelerationResult(part, description) {
-	def name = "acceleration"
-	def value = part.endsWith("1") ? "active" : "inactive"
-	def linkText = getLinkText(device)
-	def descriptionText = "$linkText ${name} was $value"
-	def isStateChange = isStateChange(device, name, value)
-
-	[
-		name: name,
-		value: value,
-		unit: null,
-		linkText: linkText,
-		descriptionText: descriptionText,
-		handlerName: value,
-		isStateChange: isStateChange,
-		displayed: displayed(description, isStateChange)
-	]
-}
-
-private getTempResult(part, description) {
-	def name = "temperature"
-	def temperatureScale = getTemperatureScale()
-	def value = zigbee.parseSmartThingsTemperatureValue(part, "temp: ", temperatureScale)
-	if (tempOffset) {
-		def offset = tempOffset as int
-		def v = value as int
-		value = v + offset
-	}
-	def linkText = getLinkText(device)
-	def descriptionText = "$linkText was $value°$temperatureScale"
-	def isStateChange = isTemperatureStateChange(device, name, value.toString())
-
-	[
-		name: name,
-		value: value,
-		unit: temperatureScale,
-		linkText: linkText,
-		descriptionText: descriptionText,
-		handlerName: name,
-		isStateChange: isStateChange,
-		displayed: displayed(description, isStateChange)
-	]
-}
-
-private getXyzResult(results, description) {
-	def name = "threeAxis"
-	def value = "${results.x},${results.y},${results.z}"
-	def linkText = getLinkText(device)
-	def descriptionText = "$linkText ${name} 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 getBatteryResult(part, description) {
-	def batteryDivisor = description.split(",").find {it.split(":")[0].trim() == "batteryDivisor"} ? description.split(",").find {it.split(":")[0].trim() == "batteryDivisor"}.split(":")[1].trim() : null
-	def name = "battery"
-	def value = zigbee.parseSmartThingsBatteryValue(part, batteryDivisor)
-	def unit = "%"
-	def linkText = getLinkText(device)
-	def descriptionText = "$linkText ${name} was ${value}${unit}"
-	def isStateChange = isStateChange(device, name, value)
-
-	[
-		name: name,
-		value: value,
-		unit: unit,
-		linkText: linkText,
-		descriptionText: descriptionText,
-		handlerName: name,
-		isStateChange: isStateChange,
-		displayed: false
-	]
-}
-
-private getRssiResult(part, description, lastHop=false) {
-	def name = lastHop ? "lastHopRssi" : "rssi"
-	def valueString = part.split(":")[1].trim()
-	def value = (Integer.parseInt(valueString) - 128).toString()
-	def linkText = getLinkText(device)
-	def descriptionText = "$linkText ${name} was $value dBm"
-
-	def isStateChange = isStateChange(device, name, value)
-
-	[
-		name: name,
-		value: value,
-		unit: "dBm",
-		linkText: linkText,
-		descriptionText: descriptionText,
-		handlerName: null,
-		isStateChange: isStateChange,
-		displayed: false
-	]
-}
-
-/**
- * Use LQI (Link Quality Indicator) as a measure of signal strength. The values
- * are 0 to 255 (0x00 to 0xFF) and higher values represent higher signal
- * strength. Return as a percentage of 255.
- *
- * Note: To make the signal strength indicator more accurate, we could combine
- * LQI with RSSI.
- */
-private getLqiResult(part, description, lastHop=false) {
-	def name = lastHop ? "lastHopLqi" : "lqi"
-	def valueString = part.split(":")[1].trim()
-	def percentageOf = 255
-	def value = Math.round((Integer.parseInt(valueString) / percentageOf * 100)).toString()
-	def unit = "%"
-	def linkText = getLinkText(device)
-	def descriptionText = "$linkText ${name} was: ${value}${unit}"
-
-	def isStateChange = isStateChange(device, name, value)
-
-	[
-		name: name,
-		value: value,
-		unit: unit,
-		linkText: linkText,
-		descriptionText: descriptionText,
-		handlerName: null,
-		isStateChange: isStateChange,
-		displayed: false
-	]
-}
-
-private Boolean isAccelerationMessage(String description) {
-	// "acceleration: 1, rssi: 91, lqi: 255"
-	description ==~ /acceleration:.*rssi:.*lqi:.*/
-}
-
-private Boolean isContactMessage(String description) {
-	// "contactState: 1, accelerationState: 0, temp: 14.4 C, battery: 28, rssi: 59, lqi: 255"
-	description ==~ /contactState:.*accelerationState:.*temp:.*battery:.*rssi:.*lqi:.*/
-}
-
-private Boolean isRssiLqiMessage(String description) {
-	// "lastHopRssi: 91, lastHopLqi: 255, rssi: 91, lqi: 255"
-	description ==~ /lastHopRssi:.*lastHopLqi:.*rssi:.*lqi:.*/
-}
-
-private Boolean isOrientationMessage(String description) {
-	// "x: 0, y: 33, z: 1017, rssi: 102, lqi: 255"
-	description ==~ /x:.*y:.*z:.*rssi:.*lqi:.*/
-}

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

@@ -1,7 +1,7 @@
 /**
  *  Cree Bulb
  *
- *  Copyright 2016 SmartThings
+ *  Copyright 2014 SmartThings
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  *  in compliance with the License. You may obtain a copy of the License at:
@@ -15,29 +15,29 @@
  */
  
 metadata {
-    definition (name: "Cree Bulb", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "Cree Bulb", namespace: "smartthings", author: "SmartThings") {
 
-        capability "Actuator"
+		capability "Actuator"
         capability "Configuration"
-        capability "Refresh"
+		capability "Refresh"
-        capability "Switch"
+		capability "Switch"
-        capability "Switch Level"
+		capability "Switch Level"
 
-        fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019"
+		fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019"
-    }
+	}
 
-    // simulator metadata
+	// simulator metadata
-    simulator {
+	simulator {
-        // status messages
+		// status messages
-        status "on": "on/off: 1"
+		status "on": "on/off: 1"
-        status "off": "on/off: 0"
+		status "off": "on/off: 0"
 
-        // reply messages
+		// reply messages
-        reply "zcl on-off on": "on/off: 1"
+		reply "zcl on-off on": "on/off: 1"
-        reply "zcl on-off off": "on/off: 0"
+		reply "zcl on-off off": "on/off: 0"
-    }
+	}
 
-    // UI tile definitions
+	// UI tile definitions
     tiles(scale: 2) {
         multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
             tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
@@ -62,12 +62,18 @@ metadata {
 def parse(String description) {
     log.debug "description is $description"
 
-    def resultMap = zigbee.getEvent(description)
+    def resultMap = zigbee.getKnownDescription(description)
     if (resultMap) {
-        sendEvent(resultMap)
+        log.info resultMap
+        if (resultMap.type == "update") {
+            log.info "$device updates: ${resultMap.value}"
+        }
+        else {
+            sendEvent(name: resultMap.type, value: resultMap.value)
+        }
     }
     else {
-        log.debug "DID NOT PARSE MESSAGE for description : $description"
+        log.warn "DID NOT PARSE MESSAGE for description : $description"
         log.debug zigbee.parseDescriptionAsMap(description)
     }
 }
@@ -81,7 +87,7 @@ def on() {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value) + ["delay 500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value)
 }
 
 def refresh() {

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

@@ -1,3 +1,4 @@
+
 /**
  *  Hue Bulb
  *
@@ -10,14 +11,13 @@ metadata {
 		capability "Switch Level"
 		capability "Actuator"
 		capability "Color Control"
-		capability "Color Temperature"
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
 
 		command "setAdjustedColor"
-        command "reset"
+		command "reset"
-        command "refresh"
+		command "refresh"
 	}
 
 	simulator {
@@ -25,7 +25,7 @@ metadata {
 	}
 
 	tiles (scale: 2){
-		multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
+		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
 				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
@@ -33,58 +33,23 @@ metadata {
 				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
-				attributeState "level", action:"switch level.setLevel", range:"(0..100)"
+				attributeState "level", action:"switch level.setLevel"
-            }
-            tileAttribute ("device.level", key: "SECONDARY_CONTROL") {
-	            attributeState "level", label: 'Level ${currentValue}%'
 			}
 			tileAttribute ("device.color", key: "COLOR_CONTROL") {
 				attributeState "color", action:"setAdjustedColor"
 			}
 		}
 
-		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
+		standardTile("reset", "device.reset", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-			state "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-			state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-			state "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-		}
-
-        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..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("reset", "device.reset", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
 			state "default", label:"Reset Color", action:"reset", icon:"st.lights.philips.hue-single"
 		}
-		standardTile("refresh", "device.switch", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
+		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
 			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
-		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}%'
-		}
-		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"
-		}
-		valueTile("hue", "device.hue", inactiveLabel: false, decoration: "flat") {
-			state "hue", label: 'Hue ${currentValue}   '
-		}
-
-		main(["switch"])
-		details(["rich-control", "colorTempSliderControl", "colorTemp", "reset", "refresh"])
 	}
+
+	main(["switch"])
+	details(["switch", "levelSliderControl", "rgbSelector", "refresh", "reset"])
 }
 
 // parse events into attributes
@@ -154,27 +119,19 @@ void setColor(value) {
 
 void reset() {
 	log.debug "Executing 'reset'"
-    def value = [level:100, hex:"#90C638", saturation:56, hue:23]
+	def value = [level:100, hex:"#90C638", saturation:56, hue:23]
-    setAdjustedColor(value)
+	setAdjustedColor(value)
 	parent.poll()
 }
 
 void setAdjustedColor(value) {
 	if (value) {
-        log.trace "setAdjustedColor: ${value}"
+		log.trace "setAdjustedColor: ${value}"
-        def adjusted = value + [:]
+		def adjusted = value + [:]
-        adjusted.hue = adjustOutgoingHue(value.hue)
+		adjusted.hue = adjustOutgoingHue(value.hue)
-        // Needed because color picker always sends 100
+		// Needed because color picker always sends 100
-        adjusted.level = null
+		adjusted.level = null
-        setColor(adjusted)
+		setColor(adjusted)
-    }
-}
-
-void setColorTemperature(value) {
-	if (value) {
-        log.trace "setColorTemperature: ${value}k"
-        parent.setColorTemperature(this, value)
-        sendEvent(name: "colorTemperature", value: value)
 	}
 }
 

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

@@ -9,59 +9,51 @@ metadata {
 	definition (name: "Hue Lux Bulb", namespace: "smartthings", author: "SmartThings") {
 		capability "Switch Level"
 		capability "Actuator"
-		capability "Color Temperature"
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
 
-        command "refresh"
+		command "refresh"
 	}
 
 	simulator {
 		// TODO: define status and reply messages here
 	}
 
-    tiles(scale: 2) {
+	tiles(scale: 2) {
-        multiAttributeTile(name:"rich-control", type: "lighting", canChangeIcon: true){
+		multiAttributeTile(name:"rich-control", type: "lighting", canChangeIcon: true){
-            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
+			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-              attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+				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 "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 "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"
+				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-            }
-            tileAttribute ("device.level", key: "SLIDER_CONTROL") {
-              attributeState "level", action:"switch level.setLevel", range:"(0..100)"
-            }
-            tileAttribute ("device.level", key: "SECONDARY_CONTROL") {
-	            attributeState "level", label: 'Level ${currentValue}%'
 			}
-        }
+			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
+				attributeState "level", action:"switch level.setLevel", range:"(0..100)"
+			}
+			tileAttribute ("device.level", key: "SECONDARY_CONTROL") {
+				attributeState "level", label: 'Level ${currentValue}%'
+			}
+		}
 
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 			state "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 			state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 			state "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-        }
+		}
 
-        controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {
+		controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {
-            state "level", action:"switch level.setLevel"
+			state "level", action:"switch level.setLevel"
-        }
+		}
 
-        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
+		standardTile("refresh", "device.switch", inactiveLabel: false, height: 2, width: 2, decoration: "flat") {
-            state "colorTemperature", action:"color temperature.setColorTemperature"
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-        }
+		}
-        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorTemperature", label: '${currentValue} K'
-        }
 
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
+		main(["switch"])
-            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+		details(["rich-control", "refresh"])
-        }
+	}
-
-        main(["switch"])
-        details(["rich-control", "colorTempSliderControl", "colorTemp", "refresh"])
-    }
 }
 
 // parse events into attributes
@@ -98,14 +90,6 @@ void setLevel(percent) {
 	sendEvent(name: "level", value: percent)
 }
 
-void setColorTemperature(value) {
-	if (value) {
-        log.trace "setColorTemperature: ${value}k"
-        parent.setColorTemperature(this, value)
-        sendEvent(name: "colorTemperature", value: value)
-	}
-}
-
 void refresh() {
 	log.debug "Executing 'refresh'"
 	parent.manualRefresh()

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

@@ -15,7 +15,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
-
+ 
 definition(
 	name: "Hue (Connect)",
 	namespace: "smartthings",
@@ -24,7 +24,7 @@ definition(
 	category: "SmartThings Labs",
 	iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/hue.png",
 	iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/hue@2x.png",
-        //singleInstance: true
+    singleInstance: true
 )
 
 preferences {
@@ -58,7 +58,7 @@ def bridgeDiscovery(params=[:])
     	state.bridges = [:]
         state.bridgeRefreshCount = 0
         app.updateSetting("selectedHue", "")
-    }
+    }    
 
 	subscribe(location, null, locationHandler, [filterEvents:false])
 
@@ -130,8 +130,8 @@ def bulbDiscovery() {
 	def bulboptions = bulbsDiscovered() ?: [:]
 	def numFound = bulboptions.size() ?: 0
     if (numFound == 0)
-    	app.updateSetting("selectedBulbs", "")
+    	app.updateSetting("selectedBulbs", "") 
-
+        
 	if((bulbRefreshCount % 5) == 0) {
 		discoverHueBulbs()
 	}
@@ -140,7 +140,7 @@ def bulbDiscovery() {
 		section("Please wait while we discover your Hue Bulbs. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
 			input "selectedBulbs", "enum", required:false, title:"Select Hue Bulbs (${numFound} found)", multiple:true, options:bulboptions
 		}
-		section {
+		section {				
 			def title = getBridgeIP() ? "Hue bridge (${getBridgeIP()})" : "Find bridges"
 			href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
 
@@ -246,13 +246,13 @@ def installed() {
 
 def updated() {
 	log.trace "Updated with settings: ${settings}"
-	unsubscribe()
+	unsubscribe() 
-    unschedule()
+    unschedule()    
 	initialize()
 }
 
 def initialize() {
-	log.debug "Initializing"
+	log.debug "Initializing"  
     unsubscribe(bridge)
     state.inBulbDiscovery = false
     state.bridgeRefreshCount = 0
@@ -281,18 +281,18 @@ def uninstalled(){
 def bulbListHandler(hub, data = "") {
 	def msg = "Bulbs list not processed. Only while in settings menu."
     def bulbs = [:]
-	if (state.inBulbDiscovery) {
+	if (state.inBulbDiscovery) {       
         def logg = ""
         log.trace "Adding bulbs to state..."
         state.bridgeProcessedLightList = true
-        def object = new groovy.json.JsonSlurper().parseText(data)
+        def object = new groovy.json.JsonSlurper().parseText(data)   
         object.each { k,v ->
-            if (v instanceof Map)
+            if (v instanceof Map) 
                 bulbs[k] = [id: k, name: v.name, type: v.type, hub:hub]
         }
-    }
+    }  
     def bridge = null
-	if (selectedHue)
+	if (selectedHue) 
         bridge = getChildDevice(selectedHue)
     bridge.sendEvent(name: "bulbList", value: hub, data: bulbs, isStateChange: true, displayed: false)
     msg = "${bulbs.size()} bulbs found. ${bulbs}"
@@ -318,7 +318,7 @@ def addBulbs() {
                 } else {
                 	log.debug "$dni in not longer paired to the Hue Bridge or ID changed"
                 }
-			} else {
+			} else { 
             	//backwards compatable
 				newHueBulb = bulbs.find { (app.id + "/" + it.id) == dni }
 				d = addChildDevice("smartthings", "Hue Bulb", dni, newHueBulb?.hub, ["label":newHueBulb?.name])
@@ -344,7 +344,7 @@ def addBridge() {
 		def d = getChildDevice(selectedHue)
 		if(!d) {
      		// compatibility with old devices
-            def newbridge = true
+            def newbridge = true 
             childDevices.each {
             	if (it.getDeviceDataByName("mac")) {
                     def newDNI = "${it.getDeviceDataByName("mac")}"
@@ -354,10 +354,10 @@ def addBridge() {
                         it.setDeviceNetworkId("${newDNI}")
                         if (oldDNI == selectedHue)
                         	app.updateSetting("selectedHue", newDNI)
-                        newbridge = false
+                        newbridge = false 
                     }
-                }
+                }    
-            }
+            }  
         	if (newbridge) {
 				d = addChildDevice("smartthings", "Hue Bridge", selectedHue, vbridge.value.hub)
  				log.debug "created ${d.displayName} with id ${d.deviceNetworkId}"
@@ -368,13 +368,13 @@ def addBridge() {
                     	childDevice.sendEvent(name: "networkAddress", value: vbridge.value.ip + ":" +  vbridge.value.port)
                         childDevice.updateDataValue("networkAddress", vbridge.value.ip + ":" +  vbridge.value.port)
                     } else {
-                    	childDevice.sendEvent(name: "networkAddress", value: convertHexToIP(vbridge.value.ip) + ":" +  convertHexToInt(vbridge.value.port))
+                    	childDevice.sendEvent(name: "networkAddress", value: convertHexToIP(vbridge.value.ip) + ":" +  convertHexToInt(vbridge.value.port))	
                         childDevice.updateDataValue("networkAddress", convertHexToIP(vbridge.value.ip) + ":" +  convertHexToInt(vbridge.value.port))
-                    }
+                    }    
 				} else {
 					childDevice.sendEvent(name: "networkAddress", value: convertHexToIP(vbridge.value.networkAddress) + ":" +  convertHexToInt(vbridge.value.deviceAddress))
                     childDevice.updateDataValue("networkAddress", convertHexToIP(vbridge.value.networkAddress) + ":" +  convertHexToInt(vbridge.value.deviceAddress))
-                }
+                }    
 			}
 		} else {
 			log.debug "found ${d.displayName} with id $selectedHue already exists"
@@ -436,7 +436,7 @@ def locationHandler(evt) {
                     dstate.name = "Philips hue ($ip)"
                     d.sendEvent(name:"networkAddress", value: host)
                     d.updateDataValue("networkAddress", host)
-            	}
+            	} 
             }
 		}
 	}
@@ -504,11 +504,11 @@ def isValidSource(macAddress) {
 /////////////////////////////////////
 
 def parse(childDevice, description) {
-	def parsedEvent = parseLanMessage(description)
+	def parsedEvent = parseLanMessage(description) 
 	if (parsedEvent.headers && parsedEvent.body) {
 		def headerString = parsedEvent.headers.toString()
         def bodyString = parsedEvent.body.toString()
-		if (headerString?.contains("json")) {
+		if (headerString?.contains("json")) { 
         	def body
         	try {
             	body = new groovy.json.JsonSlurper().parseText(bodyString)
@@ -516,11 +516,11 @@ def parse(childDevice, description) {
             	log.warn "Parsing Body failed - trying again..."
                 poll()
             }
-            if (body instanceof java.util.HashMap) {
+            if (body instanceof java.util.HashMap) { 
             	//poll response
                 def bulbs = getChildDevices()
                 for (bulb in body) {
-                    def d = bulbs.find{it.deviceNetworkId == "${app.id}/${bulb.key}"}
+                    def d = bulbs.find{it.deviceNetworkId == "${app.id}/${bulb.key}"}    
                     if (d) {
                         if (bulb.value.state?.reachable) {
                             sendEvent(d.deviceNetworkId, [name: "switch", value: bulb.value?.state?.on ? "on" : "off"])
@@ -535,18 +535,18 @@ def parse(childDevice, description) {
                             }
                         } else {
                             sendEvent(d.deviceNetworkId, [name: "switch", value: "off"])
-                            sendEvent(d.deviceNetworkId, [name: "level", value: 100])
+                            sendEvent(d.deviceNetworkId, [name: "level", value: 100])                     
                             if (bulb.value.state.sat) {
                                 def hue = 23
                                 def sat = 56
                                 def hex = colorUtil.hslToHex(23, 56)
                                 sendEvent(d.deviceNetworkId, [name: "color", value: hex])
                                 sendEvent(d.deviceNetworkId, [name: "hue", value: hue])
-                                sendEvent(d.deviceNetworkId, [name: "saturation", value: sat])
+                                sendEvent(d.deviceNetworkId, [name: "saturation", value: sat])                               
-                            }
+                            }    
                         }
                     }
-                }
+                }     
             }
             else
             { //put response
@@ -595,7 +595,7 @@ def parse(childDevice, description) {
                 }
 
             }
-    	}
+    	}        
 	} else {
 		log.debug "parse - got something other than headers,body..."
 		return []
@@ -616,7 +616,7 @@ def off(childDevice) {
 
 def setLevel(childDevice, percent) {
 	log.debug "Executing 'setLevel'"
-    def level
+    def level 
     if (percent == 1) level = 1 else level = Math.min(Math.round(percent * 255 / 100), 255)
 	put("lights/${getId(childDevice)}/state", [bri: level, on: percent > 0])
 }
@@ -633,14 +633,6 @@ def setHue(childDevice, percent) {
 	put("lights/${getId(childDevice)}/state", [hue: level])
 }
 
-def setColorTemperature(childDevice, huesettings) {
-	log.debug "Executing 'setColorTemperature($huesettings)'"
-	def ct = Math.round(Math.abs((huesettings / 12.96829971181556) - 654))
-	def value = [ct: ct, on: true]
-	log.trace "sending command $value"
-	put("lights/${getId(childDevice)}/state", value)
-}
-
 def setColor(childDevice, huesettings) {
 	log.debug "Executing 'setColor($huesettings)'"
 	def hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535)
@@ -697,7 +689,7 @@ HOST: ${host}
 }
 
 private put(path, body) {
-	def host = getBridgeIP()
+	def host = getBridgeIP()	
 	def uri = "/api/${state.username}/$path"
 	def bodyJSON = new groovy.json.JsonBuilder(body).toString()
 	def length = bodyJSON.getBytes().size().toString()
@@ -723,11 +715,11 @@ private getBridgeIP() {
             	host =  d.getDeviceDataByName("networkAddress")
             else
         		host = d.latestState('networkAddress').stringValue
-        }
+        }    
         if (host == null || host == "") {
             def serialNumber = selectedHue
             def bridge = getHueBridges().find { it?.value?.serialNumber?.equalsIgnoreCase(serialNumber) }?.value
-            if (!bridge) {
+            if (!bridge) { 
             	bridge = getHueBridges().find { it?.value?.mac?.equalsIgnoreCase(serialNumber) }?.value
             }
             if (bridge?.ip && bridge?.port) {
@@ -737,9 +729,9 @@ private getBridgeIP() {
                 	host = "${convertHexToIP(bridge?.ip)}:${convertHexToInt(bridge?.port)}"
             } else if (bridge?.networkAddress && bridge?.deviceAddress)
             	host = "${convertHexToIP(bridge?.networkAddress)}:${convertHexToInt(bridge?.deviceAddress)}"
-        }
+        }    
         log.trace "Bridge: $selectedHue - Host: $host"
-    }
+    }    
     return host
 }