MSA-2129: A device handler for the Devolo Humidity Sensor

[DHF-14][DHF-15] Updated comments & rectified typo

devicetypes/garth/devolo-humidity-sensor.src/devolo-humidity-sensor.groovy

@@ -0,0 +1,188 @@
+/**
+ *  Devolo Humidity Sensor
+ *
+ *  Copyright 2017 Garth Williams
+ *
+ *  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.
+ *
+ *
+ *  Based on definition (name: "Aeon Multisensor 6", namespace: "smartthings", author: "SmartThings")
+ *
+ */
+metadata {
+	definition (name: "Devolo Humidity Sensor", namespace: "garth", author: "Garth Williams") {
+		capability "Temperature Measurement"
+		capability "Relative Humidity Measurement"
+		capability "Configuration"
+		capability "Sensor"
+		capability "Battery"
+		capability "Health Check"
+        
+        attribute "batteryStatus", "string"
+        
+        fingerprint mfr: "0175", prod: "0002", model: "0020"
+	}
+
+	simulator {
+		for (int i = 0; i <= 100; i += 20) {
+			status "temperature ${i}F": new physicalgraph.zwave.Zwave().securityV1.securityMessageEncapsulation().encapsulate(
+				new physicalgraph.zwave.Zwave().sensorMultilevelV2.sensorMultilevelReport(
+					scaledSensorValue: i, precision: 1, sensorType: 1, scale: 1)
+				).incomingMessage()
+		}
+
+		for (int i = 0; i <= 100; i += 20) {
+			status "humidity ${i}%":  new physicalgraph.zwave.Zwave().securityV1.securityMessageEncapsulation().encapsulate(
+				new physicalgraph.zwave.Zwave().sensorMultilevelV2.sensorMultilevelReport(scaledSensorValue: i, sensorType: 5)
+			).incomingMessage()
+		}
+
+		for (int i in [0, 5, 10, 15, 50, 99, 100]) {
+			status "battery ${i}%":  new physicalgraph.zwave.Zwave().securityV1.securityMessageEncapsulation().encapsulate(
+				new physicalgraph.zwave.Zwave().batteryV1.batteryReport(batteryLevel: i)
+			).incomingMessage()
+		}
+		status "low battery alert":  new physicalgraph.zwave.Zwave().securityV1.securityMessageEncapsulation().encapsulate(
+			new physicalgraph.zwave.Zwave().batteryV1.batteryReport(batteryLevel: 255)
+		).incomingMessage()
+
+		status "wake up" : "command: 8407, payload: "
+	}
+
+	preferences {
+	}
+
+	tiles(scale: 2) {
+		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
+			state "temperature", label:'${currentValue}°',
+			backgroundColors:[
+				[value: 32, color: "#153591"],
+				[value: 44, color: "#1e9cbb"],
+				[value: 59, color: "#90d2a7"],
+				[value: 74, color: "#44b621"],
+				[value: 84, color: "#f1d801"],
+				[value: 92, color: "#d04e00"],
+				[value: 98, color: "#bc2323"]
+			]
+		}
+		valueTile("humidity", "device.humidity", inactiveLabel: false, width: 2, height: 2) {
+			state "humidity", label:'${currentValue}% humidity', unit:""
+		}
+
+		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+			state "battery", label:'${currentValue}% battery', unit:""
+		}
+
+		valueTile("batteryStatus", "device.batteryStatus", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+			state "batteryStatus", label:'${currentValue}', unit:""
+		}
+
+		main(["temperature", "humidity"])
+		details(["temperature", "humidity", "batteryStatus"])
+	}
+}
+
+def parse(String description) {
+	log.debug "parse() >> description: $description"
+	def result = null
+	if (description.startsWith("Err 106")) {
+		log.debug "parse() >> Err 106"
+		result = createEvent( name: "secureInclusion", value: "failed", isStateChange: true,
+				descriptionText: "This sensor failed to complete the network security key exchange. If you are unable to control it via SmartThings, you must remove it from your network and add it again.")
+	} else if (description != "updated") {
+		log.debug "parse() >> zwave.parse(description)"
+		def cmd = zwave.parse(description, [0x31: 5, 0x30: 2, 0x84: 1])
+		if (cmd) {
+			result = zwaveEvent(cmd)
+		}
+	}
+	log.debug "After zwaveEvent(cmd) >> Parsed '${description}' to ${result.inspect()}"
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulation cmd) {
+	def encapsulatedCommand = cmd.encapsulatedCommand([0x31: 5, 0x30: 2, 0x84: 1])
+	state.sec = 1
+	log.debug "encapsulated: ${encapsulatedCommand}"
+	if (encapsulatedCommand) {
+		zwaveEvent(encapsulatedCommand)
+	} else {
+		log.warn "Unable to extract encapsulated cmd from $cmd"
+		createEvent(descriptionText: cmd.toString())
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityCommandsSupportedReport cmd) {
+	log.info "Executing zwaveEvent 98 (SecurityV1): 03 (SecurityCommandsSupportedReport) with cmd: $cmd"
+	state.sec = 1
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.securityv1.NetworkKeyVerify cmd) {
+	state.sec = 1
+	log.info "Executing zwaveEvent 98 (SecurityV1): 07 (NetworkKeyVerify) with cmd: $cmd (node is securely included)"
+	def result = [createEvent(name:"secureInclusion", value:"success", descriptionText:"Secure inclusion was successful", isStateChange: true)]
+	result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
+	def result = []
+	def map = [ name: "battery", unit: "%" ]
+	if (cmd.batteryLevel == 0xFF) {
+		map.value = 1
+		map.descriptionText = "${device.displayName} battery is low"
+		map.isStateChange = true
+	} else {
+		map.value = cmd.batteryLevel
+	}
+	state.lastbatt = now()
+	result << createEvent(map)
+	if (device.latestValue("powerSupply") != "USB Cable"){
+		result << createEvent(name: "batteryStatus", value: "${map.value} % battery", displayed: false)
+	}
+	result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelReport cmd){
+	def map = [:]
+	switch (cmd.sensorType) {
+		case 1:
+			map.name = "temperature"
+			def cmdScale = cmd.scale == 1 ? "F" : "C"
+			map.value = convertTemperatureIfNeeded(cmd.scaledSensorValue, cmdScale, cmd.precision)
+			map.unit = getTemperatureScale()
+			break
+		case 5:
+			map.name = "humidity"
+			map.value = cmd.scaledSensorValue.toInteger()
+			map.unit = "%"
+			break
+		default:
+			map.descriptionText = cmd.toString()
+	}
+	createEvent(map)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.configurationv2.ConfigurationReport cmd) {
+	log.debug "ConfigurationReport: $cmd"
+	def result = []
+	def value
+	if (cmd.parameterNumber == 9 && cmd.configurationValue[0] == 1) {
+		value = "Battery"
+		result << createEvent(name: "powerSupply", value: value, displayed: false)
+	} else if (cmd.parameterNumber == 101){
+		result << response(configure())
+	}
+	result
+}
+
+def zwaveEvent(physicalgraph.zwave.Command cmd) {
+	log.debug "General zwaveEvent cmd: ${cmd}"
+	createEvent(descriptionText: cmd.toString(), isStateChange: false)
+}

devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy

@@ -133,8 +133,8 @@ def updated() {
 }
 
 def initialize() {
-	// Arrival sensors only goes OFFLINE when Hub is off
-	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zigbee", scheme:"untracked"]), displayed: false)
+	// Device only goes OFFLINE when Hub is off
+	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zwave", scheme:"untracked"]), displayed: false)
 
 	def zwMap = getZwaveInfo()
 	def buttons = 4 // Default for Key Fob

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

@@ -111,7 +111,6 @@ def configure() {
 	return cmds
 }
 
-
 def installed() {
 	initialize()
 }
@@ -121,7 +120,7 @@ def updated() {
 }
 
 def initialize() {
-	// Arrival sensors only goes OFFLINE when Hub is off
-	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zigbee", scheme:"untracked"]), displayed: false)
+	// Device only goes OFFLINE when Hub is off
+	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zwave", scheme:"untracked"]), displayed: false)
 	sendEvent(name: "numberOfButtons", value: 4)
 }

devicetypes/smartthings/zwave-siren.src/zwave-siren.groovy

@@ -72,7 +72,7 @@ def createEvents(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
 
 def poll() {
 	if (secondsPast(state.lastbatt, 36*60*60)) {
-		return zwave.batteryV1.batteryGet().format
+		return zwave.batteryV1.batteryGet().format()
 	} else {
 		return null
 	}

smartapps/fortrezz/fortrezz-leak-detector.src/fortrezz-leak-detector.groovy

@@ -1,320 +0,0 @@
-/**
- *  Leak Detector for FortrezZ Water Meter
- *
- *  Copyright 2016 Daniel Kurin
- *
- */
-definition(
-    name: "FortrezZ Leak Detector",
-    namespace: "fortrezz",
-    author: "FortrezZ, LLC",
-    description: "Use the FortrezZ Water Meter to identify leaks in your home's water system.",
-    category: "Green Living",
-    iconUrl: "http://swiftlet.technology/wp-content/uploads/2016/05/logo-square-200-1.png",
-    iconX2Url: "http://swiftlet.technology/wp-content/uploads/2016/05/logo-square-500.png",
-    iconX3Url: "http://swiftlet.technology/wp-content/uploads/2016/05/logo-square.png")
-
-
-preferences {
-	page(name: "page2", title: "Select device and actions", install: true, uninstall: true)
-}
-
-def page2() {
-    dynamicPage(name: "page2") {
-        section("Choose a water meter to monitor:") {
-            input(name: "meter", type: "capability.energyMeter", title: "Water Meter", description: null, required: true, submitOnChange: true)
-        }
-
-        if (meter) {
-            section {
-                app(name: "childRules", appName: "Leak Detector", namespace: "fortrezz", title: "Create New Leak Detector...", multiple: true)
-            }
-        }
-        
-        section("Send notifications through...") {
-        	input(name: "pushNotification", type: "bool", title: "SmartThings App", required: false)
-        	input(name: "smsNotification", type: "bool", title: "Text Message (SMS)", submitOnChange: true, required: false)
-            if (smsNotification)
-            {
-            	input(name: "phone", type: "phone", title: "Phone number?", required: true)
-            }
-            input(name: "minutesBetweenNotifications", type: "number", title: "Minutes between notifications", required: true, defaultValue: 60)
-        }
-
-		log.debug "there are ${childApps.size()} child smartapps"
-        def childRules = []
-        childApps.each {child ->
-            //log.debug "child ${child.id}: ${child.settings()}"
-            childRules << [id: child.id, rules: child.settings()]
-        }
-        state.rules = childRules
-        //log.debug("Child Rules: ${state.rules} w/ length ${state.rules.toString().length()}")
-        log.debug "Parent Settings: ${settings}"
-    }
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-	initialize()
-}
-
-def initialize() {
-	subscribe(meter, "cumulative", cumulativeHandler)
-	subscribe(meter, "gpm", gpmHandler)
-    log.debug("Subscribing to events")
-}
-
-def cumulativeHandler(evt) {
-	//Date Stuff
-   	def daysOfTheWeek = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
-    def today = new Date()
-    today.clearTime()
-    Calendar c = Calendar.getInstance();
-    c.setTime(today);
-    int dow = c.get(Calendar.DAY_OF_WEEK);
-    def dowName = daysOfTheWeek[dow-1]
-    
-	def gpm = meter.latestValue("gpm")
-    def cumulative = new BigDecimal(evt.value)
-    log.debug "Cumulative Handler: [gpm: ${gpm}, cumulative: ${cumulative}]"
-    def rules = state.rules
-    rules.each { it ->
-        def r = it.rules
-        def childAppID = it.id
-    	//log.debug("Rule: ${r}")
-    	switch (r.type) {
-            case "Mode":
-            	log.debug("Mode Test: ${location.currentMode} in ${r.modes}... ${findIn(r.modes, location.currentMode)}")
-                if (findIn(r.modes, location.currentMode))
-                {
-                	log.debug("Threshold:${r.gpm}, Value:${gpm}")
-                	if(gpm > r.gpm)
-                    {
-                    	sendNotification(childAppID, gpm)
-                        if(r.dev)
-                        {
-                        	//log.debug("Child App: ${childAppID}")
-                        	def activityApp = getChildById(childAppID)
-                            activityApp.devAction(r.command)
-                        }
-                    }
-                }
-                break
-
-            case "Time Period":
-            	log.debug("Time Period Test: ${r}")
-                def boolTime = timeOfDayIsBetween(r.startTime, r.endTime, new Date(), location.timeZone)
-                def boolDay = !r.days || findIn(r.days, dowName) // Truth Table of this mess: http://swiftlet.technology/wp-content/uploads/2016/05/IMG_20160523_150600.jpg
-                def boolMode = !r.modes || findIn(r.modes, location.currentMode)
-                
-            	if(boolTime && boolDay && boolMode)
-                {
-                    if(gpm > r.gpm)
-                    {
-                        sendNotification(childAppID, gpm)
-                        if(r.dev)
-                        {
-                            def activityApp = getChildById(childAppID)
-                            activityApp.devAction(r.command)
-                        }
-                    }
-                }
-            	break
-
-            case "Accumulated Flow":
-            	log.debug("Accumulated Flow Test: ${r}")
-                def boolTime = timeOfDayIsBetween(r.startTime, r.endTime, new Date(), location.timeZone)
-                def boolDay = !r.days || findIn(r.days, dowName) // Truth Table of this mess: http://swiftlet.technology/wp-content/uploads/2016/05/IMG_20160523_150600.jpg
-                def boolMode = !r.modes || findIn(r.modes, location.currentMode)
-                
-            	if(boolTime && boolDay && boolMode)
-                {
-                	def delta = 0
-                    if(state["accHistory${childAppID}"] != null)
-                    {
-                    	delta = cumulative - state["accHistory${childAppID}"]
-                    }
-                    else
-                    {
-                    	state["accHistory${childAppID}"] = cumulative
-                    }
-                	log.debug("Currently in specified time, delta from beginning of time period: ${delta}")
-                    
-                    if(delta > r.gallons)
-                    {
-                        sendNotification(childAppID, delta)
-                        if(r.dev)
-                        {
-                            def activityApp = getChildById(childAppID)
-                            activityApp.devAction(r.command)
-                        }
-                    }
-                }
-                else
-                {
-                	log.debug("Outside specified time, saving value")
-                    state["accHistory${childAppID}"] = cumulative
-                }
-            	break
-
-            case "Continuous Flow":
-            	log.debug("Continuous Flow Test: ${r}")
-            	def contMinutes = 0
-                def boolMode = !r.modes || findIn(r.modes, location.currentMode)
-
-				if(gpm != 0)
-                {
-                	if(state["contHistory${childAppID}"] == [])
-                    {
-                    	state["contHistory${childAppID}"] = new Date()
-                    }
-                    else
-                    {
-                    	//def td = now() - Date.parse("yyyy-MM-dd'T'HH:mm:ss'Z'", state["contHistory${childAppID}"]).getTime()
-                        //log.debug(state["contHistory${childAppID}"])
-                        //def historyDate = new Date(state["contHistory${childAppID}"])
-                    	def historyDate = new Date().parse("yyyy-MM-dd'T'HH:mm:ssZ", state["contHistory${childAppID}"])
-                    	def td = now() - historyDate.getTime()
-                        //log.debug("Now minus then: ${td}")
-                        contMinutes = td/60000
-                        log.debug("Minutes of constant flow: ${contMinutes}, since ${state["contHistory${childAppID}"]}")
-                    }
-                }
-                
-                if(contMinutes > r.flowMinutes && boolMode)
-                {
-                    sendNotification(childAppID, Math.round(contMinutes))
-                    if(r.dev)
-                    {
-                        def activityApp = getChildById(childAppID)
-                        activityApp.devAction(r.command)
-                    }
-                }
-                break
-
-            case "Water Valve Status":
-            	log.debug("Water Valve Test: ${r}")
-            	def child = getChildById(childAppID)
-                //log.debug("Water Valve Child App: ${child.id}")
-                if(child.isValveStatus(r.valveStatus))
-                {
-                    if(gpm > r.gpm)
-                    {
-                        sendNotification(childAppID, gpm)
-                   }
-                }
-                break
-
-            case "Switch Status":
-            	break
-
-            default:
-                break
-        }
-    }
-}
-
-def gpmHandler(evt) {
-	//Date Stuff
-   	def daysOfTheWeek = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
-    def today = new Date()
-    today.clearTime()
-    Calendar c = Calendar.getInstance();
-    c.setTime(today);
-    int dow = c.get(Calendar.DAY_OF_WEEK);
-    def dowName = daysOfTheWeek[dow-1]
-    
-	def gpm = evt.value
-    def cumulative = meter.latestValue("cumulative")
-    log.debug "GPM Handler: [gpm: ${gpm}, cumulative: ${cumulative}]"
-    def rules = state.rules
-    rules.each { it ->
-        def r = it.rules
-        def childAppID = it.id
-    	switch (r.type) {
-
-			// This is down here because "cumulative" never gets sent in the case of 0 change between messages
-			case "Continuous Flow":
-            	log.debug("Continuous Flow Test (GPM): ${r}")
-            	def contMinutes = 0
-
-				if(gpm == "0.0")
-                {
-                	state["contHistory${childAppID}"] = []
-                }
-                //log.debug("contHistory${childAppID} is ${state["contHistory${childAppID}"]}")
-                break
-
-            default:
-                break
-        }
-	}	
-}
-def sendNotification(device, gpm)
-{
-	def set = getChildById(device).settings()
-	def msg = ""
-    if(set.type == "Accumulated Flow")
-    {
-    	msg = "Water Flow Warning: \"${set.ruleName}\" is over threshold at ${gpm} gallons"
-    }
-    else if(set.type == "Continuous Flow")
-    {
-    	msg = "Water Flow Warning: \"${set.ruleName}\" is over threshold at ${gpm} minutes"
-    }
-    else
-    {
-    	msg = "Water Flow Warning: \"${set.ruleName}\" is over threshold at ${gpm}gpm"
-    }
-    log.debug(msg)
-    
-    // Only send notifications as often as the user specifies
-    def lastNotification = 0
-    if(state["notificationHistory${device}"])
-    {
-    	lastNotification = Date.parse("yyyy-MM-dd'T'HH:mm:ssZ", state["notificationHistory${device}"]).getTime()
-    }
-    def td = now() - lastNotification
-    log.debug("Last Notification at ${state["notificationHistory${device}"]}... ${td/(60*1000)} minutes")
-    if(td/(60*1000) > minutesBetweenNotifications.value)
-    {
-    	log.debug("Sending Notification")
-        if (pushNotification)
-        {
-            sendPush(msg)
-            state["notificationHistory${device}"] = new Date()
-        }
-        if (smsNotification)
-        {
-            sendSms(phone, msg)
-            state["notificationHistory${device}"] = new Date()
-        }
-    }
-}
-
-def getChildById(app)
-{
-	return childApps.find{ it.id == app }
-}
-
-def findIn(haystack, needle)
-{
-	def result = false
-	haystack.each { it ->
-    	//log.debug("findIn: ${it} <- ${needle}")
-    	if (needle == it)
-        {
-        	//log.debug("Found needle in haystack")
-        	result = true
-        }
-    }
-    return result
-}

smartapps/fortrezz/leak-detector.src/leak-detector.groovy

@@ -1,243 +0,0 @@
-/**
- *  Leak Detector
- *
- *  Copyright 2016 Daniel Kurin
- *
- */
-definition(
-    name: "Leak Detector",
-    namespace: "fortrezz",
-    author: "FortrezZ, LLC",
-    description: "Child SmartApp for leak detector rules",
-    category: "Green Living",
-    parent: "fortrezz:FortrezZ Leak Detector",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
-
-
-preferences {
-	page(name: "prefsPage", title: "Choose the detector behavior", install: true, uninstall: true)
-
-    // Do something here like update a message on the screen,
-    // or introduce more inputs. submitOnChange will refresh
-    // the page and allow the user to see the changes immediately.
-    // For example, you could prompt for the level of the dimmers
-    // if dimmers have been selected:
-    //log.debug "Child Settings: ${settings}"
-}
-
-def prefsPage() {
-	def daysOfTheWeek = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
-    dynamicPage(name: "prefsPage") {
-        section("Set Leak Threshold by...") {
-            input(name: "type", type: "enum", title: "Type...", submitOnChange: true, options: ruleTypes())
-        }
-
-        if(type)
-        {
-            switch (type) {
-                case "Mode":
-                    section("Threshold settings") {
-                        input(name: "ruleName", type: "text", title: "Rule Name", required: true)
-                        input(name: "gpm", type: "decimal", title: "GPM exceeds", required: true, defaultValue: 0.1)
-                    }
-                    section("Only in these modes") {
-                        input(name: "modes", type: "mode", title: "select a mode(s)", multiple: true, required: true)
-                    }
-                    section ("Action") {
-                    	input(name: "dev", type: "capability.actuator", title: "Choose a device to perform the action", required: false, submitOnChange: true)
-                        if (dev) {
-                        	input(name: "command", type: "enum", title: "Command...", submitOnChange: true, options: deviceCommands(dev))
-                    	}
-                    }
-                    break
-
-                case "Time Period":
-                    section("Threshold settings") {
-                        input(name: "ruleName", type: "text", title: "Rule Name", required: true)
-                        input(name: "gpm", type: "decimal", title: "GPM exceeds", required: true)
-                    }
-                    section("Between...") {
-                    	input(name: "startTime", type: "time", title: "Start Time", required: true)
-                    }
-                    section("...and...") {
-                    	input(name: "endTime", type: "time", title: "End Time", required: true)
-                    }
-                    section("Only on these days") {
-                    	input(name: "days", type: "enum", title: "Days of the week", required: false, options: daysOfTheWeek, multiple: true)
-                    }
-                    section("Only in these modes") {
-                    	input(name: "modes", type: "mode", title: "System Modes", required: false, multiple: true)
-                    }
-                    section ("Action") {
-                    	input(name: "dev", type: "capability.actuator", title: "Choose a device to perform the action", required: false, submitOnChange: true)
-                        if (dev) {
-                        	input(name: "command", type: "enum", title: "Command...", submitOnChange: true, options: deviceCommands(dev))
-                    	}
-                    }
-                    break
-
-                case "Accumulated Flow":
-                    section("Threshold settings") {
-                        input(name: "ruleName", type: "text", title: "Rule Name", required: true)
-                        input(name: "gallons", type: "number", title: "Total Gallons exceeds", required: true)
-                    }
-                    section("Between...") {
-                    	input(name: "startTime", type: "time", title: "Start Time", required: true)
-                    }
-                    section("...and...") {
-                    	input(name: "endTime", type: "time", title: "End Time", required: true)
-                    }
-                    section("Only on these days") {
-                    	input(name: "days", type: "enum", title: "Days of the week", required: false, options: daysOfTheWeek, multiple: true)
-                    }
-                    section("Only in these modes") {
-                    	input(name: "modes", type: "mode", title: "System Modes", required: false, multiple: true)
-                    }
-                    section ("Action") {
-                    	input(name: "dev", type: "capability.actuator", title: "Choose a device to perform the action", required: false, submitOnChange: true)
-                        if (dev) {
-                        	input(name: "command", type: "enum", title: "Command...", submitOnChange: true, options: deviceCommands(dev))
-                    	}
-                    }
-                    break
-
-                case "Continuous Flow":
-                    section("Threshold settings") {
-                        input(name: "ruleName", type: "text", title: "Rule Name", required: true)
-	                    input(name: "flowMinutes", type: "number", title: "Minutes of constant flow", required: true, defaultValue: 60)
-                    }
-                    section("Only in these modes") {
-                    	input(name: "modes", type: "mode", title: "System Modes", required: false, multiple: true)
-                    }
-                    section ("Action") {
-                    	input(name: "dev", type: "capability.actuator", title: "Choose a device to perform the action", required: false, submitOnChange: true)
-                        if (dev) {
-                        	input(name: "command", type: "enum", title: "Command...", submitOnChange: true, options: deviceCommands(dev))
-                    	}
-                    }
-                    break
-
-                case "Water Valve Status":
-                    section("Threshold settings") {
-                        input(name: "ruleName", type: "text", title: "Rule Name", required: true)
-                        input(name: "gpm", type: "decimal", title: "GPM exceeds", required: true, defaultValue: 0.1)
-                    }
-                    section ("While...") {
-                        input(name: "valve", type: "capability.valve", title: "Choose a valve", required: true)
-                    }
-                    section ("...is...") {
-                        input(name: "valveStatus", type: "enum", title: "Status", options: ["Open","Closed"], required: true)
-                    }
-                   break
-
-                case "Switch Status":
-                    section("Threshold settings") {
-                        input(name: "ruleName", type: "text", title: "Rule Name", required: true)
-                        input(name: "gpm", type: "decimal", title: "GPM exceeds", required: true, defaultValue: 0.1)
-                    }
-                    section ("If...") {
-                        input(name: "valve", type: "capability.switch", title: "Choose a switch", required: true)
-                    }
-                    section ("...is...") {
-                        input(name: "switchStatus", type: "enum", title: "Status", options: ["On","Off"], required: true)
-                    }
-                    break
-
-                default:
-                    break
-            }
-        }
-    }
-}
-
-def ruleTypes() {
-	def types = []
-    types << "Mode"
-    types << "Time Period"
-    types << "Accumulated Flow"
-    types << "Continuous Flow"
-    types << "Water Valve Status"
-    //types << "Switch Status"
-    
-    return types
-}
-
-def actionTypes() {
-	def types = []
-    types << [name: "Switch", capability: "capabilty.switch"]
-    types << [name: "Water Valve", capability: "capability.valve"]
-    
-    return types
-}
-
-def deviceCommands(dev)
-{
-	def cmds = []
-	dev.supportedCommands.each { command ->
-    	cmds << command.name
-    }
-    
-    return cmds
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-	app.updateLabel("${ruleName ? ruleName : ""} - ${type}")
-    
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-	app.updateLabel("${ruleName ? ruleName : ""} - ${type}")
-
-	unsubscribe()
-	initialize()
-}
-
-def settings() {
-	def set = settings
-    if (set["dev"] != null)
-    {
-    	log.debug("dev set: ${set.dev}")
-    	set.dev = set.dev.id
-    }
-    if (set["valve"] != null)
-    {
-    	log.debug("valve set: ${set.valve}")
-    	set.valve = set.valve.id
-    }
-    log.debug(set)
-	return set
-}
-
-def devAction(action)
-{
-	if(dev)
-    {
-    	log.debug("device: ${dev}, action: ${action}")
-		dev."${action}"()
-    }
-}
-
-def isValveStatus(status)
-{
-	def result = false
-    log.debug("Water Valve ${valve} has status ${valve.currentState("contact").value}, compared to ${status.toLowerCase()}")
-	if(valve)
-    {
-    	if(valve.currentState("contact").value == status.toLowerCase())
-        {
-        	result = true
-        }
-    }
-    return result
-}
-
-def initialize() {
-	// TODO: subscribe to attributes, devices, locations, etc.
-}
-
-// TODO: implement event handlers