Modifying 'Publish a SmartApp for OpenT2T - Remove support for multiple subscriptions to a single device.'

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)
 }

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)
 }

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}"
 }

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)
 }

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

@@ -125,7 +125,7 @@ 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)
+    sendEvent(name: "checkInterval", value: 60 * 12, data: [protocol: "cloud", hubHardwareId: device.hub.hardwareID], displayed: false)
 }
 
 // Device Watch will ping the device to proactively determine if the device has gone offline

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"
 	}
 }
 

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

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)
 }

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) {

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

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

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) {

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

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

smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy

@@ -0,0 +1,662 @@
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.InvalidKeyException;
+
+/**
+ *  OpenT2T SmartApp Test
+ *
+ *  Copyright 2016 OpenT2T
+ *
+ *  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: "OpenT2T SmartApp Test",
+	namespace: "opent2t",
+	author: "OpenT2T",
+	description: "Test app to test end to end SmartThings scenarios via OpenT2T",
+	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")
+
+/** --------------------+---------------+-----------------------+------------------------------------
+ *  Device Type         | Attribute Name| Commands              | Attribute Values
+ *  --------------------+---------------+-----------------------+------------------------------------
+ *  switches            | switch        | on, off               | on, off
+ *  motionSensors       | motion        |                       | active, inactive
+ *  contactSensors      | contact       |                       | open, closed
+ *  presenceSensors     | presence      |                       | present, 'not present'
+ *  temperatureSensors  | temperature   |                       | <numeric, F or C according to unit>
+ *  accelerationSensors | acceleration  |                       | active, inactive
+ *  waterSensors        | water         |                       | wet, dry
+ *  lightSensors        | illuminance   |                       | <numeric, lux>
+ *  humiditySensors     | humidity      |                       | <numeric, percent>
+ *  locks               | lock          | lock, unlock          | locked, unlocked
+ *  garageDoors         | door          | open, close           | unknown, closed, open, closing, opening
+ *  cameras             | image         | take                  | <String>
+ *  thermostats         | thermostat    | setHeatingSetpoint,   | temperature, heatingSetpoint, coolingSetpoint,
+ *	                    |				| setCoolingSetpoint,   | thermostatSetpoint, thermostatMode,
+ *                      |				| off, heat, cool, auto,| thermostatFanMode, thermostatOperatingState
+ *                      |				| emergencyHeat,        |
+ *                      |				| setThermostatMode,    |
+ *                      |				| fanOn, fanAuto,       |
+ *                      |				| fanCirculate,         |
+ *                      |				| setThermostatFanMode  |
+ *  --------------------+---------------+-----------------------+------------------------------------
+ */
+
+//Device Inputs
+preferences {
+	section("Allow OpenT2T to control these things...") {
+		input "contactSensors", "capability.contactSensor", title: "Which Contact Sensors", multiple: true, required: false, hideWhenEmpty: true
+		input "garageDoors", "capability.garageDoorControl", title: "Which Garage Doors?", multiple: true, required: false, hideWhenEmpty: true
+ 		input "locks", "capability.lock", title: "Which Locks?", multiple: true, required: false, hideWhenEmpty: true
+		input "cameras", "capability.videoCapture", title: "Which Cameras?",  multiple: true, required: false, hideWhenEmpty: true
+		input "motionSensors", "capability.motionSensor", title: "Which Motion Sensors?", multiple: true, required: false, hideWhenEmpty: true
+		input "presenceSensors", "capability.presenceSensor", title: "Which Presence Sensors", multiple: true, required: false, hideWhenEmpty: true
+		input "switches", "capability.switch", title: "Which Switches and Lights?", multiple: true, required: false, hideWhenEmpty: true
+		input "thermostats", "capability.thermostat", title: "Which Thermostat?", multiple: true, required: false, hideWhenEmpty: true
+		input "waterSensors", "capability.waterSensor", title: "Which Water Leak Sensors?", multiple: true, required: false, hideWhenEmpty: true
+	}
+}
+
+def getInputs() {
+	def inputList = []
+	inputList += contactSensors?: []
+	inputList += garageDoors?: []
+	inputList += locks?: []
+	inputList += cameras?: []
+	inputList += motionSensors?: []
+	inputList += presenceSensors?: []
+	inputList += switches?: []
+	inputList += thermostats?: []
+	inputList += waterSensors?: []
+    return inputList
+}
+
+//API external Endpoints
+mappings {
+	path("/devices") {
+		action: [
+			GET: "getDevices"
+		]
+	}
+	path("/devices/:id") {
+		action: [
+			GET: "getDevice"
+		]
+	}
+	path("/update/:id") {
+		action: [
+		  PUT: "updateDevice"
+		]
+	}
+	path("/deviceSubscription") {
+		action: [
+		  POST: "registerDeviceChange",
+		  DELETE: "unregisterDeviceChange"
+		]
+	}
+    path("/locationSubscription") {
+		action: [
+		  POST: "registerDeviceGraph",
+		  DELETE: "unregisterDeviceGraph"
+		]
+	}
+}
+
+def installed() {
+	log.debug "Installing with settings: ${settings}"
+	initialize()
+}
+
+def updated() {
+	log.debug "Updating with settings: ${settings}"
+	
+    //Initialize state variables if didn't exist.
+    if( state.deviceSubscriptionMap == null ){
+		state.deviceSubscriptionMap = [:]
+		log.debug "deviceSubscriptionMap created."
+	}
+    if( state.locationSubscriptionMap == null ){
+		state.locationSubscriptionMap = [:]
+		log.debug "locationSubscriptionMap created."
+	}
+    if(state.verificationKeyMap == null){
+    	state.verificationKeyMap = [:]
+		log.debug "verificationKeyMap created."
+    }
+    
+	unsubscribe()
+	registerAllDeviceSubscriptions()
+}
+
+def initialize() {
+	log.debug "Initializing with settings: ${settings}"
+	state.deviceSubscriptionMap = [:]
+	log.debug "deviceSubscriptionMap created."
+    state.locationSubscriptionMap = [:]
+	log.debug "locationSubscriptionMap created."
+    state.verificationKeyMap = [:]
+	log.debug "verificationKeyMap created."
+    registerAllDeviceSubscriptions()
+}
+
+/*** Subscription Functions  ***/
+
+//Subscribe events for all devices
+def registerAllDeviceSubscriptions() {
+	registerChangeHandler(inputs)
+}
+
+//Subscribe to events from a list of devices
+def registerChangeHandler(myList) {
+	myList.each { myDevice ->
+		def theAtts = myDevice.supportedAttributes
+		theAtts.each {att ->
+			subscribe(myDevice, att.name, deviceEventHandler)
+			log.info "Registering for ${myDevice.displayName}.${att.name}"
+		}
+	}
+}
+
+//Endpoints function: Subscribe to events from a specific device
+def registerDeviceChange() {
+	def subscriptionEndpt = params.subscriptionURL
+	def deviceId = params.deviceId
+   	def myDevice = findDevice(deviceId)
+    
+	if( myDevice == null ){
+		httpError(404, "Cannot find device with device ID ${deviceId}.")
+	}
+    
+	def theAtts = myDevice.supportedAttributes
+	try {
+		theAtts.each {att ->
+			subscribe(myDevice, att.name, deviceEventHandler)
+		}
+        log.info "Subscribing for ${myDevice.displayName}"
+
+        if(subscriptionEndpt != null){
+			if(state.deviceSubscriptionMap[deviceId] == null){
+				state.deviceSubscriptionMap.put(deviceId, [subscriptionEndpt])
+				log.info "Added subscription URL: ${subscriptionEndpt} for ${myDevice.displayName}"
+			} else if (!state.deviceSubscriptionMap[deviceId].contains(subscriptionEndpt)){
+				// state.deviceSubscriptionMap[deviceId] << subscriptionEndpt
+                // For now, we will only have one subscription endpoint per device
+				state.deviceSubscriptionMap.remove(deviceId)
+				state.deviceSubscriptionMap.put(deviceId, [subscriptionEndpt])
+				log.info "Added subscription URL: ${subscriptionEndpt} for ${myDevice.displayName}"
+			}
+            
+            if(params.key != null){
+            	state.verificationKeyMap[subscriptionEndpt] = params.key
+				log.info "Added verification key: ${params.key} for ${subscriptionEndpt}"
+            }
+        }
+	} catch (e) {
+		httpError(500, "something went wrong: $e")
+	}
+
+	log.info "Current subscription map is ${state.deviceSubscriptionMap}"
+    log.info "Current verification key map is ${state.verificationKeyMap}"
+	return ["succeed"]
+}
+
+//Endpoints function: Unsubscribe to events from a specific device
+def unregisterDeviceChange() {
+	def subscriptionEndpt = params.subscriptionURL
+	def deviceId = params.deviceId
+	def myDevice = findDevice(deviceId)
+    
+	if( myDevice == null ){
+		httpError(404, "Cannot find device with device ID ${deviceId}.")
+	}
+    
+	try {
+		if(subscriptionEndpt != null && subscriptionEndpt != "undefined"){
+			if (state.deviceSubscriptionMap[deviceId]?.contains(subscriptionEndpt)){
+				if(state.deviceSubscriptionMap[deviceId].size() == 1){
+					state.deviceSubscriptionMap.remove(deviceId)
+				} else {
+					state.deviceSubscriptionMap[deviceId].remove(subscriptionEndpt)
+				}
+                state.verificationKeyMap.remove(subscriptionEndpt)
+				log.info "Removed subscription URL: ${subscriptionEndpt} for ${myDevice.displayName}"
+			}
+        } else {
+			state.deviceSubscriptionMap.remove(deviceId)
+			log.info "Unsubscriping for ${myDevice.displayName}"
+		}
+	} catch (e) {
+		httpError(500, "something went wrong: $e")
+	}
+
+	log.info "Current subscription map is ${state.deviceSubscriptionMap}"
+    log.info "Current verification key map is ${state.verificationKeyMap}"
+}
+
+//Endpoints function: Subscribe to device additiona/removal updated in a location
+def registerDeviceGraph() {
+	def subscriptionEndpt = params.subscriptionURL
+    
+    if (subscriptionEndpt != null && subscriptionEndpt != "undefined"){
+        subscribe(location, "DeviceCreated", locationEventHandler, [filterEvents: false])
+        subscribe(location, "DeviceUpdated", locationEventHandler, [filterEvents: false])
+        subscribe(location, "DeviceDeleted", locationEventHandler, [filterEvents: false])
+
+    	if(state.locationSubscriptionMap[location.id] == null){
+            state.locationSubscriptionMap.put(location.id, [subscriptionEndpt])
+			log.info "Added subscription URL: ${subscriptionEndpt} for Location ${location.name}"
+        }else if (!state.locationSubscriptionMap[location.id].contains(subscriptionEndpt)){
+            state.locationSubscriptionMap[location.id] << subscriptionEndpt
+			log.info "Added subscription URL: ${subscriptionEndpt} for Location ${location.name}"
+        }
+        
+        if(params.key != null){
+            state.verificationKeyMap[subscriptionEndpt] = params.key
+			log.info "Added verification key: ${params.key} for ${subscriptionEndpt}"
+        }
+        
+        log.info "Current location subscription map is ${state.locationSubscriptionMap}"
+        log.info "Current verification key map is ${state.verificationKeyMap}"
+        return ["succeed"]
+    } else {
+        httpError(400, "missing input parameter: subscriptionURL")
+    }
+}
+
+//Endpoints function: Unsubscribe to events from a specific device
+def unregisterDeviceGraph() {
+	def subscriptionEndpt = params.subscriptionURL
+    
+	try {
+		if(subscriptionEndpt != null && subscriptionEndpt != "undefined"){
+			if (state.locationSubscriptionMap[location.id]?.contains(subscriptionEndpt)){
+				if(state.locationSubscriptionMap[location.id].size() == 1){
+					state.locationSubscriptionMap.remove(location.id)
+				} else {
+					state.locationSubscriptionMap[location.id].remove(subscriptionEndpt)
+				}
+                state.verificationKeyMap.remove(subscriptionEndpt)
+				log.info "Removed subscription URL: ${subscriptionEndpt} for Location ${location.name}"
+			}
+        }else{
+        	httpError(400, "missing input parameter: subscriptionURL")
+        }
+	} catch (e) {
+		httpError(500, "something went wrong: $e")
+	}
+
+	log.info "Current location subscription map is ${state.locationSubscriptionMap}"
+    log.info "Current verification key map is ${state.verificationKeyMap}"
+}
+
+//When events are triggered, send HTTP post to web socket servers
+def deviceEventHandler(evt) {
+	def evtDevice = evt.device
+	def evtDeviceType = getDeviceType(evtDevice)
+	def deviceData = [];
+   	
+    if(evt.data != null){
+		def evtData = parseJson(evt.data)
+		log.info "Received event for ${evtDevice.displayName}, data: ${evtData},  description: ${evt.descriptionText}"
+	}
+    
+    if(evtDeviceType == "thermostat") {
+		deviceData = [name: evtDevice.displayName, id: evtDevice.id, status:evtDevice.status, deviceType:evtDeviceType, manufacturer:evtDevice.manufacturerName, model:evtDevice.modelName, attributes: deviceAttributeList(evtDevice, evtDeviceType), locationMode: getLocationModeInfo(), locationId: location.id ]
+	} else {
+		deviceData = [name: evtDevice.displayName, id: evtDevice.id, status:evtDevice.status, deviceType:evtDeviceType, manufacturer:evtDevice.manufacturerName, model:evtDevice.modelName, attributes: deviceAttributeList(evtDevice, evtDeviceType), locationId: location.id ]
+	}
+    
+    def params = [ body: deviceData ]
+    
+	//send event to all subscriptions urls
+	log.debug "Current subscription urls for ${evtDevice.displayName} is ${state.deviceSubscriptionMap[evtDevice.id]}"
+	state.deviceSubscriptionMap[evtDevice.id].each {
+		params.uri = "${it}"
+        if(state.verificationKeyMap[it] != null ){
+        	def key = state.verificationKeyMap[it]
+            params.header = [Signature: ComputHMACValue(key, groovy.json.JsonOutput.toJson(params.body))]
+        }
+		log.trace "POST URI: ${params.uri}"
+        log.trace "Header: ${params.header}"
+		log.trace "Payload: ${params.body}"
+		try{
+			httpPostJson(params) { resp ->
+				log.trace "response status code: ${resp.status}"
+				log.trace "response data: ${resp.data}"
+			}
+		} catch (e) {
+			log.error "something went wrong: $e"
+		}
+	}
+}
+
+def locationEventHandler(evt) {
+	log.info "Received event for location ${location.name}/${location.id}, Event: ${evt.name}, description: ${evt.descriptionText}, apiServerUrl: ${apiServerUrl("")}"
+    switch(evt.name){
+    	case "DeviceCreated":
+        case "DeviceDeleted":
+        	def evtDevice = evt.device
+            def evtDeviceType = getDeviceType(evtDevice)
+            def params = [ body: [ eventType:evt.name, deviceId: evtDevice.id, locationId: location.id ] ]
+            
+            if (evt.name == "DeviceDeleted" && state.deviceSubscriptionMap[deviceId] != null){
+            	state.deviceSubscriptionMap.remove(evtDevice.id)
+            }
+        
+            state.locationSubscriptionMap[location.id].each {
+                params.uri = "${it}"
+                if(state.verificationKeyMap[it] != null ){
+                    def key = state.verificationKeyMap[it]
+                    params.header = [Signature: ComputHMACValue(key, groovy.json.JsonOutput.toJson(params.body))]
+                }
+                log.trace "POST URI: ${params.uri}"
+				log.trace "Header: ${params.header}"
+                log.trace "Payload: ${params.body}"
+                try{
+                    httpPostJson(params) { resp ->
+                        log.trace "response status code: ${resp.status}"
+                        log.trace "response data: ${resp.data}"
+                    }
+                } catch (e) {
+                    log.error "something went wrong: $e"
+                }
+            }
+    	case "DeviceUpdated":
+        default:
+        break
+    }
+}
+
+private ComputHMACValue(key, data){
+	try {
+        SecretKeySpec secretKeySpec = new SecretKeySpec(key.getBytes("UTF-8"), "HmacSHA1")
+		Mac mac = Mac.getInstance("HmacSHA1")
+		mac.init(secretKeySpec)
+		byte[] digest = mac.doFinal(data.getBytes("UTF-8"))
+		return byteArrayToString(digest)
+	} catch (InvalidKeyException e) {  
+     	log.error "Invalid key exception while converting to HMac SHA1"
+	}
+}
+
+private def byteArrayToString(byte[] data) {
+	BigInteger bigInteger = new BigInteger(1, data)
+    String hash = bigInteger.toString(16)
+	return hash
+}
+
+/*** Device Query/Update Functions  ***/
+
+//Endpoints function: return all device data in json format
+def getDevices() {
+	def deviceData = [] 
+	inputs?.each {
+		def deviceType = getDeviceType(it)
+		if(deviceType == "thermostat") {
+			deviceData << [name: it.displayName, id: it.id, status:it.status, deviceType:deviceType, manufacturer:it.manufacturerName, model:it.modelName, attributes: deviceAttributeList(it, deviceType), locationMode: getLocationModeInfo()]
+		} else {
+			deviceData << [name: it.displayName, id: it.id, status:it.status, deviceType:deviceType, manufacturer:it.manufacturerName, model:it.modelName, attributes: deviceAttributeList(it, deviceType)]
+		} 
+	}
+ 
+	log.debug "getDevices, return: ${deviceData}"
+	return deviceData
+}
+
+//Endpoints function: get device data
+def getDevice() {	
+	def it = findDevice(params.id)
+	def deviceType = getDeviceType(it)
+	def device
+	if(deviceType == "thermostat") {
+		device = [name: it.displayName, id: it.id, status:it.status, deviceType:deviceType, manufacturer:it.manufacturerName, model:it.modelName, attributes: deviceAttributeList(it,deviceType), locationMode: getLocationModeInfo()]
+	} else {
+		device = [name: it.displayName, id: it.id, status:it.status, deviceType:deviceType, manufacturer:it.manufacturerName, model:it.modelName, attributes: deviceAttributeList(it, deviceType)]
+	}
+
+	log.debug "getDevice, return: ${device}"
+	return device
+}
+
+//Endpoints function: update device data
+void updateDevice() {	
+	def device = findDevice(params.id)
+	request.JSON.each {   
+		def command = it.key
+		def value = it.value
+		if (command){
+			def commandList = mapDeviceCommands(command, value)
+			command = commandList[0]
+			value = commandList[1]
+			
+			if (command == "setAwayMode") {
+				log.info "Setting away mode to ${value}"
+				if (location.modes?.find {it.name == value}) {
+					location.setMode(value)
+				}
+			}else if (command == "thermostatSetpoint"){
+				switch(device.currentThermostatMode){
+					case "cool":
+						log.info "Update: ${device.displayName}, [${command}, ${value}]"
+						device.setCoolingSetpoint(value)
+						break
+					case "heat":
+					case "emergency heat":
+						log.info "Update: ${device.displayName}, [${command}, ${value}]"
+						device.setHeatingSetpoint(value)
+						break
+					default:
+						httpError(501, "this mode: ${device.currentThermostatMode} does not allow changing thermostat setpoint.")
+						break
+				}
+			}else if (!device) {
+				log.error "updateDevice, Device not found"
+				httpError(404, "Device not found")
+			} else if (!device.hasCommand(command)) {
+				log.error "updateDevice, Device does not have the command"
+				httpError(404, "Device does not have such command")
+			} else {
+				if (command == "setColor") {
+					log.info "Update: ${device.displayName}, [${command}, ${value}]"
+					device."$command"(hex: value)
+				} else if(value.isNumber()) {
+					def intValue = value as Integer
+					log.info "Update: ${device.displayName}, [${command}, ${intValue}(int)]"
+					device."$command"(intValue)
+				} else if (value){
+					log.info "Update: ${device.displayName}, [${command}, ${value}]"
+					device."$command"(value)
+				} else {
+					log.info "Update: ${device.displayName}, [${command}]"
+					device."$command"()
+				}
+			}
+		}
+	}
+}
+
+/*** Private Functions ***/
+
+//Return current location mode info
+private getLocationModeInfo() {
+	return [mode: location.mode, supported: location.modes.name]
+}
+
+//Map each device to a type given it's capabilities
+private getDeviceType(device) {
+	def deviceType
+	def capabilities = device.capabilities
+	log.debug "capabilities: [${device}, ${capabilities}]"
+	log.debug "supported commands: [${device}, ${device.supportedCommands}]"
+    
+	//Loop through the device capability list to determine the device type.
+	capabilities.each {capability ->
+		switch(capability.name.toLowerCase())
+		{
+			case "switch":
+				deviceType = "switch"
+
+				//If the device also contains "Switch Level" capability, identify it as a "light" device.
+				if (capabilities.any{it.name.toLowerCase() == "switch level"}){
+                	
+                    //If the device also contains "Power Meter" capability, identify it as a "dimmerSwitch" device.
+                    if (capabilities.any{it.name.toLowerCase() == "power meter"}){
+                        deviceType = "dimmerSwitch"
+                        return deviceType
+                    } else {
+                        deviceType = "light"
+                        return deviceType
+                    }
+                }
+				break
+			case "garageDoorControl":
+				deviceType = "garageDoor"
+				return deviceType
+			case "lock":
+				deviceType = "lock"
+				return deviceType
+			case "video camera":
+				deviceType = "camera"
+				return deviceType
+			case "thermostat":
+				deviceType = "thermostat"
+				return deviceType    
+			case "acceleration sensor":
+			case "contact sensor":
+			case "motion sensor":
+			case "presence sensor":
+			case "water sensor":
+				deviceType = "genericSensor"
+				return deviceType
+			default:
+				break
+		}
+	}
+	return deviceType
+}
+
+//Return a specific device give the device ID.
+private findDevice(deviceId) {
+	return inputs?.find { it.id == deviceId }
+}
+ 
+//Return a list of device attributes
+private deviceAttributeList(device, deviceType) {
+	def attributeList = [:]
+	def allAttributes = device.supportedAttributes
+	allAttributes.each { attribute ->
+        	try {
+			def currentState = device.currentState(attribute.name)
+            		if(currentState != null ){
+                		switch(attribute.name){
+                    		case 'temperature':
+                        		attributeList.putAll([ (attribute.name): currentState.value, 'temperatureScale':location.temperatureScale ])
+                        		break;
+	                    	default:
+        	                	attributeList.putAll([(attribute.name): currentState.value ])
+                	        	break;
+                		}
+                		if( deviceType == "genericSensor" ){
+                    			def key = attribute.name + "_lastUpdated"
+                			attributeList.putAll([ (key): currentState.isoDate ])
+                		}
+	            	} else {
+            			attributeList.putAll([ (attribute.name): null ]);
+            		}
+		} catch(e) {
+			attributeList.putAll([ (attribute.name): null ]);
+		}
+	}
+    return attributeList
+}
+
+//Map device command and value. 
+//input command and value are from UWP,
+//returns resultCommand and resultValue that corresponds with function and value in SmartApps
+private mapDeviceCommands(command, value) {
+	log.debug "mapDeviceCommands: [${command}, ${value}]"
+	def resultCommand = command
+	def resultValue = value
+	switch (command) {
+		case "switch":
+			if (value == 1 || value == "1" || value == "on") {
+				resultCommand = "on"
+				resultValue = ""
+			} else if (value == 0 || value == "0" || value == "off") {
+				resultCommand = "off"
+				resultValue = ""
+			}
+			break
+		// light attributes
+		case "level":
+			resultCommand = "setLevel"
+			resultValue = value
+			break
+		case "hue":
+			resultCommand = "setHue"
+			resultValue = value
+			break
+		case "saturation":
+			resultCommand = "setSaturation"
+			resultValue = value
+			break
+		case "colorTemperature":
+			resultCommand = "setColorTemperature"
+			resultValue = value
+			break
+		case "color":	
+			resultCommand = "setColor"
+			resultValue = value
+		// thermostat attributes
+		case "hvacMode":
+			resultCommand = "setThermostatMode"
+			resultValue = value
+			break
+		case "fanMode":
+			resultCommand = "setThermostatFanMode"
+			resultValue = value
+			break
+		case "awayMode":
+			resultCommand = "setAwayMode"
+			resultValue = value
+			break
+		case "coolingSetpoint":
+			resultCommand = "setCoolingSetpoint"
+			resultValue = value
+			break
+		case "heatingSetpoint":	
+			resultCommand = "setHeatingSetpoint"
+			resultValue = value
+			break
+		case "thermostatSetpoint":
+			resultCommand = "thermostatSetpoint"
+			resultValue = value
+			break
+		// lock attributes
+		case "locked":
+			if (value == 1 || value == "1" || value == "lock") {
+				resultCommand = "lock"
+				resultValue = ""
+			}
+			else if (value == 0 || value == "0" || value == "unlock") {
+				resultCommand = "unlock"
+				resultValue = ""
+			}
+			break
+		default:
+			break
+	 }
+	 
+	 return [resultCommand,resultValue]
+}

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"
         }

smartapps/thehomeremote-homeremote/home-remote.src/home-remote.groovy

@@ -1,800 +0,0 @@
-/**
- *  Home Remote
- *
- *  Copyright 2015 The Home Remote
- *
- *  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: "Home Remote",
-    namespace: "thehomeremote.homeremote",
-    author: "The Home Remote",
-    description: "Web service that enables communication between the Home Remote app and a SmartThings hub.",
-    category: "My Apps",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    oauth: [displayName: "The Home Remote", displayLink: "http://thehomeremote.com/"])
-
-
-preferences {
-    section() {
-	input "accelerationSensors", "capability.accelerationSensor",title: "Acceleration Sensors", multiple: true, required: false
-	input "alarms", "capability.alarm",title: "Alarms", multiple: true, required: false
-	input "batteries", "capability.battery",title: "Batteries", multiple: true, required: false
-	input "beacons", "capability.beacon",title: "Beacons", multiple: true, required: false
-	input "buttonGroup", "capability.button",title: "Buttons", multiple: true, required: false
-	input "carbonMonoxideDetectors", "capability.carbonMonoxideDetector",title: "CO Detectors", multiple: true, required: false
-	input "colorControls", "capability.colorControl",title: "Color Lights", multiple: true, required: false
-	input "contactSensors", "capability.contactSensor",title: "Contact Sensors", multiple: true, required: false
-	input "doorControls", "capability.doorControl",title: "Door Controllers", multiple: true, required: false
-	input "energyMeters", "capability.energyMeter",title: "Energy Meters", multiple: true, required: false
-	input "illuminanceMeasurements", "capability.illuminanceMeasurement",title: "Illuminance Sensors", multiple: true, required: false
-	input "imageCaptures", "capability.imageCapture",title: "Cameras", multiple: true, required: false
-	input "locks", "capability.lock",title: "Locks", multiple: true, required: false
-	input "mediaControllers", "capability.mediaController",title: "Media Controllers", multiple: true, required: false
-	input "momentaries", "capability.momentary",title: "Momentary Buttons", multiple: true, required: false
-	input "motionSensors", "capability.motionSensor",title: "Motion Sensors", multiple: true, required: false
-	input "musicPlayers", "capability.musicPlayer",title: "Music Players", multiple: true, required: false
-	input "powerMeters", "capability.powerMeter",title: "Power Meters", multiple: true, required: false
-	input "presenceSensors", "capability.presenceSensor",title: "Presence Sensors", multiple: true, required: false
-	input "relativeHumidityMeasurements", "capability.relativeHumidityMeasurement",title: "Humidity Sensors", multiple: true, required: false
-	input "relaySwitches", "capability.relaySwitch",title: "Relays", multiple: true, required: false
-	input "signalStrengths", "capability.signalStrength",title: "Signal Strengths", multiple: true, required: false
-	input "sleepSensors", "capability.sleepSensor",title: "Sleep Sensors", multiple: true, required: false
-	input "smokeDetectors", "capability.smokeDetector",title: "Smoke Detectors", multiple: true, required: false
-	input "speechSyntheses", "capability.speechSynthesis",title: "Speech Syntheses", multiple: true, required: false
-	input "stepSensors", "capability.stepSensor",title: "Step Sensors", multiple: true, required: false
-	input "switches", "capability.switch",title: "Switches", multiple: true, required: false
-	input "switchLevels", "capability.switchLevel",title: "Dimmers", multiple: true, required: false
-	input "temperatureMeasurements", "capability.temperatureMeasurement",title: "Temperature Sensors", multiple: true, required: false
-	input "thermostats", "capability.thermostat",title: "Thermostats", multiple: true, required: false
-	input "threeAxes", "capability.threeAxis",title: "Three axis Sensors", multiple: true, required: false
-	input "tones", "capability.tone",title: "Tones", multiple: true, required: false
-	input "touchSensors", "capability.touchSensor",title: "Touch Sensors", multiple: true, required: false
-	input "valves", "capability.valve",title: "Valves", multiple: true, required: false
-	input "waterSensors", "capability.waterSensor",title: "Water Sensors", multiple: true, required: false
-    }
-}
-
-mappings {
-  path("/GetCurrentValues") {
-    action: [
-      GET: "getCurrentValues"
-    ]
-  }
-  path("/GetCurrentValuesWithDisplayName") {
-    action: [
-      GET: "getCurrentValuesWithDisplayName"
-    ]
-  }
-  path("/GetRoutines") {
-    action: [
-      GET: "getRoutines"
-    ]
-  }
-  path("/ExecuteCommand") {
-    action: [
-      PUT: "executeCommand"
-    ]
-  }
-  path("/ExecuteRoutine") {
-    action: [
-      PUT: "executeRoutine"
-    ]
-  }
-}
-
-def getCurrentValues() {
-    def resp = []    
-        
- 	accelerationSensors.each {
-      resp << [id: it.id, capability: "AccelerationSensor", attribute: "acceleration", value: it.currentValue("acceleration")]
-    }
-
-	alarms.each {
-      resp << [id: it.id, capability: "Alarm", attribute: "alarm", value: it.currentValue("alarm")]
-    }
-
-	batteries.each {
-      resp << [id: it.id, capability: "Battery", attribute: "battery", value: it.currentValue("battery")]
-    }
-
-	beacons.each {
-      resp << [id: it.id, capability: "Beacon", attribute: "presence", value: it.currentValue("presence")]
-    }
-
-	buttonGroup.each {
-      resp << [id: it.id, capability: "Button", attribute: "button", value: it.currentValue("button")]
-    }
-
-	carbonMonoxideDetectors.each {
-      resp << [id: it.id, capability: "CarbonMonoxideDetector", attribute: "carbonMonoxide", value: it.currentValue("carbonMonoxide")]
-    }
-
-	colorControls.each {
-      resp << [id: it.id, capability: "ColorControl", attribute: "hue", value: it.currentValue("hue")]
-    }
-
-	colorControls.each {
-      resp << [id: it.id, capability: "ColorControl", attribute: "saturation", value: it.currentValue("saturation")]
-    }
-
-	colorControls.each {
-      resp << [id: it.id, capability: "ColorControl", attribute: "color", value: it.currentValue("color")]
-    }
-
-	contactSensors.each {
-      resp << [id: it.id, capability: "ContactSensor", attribute: "contact", value: it.currentValue("contact")]
-    }
-
-	doorControls.each {
-      resp << [id: it.id, capability: "DoorControl", attribute: "door", value: it.currentValue("door")]
-    }
-
-	energyMeters.each {
-      resp << [id: it.id, capability: "EnergyMeter", attribute: "energy", value: it.currentValue("energy")]
-    }
-
-	illuminanceMeasurements.each {
-      resp << [id: it.id, capability: "IlluminanceMeasurement", attribute: "illuminance", value: it.currentValue("illuminance")]
-    }
-
-	imageCaptures.each {
-      resp << [id: it.id, capability: "ImageCapture", attribute: "image", value: it.currentValue("image")]
-    }
-
-	locks.each {
-      resp << [id: it.id, capability: "Lock", attribute: "lock", value: it.currentValue("lock")]
-    }
-
-	mediaControllers.each {
-      resp << [id: it.id, capability: "MediaController", attribute: "activities", value: it.currentValue("activities")]
-    }
-
-	mediaControllers.each {
-      resp << [id: it.id, capability: "MediaController", attribute: "currentActivity", value: it.currentValue("currentActivity")]
-    }
-
-	motionSensors.each {
-      resp << [id: it.id, capability: "MotionSensor", attribute: "motion", value: it.currentValue("motion")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, capability: "MusicPlayer", attribute: "status", value: it.currentValue("status")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, capability: "MusicPlayer", attribute: "level", value: it.currentValue("level")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, capability: "MusicPlayer", attribute: "trackDescription", value: it.currentValue("trackDescription")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, capability: "MusicPlayer", attribute: "trackData", value: it.currentValue("trackData")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, capability: "MusicPlayer", attribute: "mute", value: it.currentValue("mute")]
-    }
-
-	powerMeters.each {
-      resp << [id: it.id, capability: "PowerMeter", attribute: "power", value: it.currentValue("power")]
-    }
-
-	presenceSensors.each {
-      resp << [id: it.id, capability: "PresenceSensor", attribute: "presence", value: it.currentValue("presence")]
-    }
-
-	relativeHumidityMeasurements.each {
-      resp << [id: it.id, capability: "RelativeHumidityMeasurement", attribute: "humidity", value: it.currentValue("humidity")]
-    }
-
-	relaySwitches.each {
-      resp << [id: it.id, capability: "RelaySwitch", attribute: "switch", value: it.currentValue("switch")]
-    }
-
-	signalStrengths.each {
-      resp << [id: it.id, capability: "SignalStrength", attribute: "lqi", value: it.currentValue("lqi")]
-    }
-
-	signalStrengths.each {
-      resp << [id: it.id, capability: "SignalStrength", attribute: "rssi", value: it.currentValue("rssi")]
-    }
-
-	sleepSensors.each {
-      resp << [id: it.id, capability: "SleepSensor", attribute: "sleeping", value: it.currentValue("sleeping")]
-    }
-
-	smokeDetectors.each {
-      resp << [id: it.id, capability: "SmokeDetector", attribute: "smoke", value: it.currentValue("smoke")]
-    }
-
-	stepSensors.each {
-      resp << [id: it.id, capability: "StepSensor", attribute: "steps", value: it.currentValue("steps")]
-    }
-
-	stepSensors.each {
-      resp << [id: it.id, capability: "StepSensor", attribute: "goal", value: it.currentValue("goal")]
-    }
-
-	switches.each {
-      resp << [id: it.id, capability: "Switch", attribute: "switch", value: it.currentValue("switch")]
-    }
-
-	switchLevels.each {
-      resp << [id: it.id, capability: "SwitchLevel", attribute: "level", value: it.currentValue("level")]
-    }
-
-	temperatureMeasurements.each {
-      resp << [id: it.id, capability: "TemperatureMeasurement", attribute: "temperature", value: it.currentValue("temperature")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, capability: "Thermostat", attribute: "temperature", value: it.currentValue("temperature")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, capability: "Thermostat", attribute: "heatingSetpoint", value: it.currentValue("heatingSetpoint")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, capability: "Thermostat", attribute: "coolingSetpoint", value: it.currentValue("coolingSetpoint")]
-    }
-
-	//Commented out on 7/23/2016.   This randomly started throwing number format exceptions with either my ecobee or Lyric thermostat.
-	//thermostats.each {
-    //  resp << [id: it.id, capability: "Thermostat", attribute: "thermostatSetpoint", value: it.currentValue("thermostatSetpoint")]
-    //}
-
-	thermostats.each {
-      resp << [id: it.id, capability: "Thermostat", attribute: "thermostatMode", value: it.currentValue("thermostatMode")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, capability: "Thermostat", attribute: "thermostatFanMode", value: it.currentValue("thermostatFanMode")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, capability: "Thermostat", attribute: "thermostatOperatingState", value: it.currentValue("thermostatOperatingState")]
-    }
-
-	threeAxes.each {
-      resp << [id: it.id, capability: "ThreeAxis", attribute: "threeAxis", value: it.currentValue("threeAxis")]
-    }
-
-	touchSensors.each {
-      resp << [id: it.id, capability: "TouchSensor", attribute: "touch", value: it.currentValue("touch")]
-    }
-
-	valves.each {
-      resp << [id: it.id, capability: "Valve", attribute: "contact", value: it.currentValue("contact")]
-    }
-
-	waterSensors.each {
-      resp << [id: it.id, capability: "WaterSensor", attribute: "water", value: it.currentValue("water")]
-    }
-   
-   	//resp << [id: 0, capability: "Heartbeat", attribute: "heartbeat", value: String.valueOf(state.heartbeat)]
-    
-    state.heartbeat = !state.heartbeat
-    
-    return resp
-}
-
-def getCurrentValuesWithDisplayName() {
-    def resp = []    
-        
- 	accelerationSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "AccelerationSensor", attribute: "acceleration", value: it.currentValue("acceleration")]
-    }
-
-	alarms.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Alarm", attribute: "alarm", value: it.currentValue("alarm")]
-    }
-
-	batteries.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Battery", attribute: "battery", value: it.currentValue("battery")]
-    }
-
-	beacons.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Beacon", attribute: "presence", value: it.currentValue("presence")]
-    }
-
-	buttonGroup.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Button", attribute: "button", value: it.currentValue("button")]
-    }
-
-	carbonMonoxideDetectors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "CarbonMonoxideDetector", attribute: "carbonMonoxide", value: it.currentValue("carbonMonoxide")]
-    }
-
-	colorControls.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "ColorControl", attribute: "hue", value: it.currentValue("hue")]
-    }
-
-	colorControls.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "ColorControl", attribute: "saturation", value: it.currentValue("saturation")]
-    }
-
-	colorControls.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "ColorControl", attribute: "color", value: it.currentValue("color")]
-    }
-
-	contactSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "ContactSensor", attribute: "contact", value: it.currentValue("contact")]
-    }
-
-	doorControls.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "DoorControl", attribute: "door", value: it.currentValue("door")]
-    }
-
-	energyMeters.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "EnergyMeter", attribute: "energy", value: it.currentValue("energy")]
-    }
-
-	illuminanceMeasurements.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "IlluminanceMeasurement", attribute: "illuminance", value: it.currentValue("illuminance")]
-    }
-
-	imageCaptures.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "ImageCapture", attribute: "image", value: it.currentValue("image")]
-    }
-
-	locks.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Lock", attribute: "lock", value: it.currentValue("lock")]
-    }
-
-	mediaControllers.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MediaController", attribute: "activities", value: it.currentValue("activities")]
-    }
-
-	mediaControllers.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MediaController", attribute: "currentActivity", value: it.currentValue("currentActivity")]
-    }
-
-	motionSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MotionSensor", attribute: "motion", value: it.currentValue("motion")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MusicPlayer", attribute: "status", value: it.currentValue("status")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MusicPlayer", attribute: "level", value: it.currentValue("level")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MusicPlayer", attribute: "trackDescription", value: it.currentValue("trackDescription")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MusicPlayer", attribute: "trackData", value: it.currentValue("trackData")]
-    }
-
-	musicPlayers.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "MusicPlayer", attribute: "mute", value: it.currentValue("mute")]
-    }
-
-	powerMeters.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "PowerMeter", attribute: "power", value: it.currentValue("power")]
-    }
-
-	presenceSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "PresenceSensor", attribute: "presence", value: it.currentValue("presence")]
-    }
-
-	relativeHumidityMeasurements.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "RelativeHumidityMeasurement", attribute: "humidity", value: it.currentValue("humidity")]
-    }
-
-	relaySwitches.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "RelaySwitch", attribute: "switch", value: it.currentValue("switch")]
-    }
-
-	signalStrengths.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "SignalStrength", attribute: "lqi", value: it.currentValue("lqi")]
-    }
-
-	signalStrengths.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "SignalStrength", attribute: "rssi", value: it.currentValue("rssi")]
-    }
-
-	sleepSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "SleepSensor", attribute: "sleeping", value: it.currentValue("sleeping")]
-    }
-
-	smokeDetectors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "SmokeDetector", attribute: "smoke", value: it.currentValue("smoke")]
-    }
-
-	stepSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "StepSensor", attribute: "steps", value: it.currentValue("steps")]
-    }
-
-	stepSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "StepSensor", attribute: "goal", value: it.currentValue("goal")]
-    }
-
-	switches.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Switch", attribute: "switch", value: it.currentValue("switch")]
-    }
-
-	switchLevels.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "SwitchLevel", attribute: "level", value: it.currentValue("level")]
-    }
-
-	temperatureMeasurements.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "TemperatureMeasurement", attribute: "temperature", value: it.currentValue("temperature")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "temperature", value: it.currentValue("temperature")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "heatingSetpoint", value: it.currentValue("heatingSetpoint")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "coolingSetpoint", value: it.currentValue("coolingSetpoint")]
-    }
-
-	//Commented out on 7/23/2016.   This randomly started throwing number format exceptions with either my ecobee or Lyric thermostat.
-	//thermostats.each {
-    //  resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "thermostatSetpoint", value: it.currentValue("thermostatSetpoint")]
-    //}
-
-	thermostats.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "thermostatMode", value: it.currentValue("thermostatMode")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "thermostatFanMode", value: it.currentValue("thermostatFanMode")]
-    }
-
-	thermostats.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "thermostatOperatingState", value: it.currentValue("thermostatOperatingState")]
-    }
-
-	threeAxes.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "ThreeAxis", attribute: "threeAxis", value: it.currentValue("threeAxis")]
-    }
-
-	touchSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "TouchSensor", attribute: "touch", value: it.currentValue("touch")]
-    }
-
-	valves.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Valve", attribute: "contact", value: it.currentValue("contact")]
-    }
-
-	waterSensors.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "WaterSensor", attribute: "water", value: it.currentValue("water")]
-    }
-   
-    momentaries.each {
-      resp << [id: it.id, displayName: it.displayName, capability: "Momentary", attribute: "", value: ""]
-    }
-   
-    //resp << [id: 0, displayName: "Heartbeat", capability: "Heartbeat", attribute: "heartbeat", value: state.heartbeat]
-    
-    return resp
-}
-
-def getDevices(capability){
-
-	def result
-
-	switch (capability) {
-    	case "Alarm":
-        	result = alarms
-        	break
-    	case "ColorControl":
-        	result = colorControls
-        	break
-    	case "DoorControl":
-        	result = doorControls
-        	break
-        case "ImageCapture":
-        	result = imageCaptures
-        	break
-    	case "Lock":
-        	result = locks
-        	break
-        case "MediaController":
-        	result = mediaControllers
-        	break
-    	case "Momentary":
-        	result = momentaries
-        	break
-        case "MusicPlayer":
-        	result = musicPlayers
-        	break
-        case "RelaySwitch":
-        	result = relaySwitches
-        	break
-    	case "SpeechSynthesis":
-        	result = speechSyntheses
-        	break
-    	case "Switch":
-        	result = switches
-        	break
-        case "SwitchLevel":
-        	result = switchLevels
-        	break
-    	case "Thermostat":
-        	result = thermostats
-        	break
-		case "ThermostatCoolingSetpoint":
-        	result = thermostatCoolingSetpoints
-        	break
-    	case "ThermostatFanMode":
-        	result = thermostatFanModes
-        	break
-        case "ThermostatHeatingSetpoint":
-        	result = thermostatHeatingSetpoints
-        	break
-    	case "ThermostatMode":
-        	result = thermostatModes
-        	break
-    	case "Tone":
-        	result = tones
-        	break
-        case "Valve":
-        	result = valves
-        	break     
-    	default:
-        	result = valves
-	}
-	return result
-}
-
-def getDoorControlCommand(value){
-	def result
-	switch (value) {
-        case "closed":
-        	result = "close"
-        	break
-    	case "open":
-        	result = "open"
-        	break
-    	default:
-        	result = value
-	}    
-	return result
-}
-
-def getLockCommand(value){
-	def result
-	switch (value) {
-        case "locked":
-        	result = "lock"
-        	break
-    	case "unlocked":
-        	result = "unlock"
-        	break
-    	default:
-        	result = value
-	}    
-	return result
-}
-
-def getMuteCommand(value){
-	def result
-	switch (value) {
-        case "muted":
-        	result = "mute"
-        	break
-    	case "unmuted":
-        	result = "unmute"
-        	break
-    	default:
-        	result = value
-	}    
-	return result
-}
-
-def getContactCommand(value){
-	def result
-	switch (value) {
-        case "closed":
-        	result = "close"
-        	break
-    	case "open":
-        	result = "open"
-        	break
-    	default:
-        	result = value
-	}    
-	return result
-}
-
-def getRoutines() {
-	return location.helloHome?.getPhrases()*.label
-}
-
-def getThermostatFanModeCommand(value){
-	def result
-	switch (value) {
-        case "on":
-        	result = "fanOn"
-        	break
-    	case "auto":
-        	result = "fanAuto"
-        	break
-    	case "circulate":
-        	result = "fanCirculate"
-        	break
-    	default:
-        	result = value
-	}    
-	return result
-}
-
-void executeCommand() {    
-    def deviceId = request.JSON?.deviceId
-    def capability = request.JSON?.capability
-    def attribute = request.JSON?.attribute 
-    def value = request.JSON?.value    
-    if (deviceId) {
-		def devices = getDevices(capability)
-        def command
-        def valueIsParameter = false
-        def valueIsInteger = false
-        switch (attribute) {    	       	
-        	case "hue":
-        		command = "setHue"
-                valueIsParameter = true
-                valueIsInteger = true
-        		break
-    		case "saturation":
-        		command = "setSaturation"
-                valueIsParameter = true
-                valueIsInteger = true
-        		break
-    		case "color":
-        		command = "setColor"
-                def rgb = hexToRgb(value)
-                def hsl = rgbToHSL(rgb)
-                value = [hue:hsl.h.toInteger(), saturation:hsl.s.toInteger()]
-                valueIsParameter = true				
-        		break
-			case "level":
-        		command = "setLevel"
-                valueIsParameter = true
-                valueIsInteger = true
-        		break            
-        	case "heatingSetpoint":
-        		command = "setHeatingSetpoint"
-                valueIsParameter = true
-        		break    
-       		case "coolingSetpoint":
-        		command = "setCoolingSetpoint"
-                valueIsParameter = true
-        		break
-          	case "currentActivity":
-        		command = "startActivity"
-                valueIsParameter = true
-        		break  
- 	  		case "door":
-        		command = getDoorControlCommand(value)
-        		break    
-      		case "lock":
-        		command = getLockCommand(value)
-        		break           
-      		case "mute":
-        		command = getMuteCommand(value)
-        		break         
-      		case "thermostatFanMode":
-        		command = getThermostatFanModeCommand(value)
-        		break         
-       		case "thermostatMode":
-        		if (value == "emergency heat") {
-                	command = "emergencyHeat"
-           		}
-                else
-                {
-                    command = value
-                }
-        		break     
-      		case "contact":
-        		command = getContactCommand(value)
-        		break
-    		default:
-        		command = value
-		}
-        devices.each {
-        	if (it.id == deviceId) {
-                // check that the device supports the specified command
-                // If not, return an error using httpError, providing a HTTP status code.
-            	if (!it.hasCommand(command)) {
-                	httpError(501, "$command is not a valid command for the device")
-            	}                
-                if(valueIsParameter){
-                	if(valueIsInteger){
-                		it."$command"(value as int)
-                	}
-                	else{
-                		it."$command"(value)
-                	}   
-                }
-                else{
-                	it."$command"()
-                }   
-           }       
-        }
-    }
-}
-
-void executeRoutine() {   
-	def routine = request.JSON?.routine
-    location.helloHome?.execute(routine)
-}
-
-def rgbToHSL(rgb) {
-	def r = rgb.r / 255
-    def g = rgb.g / 255
-    def b = rgb.b / 255
-    def h = 0
-    def s = 0
-    def l = 0
-    
-    def var_min = [r,g,b].min()
-    def var_max = [r,g,b].max()
-    def del_max = var_max - var_min
-    
-    l = (var_max + var_min) / 2
-    
-    if (del_max == 0) {
-            h = 0
-            s = 0
-    } else {
-    	if (l < 0.5) { s = del_max / (var_max + var_min) } 
-        else { s = del_max / (2 - var_max - var_min) }
-
-        def del_r = (((var_max - r) / 6) + (del_max / 2)) / del_max
-        def del_g = (((var_max - g) / 6) + (del_max / 2)) / del_max
-        def del_b = (((var_max - b) / 6) + (del_max / 2)) / del_max
-
-        if (r == var_max) { h = del_b - del_g } 
-        else if (g == var_max) { h = (1 / 3) + del_r - del_b } 
-        else if (b == var_max) { h = (2 / 3) + del_g - del_r }
-        
-		if (h < 0) { h += 1 }
-        if (h > 1) { h -= 1 }
-	}
-    def hsl = [:]    
-    hsl = [h: h * 100, s: s * 100, l: l]
-    
-    hsl
-}
-
-def hexToRgb(colorHex) {
-	def rrInt = Integer.parseInt(colorHex.substring(1,3),16)
-    def ggInt = Integer.parseInt(colorHex.substring(3,5),16)
-    def bbInt = Integer.parseInt(colorHex.substring(5,7),16)
-    
-    def colorData = [:]
-    colorData = [r: rrInt, g: ggInt, b: bbInt]
-    colorData
-}
-
-def installed() {
-	state.heartbeat = false
-}
-
-def updated() {
-	state.heartbeat = false
-}