Revert "DVCSMP-2179 added device watch for ecobee based on the code from lyric"

2026-04-06 06:13:07 +01:00 · 2016-11-14 11:49:30 -08:00
25 changed files with 144 additions and 696 deletions
--- a/devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy
+++ b/devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy
@@ -120,15 +120,6 @@ def configure() {
 	return cmd
 }

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

-
-def installed() {
-	initialize()
-}
-
 def updated() {
-	initialize()
-}
-
-def initialize() {
 	sendEvent(name: "numberOfButtons", value: 4)
 }
--- a/devicetypes/smartthings/bose-soundtouch.src/bose-soundtouch.groovy
+++ b/devicetypes/smartthings/bose-soundtouch.src/bose-soundtouch.groovy
@@ -27,7 +27,7 @@ metadata {
        capability "Switch"
        capability "Refresh"
        capability "Music Player"
-        capability "Health Check"
+        capability "Polling"

        /**
         * Define all commands, ie, if you have a custom action not
@@ -236,33 +236,7 @@ def parse(String event) {
 * @return action(s) to take or null
 */
 def installed() {
-    // Notify health check about this device with timeout interval 12 minutes
-    sendEvent(name: "checkInterval", value: 12 * 60, data: [protocol: "lan", hubHardwareId: device.hub.hardwareID], displayed: false)
-    startPoll()
-}
-
-/**
- * Called by health check if no events been generated in the last 12 minutes
- * If device doesn't respond it will be marked offline (not available)
- */
-def ping() {
-    TRACE("ping")
-    boseSendGetNowPlaying()
-}
-
-/**
- * Schedule a 2 minute poll of the device to refresh the
- * tiles so the user gets the correct information.
- */
-def startPoll() {
-    TRACE("startPoll")
-    unschedule()
-    // Schedule 2 minute polling of speaker status (song average length is 3-4 minutes)
-    def sec = Math.round(Math.floor(Math.random() * 60))
-    //def cron = "$sec 0/5 * * * ?" // every 5 min
-    def cron = "$sec 0/2 * * * ?" // every 2 min
-    log.debug "schedule('$cron', boseSendGetNowPlaying)"
-    schedule(cron, boseSendGetNowPlaying)
+    onAction("refresh")
 }

 /**
@@ -342,6 +316,14 @@ def onAction(String user, data=null) {
    return actions
 }

+/**
+ * Called every so often (every 5 minutes actually) to refresh the
+ * tiles so the user gets the correct information.
+ */
+def poll() {
+    return boseRefreshNowPlaying()
+}
+
 /**
 * Joins this speaker into the everywhere zone
 */
@@ -855,10 +837,6 @@ def boseRefreshNowPlaying(delay=0) {
    return boseGET("/now_playing")
 }

-def boseSendGetNowPlaying() {
-    sendHubCommand(boseGET("/now_playing"))
-}
-
 /**
 * Requests the list of presets
 *
@@ -1036,8 +1014,4 @@ def boseGetDeviceID() {
 */
 def getDeviceIP() {
    return parent.resolveDNI2Address(device.deviceNetworkId)
-}
-
-def TRACE(text) {
-    log.trace "${text}"
 }
--- a/devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy
+++ b/devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy
@@ -183,15 +183,6 @@ def updateState(String name, String value) {
 	device.updateDataValue(name, value)
 }

-
-def installed() {
-	initialize()
-}
-
 def updated() {
-	initialize()
-}
-
-def initialize() {
 	sendEvent(name: "numberOfButtons", value: 3)
 }
--- a/devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy
+++ b/devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy
@@ -23,7 +23,6 @@ metadata {
 		capability "Sensor"
 		capability "Refresh"
 		capability "Relative Humidity Measurement"
-		capability "Health Check"

 		command "generateEvent"
 		command "raiseSetpoint"
@@ -39,7 +38,6 @@ metadata {
 		attribute "maxCoolingSetpoint", "number"
 		attribute "minCoolingSetpoint", "number"
 		attribute "deviceTemperatureUnit", "string"
-		attribute "deviceAlive", "enum", ["true", "false"]
 	}

 	tiles {
@@ -122,21 +120,6 @@ metadata {

 }

-void installed() {
-    // The device refreshes every 5 minutes by default so if we miss 2 refreshes we can consider it offline
-    // Using 12 minutes because in testing, device health team found that there could be "jitter"
-    sendEvent(name: "checkInterval", value: 60 * 12, data: [protocol: "cloud"], displayed: false)
-}
-
-// Device Watch will ping the device to proactively determine if the device has gone offline
-// If the device was online the last time we refreshed, trigger another refresh as part of the ping.
-def ping() {
-    def isAlive = device.currentValue("deviceAlive") == "true" ? true : false
-    if (isAlive) {
-        refresh()
-    }
-}
-
 // parse events into attributes
 def parse(String description) {
 	log.debug "Parsing '${description}'"
@@ -181,11 +164,7 @@ def generateEvent(Map results) {
 			}  else if (name=="humidity") {
 				isChange = isStateChange(device, name, value.toString())
 				event << [value: value.toString(), isStateChange: isChange, displayed: false, unit: "%"]
-			} else if (name == "deviceAlive") {
-				isChange = isStateChange(device, name, value.toString())
-				event['isStateChange'] = isChange
-				event['displayed'] = false
-			} else {
+			}  else {
 				isChange = isStateChange(device, name, value.toString())
 				isDisplayed = isChange
 				event << [value: value.toString(), isStateChange: isChange, displayed: isDisplayed]
--- a/devicetypes/smartthings/life360-user.src/life360-user.groovy
+++ b/devicetypes/smartthings/life360-user.src/life360-user.groovy
@@ -39,7 +39,7 @@ metadata {
 }

 def generatePresenceEvent(boolean present) {
-	log.info "Life360 generatePresenceEvent($present)"
+	log.debug "Here in generatePresenceEvent!"
 	def value = formatValue(present)
 	def linkText = getLinkText(device)
 	def descriptionText = formatDescriptionText(linkText, present)
--- a/devicetypes/smartthings/smartpower-dimming-outlet.src/smartpower-dimming-outlet.groovy
+++ b/devicetypes/smartthings/smartpower-dimming-outlet.src/smartpower-dimming-outlet.groovy
@@ -71,7 +71,7 @@ def parse(String description) {

 	def event = [:]
 	def finalResult = isKnownDescription(description)
-	if (finalResult) {
+	if (finalResult != "false") {
 		log.info finalResult
 		if (finalResult.type == "update") {
 			log.info "$device updates: ${finalResult.value}"
@@ -212,16 +212,13 @@ def isKnownDescription(description) {
 		else if (descMap.cluster == "0B04" || descMap.clusterId == "0B04"){
 			isDescriptionPower(descMap)
 		}
-		else {
-			return [:]
-		}
 	}
 	else if(description?.startsWith("on/off:")) {
 		def switchValue = description?.endsWith("1") ? "on" : "off"
 		return	[type: "switch", value : switchValue]
 	}
 	else {
-		return [:]
+		return "false"
 	}
 }

@@ -255,7 +252,7 @@ def isDescriptionOnOff(descMap) {
 		return	[type: "switch", value : switchValue]
 	}
 	else {
-		return [:]
+		return "false"
 	}

 }
@@ -282,9 +279,10 @@ def isDescriptionLevel(descMap) {

 	if (dimmerValue != -1){
 		return	[type: "level", value : dimmerValue]
+
 	}
 	else {
-		return [:]
+		return "false"
 	}
 }

@@ -306,7 +304,7 @@ def isDescriptionPower(descMap) {
 		return	[type: "power", value : powerValue]
 	}
 	else {
-		return [:]
+		return "false"
 	}
 }

--- a/devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy
@@ -128,7 +128,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00){
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
--- a/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
@@ -132,7 +132,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
--- a/devicetypes/smartthings/smartsense-motion.src/smartsense-motion.groovy
+++ b/devicetypes/smartthings/smartsense-motion.src/smartsense-motion.groovy
@@ -57,7 +57,6 @@ def parse(String description) {

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

-		results = [
+		def results = [
 				name           : name,
 				value          : value,
 				linkText       : linkText,
@@ -74,6 +73,8 @@ private Map parseBasicMessage(description) {
 				isStateChange  : isStateChange,
 				displayed      : displayed(description, isStateChange)
 		]
+	} else {
+		results = [:]
 	}
 	log.debug "Parse returned $results.descriptionText"
 	return results
--- a/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
@@ -161,7 +161,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if(cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
@@ -339,7 +339,7 @@ private Map getContactResult(value) {
 	log.debug "Contact: ${device.displayName} value = ${value}"
 	def descriptionText = value == 'open' ? '{{ device.displayName }} was opened' : '{{ device.displayName }} was closed'
 	sendEvent(name: 'contact', value: value, descriptionText: descriptionText, displayed: false, translatable: true)
-	return [name: 'status', value: value, descriptionText: descriptionText, translatable: true]
+	sendEvent(name: 'status', value: value, descriptionText: descriptionText, translatable: true)
 }

 private getAccelerationResult(numValue) {
--- a/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy
@@ -119,7 +119,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07){
 					if (cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
--- a/devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy
@@ -103,7 +103,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00){
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
--- a/devicetypes/smartthings/testing/simulated-minimote.src/simulated-minimote.groovy
+++ b/devicetypes/smartthings/testing/simulated-minimote.src/simulated-minimote.groovy
@@ -126,15 +126,6 @@ private hold(button) {
 	sendEvent(name: "button", value: "held", data: [buttonNumber: button], descriptionText: "$device.displayName button $button was held", isStateChange: true)
 }

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


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

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

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

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

-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Flex RGBW", deviceJoinName: "SYLVANIA Smart Flex RGBW"
-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY Flex RGBW"
-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 RGBW", deviceJoinName: "SYLVANIA Smart A19 RGBW"
-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR RGBW", deviceJoinName: "SYLVANIA Smart BR30 RGBW"
-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT RGBW", deviceJoinName: "SYLVANIA Smart RT5/6 RGBW"
-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY FLEX OUTDOOR RGBW", deviceJoinName: "SYLVANIA Smart Outdoor RGBW Flex"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 RGBW", deviceJoinName: "OSRAM LIGHTIFY LED A19 RGBW"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR RGBW", deviceJoinName: "OSRAM LIGHTIFY LED BR30 RGBW"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT RGBW", deviceJoinName: "OSRAM LIGHTIFY LED RT 5/6 RGBW"
    }

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

        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300", outClusters: "0019"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04", outClusters: "0019"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR Tunable White", deviceJoinName: "SYLVANIA Smart BR30 Tunable White"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT Tunable White", deviceJoinName: "SYLVANIA Smart RT5/6 Tunable White"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 TW", deviceJoinName: "OSRAM LIGHTIFY LED Classic A60 Tunable White"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 Tunable White", deviceJoinName: "SYLVANIA Smart A19 Tunable White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Flood BR30 Tunable White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT Tunable White", deviceJoinName: "OSRAM LIGHTIFY RT5/6 Tunable White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 TW", deviceJoinName: "OSRAM LIGHTIFY LED 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"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0702, 0B05", outClusters: "0019", manufacturer: "sengled", model: "Z01-A19NAE26", deviceJoinName: "Sengled Element plus"
    }

    // UI tile definitions
@@ -84,24 +83,105 @@ def parse(String description) {
        }
    }
    else {
-        def cluster = zigbee.parse(description)
+        Map bindingTable = parseBindingTableResponse(description)
+        if (bindingTable) {
+            List<String> cmds = []
+            bindingTable.table_entries.inject(cmds) { acc, entry ->
+                // The binding entry is not for our hub and should be deleted
+                if (entry["dstAddr"] != zigbeeEui) {
+                    acc.addAll(removeBinding(entry.clusterId, entry.srcAddr, entry.srcEndpoint, entry.dstAddr, entry.dstEndpoint))
+                }
+                acc
+            }
+            // There are more entries that we haven't examined yet
+            if (bindingTable.numTableEntries > bindingTable.startIndex + bindingTable.numEntriesReturned) {
+                def startPos
+                if (cmds) {
+                    log.warn "Removing binding entries for other devices: $cmds"
+                    // Since we are removing some entries, we should start in the same spot as we just read since values
+                    // will fill in the newly vacated spots
+                    startPos = bindingTable.startIndex
+                } else {
+                    // Since we aren't removing anything we move forward to the next set of table entries
+                    startPos = bindingTable.startIndex + bindingTable.numEntriesReturned
+                }
+                cmds.addAll(requestBindingTable(startPos))
+            }
+            sendHubCommand(cmds.collect { it ->
+                new physicalgraph.device.HubAction(it)
+            }, 2000)
+        } else {
+            def cluster = zigbee.parse(description)

-        if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
-            if (cluster.data[0] == 0x00) {
-                log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
-                sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+            if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
+                if (cluster.data[0] == 0x00) {
+                    log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
+                    sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+                }
+                else {
+                    log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
+                }
            }
            else {
-                log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
+                log.warn "DID NOT PARSE MESSAGE for description : $description"
+                log.debug "${cluster}"
            }
        }
-        else {
-            log.warn "DID NOT PARSE MESSAGE for description : $description"
-            log.debug "${cluster}"
-        }
    }
 }

+def parseBindingTableResponse(description) {
+    Map descMap = zigbee.parseDescriptionAsMap(description)
+    if (descMap["clusterInt"] == 0x8033) {
+        def header_field_lengths = ["transactionSeqNo": 1, "status": 1, "numTableEntries": 1, "startIndex": 1, "numEntriesReturned": 1]
+        def field_values = [:]
+        def data = descMap["data"]
+        header_field_lengths.each { k, v ->
+            field_values[k] = Integer.parseInt(data.take(v).join(""), 16);
+            data = data.drop(v);
+        }
+
+        List<Map> table = []
+        if (field_values.numEntriesReturned) {
+            def table_entry_lengths = ["srcAddr": 8, "srcEndpoint": 1, "clusterId": 2, "dstAddrMode": 1]
+            for (def i : 0..(field_values.numEntriesReturned - 1)) {
+                def entryMap = [:]
+                table_entry_lengths.each { k, v ->
+                    def val = data.take(v).reverse().join("")
+                    entryMap[k] = val.length() < 8 ? Integer.parseInt(val, 16) : val
+                    data = data.drop(v)
+                }
+
+                switch (entryMap.dstAddrMode) {
+                    case 0x01:
+                        entryMap["dstAddr"] = data.take(2).reverse().join("")
+                        data = data.drop(2)
+                        break
+                    case 0x03:
+                        entryMap["dstAddr"] = data.take(8).reverse().join("")
+                        data = data.drop(8)
+                        entryMap["dstEndpoint"] = Integer.parseInt(data.take(1).join(""), 16)
+                        data = data.drop(1)
+                        break
+                }
+                table << entryMap
+            }
+        }
+        field_values["table_entries"] = table
+        return field_values
+    }
+    return [:]
+}
+
+def requestBindingTable(startPos=0) {
+    return ["zdo mgmt-bind 0x${zigbee.deviceNetworkId} $startPos"]
+}
+
+def removeBinding(cluster, srcAddr, srcEndpoint, destAddr, destEndpoint) {
+    return ["zdo unbind unicast 0x${zigbee.deviceNetworkId} {${srcAddr}} $srcEndpoint $cluster {${destAddr}} $destEndpoint"]
+}
+
+
 def off() {
    zigbee.off()
 }
@@ -131,8 +211,7 @@ def configure() {
    // enrolls with default periodic reporting until newer 5 min interval is confirmed
    sendEvent(name: "checkInterval", value: 2 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])

-    // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
-    refresh()
+    refresh() + requestBindingTable(0) + ["delay 2000"]
 }

 def setColorTemperature(value) {
--- a/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy
+++ b/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy
@@ -127,8 +127,8 @@ def configureHealthCheck() {

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

 def updated() {
--- a/devicetypes/smartthings/zll-rgbw-bulb.src/zll-rgbw-bulb.groovy
+++ b/devicetypes/smartthings/zll-rgbw-bulb.src/zll-rgbw-bulb.groovy
@@ -27,10 +27,6 @@ metadata {
        fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300", outClusters: "0019"
        fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 1000", outClusters: "0019"
        fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 1000", outClusters: "0019", "manufacturer":"OSRAM", "model":"Classic A60 RGBW", deviceJoinName: "OSRAM LIGHTIFY LED Classic A60 RGBW"
-        fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "PAR 16 50 RGBW - LIGHTIFY", deviceJoinName: "OSRAM LIGHTIFY RGBW PAR 16 50"
-        fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,0300,1000,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY Flex RGBW"
-        fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,0300,1000,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Gardenpole RGBW-Lightify", deviceJoinName: "OSRAM LIGHTIFY Gardenpole RGBW"
-        fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,0300,1000,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Outdoor Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY Outdoor Flex RGBW"
    }

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

        fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 1000, 0B04, FC0F", outClusters: "0019", "manufacturer":"OSRAM", "model":"Classic A60 TW", deviceJoinName: "OSRAM LIGHTIFY LED Classic A60 Tunable White"
        fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 1000, FC0F", outClusters: "0019", "manufacturer":"OSRAM", "model":"PAR16 50 TW", deviceJoinName: "OSRAM LIGHTIFY LED PAR16 50 Tunable White"
-        fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 1000, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic B40 TW - LIGHTIFY", deviceJoinName: "OSRAM LIGHTIFY Classic B40 Tunable White"
    }

    // UI tile definitions
--- a/smartapps/brbeaird/myq-lite.src/myq-lite.groovy
+++ b/smartapps/brbeaird/myq-lite.src/myq-lite.groovy
@@ -1,536 +0,0 @@
-/**
- *  MyQ Lite
- *
- *  Copyright 2015 Jason Mok/Brian Beaird/Barry Burke
- *
- *  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.
- *
- *  Last Updated : 06/14/2016
- *
- */
-definition(
-	name: "MyQ Lite",
-	namespace: "brbeaird",
-	author: "Jason Mok/Brian Beaird/Barry Burke",
-	description: "Integrate MyQ with Smartthings",
-	category: "SmartThings Labs",
-	iconUrl:   "http://smartthings.copyninja.net/icons/MyQ@1x.png",
-	iconX2Url: "http://smartthings.copyninja.net/icons/MyQ@2x.png",
-	iconX3Url: "http://smartthings.copyninja.net/icons/MyQ@3x.png"
-)
-
-preferences {
-	page(name: "prefLogIn", title: "MyQ")    
-	page(name: "prefListDevices", title: "MyQ")
-    page(name: "prefSensor1", title: "MyQ")
-    page(name: "prefSensor2", title: "MyQ")
-    page(name: "prefSensor3", title: "MyQ")
-    page(name: "prefSensor4", title: "MyQ")
-}
-
-/* Preferences */
-def prefLogIn() {
-	def showUninstall = username != null && password != null 
-	return dynamicPage(name: "prefLogIn", title: "Connect to MyQ", nextPage:"prefListDevices", uninstall:showUninstall, install: false) {
-		section("Login Credentials"){
-			input("username", "email", title: "Username", description: "MyQ Username (email address)")
-			input("password", "password", title: "Password", description: "MyQ password")
-		}
-		section("Gateway Brand"){
-			input(name: "brand", title: "Gateway Brand", type: "enum",  metadata:[values:["Liftmaster","Chamberlain","Craftsman"]] )
-		}
-	}
-}
-
-def prefListDevices() {
-	if (forceLogin()) {
-		def doorList = getDoorList()		
-		if ((doorList)) {
-			return dynamicPage(name: "prefListDevices",  title: "Devices", nextPage:"prefSensor1", install:false, uninstall:true) {
-				if (doorList) {
-					section("Select which garage door/gate to use"){
-						input(name: "doors", type: "enum", required:false, multiple:true, metadata:[values:doorList])
-					}
-				} 
-			}
-		} else {
-			def devList = getDeviceList()
-			return dynamicPage(name: "prefListDevices",  title: "Error!", install:false, uninstall:true) {
-				section(""){
-					paragraph "Could not find any supported device(s). Please report to author about these devices: " +  devList
-				}
-			}
-		}  
-	} else {
-		return dynamicPage(name: "prefListDevices",  title: "Error!", install:false, uninstall:true) {
-			section(""){
-				paragraph "The username or password you entered is incorrect. Try again. " 
-			}
-		}  
-	}
-}
-
-
-def prefSensor1() {
-	log.debug "Doors chosen: " + doors
-    
-    //Set defaults
-    def nextPage = ""
-    def showInstall = true
-    def titleText = ""
-    
-    //Determine if we have multiple doors and need to send to another page
-    if (doors instanceof String){ //simulator seems to just make a single door a string. For that reason we have this weird check.
-    	log.debug "Single door detected (string)."
-        titleText = "Select Sensors for Door 1 (" + state.data[doors].name + ")"
-    }
-    else if (doors.size() == 1){
-    	log.debug "Single door detected (array)."
-        titleText = "Select Sensors for Door 1 (" + state.data[doors[0]].name + ")"
-    }
-    else{
-    	log.debug "Multiple doors detected."
-        nextPage = "prefSensor2"
-        titleText = "Select Sensors for Door 1 (" + state.data[doors[0]].name + ")"
-        showInstall = false;
-    }    
-    
-    return dynamicPage(name: "prefSensor1",  title: "Sensors", nextPage:nextPage, install:showInstall, uninstall:true) {        
-        section(titleText){			
-			input(name: "door1Sensor", title: "Contact Sensor", type: "capability.contactSensor", required: true, multiple: false)
-			input(name: "door1Acceleration", title: "Acceleration Sensor", type: "capability.accelerationSensor", required: false, multiple: false)
-		}
-    }
-}
-
-def prefSensor2() {	   
-    def nextPage = ""
-    def showInstall = true
-    def titleText = "Sensors for Door 2 (" + state.data[doors[1]].name + ")"
-     
-    if (doors.size() > 2){
-    	nextPage = "prefSensor3"
-        showInstall = false;
-    }
-    
-    return dynamicPage(name: "prefSensor2",  title: "Sensors", nextPage:nextPage, install:showInstall, uninstall:true) {
-        section(titleText){			
-			input(name: "door2Sensor", title: "Contact Sensor", type: "capability.contactSensor", required: true, multiple: false)
-			input(name: "door2Acceleration", title: "Acceleration Sensor", type: "capability.accelerationSensor", required: false, multiple: false)
-		}
-    }
-}
-
-def prefSensor3() {	   
-    def nextPage = ""
-    def showInstall = true
-    def titleText = "Sensors for Door 3 (" + state.data[doors[2]].name + ")"
-     
-    if (doors.size() > 3){
-    	nextPage = "prefSensor4"
-        showInstall = false;
-    }
-    
-    return dynamicPage(name: "prefSensor3",  title: "Sensors", nextPage:nextPage, install:showInstall, uninstall:true) {
-        section(titleText){			
-			input(name: "door3Sensor", title: "Contact Sensor", type: "capability.contactSensor", required: true, multiple: false)
-			input(name: "door3Acceleration", title: "Acceleration Sensor", type: "capability.accelerationSensor", required: false, multiple: false)
-		}
-    }
-}
-
-def prefSensor4() {	   
-	def titleText = "Contact Sensor for Door 4 (" + state.data[doors[3]].name + ")"
-    return dynamicPage(name: "prefSensor4",  title: "Sensors", install:true, uninstall:true) {
-        section(titleText){			
-			input(name: "door4Sensor", title: "Contact Sensor", type: "capability.contactSensor", required: "true", multiple: "false")
-			input(name: "door4Acceleration", title: "Acceleration Sensor", type: "capability.accelerationSensor", required: false, multiple: false)
-		}
-    }
-}
-
-/* Initialization */
-def installed() { initialize() }
-
-def updated() { 
-	unsubscribe()
-	initialize()
-}
-
-def uninstalled() {}	
-
-def initialize() {    
-	login()
-    state.sensorMap = [:]
-    
-    // Get initial device status in state.data
-	state.polling = [ last: 0, rescheduler: now() ]
-	state.data = [:]
-    
-	// Create selected devices
-	def doorsList = getDoorList()
-	//def lightsList = getLightList()
-	def selectedDevices = [] + getSelectedDevices("doors")
-  
-	selectedDevices.each { 
-    	log.debug "Creating child device: " + it
-		if (!getChildDevice(it)) {
-			if (it.contains("GarageDoorOpener")) { addChildDevice("brbeaird", "MyQ Garage Door Opener", it, null, ["name": "MyQLite: " + doorsList[it]]) }			
-		} 
-	}
-
-	// Remove unselected devices
-	def deleteDevices = (selectedDevices) ? (getChildDevices().findAll { !selectedDevices.contains(it.deviceNetworkId) }) : getAllChildDevices()
-	deleteDevices.each { deleteChildDevice(it.deviceNetworkId) }    
-    
-    //Create subscriptions
-    if (door1Sensor)
-        subscribe(door1Sensor, "contact", sensorHandler)    
-    if (door2Sensor)    	
-        subscribe(door2Sensor, "contact", sensorHandler)
-    if (door3Sensor)        
-        subscribe(door3Sensor, "contact", sensorHandler)        
-    if (door4Sensor)    	
-        subscribe(door4Sensor, "contact", sensorHandler)
-        
-    if (door1Acceleration)
-        subscribe(door1Acceleration, "acceleration", sensorHandler)    
-    if (door2Acceleration)    	
-        subscribe(door2Acceleration, "acceleration", sensorHandler)
-    if (door3Acceleration)        
-        subscribe(door3Acceleration, "acceleration", sensorHandler)        
-    if (door4Acceleration)    	
-        subscribe(door4Acceleration, "acceleration", sensorHandler)
-        
-    //Set initial values
-    syncDoorsWithSensors()   
-}
-
-def syncDoorsWithSensors(child){	
-    def firstDoor = doors[0]
-        
-    //Handle single door (sometimes it's just a dumb string thanks to the simulator)
-    if (doors instanceof String)
-    firstDoor = doors
-    
-    def doorDNI = null
-    if (child) {								// refresh only the requesting door (makes things a bit more efficient if you have more than 1 door
-    	doorDNI = child.device.deviceNetworkId
-        switch (doorDNI) {
-        	case firstDoor:
-            	updateDoorStatus(firstDoor, door1Sensor, door1Acceleration, door1ThreeAxis, child)
-                break
-            case doors[1]:
-            	updateDoorStatus(doors[1], door2Sensor, door2Acceleration, door2ThreeAxis, child)
-                break
-            case doors[2]:
-            	updateDoorStatus(doors[2], door3Sensor, door3Acceleration, door3ThreeAxis, child)
-                break
-            case doors[3]:
-            	updateDoorStatus(doors[3], door4Sensor, door4Acceleration, door4ThreeAxis, child)
-     	}
-    } else {           					// refresh ALL the doors
-		if (firstDoor) updateDoorStatus(firstDoor, door1Sensor, door1Acceleration, door1ThreeAxis, null)
-		if (doors[1]) updateDoorStatus(doors[1], door2Sensor, door2Acceleration, door2ThreeAxis, null)
-		if (doors[2]) updateDoorStatus(doors[2], door3Sensor, door3Acceleration, door3ThreeAxis, null)
-		if (doors[3]) updateDoorStatus(doors[3], door4Sensor, door4Acceleration, door4ThreeAxis, null)
-    }
-}
-
-def updateDoorStatus(doorDNI, sensor, acceleration, threeAxis, child){
-	
-    //Get door to update and set the new value
-    def doorToUpdate = getChildDevice(doorDNI)
-    def doorName = state.data[doorDNI].name
-    
-    def value = "unknown"
-    def moving = "unknown"
-    def door = doorToUpdate.latestValue("door")
-    
-    if (acceleration) moving = acceleration.latestValue("acceleration")
-    if (sensor) value = sensor.latestValue("contact")
-
-    if (moving == "active") {
-    	if (value == "open") {			
-        	if (door != "opening") value = "closing" else value = "opening"  // if door is "open" or "waiting" change to "closing", else it must be "opening"
-    	} else if (value == "closed") { 
-        	if (door != "closing") 	value = "opening" else value = "closed"
-    	}
-    } else if (moving == "inactive") {
-    	if (door == "closing") {
-    		if (value == "open") { 	// just stopped but door is still open
-    			value = "stopped"
-        	}
-        }
-    }
-    	
-    doorToUpdate.updateDeviceStatus(value)
-    doorToUpdate.updateDeviceSensor("${sensor} is ${sensor.currentContact}")
-    
-    log.debug "Door: " + doorName + ": Updating with status - " + value + " -  from sensor " + sensor
-    
-    //Write to child log if this was initiated from one of the doors    
-    if (child)
-    	child.log("Door: " + doorName + ": Updating with status - " + value + " -  from sensor " + sensor)
- 
-     if (acceleration) {
-     	doorToUpdate.updateDeviceMoving("${acceleration} is ${moving}")
-        log.debug "Door: " + doorName + ": Updating with status - " + moving + " - from sensor " + acceleration
-        if (child)
-        	child.log("Door: " + doorName + ": Updating with status - " + moving + " - from sensor " + acceleration)
-     }
-    
-    //Get latest activity timestamp for the sensor (data saved for up to a week)
-    def eventsSinceYesterday = sensor.eventsSince(new Date() - 7)    
-    def latestEvent = eventsSinceYesterday[0]?.date
-    def timeStampLogText = "Door: " + doorName + ": Updating timestamp to: " + latestEvent + " -  from sensor " + sensor
-    
-    if (!latestEvent)	//If the door has been inactive for more than a week, timestamp data will be null. Keep current value in that case.
-    	timeStampLogText = "Door: " + doorName + ": Null timestamp detected "  + " -  from sensor " + sensor + " . Keeping current value."
-    else
-    	doorToUpdate.updateDeviceLastActivity(latestEvent)    	
-    	
-    log.debug timeStampLogText    
-    
-    //Write to child log if this was initiated from one of the doors
-    if (child)
-    	child.log(timeStampLogText)
-}
-
-def refresh(child){	
-    def door = child.device.deviceNetworkId
-    def doorName = state.data[door].name
-    child.log("refresh called from " + doorName + ' (' + door + ')')
-    syncDoorsWithSensors(child)
-}
-
-def sensorHandler(evt) {    
-    log.debug "Sensor change detected: Event name  " + evt.name + " value: " + evt.value   + " deviceID: " + evt.deviceId    
-    
-    switch (evt.deviceId) {
-    	case door1Sensor.id:
-        case door1Acceleration?.id:
-            def firstDoor = doors[0]
-			if (doors instanceof String) firstDoor = doors
-        	updateDoorStatus(firstDoor, door1Sensor, door1Acceleration, door1ThreeAxis, null)
-            break
-    	case door2Sensor?.id:
-        case door2Acceleration?.id:
-        	updateDoorStatus(doors[1], door2Sensor, door2Acceleration, door2ThreeAxis, null)
-            break    	
-        case door3Sensor?.id:
-        case door3Acceleration?.id:
-        	updateDoorStatus(doors[2], door3Sensor, door3Acceleration, door3ThreeAxis, null)
-            break        
-    	case door4Sensor?.id:
-        case door4Acceleration?.id:
-        	updateDoorStatus(doors[3], door4Sensor, door4Acceleration, door4ThreeAxis, null)
-            break
-        default:
-			syncDoorsWithSensors()
-    }
-}
-
-def getSelectedDevices( settingsName ) { 
-	def selectedDevices = [] 
-	(!settings.get(settingsName))?:((settings.get(settingsName)?.getAt(0)?.size() > 1)  ? settings.get(settingsName)?.each { selectedDevices.add(it) } : selectedDevices.add(settings.get(settingsName))) 
-	return selectedDevices 
-} 
-
-/* Access Management */
-private forceLogin() {
-	//Reset token and expiry
-	state.session = [ brandID: 0, brandName: settings.brand, securityToken: null, expiration: 0 ]
-	state.polling = [ last: 0, rescheduler: now() ]
-	state.data = [:]
-	return doLogin()
-}
-
-private login() { return (!(state.session.expiration > now())) ? doLogin() : true }
-
-private doLogin() { 
-	apiGet("/api/user/validate", [username: settings.username, password: settings.password] ) { response ->
-		log.debug "got login response: " + response
-        if (response.status == 200) {
-			if (response.data.SecurityToken != null) {
-				state.session.brandID = response.data.BrandId
-				state.session.brandName = response.data.BrandName
-				state.session.securityToken = response.data.SecurityToken
-				state.session.expiration = now() + 150000
-				return true
-			} else {
-				return false
-			}
-		} else {
-			return false
-		}
-	} 	
-}
-
-// Listing all the garage doors you have in MyQ
-private getDoorList() { 	    
-	def deviceList = [:]
-	apiGet("/api/v4/userdevicedetails/get", []) { response ->
-		if (response.status == 200) {
-        //log.debug "response data: " + response.data.Devices
-        //sendAlert("response data: " + response.data.Devices)
-			response.data.Devices.each { device ->
-				// 2 = garage door, 5 = gate, 7 = MyQGarage(no gateway), 17 = Garage Door Opener WGDO
-				if (device.MyQDeviceTypeId == 2||device.MyQDeviceTypeId == 5||device.MyQDeviceTypeId == 7||device.MyQDeviceTypeId == 17) {
-					log.debug "Found door: " + device.MyQDeviceId
-                    def dni = [ app.id, "GarageDoorOpener", device.MyQDeviceId ].join('|')
-					def description = ''
-                    def doorState = ''
-                    def updatedTime = ''
-                    device.Attributes.each { 
-						
-                        if (it.AttributeDisplayName=="desc")	//deviceList[dni] = it.Value                        	
-                        {
-                        	description = it.Value
-                        }
-                        	
-						if (it.AttributeDisplayName=="doorstate") { 
-                        	doorState = it.Value
-                            updatedTime = it.UpdatedTime							
-						}
-					}
-                    
-                    //Ignore any doors with blank descriptions
-                    if (description != ''){
-                        log.debug "adding door: " + description + "type: " + device.MyQDeviceTypeId + " status: " + doorState
-                        deviceList[dni] = description
-                        state.data[dni] = [ status: doorState, lastAction: updatedTime, name: description ]
-                    }
-				}
-			}
-		}
-	}    
-	return deviceList
-}
-
-private getDeviceList() { 	    
-	def deviceList = []
-	apiGet("/api/v4/userdevicedetails/get", []) { response ->
-		if (response.status == 200) {
-			response.data.Devices.each { device ->
-				log.debug "MyQDeviceTypeId : " + device.MyQDeviceTypeId.toString()
-				if (!(device.MyQDeviceTypeId == 1||device.MyQDeviceTypeId == 2||device.MyQDeviceTypeId == 3||device.MyQDeviceTypeId == 5||device.MyQDeviceTypeId == 7)) {					
-                    device.Attributes.each { 
-						def description = ''
-                        def doorState = ''
-                        def updatedTime = ''
-                        if (it.AttributeDisplayName=="desc")	//deviceList[dni] = it.Value
-                        	description = it.Value
-						
-                        //Ignore any doors with blank descriptions
-                        if (description != ''){
-                        	log.debug "found device: " + description
-                        	deviceList.add( device.MyQDeviceTypeId.toString() + "|" + device.TypeID )
-                        }
-					}
-				}
-			}
-		}
-	}    
-	return deviceList
-}
-
-/* api connection */
-// get URL 
-private getApiURL() {
-	if (settings.brand == "Craftsman") {
-		return "https://craftexternal.myqdevice.com"
-	} else {
-		return "https://myqexternal.myqdevice.com"
-	}
-}
-
-private getApiAppID() {
-	if (settings.brand == "Craftsman") {
-		return "QH5AzY8MurrilYsbcG1f6eMTffMCm3cIEyZaSdK/TD/8SvlKAWUAmodIqa5VqVAs"
-	} else {
-		return "JVM/G9Nwih5BwKgNCjLxiFUQxQijAebyyg8QUHr7JOrP+tuPb8iHfRHKwTmDzHOu"
-	}
-}
-	
-// HTTP GET call
-private apiGet(apiPath, apiQuery = [], callback = {}) {	
-	// set up query
-	apiQuery = [ appId: getApiAppID() ] + apiQuery
-	if (state.session.securityToken) { apiQuery = apiQuery + [SecurityToken: state.session.securityToken ] }
-       
-	try {
-		httpGet([ uri: getApiURL(), path: apiPath, query: apiQuery ]) { response -> callback(response) }
-	}	catch (SocketException e)	{
-		//sendAlert("API Error: $e")
-        log.debug "API Error: $e"
-	}
-}
-
-// HTTP PUT call
-private apiPut(apiPath, apiBody = [], callback = {}) {    
-	// set up body
-	apiBody = [ ApplicationId: getApiAppID() ] + apiBody
-	if (state.session.securityToken) { apiBody = apiBody + [SecurityToken: state.session.securityToken ] }
-    
-	// set up query
-	def apiQuery = [ appId: getApiAppID() ]
-	if (state.session.securityToken) { apiQuery = apiQuery + [SecurityToken: state.session.securityToken ] }
-    
-	try {
-		httpPut([ uri: getApiURL(), path: apiPath, contentType: "application/json; charset=utf-8", body: apiBody, query: apiQuery ]) { response -> callback(response) }
-	} catch (SocketException e)	{
-		log.debug "API Error: $e"
-	}
-}
-
-// Get Device ID
-def getChildDeviceID(child) {
-	return child.device.deviceNetworkId.split("\\|")[2]
-}
-
-// Get single device status
-def getDeviceStatus(child) {
-	return state.data[child.device.deviceNetworkId].status
-}
-
-// Get single device last activity
-def getDeviceLastActivity(child) {
-	return state.data[child.device.deviceNetworkId].lastAction.toLong()
-}
-
-// Send command to start or stop
-def sendCommand(child, attributeName, attributeValue) {
-	if (login()) {	    	
-		//Send command
-		apiPut("/api/v4/deviceattribute/putdeviceattribute", [ MyQDeviceId: getChildDeviceID(child), AttributeName: attributeName, AttributeValue: attributeValue ]) 
-        
-        if ((attributeName == "desireddoorstate") && (attributeValue == 0)) {		// if we are closing, check if we have an Acceleration sensor, if so, "waiting" until it moves
-            def firstDoor = doors[0]
-    		if (doors instanceof String) firstDoor = doors
-        	def doorDNI = child.device.deviceNetworkId
-        	switch (doorDNI) {
-        		case firstDoor:
-                	if (door1Acceleration) child.updateDeviceStatus("waiting") else child.updateDeviceStatus("opening")
-                	break
-            	case doors[1]:
-            		if (door2Acceleration) child.updateDeviceStatus("waiting") else child.updateDeviceStatus("opening")
-                	break
-            	case doors[2]:
-            		if (door3Acceleration) child.updateDeviceStatus("waiting") else child.updateDeviceStatus("opening")
-                	break
-            	case doors[3]:
-            		if (door4Acceleration) child.updateDeviceStatus("waiting") else child.updateDeviceStatus("opening")
-        			break
-            }
-        }      
-		return true
-	} 
-}
--- a/smartapps/smartthings/bose-soundtouch-connect.src/bose-soundtouch-connect.groovy
+++ b/smartapps/smartthings/bose-soundtouch-connect.src/bose-soundtouch-connect.groovy
@@ -19,9 +19,9 @@
    author: "SmartThings",
    description: "Control your Bose SoundTouch speakers",
    category: "SmartThings Labs",
-    iconUrl: "https://d3azp77rte0gip.cloudfront.net/smartapps/fcf1d93a-ba0b-4324-b96f-e5b5487dfaf5/images/BoseST_icon.png",
-    iconX2Url: "https://d3azp77rte0gip.cloudfront.net/smartapps/fcf1d93a-ba0b-4324-b96f-e5b5487dfaf5/images/BoseST_icon@2x.png",
-    iconX3Url: "https://d3azp77rte0gip.cloudfront.net/smartapps/fcf1d93a-ba0b-4324-b96f-e5b5487dfaf5/images/BoseST_icon@2x-1.png",
+    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",
    singleInstance: true
 )

@@ -104,7 +104,7 @@ def deviceDiscovery()

        return dynamicPage(name:"deviceDiscovery", title:"Discovery Started!", nextPage:"", refreshInterval:refreshInterval, install:true, uninstall: true) {
            section("Please wait while we discover your ${getDeviceName()}. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
-                input "selecteddevice", "enum", required:false, title:"Select ${getDeviceName()} (${numFound} found)", multiple:true, options:devices, submitOnChange: true
+                input "selecteddevice", "enum", required:false, title:"Select ${getDeviceName()} (${numFound} found)", multiple:true, options:devices
            }
        }
    }
@@ -196,8 +196,6 @@ def addDevice(){
            d = addChildDevice(getNameSpace(), getDeviceName(), dni, newDevice?.value.hub, [label:"${deviceName}"])
            d.boseSetDeviceID(newDevice.value.deviceID)
            log.trace "Created ${d.displayName} with id $dni"
-            // sync DTH with device, done here as it currently don't work from the DTH's installed() method
-            d.refresh()
        } else {
            log.trace "${d.displayName} with id $dni already exists"
        }
--- a/smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy
+++ b/smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy
@@ -842,7 +842,6 @@ private void storeThermostatData(thermostats) {
            minCoolingSetpoint: (stat.settings.coolRangeLow / 10),
            maxCoolingSetpoint: (stat.settings.coolRangeHigh / 10),
            autoMode: stat.settings.autoHeatCoolFeatureEnabled,
-            deviceAlive: stat.runtime.connected == true ? "true" : "false",
            auxHeatMode: (stat.settings.hasHeatPump) && (stat.settings.hasForcedAir || stat.settings.hasElectric || stat.settings.hasBoiler),
            temperature: (stat.runtime.actualTemperature / 10),
            heatingSetpoint: stat.runtime.desiredHeat / 10,
--- a/smartapps/smartthings/life360-connect.src/life360-connect.groovy
+++ b/smartapps/smartthings/life360-connect.src/life360-connect.groovy
@@ -289,12 +289,12 @@ def initializeLife360Connection() {
       		state.life360AccessToken = result.data.access_token
            return true;
   		}
-		log.info "Life360 initializeLife360Connection, response=${result.data}"
+		log.debug "Response=${result.data}"
        return false;
        
    }
    catch (e) {
-       log.error "Life360 initializeLife360Connection, error: $e"
+       log.debug e
       return false;
    }

@@ -656,7 +656,7 @@ def generateInitialEvent (member, childDevice) {
    
    try { // we are going to just ignore any errors
    
-    	log.info "Life360 generateInitialEvent($member, $childDevice)"
+    	log.debug "Generate Initial Event for New Device for Member = ${member.id}"
        
        def place = state.places.find{it.id==settings.place}
        
@@ -677,8 +677,6 @@ def generateInitialEvent (member, childDevice) {
        	// log.debug "Distance Away = ${distanceAway}"
  
  			boolean isPresent = (distanceAway <= placeRadius)
-
-			log.info "Life360 generateInitialEvent, member: ($memberLatitude, $memberLongitude), place: ($placeLatitude, $placeLongitude), radius: $placeRadius, dist: $distanceAway, present: $isPresent"
                
        	// log.debug "External Id=${app.id}:${member.id}"
        
@@ -720,7 +718,7 @@ def haversine(lat1, lon1, lat2, lon2) {

 def placeEventHandler() {

-	log.info "Life360 placeEventHandler: params=$params, settings.place=$settings.place"
+	log.debug "In placeEventHandler method."

 	// the POST to this end-point will look like:
    // POST http://test.com/webhook?circleId=XXXX&placeId=XXXX&userId=XXXX&direction=arrive
@@ -731,6 +729,8 @@ def placeEventHandler() {
    def direction = params?.direction
    def timestamp = params?.timestamp
    
+    log.debug "Life360 Event: Circle: ${circleId}, Place: ${placeId}, User: ${userId}, Direction: ${direction}"
+
    if (placeId == settings.place) {

 		def presenceState = (direction=="in")
@@ -745,10 +745,10 @@ def placeEventHandler() {

 		if (deviceWrapper) {
 			deviceWrapper.generatePresenceEvent(presenceState)
-    		log.debug "Life360 event raised on child device: ${externalId}"
+    		log.debug "Event raised on child device: ${externalId}"
 		}
   		else {
-    		log.warn "Life360 couldn't find child device associated with inbound Life360 event."
+    		log.debug "Couldn't find child device associated with inbound Life360 event."
    	}
    }