MSA-2148: Hi,

I have updated the SmartThings Device Handlers for Zigbee Dimmer, Zigbee RGBW Bulb, and Zigbee White Color Temperature Bulb with the appropriate Zigbee fingerprints for our new SYLVANIA Smart bulbs.  Some of the bulb fingerprints included are: A19 On/Off/Dim 10 Year, BR30 On/Off/Dim 10 Year, PAR38 On/Off/Dim 10 Year, RT HO RGBW, and the MR16 TW.  Some of these bulbs are on the market already and people cannot connect them to SmartThings because there are no public Device Handlers for these devices. Adding these fingerprints will help! 

Please contact me with any questions: R.Canty@ledvance.com

Thank you!

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

@@ -53,20 +53,21 @@ metadata {
 			}
 		}
 		standardTile("mode", "device.thermostatMode", width:2, height:2, inactiveLabel: false, decoration: "flat") {
-			state "off", action:"switchMode", nextState:"...", icon: "st.thermostat.heating-cooling-off"
+			state "off", action:"switchMode", nextState:"to_heat", icon: "st.thermostat.heating-cooling-off"
-			state "heat", action:"switchMode", nextState:"...", icon: "st.thermostat.heat"
+			state "heat", action:"switchMode", nextState:"to_cool", icon: "st.thermostat.heat"
 			state "cool", action:"switchMode", nextState:"...", icon: "st.thermostat.cool"
 			state "auto", action:"switchMode", nextState:"...", icon: "st.thermostat.auto"
 			state "emergency heat", action:"switchMode", nextState:"...", icon: "st.thermostat.emergency-heat"
-			state "...", label: "Updating...",nextState:"...", backgroundColor:"#ffffff"
+			state "to_heat", action:"switchMode", nextState:"to_cool", icon: "st.secondary.secondary"
+			state "to_cool", action:"switchMode", nextState:"...", icon: "st.secondary.secondary"
+			state "...", label: "...", action:"off", nextState:"off", icon: "st.secondary.secondary"
 		}
 		standardTile("fanMode", "device.thermostatFanMode", width:2, height:2, inactiveLabel: false, decoration: "flat") {
-			state "auto", action:"switchFanMode", nextState:"...", icon: "st.thermostat.fan-auto"
+			state "auto", action:"switchFanMode", icon: "st.thermostat.fan-auto"
-			state "on", action:"switchFanMode", nextState:"...", icon: "st.thermostat.fan-on"
+			state "on", action:"switchFanMode", icon: "st.thermostat.fan-on"
-			state "circulate", action:"switchFanMode", nextState:"...", icon: "st.thermostat.fan-circulate"
+			state "circulate", action:"switchFanMode", icon: "st.thermostat.fan-circulate"
-			state "...", label: "Updating...", nextState:"...", backgroundColor:"#ffffff"
 		}
-		standardTile("humidity", "device.humidity", width:2, height:2, inactiveLabel: false, decoration: "flat") {
+		valueTile("humidity", "device.humidity", width:2, height:2, inactiveLabel: false, decoration: "flat") {
 			state "humidity", label:'${currentValue}%', icon:"st.Weather.weather12"
 		}
 		standardTile("lowerHeatingSetpoint", "device.heatingSetpoint", width:2, height:1, inactiveLabel: false, decoration: "flat") {
@@ -87,43 +88,37 @@ metadata {
 		standardTile("raiseCoolSetpoint", "device.heatingSetpoint", width:2, height:1, inactiveLabel: false, decoration: "flat") {
 			state "heatingSetpoint", action:"raiseCoolSetpoint", icon:"st.thermostat.thermostat-right"
 		}
-		standardTile("thermostatOperatingState", "device.thermostatOperatingState", width: 2, height:2, decoration: "flat") {
+
-			state "thermostatOperatingState", label:'${currentValue}', backgroundColor:"#ffffff"
-		}
 		standardTile("refresh", "device.thermostatMode", width:2, height:2, inactiveLabel: false, decoration: "flat") {
 			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 		main "temperature"
-		details(["temperature", "lowerHeatingSetpoint", "heatingSetpoint", "raiseHeatingSetpoint", "lowerCoolSetpoint",
+		details(["temperature", "mode", "fanMode", "humidity", "lowerHeatingSetpoint", "heatingSetpoint", "raiseHeatingSetpoint", "lowerCoolSetpoint", "coolingSetpoint", "raiseCoolSetpoint", "refresh"])
-				"coolingSetpoint", "raiseCoolSetpoint", "mode", "fanMode", "humidity", "thermostatOperatingState", "refresh"])
 	}
 }
 
+def updated() {
+	// If not set update ManufacturerSpecific data
+	if (!getDataValue("manufacturer")) {
+		sendHubCommand(new physicalgraph.device.HubAction(zwave.manufacturerSpecificV2.manufacturerSpecificGet().format()))
+	}
+	initialize()
+}
+
 def installed() {
 	// Configure device
 	def cmds = []
 	cmds << new physicalgraph.device.HubAction(zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]).format())
 	cmds << new physicalgraph.device.HubAction(zwave.manufacturerSpecificV2.manufacturerSpecificGet().format())
 	sendHubCommand(cmds)
-	runIn(3, "initialize", [overwrite: true])  // Allow configure command to be sent and acknowledged before proceeding
+	initialize()
-}
-
-def updated() {
-	// If not set update ManufacturerSpecific data
-	if (!getDataValue("manufacturer")) {
-		sendHubCommand(new physicalgraph.device.HubAction(zwave.manufacturerSpecificV2.manufacturerSpecificGet().format()))
-		runIn(2, "initialize", [overwrite: true])  // Allow configure command to be sent and acknowledged before proceeding
-	} else {
-		initialize()
-	}
 }
 
 def initialize() {
-	unschedule()
 	// Device-Watch simply pings if no device events received for 32min(checkInterval)
 	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 	// Poll device for additional data that will be updated by refresh tile
-	poll()
+	refresh()
 }
 
 def parse(String description)
@@ -156,43 +151,35 @@ def zwaveEvent(physicalgraph.zwave.commands.multichannelv3.MultiInstanceCmdEncap
 	}
 }
 
-// Event Generation
+def zwaveEvent(physicalgraph.zwave.commands.thermostatsetpointv2.ThermostatSetpointReport cmd)
-def zwaveEvent(physicalgraph.zwave.commands.thermostatsetpointv2.ThermostatSetpointReport cmd) {
+{
 	def sendCmd = []
 	def unit = getTemperatureScale()
 	def cmdScale = cmd.scale == 1 ? "F" : "C"
 	def setpoint = getTempInLocalScale(cmd.scaledValue, cmdScale)
-	def heatingSetpoint = (setpoint == "heatingSetpoint") ? value : getTempInLocalScale("heatingSetpoint")
-	def coolingSetpoint = (setpoint == "coolingSetpoint") ? value : getTempInLocalScale("coolingSetpoint")
-	def mode = device.currentValue("thermostatMode")
-
-	// Save device scale, precision, scale as they are used when enforcing setpoint limits
-	if (cmd.setpointType == 1 || cmd.setpointType == 2) {
-		state.size = cmd.size
-		state.scale = cmd.scale
-		state.precision = cmd.precision
-	}
 	switch (cmd.setpointType) {
-		case 1: // "heatingSetpoint"
+		case 1:
-			state.deviceHeatingSetpoint = cmd.scaledValue
+			//map1.name = "heatingSetpoint"
-			if (state.targetHeatingSetpoint) {
+			sendEvent(name: "heatingSetpoint", value: setpoint, unit: unit, displayed: false)
-				state.targetHeatingSetpoint = null
+			updateThermostatSetpoint("heatingSetpoint", setpoint)
-				sendEvent(name: "heatingSetpoint", value: setpoint, unit: getTemperatureScale())
+			// Enforce coolingSetpoint limits, as device doesn't
-			} else if (mode != "cool") {
+			if (setpoint > getTempInLocalScale("coolingSetpoint")) {
-				// if mode is cool heatingSetpoint can't be changed on device, disregard update
+				sendCmd << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointSet(
-				// else update heatingSetpoint and enforce limits on coolingSetpoint
+						setpointType: 2, scale: cmd.scale, precision: cmd.precision, scaledValue: cmd.scaledValue).format())
-				updateEnforceSetpointLimits("heatingSetpoint", setpoint)
+				sendCmd << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format())
+				sendHubCommand(sendCmd)
 			}
 			break;
-		case 2: // "coolingSetpoint"
+		case 2:
-			state.deviceCoolingSetpoint = cmd.scaledValue
+			//map1.name = "coolingSetpoint"
-			if (state.targetCoolingSetpoint) {
+			sendEvent(name: "coolingSetpoint", value: setpoint, unit: unit, displayed: false)
-				state.targetCoolingSetpoint = null
+			updateThermostatSetpoint("coolingSetpoint", setpoint)
-				sendEvent(name: "coolingSetpoint", value: setpoint, unit: getTemperatureScale())
+			// Enforce heatingSetpoint limits, as device doesn't
-			} else if (mode != "heat" || mode != "emergency heat") {
+			if (setpoint < getTempInLocalScale("heatingSetpoint")) {
-				// if mode is heat or  emergency heat coolingSetpoint can't be changed on device, disregard update
+				sendCmd << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointSet(
-				// else update coolingSetpoint and enforce limits on heatingSetpoint
+						setpointType: 1, scale: cmd.scale, precision: cmd.precision, scaledValue: cmd.scaledValue).format())
-				updateEnforceSetpointLimits("coolingSetpoint", setpoint)
+				sendCmd << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format())
+				sendHubCommand(sendCmd)
 			}
 			break;
 		default:
@@ -200,6 +187,28 @@ def zwaveEvent(physicalgraph.zwave.commands.thermostatsetpointv2.ThermostatSetpo
 			return
 	}
 
+	// So we can respond with same format
+	state.size = cmd.size
+	state.scale = cmd.scale
+	state.precision = cmd.precision
+}
+
+// thermostatSetpoint is not displayed by any tile as it can't be predictable calculated due to
+// the device's quirkiness but it is defined by the capability so it must be set, set it to the most likely value
+def updateThermostatSetpoint(setpoint, value) {
+	def scale = getTemperatureScale()
+	def heatingSetpoint = (setpoint == "heatingSetpoint") ? value : getTempInLocalScale("heatingSetpoint")
+	def coolingSetpoint = (setpoint == "coolingSetpoint") ? value : getTempInLocalScale("coolingSetpoint")
+	def mode = device.currentValue("thermostatMode")
+	def thermostatSetpoint = heatingSetpoint    // corresponds to (mode == "heat" || mode == "emergency heat")
+	if (mode == "cool") {
+		thermostatSetpoint = coolingSetpoint
+	}
+	// Just set to average of heating + cooling for mode off and auto
+	if (mode == "off" || mode == "auto") {
+		thermostatSetpoint = getTempInLocalScale((heatingSetpoint + coolingSetpoint)/2, scale)
+	}
+	sendEvent(name: "thermostatSetpoint", value: thermostatSetpoint, unit: scale)
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv2.SensorMultilevelReport cmd) {
@@ -208,7 +217,6 @@ def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv2.SensorMultilevelR
 		map.name = "temperature"
 		map.unit = getTemperatureScale()
 		map.value = getTempInLocalScale(cmd.scaledSensorValue, (cmd.scale == 1 ? "F" : "C"))
-		updateThermostatSetpoint(null, null)
 	} else if (cmd.sensorType == 5) {
 		map.name = "humidity"
 		map.unit = "%"
@@ -223,7 +231,6 @@ def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv3.SensorMultilevelR
 		map.name = "temperature"
 		map.unit = getTemperatureScale()
 		map.value = getTempInLocalScale(cmd.scaledSensorValue, (cmd.scale == 1 ? "F" : "C"))
-		updateThermostatSetpoint(null, null)
 	} else if (cmd.sensorType == 5) {
 		map.value = cmd.scaledSensorValue
 		map.unit = "%"
@@ -233,7 +240,7 @@ def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv3.SensorMultilevelR
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatoperatingstatev2.ThermostatOperatingStateReport cmd) {
-	def map = [name: "thermostatOperatingState"]
+	def map = [name: "thermostatOperatingState" ]
 	switch (cmd.operatingState) {
 		case physicalgraph.zwave.commands.thermostatoperatingstatev2.ThermostatOperatingStateReport.OPERATING_STATE_IDLE:
 			map.value = "idle"
@@ -295,30 +302,15 @@ def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeRepor
 			map.value = "auto"
 			break
 	}
+	state.lastTriedMode = map.value
 	sendEvent(map)
-	// Now that mode and temperature is known we can request setpoints in correct order
+	updateThermostatSetpoint(null, null)
-	// Also makes sure operating state is in sync as it isn't being reported when changed
-	def cmds = []
-	def heatingSetpoint = getTempInLocalScale("heatingSetpoint")
-	def coolingSetpoint = getTempInLocalScale("coolingSetpoint")
-	def currentTemperature = getTempInLocalScale("temperature")
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format())
-	if (map.value == "cool" || ((map.value == "auto" || map.value == "off") && (currentTemperature > (heatingSetpoint + coolingSetpoint)/2))) {
-		// request cooling setpoint first
-		cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format()) // CoolingSetpoint
-		cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format()) // HeatingSetpoint
-	} else {
-		// request heating setpoint first
-		cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format()) // HeatingSetpoint
-		cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format()) // CoolingSetpoint
-	}
-	sendHubCommand(cmds)
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeReport cmd) {
 	def map = [name: "thermostatFanMode", data:[supportedThermostatFanModes: state.supportedFanModes]]
 	switch (cmd.fanMode) {
-		case physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeReport.FAN_MODE_AUTO_LOW:
+	case physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeReport.FAN_MODE_AUTO_LOW:
 			map.value = "auto"
 			break
 		case physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeReport.FAN_MODE_LOW:
@@ -328,6 +320,7 @@ def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanMod
 			map.value = "circulate"
 			break
 	}
+	state.lastTriedFanMode = map.value
 	sendEvent(map)
 }
 
@@ -405,65 +398,64 @@ def poll() {
 	def cmds = []
 	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSupportedGet().format())
 	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeSupportedGet().format())
+	cmds << new physicalgraph.device.HubAction(zwave.multiChannelV3.multiInstanceCmdEncap(instance: 1).encapsulate(zwave.sensorMultilevelV3.sensorMultilevelGet()).format()) // temperature
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeGet().format())
 	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeGet().format())
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format())
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format()) // HeatingSetpoint
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format()) // CoolingSetpoint
 	cmds << new physicalgraph.device.HubAction(zwave.batteryV1.batteryGet().format())
 	cmds << new physicalgraph.device.HubAction(zwave.multiChannelV3.multiInstanceCmdEncap(instance: 2).encapsulate(zwave.sensorMultilevelV3.sensorMultilevelGet()).format()) // humidity
-	cmds << new physicalgraph.device.HubAction(zwave.multiChannelV3.multiInstanceCmdEncap(instance: 1).encapsulate(zwave.sensorMultilevelV3.sensorMultilevelGet()).format()) // temperature
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format())
 	def time = getTimeAndDay()
+log.debug "time: $time"
 	if (time) {
 		cmds << new physicalgraph.device.HubAction(zwave.clockV1.clockSet(time).format())
 	}
-	// ThermostatModeReport will spawn request for operating state and setpoints so request this last
+	// Add 3 seconds delay between each command to avoid flooding the Z-Wave network choking the hub 
-	// this as temperature and mode is needed to determine which setpoints should be requested first
+	sendHubCommand(cmds, 3000)
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeGet().format())
-	// Add 2 seconds delay between each command to avoid flooding the Z-Wave network choking the hub 
-	sendHubCommand(cmds, 2000)
 }
 
 def raiseHeatingSetpoint() {
-	alterSetpoint(true, "heatingSetpoint")
+	alterSetpoint(null, true, "heatingSetpoint")
 }
 
 def lowerHeatingSetpoint() {
-	alterSetpoint(false, "heatingSetpoint")
+	alterSetpoint(null, false, "heatingSetpoint")
 }
 
 def raiseCoolSetpoint() {
-	alterSetpoint(true, "coolingSetpoint")
+	alterSetpoint(null, true, "coolingSetpoint")
 }
 
 def lowerCoolSetpoint() {
-	alterSetpoint(false, "coolingSetpoint")
+	alterSetpoint(null, false, "coolingSetpoint")
 }
 
 // Adjusts nextHeatingSetpoint either .5° C/1° F) if raise true/false
-def alterSetpoint(raise, setpoint) {
+def alterSetpoint(degrees, raise, setpoint) {
 	def locationScale = getTemperatureScale()
-	def deviceScale = (state.scale == 1) ? "F" : "C"
 	def heatingSetpoint = getTempInLocalScale("heatingSetpoint")
 	def coolingSetpoint = getTempInLocalScale("coolingSetpoint")
-	def targetValue = (setpoint == "heatingSetpoint") ? heatingSetpoint : coolingSetpoint
+	def targetvalue = (setpoint == "heatingSetpoint") ? heatingSetpoint : coolingSetpoint
 	def delta = (locationScale == "F") ? 1 : 0.5
-	targetValue += raise ? delta : - delta
+	if (raise != null) {
-
+		targetvalue += raise ? delta : - delta
-	def data = enforceSetpointLimits(setpoint, [targetValue: targetValue, heatingSetpoint: heatingSetpoint, coolingSetpoint: coolingSetpoint], raise)
+	} else if (degrees) {
+		targetvalue = degrees
+	} else {
+		log.warn "alterSetpoint called with neither up/down/degree information"
+		return
+	}
+	def data = enforceSetpointLimits(setpoint, [targetvalue: targetvalue, heatingSetpoint: heatingSetpoint, coolingSetpoint: coolingSetpoint])
 	// update UI without waiting for the device to respond, this to give user a smoother UI experience
 	// also, as runIn's have to overwrite and user can change heating/cooling setpoint separately separate runIn's have to be used
 	if (data.targetHeatingSetpoint) {
-		sendEvent("name": "heatingSetpoint", "value": getTempInLocalScale(data.targetHeatingSetpoint, deviceScale),
+		sendEvent("name": "heatingSetpoint", "value": data.targetHeatingSetpoint, unit: locationScale, eventType: "ENTITY_UPDATE")//, displayed: false)
-				unit: getTemperatureScale(), eventType: "ENTITY_UPDATE", displayed: false)
+		runIn(4, "updateHeatingSetpoint", [data: data, overwrite: true])
 	}
 	if (data.targetCoolingSetpoint) {
-		sendEvent("name": "coolingSetpoint", "value": getTempInLocalScale(data.targetCoolingSetpoint, deviceScale),
+		sendEvent("name": "coolingSetpoint", "value": data.targetCoolingSetpoint, unit: locationScale, eventType: "ENTITY_UPDATE")//, displayed: false)
-				unit: getTemperatureScale(), eventType: "ENTITY_UPDATE", displayed: false)
+		runIn(4, "updateCoolingSetpoint", [data: data, overwrite: true])
-	}
-	if (data.targetHeatingSetpoint && data.targetCoolingSetpoint) {
-		runIn(5, "updateHeatingSetpoint", [data: data, overwrite: true])
-	} else if (setpoint == "heatingSetpoint" && data.targetHeatingSetpoint) {
-		runIn(5, "updateHeatingSetpoint", [data: data, overwrite: true])
-	} else if (setpoint == "coolingSetpoint" && data.targetCoolingSetpoint) {
-		runIn(5, "updateCoolingSetpoint", [data: data, overwrite: true])
 	}
 }
 
@@ -475,138 +467,69 @@ def updateCoolingSetpoint(data) {
 	updateSetpoints(data)
 }
 
-def updateEnforceSetpointLimits(setpoint, setpointValue) {
+def enforceSetpointLimits(setpoint, data) {
-	def heatingSetpoint = (setpoint == "heatingSetpoint") ? setpointValue : getTempInLocalScale("heatingSetpoint")
+	// Enforce max/min for setpoints
-	def coolingSetpoint = (setpoint == "coolingSetpoint") ? setpointValue : getTempInLocalScale("coolingSetpoint")
+	def maxSetpoint = getTempInLocalScale(95, "F")
-
+	def minSetpoint = getTempInLocalScale(35, "F")
-	sendEvent(name: setpoint, value: setpointValue, unit: getTemperatureScale(), displayed: false)
+	def targetvalue = data.targetvalue
-	updateThermostatSetpoint(setpoint, setpointValue)
-	// Enforce coolingSetpoint limits, as device doesn't
-	def data = enforceSetpointLimits(setpoint, [targetValue: setpointValue,
-		heatingSetpoint: heatingSetpoint, coolingSetpoint: coolingSetpoint])
-	if (setpoint == "heatingSetpoint" && data.targetHeatingSetpoint) {
-		data.targetHeatingSetpoint = null
-	} else if (setpoint == "coolingSetpoint" && data.targetCoolingSetpoint) {
-		data.targetCoolingSetpoint = null
-	}
-	if (data.targetHeatingSetpoint != null || data.targetCoolingSetpoint != null) {
-		updateSetpoints(data)
-	}
-}
-
-def enforceSetpointLimits(setpoint, data, raise = null) {
-	def locationScale = getTemperatureScale()
-	def deviceScale = (state.scale == 1) ? "F" : "C"
-	// min/max with 3°F/2°C deadband consideration
-	def minSetpoint = (setpoint == "heatingSetpoint") ?  getTempInDeviceScale(35, "F") :  getTempInDeviceScale(38, "F")
-	def maxSetpoint = (setpoint == "heatingSetpoint") ?  getTempInDeviceScale(92, "F") :  getTempInDeviceScale(95, "F")
-	def deadband = (deviceScale == "F") ? 3 : 2
-	def delta = (locationScale == "F") ? 1 : 0.5
-	def targetValue = getTempInDeviceScale(data.targetValue, locationScale)
 	def heatingSetpoint = null
 	def coolingSetpoint = null
 
-	// Enforce min/mix for setpoints
+	if (targetvalue > maxSetpoint) {
-	if (targetValue > maxSetpoint) {
+		targetvalue = maxSetpoint
-		heatingSetpoint = (setpoint == "heatingSetpoint") ? maxSetpoint : getTempInDeviceScale(data.heatingSetpoint, locationScale)
+	} else if (targetvalue < minSetpoint) {
-		coolingSetpoint = (setpoint == "heatingSetpoint") ? maxSetpoint + deadband : maxSetpoint
+		targetvalue = minSetpoint
-	} else if (targetValue < minSetpoint) {
-		heatingSetpoint = (setpoint == "coolingSetpoint") ? minSetpoint - deadband : minSetpoint
-		coolingSetpoint = (setpoint == "coolingSetpoint") ? minSetpoint : getTempInDeviceScale(data.coolingSetpoint, locationScale)
 	}
-	// Enforce deadband between setpoints
+	// Enforce limits, for now make sure heating <= cooling, and cooling >= heating
-	if (setpoint == "heatingSetpoint" && !coolingSetpoint) {
+	if (setpoint == "heatingSetpoint") {
-		// Note if new value is same as old value we need to move it in the direction the user wants to change it, 1°F or 0.5°C,
+		heatingSetpoint = targetvalue
-		heatingSetpoint = (targetValue != getTempInDeviceScale(data.heatingSetpoint, locationScale) || !raise) ?
+		coolingSetpoint = (heatingSetpoint > data.coolingSetpoint) ? heatingSetpoint : null
-				targetValue : (raise ? targetValue + delta : targetValue - delta)
-		coolingSetpoint = (heatingSetpoint + deadband > getTempInDeviceScale(data.coolingSetpoint, locationScale)) ? heatingSetpoint + deadband : null
 	}
-	if (setpoint == "coolingSetpoint" && !heatingSetpoint) {
+	if (setpoint == "coolingSetpoint") {
-		coolingSetpoint = (targetValue != getTempInDeviceScale(data.coolingSetpoint, locationScale) || !raise) ?
+		coolingSetpoint = targetvalue
-				targetValue : (raise ? targetValue + delta : targetValue - delta)
+		heatingSetpoint = (coolingSetpoint < data.heatingSetpoint) ? coolingSetpoint : null
-		heatingSetpoint = (coolingSetpoint - deadband < getTempInDeviceScale(data.heatingSetpoint, locationScale)) ? coolingSetpoint - deadband : null
 	}
 	return [targetHeatingSetpoint: heatingSetpoint, targetCoolingSetpoint: coolingSetpoint]
 }
 
 def setHeatingSetpoint(degrees) {
 	if (degrees) {
-		state.heatingSetpoint = degrees.toDouble()
+		def data = enforceSetpointLimits("heatingSetpoint",
-		runIn(2, "updateSetpoints", [overwrite: true])
+				[targetvalue: degrees.toDouble(), heatingSetpoint: getTempInLocalScale("heatingSetpoint"), coolingSetpoint: getTempInLocalScale("coolingSetpoint")])
+		updateSetpoints(data)
 	}
 }
 
 def setCoolingSetpoint(degrees) {
 	if (degrees) {
-		state.coolingSetpoint = degrees.toDouble()
+		def data = enforceSetpointLimits("coolingSetpoint",
-		runIn(2, "updateSetpoints", [overwrite: true])
+				[targetvalue: degrees.toDouble(), heatingSetpoint: getTempInLocalScale("heatingSetpoint"), coolingSetpoint: getTempInLocalScale("coolingSetpoint")])
+		updateSetpoints(data)
 	}
 }
 
-def updateSetpoints() {
-	def deviceScale = (state.scale == 1) ? "F" : "C"
-	def data = [targetHeatingSetpoint: null, targetCoolingSetpoint: null]
-	def heatingSetpoint = getTempInLocalScale("heatingSetpoint")
-	def coolingSetpoint = getTempInLocalScale("coolingSetpoint")
-	if (state.heatingSetpoint) {
-		data = enforceSetpointLimits("heatingSetpoint", [targetValue: state.heatingSetpoint,
-				heatingSetpoint: heatingSetpoint, coolingSetpoint: coolingSetpoint])
-	}
-	if (state.coolingSetpoint) {
-		heatingSetpoint = data.targetHeatingSetpoint ? getTempInLocalScale(data.targetHeatingSetpoint, deviceScale) : heatingSetpoint
-		coolingSetpoint = data.targetCoolingSetpoint ? getTempInLocalScale(data.targetCoolingSetpoint, deviceScale) : coolingSetpoint
-		data = enforceSetpointLimits("coolingSetpoint", [targetValue: state.coolingSetpoint,
-				heatingSetpoint: heatingSetpoint, coolingSetpoint: coolingSetpoint])
-		data.targetHeatingSetpoint = data.targetHeatingSetpoint ?: heatingSetpoint
-	}
-	state.heatingSetpoint = null
-	state.coolingSetpoint = null
-	updateSetpoints(data)
-}
-
 def updateSetpoints(data) {
-	unschedule("updateSetpoints")
 	def cmds = []
 	if (data.targetHeatingSetpoint) {
-		state.targetHeatingSetpoint = data.targetHeatingSetpoint
 		cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointSet(
-					setpointType: 1, scale: state.scale, precision: state.precision, scaledValue: data.targetHeatingSetpoint).format())
+					setpointType: 1, scale: state.scale, precision: state.precision, scaledValue: convertToDeviceScale(data.targetHeatingSetpoint)).format())
 	}
 	if (data.targetCoolingSetpoint) {
-		state.targetCoolingSetpoint = data.targetCoolingSetpoint
 		cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointSet(
-					setpointType: 2, scale: state.scale, precision: state.precision, scaledValue: data.targetCoolingSetpoint).format())
+					setpointType: 2, scale: state.scale, precision: state.precision, scaledValue: convertToDeviceScale(data.targetCoolingSetpoint)).format())
-	}
-	// Also make sure temperature and operating state is in sync
-	cmds << new physicalgraph.device.HubAction(zwave.multiChannelV3.multiInstanceCmdEncap(instance: 1).encapsulate(zwave.sensorMultilevelV3.sensorMultilevelGet()).format()) // temperature
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format())
-	if (data.targetHeatingSetpoint) {
-		cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format())
-	}
-	if (data.targetCoolingSetpoint) {
-		cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format())
 	}
+
+	// Always request both setpoints in case thermostat changed both
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format())
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format())
 	sendHubCommand(cmds)
 }
 
-// thermostatSetpoint is not displayed by any tile as it can't be predictable calculated due to
+def convertToDeviceScale(setpoint) {
-// the device's quirkiness but it is defined by the capability so it must be set, set it to the most likely value
+	def locationScale = getTemperatureScale()
-def updateThermostatSetpoint(setpoint, value) {
+	def deviceScale = (state.scale == 1) ? "F" : "C"
-	def scale = getTemperatureScale()
+	return (deviceScale == locationScale) ? setpoint :
-	def heatingSetpoint = (setpoint == "heatingSetpoint") ? value : getTempInLocalScale("heatingSetpoint")
+		(deviceScale == "F" ? celsiusToFahrenheit(setpoint.toBigDecimal()) : roundC(fahrenheitToCelsius(setpoint.toBigDecimal())))
-	def coolingSetpoint = (setpoint == "coolingSetpoint") ? value : getTempInLocalScale("coolingSetpoint")
-	def mode = device.currentValue("thermostatMode")
-	def thermostatSetpoint = heatingSetpoint    // corresponds to (mode == "heat" || mode == "emergency heat")
-	if (mode == "cool") {
-		thermostatSetpoint = coolingSetpoint
-	} else if (mode == "auto" || mode == "off") {
-		// Set thermostatSetpoint to the setpoint closest to the current temperature
-		def currentTemperature = getTempInLocalScale("temperature")
-		if (currentTemperature > (heatingSetpoint + coolingSetpoint)/2) {
-			thermostatSetpoint = coolingSetpoint
-		}
-	}
-	sendEvent(name: "thermostatSetpoint", value: thermostatSetpoint, unit: getTemperatureScale())
 }
 
 /**
@@ -620,68 +543,54 @@ def ping() {
 
 def switchMode() {
 	def currentMode = device.currentValue("thermostatMode")
+	def lastTriedMode = state.lastTriedMode ?: currentMode ?: "off"
 	def supportedModes = state.supportedModes
 	if (supportedModes) {
 		def next = { supportedModes[supportedModes.indexOf(it) + 1] ?: supportedModes[0] }
-		def nextMode = next(currentMode)
+		def nextMode = next(lastTriedMode)
-		runIn(2, "setThermostatMode", [data: [nextMode: nextMode], overwrite: true])
+		setThermostatMode(nextMode)
+		state.lastTriedMode = nextMode
 	} else {
 		log.warn "supportedModes not defined"
-		getSupportedModes()
 	}
 }
 
 def switchToMode(nextMode) {
 	def supportedModes = state.supportedModes
-	if (supportedModes) {
+	if (supportedModes && supportedModes.contains(nextMode)) {
-		if (supportedModes.contains(nextMode)) {
+		setThermostatMode(nextMode)
-			runIn(2, "setThermostatMode", [data: [nextMode: nextMode], overwrite: true])
+		state.lastTriedMode = nextMode
-		} else {
-			log.debug("ThermostatMode $nextMode is not supported by ${device.displayName}")
-		}
 	} else {
-		log.warn "supportedModes not defined"
+		log.debug("ThermostatMode $nextMode is not supported by ${device.displayName}")
-		getSupportedModes()
 	}
 }
 
-def getSupportedModes() {
-	def cmds = []
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSupportedGet().format())
-	sendHubCommand(cmds)
-}
-
 def switchFanMode() {
-	def currentMode = device.currentValue("thermostatFanMode")
+	def currentMode = device.currentState("thermostatFanMode")?.value
+	def lastTriedMode = state.lastTriedFanMode ?: currentMode ?: "off"
 	def supportedFanModes = state.supportedFanModes
 	if (supportedFanModes) {
 		def next = { supportedFanModes[supportedFanModes.indexOf(it) + 1] ?: supportedFanModes[0] }
-		def nextMode = next(currentMode)
+		def nextMode = next(lastTriedMode)
-		runIn(2, "setThermostatFanMode", [data: [nextMode: nextMode], overwrite: true])
+		setThermostatFanMode(nextMode)
+		state.lastTriedFanMode = nextMode
 	} else {
 		log.warn "supportedFanModes not defined"
-		getSupportedFanModes()
 	}
 }
 
 def switchToFanMode(nextMode) {
 	def supportedFanModes = state.supportedFanModes
-	if (supportedFanModes) {
+	if (supportedFanModes && supportedFanModes.contains(nextMode)) {
-		if (supportedFanModes.contains(nextMode)) {
+		setThermostatFanMode(nextMode)
-			runIn(2, "setThermostatFanMode", [data: [nextMode: nextMode], overwrite: true])
+		state.lastTriedFanMode = nextMode
-		} else {
-			log.debug("FanMode $nextMode is not supported by ${device.displayName}")
-		}
 	} else {
-		log.warn "supportedFanModes not defined"
+		log.debug("FanMode $nextMode is not supported by ${device.displayName}")
-		getSupportedFanModes()
 	}
 }
 
-def getSupportedFanModes() {
+def getDataByName(String name) {
-	def cmds = []
+	state[name] ?: device.getDataValue(name)
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeSupportedGet().format())
-	sendHubCommand(cmds)
 }
 
 def getModeMap() { [
@@ -693,12 +602,8 @@ def getModeMap() { [
 ]}
 
 def setThermostatMode(String value) {
-	switchToMode(value)
-}
-
-def setThermostatMode(data) {
 	def cmds = []
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSet(mode: modeMap[data.nextMode]).format())
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSet(mode: modeMap[value]).format())
 	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeGet().format())
 	sendHubCommand(cmds)
 }
@@ -710,12 +615,8 @@ def getFanModeMap() { [
 ]}
 
 def setThermostatFanMode(String value) {
-	switchToFanMode(value)
-}
-
-def setThermostatFanMode(data) {
 	def cmds = []
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeSet(fanMode: fanModeMap[data.nextMode]).format())
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeSet(fanMode: fanModeMap[value]).format())
 	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeGet().format())
 	sendHubCommand(cmds)
 }
@@ -774,28 +675,8 @@ def getTempInLocalScale(state) {
 
 // get/convert temperature to current local scale
 def getTempInLocalScale(temp, scale) {
-	if (temp && scale) {
+	def scaledTemp = convertTemperatureIfNeeded(temp.toBigDecimal(), scale).toDouble()
-		def scaledTemp = convertTemperatureIfNeeded(temp.toBigDecimal(), scale).toDouble()
+	return (getTemperatureScale() == "F" ? scaledTemp.round(0).toInteger() : roundC(scaledTemp))
-		return (getTemperatureScale() == "F" ? scaledTemp.round(0).toInteger() : roundC(scaledTemp))
-	}
-	return 0
-}
-
-def getTempInDeviceScale(state) {
-	def temp = device.currentState(state)
-	if (temp && temp.value && temp.unit) {
-		return getTempInDeviceScale(temp.value.toBigDecimal(), temp.unit)
-	}
-	return 0
-}
-
-def getTempInDeviceScale(temp, scale) {
-	if (temp && scale) {
-		def deviceScale = (state.scale == 1) ? "F" : "C"
-		return (deviceScale == scale) ? temp :
-				(deviceScale == "F" ? celsiusToFahrenheit(temp).toDouble().round(0).toInteger() : roundC(fahrenheitToCelsius(temp)))
-	}
-	return 0
 }
 
 def roundC (tempC) {

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

@@ -34,6 +34,9 @@ metadata {
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL6HD", deviceJoinName: "Leviton Dimmer Switch"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL3HL", deviceJoinName: "Leviton Lumina RF Plug-In Dimmer"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL1KD", deviceJoinName: "Leviton Lumina RF Dimmer Switch"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, 0B05, FC01, FC08", outClusters: "0003, 0019", manufacturer: "LEDVANCE", model: "A19 W 10 year", deviceJoinName: "SYLVANIA Smart 10Y A19 Soft White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B05, FC01", outClusters: "0003, 0019", manufacturer: "LEDVANCE", model: "BR30 W 10 year", deviceJoinName: "SYLVANIA Smart 10Y BR30 Soft White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B05, FC01", outClusters: "0003, 0019", manufacturer: "LEDVANCE", model: "PAR38 W 10 year", deviceJoinName: "SYLVANIA Smart 10Y PAR38 Soft White"
     }
 
     tiles(scale: 2) {

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

@@ -40,6 +40,9 @@ metadata {
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR RGBW", deviceJoinName: "SYLVANIA Smart BR30 RGBW"
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT RGBW", deviceJoinName: "SYLVANIA Smart RT5/6 RGBW"
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY FLEX OUTDOOR RGBW", deviceJoinName: "SYLVANIA Smart Outdoor RGBW Flex"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B05, FC01, FC08", outClusters: "0003, 0019", manufacturer: "LEDVANCE", model: "RT HO RGBW", deviceJoinName: "SYLVANIA Smart RT HO RGBW"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B05, FC01", outClusters: "0019", manufacturer: "LEDVANCE", model: "A19 RGBW", deviceJoinName: "SYLVANIA Smart A19 RGBW"
+
     }
 
     // UI tile definitions

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

@@ -39,6 +39,13 @@ metadata {
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 Tunable White", deviceJoinName: "SYLVANIA Smart A19 Tunable White"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic B40 TW - LIGHTIFY", deviceJoinName: "OSRAM LIGHTIFY Classic B40 Tunable White"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0702, 0B05", outClusters: "0019", manufacturer: "sengled", model: "Z01-A19NAE26", deviceJoinName: "Sengled Element plus"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, 0B05, FC01, FC08", outClusters: "0003, 0019", manufacturer: "LEDVANCE", model: "A19 TW 10 year", deviceJoinName: "SYLVANIA Smart 10Y A19 TW"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Conv Under Cabinet TW", deviceJoinName: "SYLVANIA Smart Convertible Under Cabinet"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "ColorstripRGBW", deviceJoinName: "SYLVANIA Smart Convertible Under Cabinet"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Edge-lit Flushmount TW", deviceJoinName: "SYLVANIA Smart Edge-lit Flushmount TW"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B05, FC01", outClusters: "0003, 0019", manufacturer: "LEDVANCE", model: "MR16 TW", deviceJoinName: "SYLVANIA Smart MR16 Tunable White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Surface TW", deviceJoinName: "SYLVANIA Smart Surface Tunable White"
+
     }
 
     // UI tile definitions

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

@@ -16,6 +16,7 @@ metadata {
 		capability "Actuator"
 		capability "Temperature Measurement"
 		capability "Thermostat"
+		capability "Configuration"
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
@@ -24,175 +25,209 @@ metadata {
 
 		command "switchMode"
 		command "switchFanMode"
-		command "lowerHeatingSetpoint"
+        command "quickSetCool"
-		command "raiseHeatingSetpoint"
+        command "quickSetHeat"
-		command "lowerCoolSetpoint"
-		command "raiseCoolSetpoint"
 
 		fingerprint deviceId: "0x08"
 		fingerprint inClusters: "0x43,0x40,0x44,0x31"
 		fingerprint mfr:"0039", prod:"0011", model:"0001", deviceJoinName: "Honeywell Z-Wave Thermostat"
 	}
 
+	// simulator metadata
+	simulator {
+		status "off"			: "command: 4003, payload: 00"
+		status "heat"			: "command: 4003, payload: 01"
+		status "cool"			: "command: 4003, payload: 02"
+		status "auto"			: "command: 4003, payload: 03"
+		status "emergencyHeat"	: "command: 4003, payload: 04"
+
+		status "auto"			: "command: 4403, payload: 00" // "fanAuto"
+		status "on"				: "command: 4403, payload: 01" // "fanOn"
+		status "circulate"		: "command: 4403, payload: 06" // "fanCirculate
+
+		status "heat 60"        : "command: 4303, payload: 01 09 3C"
+		status "heat 68"        : "command: 4303, payload: 01 09 44"
+		status "heat 72"        : "command: 4303, payload: 01 09 48"
+
+		status "cool 72"        : "command: 4303, payload: 02 09 48"
+		status "cool 76"        : "command: 4303, payload: 02 09 4C"
+		status "cool 80"        : "command: 4303, payload: 02 09 50"
+
+		status "temp 58"        : "command: 3105, payload: 01 2A 02 44"
+		status "temp 62"        : "command: 3105, payload: 01 2A 02 6C"
+		status "temp 70"        : "command: 3105, payload: 01 2A 02 BC"
+		status "temp 74"        : "command: 3105, payload: 01 2A 02 E4"
+		status "temp 78"        : "command: 3105, payload: 01 2A 03 0C"
+		status "temp 82"        : "command: 3105, payload: 01 2A 03 34"
+
+		status "idle"			: "command: 4203, payload: 00"
+		status "heating"		: "command: 4203, payload: 01"
+		status "cooling"		: "command: 4203, payload: 02"
+		status "fan only"		: "command: 4203, payload: 03"
+		status "pending heat"	: "command: 4203, payload: 04"
+		status "pending cool"	: "command: 4203, payload: 05"
+		status "vent economizer": "command: 4203, payload: 06"
+
+		// reply messages
+		reply "2502": "command: 2503, payload: FF"
+	}
+
 	tiles {
-		multiAttributeTile(name:"temperature", type:"generic", width:3, height:2, canChangeIcon: true) {
+		// Using standardTile instead of valueTile as it renders the icon better
-			tileAttribute("device.temperature", key: "PRIMARY_CONTROL") {
+		standardTile("temperature", "device.temperature", width: 2, height: 2) {
-				attributeState("temperature", label:'${currentValue}°', icon: "st.alarm.temperature.normal",
+			state("temperature", label:'${currentValue}°', icon: "st.thermostat.ac.air-conditioning",
-					backgroundColors:[
+				backgroundColors:[
-							// Celsius
+					[value: 31, color: "#153591"],
-							[value: 0, color: "#153591"],
+					[value: 44, color: "#1e9cbb"],
-							[value: 7, color: "#1e9cbb"],
+					[value: 59, color: "#90d2a7"],
-							[value: 15, color: "#90d2a7"],
+					[value: 74, color: "#44b621"],
-							[value: 23, color: "#44b621"],
+					[value: 84, color: "#f1d801"],
-							[value: 28, color: "#f1d801"],
+					[value: 95, color: "#d04e00"],
-							[value: 35, color: "#d04e00"],
+					[value: 96, color: "#bc2323"]
-							[value: 37, color: "#bc2323"],
+				]
-							// Fahrenheit
+			)
-							[value: 40, 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"]
-					]
-				)
-			}
 		}
-		standardTile("mode", "device.thermostatMode", width:2, height:2, inactiveLabel: false, decoration: "flat") {
+		standardTile("mode", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
-			state "off", action:"switchMode", nextState:"...", icon: "st.thermostat.heating-cooling-off"
+			state "off", action:"switchMode", nextState:"to_heat", icon: "st.thermostat.heating-cooling-off"
-			state "heat", action:"switchMode", nextState:"...", icon: "st.thermostat.heat"
+			state "heat", action:"switchMode", nextState:"to_cool", icon: "st.thermostat.heat"
 			state "cool", action:"switchMode", nextState:"...", icon: "st.thermostat.cool"
 			state "auto", action:"switchMode", nextState:"...", icon: "st.thermostat.auto"
 			state "emergency heat", action:"switchMode", nextState:"...", icon: "st.thermostat.emergency-heat"
-			state "...", label: "Updating...",nextState:"...", backgroundColor:"#ffffff"
+			state "to_heat", action:"switchMode", nextState:"to_cool", icon: "st.thermostat.heat"
+			state "to_cool", action:"switchMode", nextState:"...", icon: "st.thermostat.cool"
+			state "...", label: "...", action:"off", nextState:"off"
 		}
-		standardTile("fanMode", "device.thermostatFanMode", width:2, height:2, inactiveLabel: false, decoration: "flat") {
+		standardTile("fanMode", "device.thermostatFanMode", inactiveLabel: false, decoration: "flat") {
-			state "auto", action:"switchFanMode", nextState:"...", icon: "st.thermostat.fan-auto"
+			state "auto", action:"switchFanMode", nextState:"...", icon: "st.thermostat.fan-auto" // "fanAuto"
-			state "on", action:"switchFanMode", nextState:"...", icon: "st.thermostat.fan-on"
+			state "on", action:"switchFanMode", nextState:"...", icon: "st.thermostat.fan-on" // "fanOn"
-			state "circulate", action:"switchFanMode", nextState:"...", icon: "st.thermostat.fan-circulate"
+			state "circulate", action:"switchFanMode", nextState:"...", icon: "st.thermostat.fan-circulate" // "fanCirculate"
-			state "...", label: "Updating...", nextState:"...", backgroundColor:"#ffffff"
+			state "...", label: "...", nextState:"..."
 		}
-		standardTile("lowerHeatingSetpoint", "device.heatingSetpoint", width:2, height:1, inactiveLabel: false, decoration: "flat") {
+		controlTile("heatSliderControl", "device.heatingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "heatingSetpoint", action:"lowerHeatingSetpoint", icon:"st.thermostat.thermostat-left"
+			state "setHeatingSetpoint", action:"quickSetHeat", backgroundColor:"#d04e00"
 		}
-		valueTile("heatingSetpoint", "device.heatingSetpoint", width:2, height:1, inactiveLabel: false, decoration: "flat") {
+		valueTile("heatingSetpoint", "device.heatingSetpoint", inactiveLabel: false, decoration: "flat") {
-			state "heatingSetpoint", label:'${currentValue}° heat', backgroundColor:"#ffffff"
+			state "heat", label:'${currentValue}° heat', backgroundColor:"#ffffff"
 		}
-		standardTile("raiseHeatingSetpoint", "device.heatingSetpoint", width:2, height:1, inactiveLabel: false, decoration: "flat") {
+		controlTile("coolSliderControl", "device.coolingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "heatingSetpoint", action:"raiseHeatingSetpoint", icon:"st.thermostat.thermostat-right"
+			state "setCoolingSetpoint", action:"quickSetCool", backgroundColor: "#1e9cbb"
 		}
-		standardTile("lowerCoolSetpoint", "device.coolingSetpoint", width:2, height:1, inactiveLabel: false, decoration: "flat") {
+		valueTile("coolingSetpoint", "device.coolingSetpoint", inactiveLabel: false, decoration: "flat") {
-			state "coolingSetpoint", action:"lowerCoolSetpoint", icon:"st.thermostat.thermostat-left"
+			state "cool", label:'${currentValue}° cool', backgroundColor:"#ffffff"
 		}
-		valueTile("coolingSetpoint", "device.coolingSetpoint", width:2, height:1, inactiveLabel: false, decoration: "flat") {
+		standardTile("refresh", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
-			state "coolingSetpoint", label:'${currentValue}° cool', backgroundColor:"#ffffff"
-		}
-		standardTile("raiseCoolSetpoint", "device.heatingSetpoint", width:2, height:1, inactiveLabel: false, decoration: "flat") {
-			state "heatingSetpoint", action:"raiseCoolSetpoint", icon:"st.thermostat.thermostat-right"
-		}
-		valueTile("thermostatOperatingState", "device.thermostatOperatingState", width: 2, height:1, decoration: "flat") {
-			state "thermostatOperatingState", label:'${currentValue}', backgroundColor:"#ffffff"
-		}
-		standardTile("refresh", "device.thermostatMode", width:2, height:1, inactiveLabel: false, decoration: "flat") {
 			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 		main "temperature"
-		details(["temperature", "lowerHeatingSetpoint", "heatingSetpoint", "raiseHeatingSetpoint", "lowerCoolSetpoint",
+		details(["temperature", "mode", "fanMode", "heatSliderControl", "heatingSetpoint", "coolSliderControl", "coolingSetpoint", "refresh"])
-				"coolingSetpoint", "raiseCoolSetpoint", "mode", "fanMode", "thermostatOperatingState", "refresh"])
 	}
 }
 
-def installed() {
+def installed(){
-	// Configure device
+	sendHubCommand(new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSupportedGet().format()))
-	def cmds = []
+	initialize()
-	cmds << new physicalgraph.device.HubAction(zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]).format())
-	cmds << new physicalgraph.device.HubAction(zwave.manufacturerSpecificV2.manufacturerSpecificGet().format())
-	sendHubCommand(cmds)
-	runIn(3, "initialize", [overwrite: true])  // Allow configure command to be sent and acknowledged before proceeding
 }
 
-def updated() {
+def updated(){
-	// If not set update ManufacturerSpecific data
+	initialize()
-	if (!getDataValue("manufacturer")) {
-		sendHubCommand(new physicalgraph.device.HubAction(zwave.manufacturerSpecificV2.manufacturerSpecificGet().format()))
-		runIn(2, "initialize", [overwrite: true])  // Allow configure command to be sent and acknowledged before proceeding
-	} else {
-		initialize()
-	}
 }
 
 def initialize() {
 	// Device-Watch simply pings if no device events received for 32min(checkInterval)
 	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 	unschedule()
-	if (getDataValue("manufacturer") != "Honeywell") {
+	runEvery5Minutes("refresh")
-		runEvery5Minutes("poll")  // This is not necessary for Honeywell Z-wave, but could be for other Z-wave thermostats
+	refresh()
-	}
-	poll()
 }
 
 def parse(String description)
 {
-	def result = null
+	def map = createEvent(zwaveEvent(zwave.parse(description, [0x42:1, 0x43:2, 0x31: 3])))
-	if (description == "updated") {
+	if (!map) {
-	} else {
+		return null
-		def zwcmd = zwave.parse(description, [0x42:1, 0x43:2, 0x31: 3])
+	}
-		if (zwcmd) {
+
-			result = zwaveEvent(zwcmd)
+	def result = [map]
-		} else {
+	if (map.isStateChange && map.name in ["heatingSetpoint","coolingSetpoint","thermostatMode"]) {
-			log.debug "$device.displayName couldn't parse $description"
+		def map2 = [
+			name: "thermostatSetpoint",
+			unit: getTemperatureScale()
+		]
+		if (map.name == "thermostatMode") {
+			state.lastTriedMode = map.value
+			map.data = [supportedThermostatModes:state.supportedThermostatModes]
+			if (map.value == "cool") {
+				map2.value = device.latestValue("coolingSetpoint")
+				log.info "THERMOSTAT, latest cooling setpoint = ${map2.value}"
+			}
+			else {
+				map2.value = device.latestValue("heatingSetpoint")
+				log.info "THERMOSTAT, latest heating setpoint = ${map2.value}"
+			}
 		}
+		else {
+			def mode = device.latestValue("thermostatMode")
+			log.info "THERMOSTAT, latest mode = ${mode}"
+			if ((map.name == "heatingSetpoint" && mode == "heat") || (map.name == "coolingSetpoint" && mode == "cool")) {
+				map2.value = map.value
+				map2.unit = map.unit
+			}
+		}
+		if (map2.value != null) {
+			log.debug "THERMOSTAT, adding setpoint event: $map"
+			result << createEvent(map2)
+		}
+	} else if (map.name == "thermostatFanMode" && map.isStateChange) {
+		state.lastTriedFanMode = map.value
+		map.data = [supportedThermostatFanModes: state.supportedThermostatFanModes]
 	}
-	if (!result) {
+	log.debug "Parse returned $result"
-		return []
+	result
-	}
-	return [result]
 }
 
 // Event Generation
-def zwaveEvent(physicalgraph.zwave.commands.thermostatsetpointv2.ThermostatSetpointReport cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.thermostatsetpointv2.ThermostatSetpointReport cmd)
+{
 	def cmdScale = cmd.scale == 1 ? "F" : "C"
-	def setpoint = getTempInLocalScale(cmd.scaledValue, cmdScale)
+	def map = [:]
-	def unit = getTemperatureScale()
+	map.value = convertTemperatureIfNeeded(cmd.scaledValue, cmdScale, cmd.precision)
+	map.unit = getTemperatureScale()
+	map.displayed = false
 	switch (cmd.setpointType) {
 		case 1:
-			sendEvent(name: "heatingSetpoint", value: setpoint, unit: unit, displayed: false)
+			map.name = "heatingSetpoint"
-			updateThermostatSetpoint("heatingSetpoint", setpoint)
 			break;
 		case 2:
-			sendEvent(name: "coolingSetpoint", value: setpoint, unit: unit, displayed: false)
+			map.name = "coolingSetpoint"
-			updateThermostatSetpoint("coolingSetpoint", setpoint)
 			break;
 		default:
-			log.debug "unknown setpointType $cmd.setpointType"
+			return [:]
-			return
 	}
 	// So we can respond with same format
 	state.size = cmd.size
 	state.scale = cmd.scale
 	state.precision = cmd.precision
-	// Make sure return value is not result from above expresion
+	map
-	return 0
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv3.SensorMultilevelReport cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv3.SensorMultilevelReport cmd)
+{
 	def map = [:]
 	if (cmd.sensorType == 1) {
-		map.value = getTempInLocalScale(cmd.scaledSensorValue, cmd.scale == 1 ? "F" : "C")
+		map.value = convertTemperatureIfNeeded(cmd.scaledSensorValue, cmd.scale == 1 ? "F" : "C", cmd.precision)
 		map.unit = getTemperatureScale()
 		map.name = "temperature"
-		updateThermostatSetpoint(null, null)
 	} else if (cmd.sensorType == 5) {
 		map.value = cmd.scaledSensorValue
 		map.unit = "%"
 		map.name = "humidity"
 	}
-	sendEvent(map)
+	map
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport cmd)
-	def map = [name: "thermostatOperatingState"]
+{
+	def map = [:]
 	switch (cmd.operatingState) {
 		case physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport.OPERATING_STATE_IDLE:
 			map.value = "idle"
@@ -216,9 +251,8 @@ def zwaveEvent(physicalgraph.zwave.commands.thermostatoperatingstatev1.Thermosta
 			map.value = "vent economizer"
 			break
 	}
-	// Makes sure we have the correct thermostat mode
+	map.name = "thermostatOperatingState"
-	sendHubCommand(new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeGet().format()))
+	map
-	sendEvent(map)
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatfanstatev1.ThermostatFanStateReport cmd) {
@@ -234,11 +268,11 @@ def zwaveEvent(physicalgraph.zwave.commands.thermostatfanstatev1.ThermostatFanSt
 			map.value = "running high"
 			break
 	}
-	sendEvent(map)
+	map
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport cmd) {
-	def map = [name: "thermostatMode", data:[supportedThermostatModes: state.supportedModes]]
+	def map = [:]
 	switch (cmd.mode) {
 		case physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport.MODE_OFF:
 			map.value = "off"
@@ -256,24 +290,26 @@ def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeRepor
 			map.value = "auto"
 			break
 	}
-	sendEvent(map)
+	map.name = "thermostatMode"
-	updateThermostatSetpoint(null, null)
+	map
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeReport cmd) {
-	def map = [name: "thermostatFanMode", data:[supportedThermostatFanModes: state.supportedFanModes]]
+	def map = [:]
 	switch (cmd.fanMode) {
 		case physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeReport.FAN_MODE_AUTO_LOW:
-			map.value = "auto"
+			map.value = "auto" // "fanAuto"
 			break
 		case physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeReport.FAN_MODE_LOW:
-			map.value = "on"
+			map.value = "on" // "fanOn"
 			break
 		case physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeReport.FAN_MODE_CIRCULATION:
-			map.value = "circulate"
+			map.value = "circulate" // "fanCirculate"
 			break
 	}
-	sendEvent(map)
+	map.name = "thermostatFanMode"
+	map.displayed = false
+	map
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeSupportedReport cmd) {
@@ -284,34 +320,24 @@ def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeSuppo
 	if(cmd.auto) { supportedModes << "auto" }
 	if(cmd.auxiliaryemergencyHeat) { supportedModes << "emergency heat" }
 
-	state.supportedModes = supportedModes
+	state.supportedThermostatModes = supportedModes
 	sendEvent(name: "supportedThermostatModes", value: supportedModes, displayed: false)
+	return [:]
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeSupportedReport cmd) {
 	def supportedFanModes = []
-	if(cmd.auto) { supportedFanModes << "auto" }
+	if(cmd.auto) { supportedFanModes << "auto" } // "fanAuto "
-	if(cmd.circulation) { supportedFanModes << "circulate" }
+	if(cmd.circulation) { supportedFanModes << "circulate" } // "fanCirculate"
-	if(cmd.low) { supportedFanModes << "on" }
+	if(cmd.low) { supportedFanModes << "on" } // "fanOn"
 
-	state.supportedFanModes = supportedFanModes
+	state.supportedThermostatFanModes = supportedFanModes
 	sendEvent(name: "supportedThermostatFanModes", value: supportedFanModes, displayed: false)
-}
+	return [:]
-
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
-	if (cmd.manufacturerName) {
-		updateDataValue("manufacturer", cmd.manufacturerName)
-	}
-	if (cmd.productTypeId) {
-		updateDataValue("productTypeId", cmd.productTypeId.toString())
-	}
-	if (cmd.productId) {
-		updateDataValue("productId", cmd.productId.toString())
-	}
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
-	log.debug "Zwave BasicReport: $cmd"
+	log.debug "Zwave event received: $cmd"
 }
 
 def zwaveEvent(physicalgraph.zwave.Command cmd) {
@@ -320,16 +346,6 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 
 // Command Implementations
 def refresh() {
-	// Only allow refresh every 2 minutes to prevent flooding the Zwave network
-	def timeNow = now()
-	if (!state.refreshTriggeredAt || (2 * 60 * 1000 < (timeNow - state.refreshTriggeredAt))) {
-		state.refreshTriggeredAt = timeNow
-		// use runIn with overwrite to prevent multiple DTH instances run before state.refreshTriggeredAt has been saved
-		runIn(2, "poll", [overwrite: true])
-	}
-}
-
-def poll() {
 	def cmds = []
 	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSupportedGet().format())
 	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeSupportedGet().format())
@@ -342,152 +358,64 @@ def poll() {
 	sendHubCommand(cmds)
 }
 
-def raiseHeatingSetpoint() {
+def quickSetHeat(degrees) {
-	alterSetpoint(true, "heatingSetpoint")
+	setHeatingSetpoint(degrees, 1000)
 }
 
-def lowerHeatingSetpoint() {
+def setHeatingSetpoint(degrees, delay = 30000) {
-	alterSetpoint(false, "heatingSetpoint")
+	setHeatingSetpoint(degrees.toDouble(), delay)
 }
 
-def raiseCoolSetpoint() {
+def setHeatingSetpoint(Double degrees, Integer delay = 30000) {
-	alterSetpoint(true, "coolingSetpoint")
+	log.trace "setHeatingSetpoint($degrees, $delay)"
+	def deviceScale = state.scale ?: 1
+	def deviceScaleString = deviceScale == 2 ? "C" : "F"
+    def locationScale = getTemperatureScale()
+	def p = (state.precision == null) ? 1 : state.precision
+
+    def convertedDegrees
+    if (locationScale == "C" && deviceScaleString == "F") {
+    	convertedDegrees = celsiusToFahrenheit(degrees)
+    } else if (locationScale == "F" && deviceScaleString == "C") {
+    	convertedDegrees = fahrenheitToCelsius(degrees)
+    } else {
+    	convertedDegrees = degrees
+    }
+
+	delayBetween([
+		zwave.thermostatSetpointV1.thermostatSetpointSet(setpointType: 1, scale: deviceScale, precision: p, scaledValue: convertedDegrees).format(),
+		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format()
+	], delay)
 }
 
-def lowerCoolSetpoint() {
+def quickSetCool(degrees) {
-	alterSetpoint(false, "coolingSetpoint")
+	setCoolingSetpoint(degrees, 1000)
 }
 
-// Adjusts nextHeatingSetpoint either .5° C/1° F) if raise true/false
+def setCoolingSetpoint(degrees, delay = 30000) {
-def alterSetpoint(raise, setpoint) {
+	setCoolingSetpoint(degrees.toDouble(), delay)
-	def locationScale = getTemperatureScale()
-	def deviceScale = (state.scale == 1) ? "F" : "C"
-	def heatingSetpoint = getTempInLocalScale("heatingSetpoint")
-	def coolingSetpoint = getTempInLocalScale("coolingSetpoint")
-	def targetValue = (setpoint == "heatingSetpoint") ? heatingSetpoint : coolingSetpoint
-	def delta = (locationScale == "F") ? 1 : 0.5
-	targetValue += raise ? delta : - delta
-
-	def data = enforceSetpointLimits(setpoint, [targetValue: targetValue, heatingSetpoint: heatingSetpoint, coolingSetpoint: coolingSetpoint])
-	// update UI without waiting for the device to respond, this to give user a smoother UI experience
-	// also, as runIn's have to overwrite and user can change heating/cooling setpoint separately separate runIn's have to be used
-	if (data.targetHeatingSetpoint) {
-		sendEvent("name": "heatingSetpoint", "value": getTempInLocalScale(data.targetHeatingSetpoint, deviceScale),
-				unit: getTemperatureScale(), eventType: "ENTITY_UPDATE", displayed: false)
-	}
-	if (data.targetCoolingSetpoint) {
-		sendEvent("name": "coolingSetpoint", "value": getTempInLocalScale(data.targetCoolingSetpoint, deviceScale),
-				unit: getTemperatureScale(), eventType: "ENTITY_UPDATE", displayed: false)
-	}
-	if (data.targetHeatingSetpoint && data.targetCoolingSetpoint) {
-		runIn(5, "updateHeatingSetpoint", [data: data, overwrite: true])
-	} else if (setpoint == "heatingSetpoint" && data.targetHeatingSetpoint) {
-		runIn(5, "updateHeatingSetpoint", [data: data, overwrite: true])
-	} else if (setpoint == "coolingSetpoint" && data.targetCoolingSetpoint) {
-		runIn(5, "updateCoolingSetpoint", [data: data, overwrite: true])
-	}
 }
 
-def updateHeatingSetpoint(data) {
+def setCoolingSetpoint(Double degrees, Integer delay = 30000) {
-	updateSetpoints(data)
+    log.trace "setCoolingSetpoint($degrees, $delay)"
-}
+	def deviceScale = state.scale ?: 1
+	def deviceScaleString = deviceScale == 2 ? "C" : "F"
+    def locationScale = getTemperatureScale()
+	def p = (state.precision == null) ? 1 : state.precision
 
-def updateCoolingSetpoint(data) {
+    def convertedDegrees
-	updateSetpoints(data)
+    if (locationScale == "C" && deviceScaleString == "F") {
-}
+    	convertedDegrees = celsiusToFahrenheit(degrees)
+    } else if (locationScale == "F" && deviceScaleString == "C") {
+    	convertedDegrees = fahrenheitToCelsius(degrees)
+    } else {
+    	convertedDegrees = degrees
+    }
 
-def enforceSetpointLimits(setpoint, data) {
+	delayBetween([
-	def locationScale = getTemperatureScale() 
+		zwave.thermostatSetpointV1.thermostatSetpointSet(setpointType: 2, scale: deviceScale, precision: p,  scaledValue: convertedDegrees).format(),
-	def minSetpoint = (setpoint == "heatingSetpoint") ? getTempInDeviceScale(40, "F") : getTempInDeviceScale(50, "F")
+		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format()
-	def maxSetpoint = (setpoint == "heatingSetpoint") ? getTempInDeviceScale(90, "F") : getTempInDeviceScale(99, "F")
+	], delay)
-	def deadband = (state.scale == 1) ? 3 : 2  // 3°F, 2°C
-	def targetValue = getTempInDeviceScale(data.targetValue, locationScale)
-	def heatingSetpoint = null
-	def coolingSetpoint = null
-	// Enforce min/mix for setpoints
-	if (targetValue > maxSetpoint) {
-		targetValue = maxSetpoint
-	} else if (targetValue < minSetpoint) {
-		targetValue = minSetpoint
-	}
-	// Enforce 3 degrees F deadband between setpoints
-	if (setpoint == "heatingSetpoint") {
-		heatingSetpoint = targetValue 
-		coolingSetpoint = (heatingSetpoint + deadband > getTempInDeviceScale(data.coolingSetpoint, locationScale)) ? heatingSetpoint + deadband : null
-	}
-	if (setpoint == "coolingSetpoint") {
-		coolingSetpoint = targetValue
-		heatingSetpoint = (coolingSetpoint - deadband < getTempInDeviceScale(data.heatingSetpoint, locationScale)) ? coolingSetpoint - deadband : null
-	}
-	return [targetHeatingSetpoint: heatingSetpoint, targetCoolingSetpoint: coolingSetpoint]
-}
-
-def setHeatingSetpoint(degrees) {
-	if (degrees) {
-		state.heatingSetpoint = degrees.toDouble()
-		runIn(2, "updateSetpoints", [overwrite: true])
-	}
-}
-
-def setCoolingSetpoint(degrees) {
-	if (degrees) {
-		state.coolingSetpoint = degrees.toDouble()
-		runIn(2, "updateSetpoints", [overwrite: true])
-	}
-}
-
-def updateSetpoints() {
-	def deviceScale = (state.scale == 1) ? "F" : "C"
-	def data = [targetHeatingSetpoint: null, targetCoolingSetpoint: null]
-	def heatingSetpoint = getTempInLocalScale("heatingSetpoint")
-	def coolingSetpoint = getTempInLocalScale("coolingSetpoint")
-	if (state.heatingSetpoint) {
-		data = enforceSetpointLimits("heatingSetpoint", [targetValue: state.heatingSetpoint,
-				heatingSetpoint: heatingSetpoint, coolingSetpoint: coolingSetpoint])
-	}
-	if (state.coolingSetpoint) {
-		heatingSetpoint = data.targetHeatingSetpoint ? getTempInLocalScale(data.targetHeatingSetpoint, deviceScale) : heatingSetpoint
-		coolingSetpoint = data.targetCoolingSetpoint ? getTempInLocalScale(data.targetCoolingSetpoint, deviceScale) : coolingSetpoint
-		data = enforceSetpointLimits("coolingSetpoint", [targetValue: state.coolingSetpoint,
-				heatingSetpoint: heatingSetpoint, coolingSetpoint: coolingSetpoint])
-		data.targetHeatingSetpoint = data.targetHeatingSetpoint ?: heatingSetpoint
-	}
-	state.heatingSetpoint = null
-	state.coolingSetpoint = null
-	updateSetpoints(data)
-}
-
-def updateSetpoints(data) {
-	def cmds = []
-	if (data.targetHeatingSetpoint) {
-		cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointSet(
-					setpointType: 1, scale: state.scale, precision: state.precision, scaledValue: data.targetHeatingSetpoint).format())
-	}
-	if (data.targetCoolingSetpoint) {
-		cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointSet(
-					setpointType: 2, scale: state.scale, precision: state.precision, scaledValue: data.targetCoolingSetpoint).format())
-	}
-	sendHubCommand(cmds)
-}
-
-// thermostatSetpoint is not displayed by any tile as it can't be predictable calculated due to
-// the device's quirkiness but it is defined by the capability so it must be set, set it to the most likely value
-def updateThermostatSetpoint(setpoint, value) {
-	def scale = getTemperatureScale()
-	def heatingSetpoint = (setpoint == "heatingSetpoint") ? value : getTempInLocalScale("heatingSetpoint")
-	def coolingSetpoint = (setpoint == "coolingSetpoint") ? value : getTempInLocalScale("coolingSetpoint")
-	def mode = device.currentValue("thermostatMode")
-	def thermostatSetpoint = heatingSetpoint    // corresponds to (mode == "heat" || mode == "emergency heat")
-	if (mode == "cool") {
-		thermostatSetpoint = coolingSetpoint
-	} else if (mode == "auto" || mode == "off") {
-		// Set thermostatSetpoint to the setpoint closest to the current temperature
-		def currentTemperature = getTempInLocalScale("temperature")
-		if (currentTemperature > (heatingSetpoint + coolingSetpoint)/2) {
-			thermostatSetpoint = coolingSetpoint
-		}
-	}
-	sendEvent(name: "thermostatSetpoint", value: thermostatSetpoint, unit: getTemperatureScale())
 }
 
 /**
@@ -495,74 +423,76 @@ def updateThermostatSetpoint(setpoint, value) {
  * */
 def ping() {
 	log.debug "ping() called"
-	// Just get Operating State there's no need to flood more commands
+	poll()
-	sendHubCommand(new physicalgraph.device.HubAction(zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format()))
+}
+
+def modes() {
+	return state.supportedThermostatModes
 }
 
 def switchMode() {
-	def currentMode = device.currentValue("thermostatMode")
+	def currentMode = device.currentState("thermostatMode")?.value
-	def supportedModes = state.supportedModes
+	def lastTriedMode = state.lastTriedMode ?: currentMode ?: ["off"]
-	if (supportedModes) {
+	def supportedModes = getDataByName("supportedThermostatModes")
-		def next = { supportedModes[supportedModes.indexOf(it) + 1] ?: supportedModes[0] }
+	def modeOrder = modes()
-		def nextMode = next(currentMode)
+	def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
-		runIn(2, "setThermostatMode", [data: [nextMode: nextMode], overwrite: true])
+	def nextMode = next(lastTriedMode)
-	} else {
+	if (supportedModes?.contains(currentMode)) {
-		log.warn "supportedModes not defined"
+		while (!supportedModes.contains(nextMode) && nextMode != "off") {
-		getSupportedModes()
+			nextMode = next(nextMode)
+		}
 	}
+	state.lastTriedMode = nextMode
+	delayBetween([
+		zwave.thermostatModeV2.thermostatModeSet(mode: modeMap[nextMode]).format(),
+		zwave.thermostatModeV2.thermostatModeGet().format()
+	], 1000)
 }
 
 def switchToMode(nextMode) {
-	def supportedModes = state.supportedModes
+	def supportedModes = getDataByName("supportedThermostatModes")
-	if (supportedModes) {
+	if(supportedModes && !supportedModes.contains(nextMode)) log.warn "thermostat mode '$nextMode' is not supported"
-		if (supportedModes.contains(nextMode)) {
+	if (nextMode in modes()) {
-			runIn(2, "setThermostatMode", [data: [nextMode: nextMode], overwrite: true])
+		state.lastTriedMode = nextMode
-		} else {
+		"$nextMode"()
-			log.debug("ThermostatMode $nextMode is not supported by ${device.displayName}")
-		}
 	} else {
-		log.warn "supportedModes not defined"
+		log.debug("no mode method '$nextMode'")
-		getSupportedModes()
 	}
 }
 
-def getSupportedModes() {
-	def cmds = []
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSupportedGet().format())
-	sendHubCommand(cmds)
-}
-
 def switchFanMode() {
-	def currentMode = device.currentValue("thermostatFanMode")
+	def currentMode = device.currentState("thermostatFanMode")?.value
-	def supportedFanModes = state.supportedFanModes
+	def lastTriedMode = state.lastTriedFanMode ?: currentMode ?: ["off"]
-	if (supportedFanModes) {
+	def supportedModes = getDataByName("supportedThermostatFanModes") ?: ["auto", "on"]
-		def next = { supportedFanModes[supportedFanModes.indexOf(it) + 1] ?: supportedFanModes[0] }
+	def modeOrder = state.supportedThermostatFanModes
-		def nextMode = next(currentMode)
+	def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
-		runIn(2, "setThermostatFanMode", [data: [nextMode: nextMode], overwrite: true])
+	def nextMode = next(lastTriedMode)
-	} else {
+	while (!supportedModes?.contains(nextMode) && nextMode != "auto") { // "fanAuto"
-		log.warn "supportedFanModes not defined"
+		nextMode = next(nextMode)
-		getSupportedFanModes()
 	}
+	switchToFanMode(nextMode)
 }
 
 def switchToFanMode(nextMode) {
-	def supportedFanModes = state.supportedFanModes
+	def supportedFanModes = getDataByName("supportedThermostatFanModes")
-	if (supportedFanModes) {
+	if(supportedFanModes && !supportedFanModes.contains(nextMode)) log.warn "thermostat mode '$nextMode' is not supported"
-		if (supportedFanModes.contains(nextMode)) {
+
-			runIn(2, "setThermostatFanMode", [data: [nextMode: nextMode], overwrite: true])
+	def returnCommand
-		} else {
+	if (nextMode == "auto") { // "fanAuto"
-			log.debug("FanMode $nextMode is not supported by ${device.displayName}")
+		returnCommand = fanAuto()
-		}
+	} else if (nextMode == "on") { // "fanOn"
+		returnCommand = fanOn()
+	} else if (nextMode == "circulate") { // "fanCirculate"
+		returnCommand = fanCirculate()
 	} else {
-		log.warn "supportedFanModes not defined"
+		log.debug("no fan mode '$nextMode'")
-		getSupportedFanModes()
 	}
+	if(returnCommand) state.lastTriedFanMode = nextMode
+	returnCommand
 }
 
-def getSupportedFanModes() {
+def getDataByName(String name) {
-	def cmds = []
+	state[name] ?: device.getDataValue(name)
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeSupportedGet().format())
-	sendHubCommand(cmds)
 }
 
 def getModeMap() { [
@@ -574,14 +504,10 @@ def getModeMap() { [
 ]}
 
 def setThermostatMode(String value) {
-	switchToMode(value)
+	delayBetween([
-}
+		zwave.thermostatModeV2.thermostatModeSet(mode: modeMap[value]).format(),
-
+		zwave.thermostatModeV2.thermostatModeGet().format()
-def setThermostatMode(data) {
+	], standardDelay)
-	def cmds = []
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSet(mode: modeMap[data.nextMode]).format())
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeGet().format())
-	sendHubCommand(cmds)
 }
 
 def getFanModeMap() { [
@@ -591,83 +517,69 @@ def getFanModeMap() { [
 ]}
 
 def setThermostatFanMode(String value) {
-	switchToFanMode(value)
+	delayBetween([
-}
+		zwave.thermostatFanModeV3.thermostatFanModeSet(fanMode: fanModeMap[value]).format(),
-
+		zwave.thermostatFanModeV3.thermostatFanModeGet().format()
-def setThermostatFanMode(data) {
+	], standardDelay)
-	def cmds = []
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeSet(fanMode: fanModeMap[data.nextMode]).format())
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeGet().format())
-	sendHubCommand(cmds)
 }
 
 def off() {
-	switchToMode("off")
+	delayBetween([
+		zwave.thermostatModeV2.thermostatModeSet(mode: 0).format(),
+		zwave.thermostatModeV2.thermostatModeGet().format()
+	], standardDelay)
 }
 
 def heat() {
-	switchToMode("heat")
+	delayBetween([
+		zwave.thermostatModeV2.thermostatModeSet(mode: 1).format(),
+		zwave.thermostatModeV2.thermostatModeGet().format()
+	], standardDelay)
 }
 
 def emergencyHeat() {
-	switchToMode("emergency heat")
+	delayBetween([
+		zwave.thermostatModeV2.thermostatModeSet(mode: 4).format(),
+		zwave.thermostatModeV2.thermostatModeGet().format()
+	], standardDelay)
 }
 
 def cool() {
-	switchToMode("cool")
+	delayBetween([
+		zwave.thermostatModeV2.thermostatModeSet(mode: 2).format(),
+		zwave.thermostatModeV2.thermostatModeGet().format()
+	], standardDelay)
 }
 
 def auto() {
-	switchToMode("auto")
+	delayBetween([
+		zwave.thermostatModeV2.thermostatModeSet(mode: 3).format(),
+		zwave.thermostatModeV2.thermostatModeGet().format()
+	], standardDelay)
 }
 
 def fanOn() {
-	switchToFanMode("on")
+	delayBetween([
+		zwave.thermostatFanModeV3.thermostatFanModeSet(fanMode: 1).format(),
+		zwave.thermostatFanModeV3.thermostatFanModeGet().format()
+	], standardDelay)
 }
 
 def fanAuto() {
-	switchToFanMode("auto")
+	delayBetween([
+		zwave.thermostatFanModeV3.thermostatFanModeSet(fanMode: 0).format(),
+		zwave.thermostatFanModeV3.thermostatFanModeGet().format()
+	], standardDelay)
 }
 
 def fanCirculate() {
-	switchToFanMode("circulate")
+	delayBetween([
+		zwave.thermostatFanModeV3.thermostatFanModeSet(fanMode: 6).format(),
+		zwave.thermostatFanModeV3.thermostatFanModeGet().format()
+	], standardDelay)
 }
 
-// Get stored temperature from currentState in current local scale
+private getStandardDelay() {
-def getTempInLocalScale(state) {
+	1000
-	def temp = device.currentState(state)
-	if (temp && temp.value && temp.unit) {
-		return getTempInLocalScale(temp.value.toBigDecimal(), temp.unit)
-	}
-	return 0
 }
 
-// get/convert temperature to current local scale
-def getTempInLocalScale(temp, scale) {
-	if (temp && scale) {
-		def scaledTemp = convertTemperatureIfNeeded(temp.toBigDecimal(), scale).toDouble()
-		return (getTemperatureScale() == "F" ? scaledTemp.round(0).toInteger() : roundC(scaledTemp))
-	}
-	return 0
-}
-
-def getTempInDeviceScale(state) {
-	def temp = device.currentState(state)
-	if (temp && temp.value && temp.unit) {
-		return getTempInDeviceScale(temp.value.toBigDecimal(), temp.unit)
-	}
-	return 0
-}
-
-def getTempInDeviceScale(temp, scale) {
-	if (temp && scale) {
-		def deviceScale = (state.scale == 1) ? "F" : "C"
-		return (deviceScale == scale) ? temp :
-				(deviceScale == "F" ? celsiusToFahrenheit(temp) : roundC(fahrenheitToCelsius(temp)))
-	}
-	return 0
-}
-
-def roundC (tempC) {
-	return (Math.round(tempC.toDouble() * 2))/2
-}