MSA-1646: Gate/Garage opener

Rolling down staging hotfix to master

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

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

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

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

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

smartapps/brbeaird/myq-lite.src/myq-lite.groovy

@@ -0,0 +1,536 @@
+/**
+ *  MyQ Lite
+ *
+ *  Copyright 2015 Jason Mok/Brian Beaird/Barry Burke
+ *
+ *  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.
+ *
+ *  Last Updated : 06/14/2016
+ *
+ */
+definition(
+	name: "MyQ Lite",
+	namespace: "brbeaird",
+	author: "Jason Mok/Brian Beaird/Barry Burke",
+	description: "Integrate MyQ with Smartthings",
+	category: "SmartThings Labs",
+	iconUrl:   "http://smartthings.copyninja.net/icons/MyQ@1x.png",
+	iconX2Url: "http://smartthings.copyninja.net/icons/MyQ@2x.png",
+	iconX3Url: "http://smartthings.copyninja.net/icons/MyQ@3x.png"
+)
+
+preferences {
+	page(name: "prefLogIn", title: "MyQ")    
+	page(name: "prefListDevices", title: "MyQ")
+    page(name: "prefSensor1", title: "MyQ")
+    page(name: "prefSensor2", title: "MyQ")
+    page(name: "prefSensor3", title: "MyQ")
+    page(name: "prefSensor4", title: "MyQ")
+}
+
+/* Preferences */
+def prefLogIn() {
+	def showUninstall = username != null && password != null 
+	return dynamicPage(name: "prefLogIn", title: "Connect to MyQ", nextPage:"prefListDevices", uninstall:showUninstall, install: false) {
+		section("Login Credentials"){
+			input("username", "email", title: "Username", description: "MyQ Username (email address)")
+			input("password", "password", title: "Password", description: "MyQ password")
+		}
+		section("Gateway Brand"){
+			input(name: "brand", title: "Gateway Brand", type: "enum",  metadata:[values:["Liftmaster","Chamberlain","Craftsman"]] )
+		}
+	}
+}
+
+def prefListDevices() {
+	if (forceLogin()) {
+		def doorList = getDoorList()		
+		if ((doorList)) {
+			return dynamicPage(name: "prefListDevices",  title: "Devices", nextPage:"prefSensor1", install:false, uninstall:true) {
+				if (doorList) {
+					section("Select which garage door/gate to use"){
+						input(name: "doors", type: "enum", required:false, multiple:true, metadata:[values:doorList])
+					}
+				} 
+			}
+		} else {
+			def devList = getDeviceList()
+			return dynamicPage(name: "prefListDevices",  title: "Error!", install:false, uninstall:true) {
+				section(""){
+					paragraph "Could not find any supported device(s). Please report to author about these devices: " +  devList
+				}
+			}
+		}  
+	} else {
+		return dynamicPage(name: "prefListDevices",  title: "Error!", install:false, uninstall:true) {
+			section(""){
+				paragraph "The username or password you entered is incorrect. Try again. " 
+			}
+		}  
+	}
+}
+
+
+def prefSensor1() {
+	log.debug "Doors chosen: " + doors
+    
+    //Set defaults
+    def nextPage = ""
+    def showInstall = true
+    def titleText = ""
+    
+    //Determine if we have multiple doors and need to send to another page
+    if (doors instanceof String){ //simulator seems to just make a single door a string. For that reason we have this weird check.
+    	log.debug "Single door detected (string)."
+        titleText = "Select Sensors for Door 1 (" + state.data[doors].name + ")"
+    }
+    else if (doors.size() == 1){
+    	log.debug "Single door detected (array)."
+        titleText = "Select Sensors for Door 1 (" + state.data[doors[0]].name + ")"
+    }
+    else{
+    	log.debug "Multiple doors detected."
+        nextPage = "prefSensor2"
+        titleText = "Select Sensors for Door 1 (" + state.data[doors[0]].name + ")"
+        showInstall = false;
+    }    
+    
+    return dynamicPage(name: "prefSensor1",  title: "Sensors", nextPage:nextPage, install:showInstall, uninstall:true) {        
+        section(titleText){			
+			input(name: "door1Sensor", title: "Contact Sensor", type: "capability.contactSensor", required: true, multiple: false)
+			input(name: "door1Acceleration", title: "Acceleration Sensor", type: "capability.accelerationSensor", required: false, multiple: false)
+		}
+    }
+}
+
+def prefSensor2() {	   
+    def nextPage = ""
+    def showInstall = true
+    def titleText = "Sensors for Door 2 (" + state.data[doors[1]].name + ")"
+     
+    if (doors.size() > 2){
+    	nextPage = "prefSensor3"
+        showInstall = false;
+    }
+    
+    return dynamicPage(name: "prefSensor2",  title: "Sensors", nextPage:nextPage, install:showInstall, uninstall:true) {
+        section(titleText){			
+			input(name: "door2Sensor", title: "Contact Sensor", type: "capability.contactSensor", required: true, multiple: false)
+			input(name: "door2Acceleration", title: "Acceleration Sensor", type: "capability.accelerationSensor", required: false, multiple: false)
+		}
+    }
+}
+
+def prefSensor3() {	   
+    def nextPage = ""
+    def showInstall = true
+    def titleText = "Sensors for Door 3 (" + state.data[doors[2]].name + ")"
+     
+    if (doors.size() > 3){
+    	nextPage = "prefSensor4"
+        showInstall = false;
+    }
+    
+    return dynamicPage(name: "prefSensor3",  title: "Sensors", nextPage:nextPage, install:showInstall, uninstall:true) {
+        section(titleText){			
+			input(name: "door3Sensor", title: "Contact Sensor", type: "capability.contactSensor", required: true, multiple: false)
+			input(name: "door3Acceleration", title: "Acceleration Sensor", type: "capability.accelerationSensor", required: false, multiple: false)
+		}
+    }
+}
+
+def prefSensor4() {	   
+	def titleText = "Contact Sensor for Door 4 (" + state.data[doors[3]].name + ")"
+    return dynamicPage(name: "prefSensor4",  title: "Sensors", install:true, uninstall:true) {
+        section(titleText){			
+			input(name: "door4Sensor", title: "Contact Sensor", type: "capability.contactSensor", required: "true", multiple: "false")
+			input(name: "door4Acceleration", title: "Acceleration Sensor", type: "capability.accelerationSensor", required: false, multiple: false)
+		}
+    }
+}
+
+/* Initialization */
+def installed() { initialize() }
+
+def updated() { 
+	unsubscribe()
+	initialize()
+}
+
+def uninstalled() {}	
+
+def initialize() {    
+	login()
+    state.sensorMap = [:]
+    
+    // Get initial device status in state.data
+	state.polling = [ last: 0, rescheduler: now() ]
+	state.data = [:]
+    
+	// Create selected devices
+	def doorsList = getDoorList()
+	//def lightsList = getLightList()
+	def selectedDevices = [] + getSelectedDevices("doors")
+  
+	selectedDevices.each { 
+    	log.debug "Creating child device: " + it
+		if (!getChildDevice(it)) {
+			if (it.contains("GarageDoorOpener")) { addChildDevice("brbeaird", "MyQ Garage Door Opener", it, null, ["name": "MyQLite: " + doorsList[it]]) }			
+		} 
+	}
+
+	// Remove unselected devices
+	def deleteDevices = (selectedDevices) ? (getChildDevices().findAll { !selectedDevices.contains(it.deviceNetworkId) }) : getAllChildDevices()
+	deleteDevices.each { deleteChildDevice(it.deviceNetworkId) }    
+    
+    //Create subscriptions
+    if (door1Sensor)
+        subscribe(door1Sensor, "contact", sensorHandler)    
+    if (door2Sensor)    	
+        subscribe(door2Sensor, "contact", sensorHandler)
+    if (door3Sensor)        
+        subscribe(door3Sensor, "contact", sensorHandler)        
+    if (door4Sensor)    	
+        subscribe(door4Sensor, "contact", sensorHandler)
+        
+    if (door1Acceleration)
+        subscribe(door1Acceleration, "acceleration", sensorHandler)    
+    if (door2Acceleration)    	
+        subscribe(door2Acceleration, "acceleration", sensorHandler)
+    if (door3Acceleration)        
+        subscribe(door3Acceleration, "acceleration", sensorHandler)        
+    if (door4Acceleration)    	
+        subscribe(door4Acceleration, "acceleration", sensorHandler)
+        
+    //Set initial values
+    syncDoorsWithSensors()   
+}
+
+def syncDoorsWithSensors(child){	
+    def firstDoor = doors[0]
+        
+    //Handle single door (sometimes it's just a dumb string thanks to the simulator)
+    if (doors instanceof String)
+    firstDoor = doors
+    
+    def doorDNI = null
+    if (child) {								// refresh only the requesting door (makes things a bit more efficient if you have more than 1 door
+    	doorDNI = child.device.deviceNetworkId
+        switch (doorDNI) {
+        	case firstDoor:
+            	updateDoorStatus(firstDoor, door1Sensor, door1Acceleration, door1ThreeAxis, child)
+                break
+            case doors[1]:
+            	updateDoorStatus(doors[1], door2Sensor, door2Acceleration, door2ThreeAxis, child)
+                break
+            case doors[2]:
+            	updateDoorStatus(doors[2], door3Sensor, door3Acceleration, door3ThreeAxis, child)
+                break
+            case doors[3]:
+            	updateDoorStatus(doors[3], door4Sensor, door4Acceleration, door4ThreeAxis, child)
+     	}
+    } else {           					// refresh ALL the doors
+		if (firstDoor) updateDoorStatus(firstDoor, door1Sensor, door1Acceleration, door1ThreeAxis, null)
+		if (doors[1]) updateDoorStatus(doors[1], door2Sensor, door2Acceleration, door2ThreeAxis, null)
+		if (doors[2]) updateDoorStatus(doors[2], door3Sensor, door3Acceleration, door3ThreeAxis, null)
+		if (doors[3]) updateDoorStatus(doors[3], door4Sensor, door4Acceleration, door4ThreeAxis, null)
+    }
+}
+
+def updateDoorStatus(doorDNI, sensor, acceleration, threeAxis, child){
+	
+    //Get door to update and set the new value
+    def doorToUpdate = getChildDevice(doorDNI)
+    def doorName = state.data[doorDNI].name
+    
+    def value = "unknown"
+    def moving = "unknown"
+    def door = doorToUpdate.latestValue("door")
+    
+    if (acceleration) moving = acceleration.latestValue("acceleration")
+    if (sensor) value = sensor.latestValue("contact")
+
+    if (moving == "active") {
+    	if (value == "open") {			
+        	if (door != "opening") value = "closing" else value = "opening"  // if door is "open" or "waiting" change to "closing", else it must be "opening"
+    	} else if (value == "closed") { 
+        	if (door != "closing") 	value = "opening" else value = "closed"
+    	}
+    } else if (moving == "inactive") {
+    	if (door == "closing") {
+    		if (value == "open") { 	// just stopped but door is still open
+    			value = "stopped"
+        	}
+        }
+    }
+    	
+    doorToUpdate.updateDeviceStatus(value)
+    doorToUpdate.updateDeviceSensor("${sensor} is ${sensor.currentContact}")
+    
+    log.debug "Door: " + doorName + ": Updating with status - " + value + " -  from sensor " + sensor
+    
+    //Write to child log if this was initiated from one of the doors    
+    if (child)
+    	child.log("Door: " + doorName + ": Updating with status - " + value + " -  from sensor " + sensor)
+ 
+     if (acceleration) {
+     	doorToUpdate.updateDeviceMoving("${acceleration} is ${moving}")
+        log.debug "Door: " + doorName + ": Updating with status - " + moving + " - from sensor " + acceleration
+        if (child)
+        	child.log("Door: " + doorName + ": Updating with status - " + moving + " - from sensor " + acceleration)
+     }
+    
+    //Get latest activity timestamp for the sensor (data saved for up to a week)
+    def eventsSinceYesterday = sensor.eventsSince(new Date() - 7)    
+    def latestEvent = eventsSinceYesterday[0]?.date
+    def timeStampLogText = "Door: " + doorName + ": Updating timestamp to: " + latestEvent + " -  from sensor " + sensor
+    
+    if (!latestEvent)	//If the door has been inactive for more than a week, timestamp data will be null. Keep current value in that case.
+    	timeStampLogText = "Door: " + doorName + ": Null timestamp detected "  + " -  from sensor " + sensor + " . Keeping current value."
+    else
+    	doorToUpdate.updateDeviceLastActivity(latestEvent)    	
+    	
+    log.debug timeStampLogText    
+    
+    //Write to child log if this was initiated from one of the doors
+    if (child)
+    	child.log(timeStampLogText)
+}
+
+def refresh(child){	
+    def door = child.device.deviceNetworkId
+    def doorName = state.data[door].name
+    child.log("refresh called from " + doorName + ' (' + door + ')')
+    syncDoorsWithSensors(child)
+}
+
+def sensorHandler(evt) {    
+    log.debug "Sensor change detected: Event name  " + evt.name + " value: " + evt.value   + " deviceID: " + evt.deviceId    
+    
+    switch (evt.deviceId) {
+    	case door1Sensor.id:
+        case door1Acceleration?.id:
+            def firstDoor = doors[0]
+			if (doors instanceof String) firstDoor = doors
+        	updateDoorStatus(firstDoor, door1Sensor, door1Acceleration, door1ThreeAxis, null)
+            break
+    	case door2Sensor?.id:
+        case door2Acceleration?.id:
+        	updateDoorStatus(doors[1], door2Sensor, door2Acceleration, door2ThreeAxis, null)
+            break    	
+        case door3Sensor?.id:
+        case door3Acceleration?.id:
+        	updateDoorStatus(doors[2], door3Sensor, door3Acceleration, door3ThreeAxis, null)
+            break        
+    	case door4Sensor?.id:
+        case door4Acceleration?.id:
+        	updateDoorStatus(doors[3], door4Sensor, door4Acceleration, door4ThreeAxis, null)
+            break
+        default:
+			syncDoorsWithSensors()
+    }
+}
+
+def getSelectedDevices( settingsName ) { 
+	def selectedDevices = [] 
+	(!settings.get(settingsName))?:((settings.get(settingsName)?.getAt(0)?.size() > 1)  ? settings.get(settingsName)?.each { selectedDevices.add(it) } : selectedDevices.add(settings.get(settingsName))) 
+	return selectedDevices 
+} 
+
+/* Access Management */
+private forceLogin() {
+	//Reset token and expiry
+	state.session = [ brandID: 0, brandName: settings.brand, securityToken: null, expiration: 0 ]
+	state.polling = [ last: 0, rescheduler: now() ]
+	state.data = [:]
+	return doLogin()
+}
+
+private login() { return (!(state.session.expiration > now())) ? doLogin() : true }
+
+private doLogin() { 
+	apiGet("/api/user/validate", [username: settings.username, password: settings.password] ) { response ->
+		log.debug "got login response: " + response
+        if (response.status == 200) {
+			if (response.data.SecurityToken != null) {
+				state.session.brandID = response.data.BrandId
+				state.session.brandName = response.data.BrandName
+				state.session.securityToken = response.data.SecurityToken
+				state.session.expiration = now() + 150000
+				return true
+			} else {
+				return false
+			}
+		} else {
+			return false
+		}
+	} 	
+}
+
+// Listing all the garage doors you have in MyQ
+private getDoorList() { 	    
+	def deviceList = [:]
+	apiGet("/api/v4/userdevicedetails/get", []) { response ->
+		if (response.status == 200) {
+        //log.debug "response data: " + response.data.Devices
+        //sendAlert("response data: " + response.data.Devices)
+			response.data.Devices.each { device ->
+				// 2 = garage door, 5 = gate, 7 = MyQGarage(no gateway), 17 = Garage Door Opener WGDO
+				if (device.MyQDeviceTypeId == 2||device.MyQDeviceTypeId == 5||device.MyQDeviceTypeId == 7||device.MyQDeviceTypeId == 17) {
+					log.debug "Found door: " + device.MyQDeviceId
+                    def dni = [ app.id, "GarageDoorOpener", device.MyQDeviceId ].join('|')
+					def description = ''
+                    def doorState = ''
+                    def updatedTime = ''
+                    device.Attributes.each { 
+						
+                        if (it.AttributeDisplayName=="desc")	//deviceList[dni] = it.Value                        	
+                        {
+                        	description = it.Value
+                        }
+                        	
+						if (it.AttributeDisplayName=="doorstate") { 
+                        	doorState = it.Value
+                            updatedTime = it.UpdatedTime							
+						}
+					}
+                    
+                    //Ignore any doors with blank descriptions
+                    if (description != ''){
+                        log.debug "adding door: " + description + "type: " + device.MyQDeviceTypeId + " status: " + doorState
+                        deviceList[dni] = description
+                        state.data[dni] = [ status: doorState, lastAction: updatedTime, name: description ]
+                    }
+				}
+			}
+		}
+	}    
+	return deviceList
+}
+
+private getDeviceList() { 	    
+	def deviceList = []
+	apiGet("/api/v4/userdevicedetails/get", []) { response ->
+		if (response.status == 200) {
+			response.data.Devices.each { device ->
+				log.debug "MyQDeviceTypeId : " + device.MyQDeviceTypeId.toString()
+				if (!(device.MyQDeviceTypeId == 1||device.MyQDeviceTypeId == 2||device.MyQDeviceTypeId == 3||device.MyQDeviceTypeId == 5||device.MyQDeviceTypeId == 7)) {					
+                    device.Attributes.each { 
+						def description = ''
+                        def doorState = ''
+                        def updatedTime = ''
+                        if (it.AttributeDisplayName=="desc")	//deviceList[dni] = it.Value
+                        	description = it.Value
+						
+                        //Ignore any doors with blank descriptions
+                        if (description != ''){
+                        	log.debug "found device: " + description
+                        	deviceList.add( device.MyQDeviceTypeId.toString() + "|" + device.TypeID )
+                        }
+					}
+				}
+			}
+		}
+	}    
+	return deviceList
+}
+
+/* api connection */
+// get URL 
+private getApiURL() {
+	if (settings.brand == "Craftsman") {
+		return "https://craftexternal.myqdevice.com"
+	} else {
+		return "https://myqexternal.myqdevice.com"
+	}
+}
+
+private getApiAppID() {
+	if (settings.brand == "Craftsman") {
+		return "QH5AzY8MurrilYsbcG1f6eMTffMCm3cIEyZaSdK/TD/8SvlKAWUAmodIqa5VqVAs"
+	} else {
+		return "JVM/G9Nwih5BwKgNCjLxiFUQxQijAebyyg8QUHr7JOrP+tuPb8iHfRHKwTmDzHOu"
+	}
+}
+	
+// HTTP GET call
+private apiGet(apiPath, apiQuery = [], callback = {}) {	
+	// set up query
+	apiQuery = [ appId: getApiAppID() ] + apiQuery
+	if (state.session.securityToken) { apiQuery = apiQuery + [SecurityToken: state.session.securityToken ] }
+       
+	try {
+		httpGet([ uri: getApiURL(), path: apiPath, query: apiQuery ]) { response -> callback(response) }
+	}	catch (SocketException e)	{
+		//sendAlert("API Error: $e")
+        log.debug "API Error: $e"
+	}
+}
+
+// HTTP PUT call
+private apiPut(apiPath, apiBody = [], callback = {}) {    
+	// set up body
+	apiBody = [ ApplicationId: getApiAppID() ] + apiBody
+	if (state.session.securityToken) { apiBody = apiBody + [SecurityToken: state.session.securityToken ] }
+    
+	// set up query
+	def apiQuery = [ appId: getApiAppID() ]
+	if (state.session.securityToken) { apiQuery = apiQuery + [SecurityToken: state.session.securityToken ] }
+    
+	try {
+		httpPut([ uri: getApiURL(), path: apiPath, contentType: "application/json; charset=utf-8", body: apiBody, query: apiQuery ]) { response -> callback(response) }
+	} catch (SocketException e)	{
+		log.debug "API Error: $e"
+	}
+}
+
+// Get Device ID
+def getChildDeviceID(child) {
+	return child.device.deviceNetworkId.split("\\|")[2]
+}
+
+// Get single device status
+def getDeviceStatus(child) {
+	return state.data[child.device.deviceNetworkId].status
+}
+
+// Get single device last activity
+def getDeviceLastActivity(child) {
+	return state.data[child.device.deviceNetworkId].lastAction.toLong()
+}
+
+// Send command to start or stop
+def sendCommand(child, attributeName, attributeValue) {
+	if (login()) {	    	
+		//Send command
+		apiPut("/api/v4/deviceattribute/putdeviceattribute", [ MyQDeviceId: getChildDeviceID(child), AttributeName: attributeName, AttributeValue: attributeValue ]) 
+        
+        if ((attributeName == "desireddoorstate") && (attributeValue == 0)) {		// if we are closing, check if we have an Acceleration sensor, if so, "waiting" until it moves
+            def firstDoor = doors[0]
+    		if (doors instanceof String) firstDoor = doors
+        	def doorDNI = child.device.deviceNetworkId
+        	switch (doorDNI) {
+        		case firstDoor:
+                	if (door1Acceleration) child.updateDeviceStatus("waiting") else child.updateDeviceStatus("opening")
+                	break
+            	case doors[1]:
+            		if (door2Acceleration) child.updateDeviceStatus("waiting") else child.updateDeviceStatus("opening")
+                	break
+            	case doors[2]:
+            		if (door3Acceleration) child.updateDeviceStatus("waiting") else child.updateDeviceStatus("opening")
+                	break
+            	case doors[3]:
+            		if (door4Acceleration) child.updateDeviceStatus("waiting") else child.updateDeviceStatus("opening")
+        			break
+            }
+        }      
+		return true
+	} 
+}

smartapps/gideon-api/gideon.src/gideon.groovy

@@ -26,44 +26,23 @@ definition(
 
 
 preferences {
-	section("Control these contact sensors...") {
-        input "contact", "capability.contactSensor", multiple:true, required:false
-    }
 	section("Control these switches...") {
-        input "switches", "capability.switch", multiple:true, required:false
-    }
-    section("Control these smoke alarms...") {
-        input "smoke_alarms", "capability.smokeDetector", multiple:true, required:false
-    }
-    section("Control these window shades...") {
-        input "shades", "capability.windowShade", multiple:true, required:false
-    }
-    section("Control these garage doors...") {
-        input "garage", "capability.garageDoorControl", multiple:true, required:false
-    }
-    section("Control these water sensors...") {
-        input "water_sensors", "capability.waterSensor", multiple:true, required:false
+        input "switches", "capability.switch", multiple:true
     }
     section("Control these motion sensors...") {
-        input "motions", "capability.motionSensor", multiple:true, required:false
+        input "motions", "capability.motionSensor", multiple:true
     }
     section("Control these presence sensors...") {
-    	input "presence_sensors", "capability.presenceSensor", multiple:true, required:false
+    	input "presence_sensors", "capability.presenceSensor", multiple:true
     }
     section("Control these outlets...") {
-    	input "outlets", "capability.switch", multiple:true, required:false
-    }
-     section("Control these power meters...") {
-        input "meters", "capability.powerMeter", multiple:true, required:false
+    	input "outlets", "capability.switch", multiple:true
     }
     section("Control these locks...") {
-    	input "locks", "capability.lock", multiple:true, required:false
+    	input "locks", "capability.lock", multiple:true
     }
-    section("Control these temperature sensors...") {
-	    input "temperature_sensors", "capability.temperatureMeasurement", multiple:true, required:false
-    }
-    section("Control these batteries...") {
-	    input "batteries", "capability.battery", multiple:true, required:false
+    section("Control these locks...") {
+	    input "temperature_sensors", "capability.temperatureMeasurement"
     }
 }
 
@@ -82,13 +61,13 @@ def updated() {
 
 def initialize() {
 	// TODO: subscribe to attributes, devices, locations, etc.
-    //subscribe(outlet, "energy", outletHandler)
-  	//subscribe(outlet, "switch", outletHandler)
+    subscribe(outlet, "energy", outletHandler)
+  	subscribe(outlet, "switch", outletHandler)
 }
 
 // TODO: implement event handlers
 def outletHandler(evt) {
-	//log.debug "$outlet.currentEnergy"
+	log.debug "$outlet.currentEnergy"
 	//TODO call G API  
 }
 
@@ -104,14 +83,9 @@ mappings {
       			GET: "getAllDevices"
     		]
   	}
-	path("/doorlocks/lock/:id") {
+	path("/doorlocks/:id/:command") {
     action: [
-      GET: "lockDoorLock"
-    ]
-  }
-  path("/doorlocks/unlock/:id") {
-    action: [
-      GET: "unlockDoorLock"
+      GET: "updateDoorLock"
     ]
   }
   	path("/doorlocks/:id") {
@@ -119,70 +93,10 @@ mappings {
       			GET: "getDoorLockStatus"
     		]
   	}
-    path("/contacts/:id") {
-    action: [
-      			GET: "getContactStatus"
-    		]
-  	}
-    path("/smoke/:id") {
-    action: [
-      			GET: "getSmokeStatus"
-    		]
-  	}
-    path("/shades/open/:id") {
-    action: [
-      GET: "openShade"
-    ]
-  }
-  path("/shades/preset/:id") {
-    action: [
-      GET: "presetShade"
-    ]
-  }
-  path("/shades/close/:id") {
-    action: [
-      GET: "closeShade"
-    ]
-  }
-  	path("/shades/:id") {
-    action: [
-      			GET: "getShadeStatus"
-    		]
-  	}
-    path("/garage/open/:id") {
-    action: [
-      GET: "openGarage"
-    ]
-  }
-  path("/garage/close/:id") {
-    action: [
-      GET: "closeGarage"
-    ]
-  }
-  	path("/garage/:id") {
-    action: [
-      			GET: "getGarageStatus"
-    		]
-  	}
-    path("/watersensors/:id") {
-    action: [
-      			GET: "getWaterSensorStatus"
-    		]
-  	}
   	path("/tempsensors/:id") {
     action: [
       GET: "getTempSensorsStatus"
     ]
-  }
-  path("/meters/:id") {
-    action: [
-      GET: "getMeterStatus"
-    ]
-  }
-  path("/batteries/:id") {
-    action: [
-      GET: "getBatteryStatus"
-    ]
   }
   	path("/presences/:id") {
     action: [
@@ -199,29 +113,14 @@ mappings {
       GET: "getOutletStatus"
     ]
   }
-  	path("/outlets/turnon/:id") {
+  	path("/outlets/:id/:command") {
     action: [
-      GET: "turnOnOutlet"
+      GET: "updateOutlet"
     ]
   }
-  path("/outlets/turnoff/:id") {
+  	path("/switches/:command") {
     action: [
-      GET: "turnOffOutlet"
-    ]
-  }
-  	path("/switches/turnon/:id") {
-    action: [
-      GET: "turnOnSwitch"
-    ]
-  }
-  path("/switches/turnoff/:id") {
-    action: [
-      GET: "turnOffSwitch"
-    ]
-  }
-  path("/switches/:id") {
-    action: [
-      GET: "getSwitchStatus"
+      PUT: "updateSwitch"
     ]
   }
 }
@@ -229,149 +128,12 @@ mappings {
 //API Methods
 def getAllDevices() {
 	def locks_list = locks.collect{device(it,"Lock")}
-    def contact_list = contact.collect{device(it,"Contact Sensor")}
-    def smokes_list = smoke_alarms.collect{device(it,"Smoke Alarm")}
-    def shades_list = shades.collect{device(it,"Window Shade")}
-    def garage_list = garage.collect{device(it,"Garage Door")}
-    def water_sensors_list = water_sensors.collect{device(it,"Water Sensor")}
     def presences_list = presence_sensors.collect{device(it,"Presence")}
     def motions_list = motions.collect{device(it,"Motion")}
     def outlets_list = outlets.collect{device(it,"Outlet")}
     def switches_list = switches.collect{device(it,"Switch")}
     def temp_list = temperature_sensors.collect{device(it,"Temperature")}
-    def meters_list = meters.collect{device(it,"Power Meters")}
-    def battery_list = batteries.collect{device(it,"Batteries")}
-    return smokes_list + contact_list + water_sensors_list + shades_list + garage_list + locks_list + presences_list + motions_list + outlets_list + switches_list + temp_list + meters_list + battery_list
-}
-
-//contact sensors
-def getContactStatus() {
-	def device = contact.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	def args = getTempSensorsStatus(device.id)
-        	return [Device_state: device.currentValue('contact')] + args
-        }
-}
-
-//smoke detectors
-def getSmokeStatus() {
-	def device = smoke_alarms.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        def bat = getBatteryStatus(device.id)
-        	return [Device_state: device.currentValue('smoke')] + bat
-        }
-}
-
-//garage
-def getGarageStatus() {
-	def device = garage.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.currentValue('door')]
-        }
-}
-
-def openGarage() {
-    def device = garage.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.open();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-
-def closeGarage() {
-	def device = garage.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.close();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-//shades
-def getShadeStatus() {
-	def device = shades.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.currentValue('windowShade')]
-        }
-}
-
-def openShade() {
-    def device = shades.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.open();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-    
-def presetShade() {
-    def device = shades.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.presetPosition();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-
-def closeShade() {
-	def device = shades.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.close();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-
-//water sensor
-def getWaterSensorStatus() {
-	def device = water_sensors.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	def bat = getBatteryStatus(device.id)
-        	return [Device_state: device.currentValue('water')] + bat
-        }
-}
-//batteries
-def getBatteryStatus() {
-	def device = batteries.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.latestValue("battery")]
-        }
-}
-
-def getBatteryStatus(id) {
-	def device = batteries.find { it.id == id }
-    if (!device) {
-            return []
-        } else {
-        	return [battery_state: device.latestValue("battery")]
-        }
+    return [Locks: locks_list, Presences: presences_list, Motions: motions_list, Outlets: outlets_list, Switches: switches_list, Temperatures: temp_list]
 }
 
 //LOCKS
@@ -380,34 +142,30 @@ def getDoorLockStatus() {
     if (!device) {
             httpError(404, "Device not found")
         } else {
-        	def bat = getBatteryStatus(device.id)
-        	return [Device_state: device.currentValue('lock')] + bat
+        	return [Device_state: device.currentValue('lock')]
         }
 }
 
-def lockDoorLock() {
+def updateDoorLock() {
+	def command = params.command
     def device = locks.find { it.id == params.id }
-    if (!device) {
+    if (command){
+        if (!device) {
             httpError(404, "Device not found")
         } else {
-            
-            device.lock();
+            if(command == "toggle")
+            {
+                if(device.currentValue('lock') == "locked")
+                  device.unlock();
+                else
+                  device.lock();
                   
-            return [Device_id: params.id, result_action: "200"]                              
+                return [Device_id: params.id, result_action: "200"]
             }
+        }
     }
+}
 
-def unlockDoorLock() {
-	def device = locks.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.unlock();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
 //PRESENCE
 def getPresenceStatus() {
 
@@ -415,8 +173,7 @@ def getPresenceStatus() {
     if (!device) {
             httpError(404, "Device not found")
         } else {
-        def bat = getBatteryStatus(device.id)
-        	return [Device_state: device.currentValue('presence')] + bat
+        	return [Device_state: device.currentValue('presence')]
    }
 }
 
@@ -427,8 +184,7 @@ def getMotionStatus() {
     if (!device) {
             httpError(404, "Device not found")
         } else {
-        	def args = getTempSensorsStatus(device.id)
-        	return [Device_state: device.currentValue('motion')] + args
+        	return [Device_state: device.currentValue('motion')]
    }
 }
 
@@ -439,98 +195,52 @@ def getOutletStatus() {
    	if (!device) {
             httpError(404, "Device not found")
         } else {
-        	def watt = getMeterStatus(device.id)
-        	return [Device_state: device.currentSwitch] + watt
+        	return [Device_state: device.currentSwitch, Current_watt: device.currentValue("energy")]
   }
 }
 
-def getMeterStatus() {
+def updateOutlet() {
 	
-    def device = meters.find { it.id == params.id }
-   	if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_id: device.id, Device_type: device.type, Current_watt: device.currentValue("power")]
-  }
-}
-
-def getMeterStatus(id) {
-	
-    def device = meters.find { it.id == id }
-   	if (!device) {
-            return []
-        } else {
-        	return [Current_watt: device.currentValue("power")]
-  }
-}
-
-def turnOnOutlet() {
+    def command = params.command
     def device = outlets.find { it.id == params.id }
     if (command){
         if (!device) {
             httpError(404, "Device not found")
         } else {
-            
-            device.on();
+            if(command == "toggle")
+            {
+                if(device.currentSwitch == "on")
+                  device.off();
+                else
+                  device.on();
                   
-            return [Device_id: params.id, result_action: "200"]
+                return [Device_id: params.id, result_action: "200"]
+            }
         }
     }
-}
-
-def turnOffOutlet() {
-    def device = outlets.find { it.id == params.id }
-    if (command){
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.off();
-                  
-            return [Device_id: params.id, result_action: "200"]
-        }
-    }
-}
+}                
 
 //SWITCH
-def getSwitchStatus() {
-	def device = switches.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.currentValue('switch')]
-	}
-}
-
-def turnOnSwitch() {
+def updateSwitch() {
+    def command = params.command
     def device = switches.find { it.id == params.id }
     if (command){
         if (!device) {
             httpError(404, "Device not found")
         } else {
-            
-            device.on();
+            if(command == "toggle")
+            {
+                if(device.currentSwitch == "on")
+                  device.off();
+                else
+                  device.on();
                   
-            return [Device_id: params.id, result_action: "200"]
+                return [Device_id: params.id, result_action: "200"]
+            }
         }
     }
 }
 
-def turnOffSwitch() {
-    def device = switches.find { it.id == params.id }
-    if (command){
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.on();
-                  
-            return [Device_id: params.id, result_action: "200"]
-        }
-    }
-}
-
-
 //TEMPERATURE
 def getTempSensorsStatus() {
 	
@@ -538,17 +248,6 @@ def getTempSensorsStatus() {
     if (!device) {
             httpError(404, "Device not found")
         } else {
-        	def bat = getBatteryStatus(device.id)
-        	return [Device_state: device.currentValue('temperature')] + bat
-   }
-}
-   
-def getTempSensorsStatus(id) {	
-    def device = temperature_sensors.find { it.id == id }
-    if (!device) {
-            return []
-        } else {
-        	def bat = getBatteryStatus(device.id)
-        	return [temperature: device.currentValue('temperature')] + bat
-   		}
+        	return [Device_state: device.currentValue('temperature')]
    }
+}

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