Merge pull request #1229 from SmartThingsCommunity/staging

Rolling down hotfix to master

devicetypes/dianoga/netatmo-additional-module.src/netatmo-additional-module.groovy

@@ -15,6 +15,7 @@
  */
 metadata {
 	definition (name: "Netatmo Additional Module", namespace: "dianoga", author: "Brian Steere") {
+		capability "Sensor"
 		capability "Relative Humidity Measurement"
 		capability "Temperature Measurement"
 

devicetypes/dianoga/netatmo-basestation.src/netatmo-basestation.groovy

@@ -15,6 +15,7 @@
  */
 metadata {
 	definition (name: "Netatmo Basestation", namespace: "dianoga", author: "Brian Steere") {
+		capability "Sensor"
 		capability "Relative Humidity Measurement"
 		capability "Temperature Measurement"
 

devicetypes/dianoga/netatmo-outdoor-module.src/netatmo-outdoor-module.groovy

@@ -15,6 +15,7 @@
  */
 metadata {
 	definition (name: "Netatmo Outdoor Module", namespace: "dianoga", author: "Brian Steere") {
+		capability "Sensor"
 		capability "Relative Humidity Measurement"
 		capability "Temperature Measurement"
 	}

devicetypes/dianoga/netatmo-rain.src/netatmo-rain.groovy

@@ -15,6 +15,8 @@
  */
 metadata {
 	definition (name: "Netatmo Rain", namespace: "dianoga", author: "Brian Steere") {
+		capability "Sensor"
+	
 		attribute "rain", "number"
         attribute "rainSumHour", "number"
         attribute "rainSumDay", "number"

devicetypes/smartthings/ecobee-sensor.src/ecobee-sensor.groovy

@@ -67,6 +67,6 @@ def refresh() {
 
 void poll() {
 	log.debug "Executing 'poll' using parent SmartApp"
-	parent.pollChild()
+	parent.poll()
 
 }

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

@@ -133,7 +133,7 @@ def refresh() {
 
 void poll() {
 	log.debug "Executing 'poll' using parent SmartApp"
-	parent.pollChild()
+	parent.poll()
 }
 
 def generateEvent(Map results) {
@@ -152,11 +152,11 @@ def generateEvent(Map results) {
 				sendValue =  location.temperatureScale == "C"? roundC(sendValue) : sendValue
 				isChange = isTemperatureStateChange(device, name, value.toString())
 				isDisplayed = isChange
-				event << [value: sendValue, isStateChange: isChange, displayed: isDisplayed]
+				event << [value: sendValue, unit: temperatureScale, 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]
+				event << [value: sendValue, unit: temperatureScale, displayed: false]
 			}  else if (name=="heatMode" || name=="coolMode" || name=="autoMode" || name=="auxHeatMode"){
 				isChange = isStateChange(device, name, value.toString())
 				event << [value: value.toString(), isStateChange: isChange, displayed: false]
@@ -234,9 +234,9 @@ void setHeatingSetpoint(setpoint) {
 	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(heatingValue, coolingValue, deviceId, sendHoldType)) {
-		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)
+		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
-		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint)
+		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint, "unit":location.temperatureScale)
 		log.debug "Done setHeatingSetpoint> coolingSetpoint: ${coolingSetpoint}, heatingSetpoint: ${heatingSetpoint}"
 		generateSetpointEvent()
 		generateStatusEvent()
@@ -271,9 +271,9 @@ void setCoolingSetpoint(setpoint) {
 	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(heatingValue, coolingValue, deviceId, sendHoldType)) {
-		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)
+		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
-		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint)
+		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint, "unit":location.temperatureScale)
 		log.debug "Done setCoolingSetpoint>> coolingSetpoint = ${coolingSetpoint}, heatingSetpoint = ${heatingSetpoint}"
 		generateSetpointEvent()
 		generateStatusEvent()
@@ -287,14 +287,14 @@ void resumeProgram() {
 	log.debug "resumeProgram() is called"
 	sendEvent("name":"thermostatStatus", "value":"resuming schedule", "description":statusText, displayed: false)
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	if (parent.resumeProgram(this, deviceId)) {
+	if (parent.resumeProgram(deviceId)) {
 		sendEvent("name":"thermostatStatus", "value":"setpoint is updating", "description":statusText, displayed: false)
 		runIn(5, "poll")
 		log.debug "resumeProgram() is done"
 		sendEvent("name":"resumeProgram", "value":"resume", descriptionText: "resumeProgram is done", displayed: false, isStateChange: true)
 	} else {
 		sendEvent("name":"thermostatStatus", "value":"failed resume click refresh", "description":statusText, displayed: false)
-		log.error "Error resumeProgram() check parent.resumeProgram(this, deviceId)"
+		log.error "Error resumeProgram() check parent.resumeProgram(deviceId)"
 	}
 
 }
@@ -406,7 +406,7 @@ def generateOperatingStateEvent(operatingState) {
 def off() {
 	log.debug "off"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	if (parent.setMode (this,"off", deviceId))
+	if (parent.setMode ("off", deviceId))
 		generateModeEvent("off")
 	else {
 		log.debug "Error setting new mode."
@@ -420,7 +420,7 @@ def off() {
 def heat() {
 	log.debug "heat"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	if (parent.setMode (this,"heat", deviceId))
+	if (parent.setMode ("heat", deviceId))
 		generateModeEvent("heat")
 	else {
 		log.debug "Error setting new mode."
@@ -438,7 +438,7 @@ def emergencyHeat() {
 def auxHeatOnly() {
 	log.debug "auxHeatOnly"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	if (parent.setMode (this,"auxHeatOnly", deviceId))
+	if (parent.setMode ("auxHeatOnly", deviceId))
 		generateModeEvent("auxHeatOnly")
 	else {
 		log.debug "Error setting new mode."
@@ -452,7 +452,7 @@ def auxHeatOnly() {
 def cool() {
 	log.debug "cool"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	if (parent.setMode (this,"cool", deviceId))
+	if (parent.setMode ("cool", deviceId))
 		generateModeEvent("cool")
 	else {
 		log.debug "Error setting new mode."
@@ -466,7 +466,7 @@ def cool() {
 def auto() {
 	log.debug "auto"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	if (parent.setMode (this,"auto", deviceId))
+	if (parent.setMode ("auto", deviceId))
 		generateModeEvent("auto")
 	else {
 		log.debug "Error setting new mode."
@@ -489,7 +489,7 @@ def fanOn() {
 	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)) {
+	if (parent.setFanMode(heatingValue, coolingValue, deviceId, sendHoldType, fanMode)) {
 		generateFanModeEvent(fanMode)
 	} else {
 		log.debug "Error setting new mode."
@@ -510,7 +510,7 @@ def fanAuto() {
 	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)) {
+	if (parent.setFanMode(heatingValue, coolingValue, deviceId, sendHoldType, fanMode)) {
 		generateFanModeEvent(fanMode)
 	} else {
 		log.debug "Error setting new mode."
@@ -556,12 +556,12 @@ def generateSetpointEvent() {
 
 	if (mode == "heat") {
 
-		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint )
+		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
 
 	}
 	else if (mode == "cool") {
 
-		sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint)
+		sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint, "unit":location.temperatureScale)
 
 	} else if (mode == "auto") {
 
@@ -573,7 +573,7 @@ def generateSetpointEvent() {
 
 	} else if (mode == "auxHeatOnly") {
 
-		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint)
+		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
 
 	}
 
@@ -608,7 +608,7 @@ void raiseSetpoint() {
 			targetvalue = maxCoolingSetpoint
 		}
 
-		sendEvent("name":"thermostatSetpoint", "value":targetvalue, displayed: false)
+		sendEvent("name":"thermostatSetpoint", "value":targetvalue, "unit":location.temperatureScale, displayed: false)
 		log.info "In mode $mode raiseSetpoint() to $targetvalue"
 
 		runIn(3, "alterSetpoint", [data: [value:targetvalue], overwrite: true]) //when user click button this runIn will be overwrite
@@ -644,7 +644,7 @@ void lowerSetpoint() {
 			targetvalue = minCoolingSetpoint
 		}
 
-		sendEvent("name":"thermostatSetpoint", "value":targetvalue, displayed: false)
+		sendEvent("name":"thermostatSetpoint", "value":targetvalue, "unit":location.temperatureScale, displayed: false)
 		log.info "In mode $mode lowerSetpoint() to $targetvalue"
 
 		runIn(3, "alterSetpoint", [data: [value:targetvalue], overwrite: true]) //when user click button this runIn will be overwrite
@@ -690,10 +690,10 @@ void alterSetpoint(temp) {
 	def coolingValue = location.temperatureScale == "C"? convertCtoF(targetCoolingSetpoint) : targetCoolingSetpoint
 	def heatingValue = location.temperatureScale == "C"? convertCtoF(targetHeatingSetpoint) : targetHeatingSetpoint
 
-	if (parent.setHold(this, heatingValue, coolingValue, deviceId, sendHoldType)) {
+	if (parent.setHold(heatingValue, coolingValue, deviceId, sendHoldType)) {
 		sendEvent("name": "thermostatSetpoint", "value": temp.value, displayed: false)
-		sendEvent("name": "heatingSetpoint", "value": targetHeatingSetpoint)
+		sendEvent("name": "heatingSetpoint", "value": targetHeatingSetpoint, "unit": location.temperatureScale)
-		sendEvent("name": "coolingSetpoint", "value": targetCoolingSetpoint)
+		sendEvent("name": "coolingSetpoint", "value": targetCoolingSetpoint, "unit": location.temperatureScale)
 		log.debug "alterSetpoint in mode $mode succeed change setpoint to= ${temp.value}"
 	} else {
 		log.error "Error alterSetpoint()"

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

@@ -16,6 +16,7 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
+		capability "Health Check"
 
 		command "setAdjustedColor"
         command "reset"
@@ -55,6 +56,10 @@ metadata {
 	}
 }
 
+void installed() {
+	sendEvent(name: "checkInterval", value: 60 * 30, data: [protocol: "lan"], displayed: false)
+}
+
 // parse events into attributes
 def parse(description) {
 	log.debug "parse() - $description"
@@ -166,3 +171,7 @@ def verifyPercent(percent) {
         return false
     }
 }
+
+def ping() {
+    log.debug "${parent.ping(this)}"
+}

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

@@ -17,6 +17,7 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
+		capability "Health Check"
 
 		command "setAdjustedColor"
         command "reset"
@@ -64,6 +65,10 @@ metadata {
 	}
 }
 
+void installed() {
+	sendEvent(name: "checkInterval", value: 60 * 30, data: [protocol: "lan"], displayed: false)
+}
+
 // parse events into attributes
 def parse(description) {
 	log.debug "parse() - $description"
@@ -182,3 +187,7 @@ def verifyPercent(percent) {
         return false
     }
 }
+
+def ping() {
+    log.trace "${parent.ping(this)}"
+}

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

@@ -14,6 +14,7 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
+        capability "Health Check"
 
         command "refresh"
 	}
@@ -48,6 +49,10 @@ metadata {
     }
 }
 
+void installed() {
+	sendEvent(name: "checkInterval", value: 60 * 30, data: [protocol: "lan"], displayed: false)
+}
+
 // parse events into attributes
 def parse(description) {
 	log.debug "parse() - $description"
@@ -87,3 +92,7 @@ void refresh() {
 	log.debug "Executing 'refresh'"
 	parent.manualRefresh()
 }
+
+def ping() {
+    log.debug "${parent.ping(this)}"
+}

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

@@ -15,6 +15,7 @@ metadata {
         capability "Color Temperature"
         capability "Switch"
         capability "Refresh"
+        capability "Health Check"
 
         command "refresh"
     }
@@ -53,6 +54,10 @@ metadata {
     }
 }
 
+void installed() {
+	sendEvent(name: "checkInterval", value: 60 * 30, data: [protocol: "lan"], displayed: false)
+}
+
 // parse events into attributes
 def parse(description) {
     log.debug "parse() - $description"
@@ -101,3 +106,7 @@ void refresh() {
     log.debug "Executing 'refresh'"
     parent.manualRefresh()
 }
+
+def ping() {
+    log.debug "${parent.ping(this)}"
+}

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

@@ -233,6 +233,8 @@ private Map getBatteryResult(rawValue) {
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				def roundedPct = Math.round(pct * 100)
+				if (roundedPct <= 0)
+					roundedPct = 1
 				result.value = Math.min(100, roundedPct)
 				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}

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

@@ -248,6 +248,8 @@ private Map getBatteryResult(rawValue) {
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				def roundedPct = Math.round(pct * 100)
+				if (roundedPct <= 0)
+					roundedPct = 1
 				result.value = Math.min(100, roundedPct)
 				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}

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

@@ -206,6 +206,8 @@ private Map getBatteryResult(rawValue) {
 			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
 			def roundedPct = Math.round(pct * 100)
+			if (roundedPct <= 0)
+				roundedPct = 1
 			result.value = Math.min(100, roundedPct)
 			result.descriptionText = "${linkText} battery was ${result.value}%"
 		}

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

@@ -313,6 +313,8 @@ private Map getBatteryResult(rawValue) {
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				def roundedPct = Math.round(pct * 100)
+				if (roundedPct <= 0)
+					roundedPct = 1
 				result.value = Math.min(100, roundedPct)
 				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}

devicetypes/smartthings/smartsense-open-closed-accelerometer-sensor.src/smartsense-open-closed-accelerometer-sensor.groovy

@@ -206,6 +206,8 @@ def getTemperature(value) {
 			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
 			def roundedPct = Math.round(pct * 100)
+	        if (roundedPct <= 0)
+		        roundedPct = 1
 			result.value = Math.min(100, roundedPct)
 			result.descriptionText = "${linkText} battery was ${result.value}%"
 		}

devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy

@@ -207,6 +207,8 @@ private Map getBatteryResult(rawValue) {
     	def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
 		def roundedPct = Math.round(pct * 100)
+	    if (roundedPct <= 0)
+		    roundedPct = 1
 		result.value = Math.min(100, roundedPct)
 		result.descriptionText = "${linkText} battery was ${result.value}%"
 	}

devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy

@@ -214,6 +214,8 @@ private Map getBatteryResult(rawValue) {
     	def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
 		def roundedPct = Math.round(pct * 100)
+	    if (roundedPct <= 0)
+		    roundedPct = 1
 		result.value = Math.min(100, roundedPct)
 		result.descriptionText = "${linkText} battery was ${result.value}%"
 	}

smartapps/curb/curb-control.src/curb-control.groovy

@@ -65,7 +65,16 @@ void updateSwitch() {
 private void updateAll(devices) {
 	def command = request.JSON?.command
 	if (command) {
-		devices."$command"()
+		switch(command) {
+			case "on":
+				devices.on()
+				break
+			case "off":
+				devices.off()
+				break
+			default:
+				httpError(403, "Access denied. This command is not supported by current capability.")
+		}
 	}
 }
 
@@ -77,7 +86,16 @@ private void update(devices) {
 		if (!device) {
 			httpError(404, "Device not found")
 		} else {
-			device."$command"()
+			switch(command) {
+				case "on":
+					device.on()
+					break
+				case "off":
+					device.off()
+					break
+				default:
+					httpError(403, "Access denied. This command is not supported by current capability.")
+			}
 		}
 	}
 }

smartapps/dianoga/netatmo-connect.src/netatmo-connect.groovy

@@ -58,7 +58,7 @@ def authPage() {
 	if (canInstallLabs()) {
 
 		def redirectUrl = getBuildRedirectUrl()
-		log.debug "Redirect url = ${redirectUrl}"
+		// log.debug "Redirect url = ${redirectUrl}"
 
 		if (state.authToken) {
 			description = "Tap 'Next' to proceed"
@@ -113,13 +113,13 @@ def oauthInitUrl() {
 		scope: "read_station"
 	]
 
-	log.debug "REDIRECT URL: ${getVendorAuthPath() + toQueryString(oauthParams)}"
+	// log.debug "REDIRECT URL: ${getVendorAuthPath() + toQueryString(oauthParams)}"
 
 	redirect (location: getVendorAuthPath() + toQueryString(oauthParams))
 }
 
 def callback() {
-	log.debug "callback()>> params: $params, params.code ${params.code}"
+	// log.debug "callback()>> params: $params, params.code ${params.code}"
 
 	def code = params.code
 	def oauthState = params.state
@@ -135,7 +135,7 @@ def callback() {
 			scope: "read_station"
 		]
 
-		log.debug "TOKEN URL: ${getVendorTokenPath() + toQueryString(tokenParams)}"
+		// log.debug "TOKEN URL: ${getVendorTokenPath() + toQueryString(tokenParams)}"
 
 		def tokenUrl = getVendorTokenPath()
 		def params = [
@@ -144,7 +144,7 @@ def callback() {
 			body: tokenParams
 		]
 
-		log.debug "PARAMS: ${params}"
+		// log.debug "PARAMS: ${params}"
 
 		httpPost(params) { resp ->
 
@@ -156,7 +156,7 @@ def callback() {
 				state.refreshToken = data.refresh_token
 				state.authToken = data.access_token
 				state.tokenExpires = now() + (data.expires_in * 1000)
-				log.debug "swapped token: $resp.data"
+				// log.debug "swapped token: $resp.data"
 			}
 		}
 
@@ -292,7 +292,7 @@ def refreshToken() {
 
 			response.data.each {key, value ->
 				def data = slurper.parseText(key);
-				log.debug "Data: $data"
+				// log.debug "Data: $data"
 
 				state.refreshToken = data.refresh_token
 				state.accessToken = data.access_token

smartapps/resteele/monitor-on-sense.src/monitor-on-sense.groovy

@@ -17,7 +17,7 @@ definition(
     name: "Monitor on Sense",
     namespace: "resteele",
     author: "Rachel Steele",
-    description: "Turn on Monitor when vibration is sensed",
+    description: "Turn on switch when vibration is sensed",
     category: "My Apps",
     iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
     iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
@@ -25,10 +25,10 @@ definition(
 
 
 preferences {
-	section("When the keyboard is used...") {
+	section("When vibration is sensed...") {
 		input "accelerationSensor", "capability.accelerationSensor", title: "Which Sensor?"
 	}
-section("Turn on/off a light...") {
+section("Turn on switch...") {
 		input "switch1", "capability.switch"
 	}
 }
@@ -47,5 +47,3 @@ def updated() {
 def accelerationActiveHandler(evt) {
 		switch1.on()
 	}
-
-

smartapps/smartthings/beacon-control.src/beacon-control.groovy

@@ -114,13 +114,16 @@ def beaconHandler(evt) {
 
 	if (allOk) {
 		def data = new groovy.json.JsonSlurper().parseText(evt.data)
-		log.debug "<beacon-control> data: $data - phones: " + phones*.deviceNetworkId
+                // removed logging of device names. can be added back for debugging
+		//log.debug "<beacon-control> data: $data - phones: " + phones*.deviceNetworkId
 
 		def beaconName = getBeaconName(evt)
-		log.debug "<beacon-control> beaconName: $beaconName"
+                // removed logging of device names. can be added back for debugging
+		//log.debug "<beacon-control> beaconName: $beaconName"
 
 		def phoneName = getPhoneName(data)
-		log.debug "<beacon-control> phoneName: $phoneName"
+                // removed logging of device names. can be added back for debugging
+		//log.debug "<beacon-control> phoneName: $phoneName"
 		if (phoneName != null) {
             def action = data.presence == "1" ? "arrived" : "left"
             def msg = "$phoneName has $action ${action == 'arrived' ? 'at ' : ''}the $beaconName"

smartapps/smartthings/bon-voyage.src/bon-voyage.groovy

@@ -49,13 +49,15 @@ preferences {
 
 def installed() {
 	log.debug "Installed with settings: ${settings}"
-	log.debug "Current mode = ${location.mode}, people = ${people.collect{it.label + ': ' + it.currentPresence}}"
+        // commented out log statement because presence sensor label could contain user's name
+	//log.debug "Current mode = ${location.mode}, people = ${people.collect{it.label + ': ' + it.currentPresence}}"
 	subscribe(people, "presence", presence)
 }
 
 def updated() {
 	log.debug "Updated with settings: ${settings}"
-	log.debug "Current mode = ${location.mode}, people = ${people.collect{it.label + ': ' + it.currentPresence}}"
+        // commented out log statement because presence sensor label could contain user's name
+	//log.debug "Current mode = ${location.mode}, people = ${people.collect{it.label + ': ' + it.currentPresence}}"
 	unsubscribe()
 	subscribe(people, "presence", presence)
 }

smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy

@@ -20,6 +20,8 @@
  *      JLH - 02-15-2014 - Fuller use of ecobee API
  *      10-28-2015 DVCSMP-604 - accessory sensor, DVCSMP-1174, DVCSMP-1111 - not respond to routines
  */
+include 'asynchttp_v1'
+
 definition(
 		name: "Ecobee (Connect)",
 		namespace: "smartthings",
@@ -116,7 +118,6 @@ def callback() {
 	def oauthState = params.state
 
 	if (oauthState == atomicState.oauthInitState) {
-
 		def tokenParams = [
 			grant_type: "authorization_code",
 			code      : code,
@@ -129,9 +130,6 @@ def callback() {
 		httpPost(uri: tokenUrl) { resp ->
 			atomicState.refreshToken = resp.data.refresh_token
 			atomicState.authToken = resp.data.access_token
-			log.debug "swapped token: $resp.data"
-			log.debug "atomicState.refreshToken: ${atomicState.refreshToken}"
-			log.debug "atomicState.authToken: ${atomicState.authToken}"
 		}
 
 		if (atomicState.authToken) {
@@ -200,7 +198,6 @@ def connectionStatus(message, redirectUrl = null) {
                     .container {
                         width: 90%;
                         padding: 4%;
-                /*background: #eee;*/
                         text-align: center;
                     }
                     img {
@@ -237,19 +234,24 @@ def getEcobeeThermostats() {
 	log.debug "getting device list"
 	atomicState.remoteSensors = []
 
-	def requestBody = '{"selection":{"selectionType":"registered","selectionMatch":"","includeRuntime":true,"includeSensors":true}}'
+    def bodyParams = [
-
+        selection: [
+            selectionType: "registered",
+            selectionMatch: "",
+            includeRuntime: true,
+            includeSensors: true
+        ]
+    ]
 	def deviceListParams = [
 		uri: apiEndpoint,
 		path: "/1/thermostat",
 		headers: ["Content-Type": "text/json", "Authorization": "Bearer ${atomicState.authToken}"],
-			query: [format: 'json', body: requestBody]
+		query: [json: toJson(bodyParams)]
 	]
 
 	def stats = [:]
 	try {
 		httpGet(deviceListParams) { resp ->
-
 			if (resp.status == 200) {
 				resp.data.thermostatList.each { stat ->
 					atomicState.remoteSensors = atomicState.remoteSensors == null ? stat.remoteSensors : atomicState.remoteSensors <<  stat.remoteSensors
@@ -263,9 +265,8 @@ def getEcobeeThermostats() {
 	} catch (groovyx.net.http.HttpResponseException e) {
         log.trace "Exception polling children: " + e.response.data.status
         if (e.response.data.status.code == 14) {
-            atomicState.action = "getEcobeeThermostats"
             log.debug "Refreshing your auth_token!"
-            refreshAuthToken()
+            refreshAuthToken([async: false, nextAction: "getEcobeeThermostats"])
         }
     }
 	atomicState.thermostats = stats
@@ -289,8 +290,9 @@ Map sensorsDiscovered() {
 }
 
 def getThermostatDisplayName(stat) {
-	if(stat?.name)
+    if(stat?.name) {
         return stat.name.toString()
+    }
     return (getThermostatTypeName(stat) + " (${stat.identifier})").toString()
 }
 
@@ -310,7 +312,6 @@ def updated() {
 }
 
 def initialize() {
-
 	log.debug "initialize"
 	def devices = thermostats.collect { dni ->
 		def d = getChildDevice(dni)
@@ -350,24 +351,28 @@ def initialize() {
 	log.warn "delete: ${delete}, deleting ${delete.size()} thermostats"
 	delete.each { deleteChildDevice(it.deviceNetworkId) } //inherits from SmartApp (data-management)
 
-	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
 
-	pollHandler() //first time polling data data from thermostat
+	initialPoll() //first time polling data data from thermostat
 
 	//automatically update devices status every 5 mins
 	runEvery5Minutes("poll")
 
 }
 
-def pollHandler() {
+/**
-	log.debug "pollHandler()"
+ * Polls the child devices (synchronously).
-	pollChildren(null) // Hit the ecobee API for update on all thermostats
+ * This is used during app install/update, and is synchronous
+ * to maintain current behavior that will cause install/update to fail
+ * if polling fails.
+ */
+def initialPoll() {
+	log.debug "initialPoll()"
+	pollChildrenSync() // Hit the ecobee API for update on all thermostats
 
 	atomicState.thermostats.each {stat ->
 		def dni = stat.key
@@ -380,73 +385,41 @@ def pollHandler() {
 	}
 }
 
-def pollChildren(child = null) {
+/**
-	def thermostatIdsString = getChildDeviceIdsString()
+ * Polls Ecobee (asynchronously) for updated device state data.
+ * Called from within this Connect SmartApp as well as the child
+ * devices.
+ */
+def poll() {
+    log.debug "polling asynchronously"
+    asynchttp_v1.get('asyncPollResponseHandler', getPollParams())
+}
+
+/**
+ * Makes a (synchronous) request to the Ecobee API to get the data for the thermostats.
+ * This request is made synchronously here because it is called as part of the
+ * install/updated lifecycle, and changing it to asynchronous during the install/update
+ * lifecycle may change the behavior if there is an error in polling.
+ *
+ * If further analysis shows that polling can be done asynchronously during
+ * install/update without any adverse consequences, this should then be made
+ * asynchronous just as the scheduled polling is.
+ */
+def pollChildrenSync() {
     log.debug "polling children: $thermostatIdsString"
-	def data = ""
 
-	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + thermostatIdsString + '","includeExtendedRuntime":"true","includeSettings":"true","includeRuntime":"true","includeSensors":true}}'
+    def params = getPollParams()
+    params.query << ["Content-Type": "application/json"]
+
 	def result = false
-
+    log.debug "making synchronous poll request"
-	def pollParams = [
-			uri: apiEndpoint,
-			path: "/1/thermostat",
-			headers: ["Content-Type": "text/json", "Authorization": "Bearer ${atomicState.authToken}"],
-			query: [format: 'json', body: jsonRequestBody]
-	]
 
 	try{
-		httpGet(pollParams) { resp ->
+		httpGet(params) { resp ->
 			if(resp.status == 200) {
-				log.debug "poll results returned resp.data ${resp.data}"
                 atomicState.remoteSensors = resp.data.thermostatList.remoteSensors
-				atomicState.thermostatData = resp.data
                 updateSensorData()
-				atomicState.thermostats = resp.data.thermostatList.inject([:]) { collector, stat ->
+                storeThermostatData(resp.data.thermostatList)
-					def dni = [ app.id, stat.identifier ].join('.')
-
-					log.debug "updating dni $dni"
-
-					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),
-							heatingSetpoint: stat.runtime.desiredHeat / 10,
-							coolingSetpoint: stat.runtime.desiredCool / 10,
-							thermostatMode: stat.settings.hvacMode,
-							humidity: stat.runtime.actualHumidity,
-							thermostatFanMode: stat.runtime.desiredFanMode
-					]
-
-					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"
-					}
-
-					collector[dni] = [data:data]
-					return collector
-				}
                 result = true
                 log.debug "updated ${atomicState.thermostats?.size()} stats: ${atomicState.thermostats}"
             }
@@ -454,25 +427,88 @@ def pollChildren(child = null) {
 	} catch (groovyx.net.http.HttpResponseException e) {
 		log.trace "Exception polling children: " + e.response.data.status
         if (e.response.data.status.code == 14) {
-            atomicState.action = "pollChildren"
             log.debug "Refreshing your auth_token!"
-            refreshAuthToken()
+            refreshAuthToken([async: false, nextAction: "pollChildrenSync"])
         }
 	}
 	return result
 }
 
-// Poll Child is invoked from the Child Device itself as part of the Poll Capability
+/**
-def pollChild(){
+ * Response handler for asynchronous request to get thermostat data.
+ * Given a successful response, updates the sensor data, stores the thermostat
+ * data, and generates child device events.
+ *
+ * If the access token has expired, will issue a request to refresh the token
+ * (and pending successful token refresh, the poll request will be made again).
+ */
+def asyncPollResponseHandler(response, data) {
+    log.trace "async poll response handler"
+    if (!response.hasError()) {
+        if (response.status == 200) {
+            def json
+            try {
+                json = response.getJson()
+            } catch (e) {
+                log.error ("error parsing JSON", e)
+            }
+            if (json) {
+                atomicState.remoteSensors = json.thermostatList.remoteSensors
+                updateSensorData()
+                storeThermostatData(json.thermostatList)
+                generateChildThermostatEvent()
+            }
+        } else {
+            log.warn "Response returned non-200 response. Status: ${response.status}, data: ${response.getData()}"
+        }
+    } else {
+        log.trace "Exception polling children: ${response.getErrorMessage()}"
+        def errorJson
+        try {
+            errorJson = response.getErrorJson()
+        } catch (e) {
+            log.error("Unable to parse error json response", e)
+        }
+        if (errorJson?.status?.code == 14) {
+            log.debug "Refreshing your auth_token!"
+            refreshAuthToken([async: true, nextAction: "poll"])
+        } else {
+            log.warn "Error polling children that is not due to an expired token. Response: ${response.getErrorData()}"
+        }
+    }
+}
 
-	def devices = getChildDevices()
+private getPollParams() {
+    def thermostatIdsString = getChildDeviceIdsString()
+    def requestBody = [
+        selection: [
+            selectionType: "thermostats",
+            selectionMatch: thermostatIdsString,
+            includeExtendedRuntime: true,
+            includeSettings: true,
+            includeRuntime: true,
+            includeSensors: true
+        ]
+    ]
+    return [
+        uri: apiEndpoint,
+        path: "/1/thermostat",
+        headers: ["Authorization": "Bearer ${atomicState.authToken}"],
+        query: [json: toJson(requestBody)]
+    ]
+}
 
-	if (pollChildren()){
+/**
-		devices.each { child ->
+ * Calls each child thermostat device to generate an event with the thermostat
+ * data.
+ */
+def generateChildThermostatEvent() {
+    log.trace("generateChildThermostatEvent")
+    getChildDevices().each { child ->
         if (!child.device.deviceNetworkId.startsWith("ecobee_sensor")){
             if(atomicState.thermostats[child.device.deviceNetworkId] != null) {
                 def tData = atomicState.thermostats[child.device.deviceNetworkId]
-					log.info "pollChild(child)>> data for ${child.device.deviceNetworkId} : ${tData.data}"
+                log.debug "calling child.generateEvent($tData.data)"
                 child.generateEvent(tData.data) //parse received message from parent
             } else if(atomicState.thermostats[child.device.deviceNetworkId] == null) {
                 log.error "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId}"
@@ -480,48 +516,10 @@ def pollChild(){
             }
         }
     }
-	} else {
-		log.info "ERROR: pollChildren()"
-		return null
-	}
-
-}
-
-void poll() {
-	pollChild()
 }
 
 def availableModes(child) {
-
 	debugEvent ("atomicState.thermostats = ${atomicState.thermostats}")
-
-	debugEvent ("Child DNI = ${child.device.deviceNetworkId}")
-
-	def tData = atomicState.thermostats[child.device.deviceNetworkId]
-
-	debugEvent("Data = ${tData}")
-
-	if(!tData)
-	{
-		log.error "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId} after polling"
-
-		return null
-	}
-
-	def modes = ["off"]
-
-	if (tData.data.heatMode) modes.add("heat")
-	if (tData.data.coolMode) modes.add("cool")
-	if (tData.data.autoMode) modes.add("auto")
-	if (tData.data.auxHeatMode) modes.add("auxHeatOnly")
-
-	modes
-
-}
-
-def currentMode(child) {
-	debugEvent ("atomicState.Thermos = ${atomicState.thermostats}")
-
 	debugEvent ("Child DNI = ${child.device.deviceNetworkId}")
 
 	def tData = atomicState.thermostats[child.device.deviceNetworkId]
@@ -530,14 +528,42 @@ def currentMode(child) {
 
 	if(!tData) {
 		log.error "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId} after polling"
+		return null
+	}
 
+	def modes = ["off"]
 
+    if (tData.data.heatMode) {
+        modes.add("heat")
+    }
+    if (tData.data.coolMode) {
+        modes.add("cool")
+    }
+    if (tData.data.autoMode) {
+        modes.add("auto")
+    }
+    if (tData.data.auxHeatMode) {
+        modes.add("auxHeatOnly")
+    }
+
+    return modes
+}
+
+def currentMode(child) {
+	debugEvent ("atomicState.Thermos = ${atomicState.thermostats}")
+	debugEvent ("Child DNI = ${child.device.deviceNetworkId}")
+
+	def tData = atomicState.thermostats[child.device.deviceNetworkId]
+
+	debugEvent("Data = ${tData}")
+
+	if(!tData) {
+		log.error "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId} after polling"
 		return null
 	}
 
 	def mode = tData.data.thermostatMode
-
+	return mode
-	mode
 }
 
 def updateSensorData() {
@@ -558,12 +584,12 @@ def updateSensorData() {
 							}
 
 						}
-
 					} else if (it.type == "occupancy") {
-						if(it.value == "true")
+						if(it.value == "true") {
                             occupancy = "active"
-						else
+                        } else {
 							occupancy = "inactive"
+                        }
 					}
 				}
 				def dni = "ecobee_sensor-"+ it?.id + "-" + it?.code
@@ -582,144 +608,280 @@ def getChildDeviceIdsString() {
 }
 
 def toJson(Map m) {
-	return new org.json.JSONObject(m).toString()
+    return groovy.json.JsonOutput.toJson(m)
 }
 
 def toQueryString(Map m) {
 	return m.collect { k, v -> "${k}=${URLEncoder.encode(v.toString())}" }.sort().join("&")
 }
 
-private refreshAuthToken() {
+/**
-	log.debug "refreshing auth token"
+ * Uses the refresh token to get a new access token, then executes the nextAction.
-
+ * @param options - a map of options. valid options are async: true/false, which
+ *                  specifies if the refresh token request will be done asynchronously or not (default is false)
+ *                  nextAction: "nameOfMethod" specifies what method to execute after
+ *                  the token is refreshed (not required).
+ * (note: using a map as the parameter because we need to call it from a schedueled
+ * execution and we can only pass a data map to scheduled executions)
+ */
+private void refreshAuthToken(options) {
     if(!atomicState.refreshToken) {
-		log.warn "Can not refresh OAuth token since there is no refreshToken stored"
+		log.warn "Cannot 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],
         ]
+        if (options.async) {
+            refreshAuthTokenAsync(refreshParams, options.nextAction)
+        } else {
+            refreshAuthTokenSync(refreshParams, options.nextAction)
+        }
+    }
+}
 
-		log.debug refreshParams
+private void refreshAuthTokenSync(params, nextAction = null) {
-
-		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!"
-
                 debugEvent("Token refreshed ... calling saved RestAction now!")
-
+                saveTokenAndResumeAction(resp.data, nextAction)
-					log.debug resp
-
-					jsonMap = resp.data
-
-					if(resp.data) {
-
-						log.debug resp.data
-						debugEvent("Response = ${resp.data}")
-
-						atomicState.refreshToken = resp?.data?.refresh_token
-						atomicState.authToken = resp?.data?.access_token
-
-						debugEvent("Refresh Token = ${atomicState.refreshToken}")
-						debugEvent("OAUTH Token = ${atomicState.authToken}")
-
-						if(atomicState.action && atomicState.action != "") {
-							log.debug "Executing next action: ${atomicState.action}"
-
-							"${atomicState.action}"()
-
-							atomicState.action = ""
-						}
-
-					}
-					atomicState.action = ""
             }
         }
     } catch (groovyx.net.http.HttpResponseException e) {
         log.error "refreshAuthToken() >> Error: e.statusCode ${e.statusCode}"
-			def reAttemptPeriod = 300 // in sec
+        reauthTokenErrorHandler(e.statusCode)
-			if (e.statusCode != 401) { // this issue might comes from exceed 20sec app execution, connectivity issue etc.
+    }
-				runIn(reAttemptPeriod, "refreshAuthToken")
+}
-			} else if (e.statusCode == 401) { // unauthorized
+
+private void refreshAuthTokenAsync(refreshParams, nextAction = null) {
+    log.debug "making asynchronous refresh request"
+    asynchttp_v1.post('refreshTokenResponseHandler', refreshParams, [nextAction: nextAction])
+}
+
+/**
+ * The response handler for the request to refresh the authorization handler.
+ * Stores the new authorization token and refresh token, and executes any action
+ * (method) that failed due to the authorization token expiring.
+ */
+private void refreshTokenResponseHandler(response, data) {
+    if (!response.hasError()) {
+        if (response.status == 200) {
+            def json
+            try {
+            	json = response.getJson()
+            } catch (e) {
+            	log.error "error parsing json from response data: $response.data"
+            }
+            if (json) {
+                log.debug "asnyc refreshTokenHandler: Token refreshed...calling saved RestAction now!"
+                debugEvent("async Token refreshed ... calling saved RestAction now!")
+             	saveTokenAndResumeAction(json, data.nextAction)
+            } else {
+            	log.warn "successfully parsed json but result is empty or null"
+            }
+        } else {
+            log.debug "Non 200 response returned. Response code: ${response.code}, data: ${response.getData()}"
+        }
+    } else {
+        log.debug "async refreshTokenHandler: RESPONSE ERROR: ${response.getErrorJson()}"
+        reauthTokenErrorHandler(response.getErrorJson().code)
+    }
+}
+
+/**
+ * Retries refreshing the authorization token. Will attempt to get the refresh
+ * token later, in case there were errors retrieving it.
+ * Will retry a fixed number of times before sending a push notification to the
+ * user instructing them to reauthenticate
+ */
+private void reauthTokenErrorHandler(responseCode) {
+    def retryInterval = 300 // in seconds
+    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."
+    // might get non-401 error from exceeding 20 second app limit, connectivity issues, etc.
+    if (responseCode != 401) {
+        runIn(retryInterval, "refreshAuthToken", [async: true])
+    } else if (responseCode == 401) { // unauthorized
         atomicState.reAttempt = atomicState.reAttempt + 1
         log.warn "reAttempt refreshAuthToken to try = ${atomicState.reAttempt}"
         if (atomicState.reAttempt <= 3) {
-					runIn(reAttemptPeriod, "refreshAuthToken")
+            runIn(retryInterval, "refreshAuthToken", [async: true])
         } else {
             sendPushAndFeeds(notificationMessage)
             atomicState.reAttempt = 0
         }
     }
 }
+
+/**
+ * Saves the refresh and auth token from the passed-in JSON object,
+ * and invokes any previously executing action that did not complete due to
+ * an expired token.
+ *
+ * @param json - an object representing the parsed JSON response from Ecobee
+ */
+private void saveTokenAndResumeAction(json, String nextAction) {
+    def debugMessage = "token response, scope: ${json?.scope}, expires_in: ${json?.expires_in}, token_type: ${json?.token_type}"
+    log.debug "debugMessage"
+    if (json) {
+        debugEvent(debugMessage)
+        atomicState.refreshToken = json?.refresh_token
+        atomicState.authToken = json?.access_token
+        if (nextAction) {
+            log.debug "got refresh token, will execute next action (passed in!): $nextAction"
+            "$nextAction"()
+        }
+    } else {
+        log.warn "did not get response body from refresh token response"
     }
 }
 
-def resumeProgram(child, deviceId) {
+/**
-
+ * Executes the resume program command on the Ecobee thermostat
-
+ * @param deviceId - the ID of the device
-	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"functions": [{"type": "resumeProgram"}]}'
+ *
-	def result = sendJson(jsonRequestBody)
+ * @retrun true if the command was successful, false otherwise.
-	return result
+ */
+boolean resumeProgram(deviceId) {
+    def payload = [
+        selection: [
+            selectionType: "thermostats",
+            selectionMatch: deviceId,
+            includeRuntime: true
+        ],
+        functions: [
+            [
+                type: "resumeProgram"
+            ]
+        ]
+    ]
+    return sendCommandToEcobee(payload)
 }
 
-def setHold(child, heating, cooling, deviceId, sendHoldType) {
+/**
-
+ * Executes the set hold command on the Ecobee thermostat
-	int h = heating * 10
+ * @param heating - The heating temperature to set in fahrenheit
-	int c = cooling * 10
+ * @param cooling - the cooling temperature to set in fahrenheit
-	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"functions": [{ "type": "setHold", "params": { "coolHoldTemp": '+c+',"heatHoldTemp": '+h+', "holdType": '+sendHoldType+' } } ]}'
+ * @param deviceId - the ID of the device
-
+ * @param sendHoldType - the hold type to execute
-	def result = sendJson(child, jsonRequestBody)
+ *
-	return result
+ * @return true if the command was successful, false otherwise
-}
+ */
-
+boolean setHold(heating, cooling, deviceId, sendHoldType) {
-def setFanMode(child, heating, cooling, deviceId, sendHoldType, fanMode) {
+    // Ecobee requires that temp values be in fahrenheit multiplied by 10.
-
     int h = heating * 10
     int c = cooling * 10
 
+    def payload = [
+        selection: [
+            selectionType: "thermostats",
+            selectionMatch: deviceId,
+            includeRuntime: true
+        ],
+        functions: [
+            [
+                type: "setHold",
+                params: [
+                    coolHoldTemp: c,
+                    heatHoldTemp: h,
+                    holdType: sendHoldType
+                ]
+            ]
+        ]
+    ]
 
-	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"functions": [{ "type": "setHold", "params": { "coolHoldTemp": '+c+',"heatHoldTemp": '+h+', "holdType": '+sendHoldType+', "fan": '+fanMode+' } } ]}'
+    return sendCommandToEcobee(payload)
-	def result = sendJson(child, jsonRequestBody)
-	return result
 }
 
-def setMode(child, mode, deviceId) {
+/**
-	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"thermostat": {"settings":{"hvacMode":"'+"${mode}"+'"}}}'
+ * Executes the set fan mode command on the Ecobee thermostat
+ * @param heating - The heating temperature to set in fahrenheit
+ * @param cooling - the cooling temperature to set in fahrenheit
+ * @param deviceId - the ID of the device
+ * @param sendHoldType - the hold type to execute
+ * @param fanMode - the fan mode to set to
+ *
+ * @return true if the command was successful, false otherwise
+ */
+boolean setFanMode(heating, cooling, deviceId, sendHoldType, fanMode) {
+    // Ecobee requires that temp values be in fahrenheit multiplied by 10.
+    int h = heating * 10
+    int c = cooling * 10
 
-	def result = sendJson(jsonRequestBody)
+    def payload = [
-	return result
+        selection: [
+            selectionType: "thermostats",
+            selectionMatch: deviceId,
+            includeRuntime: true
+        ],
+        functions: [
+            [
+                type: "setHold",
+                params: [
+                    coolHoldTemp: c,
+                    heatHoldTemp: h,
+                    holdType: sendHoldType,
+                    fan: fanMode
+                ]
+            ]
+        ]
+    ]
+
+	return sendCommandToEcobee(payload)
 }
 
-def sendJson(child = null, String jsonBody) {
+/**
+ * Sets the mode of the Ecobee thermostat
+ * @param mode - the mode to set to
+ * @param deviceId - the ID of the device
+ *
+ * @return true if the command was successful, false otherwise
+ */
+boolean setMode(mode, deviceId) {
+    def payload = [
+        selection: [
+            selectionType: "thermostats",
+            selectionMatch: deviceId,
+            includeRuntime: true
+        ],
+        thermostat: [
+            settings: [
+                hvacMode: mode
+            ]
+        ]
+    ]
+	return sendCommandToEcobee(payload)
+}
 
-	def returnStatus = false
+/**
+ * Makes a request to the Ecobee API to actuate the thermostat.
+ * Used by command methods to send commands to Ecobee.
+ *
+ * @param bodyParams - a map of request parameters to send to Ecobee.
+ *
+ * @return true if the command was accepted by Ecobee without error, false otherwise.
+ */
+private boolean sendCommandToEcobee(Map bodyParams) {
+	def isSuccess = false
 	def cmdParams = [
 		uri: apiEndpoint,
 		path: "/1/thermostat",
 		headers: ["Content-Type": "application/json", "Authorization": "Bearer ${atomicState.authToken}"],
-			body: jsonBody
+		body: toJson(bodyParams)
 	]
 
 	try{
         httpPost(cmdParams) { resp ->
-
             if(resp.status == 200) {
-
+                def returnStatus = resp.data.status.code
-				log.debug "updated ${resp.data}"
+                if (returnStatus == 0) {
-				returnStatus = resp.data.status.code
-				if (resp.data.status.code == 0)
                     log.debug "Successful call to ecobee API."
-				else {
+                    isSuccess = true
-					log.debug "Error return code = ${resp.data.status.code}"
+                } else {
-					debugEvent("Error return code = ${resp.data.status.code}")
+                    log.debug "Error return code = ${returnStatus}"
+                    debugEvent("Error return code = ${returnStatus}")
                 }
             }
         }
@@ -727,33 +889,29 @@ def sendJson(child = null, String jsonBody) {
         log.trace "Exception Sending Json: " + e.response.data.status
         debugEvent ("sent Json & got http status ${e.statusCode} - ${e.response.data.status.code}")
         if (e.response.data.status.code == 14) {
-            atomicState.action = "pollChildren"
+            // TODO - figure out why we're setting the next action to be poll
+            // after refreshing auth token. Is it to keep UI in sync, or just copy/paste error?
             log.debug "Refreshing your auth_token!"
-            refreshAuthToken()
+            refreshAuthToken([async: true, nextAction: "poll"])
-        }
+        } else {
-        else {
             debugEvent("Authentication error, invalid authentication method, lack of credentials, etc.")
             log.error "Authentication error, invalid authentication method, lack of credentials, etc."
         }
     }
 
-	if (returnStatus == 0)
+    return isSuccess
-		return true
-	else
-		return false
 }
 
-def getChildName()           { "Ecobee Thermostat" }
+def getChildName()           { return "Ecobee Thermostat" }
-def getSensorChildName()     { "Ecobee Sensor" }
+def getSensorChildName()     { return "Ecobee Sensor" }
 def getServerUrl()           { return "https://graph.api.smartthings.com" }
 def getShardUrl()            { return getApiServerUrl() }
-def getCallbackUrl()        { "https://graph.api.smartthings.com/oauth/callback" }
+def getCallbackUrl()         { return "https://graph.api.smartthings.com/oauth/callback" }
-def getBuildRedirectUrl()   { "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${atomicState.accessToken}&apiServerUrl=${shardUrl}" }
+def getBuildRedirectUrl()    { return "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${atomicState.accessToken}&apiServerUrl=${shardUrl}" }
-def getApiEndpoint()        { "https://api.ecobee.com" }
+def getApiEndpoint()         { return "https://api.ecobee.com" }
-def getSmartThingsClientId() { appSettings.clientId }
+def getSmartThingsClientId() { return appSettings.clientId }
 
 def debugEvent(message, displayEvent = false) {
-
 	def results = [
 		name: "appdebug",
 		descriptionText: message,
@@ -761,11 +919,6 @@ def debugEvent(message, displayEvent = false) {
 	]
 	log.debug "Generating AppDebug Event: ${results}"
 	sendEvent (results)
-
-}
-
-def debugEventFromParent(child, message) {
-	if (child != null) { child.sendEvent("name":"debugEventFromParent", "value":message, "description":message, displayed: true, isStateChange: true)}
 }
 
 //send both push notification and mobile activity feeds
@@ -786,6 +939,58 @@ def sendPushAndFeeds(notificationMessage){
 	atomicState.authToken = null
 }
 
+/**
+ * Stores data about the thermostats in atomicState.
+ * @param thermostats - a list of thermostats as returned from the Ecobee API
+ */
+private void storeThermostatData(thermostats) {
+    log.trace "Storing thermostat data: $thermostats"
+    def data
+    atomicState.thermostats = thermostats.inject([:]) { collector, stat ->
+        def dni = [ app.id, stat.identifier ].join('.')
+        log.debug "updating dni $dni"
+
+        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),
+            heatingSetpoint: stat.runtime.desiredHeat / 10,
+            coolingSetpoint: stat.runtime.desiredCool / 10,
+            thermostatMode: stat.settings.hvacMode,
+            humidity: stat.runtime.actualHumidity,
+            thermostatFanMode: stat.runtime.desiredFanMode
+        ]
+        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"
+        }
+
+        collector[dni] = [data:data]
+        return collector
+    }
+    log.debug "updated ${atomicState.thermostats?.size()} thermostats: ${atomicState.thermostats}"
+}
+
 def sendActivityFeeds(notificationMessage) {
 	def devices = getChildDevices()
 	devices.each { child ->
@@ -793,14 +998,6 @@ def sendActivityFeeds(notificationMessage) {
 	}
 }
 
-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()
-}

smartapps/smartthings/energy-alerts.src/energy-alerts.groovy

@@ -64,10 +64,12 @@ def meterHandler(evt) {
     def lastValue = atomicState.lastValue as double
     atomicState.lastValue = meterValue
 
+    def dUnit ? evt.unit : "Watts"
+
     def aboveThresholdValue = aboveThreshold as int
     if (meterValue > aboveThresholdValue) {
     	if (lastValue < aboveThresholdValue) { // only send notifications when crossing the threshold
-		    def msg = "${meter} reported ${evt.value} ${evt.unit} which is above your threshold of ${aboveThreshold}."
+		    def msg = "${meter} reported ${evt.value} ${dUnit} which is above your threshold of ${aboveThreshold}."
     	    sendMessage(msg)
         } else {
 //        	log.debug "not sending notification for ${evt.description} because the threshold (${aboveThreshold}) has already been crossed"
@@ -78,7 +80,7 @@ def meterHandler(evt) {
     def belowThresholdValue = belowThreshold as int
     if (meterValue < belowThresholdValue) {
     	if (lastValue > belowThresholdValue) { // only send notifications when crossing the threshold
-		    def msg = "${meter} reported ${evt.value} ${evt.unit} which is below your threshold of ${belowThreshold}."
+		    def msg = "${meter} reported ${evt.value} ${dUnit} which is below your threshold of ${belowThreshold}."
     	    sendMessage(msg)
         } else {
 //        	log.debug "not sending notification for ${evt.description} because the threshold (${belowThreshold}) has already been crossed"

smartapps/smartthings/flood-alert.src/flood-alert.groovy

@@ -54,10 +54,10 @@ def waterWetHandler(evt) {
 	def alreadySentSms = recentEvents.count { it.value && it.value == "wet" } > 1
 
 	if (alreadySentSms) {
-		log.debug "SMS already sent to $phone within the last $deltaSeconds seconds"
+		log.debug "SMS already sent within the last $deltaSeconds seconds"
 	} else {
 		def msg = "${alarm.displayName} is wet!"
-		log.debug "$alarm is wet, texting $phone"
+		log.debug "$alarm is wet, texting phone number"
 
 		if (location.contactBookEnabled) {
 			sendNotificationToContacts(msg, recipients)

smartapps/smartthings/garage-door-monitor.src/garage-door-monitor.groovy

@@ -90,7 +90,7 @@ def takeAction(){
 }
 
 def sendTextMessage() {
-	log.debug "$multisensor was open too long, texting $phone"
+	log.debug "$multisensor was open too long, texting phone"
 
 	updateSmsHistory()
 	def openMinutes = maxOpenTime * (state.smsHistory?.size() ?: 1)

smartapps/smartthings/gentle-wake-up.src/gentle-wake-up.groovy

@@ -761,7 +761,7 @@ String displayableTime(timeRemaining) {
 		return "${minutes}:00"
 	}
 	def fraction = "0.${parts[1]}" as double
-	def seconds = "${60 * fraction as int}".padRight(2, "0")
+	def seconds = "${60 * fraction as int}".padLeft(2, "0")
 	return "${minutes}:${seconds}"
 }
 

smartapps/smartthings/greetings-earthling.src/greetings-earthling.groovy

@@ -47,13 +47,13 @@ preferences {
 
 def installed() {
 	log.debug "Installed with settings: ${settings}"
-	log.debug "Current mode = ${location.mode}, people = ${people.collect{it.label + ': ' + it.currentPresence}}"
+	// log.debug "Current mode = ${location.mode}, people = ${people.collect{it.label + ': ' + it.currentPresence}}"
 	subscribe(people, "presence", presence)
 }
 
 def updated() {
 	log.debug "Updated with settings: ${settings}"
-	log.debug "Current mode = ${location.mode}, people = ${people.collect{it.label + ': ' + it.currentPresence}}"
+	// log.debug "Current mode = ${location.mode}, people = ${people.collect{it.label + ': ' + it.currentPresence}}"
 	unsubscribe()
 	subscribe(people, "presence", presence)
 }
@@ -71,11 +71,10 @@ def presence(evt)
 			def person = getPerson(evt)
 			def recentNotPresent = person.statesSince("presence", t0).find{it.value == "not present"}
 			if (recentNotPresent) {
-				log.debug "skipping notification of arrival of ${person.displayName} because last departure was only ${now() - recentNotPresent.date.time} msec ago"
+				log.debug "skipping notification of arrival of Person because last departure was only ${now() - recentNotPresent.date.time} msec ago"
 			}
 			else {
 				def message = "${person.displayName} arrived at home, changing mode to '${newMode}'"
-				log.info message
 				send(message)
 				setLocationMode(newMode)
 			}
@@ -106,6 +105,4 @@ private send(msg) {
             sendSms(phone, msg)
         }
     }
-
-	log.debug msg
 }

smartapps/smartthings/habit-helper.src/habit-helper.groovy

@@ -57,12 +57,11 @@ def scheduleCheck()
 	def message = message1 ?: "SmartThings - Habit Helper Reminder!"
 
     if (location.contactBookEnabled) {
-        log.debug "Texting reminder: ($message) to contacts:${recipients?.size()}"
+        log.debug "Texting reminder to contacts:${recipients?.size()}"
         sendNotificationToContacts(message, recipients)
     }
     else {
-
+        log.debug "Texting reminder"
-        log.debug "Texting reminder: ($message) to $phone1"
         sendSms(phone1, message)
     }
 }

smartapps/smartthings/hue-connect.src/hue-connect.groovy

@@ -95,8 +95,7 @@ def bridgeDiscoveryFailed() {
 	}
 }
 
-def bridgeLinking()
+def bridgeLinking() {
-{
 	int linkRefreshcount = !state.linkRefreshcount ? 0 : state.linkRefreshcount as int
 	state.linkRefreshcount = linkRefreshcount + 1
 	def refreshInterval = 3
@@ -328,7 +327,7 @@ def bulbListHandler(hub, data = "") {
         def object = new groovy.json.JsonSlurper().parseText(data)
         object.each { k,v ->
             if (v instanceof Map)
-                bulbs[k] = [id: k, name: v.name, type: v.type, modelid: v.modelid, hub:hub]
+                bulbs[k] = [id: k, name: v.name, type: v.type, modelid: v.modelid, hub:hub, online: v.state?.reachable]
         }
     }
     def bridge = null
@@ -448,7 +447,6 @@ def addBridge() {
 					updateBridgeStatus(childDevice)
 					childDevice.sendEvent(name: "idNumber", value: idNumber)
 
-
 					if (vbridge.value.ip && vbridge.value.port) {
 						if (vbridge.value.ip.contains(".")) {
 							childDevice.sendEvent(name: "networkAddress", value: vbridge.value.ip + ":" +  vbridge.value.port)
@@ -649,8 +647,7 @@ def locationHandler(evt) {
             	}
             }
 		}
-	}
+	} else if (parsedEvent.headers && parsedEvent.body) {
-	else if (parsedEvent.headers && parsedEvent.body) {
 		log.trace "HUE BRIDGE RESPONSES"
 		def headerString = parsedEvent.headers.toString()
 		if (headerString?.contains("xml")) {
@@ -733,7 +730,7 @@ private void updateBridgeStatus(childDevice) {
 private void checkBridgeStatus() {
     def bridges = getHueBridges()
     // Check if each bridge has been heard from within the last 16 minutes (3 poll intervals times 5 minutes plus buffer)
-    def time = now() - (1000 * 60 * 16)
+    def time = now() - (1000 * 60 * 30)
     bridges.each {
         def d = getChildDevice(it.value.mac)
 	    if(d) {
@@ -746,6 +743,8 @@ private void checkBridgeStatus() {
 	        if (it.value.lastActivity < time) { // it.value.lastActivity != null &&
 	            log.warn "Bridge $it.key is Offline"
 	            d.sendEvent(name: "status", value: "Offline")
+                // set all lights to offline since bridge is not reachable
+                state.bulbs?.each {it.value.online = false}
 	        } else {
 				d.sendEvent(name: "status", value: "Online")//setOnline(false)
 	        }
@@ -785,8 +784,7 @@ def parse(childDevice, description) {
             if (body instanceof java.util.Map) {
                 // get (poll) reponse
                 return handlePoll(body)
-            }
+			} else {
-            else {
 				//put response
 				return handleCommandResponse(body)
             }
@@ -907,10 +905,14 @@ private handleCommandResponse(body) {
 	// send events for each update found above (order of events should be same as handlePoll())
 	updates.each { childDeviceNetworkId, params ->
 		def device = getChildDevice(childDeviceNetworkId)
+		def id = getId(device)
+		// If device is offline, then don't send events which will update device watch
+		if (isOnline(id)) {
 			sendBasicEvents(device, "on", params.on)
 			sendBasicEvents(device, "bri", params.bri)
 			sendColorEvents(device, params.xy, params.hue, params.sat, params.ct)
 		}
+	}
 	return []
 }
 
@@ -932,20 +934,26 @@ private handleCommandResponse(body) {
  * @return empty array
  */
 private handlePoll(body) {
-	if (state.updating) {
-		// If user just executed commands, then ignore poll to not confuse the turning on/off state
-		return []
-                }
-
 	def bulbs = getChildDevices()
 	for (bulb in body) {
 		def device = bulbs.find{it.deviceNetworkId == "${app.id}/${bulb.key}"}
 		if (device) {
 			if (bulb.value.state?.reachable) {
+				if (state.bulbs[bulb.key]?.online == false) {
+					// light just came back online, notify device watch
+					def lastActivity = now()
+					device.sendEvent(name: "deviceWatch-status", value: "ONLINE", description: "Last Activity is on ${new Date((long) lastActivity)}", displayed: false, isStateChange: true)
+				}
+				state.bulbs[bulb.key]?.online = true
+
+				// If user just executed commands, then do not send events to avoid confusing the turning on/off state
+				if (!state.updating) {
 					sendBasicEvents(device, "on", bulb.value?.state?.on)
 					sendBasicEvents(device, "bri", bulb.value?.state?.bri)
 					sendColorEvents(device, bulb.value?.state?.xy, bulb.value?.state?.hue, bulb.value?.state?.sat, bulb.value?.state?.ct, bulb.value?.state?.colormode)
+				}
 			} else {
+				state.bulbs[bulb.key]?.online = false
 				log.warn "$device is not reachable by Hue bridge"
 			}
 		}
@@ -980,22 +988,34 @@ def hubVerification(bodytext) {
 
 def on(childDevice) {
 	log.debug "Executing 'on'"
+	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
 	updateInProgress()
 	createSwitchEvent(childDevice, "on")
-	put("lights/${getId(childDevice)}/state", [on: true])
+	put("lights/$id/state", [on: true])
     return "Bulb is turning On"
 }
 
 def off(childDevice) {
 	log.debug "Executing 'off'"
+	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
 	updateInProgress()
 	createSwitchEvent(childDevice, "off")
-	put("lights/${getId(childDevice)}/state", [on: false])
+	put("lights/$id/state", [on: false])
     return "Bulb is turning Off"
 }
 
 def setLevel(childDevice, percent) {
 	log.debug "Executing 'setLevel'"
+	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
     updateInProgress()
 	// 1 - 254
     def level
@@ -1010,48 +1030,64 @@ def setLevel(childDevice, percent) {
 	// that means that the light will still be on when on is called next time
 	// Lets emulate that here
 	if (percent > 0) {
-		put("lights/${getId(childDevice)}/state", [bri: level, on: true])
+		put("lights/$id/state", [bri: level, on: true])
 	} else {
-		put("lights/${getId(childDevice)}/state", [on: false])
+		put("lights/$id/state", [on: false])
 	}
 	return "Setting level to $percent"
 }
 
 def setSaturation(childDevice, percent) {
 	log.debug "Executing 'setSaturation($percent)'"
+	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
+
 	updateInProgress()
 	// 0 - 254
 	def level = Math.min(Math.round(percent * 254 / 100), 254)
 	// TODO should this be done by app only or should we default to on?
 	createSwitchEvent(childDevice, "on")
-	put("lights/${getId(childDevice)}/state", [sat: level, on: true])
+	put("lights/$id/state", [sat: level, on: true])
 	return "Setting saturation to $percent"
 }
 
 def setHue(childDevice, percent) {
 	log.debug "Executing 'setHue($percent)'"
+	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
     updateInProgress()
 	// 0 - 65535
 	def level =	Math.min(Math.round(percent * 65535 / 100), 65535)
 	// TODO should this be done by app only or should we default to on?
 	createSwitchEvent(childDevice, "on")
-	put("lights/${getId(childDevice)}/state", [hue: level, on: true])
+	put("lights/$id/state", [hue: level, on: true])
 	return "Setting hue to $percent"
 }
 
 def setColorTemperature(childDevice, huesettings) {
 	log.debug "Executing 'setColorTemperature($huesettings)'"
+	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
     updateInProgress()
 	// 153 (6500K) to 500 (2000K)
 	def ct = hueSettings == 6500 ? 153 : Math.round(1000000/huesettings)
 	createSwitchEvent(childDevice, "on")
-	put("lights/${getId(childDevice)}/state", [ct: ct, on: true])
+	put("lights/$id/state", [ct: ct, on: true])
 	return "Setting color temperature to $percent"
 }
 
 def setColor(childDevice, huesettings) {
     log.debug "Executing 'setColor($huesettings)'"
-
+	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
     updateInProgress()
 
     def value = [:]
@@ -1108,15 +1144,23 @@ def setColor(childDevice, huesettings) {
         value.on = false
 
 	createSwitchEvent(childDevice, value.on ? "on" : "off")
-    put("lights/${getId(childDevice)}/state", value)
+    put("lights/$id/state", value)
 	return "Setting color to $value"
 }
 
+def ping(childDevice) {
+	if (isOnline(getId(childDevice))) {
+		childDevice.sendEvent(name: "deviceWatch-ping", value: "ONLINE", description: "Hue Light is reachable", displayed: false, isStateChange: true)
+		return "Device is Online"
+	} else {
+		return "Device is Offline"
+	}
+}
+
 private getId(childDevice) {
 	if (childDevice.device?.deviceNetworkId?.startsWith("HUE")) {
 		return childDevice.device?.deviceNetworkId[3..-1]
-	}
+	} else {
-	else {
 		return childDevice.device?.deviceNetworkId.split("/")[-1]
 	}
 }
@@ -1127,10 +1171,13 @@ private poll() {
 	log.debug "GET: $host$uri"
 	sendHubCommand(new physicalgraph.device.HubAction("""GET ${uri} HTTP/1.1
 HOST: ${host}
-
 """, physicalgraph.device.Protocol.LAN, selectedHue))
 }
 
+private isOnline(id) {
+	return (state.bulbs[id].online != null && state.bulbs[id].online) || state.bulbs[id].online == null
+}
+
 private put(path, body) {
 	def host = getBridgeIP()
 	def uri = "/api/${state.username}/$path"
@@ -1198,7 +1245,7 @@ def convertBulbListToMap() {
 		if (state.bulbs instanceof java.util.List) {
 			def map = [:]
 			state.bulbs.unique {it.id}.each { bulb ->
-				map << ["${bulb.id}":["id":bulb.id, "name":bulb.name, "type": bulb.type, "modelid": bulb.modelid, "hub":bulb.hub]]
+				map << ["${bulb.id}":["id":bulb.id, "name":bulb.name, "type": bulb.type, "modelid": bulb.modelid, "hub":bulb.hub, "online": bulb.online]]
 			}
 			state.bulbs = map
 		}

smartapps/smartthings/it-moved.src/it-moved.groovy

@@ -53,14 +53,14 @@ def accelerationActiveHandler(evt) {
 	def alreadySentSms = recentEvents.count { it.value && it.value == "active" } > 1
 
 	if (alreadySentSms) {
-		log.debug "SMS already sent to $phone1 within the last $deltaSeconds seconds"
+		log.debug "SMS already sent within the last $deltaSeconds seconds"
 	} else {
         if (location.contactBookEnabled) {
-            log.debug "$accelerationSensor has moved, texting contacts: ${recipients?.size()}"
+            log.debug "accelerationSensor has moved, texting contacts: ${recipients?.size()}"
             sendNotificationToContacts("${accelerationSensor.label ?: accelerationSensor.name} moved", recipients)
         }
         else {
-            log.debug "$accelerationSensor has moved, texting $phone1"
+            log.debug "accelerationSensor has moved, sending text message"
             sendSms(phone1, "${accelerationSensor.label ?: accelerationSensor.name} moved")
         }
 	}

smartapps/smartthings/its-too-hot.src/its-too-hot.groovy

@@ -69,10 +69,10 @@ def temperatureHandler(evt) {
 		def alreadySentSms = recentEvents.count { it.doubleValue >= tooHot } > 1
 
 		if (alreadySentSms) {
-			log.debug "SMS already sent to $phone1 within the last $deltaMinutes minutes"
+			log.debug "SMS already sent within the last $deltaMinutes minutes"
 			// TODO: Send "Temperature back to normal" SMS, turn switch off
 		} else {
-			log.debug "Temperature rose above $tooHot:  sending SMS to $phone1 and activating $mySwitch"
+			log.debug "Temperature rose above $tooHot:  sending SMS and activating $mySwitch"
 			def tempScale = location.temperatureScale ?: "F"
 			send("${temperatureSensor1.displayName} is too hot, reporting a temperature of ${evt.value}${evt.unit?:tempScale}")
 			switch1?.on()

smartapps/smartthings/lifx-connect.src/lifx-connect.groovy

@@ -51,8 +51,8 @@ def authPage() {
 		def description = "Tap to enter LIFX credentials"
 		def redirectUrl = "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${state.accessToken}&apiServerUrl=${apiServerUrl}" // this triggers oauthInit() below
 		// def redirectUrl = "${apiServerUrl}"
-        log.debug "app id: ${app.id}"
+		// log.debug "app id: ${app.id}"
-		log.debug "redirect url: ${redirectUrl}"
+		// log.debug "redirect url: ${redirectUrl}"s
 		return dynamicPage(name: "Credentials", title: "Connect to LIFX", nextPage: null, uninstall: true, install:true) {
 			section {
 				href(url:redirectUrl, required:true, title:"Connect to LIFX", description:"Tap here to connect your LIFX account")
@@ -372,7 +372,7 @@ def updateDevices() {
 		def childDevice = getChildDevice(device.id)
 		selectors.add("${device.id}")
 		if (!childDevice) {
-			log.info("Adding device ${device.id}: ${device.product}")
+			// log.info("Adding device ${device.id}: ${device.product}")
 			def data = [
 					label: device.label,
 					level: Math.round((device.brightness ?: 1) * 100),

smartapps/smartthings/presence-change-push.src/presence-change-push.groovy

@@ -41,10 +41,10 @@ def updated() {
 
 def presenceHandler(evt) {
 	if (evt.value == "present") {
-		log.debug "${presence.label ?: presence.name} has arrived at the ${location}"
+		// log.debug "${presence.label ?: presence.name} has arrived at the ${location}"
     	sendPush("${presence.label ?: presence.name} has arrived at the ${location}")
 	} else if (evt.value == "not present") {
-		log.debug "${presence.label ?: presence.name} has left the ${location}"
+		// log.debug "${presence.label ?: presence.name} has left the ${location}"
     	sendPush("${presence.label ?: presence.name} has left the ${location}")
 	}
 }

smartapps/smartthings/presence-change-text.src/presence-change-text.groovy

@@ -47,7 +47,7 @@ def updated() {
 
 def presenceHandler(evt) {
 	if (evt.value == "present") {
-		log.debug "${presence.label ?: presence.name} has arrived at the ${location}"
+		// log.debug "${presence.label ?: presence.name} has arrived at the ${location}"
 
         if (location.contactBookEnabled) {
             sendNotificationToContacts("${presence.label ?: presence.name} has arrived at the ${location}", recipients)
@@ -56,7 +56,7 @@ def presenceHandler(evt) {
             sendSms(phone1, "${presence.label ?: presence.name} has arrived at the ${location}")
         }
 	} else if (evt.value == "not present") {
-		log.debug "${presence.label ?: presence.name} has left the ${location}"
+		// log.debug "${presence.label ?: presence.name} has left the ${location}"
 
         if (location.contactBookEnabled) {
             sendNotificationToContacts("${presence.label ?: presence.name} has left the ${location}", recipients)

smartapps/smartthings/ridiculously-automated-garage-door.src/ridiculously-automated-garage-door.groovy

@@ -67,7 +67,7 @@ def updated() {
 }
 
 def subscribe() {
-	log.debug "present: ${cars.collect{it.displayName + ': ' + it.currentPresence}}"
+	// log.debug "present: ${cars.collect{it.displayName + ': ' + it.currentPresence}}"
 	subscribe(doorSensor, "contact", garageDoorContact)
 
 	subscribe(cars, "presence", carPresence)

smartapps/smartthings/smart-security.src/smart-security.groovy

@@ -71,7 +71,7 @@ def updated() {
 private subscribeToEvents()
 {
 	subscribe intrusionMotions, "motion", intruderMotion
-	subscribe residentMotions, "motion", residentMotion
+	// subscribe residentMotions, "motion", residentMotion
 	subscribe intrusionContacts, "contact", contact
 	subscribe alarms, "alarm", alarm
 	subscribe(app, appTouch)
@@ -156,6 +156,7 @@ def residentMotion(evt)
 	//    	startReArmSequence()
 	//    }
 	//}
+  unsubscribe(residentMotions)
 }
 
 def contact(evt)

smartapps/smartthings/text-me-when-it-opens.src/text-me-when-it-opens.groovy

@@ -48,7 +48,7 @@ def updated()
 
 def contactOpenHandler(evt) {
 	log.trace "$evt.value: $evt, $settings"
-	log.debug "$contact1 was opened, texting $phone1"
+  log.debug "$contact1 was opened, sending text"
     if (location.contactBookEnabled) {
         sendNotificationToContacts("Your ${contact1.label ?: contact1.name} was opened", recipients)
     }

smartapps/smartthings/text-me-when-theres-motion-and-im-not-here.src/text-me-when-theres-motion-and-im-not-here.groovy

@@ -60,14 +60,14 @@ def motionActiveHandler(evt) {
 		def alreadySentSms = recentEvents.count { it.value && it.value == "active" } > 1
 
 		if (alreadySentSms) {
-			log.debug "SMS already sent to $phone1 within the last $deltaSeconds seconds"
+			log.debug "SMS already sent within the last $deltaSeconds seconds"
 		} else {
             if (location.contactBookEnabled) {
                 log.debug "$motion1 has moved while you were out, sending notifications to: ${recipients?.size()}"
                 sendNotificationToContacts("${motion1.label} ${motion1.name} moved while you were out", recipients)
             }
             else {
-                log.debug "$motion1 has moved while you were out, texting $phone1"
+                log.debug "$motion1 has moved while you were out, sending text"
                 sendSms(phone1, "${motion1.label} ${motion1.name} moved while you were out")
             }
 		}

smartapps/smartthings/the-gun-case-moved.src/the-gun-case-moved.groovy

@@ -53,13 +53,13 @@ def accelerationActiveHandler(evt) {
 	def alreadySentSms = recentEvents.count { it.value && it.value == "active" } > 1
 
 	if (alreadySentSms) {
-		log.debug "SMS already sent to $phone1 within the last $deltaSeconds seconds"
+		log.debug "SMS already sent to phone within the last $deltaSeconds seconds"
 	} else {
         if (location.contactBookEnabled) {
             sendNotificationToContacts("Gun case has moved!", recipients)
         }
         else {
-            log.debug "$accelerationSensor has moved, texting $phone1"
+            log.debug "$accelerationSensor has moved, texting phone"
             sendSms(phone1, "Gun case has moved!")
         }
 	}

smartapps/smartthings/withings.src/withings.groovy

@@ -60,7 +60,7 @@ def authPage() {
 
 def oauthInitUrl() {
 	def token = getToken()
-	log.debug "initiateOauth got token: $token"
+	//log.debug "initiateOauth got token: $token"
 
 	// store these for validate after the user takes the oauth journey
 	state.oauth_request_token = token.oauth_token
@@ -76,7 +76,7 @@ def getToken() {
 	]
 	def requestTokenBaseUrl = "https://oauth.withings.com/account/request_token"
 	def url = buildSignedUrl(requestTokenBaseUrl, params)
-	log.debug "getToken - url: $url"
+	//log.debug "getToken - url: $url"
 
 	return getJsonFromUrl(url)
 }
@@ -182,7 +182,7 @@ def exchangeToken() {
 
 	def requestTokenBaseUrl = "https://oauth.withings.com/account/access_token"
 	def url = buildSignedUrl(requestTokenBaseUrl, params, tokenSecret)
-	log.debug "signed url: $url with secret $tokenSecret"
+	//log.debug "signed url: $url with secret $tokenSecret"
 
 	def token = getJsonFromUrl(url)
 
@@ -198,8 +198,8 @@ def exchangeToken() {
 
 def load() {
 	def json = get(getMeasurement(new Date() - 30))
-
+	// removed logging of actual json payload.  Can be put back for debugging
-	log.debug "swapped, then received: $json"
+	log.debug "swapped, then received json"
 	parse(data:json)
 
 	def html = """