MSA-1385: Beep presence sensor if anything happens.....

devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy

@@ -22,7 +22,6 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
-		capability "Health Check"
 
 		attribute "tamper", "enum", ["detected", "clear"]
 		attribute "batteryStatus", "string"
@@ -327,9 +326,6 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 def configure() {
-	// allow device user configured or default 16 min to check in; double the periodic reporting interval
-	sendEvent(name: "checkInterval", value: 2* timeOptionValueMap[reportInterval] ?: 2*8*60, displayed: false)
-
 	// This sensor joins as a secure device if you double-click the button to include it
 	log.debug "${device.displayName} is configuring its settings"
 	def request = []

devicetypes/smartthings/aeon-multisensor-gen5.src/aeon-multisensor-gen5.groovy

@@ -20,9 +20,6 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
-		capability "Health Check"
-
-		command "configureAfterSecure"
 
 		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x98,0x7A", outClusters:"0x5A"
 	}
@@ -248,8 +245,6 @@ def configureAfterSecure() {
 def configure() {
 	// log.debug "configure()"
     //["delay 30000"] + secure(zwave.securityV1.securityCommandsSupportedGet())
-	// allow device 16 min to check in; double the periodic reporting interval
-	sendEvent(name: "checkInterval", value: 2*8*60, displayed: false)
 }
 
 private setConfigured() {

devicetypes/smartthings/aeon-multisensor.src/aeon-multisensor.groovy

@@ -20,7 +20,6 @@ metadata {
 		capability "Illuminance Measurement"
 		capability "Sensor"
 		capability "Battery"
-		capability "Health Check"
 
 		fingerprint deviceId: "0x2001", inClusters: "0x30,0x31,0x80,0x84,0x70,0x85,0x72,0x86"
 	}
@@ -181,9 +180,6 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 def configure() {
-	// allow device 10 min to check in; double the periodic reporting interval
-	sendEvent(name: "checkInterval", value: 2*5*60, displayed: false)
-
 	delayBetween([
 		// send binary sensor report instead of basic set for motion
 		zwave.configurationV1.configurationSet(parameterNumber: 5, size: 1, scaledConfigurationValue: 2).format(),

smartapps/ddspivey/smart-family-presence.src/smart-family-presence.groovy

@@ -1,251 +0,0 @@
-/**
- *  Smart Family Presence
- *
- *  Copyright 2016 Darin Spivey
- *
- *  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: "Smart Family Presence",
-    namespace: "ddspivey",
-    author: "Darin Spivey",
-    description: "Smart arrival and departure push messages for couples/families that are traveling together.  When family members arrive and depart together, there is no need to send an individual push alert for each.",
-    category: "Family",
-    iconUrl: "http://cdn.device-icons.smartthings.com/Home/home4-icn@2x.png",
-    iconX2Url: "http://cdn.device-icons.smartthings.com/Home/home4-icn@2x.png",
-    iconX3Url: "http://cdn.device-icons.smartthings.com/Home/home4-icn@2x.png")
-
-
-preferences {
-	section("Family Members") {
-		input "familySensors", "capability.presenceSensor", required: true, title: "Who's in your family?", multiple: true
-	}
-    section("Threshold") {
-    	paragraph "Set the time in seconds to allow for group arrival/departure"
-    	input "timeThreshold", "text", required: false, title: "Default is ${defaultThreshold}."
-    }
-	section("Smart departure alerts") {
-    	paragraph "When family members are home together, departure push alerts may not be necessary because most of the time, people are aware when their family members are leaving.  This feature will only send a push alert if the the entire family was previously apart."
-		paragraph "For example, when my wife and I are home together, I know when she's leaving; I don't need an alert for that.  If this feature is off, it will send a departure alert when she leaves."
-        input("smartDepartureFeature", "enum", title: "Default is On.", default:"On", options: ["On","Off"])
-	}
-    section("Verbose logging") {
-    	paragraph "For debugging, you may log all the app's decisions to the notifications log."
-    	input("logToNotifications", "enum", title: "Default is No.", default:"No", options: ["Yes", "No" ])
-	}
-}
-
-/****************************
-	Auto-getters and setters
-*****************************/
-
-def getDefaultThreshold() {
-	60
-}
-
-def setInProgress(value) {
-	state.inProgress = value
-}
-
-def getInProgress() {
-	state.inProgress == true
-}
-
-def getSmartDeparture() {
-	settings.smartDepartureFeature == 'On'
-}
-
-def getLogToNotifications() {
-	settings.logToNotifications == 'Yes'
-}
-
-def getThreshold() {
-	settings.timeThreshold ? settings.timeThreshold.toInteger() : defaultThreshold
-}
-
-/****************************
- Framework methods
-*****************************/
-
-def installed() {
-	initialize()
-}
- 
-def logit(msg) {
-	log.debug msg
-    if (logToNotifications) {
-    	sendNotificationEvent("[Smart Family Presense] $msg")
-    }
-}
-
-def updated() {
-	unsubscribe()
-	initialize()
-}
-
-def initialize() {
-    subscribe(familySensors, "presence", presenceHandler)
-    log.debug("Subscribed ${familySensors.toString()} to presenceHandler")
-
-	/*
-    	Regular usage shows that, during certain cases such as the hub going offline,
-        or power outages, the app may lose state and not send alerts.  This will ensure that
-        it re-evaluates its state at least once per hour.
-    */
-    
-	logit "Scheduling a re-calibration at the top of every hour."
-    schedule("0 0 0/1 1/1 * ? *", reset)
-	reset()
-}
-
-/*****************************
- Smart Family Presence methods
-******************************/
-
-def reset() {
-	if (inProgress) {
-    	logit "Skipping re-calibration, execution in progress!"
-        return
-    }    
-    logit "Re-calibrating."
-    state.baseCase = null
-    state.changedThisTime = []
-    wasApart()
-}
-
-def isFamilyTogether() {
-	// Check to see if the entire family has arrived/departed together
-
-	if (state.changedThisTime.size() == 0) {
-    	logit "No changes."
-        reset()
-    	return
-	}
-    
-	logit "People who changed presence: ${state.changedThisTime}"
-
-	def theirState = state.baseCase
-  	def notTogether = statusNotEquals(theirState)
-    
-  	if (notTogether) {
-    	// The family is not together, send an alert as normal
-        
-    	logit "${notTogether.join(", ")} is not with the rest of the family (who are $theirState)"
-        sendPushAlert()
-    }
-    else {
-    	/* 
-        	Special case - When everyone is gone, but they *previously* weren't together,
-        	then technically they were apart to begin with and are still apart upon leaving
-        */
-            
-        if (state.wasApart && theirState == 'not present') {
-           	logit "Family was previously apart and now all gone.  Alert."
-        	sendPushAlert()
-        }
-        else {    
-    		logit "OK!  Everyone has arrived/departed together.  The family is $theirState"
-        }
-    }
-    inProgress = false
-    reset()
-}
-
-def wasApart() {
-	// This is true if everyone is gone, or some were home
-	def allGone = statusEquals('not present') == familySensors
-    def someHome = statusEquals('present') != familySensors
-    if (allGone || someHome) {
-    	state.wasApart = true
-    }
-    else {
-    	state.wasApart = false
-    }
-}
-
-
-def presenceHandler(evt) {
-    def person = evt.displayName
-
-	logit "Presence Event: $person is $evt.value"
-    
-	if (! inProgress) {
-    	inProgress = true
-    	state.baseCase = evt.value
-        logit "First person sensed.  Checking for others to be $evt.value in ${threshold} seconds"
-        runIn(threshold, isFamilyTogether, [overwrite: false])
-	}
-    
-	if (! state.changedThisTime.contains(person)) {    
-    	state.changedThisTime.push person
-    }
-    else {
-    	// Special case - presence has changed within the threshold.  Remove this person.
-        state.changedThisTime = state.changedThisTime - person
-		logit "Ignoring flapping presence event for $person"
-    }
-}
-
-def statusEquals(status) {
-	if (status == null) return
-    
-	familySensors.findAll {
-        it.currentPresence == status
-    }
-}
-
-def statusNotEquals(status) {
-	if (status == null) return
-      
-	familySensors.findAll {
-        it.currentPresence != status 
-    }
-}
-
-def sendPushAlert() {
-	def baseCase = state.baseCase
-    def changedPeople = state.changedThisTime
-    
-    if (baseCase == 'not present' && state.wasApart == false && smartDeparture) {
-      logit "Not sending departure alert because smartDeparture is $smartDeparture"
-        return
-    }
-    
-	def statuses = [ 'present':[], 'not present':[] ]
-
-	for (sensor in familySensors) {
-    	def person = sensor.toString()       
-        if (changedPeople.contains(person)) {
-        	def currentState = sensor.currentPresence
-        	log.debug "$person is now $currentState"
-            statuses[currentState].push person
-        } 
-	}
-    logit "Statuses: $statuses"
-    
-    // Construct the message payload
-    
-    def pushMsg = ""    
-    def home = statuses.present
-    def notHome = statuses['not present']
- 	String adVerb;
-   
-    if (home.size() > 0) {
-    	adVerb = home.size > 1 ? "have" : "has"
-    	pushMsg += "${home.join(", ")} $adVerb arrived $location.name. "
-    }
-    if (notHome.size() > 0) {
-    	adVerb = notHome.size > 1 ? "have" : "has"
-    	pushMsg += "${notHome.join(", ")} $adVerb left $location.name"
-    }    	
-    
-    sendPush pushMsg
-}

smartapps/smartthings/beep-when.src/beep-when.groovy

@@ -0,0 +1,88 @@
+/**
+ *  Copyright 2016 SmartThings
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ *  Beep When
+ *
+ *  Author: SmartThings
+ *  Date: 2016-06-05
+ */
+definition(
+		name: "Beep When",
+		namespace: "smartthings",
+		author: "SmartThings",
+		description: "Beep Presence sensor when anything happens in your home.",
+		category: "Convenience",
+		iconUrl: "https://s3.amazonaws.com/smartapp-icons/Meta/window_contact.png",
+		iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Meta/window_contact@2x.png"
+)
+
+preferences {
+	section("Choose one or more, when..."){
+		input "button", "capability.button", title: "Button Pushed", required: false, multiple: true //tw
+		input "motion", "capability.motionSensor", title: "Motion Here", required: false, multiple: true
+		input "contact", "capability.contactSensor", title: "Contact Opens", required: false, multiple: true
+		input "contactClosed", "capability.contactSensor", title: "Contact Closes", required: false, multiple: true
+		input "acceleration", "capability.accelerationSensor", title: "Acceleration Detected", required: false, multiple: true
+		input "mySwitch", "capability.switch", title: "Switch Turned On", required: false, multiple: true
+		input "mySwitchOff", "capability.switch", title: "Switch Turned Off", required: false, multiple: true
+		input "arrivalPresence", "capability.presenceSensor", title: "Arrival Of", required: false, multiple: true
+		input "departurePresence", "capability.presenceSensor", title: "Departure Of", required: false, multiple: true
+		input "smoke", "capability.smokeDetector", title: "Smoke Detected", required: false, multiple: true
+		input "water", "capability.waterSensor", title: "Water Sensor Wet", required: false, multiple: true
+	}
+	section("Beep the presence sensor..") {
+		input "presence", "capability.presenceSensor", title: "Which sensor beep?"
+	}
+
+	section("Minimum time between beeps (optional, defaults to every beep)") {
+		input "frequency", "decimal", title: "Minutes", required: false
+	}
+}
+
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+	subscribeToEvents()
+}
+
+def updated() {
+	log.debug "Updated with settings: ${settings}"
+	unsubscribe()
+	subscribeToEvents()
+}
+
+def subscribeToEvents() {
+	subscribe(button, "button.pushed", eventHandler) //tw
+	subscribe(contact, "contact.open", eventHandler)
+	subscribe(contactClosed, "contact.closed", eventHandler)
+	subscribe(acceleration, "acceleration.active", eventHandler)
+	subscribe(motion, "motion.active", eventHandler)
+	subscribe(mySwitch, "switch.on", eventHandler)
+	subscribe(mySwitchOff, "switch.off", eventHandler)
+	subscribe(arrivalPresence, "presence.present", eventHandler)
+	subscribe(departurePresence, "presence.not present", eventHandler)
+	subscribe(smoke, "smoke.detected", eventHandler)
+	subscribe(smoke, "smoke.tested", eventHandler)
+	subscribe(smoke, "carbonMonoxide.detected", eventHandler)
+	subscribe(water, "water.wet", eventHandler)
+}
+
+def eventHandler(evt) {
+	log.debug "Notify got evt ${evt}"
+	if (frequency) {
+		def lastTime = state[evt.deviceId]
+		if (lastTime == null || now() - lastTime >= frequency * 60000) {
+			 presence.beep()		}
+	}
+	else {
+		 presence.beep()
+	}
+}

smartapps/smartthings/logitech-harmony-connect.src/logitech-harmony-connect.groovy

@@ -688,7 +688,7 @@ def validateCommand(device, command) {
 	def capabilityCommands = getDeviceCapabilityCommands(device.capabilities)
 	def currentDeviceCapability = getCapabilityName(device)
 	if (currentDeviceCapability != "" && capabilityCommands[currentDeviceCapability]) {
-    return (command in capabilityCommands[currentDeviceCapability] || (currentDeviceCapability == "Switch" && command == "setLevel" && device.hasCommand("setLevel"))) ? true : false
+		return command in capabilityCommands[currentDeviceCapability] ? true : false
 	} else {
 		// Handling other device types here, which don't accept commands
 		httpError(400, "Bad request.")
@@ -823,8 +823,8 @@ def deviceHandler(evt) {
 }
 
 def sendToHarmony(evt, String callbackUrl) {
-  def callback = new URI(callbackUrl)
-  if (callback.port != -1) {
+	def callback = new URI(callbackUrl)
+  if(isIP(callback.host)){
   	def host = callback.port != -1 ? "${callback.host}:${callback.port}" : callback.host
   	def path = callback.query ? "${callback.path}?${callback.query}".toString() : callback.path
   	sendHubCommand(new physicalgraph.device.HubAction(
@@ -852,6 +852,25 @@ def sendToHarmony(evt, String callbackUrl) {
   }
 }
 
+public static boolean isIP(String str) {
+    try {
+         String[] parts = str.split("\\.");
+         if (parts.length != 4) return false;
+         for (int i = 0; i < 4; ++i) {
+             int p
+             try {
+               p = Integer.parseInt(parts[i]);
+             } catch (Exception e) {
+               return false;
+             }
+             if (p > 255 || p < 0) return false;
+         }
+         return true;
+    } catch (Exception e) {
+        return false;
+    }
+}
+
 def listHubs() {
 	location.hubs?.findAll { it.type.toString() == "PHYSICAL" }?.collect { hubItem(it) }
 }