MSA-1631: Hi!

We want to introduce the web service smart app for SmartThings devices integration into our voice controlled ai bulter: https://play.google.com/store/apps/details?id=ai.cubic.home 
Please, provide your review. 

Regards Cubic Team

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

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

devicetypes/smartthings/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
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"

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

@@ -132,7 +132,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"

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

@@ -161,7 +161,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if(cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
@@ -339,7 +339,7 @@ private Map getContactResult(value) {
 	log.debug "Contact: ${device.displayName} value = ${value}"
 	def descriptionText = value == 'open' ? '{{ device.displayName }} was opened' : '{{ device.displayName }} was closed'
 	sendEvent(name: 'contact', value: value, descriptionText: descriptionText, displayed: false, translatable: true)
-	return [name: 'status', value: value, descriptionText: descriptionText, translatable: true]
+	sendEvent(name: 'status', value: value, descriptionText: descriptionText, translatable: true)
 }
 
 private getAccelerationResult(numValue) {

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

@@ -119,7 +119,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07){
 					if (cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"

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

@@ -103,7 +103,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00){
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
+						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"

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

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

smartapps/bravenel/rule-machine.src/rule-machine.groovy

@@ -1,623 +0,0 @@
-/**
- *  Rule Machine
- *
- *  Copyright 2015 Bruce Ravenel and Mike Maxwell
- *
- *  Version 1.6.5   1 Jan 2016
- *
- *	Version History
- *
- *	1.6.5	1 Jan 2016		Added version numbers to main page
- *	1.6.4	30 Dec 2015		Multi-commands
- *	1.6.3	26 Dec 2015		UI improvements and icon per Michael Struck
- *	1.6.2	25 Dec 2015		null parameter value patch in expert, maxwell
- *	1.6.1	24 Dec 2015		UI improvement
- *	1.6	23 Dec 2015		Added expert commands per Mike Maxwell
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0  
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-
-definition(
-	name: "Rule Machine",
-	singleInstance: true,
-	namespace: "bravenel",
-	author: "Bruce Ravenel and Mike Maxwell",
-	description: "Rule Machine",
-	category: "My Apps",
-	iconUrl: "https://raw.githubusercontent.com/bravenel/Rule-Trigger/master/smartapps/bravenel/RuleMachine.png",
-	iconX2Url: "https://raw.githubusercontent.com/bravenel/Rule-Trigger/master/smartapps/bravenel/RuleMachine%402x.png",
-	iconX3Url: "https://raw.githubusercontent.com/bravenel/Rule-Trigger/master/smartapps/bravenel/RuleMachine%402x.png"
-)
-
-preferences {
-	page(name: "mainPage")
-	page(name: "removePage")
-	//expert pages
-	page(name: "expert")
-	page(name: "generalApprovalPAGE")
-	page(name: "customCommandsPAGE")
-	page(name: "addCustomCommandPAGE")
-	page(name: "customParamsPAGE")
-}
-
-def mainPage() {
-    dynamicPage(name: "mainPage", title: "Installed Rules", install: true, uninstall: false, submitOnChange: true) {
-    	if(!state.setup) initialize(true)
-        section {
-            app(name: "childRules", appName: "Rule", namespace: "bravenel", title: "Create New Rule...", multiple: true)
-        }
-	section ("Expert Features") {
-		href( "expert", title: "", description: "Tap to create custom commands", state: "")
-        }
-        section ("Remove Rule Machine"){
-        	href "removePage", description: "Tap to remove Rule Machine ", title: ""
-        }
-        if(state.ver) section ("Version 1.6.5/" + state.ver) { }
-    }
-}
-
-def removePage() {
-	dynamicPage(name: "removePage", title: "Remove Rule Machine And All Rules", install: false, uninstall: true) {
-    	section ("WARNING!\n\nRemoving Rule Machine also removes all Rules\n") {
-        }
-    }
-}
-
-def installed() {
-    if(!state.setup) initialize(true) else initialize(false)
-}
-
-def updated() {
-    initialize(false)
-}
-
-def initialize(first) {
-	if(first) {
-		state.ruleState = [:]
-    		state.ruleSubscribers = [:]
-	}
-	childApps.each {child ->
-		if(child.name == "Rule") {
-			log.info "Installed Rules and Triggers: ${child.label}"
-			if(first) {
-				state.ruleState[child.label] = null
-				state.ruleSubscribers[child.label] = [:]
-			}
-		} 
-	}
-	state.setup = true
-}
-
-def ruleList(appLabel) {
-	def result = []
-	childApps.each { child ->
-		if(child.name == "Rule" && child.label != appLabel && state.ruleState[child.label] != null) result << child.label
-	}
-	return result
-}
-
-def subscribeRule(appLabel, ruleName, ruleTruth, childMethod) {
-//	log.debug "subscribe: $appLabel, $ruleName, $ruleTruth, $childMethod"
-	ruleName.each {name ->
-    	state.ruleSubscribers[name].each {if(it == appLabel) return}
-        if(state.ruleSubscribers[name] == null) state.ruleSubscribers[name] = ["$appLabel":ruleTruth]
-    	else state.ruleSubscribers[name] << ["$appLabel":ruleTruth]
-    }
-}
-
-def setRuleTruth(appLabel, ruleTruth) {
-//	log.debug "setRuleTruth1: $appLabel, $ruleTruth"
-	state.ruleState[appLabel] = ruleTruth
-	def thisList = state.ruleSubscribers[appLabel]
-	thisList.each {
-		if(it.value == null || "$it.value" == "$ruleTruth") {
-			childApps.each { child ->
-				if(child.label == it.key) child.ruleHandler(appLabel, ruleTruth)
-			}
-		}
-	}
-}
-
-def currentRule(appLabel) {
-//	log.debug "currentRule: $appLabel, ${state.ruleState[appLabel]}"
-	def result = state.ruleState[appLabel]
-}
-
-def childUninstalled() {
-//	log.debug "childUninstalled called"
-}
-
-def removeChild(appLabel) {
-//	log.debug "removeChild: $appLabel"
-	unSubscribeRule(appLabel)
-	if(state.ruleState[appLabel] != null) state.ruleState.remove(appLabel)
-	if(state.ruleSubscribers[appLabel] != null) state.ruleSubscribers.remove(appLabel)
-}
-
-def unSubscribeRule(appLabel) {
-//	log.debug "unSubscribeRule: $appLabel"
-	state.ruleSubscribers.each { rule ->
-        def newList = [:]
-        rule.value.each {list ->
-        	if(list.key != appLabel) newList << list
-        }
-        rule.value = newList
-    }
-}
-
-def runRule(rule, appLabel) {
-//	log.debug "runRule: $rule, $appLabel"
-	childApps.each { child ->
-		rule.each {
-			if(child.label == it) child.ruleEvaluator(appLabel)
-		}
-	}
-}
-
-/*****custom command specific pages	*****/
-def expert(){
-	dynamicPage(name: "expert", title: "Expert Features", uninstall: false, install: false) {
-		section(){
-			paragraph "${expertText()}"
-			//expert hrefs...
-			href( "customCommandsPAGE"
-				,title		: "Configure Custom Commands..."
-				,description: ""
-				,state		: anyCustom()
-			)
-		}
-	}
-}
-
-def generalApprovalPAGE(params){
-	def title = params.title
-	def method = params.method
-	def result
-	dynamicPage(name: "generalApprovalPAGE", title: title ){
-		section() {
-			if (method) {
-				result = app."${method}"()
-				paragraph "${result}"
-			}
-		}
-	}
-}
-
-def customCommandsPAGE() {
-	if (!state.lastCmdIDX) state.lastCmdIDX = 0
-	def savedCommands = getCommands()
-	dynamicPage(name: "customCommandsPAGE", title: "Custom Commands", uninstall: false, install: false) {
-		section(){
-			input(
-				name			: "devices"
-				,title			: "Test device"
-				,multiple		: false
-				,required		: false
-				,type			: "capability.actuator"
-				,submitOnChange	: true
-			)
-			if (settings.devices && savedCommands.size() != 0){
-				input(
-					name			: "testCmd"
-					,title			: "Select saved command to test"
-					,multiple		: false
-					,required		: false
-					,type			: "enum"
-					,options		: savedCommands
-					,submitOnChange	: true
-				)
-			}
-		}
-		def result = execCommand(settings.testCmd)
-		if (result) {
-			section("${result}"){
-			}
-		}
-		section(){
-		if (devices){
-				href( "addCustomCommandPAGE"
-					,title		: "New custom command..."
-					,description: ""
-					,state		: null
-				)
-			}
-        }
-		if (getCommands()){
-			section(){
-				input(
-					name			: "deleteCmds"
-					,title			: "Delete custom commands..."
-					,multiple		: true
-					,required		: false
-                    ,description	: ""
-					,type			: "enum"
-					,options		: getCommands()
-					,submitOnChange	: true
-				)
-				if (isValidCommand(deleteCmds)){
-					href( "generalApprovalPAGE"
-						,title			: "Delete command(s) now"
-						,description	: ""
-						,state			: null
-						,params			: [method:"deleteCommands",title:"Delete Command"]
-						,submitOnChange	: true
-					)
-				}
-			}
-		}
-	}
-}
-
-def addCustomCommandPAGE(){
-	def cmdLabel = getCmdLabel()
-	def complete = "" 
-	def test = false
-	def pageTitle = "Create new custom command for:\n${devices}" 
-	if (cmdLabel){
-		complete = "complete"
-		test = true
-	}
-	dynamicPage(name: "addCustomCommandPAGE", title: pageTitle, uninstall: false, install: false) {
-		section(){
-			input(
-		   		name			: "cCmd"
-				,title			: "Available device commands"
-				,multiple		: false
-				,required		: false
-				,type			: "enum"
-				,options		: getDeviceCommands()
-				,submitOnChange	: true
-			)
-			href( "customParamsPAGE"
-				,title: "Parameters"
-				,description: parameterLabel()
-				,state: null
-			)
-		}
-		if (test){
-			def result = execTestCommand()
-			section("Configured command: ${cmdLabel}\n${result}"){
-				if (result == "succeeded"){
-					if (!commandExists(cmdLabel)){
-						href( "generalApprovalPAGE"
-							,title		: "Save command now"
-							,description: ""
-							,state		: null
-							,params		: [method:"addCommand",title:"Add Command"]
-						)
-					}
-				} 
-			}
-		}
-	}
-}
-
-def customParamsPAGE(p){
-	def ct = settings.findAll{it.key.startsWith("cpType_")}
-	state.howManyP = ct.size() + 1
-	def howMany = state.howManyP
-	dynamicPage(name: "customParamsPAGE", title: "Select parameters", uninstall: false) {
-		if(howMany) {
-			for (int i = 1; i <= howMany; i++) {
-				def thisParam = "cpType_" + i
-				def myParam = ct.find {it.key == thisParam}
-				section("Parameter #${i}") {
-					getParamType(thisParam, i != howMany)
-					if(myParam) {
-						def pType = myParam.value
-						getPvalue(pType, i)
-					}
-				}
-			}
-		}
-	}
-}
-
-/***** child specific methods *****/
-
-def getCommandMap(cmdID){
-	return state.customCommands["${cmdID}"]
-}
-
-
-/***** local custom command specific methods *****/
-def anyCustom(){
-	def result = null
-	if (getCommands()) result = "complete"
-	return result
-}
-
-def getParamType(myParam,isLast){  
-	def myOptions = ["string", "number", "decimal"]
-	def result = input (
-					name			: myParam
-					,type			: "enum"
-					,title			: "parameter type"
-					,required		: isLast
-					,options		: myOptions
-					,submitOnChange	: true
-				)
-	return result
-}
-
-def getPvalue(myPtype, n){
-	def myVal = "cpVal_" + n
-	def result = null
-	if (myPtype == "string"){
-		result = input(
-					name		: myVal
-					,title		: "string value"
-					,type		: "text"
-					,required	: false
-				)
-	} else if (myPtype == "number"){
-		result = input(
-					name		: myVal
-					,title		: "integer value"
-					,type		: "number"
-					,required	: false
-				)
-	} else if (myPtype == "decimal"){
-		result = input(
-					name		: myVal
-					,title		: "decimal value"
-					,type		: "decimal"
-					,required	: false
-				)
-	}
-	return result
-}
-
-def getCmdLabel(){
-	def cmd
-	if (settings.cCmd) cmd = settings.cCmd.value
-	def cpTypes = settings.findAll{it.key.startsWith("cpType_")}.sort()
-	def result = null
-	if (cmd) {
-		result = "${cmd}("
-		if (cpTypes.size() == 0){
-			result = result + ")"
-		} else {
-        	def r = getParams(cpTypes)
-            if (r == "") result = r
-            else result = "${result}${r})"
-		}
-	}
-	return result
-}
-
-def getParams(cpTypes){
-	def result = ""
-	def cpValue
-	def badParam = false
-	cpTypes.each{ cpType ->
-		def i = cpType.key.replaceAll("cpType_","")
-		def cpVal = settings.find{it.key == "cpVal_${i}"}
-		if (cpVal){
-			cpValue = cpVal.value
-			if (cpType.value == "string"){
-				result = result + "'${cpValue}'," 
-			} else {
-				if (cpValue.isNumber()){
-					result = result + "${cpValue}," 
-				} else {
-					result = result + "[${cpValue}]: is not a number,"
-				}
-			}
-		} else {
-			badParam = true
-		}
-	}
-	if (badParam) result = ""
-	else result = result[0..-2]   
-	return result
-}
-
-def parameterLabel(){
-	def howMany = (state.howManyP ?: 1) - 1
-	def result = ""
-	if (howMany) {
-		for (int i = 1; i <= howMany; i++) {
-			result = result + parameterLabelN(i) + "\n"
-		}
-		result = result[0..-2]
-	}
-	return result
-}
-
-def parameterLabelN(i){
-	def result = ""
-	def cpType = settings.find{it.key == "cpType_${i}"}
-	def cpVal = settings.find{it.key == "cpVal_${i}"}
-	def cpValue
-	if (cpVal) cpValue = cpVal.value
-	else cpValue = "missing value"
-	if (cpType){
-		result = "p${i} - type:${cpType.value}, value:${cpValue}"
-	} 
-	return result
-}
-
-def getParamsAsList(cpTypes){
-	def result = []
-	cpTypes.each{ cpType ->
-		def i = cpType.key.replaceAll("cpType_","")
-		def cpVal = settings.find{it.key == "cpVal_${i}"}
-		if (cpVal){
-			if (cpType.value == "string"){
-				result << "${cpVal.value}" 
-			} else if (cpType.value == "decimal"){
-				result << cpVal.value.toBigDecimal()
-			} else {
-				result << cpVal.value.toInteger() 
-			}
-		} else {
-        	result << "missing value"
-        }
-	}
-	return result
-}
-
-def getCommands(){
-	def result = [] 
-	def cmdMaps = state.customCommands ?: []
-	cmdMaps.each{ cmd ->
-		def option = [(cmd.key):(cmd.value.text)]
-		result.push(option)
-	}
-	return result
-}
-
-def isValidCommand(cmdIDS){
-	def result = false
-	cmdIDS.each{ cmdID ->
-		def cmd = state.customCommands["${cmdID}"]
-		if (cmd) result = true
-	}
-	return result
-}
-
-def deleteCommands(){
-	def result
-	def cmdMaps = state.customCommands
-	if (deleteCmds.size == 1) result = "Command removed"
-	else result = "Commands removed"
-	deleteCmds.each{ it -> 
-		cmdMaps.remove(it)
-	}
-	return result
-}
-def commandExists(cmd){
-	def result = false
-	if (state.customCommands){
-		result = state.customCommands.find{ it.value.text == "${cmd}" }
-	}
-	return result
-}
-def addCommand(){
-	def result
-	def newCmd = getCmdLabel()
-	def found = commandExists(newCmd)
-	def cmdMaps = state.customCommands
-	//only update if not found...
-	if (!found) {
-		state.lastCmdIDX = state.lastCmdIDX + 1
-		def nextIDX = state.lastCmdIDX
-		def cmd = [text:"${newCmd}",cmd:"${cCmd}"]
-		def params = [:]
-		def cpTypes = settings.findAll{it.key.startsWith("cpType_")}.sort()
-		cpTypes.each{ cpType ->
-			def i = cpType.key.replaceAll("cpType_","")
-			def cpVal = settings.find{it.key == "cpVal_${i}"}
-			def param = ["type":"${cpType.value}","value":"${cpVal.value}"]
-			params.put(i, param)
-		}	
-		cmd.put("params",params)
-		if (cmdMaps) cmdMaps.put((nextIDX),cmd)
-		else state.customCommands = [(nextIDX):cmd]
-		result = "command: ${newCmd} was added"
-	} else {
-		result = "command: ${newCmd} was not added, it already exists."
-	}
-	return result
-}
-
-def execTestCommand(){
-	def result
-	def cTypes = settings.findAll{it.key.startsWith("cpType_")}
-	def p = getParamsAsList(cTypes.sort()) as Object[]
-	devices.each { device ->
-		try {
-			device."${cCmd}"(p)
-			result = "succeeded"
-		}
-		catch (IllegalArgumentException e){
-			def em = e as String
-			def ems = em.split(":")
-			ems = ems[2].replace(" [","").replace("]","")
-			ems = ems.replaceAll(", ","\n")
-			result = "failed, valid commands:\n${ems}"
-		}
-		catch (e){
-			result = "failed with:\n${e}"
-		}
-	}
-	return result
-}
-
-def execCommand(cmdID){
-	def result = ""
-	def pList = []
-	if (cmdID){
-		def cmdMap = state.customCommands["${cmdID}"] 
-		if (testCmd && cmdMap) {
-        	def params = cmdMap.params.sort()
-			params.each{ p ->
-				if (p.value.type == "string"){
-					pList << "${p.value.value}"
-       			} else if (p.value.type == "decimal"){
-		   			pList << p.value.value.toBigDecimal()
-				} else {
-					pList << p.value.value.toInteger()
-				}
-			}
-			def p = pList as Object[]
-			devices.each { device ->
-				try {
-					device."${cmdMap.cmd}"(p)
-					result = "Command succeeded"
-				}
-				catch (IllegalArgumentException e){
-					def em = e as String
-					def ems = em.split(":")
-					ems = ems[2].replace(" [","").replace("]","")
-					ems = ems.replaceAll(", ","\n")
-					result = "Command failed, valid commands:\n${ems}"
-				}
-				catch (e){
-					result = "failed with:\n${e}"
-				}
-			}
-			return result
-		}
-	}
-}
-
-def getDeviceCommands(){
-	def result = ""
-	devices.each { device ->
-		try {
-			device."xxx"()
-			result = "Command succeeded"
-		}
-		catch (IllegalArgumentException e){
-			def em = e as String
-			def ems = em.split(":")
-			ems = ems[2].replace(" [","").replace("]","")
-			result = ems.split(", ").collect{it as String}
-		}
-	}
-	return result
-}
-
-def isExpert(ver){
-	state.ver = ver
-	return getCommands().size() > 0
-}
-
-def expertText() {
-	def text = 
-		"Custom commands allows Rule Machine to control devices with custom capabilities. " +
-		"This includes dual dimmers and switches, ThingShields, FGBW controllers or any device you might build a " +
-		"custom SmartApp to utilize.\n\nCustom commands that are created and saved here will become available for use " +
-		"in any new or existing rules.\n\nAfter saving at least one command, look for 'Run custom device command' in your " + 
-		"'Select Actions' sections."
-}

smartapps/cubicrobotics/cubic-butler-for-smart-home.src/cubic-butler-for-smart-home.groovy

@@ -0,0 +1,327 @@
+/**
+ *  Cubic Home
+ * sdfssdfsfsdfsdfdsf
+ *  Copyright 2016 Nikolay Zenovkin
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ */
+definition(
+        name: "Cubic Butler for Smart Home",
+        namespace: "cubicrobotics",
+        author: "Cubic Robotics",
+        description: "Hey, I’m Cubic, AI butler for smart home! \n" +
+                "I am the one and only app you need to control an entire home. \n" +
+                "Right now I can help you to control your SmartThings devices via natural speech and dashboard.\n" +
+                "Speak naturally, don’t learn robot! My A.I. is designed for a smart home control.\n" +
+                "- You don’t have to remember exact commands and phrases.\n" +
+                "- I have memory, and every new request will be processed in the context of previous ones.\n" +
+                "- I can ask clarifying questions, if I’m not sure what you mean.",
+        category: "Convenience",
+        iconUrl: "https://lh3.googleusercontent.com/GX5BRhaFq22HpAEU6tD4JXvizlxWFuB9zjyZE39-pLpZvQvvUmVpWXa0v4-oaxz4tg=w300-rw",
+        iconX2Url: "https://lh3.googleusercontent.com/GX5BRhaFq22HpAEU6tD4JXvizlxWFuB9zjyZE39-pLpZvQvvUmVpWXa0v4-oaxz4tg=w300-rw",
+        iconX3Url: "https://lh3.googleusercontent.com/GX5BRhaFq22HpAEU6tD4JXvizlxWFuB9zjyZE39-pLpZvQvvUmVpWXa0v4-oaxz4tg=w300-rw",
+        oauth: [displayName: "Cubic Home", displayLink: "http://cubic.ai/"])
+
+
+preferences {
+    section("Welcome to Cubic") {
+        // TODO: put inputs here
+    }
+    section("Allow Cubic to control these switches") {
+        input "switches", "capability.switch", multiple: true, required: false
+    }
+
+    section("Allow Cubic to control these motion sensors") {
+        input "motionSensors", "capability.motionSensor", multiple: true, required: false
+    }
+
+    section("Allow Cubic to control these bulbs") {
+        input "lamps", "capability.colorControl", multiple: true, required: false
+    }
+
+    section("Allow Cubic to control these thermostats") {
+        input "thermostats", "capability.thermostat", multiple: true, required: false
+    }
+
+    section("Allow Cubic to control these water sensors") {
+        input "waterSensors", "capability.waterSensor", multiple: true, required: false
+    }
+
+    section("Allow Cubic to control these CO sensors") {
+        input "smokeSensors", "capability.carbonMonoxideDetector", multiple: true, required: false
+    }
+
+    section("Allow Cubic to control these door controls") {
+        input "doorControls", "capability.doorControl", multiple: true, required: false
+    }
+
+}
+
+
+mappings {
+    path("/devices") {
+        action:
+        [
+                GET: "getDevices"
+        ]
+    }
+    path("/devices/:id") {
+        action:
+        [
+                PUT: "updateDevice",
+                GET: "getDevice"
+        ]
+    }
+}
+
+def installed() {
+    log.debug "Installed with settings: ${settings}"
+
+    initialize()
+}
+
+def updated() {
+    log.debug "Updated with settings: ${settings}"
+
+    unsubscribe()
+    initialize()
+}
+
+def initialize() {
+    subscribe(motionSensors, "motion", motionHandler)
+    subscribe(switches, "switch", switchHandler)
+    subscribe(thermostats, "thermostat.temperature", thermostatHandler)
+    subscribe(waterSensors, "waterSensor", waterHandler)
+    subscribe(smokeSensors, "carbonMonoxideDetector", smokeHandler)
+    subscribe(doorControls, "doorControl", doorControlHandler)
+}
+
+def doorControlHandler(evt) {
+    if (evt.isStateChanged()) {
+        sendPushEvent(evt.deviceId,
+                "DOOR_CONTROL_SMART_THINGS",
+                evt.value
+        )
+    }
+}
+
+def smokeHandler(evt) {
+    if (evt.isStateChanged()) {
+        sendPushEvent(evt.deviceId,
+                "SMOKE_CO_SENSOR_SMART_THINGS",
+                evt.value
+        )
+    }
+}
+
+def thermostatHandler(evt) {
+    if (evt.isStateChanged()) {
+        sendPushEvent(evt.deviceId,
+                "THERMOSTAT_SMART_THINGS",
+                evt.value
+        )
+    }
+}
+
+def waterHandler(evt) {
+    if (evt.isStateChanged()) {
+        sendPushEvent(evt.deviceId,
+                "WATER_SENSOR_SMART_THINGS",
+                evt.value
+        )
+    }
+}
+
+def motionHandler(evt) {
+    if ("active" == evt.value) {
+        sendPushEvent(evt.deviceId,
+                "MOTION_SENSOR_SMART_THINGS",
+                evt.value)
+    }
+}
+
+def switchHandler(evt) {
+    log.debug "$evt.deviceId switch changed state to $evt.value"
+}
+
+def getDevices() {
+    def resp = []
+    switches.each {
+        resp << extractSwitch(it)
+    }
+    motionSensors.each {
+        resp << extractMotionSensor(it)
+    }
+
+    lamps.each {
+        resp << extractLamp(it)
+    }
+
+    thermostats.each {
+        resp << extractThermostat(it)
+    }
+
+    return resp
+}
+
+def getDevice() {
+    def id = params.id
+    log.info "Getting device by id " + id
+    def device = findDeviceById(id);
+    if (device == null) {
+        httpError(400, "$id is not a valid id for switch specified")
+    } else if (device.type == "SWITCH_SMART_THINGS") {
+        return extractSwitch(device.device);
+    } else if (device.type == "THERMOSTAT_SMART_THINGS") {
+        return extractThermostat(device.device);
+    } else if (device.type == "LAMP_SMART_THINGS") {
+        return extractLamp(device.device);
+    } else if (device.type == "MOTION_SENSOR_SMART_THINGS") {
+        return extractMotionSensor(device.device);
+    }
+    return nil
+}
+
+void updateDevice() {
+    def id = params.id
+    def device = findDeviceById(id)
+
+    if (device == null) {
+        httpError(400, "$id is not a valid switch id")
+    } else if (device.type == "SWITCH_SMART_THINGS") {
+        changeSwitchState(device, request.JSON?.powered)
+    } else if (device.type == "THERMOSTAT_SMART_THINGS") {
+        def heating_setpoint = request.JSON?.heating_setpoint
+        def cooling_setpoint = request.JSON?.cooling_setpoint
+        def thermostat_setpoint = request.JSON?.thermostat_setpoint
+        if (heating_setpoint != null) {
+            device.device.setHeatingSetpoint(heating_setpoint)
+        }
+        if (cooling_setpoint != null) {
+            device.device.setCoolingSetpoint(cooling_setpoint)
+        }
+        //if (thermostat_setpoint != null) {
+        //	device.device.setThermostatSetpoint(thermostat_setpoint)
+        //}
+    } else if (device.type == "LAMP_SMART_THINGS") {
+        def powered = request.JSON?.powered
+        def color_h = request.JSON?.color_h
+        def color_s = request.JSON?.color_s
+        def color_b = request.JSON?.color_b
+        def color_temperature = request.JSON?.color_temperature
+        if (powered != null) {
+            changeSwitchState(device, request.JSON?.powered)
+        }
+        if (color_h != null) {
+            device.device.setHue(color_h)
+        }
+        if (color_b != null) {
+            device.device.setLevel(color_b)
+        }
+        if (color_s != null) {
+            device.device.setSaturation(color_s)
+        }
+        if (color_temperature != null) {
+            device.device.setColorTemperature(color_temperature)
+        }
+    } else if (device.type == "MOTION_SENSOR_SMART_THINGS") {
+        httpError(400, "Unable to control motion sensor")
+    }
+}
+
+def findDeviceById(id) {
+    def device = switches.find { it.id == id }
+    def type = "SWITCH_SMART_THINGS"
+    if (device == null) {
+        device = thermostats.find { it.id == id }
+        type = "THERMOSTAT_SMART_THINGS"
+    }
+    if (device == null) {
+        device = lamps.find { it.id == id }
+        type = "LAMP_SMART_THINGS"
+    }
+    if (device == null) {
+        device = motionSensors.find { it.id == id }
+        type = "MOTION_SENSOR_SMART_THINGS"
+    }
+    if (device == null) {
+        return null;
+    }
+    return [device: device, type: type];
+}
+
+
+def extractSwitch(it) {
+    return [id: it.id, type: "SWITCH_SMART_THINGS", state: [name: it.displayName, powered: it.currentValue("switch") == "on" ? true : false]]
+}
+
+def extractMotionSensor(it) {
+    return [id: it.id, type: "MOTION_SENSOR_SMART_THINGS", state: [name: it.displayName, state: it.currentValue("motion")]]
+}
+
+def extractLamp(it) {
+    return [id: it.id, type: "LAMP_SMART_THINGS", state: [name             : it.displayName,
+                                                          color_h          : it.currentValue("hue"), color_s: it.currentValue("saturation"), color_b: it.currentValue("level"),
+                                                          color_temperature: it.currentValue("colorTemperature"), powered: it.currentValue("switch") == "on" ? true : false]]
+}
+
+def extractThermostat(it) {
+    return [id: it.id, type: "THERMOSTAT_SMART_THINGS", state: [name                      : it.displayName,
+                                                                temperature               : it.currentValue("temperature"),
+                                                                heating_setpoint          : it.currentValue("heatingSetpoint"),
+                                                                cooling_setpoint          : it.currentValue("coolingSetpoint"),
+                                                                thermostat_setpoint       : it.currentValue("thermostatSetpoint"),
+                                                                thermostat_mode           : it.currentValue("thermostatMode"),
+                                                                thermostat_fan_mode       : it.currentValue("thermostatFanMode"),
+                                                                thermostat_operating_state: it.currentValue("thermostatOperatingState")]]
+}
+
+def changeSwitchState(device, powered) {
+    log.info "Updating device " + device.device.displayName + " to state $powered"
+    switch (powered) {
+        case "true":
+            device.device.on()
+            break
+        case "false":
+            device.device.off()
+            break
+        default:
+            httpError(400, "$powered is not a valid power state for switch specified")
+    }
+}
+
+def sendPushEvent(pushEvent) {
+    def params = [
+            uri               : "https://intent-processor-stage.cubic.ai/api/v1/pushEvent",
+            headers           : [
+                    Authorization: "Bearer -gm-IOuQR3W2Gim8Tjwsuw",
+                    Accept       : "/"
+            ],
+            body              : pushEvent,
+            requestContentType: "application/json"
+    ]
+    try {
+        httpPost(params) { resp ->
+            log.debug "response data: ${resp.data}"
+            log.debug "response contentType: ${resp.contentType}"
+        }
+    } catch (e) {
+        log.debug "something went wrong: $e"
+    }
+}
+
+def sendPushEvent(id, type, state) {
+    sendPushEvent(
+            [device_id  : id,
+             device_type: type,
+             state      : state]
+    )
+}

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

@@ -289,12 +289,12 @@ def initializeLife360Connection() {
        		state.life360AccessToken = result.data.access_token
             return true;
    		}
-		log.info "Life360 initializeLife360Connection, response=${result.data}"
+		log.debug "Response=${result.data}"
         return false;
         
     }
     catch (e) {
-       log.error "Life360 initializeLife360Connection, error: $e"
+       log.debug e
        return false;
     }
 
@@ -656,7 +656,7 @@ def generateInitialEvent (member, childDevice) {
     
     try { // we are going to just ignore any errors
     
-    	log.info "Life360 generateInitialEvent($member, $childDevice)"
+    	log.debug "Generate Initial Event for New Device for Member = ${member.id}"
         
         def place = state.places.find{it.id==settings.place}
         
@@ -677,8 +677,6 @@ def generateInitialEvent (member, childDevice) {
         	// log.debug "Distance Away = ${distanceAway}"
   
   			boolean isPresent = (distanceAway <= placeRadius)
-
-			log.info "Life360 generateInitialEvent, member: ($memberLatitude, $memberLongitude), place: ($placeLatitude, $placeLongitude), radius: $placeRadius, dist: $distanceAway, present: $isPresent"
                 
         	// log.debug "External Id=${app.id}:${member.id}"
         
@@ -720,7 +718,7 @@ def haversine(lat1, lon1, lat2, lon2) {
 
 def placeEventHandler() {
 
-	log.info "Life360 placeEventHandler: params=$params, settings.place=$settings.place"
+	log.debug "In placeEventHandler method."
 
 	// the POST to this end-point will look like:
     // POST http://test.com/webhook?circleId=XXXX&placeId=XXXX&userId=XXXX&direction=arrive
@@ -731,6 +729,8 @@ def placeEventHandler() {
     def direction = params?.direction
     def timestamp = params?.timestamp
     
+    log.debug "Life360 Event: Circle: ${circleId}, Place: ${placeId}, User: ${userId}, Direction: ${direction}"
+
     if (placeId == settings.place) {
 
 		def presenceState = (direction=="in")
@@ -745,10 +745,10 @@ def placeEventHandler() {
 
 		if (deviceWrapper) {
 			deviceWrapper.generatePresenceEvent(presenceState)
-    		log.debug "Life360 event raised on child device: ${externalId}"
+    		log.debug "Event raised on child device: ${externalId}"
 		}
    		else {
-    		log.warn "Life360 couldn't find child device associated with inbound Life360 event."
+    		log.debug "Couldn't find child device associated with inbound Life360 event."
     	}
     }