Merge pull request #1518 from SmartThingsCommunity/staging

Rolling up staging to prod for deploy
Merge pull request #1517 from SmartThingsCommunity/production
2026-03-09 05:11:52 +00:00 · 2016-12-07 12:41:33 -08:00 · 2016-12-07 12:10:01 -08:00 · 2016-12-02 11:39:24 -08:00 · 2016-12-01 14:52:24 -06:00 · 2016-11-28 13:20:16 -08:00
8 changed files with 16 additions and 16 deletions
--- a/devicetypes/smartthings/life360-user.src/life360-user.groovy
+++ b/devicetypes/smartthings/life360-user.src/life360-user.groovy
@@ -39,7 +39,7 @@ metadata {
 }

 def generatePresenceEvent(boolean present) {
-	log.debug "Here in generatePresenceEvent!"
+	log.info "Life360 generatePresenceEvent($present)"
 	def value = formatValue(present)
 	def linkText = getLinkText(device)
 	def descriptionText = formatDescriptionText(linkText, present)
--- a/devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy
@@ -128,7 +128,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00){
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						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]}"
--- a/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
@@ -132,7 +132,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						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]}"
--- a/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
@@ -161,7 +161,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if(cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						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) {
--- a/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy
@@ -119,7 +119,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07){
 					if (cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						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]}"
--- a/devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy
@@ -103,7 +103,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00){
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						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]}"
--- a/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy
+++ b/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy
@@ -127,8 +127,8 @@ def configureHealthCheck() {

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

 def updated() {
--- a/smartapps/smartthings/life360-connect.src/life360-connect.groovy
+++ b/smartapps/smartthings/life360-connect.src/life360-connect.groovy
@@ -289,12 +289,12 @@ def initializeLife360Connection() {
       		state.life360AccessToken = result.data.access_token
            return true;
   		}
-		log.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."
    	}
    }
Author	SHA1	Message	Date
Vinay Rao	083ed7cc9a	Merge pull request #1518 from SmartThingsCommunity/staging Rolling up staging to prod for deploy	2016-12-07 12:41:33 -08:00
Vinay Rao	38ef9e5c77	Merge pull request #1517 from SmartThingsCommunity/production Rolling down production hotfix to staging	2016-12-07 12:10:01 -08:00
Vinay Rao	6a71615ca5	Merge pull request #1505 from varzac/sendevent-appengine-fix DPROT-215 Don't use sendEvent for AppEngine parse events	2016-12-02 11:39:24 -08:00
Zach Varberg	9939591005	Don't use sendEvent for AppEngine parse events With the changes made for https://smartthings.atlassian.net/browse/DPROT-200 there were a few DTHs that were using sendEvent to directly send events generated during parse. However, because using sendEvent didn't result in parse returning an event AppEngine would send the description up to the cloud DTH to be handled. In some cases this resulted in multiple events for the same device trigger. This resolves: https://smartthings.atlassian.net/browse/DPROT-215	2016-12-01 14:52:24 -06:00
Vinay Rao	d7f2bc1d79	Merge pull request #1502 from bflorian/PROB-1426-life360-logging PROB-1426 adding logging to Life360	2016-11-28 13:20:16 -08:00
bflorian	3c5d727d4c	PROB-1426 adding logging to Life360	2016-11-28 16:00:42 -05:00
Vinay Rao	df6c815aa4	Merge pull request #1500 from SmartThingsCommunity/production Rolling down production hotfix to staging	2016-11-28 10:34:01 -08:00
Tom Manley	d16ac00eb6	Merge pull request #1493 from tpmanley/hotfix/zll-dimmer-join-failure zll-dimmer-bulb: Fix bug in configure preventing devices from joining	2016-11-23 23:30:08 -06:00
Tom Manley	1941f56007	zll-dimmer-bulb: Fix bug in configure preventing devices from joining The configureHealthCheck method and therefore the configure method was returning a boolean which was causing an exception during the initial join that would prevent the device from showing up to the user. https://smartthings.atlassian.net/browse/PROB-1428	2016-11-23 23:01:05 -06:00
Vinay Rao	f34df19a65	Merge pull request #1490 from SmartThingsCommunity/master Rolling up master to staging	2016-11-22 13:00:00 -08:00
Vinay Rao	20239ca982	Merge pull request #1488 from SmartThingsCommunity/staging Rolling up to production for deploy	2016-11-22 12:43:20 -08:00