Merge pull request #2153 from SmartThingsCommunity/staging

Rolling up staging to production

devicetypes/plaidsystems/spruce-sensor.src/spruce-sensor.groovy

@@ -1,5 +1,5 @@
 /**
- *  Spruce Sensor -updated with SLP model number 5/2017
+ *  Spruce Sensor -Pre-release V2 10/8/2015
  *
  *  Copyright 2014 Plaid Systems
  *
@@ -14,33 +14,25 @@
  *
  -------10/20/2015 Updates--------
  -Fix/add battery reporting interval to update
- -remove polling and/or refresh
+ -remove polling and/or refresh(?)
- 
- -------5/2017 Updates--------
- -Add fingerprints for SLP
- -add device health, check every 60mins + 2mins
  */
- 
 metadata {
-	definition (name: "Spruce Sensor", namespace: "plaidsystems", author: "Plaid Systems") {
+	definition (name: "Spruce Sensor", namespace: "plaidsystems", author: "NCauffman") {
 		
 		capability "Configuration"
 		capability "Battery"
         capability "Relative Humidity Measurement"
         capability "Temperature Measurement"
         capability "Sensor"
-        capability "Health Check"
         //capability "Polling"
 		
         attribute "maxHum", "string"
         attribute "minHum", "string"        
         
-        
         command "resetHumidity"
         command "refresh"
         
-        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0402,0405", outClusters: "0003, 0019", manufacturer: "PLAID SYSTEMS", model: "PS-SPRZMS-01", deviceJoinName: "Spruce Sensor"
+        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0402,0405", outClusters: "0003, 0019", manufacturer: "PLAID SYSTEMS", model: "PS-SPRZMS-01"
-        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0402,0405", outClusters: "0003, 0019", manufacturer: "PLAID SYSTEMS", model: "PS-SPRZMS-SLP1", deviceJoinName: "Spruce Sensor"
 	}
 
 	preferences {
@@ -301,11 +293,6 @@ def setConfig(){
     sendEvent(name: 'configuration',value: configInterval, descriptionText: "Configuration initialized")
 }
 
-def installed(){
-	//check every 1 hour + 2mins
-    sendEvent(name: "checkInterval", value: 1 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-}
-
 //when device preferences are changed
 def updated(){	
     log.debug "device updated"
@@ -316,8 +303,6 @@ def updated(){
             sendEvent(name: 'configuration',value: 0, descriptionText: "Settings changed and will update at next report. Measure interval set to ${interval} mins")
     	}
     }
-    //check every 1 hour + 2mins
-    sendEvent(name: "checkInterval", value: 1 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 }
 
 //poll
@@ -410,4 +395,4 @@ private byte[] reverseArray(byte[] array) {
         i++;
     }
     return array
-}
+}

devicetypes/smartthings/aeon-multisensor-6.src/README.md

@@ -27,9 +27,13 @@ Works with:
 ## Device Health
 
 Aeon Labs MultiSensor 6 is polled by the hub.
-Aeon MultiSensor reports in once every hour.
+As of hubCore version 0.14.38 the hub sends up reports every 15 minutes regardless of whether the state changed.
+Device-Watch allows 2 check-in misses from device plus some lag time. So Check-in interval = (2*15 + 2)mins = 32 mins.
+Not to mention after going OFFLINE when the device is plugged back in, it might take a considerable amount of time for
+the device to appear as ONLINE again. This is because if this listening device does not respond to two poll requests in a row,
+it is not polled for 5 minutes by the hub. This can delay up the process of being marked ONLINE by quite some time.
 
-* __122min__ checkInterval
+* __32min__ checkInterval
 
 ## Troubleshooting
 

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

@@ -130,13 +130,13 @@ metadata {
 }
 
 def installed(){
-// Device-Watch simply pings if no device events received for 122min(checkInterval)
+// Device-Watch simply pings if no device events received for 32min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 }
 
 def updated() {
-// Device-Watch simply pings if no device events received for 122min(checkInterval)
+// Device-Watch simply pings if no device events received for 32min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 	log.debug "Updated with settings: ${settings}"
 	log.debug "${device.displayName} is now ${device.latestValue("powerSupply")}"
 

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

@@ -171,8 +171,8 @@ private Map getBatteryResult(rawValue) {
 			def pct = batteryMap[volts]
 			result.value = pct
 		} else {
-			def minVolts = 2.4
+			def minVolts = 2.1
-			def maxVolts = 2.7
+			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
 			def roundedPct = Math.round(pct * 100)
 			if (roundedPct <= 0)

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

@@ -274,7 +274,7 @@ private Map getBatteryResult(rawValue) {
 			result.value = pct
 		} else {
 			def minVolts = 2.1
-			def maxVolts = 2.7
+			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
 			def roundedPct = Math.round(pct * 100)
 			if (roundedPct <= 0)

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

@@ -15,9 +15,10 @@ metadata {
 	definition (name: "Z-Wave Thermostat", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Temperature Measurement"
+		capability "Relative Humidity Measurement"
 		capability "Thermostat"
 		capability "Configuration"
-		capability "Refresh"
+		capability "Polling"
 		capability "Sensor"
 		capability "Health Check"
 		
@@ -116,7 +117,7 @@ metadata {
 			state "cool", label:'${currentValue}° cool', backgroundColor:"#ffffff"
 		}
 		standardTile("refresh", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
-			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
+			state "default", action:"polling.poll", icon:"st.secondary.refresh"
 		}
 		main "temperature"
 		details(["temperature", "mode", "fanMode", "heatSliderControl", "heatingSetpoint", "coolSliderControl", "coolingSetpoint", "refresh"])
@@ -124,20 +125,13 @@ metadata {
 }
 
 def installed(){
-	sendHubCommand(new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSupportedGet().format()))
+	// Device-Watch simply pings if no device events received for 32min(checkInterval)
-	initialize()
+	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 }
 
 def updated(){
-	initialize()
-}
-
-def initialize() {
 	// Device-Watch simply pings if no device events received for 32min(checkInterval)
 	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-	unschedule()
-	runEvery5Minutes("refresh")
-	refresh()
 }
 
 def parse(String description)
@@ -155,7 +149,6 @@ def parse(String description)
 		]
 		if (map.name == "thermostatMode") {
 			state.lastTriedMode = map.value
-			map.data = [supportedThermostatModes:state.supportedThermostatModes]
 			if (map.value == "cool") {
 				map2.value = device.latestValue("coolingSetpoint")
 				log.info "THERMOSTAT, latest cooling setpoint = ${map2.value}"
@@ -179,7 +172,6 @@ def parse(String description)
 		}
 	} else if (map.name == "thermostatFanMode" && map.isStateChange) {
 		state.lastTriedFanMode = map.value
-		map.data = [supportedThermostatFanModes: state.supportedThermostatFanModes]
 	}
 	log.debug "Parse returned $result"
 	result
@@ -313,26 +305,26 @@ def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanMod
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeSupportedReport cmd) {
-	def supportedModes = []
+	def supportedModes = ""
-	if(cmd.off) { supportedModes << "off" }
+	if(cmd.off) { supportedModes += "off " }
-	if(cmd.heat) { supportedModes << "heat" }
+	if(cmd.heat) { supportedModes += "heat " }
-	if(cmd.cool) { supportedModes << "cool" }
+	if(cmd.auxiliaryemergencyHeat) { supportedModes += "emergency heat " }
-	if(cmd.auto) { supportedModes << "auto" }
+	if(cmd.cool) { supportedModes += "cool " }
-	if(cmd.auxiliaryemergencyHeat) { supportedModes << "emergency heat" }
+	if(cmd.auto) { supportedModes += "auto " }
 
-	state.supportedThermostatModes = supportedModes
+	state.supportedModes = supportedModes
-	sendEvent(name: "supportedThermostatModes", value: supportedModes, displayed: false)
+	// No events to be generated, return empty map
 	return [:]
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeSupportedReport cmd) {
-	def supportedFanModes = []
+	def supportedFanModes = ""
-	if(cmd.auto) { supportedFanModes << "auto" } // "fanAuto "
+	if(cmd.auto) { supportedFanModes += "auto " } // "fanAuto "
-	if(cmd.circulation) { supportedFanModes << "circulate" } // "fanCirculate"
+	if(cmd.low) { supportedFanModes += "on " } // "fanOn"
-	if(cmd.low) { supportedFanModes << "on" } // "fanOn"
+	if(cmd.circulation) { supportedFanModes += "circulate " } // "fanCirculate"
 
-	state.supportedThermostatFanModes = supportedFanModes
+	state.supportedFanModes = supportedFanModes
-	sendEvent(name: "supportedThermostatFanModes", value: supportedFanModes, displayed: false)
+	// No events to be generated, return empty map
 	return [:]
 }
 
@@ -345,17 +337,15 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 // Command Implementations
-def refresh() {
+def poll() {
-	def cmds = []
+	delayBetween([
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSupportedGet().format())
+		zwave.sensorMultilevelV3.sensorMultilevelGet().format(), // current temperature
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeSupportedGet().format())
+		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format(),
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeGet().format())
+		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format(),
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeGet().format())
+		zwave.thermostatModeV2.thermostatModeGet().format(),
-	cmds << new physicalgraph.device.HubAction(zwave.sensorMultilevelV2.sensorMultilevelGet().format()) // current temperature
+		zwave.thermostatFanModeV3.thermostatFanModeGet().format(),
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format())
+		zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format()
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format())
+	], 2300)
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format())
-	sendHubCommand(cmds)
 }
 
 def quickSetHeat(degrees) {
@@ -426,14 +416,28 @@ def ping() {
 	poll()
 }
 
+def configure() {
+	delayBetween([
+		zwave.thermostatModeV2.thermostatModeSupportedGet().format(),
+		zwave.thermostatFanModeV3.thermostatFanModeSupportedGet().format(),
+		zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]).format(),
+		zwave.sensorMultilevelV3.sensorMultilevelGet().format(), // current temperature
+		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format(),
+		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format(),
+		zwave.thermostatModeV2.thermostatModeGet().format(),
+		zwave.thermostatFanModeV3.thermostatFanModeGet().format(),
+		zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format()
+	], 2300)
+}
+
 def modes() {
-	return state.supportedThermostatModes
+	["off", "heat", "cool", "auto", "emergency heat"]
 }
 
 def switchMode() {
 	def currentMode = device.currentState("thermostatMode")?.value
-	def lastTriedMode = state.lastTriedMode ?: currentMode ?: ["off"]
+	def lastTriedMode = state.lastTriedMode ?: currentMode ?: "off"
-	def supportedModes = getDataByName("supportedThermostatModes")
+	def supportedModes = getDataByName("supportedModes")
 	def modeOrder = modes()
 	def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
 	def nextMode = next(lastTriedMode)
@@ -450,7 +454,7 @@ def switchMode() {
 }
 
 def switchToMode(nextMode) {
-	def supportedModes = getDataByName("supportedThermostatModes")
+	def supportedModes = getDataByName("supportedModes")
 	if(supportedModes && !supportedModes.contains(nextMode)) log.warn "thermostat mode '$nextMode' is not supported"
 	if (nextMode in modes()) {
 		state.lastTriedMode = nextMode
@@ -462,9 +466,9 @@ def switchToMode(nextMode) {
 
 def switchFanMode() {
 	def currentMode = device.currentState("thermostatFanMode")?.value
-	def lastTriedMode = state.lastTriedFanMode ?: currentMode ?: ["off"]
+	def lastTriedMode = state.lastTriedFanMode ?: currentMode ?: "off"
-	def supportedModes = getDataByName("supportedThermostatFanModes") ?: ["auto", "on"]
+	def supportedModes = getDataByName("supportedFanModes") ?: "auto on" // "fanAuto fanOn"
-	def modeOrder = state.supportedThermostatFanModes
+	def modeOrder = ["auto", "circulate", "on"]                 // "fanAuto", "fanCirculate", "fanOn"
 	def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
 	def nextMode = next(lastTriedMode)
 	while (!supportedModes?.contains(nextMode) && nextMode != "auto") { // "fanAuto"
@@ -474,7 +478,7 @@ def switchFanMode() {
 }
 
 def switchToFanMode(nextMode) {
-	def supportedFanModes = getDataByName("supportedThermostatFanModes")
+	def supportedFanModes = getDataByName("supportedFanModes")
 	if(supportedFanModes && !supportedFanModes.contains(nextMode)) log.warn "thermostat mode '$nextMode' is not supported"
 
 	def returnCommand

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

smartapps/smartthings/examples/every-element.src/every-element.groovy

@@ -202,8 +202,7 @@ def inputSelectionPage() {
 
         section("options variations") {
             paragraph "tap these elements and look at the differences when selecting an option"
-            input(type: "enum", name: "selectionSimple", title: "Simple options", description: "no separators in the selectable options", options: ["Thing 1", "Thing 2", "(Complicated) Thing 3"])
+            input(type: "enum", name: "selectionSimple", title: "Simple options", description: "no separators in the selectable options", groupedOptions: addGroup(englishOptions + spanishOptions))
-            input(type: "enum", name: "selectionSimpleGrouped", title: "Simple (Grouped) options", description: "no separators in the selectable options", groupedOptions: addGroup(englishOptions + spanishOptions))
             input(type: "enum", name: "selectionGrouped", title: "Grouped options", description: "separate groups of options with headers", groupedOptions: groupedOptions)
         }
 
@@ -215,15 +214,15 @@ def inputSelectionPage() {
 
         section("segmented") {
             paragraph "segmented should only work if there are either 2 or 3 options to choose from"
-            input(type: "enum", name: "selectionSegmented1", style: "segmented", title: "1 option", options: ["One"])
+            input(type: "enum", name: "selectionSegmented1", style: "segmented", title: "1 option", groupedOptions: addGroup(["One"]))
-            input(type: "enum", name: "selectionSegmented4", style: "segmented", title: "4 options", options: ["One", "Two", "Three", "Four"])
+            input(type: "enum", name: "selectionSegmented4", style: "segmented", title: "4 options", groupedOptions: addGroup(["One", "Two", "Three", "Four"]))
 
             paragraph "multiple and required will have no effect on segmented selection elements. There will always be exactly 1 option selected"
             input(type: "enum", name: "selectionSegmented2", style: "segmented", title: "2 options", options: ["One", "Two"])
             input(type: "enum", name: "selectionSegmented3", style: "segmented", title: "3 options", options: ["One", "Two", "Three"])
 
             paragraph "specifying defaultValue still works with segmented selection elements"
-            input(type: "enum", name: "selectionSegmentedWithDefault", style: "segmented", title: "defaulted to 'two'", options: ["One", "Two", "Three"], defaultValue: "Two")
+            input(type: "enum", name: "selectionSegmentedWithDefault", title: "defaulted to 'two'", groupedOptions: addGroup(["One", "Two", "Three"]), defaultValue: "Two")
         }
 
         section("required: true") {
@@ -232,8 +231,6 @@ def inputSelectionPage() {
 
         section("multiple: true") {
             input(type: "enum", name: "selectionMultiple", title: "This allows multiple selections", description: "It should look different when nothing is selected", groupedOptions: addGroup(["an option", "another option", "no way, one more?"]), multiple: true)
-            input(type: "enum", name: "selectionMultipleDefault1", title: "This allows multiple selections with a single default", description: "It should look different when nothing is selected", groupedOptions: addGroup(["an option", "another option", "no way, one more?"]), multiple: true, defaultValue: "an option")
-            input(type: "enum", name: "selectionMultipleDefault2", title: "This allows multiple selections with multiple defaults", description: "It should look different when nothing is selected", groupedOptions: addGroup(["an option", "another option", "no way, one more?"]), multiple: true, defaultValue: ["an option", "another option"])
         }
 
         section("with image") {

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

@@ -72,7 +72,7 @@ def authPage() {
 		log.debug "have LIFX access token"
 
 		def options = locationOptions() ?: []
-		def count = options.size().toString()
+		def count = options.size()
 
 		return dynamicPage(name:"Credentials", title:"", nextPage:"", install:true, uninstall: true) {
 			section("Select your location") {