MSA-2097: Simple Hue Bulb Template.

devicetypes/smartthings/aeon-multisensor-6.src/README.md

@@ -27,9 +27,13 @@ Works with:
 ## Device Health
 
 Aeon Labs MultiSensor 6 is polled by the hub.
-Aeon MultiSensor reports in once every hour.
+As of hubCore version 0.14.38 the hub sends up reports every 15 minutes regardless of whether the state changed.
+Device-Watch allows 2 check-in misses from device plus some lag time. So Check-in interval = (2*15 + 2)mins = 32 mins.
+Not to mention after going OFFLINE when the device is plugged back in, it might take a considerable amount of time for
+the device to appear as ONLINE again. This is because if this listening device does not respond to two poll requests in a row,
+it is not polled for 5 minutes by the hub. This can delay up the process of being marked ONLINE by quite some time.
 
-* __122min__ checkInterval
+* __32min__ checkInterval
 
 ## Troubleshooting
 

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

@@ -130,13 +130,13 @@ metadata {
 }
 
 def installed(){
-// Device-Watch simply pings if no device events received for 122min(checkInterval)
+// Device-Watch simply pings if no device events received for 32min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 }
 
 def updated() {
-// Device-Watch simply pings if no device events received for 122min(checkInterval)
+// Device-Watch simply pings if no device events received for 32min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 	log.debug "Updated with settings: ${settings}"
 	log.debug "${device.displayName} is now ${device.latestValue("powerSupply")}"
 

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

@@ -1,203 +1,202 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
+
-/**
+/**
- *  Hue Bulb
+ *  Hue Bulb
- *
+ *
- *  Philips Hue Type "Extended Color Light"
+ *  Philips Hue Type "Extended Color Light"
- *
+ *
- *  Author: SmartThings
+ *  Author: SmartThings
- */
+ */
-
+
-// for the UI
+// for the UI
-metadata {
+metadata {
-	// Automatically generated. Make future change here.
+	// Automatically generated. Make future change here.
-	definition (name: "Hue Bulb", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "Hue Bulb", namespace: "smartthings", author: "SmartThings") {
-		capability "Switch Level"
+		capability "Switch Level"
-		capability "Actuator"
+		capability "Actuator"
-		capability "Color Control"
+		capability "Color Control"
-		capability "Color Temperature"
+		capability "Color Temperature"
-		capability "Switch"
+		capability "Switch"
-		capability "Refresh"
+		capability "Refresh"
-		capability "Sensor"
+		capability "Sensor"
-		capability "Health Check"
+		capability "Health Check"
-		capability "Light"
+		capability "Light"
-
+
-		command "setAdjustedColor"
+		command "setAdjustedColor"
-        command "reset"
+        command "reset"
-        command "refresh"
+        command "refresh"
-	}
+	}
-
+
-	simulator {
+	simulator {
-		// TODO: define status and reply messages here
+		// TODO: define status and reply messages here
-	}
+	}
-
+
-	tiles (scale: 2){
+	tiles (scale: 2){
-		multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
+		multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
-			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
+			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
-				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
-				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-			}
+			}
-			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
+			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
-				attributeState "level", action:"switch level.setLevel", range:"(0..100)"
+				attributeState "level", action:"switch level.setLevel", range:"(0..100)"
-            }
+            }
-			tileAttribute ("device.color", key: "COLOR_CONTROL") {
+			tileAttribute ("device.color", key: "COLOR_CONTROL") {
-				attributeState "color", action:"setAdjustedColor"
+				attributeState "color", action:"setAdjustedColor"
-			}
+			}
-		}
+		}
-
+
-    controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
+    controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
-        state "colorTemperature", action:"color temperature.setColorTemperature"
+        state "colorTemperature", action:"color temperature.setColorTemperature"
-    }
+    }
-
+
-    valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+    valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-        state "colorTemperature", label: 'WHITES'
+        state "colorTemperature", label: 'WHITES'
-    }
+    }
-
+
-		standardTile("reset", "device.reset", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
+		standardTile("reset", "device.reset", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
-			state "default", label:"Reset To White", action:"reset", icon:"st.lights.philips.hue-single"
+			state "default", label:"Reset To White", action:"reset", icon:"st.lights.philips.hue-single"
-		}
+		}
-
+
-		standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
+		standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
-			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
+		}
-
+
-		main(["rich-control"])
+		main(["rich-control"])
-		details(["rich-control", "colorTempSliderControl", "colorTemp", "reset", "refresh"])
+		details(["rich-control", "colorTempSliderControl", "colorTemp", "reset", "refresh"])
-	}
+	}
-}
+}
-
+
-def initialize() {
+def initialize() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
-}
+}
-
+
-void installed() {
+void installed() {
-	log.debug "installed()"
+	log.debug "installed()"
-	initialize()
+	initialize()
-}
+}
-
+
-def updated() {
+def updated() {
-	log.debug "updated()"
+	log.debug "updated()"
-	initialize()
+	initialize()
-}
+}
-
+
-// parse events into attributes
+// parse events into attributes
-def parse(description) {
+def parse(description) {
-	log.debug "parse() - $description"
+	log.debug "parse() - $description"
-	def results = []
+	def results = []
-
+
-	def map = description
+	def map = description
-	if (description instanceof String)  {
+	if (description instanceof String)  {
-		log.debug "Hue Bulb stringToMap - ${map}"
+		log.debug "Hue Bulb stringToMap - ${map}"
-		map = stringToMap(description)
+		map = stringToMap(description)
-	}
+	}
-
+
-	if (map?.name && map?.value) {
+	if (map?.name && map?.value) {
-		results << createEvent(name: "${map?.name}", value: "${map?.value}")
+		results << createEvent(name: "${map?.name}", value: "${map?.value}")
-	}
+	}
-	results
+	results
-}
+}
-
+
-// handle commands
+// handle commands
-void on() {
+void on() {
-	log.trace parent.on(this)
+	log.trace parent.on(this)
-}
+}
-
+
-void off() {
+void off() {
-	log.trace parent.off(this)
+	log.trace parent.off(this)
-}
+}
-
+
-void setLevel(percent) {
+void setLevel(percent) {
-    log.debug "Executing 'setLevel'"
+    log.debug "Executing 'setLevel'"
-    if (verifyPercent(percent)) {
+    if (verifyPercent(percent)) {
-	    log.trace parent.setLevel(this, percent)
+	    log.trace parent.setLevel(this, percent)
-    }
+    }
-}
+}
-
+
-void setSaturation(percent) {
+void setSaturation(percent) {
-    log.debug "Executing 'setSaturation'"
+    log.debug "Executing 'setSaturation'"
-    if (verifyPercent(percent)) {
+    if (verifyPercent(percent)) {
-	    log.trace parent.setSaturation(this, percent)
+	    log.trace parent.setSaturation(this, percent)
-    }
+    }
-}
+}
-
+
-void setHue(percent) {
+void setHue(percent) {
-    log.debug "Executing 'setHue'"
+    log.debug "Executing 'setHue'"
-    if (verifyPercent(percent)) {
+    if (verifyPercent(percent)) {
-	    log.trace parent.setHue(this, percent)
+	    log.trace parent.setHue(this, percent)
-    }
+    }
-}
+}
-
+
-void setColor(value) {
+void setColor(value) {
-    def events = []
+    def events = []
-    def validValues = [:]
+    def validValues = [:]
-
+
-    if (verifyPercent(value.hue)) {
+    if (verifyPercent(value.hue)) {
-        validValues.hue = value.hue
+        validValues.hue = value.hue
-    }
+    }
-    if (verifyPercent(value.saturation)) {
+    if (verifyPercent(value.saturation)) {
-        validValues.saturation = value.saturation
+        validValues.saturation = value.saturation
-    }
+    }
-    if (value.hex != null) {
+    if (value.hex != null) {
-        if (value.hex ==~ /^\#([A-Fa-f0-9]){6}$/) {
+        if (value.hex ==~ /^\#([A-Fa-f0-9]){6}$/) {
-            validValues.hex = value.hex
+            validValues.hex = value.hex
-        } else {
+        } else {
-            log.warn "$value.hex is not a valid color"
+            log.warn "$value.hex is not a valid color"
-        }
+        }
-    }
+    }
-    if (verifyPercent(value.level)) {
+    if (verifyPercent(value.level)) {
-        validValues.level = value.level
+        validValues.level = value.level
-    }
+    }
-    if (value.switch == "off" || (value.level != null && value.level <= 0)) {
+    if (value.switch == "off" || (value.level != null && value.level <= 0)) {
-        validValues.switch = "off"
+        validValues.switch = "off"
-    } else {
+    } else {
-        validValues.switch = "on"
+        validValues.switch = "on"
-    }
+    }
-    if (!validValues.isEmpty()) {
+    if (!validValues.isEmpty()) {
-	    log.trace parent.setColor(this, validValues)
+	    log.trace parent.setColor(this, validValues)
-    }
+    }
-}
+}
-
+
-void reset() {
+void reset() {
-    log.debug "Executing 'reset'"
+    log.debug "Executing 'reset'"
-	setColorTemperature(4000)
+	setColorTemperature(4000)
-}
+}
-
+
-void setAdjustedColor(value) {
+void setAdjustedColor(value) {
-    if (value) {
+    if (value) {
-        log.trace "setAdjustedColor: ${value}"
+        log.trace "setAdjustedColor: ${value}"
-        def adjusted = value + [:]
+        def adjusted = value + [:]
-        // Needed because color picker always sends 100
+        // Needed because color picker always sends 100
-        adjusted.level = null
+        adjusted.level = null
-	    setColor(adjusted)
+	    setColor(adjusted)
-    } else {
+    } else {
-        log.warn "Invalid color input $value"
+        log.warn "Invalid color input $value"
-    }
+    }
-}
+}
-
+
-void setColorTemperature(value) {
+void setColorTemperature(value) {
-    if (value) {
+    if (value) {
-        log.trace "setColorTemperature: ${value}k"
+        log.trace "setColorTemperature: ${value}k"
-	    log.trace parent.setColorTemperature(this, value)
+	    log.trace parent.setColorTemperature(this, value)
-    } else {
+    } else {
-        log.warn "Invalid color temperature $value"
+        log.warn "Invalid color temperature $value"
-    }
+    }
-}
+}
-
+
-void refresh() {
+void refresh() {
-    log.debug "Executing 'refresh'"
+    log.debug "Executing 'refresh'"
-    parent?.manualRefresh()
+    parent?.manualRefresh()
-}
+}
-
+
-def verifyPercent(percent) {
+def verifyPercent(percent) {
-    if (percent == null)
+    if (percent == null)
-        return false
+        return false
-    else if (percent >= 0 && percent <= 100) {
+    else if (percent >= 0 && percent <= 100) {
-        return true
+        return true
-    } else {
+    } else {
-        log.warn "$percent is not 0-100"
+        log.warn "$percent is not 0-100"
-        return false
+        return false
-    }
+    }
-}
+}
-

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

@@ -171,8 +171,8 @@ private Map getBatteryResult(rawValue) {
 			def pct = batteryMap[volts]
 			result.value = pct
 		} else {
-			def minVolts = 2.4
+			def minVolts = 2.1
-			def maxVolts = 2.7
+			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
 			def roundedPct = Math.round(pct * 100)
 			if (roundedPct <= 0)

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

@@ -274,7 +274,7 @@ private Map getBatteryResult(rawValue) {
 			result.value = pct
 		} else {
 			def minVolts = 2.1
-			def maxVolts = 2.7
+			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
 			def roundedPct = Math.round(pct * 100)
 			if (roundedPct <= 0)

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

@@ -15,9 +15,10 @@ metadata {
 	definition (name: "Z-Wave Thermostat", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Temperature Measurement"
+		capability "Relative Humidity Measurement"
 		capability "Thermostat"
 		capability "Configuration"
-		capability "Refresh"
+		capability "Polling"
 		capability "Sensor"
 		capability "Health Check"
 		
@@ -116,7 +117,7 @@ metadata {
 			state "cool", label:'${currentValue}° cool', backgroundColor:"#ffffff"
 		}
 		standardTile("refresh", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
-			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
+			state "default", action:"polling.poll", icon:"st.secondary.refresh"
 		}
 		main "temperature"
 		details(["temperature", "mode", "fanMode", "heatSliderControl", "heatingSetpoint", "coolSliderControl", "coolingSetpoint", "refresh"])
@@ -124,20 +125,13 @@ metadata {
 }
 
 def installed(){
-	sendHubCommand(new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSupportedGet().format()))
+	// Device-Watch simply pings if no device events received for 32min(checkInterval)
-	initialize()
+	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 }
 
 def updated(){
-	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()
-	runEvery5Minutes("refresh")
-	refresh()
 }
 
 def parse(String description)
@@ -155,7 +149,6 @@ def parse(String description)
 		]
 		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}"
@@ -179,7 +172,6 @@ def parse(String description)
 		}
 	} else if (map.name == "thermostatFanMode" && map.isStateChange) {
 		state.lastTriedFanMode = map.value
-		map.data = [supportedThermostatFanModes: state.supportedThermostatFanModes]
 	}
 	log.debug "Parse returned $result"
 	result
@@ -313,26 +305,26 @@ def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanMod
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeSupportedReport cmd) {
-	def supportedModes = []
+	def supportedModes = ""
-	if(cmd.off) { supportedModes << "off" }
+	if(cmd.off) { supportedModes += "off " }
-	if(cmd.heat) { supportedModes << "heat" }
+	if(cmd.heat) { supportedModes += "heat " }
-	if(cmd.cool) { supportedModes << "cool" }
+	if(cmd.auxiliaryemergencyHeat) { supportedModes += "emergency heat " }
-	if(cmd.auto) { supportedModes << "auto" }
+	if(cmd.cool) { supportedModes += "cool " }
-	if(cmd.auxiliaryemergencyHeat) { supportedModes << "emergency heat" }
+	if(cmd.auto) { supportedModes += "auto " }
 
-	state.supportedThermostatModes = supportedModes
+	state.supportedModes = supportedModes
-	sendEvent(name: "supportedThermostatModes", value: supportedModes, displayed: false)
+	// No events to be generated, return empty map
 	return [:]
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeSupportedReport cmd) {
-	def supportedFanModes = []
+	def supportedFanModes = ""
-	if(cmd.auto) { supportedFanModes << "auto" } // "fanAuto "
+	if(cmd.auto) { supportedFanModes += "auto " } // "fanAuto "
-	if(cmd.circulation) { supportedFanModes << "circulate" } // "fanCirculate"
+	if(cmd.low) { supportedFanModes += "on " } // "fanOn"
-	if(cmd.low) { supportedFanModes << "on" } // "fanOn"
+	if(cmd.circulation) { supportedFanModes += "circulate " } // "fanCirculate"
 
-	state.supportedThermostatFanModes = supportedFanModes
+	state.supportedFanModes = supportedFanModes
-	sendEvent(name: "supportedThermostatFanModes", value: supportedFanModes, displayed: false)
+	// No events to be generated, return empty map
 	return [:]
 }
 
@@ -345,17 +337,15 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 // Command Implementations
-def refresh() {
+def poll() {
-	def cmds = []
+	delayBetween([
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSupportedGet().format())
+		zwave.sensorMultilevelV3.sensorMultilevelGet().format(), // current temperature
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeSupportedGet().format())
+		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format(),
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeGet().format())
+		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format(),
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeGet().format())
+		zwave.thermostatModeV2.thermostatModeGet().format(),
-	cmds << new physicalgraph.device.HubAction(zwave.sensorMultilevelV2.sensorMultilevelGet().format()) // current temperature
+		zwave.thermostatFanModeV3.thermostatFanModeGet().format(),
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format())
+		zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format()
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format())
+	], 2300)
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format())
-	sendHubCommand(cmds)
 }
 
 def quickSetHeat(degrees) {
@@ -426,14 +416,28 @@ def ping() {
 	poll()
 }
 
+def configure() {
+	delayBetween([
+		zwave.thermostatModeV2.thermostatModeSupportedGet().format(),
+		zwave.thermostatFanModeV3.thermostatFanModeSupportedGet().format(),
+		zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]).format(),
+		zwave.sensorMultilevelV3.sensorMultilevelGet().format(), // current temperature
+		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format(),
+		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format(),
+		zwave.thermostatModeV2.thermostatModeGet().format(),
+		zwave.thermostatFanModeV3.thermostatFanModeGet().format(),
+		zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format()
+	], 2300)
+}
+
 def modes() {
-	return state.supportedThermostatModes
+	["off", "heat", "cool", "auto", "emergency heat"]
 }
 
 def switchMode() {
 	def currentMode = device.currentState("thermostatMode")?.value
-	def lastTriedMode = state.lastTriedMode ?: currentMode ?: ["off"]
+	def lastTriedMode = state.lastTriedMode ?: currentMode ?: "off"
-	def supportedModes = getDataByName("supportedThermostatModes")
+	def supportedModes = getDataByName("supportedModes")
 	def modeOrder = modes()
 	def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
 	def nextMode = next(lastTriedMode)
@@ -450,7 +454,7 @@ def switchMode() {
 }
 
 def switchToMode(nextMode) {
-	def supportedModes = getDataByName("supportedThermostatModes")
+	def supportedModes = getDataByName("supportedModes")
 	if(supportedModes && !supportedModes.contains(nextMode)) log.warn "thermostat mode '$nextMode' is not supported"
 	if (nextMode in modes()) {
 		state.lastTriedMode = nextMode
@@ -462,9 +466,9 @@ def switchToMode(nextMode) {
 
 def switchFanMode() {
 	def currentMode = device.currentState("thermostatFanMode")?.value
-	def lastTriedMode = state.lastTriedFanMode ?: currentMode ?: ["off"]
+	def lastTriedMode = state.lastTriedFanMode ?: currentMode ?: "off"
-	def supportedModes = getDataByName("supportedThermostatFanModes") ?: ["auto", "on"]
+	def supportedModes = getDataByName("supportedFanModes") ?: "auto on" // "fanAuto fanOn"
-	def modeOrder = state.supportedThermostatFanModes
+	def modeOrder = ["auto", "circulate", "on"]                 // "fanAuto", "fanCirculate", "fanOn"
 	def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
 	def nextMode = next(lastTriedMode)
 	while (!supportedModes?.contains(nextMode) && nextMode != "auto") { // "fanAuto"
@@ -474,7 +478,7 @@ def switchFanMode() {
 }
 
 def switchToFanMode(nextMode) {
-	def supportedFanModes = getDataByName("supportedThermostatFanModes")
+	def supportedFanModes = getDataByName("supportedFanModes")
 	if(supportedFanModes && !supportedFanModes.contains(nextMode)) log.warn "thermostat mode '$nextMode' is not supported"
 
 	def returnCommand