MSA-1739: Integrates Hunter Douglas window shades controlled by their Platinum Gateway bridge.

Rolling down staging hotfix to master

devicetypes/schwark/platinum-gateway-scene-switch.src/platinum-gateway-scene-switch.groovy

@@ -0,0 +1,71 @@
+ /**
+ *  Hunter Douglas Platinum Gateway Scene Control Switch for SmartThings
+ *  Schwark Satyavolu
+ *  Originally based on: Allan Klein's (@allanak) and Mike Maxwell's code
+ *
+ *  Usage:
+ *  1. Add this code as a device handler in the SmartThings IDE
+ *  3. Create a device using PlatinumGatewaySceneSwitch as the device handler using a hexadecimal representation of IP:port as the device network ID value
+ *  For example, a gateway at 192.168.1.222:522 would have a device network ID of C0A801DE:20A
+ *  Note: Port 522 is the default Hunter Douglas Platinum Gateway port so you shouldn't need to change anything after the colon
+ *  4. Enjoy the new functionality of the SmartThings app
+ * 
+ *  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.
+ *
+ */
+
+metadata {
+	definition (name: "Platinum Gateway Scene Switch", namespace: "schwark", author: "Schwark Satyavolu") {
+	capability "Switch"
+	command "setSceneNo", ["string"]
+	command "runScene"
+	}
+
+simulator {
+		// TODO: define status and reply messages here
+	}
+
+tiles {
+	standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
+        	state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
+        	state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
+   		}
+	}
+
+preferences {
+}
+
+    main "switch"
+    details(["switch"])
+}
+
+def updated() {
+}
+
+def runScene() {
+	parent.runScene(state.sceneNo)
+}
+
+def on() {
+	runScene()
+	sendEvent(name: "switch", value: "on")
+}
+
+def off() {
+	runScene()
+	sendEvent(name: "switch", value: "off")
+}
+
+def setSceneNo(sceneNo) {
+	state.sceneNo = sceneNo
+}
+
+
+

devicetypes/schwark/platinum-gateway-shade-switch.src/platinum-gateway-shade-switch.groovy

@@ -0,0 +1,86 @@
+/**
+ *  Hunter Douglas Platinum Gateway Shade Control Switch for SmartThings
+ *  Schwark Satyavolu
+ *  Originally based on: Allan Klein's (@allanak) and Mike Maxwell's code
+ *
+ *  Usage:
+ *  1. Add this code as a device handler in the SmartThings IDE
+ *  3. Create a device using PlatinumGatewayShadeSwitch as the device handler using a hexadecimal representation of IP:port as the device network ID value
+ *  For example, a gateway at 192.168.1.222:522 would have a device network ID of C0A801DE:20A
+ *  Note: Port 522 is the default Hunter Douglas Platinum Gateway port so you shouldn't need to change anything after the colon
+ *  4. Enjoy the new functionality of the SmartThings app
+ * 
+ *  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.
+ *
+ */
+
+metadata {
+	definition (name: "Platinum Gateway Shade Switch", namespace: "schwark", author: "Schwark Satyavolu") {
+	capability "Switch"
+	capability "Switch Level"
+	command "setShadeNo", ["string"]
+	}
+
+simulator {
+		// TODO: define status and reply messages here
+	}
+
+tiles {
+	standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
+        	state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
+        	state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
+   		}
+	controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false) {
+		state "level", action:"switch level.setLevel"
+	}
+}
+
+preferences {
+}
+
+    main "switch"
+    details(["switch", "levelSliderControl"])
+}
+
+def installed() {
+	log.debug("installed Shade with settings ${settings}")
+	initialize()
+}
+
+def initialize() {
+}
+
+def updated() {
+}
+
+def on() {
+	return setLevel(100)
+}
+
+def off() {
+	return setLevel(0)
+}
+
+def setLevel(percent) {
+	parent.setShadeLevel(state.shadeNo, percent)
+	if(percent == 100) {
+		sendEvent(name: "switch", value: "on")
+	} else if (percent == 0) {
+		sendEvent(name: "switch", value: "off")
+	}
+	sendEvent(name: "level", value: percent)
+}
+
+def setShadeNo(shadeNo) {
+	state.shadeNo = shadeNo
+}
+
+
+

devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy

@@ -120,6 +120,15 @@ 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,6 +109,15 @@ 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 "Polling"
+        capability "Health Check"
 
         /**
          * Define all commands, ie, if you have a custom action not
@@ -236,7 +236,33 @@ def parse(String event) {
  * @return action(s) to take or null
  */
 def installed() {
-    onAction("refresh")
+    // 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)
 }
 
 /**
@@ -316,14 +342,6 @@ 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
  */
@@ -837,6 +855,10 @@ def boseRefreshNowPlaying(delay=0) {
     return boseGET("/now_playing")
 }
 
+def boseSendGetNowPlaying() {
+    sendHubCommand(boseGET("/now_playing"))
+}
+
 /**
  * Requests the list of presets
  *
@@ -1014,4 +1036,8 @@ def boseGetDeviceID() {
  */
 def getDeviceIP() {
     return parent.resolveDNI2Address(device.deviceNetworkId)
+}
+
+def TRACE(text) {
+    log.trace "${text}"
 }

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

@@ -81,51 +81,47 @@ metadata {
 // parse events into attributes
 def parse(String description) {
 	log.debug "Parse description $description"
-	def map = [:]
-	if (description?.startsWith("read attr -")) {
-		def descMap = parseDescriptionAsMap(description)
-		log.debug "Desc Map: $descMap"
-		if (descMap.cluster == "0201" && descMap.attrId == "0000") {
+	List result = []
+	def descMap = zigbee.parseDescriptionAsMap(description)
+	log.debug "Desc Map: $descMap"
+	List attrData = [[cluster: descMap.cluster ,attrId: descMap.attrId, value: descMap.value]]
+	descMap.additionalAttrs.each {
+	    attrData << [cluster: descMap.cluster, attrId: it.attrId, value: it.value]
+	}
+	attrData.each {
+		def map = [:]
+		if (it.cluster == "0201" && it.attrId == "0000") {
 			log.debug "TEMP"
 			map.name = "temperature"
-			map.value = getTemperature(descMap.value)
+			map.value = getTemperature(it.value)
 			map.unit = temperatureScale
-		} else if (descMap.cluster == "0201" && descMap.attrId == "0011") {
+		} else if (it.cluster == "0201" && it.attrId == "0011") {
 			log.debug "COOLING SETPOINT"
 			map.name = "coolingSetpoint"
-			map.value = getTemperature(descMap.value)
+			map.value = getTemperature(it.value)
 			map.unit = temperatureScale
-		} else if (descMap.cluster == "0201" && descMap.attrId == "0012") {
+		} else if (it.cluster == "0201" && it.attrId == "0012") {
 			log.debug "HEATING SETPOINT"
 			map.name = "heatingSetpoint"
-			map.value = getTemperature(descMap.value)
+			map.value = getTemperature(it.value)
 			map.unit = temperatureScale
-		} else if (descMap.cluster == "0201" && descMap.attrId == "001c") {
+		} else if (it.cluster == "0201" && it.attrId == "001c") {
 			log.debug "MODE"
 			map.name = "thermostatMode"
-			map.value = getModeMap()[descMap.value]
-		} else if (descMap.cluster == "0202" && descMap.attrId == "0000") {
+			map.value = getModeMap()[it.value]
+		} else if (it.cluster == "0202" && it.attrId == "0000") {
 			log.debug "FAN MODE"
 			map.name = "thermostatFanMode"
-			map.value = getFanModeMap()[descMap.value]
+			map.value = getFanModeMap()[it.value]
 		}
+		if (map) {
+			result << createEvent(map)
+		}
+		log.debug "Parse returned $map"
 	}
-
-	def result = null
-	if (map) {
-		result = createEvent(map)
-	}
-	log.debug "Parse returned $map"
 	return result
 }
 
-def parseDescriptionAsMap(description) {
-	(description - "read attr - ").split(",").inject([:]) { map, param ->
-		def nameAndValue = param.split(":")
-		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-	}
-}
-
 def getModeMap() { [
 	"00":"off",
 	"03":"cool",

devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy

@@ -183,6 +183,15 @@ 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/dimmer-switch.src/dimmer-switch.groovy

@@ -22,9 +22,10 @@ metadata {
 		capability "Sensor"
 		capability "Health Check"
 
-		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "Z-Wave Wall Dimmer"
-		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "Z-Wave Wall Dimmer"
-		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "Z-Wave Plug-In Dimmer"
+		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "GE In-Wall Smart Dimmer "
+		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "GE In-Wall Smart Dimmer "
+		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "GE Plug-In Smart Dimmer "
+		fingerprint mfr:"0063", prod:"4944", model:"3034", deviceJoinName: "GE In-Wall Smart Fan Control"
 	}
 
 	simulator {

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", hubHardwareId: device.hub.hardwareID], displayed: false)
+    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

devicetypes/smartthings/ge-link-bulb.src/ge-link-bulb.groovy

@@ -99,7 +99,7 @@ def parse(String description) {
 
 def poll() {
     def refreshCmds = [
-        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
+        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 2000"
     ]
 
     return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh()
@@ -197,7 +197,7 @@ def off() {
 
 def refresh() {
     def refreshCmds = [
-        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
+        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 2000"
     ]
 
     return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig()

devicetypes/smartthings/life360-user.src/life360-user.groovy

@@ -39,7 +39,7 @@ metadata {
 }
 
 def generatePresenceEvent(boolean present) {
-	log.debug "Here in generatePresenceEvent!"
+	log.info "Life360 generatePresenceEvent($present)"
 	def value = formatValue(present)
 	def linkText = getLinkText(device)
 	def descriptionText = formatDescriptionText(linkText, present)

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 != "false") {
+	if (finalResult) {
 		log.info finalResult
 		if (finalResult.type == "update") {
 			log.info "$device updates: ${finalResult.value}"
@@ -128,9 +128,9 @@ def setLevel(value) {
 
 def refresh() {
 	[
-			"st rattr 0x${device.deviceNetworkId} ${endpointId} 6 0", "delay 500",
-			"st rattr 0x${device.deviceNetworkId} ${endpointId} 8 0", "delay 500",
-			"st rattr 0x${device.deviceNetworkId} ${endpointId} 0x0B04 0x050B", "delay 500"
+			"st rattr 0x${device.deviceNetworkId} ${endpointId} 6 0", "delay 2000",
+			"st rattr 0x${device.deviceNetworkId} ${endpointId} 8 0", "delay 2000",
+			"st rattr 0x${device.deviceNetworkId} ${endpointId} 0x0B04 0x050B", "delay 2000"
 	]
 
 }
@@ -212,13 +212,16 @@ 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 "false"
+		return [:]
 	}
 }
 
@@ -252,7 +255,7 @@ def isDescriptionOnOff(descMap) {
 		return	[type: "switch", value : switchValue]
 	}
 	else {
-		return "false"
+		return [:]
 	}
 
 }
@@ -279,10 +282,9 @@ def isDescriptionLevel(descMap) {
 
 	if (dimmerValue != -1){
 		return	[type: "level", value : dimmerValue]
-
 	}
 	else {
-		return "false"
+		return [:]
 	}
 }
 
@@ -304,16 +306,16 @@ def isDescriptionPower(descMap) {
 		return	[type: "power", value : powerValue]
 	}
 	else {
-		return "false"
+		return [:]
 	}
 }
 
 
 def onOffConfig() {
 	[
-			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 6 {${device.zigbeeId}} {}", "delay 200",
-			"zcl global send-me-a-report 6 0 0x10 0 600 {01}",
-			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
+			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 6 {${device.zigbeeId}} {}", "delay 2000",
+			"zcl global send-me-a-report 6 0 0x10 0 600 {01}", "delay 200",
+			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
 	]
 }
 
@@ -321,9 +323,9 @@ def onOffConfig() {
 //min level change is 01
 def levelConfig() {
 	[
-			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 8 {${device.zigbeeId}} {}", "delay 200",
-			"zcl global send-me-a-report 8 0 0x20 5 3600 {01}",
-			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
+			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 8 {${device.zigbeeId}} {}", "delay 2000",
+			"zcl global send-me-a-report 8 0 0x20 5 3600 {01}", "delay 200",
+			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
 	]
 }
 
@@ -331,9 +333,10 @@ def levelConfig() {
 //min change in value is 05
 def powerConfig() {
 	[
-		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
+		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 2000",
 		"zcl global send-me-a-report 0x0B04 0x050B 0x29 1 600 {05 00}",				//The send-me-a-report is custom to the attribute type for CentraLite
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
+		"delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
 	]
 }
 
@@ -342,7 +345,10 @@ def setLevelWithRate(level, rate) {
 		rate = "0000"
 	}
 	level = convertToHexString(level * 255 / 100) 				//Converting the 0-100 range to 0-FF range in hex
-	"st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {$level $rate}"
+	[
+			"st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {$level $rate}",
+			"delay 2000"
+	]
 }
 
 String convertToHexString(value, width=2) {

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

@@ -51,7 +51,7 @@ def on() {
 			'zcl on-off on',
 			'delay 200',
 			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 500'
+			'delay 2000'
 
 	]
 
@@ -62,6 +62,6 @@ def off() {
 			'zcl on-off off',
 			'delay 200',
 			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 500'
+			'delay 2000'
 	]
 }

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

@@ -157,9 +157,10 @@ def configure() {
 //min change in value is 01
 def powerConfig() {
 	[
-		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
+		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 2000",
 		"zcl global send-me-a-report 0x0B04 0x050B 0x29 1 600 {05 00}",				//The send-me-a-report is custom to the attribute type for CentraLite
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
+		"delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
 	]
 }
 

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

@@ -29,9 +29,10 @@ metadata {
 		command "enrollResponse"
 
 
-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315-S", deviceJoinName: "Water Leak Sensor"
-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315"
-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315-Seu", deviceJoinName: "Water Leak Sensor"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-S", deviceJoinName: "Water Leak Sensor"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-Seu", deviceJoinName: "Water Leak Sensor"
+		fingerprint inClusters: "0000,0001,0003,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-L", deviceJoinName: "Iris Smart Water Sensor"
 		fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "moisturev4", deviceJoinName: "Water Leak Sensor"
 	}
 
@@ -128,7 +129,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00){
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [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]}"
@@ -285,8 +286,8 @@ def ping() {
 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
 	def refreshCmds = [
-		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
-		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
+		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 2000",
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 2000"
 	]
 
 	return refreshCmds + enrollResponse()
@@ -308,10 +309,10 @@ def enrollResponse() {
 	[
 		//Resending the CIE in case the enroll request is sent before CIE is written
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000",
 		//Enroll Response
-		"raw 0x500 {01 23 00 00 00}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+		"raw 0x500 {01 23 00 00 00}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
 	]
 }
 

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
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [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]}"
@@ -298,8 +298,8 @@ def ping() {
 def refresh() {
 	log.debug "refresh called"
 	def refreshCmds = [
-		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
-		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
+		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 2000",
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 2000"
 	]
 
 	return refreshCmds + enrollResponse()
@@ -321,10 +321,10 @@ def enrollResponse() {
 	[
 		//Resending the CIE in case the enroll request is sent before CIE is written
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000",
 		//Enroll Response
-		"raw 0x500 {01 23 00 00 00}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+		"raw 0x500 {01 23 00 00 00}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
 	]
 }
 

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

@@ -57,6 +57,7 @@ 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)
@@ -64,7 +65,7 @@ private Map parseBasicMessage(description) {
 		def handlerName = value
 		def isStateChange = isStateChange(device, name, value)
 
-		def results = [
+		results = [
 				name           : name,
 				value          : value,
 				linkText       : linkText,
@@ -73,8 +74,6 @@ private Map parseBasicMessage(description) {
 				isStateChange  : isStateChange,
 				displayed      : displayed(description, isStateChange)
 		]
-	} else {
-		results = [:]
 	}
 	log.debug "Parse returned $results.descriptionText"
 	return results

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
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [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)
-	sendEvent(name: 'status', value: value, descriptionText: descriptionText, translatable: true)
+	return [name: 'status', value: value, descriptionText: descriptionText, translatable: true]
 }
 
 private getAccelerationResult(numValue) {
@@ -428,10 +428,10 @@ def enrollResponse() {
 	[
 		//Resending the CIE in case the enroll request is sent before CIE is written
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000",
 		//Enroll Response
 		"raw 0x500 {01 23 00 00 00}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
 	]
 }
 

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
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [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]}"
@@ -252,8 +252,8 @@ def ping() {
 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
 	def refreshCmds = [
-        "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
-		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
+        "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 2000",
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 2000"
 	]
 
 	return refreshCmds + enrollResponse()
@@ -277,10 +277,10 @@ def enrollResponse() {
 	[
 		//Resending the CIE in case the enroll request is sent before CIE is written
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000",
 		//Enroll Response
-		"raw 0x500 {01 23 00 00 00}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+		"raw 0x500 {01 23 00 00 00}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
 	]
 }
 

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
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [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]}"
@@ -270,9 +270,9 @@ def configure() {
 
 	log.debug "Configuring Reporting and Bindings."
 	def humidityConfigCmds = [
-		"zdo bind 0x${device.deviceNetworkId} 1 1 0xFC45 {${device.zigbeeId}} {}", "delay 500",
-		"zcl global send-me-a-report 0xFC45 0 0x29 30 3600 {6400}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 500"
+		"zdo bind 0x${device.deviceNetworkId} 1 1 0xFC45 {${device.zigbeeId}} {}", "delay 2000",
+		"zcl global send-me-a-report 0xFC45 0 0x29 30 3600 {6400}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
 	]
 
 	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity

devicetypes/smartthings/testing/simulated-minimote.src/simulated-minimote.groovy

@@ -126,6 +126,15 @@ 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/testing/simulated-switch.src/simulated-switch.groovy

@@ -12,7 +12,7 @@
  *
  */
 metadata {
-	
+
     definition (name: "Simulated Switch", namespace: "smartthings/testing", author: "bob") {
 		capability "Switch"
         capability "Relay Switch"
@@ -39,9 +39,7 @@ metadata {
 	}
 }
 
-def parse(String description) {
-	def pair = description.split(":")
-	createEvent(name: pair[0].trim(), value: pair[1].trim())
+def parse(description) {
 }
 
 def on() {

devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy

@@ -86,7 +86,7 @@ def parse(String description) {
 	def bodyString = msg.body
 	if (bodyString) {
 		unschedule("setOffline")
-		def body = new XmlSlurper().parseText(bodyString)
+        def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", ""))
 
 		if (body?.property?.TimeSyncRequest?.text()) {
 			log.trace "Got TimeSyncRequest"

devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy

@@ -78,7 +78,7 @@ def parse(String description) {
 	def bodyString = msg.body
 	if (bodyString) {
     	unschedule("setOffline")
-		def body = new XmlSlurper().parseText(bodyString)
+        def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", ""))
 		if (body?.property?.TimeSyncRequest?.text()) {
 			log.trace "Got TimeSyncRequest"
 			result << timeSyncResponse()

devicetypes/smartthings/wemo-switch.src/wemo-switch.groovy

@@ -84,7 +84,7 @@ def parse(String description) {
     def bodyString = msg.body
     if (bodyString) {
     	unschedule("setOffline")
-        def body = new XmlSlurper().parseText(bodyString)
+        def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", ""))
  		if (body?.property?.TimeSyncRequest?.text()) {
         	log.trace "Got TimeSyncRequest"
         	result << timeSyncResponse()
@@ -208,7 +208,7 @@ def subscribe(ip, port) {
     def existingIp = getDataValue("ip")
     def existingPort = getDataValue("port")
     if (ip && ip != existingIp) {
-         log.debug "Updating ip from $existingIp to $ip"    
+         log.debug "Updating ip from $existingIp to $ip"
     	 updateDataValue("ip", ip)
     	 def ipvalue = convertHexToIP(getDataValue("ip"))
          sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP changed to ${ipvalue}")
@@ -291,4 +291,4 @@ User-Agent: CyberGarage-HTTP/1.0
 </u:GetBinaryState>
 </s:Body>
 </s:Envelope>""", physicalgraph.device.Protocol.LAN)
-}
+}

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

@@ -28,8 +28,8 @@ metadata {
 
         fingerprint inClusters: "0000, 0001, 0003, 0020, 0402, 0B05", outClusters: "0003, 0006, 0008, 0019", manufacturer: "OSRAM", model: "LIGHTIFY Dimming Switch", deviceJoinName: "OSRAM LIGHTIFY Dimming Switch"
         //fingerprint inClusters: "0000, 0001, 0003, 0020, 0500", outClusters: "0003,0019", manufacturer: "CentraLite", model: "3455-L", deviceJoinName: "Iris Care Pendant"
-        //fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0402, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model: "3460-L", deviceJoinName: "Iris Smart Button"
-        //fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model:"3450-L", deviceJoinName: "Iris KeyFob"
+        fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0402, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model: "3460-L", deviceJoinName: "Iris Smart Button"
+        fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model:"3450-L", deviceJoinName: "Iris KeyFob"
     }
 
     simulator {}

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

@@ -23,9 +23,15 @@ 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: "OSRAM LIGHTIFY LED Smart Connected Light"
+        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, 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"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0702, 0B05", outClusters: "0019", manufacturer: "sengled", model: "E11-G13", deviceJoinName: "Sengled Element Classic"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL6HD", deviceJoinName: "Leviton Dimmer Switch"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL3HL", deviceJoinName: "Leviton Lumina RF Plug-In Dimmer"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL1KD", deviceJoinName: "Leviton Lumina RF Dimmer Switch"
     }
 
     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: "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"
+		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"
 	}
 
 	// UI tile definitions

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

@@ -32,11 +32,12 @@ 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: "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"
+        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"
     }
 
     // UI tile definitions

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

@@ -22,6 +22,7 @@ metadata {
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0006", outClusters: "0003, 0006, 0019, 0406", manufacturer: "Leviton", model: "ZSS-10", deviceJoinName: "Leviton Switch"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0006", outClusters: "000A", manufacturer: "HAI", model: "65A21-1", deviceJoinName: "Leviton Wireless Load Control Module-30amp"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL15A", deviceJoinName: "Leviton Lumina RF Plug-In Appliance Module"
     }
 
     // simulator metadata

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

@@ -32,11 +32,12 @@ 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: "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: "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: "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
@@ -83,105 +84,24 @@ def parse(String description) {
         }
     }
     else {
-        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)
+        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])
-                }
-                else {
-                    log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
-                }
+        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 "DID NOT PARSE MESSAGE for description : $description"
-                log.debug "${cluster}"
+                log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
             }
         }
+        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()
 }
@@ -211,7 +131,8 @@ 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])
 
-    refresh() + requestBindingTable(0) + ["delay 2000"]
+    // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
+    refresh()
 }
 
 def setColorTemperature(value) {

devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy

@@ -127,8 +127,8 @@ def configureHealthCheck() {
 
 def configure() {
     log.debug "configure()"
-    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
     configureHealthCheck()
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }
 
 def updated() {

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

@@ -27,6 +27,10 @@ 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,6 +32,7 @@ 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

devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy

@@ -24,6 +24,10 @@ metadata {
 		fingerprint inClusters: "0x26", deviceJoinName: "Z-Wave Dimmer"
 		fingerprint mfr:"001D", prod:"1902", deviceJoinName: "Z-Wave Dimmer"
 		fingerprint mfr:"001D", prod:"1B03", model:"0334", deviceJoinName: "Leviton Universal Dimmer"
+		fingerprint mfr:"011A", prod:"0102", model:"0201", deviceJoinName: "Enerwave In-Wall Dimmer"
+		fingerprint mfr:"001D", prod:"1001", model:"0334", deviceJoinName: "Leviton 3-Speed Fan Controller"
+		fingerprint mfr:"001D", prod:"0602", model:"0334", deviceJoinName: "Leviton Magnetic Low Voltage Dimmer"
+		fingerprint mfr:"001D", prod:"0401", model:"0334", deviceJoinName: "Leviton 600W Incandescent Dimmer"
 	}
 
 	simulator {

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

@@ -28,6 +28,7 @@ metadata {
 		fingerprint mfr: "0060", prod: "0001", model: "0002", deviceJoinName: "Everspring Motion Sensor"  // Everspring SP814
 		fingerprint mfr: "0060", prod: "0001", model: "0003", deviceJoinName: "Everspring Motion Sensor"  // Everspring HSP02
 		fingerprint mfr: "011A", prod: "0601", model: "0901", deviceJoinName: "Enerwave Motion Sensor"  // Enerwave ZWN-BPC
+		fingerprint mfr: "0063", prod: "4953", model: "3133", deviceJoinName: "GE Smart Motion Sensor"
 	}
 
 	simulator {

devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy

@@ -25,6 +25,9 @@ metadata {
 		fingerprint mfr:"0063", prod:"4F50", model:"3031", deviceJoinName: "GE Plug-in Outdoor Switch"
 		fingerprint mfr:"001D", prod:"1D04", model:"0334", deviceJoinName: "Leviton Outlet"
 		fingerprint mfr:"001D", prod:"1C02", model:"0334", deviceJoinName: "Leviton Switch"
+		fingerprint mfr:"001D", prod:"0301", model:"0334", deviceJoinName: "Leviton 15A Switch"
+		fingerprint mfr:"011A", prod:"0101", model:"0102", deviceJoinName: "Enerwave On/Off Switch"
+		fingerprint mfr:"011A", prod:"0101", model:"0603", deviceJoinName: "Enerwave Duplex Receptacle"
 	}
 
 	// simulator metadata

smartapps/michaelstruck/color-coordinator.src/color-coordinator.groovy

@@ -1,10 +1,11 @@
 /**
  * 	Color Coordinator 
- *  Version 1.1.0 - 11/9/16
+ *  Version 1.1.1 - 11/9/16
  *  By Michael Struck
  *
  *  1.0.0 - Initial release
  *  1.1.0 - Fixed issue where master can be part of slaves. This causes a loop that impacts SmartThings. 
+ *  1.1.1 - Fix NPE being thrown for slave/master inputs being empty.
  *
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -33,17 +34,17 @@ preferences {
 
 def mainPage() {
 	dynamicPage(name: "mainPage", title: "", install: true, uninstall: false) {
-		def masterInList = slaves.id.find{it==master.id}
+		def masterInList = slaves?.id?.find{it==master?.id}
         if (masterInList) {
         	section ("**WARNING**"){
             	paragraph "You have included the Master Light in the Slave Group. This will cause a loop in execution. Please remove this device from the Slave Group.", image: "https://raw.githubusercontent.com/MichaelStruck/SmartThingsPublic/master/img/caution.png"
             }
         }
         section("Master Light") {
-			input "master", "capability.colorControl", title: "Colored Light"
+			input "master", "capability.colorControl", title: "Colored Light", required: true
 		}
 		section("Lights that follow the master settings") {
-			input "slaves", "capability.colorControl", title: "Colored Lights",  multiple: true, required: false, submitOnChange: true
+			input "slaves", "capability.colorControl", title: "Colored Lights",  multiple: true, required: true, submitOnChange: true
 		}
     	section([mobileOnly:true], "Options") {
 			input "randomYes", "bool",title: "When Master Turned On, Randomize Color", defaultValue: false
@@ -81,40 +82,44 @@ def init() {
 }
 //-----------------------------------
 def onOffHandler(evt){
-	if (!slaves.id.find{it==master.id}){
-        if (master.currentValue("switch") == "on"){
-            if (randomYes) getRandomColorMaster()
-			else slaves?.on()
-        }
-        else {
-            slaves?.off()  
-        }
+	if (slaves && master) {
+		if (!slaves?.id.find{it==master?.id}){
+		if (master?.currentValue("switch") == "on"){
+		    if (randomYes) getRandomColorMaster()
+				else slaves?.on()
+		}
+		else {
+		    slaves?.off()  
+		}
+		}
 	}
 }
 
 def colorHandler(evt) {
-   	if (!slaves.id.find{it==master.id} && master.currentValue("switch") == "on"){
-		log.debug "Changing Slave units H,S,L"
-    	def dimLevel = master.currentValue("level")
-    	def hueLevel = master.currentValue("hue")
-    	def saturationLevel = master.currentValue("saturation")
-		def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer]
-    	slaves?.setColor(newValue)
-    	try {
-    		log.debug "Changing Slave color temp"
-        	def tempLevel = master.currentValue("colorTemperature")
-    		slaves?.setColorTemperature(tempLevel)
-    	}
-   		catch (e){
-    		log.debug "Color temp for master --"
-    	}
+	if (slaves && master) {
+		if (!slaves?.id?.find{it==master?.id} && master?.currentValue("switch") == "on"){
+			log.debug "Changing Slave units H,S,L"
+		def dimLevel = master?.currentValue("level")
+		def hueLevel = master?.currentValue("hue")
+		def saturationLevel = master.currentValue("saturation")
+			def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer]
+		slaves?.setColor(newValue)
+		try {
+			log.debug "Changing Slave color temp"
+			def tempLevel = master?.currentValue("colorTemperature")
+			slaves?.setColorTemperature(tempLevel)
+		}
+			catch (e){
+			log.debug "Color temp for master --"
+		}
+		}
 	}
 }
 
 def getRandomColorMaster(){
     def hueLevel = Math.floor(Math.random() *1000)
     def saturationLevel = Math.floor(Math.random() * 100)
-    def dimLevel = master.currentValue("level")
+    def dimLevel = master?.currentValue("level")
 	def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer]
     log.debug hueLevel
     log.debug saturationLevel
@@ -123,12 +128,14 @@ def getRandomColorMaster(){
 }
 
 def tempHandler(evt){
-    if (!slaves.id.find{it==master.id} && master.currentValue("switch") == "on"){
-        if (evt.value != "--") {
-            log.debug "Changing Slave color temp based on Master change"
-            def tempLevel = master.currentValue("colorTemperature")
-            slaves?.setColorTemperature(tempLevel)
-        }
+	if (slaves && master) {
+	    if (!slaves?.id?.find{it==master?.id} && master?.currentValue("switch") == "on"){
+		if (evt.value != "--") {
+		    log.debug "Changing Slave color temp based on Master change"
+		    def tempLevel = master.currentValue("colorTemperature")
+		    slaves?.setColorTemperature(tempLevel)
+		}
+		}
 	}
 }
 
@@ -139,7 +146,7 @@ private def textAppName() {
 }	
 
 private def textVersion() {
-    def text = "Version 1.1.0 (11/09/2016)"
+    def text = "Version 1.1.1 (12/13/2016)"
 }
 
 private def textCopyright() {
@@ -166,4 +173,4 @@ private def textHelp() {
     	"This application will allow you to control the settings of multiple colored lights with one control. " +
         "Simply choose a master control light, and then choose the lights that will follow the settings of the master, "+
         "including on/off conditions, hue, saturation, level and color temperature. Also includes a random color feature."
-}
+}

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

@@ -1,7 +1,3 @@
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-import java.security.InvalidKeyException;
-
 /**
  *  OpenT2T SmartApp Test
  *
@@ -18,14 +14,14 @@ import java.security.InvalidKeyException;
  *
  */
 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")
+		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
@@ -43,7 +39,7 @@ definition(
  *  garageDoors         | door          | open, close           | unknown, closed, open, closing, opening
  *  cameras             | image         | take                  | <String>
  *  thermostats         | thermostat    | setHeatingSetpoint,   | temperature, heatingSetpoint, coolingSetpoint,
- *	                    |				| setCoolingSetpoint,   | thermostatSetpoint, thermostatMode,
+ * 	                    |				| setCoolingSetpoint,   | thermostatSetpoint, thermostatMode,
  *                      |				| off, heat, cool, auto,| thermostatFanMode, thermostatOperatingState
  *                      |				| emergencyHeat,        |
  *                      |				| setThermostatMode,    |
@@ -55,105 +51,93 @@ definition(
 
 //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
+	section("Allow <PLACEHOLDER: Your App Name> to control these things...") {
+		input "contactSensors", "capability.contactSensor", title: "Which Contact Sensors", multiple: true, required: false
+		input "garageDoors", "capability.garageDoorControl", title: "Which Garage Doors?", multiple: true, required: false
+		input "locks", "capability.lock", title: "Which Locks?", multiple: true, required: false
+		input "cameras", "capability.videoCapture", title: "Which Cameras?", multiple: true, required: false
+		input "motionSensors", "capability.motionSensor", title: "Which Motion Sensors?", multiple: true, required: false
+		input "presenceSensors", "capability.presenceSensor", title: "Which Presence Sensors", multiple: true, required: false
+		input "switches", "capability.switch", title: "Which Switches and Lights?", multiple: true, required: false
+		input "thermostats", "capability.thermostat", title: "Which Thermostat?", multiple: true, required: false
+		input "waterSensors", "capability.waterSensor", title: "Which Water Leak Sensors?", multiple: true, required: false
 	}
 }
 
 def getInputs() {
 	def inputList = []
-	inputList += contactSensors?: []
-	inputList += garageDoors?: []
-	inputList += locks?: []
-	inputList += cameras?: []
-	inputList += motionSensors?: []
-	inputList += presenceSensors?: []
-	inputList += switches?: []
-	inputList += thermostats?: []
-	inputList += waterSensors?: []
-    return 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("/subscriptionURL/:url") {
+		action:
+		[
+				PUT: "updateEndpointURL"
+		]
+	}
+	path("/connectionId/:connId") {
+		action:
+		[
+				PUT: "updateConnectionId"
+		]
+	}
 	path("/devices") {
-		action: [
-			GET: "getDevices"
+		action:
+		[
+				GET: "getDevices"
 		]
 	}
 	path("/devices/:id") {
-		action: [
-			GET: "getDevice"
+		action:
+		[
+				GET: "getDevice"
 		]
 	}
 	path("/update/:id") {
-		action: [
-		  PUT: "updateDevice"
+		action:
+		[
+				PUT: "updateDevice"
 		]
 	}
-	path("/deviceSubscription") {
-		action: [
-		  POST: "registerDeviceChange",
-		  DELETE: "unregisterDeviceChange"
-		]
-	}
-    path("/locationSubscription") {
-		action: [
-		  POST: "registerDeviceGraph",
-		  DELETE: "unregisterDeviceGraph"
+	path("/subscription/:id") {
+		action:
+		[
+				POST  : "registerDeviceChange",
+				DELETE: "unregisterDeviceChange"
 		]
 	}
 }
 
 def installed() {
-	log.debug "Installing with settings: ${settings}"
+	log.debug "Installed 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."
-    }
-    
+	log.debug "Updated with settings: ${settings}"
 	unsubscribe()
-	registerAllDeviceSubscriptions()
+	registerSubscriptions()
 }
 
 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()
+	state.connectionId = ""
+	state.endpointURL = "https://ifs.windows-int.com/v1/cb/81C7E77B-EABC-488A-B2BF-FEC42F0DABD2/notify"
+	registerSubscriptions()
 }
 
-/*** Subscription Functions  ***/
-
 //Subscribe events for all devices
-def registerAllDeviceSubscriptions() {
+def registerSubscriptions() {
 	registerChangeHandler(inputs)
 }
 
@@ -161,292 +145,134 @@ def registerAllDeviceSubscriptions() {
 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}"
+		theAtts.each { att ->
+			subscribe(myDevice, att.name, eventHandler)
+			log.info "Registering ${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 myDevice = findDevice(params.id)
 	def theAtts = myDevice.supportedAttributes
 	try {
-		theAtts.each {att ->
-			subscribe(myDevice, att.name, deviceEventHandler)
+		theAtts.each { att ->
+			subscribe(myDevice, att.name, eventHandler)
+			log.info "Registering ${myDevice.displayName}.${att.name}"
 		}
-        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}"
-            }
-        }
+		return ["succeed"]
 	} 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}.")
-	}
-    
+	def myDevice = findDevice(params.id)
 	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}"
-		}
+		unsubscribe(myDevice)
+		log.info "Unregistering ${myDevice.displayName}"
+		return ["succeed"]
 	} 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){
+def eventHandler(evt) {
+	def evt_device_id = evt.deviceId
+	def evt_device_value = evt.value
+	def evt_name = evt.name
+	def evt_device = evt.device
+	def evt_deviceType = getDeviceType(evt_device);
+	def params = [
+			uri : "${state.endpointURL}/${state.connectionId}",
+			body: [
+					name        : evt_device.displayName,
+					id          : evt_device.id,
+					deviceType  : evt_deviceType,
+					manufacturer: evt_device.getManufacturerName(),
+					model       : evt_device.getModelName(),
+					attributes  : deviceAttributeList(evt_device)
+			]
+	]
 	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"
+		log.trace "POST URI: ${params.uri}"
+		log.trace "Payload: ${params.body}"
+		httpPostJson(params) { resp ->
+			resp.headers.each {
+				log.debug "${it.name} : ${it.value}"
+			}
+			log.trace "response status code: ${resp.status}"
+			log.trace "response data: ${resp.data}"
+		}
+	} catch (e) {
+		log.debug "something went wrong: $e"
 	}
 }
 
-private def byteArrayToString(byte[] data) {
-	BigInteger bigInteger = new BigInteger(1, data)
-    String hash = bigInteger.toString(16)
-	return hash
+//Endpoints function: update subcription endpoint url [state.endpoint]
+void updateEndpointURL() {
+	state.endpointURL = params.url
+	log.info "Updated EndpointURL to ${state.endpointURL}"
 }
 
-/*** Device Query/Update Functions  ***/
+//Endpoints function: update global variable [state.connectionId]
+void updateConnectionId() {
+	def connId = params.connId
+	state.connectionId = connId
+	log.info "Updated ConnectionID to ${state.connectionId}"
+}
 
 //Endpoints function: return all device data in json format
 def getDevices() {
-	def deviceData = [] 
+	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()]
+		if (deviceType == "thermostat") {
+			deviceData << [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it), 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)]
-		} 
+			deviceData << [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it)]
+		}
 	}
- 
+
 	log.debug "getDevices, return: ${deviceData}"
 	return deviceData
 }
 
 //Endpoints function: get device data
-def getDevice() {	
+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()]
+	if (deviceType == "thermostat") {
+		device = [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it), 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)]
+		device = [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it)]
 	}
-
 	log.debug "getDevice, return: ${device}"
 	return device
 }
 
 //Endpoints function: update device data
-void updateDevice() {	
+void updateDevice() {
 	def device = findDevice(params.id)
-	request.JSON.each {   
+	request.JSON.each {
 		def command = it.key
 		def value = it.value
-		if (command){
+		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}) {
+				if (location.modes?.find { it.name == value }) {
 					location.setMode(value)
 				}
-			}else if (command == "thermostatSetpoint"){
-				switch(device.currentThermostatMode){
+			} else if (command == "thermostatSetpoint") {
+				switch (device.currentThermostatMode) {
 					case "cool":
 						log.info "Update: ${device.displayName}, [${command}, ${value}]"
 						device.setCoolingSetpoint(value)
@@ -460,7 +286,7 @@ void updateDevice() {
 						httpError(501, "this mode: ${device.currentThermostatMode} does not allow changing thermostat setpoint.")
 						break
 				}
-			}else if (!device) {
+			} else if (!device) {
 				log.error "updateDevice, Device not found"
 				httpError(404, "Device not found")
 			} else if (!device.hasCommand(command)) {
@@ -470,11 +296,11 @@ void updateDevice() {
 				if (command == "setColor") {
 					log.info "Update: ${device.displayName}, [${command}, ${value}]"
 					device."$command"(hex: value)
-				} else if(value.isNumber()) {
+				} else if (value.isNumber()) {
 					def intValue = value as Integer
 					log.info "Update: ${device.displayName}, [${command}, ${intValue}(int)]"
 					device."$command"(intValue)
-				} else if (value){
+				} else if (value) {
 					log.info "Update: ${device.displayName}, [${command}, ${value}]"
 					device."$command"(value)
 				} else {
@@ -496,49 +322,41 @@ private getLocationModeInfo() {
 //Map each device to a type given it's capabilities
 private getDeviceType(device) {
 	def deviceType
-	def capabilities = device.capabilities
-	log.debug "capabilities: [${device}, ${capabilities}]"
+	def caps = device.capabilities
+	log.debug "capabilities: [${device}, ${caps}]"
 	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())
-		{
+	caps.each {
+		switch (it.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 "switch level":
+				deviceType = "light"
+				break
+			case "contact sensor":
+				deviceType = "contactSensor"
 				break
 			case "garageDoorControl":
 				deviceType = "garageDoor"
-				return deviceType
+				break
 			case "lock":
 				deviceType = "lock"
-				return deviceType
+				break
 			case "video camera":
 				deviceType = "camera"
-				return deviceType
+				break
+			case "motion sensor":
+				deviceType = "motionSensor"
+				break
+			case "presence sensor":
+				deviceType = "presenceSensor"
+				break
 			case "thermostat":
 				deviceType = "thermostat"
-				return deviceType    
-			case "acceleration sensor":
-			case "contact sensor":
-			case "motion sensor":
-			case "presence sensor":
+				break
 			case "water sensor":
-				deviceType = "genericSensor"
-				return deviceType
+				deviceType = "waterSensor"
+				break
 			default:
 				break
 		}
@@ -550,38 +368,19 @@ private getDeviceType(device) {
 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 ]);
+private deviceAttributeList(device) {
+	device.supportedAttributes.collectEntries { attribute ->
+		try {
+			[(attribute.name): device.currentValue(attribute.name)]
+		} catch (e) {
+			[(attribute.name): null]
 		}
 	}
-    return attributeList
 }
 
-//Map device command and value. 
+//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) {
@@ -598,7 +397,7 @@ private mapDeviceCommands(command, value) {
 				resultValue = ""
 			}
 			break
-		// light attributes
+	// light attributes
 		case "level":
 			resultCommand = "setLevel"
 			resultValue = value
@@ -611,14 +410,14 @@ private mapDeviceCommands(command, value) {
 			resultCommand = "setSaturation"
 			resultValue = value
 			break
-		case "colorTemperature":
+		case "ct":
 			resultCommand = "setColorTemperature"
 			resultValue = value
 			break
-		case "color":	
+		case "color":
 			resultCommand = "setColor"
 			resultValue = value
-		// thermostat attributes
+	// thermostat attributes
 		case "hvacMode":
 			resultCommand = "setThermostatMode"
 			resultValue = value
@@ -635,7 +434,7 @@ private mapDeviceCommands(command, value) {
 			resultCommand = "setCoolingSetpoint"
 			resultValue = value
 			break
-		case "heatingSetpoint":	
+		case "heatingSetpoint":
 			resultCommand = "setHeatingSetpoint"
 			resultValue = value
 			break
@@ -643,20 +442,20 @@ private mapDeviceCommands(command, value) {
 			resultCommand = "thermostatSetpoint"
 			resultValue = value
 			break
-		// lock attributes
+	// lock attributes
 		case "locked":
 			if (value == 1 || value == "1" || value == "lock") {
 				resultCommand = "lock"
 				resultValue = ""
-			}
-			else if (value == 0 || value == "0" || value == "unlock") {
+			} else if (value == 0 || value == "0" || value == "unlock") {
 				resultCommand = "unlock"
 				resultValue = ""
 			}
 			break
 		default:
 			break
-	 }
-	 
-	 return [resultCommand,resultValue]
-}
+	}
+
+	return [resultCommand, resultValue]
+}
+

smartapps/schwark/hunter-douglas-platinum-gateway.src/hunter-douglas-platinum-gateway.groovy

@@ -0,0 +1,347 @@
+/**
+ *  PlatinumGateway Service Manager
+ *
+ *  Author: Schwark Satyavolu
+ *. nc -i3 <ip-address-of-gateway> 522 < input.txt > output.txt
+ *
+ */
+definition(
+    name: "Hunter Douglas Platinum Gateway",
+    namespace: "schwark",
+    author: "Schwark Satyavolu",
+    description: "Allows you to connect your Hunter Douglas Platinum Gateway shades with SmartThings and control them from your Things area or Dashboard in the SmartThings Mobile app. Adjust colors by going to the Thing detail screen for your PlatinumGateway shades (tap the gear on PlatinumGateway tiles).",
+    category: "SmartThings Labs",
+    iconUrl: "https://lh5.ggpht.com/FN3-xG6R0q9VjJHYE1iK5K2J11rTphiDEePr8XluI6o_s52xfPoHwt0-TZxc0qlVSQ=w300",
+    iconX2Url: "https://lh5.ggpht.com/FN3-xG6R0q9VjJHYE1iK5K2J11rTphiDEePr8XluI6o_s52xfPoHwt0-TZxc0qlVSQ=w300",
+    singleInstance: true
+)
+
+preferences {
+	input("gatewayIP", "string", title:"Gateway IP Address", description: "Please enter your gateway's IP Address", required: true, displayDuringSetup: true)
+	input("statusURL", "string", title:"Gateway Status URL", description: "Please enter the URL to download status", required: true, displayDuringSetup: true)
+	input("scenePrefix", "string", title:"Scene Name Prefix", description: "Please choose a prefix to add to all the Scenes", required: false, displayDuringSetup: true, defaultValue: "Shade Scene " )
+	input("shadePrefix", "string", title:"Shade Name Prefix", description: "Please choose a prefix to add to all the Shades", required: false, displayDuringSetup: true, defaultValue: "Shade " )
+	input("wantShades", "bool", title:"Do you want to add each Shade as a Switch?", description: "Turning this on will add one switch for EACH shade in your house", required: false, displayDuringSetup: true, defaultValue: false )
+}
+
+def makeNetworkId(ipaddr, port) { 
+	String hexIp = ipaddr.tokenize('.').collect {String.format('%02X', it.toInteger()) }.join() 
+	String hexPort = String.format('%04X', port.toInteger()) 
+	log.debug "The target device is configured as: ${hexIp}:${hexPort}" 
+	return "${hexIp}:${hexPort}" 
+}
+
+/////////////////////////////////////
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+	initialize()
+}
+
+def uninstalled() {
+	log.debug("Uninstalling with settings: ${settings}")
+	unschedule()
+	if(state.scenes) {
+		// remove scene child devices
+		state.scenes = [:]
+	}
+	if(state.shades) {
+		// remove window child devices
+		state.shades = [:]
+	}
+
+	removeChildDevices(getChildDevices())
+}
+
+/////////////////////////////////////
+def updated() {
+	//log.debug "Updated with settings: ${settings}"
+	unsubscribe()
+	initialize()
+}
+
+/////////////////////////////////////
+def initialize() {
+	// remove location subscription aftwards
+	unsubscribe()
+	state.subscribe = false
+	log.debug("gatewayIP is ${gatewayIP}")
+
+	if (gatewayIP) {
+		addgateway()
+	}
+
+ 	runEvery5Minutes(doDeviceSync)
+}
+
+def getHubId() {
+	return state.hubId ? state.hubId : location.hubs[0].id
+}
+
+/////////////////////////////////////
+def addgateway() {
+	if(!state.gatewayHex) {
+		state.gatewayHex = makeNetworkId(gatewayIP,522)
+	}
+}
+
+
+/////////////////////////////////////
+def locationHandler(evt) {
+	log.debug "$locationHandler(evt.description)"
+	def description = evt.description
+	def hub = evt?.hubId
+	state.hubId = hub
+	log.debug("location handler: event description is ${description}")
+}
+
+/////////////////////////////////////
+private def parseEventMessage(Map event) {
+	//handles gateway attribute events
+	return event
+}
+
+private def parseEventMessage(String description) {
+}
+
+/////////////////////////////////////
+def doDeviceSync(){
+	log.debug "Doing Platinum Gateway Device Sync!"
+
+	if(!state.subscribe) {
+		subscribe(location, null, locationHandler, [filterEvents:false])
+		state.subscribe = true
+	}
+
+	if(statusURL) {
+		try {
+			
+    		httpGet(statusURL) { resp ->
+        		resp.headers.each {
+        			log.debug "${it.name} : ${it.value}"
+    			}
+    			log.debug "response contentType: ${resp.contentType}"
+    			//log.trace "response data: ${resp.data}"
+    			if(resp.status == 200) {
+    				state.statusText = resp.data
+    			}
+    		}
+    		
+		} catch (e) {
+    			log.error "something went wrong: $e"
+		}
+	}
+
+	updateStatus()
+}
+
+def processState(info) {
+  log.debug("processing state...")
+  def DB = ['rooms':[:], 'shades':[:], 'scenes':[:]]
+  def prefix = ""
+  //def lines = info.split(/[\n\r]+/)
+
+  info.eachLine() { line ->
+    line = line.trim()
+    if(!prefix) {
+      prefix = line[0..1]
+      log.debug("prefix is set to ${prefix}")
+    }
+    else if(!line.startsWith(prefix)) {
+      return
+    }
+    
+    line = line.drop(2)
+  	//log.trace("processing line ${line}")
+    if(line.startsWith("\$cr")) {
+      // name of room
+      def room_id = line[3..4]
+      def room_name = line.split('-')[-1].trim()
+      log.debug("found room with ${room_id} and ${room_name}")
+      DB['rooms'][room_id] = ['name':room_name, 'id':room_id, 'search':room_name.toLowerCase()]
+    } else if(line.startsWith("\$cm")) {
+      // name of scene
+      def scene_id = line[3..4]
+      def scene_name = line.split('-')[-1].trim()
+      log.debug("found scene with ${scene_id} and ${scene_name}")
+      DB['scenes'][scene_id] = ['name':scene_name, 'id':scene_id, 'search':scene_name.toLowerCase()]
+    } else if(line.startsWith("\$cs")) {
+      // name of a shade
+      def parts = line.split('-')
+      def shade_id = line[3..4]
+      def shade_name = parts[-1].trim()
+      def room_id = parts[1]
+      log.debug("found shade with ${shade_id} and ${shade_name}")
+      DB['shades'][shade_id] = ['name':shade_name, 'id':shade_id, 'search':shade_name.toLowerCase(), 'room': room_id]
+    } else if(line.startsWith("\$cp")) {
+      // state of a shade
+      def shade_id = line[3..4]
+      def stateTxt = line[-4..-2]
+      def state = stateTxt.toInteger()/255.0
+      log.debug("found shade state with ${shade_id} and ${state}")
+      def shade = DB['shades'][shade_id]
+      if(shade) {
+        DB['shades'][shade_id]['state'] = state
+      }
+    }
+   }
+
+    log.debug("DB is ${DB}")
+    return DB
+}
+
+
+
+////////////////////////////////////////////
+//CHILD DEVICE METHODS
+/////////////////////////////////////
+def parse(childDevice, description) {
+	def parsedEvent = parseEventMessage(description)
+
+	if (parsedEvent.headers && parsedEvent.body) {
+		def headerString = new String(parsedEvent.headers.decodeBase64())
+		def bodyString = new String(parsedEvent.body.decodeBase64())
+		log.debug "parse() - ${bodyString}"
+	} else {
+		log.debug "parse - got something other than headers,body..."
+		return []
+	}
+}
+
+def sendMessage(params) {
+	def newDNI = state.gatewayHex
+	if(newDNI) {
+		log.debug("sending ${params.msg} to ${newDNI}")
+		def ha = new physicalgraph.device.HubAction(params.msg,physicalgraph.device.Protocol.LAN, newDNI)
+		sendHubCommand(ha)
+	}
+}
+
+/////////////////////////////////////
+def runScene(sceneID) {
+	log.debug "Running Scene ${sceneID}"
+	sceneID = String.format('%02d',sceneID.toInteger())
+	def msg = "\$inm${sceneID}-"
+	sendMessage(["msg":msg])
+}
+
+def setShadeLevel(shadeNo, percent) {
+	log.debug "Setting Shade level on Shade ${shadeNo} to ${percent}%"
+	def shadeValue = 255 - (percent * 2.55).toInteger()
+	log.debug "Setting Shade level on Shade ${shadeNo} to ${shadeValue} value"
+	def msg = String.format("\$pss%s-04-%03d",shadeNo,shadeValue)
+	sendMessage(["msg":msg])
+	runIn(1, "sendMessage", [overwrite: false, data:["msg":"\$rls"]])
+}
+
+def updateScenes(DB) {
+	log.debug("Updating Scenes...")
+	if(!state.scenes) {
+		state.scenes = [:]
+	}
+	state.scenes.each() { id, sceneDevice ->
+		if(DB['scenes'][id]) {
+			// update device
+			if(DB['scenes'][id]['name'] != sceneDevice.label) {
+				log.debug("processing scene ${id} from name ${sceneDevice.label} to ${DB['scenes'][id]['name']}")
+				sceneDevice.sendEvent(name:'label', value: DB['scenes'][id]['name'], isStateChange: true)
+			}
+			DB['scenes'].remove(id)
+		} else {
+			// remove device
+			log.debug("removing scene ${id} from name ${sceneDevice.displayName}")
+			deleteChildDevice(sceneDevice.deviceNetworkId)
+		}
+	}
+	def namePrefix = scenePrefix
+	if(namePrefix) {
+		namePrefix = namePrefix.trim()+" "
+	}
+	DB['scenes']?.each() { id, sceneMap ->
+		def name = sceneMap['name']
+		log.debug("processing scene ${id} with name ${name}")
+		def PREFIX = "PLATINUMGATEWAYSCENE"
+		def hubId = getHubId()
+		def sceneDevice = addChildDevice("schwark", "Platinum Gateway Scene Switch", "${PREFIX}${id}", hubId, ["name": "PlatinumScene.${id}", "label": "${namePrefix}${name}", "completedSetup": true])
+		log.debug("created child device ${PREFIX}${id} for scene ${id} with name ${name} and hub ${hubId}")
+		sceneDevice.setSceneNo(id)
+		state.scenes[id] = sceneDevice
+	}
+}
+
+def updateShades(DB) {
+	if(!wantShades) return
+	log.debug("Updating Shades...")
+
+	if(!state.shades) {
+		state.shades = [:]
+	}
+	state.shades.each() { id, shadeDevice ->
+		if(DB['shades'][id]) {
+			// update device
+			if(DB['shades'][id]['name'] != shadeDevice.label) {
+				log.debug("processing shade rename ${id} from name ${shadeDevice.label} to ${DB['shades'][id]['name']}")
+				shadeDevice.sendEvent(name:'label', value: DB['shades'][id]['name'], isStateChange: true)
+			}
+			DB['shades'].remove(id)
+		} else {
+			// remove device
+			log.debug("removing shade ${id} from name ${shadeDevice.displayName}")
+			deleteChildDevice(shadeDevice.deviceNetworkId)
+		}
+	}
+	def namePrefix = shadePrefix
+	if(namePrefix) {
+		namePrefix = namePrefix.trim()+" "
+	}
+	DB['shades']?.each() { id, shadeMap ->
+		def name = shadeMap['name']
+		log.debug("processing shade ${id} with name ${name}")
+		def PREFIX = "PLATINUMGATEWAYSHADE"
+		def hubId = getHubId()
+		def shadeDevice = addChildDevice("schwark", "Platinum Gateway Shade Switch", "${PREFIX}${id}", hubId, ["name": "PlatinumShade.${id}", "label": "${namePrefix}${name}", "completedSetup": true])
+		log.debug("created child device ${PREFIX}${id} for shade ${id} with name ${name} and hub ${hubId}")
+		shadeDevice.setShadeNo(id)
+		state.shades[id] = shadeDevice
+	}
+}
+
+def updateStatus() {
+	if(!state.statusText) {
+		log.debug("statusText is empty - ${state.statusText}.")
+		return
+	}
+	log.debug ("Updating status")
+
+	def DB = processState(state.statusText)
+	updateScenes(DB)
+	updateShades(DB)
+}
+
+private Integer convertHexToInt(hex) {
+	Integer.parseInt(hex,16)
+}
+
+private String convertHexToIP(hex) {
+	[convertHexToInt(hex[0..1]),convertHexToInt(hex[2..3]),convertHexToInt(hex[4..5]),convertHexToInt(hex[6..7])].join(".")
+}
+
+private Boolean canInstallLabs()
+{
+	return hasAllHubsOver("000.011.00603")
+}
+
+private Boolean hasAllHubsOver(String desiredFirmware)
+{
+	return realHubFirmwareVersions.every { fw -> fw >= desiredFirmware }
+}
+
+private List getRealHubFirmwareVersions()
+{
+	return location.hubs*.firmwareVersionString.findAll { it }
+}
+
+private removeChildDevices(data) {
+    data.delete.each {
+        deleteChildDevice(it.deviceNetworkId)
+    }
+}

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://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",
+    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",
     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
+                input "selecteddevice", "enum", required:false, title:"Select ${getDeviceName()} (${numFound} found)", multiple:true, options:devices, submitOnChange: true
             }
         }
     }
@@ -196,6 +196,8 @@ 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/smartthings/hue-connect.src/hue-connect.groovy

@@ -172,18 +172,34 @@ def bulbDiscovery() {
 			if (existingLightsDescription.isEmpty()) {
 				existingLightsDescription += it.value
 			} else {
-				 existingLightsDescription += ", ${it.value}"
+				existingLightsDescription += ", ${it.value}"
 			}
 		}
 	}
 
-	return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Started!", nextPage:"", refreshInterval:refreshInterval, install:true, uninstall: true) {
-		section("Please wait while we discover your Hue Lights. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
-			input "selectedBulbs", "enum", required:false, title:"Select Hue Lights to add (${numFound} found)", multiple:true, submitOnChange: true, options:newLights
-			paragraph title: "Previously added Hue Lights (${existingLights.size()} added)", existingLightsDescription
+	if (bulbRefreshCount > 200 && numFound == 0) {
+		// Time out to avoid endless discovery
+		state.inBulbDiscovery = false
+		bulbRefreshCount = 0
+		return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Failed!", nextPage:"", refreshInterval:0, install:true, uninstall: true) {
+			section("Failed to discover any lights, please try again later. Click Done to exit.") {
+				//input "selectedBulbs", "enum", required:false, title:"Select Hue Lights to add (${numFound} found)", multiple:true, submitOnChange: true, options:newLights
+				paragraph title: "Previously added Hue Lights (${existingLights.size()} added)", existingLightsDescription
+			}
+			section {
+				href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
+			}
 		}
-		section {
-			href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
+
+	} else {
+		return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Started!", nextPage:"", refreshInterval:refreshInterval, install:true, uninstall: true) {
+			section("Please wait while we discover your Hue Lights. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
+				input "selectedBulbs", "enum", required:false, title:"Select Hue Lights to add (${numFound} found)", multiple:true, submitOnChange: true, options:newLights
+				paragraph title: "Previously added Hue Lights (${existingLights.size()} added)", existingLightsDescription
+			}
+			section {
+				href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
+			}
 		}
 	}
 }
@@ -407,7 +423,7 @@ def addBridge() {
 	if(vbridge) {
 		def d = getChildDevice(selectedHue)
 		if(!d) {
-	 		// compatibility with old devices
+			// compatibility with old devices
 			def newbridge = true
 			childDevices.each {
 				if (it.getDeviceDataByName("mac")) {
@@ -593,7 +609,7 @@ def locationHandler(evt) {
 	log.trace "Location: $description"
 
 	def hub = evt?.hubId
- 	def parsedEvent = parseLanMessage(description)
+	def parsedEvent = parseLanMessage(description)
 	parsedEvent << ["hub":hub]
 
 	if (parsedEvent?.ssdpTerm?.contains("urn:schemas-upnp-org:device:basic:1")) {
@@ -819,8 +835,7 @@ def parse(childDevice, description) {
 			try {
 				body = new groovy.json.JsonSlurper().parseText(bodyString)
 			} catch (all) {
-				log.warn "Parsing Body failed - trying again..."
-				poll()
+				log.warn "Parsing Body failed"
 			}
 			if (body instanceof java.util.Map) {
 				// get (poll) reponse
@@ -844,7 +859,7 @@ private sendColorEvents(device, xy, hue, sat, ct, colormode = null) {
 
 	def events = [:]
 	// For now, only care about changing color temperature if requested by user
-	if (ct != null && (colormode == "ct" || (xy == null && hue == null && sat == null))) {
+	if (ct != null && ct != 0 && (colormode == "ct" || (xy == null && hue == null && sat == null))) {
 		// for some reason setting Hue to their specified minimum off 153 yields 154, dealt with below
 		// 153 (6500K) to 500 (2000K)
 		def temp = (ct == 154) ? 6500 : Math.round(1000000 / ct)
@@ -1252,7 +1267,7 @@ private getBridgeIP() {
 		if (d) {
 			if (d.getDeviceDataByName("networkAddress"))
 				host =  d.getDeviceDataByName("networkAddress")
-		else
+			else
 				host = d.latestState('networkAddress').stringValue
 		}
 		if (host == null || host == "") {

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

@@ -289,12 +289,12 @@ def initializeLife360Connection() {
        		state.life360AccessToken = result.data.access_token
             return true;
    		}
-		log.debug "Response=${result.data}"
+		log.info "Life360 initializeLife360Connection, response=${result.data}"
         return false;
         
     }
     catch (e) {
-       log.debug e
+       log.error "Life360 initializeLife360Connection, error: $e"
        return false;
     }
 
@@ -656,7 +656,7 @@ def generateInitialEvent (member, childDevice) {
     
     try { // we are going to just ignore any errors
     
-    	log.debug "Generate Initial Event for New Device for Member = ${member.id}"
+    	log.info "Life360 generateInitialEvent($member, $childDevice)"
         
         def place = state.places.find{it.id==settings.place}
         
@@ -677,6 +677,8 @@ 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}"
         
@@ -718,7 +720,7 @@ def haversine(lat1, lon1, lat2, lon2) {
 
 def placeEventHandler() {
 
-	log.debug "In placeEventHandler method."
+	log.info "Life360 placeEventHandler: params=$params, settings.place=$settings.place"
 
 	// the POST to this end-point will look like:
     // POST http://test.com/webhook?circleId=XXXX&placeId=XXXX&userId=XXXX&direction=arrive
@@ -729,8 +731,6 @@ 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 "Event raised on child device: ${externalId}"
+    		log.debug "Life360 event raised on child device: ${externalId}"
 		}
    		else {
-    		log.debug "Couldn't find child device associated with inbound Life360 event."
+    		log.warn "Life360 couldn't find child device associated with inbound Life360 event."
     	}
     }