MSA-990: test

Update vacation-lighting-director.groovy

devicetypes/fibargroup/fibaro-wall-plug-zw5.src/fibaro-wall-plug-zw5.groovy

@@ -1,254 +0,0 @@
-/**
- *  Fibaro Wall Plug ZW5
- *
- *  Copyright 2016 Fibar Group S.A.
- *
- *  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.
- *
- */
-metadata {
-	definition (name: "Fibaro Wall Plug ZW5", namespace: "fibargroup", author: "Fibar Group S.A.") {
-		capability "Actuator"
-		capability "Configuration"
-		capability "Energy Meter"
-		capability "Power Meter"
-		capability "Refresh"
-		capability "Sensor"
-		capability "Switch"
-
-		command "reset"
-        
-        fingerprint deviceId: "0x1001", inClusters: "0x5E, 0x22, 0x85, 0x59, 0x70, 0x56, 0x5A, 0x7A, 0x72, 0x32, 0x8E, 0x71, 0x73, 0x98, 0x31, 0x25, 0x86", outClusters: ""
-	}
-
-	simulator {
-		
-	}
-
-	tiles(scale: 2) {
-    	multiAttributeTile(name:"FGWP", type:"lighting", width:6, height:4) {//with generic type secondary control text is not displayed in Android app
-        	tileAttribute("device.switch", key:"PRIMARY_CONTROL") {
-            	attributeState("on", label: '${name}', action: "switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821")
-            	attributeState("off", label: '${name}', action: "switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff")   
-            }
-            
-            tileAttribute("device.power", key:"SECONDARY_CONTROL") {
-				attributeState("default", label:'${currentValue} W', backgroundColor:"#ffffff")
-			}
-        }
-        
-		valueTile("energy", "device.energy", width: 2, height: 2) {
-			state "default", label:'${currentValue} kWh'
-		}
-		standardTile("reset", "device.energy", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", label:'reset kWh', action:"reset"
-		}
-		standardTile("refresh", "device.power", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
-                
-        main "FGWP"
-        details(["FGWP", "energy", "reset", "refresh"])
-	}
-}
-
-// parse events into attributes
-def parse(String description) {
-	log.debug "Parsing '${description}'"
-
-	if (description.startsWith("Err 106")) {
-		if (state.sec) {
-			result = createEvent(descriptionText:description, displayed:false)
-		} else {
-			result = createEvent(
-				descriptionText: "FGK failed to complete the network security key exchange. If you are unable to receive data from it, you must remove it from your network and add it again.",
-				eventType: "ALERT",
-				name: "secureInclusion",
-				value: "failed",
-				displayed: true,
-			)
-		}
-	} else if (description == "updated") {
-		return null
-	} else {
-    	def cmd = zwave.parse(description, [0x25: 1, 0x31: 5, 0x32: 1, 0x5A: 1, 0x71: 3, 0x72: 2, 0x86: 1])
-    
-    	if (cmd) {
-    		log.debug "Parsed '${cmd}'"
-        	zwaveEvent(cmd)
-    	}
-    }
-}
-
-//security
-def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulation cmd) {
-	def encapsulatedCommand = cmd.encapsulatedCommand([0x25: 1, 0x5A: 1])
-	if (encapsulatedCommand) {
-		return zwaveEvent(encapsulatedCommand)
-	} else {
-		log.warn "Unable to extract encapsulated cmd from $cmd"
-		createEvent(descriptionText: cmd.toString())
-	}
-}
-
-//crc16
-def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd)
-{
-    def versions = [0x31: 5, 0x32: 1, 0x71: 3, 0x72: 2, 0x86: 1]
-	def version = versions[cmd.commandClass as Integer]
-	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
-	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
-	if (!encapsulatedCommand) {
-		log.debug "Could not extract command from $cmd"
-	} else {
-		zwaveEvent(encapsulatedCommand)
-	}
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.meterv1.MeterReport cmd) {
-	if (cmd.scale == 0) {
-		createEvent(name: "energy", value: cmd.scaledMeterValue, unit: "kWh")
-	} else if (cmd.scale == 2) {
-		createEvent(name: "power", value: Math.round(cmd.scaledMeterValue), unit: "W")
-	}
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) { 
-	log.debug "manufacturerId:   ${cmd.manufacturerId}"
-    log.debug "manufacturerName: ${cmd.manufacturerName}"
-    log.debug "productId:        ${cmd.productId}"
-    log.debug "productTypeId:    ${cmd.productTypeId}"
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.DeviceSpecificReport cmd) { 
-	log.debug "deviceIdData:                ${cmd.deviceIdData}"
-    log.debug "deviceIdDataFormat:          ${cmd.deviceIdDataFormat}"
-    log.debug "deviceIdDataLengthIndicator: ${cmd.deviceIdDataLengthIndicator}"
-    log.debug "deviceIdType:                ${cmd.deviceIdType}"
-    
-    if (cmd.deviceIdType == 1 && cmd.deviceIdDataFormat == 1) {//serial number in binary format
-		String serialNumber = "h'"
-        
-        cmd.deviceIdData.each{ data ->
-        	serialNumber += "${String.format("%02X", data)}"
-        }
-        
-        updateDataValue("serialNumber", serialNumber)
-        log.debug "${device.displayName} - serial number: ${serialNumber}"
-    }
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.versionv1.VersionReport cmd) {	
-    updateDataValue("version", "${cmd.applicationVersion}.${cmd.applicationSubVersion}")
-    log.debug "applicationVersion:      ${cmd.applicationVersion}"
-    log.debug "applicationSubVersion:   ${cmd.applicationSubVersion}"
-    log.debug "zWaveLibraryType:        ${cmd.zWaveLibraryType}"
-    log.debug "zWaveProtocolVersion:    ${cmd.zWaveProtocolVersion}"
-    log.debug "zWaveProtocolSubVersion: ${cmd.zWaveProtocolSubVersion}"
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelReport cmd) {
-	def map = [ displayed: true ]
-    if (cmd.sensorType == 4) {
-    	createEvent(name: "power", value: Math.round(cmd.scaledSensorValue), unit: "W")
-    }
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.switchbinaryv1.SwitchBinaryReport cmd) {
-	createEvent(name: "switch", value: cmd.value ? "on" : "off", type: "digital")
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.deviceresetlocallyv1.DeviceResetLocallyNotification cmd) {
-	log.info "${device.displayName}: received command: $cmd - device has reset itself"
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cmd)
-{
-	if (cmd.notificationType == 0x08) {
-    	if (cmd.event == 0x06) {
-        	createEvent(descriptionText: "Warning: $device.displayName detected over-current", isStateChange: true)	
-        } else if (cmd.event == 0x08) {
-        	createEvent(descriptionText: "Warning: $device.displayName detected over-load", isStateChange: true)
-        }
-    }
-}
-
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	log.debug "$device.displayName: Unhandled: $cmd"
-	[:]
-}
-
-// handle commands
-def configure() {
-	log.debug "Executing 'configure'"
-	
-    def cmds = []
-
-    cmds += zwave.manufacturerSpecificV1.manufacturerSpecificGet()
-    cmds += zwave.manufacturerSpecificV2.deviceSpecificGet()
-    cmds += zwave.versionV1.versionGet()
-    cmds += zwave.associationV2.associationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId])
-    cmds += zwave.meterV2.meterGet(scale:0)
-    cmds += zwave.meterV2.meterGet(scale:2)
-    cmds += zwave.switchBinaryV1.switchBinaryGet()
-    
-    encapSequence(cmds, 500)
-}
-
-def refresh() {
-	log.debug "Executing 'refresh'"
-	
-    def cmds = []
-    cmds += zwave.meterV2.meterGet(scale:0)
-    cmds += zwave.meterV2.meterGet(scale:2)
-    cmds += zwave.switchBinaryV1.switchBinaryGet()
-    
-    encapSequence(cmds, 500)
-}
-
-def on() {
-	log.debug "Executing 'on'"
-	encap(zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF))
-}
-
-def off() {
-	log.debug "Executing 'off'"
-	encap(zwave.switchBinaryV1.switchBinarySet(switchValue: 0x00))
-}
-
-def reset() {
-	log.debug "Executing 'reset'"
-    encap(zwave.meterV2.meterReset())
-}
-
-private secure(physicalgraph.zwave.Command cmd) {
-	zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
-}
-
-private crc16(physicalgraph.zwave.Command cmd) {
-	//zwave.crc16encapV1.crc16Encap().encapsulate(cmd).format()
-    "5601${cmd.format()}0000"
-}
-
-private encapSequence(commands, delay=200) {
-	delayBetween(commands.collect{ encap(it) }, delay)
-}
-
-private encap(physicalgraph.zwave.Command cmd) {
-	def secureClasses = [0x25, 0x5A, 0x70, 0x85, 0x8E]
-
-	//todo: check if secure inclusion was successful
-    //if not do not send security-encapsulated command
-	if (secureClasses.find{ it == cmd.commandClassId }) {
-    	secure(cmd)
-    } else {
-    	crc16(cmd)
-    }
-}

devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy

@@ -17,16 +17,13 @@ metadata {
 
 	tiles(scale: 2) {
      	multiAttributeTile(name:"rich-control"){
-			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
+			tileAttribute ("", key: "PRIMARY_CONTROL") {
 	            attributeState "default", label: "Hue Bridge", action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#F3C200"
-			}    
+			}
 	        tileAttribute ("serialNumber", key: "SECONDARY_CONTROL") {
 	            attributeState "default", label:'SN: ${currentValue}'
-			}    
-        }    
-		standardTile("icon", "icon", width: 1, height: 1, canChangeIcon: false, inactiveLabel: true, canChangeBackground: false) {
-			state "default", label: "Hue Bridge", action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#FFFFFF"
-		}
+			}
+        }
 		valueTile("serialNumber", "device.serialNumber", decoration: "flat", height: 1, width: 2, inactiveLabel: false) {
 			state "default", label:'SN: ${currentValue}'
 		}
@@ -34,7 +31,7 @@ metadata {
 			state "default", label:'${currentValue}', height: 1, width: 2, inactiveLabel: false
 		}
 
-		main (["icon"])
+		main (["rich-control"])
 		details(["rich-control", "networkAddress"])
 	}
 }
@@ -75,6 +72,7 @@ def parse(description) {
 				}
 				else if (contentType?.contains("xml")) {
 					log.debug "HUE BRIDGE ALREADY PRESENT"
+                    parent.hubVerification(device.hub.id, msg.body)
 				}
 			}
 		}

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

@@ -57,7 +57,7 @@ def parse(String description) {
 	return result
 }
 
-def sensorValueEvent(Short value) {
+def sensorValueEvent(value) {
 	if (value) {
 		createEvent(name: "motion", value: "active", descriptionText: "$device.displayName detected motion")
 	} else {
@@ -94,24 +94,24 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm
 {
 	def result = []
 	if (cmd.notificationType == 0x07) {
-		if (cmd.event == 0x01 || cmd.event == 0x02) {
+		if (cmd.v1AlarmType == 0x07) {  // special case for nonstandard messages from Monoprice ensors
+			result << sensorValueEvent(cmd.v1AlarmLevel)
+		} else if (cmd.event == 0x01 || cmd.event == 0x02 || cmd.event == 0x07 || cmd.event == 0x08) {
 			result << sensorValueEvent(1)
+		} else if (cmd.event == 0x00) {
+			result << sensorValueEvent(0)
 		} else if (cmd.event == 0x03) {
-			result << createEvent(descriptionText: "$device.displayName covering was removed", isStateChange: true)
-			result << response(zwave.wakeUpV1.wakeUpIntervalSet(seconds:4*3600, nodeid:zwaveHubNodeId))
-			if(!state.MSR) result << response(zwave.manufacturerSpecificV2.manufacturerSpecificGet())
+			result << createEvent(name: "tamper", value: "detected", descriptionText: "$device.displayName covering was removed", isStateChange: true)
+			result << response(zwave.batteryV1.batteryGet())
 		} else if (cmd.event == 0x05 || cmd.event == 0x06) {
 			result << createEvent(descriptionText: "$device.displayName detected glass breakage", isStateChange: true)
-		} else if (cmd.event == 0x07) {
-			if(!state.MSR) result << response(zwave.manufacturerSpecificV2.manufacturerSpecificGet())
-			result << sensorValueEvent(1)
 		}
 	} else if (cmd.notificationType) {
 		def text = "Notification $cmd.notificationType: event ${([cmd.event] + cmd.eventParameter).join(", ")}"
-		result << createEvent(name: "notification$cmd.notificationType", value: "$cmd.event", descriptionText: text, displayed: false)
+		result << createEvent(name: "notification$cmd.notificationType", value: "$cmd.event", descriptionText: text, isStateChange: true, displayed: false)
 	} else {
 		def value = cmd.v1AlarmLevel == 255 ? "active" : cmd.v1AlarmLevel ?: "inactive"
-		result << createEvent(name: "alarm $cmd.v1AlarmType", value: value, displayed: false)
+		result << createEvent(name: "alarm $cmd.v1AlarmType", value: value, isStateChange: true, displayed: false)
 	}
 	result
 }

devicetypes/smartthings/zwave-smoke-alarm.src/zwave-smoke-alarm.groovy

@@ -61,37 +61,44 @@ def parse(String description) {
 			zwaveEvent(cmd, results)
 		}
 	}
-	// log.debug "\"$description\" parsed to ${results.inspect()}"
+	log.debug "'$description' parsed to ${results.inspect()}"
 	return results
 }
 
 
 def createSmokeOrCOEvents(name, results) {
 	def text = null
-	if (name == "smoke") {
-		text = "$device.displayName smoke was detected!"
-		// these are displayed:false because the composite event is the one we want to see in the app
-		results << createEvent(name: "smoke",          value: "detected", descriptionText: text, displayed: false)
-	} else if (name == "carbonMonoxide") {
-		text = "$device.displayName carbon monoxide was detected!"
-		results << createEvent(name: "carbonMonoxide", value: "detected", descriptionText: text, displayed: false)
-	} else if (name == "tested") {
-		text = "$device.displayName was tested"
-		results << createEvent(name: "smoke",          value: "tested", descriptionText: text, displayed: false)
-		results << createEvent(name: "carbonMonoxide", value: "tested", descriptionText: text, displayed: false)
-	} else if (name == "smokeClear") {
-		text = "$device.displayName smoke is clear"
-		results << createEvent(name: "smoke",          value: "clear", descriptionText: text, displayed: false)
-		name = "clear"
-	} else if (name == "carbonMonoxideClear") {
-		text = "$device.displayName carbon monoxide is clear"
-		results << createEvent(name: "carbonMonoxide", value: "clear", descriptionText: text, displayed: false)
-		name = "clear"
-	} else if (name == "testClear") {
-		text = "$device.displayName smoke is clear"
-		results << createEvent(name: "smoke",          value: "clear", descriptionText: text, displayed: false)
-		results << createEvent(name: "carbonMonoxide", value: "clear", displayed: false)
-		name = "clear"
+	switch (name) {
+		case "smoke":
+			text = "$device.displayName smoke was detected!"
+			// these are displayed:false because the composite event is the one we want to see in the app
+			results << createEvent(name: "smoke",          value: "detected", descriptionText: text, displayed: false)
+			break
+		case "carbonMonoxide":
+			text = "$device.displayName carbon monoxide was detected!"
+			results << createEvent(name: "carbonMonoxide", value: "detected", descriptionText: text, displayed: false)
+			break
+		case "tested":
+			text = "$device.displayName was tested"
+			results << createEvent(name: "smoke",          value: "tested", descriptionText: text, displayed: false)
+			results << createEvent(name: "carbonMonoxide", value: "tested", descriptionText: text, displayed: false)
+			break
+		case "smokeClear":
+			text = "$device.displayName smoke is clear"
+			results << createEvent(name: "smoke",          value: "clear", descriptionText: text, displayed: false)
+			name = "clear"
+			break
+		case "carbonMonoxideClear":
+			text = "$device.displayName carbon monoxide is clear"
+			results << createEvent(name: "carbonMonoxide", value: "clear", descriptionText: text, displayed: false)
+			name = "clear"
+			break
+		case "testClear":
+			text = "$device.displayName test cleared"
+			results << createEvent(name: "smoke",          value: "clear", descriptionText: text, displayed: false)
+			results << createEvent(name: "carbonMonoxide", value: "clear", displayed: false)
+			name = "clear"
+			break
 	}
 	// This composite event is used for updating the tile
 	results << createEvent(name: "alarmState", value: name, descriptionText: text)
@@ -117,8 +124,10 @@ def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd, results) {
 			createSmokeOrCOEvents(cmd.alarmLevel ? "tested" : "testClear", results)
 			break
 		case 13:  // sent every hour -- not sure what this means, just a wake up notification?
-			if (cmd.alarmLevel != 255) {
-				results << createEvent(descriptionText: "$device.displayName code 13 is $cmd.alarmLevel", displayed: true)
+			if (cmd.alarmLevel == 255) {
+				results << createEvent(descriptionText: "$device.displayName checked in", isStateChange: false)
+			} else {
+				results << createEvent(descriptionText: "$device.displayName code 13 is $cmd.alarmLevel", isStateChange:true, displayed:false)
 			}
 			
 			// Clear smoke in case they pulled batteries and we missed the clear msg
@@ -127,9 +136,8 @@ def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd, results) {
 			}
 			
 			// Check battery if we don't have a recent battery event
-			def prevBattery = device.currentState("battery")
-			if (!prevBattery || (new Date().time - prevBattery.date.time)/60000 >= 60 * 53) {
-				results << new physicalgraph.device.HubAction(zwave.batteryV1.batteryGet().format())
+			if (!state.lastbatt || (now() - state.lastbatt) >= 48*60*60*1000) {
+				results << response(zwave.batteryV1.batteryGet())
 			}
 			break
 		default:
@@ -158,12 +166,17 @@ def zwaveEvent(physicalgraph.zwave.commands.sensoralarmv1.SensorAlarmReport cmd,
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd, results) {
-	results << new physicalgraph.device.HubAction(zwave.wakeUpV1.wakeUpNoMoreInformation().format())
 	results << createEvent(descriptionText: "$device.displayName woke up", isStateChange: false)
+	if (!state.lastbatt || (now() - state.lastbatt) >= 56*60*60*1000) {
+		results << response(zwave.batteryV1.batteryGet(), "delay 2000", zwave.wakeUpV1.wakeUpNoMoreInformation())
+	} else {
+		results << response(zwave.wakeUpV1.wakeUpNoMoreInformation())
+	}
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd, results) {
-	def map = [ name: "battery", unit: "%" ]
+	def map = [ name: "battery", unit: "%", isStateChange: true ]
+	state.lastbatt = now()
 	if (cmd.batteryLevel == 0xFF) {
 		map.value = 1
 		map.descriptionText = "$device.displayName battery is low!"

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

@@ -68,7 +68,7 @@ def bridgeDiscovery(params=[:])
 	}
 
 	//setup.xml request every 3 seconds except on discoveries
-	if(((bridgeRefreshCount % 1) == 0) && ((bridgeRefreshCount % 5) != 0)) {
+	if(((bridgeRefreshCount % 3) == 0) && ((bridgeRefreshCount % 5) != 0)) {
 		verifyHueBridges()
 	}
 
@@ -175,6 +175,7 @@ private discoverHueBulbs() {
 }
 
 private verifyHueBridge(String deviceNetworkId, String host) {
+	log.trace "Verify Hue Bridge $deviceNetworkId"
 	sendHubCommand(new physicalgraph.device.HubAction([
 		method: "GET",
 		path: "/description.xml",
@@ -602,6 +603,20 @@ def parse(childDevice, description) {
 	}
 }
 
+def hubVerification(bodytext) {
+	log.trace "Bridge sent back description.xml for verification"
+    def body = new XmlSlurper().parseText(bodytext)
+    if (body?.device?.modelName?.text().startsWith("Philips hue bridge")) {
+        def bridges = getHueBridges()
+        def bridge = bridges.find {it?.key?.contains(body?.device?.UDN?.text())}
+        if (bridge) {
+            bridge.value << [name:body?.device?.friendlyName?.text(), serialNumber:body?.device?.serialNumber?.text(), verified: true]
+        } else {
+            log.error "/description.xml returned a bridge that didn't exist"
+        }
+    }
+}
+
 def on(childDevice) {
 	log.debug "Executing 'on'"
 	put("lights/${getId(childDevice)}/state", [on: true])

smartapps/smartthings/notify-me-when.src/notify-me-when.groovy

@@ -1,158 +1,158 @@
-/**
- *  Copyright 2015 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.
- *
- *  Notify Me When
- *
- *  Author: SmartThings
- *  Date: 2013-03-20
- *
- * Change Log:
- *	1. Todd Wackford
- *	2014-10-03:	Added capability.button device picker and button.pushed event subscription. For Doorbell.
- */
-definition(
-		name: "Notify Me When",
-		namespace: "smartthings",
-		author: "SmartThings",
-		description: "Receive notifications 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("Send this message (optional, sends standard status message if not specified)"){
-		input "messageText", "text", title: "Message Text", required: false
-	}
-	section("Via a push notification and/or an SMS message"){
-		input("recipients", "contact", title: "Send notifications to") {
-			input "phone", "phone", title: "Phone Number (for SMS, optional)", required: false
-			paragraph "If outside the US please make sure to enter the proper country code"
-			input "pushAndPhone", "enum", title: "Both Push and SMS?", required: false, options: ["Yes", "No"]
-		}
-	}
-	section("Minimum time between messages (optional, defaults to every message)") {
-		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) {
-			sendMessage(evt)
-		}
-	}
-	else {
-		sendMessage(evt)
-	}
-}
-
-private sendMessage(evt) {
-	String msg = messageText
-	Map options = [:]
-
-	if (!messageText) {
-		msg = defaultText(evt)
-		options = [translatable: true, triggerEvent: evt]
-	}
-	log.debug "$evt.name:$evt.value, pushAndPhone:$pushAndPhone, '$msg'"
-
-	if (location.contactBookEnabled) {
-		sendNotificationToContacts(msg, recipients, options)
-	} else {
-		if (!phone || pushAndPhone != 'No') {
-			log.debug 'sending push'
-			options.method = 'push'
-			//sendPush(msg)
-		}
-		if (phone) {
-			options.phone = phone
-			log.debug 'sending SMS'
-			//sendSms(phone, msg)
-		}
-		sendNotification(msg, options)
-	}
-
-	if (frequency) {
-		state[evt.deviceId] = now()
-	}
-}
-
-private defaultText(evt) {
-	if (evt.name == 'presence') {
-		if (evt.value == 'present') {
-			if (includeArticle) {
-				'{{ triggerEvent.linkText }} has arrived at the {{ location.name }}'
-			}
-			else {
-				'{{ triggerEvent.linkText }} has arrived at {{ location.name }}'
-			}
-		} else {
-			if (includeArticle) {
-				'{{ triggerEvent.linkText }} has left the {{ location.name }}'
-			}
-			else {
-				'{{ triggerEvent.linkText }} has left {{ location.name }}'
-			}
-		}
-	} else {
-		'{{ triggerEvent.descriptionText }}'
-	}
-}
-
-private getIncludeArticle() {
-	def name = location.name.toLowerCase()
-	def segs = name.split(" ")
-	!(["work","home"].contains(name) || (segs.size() > 1 && (["the","my","a","an"].contains(segs[0]) || segs[0].endsWith("'s"))))
-}
+/**
+ *  Copyright 2015 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.
+ *
+ *  Notify Me When
+ *
+ *  Author: SmartThings
+ *  Date: 2013-03-20
+ *
+ * Change Log:
+ *	1. Todd Wackford
+ *	2014-10-03:	Added capability.button device picker and button.pushed event subscription. For Doorbell.
+ */
+definition(
+		name: "Notify Me When",
+		namespace: "smartthings",
+		author: "SmartThings",
+		description: "Receive notifications 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("Send this message (optional, sends standard status message if not specified)"){
+		input "messageText", "text", title: "Message Text", required: false
+	}
+	section("Via a push notification and/or an SMS message"){
+		input("recipients", "contact", title: "Send notifications to") {
+			input "phone", "phone", title: "Phone Number (for SMS, optional)", required: false
+			paragraph "If outside the US please make sure to enter the proper country code"
+			input "pushAndPhone", "enum", title: "Both Push and SMS?", required: false, options: ["Yes", "No"]
+		}
+	}
+	section("Minimum time between messages (optional, defaults to every message)") {
+		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) {
+			sendMessage(evt)
+		}
+	}
+	else {
+		sendMessage(evt)
+	}
+}
+
+private sendMessage(evt) {
+	String msg = messageText
+	Map options = [:]
+
+	if (!messageText) {
+		msg = defaultText(evt)
+		options = [translatable: true, triggerEvent: evt]
+	}
+	log.debug "$evt.name:$evt.value, pushAndPhone:$pushAndPhone, '$msg'"
+
+	if (location.contactBookEnabled) {
+		sendNotificationToContacts(msg, recipients, options)
+	} else {
+		if (!phone || pushAndPhone != 'No') {
+			log.debug 'sending push'
+			options.method = 'push'
+			//sendPush(msg)
+		}
+		if (phone) {
+			options.phone = phone
+			log.debug 'sending SMS'
+			//sendSms(phone, msg)
+		}
+		sendNotification(msg, options)
+	}
+
+	if (frequency) {
+		state[evt.deviceId] = now()
+	}
+}
+
+private defaultText(evt) {
+	if (evt.name == 'presence') {
+		if (evt.value == 'present') {
+			if (includeArticle) {
+				'{{ triggerEvent.linkText }} has arrived at the {{ location.name }}'
+			}
+			else {
+				'{{ triggerEvent.linkText }} has arrived at {{ location.name }}'
+			}
+		} else {
+			if (includeArticle) {
+				'{{ triggerEvent.linkText }} has left the {{ location.name }}'
+			}
+			else {
+				'{{ triggerEvent.linkText }} has left {{ location.name }}'
+			}
+		}
+	} else {
+		'{{ triggerEvent.descriptionText }}'
+	}
+}
+
+private getIncludeArticle() {
+	def name = location.name.toLowerCase()
+	def segs = name.split(" ")
+	!(["work","home"].contains(name) || (segs.size() > 1 && (["the","my","a","an"].contains(segs[0]) || segs[0].endsWith("'s"))))
+}

smartapps/tslagle13/vacation-lighting-director.src/vacation-lighting-director.groovy

@@ -1,11 +1,17 @@
 /**
  *  Vacation Lighting Director
  * 
- *  Version  2.4 - Added information paragraphs
+ * Version  2.5 - Moved scheduling over to Cron and added time as a trigger. 
+ *				  Cleaned up formatting and some typos.
+ *                Updated license.
+ *                Made people option optional
+ * 				  Added sttement to unschedule on mode change if people option is not selected
+ *
+ * Version  2.4 - Added information paragraphs
  * 
  *  Source code can be found here: https://github.com/tslagle13/SmartThings/blob/master/smartapps/tslagle13/vacation-lighting-director.groovy
  *
- *  Copyright 2015 Tim Slagle
+ *  Copyright 2016 Tim Slagle
  *
  *  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:
@@ -51,8 +57,7 @@ def pageSetup() {
 	return dynamicPage(pageProperties) {
     	section(""){
         	paragraph "This app can be used to make your home seem occupied anytime you are away from your home. " +
-			"Please use each othe the sections below to setup the different preferences to your liking. " +
-			"I recommend this app be used with at least two away modes.  An example would be 'Away Day' 'and Away Night'. " 
+			"Please use each of the the sections below to setup the different preferences to your liking. " 
         }
         section("Setup Menu") {
             href "Setup", title: "Setup", description: "", state:greyedOut()
@@ -70,7 +75,7 @@ def Setup() {
     def newMode = [
         name:       	"newMode",
         type:       	"mode",
-        title:      	"Which?",
+        title:      	"Modes",
         multiple:   	true,
         required:   	true
     ]
@@ -96,14 +101,6 @@ def Setup() {
         required:	true,
     ]
     
-    def people = [
-        name:       "people",
-        type:       "capability.presenceSensor",
-        title:      "If these people are home do not change light status",
-        required:	true,
-        multiple:	true
-    ]
-    
     def pageName = "Setup"
     
     def pageProperties = [
@@ -116,10 +113,11 @@ def Setup() {
 
 		section(""){            
                     paragraph "In this section you need to setup the deatils of how you want your lighting to be affected while " +
-                    paragraph "you are away.  All of these settings are required in order for the simulator to run correctly."
+                    "you are away.  All of these settings are required in order for the simulator to run correctly."
         }
-        section("Which mode change triggers the simulator? (This app will only run in selected mode(s))") {
-                    input newMode           
+        section("Simulator Triggers") {
+                    input newMode  
+                    href "timeIntervalInput", title: "Times", description: timeIntervalLabel(), refreshAfterSelection:true
         }
         section("Light switches to turn on/off") {
                     input switches           
@@ -130,9 +128,6 @@ def Setup() {
         section("Number of active lights at any given time") {
                     input number_of_active_lights           
         }    
-        section("People") {
-                    input people            
-        }
     }
     
 }
@@ -162,18 +157,29 @@ def Settings() {
         title:      "Settings",
         nextPage:   "pageSetup"
     ]
+    
+    def people = [
+        name:       "people",
+        type:       "capability.presenceSensor",
+        title:      "If these people are home do not change light status",
+        required:	false,
+        multiple:	true
+    ]
 
     return dynamicPage(pageProperties) {
 
 		section(""){              
                     paragraph "In this section you can restrict how your simulator runs.  For instance you can restrict on which days it will run " +
-                    paragraph "as well as a delay for the simulator to start after it is in the correct mode.  Delaying the simulator helps with false starts based on a incorrect mode change."
+                    "as well as a delay for the simulator to start after it is in the correct mode.  Delaying the simulator helps with false starts based on a incorrect mode change."
         }
         section("Delay to start simulator") {
                     input falseAlarmThreshold
         }
+        section("People") {
+        			paragraph "Not using this setting may cause some lights to remain on when you arrive home"
+                    input people            
+        }
         section("More options") {
-                    href "timeIntervalInput", title: "Only during a certain time", description: getTimeLabel(starting, ending), state: greyedOutTime(starting, ending), refreshAfterSelection:true
                     input days
         } 
     }   
@@ -181,9 +187,24 @@ def Settings() {
 
 page(name: "timeIntervalInput", title: "Only during a certain time", refreshAfterSelection:true) {
 		section {
-			input "starting", "time", title: "Starting", required: false 
-			input "ending", "time", title: "Ending", required: false 
+			input "startTimeType", "enum", title: "Starting at", options: [["time": "A specific time"], ["sunrise": "Sunrise"], ["sunset": "Sunset"]], defaultValue: "time", submitOnChange: true
+			if (startTimeType in ["sunrise","sunset"]) {
+				input "startTimeOffset", "number", title: "Offset in minutes (+/-)", range: "*..*", required: false
+			}
+			else {
+				input "starting", "time", title: "Start time", required: false
+			}
 		}
+		section {
+			input "endTimeType", "enum", title: "Ending at", options: [["time": "A specific time"], ["sunrise": "Sunrise"], ["sunset": "Sunset"]], defaultValue: "time", submitOnChange: true
+			if (endTimeType in ["sunrise","sunset"]) {
+				input "endTimeOffset", "number", title: "Offset in minutes (+/-)", range: "*..*", required: false
+			}
+			else {
+				input "ending", "time", title: "End time", required: false
+			}
+		}
+        
 }
 
 def installed() {
@@ -201,10 +222,13 @@ def initialize(){
 	if (newMode != null) {
 		subscribe(location, modeChangeHandler)
     }
+    if (starting != null) {
+    	schedule(starting, modeChangeHandler)
+    }
+    log.debug "Installed with settings: ${settings}"
 }
 
 def modeChangeHandler(evt) {
-	log.debug "Mode change to: ${evt.value}"
 		def delay = (falseAlarmThreshold != null && falseAlarmThreshold != "") ? falseAlarmThreshold * 60 : 2 * 60  
     	runIn(delay, scheduleCheck)
 }
@@ -212,48 +236,54 @@ def modeChangeHandler(evt) {
 
 //Main logic to pick a random set of lights from the large set of lights to turn on and then turn the rest off
 def scheduleCheck(evt) {
-if(allOk){
-log.debug("Running")
-  // turn off all the switches
-  switches.off()
-
-  // grab a random switch
-  def random = new Random()
-  def inactive_switches = switches
-  for (int i = 0 ; i < number_of_active_lights ; i++) {
-    // if there are no inactive switches to turn on then let's break
-    if (inactive_switches.size() == 0){
-      break
+    if(allOk){
+        log.debug("Running")
+        // turn off all the switches
+        switches.off()
+        
+        // grab a random switch
+        def random = new Random()
+        def inactive_switches = switches
+        for (int i = 0 ; i < number_of_active_lights ; i++) {
+            // if there are no inactive switches to turn on then let's break
+            if (inactive_switches.size() == 0){
+                break
+            }
+            
+            // grab a random switch and turn it on
+            def random_int = random.nextInt(inactive_switches.size())
+            inactive_switches[random_int].on()
+            
+            // then remove that switch from the pool off switches that can be turned on
+            inactive_switches.remove(random_int)
+        }
+        
+        // re-run again when the frequency demands it
+        schedule("0 0/${frequency_minutes} * 1/1 * ? *", scheduleCheck)
     }
-
-    // grab a random switch and turn it on
-    def random_int = random.nextInt(inactive_switches.size())
-    inactive_switches[random_int].on()
-
-    // then remove that switch from the pool off switches that can be turned on
-    inactive_switches.remove(random_int)
-  }
-
-  // re-run again when the frequency demands it
-  runIn(frequency_minutes * 60, scheduleCheck)
-}
-//Check to see if mode is ok but not time/day.  If mode is still ok, check again after frequency period.
-else if (modeOk) {
-	log.debug("mode OK.  Running again")
-	runIn(frequency_minutes * 60, scheduleCheck)
-    switches.off()
-}
-//if none is ok turn off frequency check and turn off lights.
-else if(people){
-    //don't turn off lights if anyone is home
-		if(someoneIsHome()){
-		log.debug("Stopping Check for Light")
+    //Check to see if mode is ok but not time/day.  If mode is still ok, check again after frequency period.
+    else if (modeOk) {
+        log.debug("mode OK.  Running again")
+        switches.off()
+    }
+    //if none is ok turn off frequency check and turn off lights.
+    else {
+    	if(people){
+        	//don't turn off lights if anyone is home
+        	if(someoneIsHome()){
+        	    log.debug("Stopping Check for Light")
+        	    unschedule()
+        	}
+        	else{
+        	    log.debug("Stopping Check for Light and turning off all lights")
+        	    switches.off()
+        	    unschedule()
+        	}
     	}
-        else{
-    log.debug("Stopping Check for Light and turning off all lights")
-	switches.off()
+        else if (!modeOk) {
+        	unschedule()
+        }
     }
-}
 }      
 
 
@@ -286,26 +316,6 @@ private getDaysOk() {
 	result
 }
 
-private getTimeOk() {
-	def result = true
-	if (starting && ending) {
-		def currTime = now()
-		def start = timeToday(starting).time
-		def stop = timeToday(ending).time
-		result = start < stop ? currTime >= start && currTime <= stop : currTime <= stop || currTime >= start
-	}
-    
-    else if (starting){
-    	result = currTime >= start
-    }
-    else if (ending){
-    	result = currTime <= stop
-    }
-    
-	log.trace "timeOk = $result"
-	result
-}
-
 private getHomeIsEmpty() {
   def result = true
 
@@ -330,25 +340,59 @@ private getSomeoneIsHome() {
   return result
 }
 
-
-//gets the label for time restriction. Label phrasing changes depending on if there is both start and stop times or just one start/stop time.
-def getTimeLabel(starting, ending){
-
-	def timeLabel = "Tap to set"
-	
-    if(starting && ending){
-    	timeLabel = "Between" + " " + hhmm(starting) + " "  + "and" + " " +  hhmm(ending)
-    }
-    else if (starting) {
-		timeLabel = "Start at" + " " + hhmm(starting)
-    }
-    else if(ending){
-    timeLabel = "End at" + hhmm(ending)
-    }
-	timeLabel
+private getTimeOk() {
+	def result = true
+	def start = timeWindowStart()
+	def stop = timeWindowStop()
+	if (start && stop && location.timeZone) {
+		result = timeOfDayIsBetween(start, stop, new Date(), location.timeZone)
+	}
+	log.trace "timeOk = $result"
+	result
+}
+
+private timeWindowStart() {
+	def result = null
+	if (startTimeType == "sunrise") {
+		result = location.currentState("sunriseTime")?.dateValue
+		if (result && startTimeOffset) {
+			result = new Date(result.time + Math.round(startTimeOffset * 60000))
+		}
+	}
+	else if (startTimeType == "sunset") {
+		result = location.currentState("sunsetTime")?.dateValue
+		if (result && startTimeOffset) {
+			result = new Date(result.time + Math.round(startTimeOffset * 60000))
+		}
+	}
+	else if (starting && location.timeZone) {
+		result = timeToday(starting, location.timeZone)
+	}
+	log.trace "timeWindowStart = ${result}"
+	result
+}
+
+private timeWindowStop() {
+	def result = null
+	if (endTimeType == "sunrise") {
+		result = location.currentState("sunriseTime")?.dateValue
+		if (result && endTimeOffset) {
+			result = new Date(result.time + Math.round(endTimeOffset * 60000))
+		}
+	}
+	else if (endTimeType == "sunset") {
+		result = location.currentState("sunsetTime")?.dateValue
+		if (result && endTimeOffset) {
+			result = new Date(result.time + Math.round(endTimeOffset * 60000))
+		}
+	}
+	else if (ending && location.timeZone) {
+		result = timeToday(ending, location.timeZone)
+	}
+	log.trace "timeWindowStop = ${result}"
+	result
 }
 
-//fomrats time to readable format for time label
 private hhmm(time, fmt = "h:mm a")
 {
 	def t = timeToday(time, location.timeZone)
@@ -357,6 +401,41 @@ private hhmm(time, fmt = "h:mm a")
 	f.format(t)
 }
 
+private timeIntervalLabel() {
+	def start = ""
+	switch (startTimeType) {
+		case "time":
+			if (ending) {
+            	start += hhmm(starting)
+            }
+			break
+		case "sunrise":
+		case "sunset":
+        	start += startTimeType[0].toUpperCase() + startTimeType[1..-1]
+			if (startTimeOffset) {
+				start += startTimeOffset > 0 ? "+${startTimeOffset} min" : "${startTimeOffset} min"
+			}
+			break
+	}
+
+    def finish = ""
+	switch (endTimeType) {
+		case "time":
+			if (ending) {
+            	finish += hhmm(ending)
+            }
+			break
+		case "sunrise":
+		case "sunset":
+        	finish += endTimeType[0].toUpperCase() + endTimeType[1..-1]
+			if (endTimeOffset) {
+				finish += endTimeOffset > 0 ? "+${endTimeOffset} min" : "${endTimeOffset} min"
+			}
+			break
+	}
+	start && finish ? "${start} to ${finish}" : ""
+}
+
 //sets complete/not complete for the setup section on the main dynamic page
 def greyedOut(){
 	def result = ""
@@ -369,16 +448,7 @@ def greyedOut(){
 //sets complete/not complete for the settings section on the main dynamic page
 def greyedOutSettings(){
 	def result = ""
-    if (starting || ending || days || falseAlarmThreshold) {
-    	result = "complete"	
-    }
-    result
-}
-
-//sets complete/not complete for time restriction section in settings
-def greyedOutTime(starting, ending){
-	def result = ""
-    if (starting || ending) {
+    if (people || days || falseAlarmThreshold ) {
     	result = "complete"	
     }
     result