MSA-882: Modifications to Total Comfort API:Total Comfort API as noted in code notes

2026-03-11 05:11:51 +00:00 · 2016-02-14 16:45:21 -06:00
11 changed files with 1363 additions and 516 deletions
--- a/devicetypes/osotech/plantlink.src/plantlink.groovy
+++ b/devicetypes/osotech/plantlink.src/plantlink.groovy
@@ -120,7 +120,7 @@ def setInstallSmartApp(value){
 }

 def parse(String description) {
-	log.debug description
+
 	def description_map = parseDescriptionAsMap(description)
    def event_name = ""
    def measurement_map = [
@@ -129,7 +129,10 @@ def parse(String description) {
            zigbeedeviceid: device.zigbeeId,
            created: new Date().time /1000 as int
    ]
-    if (description_map.cluster == "0001"){
+    if (description_map.cluster == "0000"){
+    	/* version number, not used */
+        
+    } else if (description_map.cluster == "0001"){
        /* battery voltage in mV (device needs minimium 2.1v to run) */
        log.debug "PlantLink - id ${device.zigbeeId} battery ${description_map.value}"
        event_name = "battery_status"
@@ -155,10 +158,6 @@ def parse(String description) {
 def parseDescriptionAsMap(description) {
    (description - "read attr - ").split(",").inject([:]) { map, param ->
        def nameAndValue = param.split(":")
-        if(nameAndValue.length == 2){
-	        map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-        }else{
-        	map += []
-        }
+        map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
    }
 }
--- a/devicetypes/smartthings/ecobee-sensor.src/ecobee-sensor.groovy
+++ b/devicetypes/smartthings/ecobee-sensor.src/ecobee-sensor.groovy
@@ -22,6 +22,10 @@ metadata {
 		capability "Polling"
 	}

+	simulator {
+		// TODO: define status and reply messages here
+	}
+
 	tiles {
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
 			state("temperature", label:'${currentValue}°', unit:"F",
@@ -52,12 +56,16 @@ metadata {
 }

 def refresh() {
-	log.debug "refresh called"
+	log.debug "refresh..."
 	poll()
 }

 void poll() {
 	log.debug "Executing 'poll' using parent SmartApp"
-	parent.pollChild(this)
-
+	parent.pollChildren(this)
+}
+
+//generate custom mobile activity feeds event
+def generateActivityFeedsEvent(notificationMessage) {
+	sendEvent(name: "notificationMessage", value: "$device.displayName $notificationMessage", descriptionText: "$device.displayName $notificationMessage", displayed: true)
 }
--- a/devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy
+++ b/devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy
@@ -19,40 +19,34 @@ metadata {
 	definition (name: "Ecobee Thermostat", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Thermostat"
-		capability "Temperature Measurement"
 		capability "Polling"
 		capability "Sensor"
-		capability "Refresh"
-		capability "Relative Humidity Measurement"
+        capability "Refresh"

-		command "generateEvent"
-		command "raiseSetpoint"
-		command "lowerSetpoint"
-		command "resumeProgram"
-		command "switchMode"
-		command "switchFanMode"
+        command "generateEvent"
+        command "raiseSetpoint"
+        command "lowerSetpoint"
+        command "resumeProgram"
+        command "switchMode"

-		attribute "thermostatSetpoint","number"
-		attribute "thermostatStatus","string"
-		attribute "maxHeatingSetpoint", "number"
-		attribute "minHeatingSetpoint", "number"
-		attribute "maxCoolingSetpoint", "number"
-		attribute "minCoolingSetpoint", "number"
-		attribute "deviceTemperatureUnit", "number"
+        attribute "thermostatSetpoint","number"
+        attribute "thermostatStatus","string"
 	}

-	tiles {
+	simulator { }
+
+    	tiles {
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
 			state("temperature", label:'${currentValue}°', unit:"F",
-					backgroundColors:[
-							[value: 31, color: "#153591"],
-							[value: 44, color: "#1e9cbb"],
-							[value: 59, color: "#90d2a7"],
-							[value: 74, color: "#44b621"],
-							[value: 84, color: "#f1d801"],
-							[value: 95, color: "#d04e00"],
-							[value: 96, color: "#bc2323"]
-					]
+                backgroundColors:[
+                    [value: 31, color: "#153591"],
+                    [value: 44, color: "#1e9cbb"],
+                    [value: 59, color: "#90d2a7"],
+                    [value: 74, color: "#44b621"],
+                    [value: 84, color: "#f1d801"],
+                    [value: 95, color: "#d04e00"],
+                    [value: 96, color: "#bc2323"]
+                ]
 			)
 		}
 		standardTile("mode", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
@@ -64,9 +58,10 @@ metadata {
 			state "updating", label:"Working", icon: "st.secondary.secondary"
 		}
 		standardTile("fanMode", "device.thermostatFanMode", inactiveLabel: false, decoration: "flat") {
-			state "auto", action:"switchFanMode", nextState: "updating", icon: "st.thermostat.fan-auto"
-			state "on", action:"switchFanMode", nextState: "updating", icon: "st.thermostat.fan-on"
-			state "updating", label:"Working", icon: "st.secondary.secondary"
+			state "auto", label:'Fan: ${currentValue}', action:"switchFanMode", nextState: "on"
+			state "on", label:'Fan: ${currentValue}', action:"switchFanMode", nextState: "off"
+			state "off", label:'Fan: ${currentValue}', action:"switchFanMode", nextState: "circulate"
+			state "circulate", label:'Fan: ${currentValue}', action:"switchFanMode", nextState: "auto"
 		}
 		standardTile("upButtonControl", "device.thermostatSetpoint", inactiveLabel: false, decoration: "flat") {
 			state "setpoint", action:"raiseSetpoint", icon:"st.thermostat.thermostat-up"
@@ -96,14 +91,11 @@ metadata {
 			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 		standardTile("resumeProgram", "device.resumeProgram", inactiveLabel: false, decoration: "flat") {
-			state "resume", action:"resumeProgram", nextState: "updating", label:'Resume', icon:"st.samsung.da.oven_ic_send"
+			state "resume", action:"resumeProgram", nextState: "updating", label:'Resume Schedule', icon:"st.samsung.da.oven_ic_send"
 			state "updating", label:"Working", icon: "st.secondary.secondary"
 		}
-		valueTile("humidity", "device.humidity", decoration: "flat") {
-			state "humidity", label:'${currentValue}%'
-		}
 		main "temperature"
-		details(["temperature", "upButtonControl", "thermostatSetpoint", "currentStatus", "downButtonControl", "mode", "fanMode","resumeProgram", "humidity", "refresh"])
+		details(["temperature", "upButtonControl", "thermostatSetpoint", "currentStatus", "downButtonControl", "mode", "resumeProgram", "refresh"])
 	}

 	preferences {
@@ -115,6 +107,8 @@ metadata {
 // parse events into attributes
 def parse(String description) {
 	log.debug "Parsing '${description}'"
+	// TODO: handle '' attribute
+
 }

 def refresh() {
@@ -139,27 +133,16 @@ def generateEvent(Map results) {
 			def isChange = false
 			def isDisplayed = true
 			def event = [name: name, linkText: linkText, descriptionText: getThermostatDescriptionText(name, value, linkText),
-						 handlerName: name]
+			handlerName: name]

-			if (name=="temperature" || name=="heatingSetpoint" || name=="coolingSetpoint" ) {
-				def sendValue = convertTemperatureIfNeeded(value.toDouble(), "F", 1) //API return temperature value in F
-				sendValue =  location.temperatureScale == "C"? roundC(sendValue) : sendValue
+			if (name=="temperature" || name=="heatingSetpoint" || name=="coolingSetpoint") {
+				def sendValue = value? convertTemperatureIfNeeded(value.toDouble(), "F", 1): value //API return temperature value in F
 				isChange = isTemperatureStateChange(device, name, value.toString())
 				isDisplayed = isChange
 				event << [value: sendValue, isStateChange: isChange, displayed: isDisplayed]
-			}  else if (name=="maxCoolingSetpoint" || name=="minCoolingSetpoint" || name=="maxHeatingSetpoint" || name=="minHeatingSetpoint") {
-				def sendValue = convertTemperatureIfNeeded(value.toDouble(), "F", 1) //API return temperature value in F
-				sendValue =  location.temperatureScale == "C"? roundC(sendValue) : sendValue
-				event << [value: sendValue, displayed: false]
-			}  else if (name=="heatMode" || name=="coolMode" || name=="autoMode" || name=="auxHeatMode"){
+			} else if (name=="heatMode" || name=="coolMode" || name=="autoMode" || name=="auxHeatMode"){
 				isChange = isStateChange(device, name, value.toString())
 				event << [value: value.toString(), isStateChange: isChange, displayed: false]
-			}  else if (name=="thermostatFanMode"){
-				isChange = isStateChange(device, name, value.toString())
-				event << [value: value.toString(), isStateChange: isChange, displayed: false]
-			}  else if (name=="humidity") {
-				isChange = isStateChange(device, name, value.toString())
-				event << [value: value.toString(), isStateChange: isChange, displayed: false, unit: "%"]
 			}  else {
 				isChange = isStateChange(device, name, value.toString())
 				isDisplayed = isChange
@@ -175,19 +158,13 @@ def generateEvent(Map results) {
 //return descriptionText to be shown on mobile activity feed
 private getThermostatDescriptionText(name, value, linkText) {
 	if(name == "temperature") {
-		def sendValue = convertTemperatureIfNeeded(value.toDouble(), "F", 1) //API return temperature value in F
-		sendValue =  location.temperatureScale == "C"? roundC(sendValue) : sendValue
-		return "$linkText temperature is $sendValue ${location.temperatureScale}"
+		return "$linkText temperature is $value°F"

 	} else if(name == "heatingSetpoint") {
-		def sendValue = convertTemperatureIfNeeded(value.toDouble(), "F", 1) //API return temperature value in F
-		sendValue =  location.temperatureScale == "C"? roundC(sendValue) : sendValue
-		return "heating setpoint is $sendValue ${location.temperatureScale}"
+		return "heating setpoint is $value°F"

 	} else if(name == "coolingSetpoint"){
-		def sendValue = convertTemperatureIfNeeded(value.toDouble(), "F", 1) //API return temperature value in F
-		sendValue =  location.temperatureScale == "C"? roundC(sendValue) : sendValue
-		return "cooling setpoint is $sendValue ${location.temperatureScale}"
+		return "cooling setpoint is $value°F"

 	} else if (name == "thermostatMode") {
 		return "thermostat mode is ${value}"
@@ -195,26 +172,26 @@ private getThermostatDescriptionText(name, value, linkText) {
 	} else if (name == "thermostatFanMode") {
 		return "thermostat fan mode is ${value}"

-	} else if (name == "humidity") {
-		return "humidity is ${value} %"
 	} else {
 		return "${name} = ${value}"
 	}
 }

 void setHeatingSetpoint(setpoint) {
-	log.debug "***heating setpoint $setpoint"
-	def heatingSetpoint = setpoint.toDouble()
+	setHeatingSetpoint(setpoint.toDouble())
+}
+
+void setHeatingSetpoint(Double setpoint) {
+//    def mode = device.currentValue("thermostatMode")
+	def heatingSetpoint = setpoint
 	def coolingSetpoint = device.currentValue("coolingSetpoint").toDouble()
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	def maxHeatingSetpoint = device.currentValue("maxHeatingSetpoint").toDouble()
-	def minHeatingSetpoint = device.currentValue("minHeatingSetpoint").toDouble()

 	//enforce limits of heatingSetpoint
-	if (heatingSetpoint > maxHeatingSetpoint) {
-		heatingSetpoint = maxHeatingSetpoint
-	} else if (heatingSetpoint < minHeatingSetpoint) {
-		heatingSetpoint = minHeatingSetpoint
+	if (heatingSetpoint > 79) {
+		heatingSetpoint = 79
+	} else if (heatingSetpoint < 45) {
+		heatingSetpoint = 45
 	}

 	//enforce limits of heatingSetpoint vs coolingSetpoint
@@ -224,34 +201,32 @@ void setHeatingSetpoint(setpoint) {

 	log.debug "Sending setHeatingSetpoint> coolingSetpoint: ${coolingSetpoint}, heatingSetpoint: ${heatingSetpoint}"

-	def coolingValue = location.temperatureScale == "C"? convertCtoF(coolingSetpoint) : coolingSetpoint
-	def heatingValue = location.temperatureScale == "C"? convertCtoF(heatingSetpoint) : heatingSetpoint
-
 	def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
-	if (parent.setHold(this, heatingValue, coolingValue, deviceId, sendHoldType)) {
+	if (parent.setHold (this, heatingSetpoint,  coolingSetpoint, deviceId, sendHoldType)) {
 		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)
 		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint)
 		log.debug "Done setHeatingSetpoint> coolingSetpoint: ${coolingSetpoint}, heatingSetpoint: ${heatingSetpoint}"
 		generateSetpointEvent()
 		generateStatusEvent()
 	} else {
-		log.error "Error setHeatingSetpoint(setpoint)"
+		log.error "Error setHeatingSetpoint(setpoint)" //This error is handled by the connect app
 	}
 }

 void setCoolingSetpoint(setpoint) {
-	log.debug "***cooling setpoint $setpoint"
+	setCoolingSetpoint(setpoint.toDouble())
+}
+
+void setCoolingSetpoint(Double setpoint) {
+//    def mode = device.currentValue("thermostatMode")
 	def heatingSetpoint = device.currentValue("heatingSetpoint").toDouble()
-	def coolingSetpoint = setpoint.toDouble()
+	def coolingSetpoint = setpoint
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	def maxCoolingSetpoint = device.currentValue("maxCoolingSetpoint").toDouble()
-	def minCoolingSetpoint = device.currentValue("minCoolingSetpoint").toDouble()

-
-	if (coolingSetpoint > maxCoolingSetpoint) {
-		coolingSetpoint = maxCoolingSetpoint
-	} else if (coolingSetpoint < minCoolingSetpoint) {
-		coolingSetpoint = minCoolingSetpoint
+	if (coolingSetpoint > 92) {
+		coolingSetpoint = 92
+	} else if (coolingSetpoint < 65) {
+		coolingSetpoint = 65
 	}

 	//enforce limits of heatingSetpoint vs coolingSetpoint
@@ -261,18 +236,15 @@ void setCoolingSetpoint(setpoint) {

 	log.debug "Sending setCoolingSetpoint> coolingSetpoint: ${coolingSetpoint}, heatingSetpoint: ${heatingSetpoint}"

-	def coolingValue = location.temperatureScale == "C"? convertCtoF(coolingSetpoint) : coolingSetpoint
-	def heatingValue = location.temperatureScale == "C"? convertCtoF(heatingSetpoint) : heatingSetpoint
-
 	def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
-	if (parent.setHold(this, heatingValue, coolingValue, deviceId, sendHoldType)) {
+	if (parent.setHold (this, heatingSetpoint,  coolingSetpoint, deviceId, sendHoldType)) {
 		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)
 		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint)
 		log.debug "Done setCoolingSetpoint>> coolingSetpoint = ${coolingSetpoint}, heatingSetpoint = ${heatingSetpoint}"
 		generateSetpointEvent()
 		generateStatusEvent()
 	} else {
-		log.error "Error setCoolingSetpoint(setpoint)"
+		log.error "Error setCoolingSetpoint(setpoint)" //This error is handled by the connect app
 	}
 }

@@ -306,7 +278,7 @@ def modes() {
 }

 def fanModes() {
-	["on", "auto"]
+	["off", "on", "auto", "circulate"]
 }

 def switchMode() {
@@ -335,15 +307,17 @@ def switchFanMode() {
 	def returnCommand

 	switch (currentFanMode) {
-		case "on":
-			returnCommand = switchToFanMode("auto")
+		case "fanAuto":
+			returnCommand = switchToFanMode("fanOn")
 			break
-		case "auto":
-			returnCommand = switchToFanMode("on")
+		case "fanOn":
+			returnCommand = switchToFanMode("fanCirculate")
+			break
+		case "fanCirculate":
+			returnCommand = switchToFanMode("fanAuto")
 			break
-
 	}
-	if(!currentFanMode) { returnCommand = switchToFanMode("auto") }
+	if(!currentFanMode) { returnCommand = switchToFanMode("fanOn") }
 	returnCommand
 }

@@ -352,20 +326,25 @@ def switchToFanMode(nextMode) {
 	log.debug "switching to fan mode: $nextMode"
 	def returnCommand

-	if(nextMode == "auto") {
-		if(!fanModes.contains("auto")) {
+	if(nextMode == "fanAuto") {
+		if(!fanModes.contains("fanAuto")) {
 			returnCommand = fanAuto()
 		} else {
-			returnCommand = switchToFanMode("on")
+			returnCommand = switchToFanMode("fanOn")
 		}
-	} else if(nextMode == "on") {
-		if(!fanModes.contains("on")) {
+	} else if(nextMode == "fanOn") {
+		if(!fanModes.contains("fanOn")) {
 			returnCommand = fanOn()
 		} else {
-			returnCommand = switchToFanMode("auto")
+			returnCommand = switchToFanMode("fanCirculate")
+		}
+	} else if(nextMode == "fanCirculate") {
+		if(!fanModes.contains("fanCirculate")) {
+			returnCommand = fanCirculate()
+		} else {
+			returnCommand = switchToFanMode("fanAuto")
 		}
 	}
-
 	returnCommand
 }

@@ -375,10 +354,13 @@ def getDataByName(String name) {

 def setThermostatMode(String value) {
 	log.debug "setThermostatMode({$value})"
+
 }

 def setThermostatFanMode(String value) {
+
 	log.debug "setThermostatFanMode({$value})"
+
 }

 def generateModeEvent(mode) {
@@ -465,48 +447,27 @@ def auto() {

 def fanOn() {
 	log.debug "fanOn"
-	String fanMode = "on"
-	def heatingSetpoint = device.currentValue("heatingSetpoint")
-	def coolingSetpoint = device.currentValue("coolingSetpoint")
-	def deviceId = device.deviceNetworkId.split(/\./).last()
+//    parent.setFanMode (this,"on")

-	def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
-
-	def coolingValue = location.temperatureScale == "C"? convertCtoF(coolingSetpoint) : coolingSetpoint
-	def heatingValue = location.temperatureScale == "C"? convertCtoF(heatingSetpoint) : heatingSetpoint
-
-	if (parent.setFanMode(this, heatingValue, coolingValue, deviceId, sendHoldType, fanMode)) {
-		generateFanModeEvent(fanMode)
-	} else {
-		log.debug "Error setting new mode."
-		def currentFanMode = device.currentState("thermostatFanMode")?.value
-		generateModeEvent(currentFanMode) // reset the tile back
-	}
 }

 def fanAuto() {
 	log.debug "fanAuto"
-	String fanMode = "auto"
-	def heatingSetpoint = device.currentValue("heatingSetpoint")
-	def coolingSetpoint = device.currentValue("coolingSetpoint")
-	def deviceId = device.deviceNetworkId.split(/\./).last()
+//    parent.setFanMode (this,"auto")

-	def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
-
-	def coolingValue = location.temperatureScale == "C"? convertCtoF(coolingSetpoint) : coolingSetpoint
-	def heatingValue = location.temperatureScale == "C"? convertCtoF(heatingSetpoint) : heatingSetpoint
-
-	if (parent.setFanMode(this, heatingValue, coolingValue, deviceId, sendHoldType, fanMode)) {
-		generateFanModeEvent(fanMode)
-	} else {
-		log.debug "Error setting new mode."
-		def currentFanMode = device.currentState("thermostatFanMode")?.value
-		generateModeEvent(currentFanMode) // reset the tile back
-	}
 }

+def fanCirculate() {
+	log.debug "fanCirculate"
+//    parent.setFanMode (this,"circulate")

+}

+def fanOff() {
+	log.debug "fanOff"
+//    parent.setFanMode (this,"off")
+
+}

 def generateSetpointEvent() {

@@ -515,41 +476,20 @@ def generateSetpointEvent() {
 	def mode = device.currentValue("thermostatMode")
 	log.debug "Current Mode = ${mode}"

-	def heatingSetpoint = device.currentValue("heatingSetpoint")
+	def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
 	log.debug "Heating Setpoint = ${heatingSetpoint}"

-	def coolingSetpoint = device.currentValue("coolingSetpoint")
+	def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
 	log.debug "Cooling Setpoint = ${coolingSetpoint}"

-	def maxHeatingSetpoint = device.currentValue("maxHeatingSetpoint")
-	def maxCoolingSetpoint = device.currentValue("maxCoolingSetpoint")
-	def minHeatingSetpoint = device.currentValue("minHeatingSetpoint")
-	def minCoolingSetpoint = device.currentValue("minCoolingSetpoint")
-
-	if(location.temperatureScale == "C")
-	{
-		maxHeatingSetpoint = roundC(maxHeatingSetpoint)
-		maxCoolingSetpoint = roundC(maxCoolingSetpoint)
-		minHeatingSetpoint = roundC(minHeatingSetpoint)
-		minCoolingSetpoint = roundC(minCoolingSetpoint)
-		heatingSetpoint = roundC(heatingSetpoint)
-		coolingSetpoint = roundC(coolingSetpoint)
-	}
-
-	sendEvent("name":"maxHeatingSetpoint", "value":maxHeatingSetpoint, "unit":location.temperatureScale)
-	sendEvent("name":"maxCoolingSetpoint", "value":maxCoolingSetpoint, "unit":location.temperatureScale)
-	sendEvent("name":"minHeatingSetpoint", "value":minHeatingSetpoint, "unit":location.temperatureScale)
-	sendEvent("name":"minCoolingSetpoint", "value":minCoolingSetpoint, "unit":location.temperatureScale)
-
-
 	if (mode == "heat") {

-		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint )
+		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint.toString())

 	}
 	else if (mode == "cool") {

-		sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint)
+		sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint.toString())

 	} else if (mode == "auto") {

@@ -559,9 +499,9 @@ def generateSetpointEvent() {

 		sendEvent("name":"thermostatSetpoint", "value":"Off")

-	} else if (mode == "auxHeatOnly") {
+	} else if (mode == "emergencyHeat") {

-		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint)
+		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint.toString())

 	}

@@ -570,30 +510,26 @@ def generateSetpointEvent() {
 void raiseSetpoint() {
 	def mode = device.currentValue("thermostatMode")
 	def targetvalue
-	def maxHeatingSetpoint = device.currentValue("maxHeatingSetpoint")
-	def maxCoolingSetpoint = device.currentValue("maxCoolingSetpoint")
-

 	if (mode == "off" || mode == "auto") {
 		log.warn "this mode: $mode does not allow raiseSetpoint"
 	} else {
-		def heatingSetpoint = device.currentValue("heatingSetpoint")
-		def coolingSetpoint = device.currentValue("coolingSetpoint")
-		def thermostatSetpoint = device.currentValue("thermostatSetpoint")
+		def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
+		def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
+		def thermostatSetpoint = device.currentValue("thermostatSetpoint").toInteger()
 		log.debug "raiseSetpoint() mode = ${mode}, heatingSetpoint: ${heatingSetpoint}, coolingSetpoint:${coolingSetpoint}, thermostatSetpoint:${thermostatSetpoint}"

 		if (device.latestState('thermostatSetpoint')) {
-			targetvalue = device.latestState('thermostatSetpoint').value
-			targetvalue = location.temperatureScale == "F"? targetvalue.toInteger() : targetvalue.toDouble()
+			targetvalue = device.latestState('thermostatSetpoint').value as Integer
 		} else {
 			targetvalue = 0
 		}
-		targetvalue = location.temperatureScale == "F"? targetvalue + 1 : targetvalue + 0.5
+		targetvalue = targetvalue + 1

-		if ((mode == "heat" || mode == "auxHeatOnly") && targetvalue > maxHeatingSetpoint) {
-			targetvalue = maxHeatingSetpoint
-		} else if (mode == "cool" && targetvalue > maxCoolingSetpoint) {
-			targetvalue = maxCoolingSetpoint
+		if (mode == "heat" && targetvalue > 79) {
+			targetvalue = 79
+		} else if (mode == "cool" && targetvalue > 92) {
+			targetvalue = 92
 		}

 		sendEvent("name":"thermostatSetpoint", "value":targetvalue, displayed: false)
@@ -607,29 +543,25 @@ void raiseSetpoint() {
 void lowerSetpoint() {
 	def mode = device.currentValue("thermostatMode")
 	def targetvalue
-	def minHeatingSetpoint = device.currentValue("minHeatingSetpoint")
-	def minCoolingSetpoint = device.currentValue("minCoolingSetpoint")
-

 	if (mode == "off" || mode == "auto") {
 		log.warn "this mode: $mode does not allow lowerSetpoint"
 	} else {
-		def heatingSetpoint = device.currentValue("heatingSetpoint")
-		def coolingSetpoint = device.currentValue("coolingSetpoint")
-		def thermostatSetpoint = device.currentValue("thermostatSetpoint")
+		def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
+		def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
+		def thermostatSetpoint = device.currentValue("thermostatSetpoint").toInteger()
 		log.debug "lowerSetpoint() mode = ${mode}, heatingSetpoint: ${heatingSetpoint}, coolingSetpoint:${coolingSetpoint}, thermostatSetpoint:${thermostatSetpoint}"
 		if (device.latestState('thermostatSetpoint')) {
-			targetvalue = device.latestState('thermostatSetpoint').value
-			targetvalue = location.temperatureScale == "F"? targetvalue.toInteger() : targetvalue.toDouble()
+			targetvalue = device.latestState('thermostatSetpoint').value as Integer
 		} else {
 			targetvalue = 0
 		}
-		targetvalue = location.temperatureScale == "F"? targetvalue - 1 : targetvalue - 0.5
+		targetvalue = targetvalue - 1

-		if ((mode == "heat" || mode == "auxHeatOnly") && targetvalue < minHeatingSetpoint) {
-			targetvalue = minHeatingSetpoint
-		} else if (mode == "cool" && targetvalue < minCoolingSetpoint) {
-			targetvalue = minCoolingSetpoint
+		if (mode == "heat" && targetvalue.toInteger() < 45) {
+			targetvalue = 45
+		} else if (mode == "cool" && targetvalue.toInteger() < 65) {
+			targetvalue = 65
 		}

 		sendEvent("name":"thermostatSetpoint", "value":targetvalue, displayed: false)
@@ -643,15 +575,15 @@ void lowerSetpoint() {
 void alterSetpoint(temp) {

 	def mode = device.currentValue("thermostatMode")
-	def heatingSetpoint = device.currentValue("heatingSetpoint")
-	def coolingSetpoint = device.currentValue("coolingSetpoint")
+	def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
+	def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
 	def deviceId = device.deviceNetworkId.split(/\./).last()

 	def targetHeatingSetpoint
 	def targetCoolingSetpoint

 	//step1: check thermostatMode, enforce limits before sending request to cloud
-	if (mode == "heat" || mode == "auxHeatOnly"){
+	if (mode == "heat"){
 		if (temp.value > coolingSetpoint){
 			targetHeatingSetpoint = temp.value
 			targetCoolingSetpoint = temp.value
@@ -670,22 +602,19 @@ void alterSetpoint(temp) {
 		}
 	}

-	log.debug "alterSetpoint >> in mode ${mode} trying to change heatingSetpoint to $targetHeatingSetpoint " +
-			"coolingSetpoint to $targetCoolingSetpoint with holdType : ${holdType}"
+	log.debug "alterSetpoint >> in mode ${mode} trying to change heatingSetpoint to ${targetHeatingSetpoint} " +
+			"coolingSetpoint to ${targetCoolingSetpoint} with holdType : ${holdType}"

 	def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
-
-	def coolingValue = location.temperatureScale == "C"? convertCtoF(targetCoolingSetpoint) : targetCoolingSetpoint
-	def heatingValue = location.temperatureScale == "C"? convertCtoF(targetHeatingSetpoint) : targetHeatingSetpoint
-
-	if (parent.setHold(this, heatingValue, coolingValue, deviceId, sendHoldType)) {
-		sendEvent("name": "thermostatSetpoint", "value": temp.value, displayed: false)
+	//step2: call parent.setHold to send http request to 3rd party cloud
+	if (parent.setHold(this, targetHeatingSetpoint, targetCoolingSetpoint, deviceId, sendHoldType)) {
+		sendEvent("name": "thermostatSetpoint", "value": temp.value.toString(), displayed: false)
 		sendEvent("name": "heatingSetpoint", "value": targetHeatingSetpoint)
 		sendEvent("name": "coolingSetpoint", "value": targetCoolingSetpoint)
 		log.debug "alterSetpoint in mode $mode succeed change setpoint to= ${temp.value}"
 	} else {
 		log.error "Error alterSetpoint()"
-		if (mode == "heat" || mode == "auxHeatOnly"){
+		if (mode == "heat"){
 			sendEvent("name": "thermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
 		} else if (mode == "cool") {
 			sendEvent("name": "thermostatSetpoint", "value": coolingSetpoint.toString(), displayed: false)
@@ -697,9 +626,9 @@ void alterSetpoint(temp) {
 def generateStatusEvent() {

 	def mode = device.currentValue("thermostatMode")
-	def heatingSetpoint = device.currentValue("heatingSetpoint")
-	def coolingSetpoint = device.currentValue("coolingSetpoint")
-	def temperature = device.currentValue("temperature")
+	def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
+	def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
+	def temperature = device.currentValue("temperature").toInteger()

 	def statusText

@@ -714,14 +643,14 @@ def generateStatusEvent() {
 		if (temperature >= heatingSetpoint)
 			statusText = "Right Now: Idle"
 		else
-			statusText = "Heating to ${heatingSetpoint} ${location.temperatureScale}"
+			statusText = "Heating to ${heatingSetpoint}° F"

 	} else if (mode == "cool") {

 		if (temperature <= coolingSetpoint)
 			statusText = "Right Now: Idle"
 		else
-			statusText = "Cooling to ${coolingSetpoint} ${location.temperatureScale}"
+			statusText = "Cooling to ${coolingSetpoint}° F"

 	} else if (mode == "auto") {

@@ -731,7 +660,7 @@ def generateStatusEvent() {

 		statusText = "Right Now: Off"

-	} else if (mode == "auxHeatOnly") {
+	} else if (mode == "emergencyHeat") {

 		statusText = "Emergency Heat"

@@ -744,18 +673,7 @@ def generateStatusEvent() {
 	sendEvent("name":"thermostatStatus", "value":statusText, "description":statusText, displayed: true)
 }

+//generate custom mobile activity feeds event
 def generateActivityFeedsEvent(notificationMessage) {
 	sendEvent(name: "notificationMessage", value: "$device.displayName $notificationMessage", descriptionText: "$device.displayName $notificationMessage", displayed: true)
 }
-
-def roundC (tempC) {
-	return (Math.round(tempC.toDouble() * 2))/2
-}
-
-def convertFtoC (tempF) {
-	return String.format("%.1f", (Math.round(((tempF - 32)*(5/9)) * 2))/2)
-}
-
-def convertCtoF (tempC) {
-	return (Math.round(tempC * (9/5)) + 32).toInteger()
-}
--- a/devicetypes/smartthings/smartsense-moisture.src/smartsense-moisture.groovy
+++ b/devicetypes/smartthings/smartsense-moisture.src/smartsense-moisture.groovy
@@ -16,7 +16,6 @@ metadata {
 		capability "Water Sensor"
 		capability "Sensor"
 		capability "Battery"
-        capability "Temperature Measurement"

 		fingerprint deviceId: "0x2001", inClusters: "0x30,0x9C,0x9D,0x85,0x80,0x72,0x31,0x84,0x86"
 		fingerprint deviceId: "0x2101", inClusters: "0x71,0x70,0x85,0x80,0x72,0x31,0x84,0x86"
@@ -40,29 +39,17 @@ metadata {
 				attributeState "wet", label: "Wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0"
 			}
 		}
-		standardTile("temperatureState", "device.temperature", width: 2, height: 2) {
+		standardTile("temperature", "device.temperature", width: 2, height: 2) {
 			state "normal", icon:"st.alarm.temperature.normal", backgroundColor:"#ffffff"
 			state "freezing", icon:"st.alarm.temperature.freeze", backgroundColor:"#53a7c0"
 			state "overheated", icon:"st.alarm.temperature.overheat", backgroundColor:"#F80000"
 		}
-		valueTile("temperature", "device.temperature", width: 2, height: 2) {
-            state("temperature", label:'${currentValue}°',
-                backgroundColors:[
-                    [value: 31, color: "#153591"],
-                    [value: 44, color: "#1e9cbb"],
-                    [value: 59, color: "#90d2a7"],
-                    [value: 74, color: "#44b621"],
-                    [value: 84, color: "#f1d801"],
-                    [value: 95, color: "#d04e00"],
-                    [value: 96, color: "#bc2323"]
-                ]
-            )
-        }
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
 			state "battery", label:'${currentValue}% battery', unit:""
 		}
-		main (["water", "temperatureState"])
-		details(["water", "temperatureState", "temperature", "battery"])
+
+		main (["water", "temperature"])
+		details(["water", "temperature", "battery"])
 	}
 }

@@ -128,7 +115,7 @@ def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd)
 		map.descriptionText = "${device.displayName} is ${map.value}"
 	}
 	if(cmd.zwaveAlarmType ==  physicalgraph.zwave.commands.alarmv2.AlarmReport.ZWAVE_ALARM_TYPE_HEAT) {
-		map.name = "temperatureState"
+		map.name = "temperature"
 		if(cmd.zwaveAlarmEvent == 1) { map.value = "overheated"}
 		if(cmd.zwaveAlarmEvent == 2) { map.value = "overheated"}
 		if(cmd.zwaveAlarmEvent == 3) { map.value = "changing temperature rapidly"}
@@ -142,30 +129,17 @@ def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd)
 	map
 }

-def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelReport cmd)
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd)
 {
 	def map = [:]
-	if(cmd.sensorType == 1) {
-		map.name = "temperature"
-        if(cmd.scale == 0) {
-        	map.value = getTemperature(cmd.scaledSensorValue)
-        } else {
-	        map.value = cmd.scaledSensorValue
-        }
-        map.unit = location.temperatureScale
-	}
+	map.name = "water"
+	map.value = cmd.value ? "wet" : "dry"
+	map.descriptionText = "${device.displayName} is ${map.value}"
 	map
 }

-def getTemperature(value) {
-	if(location.temperatureScale == "C"){
-		return value
-    } else {
-        return Math.round(celsiusToFahrenheit(value))
-    }
-}
-
 def zwaveEvent(physicalgraph.zwave.Command cmd)
 {
 	log.debug "COMMAND CLASS: $cmd"
-}
+}
+
--- a/devicetypes/total-comfort-api/total-comfort-api.src/total-comfort-api.groovy
+++ b/devicetypes/total-comfort-api/total-comfort-api.src/total-comfort-api.groovy
@@ -0,0 +1,970 @@
+/**
+ *  Total Comfort API
+ *   
+ *  Based on Code by Eric Thomas
+ *
+ *  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
+ *   lgk v 3 added optional outdoor temp sensors and preferences for it, also made api login required.
+ *  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.
+ * lgk version 4 supports celsius and fahrenheit with option, and now colors.
+ * lgk version 5, due to intermittant update failures added last update date/time tile so that you can see when it happended
+ * not there is a new input tzoffset which defaults to my time ie -5 which you must set .
+ * lgk version 6 add support for actually knowing the fan is on or not (added tile),
+ * and also the actual operating state ie heating,cooling or idle via new response variables.
+ * lgk version 7, change the new operating state to be a value vs standard tile
+ * to work around a bug smartthings caused in the latest 2.08 release with text wrapping.
+ * related also added icons to the operating state, and increase the width of the last update
+ * to avoid wrapping.
+ * 2-14-16 llb added full path to icons so the show on android Fire Tablet
+ * 2-14-16 llb added check for indoor humidity sensor to avoid 128 value if not supported
+ * 2-14-16 llb modified operating state tile to show control by Hold or Schedule
+ *
+ */
+preferences {
+    input("username", "text", title: "Username", description: "Your Total Comfort User Name", required: true)
+    input("password", "password", title: "Password", description: "Your Total Comfort password",required: true)
+    input("honeywelldevice", "text", title: "Device ID", description: "Your Device ID", required: true)
+    input ("enableOutdoorTemps", "enum", title: "Do you have the optional outdoor temperature sensor and want to enable it?", options: ["Yes", "No"], required: false, defaultValue: "No")
+    input ("tempScale", "enum", title: "Fahrenheit or Celsius?", options: ["F", "C"], required: false, defaultValue: "F")
+  	input("tzOffset", "number", title: "Time zone offset +/-xx?", required: false, defaultValue: -5, description: "Time Zone Offset ie -5.")  
+  }
+
+metadata {
+  definition (name: "Total Comfort API", namespace: 
+"Total Comfort API", author: "Eric Thomas, modified lg kahn") {
+    capability "Polling"
+    capability "Thermostat"
+    capability "Refresh"
+    capability "Temperature Measurement"
+    capability "Sensor"
+    capability "Relative Humidity Measurement"    
+    command "heatLevelUp"
+    command "heatLevelDown"
+    command "coolLevelUp"
+    command "coolLevelDown"
+    attribute "outdoorHumidity", "number"
+    attribute "outdoorTemperature", "number"
+    attribute "lastUpdate", "string"
+
+    
+  }
+
+  simulator {
+    // TODO: define status and reply messages here
+  }
+
+   tiles {
+        valueTile("temperature", "device.temperature", width: 2, height: 2, canChangeIcon: true) {
+            state("temperature", label: '${currentValue}°', 
+             icon: "http://cdn.device-icons.smartthings.com/Weather/weather2-icn@3x.png",
+             unit:"F", backgroundColors: [            
+             		[value: -14, color: "#1e9cbb"],
+         	        [value: -10, color: "#90d2a7"],
+               		[value: -5, color: "#44b621"],
+             	    [value: -2, color: "#f1d801"],
+             	    [value: 0, color: "#153591"],
+               	    [value: 7, color: "#1e9cbb"],
+     			    [value: 15, color: "#90d2a7"],           
+              		[value: 23, color: "#44b621"],
+            	    [value: 29, color: "#f1d801"],
+                    [value: 31, color: "#153591"],
+                    [value: 44, color: "#1e9cbb"],
+                    [value: 59, color: "#90d2a7"],
+                    [value: 74, color: "#44b621"],
+                    [value: 84, color: "#f1d801"],
+                    [value: 95, color: "#d04e00"],
+                    [value: 96, color: "#bc2323"]
+                ]
+            )
+        }
+        
+        standardTile("thermostatMode", "device.thermostatMode", inactiveLabel: false, canChangeIcon: true) {
+            state "off", label:'${name}', action:"thermostat.cool", icon: "http://cdn.device-icons.smartthings.com/Outdoor/outdoor19.png"
+            state "cool", label:'${name}', action:"thermostat.heat", icon: "http://cdn.device-icons.smartthings.com/Weather/weather7.png", backgroundColor: '#1e9cbb'
+            state "heat", label:'${name}', action:"thermostat.auto", icon: "http://cdn.device-icons.smartthings.com/Weather/weather14.png", backgroundColor: '#E14902'  
+            state "auto", label:'${name}', action:"thermostat.off", icon: "http://cdn.device-icons.smartthings.com/Weather/weather3.png", backgroundColor: '#44b621'
+        }
+        standardTile("thermostatFanMode", "device.thermostatFanMode", inactiveLabel: false, canChangeIcon: true) {
+            state "auto", label:'${name}', action:"thermostat.fanAuto", icon: "http://cdn.device-icons.smartthings.com/Appliances/appliances11.png", backgroundColor: '#44b621'
+            state "circulate", label:'${name}', action:"thermostat.fanCirculate", icon: "http://cdn.device-icons.smartthings.com/Appliances/appliances11.png", backgroundColor: '#44b621'
+            state "on", label:'${name}', action:"thermostat.fanOn", icon: "http://cdn.device-icons.smartthings.com/Appliances/appliances11.png", backgroundColor: '#44b621'
+        }
+
+        controlTile("coolSliderControl", "device.coolingSetpoint", "slider", height: 3, width: 1, inactiveLabel: false) {
+            state "setCoolingSetpoint", label:'Set temperarure to', action:"thermostat.setCoolingSetpoint", 
+            backgroundColors:[
+             	    [value: 0, color: "#153591"],
+               	    [value: 7, color: "#1e9cbb"],
+     			    [value: 15, color: "#90d2a7"],           
+              		[value: 23, color: "#44b621"],
+            	    [value: 29, color: "#f1d801"],
+                    [value: 31, color: "#153591"],
+                    [value: 44, color: "#1e9cbb"],
+                    [value: 59, color: "#90d2a7"],
+                    [value: 74, color: "#44b621"],
+                    [value: 84, color: "#f1d801"],
+                    [value: 95, color: "#d04e00"],
+                    [value: 96, color: "#bc2323"]
+            ]               
+        }
+       valueTile("coolingSetpoint", "device.coolingSetpoint", inactiveLabel: false) 
+    	  {
+          state "default", label:'Cool\n${currentValue}°', unit:"F",
+           backgroundColors: [
+          		    [value: 0, color: "#153591"],
+               	    [value: 7, color: "#1e9cbb"],
+     			    [value: 15, color: "#90d2a7"],           
+              		[value: 23, color: "#44b621"],
+            	    [value: 29, color: "#f1d801"],
+                    [value: 31, color: "#153591"],
+                    [value: 44, color: "#1e9cbb"],
+                    [value: 59, color: "#90d2a7"],
+                    [value: 74, color: "#44b621"],
+                    [value: 84, color: "#f1d801"],
+                    [value: 95, color: "#d04e00"],
+                    [value: 96, color: "#bc2323"]
+          ]   
+        }
+   valueTile("heatingSetpoint", "device.heatingSetpoint", inactiveLabel: false) 
+    	{
+      state "default", label:'Heat\n${currentValue}°', unit: "F",
+       backgroundColors:[
+     			    [value: 0, color: "#153591"],
+               	    [value: 7, color: "#1e9cbb"],
+     			    [value: 15, color: "#90d2a7"],           
+              		[value: 23, color: "#44b621"],
+            	    [value: 29, color: "#f1d801"],
+                    [value: 31, color: "#153591"],
+                    [value: 44, color: "#1e9cbb"],
+                    [value: 59, color: "#90d2a7"],
+                    [value: 74, color: "#44b621"],
+                    [value: 84, color: "#f1d801"],
+                    [value: 95, color: "#d04e00"],
+                    [value: 96, color: "#bc2323"]
+      ]   
+    }
+    
+        
+        //tile added for operating state - Create the tiles for each possible state, look at other examples if you wish to change the icons here. 
+        
+        valueTile("thermostatOperatingState", "device.thermostatOperatingState", inactiveLabel: false) {
+            state 'default', label:'${currentValue}',
+                    backgroundColors:[
+                                 [value: 0, color: "#911535"]]
+            state "Unknown", label:'${name}', backgroundColor : '#cc0000', icon: ""
+        }
+        
+           standardTile("fanOperatingState", "device.fanOperatingState", inactiveLabel: false) {
+            state "On", label:'${name}',icon: "http://cdn.device-icons.smartthings.com/Appliances/appliances11.png", backgroundColor : '#53a7c0'
+            state "Idle", label:'${name}',icon: "http://cdn.device-icons.smartthings.com/Appliances/appliances11.png"
+            state "Unknown", label:'${name}',icon: "http://cdn.device-icons.smartthings.com/Appliances/appliances11.png", backgroundColor : '#cc0000'
+        }
+        
+        standardTile("refresh", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
+            state "default", action:"polling.poll", icon:"http://cdn.device-icons.smartthings.com/secondary/refresh@2x.png"
+        }
+        
+        standardTile("heatLevelUp", "device.heatingSetpoint", canChangeIcon: false, inactiveLabel: false) {
+                        state "heatLevelUp", label:'  ', action:"heatLevelUp", icon:"http://cdn.device-icons.smartthings.com/thermostat/thermostat-up.png"
+        }
+        standardTile("heatLevelDown", "device.heatingSetpoint", canChangeIcon: false, inactiveLabel: false) {
+                        state "heatLevelDown", label:'  ', action:"heatLevelDown", icon:"http://cdn.device-icons.smartthings.com/thermostat/thermostat-down.png"
+        }
+        standardTile("coolLevelUp", "device.heatingSetpoint", canChangeIcon: false, inactiveLabel: false) {
+                        state "coolLevelUp", label:'  ', action:"coolLevelUp", icon:"http://cdn.device-icons.smartthings.com/thermostat/thermostat-up.png"
+        }
+        standardTile("coolLevelDown", "device.heatingSetpoint", canChangeIcon: false, inactiveLabel: false) {
+                        state "coolLevelDown", label:'  ', action:"coolLevelDown", icon:"http://cdn.device-icons.smartthings.com/thermostat/thermostat-down.png"
+        }
+        
+        valueTile("relativeHumidity", "device.relativeHumidity", inactiveLabel: false)
+        {
+        	state "default", label:'Humidity\n${currentValue}%',
+             icon: "http://cdn.device-icons.smartthings.com/Weather/weather12-icn@3x.png",
+             unit:"%", backgroundColors : [
+                    [value: 01, color: "#724529"],
+                    [value: 11, color: "#724529"],
+                    [value: 21, color: "#724529"],
+                    [value: 35, color: "#44b621"],
+                    [value: 49, color: "#44b621"],
+                    [value: 50, color: "#1e9cbb"]
+                ]
+        }
+
+        standardTile("thermostatMode", "device.thermostatMode", inactiveLabel: false, canChangeIcon: true) 
+        {
+		}
+        
+        /* lgk new tiles for outside temp and hummidity */
+          valueTile("outdoorTemperature", "device.outdoorTemperature", width: 1, height: 1, canChangeIcon: true) {
+            state("temperature", label: 'Outdoor\n ${currentValue}°',
+            icon: "http://cdn.device-icons.smartthings.com/Weather/weather2-icn@3x.png",
+            unit:"F", backgroundColors: [
+                    [value: -31, color: "#003591"],
+                    [value: -10, color: "#90d2a7"],
+               		[value: -5, color: "#44b621"],
+             	    [value: -2, color: "#f1d801"],
+             	    [value: 0, color: "#153591"],
+               	    [value: 7, color: "#1e9cbb"],
+                    [value: 00, color: "#cccccc"],
+                    [value: 31, color: "#153500"],
+                    [value: 44, color: "#1e9cbb"],
+                    [value: 59, color: "#90d2a7"],
+                    [value: 74, color: "#44b621"],
+                    [value: 84, color: "#f1d801"],
+                    [value: 95, color: "#d04e00"],
+                    [value: 96, color: "#bc2323"]
+                ]
+            )
+        }
+        
+         valueTile("outdoorHumidity", "device.outdoorHumidity", inactiveLabel: false){
+        	state "default", label:'Outdoor\n ${currentValue}%', 
+            icon: "http://cdn.device-icons.smartthings.com/Weather/weather12-icn@3x.png",
+            unit:"%", backgroundColors : [
+                    [value: 01, color: "#724529"],
+                    [value: 11, color: "#724529"],
+                    [value: 21, color: "#724529"],
+                    [value: 35, color: "#44b621"],
+                    [value: 49, color: "#44b621"],
+                    [value: 70, color: "#449c00"],
+                    [value: 90, color: "#009cbb"]
+                  
+                ]
+        }
+
+      		valueTile("status", "device.lastUpdate", width: 3, height: 1, decoration: "flat") {
+			state "default", label: 'Last Update: ${currentValue}'
+		}
+
+        main "temperature"
+        details(["temperature", "thermostatMode", "thermostatFanMode",   
+        "heatLevelUp", "heatingSetpoint" , "heatLevelDown", "coolLevelUp",
+        "coolingSetpoint", "coolLevelDown" ,"thermostatOperatingState","fanOperatingState",
+        "refresh","relativeHumidity","outdoorTemperature","outdoorHumidity", "status"])
+       
+    }
+}
+
+def coolLevelUp()
+{
+state.DisplayUnits = settings.tempScale
+if (state.DisplayUnits == "F")
+{
+    int nextLevel = device.currentValue("coolingSetpoint") + 1
+    
+    if( nextLevel > 99){
+      nextLevel = 99
+    }
+    log.debug "Setting cool set point up to: ${nextLevel}"
+    setCoolingSetpoint(nextLevel)
+}
+else
+{
+ int nextLevel = device.currentValue("coolingSetpoint") + 0.5
+    
+    if( nextLevel > 37){
+      nextLevel = 37
+    }
+    log.debug "Setting cool set point up to: ${nextLevel}"
+    setCoolingSetpoint(nextLevel)
+
+}
+}
+
+def coolLevelDown()
+{
+state.DisplayUnits = settings.tempScale
+if (state.DisplayUnits == "F")
+{
+    int nextLevel = device.currentValue("coolingSetpoint") - 1
+    
+    if( nextLevel < 50){
+      nextLevel = 50
+    }
+    log.debug "Setting cool set point down to: ${nextLevel}"
+    setCoolingSetpoint(nextLevel)
+}
+
+else
+
+{
+ double nextLevel = device.currentValue("coolingSetpoint") - 0.5
+    
+    if( nextLevel < 10){
+      nextLevel = 10
+    }
+    log.debug "Setting cool set point down to: ${nextLevel}"
+    setCoolingSetpoint(nextLevel)
+
+}
+}
+
+def heatLevelUp()
+{
+state.DisplayUnits = settings.tempScale
+if (state.DisplayUnits == "F")
+{
+   log.debug "in fahrenheit level up"
+    int nextLevel = device.currentValue("heatingSetpoint") + 1
+    
+    if( nextLevel > 90){
+      nextLevel = 90
+    }
+    log.debug "Setting heat set point up to: ${nextLevel}"
+    setHeatingSetpoint(nextLevel)
+}
+
+else
+{
+
+   log.debug "in celsius level uo"
+  double nextLevel = device.currentValue("heatingSetpoint") + 0.5
+    
+    if( nextLevel > 33){
+      nextLevel = 33
+    }
+    log.debug "Setting heat set point up to: ${nextLevel}"
+    setHeatingSetpoint(nextLevel)
+}
+
+}
+
+
+
+def heatLevelDown()
+{
+state.DisplayUnits = settings.tempScale
+if (state.DisplayUnits == "F")
+{
+   log.debug "in fahrenheit level down"
+    int nextLevel = device.currentValue("heatingSetpoint") - 1
+    
+    if( nextLevel < 40){
+      nextLevel = 40
+    }
+    log.debug "Setting heat set point down to: ${nextLevel}"
+    setHeatingSetpoint(nextLevel)
+}
+
+else
+{
+
+   log.debug "in celsius level down"
+  double nextLevel = device.currentValue("heatingSetpoint") - 0.5
+    
+    if( nextLevel < 4){
+      nextLevel = 4
+    }
+    log.debug "Setting heat set point down to: ${nextLevel}"
+    setHeatingSetpoint(nextLevel)
+}
+
+}
+
+
+
+// parse events into attributes
+def parse(String description) {
+    
+}
+
+// handle commands
+
+def setHeatingSetpoint(Double temp)
+{
+ data.SystemSwitch = 'null' 
+    data.HeatSetpoint = temp
+    data.CoolSetpoint = 'null'
+    data.HeatNextPeriod = 'null'
+    data.CoolNextPeriod = 'null'
+    data.StatusHeat='1'
+    data.StatusCool='1'
+    data.FanMode = 'null'
+  setStatus()
+
+    if(data.SetStatus==1)
+  {
+        sendEvent(name: 'heatingSetpoint', value: temp as double)
+
+    }	
+}
+
+def setHeatingSetpoint(temp) {
+  data.SystemSwitch = 'null' 
+    data.HeatSetpoint = temp
+    data.CoolSetpoint = 'null'
+    data.HeatNextPeriod = 'null'
+    data.CoolNextPeriod = 'null'
+    data.StatusHeat='1'
+    data.StatusCool='1'
+    data.FanMode = 'null'
+  setStatus()
+
+    if(data.SetStatus==1)
+  {
+        sendEvent(name: 'heatingSetpoint', value: temp as Integer)
+
+    }
+        
+}
+
+def setCoolingSetpoint(double temp) {
+  data.SystemSwitch = 'null' 
+    data.HeatSetpoint = 'null'
+    data.CoolSetpoint = temp
+    data.HeatNextPeriod = 'null'
+    data.CoolNextPeriod = 'null'
+    data.StatusHeat='1'
+    data.StatusCool='1'
+    data.FanMode = 'null'
+  setStatus()
+    
+    if(data.SetStatus==1)
+  {
+        sendEvent(name: 'coolingSetpoint', value: temp as double)
+
+    }
+}
+
+def setCoolingSetpoint(temp) {
+  data.SystemSwitch = 'null' 
+    data.HeatSetpoint = 'null'
+    data.CoolSetpoint = temp
+    data.HeatNextPeriod = 'null'
+    data.CoolNextPeriod = 'null'
+    data.StatusHeat='1'
+    data.StatusCool='1'
+    data.FanMode = 'null'
+  setStatus()
+    
+    if(data.SetStatus==1)
+  {
+        sendEvent(name: 'coolingSetpoint', value: temp as Integer)
+
+    }
+}
+
+def setTargetTemp(temp) {
+  data.SystemSwitch = 'null' 
+    data.HeatSetpoint = temp
+    data.CoolSetpoint = temp
+    data.HeatNextPeriod = 'null'
+    data.CoolNextPeriod = 'null'
+    data.StatusHeat='1'
+    data.StatusCool='1'
+    data.FanMode = 'null'
+  setStatus()
+}
+
+
+
+def setTargetTemp(double temp) {
+  data.SystemSwitch = 'null' 
+    data.HeatSetpoint = temp
+    data.CoolSetpoint = temp
+    data.HeatNextPeriod = 'null'
+    data.CoolNextPeriod = 'null'
+    data.StatusHeat='1'
+    data.StatusCool='1'
+    data.FanMode = 'null'
+  setStatus()
+}
+
+
+def off() {
+  setThermostatMode(2)
+}
+
+def auto() {
+  setThermostatMode(4)
+}
+
+def heat() {
+  setThermostatMode(1)
+}
+
+def emergencyHeat() {
+
+}
+
+def cool() {
+  setThermostatMode(3)
+}
+
+def setThermostatMode(mode) {
+  data.SystemSwitch = mode 
+    data.HeatSetpoint = 'null'
+    data.CoolSetpoint = 'null'
+    data.HeatNextPeriod = 'null'
+    data.CoolNextPeriod = 'null'
+    data.StatusHeat=1
+    data.StatusCool=1
+    data.FanMode = 'null'
+
+  setStatus()
+    
+      def switchPos
+
+        if(mode==1)
+          switchPos = 'heat'
+        if(mode==2)
+          switchPos = 'off'
+        if(mode==3)
+          switchPos = 'cool'
+ /* lgk modified my therm has pos 5 for auto vision pro */
+       if(mode==4 || swithPos == 5)
+          switchPos = 'auto'
+
+  if(data.SetStatus==1)
+  {
+        sendEvent(name: 'thermostatMode', value: switchPos)
+    }
+    
+}
+
+def fanOn() {
+    setThermostatFanMode(1)
+}
+
+def fanAuto() {
+    setThermostatFanMode(0)
+}
+
+def fanCirculate() {
+    setThermostatFanMode(2)
+}
+
+def setThermostatFanMode(mode) {    
+  
+  data.SystemSwitch = 'null' 
+    data.HeatSetpoint = 'null'
+    data.CoolSetpoint = 'null'
+    data.HeatNextPeriod = 'null'
+    data.CoolNextPeriod = 'null'
+    data.StatusHeat='null'
+    data.StatusCool='null'
+    data.FanMode = mode
+
+  setStatus()
+
+  def fanMode
+
+    if(mode==0)
+      fanMode = 'auto'
+    if(mode==1)
+      fanMode = 'on'
+    if(mode==2)
+      fanMode = 'circulate'
+   
+  if(data.SetStatus==1)
+  {
+      sendEvent(name: 'thermostatFanMode', value: fanMode)    
+    }
+
+}
+
+
+def poll() {
+refresh()
+}
+
+
+def setStatus() {
+
+  data.SetStatus = 0
+
+    login()
+  log.debug "Executing 'setStatus'"
+def today= new Date()
+log.debug "https://www.mytotalconnectcomfort.com/portal/Device/SubmitControlScreenChanges"
+log.debug "setting heat setpoint to $data.HeatSetpoint"
+log.debug "setting cool setpoint to $data.CoolSetpoint"
+    
+    def params = [
+        uri: "https://www.mytotalconnectcomfort.com/portal/Device/SubmitControlScreenChanges",
+        headers: [
+              'Accept': 'application/json, text/javascript, */*; q=0.01',
+              'DNT': '1',
+        	  'Accept-Encoding': 'gzip,deflate,sdch',
+              'Cache-Control': 'max-age=0',
+              'Accept-Language': 'en-US,en,q=0.8',
+              'Connection': 'keep-alive',
+              'Host': 'rs.alarmnet.com',
+              'Referer': "https://www.mytotalconnectcomfort.com/portal/Device/Control/${settings.honeywelldevice}",
+              'X-Requested-With': 'XMLHttpRequest',
+              'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.36',
+              'Cookie': data.cookiess        ],
+        body: [ DeviceID: "${settings.honeywelldevice}", SystemSwitch : data.SystemSwitch ,HeatSetpoint : 
+        data.HeatSetpoint, CoolSetpoint: data.CoolSetpoint, HeatNextPeriod: 
+        data.HeatNextPeriod,CoolNextPeriod:data.CoolNextPeriod,StatusHeat:data.StatusHeat,
+        StatusCool:data.StatusCool,FanMode:data.FanMode,ThermostatUnits: settings.tempScale]
+
+]
+
+log.debug "params = $params"
+    httpPost(params) { response ->
+        log.debug "Request was successful, $response.status"
+ 
+    }
+    
+    log.debug "SetStatus is 1 now"
+    data.SetStatus = 1
+
+}
+
+def getStatus() {
+  log.debug "Executing getStatus"
+  log.debug "enable outside temps = $enableOutdoorTemps"
+def today= new Date()
+log.debug "https://www.mytotalconnectcomfort.com/portal/Device/CheckDataSession/${settings.honeywelldevice}?_=$today.time"
+
+    def params = [
+        uri: "https://www.mytotalconnectcomfort.com/portal/Device/CheckDataSession/${settings.honeywelldevice}",
+        headers: [
+              'Accept': '*/*',
+              'DNT': '1',
+              'Cache' : 'false',
+              'dataType': 'json',
+              'Accept-Encoding': 'plain',
+              'Cache-Control': 'max-age=0',
+              'Accept-Language': 'en-US,en,q=0.8',
+              'Connection': 'keep-alive',
+              'Referer': 'https://www.mytotalconnectcomfort.com/portal',
+              'X-Requested-With': 'XMLHttpRequest',
+              'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.36',
+              'Cookie': data.cookiess        ],
+    ]
+
+		log.debug "doing request"
+        
+        httpGet(params) { response ->
+        log.debug "Request was successful, $response.status"
+        //log.debug "data = $response.data"
+        log.debug "ld = $response.data.latestData"
+       
+        def curTemp = response.data.latestData.uiData.DispTemperature
+        def fanMode = response.data.latestData.fanData.fanMode
+        def switchPos = response.data.latestData.uiData.SystemSwitchPosition
+        def coolSetPoint = response.data.latestData.uiData.CoolSetpoint
+        def heatSetPoint = response.data.latestData.uiData.HeatSetpoint
+        def statusCool = response.data.latestData.uiData.StatusCool
+        def statusHeat = response.data.latestData.uiData.StatusHeat
+        def curHumidity = response.data.latestData.uiData.IndoorHumidity
+        def Boolean hasOutdoorHumid = response.data.latestData.uiData.OutdoorHumidityAvailable
+        def Boolean hasOutdoorTemp = response.data.latestData.uiData.OutdoorTemperatureAvailable
+        def curOutdoorHumidity = response.data.latestData.uiData.OutdoorHumidity
+        def curOutdoorTemp = response.data.latestData.uiData.OutdoorTemperature
+        def displayUnits = response.data.latestData.uiData.DisplayUnits
+        def fanIsRunning = response.data.latestData.fanData.fanIsRunning
+        def equipmentStatus = response.data.latestData.uiData.EquipmentOutputStatus
+        def Boolean hasIndoorHumid = response.data.latestData.uiData.IndoorHumiditySensorAvailable
+        def curSetpointStatus = response.data.latestData.uiData.CurrentSetpointStatus
+        def TempHoldTime = response.data.latestData.uiData.TemporaryHoldUntilTime
+        def int TempHoldTimeHrs = TempHoldTime / 60
+        def TempHoldTimeMins = TempHoldTime % 60
+        
+/*ld = [fanData:[fanModeCirculateAllowed:true, fanModeAutoAllowed:true, fanModeFollowScheduleAllowed:false, 
+        fanIsRunning:false, fanModeOnAllowed:true, fanMode:0], 
+        drData:[Load:127.5, HeatSetpLimit:0,
+        OptOutable:false, DeltaHeatSP:-0.01, CoolSetpLimit:0, Phase:-1, DeltaCoolSP:-0.01], 
+        uiData:[OutdoorTemperature:128.0000, TemporaryHoldUntilTime:0, ScheduleHeatSp:67.0000, 
+        DeviceID:453824, DispTemperatureAvailable:true, VacationHold:0, VacationHoldUntilTime:0,
+        CoolSetpoint:76.0000, ScheduleCoolSp:76.0000, SwitchHeatAllowed:true, CoolNextPeriod:67, 
+        IndoorHumidity:31.0000, SwitchAutoAllowed:true, SetpointChangeAllowed:true, HeatLowerSetptLimit:40.0000,
+        OutdoorHumidStatus:128, SwitchOffAllowed:true, OutdoorHumidityAvailable:false,
+        StatusCool:0, OutdoorTemperatureAvailable:false, EquipmentOutputStatus:0, StatusHeat:0, 
+        CurrentSetpointStatus:0, HoldUntilCapable:true, CoolUpperSetptLimit:99.0000, SwitchCoolAllowed:true, 
+        OutdoorHumidity:128.0000, DualSetpointStatus:false, SwitchEmergencyHeatAllowed:false, Commercial:false, 
+        CoolLowerSetptLimit:50.0000, OutdoorHumiditySensorNotFault:true, IndoorHumiditySensorAvailable:true,
+        ScheduleCapable:true, DisplayUnits:F, DispTemperature:70.0000, Deadband:3.0000, HeatUpperSetptLimit:90.0000, 
+        IsInVacationHoldMode:false, OutdoorTemperatureSensorNotFault:true, HeatSetpoint:67.0000, DispTemperatureStatus:0,
+        HeatNextPeriod:67, IndoorHumiditySensorNotFault:true, OutdoorTempStatus:128, IndoorHumidStatus:0, 
+        SystemSwitchPosition:4], canControlHumidification:false, hasFan:true] 
+        
+        log.trace("Fan operating state: ${response.data.latestData.fanData.fanIsRunning}")
+        log.trace("EquipmentOutputStatus: ${response.data.latestData.uiData.EquipmentOutputStatus}")
+        log.trace("IndoorHumidity: ${response.data.latestData.uiData.IndoorHumidity}")
+          
+        log.trace("OutdoorTemp = ${response.data.latestData.uiData.OutdoorTemperature}")
+        log.trace("fanMode: ${response.data.latestData.fanData.fanMode}")
+        log.trace("SystenSwitchPosition: ${response.data.latestData.uiData.SystemSwitchPosition}")
+        log.trace("StatusCool: ${response.data.latestData.uiData.StatusCool}")
+        log.trace("StatusHeat: ${response.data.latestData.uiData.StatusHeat}")
+        
+        log.trace("IndoorHumiditySensorAvailable: ${response.data.latestData.uiData.IndoorHumiditySensorAvailable}")        
+        log.trace("IndoorHumidityAvailable: ${response.data.latestData.uiData.IndoorHumidityAvailable}")        
+       
+        log.debug "OutdoorHumidityAvailable: response.data.latestData.uiData.OutdoorHumidityAvailable"        
+        log.debug "OutdoorTemperatureAvailable: $response.data.latestData.uiData.OutdoorTemperatureAvailable"        
+        
+		log.debug "OutdoorHumiditySensorNotFault = $response.data.latestData.uiData.OutdoorHumiditySensorNotFault"
+		log.debug "OutdoorTemperatureSensorNotFault = $response.data.latestData.uiData.OutdoorTemperatureSensorNotFault"
+          
+        log.debug "IndoorHumiditySensorNotFault: $response.data.latestData.uiData.IndoorHumiditySensorNotFault"        
+        log.debug "IndoorHumidStatus: $response.data.latestData.uiData.IndoorHumidStatus"       
+        log.debug "OutdoorHumidStatus: $response.data.latestData.uiData.OutdoorHumidStatus"   
+        log.debug "OutdoorHumidity: = $response.data.latestData.uiData.OutdoorHumidity"
+        log.debug "OutdoorTemperature = $response.data.latestData.uiData.OutdoorTemperature"
+        
+        log.debug "got curOutdoorTemp = $curOutdoorTemp"
+        log.debug "got curOutdoorHumidity = $curOutdoorHumidity"
+        log.debug "hasOutdoorHumid = $hasOutdoorHumid"
+        log.debug "hasOutdoorTemp =  $hasOutdoorTemp"
+      */
+      
+      //  log.debug "displayUnits = $displayUnits"
+        state.DisplayUnits = $displayUnits
+        
+        //Operating State Section 
+        //Set the operating state to off 
+        
+        def operatingState = "Unknown"
+          
+// lgk operating state not working here.. shows both on ie 1 when heat doesnt go on to 67 and heat till 76  and current is 73 
+        //Check the status of heat and cool 
+     
+     // lgk old method now use equipment status
+     if (equipmentStatus == 1) {
+        operatingState = "HEAT ON"
+      } else if (equipmentStatus == 2) {
+        operatingState = "COOL ON"
+      } else if (equipmentStatus == 0) {
+        operatingState = "IDLE"
+      } else {
+          	operatingState = "Unknown"
+      }
+      
+     if(curSetpointStatus == 0) {
+            operatingState = "$operatingState\nControl By\nFollowing\nSchedule"
+        } else if(curSetpointStatus == 1) {  
+            operatingState = "$operatingState\nControl By\nHold Until\n" + String.format("%02d:%02d", TempHoldTimeHrs, TempHoldTimeMins)
+        } else if(curSetpointStatus == 2) {
+            operatingState = "$operatingState\nControl By\nPermanent\nHold"
+      
+        } else {
+            operatingState = "unknown"
+        }
+      
+      /*
+     if(statusCool == 1 && (switchPos == 3 || switchPos == 5 || swithPos == 4)) {
+            operatingState = "cooling"
+        } else if (statusHeat == 1 && (switchPos == 1 || switchPos == 5 || switchPos == 4)) {  
+            operatingState = "heating"
+        } else if (statusCool == 0 && statusHeat == 0) {
+            operatingState = "idle"
+           
+        } else {
+          	operatingState = "unknown"
+        }
+        */
+
+        log.trace("Set operating State to: ${operatingState}")        
+
+     // set fast state
+     def fanState = "Unknown"
+
+	if (fanIsRunning == true)
+      fanState = "On"
+    else fanState = "Idle" 
+
+    log.trace("Set Fan operating State to: ${fanState}")        
+
+        //End Operating State
+        
+      //  log.debug curTemp
+       // log.debug fanMode
+       // log.debug switchPos
+       
+        //fan mode 0=auto, 2=circ, 1=on
+        
+        if(fanMode==0)
+          fanMode = 'auto'
+        if(fanMode==1)
+          fanMode = 'on'
+        if(fanMode==2)
+          fanMode = 'circulate'
+
+        if(switchPos==1)
+          switchPos = 'heat'
+        if(switchPos==2)
+          switchPos = 'off'
+        if(switchPos==3)
+          switchPos = 'cool'
+        if(switchPos==4 || switchPos==5)
+          switchPos = 'auto'
+
+    def formattedCoolSetPoint = String.format("%5.1f", coolSetPoint)
+    def formattedHeatSetPoint = String.format("%5.1f", heatSetPoint)
+    def formattedTemp = String.format("%5.1f", curTemp)
+    
+   	def finalCoolSetPoint = formattedCoolSetPoint as BigDecimal
+	def finalHeatSetPoint = formattedHeatSetPoint as BigDecimal
+	def finalTemp = formattedTemp as BigDecimal
+
+	//Send events 
+        sendEvent(name: 'thermostatOperatingState', value: operatingState)
+        sendEvent(name: 'fanOperatingState', value: fanState)
+        sendEvent(name: 'thermostatFanMode', value: fanMode)
+        sendEvent(name: 'thermostatMode', value: switchPos)
+        sendEvent(name: 'coolingSetpoint', value: finalCoolSetPoint )
+        sendEvent(name: 'heatingSetpoint', value: finalHeatSetPoint )
+        sendEvent(name: 'temperature', value: finalTemp, state: switchPos)
+        if (hasIndoorHumid){sendEvent(name: 'relativeHumidity', value: curHumidity as Integer)}
+        
+       if (settings.tzOffset == null)
+        settings.tzOffset = -5
+
+        def now = new Date()
+        def tf = new java.text.SimpleDateFormat("MM/dd/yyyy h:mm a")
+        tf.setTimeZone(TimeZone.getTimeZone("GMT${settings.tzOffset}"))
+        def newtime = "${tf.format(now)}" as String   
+        sendEvent(name: "lastUpdate", value: newtime, descriptionText: "Last Update: $newtime")
+
+        
+      if (enableOutdoorTemps == "Yes")
+        {
+    
+       if (hasOutdoorHumid)
+        {
+          sendEvent(name: 'outdoorHumidity', value: curOutdoorHumidity as Integer)
+        }
+     
+       if (hasOutdoorTemp)
+        {
+          sendEvent(name: 'outdoorTemperature', value: curOutdoorTemp as Integer)
+        }
+      }
+      
+    
+        
+
+}
+}
+
+
+def getHumidifierStatus()
+{
+/*
+ $.ajax({
+            url: humUrl,
+            type: 'POST',
+            cache: false,
+            dataType: "json",
+            success: function(data) {
+            /portal/Device/Menu/GetHumData/454832';
+     */
+    def params = [
+        uri: "https://www.mytotalconnectcomfort.com/portal/Device/Menu/GetHumData/${settings.honeywelldevice}",
+        headers: [
+              'Accept': '*/*',
+              'DNT': '1',
+              'dataType': 'json',
+              'cache': 'false',
+              'Accept-Encoding': 'plain',
+              'Cache-Control': 'max-age=0',
+              'Accept-Language': 'en-US,en,q=0.8',
+              'Connection': 'keep-alive',
+              'Host': 'rs.alarmnet.com',
+              'Referer': 'https://www.mytotalconnectcomfort.com/portal/Menu/${settings.honeywelldevice}',
+              'X-Requested-With': 'XMLHttpRequest',
+              'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.36',
+              'Cookie': data.cookiess        ],
+    ]
+        httpGet(params) { response ->
+        log.debug "GetHumidity Request was successful, $response.status"
+        log.debug "response = $response.data"
+       
+      //  log.debug "ld = $response.data.latestData"
+       //  log.debug "humdata = $response.data.latestData.humData"
+
+        log.trace("lowerLimit: ${response.data.latestData.humData.lowerLimit}")        
+        log.trace("upperLimit: ${response.data.humData.upperLimit}")        
+        log.trace("SetPoint: ${response.data.humData.Setpoint}")        
+        log.trace("DeviceId: ${response.data.humData.DeviceId}")        
+        log.trace("IndoorHumidity: ${response.data.humData.IndoorHumidity}")        
+
+}
+}
+
+def api(method, args = [], success = {}) {
+
+}
+
+// Need to be logged in before this is called. So don't call this. Call api.
+def doRequest(uri, args, type, success) {
+
+}
+
+def refresh() {
+  log.debug "Executing 'refresh'"
+  def unit = getTemperatureScale()
+  log.debug "units = $unit"
+    login()
+    //getHumidifierStatus()
+    getStatus()
+}
+
+def login() {  
+  log.debug "Executing 'login'"
+      
+    def params = [
+        uri: 'https://www.mytotalconnectcomfort.com/portal',
+        headers: [
+            'Content-Type': 'application/x-www-form-urlencoded',
+            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+            'Accept-Encoding': 'sdch',
+            'Host': 'www.mytotalconnectcomfort.com',
+            'DNT': '1',
+            'Origin': 'www.mytotalconnectcomfort.com/portal/',
+            'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.36'
+        ],
+        body: [timeOffset: '240', UserName: "${settings.username}", Password: "${settings.password}", RememberMe: 'false']
+    ]
+
+  data.cookiess = ''
+
+    httpPost(params) { response ->
+        log.debug "Request was successful, $response.status"
+        log.debug response.headers
+    response.getHeaders('Set-Cookie').each {
+          String cookie = it.value.split(';|,')[0]
+      log.debug "Adding cookie to collection: $cookie"
+            if(cookie != ".ASPXAUTH_TH_A=") {
+      data.cookiess = data.cookiess+cookie+';'
+            }
+        }
+        log.debug "cookies: $data.cookiess"
+
+    }
+}
+
+def isLoggedIn() {
+    if(!data.auth) {
+        log.debug "No data.auth"
+        return false
+    }
+    
+    def now = new Date().getTime();
+    return data.auth.expires_in > now
+}
+
+
+def updated()
+{
+log.debug "in updated"
+state.DisplayUnits = settings.tempScale
+ log.debug "display units now = $state.DisplayUnits"
+   
+}
+
+def installed() {
+  state.DisplayUnits = settings.tempScale
+  
+  log.debug "display units now = $state.DisplayUnits"
+}
--- a/smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy
+++ b/smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy
@@ -28,7 +28,7 @@ definition(
 		category: "SmartThings Labs",
 		iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/ecobee.png",
 		iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/ecobee@2x.png",
-		singleInstance: true
+        singleInstance: true
 ) {
 	appSetting "clientId"
 }
@@ -61,7 +61,7 @@ def authPage() {
 		description = "Click to enter Ecobee Credentials"
 	}

-	def redirectUrl = buildRedirectUrl
+	def redirectUrl = buildRedirectUrl //"${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${atomicState.accessToken}"
 	log.debug "RedirectUrl = ${redirectUrl}"
 	// get rid of next button until the user is actually auth'd
 	if (!oauthTokenProvided) {
@@ -103,7 +103,7 @@ def oauthInitUrl() {
 			scope: "smartRead,smartWrite",
 			client_id: smartThingsClientId,
 			state: atomicState.oauthInitState,
-			redirect_uri: callbackUrl
+			redirect_uri: callbackUrl //"https://graph.api.smartthings.com/oauth/callback"
 	]

 	redirect(location: "${apiEndpoint}/authorize?${toQueryString(oauthParams)}")
@@ -115,13 +115,14 @@ def callback() {
 	def code = params.code
 	def oauthState = params.state

+	//verify oauthState == atomicState.oauthInitState, so the callback corresponds to the authentication request
 	if (oauthState == atomicState.oauthInitState){

 		def tokenParams = [
 				grant_type: "authorization_code",
 				code      : code,
 				client_id : smartThingsClientId,
-				redirect_uri: callbackUrl
+				redirect_uri: callbackUrl //"https://graph.api.smartthings.com/oauth/callback"
 		]

 		def tokenUrl = "https://www.ecobee.com/home/token?${toQueryString(tokenParams)}"
@@ -246,32 +247,32 @@ def getEcobeeThermostats() {
 	]

 	def stats = [:]
-	try {
-		httpGet(deviceListParams) { resp ->
+    try {
+        httpGet(deviceListParams) { resp ->

-			if (resp.status == 200) {
-				resp.data.thermostatList.each { stat ->
-					atomicState.remoteSensors = stat.remoteSensors
-					def dni = [app.id, stat.identifier].join('.')
-					stats[dni] = getThermostatDisplayName(stat)
-				}
-			} else {
-				log.debug "http status: ${resp.status}"
-				//refresh the auth token
-				if (resp.data.status.code == 14) {
-					log.debug "Storing the failed action to try later"
-					atomicState.action = "getEcobeeThermostats"
-					log.debug "Refreshing your auth_token!"
-					refreshAuthToken()
-				} else {
-					log.error "Authentication error, invalid authentication method, lack of credentials, etc."
-				}
-			}
-		}
-	} catch(Exception e) {
-		log.debug "___exception getEcobeeThermostats(): " + e
-		refreshAuthToken()
-	}
+            if (resp.status == 200) {
+                resp.data.thermostatList.each { stat ->
+                    atomicState.remoteSensors = stat.remoteSensors
+                    def dni = [app.id, stat.identifier].join('.')
+                    stats[dni] = getThermostatDisplayName(stat)
+                }
+            } else {
+                log.debug "http status: ${resp.status}"
+                //refresh the auth token
+                if (resp.status == 500 && resp.data.status.code == 14) {
+                    log.debug "Storing the failed action to try later"
+                    atomicState.action = "getEcobeeThermostats"
+                    log.debug "Refreshing your auth_token!"
+                    refreshAuthToken()
+                } else {
+                    log.error "Authentication error, invalid authentication method, lack of credentials, etc."
+                }
+            }
+        }
+    } catch(Exception e) {
+        log.debug "___exception getEcobeeThermostats(): " + e
+        refreshAuthToken()
+    }
 	atomicState.thermostats = stats
 	return stats
 }
@@ -316,7 +317,7 @@ def initialize() {
 	def devices = thermostats.collect { dni ->
 		def d = getChildDevice(dni)
 		if(!d) {
-			d = addChildDevice(app.namespace, getChildName(), dni, null, ["label":"${atomicState.thermostats[dni]}" ?: "Ecobee Thermostat"])
+			d = addChildDevice(app.namespace, getChildName(), dni, null, ["label":"Ecobee Thermostat:${atomicState.thermostats[dni]}"])
 			log.debug "created ${d.displayName} with id $dni"
 		} else {
 			log.debug "found ${d.displayName} with id $dni already exists"
@@ -327,7 +328,7 @@ def initialize() {
 	def sensors = ecobeesensors.collect { dni ->
 		def d = getChildDevice(dni)
 		if(!d) {
-			d = addChildDevice(app.namespace, getSensorChildName(), dni, null, ["label":"${atomicState.sensors[dni]}" ?:"Ecobee Sensor"])
+			d = addChildDevice(app.namespace, getSensorChildName(), dni, null, ["label":"Ecobee Sensor:${atomicState.sensors[dni]}"])
 			log.debug "created ${d.displayName} with id $dni"
 		} else {
 			log.debug "found ${d.displayName} with id $dni already exists"
@@ -353,17 +354,21 @@ def initialize() {

 	atomicState.thermostatData = [:] //reset Map to store thermostat data

-	//send activity feeds to tell that device is connected
-	def notificationMessage = "is connected to SmartThings"
-	sendActivityFeeds(notificationMessage)
-	atomicState.timeSendPush = null
-	atomicState.reAttempt = 0
+    //send activity feeds to tell that device is connected
+    def notificationMessage = "is connected to SmartThings"
+    sendActivityFeeds(notificationMessage)
+    state.timeSendPush = null

 	pollHandler() //first time polling data data from thermostat

 	//automatically update devices status every 5 mins
 	runEvery5Minutes("poll")

+    //since access_token expires every 2 hours
+    runEvery1Hour("refreshAuthToken")
+
+	atomicState.reAttempt = 0
+
 }

 def pollHandler() {
@@ -384,10 +389,18 @@ def pollHandler() {
 def pollChildren(child = null) {
 	def thermostatIdsString = getChildDeviceIdsString()
 	log.debug "polling children: $thermostatIdsString"
-	def data = ""

 	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + thermostatIdsString + '","includeExtendedRuntime":"true","includeSettings":"true","includeRuntime":"true","includeSensors":true}}'
 	def result = false
+	// // TODO: test this:
+	//
+	// def jsonRequestBody = toJson([
+	//	selection:[
+	//		selectionType: "thermostats",
+	//		   selectionMatch: getChildDeviceIdsString(),
+	//		   includeRuntime: true
+	//	   ]
+	// ])

 	def pollParams = [
 			uri: apiEndpoint,
@@ -398,6 +411,11 @@ def pollChildren(child = null) {

 	try{
 		httpGet(pollParams) { resp ->
+
+//            if (resp.data) {
+//                debugEventFromParent(child, "pollChildren(child) >> resp.status = ${resp.status}, resp.data = ${resp.data}")
+//            }
+
 			if(resp.status == 200) {
 				log.debug "poll results returned resp.data ${resp.data}"
 				atomicState.remoteSensors = resp.data.thermostatList.remoteSensors
@@ -408,42 +426,20 @@ def pollChildren(child = null) {

 					log.debug "updating dni $dni"

-					data = [
+					def data = [
 							coolMode: (stat.settings.coolStages > 0),
 							heatMode: (stat.settings.heatStages > 0),
-							deviceTemperatureUnit: stat.settings.useCelsius,
-							minHeatingSetpoint: (stat.settings.heatRangeLow / 10),
-							maxHeatingSetpoint: (stat.settings.heatRangeHigh / 10),
-							minCoolingSetpoint: (stat.settings.coolRangeLow / 10),
-							maxCoolingSetpoint: (stat.settings.coolRangeHigh / 10),
 							autoMode: stat.settings.autoHeatCoolFeatureEnabled,
 							auxHeatMode: (stat.settings.hasHeatPump) && (stat.settings.hasForcedAir || stat.settings.hasElectric || stat.settings.hasBoiler),
-							temperature: (stat.runtime.actualTemperature / 10),
+							temperature: stat.runtime.actualTemperature / 10,
 							heatingSetpoint: stat.runtime.desiredHeat / 10,
 							coolingSetpoint: stat.runtime.desiredCool / 10,
-							thermostatMode: stat.settings.hvacMode,
-							humidity: stat.runtime.actualHumidity,
-							thermostatFanMode: stat.runtime.desiredFanMode
+							thermostatMode: stat.settings.hvacMode
 					]
-
-					if (location.temperatureScale == "F")
-					{
-						data["temperature"] = data["temperature"] ? Math.round(data["temperature"].toDouble()) : data["temperature"]
-						data["heatingSetpoint"] = data["heatingSetpoint"] ? Math.round(data["heatingSetpoint"].toDouble()) : data["heatingSetpoint"]
-						data["coolingSetpoint"] = data["coolingSetpoint"] ? Math.round(data["coolingSetpoint"].toDouble()) : data["coolingSetpoint"]
-						data["minHeatingSetpoint"] = data["minHeatingSetpoint"] ? Math.round(data["minHeatingSetpoint"].toDouble()) : data["minHeatingSetpoint"]
-						data["maxHeatingSetpoint"] = data["maxHeatingSetpoint"] ? Math.round(data["maxHeatingSetpoint"].toDouble()) : data["maxHeatingSetpoint"]
-						data["minCoolingSetpoint"] = data["minCoolingSetpoint"] ? Math.round(data["minCoolingSetpoint"].toDouble()) : data["minCoolingSetpoint"]
-						data["maxCoolingSetpoint"] = data["maxCoolingSetpoint"] ? Math.round(data["maxCoolingSetpoint"].toDouble()) : data["maxCoolingSetpoint"]
-
-					}
-
-					if (data?.deviceTemperatureUnit == false && location.temperatureScale == "F") {
-						data["deviceTemperatureUnit"] = "F"
-
-					} else {
-						data["deviceTemperatureUnit"] = "C"
-					}
+					data["temperature"] = data["temperature"] ? data["temperature"].toDouble().toInteger() : data["temperature"]
+					data["heatingSetpoint"] = data["heatingSetpoint"] ? data["heatingSetpoint"].toDouble().toInteger() : data["heatingSetpoint"]
+					data["coolingSetpoint"] = data["coolingSetpoint"] ? data["coolingSetpoint"].toDouble().toInteger() : data["coolingSetpoint"]
+//                    debugEventFromParent(child, "Event Data = ${data}")

 					collector[dni] = [data:data]
 					return collector
@@ -454,8 +450,9 @@ def pollChildren(child = null) {
 				log.error "polling children & got http status ${resp.status}"

 				//refresh the auth token
-				if (resp.data.status.code == 14) {
-					atomicState.action = "pollChildren"
+				if (resp.status == 500 && resp.data.status.code == 14) {
+					log.debug "Storing the failed action to try later"
+					atomicState.action = "pollChildren";
 					log.debug "Refreshing your auth_token!"
 					refreshAuthToken()
 				}
@@ -466,6 +463,7 @@ def pollChildren(child = null) {
 		}
 	} catch(Exception e) {
 		log.debug "___exception polling children: " + e
+//        debugEventFromParent(child, "___exception polling children: " + e)
 		refreshAuthToken()
 	}
 	return result
@@ -478,14 +476,18 @@ def pollChild(child){
 		if (!child.device.deviceNetworkId.startsWith("ecobee_sensor")){
 			if(atomicState.thermostats[child.device.deviceNetworkId] != null) {
 				def tData = atomicState.thermostats[child.device.deviceNetworkId]
+//                debugEventFromParent(child, "pollChild(child)>> data for ${child.device.deviceNetworkId} : ${tData.data}") //TODO comment
 				log.info "pollChild(child)>> data for ${child.device.deviceNetworkId} : ${tData.data}"
 				child.generateEvent(tData.data) //parse received message from parent
+//            return tData.data
 			} else if(atomicState.thermostats[child.device.deviceNetworkId] == null) {
+//                debugEventFromParent(child, "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId} after polling") //TODO comment
 				log.error "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId}"
 				return null
 			}
 		}
 	} else {
+//        debugEventFromParent(child, "ERROR: pollChildren(child) for ${child.device.deviceNetworkId} after polling") //TODO comment
 		log.info "ERROR: pollChildren(child) for ${child.device.deviceNetworkId} after polling"
 		return null
 	}
@@ -511,6 +513,9 @@ def availableModes(child) {
 	{
 		log.error "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId} after polling"

+		// TODO: flag device as in error state
+		// child.errorState = true
+
 		return null
 	}

@@ -537,6 +542,8 @@ def currentMode(child) {
 	if(!tData) {
 		log.error "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId} after polling"

+		// TODO: flag device as in error state
+		// child.errorState = true

 		return null
 	}
@@ -554,12 +561,8 @@ def updateSensorData() {
 				def occupancy = ""
 				it.capability.each {
 					if (it.type == "temperature") {
-						if (location.temperatureScale == "F") {
-							temperature = Math.round(it.value.toDouble() / 10)
-						} else {
-							temperature = convertFtoC(it.value.toDouble() / 10)
-						}
-
+						temperature = it.value as Double
+						temperature = (temperature / 10).toInteger()
 					} else if (it.type == "occupancy") {
 						if(it.value == "true")
 							occupancy = "active"
@@ -572,6 +575,7 @@ def updateSensorData() {
 				if(d) {
 					d.sendEvent(name:"temperature", value: temperature)
 					d.sendEvent(name:"motion", value: occupancy)
+//                    debugEventFromParent(d, "temperature : ${temperature}, motion:${occupancy}")
 				}
 			}
 		}
@@ -591,63 +595,64 @@ def toQueryString(Map m) {
 }

 private refreshAuthToken() {
-	log.debug "refreshing auth token"
+    log.debug "refreshing auth token"

-	if(!atomicState.refreshToken) {
-		log.warn "Can not refresh OAuth token since there is no refreshToken stored"
-	} else {
+    if(!atomicState.refreshToken) {
+        log.warn "Can not refresh OAuth token since there is no refreshToken stored"
+    } else {

-		def refreshParams = [
-				method: 'POST',
-				uri   : apiEndpoint,
-				path  : "/token",
-				query : [grant_type: 'refresh_token', code: "${atomicState.refreshToken}", client_id: smartThingsClientId],
-		]
+        def refreshParams = [
+                method: 'POST',
+                uri   : apiEndpoint,
+                path  : "/token",
+                query : [grant_type: 'refresh_token', code: "${atomicState.refreshToken}", client_id: smartThingsClientId],
+        ]

-		log.debug refreshParams
+        log.debug refreshParams

-		def notificationMessage = "is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials."
-		//changed to httpPost
-		try {
-			def jsonMap
-			httpPost(refreshParams) { resp ->
+        def notificationMessage = "is disconnected from SmartThings, because the access credential changed or was lost. Please go to the Ecobee (Connect) SmartApp and re-enter your account login credentials."
+        //changed to httpPost
+        try {
+            def jsonMap
+            httpPost(refreshParams) { resp ->

-				if(resp.status == 200) {
-					log.debug "Token refreshed...calling saved RestAction now!"
+                if(resp.status == 200) {
+                    log.debug "Token refreshed...calling saved RestAction now!"

-					debugEvent("Token refreshed ... calling saved RestAction now!")
+                    debugEvent("Token refreshed ... calling saved RestAction now!")

-					log.debug resp
+                    log.debug resp

-					jsonMap = resp.data
+                    jsonMap = resp.data

-					if(resp.data) {
+                    if(resp.data) {

-						log.debug resp.data
-						debugEvent("Response = ${resp.data}")
+                        log.debug resp.data
+                        debugEvent("Response = ${resp.data}")

-						atomicState.refreshToken = resp?.data?.refresh_token
-						atomicState.authToken = resp?.data?.access_token
+                        atomicState.refreshToken = resp?.data?.refresh_token
+                        atomicState.authToken = resp?.data?.access_token

-						debugEvent("Refresh Token = ${atomicState.refreshToken}")
-						debugEvent("OAUTH Token = ${atomicState.authToken}")
+                        debugEvent("Refresh Token = ${atomicState.refreshToken}")
+                        debugEvent("OAUTH Token = ${atomicState.authToken}")

-						if(atomicState.action && atomicState.action != "") {
-							log.debug "Executing next action: ${atomicState.action}"
+                        if(atomicState.action && atomicState.action != "") {
+                            log.debug "Executing next action: ${atomicState.action}"

-							"${atomicState.action}"()
+                            "${atomicState.action}"()

-							atomicState.action = ""
-						}
+                            //remove saved action
+                            atomicState.action = ""
+                        }

-					}
-					atomicState.action = ""
-				} else {
-					log.debug "refresh failed ${resp.status} : ${resp.status.code}"
-				}
-			}
-		} catch (groovyx.net.http.HttpResponseException e) {
-			log.error "refreshAuthToken() >> Error: e.statusCode ${e.statusCode}"
+                    }
+                    atomicState.action = ""
+                } else {
+                    log.debug "refresh failed ${resp.status} : ${resp.status.code}"
+                }
+            }
+        } catch(Exception e) {
+            log.error "refreshAuthToken() >> Error: e.statusCode ${e.statusCode}"
 			def reAttemptPeriod = 300 // in sec
 			if (e.statusCode != 401) { //this issue might comes from exceed 20sec app execution, connectivity issue etc.
 				runIn(reAttemptPeriod, "refreshAuthToken")
@@ -660,16 +665,20 @@ private refreshAuthToken() {
 					sendPushAndFeeds(notificationMessage)
 					atomicState.reAttempt = 0
 				}
-			}
-		}
-	}
+            }
+        }
+    }
 }

 def resumeProgram(child, deviceId) {

+//    def thermostatIdsString = getChildDeviceIdsString()
+//    log.debug "resumeProgram children: $thermostatIdsString"

 	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"functions": [{"type": "resumeProgram"}]}'
+	//, { "type": "sendMessage", "params": { "text": "Setpoint Updated" } }
 	def result = sendJson(jsonRequestBody)
+//    debugEventFromParent(child, "resumeProgram(child) with result ${result}")
 	return result
 }

@@ -677,27 +686,28 @@ def setHold(child, heating, cooling, deviceId, sendHoldType) {

 	int h = heating * 10
 	int c = cooling * 10
+
+//    log.debug "setpoints____________ - h: $heating - $h, c: $cooling - $c"
+//    def thermostatIdsString = getChildDeviceIdsString()
+
 	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"functions": [{ "type": "setHold", "params": { "coolHoldTemp": '+c+',"heatHoldTemp": '+h+', "holdType": '+sendHoldType+' } } ]}'
-
-	def result = sendJson(child, jsonRequestBody)
-	return result
-}
-
-def setFanMode(child, heating, cooling, deviceId, sendHoldType, fanMode) {
-
-	int h = heating * 10
-	int c = cooling * 10
-
-
-	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"functions": [{ "type": "setHold", "params": { "coolHoldTemp": '+c+',"heatHoldTemp": '+h+', "holdType": '+sendHoldType+', "fan": '+fanMode+' } } ]}'
+//	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + thermostatIdsString + '","includeRuntime":true},"functions": [{"type": "resumeProgram"}, { "type": "setHold", "params": { "coolHoldTemp": '+c+',"heatHoldTemp": '+h+', "holdType": "indefinite" } } ]}'
 	def result = sendJson(child, jsonRequestBody)
+//    debugEventFromParent(child, "setHold: heating: ${h}, cooling: ${c} with result ${result}")
 	return result
 }

 def setMode(child, mode, deviceId) {
+//    def thermostatIdsString = getChildDeviceIdsString()
+//    log.debug "setCoolingSetpoint children: $thermostatIdsString"
+
 	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"thermostat": {"settings":{"hvacMode":"'+"${mode}"+'"}}}'

+//    log.debug "Mode Request Body = ${jsonRequestBody}"
+//    debugEvent ("Mode Request Body = ${jsonRequestBody}")
+
 	def result = sendJson(jsonRequestBody)
+//    debugEventFromParent(child, "setMode to ${mode} with result ${result}")
 	return result
 }

@@ -714,6 +724,8 @@ def sendJson(child = null, String jsonBody) {
 	try{
 		httpPost(cmdParams) { resp ->

+//            debugEventFromParent(child, "sendJson >> resp.status ${resp.status}, resp.data: ${resp.data}")
+
 			if(resp.status == 200) {

 				log.debug "updated ${resp.data}"
@@ -729,7 +741,8 @@ def sendJson(child = null, String jsonBody) {
 				debugEvent ("sent Json & got http status ${resp.status} - ${resp.status.code}")

 				//refresh the auth token
-				if (resp.status.code == 14) {
+				if (resp.status == 500 && resp.status.code == 14) {
+					//log.debug "Storing the failed action to try later"
 					log.debug "Refreshing your auth_token!"
 					debugEvent ("Refreshing OAUTH Token")
 					refreshAuthToken()
@@ -744,7 +757,7 @@ def sendJson(child = null, String jsonBody) {
 	} catch(Exception e) {
 		log.debug "Exception Sending Json: " + e
 		debugEvent ("Exception Sending JSON: " + e)
-		refreshAuthToken()
+        refreshAuthToken()
 		return false
 	}

@@ -781,37 +794,25 @@ def debugEventFromParent(child, message) {

 //send both push notification and mobile activity feeds
 def sendPushAndFeeds(notificationMessage){
-	log.warn "sendPushAndFeeds >> notificationMessage: ${notificationMessage}"
-	log.warn "sendPushAndFeeds >> atomicState.timeSendPush: ${atomicState.timeSendPush}"
-	if (atomicState.timeSendPush){
-		if (now() - atomicState.timeSendPush > 86400000){ // notification is sent to remind user once a day
-			sendPush("Your Ecobee thermostat " + notificationMessage)
-			sendActivityFeeds(notificationMessage)
-			atomicState.timeSendPush = now()
-		}
-	} else {
-		sendPush("Your Ecobee thermostat " + notificationMessage)
-		sendActivityFeeds(notificationMessage)
-		atomicState.timeSendPush = now()
-	}
-	atomicState.authToken = null
+    log.warn "sendPushAndFeeds >> notificationMessage: ${notificationMessage}"
+    log.warn "sendPushAndFeeds >> atomicState.timeSendPush: ${atomicState.timeSendPush}"
+    if (atomicState.timeSendPush){
+        if (now() - atomicState.timeSendPush > 86400000){ // notification is sent to remind user once a day
+            sendPush("Your Ecobee thermostat " + notificationMessage)
+            sendActivityFeeds(notificationMessage)
+            atomicState.timeSendPush = now()
+        }
+    } else {
+        sendPush("Your Ecobee thermostat " + notificationMessage)
+        sendActivityFeeds(notificationMessage)
+        atomicState.timeSendPush = now()
+    }
+    atomicState.authToken = null
 }

 def sendActivityFeeds(notificationMessage) {
-	def devices = getChildDevices()
-	devices.each { child ->
-		child.generateActivityFeedsEvent(notificationMessage) //parse received message from parent
-	}
-}
-
-def roundC (tempC) {
-	return String.format("%.1f", (Math.round(tempC * 2))/2)
-}
-
-def convertFtoC (tempF) {
-	return String.format("%.1f", (Math.round(((tempF - 32)*(5/9)) * 2))/2)
-}
-
-def convertCtoF (tempC) {
-	return (Math.round(tempC * (9/5)) + 32).toInteger()
+    def devices = getChildDevices()
+    devices.each { child ->
+        child.generateActivityFeedsEvent(notificationMessage) //parse received message from parent
+    }
 }
--- a/smartapps/smartthings/gentle-wake-up.src/gentle-wake-up.groovy
+++ b/smartapps/smartthings/gentle-wake-up.src/gentle-wake-up.groovy
@@ -201,8 +201,8 @@ def completionPage() {

 		section("Switches") {
 			input(name: "completionSwitches", type: "capability.switch", title: "Set these switches", description: null, required: false, multiple: true, submitOnChange: true)
-			if (completionSwitches) {
-				input(name: "completionSwitchesState", type: "enum", title: "To", description: null, required: false, multiple: false, options: ["on", "off"], defaultValue: "on")
+			if (completionSwitches || androidClient()) {
+				input(name: "completionSwitchesState", type: "enum", title: "To", description: null, required: false, multiple: false, options: ["on", "off"], style: "segmented", defaultValue: "on")
 				input(name: "completionSwitchesLevel", type: "number", title: "Optionally, Set Dimmer Levels To", description: null, required: false, multiple: false, range: "(0..99)")
 			}
 		}
--- a/smartapps/smartthings/hue-connect.src/hue-connect.groovy
+++ b/smartapps/smartthings/hue-connect.src/hue-connect.groovy
@@ -35,11 +35,23 @@ preferences {
 }

 def mainPage() {
-	def bridges = bridgesDiscovered()
-	if (state.username && bridges) {
-		return bulbDiscovery()
+	if(canInstallLabs()) {
+		def bridges = bridgesDiscovered()
+		if (state.username && bridges) {
+			return bulbDiscovery()
+		} else {
+			return bridgeDiscovery()
+		}
 	} else {
-		return bridgeDiscovery()
+		def upgradeNeeded = """To use SmartThings Labs, your Hub should be completely up to date.
+
+To update your Hub, access Location Settings in the Main Menu (tap the gear next to your location name), select your Hub, and choose "Update Hub"."""
+
+		return dynamicPage(name:"bridgeDiscovery", title:"Upgrade needed!", nextPage:"", install:false, uninstall: true) {
+			section("Upgrade") {
+				paragraph "$upgradeNeeded"
+			}
+		}
 	}
 }

@@ -753,6 +765,10 @@ private String convertHexToIP(hex) {
 	[convertHexToInt(hex[0..1]),convertHexToInt(hex[2..3]),convertHexToInt(hex[4..5]),convertHexToInt(hex[6..7])].join(".")
 }

+private Boolean canInstallLabs() {
+	return hasAllHubsOver("000.011.00603")
+}
+
 private Boolean hasAllHubsOver(String desiredFirmware) {
 	return realHubFirmwareVersions.every { fw -> fw >= desiredFirmware }
 }
--- a/smartapps/smartthings/logitech-harmony-connect.src/logitech-harmony-connect.groovy
+++ b/smartapps/smartthings/logitech-harmony-connect.src/logitech-harmony-connect.groovy
@@ -419,11 +419,9 @@ def addDevice() {
        def d = getChildDevice(dni)
        if(!d) {
            def newAction = state.HarmonyActivities.find { it.key == dni }
-            if (newAction) {
-	            d = addChildDevice("smartthings", "Harmony Activity", dni, null, [label:"${newAction.value} [Harmony Activity]"])
-	            log.trace "created ${d.displayName} with id $dni"
-	            poll()
-            }
+            d = addChildDevice("smartthings", "Harmony Activity", dni, null, [label:"${newAction.value} [Harmony Activity]"])
+            log.trace "created ${d.displayName} with id $dni"
+            poll()
        } else {
            log.trace "found ${d.displayName} with id $dni already exists"
        }
--- a/smartapps/smartthings/notify-me-when.src/i18n/messages.properties
+++ b/smartapps/smartthings/notify-me-when.src/i18n/messages.properties
@@ -1,31 +0,0 @@
-'''Acceleration Detected'''.ko=가속화 감지됨
-'''Arrival Of'''.ko=도착
-'''Both Push and SMS?'''.ko=푸시 메시지와 SMS를 모두 사용하시겠습니까?
-'''Button Pushed'''.ko=버튼이 눌렸습니다
-'''Contact Closes'''.ko=접점 닫힘
-'''Contact Opens'''.ko=접점 열림
-'''Departure Of'''.ko=출발
-'''Message Text'''.ko=문자 메시지
-'''Minutes'''.ko=분
-'''Motion Here'''.ko=동작
-'''Phone Number (for SMS, optional)'''.ko=휴대전화 번호(문자 메시지 - 옵션)
-'''Receive notifications when anything happens in your home.'''.ko=집 안에 무슨 일이 일어나면 알림이 전송됩니다.
-'''Smoke Detected'''.ko=연기가 감지되었습니다
-'''Switch Turned Off'''.ko=스위치 꺼짐
-'''Switch Turned On'''.ko=스위치 꺼짐
-'''Choose one or more, when...'''.ko=다음의 경우 하나 이상 선택
-'''Yes'''.ko=예
-'''No'''.ko=아니요
-'''Send this message (optional, sends standard status message if not specified)'''.ko=이 메시지 전송(선택적, 지정되지 않은 경우 표준 상태 메시지를 보냅니다)
-'''Via a push notification and/or an SMS message'''.ko=푸시 알림 및/또는 문자 메시지를 통해
-'''Set for specific mode(s)'''.ko=특정 모드 설정
-'''Tap to set'''.ko=눌러서 설정
-'''Minimum time between messages (optional, defaults to every message)'''.ko=메시지작 간 최소 시간(선택 사항, 모든 메시지의 기본 설정)
-'''If outside the US please make sure to enter the proper country code'''.ko=미국 이외 거주자는 적절한 국가 코드를 입력했는지 확인하십시오
-'''Water Sensor Wet'''.ko=Water Sensor에서 물이 감지되었습니다
-'''{{ triggerEvent.linkText }} has arrived at the {{ location.name }}'''.ko={{ triggerEvent.linkText }}님이 {{ location.name }}에 도착했습니다
-'''{{ triggerEvent.linkText }} has arrived at {{ location.name }}'''.ko={{ triggerEvent.linkText }}님이 {{ location.name }}에 도착했습니다
-'''{{ triggerEvent.linkText }} has left the {{ location.name }}'''.ko={{ triggerEvent.linkText }}님이 {{ location.name }}을(를) 떠났습니다
-'''{{ triggerEvent.linkText }} has left {{ location.name }}'''.ko={{ triggerEvent.linkText }}님이 {{ location.name }}을(를) 떠났습니다
-'''Assign a name'''.ko=이름 배정
-'''Choose Modes'''.ko=모드 선택
--- a/smartapps/smartthings/notify-me-when.src/notify-me-when.groovy
+++ b/smartapps/smartthings/notify-me-when.src/notify-me-when.groovy
@@ -20,19 +20,19 @@
 *	2014-10-03:	Added capability.button device picker and button.pushed event subscription. For Doorbell.
 */
 definition(
-		name: "Notify Me When",
-		namespace: "smartthings",
-		author: "SmartThings",
-		description: "Receive notifications when anything happens in your home.",
-		category: "Convenience",
-		iconUrl: "https://s3.amazonaws.com/smartapp-icons/Meta/window_contact.png",
-		iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Meta/window_contact@2x.png"
+    name: "Notify Me When",
+    namespace: "smartthings",
+    author: "SmartThings",
+    description: "Receive notifications when anything happens in your home.",
+    category: "Convenience",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Meta/window_contact.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Meta/window_contact@2x.png"
 )

 preferences {
 	section("Choose one or more, when..."){
 		input "button", "capability.button", title: "Button Pushed", required: false, multiple: true //tw
-		input "motion", "capability.motionSensor", title: "Motion Here", required: false, multiple: true
+        input "motion", "capability.motionSensor", title: "Motion Here", required: false, multiple: true
 		input "contact", "capability.contactSensor", title: "Contact Opens", required: false, multiple: true
 		input "contactClosed", "capability.contactSensor", title: "Contact Closes", required: false, multiple: true
 		input "acceleration", "capability.accelerationSensor", title: "Acceleration Detected", required: false, multiple: true
@@ -47,11 +47,11 @@ preferences {
 		input "messageText", "text", title: "Message Text", required: false
 	}
 	section("Via a push notification and/or an SMS message"){
-		input("recipients", "contact", title: "Send notifications to") {
-			input "phone", "phone", title: "Phone Number (for SMS, optional)", required: false
-			paragraph "If outside the US please make sure to enter the proper country code"
-			input "pushAndPhone", "enum", title: "Both Push and SMS?", required: false, options: ["Yes", "No"]
-		}
+        input("recipients", "contact", title: "Send notifications to") {
+            input "phone", "phone", title: "Phone Number (for SMS, optional)", required: false
+            paragraph "If outside the US please make sure to enter the proper country code"
+            input "pushAndPhone", "enum", title: "Both Push and SMS?", required: false, options: ["Yes", "No"]
+        }
 	}
 	section("Minimum time between messages (optional, defaults to every message)") {
 		input "frequency", "decimal", title: "Minutes", required: false
@@ -71,7 +71,7 @@ def updated() {

 def subscribeToEvents() {
 	subscribe(button, "button.pushed", eventHandler) //tw
-	subscribe(contact, "contact.open", eventHandler)
+    subscribe(contact, "contact.open", eventHandler)
 	subscribe(contactClosed, "contact.closed", eventHandler)
 	subscribe(acceleration, "acceleration.active", eventHandler)
 	subscribe(motion, "motion.active", eventHandler)
@@ -99,55 +99,49 @@ def eventHandler(evt) {
 }

 private sendMessage(evt) {
-	String msg = messageText
-	Map options = [:]
-
-	if (!messageText) {
-		msg = defaultText(evt)
-		options = [translatable: true, triggerEvent: evt]
-	}
+	def msg = messageText ?: defaultText(evt)
 	log.debug "$evt.name:$evt.value, pushAndPhone:$pushAndPhone, '$msg'"

-	if (location.contactBookEnabled) {
-		sendNotificationToContacts(msg, recipients, options)
-	} else {
-		if (!phone || pushAndPhone != 'No') {
-			log.debug 'sending push'
-			options.method = 'push'
-			//sendPush(msg)
-		}
-		if (phone) {
-			options.phone = phone
-			log.debug 'sending SMS'
-			//sendSms(phone, msg)
-		}
-		sendNotification(msg, options)
-	}
+    if (location.contactBookEnabled) {
+        sendNotificationToContacts(msg, recipients)
+    }
+    else {

+        if (!phone || pushAndPhone != "No") {
+            log.debug "sending push"
+            sendPush(msg)
+        }
+        if (phone) {
+            log.debug "sending SMS"
+            sendSms(phone, msg)
+        }
+    }
 	if (frequency) {
 		state[evt.deviceId] = now()
 	}
 }

 private defaultText(evt) {
-	if (evt.name == 'presence') {
-		if (evt.value == 'present') {
+	if (evt.name == "presence") {
+		if (evt.value == "present") {
 			if (includeArticle) {
-				'{{ triggerEvent.linkText }} has arrived at the {{ location.name }}'
+				"$evt.linkText has arrived at the $location.name"
 			}
 			else {
-				'{{ triggerEvent.linkText }} has arrived at {{ location.name }}'
-			}
-		} else {
-			if (includeArticle) {
-				'{{ triggerEvent.linkText }} has left the {{ location.name }}'
-			}
-			else {
-				'{{ triggerEvent.linkText }} has left {{ location.name }}'
+				"$evt.linkText has arrived at $location.name"
 			}
 		}
-	} else {
-		'{{ triggerEvent.descriptionText }}'
+		else {
+			if (includeArticle) {
+				"$evt.linkText has left the $location.name"
+			}
+			else {
+				"$evt.linkText has left $location.name"
+			}
+		}
+	}
+	else {
+		evt.descriptionText
 	}
 }