MSA-1457: home

Rolling down staging hotfix to master

devicetypes/keen-home/keen-home-smart-vent.src/keen-home-smart-vent.groovy

@@ -274,6 +274,7 @@ private Map makeTemperatureResult(value) {
         name: 'temperature',
         value: "" + value,
         descriptionText: "${linkText} is ${value}°${temperatureScale}",
+        unit: temperatureScale
     ]
 }
 

devicetypes/plaidsystems/spruce-sensor.src/spruce-sensor.groovy

@@ -254,7 +254,8 @@ private Map getTemperatureResult(value) {
 	return [
 		name: 'temperature',
 		value: value,
-		descriptionText: descriptionText
+		descriptionText: descriptionText,
+		unit: temperatureScale
 	]
 }
 

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

@@ -22,7 +22,6 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
-		capability "Health Check"
 
 		attribute "tamper", "enum", ["detected", "clear"]
 		attribute "batteryStatus", "string"
@@ -328,9 +327,6 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 def configure() {
-	// allow device user configured or default 16 min to check in; double the periodic reporting interval
-	sendEvent(name: "checkInterval", value: 2* (timeOptionValueMap[reportInterval] ?: (2*8*60)), displayed: false)
-
 	// This sensor joins as a secure device if you double-click the button to include it
 	log.debug "${device.displayName} is configuring its settings"
 	def request = []

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

@@ -20,7 +20,6 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
-		capability "Health Check"
 
 		command "configureAfterSecure"
 
@@ -248,8 +247,6 @@ def configureAfterSecure() {
 def configure() {
 	// log.debug "configure()"
     //["delay 30000"] + secure(zwave.securityV1.securityCommandsSupportedGet())
-	// allow device 16 min to check in; double the periodic reporting interval
-	sendEvent(name: "checkInterval", value: 2*8*60, displayed: false)
 }
 
 private setConfigured() {

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

@@ -20,7 +20,6 @@ metadata {
 		capability "Illuminance Measurement"
 		capability "Sensor"
 		capability "Battery"
-		capability "Health Check"
 
 		fingerprint deviceId: "0x2001", inClusters: "0x30,0x31,0x80,0x84,0x70,0x85,0x72,0x86"
 	}
@@ -181,9 +180,6 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 def configure() {
-	// allow device 10 min to check in; double the periodic reporting interval
-	sendEvent(name: "checkInterval", value: 2*5*60, displayed: false)
-
 	delayBetween([
 		// send binary sensor report instead of basic set for motion
 		zwave.configurationV1.configurationSet(parameterNumber: 5, size: 1, scaledConfigurationValue: 2).format(),

devicetypes/smartthings/bose-soundtouch.src/bose-soundtouch.groovy

@@ -47,6 +47,9 @@ metadata {
 
         command "everywhereJoin"
         command "everywhereLeave"
+
+        command "forceOff"
+        command "forceOn"
     }
 
     /**
@@ -64,9 +67,9 @@ metadata {
     }
 
     standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
-        state "on", label: '${name}', action: "switch.off", icon: "st.Electronics.electronics16", backgroundColor: "#79b821", nextState:"turningOff"
+        state "on", label: '${name}', action: "forceOff", icon: "st.Electronics.electronics16", backgroundColor: "#79b821", nextState:"turningOff"
         state "turningOff", label:'TURNING OFF', icon:"st.Electronics.electronics16", backgroundColor:"#ffffff"
-        state "off", label: '${name}', action: "switch.on", icon: "st.Electronics.electronics16", backgroundColor: "#ffffff", nextState:"turningOn"
+        state "off", label: '${name}', action: "forceOn", icon: "st.Electronics.electronics16", backgroundColor: "#ffffff", nextState:"turningOn"
         state "turningOn", label:'TURNING ON', icon:"st.Electronics.electronics16", backgroundColor:"#79b821"
     }
     valueTile("1", "device.station1", decoration: "flat", canChangeIcon: false) {
@@ -140,8 +143,22 @@ metadata {
  * one place.
  *
  */
-def off() { onAction("off") }
-def on() { onAction("on") }
+def off() {
+    if (device.currentState("switch")?.value == "on") {
+        onAction("off")
+    }
+}
+def forceOff() {
+    onAction("off")
+}
+def on() {
+    if (device.currentState("switch")?.value == "off") {
+        onAction("on")
+    }
+}
+def forceOn() {
+    onAction("on")
+}
 def volup() { onAction("volup") }
 def voldown() { onAction("voldown") }
 def preset1() { onAction("1") }
@@ -240,11 +257,11 @@ def onAction(String user, data=null) {
     def actions = null
     switch (user) {
         case "on":
-            actions = boseSetPowerState(true)
+            boseSetPowerState(true)
             break
         case "off":
             boseSetNowPlaying(null, "STANDBY")
-            actions = boseSetPowerState(false)
+            boseSetPowerState(false)
             break
         case "volume":
             actions = boseSetVolume(data)

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

@@ -89,14 +89,17 @@ def parse(String description) {
 			log.debug "TEMP"
 			map.name = "temperature"
 			map.value = getTemperature(descMap.value)
+			map.unit = temperatureScale
 		} else if (descMap.cluster == "0201" && descMap.attrId == "0011") {
 			log.debug "COOLING SETPOINT"
 			map.name = "coolingSetpoint"
 			map.value = getTemperature(descMap.value)
+			map.unit = temperatureScale
 		} else if (descMap.cluster == "0201" && descMap.attrId == "0012") {
 			log.debug "HEATING SETPOINT"
 			map.name = "heatingSetpoint"
 			map.value = getTemperature(descMap.value)
+			map.unit = temperatureScale
 		} else if (descMap.cluster == "0201" && descMap.attrId == "001c") {
 			log.debug "MODE"
 			map.name = "thermostatMode"
@@ -169,7 +172,7 @@ def setHeatingSetpoint(degrees) {
 
 		def degreesInteger = Math.round(degrees)
 		log.debug "setHeatingSetpoint({$degreesInteger} ${temperatureScale})"
-		sendEvent("name": "heatingSetpoint", "value": degreesInteger)
+		sendEvent("name": "heatingSetpoint", "value": degreesInteger, "unit": temperatureScale)
 
 		def celsius = (getTemperatureScale() == "C") ? degreesInteger : (fahrenheitToCelsius(degreesInteger) as Double).round(2)
 		"st wattr 0x${device.deviceNetworkId} 1 0x201 0x12 0x29 {" + hex(celsius * 100) + "}"
@@ -180,7 +183,7 @@ def setCoolingSetpoint(degrees) {
 	if (degrees != null) {
 		def degreesInteger = Math.round(degrees)
 		log.debug "setCoolingSetpoint({$degreesInteger} ${temperatureScale})"
-		sendEvent("name": "coolingSetpoint", "value": degreesInteger)
+		sendEvent("name": "coolingSetpoint", "value": degreesInteger, "unit": temperatureScale)
 		def celsius = (getTemperatureScale() == "C") ? degreesInteger : (fahrenheitToCelsius(degreesInteger) as Double).round(2)
 		"st wattr 0x${device.deviceNetworkId} 1 0x201 0x11 0x29 {" + hex(celsius * 100) + "}"
 	}

devicetypes/smartthings/cree-bulb.src/.st-ignore

@@ -0,0 +1,2 @@
+.st-ignore
+README.md

devicetypes/smartthings/cree-bulb.src/README.md

@@ -0,0 +1,36 @@
+# Connected Cree LED Bulb
+
+
+
+Works with: 
+
+* [Connected Cree LED Bulb](https://support.smartthings.com/hc/en-us/articles/204258280-Cree-Connected-LED-Bulb)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+
+## Capabilities
+
+* **Actuator** - represents that a Device has commands
+* **Configuration** - _configure()_ command called when device is installed or device preferences updated
+* **Polling** - represents that poll() can be implemented for the device
+* **Refresh** - _refresh()_ command for status updates
+* **Switch** - can detect state (possible values: on/off)
+* **Switch Level** - represents current light level, usually 0-100 in percent
+* **Health Check** - indicates ability to get device health notifications
+
+## Device Health
+
+A Category C6 Connected Cree LED Bulb with maxReportTime of 10 min.
+Check-in interval is double the value of maxReportTime for Zigbee device. 
+This gives the device twice the amount of time to respond before it is marked as offline.
+Check-in interval = 2*10 = 20 min
+
+## Troubleshooting
+
+If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the device is out of range.
+Pairing needs to be tried again by placing the device closer to the hub.
+Instructions related to pairing, resetting and removing the device from SmartThings can be found in the following link:
+* [Cree Connected LED Bulb Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/204258280-Cree-Connected-LED-Bulb)

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

@@ -23,6 +23,7 @@ metadata {
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
+        capability "Health Check"
 
         fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019"
     }
@@ -66,6 +67,12 @@ def parse(String description) {
     def resultMap = zigbee.getEvent(description)
     if (resultMap) {
         sendEvent(resultMap)
+        // Temporary fix for the case when Device is OFFLINE and is connected again
+        if (state.lastActivity == null){
+            state.lastActivity = now()
+            sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+        }
+        state.lastActivity = now()
     }
     else {
         log.debug "DID NOT PARSE MESSAGE for description : $description"
@@ -85,6 +92,21 @@ def setLevel(value) {
     zigbee.setLevel(value) + ["delay 500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+
+    if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
+        log.info "ping, alive=no, lastActivity=${state.lastActivity}"
+        state.lastActivity = null
+        return zigbee.levelRefresh()
+    } else {
+        log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
+        sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+    }
+}
+
 def refresh() {
     zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig() + zigbee.levelConfig()
 }
@@ -95,5 +117,6 @@ def poll() {
 
 def configure() {
     log.debug "Configuring Reporting and Bindings."
+    sendEvent(name: "checkInterval", value: 1200, displayed: false, data: [protocol: "zigbee"])
     zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }

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, 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)) {
-		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)
-		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint)
+	if (parent.setHold(heatingValue, coolingValue, deviceId, sendHoldType)) {
+		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
+		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)) {
-		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)
-		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint)
+	if (parent.setHold(heatingValue, coolingValue, deviceId, sendHoldType)) {
+		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
+		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": "coolingSetpoint", "value": targetCoolingSetpoint)
+		sendEvent("name": "heatingSetpoint", "value": targetHeatingSetpoint, "unit": location.temperatureScale)
+		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/fidure-thermostat.src/fidure-thermostat.groovy

@@ -682,7 +682,7 @@ def setHeatingSetpoint(degrees) {
 	def temperatureScale = getTemperatureScale()
 
 	def degreesInteger = degrees as Integer
-	sendEvent("name":"heatingSetpoint", "value":degreesInteger)
+	sendEvent("name":"heatingSetpoint", "value":degreesInteger, "unit":temperatureScale)
 
 	def celsius = (getTemperatureScale() == "C") ? degreesInteger : (fahrenheitToCelsius(degreesInteger) as Double).round(2)
 	"st wattr 0x${device.deviceNetworkId} 1 0x201 0x12 0x29 {" + hex(celsius*100) + "}"
@@ -691,7 +691,7 @@ def setHeatingSetpoint(degrees) {
 
 def setCoolingSetpoint(degrees) {
 	def degreesInteger = degrees as Integer
-	sendEvent("name":"coolingSetpoint", "value":degreesInteger)
+	sendEvent("name":"coolingSetpoint", "value":degreesInteger, "unit":temperatureScale)
 	def celsius = (getTemperatureScale() == "C") ? degreesInteger : (fahrenheitToCelsius(degreesInteger) as Double).round(2)
 	"st wattr 0x${device.deviceNetworkId} 1 0x201 0x11 0x29 {" + hex(celsius*100) + "}"
 

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

@@ -28,8 +28,8 @@ metadata {
 			}
 			}
 		valueTile("doNotRemove", "v", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
-			state "default", label:'Do not remove'
-        }
+			state "default", label:'If removed, Hue lights will not work properly'
+		}
 		valueTile("idNumber", "device.idNumber", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
 			state "default", label:'ID: ${currentValue}'
 		}
@@ -38,7 +38,7 @@ metadata {
 		}
 
 		main (["rich-control"])
-		details(["rich-control", "idNumber", "networkAddress", "doNotRemove"])
+		details(["rich-control", "doNotRemove", "idNumber", "networkAddress"])
 	}
 }
 

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

@@ -13,6 +13,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 metadata {
 	definition (name: "NYCE Motion Sensor", namespace: "smartthings", author: "SmartThings") {
@@ -143,51 +144,14 @@ private Map parseReportAttributeMessage(String description) {
  
 
 private Map parseIasMessage(String description) {
-    List parsedMsg = description.split(' ')
-    String msgCode = parsedMsg[2]
-    
-    Map resultMap = [:]
-    switch(msgCode) {
-        case '0x0030': // Closed/No Motion/Dry
-            log.debug 'no motion'
-            resultMap.name = 'motion'
-            resultMap.value = 'inactive'
-            break
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
+	Map resultMap = [:]
 
-        case '0x0032': // Open/Motion/Wet
-            log.debug 'motion'
-            resultMap.name = 'motion'
-            resultMap.value = 'active'
-            break
+	resultMap.name = 'motion'
+	resultMap.value = zs.isAlarm2Set() ? 'active' : 'inactive'
+	log.debug(zs.isAlarm2Set() ? 'motion' : 'no motion')
 
-        case '0x0032': // Tamper Alarm
-        	log.debug 'motion with tamper alarm'
-            resultMap.name = 'motion'
-            resultMap.value = 'active'
-            break
-
-        case '0x0033': // Battery Alarm
-            break
-
-        case '0x0034': // Supervision Report
-        	log.debug 'no motion with tamper alarm'
-            resultMap.name = 'motion'
-            resultMap.value = 'inactive'
-            break
-
-        case '0x0035': // Restore Report
-            break
-
-        case '0x0036': // Trouble/Failure
-        	log.debug 'motion with failure alarm'
-            resultMap.name = 'motion'
-            resultMap.value = 'active'
-            break
-
-        case '0x0038': // Test Mode
-            break
-    }
-    return resultMap
+	return resultMap
 }
 
 def refresh()

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

@@ -13,7 +13,10 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
- 
+
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
+
+
 metadata {
 	definition (name: "NYCE Open/Closed Sensor", namespace: "smartthings", author: "NYCE") {
     	capability "Battery"
@@ -219,40 +222,33 @@ private Map parseReportAttributeMessage(String description) {
 }
 
 private List parseIasMessage(String description) {
-	List parsedMsg = description.split(" ")
-	String msgCode = parsedMsg[2]
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
+	log.debug "parseIasMessage: $description"
 
 	List resultListMap = []
 	Map resultMap_battery = [:]
 	Map resultMap_battery_state = [:]
 	Map resultMap_sensor = [:]
 
-	// Relevant bit field definitions from ZigBee spec
-	def BATTERY_BIT = ( 1 << 3 )
-	def TROUBLE_BIT = ( 1 << 6 )
-	def SENSOR_BIT = ( 1 << 0 )		// it's ALARM1 bit from the ZCL spec
-
-	// Convert hex string to integer
-	def zoneStatus = Integer.parseInt(msgCode[-4..-1],16)
-
-	log.debug "parseIasMessage: zoneStatus: ${zoneStatus}"
+	resultMap_sensor.name = "contact"
+	resultMap_sensor.value = zs.isAlarm1Set() ? "open" : "closed"
 
 	// Check each relevant bit, create map for it, and add to list
-	log.debug "parseIasMessage: Battery Status ${zoneStatus & BATTERY_BIT}"
-	log.debug "parseIasMessage: Trouble Status ${zoneStatus & TROUBLE_BIT}"
-	log.debug "parseIasMessage: Sensor Status ${zoneStatus & SENSOR_BIT}"
+	log.debug "parseIasMessage: Battery Status ${zs.battery}"
+	log.debug "parseIasMessage: Trouble Status ${zs.trouble}"
+	log.debug "parseIasMessage: Sensor Status ${zs.alarm1}"
 
 	/* 	Comment out this path to check the battery state to avoid overwriting the
 		battery value (Change log #2), but keep these conditions for later use
 	 resultMap_battery_state.name = "battery_state"
-	 if (zoneStatus & TROUBLE_BIT) {
+	 if (zs.isTroubleSet()) {
 		 resultMap_battery_state.value = "failed"
 
 		 resultMap_battery.name = "battery"
 		 resultMap_battery.value = 0
 	 }
 	 else {
-		 if (zoneStatus & BATTERY_BIT) {
+		 if (zs.isBatterySet()) {
 			 resultMap_battery_state.value = "low"
 
 			 // to generate low battery notification by the platform
@@ -270,9 +266,6 @@ private List parseIasMessage(String description) {
 	 }
 	*/
 
-	resultMap_sensor.name = "contact"
-	resultMap_sensor.value = (zoneStatus & SENSOR_BIT) ? "open" : "closed"
-
 	resultListMap << resultMap_battery_state
 	resultListMap << resultMap_battery
 	resultListMap << resultMap_sensor

devicetypes/smartthings/smartpower-outlet.src/.st-ignore

@@ -0,0 +1,2 @@
+.st-ignore
+README.md

devicetypes/smartthings/smartpower-outlet.src/README.md

@@ -0,0 +1,38 @@
+# SmartPower Outlet
+
+
+
+Works with: 
+
+* [Samsung SmartPower Outlet](https://shop.smartthings.com/#!/products/smartpower-outlet)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+
+## Capabilities
+
+* **Configuration** - _configure()_ command called when device is installed or device preferences updated
+* **Actuator** - represents that a Device has commands
+* **Switch** - can detect state (possible values: on/off)
+* **Refresh** - _refresh()_ command for status updates
+* **Power Meter** - detects power meter for device in either w or kw.
+* **Health Check** - indicates ability to get device health notifications
+* **Sensor** - detects sensor events
+
+## Device Health
+
+A Category C1 smart power outlet with maxReportTime of 10 min.
+Check-in interval is double the value of maxReportTime for Zigbee device. 
+This gives the device twice the amount of time to respond before it is marked as offline.
+Check-in interval = 2*10 = 20 min
+
+## Troubleshooting
+
+If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the device is out of range.
+Pairing needs to be tried again by placing the device closer to the hub.
+Instructions related to pairing, resetting and removing the device from SmartThings can be found in the following links
+for the different models:
+* [SmartPower Outlet Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/201084854-SmartPower-Outlet)
+* [Samsung SmartThings Outlet Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/205957620)

devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy

@@ -101,6 +101,12 @@ def parse(String description) {
 		else {
 			def descriptionText = finalResult.value == "on" ? '{{ device.displayName }} is On' : '{{ device.displayName }} is Off'
 			sendEvent(name: finalResult.type, value: finalResult.value, descriptionText: descriptionText, translatable: true)
+			// Temporary fix for the case when Device is OFFLINE and is connected again
+			if (state.lastActivity == null){
+				state.lastActivity = now()
+				sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+			}
+			state.lastActivity = now()
 		}
 	}
 	else {
@@ -116,13 +122,27 @@ def off() {
 def on() {
 	zigbee.on()
 }
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+
+	if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
+		log.info "ping, alive=no, lastActivity=${state.lastActivity}"
+		state.lastActivity = null
+		return zigbee.onOffRefresh()
+	} else {
+		log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
+		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+	}
+}
 
 def refresh() {
-	zigbee.onOffRefresh() + zigbee.refreshData("0x0B04", "0x050B")
+	zigbee.onOffRefresh() + zigbee.electricMeasurementPowerRefresh()
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 1200, displayed: false)
+	sendEvent(name: "checkInterval", value: 1200, displayed: false, data: [protocol: "zigbee"])
 	zigbee.onOffConfig() + powerConfig() + refresh()
 }
 

devicetypes/smartthings/smartsense-moisture-sensor.src/.st-ignore

@@ -0,0 +1,2 @@
+.st-ignore
+README.md

devicetypes/smartthings/smartsense-moisture-sensor.src/README.md

@@ -0,0 +1,44 @@
+# Smartsense Moisture Sensor
+
+
+
+Works with: 
+
+* [Samsung SmartThings Moisture Sensor](https://shop.smartthings.com/#!/products/samsung-smartthings-water-leak-sensor)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+* [Battery](#battery-specification)
+
+## Capabilities
+
+* **Configuration** - _configure()_ command called when device is installed or device preferences updated
+* **Battery** - defines device uses a battery
+* **Refresh** - _refresh()_ command for status updates
+* **Temperature Measurement** - defines device measures current temperature
+* **Water Sensor** - can detect presence of water (dry or wet)
+* **Health Check** - indicates ability to get device health notifications
+
+## Device Health
+
+A Category C2 moisture sensor with maxReportTime of 1 hr.
+Check-in interval is double the value of maxReportTime for Zigbee device. 
+This gives the device twice the amount of time to respond before it is marked as offline.
+Check-in interval = 2*60 = 120 min
+
+## Battery Specification
+
+One CR2 3V battery required.
+
+## Troubleshooting
+
+If the sensor doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
+Pairing needs to be tried again by placing the sensor closer to the hub.
+Instructions related to pairing, resetting and removing the different sensors from SmartThings can be found in the following links
+for the different models:
+* [SmartSense Moisture Sensor Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202847044-SmartSense-Moisture-Sensor)
+* [Samsung SmartThings Water Leak Sensor Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/205957630)
+Other troubleshooting tips are listed as follows:
+* [Troubleshooting: Samsung SmartThings Water Leak Sensor won’t pair after removing pull-tab](https://support.smartthings.com/hc/en-us/articles/204966616-Troubleshooting-Samsung-SmartThings-device-won-t-pair-after-removing-pull-tab)

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

@@ -13,6 +13,8 @@
  *  License for the specific language governing permissions and limitations
  *  under the License.
  */
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
+
 
 metadata {
 	definition (name: "SmartSense Moisture Sensor",namespace: "smartthings", author: "SmartThings", category: "C2") {
@@ -22,7 +24,7 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Water Sensor"
 		capability "Health Check"
-		capability "Sensor"		
+		capability "Sensor"
 
 		command "enrollResponse"
 
@@ -99,6 +101,13 @@ def parse(String description) {
 		map = parseIasMessage(description)
 	}
 
+	// Temporary fix for the case when Device is OFFLINE and is connected again
+	if (state.lastActivity == null){
+		state.lastActivity = now()
+		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+	}
+	state.lastActivity = now()
+
 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : null
 
@@ -170,42 +179,9 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-	List parsedMsg = description.split(' ')
-	String msgCode = parsedMsg[2]
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
 
-	Map resultMap = [:]
-	switch(msgCode) {
-		case '0x0020': // Closed/No Motion/Dry
-			resultMap = getMoistureResult('dry')
-			break
-
-		case '0x0021': // Open/Motion/Wet
-			resultMap = getMoistureResult('wet')
-			break
-
-		case '0x0022': // Tamper Alarm
-			break
-
-		case '0x0023': // Battery Alarm
-			break
-
-		case '0x0024': // Supervision Report
-			 log.debug 'dry with tamper alarm'
-			resultMap = getMoistureResult('dry')
-			break
-
-		case '0x0025': // Restore Report
-			log.debug 'water with tamper alarm'
-			resultMap = getMoistureResult('wet')
-			break
-
-		case '0x0026': // Trouble/Failure
-			break
-
-		case '0x0028': // Test Mode
-			break
-	}
-	return resultMap
+	return zs.isAlarm1Set() ? getMoistureResult('wet') : getMoistureResult('dry')
 }
 
 def getTemperature(value) {
@@ -283,7 +259,8 @@ private Map getTemperatureResult(value) {
 		name: 'temperature',
 		value: value,
 		descriptionText: descriptionText,
-        translatable: true
+		translatable: true,
+		unit: temperatureScale
 	]
 }
 
@@ -302,6 +279,21 @@ private Map getMoistureResult(value) {
 	]
 }
 
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+
+	if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
+		log.info "ping, alive=no, lastActivity=${state.lastActivity}"
+		state.lastActivity = null
+		return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
+	} else {
+		log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
+		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+	}
+}
+
 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
 	def refreshCmds = [
@@ -313,7 +305,7 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false)
+	sendEvent(name: "checkInterval", value: 14400, displayed: false, data: [protocol: "zigbee"])
 
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."

devicetypes/smartthings/smartsense-motion-sensor.src/README.md

@@ -9,7 +9,8 @@ Works with:
 ## Table of contents
 
 * [Capabilities](#capabilities)
-* [Health]($health)
+* [Health](#device-health)
+* [Battery](#battery-specification)
 
 ## Capabilities
 
@@ -21,10 +22,24 @@ Works with:
 
 ## Device Health
 
-A Category C2 motion sensor that has 120min check-in interval
-
-
+A Category C2 motion sensor with maxReportTime of 1 hr.
+Check-in interval is double the value of maxReportTime for Zigbee device. 
+This gives the device twice the amount of time to respond before it is marked as offline.
+Check-in interval = 2*60 = 120 min
 
+## Battery Specification
 
+One CR2477 (for Samsung SmartThings Motion Sensor) / CR123A (SmartSense Motion Sensor) 3V battery is required.
 
+## Troubleshooting
 
+If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
+Pairing needs to be tried again by placing the sensor closer to the hub.
+Instructions related to pairing, resetting and removing the different motion sensors from SmartThings can be found in the following links
+for the different models:
+* [SmartSense Motion Sensor (original model) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200903280-SmartSense-Motion-Sensor-original-model-)
+* [SmartSense Motion Sensor (2014 model) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/203077520-SmartSense-Motion-Sensor-2014-model-)
+* [Samsung SmartThings Motion Sensor (2015 model) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/205957580-Samsung-SmartThings-Motion-Sensor-2015-model-)
+Other troubleshooting tips are listed as follows:
+* [Troubleshooting: Samsung SmartThings Motion Sensor is stuck showing "Motion Detected" or "No Motion"](https://support.smartthings.com/hc/en-us/articles/200961130-Troubleshooting-Samsung-SmartThings-Motion-Sensor-is-stuck-showing-Motion-Detected-or-No-Motion-)
+* [Troubleshooting: Samsung SmartThings Motion Sensor won’t pair after removing pull-tab](https://support.smartthings.com/hc/en-us/articles/204966616-Troubleshooting-Samsung-SmartThings-device-won-t-pair-after-removing-pull-tab)

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

@@ -13,6 +13,8 @@
  *  License for the specific language governing permissions and limitations
  *  under the License.
  */
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
+
 
 metadata {
 	definition (name: "SmartSense Motion Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
@@ -22,7 +24,7 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Refresh"
 		capability "Health Check"
-		capability "Sensor"		
+		capability "Sensor"
 
 		command "enrollResponse"
 
@@ -103,6 +105,13 @@ def parse(String description) {
 		map = parseIasMessage(description)
 	}
 
+	// Temporary fix for the case when Device is OFFLINE and is connected again
+	if (state.lastActivity == null){
+		state.lastActivity = now()
+		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+	}
+	state.lastActivity = now()
+
 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : null
 
@@ -183,44 +192,10 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-	List parsedMsg = description.split(' ')
-	String msgCode = parsedMsg[2]
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
 
-	Map resultMap = [:]
-	switch(msgCode) {
-		case '0x0020': // Closed/No Motion/Dry
-			resultMap = getMotionResult('inactive')
-			break
-
-		case '0x0021': // Open/Motion/Wet
-			resultMap = getMotionResult('active')
-			break
-
-		case '0x0022': // Tamper Alarm
-			log.debug 'motion with tamper alarm'
-			resultMap = getMotionResult('active')
-			break
-
-		case '0x0023': // Battery Alarm
-			break
-
-		case '0x0024': // Supervision Report
-			log.debug 'no motion with tamper alarm'
-			resultMap = getMotionResult('inactive')
-			break
-
-		case '0x0025': // Restore Report
-			break
-
-		case '0x0026': // Trouble/Failure
-			log.debug 'motion with failure alarm'
-			resultMap = getMotionResult('active')
-			break
-
-		case '0x0028': // Test Mode
-			break
-	}
-	return resultMap
+	// Some sensor models that use this DTH use alarm1 and some use alarm2 to signify motion
+	return (zs.isAlarm1Set() || zs.isAlarm2Set()) ? getMotionResult('active') : getMotionResult('inactive')
 }
 
 def getTemperature(value) {
@@ -299,7 +274,8 @@ private Map getTemperatureResult(value) {
 		name: 'temperature',
 		value: value,
 		descriptionText: descriptionText,
-        translatable: true
+		translatable: true,
+		unit: temperatureScale
 	]
 }
 
@@ -314,6 +290,21 @@ private Map getMotionResult(value) {
 	]
 }
 
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+
+	if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
+		log.info "ping, alive=no, lastActivity=${state.lastActivity}"
+		state.lastActivity = null
+		return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
+	} else { 
+		log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
+		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+	}
+}
+
 def refresh() {
 	log.debug "refresh called"
 	def refreshCmds = [
@@ -325,7 +316,7 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false)
+	sendEvent(name: "checkInterval", value: 14400, displayed: false, data: [protocol: "zigbee"])
 
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."

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

@@ -15,6 +15,7 @@
  */
 
 //DEPRECATED - Using the smartsense-motion-sensor.groovy DTH for this device. Users need to be moved before deleting this DTH
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 metadata {
 	definition (name: "SmartSense Motion/Temp Sensor", namespace: "smartthings", author: "SmartThings") {
@@ -168,44 +169,8 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-    List parsedMsg = description.split(' ')
-    String msgCode = parsedMsg[2]
-
-    Map resultMap = [:]
-    switch(msgCode) {
-        case '0x0020': // Closed/No Motion/Dry
-        	resultMap = getMotionResult('inactive')
-            break
-
-        case '0x0021': // Open/Motion/Wet
-        	resultMap = getMotionResult('active')
-            break
-
-        case '0x0022': // Tamper Alarm
-        	log.debug 'motion with tamper alarm'
-        	resultMap = getMotionResult('active')
-            break
-
-        case '0x0023': // Battery Alarm
-            break
-
-        case '0x0024': // Supervision Report
-        	log.debug 'no motion with tamper alarm'
-        	resultMap = getMotionResult('inactive')
-            break
-
-        case '0x0025': // Restore Report
-            break
-
-        case '0x0026': // Trouble/Failure
-        	log.debug 'motion with failure alarm'
-        	resultMap = getMotionResult('active')
-            break
-
-        case '0x0028': // Test Mode
-            break
-    }
-    return resultMap
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
+	return zs.isAlarm1Set() ? getMotionResult('active') : getMotionResult('inactive')
 }
 
 def getTemperature(value) {
@@ -261,7 +226,8 @@ private Map getTemperatureResult(value) {
 	return [
 		name: 'temperature',
 		value: value,
-		descriptionText: descriptionText
+		descriptionText: descriptionText,
+		unit: temperatureScale
 	]
 }
 

devicetypes/smartthings/smartsense-multi-sensor.src/.st-ignore

@@ -0,0 +1,2 @@
+.st-ignore
+README.md

devicetypes/smartthings/smartsense-multi-sensor.src/README.md

@@ -0,0 +1,45 @@
+# Smartsense Multi Sensor
+
+
+
+Works with: 
+
+* [Samsung SmartThings Multi Sensor](https://shop.smartthings.com/#!/products/smartsense-multi)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+* [Battery](#battery-specification)
+
+## Capabilities
+
+* **Three Axis** - monitors the state of a single axis
+* **Configuration** - _configure()_ command called when device is installed or device preferences updated
+* **Battery** - defines device uses a battery
+* **Sensor** - detects sensor events
+* **Contact Sensor** - can detect contact (possible values: open,closed)
+* **Acceleration Sensor** - allows for acceleration detection.
+* **Refresh** - _refresh()_ command for status updates
+* **Temperature Measurement** - defines device measures current temperature
+* **Health Check** - indicates ability to get device health notifications
+
+## Device Health
+
+A Category C2 multi sensor with maxReportTime of 1 hr.
+Check-in interval is double the value of maxReportTime for Zigbee device. 
+This gives the device twice the amount of time to respond before it is marked as offline.
+Check-in interval = 2*60 = 120 min
+
+## Battery Specification
+
+One CR2450 (for Samsung SmartThings Multipurpose Sensor) battery / Two AAAA (for SmartSense Multi Sensor) batteries required.
+
+## Troubleshooting
+
+If the sensor doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
+Pairing needs to be tried again by placing the sensor closer to the hub.
+Other troubleshooting tips are listed as follows:
+* [Troubleshooting: Samsung SmartThings Multipurpose Sensor is stuck on "open" or "closed"](https://support.smartthings.com/hc/en-us/articles/200955940-Troubleshooting-Samsung-SmartThings-Multipurpose-Sensor-is-stuck-on-open-or-closed-)
+* [Troubleshooting: Temperature reading for the Samsung SmartThings Multipurpose Sensor is off](https://support.smartthings.com/hc/en-us/articles/200756845-Troubleshooting-Temperature-reading-for-the-Samsung-SmartThings-Multipurpose-Sensor-is-off)
+* [Troubleshooting: Samsung SmartThings Multipurpose Sensor won’t pair after removing pull-tab](https://support.smartthings.com/hc/en-us/articles/204966616-Troubleshooting-Samsung-SmartThings-device-won-t-pair-after-removing-pull-tab)

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

@@ -13,6 +13,7 @@
  *  License for the specific language governing permissions and limitations
  *  under the License.
  */
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 metadata {
 	definition (name: "SmartSense Multi Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
@@ -126,6 +127,13 @@ def parse(String description) {
 		map = parseIasMessage(description)
 	}
 
+	// Temporary fix for the case when Device is OFFLINE and is connected again
+	if (state.lastActivity == null){
+		state.lastActivity = now()
+		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+	}
+	state.lastActivity = now()
+
 	def result = map ? createEvent(map) : null
 
 	if (description?.startsWith('enroll request')) {
@@ -224,47 +232,13 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-	List parsedMsg = description.split(' ')
-	String msgCode = parsedMsg[2]
-
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
 	Map resultMap = [:]
-	switch(msgCode) {
-		case '0x0020': // Closed/No Motion/Dry
+
 			if (garageSensor != "Yes"){
-				resultMap = getContactResult('closed')
+		resultMap = zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
 			}
-		break
 
-		case '0x0021': // Open/Motion/Wet
-			if (garageSensor != "Yes"){
-				resultMap = getContactResult('open')
-			}
-		break
-
-		case '0x0022': // Tamper Alarm
-		break
-
-		case '0x0023': // Battery Alarm
-		break
-
-		case '0x0024': // Supervision Report
-			if (garageSensor != "Yes"){
-				resultMap = getContactResult('closed')
-			}
-		break
-
-		case '0x0025': // Restore Report
-			if (garageSensor != "Yes"){
-				resultMap = getContactResult('open')
-			}
-		break
-
-		case '0x0026': // Trouble/Failure
-		break
-
-		case '0x0028': // Test Mode
-		break
-	}
 	return resultMap
 }
 
@@ -359,10 +333,11 @@ private Map getTemperatureResult(value) {
 			'{{ device.displayName }} was {{ value }}°F'
 
 	return [
-	name: 'temperature',
-	value: value,
-	descriptionText: descriptionText,
-    translatable: true
+		name: 'temperature',
+		value: value,
+		descriptionText: descriptionText,
+		translatable: true,
+		unit: temperatureScale
 	]
 }
 
@@ -397,6 +372,21 @@ private getAccelerationResult(numValue) {
 	]
 }
 
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+
+	if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
+		log.info "ping, alive=no, lastActivity=${state.lastActivity}"
+		state.lastActivity = null
+		return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
+	} else {
+		log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
+		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+	}
+}
+
 def refresh() {
 	log.debug "Refreshing Values "
 
@@ -424,7 +414,7 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false)
+	sendEvent(name: "checkInterval", value: 14400, displayed: false, data: [protocol: "zigbee"])
 
 	log.debug "Configuring Reporting"
 

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

@@ -14,6 +14,7 @@
  *
  */
 //DEPRECATED - Using the smartsense-multi-sensor.groovy DTH for this device. Users need to be moved before deleting this DTH
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
  metadata {
  	definition (name: "SmartSense Open/Closed Accelerometer Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
@@ -172,40 +173,9 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-	List parsedMsg = description.split(' ')
-	String msgCode = parsedMsg[2]
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
 
-	Map resultMap = [:]
-	switch(msgCode) {
-        case '0x0020': // Closed/No Motion/Dry
-        resultMap = getContactResult('closed')
-        break
-
-        case '0x0021': // Open/Motion/Wet
-        resultMap = getContactResult('open')
-        break
-
-        case '0x0022': // Tamper Alarm
-        break
-
-        case '0x0023': // Battery Alarm
-        break
-
-        case '0x0024': // Supervision Report
-        resultMap = getContactResult('closed')
-        break
-
-        case '0x0025': // Restore Report
-        resultMap = getContactResult('open')
-        break
-
-        case '0x0026': // Trouble/Failure
-        break
-
-        case '0x0028': // Test Mode
-        break
-    }
-    return resultMap
+	return zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
 }
 
 def getTemperature(value) {
@@ -253,9 +223,10 @@ def getTemperature(value) {
 		}
 		def descriptionText = "${linkText} was ${value}°${temperatureScale}"
 		return [
-		name: 'temperature',
-		value: value,
-		descriptionText: descriptionText
+			name: 'temperature',
+			value: value,
+			descriptionText: descriptionText,
+			unit: temperatureScale
 		]
 	}
 

devicetypes/smartthings/smartsense-open-closed-sensor.src/.st-ignore

@@ -0,0 +1,2 @@
+.st-ignore
+README.md

devicetypes/smartthings/smartsense-open-closed-sensor.src/README.md

@@ -0,0 +1,41 @@
+# Smartsense Open/Closed Sensor
+
+
+
+Works with: 
+
+* [Samsung SmartThings Open/Closed Sensor](https://shop.smartthings.com/#!/packs/smartsense-open-closed-sensor/)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+* [Battery](#battery-specification)
+
+## Capabilities
+
+* **Configuration** - _configure()_ command called when device is installed or device preferences updated
+* **Battery** - defines device uses a battery
+* **Contact Sensor** - can detect contact (possible values: open,closed)
+* **Refresh** - _refresh()_ command for status updates
+* **Temperature Measurement** - defines device measures current temperature
+* **Health Check** - indicates ability to get device health notifications
+* **Sensor** - detects sensor events
+
+## Device Health
+
+A Category C2 open/closed sensor with maxReportTime of 1 hr.
+Check-in interval is double the value of maxReportTime for Zigbee device. 
+This gives the device twice the amount of time to respond before it is marked as offline.
+Check-in interval = 2*60 = 120 min
+
+## Battery Specification
+
+One CR2 3V battery required.
+
+## Troubleshooting
+
+If the sensor doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
+Pairing needs to be tried again by placing the sensor closer to the hub.
+Instructions related to pairing, resetting and removing the sensor from SmartThings can be found in the following link:
+* [SmartSense Open/Closed Sensor Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202836844-SmartSense-Open-Closed-Sensor)

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

@@ -13,6 +13,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 metadata {
 	definition (name: "SmartSense Open/Closed Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
@@ -91,6 +92,13 @@ def parse(String description) {
     	map = parseIasMessage(description)
     }
 
+	// Temporary fix for the case when Device is OFFLINE and is connected again
+	if (state.lastActivity == null){
+		state.lastActivity = now()
+		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+	}
+	state.lastActivity = now()
+
 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : null
 
@@ -167,40 +175,8 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-    List parsedMsg = description.split(' ')
-    String msgCode = parsedMsg[2]
-
-    Map resultMap = [:]
-    switch(msgCode) {
-        case '0x0020': // Closed/No Motion/Dry
-        	resultMap = getContactResult('closed')
-            break
-
-        case '0x0021': // Open/Motion/Wet
-        	resultMap = getContactResult('open')
-            break
-
-        case '0x0022': // Tamper Alarm
-            break
-
-        case '0x0023': // Battery Alarm
-            break
-
-        case '0x0024': // Supervision Report
-        	resultMap = getContactResult('closed')
-            break
-
-        case '0x0025': // Restore Report
-        	resultMap = getContactResult('open')
-            break
-
-        case '0x0026': // Trouble/Failure
-            break
-
-        case '0x0028': // Test Mode
-            break
-    }
-    return resultMap
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
+	return zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
 }
 
 def getTemperature(value) {
@@ -250,7 +226,8 @@ private Map getTemperatureResult(value) {
 	return [
 		name: 'temperature',
 		value: value,
-		descriptionText: descriptionText
+		descriptionText: descriptionText,
+		unit: temperatureScale
 	]
 }
 
@@ -265,6 +242,21 @@ private Map getContactResult(value) {
 	]
 }
 
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+
+	if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
+		log.info "ping, alive=no, lastActivity=${state.lastActivity}"
+		state.lastActivity = null
+		return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
+	} else {
+		log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
+		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+	}
+}
+
 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
 	def refreshCmds = [
@@ -276,7 +268,7 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false)
+	sendEvent(name: "checkInterval", value: 14400, displayed: false, data: [protocol: "zigbee"])
 
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."

devicetypes/smartthings/smartsense-temp-humidity-sensor.src/.st-ignore

@@ -0,0 +1,2 @@
+.st-ignore
+README.md

devicetypes/smartthings/smartsense-temp-humidity-sensor.src/README.md

@@ -0,0 +1,41 @@
+# SmartSense Temp/Humidity Sensor
+
+
+
+Works with: 
+
+* [Samsung SmartSense Temp/Humidity Sensor](https://shop.smartthings.com/#!/products/smartsense-temp-humidity-sensor)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+* [Battery](#battery-specification)
+
+## Capabilities
+
+* **Configuration** - _configure()_ command called when device is installed or device preferences updated
+* **Battery** - defines device uses a battery
+* **Relative Humidity Measurement** - defines device measures relative humidity
+* **Refresh** - _refresh()_ command for status updates
+* **Temperature Measurement** - defines device measures current temperature
+* **Health Check** - indicates ability to get device health notifications
+* **Sensor** - detects sensor events
+
+## Device Health
+
+A Category C2 SmartSense Temp/Humidity Sensor with maxReportTime of 1 hr.
+Check-in interval is double the value of maxReportTime for Zigbee device. 
+This gives the device twice the amount of time to respond before it is marked as offline.
+Check-in interval = 2*60 = 120 min
+
+## Battery Specification
+
+One CR2 battery is required.
+
+## Troubleshooting
+
+If the sensor doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
+Pairing needs to be tried by placing the sensor closer to the hub.
+Instructions related to pairing, resetting and removing the sensor from SmartThings can be found in the following link:
+* [Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/203040294)

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

@@ -83,6 +83,13 @@ def parse(String description) {
 		map = parseCustomMessage(description)
 	}
 
+	// Temporary fix for the case when Device is OFFLINE and is connected again
+	if (state.lastActivity == null){
+		state.lastActivity = now()
+		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+	}
+	state.lastActivity = now()
+
 	log.debug "Parse returned $map"
 	return map ? createEvent(map) : null
 }
@@ -226,7 +233,8 @@ private Map getTemperatureResult(value) {
 	return [
 		name: 'temperature',
 		value: value,
-		descriptionText: descriptionText
+		descriptionText: descriptionText,
+		unit: temperatureScale
 	]
 }
 
@@ -239,6 +247,20 @@ private Map getHumidityResult(value) {
 	]
 }
 
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+	if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
+		log.info "ping, alive=no, lastActivity=${state.lastActivity}"
+		state.lastActivity = null
+		return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
+	} else {
+		log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
+		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+	}
+}
+
 def refresh()
 {
 	log.debug "refresh temperature, humidity, and battery"
@@ -254,7 +276,7 @@ def refresh()
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false)
+	sendEvent(name: "checkInterval", value: 14400, displayed: false, data: [protocol: "zigbee"])
 
 	log.debug "Configuring Reporting and Bindings."
 	def configCmds = [

devicetypes/smartthings/tyco-door-window-sensor.src/tyco-door-window-sensor.groovy

@@ -13,6 +13,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 metadata {
 	definition (name: "Tyco Door/Window Sensor", namespace: "smartthings", author: "SmartThings") {
@@ -161,40 +162,9 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-    List parsedMsg = description.split(' ')
-    String msgCode = parsedMsg[2]
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
 
-    Map resultMap = [:]
-    switch(msgCode) {
-        case '0x0020': // Closed/No Motion/Dry
-        	resultMap = getContactResult('closed')
-            break
-
-        case '0x0021': // Open/Motion/Wet
-        	resultMap = getContactResult('open')
-            break
-
-        case '0x0022': // Tamper Alarm
-            break
-
-        case '0x0023': // Battery Alarm
-            break
-
-        case '0x0024': // Supervision Report
-        	resultMap = getContactResult('closed')
-            break
-
-        case '0x0025': // Restore Report
-        	resultMap = getContactResult('open')
-            break
-
-        case '0x0026': // Trouble/Failure
-            break
-
-        case '0x0028': // Test Mode
-            break
-    }
-    return resultMap
+	return zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
 }
 
 def getTemperature(value) {
@@ -243,7 +213,8 @@ private Map getTemperatureResult(value) {
 	return [
 		name: 'temperature',
 		value: value,
-		descriptionText: descriptionText
+		descriptionText: descriptionText,
+		unit: temperatureScale
 	]
 }
 

devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy

@@ -19,6 +19,7 @@ metadata {
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
+        capability "Health Check"
 
 
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008"
@@ -53,6 +54,12 @@ def parse(String description) {
 
     def event = zigbee.getEvent(description)
     if (event) {
+        // Temporary fix for the case when Device is OFFLINE and is connected again
+        if (state.lastActivity == null){
+            state.lastActivity = now()
+            sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+        }
+        state.lastActivity = now()
         if (event.name=="level" && event.value==0) {}
         else {
             sendEvent(event)
@@ -75,6 +82,20 @@ def on() {
 def setLevel(value) {
     zigbee.setLevel(value)
 }
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+
+    if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
+        log.info "ping, alive=no, lastActivity=${state.lastActivity}"
+        state.lastActivity = null
+        return zigbee.onOffRefresh()
+    } else {
+        log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
+        sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+    }
+}
 
 def refresh() {
     zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig() + zigbee.levelConfig()
@@ -82,5 +103,7 @@ def refresh() {
 
 def configure() {
     log.debug "Configuring Reporting and Bindings."
+    // Enrolls device to Device-Watch with 3 x Reporting interval 30min
+    sendEvent(name: "checkInterval", value: 1800, displayed: false, data: [protocol: "zigbee"])
     zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }

devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy

@@ -27,6 +27,7 @@ metadata {
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
+        capability "Health Check"
 
         attribute "colorName", "string"
         command "setGenericName"
@@ -84,6 +85,12 @@ def parse(String description) {
     def event = zigbee.getEvent(description)
     if (event) {
         log.debug event
+        // Temporary fix for the case when Device is OFFLINE and is connected again
+        if (state.lastActivity == null){
+            state.lastActivity = now()
+            sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+        }
+        state.lastActivity = now()
         if (event.name=="level" && event.value==0) {}
         else {
             if (event.name=="colorTemperature") {
@@ -119,13 +126,29 @@ def on() {
 def off() {
     zigbee.off()
 }
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+
+    if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
+        log.info "ping, alive=no, lastActivity=${state.lastActivity}"
+        state.lastActivity = null
+        return zigbee.onOffRefresh()
+    } else {
+        log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
+        sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+    }
+}
 
 def refresh() {
-    zigbee.readAttribute(0x0006, 0x00) + zigbee.readAttribute(0x0008, 0x00) + zigbee.readAttribute(0x0300, 0x00) + zigbee.readAttribute(0x0300, ATTRIBUTE_COLOR_TEMPERATURE) + zigbee.readAttribute(0x0300, ATTRIBUTE_HUE) + zigbee.readAttribute(0x0300, ATTRIBUTE_SATURATION) + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01)
+    zigbee.onOffRefresh() + zigbee.readAttribute(0x0008, 0x00) + zigbee.readAttribute(0x0300, 0x00) + zigbee.readAttribute(0x0300, ATTRIBUTE_COLOR_TEMPERATURE) + zigbee.readAttribute(0x0300, ATTRIBUTE_HUE) + zigbee.readAttribute(0x0300, ATTRIBUTE_SATURATION) + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01)
 }
 
 def configure() {
     log.debug "Configuring Reporting and Bindings."
+    // Enrolls device to Device-Watch with 3 x Reporting interval 30min
+    sendEvent(name: "checkInterval", value: 1800, displayed: false, data: [protocol: "zigbee"])
     zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01) + zigbee.readAttribute(0x0006, 0x00) + zigbee.readAttribute(0x0008, 0x00) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, 0x00) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 

devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy

@@ -22,6 +22,7 @@ metadata {
         capability "Actuator"
         capability "Color Temperature"
         capability "Configuration"
+        capability "Health Check"
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
@@ -35,6 +36,7 @@ metadata {
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Recessed Kit RT 5/6 Tunable White"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 TW", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic B40 TW - LIGHTIFY", deviceJoinName: "OSRAM LIGHTIFY Classic B40 Tunable White"
     }
 
     // UI tile definitions
@@ -72,6 +74,12 @@ def parse(String description) {
     log.debug "description is $description"
     def event = zigbee.getEvent(description)
     if (event) {
+        // Temporary fix for the case when Device is OFFLINE and is connected again
+        if (state.lastActivity == null){
+            state.lastActivity = now()
+            sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+        }
+        state.lastActivity = now()
         if (event.name=="level" && event.value==0) {}
         else {
             if (event.name=="colorTemperature") {
@@ -98,12 +106,29 @@ def setLevel(value) {
     zigbee.setLevel(value)
 }
 
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+
+    if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
+        log.info "ping, alive=no, lastActivity=${state.lastActivity}"
+        state.lastActivity = null
+        return zigbee.onOffRefresh()
+    } else {
+        log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
+        sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+    }
+}
+
 def refresh() {
     zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh() + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig()
 }
 
 def configure() {
     log.debug "Configuring Reporting and Bindings."
+    // Enrolls device to Device-Watch with 3 x Reporting interval 30min
+    sendEvent(name: "checkInterval", value: 1800, displayed: false, data: [protocol: "zigbee"])
     zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
 }
 

smartapps/jnewland/json-api.src/json-api.groovy

@@ -0,0 +1,145 @@
+/**
+ *  JSON
+ *
+ *  Copyright 2015 Jesse Newland
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ */
+definition(
+    name: "JSON API",
+    namespace: "jnewland",
+    author: "Jesse Newland",
+    description: "A JSON API for SmartThings",
+    category: "SmartThings Labs",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
+    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
+    oauth: true)
+
+
+def installed() {
+    initialize()
+}
+
+def updated() {
+    unsubscribe()
+    initialize()
+}
+
+def initialize() {
+    if (!state.accessToken) {
+        createAccessToken()
+    }
+}
+
+preferences {
+    page(name: "copyConfig")
+}
+
+def copyConfig() {
+    if (!state.accessToken) {
+        createAccessToken()
+    }
+    dynamicPage(name: "copyConfig", title: "Config", install:true) {
+        section("Select devices to include in the /devices API call") {
+            input "switches", "capability.switch", title: "Switches", multiple: true, required: false
+            input "hues", "capability.colorControl", title: "Hues", multiple: true, required: false
+        }
+
+        section() {
+            paragraph "View this SmartApp's configuration to use it in other places."
+            href url:"https://graph-eu01-euwest1.api.smartthings.com/api/smartapps/installations/${app.id}/config?access_token=${state.accessToken}", style:"embedded", required:false, title:"Config", description:"Tap, select, copy, then click \"Done\""
+        }
+
+        section() {
+            href url:"https://graph-eu01-euwest1.api.smartthings.com/api/smartapps/installations/${app.id}/devices?access_token=${state.accessToken}", style:"embedded", required:false, title:"Debug", description:"View accessories JSON"
+        }
+    }
+}
+
+def renderConfig() {
+    def configJson = new groovy.json.JsonOutput().toJson([
+        description: "JSON API",
+        platforms: [
+            [
+                platform: "SmartThings",
+                name: "SmartThings",
+                app_id:        app.id,
+                access_token:  state.accessToken
+            ]
+        ],
+    ])
+
+    def configString = new groovy.json.JsonOutput().prettyPrint(configJson)
+    render contentType: "text/plain", data: configString
+}
+
+def deviceCommandMap(device, type) {
+  device.supportedCommands.collectEntries { command->
+      def commandUrl = "https://graph-eu01-euwest1.api.smartthings.com/api/smartapps/installations/${app.id}/${type}/${device.id}/command/${command.name}?access_token=${state.accessToken}"
+      [
+        (command.name): commandUrl
+      ]
+  }
+}
+
+def authorizedDevices() {
+    [
+        switches: switches,
+        hues: hues
+    ]
+}
+
+def renderDevices() {
+    def deviceData = authorizedDevices().collectEntries { devices->
+        [
+            (devices.key): devices.value.collect { device->
+                [
+                    name: device.displayName,
+                    commands: deviceCommandMap(device, devices.key)
+                ]
+            }
+        ]
+    }
+    def deviceJson    = new groovy.json.JsonOutput().toJson(deviceData)
+    def deviceString  = new groovy.json.JsonOutput().prettyPrint(deviceJson)
+    render contentType: "application/json", data: deviceString
+}
+
+def deviceCommand() {
+  def device  = authorizedDevices()[params.type].find { it.id == params.id }
+  def command = params.command
+  if (!device) {
+      httpError(404, "Device not found")
+  } else {
+      if (params.value) {
+        device."$command"(params.value)
+      } else {
+        device."$command"()
+      }
+  }
+}
+
+mappings {
+    if (!params.access_token || (params.access_token && params.access_token != state.accessToken)) {
+        path("/devices")                      { action: [GET: "authError"] }
+        path("/config")                       { action: [GET: "authError"] }
+        path("/:type/:id/command/:command")   { action: [PUT: "authError"] }
+    } else {
+        path("/devices")                      { action: [GET: "renderDevices"]  }
+        path("/config")                       { action: [GET: "renderConfig"]  }
+        path("/:type/:id/command/:command")   { action: [PUT: "deviceCommand"] }
+    }
+}
+
+def authError() {
+    [error: "Permission denied"]
+}

smartapps/juano2310/jawbone-button-notifier.src/jawbone-button-notifier.groovy

@@ -62,7 +62,7 @@ def initialize() {
 }
 
 def sendit(evt) {
-	log.debug "$evt.value: $evt, $settings"
+	log.debug "$evt.value: $evt"
 	sendMessage()
 }
 
@@ -80,6 +80,6 @@ def sendMessage() {
         sendSms phone3, msg
     }
     if (!phone1 && !phone2 && !phone3) {
-    	sendPush msg    
+    	sendPush msg
     }
 }

smartapps/mangioneimagery/medicine-management-contact-sensor.src/medicine-management-contact-sensor.groovy

@@ -0,0 +1,188 @@
+/**
+ *  Medicine Management - Contact Sensor
+ *
+ *  Copyright 2016 Jim Mangione
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ * Logic: 
+ * --- Send notification at the medicine reminder time IF draw wasn't alread opened in past 60 minutes
+ * --- If draw still isn't open 10 minutes AFTER reminder time, LED will turn RED.
+ * --- ----- Once draw IS open, LED will return back to it's original color
+ *
+ */
+import groovy.time.TimeCategory 
+
+definition(
+    name: "Medicine Management - Contact Sensor",
+    namespace: "MangioneImagery",
+    author: "Jim Mangione",
+    description: "This supports devices with capabilities of ContactSensor and ColorControl (LED). It sends an in-app and ambient light notification if you forget to open the drawer or cabinet where meds are stored. A reminder will be set to a single time per day. If the draw or cabinet isn't opened within 60 minutes of that reminder, an in-app message will be sent. If the draw or cabinet still isn't opened after an additional 10 minutes, then an LED light turns red until the draw or cabinet is opened",
+    category: "Health & Wellness",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
+    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
+
+
+preferences {
+
+	section("My Medicine Draw/Cabinet"){
+		input "deviceContactSensor", "capability.contactSensor", title: "Opened Sensor" 
+	} 
+
+    section("Remind me to take my medicine at"){
+        input "reminderTime", "time", title: "Time"
+    }
+    
+    // NOTE: Use REAL device - virtual device causes compilation errors
+    section("My LED Light"){
+    	input "deviceLight", "capability.colorControl", title: "Smart light"
+    }
+
+}
+
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+	
+	initialize()
+}
+
+def updated() {
+	log.debug "Updated with settings: ${settings}"
+
+	unsubscribe()
+        
+	initialize()
+}
+
+def initialize() {
+
+    // will stop LED notification incase it was set by med reminder
+    subscribe(deviceContactSensor, "contact", contactHandler)
+
+    // how many minutes to look in the past from the reminder time, for an open draw
+    state.minutesToCheckOpenDraw = 60
+    
+    // is true when LED notification is set after exceeding 10 minutes past reminder time
+    state.ledNotificationTriggered = false
+    
+    // Set a timer to run once a day to notify if draw wasn't opened yet
+    schedule(reminderTime, checkOpenDrawInPast)
+   
+}
+
+// Should turn off any LED notification on OPEN state
+def contactHandler(evt){
+	if (evt.value == "open") {
+        // if LED notification triggered, reset it.
+        log.debug "Cabinet opened"
+        if (state.ledNotificationTriggered) {
+            resetLEDNotification()
+        }
+	}
+}
+
+// If the draw was NOT opened within 60 minutes of the timer send notification out.
+def checkOpenDrawInPast(){
+	log.debug "Checking past 60 minutes of activity from $reminderTime"
+    
+    // check activity of sensor for past 60 minutes for any OPENED status
+    def cabinetOpened = isOpened(state.minutesToCheckOpenDraw)
+	log.debug "Cabinet found opened: $cabinetOpened"
+    
+    // if it's opened, then do nothing and assume they took their meds
+    if (!cabinetOpened) {    
+    	sendNotification("Hi, please remember to take your meds in the cabinet")
+       
+       // if no open activity, send out notification and set new reminder    
+        def reminderTimePlus10 = new Date(now() + (10 * 60000))
+
+        // needs to be scheduled if draw wasn't already opened
+        runOnce(reminderTimePlus10, checkOpenDrawAfterReminder)
+    }
+}
+
+// If the draw was NOT opened after 10 minutes past reminder, use LED notification
+def checkOpenDrawAfterReminder(){
+	log.debug "Checking additional 10 minutes of activity from $reminderTime"
+    
+    // check activity of sensor for past 10 minutes for any OPENED status
+    def cabinetOpened = isOpened(10)    
+    
+   	log.debug "Cabinet found opened: $cabinetOpened"
+        
+    // if no open activity, blink lights
+    if (!cabinetOpened) {
+    	log.debug "Set LED to Notification color"
+        setLEDNotification()
+    }
+    
+}
+
+// Helper function for sending out an app notification
+def sendNotification(msg){
+        log.debug "Message Sent: $msg"
+        sendPush(msg)
+}
+
+// Check if the sensor has been opened since the minutes entered
+// Return true if opened found, else false.
+def isOpened(minutes){
+    // query last X minutes of activity log    
+    def previousDateTime = new Date(now() - (minutes * 60000))
+    
+    // capture all events recorded
+    def evts = deviceContactSensor.eventsSince(previousDateTime)   
+    def cabinetOpened = false
+    if (evts.size() > 0) {
+        evts.each{
+            if(it.value == "open") {
+                cabinetOpened = true 
+            }
+        }
+	}
+    
+    return cabinetOpened
+}
+
+// Saves current color and sets the light to RED
+def setLEDNotification(){
+
+	state.ledNotificationTriggered = true
+    
+	// turn light back off when reset is called if it was originally off
+ 	state.ledState = deviceLight.currentValue("switch")
+
+	// set light to RED and store original color until stopped    
+    state.origColor = deviceLight.currentValue("hue")
+    deviceLight.on()
+    deviceLight.setHue(100)
+    
+    log.debug "LED set to RED. Original color stored: $state.origColor"
+
+}
+
+// Sets the color back to the original saved color
+def resetLEDNotification(){
+
+	state.ledNotificationTriggered = false
+    
+    // return color to original
+    log.debug "Reset LED color to: $state.origColor"
+    if (state.origColor != null) {
+    	deviceLight.setHue(state.origColor)
+    }
+    
+    // if the light was turned on just for the notification, turn it back off now
+    if (state.ledState == "off") {
+    	deviceLight.off()
+    }
+
+}

smartapps/mangioneimagery/medicine-management-temp-motion.src/medicine-management-temp-motion.groovy

@@ -0,0 +1,189 @@
+/**
+ *  Medicine Management - Temp-Motion
+ *
+ *  Copyright 2016 Jim Mangione
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ * Logic: 
+ * --- If temp > threshold set, send notification
+ * --- Send in-app notification at the medicine reminder time if no motion is detected in past 60 minutes
+ * --- If motion still isn't detected 10 minutes AFTER reminder time, LED will turn RED
+ * --- ----- Once motion is detected, LED will turn back to it's original color
+ */
+import groovy.time.TimeCategory 
+
+definition(
+    name: "Medicine Management - Temp-Motion",
+    namespace: "MangioneImagery",
+    author: "Jim Mangione",
+    description: "This only supports devices with capabilities TemperatureMeasurement, AccelerationSensor and ColorControl (LED). Supports two use cases. First, will notifies via in-app if the fridge where meds are stored exceeds a temperature threshold set in degrees. Secondly, sends an in-app and ambient light notification if you forget to take your meds by sensing movement of the medicine box in the fridge. A reminder will be set to a single time per day. If the box isn't moved within 60 minutes of that reminder, an in-app message will be sent. If the box still isn't moved after an additional 10 minutes, then an LED light turns red until the box is moved",
+    category: "Health & Wellness",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
+    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
+
+
+preferences {
+ 
+     section("My Medicine in the Refrigerator"){
+		input "deviceAccelerationSensor", "capability.accelerationSensor", required: true, multiple: false, title: "Movement"
+        input "deviceTemperatureMeasurement", "capability.temperatureMeasurement", required: true, multiple: false, title: "Temperature"
+	} 
+
+	section("Temperature Threshold"){
+    	input "tempThreshold", "number", title: "Temperature Threshold"
+    }
+
+    section("Remind me to take my medicine at"){
+        input "reminderTime", "time", title: "Time"
+    }
+    
+    // NOTE: Use REAL device - virtual device causes compilation errors
+    section("My LED Light"){
+    	input "deviceLight", "capability.colorControl", title: "Smart light"
+    }    
+
+}
+
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+	
+	initialize()
+}
+
+def updated() {
+	log.debug "Updated with settings: ${settings}"
+
+	unsubscribe()
+        
+	initialize()
+}
+
+def initialize() {
+	// will notify when temp exceeds max
+    subscribe(deviceTemperatureMeasurement, "temperature", tempHandler)
+
+    // will stop LED notification incase it was set by med reminder
+    subscribe(deviceAccelerationSensor, "acceleration.active", motionHandler)
+    
+    // how many minutes to look in the past from the reminder time
+    state.minutesToCheckPriorToReminder = 60
+    
+    // Set a timer to run once a day to notify if draw wasn't opened yet
+    schedule(reminderTime, checkMotionInPast)
+}
+
+
+// If temp > 39 then send an app notification out.
+def tempHandler(evt){
+	if (evt.doubleValue > tempThreshold) {
+    	log.debug "Fridge temp of $evt.value exceeded threshold"
+   		sendNotification("WARNING: Fridge temp is $evt.value with threshold of $tempThreshold")
+	}
+}
+
+// Should turn off any LED notification once motion detected
+def motionHandler(evt){
+    // always call out to stop any possible LED notification
+	log.debug "Medication moved. Send stop LED notification"
+    resetLEDNotification()
+}
+
+// If no motion detected within 60 minutes of the timer send notification out.
+def checkMotionInPast(){
+	log.debug "Checking past 60 minutes of activity from $reminderTime"
+    
+    // check activity of sensor for past 60 minutes for any OPENED status
+    def movement = isMoved(state.minutesToCheckPriorToReminder)
+	log.debug "Motion found: $movement"
+    
+    // if there was movement, then do nothing and assume they took their meds
+    if (!movement) {    
+    	sendNotification("Hi, please remember to take your meds in the fridge")
+    
+        // if no movement, send out notification and set new reminder    
+        def reminderTimePlus10 = new Date(now() + (10 * 60000))
+
+        // needs to be scheduled if draw wasn't already opened
+        runOnce(reminderTimePlus10, checkMotionAfterReminder)
+    }
+}
+
+// If still no movement after 10 minutes past reminder, use LED notification
+def checkMotionAfterReminder(){
+	log.debug "Checking additional 10 minutes of activity from $reminderTime"
+    
+    // check activity of sensor for past 10 minutes for any OPENED status
+    def movement = isMoved(10)    
+    
+   	log.debug "Motion found: $movement"
+        
+    // if no open activity, blink lights
+    if (!movement) {
+    	log.debug "Notify LED API"
+        setLEDNotification()
+    }
+    
+}
+
+// Helper function for sending out an app notification
+def sendNotification(msg){
+        log.debug "Message Sent: $msg"
+        sendPush(msg)
+}
+
+// Check if the accelerometer has been activated since the minutes entered
+// Return true if active, else false.
+def isMoved(minutes){
+    // query last X minutes of activity log    
+    def previousDateTime = new Date(now() - (minutes * 60000))
+    
+    // capture all events recorded
+    def evts = deviceAccelerationSensor.eventsSince(previousDateTime)   
+    def motion = false
+    if (evts.size() > 0) {
+        evts.each{
+            if(it.value == "active") {
+                motion = true 
+            }
+        }
+	}
+    
+    return motion
+}
+
+// Saves current color and sets the light to RED
+def setLEDNotification(){
+
+	// turn light back off when reset is called if it was originally off
+ 	state.ledState = deviceLight.currentValue("switch")
+
+	// set light to RED and store original color until stopped    
+    state.origColor = deviceLight.currentValue("hue")
+    deviceLight.on()
+    deviceLight.setHue(100)
+    
+    log.debug "LED set to RED. Original color stored: $state.origColor"
+
+}
+
+// Sets the color back to the original saved color
+def resetLEDNotification(){
+
+    // return color to original
+    log.debug "Reset LED color to: $state.origColor"
+    deviceLight.setHue(state.origColor)
+    
+    // if the light was turned on just for the notification, turn it back off now
+    if (state.ledState == "off") {
+    	deviceLight.off()
+    }
+}

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

@@ -66,7 +66,7 @@ def authPage() {
 	// get rid of next button until the user is actually auth'd
 	if (!oauthTokenProvided) {
 		return dynamicPage(name: "auth", title: "Login", nextPage: "", uninstall:uninstallAllowed) {
-			section(){
+			section() {
 				paragraph "Tap below to log in to the ecobee service and authorize SmartThings access. Be sure to scroll down on page 2 and press the 'Allow' button."
 				href url:redirectUrl, style:"embedded", required:true, title:"ecobee", description:description
 			}
@@ -76,7 +76,7 @@ def authPage() {
 		log.debug "thermostat list: $stats"
 		log.debug "sensor list: ${sensorsDiscovered()}"
 		return dynamicPage(name: "auth", title: "Select Your Thermostats", uninstall: true) {
-			section(""){
+			section("") {
 				paragraph "Tap below to see the list of ecobee thermostats available in your ecobee account and select the ones you want to connect to SmartThings."
 				input(name: "thermostats", title:"", type: "enum", required:true, multiple:true, description: "Tap to choose", metadata:[values:stats])
 			}
@@ -84,7 +84,7 @@ def authPage() {
 			def options = sensorsDiscovered() ?: []
 			def numFound = options.size() ?: 0
 			if (numFound > 0)  {
-				section(""){
+				section("") {
 					paragraph "Tap below to see the list of ecobee sensors available in your ecobee account and select the ones you want to connect to SmartThings."
 					input(name: "ecobeesensors", title:"Select Ecobee Sensors (${numFound} found)", type: "enum", required:false, description: "Tap to choose", multiple:true, options:options)
 				}
@@ -115,13 +115,12 @@ def callback() {
 	def code = params.code
 	def oauthState = params.state
 
-	if (oauthState == atomicState.oauthInitState){
-
+	if (oauthState == atomicState.oauthInitState) {
 		def tokenParams = [
-				grant_type: "authorization_code",
-				code      : code,
-				client_id : smartThingsClientId,
-				redirect_uri: callbackUrl
+			grant_type: "authorization_code",
+			code      : code,
+			client_id : smartThingsClientId,
+			redirect_uri: callbackUrl
 		]
 
 		def tokenUrl = "https://www.ecobee.com/home/token?${toQueryString(tokenParams)}"
@@ -129,9 +128,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) {
@@ -148,8 +144,8 @@ def callback() {
 
 def success() {
 	def message = """
-    <p>Your ecobee Account is now connected to SmartThings!</p>
-    <p>Click 'Done' to finish setup.</p>
+        <p>Your ecobee Account is now connected to SmartThings!</p>
+        <p>Click 'Done' to finish setup.</p>
     """
 	connectionStatus(message)
 }
@@ -171,64 +167,63 @@ def connectionStatus(message, redirectUrl = null) {
 	}
 
 	def html = """
-<!DOCTYPE html>
-<html>
-<head>
-<meta name="viewport" content="width=640">
-<title>Ecobee & SmartThings connection</title>
-<style type="text/css">
-        @font-face {
-                font-family: 'Swiss 721 W01 Thin';
-                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot');
-                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot?#iefix') format('embedded-opentype'),
-                         url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.woff') format('woff'),
-                         url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.ttf') format('truetype'),
-                         url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.svg#swis721_th_btthin') format('svg');
-                font-weight: normal;
-                font-style: normal;
-        }
-        @font-face {
-                font-family: 'Swiss 721 W01 Light';
-                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot');
-                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot?#iefix') format('embedded-opentype'),
-                         url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.woff') format('woff'),
-                         url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.ttf') format('truetype'),
-                         url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.svg#swis721_lt_btlight') format('svg');
-                font-weight: normal;
-                font-style: normal;
-        }
-        .container {
-                width: 90%;
-                padding: 4%;
-                /*background: #eee;*/
-                text-align: center;
-        }
-        img {
-                vertical-align: middle;
-        }
-        p {
-                font-size: 2.2em;
-                font-family: 'Swiss 721 W01 Thin';
-                text-align: center;
-                color: #666666;
-                padding: 0 40px;
-                margin-bottom: 0;
-        }
-        span {
-                font-family: 'Swiss 721 W01 Light';
-        }
-</style>
-</head>
-<body>
-        <div class="container">
+        <!DOCTYPE html>
+        <html>
+            <head>
+                <meta name="viewport" content="width=640">
+                <title>Ecobee & SmartThings connection</title>
+                <style type="text/css">
+                    @font-face {
+                        font-family: 'Swiss 721 W01 Thin';
+                        src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot');
+                        src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot?#iefix') format('embedded-opentype'),
+                        url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.woff') format('woff'),
+                        url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.ttf') format('truetype'),
+                        url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.svg#swis721_th_btthin') format('svg');
+                        font-weight: normal;
+                        font-style: normal;
+                    }
+                    @font-face {
+                        font-family: 'Swiss 721 W01 Light';
+                        src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot');
+                        src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot?#iefix') format('embedded-opentype'),
+                        url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.woff') format('woff'),
+                        url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.ttf') format('truetype'),
+                        url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.svg#swis721_lt_btlight') format('svg');
+                        font-weight: normal;
+                        font-style: normal;
+                    }
+                    .container {
+                        width: 90%;
+                        padding: 4%;
+                        text-align: center;
+                    }
+                    img {
+                        vertical-align: middle;
+                    }
+                    p {
+                        font-size: 2.2em;
+                        font-family: 'Swiss 721 W01 Thin';
+                        text-align: center;
+                        color: #666666;
+                        padding: 0 40px;
+                        margin-bottom: 0;
+                    }
+                    span {
+                        font-family: 'Swiss 721 W01 Light';
+                    }
+                </style>
+            </head>
+        <body>
+            <div class="container">
                 <img src="https://s3.amazonaws.com/smartapp-icons/Partner/ecobee%402x.png" alt="ecobee icon" />
                 <img src="https://s3.amazonaws.com/smartapp-icons/Partner/support/connected-device-icn%402x.png" alt="connected device icon" />
                 <img src="https://s3.amazonaws.com/smartapp-icons/Partner/support/st-logo%402x.png" alt="SmartThings logo" />
                 ${message}
-        </div>
-</body>
-</html>
-"""
+            </div>
+        </body>
+    </html>
+    """
 
 	render contentType: 'text/html', data: html
 }
@@ -237,19 +232,26 @@ 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]
+		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:
+        // 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
@@ -289,9 +291,10 @@ Map sensorsDiscovered() {
 }
 
 def getThermostatDisplayName(stat) {
-	if(stat?.name)
-		return stat.name.toString()
-	return (getThermostatTypeName(stat) + " (${stat.identifier})").toString()
+    if(stat?.name) {
+        return stat.name.toString()
+    }
+    return (getThermostatTypeName(stat) + " (${stat.identifier})").toString()
 }
 
 def getThermostatTypeName(stat) {
@@ -310,7 +313,6 @@ def updated() {
 }
 
 def initialize() {
-
 	log.debug "initialize"
 	def devices = thermostats.collect { dni ->
 		def d = getChildDevice(dni)
@@ -350,8 +352,6 @@ 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)
@@ -381,75 +381,41 @@ def pollHandler() {
 }
 
 def pollChildren(child = null) {
-	def thermostatIdsString = getChildDeviceIdsString()
-	log.debug "polling children: $thermostatIdsString"
-	def data = ""
+    def thermostatIdsString = getChildDeviceIdsString()
+    log.debug "polling children: $thermostatIdsString"
+
+    def requestBody = [
+        selection: [
+            selectionType: "thermostats",
+            selectionMatch: thermostatIdsString,
+            includeExtendedRuntime: true,
+            includeSettings: true,
+            includeRuntime: true,
+            includeSensors: true
+        ]
+    ]
 
-	def jsonRequestBody = '{"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}"],
-			query: [format: 'json', body: jsonRequestBody]
-	]
+        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:
+        // https://www.ecobee.com/home/developer/api/documentation/v1/operations/get-thermostats.shtml
+        query: [format: 'json', body: toJson(requestBody)]
+    ]
 
 	try{
 		httpGet(pollParams) { 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 ->
-					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}"
-			}
+                log.debug "poll results returned resp.data ${resp.data}"
+                atomicState.remoteSensors = resp.data.thermostatList.remoteSensors
+                updateSensorData()
+                storeThermostatData(resp.data.thermostatList)
+                result = true
+                log.debug "updated ${atomicState.thermostats?.size()} stats: ${atomicState.thermostats}"
+            }
 		}
 	} catch (groovyx.net.http.HttpResponseException e) {
 		log.trace "Exception polling children: " + e.response.data.status
@@ -463,13 +429,12 @@ def pollChildren(child = null) {
 }
 
 // Poll Child is invoked from the Child Device itself as part of the Poll Capability
-def pollChild(){
-
+def pollChild() {
 	def devices = getChildDevices()
 
-	if (pollChildren()){
+	if (pollChildren()) {
 		devices.each { child ->
-			if (!child.device.deviceNetworkId.startsWith("ecobee_sensor")){
+			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}"
@@ -492,36 +457,7 @@ 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)
-	{
-		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 +466,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
-
-	mode
+	return mode
 }
 
 def updateSensorData() {
@@ -558,12 +522,12 @@ def updateSensorData() {
 							}
 
 						}
-
 					} else if (it.type == "occupancy") {
-						if(it.value == "true")
-							occupancy = "active"
-						else
+						if(it.value == "true") {
+                            occupancy = "active"
+                        } else {
 							occupancy = "inactive"
+                        }
 					}
 				}
 				def dni = "ecobee_sensor-"+ it?.id + "-" + it?.code
@@ -582,7 +546,7 @@ def getChildDeviceIdsString() {
 }
 
 def toJson(Map m) {
-	return new org.json.JSONObject(m).toString()
+    return groovy.json.JsonOutput.toJson(m)
 }
 
 def toQueryString(Map m) {
@@ -595,54 +559,24 @@ 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,
-				path  : "/token",
-				query : [grant_type: 'refresh_token', code: "${atomicState.refreshToken}", client_id: smartThingsClientId],
+			method: 'POST',
+			uri   : apiEndpoint,
+			path  : "/token",
+			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!")
-
-					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 = ""
-				}
-			}
+					saveTokenAndResumeAction(resp.data)
+			    }
+            }
 		} catch (groovyx.net.http.HttpResponseException e) {
 			log.error "refreshAuthToken() >> Error: e.statusCode ${e.statusCode}"
 			def reAttemptPeriod = 300 // in sec
@@ -662,118 +596,220 @@ private refreshAuthToken() {
 	}
 }
 
-def resumeProgram(child, deviceId) {
-
-
-	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"functions": [{"type": "resumeProgram"}]}'
-	def result = sendJson(jsonRequestBody)
-	return result
+/**
+ * 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) {
+    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) {
-
-	int h = heating * 10
-	int c = cooling * 10
-	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"functions": [{ "type": "setHold", "params": { "coolHoldTemp": '+c+',"heatHoldTemp": '+h+', "holdType": '+sendHoldType+' } } ]}'
-
-	def result = sendJson(child, jsonRequestBody)
-	return result
+/**
+ * Executes the resume program command on the Ecobee thermostat
+ * @param deviceId - the ID of the device
+ *
+ * @retrun true if the command was successful, false otherwise.
+ */
+boolean resumeProgram(deviceId) {
+    def payload = [
+        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
 
-	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+' } } ]}'
-	def result = sendJson(child, jsonRequestBody)
-	return result
+    return sendCommandToEcobee(payload)
 }
 
-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)
-	return result
+    def payload = [
+        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
+		uri: apiEndpoint,
+		path: "/1/thermostat",
+		headers: ["Content-Type": "application/json", "Authorization": "Bearer ${atomicState.authToken}"],
+		body: toJson(bodyParams)
 	]
 
 	try{
-		httpPost(cmdParams) { resp ->
-
-			if(resp.status == 200) {
-
-				log.debug "updated ${resp.data}"
-				returnStatus = resp.data.status.code
-				if (resp.data.status.code == 0)
-					log.debug "Successful call to ecobee API."
-				else {
-					log.debug "Error return code = ${resp.data.status.code}"
-					debugEvent("Error return code = ${resp.data.status.code}")
-				}
-			}
-		}
+        httpPost(cmdParams) { resp ->
+            if(resp.status == 200) {
+                log.debug "updated ${resp.data}"
+                def returnStatus = resp.data.status.code
+                if (returnStatus == 0) {
+                    log.debug "Successful call to ecobee API."
+                    isSuccess = true
+                } else {
+                    log.debug "Error return code = ${returnStatus}"
+                    debugEvent("Error return code = ${returnStatus}")
+                }
+            }
+        }
 	} catch (groovyx.net.http.HttpResponseException e) {
         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."
         }
     }
 
-	if (returnStatus == 0)
-		return true
-	else
-		return false
+    return isSuccess
 }
 
-def getChildName()           { "Ecobee Thermostat" }
-def getSensorChildName()     { "Ecobee Sensor" }
+def getChildName()           { return "Ecobee Thermostat" }
+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 getBuildRedirectUrl()   { "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${atomicState.accessToken}&apiServerUrl=${shardUrl}" }
-def getApiEndpoint()        { "https://api.ecobee.com" }
-def getSmartThingsClientId() { appSettings.clientId }
+def getCallbackUrl()         { return "https://graph.api.smartthings.com/oauth/callback" }
+def getBuildRedirectUrl()    { return "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${atomicState.accessToken}&apiServerUrl=${shardUrl}" }
+def getApiEndpoint()         { return "https://api.ecobee.com" }
+def getSmartThingsClientId() { return appSettings.clientId }
 
 def debugEvent(message, displayEvent = false) {
-
 	def results = [
-			name: "appdebug",
-			descriptionText: message,
-			displayed: displayEvent
+		name: "appdebug",
+		descriptionText: message,
+		displayed: displayEvent
 	]
 	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
-def sendPushAndFeeds(notificationMessage){
+def sendPushAndFeeds(notificationMessage) {
 	log.warn "sendPushAndFeeds >> notificationMessage: ${notificationMessage}"
 	log.warn "sendPushAndFeeds >> atomicState.timeSendPush: ${atomicState.timeSendPush}"
-	if (atomicState.timeSendPush){
-		if (now() - atomicState.timeSendPush > 86400000){ // notification is sent to remind user once a day
+	if (atomicState.timeSendPush) {
+		if (now() - atomicState.timeSendPush > 86400000) { // notification is sent to remind user once a day
 			sendPush("Your Ecobee thermostat " + notificationMessage)
 			sendActivityFeeds(notificationMessage)
 			atomicState.timeSendPush = now()
@@ -786,6 +822,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 +881,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/hue-connect.src/hue-connect.groovy

@@ -133,14 +133,23 @@ def bulbDiscovery() {
 	state.inBulbDiscovery = true
 	def bridge = null
 	if (selectedHue) {
-        bridge = getChildDevice(selectedHue)
-        subscribe(bridge, "bulbList", bulbListData)
+		bridge = getChildDevice(selectedHue)
+		subscribe(bridge, "bulbList", bulbListData)
 	}
-    state.bridgeRefreshCount = 0
-	def bulboptions = bulbsDiscovered() ?: [:]
-	def numFound = bulboptions.size() ?: 0
-    if (numFound == 0)
-    	app.updateSetting("selectedBulbs", "")
+	state.bridgeRefreshCount = 0
+	def allLightsFound = bulbsDiscovered() ?: [:]
+
+	// List lights currently not added to the user (editable)
+	def newLights = allLightsFound.findAll {getChildDevice(it.key) == null} ?: [:]
+	newLights = newLights.sort {it.value.toLowerCase()}
+
+	// List lights already added to the user (not editable)
+	def existingLights = allLightsFound.findAll {getChildDevice(it.key) != null} ?: [:]
+	existingLights = existingLights.sort {it.value.toLowerCase()}
+
+	def numFound = newLights.size() ?: 0
+	if (numFound == 0)
+		app.updateSetting("selectedBulbs", "")
 
 	if((bulbRefreshCount % 5) == 0) {
 		discoverHueBulbs()
@@ -148,14 +157,25 @@ def bulbDiscovery() {
 	def selectedBridge = state.bridges.find { key, value -> value?.serialNumber?.equalsIgnoreCase(selectedHue) }
 	def title = selectedBridge?.value?.name ?: "Find bridges"
 
+	// List of all lights previously added shown to user
+	def existingLightsDescription = ""
+	if (existingLights) {
+		existingLights.each {
+			if (existingLightsDescription.isEmpty()) {
+				existingLightsDescription += it.value
+			} else {
+				 existingLightsDescription += ", ${it.value}"
+			}
+		}
+	}
 
 	return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Started!", nextPage:"", refreshInterval:refreshInterval, install:true, uninstall: true) {
 		section("Please wait while we discover your Hue Lights. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
-			input "selectedBulbs", "enum", required:false, title:"Select Hue Lights (${numFound} found)", multiple:true, options:bulboptions
+			input "selectedBulbs", "enum", required:false, title:"Select Hue Lights to add (${numFound} found)", multiple:true, options:newLights
+			paragraph title: "Previously added Hue Lights (${existingLights.size()} added)", existingLightsDescription
 		}
 		section {
 			href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
-
 		}
 	}
 }
@@ -290,8 +310,11 @@ def manualRefresh() {
 }
 
 def uninstalled(){
+	// Remove bridgedevice connection to allow uninstall of smartapp even though bridge is listed
+	// as user of smartapp
+	app.updateSetting("bridgeDevice", null)
 	state.bridges = [:]
-    state.username = null
+	state.username = null
 }
 
 // Handles events to add new bulbs
@@ -415,23 +438,32 @@ def addBridge() {
 				// Hue uses last 6 digits of MAC address as ID number, this number is shown on the bottom of the bridge
 				def idNumber = getBridgeIdNumber(selectedHue)
 				d = addChildDevice("smartthings", "Hue Bridge", selectedHue, vbridge.value.hub, ["label": "Hue Bridge ($idNumber)"])
-				d?.completedSetup = true
- 				log.debug "created ${d.displayName} with id ${d.deviceNetworkId}"
-                def childDevice = getChildDevice(d.deviceNetworkId)
-				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)
-                        childDevice.updateDataValue("networkAddress", vbridge.value.ip + ":" +  vbridge.value.port)
-                    } else {
-                    	childDevice.sendEvent(name: "networkAddress", value: convertHexToIP(vbridge.value.ip) + ":" +  convertHexToInt(vbridge.value.port))
-                        childDevice.updateDataValue("networkAddress", convertHexToIP(vbridge.value.ip) + ":" +  convertHexToInt(vbridge.value.port))
-                    }
+				if (d) {
+					// Associate smartapp to bridge so user will be warned if trying to delete bridge
+					app.updateSetting("bridgeDevice", [type: "device.hueBridge", value: d.id])
+
+					d.completedSetup = true
+					log.debug "created ${d.displayName} with id ${d.deviceNetworkId}"
+					def childDevice = getChildDevice(d.deviceNetworkId)
+					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)
+							childDevice.updateDataValue("networkAddress", vbridge.value.ip + ":" +  vbridge.value.port)
+						} else {
+							childDevice.sendEvent(name: "networkAddress", value: convertHexToIP(vbridge.value.ip) + ":" +  convertHexToInt(vbridge.value.port))
+							childDevice.updateDataValue("networkAddress", convertHexToIP(vbridge.value.ip) + ":" +  convertHexToInt(vbridge.value.port))
+						}
+					} else {
+						childDevice.sendEvent(name: "networkAddress", value: convertHexToIP(vbridge.value.networkAddress) + ":" +  convertHexToInt(vbridge.value.deviceAddress))
+						childDevice.updateDataValue("networkAddress", convertHexToIP(vbridge.value.networkAddress) + ":" +  convertHexToInt(vbridge.value.deviceAddress))
+					}
 				} else {
-					childDevice.sendEvent(name: "networkAddress", value: convertHexToIP(vbridge.value.networkAddress) + ":" +  convertHexToInt(vbridge.value.deviceAddress))
-                    childDevice.updateDataValue("networkAddress", convertHexToIP(vbridge.value.networkAddress) + ":" +  convertHexToInt(vbridge.value.deviceAddress))
-                }
+					log.error "Failed to create Hue Bridge device"
+				}
 			}
 		} else {
 			log.debug "found ${d.displayName} with id $selectedHue already exists"
@@ -1017,12 +1049,12 @@ def setColor(childDevice, huesettings) {
     log.debug "Executing 'setColor($huesettings)'"
 
     updateInProgress()
-    
+
     def value = [:]
     def hue = null
     def sat = null
     def xy = null
-    
+
 	// For now ignore model to get a consistent color if same color is set across multiple devices
 	// def model = state.bulbs[getId(childDevice)]?.modelid
     if (huesettings.hex != null) {
@@ -1038,11 +1070,12 @@ def setColor(childDevice, huesettings) {
 	else
 		value.hue = Math.min(Math.round(childDevice.device?.currentValue("hue") * 65535 / 100), 65535)
 
-        if (huesettings.saturation != null)   
+        if (huesettings.saturation != null)
 		value.sat = Math.min(Math.round(huesettings.saturation * 254 / 100), 254)
 	else
 		value.sat = Math.min(Math.round(childDevice.device?.currentValue("saturation") * 254 / 100), 254)
 
+/* Disabled for now due to bad behavior via Lightning Wizard
 	if (!value.xy) {
 		// Below will translate values to hex->XY to take into account the color support of the different hue types
 		def hex = colorUtil.hslToHex((int) huesettings.hue, (int) huesettings.saturation)
@@ -1050,6 +1083,7 @@ def setColor(childDevice, huesettings) {
 		// Once groups, or scenes are introduced it might be a good idea to use unique models again
 		value.xy = calculateXY(hex)
     }
+*/
 
     // Default behavior is to turn light on
     value.on = true
@@ -1059,7 +1093,7 @@ def setColor(childDevice, huesettings) {
             value.on = false
         else if (huesettings.level == 1)
             value.bri = 1
-        else 
+        else
 			value.bri = Math.min(Math.round(huesettings.level * 254 / 100), 254)
     }
     value.alert = huesettings.alert ? huesettings.alert : "none"

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

@@ -74,8 +74,6 @@ def authPage()
 
 		def redirectUrl = oauthInitUrl()
     
-  	  	log.debug "RedirectURL = ${redirectUrl}"
-
 		return dynamicPage(name: "Credentials", title: "Life360", nextPage:"listCirclesPage", uninstall: uninstallOption, install:false) {
 		    section {
     			href url:redirectUrl, style:"embedded", required:false, title:"Life360", description:description
@@ -257,8 +255,6 @@ def initializeLife360Connection() {
 	def oauthClientId = appSettings.clientId
 	def oauthClientSecret = appSettings.clientSecret
 
-	log.debug "Installed with settings: ${settings}"
-
 	initialize()
     
     def username = settings.username
@@ -269,8 +265,6 @@ def initializeLife360Connection() {
   	def basicCredentials = "${oauthClientId}:${oauthClientSecret}"
     def encodedCredentials = basicCredentials.encodeAsBase64().toString()
     
-    log.debug "Encoded Creds: ${encodedCredentials}"
-
     
     // call life360, get OAUTH token using password flow, save
     // curl -X POST -H "Authorization: Basic cFJFcXVnYWJSZXRyZTRFc3RldGhlcnVmcmVQdW1hbUV4dWNyRUh1YzptM2ZydXBSZXRSZXN3ZXJFQ2hBUHJFOTZxYWtFZHI0Vg==" 
@@ -284,8 +278,6 @@ def initializeLife360Connection() {
     				"username=${username}&"+
                     "password=${password}"
 
-    log.debug "Post Body: ${postBody}"
-	   
     def result = null
     
     try {
@@ -295,7 +287,6 @@ def initializeLife360Connection() {
 		}
         if (result.data.access_token) {
        		state.life360AccessToken = result.data.access_token
-       		log.debug "Access Token = ${state.life360AccessToken}"
             return true;
    		}
 		log.debug "Response=${result.data}"
@@ -533,8 +524,6 @@ def createCircleSubscription() {
         
     def postBody =  "url=${hookUrl}"
 
-    log.debug "Post Body: ${postBody}"
-	   
     def result = null
     
     try {
@@ -586,8 +575,6 @@ def updated() {
         
         	// log.debug "After Find Attempt."
 
-       		log.debug "Member Id = ${member.id}, Name = ${member.firstName} ${member.lastName}, Email Address = ${member.loginEmail}"
-        
         	// log.debug "External Id=${app.id}:${member.id}"
        
        		// create the device

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

@@ -48,9 +48,9 @@ preferences {
 	}
 	section("Via a push notification and/or an SMS message"){
 		input("recipients", "contact", title: "Send notifications to") {
-			input "phone", "phone", title: "Phone Number (for SMS, optional)", required: false
+			input "phone", "phone", title: "Enter a phone number to get SMS", required: false
 			paragraph "If outside the US please make sure to enter the proper country code"
-			input "pushAndPhone", "enum", title: "Both Push and SMS?", required: false, options: ["Yes", "No"]
+			input "pushAndPhone", "enum", title: "Notify me via Push Notification", required: false, options: ["Yes", "No"]
 		}
 	}
 	section("Minimum time between messages (optional, defaults to every message)") {
@@ -111,19 +111,17 @@ private sendMessage(evt) {
 	if (location.contactBookEnabled) {
 		sendNotificationToContacts(msg, recipients, options)
 	} else {
-		if (!phone || pushAndPhone != 'No') {
+		if (pushAndPhone != 'No') {
 			log.debug 'sending push'
 			options.method = 'push'
-			//sendPush(msg)
+			sendNotification(msg, options)
 		}
 		if (phone) {
 			options.phone = phone
 			log.debug 'sending SMS'
-			//sendSms(phone, msg)
+			sendNotification(msg, options)
 		}
-		sendNotification(msg, options)
 	}
-
 	if (frequency) {
 		state[evt.deviceId] = now()
 	}