MSA-1925: The DH is developed by SmartThings and the only changes are made within Tiles and UI.

devicetypes/sensative/sensative-zb-strips.src/sensative-zb-strips.groovy

@@ -0,0 +1,182 @@
+/**
+ *  SmartSense Open/Closed Sensor
+ *
+ *  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:
+ *
+ *      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.
+ *
+ */
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
+
+metadata {
+	definition(name: "Sensative ZB Strips", namespace: "sensative", author: "SmartThings") {
+		capability "Battery"
+		capability "Configuration"
+		capability "Contact Sensor"
+		capability "Refresh"
+		capability "Temperature Measurement"
+		capability "Health Check"
+		capability "Sensor"
+
+		command "enrollResponse"
+
+
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "Sensative", model: "Strips-001"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "Sensative", model: "Strips-001"
+		fingerprint inClusters: "0000,0001,0003,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "Sensativee", model: "Strips-001", deviceJoinName: "Sensative ZB Strips"
+        
+	}
+
+	simulator {
+
+	}
+
+	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(scale: 2) {
+		multiAttributeTile(name: "contact", type: "generic", width: 6, height: 4) {
+			tileAttribute("device.contact", key: "PRIMARY_CONTROL") {
+				attributeState "open", label: '${name}', icon: "st.contact.contact.open", backgroundColor: "#e86d13"
+				attributeState "closed", label: '${name}', icon: "st.contact.contact.closed", backgroundColor: "#00A0DC"
+			}
+		}
+
+		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
+			state "temperature", label: '${currentValue}°F',
+					backgroundColors: [
+							[value: 31, color: "#153591"],
+							[value: 44, color: "#1e9cbb"],
+							[value: 59, color: "#90d2a7"],
+							[value: 74, color: "#44b621"],
+							[value: 84, color: "#f1d801"],
+							[value: 95, color: "#d04e00"],
+							[value: 96, color: "#bc2323"]
+					]
+		}
+		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
+			state "battery", label: 'Battery\n${currentValue}%', unit: ""
+		}
+
+		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+			state "default", action: "refresh.refresh", icon: "st.secondary.refresh"
+		}
+
+		main(["contact"])
+		details(["contact", "battery", "temperature", "refresh"])
+	}
+}
+
+def parse(String description) {
+	log.debug "description: $description"
+
+	Map map = zigbee.getEvent(description)
+	if (!map) {
+		if (description?.startsWith('zone status')) {
+			map = parseIasMessage(description)
+		} else {
+			Map descMap = zigbee.parseDescriptionAsMap(description)
+			if (descMap?.clusterInt == 0x0001 && descMap.commandInt != 0x07 && descMap?.value) {
+				map = getBatteryResult(Integer.parseInt(descMap.value, 16))
+			} else if (descMap?.clusterInt == zigbee.TEMPERATURE_MEASUREMENT_CLUSTER && descMap.commandInt == 0x07) {
+				if (descMap.data[0] == "00") {
+					log.debug "TEMP REPORTING CONFIG RESPONSE: $descMap"
+					sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+				} else {
+					log.warn "TEMP REPORTING CONFIG FAILED- error code: ${descMap.data[0]}"
+				}
+			}
+		}
+	} else if (map.name == "temperature") {
+		if (tempOffset) {
+			map.value = (int) map.value + (int) tempOffset
+		}
+		map.descriptionText = temperatureScale == 'C' ? '{{ device.displayName }} was {{ value }}°C' : '{{ device.displayName }} was {{ value }}°F'
+		map.translatable = true
+	}
+
+	log.debug "Parse returned $map"
+	def result = map ? createEvent(map) : [:]
+
+	if (description?.startsWith('enroll request')) {
+		List cmds = zigbee.enrollResponse()
+		log.debug "enroll response: ${cmds}"
+		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
+	}
+	return result
+}
+
+
+private Map parseIasMessage(String description) {
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
+	return zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
+}
+
+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.value = Math.min(100, roundedPct)
+		result.descriptionText = "${linkText} battery was ${result.value}%"
+		result.name = 'battery'
+	}
+
+	return result
+}
+
+private Map getContactResult(value) {
+	log.debug 'Contact Status'
+	def linkText = getLinkText(device)
+	def descriptionText = "${linkText} was ${value == 'open' ? 'opened' : 'closed'}"
+	return [
+			name           : 'contact',
+			value          : value,
+			descriptionText: descriptionText
+	]
+}
+
+/**
+ * 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 Temperature and Battery"
+	def refreshCmds = zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000) +
+			zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020)
+
+	return refreshCmds + zigbee.enrollResponse()
+}
+
+def configure() {
+	// Device-Watch allows 2 check-in misses from device + ping (plus 1 min lag time)
+	// enrolls with default periodic reporting until newer 5 min interval is confirmed
+	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+
+	log.debug "Configuring Reporting, IAS CIE, and Bindings."
+
+	// 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/aeon-multisensor-6.src/aeon-multisensor-6.groovy

@@ -103,7 +103,7 @@ metadata {
 		}
 
 		valueTile("illuminance", "device.illuminance", inactiveLabel: false, width: 2, height: 2) {
-			state "illuminance", label:'${currentValue} lux', unit:""
+			state "illuminance", label:'${currentValue} ${unit}', unit:"lux"
 		}
 
 		valueTile("ultravioletIndex", "device.ultravioletIndex", inactiveLabel: false, width: 2, height: 2) {
@@ -410,4 +410,4 @@ private command(physicalgraph.zwave.Command cmd) {
 private commands(commands, delay=200) {
 	log.info "sending commands: ${commands}"
 	delayBetween(commands.collect{ command(it) }, delay)
-}
+}

devicetypes/smartthings/aeon-multisensor-gen5.src/aeon-multisensor-gen5.groovy

@@ -86,7 +86,7 @@ metadata {
 			state "humidity", label:'${currentValue}% humidity', unit:""
 		}
 		valueTile("illuminance", "device.illuminance", inactiveLabel: false, width: 2, height: 2) {
-			state "luminosity", label:'${currentValue} lux', unit:""
+			state "luminosity", label:'${currentValue} ${unit}', unit:"lux"
 		}
 		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
 			state "battery", label:'${currentValue}% battery', unit:""
@@ -282,4 +282,5 @@ private secure(physicalgraph.zwave.Command cmd) {
 
 private secureSequence(commands, delay=200) {
 	delayBetween(commands.collect{ secure(it) }, delay)
-}
+}
+

devicetypes/smartthings/aeon-multisensor.src/aeon-multisensor.groovy

@@ -79,7 +79,7 @@ metadata {
 			state "humidity", label:'${currentValue}% humidity', unit:""
 		}
 		valueTile("illuminance", "device.illuminance", inactiveLabel: false, width: 2, height: 2) {
-			state "luminosity", label:'${currentValue} lux', unit:""
+			state "luminosity", label:'${currentValue} ${unit}', unit:"lux"
 		}
 		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
 			state "battery", label:'${currentValue}% battery', unit:""
@@ -193,4 +193,4 @@ def configure() {
 		// set data reporting period to 5 minutes
 		zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: 300).format()
 	])
-}
+}

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017 SmartThings
+ *  Copyright 2016 SmartThings
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  *  in compliance with the License. You may obtain a copy of the License at:
@@ -64,7 +64,6 @@ private getATTRIBUTE_HUE() { 0x0000 }
 private getATTRIBUTE_SATURATION() { 0x0001 }
 private getHUE_COMMAND() { 0x00 }
 private getSATURATION_COMMAND() { 0x03 }
-private getMOVE_TO_HUE_AND_SATURATION_COMMAND() { 0x06 }
 private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
 
 // Parse incoming device messages to generate events
@@ -85,11 +84,11 @@ def parse(String description) {
 
 		if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
 			if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
-				def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
+				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) / 0xfe * 100)
+				def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
 				sendEvent(name: "saturation", value: saturationValue, descriptionText: "Color has changed", displayed: false)
 			}
 		}
@@ -124,12 +123,7 @@ def ping() {
 }
 
 def refresh() {
-	zigbee.onOffRefresh() +
-	zigbee.levelRefresh() +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) +
-	zigbee.onOffConfig(0, 300) +
-	zigbee.levelConfig()
+	zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) + zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, DataType.UINT8, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, DataType.UINT8, 1, 3600, 0x01)
 }
 
 def configure() {
@@ -139,38 +133,26 @@ def configure() {
 	sendEvent(name: "checkInterval", value: 3 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 
 	// OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
-	refresh()
+	zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, DataType.UINT8, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, DataType.UINT8, 1, 3600, 0x01) + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 
 def setLevel(value) {
 	zigbee.setLevel(value)
 }
 
-private getScaledHue(value) {
-	zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
-private getScaledSaturation(value) {
-	zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
 def setColor(value){
 	log.trace "setColor($value)"
-	zigbee.on() +
-	zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_HUE_AND_SATURATION_COMMAND,
-		getScaledHue(value.hue), getScaledSaturation(value.saturation), "0000") +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+	zigbee.on() + setHue(value.hue) + "delay 500" + setSaturation(value.saturation)
 }
 
 def setHue(value) {
-	zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, getScaledHue(value), "00", "0000") +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE)
+	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) {
-	zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, getScaledSaturation(value), "0000") +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+	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)
 }
 
 def installed() {
@@ -179,4 +161,4 @@ def installed() {
 			sendEvent(name: "level", value: 100)
 		}
 	}
-}
+}

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017 SmartThings
+ *  Copyright 2016 SmartThings
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  *  in compliance with the License. You may obtain a copy of the License at:
@@ -78,7 +78,6 @@ private getATTRIBUTE_HUE() { 0x0000 }
 private getATTRIBUTE_SATURATION() { 0x0001 }
 private getHUE_COMMAND() { 0x00 }
 private getSATURATION_COMMAND() { 0x03 }
-private getMOVE_TO_HUE_AND_SATURATION_COMMAND() { 0x06 }
 private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
 private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
 
@@ -103,11 +102,11 @@ def parse(String description) {
 
         if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
             if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
-                def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
+                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) / 0xfe * 100)
+                def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
                 sendEvent(name: "saturation", value: saturationValue, descriptionText: "Color has changed", displayed: false)
             }
         }
@@ -142,13 +141,7 @@ def ping() {
 }
 
 def refresh() {
-    zigbee.onOffRefresh() +
-    zigbee.levelRefresh() +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE) +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) +
-    zigbee.onOffConfig(0, 300) +
-    zigbee.levelConfig()
+    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) + zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, DataType.UINT8, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, DataType.UINT8, 1, 3600, 0x01)
 }
 
 def configure() {
@@ -163,12 +156,7 @@ def configure() {
 
 def setColorTemperature(value) {
     setGenericName(value)
-    value = value as Integer
-    def tempInMired = (1000000 / value) as Integer
-    def finalHex = zigbee.swapEndianHex(zigbee.convertToHexString(tempInMired, 4))
-
-    zigbee.command(COLOR_CONTROL_CLUSTER, 0x0A, "$finalHex 0000") +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE)
+    zigbee.setColorTemperature(value)
 }
 
 //Naming based on the wiki article here: http://en.wikipedia.org/wiki/Color_temperature
@@ -192,31 +180,19 @@ def setLevel(value) {
     zigbee.setLevel(value)
 }
 
-private getScaledHue(value) {
-    zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
-private getScaledSaturation(value) {
-    zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
 def setColor(value){
     log.trace "setColor($value)"
-    zigbee.on() +
-    zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_HUE_AND_SATURATION_COMMAND,
-        getScaledHue(value.hue), getScaledSaturation(value.saturation), "0000") +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+    zigbee.on() + setHue(value.hue) + "delay 300" + setSaturation(value.saturation)
 }
 
 def setHue(value) {
-    zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, getScaledHue(value), "00", "0000") +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE)
+    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) {
-    zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, getScaledSaturation(value), "0000") +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+    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)
 }
 
 def installed() {
@@ -225,4 +201,4 @@ def installed() {
             sendEvent(name: "level", value: 100)
         }
     }
-}
+}

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017 SmartThings
+ *  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:
@@ -71,11 +71,6 @@ metadata {
     }
 }
 
-// Globals
-private getMOVE_TO_COLOR_TEMPERATURE_COMMAND() { 0x0A }
-private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
-private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
-
 // Parse incoming device messages to generate events
 def parse(String description) {
     log.debug "description is $description"
@@ -128,11 +123,7 @@ def ping() {
 }
 
 def refresh() {
-    zigbee.onOffRefresh() +
-    zigbee.levelRefresh() +
-    zigbee.colorTemperatureRefresh() +
-    zigbee.onOffConfig(0, 300) +
-    zigbee.levelConfig()
+    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh() + zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.colorTemperatureConfig()
 }
 
 def configure() {
@@ -147,12 +138,7 @@ def configure() {
 
 def setColorTemperature(value) {
     setGenericName(value)
-	value = value as Integer
-    def tempInMired = (1000000 / value) as Integer
-    def finalHex = zigbee.swapEndianHex(zigbee.convertToHexString(tempInMired, 4))
-
-    zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_COLOR_TEMPERATURE_COMMAND, "$finalHex 0000") +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE)
+    zigbee.setColorTemperature(value)
 }
 
 //Naming based on the wiki article here: http://en.wikipedia.org/wiki/Color_temperature

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017 SmartThings
+ *  Copyright 2016 SmartThings
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  *  in compliance with the License. You may obtain a copy of the License at:
@@ -55,7 +55,6 @@ private getATTRIBUTE_HUE() { 0x0000 }
 private getATTRIBUTE_SATURATION() { 0x0001 }
 private getHUE_COMMAND() { 0x00 }
 private getSATURATION_COMMAND() { 0x03 }
-private getMOVE_TO_HUE_AND_SATURATION_COMMAND() { 0x06 }
 private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
 
 // Parse incoming device messages to generate events
@@ -73,11 +72,11 @@ def parse(String description) {
 
 		if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
 			if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
-				def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
+				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) / 0xfe * 100)
+				def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
 				sendEvent(name: "saturation", value: saturationValue, displayed:false)
 			}
 		}
@@ -109,46 +108,28 @@ def configure() {
 }
 
 def configureAttributes() {
-	zigbee.onOffConfig() +
-	zigbee.levelConfig()
+	zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, DataType.UINT8, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, DataType.UINT8, 1, 3600, 0x01)
 }
 
 def refreshAttributes() {
-	zigbee.onOffRefresh() +
-	zigbee.levelRefresh() +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+	zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 
 def setLevel(value) {
 	zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
-private getScaledHue(value) {
-	zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
-private getScaledSaturation(value) {
-	zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
 def setColor(value){
 	log.trace "setColor($value)"
-	zigbee.on() +
-	zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_HUE_AND_SATURATION_COMMAND,
-		getScaledHue(value.hue), getScaledSaturation(value.saturation), "0000") +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+	zigbee.on() + setHue(value.hue) + ["delay 300"] + setSaturation(value.saturation) + ["delay 2000"] + refreshAttributes()
 }
 
 def setHue(value) {
-	//payload-> hue value, direction (00-> shortest distance), transition time (1/10th second)
-	zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, getScaledHue(value), "00", "0000") +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE)
+	def scaledHueValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
+	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 setSaturation(value) {
-	//payload-> sat value, transition time
-	zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, getScaledSaturation(value), "0000") +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+	def scaledSatValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
+	zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, scaledSatValue, "0500") + ["delay 1500"] + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)      //payload-> sat value, transition time
 }

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017 SmartThings
+ *  Copyright 2016 SmartThings
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  *  in compliance with the License. You may obtain a copy of the License at:
@@ -70,7 +70,6 @@ private getATTRIBUTE_HUE() { 0x0000 }
 private getATTRIBUTE_SATURATION() { 0x0001 }
 private getHUE_COMMAND() { 0x00 }
 private getSATURATION_COMMAND() { 0x03 }
-private getMOVE_TO_HUE_AND_SATURATION_COMMAND() { 0x06 }
 private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
 private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
 
@@ -89,11 +88,11 @@ def parse(String description) {
 
         if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
             if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
-                def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
+                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) / 0xfe * 100)
+                def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
                 sendEvent(name: "saturation", value: saturationValue, displayed:false)
             }
         }
@@ -125,16 +124,11 @@ def configure() {
 }
 
 def configureAttributes() {
-    zigbee.onOffConfig() +
-    zigbee.levelConfig()
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, DataType.UINT8, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, DataType.UINT8, 1, 3600, 0x01)
 }
 
 def refreshAttributes() {
-    zigbee.onOffRefresh() +
-    zigbee.levelRefresh() +
-    zigbee.colorTemperatureRefresh() +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 
 def setColorTemperature(value) {
@@ -145,32 +139,17 @@ def setLevel(value) {
     zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()        //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
-private getScaledHue(value) {
-    zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
-private getScaledSaturation(value) {
-    zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
 def setColor(value){
     log.trace "setColor($value)"
-    zigbee.on() +
-    zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_HUE_AND_SATURATION_COMMAND,
-        getScaledHue(value.hue), getScaledSaturation(value.saturation), "0000") +
-    zigbee.onOffRefresh() +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+    zigbee.on() + setHue(value.hue) + ["delay 300"] + setSaturation(value.saturation) + ["delay 2000"] + refreshAttributes()
 }
 
 def setHue(value) {
-    //payload-> hue value, direction (00-> shortest distance), transition time (1/10th second)
-    zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, getScaledHue(value), "00", "0000") +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE)
+    def scaledHueValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
+    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 setSaturation(value) {
-    //payload-> sat value, transition time
-    zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, getScaledSaturation(value), "0000") +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+    def scaledSatValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
+    zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, scaledSatValue, "0500") + ["delay 1500"] + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)      //payload-> sat value, transition time
 }

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017 SmartThings
+ *  Copyright 2016 SmartThings
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  *  in compliance with the License. You may obtain a copy of the License at:
@@ -66,11 +66,6 @@ metadata {
     }
 }
 
-// Globals
-private getMOVE_TO_COLOR_TEMPERATURE_COMMAND() { 0x0A }
-private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
-private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
-
 // Parse incoming device messages to generate events
 def parse(String description) {
     log.debug "description is $description"
@@ -100,14 +95,14 @@ def setLevel(value) {
 }
 
 def refresh() {
-    def cmds = zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
+	def cmds = zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
 
-    // Do NOT config if the device is the Eaton Halo_LT01, it responds with "switch:off" to onOffConfig, and maybe other weird things with the others
+	// Do NOT config if the device is the Eaton Halo_LT01, it responds with "switch:off" to onOffConfig, and maybe other weird things with the others
     if (!((device.getDataValue("manufacturer") == "Eaton") && (device.getDataValue("model") == "Halo_LT01"))) {
-        cmds += zigbee.onOffConfig() + zigbee.levelConfig()
+        cmds = cmds + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig()
     }
 
-    cmds
+	cmds
 }
 
 def poll() {
@@ -143,7 +138,7 @@ def configure() {
     log.debug "configure()"
     configureHealthCheck()
     // Implementation note: for the Eaton Halo_LT01, it responds with "switch:off" to onOffConfig, so be sure this is before the call to onOffRefresh
-    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
 }
 
 def updated() {
@@ -153,12 +148,7 @@ def updated() {
 
 def setColorTemperature(value) {
     setGenericName(value)
-    value = value as Integer
-    def tempInMired = (1000000 / value) as Integer
-    def finalHex = zigbee.swapEndianHex(zigbee.convertToHexString(tempInMired, 4))
-
-    zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_COLOR_TEMPERATURE_COMMAND, "$finalHex 0000") +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE)
+    zigbee.setColorTemperature(value) + ["delay 1500"] + zigbee.colorTemperatureRefresh()
 }
 
 //Naming based on the wiki article here: http://en.wikipedia.org/wiki/Color_temperature

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017 SmartThings
+ *  Copyright 2016 SmartThings
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  *  in compliance with the License. You may obtain a copy of the License at:
@@ -68,11 +68,6 @@ metadata {
     }
 }
 
-// Globals
-private getMOVE_TO_COLOR_TEMPERATURE_COMMAND() { 0x0A }
-private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
-private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
-
 // Parse incoming device messages to generate events
 def parse(String description) {
     log.debug "description is $description"
@@ -99,11 +94,7 @@ def setLevel(value) {
 }
 
 def refresh() {
-    zigbee.onOffRefresh() +
-    zigbee.levelRefresh() +
-    zigbee.colorTemperatureRefresh() +
-    zigbee.onOffConfig() +
-    zigbee.levelConfig()
+    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh() + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig()
 }
 
 def poll() {
@@ -138,7 +129,8 @@ def configureHealthCheck() {
 def configure() {
     log.debug "configure()"
     configureHealthCheck()
-    refresh()
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
+
 }
 
 def updated() {
@@ -148,12 +140,7 @@ def updated() {
 
 def setColorTemperature(value) {
     setGenericName(value)
-    value = value as Integer
-    def tempInMired = (1000000 / value) as Integer
-    def finalHex = zigbee.swapEndianHex(zigbee.convertToHexString(tempInMired, 4))
-
-    zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_COLOR_TEMPERATURE_COMMAND, "$finalHex 0000") +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE)
+    zigbee.setColorTemperature(value) + ["delay 1500"] + zigbee.colorTemperatureRefresh()
 }
 
 //Naming based on the wiki article here: http://en.wikipedia.org/wiki/Color_temperature

devicetypes/stelpro/stelpro-ki-thermostat.src/stelpro-ki-thermostat.groovy

@@ -1,549 +0,0 @@
-/**
- *  Copyright 2017 Stelpro
- *
- *  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.
- *
- *  Stelpro Ki Thermostat
- *
- *  Author: Stelpro
- *
- *  Date: 2017-05-08
- */
-
-preferences {
-    input("zipcode", "text", title: "ZipCode (Outdoor Temperature)", description: "[Do not use space](Blank = No Forecast)")
-    input("heatdetails", "enum", title: "Do you want a detailed operating state notification?", options: ["No", "Yes"], defaultValue: "No", required: false, displayDuringSetup: true)
-}
-
-metadata {
-    definition (name: "Stelpro Ki Thermostat", namespace: "stelpro", author: "Stelpro") {
-        capability "Thermostat"
-        capability "Temperature Measurement"
-        capability "Actuator"
-        capability "Polling"
-        capability "Refresh"
-        capability "Sensor"
-        capability "Configuration"
-
-        attribute "outsideTemp", "number"
-
-        command "switchMode"
-        command "quickSetHeat"
-        command "quickSetOutTemp"
-        command "increaseHeatSetpoint"
-        command "decreaseHeatSetpoint"
-        command "setCustomThermostatMode"
-        command "eco"
-        command "applyNow"
-
-        fingerprint deviceId: "0x0806", inClusters: "0x5E,0x86,0x72,0x40,0x43,0x31,0x85,0x59,0x5A,0x73,0x20,0x42"
-    }
-
-    // simulator metadata
-    simulator {
-        //Add test code here
-    }
-
-    tiles {
-		multiAttributeTile(name:"thermostatMulti", type:"thermostat", width:6, height:4) {
-			tileAttribute("device.temperature", key: "PRIMARY_CONTROL") {
-				attributeState("temp", label:'${currentValue}')
-                attributeState("high", label:'HIGH')
-            	attributeState("low", label:'LOW')
-            	attributeState("--", label:'--')
-			}
-            tileAttribute("device.heatingSetpoint", key: "VALUE_CONTROL") {
-				attributeState("VALUE_UP", action: "increaseHeatSetpoint")
-                attributeState("VALUE_DOWN", action: "decreaseHeatSetpoint")
-			}
-			tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") {
-				attributeState("idle", backgroundColor:"#44b621")
-				attributeState("heating", backgroundColor:"#ffa81e")
-			}
-			tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") {
-				attributeState("off", label:'Off')
-				attributeState("comfort", label:'Comfort')
-				attributeState("eco", label:'Eco')
-			}
-            tileAttribute("device.heatingSetpoint", key: "HEATING_SETPOINT")
-            {
-            	attributeState("heatingSetpoint", label:'${currentValue}')
-            }
-		}
-        standardTile("mode", "device.thermostatMode", width: 2, height: 2) {
-        	state "off", label:'${name}', action:"switchMode", nextState:"to_comfort", icon:"st.thermostat.off"
-			state "comfort", label:'${name}', action:"switchMode", nextState:"to_eco", icon:"http://cdn.device-icons.smartthings.com/Home/home29-icn@2x.png"
-			state "eco", label:'${name}', action:"switchMode", nextState:"...", icon:"http://cdn.device-icons.smartthings.com/Outdoor/outdoor3-icn@2x.png"
-			state "to_comfort", label: "comfort", action:"switchMode", nextState:"to_eco"
-			state "to_eco", label: "eco", action:"switchMode", nextState:"..."
-			state "...", label: "...", action:"heat", nextState:"comfort"
-        }
-        valueTile("heatingSetpoint", "device.heatingSetpoint", width: 2, height: 2) {
-            state "temperature", label:'Setpoint\n${currentValue}°', backgroundColors:[
-                    [value: 31, color: "#153591"],
-                    [value: 44, color: "#1e9cbb"],
-                    [value: 59, color: "#90d2a7"],
-                    [value: 74, color: "#44b621"],
-                    [value: 84, color: "#f1d801"],
-                    [value: 95, color: "#d04e00"],
-                    [value: 96, color: "#bc2323"]
-            ]
-            state "--", label:'--', backgroundColor:"#bdbdbd"
-        }
-        standardTile("refresh", "device.refresh", decoration: "flat", width: 2, height: 2) {
-            state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
-        }
-        main ("thermostatMulti")
-        details(["thermostatMulti", "mode", "heatingSetpoint", "refresh"])
-    }
-}
-
-def parse(String description)
-{
-	if (description == "updated")
-    	return []
-
-    def unitScale = getTemperatureScale()
-    //Class, version
-    def map = createEvent(zwaveEvent(zwave.parse(description, [0x40:2, 0x43:2, 0x31:3, 0x42:1])))
-    if (!map) {
-        return null
-    }
-
-    def result = [map]
-    if (map.name in ["heatingSetpoint","thermostatMode"]) {
-        def map2 = [
-                name: "thermostatSetpoint",
-                unit: getTemperatureScale()
-        ]
-        if (map.name == "thermostatMode") {
-            state.lastTriedMode = map.value
-        }
-        else {
-            def mode = device.latestValue("thermostatMode")
-            log.info "THERMOSTAT, latest mode = ${mode}"
-            if (map.name == "heatingSetpoint") {
-                map2.value = map.value
-                map2.unit = map.unit
-            }
-        }
-        if (map2.value != null) {
-            log.debug "THERMOSTAT, adding setpoint event: $map"
-            result << createEvent(map2)
-        }
-    }
-    log.debug "Parse returned $result"
-    result
-}
-
-// Event Generation
-def zwaveEvent(physicalgraph.zwave.commands.thermostatsetpointv2.ThermostatSetpointReport cmd)
-{
-    def cmdScale = cmd.scale == 1 ? "F" : "C"
-    def temp;
-    float tempfloat;
-    def map = [:]
-    if (cmd.scaledValue >= 327)
-    {
-    	map.value = "--"
-    }
-    else
-    {
-        temp = convertTemperatureIfNeeded(cmd.scaledValue, cmdScale, cmd.precision)
-        tempfloat = (Math.round(temp.toFloat() * 2)) / 2
-        map.value = tempfloat
-    }
-    map.unit = getTemperatureScale()
-    map.displayed = false
-    switch (cmd.setpointType) {
-        case 1:
-            map.name = "heatingSetpoint"
-            break;
-        default:
-            return [:]
-    }
-    // So we can respond with same format
-    state.size = cmd.size
-    state.scale = cmd.scale
-    state.precision = cmd.precision
-    sendEvent(name:"heatingSetpoint", value:map.value)
-    map
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv3.SensorMultilevelReport cmd)
-{
-    def temp;
-    float tempfloat;
-    def format;
-    def map = [:]
-    if (cmd.sensorType == 1) {
-        map.value = convertTemperatureIfNeeded(cmd.scaledSensorValue, cmd.scale == 1 ? "F" : "C", cmd.precision)
-        map.unit = getTemperatureScale()
-        map.name = "temperature"
-
-        temp = map.value
-        if (temp == "32765")		//0x7FFD
-        {
-            map.value = "low"
-        }
-        else if (temp == "32767")	//0x7FFF
-        {
-            map.value = "high"
-        }
-        else if (temp == "-32768")	//0x8000
-        {
-            map.value = "--"
-        }
-        else
-        {
-    		tempfloat = (Math.round(temp.toFloat() * 2)) / 2
-    		map.value = tempfloat
-        }
-
-    } else if (cmd.sensorType == 5) {
-        map.value = cmd.scaledSensorValue
-        map.unit = "%"
-        map.name = "humidity"
-    }
-    sendEvent(name:"temperature", value:map.value)
-    map
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport cmd)
-{
-    def map = [:]
-    switch (cmd.operatingState) {
-        case physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport.OPERATING_STATE_IDLE:
-        map.value = "idle"
-        break
-        case physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport.OPERATING_STATE_HEATING:
-        map.value = "heating"
-        break
-    }
-    map.name = "thermostatOperatingState"
-    
-    if (settings.heatdetails == "No") {
-    	map.displayed = false
-    }
-    
-    map
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport cmd) {
-    def map = [:]
-    switch (cmd.mode) {
-        case physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport.MODE_HEAT:
-            map.value = "comfort"
-            break
-        case physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport.MODE_OFF:
-            map.value = "off"
-            break
-        default:
-            map.value = "eco"
-            break
-    }
-    map.name = "thermostatMode"
-    sendEvent(name:"thermostatMode", value:map.value)
-    map
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.associationv2.AssociationReport cmd) {
-	delayBetween([
-    	zwave.associationV1.associationRemove(groupingIdentifier:1, nodeId:0).format(),
-        zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]).format(),
-        poll()
-    ], 2300)
-}
-
-
-def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeSupportedReport cmd) {
-    log.debug "Zwave event received: $cmd"
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
-    log.debug "Zwave event received: $cmd"
-}
-
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-    log.warn "Unexpected zwave command $cmd"
-}
-
-// Command Implementations
-def poll() {
-    def weather
-
-    // If there is a zipcode defined, weather forecast will be sent. Otherwise, no weather forecast.
-    if (settings.zipcode) {
-        log.debug "ZipCode: ${settings.zipcode}"
-        weather = getWeatherFeature( "conditions", settings.zipcode )
-
-        // Check if the variable is populated, otherwise return.
-        if (!weather) {
-            log.debug( "Something went wrong, no data found." )
-            return false
-        }
-
-        // Set the tiles
-        def locationScale = getTemperatureScale()
-        def tempToSend
-        if (locationScale == "C")
-        {
-            log.debug( "Outdoor Temperature: ${weather.current_observation.temp_c}ºC" )
-            sendEvent( name: 'outsideTemp', value: weather.current_observation.temp_c )
-            tempToSend = weather.current_observation.temp_c
-        }
-        else
-        {
-            log.debug( "Outdoor Temperature: ${weather.current_observation.temp_f}ºF" )
-            sendEvent( name: 'outsideTemp', value: weather.current_observation.temp_f )
-            tempToSend = weather.current_observation.temp_f
-        }
-
-
-        delayBetween([
-                quickSetOutTemp(tempToSend),
-                zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format(),
-                zwave.thermostatModeV2.thermostatModeGet().format(),
-                zwave.thermostatSetpointV2.thermostatSetpointGet(setpointType: 1).format(),
-                zwave.sensorMultilevelV3.sensorMultilevelGet().format(), // current temperature
-                sendEvent( name: 'change', value: 0 )
-        ], 100)
-    } else {
-        delayBetween([
-                zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format(),
-                zwave.thermostatModeV2.thermostatModeGet().format(),
-                zwave.thermostatSetpointV2.thermostatSetpointGet(setpointType: 1).format(),
-                zwave.sensorMultilevelV3.sensorMultilevelGet().format(), // current temperature
-                sendEvent( name: 'change', value: 0 )
-        ], 100)
-    }
-}
-
-def refresh() {
-	poll()
-}
-
-def configure() {
-	poll()
-}
-
-def applyNow() {
-    float currentHeatSetpoint = device.currentValue("heatingSetpoint")
-    def deviceScale
-    def locationScale = getTemperatureScale()
-
-    sendEvent( name: 'change', value: 0 )
-    log.debug("currentHeatSetpoint $currentHeatSetpoint")
-    if (locationScale == "C")
-    {
-        deviceScale = 0
-    }
-    else
-    {
-        deviceScale = 1
-    }
-
-    delayBetween([
-            zwave.thermostatSetpointV2.thermostatSetpointSet(setpointType: 1, scale: deviceScale, precision: state.precision, scaledValue: currentHeatSetpoint).format(),
-            poll()
-    ], 1000)
-}
-
-def quickSetHeat(degrees) {
-    setHeatingSetpoint(degrees, 0)
-}
-
-def setHeatingSetpoint(degrees, delay = 0) {
-    sendEvent(name:"heatingSetpoint", value:degrees)
-    applyNow()
-}
-
-def quickSetOutTemp(degrees) {
-    setOutdoorTemperature(degrees, 0)
-}
-
-def setOutdoorTemperature(degrees, delay = 0) {
-    setOutdoorTemperature(degrees.toDouble(), delay)
-}
-
-def setOutdoorTemperature(Double degrees, Integer delay = 0) {
-    def deviceScale
-    def locationScale = getTemperatureScale()
-    def p = (state.precision == null) ? 1 : state.precision
-
-    if (locationScale == "C")
-    {
-        deviceScale = 0
-    }
-    else
-    {
-        deviceScale = 1
-    }
-    log.info "setOutdoorTemperature: ${degrees}"
-    zwave.sensorMultilevelV3.sensorMultilevelReport(sensorType: 1, scale: deviceScale, precision: p,  scaledSensorValue: degrees).format()
-}
-
-def increaseHeatSetpoint()
-{
-	def currentMode = device.currentState("thermostatMode")?.value
-    if (currentMode != "off")
-    {
-        float currentSetpoint = device.currentValue("heatingSetpoint")
-        def locationScale = getTemperatureScale()
-        float maxSetpoint
-        float step
-
-        if (locationScale == "C")
-        {
-            maxSetpoint = 30;
-            step = 0.5
-        }
-        else
-        {
-            maxSetpoint = 86
-            step = 1
-        }
-
-        if (currentSetpoint < maxSetpoint)
-        {
-            currentSetpoint = currentSetpoint + step
-            quickSetHeat(currentSetpoint)
-        }
-    }
-}
-
-def decreaseHeatSetpoint()
-{
-	def currentMode = device.currentState("thermostatMode")?.value
-    if (currentMode != "off")
-    {
-        float currentSetpoint = device.currentValue("heatingSetpoint")
-        def locationScale = getTemperatureScale()
-        float minSetpoint
-        float step
-
-        if (locationScale == "C")
-        {
-            minSetpoint = 5;
-            step = 0.5
-        }
-        else
-        {
-            minSetpoint = 41
-            step = 1
-        }
-
-        if (currentSetpoint > minSetpoint)
-        {
-            currentSetpoint = currentSetpoint - step
-            quickSetHeat(currentSetpoint)
-        }
-    }
-}
-
-def switchMode() {
-    def currentMode = device.currentState("thermostatMode")?.value
-    def lastTriedMode = state.lastTriedMode ?: currentMode ?: "comfort"
-    def supportedModes = getDataByName("supportedModes")
-    def modeOrder = modes()
-    def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
-    def nextMode = next(lastTriedMode)
-    if (supportedModes?.contains(currentMode)) {
-        while (!supportedModes.contains(nextMode) && nextMode != "comfort") {
-            nextMode = next(nextMode)
-        }
-    }
-    state.lastTriedMode = nextMode
-    delayBetween([
-            zwave.thermostatModeV2.thermostatModeSet(mode: modeMap[nextMode]).format(),
-            poll()
-    ], 1000)
-}
-
-def modes() {
-    ["comfort", "eco", "off"]
-}
-
-def getModeMap() { [
-		"off": 0,
-        "comfort": 1,
-        "eco": 11,
-]}
-
-def getDataByName(String name) {
-    state[name] ?: device.getDataValue(name)
-}
-
-def setCoolingSetpoint(coolingSetpoint) {
-    log.trace "${device.displayName} does not support cool setpoint"
-}
-
-def off() {
-    log.trace "off mode applied"
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSet(mode: 0).format(),
-		poll()
-	], 1000)
-}
-
-def heat() {
-	log.trace "heat mode applied"
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSet(mode: 1).format(),
-		poll()
-	], 1000)
-}
-
-def eco() {
-	log.trace "eco mode applied"
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSet(mode: 11).format(),
-		poll()
-	], 1000)
-}
-
-def auto() {
-    log.trace "${device.displayName} does not support auto mode"
-}
-
-def emergencyHeat() {
-    log.trace "${device.displayName} does not support emergency heat mode"
-}
-
-def cool() {
-    log.trace "${device.displayName} does not support cool mode"
-}
-
-def setCustomThermostatMode(mode) {
-   setThermostatMode(mode)
-}
-
-def setThermostatMode(String value) {
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSet(mode: modeMap[value]).format(),
-		poll()
-	], 1000)
-}
-
-def fanOn() {
-    log.trace "${device.displayName} does not support fan on"
-}
-
-def fanAuto() {
-    log.trace "${device.displayName} does not support fan auto"
-}
-
-def fanCirculate() {
-    log.trace "${device.displayName} does not support fan circulate"
-}
-
-def setThermostatFanMode() {
-    log.trace "${device.displayName} does not support fan mode"
-}