MSA-1626: Complete integration for all Tado Heating & Cooling products with SmartThings, this release includes discovery for the Tado Smart Thermostat, Smart Radiator Thermostat, Extension Kit & Smart AC Control Units

Merge pull request #1501 from SmartThingsCommunity/staging
Rolling down staging hotfix to master
2026-03-09 05:11:52 +00:00 · 2016-12-01 07:26:01 -08:00 · 2016-11-28 10:35:24 -08:00 · 2016-11-28 10:34:01 -08:00 · 2016-11-23 23:30:08 -06:00 · 2016-11-23 23:01:05 -06:00
15 changed files with 2923 additions and 16 deletions
--- a/devicetypes/fuzzysb/tado-cooling-thermostat.src/tado-cooling-thermostat.groovy
+++ b/devicetypes/fuzzysb/tado-cooling-thermostat.src/tado-cooling-thermostat.groovy
@@ -0,0 +1,600 @@
+/**
+ *  Copyright 2015 Stuart Buchanan
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ *	Tado AC Thermostat
+ *
+ *	Author: Stuart Buchanan, Based on original work by Ian M with thanks. also source for icons was from @tonesto7's excellent Nest Manager.
+ *	Date: 2016-11-28 v3.0 Moved all data collection functions into Tado (Connect) SmartApp, huge changes to device handler, existing devices and handler will need to be uninstalled before installing this version
+ *	Date: 2016-07-13 v2.9 Quick dirty workaround to control zones with a single account.
+ *	Date: 2016-05-07 v2.8 Corrected issue with Fan Speed commands not working.
+ *	Date: 2016-04-25 v2.7 Minor changes to thermostatOperatingState to Show "idle" and "fan only" state
+ *	Date: 2016-04-25 v2.6 Minor bug fix to correct issue with reading existing set point value.
+ *	Date: 2016-04-09 v2.5 Major bug fix exercise, found lots and lots and lots.....now 100% conforms to ST Thermostat capability. main panel now shows colour of operating state. new attributes tadoMode and tadoFanSpeed created.
+ *	Date: 2016-04-05 v2.4 Performed Testing with Thermostat Mode Director and found some deficiencies where this would not work correctly. i have now corrected, this now works fine and has been tested.
+ *	Date: 2016-04-05 v2.3 added device preference for default temps for some commands as requested by @mitchell_lu66, also added some additional refreshes and error control for unsupported capabilities
+ *	Date: 2016-04-05 v2.2 Added Fan Speed & Emergency Heat (1 Hour) Controls and also a manual Mode End function to fall back to Tado Control.
+ 						  Also added preference for how long manual mode runs for either ends at Tado Mode Change (TADO_MODE) or User Control (MANUAL),
+                          please ensure the default method is Set in the device properties
+ *	Date: 2016-04-05 v2.1 Minor Bug Fixes & improved Icons
+ *	Date: 2016-04-05 v2.0 Further Changes to MultiAttribute Tile
+ *	Date: 2016-04-05 v1.9 Amended Device Handler Name
+ *	Date: 2016-04-05 v1.8 Added all thermostat related capabilities
+ *  Date: 2016-04-05 v1.7 Amended device to be capable of both Fahrenheit and celsius and amended the Device multiattribute tile
+ *  Date: 2016-04-05 v1.6 switched API calls to new v2 calls as the old ones had been deprecated.
+ *  Date: 2016-02-21 v1.5 switched around thermostatOperatingState & thermostatMode to get better compatibility with Home Remote
+ *  Date: 2016-02-21 v1.4 added HeatingSetPoint & CoolingSetPoint to make compatible with SmartTiles
+ *  Date: 2016-02-21 v1.3 amended the read thermostat properties to match the ST Thermostat Capability
+ *  Date: 2016-02-14 v1.2 amended the thermostat properties to match the ST Capability.Thermostat values
+ *  Date: 2016-01-23 v1.1 fixed error in Tado Mode detection
+ *	Date: 2016-01-22 v1.1 Add Heating & Cooling Controls (initial offering, will need to look into adding all possible commands)
+ *	Date: 2015-12-04 v1.0 Initial Release With Temperatures & Relative Humidity
+ */
+
+import groovy.json.JsonOutput
+
+preferences {
+}
+
+metadata {
+	definition (name: "Tado Cooling Thermostat", namespace: "fuzzysb", author: "Stuart Buchanan") {
+		capability "Actuator"
+    capability "Temperature Measurement"
+		capability "Thermostat Cooling Setpoint"
+		capability "Thermostat Heating Setpoint"
+		capability "Thermostat Mode"
+		capability "Thermostat Fan Mode"
+		capability "Thermostat Setpoint"
+		capability "Thermostat Operating State"
+		capability "Thermostat"
+		capability "Relative Humidity Measurement"
+		capability "Polling"
+		capability "Refresh"
+
+    attribute "tadoMode", "string"
+    attribute "tadoFanSpeed", "string"
+    command "temperatureUp"
+    command "temperatureDown"
+    command "heatingSetpointUp"
+    command "heatingSetpointDown"
+    command "coolingSetpointUp"
+    command "coolingSetpointDown"
+    command "cmdFanSpeedAuto"
+    command "cmdFanSpeedHigh"
+    command "cmdFanSpeedMid"
+    command "cmdFanSpeedLow"
+    command "dry"
+    command "on"
+		command "fan"
+    command "endManualControl"
+    command "emergencyHeat"
+	}
+
+	// simulator metadata
+	simulator {
+		// status messages
+
+		// reply messages
+	}
+
+	tiles(scale: 2){
+    multiAttributeTile(name: "thermostat", type:"thermostat", width:6, height:4) {
+      tileAttribute("device.temperature", key:"PRIMARY_CONTROL", canChangeIcon: true, canChangeBackground: true){
+        attributeState "default", label:'${currentValue}°', backgroundColor:"#fab907", icon:"st.Home.home1"
+      }
+      tileAttribute("device.temperature", key: "VALUE_CONTROL") {
+        attributeState("VALUE_UP", action: "temperatureUp")
+        attributeState("VALUE_DOWN", action: "temperatureDown")
+      }
+      tileAttribute("device.humidity", key: "SECONDARY_CONTROL") {
+        attributeState("default", label:'${currentValue}%', unit:"%")
+      }
+      tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") {
+        attributeState("idle", backgroundColor:"#666666")
+        attributeState("heating", backgroundColor:"#ff471a")
+        attributeState("cooling", backgroundColor:"#1a75ff")
+        attributeState("emergency heat", backgroundColor:"#ff471a")
+        attributeState("drying", backgroundColor:"#c68c53")
+        attributeState("fan only", backgroundColor:"#39e600")
+        attributeState("heating|cooling", backgroundColor:"#ff9900")
+      }
+      tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") {
+        attributeState("off", label:'${name}')
+        attributeState("heat", label:'${name}')
+        attributeState("cool", label:'${name}')
+        attributeState("auto", label:'${name}')
+        attributeState("fan", label:'${name}')
+        attributeState("dry", label:'${name}')
+      }
+      tileAttribute("device.heatingSetpoint", key: "HEATING_SETPOINT") {
+        attributeState("default", label:'${currentValue}', unit:"dF")
+      }
+      tileAttribute("device.coolingSetpoint", key: "COOLING_SETPOINT") {
+        attributeState("default", label:'${currentValue}', unit:"dF")
+      }
+    }
+
+    standardTile("tadoMode", "device.tadoMode", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true) {
+      state("SLEEP", label:'${name}', backgroundColor:"#0164a8", icon:"st.Bedroom.bedroom2")
+      state("HOME", label:'${name}', backgroundColor:"#fab907", icon:"st.Home.home2")
+      state("AWAY", label:'${name}', backgroundColor:"#62aa12", icon:"st.Outdoor.outdoor18")
+      state("OFF", label:'${name}', backgroundColor:"#ffffff", icon:"st.switches.switch.off", defaultState: true)
+      state("MANUAL", label:'${name}', backgroundColor:"#804000", icon:"st.Weather.weather1")
+    }
+
+    standardTile("refresh", "device.switch", inactiveLabel: false, width: 2, height: 1, decoration: "flat") {
+      state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+    }
+
+    standardTile("thermostatMode", "device.thermostatMode", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true) {
+      state("heat", label:'HEAT', backgroundColor:"#ea2a2a", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/heat_mode_icon.png")
+      state("emergency heat", label:'HEAT', backgroundColor:"#ea2a2a", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/heat_mode_icon.png")
+      state("cool", label:'COOL', backgroundColor:"#089afb", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/cool_mode_icon.png")
+      state("dry", label:'DRY', icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/dry_mode_icon.png")
+      state("fan", label:'FAN', backgroundColor:"#ffffff", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_mode_icononly.png")
+      state("auto", label:'AUTO', icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/auto_mode_icon.png")
+      state("off", label:'', backgroundColor:"#ffffff", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/hvac_off.png", defaultState: true)
+		}
+
+		valueTile("thermostatSetpoint", "device.thermostatSetpoint", width: 2, height: 1, decoration: "flat") {
+			state "default", label: 'Set Point\r\n\${currentValue}°'
+		}
+
+    valueTile("heatingSetpoint", "device.heatingSetpoint", width: 2, height: 1, decoration: "flat") {
+			state "default", label: 'Set Point\r\n\${currentValue}°'
+		}
+
+    valueTile("coolingSetpoint", "device.coolingSetpoint", width: 2, height: 1, decoration: "flat") {
+			state "default", label: 'Set Point\r\n\${currentValue}°'
+		}
+
+		valueTile("outsidetemperature", "device.outsidetemperature", width: 2, height: 1, decoration: "flat") {
+			state "outsidetemperature", label: 'Outside Temp\r\n${currentValue}°'
+		}
+
+		standardTile("tadoFanSpeed", "device.tadoFanSpeed", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true, decoration: "flat") {
+      state("OFF", label:'', icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_off_icon.png", defaultState: true)
+      state("AUTO", label:'', icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_auto_icon.png")
+      state("HIGH", label:'', icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_high_icon.png")
+      state("MIDDLE", label:'', icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_med_icon.png")
+      state("LOW", label:'', icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_low_icon.png")
+		}
+
+		standardTile("setAuto", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.auto", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/hvac_auto.png"
+		}
+    standardTile("setDry", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"dry", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/hvac_dry.png"
+		}
+    standardTile("setOn", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"on", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/hvac_on.png"
+		}
+    standardTile("setOff", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.off", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/hvac_off.png"
+		}
+    standardTile("cool", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.cool", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/hvac_cool.png"
+		}
+    standardTile("heat", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.heat", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/hvac_heat.png"
+		}
+    standardTile("emergencyHeat", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.emergencyHeat", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/emergencyHeat.png"
+		}
+    standardTile("fan", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.fan", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_mode_icon.png"
+		}
+    standardTile("coolingSetpointUp", "device.coolingSetpoint", canChangeIcon: false, decoration: "flat") {
+      state "coolingSetpointUp", label:'  ', action:"coolingSetpointUp", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/cool_arrow_up.png"
+    }
+		standardTile("coolingSetpointDown", "device.coolingSetpoint", canChangeIcon: false, decoration: "flat") {
+      state "coolingSetpointDown", label:'  ', action:"coolingSetpointDown", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/cool_arrow_down.png"
+    }
+		standardTile("heatingSetpointUp", "device.heatingSetpoint", canChangeIcon: false, decoration: "flat") {
+      state "heatingSetpointUp", label:'  ', action:"heatingSetpointUp", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/heat_arrow_up.png"
+    }
+    standardTile("heatingSetpointDown", "device.heatingSetpoint", canChangeIcon: false, decoration: "flat") {
+      state "heatingSetpointDown", label:'  ', action:"heatingSetpointDown", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/heat_arrow_down.png"
+    }
+		standardTile("cmdFanSpeedAuto", "device.thermostat", width: 2, height: 1, canChangeIcon: false, canChangeBackground: true, decoration: "flat") {
+      state("default", label:'', action:"cmdFanSpeedAuto",  icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_auto_icon.png")
+    }
+    standardTile("cmdFanSpeedHigh", "device.thermostat", width: 2, height: 1, canChangeIcon: false, canChangeBackground: true, decoration: "flat") {
+      state("default", label:'', action:"cmdFanSpeedHigh",  icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_high_icon.png")
+    }
+    standardTile("cmdFanSpeedMid", "device.thermostat", width: 2, height: 1, canChangeIcon: false, canChangeBackground: true, decoration: "flat") {
+      state("default", label:'', action:"cmdFanSpeedMid",  icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_med_icon.png")
+    }
+    standardTile("cmdFanSpeedLow", "device.thermostat", width: 2, height: 1, canChangeIcon: false, canChangeBackground: true, decoration: "flat") {
+      state("default", label:'', action:"cmdFanSpeedLow",  icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/fan_low_icon.png")
+    }
+		standardTile("endManualControl", "device.thermostat", width: 2, height: 1, canChangeIcon: false, canChangeBackground: true, decoration: "flat") {
+      state("default", label:'', action:"endManualControl", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado-Cooling-AC.src/Images/endManual.png")
+		}
+
+		main(["thermostat"])
+		details(["thermostat","thermostatMode","coolingSetpointUp","coolingSetpointDown","autoOperation","heatingSetpointUp","heatingSetpointDown","outsidetemperature","thermostatSetpoint","tadoMode","refresh","tadoFanSpeed","setAuto","setOn","setOff","fan","cool","heat","setDry","cmdFanSpeedAuto","emergencyHeat","endManualControl","cmdFanSpeedLow","cmdFanSpeedMid","cmdFanSpeedHigh"])
+  }
+}
+
+def setCapabilitytadoType(value){
+  state.tadoType = value
+  log.debug("state.tadoType = ${state.tadoType}")
+}
+
+def getCapabilitytadoType() {
+  def map = null
+  map = [name: "capabilityTadoType", value: state.tadoType]
+  return map
+}
+
+def setCapabilitySupportsAuto(value){
+  state.supportsAuto = value
+  log.debug("state.supportsAuto = ${state.supportsAuto}")
+}
+
+def getCapabilitySupportsAuto() {
+  def map = null
+  map = [name: "capabilitySupportsAuto", value: state.supportsAuto]
+  return map
+}
+
+def setCapabilitySupportsCool(value){
+  state.supportsCool = value
+  log.debug("state.supportsCool = ${state.supportsCool}")
+}
+
+def getCapabilitySupportsCool() {
+  def map = null
+  map = [name: "capabilitySupportsCool", value: state.supportsCool]
+  return map
+}
+
+def setCapabilitySupportsCoolAutoFanSpeed(value){
+  state.SupportsCoolAutoFanSpeed = value
+  log.debug("state.SupportsCoolAutoFanSpeed = ${state.SupportsCoolAutoFanSpeed}")
+}
+
+def getCapabilitySupportsCoolAutoFanSpeed() {
+  def map = null
+  map = [name: "capabilitySupportsCoolAutoFanSpeed", value: state.supportsCoolAutoFanSpeed]
+  return map
+}
+
+def setCapabilitySupportsDry(value){
+  state.supportsDry = value
+  log.debug("state.supportsDry = ${state.supportsDry}")
+}
+
+def getCapabilitySupportsDry() {
+  def map = null
+  map = [name: "capabilitySupportsDry", value: state.supportsDry]
+  return map
+}
+
+def setCapabilitySupportsFan(value){
+  state.supportsFan = value
+  log.debug("state.supportsFan = ${state.supportsFan}")
+}
+
+def getCapabilitySupportsFan() {
+  def map = null
+  map = [name: "capabilitySupportsFan", value: state.supportsFan]
+  return map
+}
+
+def setCapabilitySupportsHeat(value){
+  state.supportsHeat = value
+  log.debug("state.supportsHeat = ${state.supportsHeat}")
+}
+
+def getCapabilitySupportsHeat() {
+  def map = null
+  map = [name: "capabilitySupportsHeat", value: state.supportsHeat]
+  return map
+}
+
+def setCapabilitySupportsHeatAutoFanSpeed(value){
+  state.SupportsHeatAutoFanSpeed = value
+  log.debug("state.SupportsHeatAutoFanSpeed = ${state.SupportsHeatAutoFanSpeed}")
+}
+
+def getCapabilitySupportsHeatAutoFanSpeed() {
+  def map = null
+  map = [name: "capabilitySupportsHeatAutoFanSpeed", value: state.SupportsHeatAutoFanSpeed]
+  return map
+}
+
+def setCapabilityMaxCoolTemp(value){
+  state.MaxCoolTemp = value
+  log.debug("set state.MaxCoolTemp to : " + state.MaxCoolTemp)
+}
+
+def getCapabilityMaxCoolTemp() {
+  def map = null
+  map = [name: "capabilityMaxCoolTemp", value: state.MaxCoolTemp]
+  return map
+}
+
+def setCapabilityMinCoolTemp(value){
+  state.MinCoolTemp = value
+  log.debug("set state.MinCoolTemp to : " + state.MinCoolTemp)
+}
+
+def getCapabilityMinCoolTemp() {
+  def map = null
+  map = [name: "capabilityMinCoolTemp", value: state.MinCoolTemp]
+  return map
+}
+
+def setCapabilityMaxHeatTemp(value){
+  state.MaxHeatTemp = value
+  log.debug("set state.MaxHeatTemp to : " + state.MaxHeatTemp)
+}
+
+def getCapabilityMaxHeatTemp() {
+  def map = null
+  map = [name: "capabilityMaxHeatTemp", value: state.MaxHeatTemp]
+  return map
+}
+
+def setCapabilityMinHeatTemp(value){
+  state.MinHeatTemp = value
+  log.debug("set state.MinHeatTemp to : " + state.MinHeatTemp)
+}
+
+def getCapabilityMinHeatTemp() {
+  def map = null
+  map = [name: "capabilityMinHeatTemp", value: state.MinHeatTemp]
+  return map
+}
+
+def updated(){
+	refresh()
+}
+
+def installed(){
+  refresh()
+}
+
+def poll() {
+	log.debug "Executing 'poll'"
+	refresh()
+}
+
+def refresh() {
+	log.debug "Executing 'refresh'"
+    parent.statusCommand(this)
+    getWeather()
+}
+
+def getWeather(){
+	parent.weatherStatusCommand(this)
+}
+
+def auto() {
+	log.debug "Executing 'auto'"
+	parent.autoCommand(this)
+  parent.statusCommand(this)
+}
+
+def on() {
+	log.debug "Executing 'on'"
+	parent.onCommand(this)
+  parent.statusCommand(this)
+}
+
+def off() {
+	log.debug "Executing 'off'"
+	parent.offCommand(this)
+  parent.statusCommand(this)
+}
+
+def dry() {
+	log.debug "Executing 'dry'"
+	parent.dryCommand(this)
+  parent.statusCommand(this)
+}
+
+def setThermostatMode(requiredMode){
+	switch (requiredMode) {
+    	case "dry":
+        	dry()
+        break
+    	case "heat":
+        	heat()
+        break
+        case "cool":
+        	cool()
+        break
+        case "auto":
+        	auto()
+        break
+        case "fan":
+        	fan()
+        break
+		case "off":
+        	off()
+        break
+		case "emergency heat":
+        	emergencyHeat()
+        break
+     }
+}
+
+def thermostatFanMode(requiredMode){
+	switch (requiredMode) {
+    	case "auto":
+        	fan()
+        break
+    	case "on":
+        	fan()
+        break
+        case "circulate":
+        	fan()
+        break
+     }
+}
+
+def setHeatingSetpoint(targetTemperature) {
+	log.debug "Executing 'setHeatingSetpoint'"
+  log.debug "Target Temperature ${targetTemperature}"
+  parent.setHeatingTempCommand(this,targetTemperature)
+	refresh()
+}
+
+def temperatureUp(){
+	if (device.currentValue("thermostatMode") == "heat") {
+    	heatingSetpointUp()
+    } else if (device.currentValue("thermostatMode") == "cool") {
+    	coolingSetpointUp()
+    } else {
+    	log.debug ("temperature setpoint not supported in the current thermostat mode")
+    }
+}
+
+def temperatureDown(){
+	if (device.currentValue("thermostatMode") == "heat") {
+    	heatingSetpointDown()
+    } else if (device.currentValue("thermostatMode") == "cool") {
+    	coolingSetpointDown()
+    } else {
+    	log.debug ("temperature setpoint not supported in the current thermostat mode")
+    }
+}
+
+def heatingSetpointUp(){
+	def capabilitysupported = state.supportsHeat
+    if (capabilitysupported == "true"){
+		log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+    	if ((device.currentValue("thermostatSetpoint").toInteger() - 1 ) < state.MinHeatTemp){
+    		log.debug("cannot decrease heat setpoint, its already at the minimum level of " + state.MinHeatTemp)
+    	} else {
+			int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() + 1
+			log.debug "Setting heatingSetpoint up to: ${newSetpoint}"
+			setHeatingSetpoint(newSetpoint)
+    	}
+    } else {
+    	log.debug("Sorry Heat Capability not supported by your HVAC Device")
+    }
+}
+
+def heatingSetpointDown(){
+	def capabilitysupported = state.supportsHeat
+    if (capabilitysupported == "true"){
+		log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+    	if ((device.currentValue("thermostatSetpoint").toInteger() + 1 ) > state.MaxHeatTemp){
+    		log.debug("cannot increase heat setpoint, its already at the maximum level of " + state.MaxHeatTemp)
+    	} else {
+			int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() - 1
+			log.debug "Setting heatingSetpoint down to: ${newSetpoint}"
+			setHeatingSetpoint(newSetpoint)
+    	}
+    } else {
+    	log.debug("Sorry Heat Capability not supported by your HVAC Device")
+    }
+}
+
+def setCoolingSetpoint(targetTemperature) {
+	log.debug "Executing 'setCoolingSetpoint'"
+  log.debug "Target Temperature ${targetTemperature}"
+  parent.setCoolingTempCommand(this,targetTemperature)
+	refresh()
+}
+
+def coolingSetpointUp(){
+	def capabilitysupported = state.supportsCool
+    if (capabilitysupported == "true"){
+		log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+    	if ((device.currentValue("thermostatSetpoint").toInteger() + 1 ) > state.MaxCoolTemp){
+    		log.debug("cannot increase cool setpoint, its already at the maximum level of " + state.MaxCoolTemp)
+    	} else {
+			int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() + 1
+			log.debug "Setting coolingSetpoint up to: ${newSetpoint}"
+			setCoolingSetpoint(newSetpoint)
+    	}
+    } else {
+    	log.debug("Sorry Cool Capability not supported by your HVAC Device")
+    }
+}
+
+def coolingSetpointDown(){
+	def capabilitysupported = state.supportsCool
+    if (capabilitysupported == "true"){
+		log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+    	if ((device.currentValue("thermostatSetpoint").toInteger() - 1 ) < state.MinCoolTemp){
+    		log.debug("cannot decrease cool setpoint, its already at the minimum level of " + state.MinCoolTemp)
+    	} else {
+			int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() - 1
+			log.debug "Setting coolingSetpoint down to: ${newSetpoint}"
+			setCoolingSetpoint(newSetpoint)
+    	}
+    } else {
+    	log.debug("Sorry Cool Capability not supported by your HVAC Device")
+    }
+}
+
+def fanOn(){
+	fan()
+}
+
+def fanCirculate(){
+	fan()
+}
+
+def cool(){
+	def capabilitysupported = state.supportsCool
+  if (capabilitysupported == "true"){
+		parent.coolCommand(this)
+    parent.statusCommand(this)
+	} else {
+    	log.debug("Sorry Cool Capability not supported by your HVAC Device")
+    }
+}
+
+def heat(){
+	def capabilitysupported = state.supportsHeat
+	if (capabilitysupported == "true"){
+	parent.heatCommand(this)
+  parent.statusCommand(this)
+  } else {
+  	log.debug("Sorry Heat Capability not supported by your HVAC Device")
+  }
+}
+
+def fan(){
+	parent.fanAuto(this)
+	refresh()
+}
+
+def emergencyHeat(){
+	parent.emergencyHeat(this)
+}
+
+def cmdFanSpeedAuto(){
+	parent.cmdFanSpeedAuto(this)
+}
+
+def cmdFanSpeedHigh(){
+	parent.cmdFanSpeedHigh(this)
+}
+
+def cmdFanSpeedMed(){
+	parent.cmdFanSpeedMed(this)
+}
+
+def cmdFanSpeedLow(){
+	parent.cmdFanSpeedLow(this)
+}
+
+def endManualControl(){
+	parent.endManualControl(this)
+}
--- a/devicetypes/fuzzysb/tado-heating-thermostat.src/tado-heating-thermostat.groovy
+++ b/devicetypes/fuzzysb/tado-heating-thermostat.src/tado-heating-thermostat.groovy
@@ -0,0 +1,270 @@
+/**
+ *  Copyright 2015 SmartThings
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ *	Tado Thermostat
+ *
+ * Author: Stuart Buchanan, Based on original work by Ian M with thanks. also source for icons was from @tonesto7's excellent Nest Manager.
+ *
+ *	Updates:
+ *	Date: 2016-11-28  v1.9 Moved all data collection functions into Tado (Connect) SmartApp, huge changes to device handler, existing devices and handler will need to be uninstalled before installing this version
+ *	Date: 2016-07-13  v1.8 Quick dirty workaround to control zones with a single account.
+ *  Date: 2016-04-25 	v1.7 Finally found time to update this with the lessons learnt from the Tado Cooling Device Type. will bring better support for RM and Thermostat Director
+ *  Date: 2016-04-08 	v1.6 added statusCommand calls to refresh more frequently, also improved compatibility with Rule Machine and Thermostat Mode Director in addition also added default heating temperature where you can set the default temperature for the mode commands.
+ *  Date: 2016-04-05 	v1.5 added improved icons and also a manual Mode End function to fall back to Tado Control.
+ 				Also added preference for how long manual mode runs for either ends at Tado Mode Change (TADO_MODE) or User Control (MANUAL),
+                please ensure the default method is Set in the device properties
+ *  Date: 2016-04-05 	v1.4 rewrite of complete functions to support Tado API v2
+ *  Date: 2016-01-20  v1.3 Updated hvacStatus to include include the correct HomeId for Humidity Value
+ *  Date: 2016-01-15  v1.2 Refactored API request code and added querying/display of humidity
+ *	Date: 2015-12-23	v1.1 Added functionality to change thermostat settings
+ *	Date: 2015-12-04	v1.0 Initial release
+ */
+
+preferences {
+	input("username", "text", title: "Username", description: "Your Tado username")
+	input("password", "password", title: "Password", description: "Your Tado password")
+	input("tadoZoneId", "number", title: "Enter Tado Zone ID?", required: true)
+  input("manualmode", "enum", title: "Default Manual Overide Method", options: ["TADO_MODE","MANUAL"], required: false, defaultValue:"TADO_MODE")
+	input("defHeatingTemp", "number", title: "Default Heating Temperature?", required: false, defaultValue: 21)
+}
+
+metadata {
+	definition (name: "Tado Heating Thermostat", namespace: "fuzzysb", author: "Stuart Buchanan") {
+		capability "Actuator"
+    capability "Temperature Measurement"
+		capability "Thermostat Heating Setpoint"
+		capability "Thermostat Setpoint"
+		capability "Thermostat Mode"
+		capability "Thermostat Operating State"
+		capability "Thermostat"
+		capability "Relative Humidity Measurement"
+		capability "Polling"
+		capability "Refresh"
+		attribute "tadoMode", "string"
+		command "temperatureUp"
+    command "temperatureDown"
+    command "heatingSetpointUp"
+    command "heatingSetpointDown"
+		command "on"
+    command "endManualControl"
+		command "emergencyHeat"
+
+	}
+
+	// simulator metadata
+	simulator {
+		// status messages
+
+		// reply messages
+	}
+
+tiles(scale: 2){
+      	multiAttributeTile(name: "thermostat", type:"thermostat", width:6, height:4) {
+			tileAttribute("device.temperature", key:"PRIMARY_CONTROL", canChangeIcon: true, canChangeBackground: true){
+            	attributeState "default", label:'${currentValue}°', backgroundColor:"#fab907", icon:"st.Home.home1"
+            }
+			tileAttribute("device.temperature", key: "VALUE_CONTROL") {
+    			attributeState("VALUE_UP", action: "temperatureUp")
+    			attributeState("VALUE_DOWN", action: "temperatureDown")
+  			}
+			tileAttribute("device.humidity", key: "SECONDARY_CONTROL") {
+    			attributeState("default", label:'${currentValue}%', unit:"%")
+  			}
+            tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") {
+    			attributeState("idle", backgroundColor:"#666666")
+    			attributeState("heating", backgroundColor:"#ff471a")
+                attributeState("emergency heat", backgroundColor:"#ff471a")
+  			}
+            tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") {
+    			attributeState("off", label:'${name}')
+    			attributeState("heat", label:'${name}')
+  			}
+			tileAttribute("device.heatingSetpoint", key: "HEATING_SETPOINT") {
+    			attributeState("default", label:'${currentValue}', unit:"dF")
+  			}
+		}
+
+        valueTile("heatingSetpoint", "device.heatingSetpoint", width: 2, height: 1, decoration: "flat") {
+			state "default", label: 'Set Point\r\n\${currentValue}°'
+		}
+
+        standardTile("tadoMode", "device.tadoMode", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true) {
+			state("SLEEP", label:'${name}', backgroundColor:"#0164a8", icon:"st.Bedroom.bedroom2")
+            state("HOME", label:'${name}', backgroundColor:"#fab907", icon:"st.Home.home2")
+            state("AWAY", label:'${name}', backgroundColor:"#62aa12", icon:"st.Outdoor.outdoor18")
+            state("OFF", label:'', backgroundColor:"#ffffff", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/hvac_off.png", defaultState: true)
+            state("MANUAL", label:'${name}', backgroundColor:"#804000", icon:"st.Weather.weather1")
+		}
+
+		standardTile("thermostatMode", "device.thermostatMode", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true) {
+        	state("heat", label:'HEAT', backgroundColor:"#ea2a2a", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/heat_mode_icon.png")
+            state("off", label:'', backgroundColor:"#ffffff", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/hvac_off.png", defaultState: true)
+		}
+
+        standardTile("refresh", "device.switch", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+        standardTile("Off", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.off", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/hvac_off.png"
+		}
+		standardTile("emergencyHeat", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.emergencyHeat", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/emergencyHeat.png"
+		}
+		valueTile("outsidetemperature", "device.outsidetemperature", width: 2, height: 1, decoration: "flat") {
+			state "outsidetemperature", label: 'Outside Temp\r\n${currentValue}°'
+		}
+		standardTile("heat", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.heat", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/hvac_heat.png"
+		}
+		standardTile("heatingSetpointUp", "device.heatingSetpoint", width: 1, height: 1, canChangeIcon: false, decoration: "flat") {
+            state "heatingSetpointUp", label:'', action:"heatingSetpointUp", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/heat_arrow_up.png"
+        }
+        standardTile("heatingSetpointDown", "device.heatingSetpoint", width: 1, height: 1, canChangeIcon: false, decoration: "flat") {
+            state "heatingSetpointDown", label:'', action:"heatingSetpointDown", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/heat_arrow_down.png"
+        }
+		standardTile("endManualControl", "device.thermostat", width: 2, height: 1, canChangeIcon: false, canChangeBackground: true, decoration: "flat") {
+            state("default", label:'', action:"endManualControl", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Heating.src/Images/endManual.png")
+		}
+		main "thermostat"
+		details (["thermostat","thermostatMode","outsidetemperature","heatingSetpoint","refresh","heatingSetpointUp","heatingSetpointDown","tadoMode","emergencyHeat","heat","Off","endManualControl"])
+	}
+}
+
+
+def getWeather(){
+	parent.weatherStatusCommand(this)
+}
+
+def setCapabilitySupportsHeat(value){
+  state.supportsHeat = value
+  log.debug("state.supportsHeat = ${state.supportsHeat}")
+}
+
+def getCapabilitySupportsHeat() {
+  def map = null
+  map = [name: "capabilitySupportsHeat", value: state.supportsHeat]
+  return map
+}
+
+def updated(){
+	refresh()
+}
+
+def installed(){
+	refresh()
+}
+
+def poll() {
+	log.debug "Executing 'poll'"
+	refresh()
+}
+
+def refresh() {
+	log.debug "Executing 'refresh'"
+    parent.statusCommand(this)
+    getWeather()
+}
+
+def auto() {
+	log.debug "Executing 'auto'"
+	parent.autoCommand(this)
+  parent.statusCommand(this)
+}
+
+def on() {
+	log.debug "Executing 'on'"
+	parent.onCommand(this)
+  parent.statusCommand(this)
+}
+
+def off() {
+	log.debug "Executing 'off'"
+	parent.offCommand(this)
+  parent.statusCommand(this)
+}
+
+def setHeatingSetpoint(targetTemperature) {
+	log.debug "Executing 'setHeatingSetpoint'"
+  log.debug "Target Temperature ${targetTemperature}"
+  parent.setHeatingTempCommand(this,targetTemperature)
+	parent.statusCommand(this)
+}
+
+def setThermostatMode(requiredMode){
+	switch (requiredMode) {
+    	case "heat":
+        	heat()
+        break
+        case "auto":
+        	auto()
+        break
+		case "off":
+        	off()
+        break
+		case "emergency heat":
+        	emergencyHeat()
+        break
+     }
+}
+
+def temperatureUp(){
+	if (device.currentValue("thermostatMode") == "heat") {
+    	heatingSetpointUp()
+    } else {
+    	log.debug ("temperature setpoint not supported in the current thermostat mode")
+    }
+}
+
+def temperatureDown(){
+	if (device.currentValue("thermostatMode") == "heat") {
+    	heatingSetpointDown()
+    } else {
+    	log.debug ("temperature setpoint not supported in the current thermostat mode")
+    }
+}
+
+def heatingSetpointUp(){
+	log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+    if ((device.currentValue("thermostatSetpoint").toInteger() - 1 ) < state.MinHeatTemp){
+    	log.debug("cannot decrease heat setpoint, its already at the minimum level of " + state.MinHeatTemp)
+    } else {
+		int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() + 1
+		log.debug "Setting heatingSetpoint up to: ${newSetpoint}"
+		setHeatingSetpoint(newSetpoint)
+    }
+}
+
+def heatingSetpointDown(){
+	log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+  if ((device.currentValue("thermostatSetpoint").toInteger() + 1 ) > state.MaxHeatTemp){
+    log.debug("cannot increase heat setpoint, its already at the maximum level of " + state.MaxHeatTemp)
+    } else {
+      int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() - 1
+      log.debug "Setting heatingSetpoint down to: ${newSetpoint}"
+      setHeatingSetpoint(newSetpoint)
+    }
+}
+
+
+// Commands to device
+def heat(){
+	parent.heatCommand(this)
+	parent.statusCommand(this)
+}
+
+def emergencyHeat(){
+  parent.emergencyHeat(this)
+}
+
+def endManualControl(){
+	parent.endManualControl(this)
+}
--- a/devicetypes/fuzzysb/tado-heating-user-presence.src/tado-heating-user-presence.groovy
+++ b/devicetypes/fuzzysb/tado-heating-user-presence.src/tado-heating-user-presence.groovy
@@ -0,0 +1,174 @@
+/**
+ *  Copyright 2015 Stuart Buchanan
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ *	Tado Thermostat
+ *
+ *	Author: Stuart Buchanan, Based on original work by Ian M with thanks
+ *	Date: 2015-04-28 v1.3 changed Presence tile as this was reporting a bug
+ *	Date: 2015-04-28 v1.2 updated API call found issue where session was closed and nothing else was returned, now add number generator to input noCache statement in the query
+ *	Date: 2015-04-27 v1.1 updated API call and added refresh function
+ *	Date: 2015-12-04 v1.0 Initial Release
+ */
+ 
+import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
+import java.util.Random  
+
+preferences {
+	input("username", "text", title: "Username", description: "Your Tado username")
+	input("password", "password", title: "Password", description: "Your Tado password")
+	input("tadouser", "text", title: "Tado User", description: "Your Tado User")
+}  
+ 
+metadata {
+	definition (name: "Tado Heating User Presence", namespace: "fuzzysb", author: "Stuart Buchanan") {
+		capability "Presence Sensor"
+		capability "Sensor"
+		capability "Polling"
+		capability "Refresh"
+        
+        command "arrived"
+		command "departed"
+              
+	}
+
+	// simulator metadata
+	simulator {
+		status "present": "presence: present"
+		status "not present": "presence: not present"
+	}
+
+	tiles {
+		standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) {
+			state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#53a7c0")
+			state("not present", labelIcon:"st.presence.tile.mobile-not-present", backgroundColor:"#ffffff")
+		}
+		standardTile("refresh", "device.refresh", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+		main "presence"
+		details (["presence","refresh"])
+	}
+}
+
+// Parse incoming device messages to generate events
+private parseResponse(resp) {
+	def result
+    log.debug("Executing parseResponse: "+resp.data)
+    log.debug("Output status: "+resp.status)
+    if(resp.status == 200) {
+    	log.debug("Executing parseResponse.successTrue")
+        def evtJson = new groovy.json.JsonOutput().toJson(resp.data)
+        def json = new JsonSlurper().parseText(evtJson)
+		def appuserarray = new groovy.json.JsonOutput().toJson(json.appUsers)
+        def list = new JsonSlurper().parseText(appuserarray)
+		list.each {
+    		if ((it.nickname).capitalize() == (settings.tadouser).capitalize()) {
+            	log.debug("Found Tado User : " + it.nickname)
+                if (it.geoTrackingEnabled == true) {
+                	log.debug("Users GeoTracking is Enabled")
+                	if (it.geolocationIsStale == false){
+                    	log.debug("Users Current Relative Position is : " + it.relativePosition )
+                		if (it.relativePosition == 0) {
+                  		  	result = arrived()
+                  		}else{
+                  		  	result = departed()
+                 	   }
+                	}else{
+                	log.debug("Geolocation is Stale Skipping")
+                	}
+                }else{
+                	log.debug("Users GeoTracking Not Enabled")
+                }     
+		}  
+        }
+    }else if(resp.status == 201){
+        log.debug("Something was created/updated")
+    }
+    return result  
+}
+
+def installed() {
+	log.debug "Executing 'installed'"
+	statusCommand()
+}
+
+def updated() {
+	log.debug "Executing 'updated'"
+	statusCommand()
+}
+
+def poll() {
+	log.debug "Executing 'poll'"
+	refresh()
+}
+
+def refresh() {
+	log.debug "Executing 'refresh'"
+    statusCommand()   
+}
+
+
+private sendCommand(method, args = []) {
+    def methods = [
+		'status': [
+        			uri: "https://my.tado.com", 
+                    path: "/mobile/1.6/getAppUsersRelativePositions", 
+                    requestContentType: "application/json", 
+                    query: [username:settings.username, password:settings.password, noCache:args[0], webapp:1]
+                    ],
+	]
+
+	def request = methods.getAt(method)
+    
+    log.debug "Http Params ("+request+")"
+    
+    try{
+        log.debug "Executing 'sendCommand'"
+        
+        if (method == "status"){
+            httpGet(request) { resp ->            
+                parseResponse(resp)
+            }
+        }else{
+            httpGet(request)
+        }
+    } catch(Exception e){
+        log.debug("___exception: " + e)
+    }
+}
+
+
+
+// Commands
+def statusCommand(){
+	log.debug "Executing 'sendCommand.statusCommand'"
+    Random rand = new Random()
+    int min = 10000
+    int max = 99999
+    int randomNum = rand.nextInt((max - min) + 1) + min
+	sendCommand("status",[randomNum])
+}
+
+def arrived() {
+	log.trace "Executing 'arrived'"
+    def result = sendEvent(name: "presence", value: "present")
+    return result
+}
+
+
+def departed() {
+	log.trace "Executing 'departed'"
+	def result = sendEvent(name: "presence", value: "not present")
+    return result
+}
+
--- a/devicetypes/fuzzysb/tado-hot-water-control.src/tado-hot-water-control.groovy
+++ b/devicetypes/fuzzysb/tado-hot-water-control.src/tado-hot-water-control.groovy
@@ -0,0 +1,280 @@
+/**
+ *  Copyright 2015 SmartThings
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ *	Tado Thermostat
+ *
+ * 	Author: Stuart Buchanan, Based on original work by Ian M with thanks. also source for icons was from @tonesto7's excellent Nest Manager.
+* 	Date: 2016-11-28 v1.6 Moved all data collection functions into Tado (Connect) SmartApp, huge changes to device handler, existing devices and handler will need to be uninstalled before installing this version
+ *	Date: 2016-07-13 v1.5 Quick dirty workaround to control zones with a single account.
+ * 	Date: 2016-04-25 v1.4 Tado Hot water does not actually return the current water temps, it only returns the Current set point temp. to get around this when the power is on for the hot water botht the temp and setpoint will both display the setpoint value, otherwise will display --
+ * 	Date: 2016-04-25 v1.3 Finally found time to update this with the lessons learnt from the Tado Cooling Device Type. will bring better support for RM and Thermostat Director
+ * 	Date: 2016-04-08 v1.2 added setThermostatMode(mode) function to work better with Rule Machine and Thermostat Mode Director
+ *	Date: 2016-04-05 v1.1 change of default Water Heating Temps can now be defined in device preferences (default Value is 90C).
+ *	Date: 2016-04-05 v1.0 Initial release
+ */
+
+preferences {
+	input("username", "text", title: "Username", description: "Your Tado username")
+	input("password", "password", title: "Password", description: "Your Tado password")
+	input("tadoZoneId", "number", title: "Enter Tado Zone ID?", required: true)
+    input("manualmode", "enum", title: "Default Manual Overide Method", options: ["TADO_MODE","MANUAL"], required: false, defaultValue:"TADO_MODE")
+	input("defWaterTemp", "number", title: "Default Water Heating Temperature", required: false, defaultValue: 90)
+}
+
+metadata {
+	definition (name: "Tado Hot Water Control", namespace: "fuzzysb", author: "Stuart Buchanan") {
+		capability "Actuator"
+    capability "Temperature Measurement"
+		capability "Thermostat Heating Setpoint"
+		capability "Thermostat Setpoint"
+		capability "Thermostat Mode"
+		capability "Thermostat Operating State"
+		capability "Thermostat"
+		capability "Polling"
+		capability "Refresh"
+    attribute "tadoMode", "string"
+		command "temperatureUp"
+    command "temperatureDown"
+    command "heatingSetpointUp"
+    command "heatingSetpointDown"
+		command "on"
+    command "endManualControl"
+		command "emergencyHeat"
+
+	}
+
+	// simulator metadata
+	simulator {
+		// status messages
+
+		// reply messages
+	}
+
+tiles(scale: 2){
+      	multiAttributeTile(name: "thermostat", type:"thermostat", width:6, height:4) {
+			tileAttribute("device.temperature", key:"PRIMARY_CONTROL", canChangeIcon: true, canChangeBackground: true){
+            	attributeState "default", label:'${currentValue}°', backgroundColor:"#fab907", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/tap_icon.png"
+            }
+			tileAttribute("device.temperature", key: "VALUE_CONTROL") {
+    			attributeState("VALUE_UP", action: "temperatureUp")
+    			attributeState("VALUE_DOWN", action: "temperatureDown")
+  			}
+            tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") {
+    			attributeState("idle", backgroundColor:"#666666")
+    			attributeState("heating", backgroundColor:"#ff471a")
+                attributeState("emergency heat", backgroundColor:"#ff471a")
+  			}
+			tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") {
+    			attributeState("off", label:'${name}')
+    			attributeState("heat", label:'${name}')
+  			}
+			tileAttribute("device.heatingSetpoint", key: "HEATING_SETPOINT") {
+    			attributeState("default", label:'${currentValue}', unit:"dF")
+  			}
+		}
+
+        valueTile("heatingSetpoint", "device.heatingSetpoint", width: 2, height: 1, decoration: "flat") {
+			state "default", label: 'Set Point\r\n\${currentValue}°'
+		}
+
+        standardTile("tadoMode", "device.tadoMode", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true) {
+			state("SLEEP", label:'${name}', backgroundColor:"#0164a8", icon:"st.Bedroom.bedroom2")
+            state("HOME", label:'${name}', backgroundColor:"#fab907", icon:"st.Home.home2")
+            state("AWAY", label:'${name}', backgroundColor:"#62aa12", icon:"st.Outdoor.outdoor18")
+            state("OFF", label:'', backgroundColor:"#ffffff", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/hvac_off.png", defaultState: true)
+            state("MANUAL", label:'${name}', backgroundColor:"#804000", icon:"st.Weather.weather1")
+		}
+
+		standardTile("thermostatMode", "device.thermostatMode", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true) {
+        	state("heat", label:'HEAT', backgroundColor:"#ea2a2a", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/heat_mode_icon.png")
+            state("off", label:'', backgroundColor:"#ffffff", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/hvac_off.png", defaultState: true)
+		}
+
+        standardTile("refresh", "device.switch", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+        standardTile("Off", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.off", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/hvac_off.png"
+		}
+		standardTile("emergencyHeat", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.emergencyHeat", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/emergencyHeat.png"
+		}
+		valueTile("outsidetemperature", "device.outsidetemperature", width: 2, height: 1, decoration: "flat") {
+			state "outsidetemperature", label: 'Outside Temp\r\n${currentValue}°'
+		}
+		standardTile("heat", "device.thermostat", width: 2, height: 1, decoration: "flat") {
+			state "default", label:"", action:"thermostat.heat", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/hvac_heat.png"
+		}
+		standardTile("heatingSetpointUp", "device.heatingSetpoint", width: 1, height: 1, canChangeIcon: false, decoration: "flat") {
+            state "heatingSetpointUp", label:'', action:"heatingSetpointUp", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/heat_arrow_up.png"
+        }
+        standardTile("heatingSetpointDown", "device.heatingSetpoint", width: 1, height: 1, canChangeIcon: false, decoration: "flat") {
+            state "heatingSetpointDown", label:'', action:"heatingSetpointDown", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/heat_arrow_down.png"
+        }
+		standardTile("endManualControl", "device.thermostat", width: 2, height: 1, canChangeIcon: false, canChangeBackground: true, decoration: "flat") {
+            state("default", label:'', action:"endManualControl", icon:"https://raw.githubusercontent.com/fuzzysb/SmartThings/master/DeviceTypes/fuzzysb/tado.Hot.Water.src/Images/endManual.png")
+		}
+		main "thermostat"
+		details (["thermostat","thermostatMode","outsidetemperature","heatingSetpoint","refresh","heatingSetpointUp","heatingSetpointDown","tadoMode","emergencyHeat","heat","Off","endManualControl"])
+	}
+}
+
+def getWeather(){
+	parent.weatherStatusCommand(this)
+}
+
+def setCapabilitySupportsWater(value){
+  state.supportsWater = value
+  log.debug("state.supportsWater = ${state.supportsWater}")
+}
+
+def getCapabilitySupportsWater() {
+  def map = null
+  map = [name: "capabilitySupportsWater", value: state.supportsWater]
+  return map
+}
+
+def setCapabilitySupportsWaterTempControl(value){
+  state.supportsWaterTempControl = value
+  log.debug("state.supportsWaterTempControl = ${state.supportsWaterTempControl}")
+}
+
+def getCapabilitySupportsWaterTempControl() {
+  def map = null
+  map = [name: "capabilitySupportsWaterTempControl", value: state.supportsWaterTempControl]
+  return map
+}
+
+def updated(){
+	refresh()
+}
+
+def installed(){
+	refresh()
+}
+
+def poll() {
+	log.debug "Executing 'poll'"
+	refresh()
+}
+
+def refresh() {
+	log.debug "Executing 'refresh'"
+    parent.statusCommand(this)
+    getWeather()
+}
+
+def auto() {
+	log.debug "Executing 'auto'"
+	parent.autoCommand(this)
+  parent.statusCommand(this)
+}
+
+def on() {
+	log.debug "Executing 'on'"
+	onCommand()
+    statusCommand()
+}
+
+def off() {
+	log.debug "Executing 'off'"
+	offCommand()
+    statusCommand()
+}
+
+def setHeatingSetpoint(targetTemperature) {
+	log.debug "Executing 'setHeatingSetpoint'"
+    log.debug "Target Temperature ${targetTemperature}"
+    setHeatingTempCommand(targetTemperature)
+	statusCommand()
+}
+
+def temperatureUp(){
+	if (device.currentValue("thermostatMode") == "heat") {
+    	heatingSetpointUp()
+    } else {
+    	log.debug ("temperature setpoint not supported in the current thermostat mode")
+    }
+}
+
+def temperatureDown(){
+	if (device.currentValue("thermostatMode") == "heat") {
+    	heatingSetpointDown()
+    } else {
+    	log.debug ("temperature setpoint not supported in the current thermostat mode")
+    }
+}
+
+def heatingSetpointUp(){
+	log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+	if(state.supportsWaterTempControl == "true"){
+		if ((device.currentValue("thermostatSetpoint").toInteger() - 1 ) < state.MinHeatTemp){
+			log.debug("cannot decrease heat setpoint, its already at the minimum level of " + state.MinHeatTemp)
+		} else {
+			int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() + 1
+			log.debug "Setting heatingSetpoint up to: ${newSetpoint}"
+			setHeatingSetpoint(newSetpoint)
+			statusCommand()
+		}
+	} else {
+		log.debug "Hot Water Temperature Capability Not Supported"
+	}
+}
+
+def heatingSetpointDown(){
+	log.debug "Current SetPoint Is " + (device.currentValue("thermostatSetpoint")).toString()
+	if(state.supportsWaterTempControl == "true"){
+		if ((device.currentValue("thermostatSetpoint").toInteger() + 1 ) > state.MaxHeatTemp){
+			log.debug("cannot increase heat setpoint, its already at the maximum level of " + state.MaxHeatTemp)
+		} else {
+			int newSetpoint = (device.currentValue("thermostatSetpoint")).toInteger() - 1
+			log.debug "Setting heatingSetpoint down to: ${newSetpoint}"
+			setHeatingSetpoint(newSetpoint)
+			statusCommand()
+		}
+	} else {
+		log.debug "Hot Water Temperature Capability Not Supported"
+	}
+}
+
+// Commands to device
+
+
+def setThermostatMode(requiredMode){
+	switch (requiredMode) {
+    	case "heat":
+        	heat()
+        break
+        case "auto":
+        	auto()
+        break
+		case "off":
+        	off()
+        break
+		case "emergency heat":
+        	emergencyHeat()
+        break
+     }
+}
+
+def heat(){
+  parent.heatCommand(this)
+  parent.statusCommand(this)
+}
+
+def emergencyHeat(){
+  parent.emergencyHeat(this)
+}
+
+def endManualControl(){
+	parent.endManualControl(this)
+}
--- a/devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy
+++ b/devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy
@@ -120,6 +120,15 @@ def configure() {
 	return cmd
 }

+
+def installed() {
+	initialize()
+}
+
 def updated() {
+	initialize()
+}
+
+def initialize() {
 	sendEvent(name: "numberOfButtons", value: 4)
 }
--- a/devicetypes/smartthings/aeon-minimote.src/aeon-minimote.groovy
+++ b/devicetypes/smartthings/aeon-minimote.src/aeon-minimote.groovy
@@ -109,6 +109,15 @@ def configure() {
 	return cmds
 }

+
+def installed() {
+	initialize()
+}
+
 def updated() {
+	initialize()
+}
+
+def initialize() {
 	sendEvent(name: "numberOfButtons", value: 4)
 }
--- a/devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy
+++ b/devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy
@@ -183,6 +183,15 @@ def updateState(String name, String value) {
 	device.updateDataValue(name, value)
 }

+
+def installed() {
+	initialize()
+}
+
 def updated() {
+	initialize()
+}
+
+def initialize() {
 	sendEvent(name: "numberOfButtons", value: 3)
 }
--- a/devicetypes/smartthings/smartsense-motion.src/smartsense-motion.groovy
+++ b/devicetypes/smartthings/smartsense-motion.src/smartsense-motion.groovy
@@ -57,6 +57,7 @@ def parse(String description) {

 private Map parseBasicMessage(description) {
 	def name = parseName(description)
+	def results = [:]
 	if (name != null) {
 		def value = parseValue(description)
 		def linkText = getLinkText(device)
@@ -64,7 +65,7 @@ private Map parseBasicMessage(description) {
 		def handlerName = value
 		def isStateChange = isStateChange(device, name, value)

-		def results = [
+		results = [
 				name           : name,
 				value          : value,
 				linkText       : linkText,
@@ -73,8 +74,6 @@ private Map parseBasicMessage(description) {
 				isStateChange  : isStateChange,
 				displayed      : displayed(description, isStateChange)
 		]
-	} else {
-		results = [:]
 	}
 	log.debug "Parse returned $results.descriptionText"
 	return results
--- a/devicetypes/smartthings/testing/simulated-minimote.src/simulated-minimote.groovy
+++ b/devicetypes/smartthings/testing/simulated-minimote.src/simulated-minimote.groovy
@@ -126,6 +126,15 @@ private hold(button) {
 	sendEvent(name: "button", value: "held", data: [buttonNumber: button], descriptionText: "$device.displayName button $button was held", isStateChange: true)
 }

+
+def installed() {
+	initialize()
+}
+
 def updated() {
+	initialize()
+}
+
+def initialize() {
 	sendEvent(name: "numberOfButtons", value: 4)
 }
--- a/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
+++ b/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
@@ -23,9 +23,11 @@ metadata {


        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 ON/OFF/DIM", deviceJoinName: "OSRAM LIGHTIFY LED Smart Connected Light"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart A19 Soft White"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FF00", outClusters: "0019", manufacturer: "MRVL", model: "MZ100", deviceJoinName: "Wemo Bulb"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B05", outClusters: "0019", manufacturer: "OSRAM SYLVANIA", model: "iQBR30", deviceJoinName: "Sylvania Ultra iQ"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY PAR38 ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart PAR38 Soft White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart BR30 Soft White"
    }

    tiles(scale: 2) {
--- a/devicetypes/smartthings/zigbee-rgb-bulb.src/zigbee-rgb-bulb.groovy
+++ b/devicetypes/smartthings/zigbee-rgb-bulb.src/zigbee-rgb-bulb.groovy
@@ -28,8 +28,8 @@ metadata {
 		capability "Switch Level"
 		capability "Health Check"

-		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Gardenspot RGB", deviceJoinName: "OSRAM LIGHTIFY Gardenspot mini RGB"
-		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Gardenspot RGB", deviceJoinName: "OSRAM LIGHTIFY Gardenspot mini RGB"
+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Gardenspot RGB", deviceJoinName: "SYLVANIA Smart Gardenspot mini RGB"
+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Gardenspot RGB", deviceJoinName: "SYLVANIA Smart Gardenspot mini RGB"
 	}

 	// UI tile definitions
--- a/devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy
+++ b/devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy
@@ -32,11 +32,12 @@ metadata {
        attribute "colorName", "string"
        command "setGenericName"

-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 RGBW", deviceJoinName: "OSRAM LIGHTIFY LED A19 RGBW"
-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR RGBW", deviceJoinName: "OSRAM LIGHTIFY LED BR30 RGBW"
-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT RGBW", deviceJoinName: "OSRAM LIGHTIFY LED RT 5/6 RGBW"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Flex RGBW", deviceJoinName: "SYLVANIA Smart Flex RGBW"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY Flex RGBW"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 RGBW", deviceJoinName: "SYLVANIA Smart A19 RGBW"
+        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"
    }

    // UI tile definitions
--- a/devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy
+++ b/devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy
@@ -32,10 +32,10 @@ metadata {

        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300", outClusters: "0019"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04", outClusters: "0019"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Flood BR30 Tunable White"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Recessed Kit RT 5/6 Tunable White"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 TW", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR Tunable White", deviceJoinName: "SYLVANIA Smart BR30 Tunable White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT Tunable White", deviceJoinName: "SYLVANIA Smart RT5/6 Tunable White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 TW", deviceJoinName: "OSRAM LIGHTIFY LED Classic A60 Tunable White"
+        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"
    }
--- a/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy
+++ b/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy
@@ -127,8 +127,8 @@ def configureHealthCheck() {

 def configure() {
    log.debug "configure()"
-    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
    configureHealthCheck()
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }

 def updated() {
--- a/smartapps/fuzzysb/tado-connect.src/tado-connect.groovy
+++ b/smartapps/fuzzysb/tado-connect.src/tado-connect.groovy
Author	SHA1	Message	Date
Stuart	27fc3983ae	MSA-1626: Complete integration for all Tado Heating & Cooling products with SmartThings, this release includes discovery for the Tado Smart Thermostat, Smart Radiator Thermostat, Extension Kit & Smart AC Control Units	2016-12-01 07:26:01 -08:00
Vinay Rao	bbad6dfa7a	Merge pull request #1501 from SmartThingsCommunity/staging Rolling down staging hotfix to master	2016-11-28 10:35:24 -08:00
Vinay Rao	df6c815aa4	Merge pull request #1500 from SmartThingsCommunity/production Rolling down production hotfix to staging	2016-11-28 10:34:01 -08:00
Tom Manley	d16ac00eb6	Merge pull request #1493 from tpmanley/hotfix/zll-dimmer-join-failure zll-dimmer-bulb: Fix bug in configure preventing devices from joining	2016-11-23 23:30:08 -06:00
Tom Manley	1941f56007	zll-dimmer-bulb: Fix bug in configure preventing devices from joining The configureHealthCheck method and therefore the configure method was returning a boolean which was causing an exception during the initial join that would prevent the device from showing up to the user. https://smartthings.atlassian.net/browse/PROB-1428	2016-11-23 23:01:05 -06:00
Vinay Rao	f34df19a65	Merge pull request #1490 from SmartThingsCommunity/master Rolling up master to staging	2016-11-22 13:00:00 -08:00
Vinay Rao	af40246655	Merge pull request #1489 from SmartThingsCommunity/staging Rolling down staging hotfix to master	2016-11-22 12:59:05 -08:00
Vinay Rao	20239ca982	Merge pull request #1488 from SmartThingsCommunity/staging Rolling up to production for deploy	2016-11-22 12:43:20 -08:00
Vinay Rao	b20c0e371f	Merge pull request #1487 from SmartThingsCommunity/production Rolling down production hotfix to staging	2016-11-22 12:42:25 -08:00
Vinay Rao	60756e6dc6	Merge pull request #1478 from yafenzhang/MSA-1591-15 MSA-1591: New Device Handle for Osram Lightify Light(ZHA)	2016-11-21 09:26:08 -08:00
bflorian	ee2e1ee04f	Merge pull request #1483 from juano2310/staging DVCSMP-2211 - Update Button Number	2016-11-18 14:55:18 -08:00
juano2310	e443cb641c	DVCSMP-2211 - Update Button Number	2016-11-18 11:28:30 -05:00
Vinay Rao	b9993a9bf2	Merge pull request #1480 from SmartThingsCommunity/master Rolling up master to staging	2016-11-16 13:38:01 -08:00
Vinay Rao	a8ee927893	Merge pull request #1479 from varzac/fix-motion-sensor [DPROT-200] Fix broken generation of smartsense-motion events	2016-11-16 08:55:13 -08:00
Zach Varberg	51979f0030	Fix broken generation of smartsense-motion events When the change went out to allow messages to be passed up to the cloud the smartsense-motion DTH was broken with the changes for https://smartthings.atlassian.net/browse/DPROT-200	2016-11-16 10:44:48 -06:00
Zhang Yafen	61d1205e7d	MSA-1591: 1.New Device Handle for Osram Lightify Light(ZHA) (1) SYLVANIA Smart BR30 Softw White (2) SYLVANIA Smart PAR38 Softw White (3) SYLVANIA Smart Outdoor RGBW Flex 2. Modify deviceJoinName of NAFTA Lightify product, all the lightify product which use ZHA protocol will be named using "SYLVANIA Smart XXXX".	2016-11-16 19:57:46 +08:00
Vinay Rao	1dfd1818b4	Merge pull request #1471 from SmartThingsCommunity/master Rolling up master to staging	2016-11-15 14:05:57 -08:00
Vinay Rao	e5c21ef720	Merge pull request #1469 from SmartThingsCommunity/staging Rolling up staging for production deploy	2016-11-15 13:18:56 -08:00