Merge pull request #1199 from SmartThingsCommunity/staging

Rolling up staging to production for deploy

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

@@ -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, unit: temperatureScale, isStateChange: isChange, displayed: isDisplayed]
+				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, unit: temperatureScale, displayed: false]
+				event << [value: sendValue, 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(heatingValue, coolingValue, deviceId, sendHoldType)) {
+	if (parent.setHold(this, heatingValue, coolingValue, deviceId, sendHoldType)) {
-		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
+		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)
-		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint, "unit":location.temperatureScale)
+		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint)
 		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(heatingValue, coolingValue, deviceId, sendHoldType)) {
+	if (parent.setHold(this, heatingValue, coolingValue, deviceId, sendHoldType)) {
-		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
+		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)
-		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint, "unit":location.temperatureScale)
+		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint)
 		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(deviceId)) {
+	if (parent.resumeProgram(this, 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(deviceId)"
+		log.error "Error resumeProgram() check parent.resumeProgram(this, deviceId)"
 	}
 
 }
@@ -406,7 +406,7 @@ def generateOperatingStateEvent(operatingState) {
 def off() {
 	log.debug "off"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	if (parent.setMode ("off", deviceId))
+	if (parent.setMode (this,"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 ("heat", deviceId))
+	if (parent.setMode (this,"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 ("auxHeatOnly", deviceId))
+	if (parent.setMode (this,"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 ("cool", deviceId))
+	if (parent.setMode (this,"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 ("auto", deviceId))
+	if (parent.setMode (this,"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(heatingValue, coolingValue, deviceId, sendHoldType, fanMode)) {
+	if (parent.setFanMode(this, 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(heatingValue, coolingValue, deviceId, sendHoldType, fanMode)) {
+	if (parent.setFanMode(this, 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, "unit":location.temperatureScale)
+		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint )
 
 	}
 	else if (mode == "cool") {
 
-		sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint, "unit":location.temperatureScale)
+		sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint)
 
 	} else if (mode == "auto") {
 
@@ -573,7 +573,7 @@ def generateSetpointEvent() {
 
 	} else if (mode == "auxHeatOnly") {
 
-		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
+		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint)
 
 	}
 
@@ -608,7 +608,7 @@ void raiseSetpoint() {
 			targetvalue = maxCoolingSetpoint
 		}
 
-		sendEvent("name":"thermostatSetpoint", "value":targetvalue, "unit":location.temperatureScale, displayed: false)
+		sendEvent("name":"thermostatSetpoint", "value":targetvalue, 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, "unit":location.temperatureScale, displayed: false)
+		sendEvent("name":"thermostatSetpoint", "value":targetvalue, 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(heatingValue, coolingValue, deviceId, sendHoldType)) {
+	if (parent.setHold(this, heatingValue, coolingValue, deviceId, sendHoldType)) {
 		sendEvent("name": "thermostatSetpoint", "value": temp.value, displayed: false)
-		sendEvent("name": "heatingSetpoint", "value": targetHeatingSetpoint, "unit": location.temperatureScale)
+		sendEvent("name": "heatingSetpoint", "value": targetHeatingSetpoint)
-		sendEvent("name": "coolingSetpoint", "value": targetCoolingSetpoint, "unit": location.temperatureScale)
+		sendEvent("name": "coolingSetpoint", "value": targetCoolingSetpoint)
 		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,7 +16,6 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
-		capability "Health Check"
 
 		command "setAdjustedColor"
         command "reset"
@@ -56,10 +55,6 @@ 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"
@@ -171,7 +166,3 @@ def verifyPercent(percent) {
         return false
     }
 }
-
-def ping() {
-    log.debug "${parent.ping(this)}"
-}

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

@@ -72,7 +72,7 @@ def parse(description) {
 						log.info "Bridge response: $msg.body"
 					} else {
 						// Sending Bulbs List to parent"
-                        if (parent.state.inBulbDiscovery)
+						if (parent.isInBulbDiscovery())
 							log.info parent.bulbListHandler(device.hub.id, msg.body)
 					}
 				}

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

@@ -17,7 +17,6 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
-		capability "Health Check"
 
 		command "setAdjustedColor"
         command "reset"
@@ -65,10 +64,6 @@ 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"
@@ -187,7 +182,3 @@ def verifyPercent(percent) {
         return false
     }
 }
-
-def ping() {
-    log.trace "${parent.ping(this)}"
-}

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

@@ -14,7 +14,6 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
-        capability "Health Check"
 
         command "refresh"
 	}
@@ -49,10 +48,6 @@ 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"
@@ -92,7 +87,3 @@ 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,7 +15,6 @@ metadata {
         capability "Color Temperature"
         capability "Switch"
         capability "Refresh"
-        capability "Health Check"
 
         command "refresh"
     }
@@ -54,10 +53,6 @@ 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"
@@ -106,7 +101,3 @@ void refresh() {
     log.debug "Executing 'refresh'"
     parent.manualRefresh()
 }
-
-def ping() {
-    log.debug "${parent.ping(this)}"
-}

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

@@ -116,6 +116,7 @@ def callback() {
 	def oauthState = params.state
 
 	if (oauthState == atomicState.oauthInitState){
+
 		def tokenParams = [
 				grant_type: "authorization_code",
 				code      : code,
@@ -128,6 +129,9 @@ 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) {
@@ -196,6 +200,7 @@ def connectionStatus(message, redirectUrl = null) {
         .container {
                 width: 90%;
                 padding: 4%;
+                /*background: #eee;*/
                 text-align: center;
         }
         img {
@@ -232,26 +237,19 @@ def getEcobeeThermostats() {
 	log.debug "getting device list"
 	atomicState.remoteSensors = []
 
-    def bodyParams = [
+	def requestBody = '{"selection":{"selectionType":"registered","selectionMatch":"","includeRuntime":true,"includeSensors":true}}'
-        selection: [
+
-            selectionType: "registered",
-            selectionMatch: "",
-            includeRuntime: true,
-            includeSensors: true
-        ]
-    ]
 	def deviceListParams = [
 			uri: apiEndpoint,
 			path: "/1/thermostat",
 			headers: ["Content-Type": "text/json", "Authorization": "Bearer ${atomicState.authToken}"],
-        // TODO - the query string below is not consistent with the Ecobee docs:
+			query: [format: 'json', body: requestBody]
-        // https://www.ecobee.com/home/developer/api/documentation/v1/operations/get-thermostats.shtml
-		query: [format: 'json', body: 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
@@ -291,9 +289,8 @@ Map sensorsDiscovered() {
 }
 
 def getThermostatDisplayName(stat) {
-    if(stat?.name) {
+	if(stat?.name)
 		return stat.name.toString()
-    }
 	return (getThermostatTypeName(stat) + " (${stat.identifier})").toString()
 }
 
@@ -313,6 +310,7 @@ def updated() {
 }
 
 def initialize() {
+
 	log.debug "initialize"
 	def devices = thermostats.collect { dni ->
 		def d = getChildDevice(dni)
@@ -352,6 +350,8 @@ 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)
@@ -383,27 +383,16 @@ def pollHandler() {
 def pollChildren(child = null) {
 	def thermostatIdsString = getChildDeviceIdsString()
 	log.debug "polling children: $thermostatIdsString"
+	def data = ""
 
-    def requestBody = [
+	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + thermostatIdsString + '","includeExtendedRuntime":"true","includeSettings":"true","includeRuntime":"true","includeSensors":true}}'
-        selection: [
-            selectionType: "thermostats",
-            selectionMatch: thermostatIdsString,
-            includeExtendedRuntime: true,
-            includeSettings: true,
-            includeRuntime: true,
-            includeSensors: true
-        ]
-    ]
-
 	def result = false
 
 	def pollParams = [
 			uri: apiEndpoint,
 			path: "/1/thermostat",
 			headers: ["Content-Type": "text/json", "Authorization": "Bearer ${atomicState.authToken}"],
-        // TODO - the query string below is not consistent with the Ecobee docs:
+			query: [format: 'json', body: jsonRequestBody]
-        // https://www.ecobee.com/home/developer/api/documentation/v1/operations/get-thermostats.shtml
-        query: [format: 'json', body: toJson(requestBody)]
 	]
 
 	try{
@@ -411,8 +400,53 @@ def pollChildren(child = null) {
 			if(resp.status == 200) {
 				log.debug "poll results returned resp.data ${resp.data}"
 				atomicState.remoteSensors = resp.data.thermostatList.remoteSensors
+				atomicState.thermostatData = resp.data
 				updateSensorData()
-                storeThermostatData(resp.data.thermostatList)
+				atomicState.thermostats = resp.data.thermostatList.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
+				}
 				result = true
 				log.debug "updated ${atomicState.thermostats?.size()} stats: ${atomicState.thermostats}"
 			}
@@ -430,6 +464,7 @@ def pollChildren(child = null) {
 
 // Poll Child is invoked from the Child Device itself as part of the Poll Capability
 def pollChild(){
+
 	def devices = getChildDevices()
 
 	if (pollChildren()){
@@ -457,38 +492,36 @@ void poll() {
 }
 
 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) {
+	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) {
+	if (tData.data.heatMode) modes.add("heat")
-        modes.add("heat")
+	if (tData.data.coolMode) modes.add("cool")
-    }
+	if (tData.data.autoMode) modes.add("auto")
-    if (tData.data.coolMode) {
+	if (tData.data.auxHeatMode) modes.add("auxHeatOnly")
-        modes.add("cool")
+
-    }
+	modes
-    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]
@@ -497,11 +530,14 @@ def currentMode(child) {
 
 	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() {
@@ -522,12 +558,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
@@ -546,7 +582,7 @@ def getChildDeviceIdsString() {
 }
 
 def toJson(Map m) {
-    return groovy.json.JsonOutput.toJson(m)
+	return new org.json.JSONObject(m).toString()
 }
 
 def toQueryString(Map m) {
@@ -559,6 +595,7 @@ private refreshAuthToken() {
 	if(!atomicState.refreshToken) {
 		log.warn "Can not refresh OAuth token since there is no refreshToken stored"
 	} else {
+
 		def refreshParams = [
 				method: 'POST',
 				uri   : apiEndpoint,
@@ -566,15 +603,44 @@ private refreshAuthToken() {
 				query : [grant_type: 'refresh_token', code: "${atomicState.refreshToken}", client_id: smartThingsClientId],
 		]
 
+		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 ->
+
 				if(resp.status == 200) {
 					log.debug "Token refreshed...calling saved RestAction now!"
+
 					debugEvent("Token refreshed ... calling saved RestAction now!")
-					saveTokenAndResumeAction(resp.data)
+
+					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) {
@@ -596,174 +662,64 @@ private refreshAuthToken() {
 	}
 }
 
-/**
+def resumeProgram(child, deviceId) {
- * 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.
+	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"functions": [{"type": "resumeProgram"}]}'
- *
+	def result = sendJson(jsonRequestBody)
- * @param json - an object representing the parsed JSON response from Ecobee
+	return result
- */
-private void saveTokenAndResumeAction(json) {
-    log.debug "token response json: $json"
-    if (json) {
-        debugEvent("Response = $json")
-        atomicState.refreshToken = json?.refresh_token
-        atomicState.authToken = json?.access_token
-        if (atomicState.action) {
-            log.debug "got refresh token, executing next action: ${atomicState.action}"
-            "${atomicState.action}"()
-        }
-    } else {
-        log.warn "did not get response body from refresh token response"
-    }
-    atomicState.action = ""
 }
 
-/**
+def setHold(child, heating, cooling, deviceId, sendHoldType) {
- * Executes the resume program command on the Ecobee thermostat
+
- * @param deviceId - the ID of the device
+	int h = heating * 10
- *
+	int c = cooling * 10
- * @retrun true if the command was successful, false otherwise.
+	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"functions": [{ "type": "setHold", "params": { "coolHoldTemp": '+c+',"heatHoldTemp": '+h+', "holdType": '+sendHoldType+' } } ]}'
- */
+
-boolean resumeProgram(deviceId) {
+	def result = sendJson(child, jsonRequestBody)
-    def payload = [
+	return result
-        selection: [
-            selectionType: "thermostats",
-            selectionMatch: deviceId,
-            includeRuntime: true
-        ],
-        functions: [
-            [
-                type: "resumeProgram"
-            ]
-        ]
-    ]
-    return sendCommandToEcobee(payload)
 }
 
-/**
+def setFanMode(child, heating, cooling, deviceId, sendHoldType, fanMode) {
- * Executes the set hold 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
- *
- * @return true if the command was successful, false otherwise
- */
-boolean setHold(heating, cooling, deviceId, sendHoldType) {
-    // 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
-                ]
-            ]
-        ]
-    ]
 
-    return sendCommandToEcobee(payload)
+	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"functions": [{ "type": "setHold", "params": { "coolHoldTemp": '+c+',"heatHoldTemp": '+h+', "holdType": '+sendHoldType+', "fan": '+fanMode+' } } ]}'
+	def result = sendJson(child, jsonRequestBody)
+	return result
 }
 
-/**
+def setMode(child, mode, deviceId) {
- * Executes the set fan mode command on the Ecobee thermostat
+	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"thermostat": {"settings":{"hvacMode":"'+"${mode}"+'"}}}'
- * @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 payload = [
+	def result = sendJson(jsonRequestBody)
-        selection: [
+	return result
-            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: toJson(bodyParams)
+			body: jsonBody
 	]
 
 	try{
 		httpPost(cmdParams) { resp ->
+
 			if(resp.status == 200) {
+
 				log.debug "updated ${resp.data}"
-                def returnStatus = resp.data.status.code
+				returnStatus = resp.data.status.code
-                if (returnStatus == 0) {
+				if (resp.data.status.code == 0)
 					log.debug "Successful call to ecobee API."
-                    isSuccess = true
+				else {
-                } else {
+					log.debug "Error return code = ${resp.data.status.code}"
-                    log.debug "Error return code = ${returnStatus}"
+					debugEvent("Error return code = ${resp.data.status.code}")
-                    debugEvent("Error return code = ${returnStatus}")
 				}
 			}
 		}
@@ -771,30 +727,33 @@ private boolean sendCommandToEcobee(Map bodyParams) {
         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) {
-            // TODO - figure out why we're setting the next action to be pollChildren
-            // after refreshing auth token. Is it to keep UI in sync, or just copy/paste error?
             atomicState.action = "pollChildren"
             log.debug "Refreshing your auth_token!"
             refreshAuthToken()
-        } else {
+        }
+        else {
             debugEvent("Authentication error, invalid authentication method, lack of credentials, etc.")
             log.error "Authentication error, invalid authentication method, lack of credentials, etc."
         }
     }
 
-    return isSuccess
+	if (returnStatus == 0)
+		return true
+	else
+		return false
 }
 
-def getChildName()           { return "Ecobee Thermostat" }
+def getChildName()           { "Ecobee Thermostat" }
-def getSensorChildName()     { return "Ecobee Sensor" }
+def getSensorChildName()     { "Ecobee Sensor" }
 def getServerUrl()           { return "https://graph.api.smartthings.com" }
 def getShardUrl()            { return getApiServerUrl() }
-def getCallbackUrl()         { return "https://graph.api.smartthings.com/oauth/callback" }
+def getCallbackUrl()        { "https://graph.api.smartthings.com/oauth/callback" }
-def getBuildRedirectUrl()    { return "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${atomicState.accessToken}&apiServerUrl=${shardUrl}" }
+def getBuildRedirectUrl()   { "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${atomicState.accessToken}&apiServerUrl=${shardUrl}" }
-def getApiEndpoint()         { return "https://api.ecobee.com" }
+def getApiEndpoint()        { "https://api.ecobee.com" }
-def getSmartThingsClientId() { return appSettings.clientId }
+def getSmartThingsClientId() { appSettings.clientId }
 
 def debugEvent(message, displayEvent = false) {
+
 	def results = [
 			name: "appdebug",
 			descriptionText: message,
@@ -802,6 +761,11 @@ 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
@@ -822,58 +786,6 @@ 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 ->
@@ -881,6 +793,14 @@ 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/hue-connect.src/hue-connect.groovy

@@ -95,7 +95,8 @@ def bridgeDiscoveryFailed() {
 	}
 }
 
-def bridgeLinking() {
+def bridgeLinking()
+{
 	int linkRefreshcount = !state.linkRefreshcount ? 0 : state.linkRefreshcount as int
 	state.linkRefreshcount = linkRefreshcount + 1
 	def refreshInterval = 3
@@ -327,7 +328,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, online: v.state?.reachable]
+                bulbs[k] = [id: k, name: v.name, type: v.type, modelid: v.modelid, hub:hub]
         }
     }
     def bridge = null
@@ -447,6 +448,7 @@ 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)
@@ -647,7 +649,8 @@ 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")) {
@@ -730,7 +733,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 * 30)
+    def time = now() - (1000 * 60 * 16)
     bridges.each {
         def d = getChildDevice(it.value.mac)
 	    if(d) {
@@ -743,8 +746,6 @@ 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)
 	        }
@@ -757,6 +758,10 @@ def isValidSource(macAddress) {
 	return (vbridges?.find {"${it.value.mac}" == macAddress}) != null
 }
 
+def isInBulbDiscovery() {
+	return state.inBulbDiscovery
+}
+
 /////////////////////////////////////
 //CHILD DEVICE METHODS
 /////////////////////////////////////
@@ -780,7 +785,8 @@ def parse(childDevice, description) {
             if (body instanceof java.util.Map) {
                 // get (poll) reponse
                 return handlePoll(body)
-			} else {
+            }
+            else {
 				//put response
 				return handleCommandResponse(body)
             }
@@ -901,14 +907,10 @@ 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 []
                     }
 
@@ -930,26 +932,20 @@ 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"
                     }
                 }
@@ -984,34 +980,22 @@ 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/$id/state", [on: true])
+	put("lights/${getId(childDevice)}/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/$id/state", [on: false])
+	put("lights/${getId(childDevice)}/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
@@ -1026,64 +1010,48 @@ 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/$id/state", [bri: level, on: true])
+		put("lights/${getId(childDevice)}/state", [bri: level, on: true])
 	} else {
-		put("lights/$id/state", [on: false])
+		put("lights/${getId(childDevice)}/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/$id/state", [sat: level, on: true])
+	put("lights/${getId(childDevice)}/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/$id/state", [hue: level, on: true])
+	put("lights/${getId(childDevice)}/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/$id/state", [ct: ct, on: true])
+	put("lights/${getId(childDevice)}/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 = [:]
@@ -1140,23 +1108,15 @@ def setColor(childDevice, huesettings) {
         value.on = false
 
 	createSwitchEvent(childDevice, value.on ? "on" : "off")
-    put("lights/$id/state", value)
+    put("lights/${getId(childDevice)}/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]
 	}
 }
@@ -1167,11 +1127,8 @@ 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) {
+""", physicalgraph.device.Protocol.LAN, selectedHue))
-	return (state.bulbs[id].online != null && state.bulbs[id].online) || state.bulbs[id].online == null
 }
 
 private put(path, body) {
@@ -1241,7 +1198,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, "online": bulb.online]]
+				map << ["${bulb.id}":["id":bulb.id, "name":bulb.name, "type": bulb.type, "modelid": bulb.modelid, "hub":bulb.hub]]
 			}
 			state.bulbs = map
 		}

smartapps/smartthings/notify-me-when.src/notify-me-when.groovy

@@ -111,16 +111,23 @@ private sendMessage(evt) {
 	if (location.contactBookEnabled) {
 		sendNotificationToContacts(msg, recipients, options)
 	} else {
-		if (pushAndPhone != 'No') {
-			log.debug 'sending push'
-			options.method = 'push'
-			sendNotification(msg, options)
-		}
 		if (phone) {
 			options.phone = phone
-			log.debug 'sending SMS'
+			if (pushAndPhone != 'No') {
-			sendNotification(msg, options)
+				log.debug 'Sending push and SMS'
+				options.method = 'both'
+			} else {
+				log.debug 'Sending SMS'
+				options.method = 'phone'
 			}
+		} else if (pushAndPhone != 'No') {
+			log.debug 'Sending push'
+			options.method = 'push'
+		} else {
+			log.debug 'Sending nothing'
+			options.method = 'none'
+		}
+		sendNotification(msg, options)
 	}
 	if (frequency) {
 		state[evt.deviceId] = now()