Merge pull request #1583 from SmartThingsCommunity/staging

Rolling up staging to production for deploy

devicetypes/smartthings-users/nest.src/nest.groovy

@@ -1,600 +0,0 @@
-/**
- *  Nest Direct
- *
- *  Author: dianoga7@3dgo.net
- *  Code: https://github.com/smartthings-users/device-type.nest
- *
- * INSTALLATION
- * =========================================
- * 1) Create a new device type (https://graph.api.smartthings.com/ide/devices)
- *     Name: Nest
- *     Author: dianoga7@3dgo.net
- *     Capabilities:
- *         Polling
- *         Relative Humidity Measurement
- *         Thermostat
- *         Temperature Measurement
- *         Presence Sensor
- *         Sensor
- *     Custom Attributes:
- *         temperatureUnit
- *     Custom Commands:
- *         away
- *         present
- *         setPresence
- *         heatingSetpointUp
- *         heatingSetpointDown
- *         coolingSetpointUp
- *         coolingSetpointDown
- *         setFahrenheit
- *         setCelsius
- *
- * 2) If you want to switch from slider controls to buttons, comment out the slider details line and uncomment the button details line.
- *
- * 3) Create a new device (https://graph.api.smartthings.com/device/list)
- *     Name: Your Choice
- *     Device Network Id: Your Choice
- *     Type: Nest (should be the last option)
- *     Location: Choose the correct location
- *     Hub/Group: Leave blank
- *
- * 4) Update device preferences
- *     Click on the new device to see the details.
- *     Click the edit button next to Preferences
- *     Fill in your information.
- *     To find your serial number, login to http://home.nest.com. Click on the thermostat
- *     you want to control. Under settings, go to Technical Info. Your serial number is
- *     the second item.
- *
- * 5) That's it, you're done.
- *
- * Copyright (C) 2013 Brian Steere <dianoga7@3dgo.net>
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this
- * software and associated documentation files (the "Software"), to deal in the Software
- * without restriction, including without limitation the rights to use, copy, modify,
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to the following
- * conditions: The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-preferences {
-	input("username", "text", title: "Username", description: "Your Nest username (usually an email address)")
-	input("password", "password", title: "Password", description: "Your Nest password")
-	input("serial", "text", title: "Serial #", description: "The serial number of your thermostat")
-}
-
-// for the UI
-metadata {
-	definition (name: "Nest", namespace: "smartthings-users", author: "dianoga7@3dgo.net") {
-		capability "Polling"
-		capability "Relative Humidity Measurement"
-		capability "Thermostat"
-		capability "Temperature Measurement"
-		capability "Presence Sensor"
-		capability "Sensor"
-
-		command "away"
-		command "present"
-		command "setPresence"
-		command "heatingSetpointUp"
-		command "heatingSetpointDown"
-		command "coolingSetpointUp"
-		command "coolingSetpointDown"
-		command "setFahrenheit"
-		command "setCelsius"
-
-		attribute "temperatureUnit", "string"
-	}
-
-	simulator {
-		// TODO: define status and reply messages here
-	}
-
-	tiles {
-		valueTile("temperature", "device.temperature", canChangeIcon: true, canChangeBackground:true) {
-			state("temperature", label: '${currentValue}°', backgroundColors: [
-				// Celsius Color Range
-				[value: 0, color: "#153591"],
-				[value: 7, color: "#1e9cbb"],
-				[value: 15, color: "#90d2a7"],
-				[value: 23, color: "#44b621"],
-				[value: 29, color: "#f1d801"],
-				[value: 33, color: "#d04e00"],
-				[value: 36, color: "#bc2323"],
-				// Fahrenheit Color Range
-				[value: 40, color: "#153591"],
-				[value: 44, color: "#1e9cbb"],
-				[value: 59, color: "#90d2a7"],
-				[value: 74, color: "#44b621"],
-				[value: 84, color: "#f1d801"],
-				[value: 92, color: "#d04e00"],
-				[value: 96, color: "#bc2323"]
-			]
-			)
-		}
-
-		standardTile("thermostatMode", "device.thermostatMode", inactiveLabel: true, decoration: "flat") {
-			state("auto", action:"thermostat.off", icon: "st.thermostat.auto")
-			state("off", action:"thermostat.cool", icon: "st.thermostat.heating-cooling-off")
-			state("cool", action:"thermostat.heat", icon: "st.thermostat.cool")
-			state("heat", action:"thermostat.auto", icon: "st.thermostat.heat")
-		}
-
-		standardTile("thermostatFanMode", "device.thermostatFanMode", inactiveLabel: true, decoration: "flat") {
-			state "auto", action:"thermostat.fanOn", icon: "st.thermostat.fan-auto"
-			state "on", action:"thermostat.fanCirculate", icon: "st.thermostat.fan-on"
-			state "circulate", action:"thermostat.fanAuto", icon: "st.thermostat.fan-circulate"
-		}
-
-		valueTile("heatingSetpoint", "device.heatingSetpoint") {
-			state "default", label:'${currentValue}°', unit:"Heat", backgroundColor:"#bc2323"
-		}
-
-		valueTile("coolingSetpoint", "device.coolingSetpoint") {
-			state "default", label:'${currentValue}°', unit:"Cool", backgroundColor:"#1e9cbb"
-		}
-
-		standardTile("thermostatOperatingState", "device.thermostatOperatingState", inactiveLabel: false, decoration: "flat") {
-			state "idle", action:"polling.poll", label:'${name}', icon: "st.sonos.pause-icon"
-			state "cooling", action:"polling.poll", label:'  ', icon: "st.thermostat.cooling", backgroundColor:"#1e9cbb"
-			state "heating", action:"polling.poll", label:'  ', icon: "st.thermostat.heating", backgroundColor:"#bc2323"
-			state "fan only", action:"polling.poll", label:'${name}', icon: "st.Appliances.appliances11"
-		}
-
-		valueTile("humidity", "device.humidity", inactiveLabel: false) {
-			state "default", label:'${currentValue}%', unit:"Humidity"
-		}
-
-		standardTile("presence", "device.presence", inactiveLabel: false, decoration: "flat") {
-			state "present", label:'${name}', action:"away", icon: "st.Home.home2"
-			state "not present", label:'away', action:"present", icon: "st.Transportation.transportation5"
-		}
-
-		standardTile("refresh", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
-			state "default", action:"polling.poll", icon:"st.secondary.refresh"
-		}
-
-		standardTile("temperatureUnit", "device.temperatureUnit", canChangeIcon: false) {
-			state "fahrenheit",  label: "°F", icon: "st.alarm.temperature.normal", action:"setCelsius"
-			state "celsius", label: "°C", icon: "st.alarm.temperature.normal", action:"setFahrenheit"
-		}
-
-		controlTile("heatSliderControl", "device.heatingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "setHeatingSetpoint", label:'Set temperature to', action:"thermostat.setHeatingSetpoint"
-		}
-		controlTile("coolSliderControl", "device.coolingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "setCoolingSetpoint", label:'Set temperature to', action:"thermostat.setCoolingSetpoint"
-		}
-
-		standardTile("heatingSetpointUp", "device.heatingSetpoint", canChangeIcon: false, inactiveLabel: false, decoration: "flat") {
-			state "heatingSetpointUp", label:'  ', action:"heatingSetpointUp", icon:"st.thermostat.thermostat-up", backgroundColor:"#bc2323"
-		}
-
-		standardTile("heatingSetpointDown", "device.heatingSetpoint", canChangeIcon: false, inactiveLabel: false, decoration: "flat") {
-			state "heatingSetpointDown", label:'  ', action:"heatingSetpointDown", icon:"st.thermostat.thermostat-down", backgroundColor:"#bc2323"
-		}
-
-		standardTile("coolingSetpointUp", "device.coolingSetpoint", canChangeIcon: false, inactiveLabel: false, decoration: "flat") {
-			state "coolingSetpointUp", label:'  ', action:"coolingSetpointUp", icon:"st.thermostat.thermostat-up", backgroundColor:"#1e9cbb"
-		}
-
-		standardTile("coolingSetpointDown", "device.coolingSetpoint", canChangeIcon: false, inactiveLabel: false, decoration: "flat") {
-			state "coolingSetpointDown", label:'  ', action:"coolingSetpointDown", icon:"st.thermostat.thermostat-down", backgroundColor:"#1e9cbb"
-		}
-
-		main(["temperature", "thermostatOperatingState", "humidity"])
-
-		// ============================================================
-		// Slider or Buttons...
-		// To expose buttons, comment out the first detials line below and uncomment the second details line below.
-		// To expose sliders, uncomment the first details line below and comment out the second details line below.
-
-		details(["temperature", "thermostatOperatingState", "humidity", "thermostatMode", "thermostatFanMode", "presence", "heatingSetpoint", "heatSliderControl", "coolingSetpoint", "coolSliderControl", "temperatureUnit", "refresh"])
-		// details(["temperature", "thermostatOperatingState", "humidity", "thermostatMode", "thermostatFanMode", "presence", "heatingSetpointDown", "heatingSetpoint", "heatingSetpointUp", "coolingSetpointDown", "coolingSetpoint", "coolingSetpointUp", "temperatureUnit", "refresh"])
-
-		// ============================================================
-
-	}
-
-}
-
-// parse events into attributes
-def parse(String description) {
-
-}
-
-// handle commands
-def setHeatingSetpoint(temp) {
-	def latestThermostatMode = device.latestState('thermostatMode')
-	def temperatureUnit = device.latestValue('temperatureUnit')
-
-	switch (temperatureUnit) {
-		case "celsius":
-			if (temp) {
-				if (temp < 9) {
-					temp = 9
-				}
-				if (temp > 32) {
-					temp = 32
-				}
-				if (latestThermostatMode.stringValue == 'auto') {
-					api('temperature', ['target_change_pending': true, 'target_temperature_low': temp]) {
-						sendEvent(name: 'heatingSetpoint', value: heatingSetpoint, unit: temperatureUnit, state: "heat")
-					}
-				} else if (latestThermostatMode.stringValue == 'heat') {
-					api('temperature', ['target_change_pending': true, 'target_temperature': temp]) {
-							sendEvent(name: 'heatingSetpoint', value: heatingSetpoint, unit: temperatureUnit, state: "heat")
-					}
-				}
-			}
-			break;
-		default:
-			if (temp) {
-				if (temp < 51) {
-					temp = 51
-				}
-				if (temp > 89) {
-					temp = 89
-				}
-				if (latestThermostatMode.stringValue == 'auto') {
-					api('temperature', ['target_change_pending': true, 'target_temperature_low': fToC(temp)]) {
-						sendEvent(name: 'heatingSetpoint', value: heatingSetpoint, unit: temperatureUnit, state: "heat")
-					}
-				} else if (latestThermostatMode.stringValue == 'heat') {
-					api('temperature', ['target_change_pending': true, 'target_temperature': fToC(temp)]) {
-						sendEvent(name: 'heatingSetpoint', value: heatingSetpoint, unit: temperatureUnit, state: "heat")
-					}
-				}
-			}
-			break;
-	}
-	poll()
-}
-
-def coolingSetpointUp(){
-	int newSetpoint = device.currentValue("coolingSetpoint") + 1
-	log.debug "Setting cool set point up to: ${newSetpoint}"
-	setCoolingSetpoint(newSetpoint)
-}
-
-def coolingSetpointDown(){
-	int newSetpoint = device.currentValue("coolingSetpoint") - 1
-	log.debug "Setting cool set point down to: ${newSetpoint}"
-	setCoolingSetpoint(newSetpoint)
-}
-
-def setCoolingSetpoint(temp) {
-	def latestThermostatMode = device.latestState('thermostatMode')
-	def temperatureUnit = device.latestValue('temperatureUnit')
-
-	switch (temperatureUnit) {
-		case "celsius":
-			if (temp) {
-				if (temp < 9) {
-					temp = 9
-				}
-				if (temp > 32) {
-					temp = 32
-				}
-				if (latestThermostatMode.stringValue == 'auto') {
-					api('temperature', ['target_change_pending': true, 'target_temperature_high': temp]) {
-						sendEvent(name: 'coolingSetpoint', value: coolingSetpoint, unit: temperatureUnit, state: "cool")
-					}
-				} else if (latestThermostatMode.stringValue == 'cool') {
-					api('temperature', ['target_change_pending': true, 'target_temperature': temp]) {
-						sendEvent(name: 'coolingSetpoint', value: coolingSetpoint, unit: temperatureUnit, state: "cool")
-					}
-				}
-			}
-			break;
-		default:
-			if (temp) {
-				if (temp < 51) {
-					temp = 51
-				}
-				if (temp > 89) {
-					temp = 89
-				}
-				if (latestThermostatMode.stringValue == 'auto') {
-					api('temperature', ['target_change_pending': true, 'target_temperature_high': fToC(temp)]) {
-						sendEvent(name: 'coolingSetpoint', value: coolingSetpoint, unit: temperatureUnit, state: "cool")
-					}
-				} else if (latestThermostatMode.stringValue == 'cool') {
-					api('temperature', ['target_change_pending': true, 'target_temperature': fToC(temp)]) {
-						sendEvent(name: 'coolingSetpoint', value: coolingSetpoint, unit: temperatureUnit, state: "cool")
-					}
-				}
-			}
-			break;
-	}
-	poll()
-}
-
-def heatingSetpointUp(){
-	int newSetpoint = device.currentValue("heatingSetpoint") + 1
-	log.debug "Setting heat set point up to: ${newSetpoint}"
-	setHeatingSetpoint(newSetpoint)
-}
-
-def heatingSetpointDown(){
-	int newSetpoint = device.currentValue("heatingSetpoint") - 1
-	log.debug "Setting heat set point down to: ${newSetpoint}"
-	setHeatingSetpoint(newSetpoint)
-}
-
-def setFahrenheit() {
-	def temperatureUnit = "fahrenheit"
-	log.debug "Setting temperatureUnit to: ${temperatureUnit}"
-	sendEvent(name: "temperatureUnit",   value: temperatureUnit)
-	poll()
-}
-
-def setCelsius() {
-	def temperatureUnit = "celsius"
-	log.debug "Setting temperatureUnit to: ${temperatureUnit}"
-	sendEvent(name: "temperatureUnit",   value: temperatureUnit)
-	poll()
-}
-
-def off() {
-	setThermostatMode('off')
-}
-
-def heat() {
-	setThermostatMode('heat')
-}
-
-def emergencyHeat() {
-	setThermostatMode('heat')
-}
-
-def cool() {
-	setThermostatMode('cool')
-}
-
-def auto() {
-	setThermostatMode('range')
-}
-
-def setThermostatMode(mode) {
-	mode = mode == 'emergency heat'? 'heat' : mode
-
-	api('thermostat_mode', ['target_change_pending': true, 'target_temperature_type': mode]) {
-		mode = mode == 'range' ? 'auto' : mode
-		sendEvent(name: 'thermostatMode', value: mode)
-		poll()
-	}
-}
-
-def fanOn() {
-	setThermostatFanMode('on')
-}
-
-def fanAuto() {
-	setThermostatFanMode('auto')
-}
-
-def fanCirculate() {
-	setThermostatFanMode('circulate')
-}
-
-def setThermostatFanMode(mode) {
-	def modes = [
-		on: ['fan_mode': 'on'],
-		auto: ['fan_mode': 'auto'],
-		circulate: ['fan_mode': 'duty-cycle', 'fan_duty_cycle': 900]
-	]
-
-	api('fan_mode', modes.getAt(mode)) {
-		sendEvent(name: 'thermostatFanMode', value: mode)
-		poll()
-	}
-}
-
-def away() {
-	setPresence('away')
-	sendEvent(name: 'presence', value: 'not present')
-}
-
-def present() {
-	setPresence('present')
-	sendEvent(name: 'presence', value: 'present')
-}
-
-def setPresence(status) {
-	log.debug "Status: $status"
-	api('presence', ['away': status == 'away', 'away_timestamp': new Date().getTime(), 'away_setter': 0]) {
-		poll()
-	}
-}
-
-def poll() {
-	log.debug "Executing 'poll'"
-	api('status', []) {
-		data.device = it.data.device.getAt(settings.serial)
-		data.shared = it.data.shared.getAt(settings.serial)
-		data.structureId = it.data.link.getAt(settings.serial).structure.tokenize('.')[1]
-		data.structure = it.data.structure.getAt(data.structureId)
-
-		data.device.fan_mode = data.device.fan_mode == 'duty-cycle'? 'circulate' : data.device.fan_mode
-		data.structure.away = data.structure.away ? 'away' : 'present'
-
-		log.debug(data.shared)
-
-		def humidity = data.device.current_humidity
-		def temperatureType = data.shared.target_temperature_type
-		def fanMode = data.device.fan_mode
-		def heatingSetpoint = '--'
-		def coolingSetpoint = '--'
-
-		temperatureType = temperatureType == 'range' ? 'auto' : temperatureType
-
-		sendEvent(name: 'humidity', value: humidity)
-		sendEvent(name: 'thermostatFanMode', value: fanMode)
-		sendEvent(name: 'thermostatMode', value: temperatureType)
-
-		def temperatureUnit = device.latestValue('temperatureUnit')
-
-		switch (temperatureUnit) {
-			case "celsius":
-				def temperature = Math.round(data.shared.current_temperature)
-				def targetTemperature = Math.round(data.shared.target_temperature)
-
-				if (temperatureType == "cool") {
-					coolingSetpoint = targetTemperature
-				} else if (temperatureType == "heat") {
-					heatingSetpoint = targetTemperature
-				} else if (temperatureType == "auto") {
-					coolingSetpoint = Math.round(data.shared.target_temperature_high)
-					heatingSetpoint = Math.round(data.shared.target_temperature_low)
-				}
-
-				sendEvent(name: 'temperature', value: temperature, unit: temperatureUnit, state: temperatureType)
-				sendEvent(name: 'coolingSetpoint', value: coolingSetpoint, unit: temperatureUnit, state: "cool")
-				sendEvent(name: 'heatingSetpoint', value: heatingSetpoint, unit: temperatureUnit, state: "heat")
-				break;
-			default:
-				def temperature = Math.round(cToF(data.shared.current_temperature))
-				def targetTemperature = Math.round(cToF(data.shared.target_temperature))
-
-				if (temperatureType == "cool") {
-					coolingSetpoint = targetTemperature
-				} else if (temperatureType == "heat") {
-					heatingSetpoint = targetTemperature
-				} else if (temperatureType == "auto") {
-					coolingSetpoint = Math.round(cToF(data.shared.target_temperature_high))
-					heatingSetpoint = Math.round(cToF(data.shared.target_temperature_low))
-				}
-
-				sendEvent(name: 'temperature', value: temperature, unit: temperatureUnit, state: temperatureType)
-				sendEvent(name: 'coolingSetpoint', value: coolingSetpoint, unit: temperatureUnit, state: "cool")
-				sendEvent(name: 'heatingSetpoint', value: heatingSetpoint, unit: temperatureUnit, state: "heat")
-				break;
-			}
-
-		switch (device.latestValue('presence')) {
-			case "present":
-				if (data.structure.away == 'away') {
-					sendEvent(name: 'presence', value: 'not present')
-				}
-				break;
-			case "not present":
-				if (data.structure.away == 'present') {
-					sendEvent(name: 'presence', value: 'present')
-				}
-				break;
-		}
-
-		if (data.shared.hvac_ac_state) {
-			sendEvent(name: 'thermostatOperatingState', value: "cooling")
-		} else if (data.shared.hvac_heater_state) {
-			sendEvent(name: 'thermostatOperatingState', value: "heating")
-		} else if (data.shared.hvac_fan_state) {
-			sendEvent(name: 'thermostatOperatingState', value: "fan only")
-		} else {
-			sendEvent(name: 'thermostatOperatingState', value: "idle")
-		}
-	}
-}
-
-def api(method, args = [], success = {}) {
-	if(!isLoggedIn()) {
-		log.debug "Need to login"
-		login(method, args, success)
-		return
-	}
-
-	def methods = [
-		'status': [uri: "/v2/mobile/${data.auth.user}", type: 'get'],
-		'fan_mode': [uri: "/v2/put/device.${settings.serial}", type: 'post'],
-		'thermostat_mode': [uri: "/v2/put/shared.${settings.serial}", type: 'post'],
-		'temperature': [uri: "/v2/put/shared.${settings.serial}", type: 'post'],
-		'presence': [uri: "/v2/put/structure.${data.structureId}", type: 'post']
-	]
-
-	def request = methods.getAt(method)
-
-	log.debug "Logged in"
-	doRequest(request.uri, args, request.type, success)
-}
-
-// Need to be logged in before this is called. So don't call this. Call api.
-def doRequest(uri, args, type, success) {
-	log.debug "Calling $type : $uri : $args"
-
-	if(uri.charAt(0) == '/') {
-		uri = "${data.auth.urls.transport_url}${uri}"
-	}
-
-	def params = [
-		uri: uri,
-		headers: [
-			'X-nl-protocol-version': 1,
-			'X-nl-user-id': data.auth.userid,
-			'Authorization': "Basic ${data.auth.access_token}"
-		],
-		body: args
-	]
-
-	def postRequest = { response ->
-		if (response.getStatus() == 302) {
-			def locations = response.getHeaders("Location")
-			def location = locations[0].getValue()
-			log.debug "redirecting to ${location}"
-			doRequest(location, args, type, success)
-		} else {
-			success.call(response)
-		}
-	}
-
-	try {
-		if (type == 'post') {
-			httpPostJson(params, postRequest)
-		} else if (type == 'get') {
-			httpGet(params, postRequest)
-		}
-	} catch (Throwable e) {
-		login()
-	}
-}
-
-def login(method = null, args = [], success = {}) {
-	def params = [
-		uri: 'https://home.nest.com/user/login',
-		body: [username: settings.username, password: settings.password]
-	]
-
-	httpPost(params) {response ->
-		data.auth = response.data
-		data.auth.expires_in = Date.parse('EEE, dd-MMM-yyyy HH:mm:ss z', response.data.expires_in).getTime()
-		log.debug data.auth
-
-		api(method, args, success)
-	}
-}
-
-def isLoggedIn() {
-	if(!data.auth) {
-		log.debug "No data.auth"
-		return false
-	}
-
-	def now = new Date().getTime();
-	return data.auth.expires_in > now
-}
-
-def cToF(temp) {
-	return (temp * 1.8 + 32).toDouble()
-}
-
-def fToC(temp) {
-	return ((temp - 32) / 1.8).toDouble()
-}

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

@@ -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"
 	]
 
 }
@@ -313,9 +313,9 @@ def isDescriptionPower(descMap) {
 
 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"
 	]
 }
 
@@ -323,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"
 	]
 }
 
@@ -333,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"
 	]
 }
 
@@ -344,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-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/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 {}

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