MSA-2118: - For use with Flow Meter -

Leak Detector SmartApp allows uses to create custom rules for turning off their water and getting notifications from their flow meter. Catch a running toilet and turn off the water automatically. Detect leaky pipes and notify user of leak alert. 5 different trigger types: Continuous flow, accumulated flow, Mode, Time Period, Water Valve Status. Parent & Child app need to be installed as a pair (parent first).
Merge pull request #2168 from SmartThingsCommunity/staging
2026-03-14 13:11:52 +00:00 · 2017-07-20 08:36:31 -07:00 · 2017-07-18 12:24:01 -07:00 · 2017-07-17 15:45:19 -07:00 · 2017-07-14 14:37:45 -07:00 · 2017-07-14 11:39:48 -05:00
9 changed files with 618 additions and 501 deletions
--- a/devicetypes/redloro-smartthings/yamaha-zone.src/yamaha-zone.groovy
+++ b/devicetypes/redloro-smartthings/yamaha-zone.src/yamaha-zone.groovy
@@ -1,284 +0,0 @@
-/**
- *  SmartThings Device Handler: Yamaha Zone
- *
- *  Author: redloro@gmail.com
- *
- *  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: "Yamaha Zone", namespace: "redloro-smartthings", author: "redloro@gmail.com") {
-
-    /**
-     * List our capabilties. Doing so adds predefined command(s) which
-     * belong to the capability.
-     */
-    capability "Music Player"
-    capability "Switch"
-    capability "Switch Level"
-    capability "Refresh"
-    capability "Polling"
-    capability "Sensor"
-    capability "Actuator"
-
-    /**
-     * Define all commands, ie, if you have a custom action not
-     * covered by a capability, you NEED to define it here or
-     * the call will not be made.
-     *
-     * To call a capability function, just prefix it with the name
-     * of the capability, for example, refresh would be "refresh.refresh"
-     */
-    command "source0"
-    command "source1"
-    command "source2"
-    command "source3"
-    command "source4"
-    command "source5"
-    command "mutedOn"
-    command "mutedOff"
-    command "partyModeOn"
-    command "partyModeOff"
-    command "zone"
-  }
-
-  /**
-   * Define the various tiles and the states that they can be in.
-   * The 2nd parameter defines an event which the tile listens to,
-   * if received, it tries to map it to a state.
-   *
-   * You can also use ${currentValue} for the value of the event
-   * or ${name} for the name of the event. Just make SURE to use
-   * single quotes, otherwise it will only be interpreted at time of
-   * launch, instead of every time the event triggers.
-   */
-  tiles(scale: 2) {
-    multiAttributeTile(name:"state", type:"lighting", width:6, height:4) {
-      tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-        attributeState "on", label:'On', action:"switch.off", icon:"st.Electronics.electronics16", backgroundColor:"#79b821", nextState:"off"
-        attributeState "off", label:'Off', action:"switch.on", icon:"st.Electronics.electronics16", backgroundColor:"#ffffff", nextState:"on"
-      }
-      tileAttribute ("source", key: "SECONDARY_CONTROL") {
-        attributeState "source", label:'${currentValue}'
-      }
-    }
-
-    // row
-    //controlTile("volume", "device.volume", "slider", height: 1, width: 6, range:"(0..100)") {
-    controlTile("volume", "device.volume", "slider", height: 1, width: 6, range:"(-80..16)") {
-      state "volume", label: "Volume", action:"music Player.setLevel", backgroundColor:"#00a0dc"
-    }
-
-    // row
-    standardTile("0", "device.source0", decoration: "flat", width: 2, height: 2) {
-      state("off", label:"AV1", action:"source0", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff")
-      state("on", label:"AV1", action:"source0", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-green.png", backgroundColor:"#ffffff")
-    }
-    standardTile("1", "device.source1", decoration: "flat", width: 2, height: 2) {
-      state("off", label:"AV2", action:"source1", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff")
-      state("on", label:"AV2", action:"source1", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-green.png", backgroundColor:"#ffffff")
-    }
-    standardTile("2", "device.source2", decoration: "flat", width: 2, height: 2) {
-      state("off", label:"AV3", action:"source2", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff")
-      state("on", label:"AV3", action:"source2", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-green.png", backgroundColor:"#ffffff")
-    }
-    standardTile("3", "device.source3", decoration: "flat", width: 2, height: 2) {
-      state("off", label:"AV4", action:"source3", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff")
-      state("on", label:"AV4", action:"source3", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-green.png", backgroundColor:"#ffffff")
-    }
-    standardTile("4", "device.source4", decoration: "flat", width: 2, height: 2) {
-      state("off", label:"AV5", action:"source4", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff")
-      state("on", label:"AV5", action:"source4", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-green.png", backgroundColor:"#ffffff")
-    }
-    standardTile("5", "device.source5", decoration: "flat", width: 2, height: 2) {
-      state("off", label:"AV6", action:"source5", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff")
-      state("on", label:"AV6", action:"source5", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-green.png", backgroundColor:"#ffffff")
-    }
-
-    // row
-    standardTile("muted", "device.muted", decoration: "flat", width: 2, height: 2) {
-      state("off", label:'Muted', action:"mutedOn", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff", nextState:"on")
-      state("on", label:'Muted', action:"mutedOff", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-mute.png", backgroundColor:"#ffffff", nextState:"off")
-    }
-    standardTile("partyMode", "device.partyMode", decoration: "flat", width: 2, height: 2, inactiveLabel: false) {
-      state("off", label:'Party Mode', action:"partyModeOn", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-gray.png", backgroundColor:"#ffffff", nextState:"on")
-      state("on", label:'Party Mode', action:"partyModeOff", icon:"https://raw.githubusercontent.com/redloro/smartthings/master/images/indicator-dot-party.png", backgroundColor:"#ffffff", nextState:"off")
-    }
-    standardTile("refresh", "device.status", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
-      state "default", label:"Refresh", action:"refresh.refresh", icon:"st.secondary.refresh-icon", backgroundColor:"#ffffff"
-    }
-
-    // Defines which tile to show in the overview
-    main "state"
-
-    // Defines which tile(s) to show when user opens the detailed view
-    details([
-      "state",
-      "volume",
-      "0","1","2","3","4","5",
-      "muted", "partyMode","refresh"
-    ])
-  }
-
-  preferences {
-    input name: "source0", type: "text", title: "Source 1", defaultValue: "AV1"
-    input name: "source1", type: "text", title: "Source 2", defaultValue: "AV2"
-    input name: "source2", type: "text", title: "Source 3", defaultValue: "AV3"
-    input name: "source3", type: "text", title: "Source 4", defaultValue: "AV4"
-    input name: "source4", type: "text", title: "Source 5", defaultValue: "AV5"
-    input name: "source5", type: "text", title: "Source 6", defaultValue: "AV6"
-  }
-}
-
-/**************************************************************************
- * The following section simply maps the actions as defined in
- * the metadata into onAction() calls.
- *
- * This is preferred since some actions can be dealt with more
- * efficiently this way. Also keeps all user interaction code in
- * one place.
- *
- */
-def on() {
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><${getZone()}><Power_Control><Power>On</Power></Power_Control></${getZone()}></YAMAHA_AV>")
-  sendEvent(name: "switch", value: "on")
-}
-def off() {
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><${getZone()}><Power_Control><Power>Standby</Power></Power_Control></${getZone()}></YAMAHA_AV>")
-  sendEvent(name: "switch", value: "off")
-}
-def setLevel(value) {
-  //sendCommand("<YAMAHA_AV cmd=\"PUT\"><${getZone()}><Volume><Lvl><Val>${(Math.round(value * 9 / 5) * 5 - 800).intValue()}</Val><Exp>1</Exp><Unit>dB</Unit></Lvl></Volume></${getZone()}></YAMAHA_AV>")
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><${getZone()}><Volume><Lvl><Val>${(value * 10).intValue()}</Val><Exp>1</Exp><Unit>dB</Unit></Lvl></Volume></${getZone()}></YAMAHA_AV>")
-  sendEvent(name: "volume", value: value)
-}
-def source0() {
-  setSource(0)
-}
-def source1() {
-  setSource(1)
-}
-def source2() {
-  setSource(2)
-}
-def source3() {
-  setSource(3)
-}
-def source4() {
-  setSource(4)
-}
-def source5() {
-  setSource(5)
-}
-def mutedOn() {
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><${getZone()}><Volume><Mute>On</Mute></Volume></${getZone()}></YAMAHA_AV>")
-  sendEvent(name: "muted", value: "on")
-}
-def mutedOff() {
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><${getZone()}><Volume><Mute>Off</Mute></Volume></${getZone()}></YAMAHA_AV>")
-  sendEvent(name: "muted", value: "off")
-}
-def partyModeOn() {
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><System><Party_Mode><Mode>On</Mode></Party_Mode></System></YAMAHA_AV>")
-  sendEvent(name: "partyMode", value: "on")
-}
-def partyModeOff() {
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><System><Party_Mode><Mode>Off</Mode></Party_Mode></System></YAMAHA_AV>")
-  sendEvent(name: "partyMode", value: "off")
-}
-def refresh() {
-  sendCommand("<YAMAHA_AV cmd=\"GET\"><${getZone()}><Basic_Status>GetParam</Basic_Status></${getZone()}></YAMAHA_AV>")
-  sendCommand("<YAMAHA_AV cmd=\"GET\"><System><Party_Mode><Mode>GetParam</Mode></Party_Mode></System></YAMAHA_AV>")
-}
-/**************************************************************************/
-
-/**
- * Called every so often (every 5 minutes actually) to refresh the
- * tiles so the user gets the correct information.
- */
-def poll() {
-  refresh()
-}
-
-def parse(String description) {
-  return
-}
-
-def setSource(id) {
-  //log.debug "source: "+getSourceName(id)
-  sendCommand("<YAMAHA_AV cmd=\"PUT\"><${getZone()}><Input><Input_Sel>"+getSourceName(id)+"</Input_Sel></Input></${getZone()}></YAMAHA_AV>")
-  setSourceTile(getSourceName(id))
-}
-
-def getSourceName(id) {
-  if (settings) {
-    return settings."source${id}"
-  } else {
-    return ['AV1', 'AV2', 'AV3', 'AV4', 'AV5', 'AV6'].get(id)
-  }
-}
-
-def setSourceTile(name) {
-  sendEvent(name: "source", value: "Source: ${name}")
-  for (def i = 0; i < 6; i++) {
-    if (name == getSourceName(i)) {
-      sendEvent(name: "source${i}", value: "on")
-    }
-    else {
-      sendEvent(name: "source${i}", value: "off")
-    }
-  }
-}
-
-def zone(evt) {
-  /*
-  * Zone On/Off
-  */
-  if (evt.Basic_Status.Power_Control.Power.text()) {
-    sendEvent(name: "switch", value: (evt.Basic_Status.Power_Control.Power.text() == "On") ? "on" : "off")
-  }
-
-  /*
-  * Zone Volume
-  */
-  if (evt.Basic_Status.Volume.Lvl.Val.text()) {
-    def int volLevel = evt.Basic_Status.Volume.Lvl.Val.toInteger() ?: -250
-    //sendEvent(name: "volume", value: ((volLevel + 800) / 9).intValue())
-    sendEvent(name: "volume", value: (volLevel / 10).intValue())
-  }
-
-  /*
-  * Zone Muted
-  */
-  if (evt.Basic_Status.Volume.Mute.text()) {
-    sendEvent(name: "muted", value: (evt.Basic_Status.Volume.Mute.text() == "On") ? "on" : "off")
-  }
-
-  /*
-  * Zone Source
-  */
-  if (evt.Basic_Status.Input.Input_Sel.text()) {
-    setSourceTile(evt.Basic_Status.Input.Input_Sel.text())
-  }
-
-  /*
-  * Party Mode
-  */
-  if (evt.Party_Mode.Mode.text()) {
-    sendEvent(name: "partyMode", value: (evt.Party_Mode.Mode.text() == "On") ? "on" : "off")
-  }
-}
-
-private sendCommand(body) {
-  parent.sendCommand(body)
-}
-
-private getZone() {
-  return new String(device.deviceNetworkId).tokenize('|')[2]
-}
--- a/devicetypes/smartthings/aeon-multisensor-6.src/README.md
+++ b/devicetypes/smartthings/aeon-multisensor-6.src/README.md
@@ -27,13 +27,9 @@ Works with:
 ## Device Health

 Aeon Labs MultiSensor 6 is polled by the hub.
-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.
+Aeon MultiSensor reports in once every hour.

-* __32min__ checkInterval
+* __122min__ checkInterval

 ## Troubleshooting

--- a/devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy
+++ b/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 32min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+// Device-Watch simply pings if no device events received for 122min(checkInterval)
+	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 }

 def updated() {
-// 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])
+// Device-Watch simply pings if no device events received for 122min(checkInterval)
+	sendEvent(name: "checkInterval", value: 2 * 60 * 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")}"

--- a/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
+++ b/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.1
-			def maxVolts = 3.0
+			def minVolts = 2.4
+			def maxVolts = 2.7
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
 			def roundedPct = Math.round(pct * 100)
 			if (roundedPct <= 0)
--- a/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
+++ b/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 = 3.0
+			def maxVolts = 2.7
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
 			def roundedPct = Math.round(pct * 100)
 			if (roundedPct <= 0)
--- a/devicetypes/smartthings/zwave-thermostat.src/zwave-thermostat.groovy
+++ b/devicetypes/smartthings/zwave-thermostat.src/zwave-thermostat.groovy
@@ -15,10 +15,9 @@ metadata {
 	definition (name: "Z-Wave Thermostat", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Temperature Measurement"
-		capability "Relative Humidity Measurement"
 		capability "Thermostat"
 		capability "Configuration"
-		capability "Polling"
+		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
 		
@@ -117,7 +116,7 @@ metadata {
 			state "cool", label:'${currentValue}° cool', backgroundColor:"#ffffff"
 		}
 		standardTile("refresh", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
-			state "default", action:"polling.poll", icon:"st.secondary.refresh"
+			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 		main "temperature"
 		details(["temperature", "mode", "fanMode", "heatSliderControl", "heatingSetpoint", "coolSliderControl", "coolingSetpoint", "refresh"])
@@ -125,13 +124,20 @@ metadata {
 }

 def installed(){
-	// 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])
+	sendHubCommand(new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSupportedGet().format()))
+	initialize()
 }

 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)
@@ -149,6 +155,7 @@ 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}"
@@ -172,6 +179,7 @@ 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
@@ -305,26 +313,26 @@ def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanMod
 }

 def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeSupportedReport cmd) {
-	def supportedModes = ""
-	if(cmd.off) { supportedModes += "off " }
-	if(cmd.heat) { supportedModes += "heat " }
-	if(cmd.auxiliaryemergencyHeat) { supportedModes += "emergency heat " }
-	if(cmd.cool) { supportedModes += "cool " }
-	if(cmd.auto) { supportedModes += "auto " }
+	def supportedModes = []
+	if(cmd.off) { supportedModes << "off" }
+	if(cmd.heat) { supportedModes << "heat" }
+	if(cmd.cool) { supportedModes << "cool" }
+	if(cmd.auto) { supportedModes << "auto" }
+	if(cmd.auxiliaryemergencyHeat) { supportedModes << "emergency heat" }

-	state.supportedModes = supportedModes
-	// No events to be generated, return empty map
+	state.supportedThermostatModes = supportedModes
+	sendEvent(name: "supportedThermostatModes", value: supportedModes, displayed: false)
 	return [:]
 }

 def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeSupportedReport cmd) {
-	def supportedFanModes = ""
-	if(cmd.auto) { supportedFanModes += "auto " } // "fanAuto "
-	if(cmd.low) { supportedFanModes += "on " } // "fanOn"
-	if(cmd.circulation) { supportedFanModes += "circulate " } // "fanCirculate"
+	def supportedFanModes = []
+	if(cmd.auto) { supportedFanModes << "auto" } // "fanAuto "
+	if(cmd.circulation) { supportedFanModes << "circulate" } // "fanCirculate"
+	if(cmd.low) { supportedFanModes << "on" } // "fanOn"

-	state.supportedFanModes = supportedFanModes
-	// No events to be generated, return empty map
+	state.supportedThermostatFanModes = supportedFanModes
+	sendEvent(name: "supportedThermostatFanModes", value: supportedFanModes, displayed: false)
 	return [:]
 }

@@ -337,15 +345,17 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }

 // Command Implementations
-def poll() {
-	delayBetween([
-		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 refresh() {
+	def cmds = []
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSupportedGet().format())
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeSupportedGet().format())
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeGet().format())
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeGet().format())
+	cmds << new physicalgraph.device.HubAction(zwave.sensorMultilevelV2.sensorMultilevelGet().format()) // current temperature
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format())
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format())
+	cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format())
+	sendHubCommand(cmds)
 }

 def quickSetHeat(degrees) {
@@ -416,28 +426,14 @@ 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() {
-	["off", "heat", "cool", "auto", "emergency heat"]
+	return state.supportedThermostatModes
 }

 def switchMode() {
 	def currentMode = device.currentState("thermostatMode")?.value
-	def lastTriedMode = state.lastTriedMode ?: currentMode ?: "off"
-	def supportedModes = getDataByName("supportedModes")
+	def lastTriedMode = state.lastTriedMode ?: currentMode ?: ["off"]
+	def supportedModes = getDataByName("supportedThermostatModes")
 	def modeOrder = modes()
 	def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
 	def nextMode = next(lastTriedMode)
@@ -454,7 +450,7 @@ def switchMode() {
 }

 def switchToMode(nextMode) {
-	def supportedModes = getDataByName("supportedModes")
+	def supportedModes = getDataByName("supportedThermostatModes")
 	if(supportedModes && !supportedModes.contains(nextMode)) log.warn "thermostat mode '$nextMode' is not supported"
 	if (nextMode in modes()) {
 		state.lastTriedMode = nextMode
@@ -466,9 +462,9 @@ def switchToMode(nextMode) {

 def switchFanMode() {
 	def currentMode = device.currentState("thermostatFanMode")?.value
-	def lastTriedMode = state.lastTriedFanMode ?: currentMode ?: "off"
-	def supportedModes = getDataByName("supportedFanModes") ?: "auto on" // "fanAuto fanOn"
-	def modeOrder = ["auto", "circulate", "on"]                 // "fanAuto", "fanCirculate", "fanOn"
+	def lastTriedMode = state.lastTriedFanMode ?: currentMode ?: ["off"]
+	def supportedModes = getDataByName("supportedThermostatFanModes") ?: ["auto", "on"]
+	def modeOrder = state.supportedThermostatFanModes
 	def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
 	def nextMode = next(lastTriedMode)
 	while (!supportedModes?.contains(nextMode) && nextMode != "auto") { // "fanAuto"
@@ -478,7 +474,7 @@ def switchFanMode() {
 }

 def switchToFanMode(nextMode) {
-	def supportedFanModes = getDataByName("supportedFanModes")
+	def supportedFanModes = getDataByName("supportedThermostatFanModes")
 	if(supportedFanModes && !supportedFanModes.contains(nextMode)) log.warn "thermostat mode '$nextMode' is not supported"

 	def returnCommand
--- a/smartapps/fortrezz/fortrezz-leak-detector.src/fortrezz-leak-detector.groovy
+++ b/smartapps/fortrezz/fortrezz-leak-detector.src/fortrezz-leak-detector.groovy
@@ -0,0 +1,320 @@
+/**
+ *  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
+}
--- a/smartapps/fortrezz/leak-detector.src/leak-detector.groovy
+++ b/smartapps/fortrezz/leak-detector.src/leak-detector.groovy
@@ -0,0 +1,243 @@
+/**
+ *  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
--- a/smartapps/redloro-smartthings/yamaha-receiver.src/yamaha-receiver.groovy
+++ b/smartapps/redloro-smartthings/yamaha-receiver.src/yamaha-receiver.groovy
@@ -1,154 +0,0 @@
-/**
- *  SmartThings SmartApp: Yamaha Network Receiver
- *
- *  Author: redloro@gmail.com
- *
- *  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.
- *
- *  https://github.com/PSeitz/yamaha-nodejs
- *  http://<RECEIVER_IP_ADDRESS>/YamahaRemoteControl/desc.xml
- */
-import groovy.util.XmlSlurper
-
-definition(
-  name: "Yamaha Receiver",
-  namespace: "redloro-smartthings",
-  author: "redloro@gmail.com",
-  description: "Yamaha SmartApp",
-  category: "My Apps",
-  iconUrl: "https://raw.githubusercontent.com/redloro/smartthings/master/images/yamaha-receiver.png",
-  iconX2Url: "https://raw.githubusercontent.com/redloro/smartthings/master/images/yamaha-receiver.png",
-  iconX3Url: "https://raw.githubusercontent.com/redloro/smartthings/master/images/yamaha-receiver.png"
-)
-
-preferences {
-  section("SmartThings Hub") {
-    input "hostHub", "hub", title: "Select Hub", multiple: false, required: true
-  }
-  section("Yamaha Receiver") {
-    input name: "receiverName", type: "text", title: "Name", required: true, defaultValue: "Yamaha"
-    input name: "receiverIp", type: "text", title: "IP", required: true
-    input name: "receiverZones", type: "enum", title: "Zones", required: true, multiple: true, options: ["Main_Zone","Zone_B","Zone_2","Zone_3","Zone_4"]
-  }
-}
-
-def installed() {
-  subscribeToEvents()
-}
-
-def subscribeToEvents() {
-  subscribe(location, null, lanResponseHandler, [filterEvents:false])
-}
-
-def updated() {
-  addChildDevices()
-}
-
-def uninstalled() {
-  removeChildDevices()
-}
-
-def lanResponseHandler(evt) {
-  def map = stringToMap(evt.stringValue)
-
-  //verify that this message is from Yamaha Receiver IP
-  if (!map.ip || map.ip != convertIPtoHex(settings.receiverIp)) {
-    return
-  }
-
-  def headers = getHttpHeaders(map.headers);
-  def body = getHttpBody(map.body);
-  //log.trace "Headers: ${headers}"
-  //log.trace "Body: ${body}"
-
-  updateZoneDevices(body.children()[0])
-}
-
-private updateZoneDevices(evt) {
-  //log.debug "updateZoneDevices: ${evt.toString()}"
-  if (evt.name() == "System") {
-    //log.debug "Update all zones"
-    childDevices*.zone(evt)
-    return
-  }
-
-  def zonedevice = getChildDevice(getDeviceId(evt.name()))
-  if (zonedevice) {
-    zonedevice.zone(evt)
-  }
-
-  //check for Zone_B
-  zonedevice = getChildDevice(getDeviceId("Zone_B"))
-  if (zonedevice && evt.name() == "Main_Zone") {
-    zonedevice.zone(evt)
-  }
-}
-
-private addChildDevices() {
-  // add yamaha device
-  settings.receiverZones.each {
-    def deviceId = getDeviceId(it)
-    if (!getChildDevice(deviceId)) {
-      addChildDevice("redloro-smartthings", "Yamaha Zone", deviceId, hostHub.id, ["name": it, label: "${settings.receiverName}: ${it}", completedSetup: true])
-      log.debug "Added Yamaha zone: ${deviceId}"
-    }
-  }
-
-  childDevices*.refresh()
-}
-
-private removeChildDevices() {
-  getAllChildDevices().each { deleteChildDevice(it.deviceNetworkId) }
-}
-
-private sendCommand(body) {
-  //log.debug "Yamaha Network Receiver send command: ${body}"
-
-  def hubAction = new physicalgraph.device.HubAction(
-      headers: [HOST: getReceiverAddress()],
-      method: "POST",
-      path: "/YamahaRemoteControl/ctrl",
-      body: body
-  )
-  sendHubCommand(hubAction)
-}
-
-private getHttpHeaders(headers) {
-  def obj = [:]
-  new String(headers.decodeBase64()).split("\r\n").each {param ->
-    def nameAndValue = param.split(":")
-    obj[nameAndValue[0]] = (nameAndValue.length == 1) ? "" : nameAndValue[1].trim()
-  }
-  return obj
-}
-
-private getHttpBody(body) {
-  def obj = null;
-  if (body) {
-    obj = new XmlSlurper().parseText(new String(body.decodeBase64()))
-  }
-  return obj
-}
-
-private getDeviceId(zone) {
-  return "yamaha|${settings.receiverIp}|${zone}"
-}
-
-private getReceiverAddress() {
-  return settings.receiverIp + ":80"
-}
-
-private String convertIPtoHex(ipAddress) {
-  return ipAddress.tokenize( '.' ).collect {  String.format( '%02x', it.toInteger() ) }.join().toUpperCase()
-}
-
-private String convertPortToHex(port) {
-  return port.toString().format( '%04x', port.toInteger() ).toUpperCase()
-}
Author	SHA1	Message	Date
Fortrezz	4ca07ce9db	MSA-2118: - For use with Flow Meter - Leak Detector SmartApp allows uses to create custom rules for turning off their water and getting notifications from their flow meter. Catch a running toilet and turn off the water automatically. Detect leaky pipes and notify user of leak alert. 5 different trigger types: Continuous flow, accumulated flow, Mode, Time Period, Water Valve Status. Parent & Child app need to be installed as a pair (parent first).	2017-07-20 08:36:31 -07:00
Vinay Rao	de5f0683d3	Merge pull request #2168 from SmartThingsCommunity/staging Rolling down staging to master	2017-07-18 12:24:01 -07:00
Vinay Rao	36e63133fc	Merge pull request #2146 from marstorp/icp1148HoneywellZwave ICP-1148 Support Thermostat Dynamic data	2017-07-17 15:45:19 -07:00
Vinay Rao	838c466312	Merge pull request #2158 from varzac/smartsense-battery-updates [DVCSMP-2811] Update ranges for centralite battery values	2017-07-14 14:37:45 -07:00
Zach Varberg	97bfe61baa	Update ranges for centralite battery values This just updates the range to be more conservative as well as match the battery curve better.	2017-07-14 11:39:48 -05:00
Vinay Rao	34df40d5b4	Merge pull request #2155 from jackchi/health-aeon6 [DHF-24] Fix Aeon MultiSensor6 OFFLINE issue	2017-07-12 14:29:03 -07:00
jackchi	545be046f0	[DHF-24] Update Aeon Multi6 to 2hr2min	2017-07-11 17:05:42 -07:00
Vinay Rao	a5041e0fcb	Merge pull request #2154 from SmartThingsCommunity/master Rolling up staging to master	2017-07-11 14:03:19 -07:00
marstorp	771926c337	ICP-1148 Support Thermostat Dynamic data Adding support for dynamic thermostat and fan modes to TCC DTH. Also replaced capability "Polling" with "Refresh" and runEvery5Minutes("refresh") as polling capability is unreliable. Also removed capability "Relative Humidity Measurement" as Honeywell Z-Wave Thermostat (YTH8320ZW1007/U) doesn't support humidity.	2017-07-05 16:50:30 -07:00