MSA-1599: Following the Benson steps for using iris smart plug

devicetypes/blebson/iris-smart-plug.src/iris-smart-plug.groovy

@@ -0,0 +1,241 @@
+/**
+ *  Copyright 2015 SmartThings
+ *
+ *  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.
+ *
+ *	SmartPower Outlet (CentraLite)
+ *
+ *	Author: SmartThings
+ *	Date: 2015-08-23
+ */
+metadata {
+	// Automatically generated. Make future change here.
+	definition (name: "Iris Smart Plug", namespace: "blebson", author: "SmartThings") {
+		capability "Actuator"
+		capability "Switch"
+		capability "Power Meter"
+		capability "Energy Meter"
+		capability "Configuration"
+		capability "Refresh"
+		capability "Sensor"
+
+		// indicates that device keeps track of heartbeat (in state.heartbeat)
+		attribute "heartbeat", "string"     
+		attribute "timerStart", "number"
+
+		attribute "energyDisplay", "string"
+		attribute "elapsedTimeDisplay", "string"
+
+		command "resetEnergyUsage"
+
+		fingerprint profileId: "0104", inClusters: "0000 0003 0004 0005 0006 0B04 0B05 FC03", outClusters: "0019", manufacturer: "CentraLite",  model: "3210-L", deviceJoinName: "Outlet"
+		//fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3200", deviceJoinName: "Outlet"
+		//fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3200-Sgb", deviceJoinName: "Outlet"
+		//fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "4257050-RZHAC", deviceJoinName: "Outlet"
+		//fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019"
+	}
+
+	// simulator metadata
+	simulator {
+		// status messages
+		status "on": "on/off: 1"
+		status "off": "on/off: 0"
+
+		// reply messages
+		reply "zcl on-off on": "on/off: 1"
+		reply "zcl on-off off": "on/off: 0"
+	}
+
+	preferences {
+		section {
+			image(name: 'educationalcontent', multiple: true, images: [
+				"http://cdn.device-gse.smartthings.com/Outlet/US/OutletUS1.jpg",
+				"http://cdn.device-gse.smartthings.com/Outlet/US/OutletUS2.jpg"
+				])
+		}
+        
+        section("Reporting Intervals") {
+        	input "intervalMin", "number", title: "Minimum interval between reports [s]", defaultValue: 5, range: "1..600"
+        	input "intervalMax", "number", title: "Maximum interval between reports [s]", defaultValue: 600, range: "1..600"
+        }
+	}
+
+	// UI tile definitions
+	tiles(scale: 2) {
+		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
+			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
+				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "turningOff"
+				attributeState "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "turningOn"
+				attributeState "turningOn", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "turningOff"
+				attributeState "turningOff", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "turningOn"
+			}
+			tileAttribute ("power", key: "SECONDARY_CONTROL") {
+				attributeState "power", label:'${currentValue} W'
+			}
+		}
+        
+		valueTile("energyDisplay", "device.energyDisplay", width: 5, height: 1, decoration: "flat") {
+			state "default", label:'Energy used: ${currentValue}', unit: "kWh"
+        	}
+        	
+		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 1, height: 1) {
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+        
+		standardTile("resetUsage", "command.resetEnergyUsage", decoration: "flat", width: 1, height: 1){
+			state "default", action: "resetEnergyUsage", label:'Reset kWh', icon:"st.Health & Wellness.health7"
+		}        
+        
+		valueTile("elapsedTimeDisplay", "device.elapsedTimeDisplay", decoration: "flat", width: 5, height: 1){
+			state "default", label: 'Time: ${currentValue}', unit: "h"
+		}      
+
+		standardTile("configure", "device.switch", inactiveLabel: false, decoration: "flat", width: 1, height: 1) {
+			state "default", label:"", action:"configure", icon:"st.secondary.configure"
+		}
+
+		main "switch"
+		details(["switch","energyDisplay","resetUsage","power","elapsedTimeDisplay","refresh"])
+	}
+}
+
+// Parse incoming device messages to generate events
+def parse(String description) {
+	log.debug "description is $description"
+
+	// save heartbeat (i.e. last time we got a message from device)
+	state.heartbeat = Calendar.getInstance().getTimeInMillis()
+	if (state.timerStart == null)
+	{
+		state.timerStart = Calendar.getInstance().getTimeInMillis()
+		state.energy = 0.0
+	}
+
+	def finalResult = zigbee.getKnownDescription(description)
+
+	//TODO: Remove this after getKnownDescription can parse it automatically
+	if (!finalResult && description!="updated")
+		finalResult = getPowerDescription(zigbee.parseDescriptionAsMap(description))
+
+	if (finalResult) {
+		log.info finalResult
+		if (finalResult.type == "update") {
+			log.info "$device updates: ${finalResult.value}"
+		}
+		else if (finalResult.type == "power") {
+			def powerValue = (finalResult.value as Integer)/10           
+			sendEvent(name: "power", value: powerValue, isStateChange: true, displayed: false) // note: stateChange = true added so the energy calculation can work properly
+			/*
+				Dividing by 10 as the Divisor is 10000 and unit is kW for the device. AttrId: 0302 and 0300. Simplifying to 10
+				power level is an integer. The exact power level with correct units needs to be handled in the device type
+				to account for the different Divisor value (AttrId: 0302) and POWER Unit (AttrId: 0300). CLUSTER for simple metering is 0702
+			*/           
+			calculateAndShowEnergy()
+		}
+		else {
+			sendEvent(name: finalResult.type, value: finalResult.value)
+		}
+	}
+	else {
+		log.warn "DID NOT PARSE MESSAGE for description : $description"
+		log.debug zigbee.parseDescriptionAsMap(description)
+	}
+}
+
+def calculateAndShowEnergy()
+{
+    def recentEvents = device.statesSince("power", new Date()-1, [max: 2]).collect {[value: it.value as float, date: it.date]}        	
+    def deltaT = (recentEvents[0].date.getTime() - recentEvents[1].date.getTime()) // time since last "power" event in milliseconds
+    deltaT = deltaT / 3600000 // convert to hours
+    
+    def energyValue = device.currentValue("energy") 
+    if(energyValue != null) {
+    	energyValue += (recentEvents[1].value * deltaT) / 1000 // energy used since last "power" event in kWh 
+    }
+    
+    sendEvent(name: "energy", value: energyValue, displayed: false)
+    sendEvent(name: "energyDisplay", value: String.format("%6.3f kWh",energyValue), displayed: false)
+
+    def currentTime = Calendar.getInstance().getTimeInMillis()   
+    def timeDifference = ((long)currentTime - state.timerStart)/1000; // in seconds
+    int h = (int) (timeDifference / (3600));
+    int m = (int) ((timeDifference - (h * 3600)) / 60);
+    int s = (int) (timeDifference - (h * 3600) - m * 60);
+    int d = (int) h >= 24 ? h / 24 : 0
+    h = d > 0 ? h % 24 : h
+
+    sendEvent(name: "elapsedTimeDisplay", value: String.format("%dd %02d:%02d:%02d", d, h, m, s), displayed: false)
+}
+
+def off() {
+	zigbee.off()
+}
+
+def on() {
+	zigbee.on()
+}
+
+def resetEnergyUsage() {
+	sendEvent(name: "energy", value: 0.0, displayed: false)
+	state.timerStart = Calendar.getInstance().getTimeInMillis()
+	sendEvent(name: "energyDisplay", value: String.format("%6.3f kWh",0.0), displayed: false)
+	sendEvent(name: "elapsedTimeDisplay", value: String.format("%dd %02d:%02d:%02d", 0, 0, 0, 0), displayed: false)
+}
+
+def refresh() {
+	sendEvent(name: "heartbeat", value: "alive", displayed:false)
+	return zigbee.onOffRefresh() + zigbee.refreshData("0x0B04", "0x050B")
+}
+
+def configure() {
+	log.debug "Configuring..."
+	return zigbee.onOffConfig() + powerConfig() + refresh()
+}
+
+def updated() {
+	response(configure())
+}
+
+//power config for devices with min reporting interval as 1 seconds and reporting interval if no activity as 10min (600s)
+//min change in value is 01
+def powerConfig() {
+	[
+		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
+		"zcl global send-me-a-report 0x0B04 0x050B 0x29 ${intervalMin ?: 5} ${intervalMax ?: 600} {05 00}",				//The send-me-a-report is custom to the attribute type for CentraLite
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
+	]
+}
+
+private getEndpointId() {
+	new BigInteger(device.endpointId, 16).toString()
+}
+
+//TODO: Remove this after getKnownDescription can parse it automatically
+def getPowerDescription(descMap) {
+	def powerValue = "undefined"
+	if (descMap.cluster == "0B04") {
+		if (descMap.attrId == "050b") {
+			if(descMap.value!="ffff")
+				powerValue = zigbee.convertHexToInt(descMap.value)
+		}
+	}
+	else if (descMap.clusterId == "0B04") {
+		if(descMap.command=="07"){
+			return	[type: "update", value : "power (0B04) capability configured successfully"]
+		}
+	}
+
+	if (powerValue != "undefined"){
+		return	[type: "power", value : powerValue]
+	}
+	else {
+		return [:]
+	}
+}

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

@@ -81,47 +81,51 @@ metadata {
 // parse events into attributes
 def parse(String description) {
 	log.debug "Parse description $description"
-	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") {
+	def map = [:]
+	if (description?.startsWith("read attr -")) {
+		def descMap = parseDescriptionAsMap(description)
+		log.debug "Desc Map: $descMap"
+		if (descMap.cluster == "0201" && descMap.attrId == "0000") {
 			log.debug "TEMP"
 			map.name = "temperature"
-			map.value = getTemperature(it.value)
+			map.value = getTemperature(descMap.value)
 			map.unit = temperatureScale
-		} else if (it.cluster == "0201" && it.attrId == "0011") {
+		} else if (descMap.cluster == "0201" && descMap.attrId == "0011") {
 			log.debug "COOLING SETPOINT"
 			map.name = "coolingSetpoint"
-			map.value = getTemperature(it.value)
+			map.value = getTemperature(descMap.value)
 			map.unit = temperatureScale
-		} else if (it.cluster == "0201" && it.attrId == "0012") {
+		} else if (descMap.cluster == "0201" && descMap.attrId == "0012") {
 			log.debug "HEATING SETPOINT"
 			map.name = "heatingSetpoint"
-			map.value = getTemperature(it.value)
+			map.value = getTemperature(descMap.value)
 			map.unit = temperatureScale
-		} else if (it.cluster == "0201" && it.attrId == "001c") {
+		} else if (descMap.cluster == "0201" && descMap.attrId == "001c") {
 			log.debug "MODE"
 			map.name = "thermostatMode"
-			map.value = getModeMap()[it.value]
-		} else if (it.cluster == "0202" && it.attrId == "0000") {
+			map.value = getModeMap()[descMap.value]
+		} else if (descMap.cluster == "0202" && descMap.attrId == "0000") {
 			log.debug "FAN MODE"
 			map.name = "thermostatFanMode"
-			map.value = getFanModeMap()[it.value]
+			map.value = getFanModeMap()[descMap.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/cree-bulb.src/cree-bulb.groovy

@@ -82,7 +82,7 @@ def on() {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()       //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value) + ["delay 500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
 /**

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

@@ -22,10 +22,9 @@ metadata {
 		capability "Sensor"
 		capability "Health Check"
 
-		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"
+		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"
 	}
 
 	simulator {

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 2000"
+        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
     ]
 
     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 2000"
+        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
     ]
 
     return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig()

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

@@ -17,7 +17,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"
 
 		command "setAdjustedColor"
         command "reset"

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

@@ -18,7 +18,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"
 
 		command "setAdjustedColor"
         command "reset"

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

@@ -14,8 +14,7 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
-		capability "Health Check"
-		capability "Light"
+        capability "Health Check"
 
         command "refresh"
 	}

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

@@ -16,7 +16,6 @@ metadata {
         capability "Switch"
         capability "Refresh"
         capability "Health Check"
-        capability "Light"
 
         command "refresh"
     }

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

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

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

@@ -128,9 +128,9 @@ def setLevel(value) {
 
 def refresh() {
 	[
-			"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"
+			"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"
 	]
 
 }
@@ -313,9 +313,9 @@ def isDescriptionPower(descMap) {
 
 def onOffConfig() {
 	[
-			"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"
+			"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"
 	]
 }
 
@@ -323,9 +323,9 @@ def onOffConfig() {
 //min level change is 01
 def levelConfig() {
 	[
-			"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"
+			"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"
 	]
 }
 
@@ -333,10 +333,9 @@ def levelConfig() {
 //min change in value is 05
 def powerConfig() {
 	[
-		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 2000",
+		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
 		"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
-		"delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
 	]
 }
 
@@ -345,10 +344,7 @@ 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}",
-			"delay 2000"
-	]
+	"st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {$level $rate}"
 }
 
 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 2000'
+			'delay 500'
 
 	]
 
@@ -62,6 +62,6 @@ def off() {
 			'zcl on-off off',
 			'delay 200',
 			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 2000'
+			'delay 500'
 	]
 }

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

@@ -157,10 +157,9 @@ def configure() {
 //min change in value is 01
 def powerConfig() {
 	[
-		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 2000",
+		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
 		"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
-		"delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
 	]
 }
 

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

@@ -29,10 +29,9 @@ 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,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-L", deviceJoinName: "Iris Smart Water 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,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "moisturev4", deviceJoinName: "Water Leak Sensor"
 	}
 
@@ -129,7 +128,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00){
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
@@ -286,8 +285,8 @@ def ping() {
 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
 	def refreshCmds = [
-		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 2000",
-		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 2000"
+		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
 	]
 
 	return refreshCmds + enrollResponse()
@@ -309,10 +308,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 2000",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 		//Enroll Response
-		"raw 0x500 {01 23 00 00 00}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
+		"raw 0x500 {01 23 00 00 00}",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
 	]
 }
 

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

@@ -132,7 +132,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
@@ -298,8 +298,8 @@ def ping() {
 def refresh() {
 	log.debug "refresh called"
 	def refreshCmds = [
-		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 2000",
-		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 2000"
+		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
 	]
 
 	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 2000",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 		//Enroll Response
-		"raw 0x500 {01 23 00 00 00}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
+		"raw 0x500 {01 23 00 00 00}",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
 	]
 }
 

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

@@ -161,7 +161,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if(cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
@@ -339,7 +339,7 @@ private Map getContactResult(value) {
 	log.debug "Contact: ${device.displayName} value = ${value}"
 	def descriptionText = value == 'open' ? '{{ device.displayName }} was opened' : '{{ device.displayName }} was closed'
 	sendEvent(name: 'contact', value: value, descriptionText: descriptionText, displayed: false, translatable: true)
-	return [name: 'status', value: value, descriptionText: descriptionText, translatable: true]
+	sendEvent(name: 'status', value: value, descriptionText: descriptionText, translatable: true)
 }
 
 private getAccelerationResult(numValue) {
@@ -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 2000",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 		//Enroll Response
 		"raw 0x500 {01 23 00 00 00}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
+		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
 	]
 }
 

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

@@ -119,7 +119,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07){
 					if (cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
@@ -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 2000",
-		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 2000"
+        "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
 	]
 
 	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 2000",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 		//Enroll Response
-		"raw 0x500 {01 23 00 00 00}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
+		"raw 0x500 {01 23 00 00 00}",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
 	]
 }
 

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

@@ -103,7 +103,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00){
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
@@ -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 2000",
-		"zcl global send-me-a-report 0xFC45 0 0x29 30 3600 {6400}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
+		"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"
 	]
 
 	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity

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,7 +39,9 @@ metadata {
 	}
 }
 
-def parse(description) {
+def parse(String description) {
+	def pair = description.split(":")
+	createEvent(name: pair[0].trim(), value: pair[1].trim())
 }
 
 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.replaceAll("[^\\x20-\\x7e]", ""))
+		def body = new XmlSlurper().parseText(bodyString)
 
 		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.replaceAll("[^\\x20-\\x7e]", ""))
+		def body = new XmlSlurper().parseText(bodyString)
 		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.replaceAll("[^\\x20-\\x7e]", ""))
+        def body = new XmlSlurper().parseText(bodyString)
  		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

@@ -28,10 +28,6 @@ metadata {
         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-switch.src/zigbee-switch.groovy

@@ -22,7 +22,6 @@ 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/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy

@@ -89,7 +89,7 @@ def on() {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
 def refresh() {
@@ -127,8 +127,8 @@ def configureHealthCheck() {
 
 def configure() {
     log.debug "configure()"
-    configureHealthCheck()
     zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
+    configureHealthCheck()
 }
 
 def updated() {

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

@@ -115,7 +115,7 @@ def refreshAttributes() {
 }
 
 def setLevel(value) {
-	zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+	zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
 def setColor(value){

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

@@ -135,7 +135,7 @@ def setColorTemperature(value) {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()        //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
 def setColor(value){

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

@@ -90,7 +90,7 @@ def on() {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()
+    zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()
 }
 
 def refresh() {

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

@@ -24,10 +24,6 @@ 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,7 +28,6 @@ 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,9 +25,6 @@ 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,11 +1,10 @@
 /**
  * 	Color Coordinator 
- *  Version 1.1.1 - 11/9/16
+ *  Version 1.1.0 - 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
@@ -34,17 +33,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", required: true
+			input "master", "capability.colorControl", title: "Colored Light"
 		}
 		section("Lights that follow the master settings") {
-			input "slaves", "capability.colorControl", title: "Colored Lights",  multiple: true, required: true, submitOnChange: true
+			input "slaves", "capability.colorControl", title: "Colored Lights",  multiple: true, required: false, submitOnChange: true
 		}
     	section([mobileOnly:true], "Options") {
 			input "randomYes", "bool",title: "When Master Turned On, Randomize Color", defaultValue: false
@@ -82,44 +81,40 @@ def init() {
 }
 //-----------------------------------
 def onOffHandler(evt){
-	if (slaves && master) {
-		if (!slaves?.id.find{it==master?.id}){
-		if (master?.currentValue("switch") == "on"){
-		    if (randomYes) getRandomColorMaster()
-				else slaves?.on()
-		}
-		else {
-		    slaves?.off()  
-		}
-		}
+	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 && 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 --"
-		}
-		}
+   	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
@@ -128,14 +123,12 @@ def getRandomColorMaster(){
 }
 
 def tempHandler(evt){
-	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)
-		}
-		}
+    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)
+        }
 	}
 }
 
@@ -146,7 +139,7 @@ private def textAppName() {
 }	
 
 private def textVersion() {
-    def text = "Version 1.1.1 (12/13/2016)"
+    def text = "Version 1.1.0 (11/09/2016)"
 }
 
 private def textCopyright() {
@@ -173,4 +166,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,461 +0,0 @@
-/**
- *  OpenT2T SmartApp Test
- *
- *  Copyright 2016 OpenT2T
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-definition(
-		name: "OpenT2T SmartApp Test",
-		namespace: "opent2t",
-		author: "OpenT2T",
-		description: "Test app to test end to end SmartThings scenarios via OpenT2T",
-		category: "SmartThings Labs",
-		iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-		iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-		iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
-
-/** --------------------+---------------+-----------------------+------------------------------------
- *  Device Type         | Attribute Name| Commands              | Attribute Values
- *  --------------------+---------------+-----------------------+------------------------------------
- *  switches            | switch        | on, off               | on, off
- *  motionSensors       | motion        |                       | active, inactive
- *  contactSensors      | contact       |                       | open, closed
- *  presenceSensors     | presence      |                       | present, 'not present'
- *  temperatureSensors  | temperature   |                       | <numeric, F or C according to unit>
- *  accelerationSensors | acceleration  |                       | active, inactive
- *  waterSensors        | water         |                       | wet, dry
- *  lightSensors        | illuminance   |                       | <numeric, lux>
- *  humiditySensors     | humidity      |                       | <numeric, percent>
- *  locks               | lock          | lock, unlock          | locked, unlocked
- *  garageDoors         | door          | open, close           | unknown, closed, open, closing, opening
- *  cameras             | image         | take                  | <String>
- *  thermostats         | thermostat    | setHeatingSetpoint,   | temperature, heatingSetpoint, coolingSetpoint,
- * 	                    |				| setCoolingSetpoint,   | thermostatSetpoint, thermostatMode,
- *                      |				| off, heat, cool, auto,| thermostatFanMode, thermostatOperatingState
- *                      |				| emergencyHeat,        |
- *                      |				| setThermostatMode,    |
- *                      |				| fanOn, fanAuto,       |
- *                      |				| fanCirculate,         |
- *                      |				| setThermostatFanMode  |
- *  --------------------+---------------+-----------------------+------------------------------------
- */
-
-//Device Inputs
-preferences {
-	section("Allow <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
-}
-
-//API external Endpoints
-mappings {
-	path("/subscriptionURL/:url") {
-		action:
-		[
-				PUT: "updateEndpointURL"
-		]
-	}
-	path("/connectionId/:connId") {
-		action:
-		[
-				PUT: "updateConnectionId"
-		]
-	}
-	path("/devices") {
-		action:
-		[
-				GET: "getDevices"
-		]
-	}
-	path("/devices/:id") {
-		action:
-		[
-				GET: "getDevice"
-		]
-	}
-	path("/update/:id") {
-		action:
-		[
-				PUT: "updateDevice"
-		]
-	}
-	path("/subscription/:id") {
-		action:
-		[
-				POST  : "registerDeviceChange",
-				DELETE: "unregisterDeviceChange"
-		]
-	}
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-	unsubscribe()
-	registerSubscriptions()
-}
-
-def initialize() {
-	state.connectionId = ""
-	state.endpointURL = "https://ifs.windows-int.com/v1/cb/81C7E77B-EABC-488A-B2BF-FEC42F0DABD2/notify"
-	registerSubscriptions()
-}
-
-//Subscribe events for all devices
-def registerSubscriptions() {
-	registerChangeHandler(inputs)
-}
-
-//Subscribe to events from a list of devices
-def registerChangeHandler(myList) {
-	myList.each { myDevice ->
-		def theAtts = myDevice.supportedAttributes
-		theAtts.each { att ->
-			subscribe(myDevice, att.name, eventHandler)
-			log.info "Registering ${myDevice.displayName}.${att.name}"
-		}
-	}
-}
-
-//Endpoints function: Subscribe to events from a specific device
-def registerDeviceChange() {
-	def myDevice = findDevice(params.id)
-	def theAtts = myDevice.supportedAttributes
-	try {
-		theAtts.each { att ->
-			subscribe(myDevice, att.name, eventHandler)
-			log.info "Registering ${myDevice.displayName}.${att.name}"
-		}
-		return ["succeed"]
-	} catch (e) {
-		httpError(500, "something went wrong: $e")
-	}
-}
-
-//Endpoints function: Unsubscribe to events from a specific device
-def unregisterDeviceChange() {
-	def myDevice = findDevice(params.id)
-	try {
-		unsubscribe(myDevice)
-		log.info "Unregistering ${myDevice.displayName}"
-		return ["succeed"]
-	} catch (e) {
-		httpError(500, "something went wrong: $e")
-	}
-}
-
-//When events are triggered, send HTTP post to web socket servers
-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 {
-		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"
-	}
-}
-
-//Endpoints function: update subcription endpoint url [state.endpoint]
-void updateEndpointURL() {
-	state.endpointURL = params.url
-	log.info "Updated EndpointURL to ${state.endpointURL}"
-}
-
-//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 = []
-	inputs?.each {
-		def deviceType = getDeviceType(it)
-		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, 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 it = findDevice(params.id)
-	def deviceType = getDeviceType(it)
-	def device
-	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, 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() {
-	def device = findDevice(params.id)
-	request.JSON.each {
-		def command = it.key
-		def value = it.value
-		if (command) {
-			def commandList = mapDeviceCommands(command, value)
-			command = commandList[0]
-			value = commandList[1]
-
-			if (command == "setAwayMode") {
-				log.info "Setting away mode to ${value}"
-				if (location.modes?.find { it.name == value }) {
-					location.setMode(value)
-				}
-			} else if (command == "thermostatSetpoint") {
-				switch (device.currentThermostatMode) {
-					case "cool":
-						log.info "Update: ${device.displayName}, [${command}, ${value}]"
-						device.setCoolingSetpoint(value)
-						break
-					case "heat":
-					case "emergency heat":
-						log.info "Update: ${device.displayName}, [${command}, ${value}]"
-						device.setHeatingSetpoint(value)
-						break
-					default:
-						httpError(501, "this mode: ${device.currentThermostatMode} does not allow changing thermostat setpoint.")
-						break
-				}
-			} else if (!device) {
-				log.error "updateDevice, Device not found"
-				httpError(404, "Device not found")
-			} else if (!device.hasCommand(command)) {
-				log.error "updateDevice, Device does not have the command"
-				httpError(404, "Device does not have such command")
-			} else {
-				if (command == "setColor") {
-					log.info "Update: ${device.displayName}, [${command}, ${value}]"
-					device."$command"(hex: value)
-				} else if (value.isNumber()) {
-					def intValue = value as Integer
-					log.info "Update: ${device.displayName}, [${command}, ${intValue}(int)]"
-					device."$command"(intValue)
-				} else if (value) {
-					log.info "Update: ${device.displayName}, [${command}, ${value}]"
-					device."$command"(value)
-				} else {
-					log.info "Update: ${device.displayName}, [${command}]"
-					device."$command"()
-				}
-			}
-		}
-	}
-}
-
-/*** Private Functions ***/
-
-//Return current location mode info
-private getLocationModeInfo() {
-	return [mode: location.mode, supported: location.modes.name]
-}
-
-//Map each device to a type given it's capabilities
-private getDeviceType(device) {
-	def deviceType
-	def caps = device.capabilities
-	log.debug "capabilities: [${device}, ${caps}]"
-	log.debug "supported commands: [${device}, ${device.supportedCommands}]"
-	caps.each {
-		switch (it.name.toLowerCase()) {
-			case "switch":
-				deviceType = "switch"
-				break
-			case "switch level":
-				deviceType = "light"
-				break
-			case "contact sensor":
-				deviceType = "contactSensor"
-				break
-			case "garageDoorControl":
-				deviceType = "garageDoor"
-				break
-			case "lock":
-				deviceType = "lock"
-				break
-			case "video camera":
-				deviceType = "camera"
-				break
-			case "motion sensor":
-				deviceType = "motionSensor"
-				break
-			case "presence sensor":
-				deviceType = "presenceSensor"
-				break
-			case "thermostat":
-				deviceType = "thermostat"
-				break
-			case "water sensor":
-				deviceType = "waterSensor"
-				break
-			default:
-				break
-		}
-	}
-	return deviceType
-}
-
-//Return a specific device give the device ID.
-private findDevice(deviceId) {
-	return inputs?.find { it.id == deviceId }
-}
-
-//Return a list of device attributes
-private deviceAttributeList(device) {
-	device.supportedAttributes.collectEntries { attribute ->
-		try {
-			[(attribute.name): device.currentValue(attribute.name)]
-		} catch (e) {
-			[(attribute.name): null]
-		}
-	}
-}
-
-//Map device command and value.
-//input command and value are from UWP,
-//returns resultCommand and resultValue that corresponds with function and value in SmartApps
-private mapDeviceCommands(command, value) {
-	log.debug "mapDeviceCommands: [${command}, ${value}]"
-	def resultCommand = command
-	def resultValue = value
-	switch (command) {
-		case "switch":
-			if (value == 1 || value == "1" || value == "on") {
-				resultCommand = "on"
-				resultValue = ""
-			} else if (value == 0 || value == "0" || value == "off") {
-				resultCommand = "off"
-				resultValue = ""
-			}
-			break
-	// light attributes
-		case "level":
-			resultCommand = "setLevel"
-			resultValue = value
-			break
-		case "hue":
-			resultCommand = "setHue"
-			resultValue = value
-			break
-		case "saturation":
-			resultCommand = "setSaturation"
-			resultValue = value
-			break
-		case "ct":
-			resultCommand = "setColorTemperature"
-			resultValue = value
-			break
-		case "color":
-			resultCommand = "setColor"
-			resultValue = value
-	// thermostat attributes
-		case "hvacMode":
-			resultCommand = "setThermostatMode"
-			resultValue = value
-			break
-		case "fanMode":
-			resultCommand = "setThermostatFanMode"
-			resultValue = value
-			break
-		case "awayMode":
-			resultCommand = "setAwayMode"
-			resultValue = value
-			break
-		case "coolingSetpoint":
-			resultCommand = "setCoolingSetpoint"
-			resultValue = value
-			break
-		case "heatingSetpoint":
-			resultCommand = "setHeatingSetpoint"
-			resultValue = value
-			break
-		case "thermostatSetpoint":
-			resultCommand = "thermostatSetpoint"
-			resultValue = value
-			break
-	// lock attributes
-		case "locked":
-			if (value == 1 || value == "1" || value == "lock") {
-				resultCommand = "lock"
-				resultValue = ""
-			} else if (value == 0 || value == "0" || value == "unlock") {
-				resultCommand = "unlock"
-				resultValue = ""
-			}
-			break
-		default:
-			break
-	}
-
-	return [resultCommand, resultValue]
-}
-

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

@@ -172,34 +172,18 @@ def bulbDiscovery() {
 			if (existingLightsDescription.isEmpty()) {
 				existingLightsDescription += it.value
 			} else {
-				existingLightsDescription += ", ${it.value}"
+				 existingLightsDescription += ", ${it.value}"
 			}
 		}
 	}
 
-	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]
-			}
+	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
 		}
-
-	} 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]
-			}
+		section {
+			href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
 		}
 	}
 }
@@ -423,7 +407,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")) {
@@ -609,7 +593,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")) {
@@ -835,7 +819,8 @@ def parse(childDevice, description) {
 			try {
 				body = new groovy.json.JsonSlurper().parseText(bodyString)
 			} catch (all) {
-				log.warn "Parsing Body failed"
+				log.warn "Parsing Body failed - trying again..."
+				poll()
 			}
 			if (body instanceof java.util.Map) {
 				// get (poll) reponse
@@ -859,7 +844,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 && ct != 0 && (colormode == "ct" || (xy == null && hue == null && sat == null))) {
+	if (ct != null && (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)
@@ -1267,7 +1252,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.info "Life360 initializeLife360Connection, response=${result.data}"
+		log.debug "Response=${result.data}"
         return false;
         
     }
     catch (e) {
-       log.error "Life360 initializeLife360Connection, error: $e"
+       log.debug e
        return false;
     }
 
@@ -656,7 +656,7 @@ def generateInitialEvent (member, childDevice) {
     
     try { // we are going to just ignore any errors
     
-    	log.info "Life360 generateInitialEvent($member, $childDevice)"
+    	log.debug "Generate Initial Event for New Device for Member = ${member.id}"
         
         def place = state.places.find{it.id==settings.place}
         
@@ -677,8 +677,6 @@ def generateInitialEvent (member, childDevice) {
         	// log.debug "Distance Away = ${distanceAway}"
   
   			boolean isPresent = (distanceAway <= placeRadius)
-
-			log.info "Life360 generateInitialEvent, member: ($memberLatitude, $memberLongitude), place: ($placeLatitude, $placeLongitude), radius: $placeRadius, dist: $distanceAway, present: $isPresent"
                 
         	// log.debug "External Id=${app.id}:${member.id}"
         
@@ -720,7 +718,7 @@ def haversine(lat1, lon1, lat2, lon2) {
 
 def placeEventHandler() {
 
-	log.info "Life360 placeEventHandler: params=$params, settings.place=$settings.place"
+	log.debug "In placeEventHandler method."
 
 	// the POST to this end-point will look like:
     // POST http://test.com/webhook?circleId=XXXX&placeId=XXXX&userId=XXXX&direction=arrive
@@ -731,6 +729,8 @@ def placeEventHandler() {
     def direction = params?.direction
     def timestamp = params?.timestamp
     
+    log.debug "Life360 Event: Circle: ${circleId}, Place: ${placeId}, User: ${userId}, Direction: ${direction}"
+
     if (placeId == settings.place) {
 
 		def presenceState = (direction=="in")
@@ -745,10 +745,10 @@ def placeEventHandler() {
 
 		if (deviceWrapper) {
 			deviceWrapper.generatePresenceEvent(presenceState)
-    		log.debug "Life360 event raised on child device: ${externalId}"
+    		log.debug "Event raised on child device: ${externalId}"
 		}
    		else {
-    		log.warn "Life360 couldn't find child device associated with inbound Life360 event."
+    		log.debug "Couldn't find child device associated with inbound Life360 event."
     	}
     }