MSA-1998: ZWave Thermostat Manager

Merge pull request #2026 from unixbeast/DVCSMP-2672
DVCSMP-2672 updating read attribute for valve capability
2026-03-09 13:21:53 +00:00 · 2017-05-22 19:34:20 -07:00 · 2017-05-22 17:59:00 -07:00 · 2017-05-22 17:57:54 -07:00 · 2017-05-22 17:44:28 -07:00 · 2017-05-22 15:23:57 -07:00
30 changed files with 1064 additions and 802 deletions
--- a/devicetypes/classicgod/fibaro-wall-plug-zw5.src/fibaro-wall-plug-zw5.groovy
+++ b/devicetypes/classicgod/fibaro-wall-plug-zw5.src/fibaro-wall-plug-zw5.groovy
@@ -1,735 +0,0 @@
-/**
-
- *  Fibaro Wall Plug ZW5
-
- *  Requires: Fibaro Double Switch 2 Child Device
-
- *
-
- *  Copyright 2017 Artur Draga
-
- *
-
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-
- *  in compliance with the License. You may obtain a copy of the License at:
-
- *
-
- *	  http://www.apache.org/licenses/LICENSE-2.0
-
- *
-
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
-
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
-
- *  for the specific language governing permissions and limitations under the License.
-
- *
-
- */
-
-metadata {
-
-	definition (name: "Fibaro Wall Plug ZW5", namespace: "ClassicGOD", author: "Artur Draga") {
-
-		capability "Switch"
-
-		capability "Energy Meter"
-
-		capability "Power Meter"
-
-		capability "Configuration"
-
-		capability "Health Check"
-
-
-
-		command "reset"
-
-		command "refresh"
-
-
-
-		fingerprint deviceId: "0x1001", inClusters:"0x5E,0x22,0x59,0x56,0x7A,0x32,0x71,0x73,0x98,0x31,0x85,0x70,0x72,0x5A,0x8E,0x25,0x86"
-
-		fingerprint deviceId: "0x1001", inClusters:"0x5E,0x22,0x59,0x56,0x7A,0x32,0x71,0x73,0x31,0x85,0x70,0x72,0x5A,0x8E,0x25,0x86"
-
-	}
-
-
-
-	tiles (scale: 2) {
-
-		multiAttributeTile(name:"switch", type: "lighting", width: 3, height: 4, canChangeIcon: true){
-
-			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-
-				attributeState "off", label: 'Off', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState:"turningOn"
-
-				attributeState "on", label: 'On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00a0dc", nextState:"turningOff"
-
-				attributeState "turningOn", label:'Turning On', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00a0dc", nextState:"turningOff"
-
-				attributeState "turningOff", label:'Turning Off', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
-
-			}
-
-			tileAttribute("device.combinedMeter", key:"SECONDARY_CONTROL") {
-
-				attributeState("combinedMeter", label:'${currentValue}')
-
-			} 
-
-		}
-
-		valueTile("power", "device.power", decoration: "flat", width: 2, height: 2) {
-
-			state "power", label:'${currentValue}\nW', action:"refresh"
-
-		}
-
-		valueTile("energy", "device.energy", decoration: "flat", width: 2, height: 2) {
-
-			state "energy", label:'${currentValue}\nkWh', action:"refresh"
-
-		}
-
-		valueTile("reset", "device.energy", decoration: "flat", width: 2, height: 2) {
-
-			state "reset", label:'reset\nkWh', action:"reset"
-
-		}
-
-	}
-
-
-
-	preferences {
-
-		input ( name: "logging", title: "Logging", type: "boolean", required: false )
-
-		parameterMap().each {
-
-			input (
-
-				name: it.key,
-
-				title: "${it.num}. ${it.title}",
-
-				description: it.descr,
-
-				type: it.type,
-
-				options: it.options,
-
-				range: (it.min != null && it.max != null) ? "${it.min}..${it.max}" : null,
-
-				defaultValue: it.def,
-
-				required: false
-
-			)
-
-		}
-
-	}
-
-}
-
-
-
-//UI and tile functions
-
-def on() {
-
-	encap(zwave.basicV1.basicSet(value: 255))
-
-}
-
-
-
-def off() {
-
-	encap(zwave.basicV1.basicSet(value: 0))
-
-}
-
-
-
-def reset() {
-
-	def cmds = []
-
-	cmds << zwave.meterV3.meterReset()
-
-	cmds << zwave.meterV3.meterGet(scale: 0)
-
-	cmds << zwave.meterV3.meterGet(scale: 2)
-
-	encapSequence(cmds,1000)
-
-}
-
-
-
-def refresh() {
-
-	def cmds = []
-
-	cmds << zwave.meterV3.meterGet(scale: 0)
-
-	cmds << zwave.meterV3.meterGet(scale: 2)
-
-	cmds << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 4)
-
-	encapSequence(cmds,1000)
-
-}
-
-
-
-//Configuration and synchronization
-
-def updated() {
-
-	if ( state.lastUpdated && (now() - state.lastUpdated) < 500 ) return
-
-	def cmds = []
-
-	logging("${device.displayName} - Executing updated()","info")
-
-	
-
-	def Integer cmdCount = 0
-
-	parameterMap().each {
-
-		if(settings."$it.key" != null) {
-
-			if (state."$it.key" == null) { state."$it.key" = [value: null, state: "synced"] }
-
-			if (state."$it.key".value != settings."$it.key" as Integer || state."$it.key".state == "notSynced") {
-
-				state."$it.key".value = settings."$it.key" as Integer
-
-				state."$it.key".state = "notSynced"
-
-				cmds << zwave.configurationV2.configurationSet(configurationValue: intToParam(state."$it.key".value, it.size), parameterNumber: it.num, size: it.size)
-
-				cmds << zwave.configurationV2.configurationGet(parameterNumber: it.num)
-
-				cmdCount = cmdCount + 1
-
-			}
-
-		}
-
-	}
-
-	
-
-	if ( cmdCount > 0 ) { 
-
-		logging("${device.displayName} - sending config.", "info")
-
-		sendEvent(name: "combinedMeter", value: "SYNC IN PROGRESS.", displayed: false)
-
-		runIn((5+cmdCount*2), syncCheck)
-
-	}
-
-	
-
-	state.lastUpdated = now()
-
-	if (cmds) { response(encapSequence(cmds,1000)) }
-
-}
-
-
-
-def syncCheck() {
-
-	logging("${device.displayName} - Executing syncCheck()","info")
-
-	def Integer count = 0
-
-	if (device.currentValue("combinedMeter")?.contains("SYNC") && device.currentValue("combinedMeter") != "SYNC OK.") {
-
-		parameterMap().each {
-
-			if (state."$it.key".state == "notSynced" ) {
-
-				count = count + 1
-
-			} 
-
-		}
-
-	}
-
-	if (count == 0) {
-
-		logging("${device.displayName} - Sync Complete","info")
-
-		sendEvent(name: "combinedMeter", value: "SYNC OK.", displayed: false)
-
-	} else {
-
-		logging("${device.displayName} Sync Incomplete","info")
-
-		if (device.currentValue("combinedMeter") != "SYNC FAILED!") {
-
-			sendEvent(name: "combinedMeter", value: "SYNC INCOMPLETE.", displayed: false)
-
-		}
-
-	}
-
-}
-
-
-
-//event handlers related to configuration and sync
-
-def zwaveEvent(physicalgraph.zwave.commands.configurationv2.ConfigurationReport cmd) {
-
-	def paramKey = parameterMap().find( {it.num == cmd.parameterNumber } ).key
-
-	logging("${device.displayName} - Parameter ${paramKey} value is ${cmd.scaledConfigurationValue} expected " + state."$paramKey".value, "info")
-
-	if (state."$paramKey".value == cmd.scaledConfigurationValue) {
-
-		state."$paramKey".state = "synced"
-
-	}
-
-}
-
-
-
-def zwaveEvent(physicalgraph.zwave.commands.applicationstatusv1.ApplicationRejectedRequest cmd) {
-
-	logging("${device.displayName} - rejected request!","warn")
-
-	if (device.currentValue("combinedMeter") == "SYNC IN PROGRESS.") { 
-
-		sendEvent(name: "combinedMeter", value: "SYNC FAILED!", displayed: false)
-
-	}
-
-}
-
-
-
-//event handlers
-
-def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
-
-	//ignore
-
-}
-
-
-
-def zwaveEvent(physicalgraph.zwave.commands.switchbinaryv1.SwitchBinaryReport cmd) {
-
-	logging("${device.displayName} - SwitchBinaryReport received, value: ${cmd.value}","info")
-
-	sendEvent([name: "switch", value: (cmd.value == 0 ) ? "off": "on"])
-
-}
-
-
-
-def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelReport cmd) {
-
-	logging("${device.displayName} - SensorMultilevelReport received, value: ${cmd.scaledSensorValue} scale: ${cmd.scale}","info")
-
-	if (cmd.sensorType == 4) { 
-
-		sendEvent([name: "power", value: cmd.scaledSensorValue, unit: "W"]) 
-
-		updateCombinedMeter()
-
-	}
-
-}
-
-
-
-def zwaveEvent(physicalgraph.zwave.commands.meterv3.MeterReport cmd) {
-
-	logging("${device.displayName} - MeterReport received, value: ${cmd.scaledMeterValue} scale: ${cmd.scale}","info")
-
-	switch (cmd.scale) {
-
-		case 0:
-
-			sendEvent([name: "energy", value: cmd.scaledMeterValue, unit: "kWh"])
-
-			break
-
-		case 2:
-
-			sendEvent([name: "power", value: cmd.scaledMeterValue, unit: "W"])
-
-			break
-
-	}
-
-	updateCombinedMeter()
-
-}
-
-
-
-//other
-
-private updateCombinedMeter() {
-
-	if (!device.currentValue("combinedMeter")?.contains("SYNC") || device.currentValue("combinedMeter") == "SYNC OK." || device.currentValue("combinedMeter") == null ) {
-
-		sendEvent([name: "combinedMeter", value: "${device.currentValue("power")} W / ${device.currentValue("energy")} kWh", displayed: false])
-
-	}
-
-}
-
-
-
-/*
-
-####################
-
-## Z-Wave Toolkit ##
-
-####################
-
-*/
-
-def parse(String description) {	  
-
-	def result = []
-
-	logging("${device.displayName} - Parsing: ${description}")
-
-	if (description.startsWith("Err 106")) {
-
-		result = createEvent(
-
-			descriptionText: "Failed to complete the network security key exchange. If you are unable to receive data from it, you must remove it from your network and add it again.",
-
-			eventType: "ALERT",
-
-			name: "secureInclusion",
-
-			value: "failed",
-
-			displayed: true,
-
-		)
-
-	} else if (description == "updated") {
-
-		return null
-
-	} else {
-
-		def cmd = zwave.parse(description, cmdVersions()) 
-
-		if (cmd) {
-
-			logging("${device.displayName} - Parsed: ${cmd}")
-
-			zwaveEvent(cmd)
-
-		}
-
-	}
-
-}
-
-
-
-def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulation cmd) {
-
-	def encapsulatedCommand = cmd.encapsulatedCommand(cmdVersions()) 
-
-	if (encapsulatedCommand) {
-
-		logging("${device.displayName} - Parsed SecurityMessageEncapsulation into: ${encapsulatedCommand}")
-
-		zwaveEvent(encapsulatedCommand)
-
-	} else {
-
-		log.warn "Unable to extract secure cmd from $cmd"
-
-		createEvent(descriptionText: cmd.toString())
-
-	}
-
-}
-
-
-
-def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
-
-	def version = cmdVersions()[cmd.commandClass as Integer]
-
-	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
-
-	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
-
-	if (!encapsulatedCommand) {
-
-		log.warn "Could not extract crc16 command from $cmd"
-
-	} else {
-
-		logging("${device.displayName} - Parsed Crc16Encap into: ${encapsulatedCommand}")
-
-		zwaveEvent(encapsulatedCommand)
-
-	}
-
-}
-
-
-
-def zwaveEvent(physicalgraph.zwave.commands.multichannelv3.MultiChannelCmdEncap cmd) {
-
-	def encapsulatedCommand = cmd.encapsulatedCommand(cmdVersions())
-
-	if (encapsulatedCommand) {
-
-		logging("${device.displayName} - Parsed MultiChannelCmdEncap ${encapsulatedCommand}")
-
-		zwaveEvent(encapsulatedCommand, cmd.sourceEndPoint as Integer)
-
-	}
-
-}
-
-
-
-
-
-private logging(text, type = "debug") {
-
-	if (settings.logging == "true") {
-
-		log."$type" text
-
-	}
-
-}
-
-
-
-private secEncap(physicalgraph.zwave.Command cmd) {
-
-	logging("${device.displayName} - encapsulating command using Secure Encapsulation, command: $cmd","info")
-
-	zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
-
-}
-
-
-
-private crcEncap(physicalgraph.zwave.Command cmd) {
-
-		logging("${device.displayName} - encapsulating command using CRC16 Encapsulation, command: $cmd","info")
-
-		zwave.crc16EncapV1.crc16Encap().encapsulate(cmd).format() // doesn't work righ now because SmartThings...
-
-		//"5601${cmd.format()}0000"
-
-}
-
-
-
-private multiEncap(physicalgraph.zwave.Command cmd, Integer ep) {
-
-	logging("${device.displayName} - encapsulating command using Multi Channel Encapsulation, ep: $ep command: $cmd","info")
-
-	zwave.multiChannelV3.multiChannelCmdEncap(destinationEndPoint:ep).encapsulate(cmd)
-
-}
-
-
-
-private encap(physicalgraph.zwave.Command cmd) {
-
-	if (zwaveInfo.zw.contains("s")) { 
-
-		secEncap(cmd)
-
-	} else if (zwaveInfo.cc.contains("56")){ 
-
-		crcEncap(cmd)
-
-	} else {
-
-		logging("${device.displayName} - no encapsulation supported for command: $cmd","info")
-
-		cmd.format()
-
-	}
-
-}
-
-
-
-private encap(physicalgraph.zwave.Command cmd, Integer ep) {
-
-	encap(multiEncap(cmd, ep))
-
-}
-
-
-
-private encap(List encapList) {
-
-	encap(encapList[0], encapList[1])
-
-}
-
-
-
-private encap(Map encapMap) {
-
-	encap(encapMap.cmd, encapMap.ep)
-
-}
-
-
-
-private encapSequence(cmds, Integer delay=250) {
-
-	delayBetween(cmds.collect{ encap(it) }, delay)
-
-}
-
-
-
-private encapSequence(cmds, Integer delay, Integer ep) {
-
-	delayBetween(cmds.collect{ encap(it, ep) }, delay)
-
-}
-
-
-
-private List intToParam(Long value, Integer size = 1) {
-
-	def result = []
-
-	size.times { 
-
-		result = result.plus(0, (value & 0xFF) as Short)
-
-		value = (value >> 8)
-
-	}
-
-	return result
-
-}
-
-/*
-
-##########################
-
-## Device Configuration ##
-
-##########################
-
-*/
-
-private Map cmdVersions() {
-
-	//[0x5E: 2, 0x59: 1, 0x80: 1, 0x56: 1, 0x7A: 3, 0x73: 1, 0x98: 1, 0x22: 1, 0x85: 2, 0x5B: 1, 0x70: 2, 0x8E: 2, 0x86: 2, 0x84: 2, 0x75: 2, 0x72: 2] //Fibaro KeyFob
-
-	//[0x5E: 2, 0x86: 1, 0x72: 2, 0x59: 1, 0x80: 1, 0x73: 1, 0x56: 1, 0x22: 1, 0x31: 5, 0x98: 1, 0x7A: 3, 0x20: 1, 0x5A: 1, 0x85: 2, 0x84: 2, 0x71: 3, 0x8E: 2, 0x70: 2, 0x30: 1, 0x9C: 1] //Fibaro Motion Sensor ZW5
-
-	//[0x5E: 2, 0x86: 1, 0x72: 1, 0x59: 1, 0x73: 1, 0x22: 1, 0x56: 1, 0x32: 3, 0x71: 1, 0x98: 1, 0x7A: 1, 0x25: 1, 0x5A: 1, 0x85: 2, 0x70: 2, 0x8E: 2, 0x60: 3, 0x75: 1, 0x5B: 1] //Fibaro Double Switch 2
-
-	[0x5E: 2, 0x22: 1, 0x59: 1, 0x56: 1, 0x7A: 1, 0x32: 3, 0x71: 1, 0x73: 1, 0x98: 1, 0x31: 5, 0x85: 2, 0x70: 2, 0x72: 2, 0x5A: 1, 0x8E: 2, 0x25: 1, 0x86: 2] //Fibaro Wall Plug ZW5
-
-}
-
-
-
-private parameterMap() {[
-
-	[key: "alwaysActive", num: 1, size: 1, type: "enum", options: [0: "0 - inactive", 1: "1 - activated"], def: "0", title: "Always on function", descr: null],
-
-	[key: "restoreState", num: 2, size: 1, type: "enum", options: [0: "0 - power off after power failure", 1: "1 - restore state"], def: "1", title: "Restore state after power failure", descr: null],
-
-	[key: "overloadSafety", num: 3, size: 2, type: "number", def: 0, min: 0, max: 30000 , title: "Overload safety switch", descr: null],
-
-	[key: "immediatePowerReports", num: 10, size: 1, type: "number", def: 80, min: 1, max: 100, title: "Immediate power reports", descr: null],
-
-	[key: "standardPowerReports", num: 11, size: 1, type: "number", def: 15, min: 1, max: 100, title: "Standard power reports", descr: null], 
-
-	[key: "powerReportFrequency", num: 12, size: 2, type: "number", def: 30, min: 5, max: 600, title: "Power reporting interval", descr: null],
-
-	[key: "energyReport", num: 13, size: 2, type: "number", def: 10, min: 0, max: 500, title: "Energy reports", descr: null], 
-
-	[key: "periodicReports", num: 14, size: 2, type: "number", def: 3600, min: 0, max: 32400, title: "Periodic power and energy reports", descr: null], 
-
-	[key: "deviceEnergyConsumed", num: 15, size: 1, type: "enum", options: [0: "0 - don't measure", 1: "1 - measure"], def: "0", title: "Energy consumed by the device itself", descr: null],
-
-	[key: "powerLoad", num: 40, size: 2, type: "number", def: 25000, min: 1000, max: 30000, title: "Power load which makes the LED ring flash violet", descr: null],
-
-	[key: "ringColorOn", num: 41, size: 1, type: "enum", options: [
-
-		0: "0 - Off",
-
-		1: "1 - Load based - continuous", 
-
-		2: "2 - Load based - steps", 
-
-		3: "3 - White", 
-
-		4: "4 - Red", 
-
-		5: "5 - Green", 
-
-		6: "6 - Blue", 
-
-		7: "7 - Yellow", 
-
-		8: "8 - Cyan", 
-
-		9: "9 - Magenta"
-
-		], def: "1", title: "Ring LED color when on", descr: null],
-
-	[key: "ringColorOff", num: 42, size: 1, type: "enum", options: [
-
-		0: "0 - Off",
-
-		1: "1 - Last measured power",  
-
-		3: "3 - White", 
-
-		4: "4 - Red", 
-
-		5: "5 - Green", 
-
-		6: "6 - Blue", 
-
-		7: "7 - Yellow", 
-
-		8: "8 - Cyan", 
-
-		9: "9 - Magenta"
-
-		], def: "0", title: "Ring LED color when off", descr: null]
-
-]}
--- a/devicetypes/fibargroup/fibaro-door-window-sensor-zw5-with-temperature.src/fibaro-door-window-sensor-zw5-with-temperature.groovy
+++ b/devicetypes/fibargroup/fibaro-door-window-sensor-zw5-with-temperature.src/fibaro-door-window-sensor-zw5-with-temperature.groovy
@@ -39,8 +39,8 @@ metadata {
            }

            tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
-				attributeState("active", label:'tamper active', backgroundColor:"#53a7c0")
-				attributeState("inactive", label:'tamper inactive', backgroundColor:"#ffffff")
+				attributeState("active", label:'tamper active', backgroundColor:"#00A0DC")
+				attributeState("inactive", label:'tamper inactive', backgroundColor:"#CCCCCC")
 			}
        }

--- a/devicetypes/fibargroup/fibaro-door-window-sensor-zw5.src/fibaro-door-window-sensor-zw5.groovy
+++ b/devicetypes/fibargroup/fibaro-door-window-sensor-zw5.src/fibaro-door-window-sensor-zw5.groovy
@@ -37,8 +37,8 @@ metadata {
            }

            tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
-				attributeState("active", label:'tamper active', backgroundColor:"#53a7c0")
-				attributeState("inactive", label:'tamper inactive', backgroundColor:"#ffffff")
+				attributeState("active", label:'tamper active', backgroundColor:"#00A0DC")
+				attributeState("inactive", label:'tamper inactive', backgroundColor:"#CCCCCC")
 			}
        }

--- a/devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy
+++ b/devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy
@@ -21,6 +21,7 @@ metadata {
 		capability "Battery"

 		fingerprint deviceId: "0x0101", inClusters: "0x86,0x72,0x70,0x80,0x84,0x85"
+		fingerprint mfr: "0086", prod: "0001", model: "0026", deviceJoinName: "Aeon Panic Button"
 	}

 	simulator {
@@ -130,5 +131,12 @@ def updated() {
 }

 def initialize() {
-	sendEvent(name: "numberOfButtons", value: 4)
+	def zwMap = getZwaveInfo()
+	def buttons = 4 // Default for Key Fob
+
+	// Only one button for Aeon Panic Button
+	if (zwMap && zwMap.mfr == "0086" && zwMap.prod == "0001" && zwMap.model == "0026") {
+		buttons = 1
+	}
+	sendEvent(name: "numberOfButtons", value: buttons)
 }
--- a/devicetypes/smartthings/aeon-multisensor-6.src/.st-ignore
+++ b/devicetypes/smartthings/aeon-multisensor-6.src/.st-ignore
@@ -0,0 +1,2 @@
+.st-ignore
+README.md
--- a/devicetypes/smartthings/aeon-multisensor-6.src/README.md
+++ b/devicetypes/smartthings/aeon-multisensor-6.src/README.md
@@ -0,0 +1,43 @@
+# Aeon Multisensor 6
+
+Cloud Execution
+
+Works with: 
+
+* [Aeon Labs MultiSensor 6](https://www.smartthings.com/products/aeon-labs-multisensor-6)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+* [Troubleshooting](#troubleshooting)
+
+## Capabilities
+
+* **Motion Sensor** - can detect motion
+* **Temperature Measurement** - defines device measures current temperature
+* **Relative Humidity Measurement** - allow reading the relative humidity from devices that support it
+* **Illuminance Measurement** - gives the illuminance reading from devices that support it
+* **Ultraviolet Index** - gives the ability to get the ultraviolet index from devices that report it
+* **Configuration** - _configure()_ command called when device is installed or device preferences updated
+* **Sensor** - detects sensor events
+* **Battery** - defines device uses a battery
+* **Health Check** - indicates ability to get device health notifications
+
+## 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.
+
+* __32min__ checkInterval
+
+## Troubleshooting
+
+If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the device is out of range.
+Pairing needs to be tried again by placing the device closer to the hub.
+Instructions related to pairing, resetting and removing the device from SmartThings can be found in the following link:
+* [Aeon Labs MultiSensor 6 Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206157226)
--- a/devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy
+++ b/devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy
@@ -22,6 +22,7 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
+		capability "Health Check"

 		attribute "tamper", "enum", ["detected", "clear"]
 		attribute "batteryStatus", "string"
@@ -29,6 +30,7 @@ metadata {

 		fingerprint deviceId: "0x2101", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x7A", outClusters: "0x5A"
 		fingerprint deviceId: "0x2101", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x7A,0x5A"
+		fingerprint mfr:"0086", prod:"0102", model:"0064", deviceJoinName: "Aeon Labs MultiSensor 6"
 	}

 	simulator {
@@ -127,7 +129,14 @@ 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])
+}
+
 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])
 	log.debug "Updated with settings: ${settings}"
 	log.debug "${device.displayName} is now ${device.latestValue("powerSupply")}"

@@ -326,6 +335,13 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	createEvent(descriptionText: cmd.toString(), isStateChange: false)
 }

+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+	secure(zwave.batteryV1.batteryGet())
+}
+
 def configure() {
 	// This sensor joins as a secure device if you double-click the button to include it
 	log.debug "${device.displayName} is configuring its settings"
--- a/devicetypes/smartthings/ct100-thermostat.src/ct100-thermostat.groovy
+++ b/devicetypes/smartthings/ct100-thermostat.src/ct100-thermostat.groovy
@@ -9,6 +9,7 @@ metadata {
 		capability "Configuration"
 		capability "Refresh"
 		capability "Sensor"
+		capability "Health Check"
 		
 		attribute "thermostatFanState", "string"

@@ -18,6 +19,7 @@ metadata {
 		command "quickSetHeat"

 		fingerprint deviceId: "0x08", inClusters: "0x43,0x40,0x44,0x31,0x80,0x85,0x60"
+		fingerprint mfr:"0098", prod:"6401", model:"0107", deviceJoinName: "2Gig CT100 Programmable Thermostat"
 	}

 	// simulator metadata
@@ -106,6 +108,16 @@ metadata {
 	}
 }

+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])
+}
+
+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])
+}
+
 def parse(String description)
 {
 	def result = []
@@ -439,6 +451,14 @@ def setCoolingSetpoint(Double degrees, Integer delay = 30000) {
 	], delay)
 }

+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+	log.debug "ping() called"
+	refresh()
+}
+
 def configure() {
 	delayBetween([
 		zwave.thermostatModeV2.thermostatModeSupportedGet().format(),
--- a/devicetypes/smartthings/fibaro-motion-sensor.src/fibaro-motion-sensor.groovy
+++ b/devicetypes/smartthings/fibaro-motion-sensor.src/fibaro-motion-sensor.groovy
@@ -107,8 +107,8 @@
 			state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
 		}
        standardTile("acceleration", "device.acceleration") {
-			state("active", label:'vibration', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
-			state("inactive", label:'still', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff")
+			state("active", label:'vibration', icon:"st.motion.acceleration.active", backgroundColor:"#00a0dc")
+			state("inactive", label:'still', icon:"st.motion.acceleration.inactive", backgroundColor:"#cccccc")
 		}


--- a/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy
+++ b/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy
@@ -12,13 +12,13 @@
 *
 */
 metadata {
-	definition (name: "Fortrezz Water Valve", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "Fortrezz Water Valve", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.watervalve") {
 		capability "Actuator"
 		capability "Health Check"
 		capability "Valve"
 		capability "Refresh"
 		capability "Sensor"
-        
+
 		fingerprint deviceId: "0x1000", inClusters: "0x25,0x72,0x86,0x71,0x22,0x70"
 		fingerprint mfr:"0084", prod:"0213", model:"0215", deviceJoinName: "FortrezZ Water Valve"
 	}
@@ -34,19 +34,22 @@ metadata {
 	}

 	// tile definitions
-	tiles {
-		standardTile("contact", "device.contact", width: 2, height: 2, canChangeIcon: true) {
-			state "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
-			state "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening"
-			state "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
-			state "closing", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+	tiles(scale: 2) {
+		multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){
+			tileAttribute ("device.valve", key: "PRIMARY_CONTROL") {
+				attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
+				attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening"
+				attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
+				attributeState "closing", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+			}
 		}
-		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
+
+		standardTile("refresh", "device.valve", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
 			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
 		}

-		main "contact"
-		details(["contact","refresh"])
+		main "valve"
+		details(["valve","refresh"])
 	}
 }

@@ -62,22 +65,23 @@ def updated(){

 def parse(String description) {
 	log.trace description
-	def result = null
 	def cmd = zwave.parse(description)
 	if (cmd) {
-		result = createEvent(zwaveEvent(cmd))
+		return zwaveEvent(cmd)
 	}
-	log.debug "Parse returned ${result?.descriptionText}"
-	return result
+	log.debug "Could not parse message"
+	return null
 }

 def zwaveEvent(physicalgraph.zwave.commands.switchbinaryv1.SwitchBinaryReport cmd) {
 	def value = cmd.value ? "closed" : "open"
-	[name: "contact", value: value, descriptionText: "$device.displayName valve is $value"]
+
+	return [createEventWithDebug([name: "contact", value: value, descriptionText: "$device.displayName valve is $value"]),
+			createEventWithDebug([name: "valve", value: value, descriptionText: "$device.displayName valve is $value"])]
 }

 def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	[:] // Handles all Z-Wave commands we aren't interested in
+	return createEvent([:]) // Handles all Z-Wave commands we aren't interested in
 }

 def open() {
@@ -98,3 +102,9 @@ def ping() {
 def refresh() {
 	zwave.switchBinaryV1.switchBinaryGet().format()
 }
+
+def createEventWithDebug(eventMap) {
+	def event = createEvent(eventMap)
+	log.debug "Event created with ${event?.descriptionText}"
+	return event
+}
--- a/devicetypes/smartthings/smartalert-siren.src/README.md
+++ b/devicetypes/smartthings/smartalert-siren.src/README.md
@@ -4,7 +4,7 @@ Cloud Execution

 Works with:

-* [FortrezZ Siren Strobe Alarm](https://www.smartthings.com/works-with-smartthings/other/fortrezz-water-valve)
+* [FortrezZ Siren Strobe Alarm](https://www.smartthings.com/products/fortrezz-siren-strobe-alarm)

 ## Table of contents

--- a/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
@@ -61,8 +61,8 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name: "motion", type: "generic", width: 6, height: 4) {
 			tileAttribute("device.motion", key: "PRIMARY_CONTROL") {
-				attributeState "active", label: 'motion', icon: "st.motion.motion.active", backgroundColor: "#53a7c0"
-				attributeState "inactive", label: 'no motion', icon: "st.motion.motion.inactive", backgroundColor: "#ffffff"
+				attributeState "active", label: 'motion', icon: "st.motion.motion.active", backgroundColor: "#00A0DC"
+				attributeState "inactive", label: 'no motion', icon: "st.motion.motion.inactive", backgroundColor: "#cccccc"
 			}
 		}
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
--- a/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
@@ -87,8 +87,8 @@ metadata {
 			state("closed", label: 'Closed', icon: "st.contact.contact.closed", backgroundColor: "#00a0dc")
 		}
 		standardTile("acceleration", "device.acceleration", width: 2, height: 2) {
-			state("active", label: 'Active', icon: "st.motion.acceleration.active", backgroundColor: "#53a7c0")
-			state("inactive", label: 'Inactive', icon: "st.motion.acceleration.inactive", backgroundColor: "#ffffff")
+			state("active", label: 'Active', icon: "st.motion.acceleration.active", backgroundColor: "#00a0dc")
+			state("inactive", label: 'Inactive', icon: "st.motion.acceleration.inactive", backgroundColor: "#cccccc")
 		}
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
 			state("temperature", label: '${currentValue}°',
--- a/devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy
+++ b/devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy
@@ -46,8 +46,8 @@
        }

 		standardTile("motion", "device.motion", width: 2, height: 2) {
-			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
-			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff")
+			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC")
+			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#CCCCCC")
      		state("offline", label:'${name}', icon:"st.motion.motion.inactive", backgroundColor:"#ff0000")
 		}

--- a/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
+++ b/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
@@ -25,6 +25,7 @@ metadata {

        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart A19 Soft White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 ON/OFF/DIM 10 Year", deviceJoinName: "SYLVANIA Smart 10-Year A19"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FF00", outClusters: "0019", manufacturer: "MRVL", model: "MZ100", deviceJoinName: "Wemo Bulb"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B05", outClusters: "0019", manufacturer: "OSRAM SYLVANIA", model: "iQBR30", deviceJoinName: "Sylvania Ultra iQ"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY PAR38 ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart PAR38 Soft White"
--- a/devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy
+++ b/devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy
@@ -34,7 +34,7 @@ import physicalgraph.zigbee.zcl.DataType
        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019", manufacturer: "Yale", model: "YRD210 PB DB", deviceJoinName: "Yale Push Button Deadbolt Lock"
        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019", manufacturer: "Yale", model: "YRD220/240 TSDB", deviceJoinName: "Yale Touch Screen Deadbolt Lock"
        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019", manufacturer: "Yale", model: "YRL210 PB LL", deviceJoinName: "Yale Push Button Lever Lock"
-	fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019", manufacturer: "Yale", model: "YRD226/246 TSDB", deviceJoinName: "Yale Touch Screen Deadbolt Lock"
+        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019", manufacturer: "Yale", model: "YRD226/246 TSDB", deviceJoinName: "Yale Touch Screen Deadbolt Lock"
 	}

    tiles(scale: 2) {
--- a/devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy
+++ b/devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy
@@ -39,7 +39,7 @@ metadata {

    tiles(scale: 2) {
        multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){
-            tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
+            tileAttribute ("device.valve", key: "PRIMARY_CONTROL") {
                attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
                attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening"
                attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
@@ -83,6 +83,9 @@ def parse(String description) {
            }
        }
        sendEvent(event)
+        //handle valve attribute
+        event.name = "valve"
+        sendEvent(event)
    }
    else {
        def descMap = zigbee.parseDescriptionAsMap(description)
--- a/devicetypes/smartthings/zwave-door-window-sensor.src/zwave-door-window-sensor.groovy
+++ b/devicetypes/smartthings/zwave-door-window-sensor.src/zwave-door-window-sensor.groovy
@@ -30,9 +30,15 @@ metadata {
 		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x86,0x72,0x98", outClusters: "0x5A,0x82"
 		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x80,0x71,0x85,0x70,0x72,0x86,0x30,0x31,0x84,0x59,0x73,0x5A,0x8F,0x98,0x7A", outClusters:"0x20" // Philio multi+
 		fingerprint mfr:"0086", prod:"0002", model:"001D", deviceJoinName: "Aeon Labs Door/Window Sensor (Gen 5)"
-		fingerprint mfr:"014A", prod:"0001", model:"0002", deviceJoinName: "Ecolink Door/Window Sensor"
 		fingerprint mfr:"0086", prod:"0102", model:"0070", deviceJoinName:  "Aeon Labs Door/Window Sensor 6"
+		fingerprint mfr:"0086", prod:"0102", model:"0059", deviceJoinName: "Aeon Labs Recessed Door Sensor"
+		fingerprint mfr:"014A", prod:"0001", model:"0002", deviceJoinName: "Ecolink Door/Window Sensor"
+		fingerprint mfr:"014A", prod:"0001", model:"0003", deviceJoinName: "Ecolink Tilt Sensor"
 		fingerprint mfr:"011A", prod:"0601", model:"0903", deviceJoinName: "Enerwave Magnetic Door/Window Sensor"
+		fingerprint mfr:"014F", prod:"2001", model:"0102", deviceJoinName: "Nortek GoControl Door/Window Sensor"
+		fingerprint mfr:"0063", prod:"4953", model:"3031", deviceJoinName: "Jasco Hinge Pin Door Sensor"
+		fingerprint mfr:"019A", prod:"0003", model:"0003", deviceJoinName: "Sensative Strips"
+
 	}

 	// simulator metadata
--- a/devicetypes/smartthings/zwave-lock.src/zwave-lock.groovy
+++ b/devicetypes/smartthings/zwave-lock.src/zwave-lock.groovy
@@ -26,7 +26,24 @@ metadata {

 		fingerprint deviceId: "0x4003", inClusters: "0x98"
 		fingerprint deviceId: "0x4004", inClusters: "0x98"
-		fingerprint mfr:"0129", prod:"0002", model:"0000", deviceJoinName: "Yale Key Free Touchscreen Deadbolt"
+		fingerprint mfr:"0090", prod:"0001", model:"0236", deviceJoinName: "KwikSet SmartCode 910 Deadbolt Door Lock"
+		fingerprint mfr:"0090", prod:"0003", model:"0238", deviceJoinName: "KwikSet SmartCode 910 Deadbolt Door Lock"
+		fingerprint mfr:"0090", prod:"0001", model:"0001", deviceJoinName: "KwikSet SmartCode 910 Contemporary Deadbolt Door Lock"
+		fingerprint mfr:"0090", prod:"0003", model:"0339", deviceJoinName: "KwikSet SmartCode 912 Lever Door Lock"
+		fingerprint mfr:"0090", prod:"0003", model:"4006", deviceJoinName: "KwikSet SmartCode 914 Deadbolt Door Lock" //backlit version
+		fingerprint mfr:"0090", prod:"0003", model:"0440", deviceJoinName: "KwikSet SmartCode 914 Deadbolt Door Lock"
+		fingerprint mfr:"0090", prod:"0001", model:"0642", deviceJoinName: "KwikSet SmartCode 916 Touchscreen Deadbolt Door Lock"
+		fingerprint mfr:"0090", prod:"0003", model:"0642", deviceJoinName: "KwikSet SmartCode 916 Touchscreen Deadbolt Door Lock"
+		fingerprint mfr:"003B", prod:"6341", model:"0544", deviceJoinName: "Schlage Camelot Touchscreen Deadbolt Door Lock"
+		fingerprint mfr:"003B", prod:"6341", model:"5044", deviceJoinName: "Schlage Century Touchscreen Deadbolt Door Lock"
+		fingerprint mfr:"003B", prod:"634B", model:"504C", deviceJoinName: "Schlage Connected Keypad Lever Door Lock"
+		fingerprint mfr:"0129", prod:"0002", model:"0800", deviceJoinName: "Yale Touchscreen Deadbolt Door Lock" // YRD120
+		fingerprint mfr:"0129", prod:"0002", model:"0000", deviceJoinName: "Yale Touchscreen Deadbolt Door Lock" // YRD220, YRD240
+		fingerprint mfr:"0129", prod:"0002", model:"FFFF", deviceJoinName: "Yale Touchscreen Lever Door Lock" // YRD220
+		fingerprint mfr:"0129", prod:"0004", model:"0800", deviceJoinName: "Yale Push Button Deadbolt Door Lock" // YRD110
+		fingerprint mfr:"0129", prod:"0004", model:"0000", deviceJoinName: "Yale Push Button Deadbolt Door Lock" // YRD210
+		fingerprint mfr:"0129", prod:"0001", model:"0000", deviceJoinName: "Yale Push Button Lever Door Lock" // YRD210
+		fingerprint mfr:"0129", prod:"8002", model:"0600", deviceJoinName: "Yale Assure Lock with Bluetooth"
 	}

 	simulator {
--- a/devicetypes/smartthings/zwave-motion-sensor.src/zwave-motion-sensor.groovy
+++ b/devicetypes/smartthings/zwave-motion-sensor.src/zwave-motion-sensor.groovy
@@ -29,7 +29,7 @@ metadata {
 		fingerprint mfr: "0060", prod: "0001", model: "0002", deviceJoinName: "Everspring Motion Sensor"  // Everspring SP814
 		fingerprint mfr: "0060", prod: "0001", model: "0003", deviceJoinName: "Everspring Motion Sensor"  // Everspring HSP02
 		fingerprint mfr: "011A", prod: "0601", model: "0901", deviceJoinName: "Enerwave Motion Sensor"  // Enerwave ZWN-BPC
-		fingerprint mfr: "0063", prod: "4953", model: "3133", deviceJoinName: "GE Smart Motion Sensor"
+		fingerprint mfr: "0063", prod: "4953", model: "3133", deviceJoinName: "GE Portable Smart Motion Sensor"
 	}

 	simulator {
--- a/devicetypes/smartthings/zwave-plus-motion-temp-sensor.src/zwave-plus-motion-temp-sensor.groovy
+++ b/devicetypes/smartthings/zwave-plus-motion-temp-sensor.src/zwave-plus-motion-temp-sensor.groovy
@@ -37,8 +37,8 @@ metadata {

 	tiles {
 		standardTile("motion", "device.motion", width: 3, height: 2) {
-			state "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0"
-			state "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff"
+			state "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC"
+			state "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#CCCCCC"
 		}

 		valueTile("temperature", "device.temperature", inactiveLabel: false) {
--- a/devicetypes/smartthings/zwave-smoke-alarm.src/zwave-smoke-alarm.groovy
+++ b/devicetypes/smartthings/zwave-smoke-alarm.src/zwave-smoke-alarm.groovy
@@ -22,6 +22,7 @@ metadata {
 		attribute "alarmState", "string"

 		fingerprint deviceId: "0xA100", inClusters: "0x20,0x80,0x70,0x85,0x71,0x72,0x86"
+		fingerprint mfr:"0138", prod:"0001", model:"0001", deviceJoinName: "First Alert Smoke Detector"
 		fingerprint mfr:"0138", prod:"0001", model:"0002", deviceJoinName: "First Alert Smoke Detector and Carbon Monoxide Alarm (ZCOMBO)"
 	}

--- a/devicetypes/smartthings/zwave-water-valve.src/.st-ignore
+++ b/devicetypes/smartthings/zwave-water-valve.src/.st-ignore
@@ -0,0 +1,2 @@
+.st-ignore
+README.md
--- a/devicetypes/smartthings/zwave-water-valve.src/README.md
+++ b/devicetypes/smartthings/zwave-water-valve.src/README.md
@@ -0,0 +1,38 @@
+# Z-Wave Water Valve
+
+Cloud Execution
+
+Works with: 
+
+* [Leak Intelligence Leak Gopher Water Shutoff Valve](https://www.smartthings.com/works-with-smartthings/other/leak-intelligence-leak-gopher-water-shutoff-valve)
+
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+* [Troubleshooting](#Troubleshooting)
+
+## Capabilities
+
+* **Actuator** - represents that a Device has commands
+* **Health Check** - indicates ability to get device health notifications
+* **Valve** - allows for the control of a valve device
+* **Polling** - represents that poll() can be implemented for the device
+* **Refresh** - _refresh()_ command for status updates
+* **Sensor** - detects sensor events
+
+## Device Health
+
+SmartThings platform will ping the device after `checkInterval` seconds of inactivity in last attempt to reach the device before marking it `OFFLINE`
+
+* __32min__ checkInterval
+
+## Troubleshooting
+
+If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the device is out of range.
+Pairing needs to be tried again by placing the device closer to the hub.
+Instructions related to pairing, resetting and removing the device from SmartThings can be found in the following link:
+* [Leak Intelligence Leak Gopher Water Shutoff Valve Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/209631423-Leak-Gopher-Z-Wave-Valve-Control)
+
+
--- a/devicetypes/smartthings/zwave-water-valve.src/zwave-water-valve.groovy
+++ b/devicetypes/smartthings/zwave-water-valve.src/zwave-water-valve.groovy
@@ -12,14 +12,16 @@
 *
 */
 metadata {
-	definition (name: "Z-Wave Water Valve", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "Z-Wave Water Valve", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.watervalve") {
 		capability "Actuator"
+		capability "Health Check"
 		capability "Valve"
 		capability "Polling"
 		capability "Refresh"
 		capability "Sensor"

 		fingerprint deviceId: "0x1006", inClusters: "0x25"
+		fingerprint mfr:"0173", prod:"0003", model:"0002", deviceJoinName: "Leak Intelligence Leak Gopher Water Shutoff Valve"
 	}

 	// simulator metadata
@@ -35,7 +37,7 @@ metadata {
 	// tile definitions
 	tiles(scale: 2) {
 		multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){
-			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
+			tileAttribute ("device.valve", key: "PRIMARY_CONTROL") {
 				attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
 				attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening"
 				attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
@@ -43,7 +45,7 @@ metadata {
 			}
 		}

-		standardTile("refresh", "device.contact", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
+		standardTile("refresh", "device.valve", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
 			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
 		}

@@ -53,24 +55,32 @@ 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])
+}
+
 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])
 	response(refresh())
 }

 def parse(String description) {
 	log.trace "parse description : $description"
-	def result = null
 	def cmd = zwave.parse(description, [0x20: 1])
 	if (cmd) {
-		result = createEvent(zwaveEvent(cmd))
+		return zwaveEvent(cmd)
 	}
-	log.debug "Parse returned ${result?.descriptionText}"
-	return result
+	log.debug "Could not parse message"
+	return null
 }

 def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
-    def value = cmd.value == 0xFF ?  "open" : cmd.value == 0x00 ? "closed" : "unknown"
-    [name: "contact", value: value, descriptionText: "$device.displayName valve is $value"]
+	def value = cmd.value == 0xFF ?  "open" : cmd.value == 0x00 ? "closed" : "unknown"
+
+	return [createEventWithDebug([name: "contact", value: value, descriptionText: "$device.displayName valve is $value"]),
+			createEventWithDebug([name: "valve", value: value, descriptionText: "$device.displayName valve is $value"])]
 }

 def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {   //TODO should show MSR when device is discovered
@@ -80,20 +90,22 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
    log.debug "productTypeId:    ${cmd.productTypeId}"
    def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId)
    updateDataValue("MSR", msr)
-    [descriptionText: "$device.displayName MSR: $msr", isStateChange: false]
+    return createEventWithDebug([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
 }

 def zwaveEvent(physicalgraph.zwave.commands.deviceresetlocallyv1.DeviceResetLocallyNotification cmd) {
-    [descriptionText: cmd.toString(), isStateChange: true, displayed: true]
+    return createEventWithDebug([descriptionText: cmd.toString(), isStateChange: true, displayed: true])
 }

 def zwaveEvent(physicalgraph.zwave.commands.switchbinaryv1.SwitchBinaryReport cmd) {
 	def value = cmd.value == 0xFF ?  "open" : cmd.value == 0x00 ? "closed" : "unknown"
-	[name: "contact", value: value, descriptionText: "$device.displayName valve is $value"]
+
+	return [createEventWithDebug([name: "contact", value: value, descriptionText: "$device.displayName valve is $value"]),
+			createEventWithDebug([name: "valve", value: value, descriptionText: "$device.displayName valve is $value"])]
 }

 def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	[:] // Handles all Z-Wave commands we aren't interested in
+	return createEvent([:]) // Handles all Z-Wave commands we aren't interested in
 }

 def open() {
@@ -114,6 +126,13 @@ def poll() {
    zwave.switchBinaryV1.switchBinaryGet().format()
 }

+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+	refresh()
+}
+
 def refresh() {
    log.debug "refresh() is called"
    def commands = [zwave.switchBinaryV1.switchBinaryGet().format()]
@@ -122,3 +141,9 @@ def refresh() {
    }
    delayBetween(commands,100)
 }
+
+def createEventWithDebug(eventMap) {
+	def event = createEvent(eventMap)
+	log.debug "Event created with ${event?.descriptionText}"
+	return event
+}
--- a/smartapps/bd/zwave-thermostat-manager.src/zwave-thermostat-manager.groovy
+++ b/smartapps/bd/zwave-thermostat-manager.src/zwave-thermostat-manager.groovy
@@ -0,0 +1,794 @@
+/**
+ *  Zwave Thermostat Manager
+ * 
+ * Credits and Kudos: 	this app is largely based on the more popular Thermostat Director SA by Tim Slagle - 
+ * 						many thanks to @slagle for his continued support. 
+ * 						Without his brilliance, this app would not exist!
+ * 
+ * 
+ *  Copyright 2015 SmartThings
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ */
+ 
+definition(
+	name: "ZWave Thermostat Manager",
+	namespace: "BD",
+	author: "Bobby Dobrescu",
+	description: "Adjust zwave thermostats based on a temperature range of a specific temperature sensor",
+	category: "My apps",
+	iconUrl: "http://icons.iconarchive.com/icons/icons8/windows-8/512/Science-Temperature-icon.png",
+	iconX2Url: "http://icons.iconarchive.com/icons/icons8/windows-8/512/Science-Temperature-icon.png"
+)
+
+preferences {
+    page name:"pageSetup"
+    page name:"TemperatureSettings"
+    page name:"ThermostatandDoors"
+    page name:"ThermostatAway"
+    page name:"Settings"
+
+}
+
+// Show setup page
+def pageSetup() {
+
+    def pageProperties = [
+        name:       "pageSetup",
+        title:      "",
+        nextPage:   null,
+        install:    true,
+        uninstall:  true
+    ]
+
+	return dynamicPage(pageProperties) {
+        section("General Settings") {
+            href "TemperatureSettings", title: "Ambiance", description: "", state:greyedOut()
+            href "ThermostatandDoors", title: "Disabled Mode", description: "", state: greyedOutTherm()
+            href "ThermostatAway", title: "Away Mode", description: "", state: greyedOutTherm2()
+			href "Settings", title: "Other Settings", description: "", state: greyedOutSettings()
+         }
+        section([title:"Options", mobileOnly:true]) {
+            label title:"Assign a name", required:false       
+        }
+    }
+}
+
+// Page - Temperature Settings	
+def TemperatureSettings() {
+
+    def sensor = [
+        name:       "sensor",
+        type:       "capability.temperatureMeasurement",
+        title:      "Which Temperature Sensor(s)?",
+        multiple:   true,
+        required:   false
+    ]
+    def thermostat = [
+        name:       "thermostat",
+        type:       "capability.thermostat",
+        title:      "Which Thermostat?",
+        multiple:   false,
+        required:   true
+    ]
+    def setLow = [
+        name:       "setLow",
+        type:       "number",
+        title:      "Low temp?",
+        required:   true
+    ]
+    
+    def cold = [
+        name:       "cold",
+        type:       "enum",
+        title:		"Mode?",
+    	required:   false,
+		metadata:   [values:["auto", "heat", "cool", "off"]]
+
+    ]
+
+    def SetHeatingLow = [
+        name:       "SetHeatingLow",
+        type:       "number",
+        title:		"Heating Temperature (degrees)",
+        required:   true
+    ]
+    
+     def SetCoolingLow = [
+        name:       "SetCoolingLow",
+        type:       "number",
+        title:		"Cooling Temperature (degrees)",
+        required:   false
+    ]   
+    
+    def setHigh = [
+        name:       "setHigh",
+        type:       "number",
+        title:      "High temp?",
+        required:   true
+    ]
+    
+    def hot = [
+        name:       "hot",
+        type:       "enum",
+        title:		"Mode?",
+        required:   false,
+        metadata:   [values:["auto", "heat", "cool", "off"]]
+    ]
+    
+    def SetHeatingHigh = [
+        name:       "SetHeatingHigh",
+        type:       "number",
+        title:		"Heating Temperature (degrees)",
+        required:   false
+    ]
+    
+     def SetCoolingHigh = [
+        name:       "SetCoolingHigh",
+        type:       "number",
+        title:		"Cooling Temperature (degrees)",
+        required:   true
+    ] 
+  
+    def pageName = "Ambiance"
+    
+    def pageProperties = [
+        name:       "TemperatureSettings",
+        title:      "",
+        //nextPage:   "ThermostatandDoors"
+    ]
+    
+    return dynamicPage(pageProperties) {
+        section("Select the main thermostat") {
+			input thermostat
+		}
+        section("Use remote sensors to adjust the thermostat (by default the app is using the internal sensor of the thermostat)") {
+			input "remoteSensors", "bool", title: "Enable remote sensor(s)", required: false, defaultValue: false, submitOnChange: true
+			if (remoteSensors) {
+            	input sensor 
+            	paragraph "If multiple sensors are selected, the average temperature is automatically calculated"	
+			}
+        }
+		section("When the temperature falls below this temperature (Low Temperature)..."){
+			input setLow
+		}
+        section("Adjust the thermostat to the following settings:"){
+			input cold
+            input SetHeatingLow
+            input SetCoolingLow
+		}
+        section("When the temperature raises above this temperature (High Temperature)..."){
+			input setHigh
+		}
+        section("Adjust the thermostat to the following settings:"){
+			input hot
+            input SetCoolingHigh
+            input SetHeatingHigh
+		}
+        section("When temperature is neutral (between above Low and High Temperatures..."){
+			input "neutral", "bool", title: "Turn off the thermostat", required: false, defaultValue: false
+		}
+    }  
+}
+
+// Page - Disabled Mode
+def ThermostatandDoors() {
+  
+    def doors = [
+        name:       "doors",
+        type:       "capability.contactSensor",
+        title:      "Which Sensor(s)?",
+        multiple:	true,
+        required:   false
+    ]
+    
+    def turnOffDelay = [
+        name:       "turnOffDelay",
+        type:       "decimal",
+        title:		"Number of minutes",
+        required:	false
+    ]
+    
+    def resetOff = [
+        name:       "resetOff",
+        type:       "bool",
+        title:		"Reset Thermostat Settings when all Sensor(s) are closed",
+        required:	false,
+        defaultValue: false
+    ]
+       
+    def pageName = "Thermostat and Doors"
+    
+    def pageProperties = [
+        name:       "ThermostatandDoors",
+        title:      "",
+        //nextPage:   "ThermostatAway"
+    ]
+
+    return dynamicPage(pageProperties) {
+        section("When one or more contact sensors open, then turn off the thermostat") {
+			input doors
+		}
+		section("Wait this long before turning the thermostat off (defaults to 1 minute)") {
+			input turnOffDelay
+            input resetOff 
+		}
+    }
+    
+}
+
+// Page - Thermostat Away
+def ThermostatAway() {
+
+    def modes2 = [
+        name:		"modes2", 
+        type:		"mode", 
+        title: 		"Which Location Mode(s)?", 
+        multiple: 	true, 
+        required: 	false
+    ]
+    
+    def away = [
+        name:       "away",
+        type:       "enum",
+        title:		"Mode?",
+        metadata:   [values:["auto", "heat", "cool", "off"]], 
+        required: 	false
+    ]
+
+    def setAwayLow = [
+        name:       "setAwayLow",
+        type:       "decimal",
+        title:      "Low temp?",
+        required:   false
+    ]
+    
+    def AwayCold = [
+        name:       "AwayCold",
+        type:       "enum",
+        title:		"Mode?",
+        metadata:   [values:["auto", "heat", "cool", "off"]],
+        required: 	false,
+    ]
+    
+    def setAwayHigh = [
+        name:       "setAwayHigh",
+        type:       "decimal",
+        title:      "High temp?",
+		required:   false
+    ]
+    
+    def AwayHot = [
+        name:       "AwayHot",
+        type:       "enum",
+        title:		"Mode?",
+        required: 	false,
+metadata:   [values:["auto", "heat", "cool", "off"]]
+    ]
+    
+    def SetHeatingAway = [
+        name:       "SetHeatingAway",
+        type:       "number",
+        title:		"Heating Temperature (degrees)",
+        required: 	false
+    ]   
+    
+    def SetCoolingAway = [
+        name:       "SetCoolingAway",
+        type:       "number",
+        title:		"Cooling Temperature (degrees)",
+        required: 	false
+    ]     
+    
+    def fanAway = [
+        name:       "fanAway",
+        type:       "enum",
+        title:		"Fan Mode?",
+        metadata:   [values:["fanAuto", "fanOn", "fanCirculate"]],
+        required: 	false
+    ]
+
+    def pageName = "Thermostat Away"
+    
+    def pageProperties = [
+        name:       "ThermostatAway",
+        title:      "",
+        //nextPage:   "Settings"
+    ]
+
+    return dynamicPage(pageProperties) {
+		
+        section("When the Location Mode changes to 'Away'") {
+   			input modes2
+        }
+           
+        section("Adjust the thermostat to the following settings:") {
+    		input away
+            input fanAway                        
+            input SetHeatingAway
+			input SetCoolingAway
+  		}	
+        section("If the temperature falls below this temperature while away..."){
+			input setAwayLow
+		}
+        
+        section("Automatically adjust the thermostat to the following operating mode..."){
+			input AwayCold
+		}
+        
+        section("If the temperature raises above this temperature while away..."){
+			input setAwayHigh
+    	}
+        section("Automatically adjust the thermostat to the following operating mode..."){
+			input AwayHot
+    	} 
+	 }
+}
+
+// Show "Setup" page
+def Settings() {
+ 
+    def days = [
+        name:       "days",
+        type:       "enum",
+        title:      "Only on certain days of the week",
+        multiple:   true,
+        required:   false,
+        options: 	["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
+    ]
+    
+    def modes = [
+        name:		"modes", 
+        type:		"mode", 
+        title: 		"Only when mode is", 
+        multiple: 	true, 
+        required: 	false
+    ]
+    
+    def pageName = ""
+    
+    def pageProperties = [
+        name:       "Settings",
+        title:      "",
+        //nextPage:   "pageSetup"
+    ]
+
+    return dynamicPage(pageProperties) {    
+        
+        section("Notifications") {
+            input("recipients", "contact", title: "Send notifications to", multiple: true, required: false) {
+            paragraph 	"You may enter multiple phone numbers separated by semicolon."+
+           				"E.G. 8045551122;8046663344"
+            input "sms", "phone", title: "To this phone", multiple: false, required: false
+            input "push", "bool", title: "Send Push Notification (optional)", required: false, defaultValue: false
+            }
+ }       
+        section(title: "Restrictions", hideable: true) {
+			href "timeIntervalInput", title: "Only during a certain time", description: getTimeLabel(starting, ending), state: greyedOutTime(starting, ending), refreshAfterSelection:true
+			input days
+			input modes
+        }
+		section(title: "Debug") {     
+        	input "debug", "bool", title: "Enable debug messages in IDE for troubleshooting purposes", required: false, defaultValue: false, refreshAfterSelection:true
+        	input "info", "bool", title: "Enable info messages in IDE to display actions in Live Logging", required: false, defaultValue: false, refreshAfterSelection:true
+        }    
+    }
+    
+}
+
+def installed(){
+	if (debug) log.debug "Installed called with $settings"
+	init()
+}
+
+def updated(){
+		if (debug) log.debug "Updated called with $settings"
+	unsubscribe()
+	init()
+}
+
+def init(){
+	state.lastStatus = null
+    runIn(60, "temperatureHandler")
+    	if (debug) log.debug "Temperature will be evaluated in one minute"
+     	if(sensor) {
+        	subscribe(sensor, "temperature", temperatureHandler)
+        }
+        else {
+        	subscribe(thermostat, "temperature", temperatureHandler)
+    	}
+    if(modes2){
+    	subscribe(location, modeAwayChange)
+        	if(sensor) {
+            	subscribe(sensor, "temperature", modeAwayTempHandler)
+            }
+            else {
+        		subscribe(thermostat, "temperature", modeAwayTempHandler)
+           	}
+    
+    }
+    if(doors){
+            subscribe(doors, "contact.open", temperatureHandler)
+            subscribe(doors, "contact.closed", doorCheck)
+            state.disabledTemp = null
+    		state.disabledMode = null
+    		state.disableHSP = null 
+    		state.disableCSP = null
+	}
+}
+
+def temperatureHandler(evt) {
+    
+    def currentTemp
+    if(modeOk && daysOk && timeOk && modeNotAwayOk)  {
+    		
+            if(sensor){
+            	//def sensors = sensor.size()
+            	//def tempAVG = sensor ? getAverage(sensor, "temperature") : "undefined device"
+            	//currentTemp = tempAVG
+            	currentTemp = sensor.latestValue("temperature")
+		 if (debug) log.debug "Data check (avg temp: ${currentTemp}, num of sensors:${sensors}, app status: ${lastStatus})"
+            }
+            else {
+            	currentTemp = thermostat.latestValue("temperature")
+                 if (debug) log.debug "Thermostat data (curr temp: ${currentTemp},status: ${lastStatus}"
+            }        
+            if(setLow > setHigh){
+                def temp = setLow
+                	setLow = setHigh
+                	setHigh = temp
+                if(info) log.info "Detected ${setLow} >  ${setHigh}. Auto-adjusting setting to  ${temp}"
+            }         
+            if (doorsOk) {
+           		def currentMode = thermostat.latestValue("thermostatMode")
+                def currentHSP = thermostat.latestValue("heatingSetpoint") 
+                def currentCSP = thermostat.latestValue("coolingSetpoint") 	
+                	if (debug) log.debug "App data (curr temp: ${currentTemp},curr mode: ${currentMode}, currentHSP: ${currentHSP},"+
+                    						" currentCSP: ${currentCSP}, last status: ${lastStatus}"
+                
+                if (currentTemp < setLow) {
+                    if (state.lastStatus == "one" || state.lastStatus == "two" || state.lastStatus == "three" || state.lastStatus == null){
+                        state.lastStatus = "one" 
+                         if (currentMode == "cool" || currentMode == "off") {
+                     		def msg = "Adjusting ${thermostat} operating mode and setpoints because temperature is below ${setLow}"
+                           	if (cold) thermostat?."${cold}"()
+                           	thermostat?.setHeatingSetpoint(SetHeatingLow)
+                           	if (SetCoolingLow) thermostat?.setCoolingSetpoint(SetCoolingLow)
+                           	thermostat?.poll()
+                           	sendMessage(msg)
+                         		if (info) log.info msg
+                        }
+                     	else if  (currentHSP < SetHeatingLow) {
+                            def msg = "Adjusting ${thermostat} setpoints because temperature is below ${setLow}"
+                     		thermostat?.setHeatingSetpoint(SetHeatingLow)
+                     		if (SetCoolingLow) thermostat?.setCoolingSetpoint(SetCoolingLow)
+                            thermostat?.poll()
+                            sendMessage(msg)
+                        		if (info) log.info msg
+                        }
+                    }
+                }                                     
+                if (currentTemp > setHigh) {
+                    if (state.lastStatus == "one" || state.lastStatus == "two" || state.lastStatus == "three" || state.lastStatus == null){
+                        state.lastStatus = "two"
+						if (currentMode == "heat" || currentMode == "off") {
+                            def msg = "Adjusting ${thermostat} operating mode and setpoints because temperature is above ${setHigh}"
+                        	if (hot) thermostat?."${hot}"()
+                        	if (SetHeatingHigh) thermostat?.setHeatingSetpoint(SetHeatingHigh)
+                        	thermostat?.setCoolingSetpoint(SetCoolingHigh)
+                        	thermostat?.poll()
+                        	sendMessage(msg)
+                            	if (info) log.info msg
+                        }
+                        else if (currentCSP > SetCoolingHigh) {
+                            def msg = "Adjusting ${thermostat} setpoints because temperature is above ${setHigh}"
+                    		thermostat?.setCoolingSetpoint(SetCoolingHigh)
+                     		if (SetHeatingHigh) thermostat?.setHeatingSetpoint(SetHeatingHigh)
+                            thermostat?.poll()
+                            sendMessage(msg)   
+                            	if (info) log.info msg
+                       	}
+                   }     
+                }    
+                if (currentTemp > setLow && currentTemp < setHigh) {
+                        if (neutral == true) {
+                            if (debug) log.debug "Neutral is ${neutral}, current temp is: ${currentTemp}"
+                            if (state.lastStatus == "two" || state.lastStatus == "one" || state.lastStatus == null){
+                                def msg = "Adjusting ${thermostat} mode to off because temperature is neutral"
+                                    thermostat?.off()
+                                    thermostat?.poll()
+									sendMessage(msg)
+                                    state.lastStatus = "three"
+                                        if (info) log.info msg
+                                        if (debug) log.debug "Data check neutral(neutral is:${neutral}, currTemp: ${currentTemp}, setLow: ${setLow}, setHigh: ${setHigh})"
+                            }
+                       }
+                						if (info) log.info "Temperature is neutral not taking action because neutral mode is: ${neutral}"      
+                }
+            }
+            else{
+                def delay = (turnOffDelay != null && turnOffDelay != "") ? turnOffDelay * 60 : 60
+               		if(info) log.info ("Detected open doors.  Checking door states again in ${delay} seconds")
+                runIn(delay, "doorCheck")
+            }
+	}
+    	if (debug) log.debug "Temperature handler called: modeOk = $modeOk, daysOk = $daysOk, timeOk = $timeOk, modeNotAwayOk = $modeNotAwayOk "
+}
+
+def modeAwayChange(evt){ 
+	if(modeOk && daysOk && timeOk){
+    	if (modes2){
+            if(modes2.contains(location.mode)){
+                    state.lastStatus = "away"
+                    if (away) thermostat."${away}"()             
+                    if(SetHeatingAway) thermostat.setHeatingSetpoint(SetHeatingAway)
+                    if(SetCoolingAway) thermostat.setCoolingSetpoint(SetCoolingAway)
+                    if(fanAway) thermostat.setThermostatFanMode(fanAway)
+                    def msg = "Adjusting ${thermostat} mode and setpoints because Location Mode is set to Away"   
+                    sendMessage(msg) 
+                    if(info) log.info "Running AwayChange because mode is now ${away} and last staus is ${lastStatus}"
+            }
+            else  {
+        			state.lastStatus = null
+                    temperatureHandler()
+                    if(info) log.info "Running Temperature Handler because Home Mode is no longer in away, and the last staus is ${lastStatus}"
+			}
+     	}
+					if(info) log.info ("Detected temperature change while away but all settings are ok, not taking any actions.")
+    }
+}
+
+def modeAwayTempHandler(evt) {
+	def tempAVGaway = sensor ? getAverage(sensor, "temperature") : "undefined device"
+	def currentAwayTemp = thermostat.latestValue("temperature")
+	
+    	if(info) log.info "Away: your average room temperature is:  ${tempAVGaway}, current temp is  ${currentAwayTemp}"
+		if (sensor) currentAwayTemp = tempAVGaway		
+        if(lastStatus == "away"){
+        	if(modes2.contains(location.mode)){
+           		if (currentAwayTemp < setAwayLow) {
+					if(Awaycold) thermostat?."${Awaycold}"()
+                    thermostat?.poll()
+                    def msg = "I changed your ${thermostat} mode to ${Awaycold} because temperature is below ${setAwayLow}"
+                    sendMessage(msg)
+                    	if (info) log.info msg
+  				}
+				if (currentAwayTemp > setHigh) {
+					if(Awayhot) thermostat?."${Awayhot}"()
+                    thermostat?.poll()
+					def msg = "I changed your ${thermostat} mode to ${Awayhot} because temperature is above ${setAwayHigh}"
+                    sendMessage(msg)
+                    	if (info) log.info msg
+  				}
+             }
+			else {
+        			state.lastStatus = null
+            		temperatureHandler()
+            		if(info) log.info "Temp changed while staus is ${lastStatus} but the Location Mode is no longer in away. Resetting lastStatus"
+        	}
+	}
+}
+
+def doorCheck(evt){	
+        state.disabledTemp = sensor.latestValue("temperature")
+       	state.disabledMode = thermostat.latestValue("thermostatMode")
+       	state.disableHSP = thermostat.latestValue("heatingSetpoint") 
+        state.disableCSP = thermostat.latestValue("coolingSetpoint") 
+		if (debug) log.debug "Disable settings: ${state.disabledMode} mode, ${state.disableHSP} HSP, ${state.disableCSP} CSP"
+    if (!doorsOk){
+		if(info) log.info ("doors still open turning off ${thermostat}")
+		def msg = "I changed your ${thermostat} mode to off because some doors are open"
+        if (state.lastStatus != "off"){
+        	thermostat?.off()
+			sendMessage(msg)
+            	if (info) log.info msg
+		}
+		state.lastStatus = "off"
+        		if (info) log.info "Changing status to off"
+	}
+	else {
+    	if (state.lastStatus == "off"){
+			state.lastStatus = null
+		    if (resetOff){
+               if(debug) log.debug "Contact sensor(s) are now closed restoring ${thermostat} with settings: ${state.disabledMode} mode"+
+               ", ${state.disableHSP} HSP, ${state.disableCSP} CSP"
+                thermostat."${state.disabledMode}"()             
+                thermostat.setHeatingSetpoint(state.disableHSP)
+                thermostat.setCoolingSetpoint(state.disableCSP) 		    
+	    	}
+        }
+        temperatureHandler()
+        	if(debug) "Calling Temperature Handler"
+	}
+}
+
+private getAverage(device,type){
+	def total = 0
+		if(debug) log.debug "calculating average temperature"  
+    device.each {total += it.latestValue(type)}
+    return Math.round(total/device.size())
+}
+
+private void sendText(number, message) {
+    if (sms) {
+        def phones = sms.split("\\;")
+        for (phone in phones) {
+            sendSms(phone, message)
+            
+        }
+    }
+}
+
+private void sendMessage(message) {
+    if(info) log.info "sending notification:  ${message}"
+    if (recipients) { 
+        sendNotificationToContacts(message, recipients)
+    if(debug) log.debug "sending notification:  ${recipients}"    
+    }
+    if (push) {
+        sendPush message
+            if(info) log.info "sending push notification"
+    } else {
+            sendNotificationEvent(message)
+             if(info) log.info "sending notification"
+    }
+    if (sms) {
+        sendText(sms, message)
+        if(debug) "Calling process to send text"
+    }
+}
+            
+
+private getAllOk() {
+	modeOk && daysOk && timeOk && doorsOk && modeNotAwayOk
+}
+
+private getModeOk() {
+	def result = !modes || modes.contains(location.mode)
+		if(debug) log.debug "modeOk = $result"
+	result
+}
+
+private getModeNotAwayOk() {
+	def result = !modes2 || !modes2.contains(location.mode)
+		if(debug) log.debug "modeNotAwayOk = $result"
+	result
+}
+
+private getDoorsOk() {
+	def result = !doors || !doors.latestValue("contact").contains("open")
+		if(debug) log.debug "doorsOk = $result"
+	result
+}
+
+
+private getDaysOk() {
+	def result = true
+	if (days) {
+		def df = new java.text.SimpleDateFormat("EEEE")
+		if (location.timeZone) {
+			df.setTimeZone(location.timeZone)
+		}
+		else {
+			df.setTimeZone(TimeZone.getTimeZone("America/New_York"))
+		}
+		def day = df.format(new Date())
+		result = days.contains(day)
+	}
+	if(debug) log.debug "daysOk = $result"
+	result
+}
+
+private getTimeOk() {
+	def result = true
+	if (starting && ending) {
+		def currTime = now()
+		def start = timeToday(starting).time
+		def stop = timeToday(ending).time
+		result = start < stop ? currTime >= start && currTime <= stop : currTime <= stop || currTime >= start
+	}
+    
+    else if (starting){
+    	result = currTime >= start
+    }
+    else if (ending){
+    	result = currTime <= stop
+    }
+    
+		if(debug) log.debug "timeOk = $result"
+	result
+}
+
+def getTimeLabel(starting, ending){
+
+	def timeLabel = "Tap to set"
+	
+    if(starting && ending){
+    	timeLabel = "Between" + " " + hhmm(starting) + " "  + "and" + " " +  hhmm(ending)
+    }
+    else if (starting) {
+		timeLabel = "Start at" + " " + hhmm(starting)
+    }
+    else if(ending){
+    timeLabel = "End at" + hhmm(ending)
+    }
+	timeLabel
+}
+
+private hhmm(time, fmt = "h:mm a")
+{
+	def t = timeToday(time, location.timeZone)
+	def f = new java.text.SimpleDateFormat(fmt)
+	f.setTimeZone(location.timeZone ?: timeZone(time))
+	f.format(t)
+}
+def greyedOut(){
+	def result = ""
+    if (sensor) {
+    	result = "complete"	
+    }
+    result
+}
+
+def greyedOutTherm(){
+	def result = ""
+    if (thermostat) {
+    	result = "complete"	
+    }
+    result
+}
+
+
+def greyedOutTherm2(){
+	def result = ""
+    if (modes2) {
+    	result = "complete"	
+    }
+    result
+}
+
+def greyedOutSettings(){
+	def result = ""
+    if (starting || ending || days || modes || push) {
+    	result = "complete"	
+    }
+    result
+}
+
+def greyedOutTime(starting, ending){
+	def result = ""
+    if (starting || ending) {
+    	result = "complete"	
+    }
+    result
+}
+
+private anyoneIsHome() {
+  def result = false
+
+  if(people.findAll { it?.currentPresence == "present" }) {
+    result = true
+  }
+
+	 if(debug) log.debug("anyoneIsHome: ${result}")
+
+  return result
+}
+
+
+
+
+page(name: "timeIntervalInput", title: "Only during a certain time", refreshAfterSelection:true) {
+		section {
+			input "starting", "time", title: "Starting (both are required)", required: false 
+			input "ending", "time", title: "Ending (both are required)", required: false 
+		}
+        }
--- a/smartapps/gideon-api/gideon-smart-home.src/gideon-smart-home.groovy
+++ b/smartapps/gideon-api/gideon-smart-home.src/gideon-smart-home.groovy
@@ -765,7 +765,6 @@ def turnOffSwitch() {
        } else {
            
            device.off();
-                  
            return [Device_id: params.id, result_action: "200"]
        }
 }
@@ -789,6 +788,7 @@ def getTempSensorsStatus(id) {
            return []
        } else {
        	def bat = getBatteryStatus(device.id)
-        	return [temperature: device.currentValue('temperature')] + bat
+            def scale = [Scale: location.temperatureScale]
+        	return [temperature: device.currentValue('temperature')] + bat + scale
   		}
-   }
+   }
--- a/smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy
+++ b/smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy
@@ -162,6 +162,17 @@ def registerAllDeviceSubscriptions() {
 	registerChangeHandler(inputs)
 }

+//Subscribe to events from a list of devices
+def registerChangeHandler(myList) {
+	myList.each { myDevice ->
+		def theAtts = myDevice.supportedAttributes
+		theAtts.each { att ->
+			subscribe(myDevice, att.name, deviceEventHandler)
+			log.info "Registering for ${myDevice.displayName}.${att.name}"
+		}
+	}
+}
+
 //Endpoints function: Subscribe to events from a specific device
 def registerDeviceChange() {
 	def subscriptionEndpt = params.subscriptionURL
--- a/smartapps/smartthings/smart-nightlight.src/smart-nightlight.groovy
+++ b/smartapps/smartthings/smart-nightlight.src/smart-nightlight.groovy
@@ -98,7 +98,7 @@ def motionHandler(evt) {
 	else {
 		state.motionStopTime = now()
 		if(delayMinutes) {
-			runIn(delayMinutes*60, turnOffMotionAfterDelay, [overwrite: false])
+			runIn(delayMinutes*60, turnOffMotionAfterDelay, [overwrite: true])
 		} else {
 			turnOffMotionAfterDelay()
 		}
--- a/smartapps/tslagle13/hello-home-phrase-director.src/hello-home-phrase-director.groovy
+++ b/smartapps/tslagle13/hello-home-phrase-director.src/hello-home-phrase-director.groovy
@@ -125,19 +125,19 @@
      if(allOk) {
    
      if(everyoneIsAway() && (state.sunMode == "sunrise")) {
-        log.info("Home is Empty  Setting New Away Mode")
+        log.debug("Home is Empty  Setting New Away Mode")
        def delay = (falseAlarmThreshold != null && falseAlarmThreshold != "") ? falseAlarmThreshold * 60 : 10 * 60 
        runIn(delay, "setAway")
      }
    
      if(everyoneIsAway() && (state.sunMode == "sunset")) {
-        log.info("Home is Empty  Setting New Away Mode")
+        log.debug("Home is Empty  Setting New Away Mode")
        def delay = (falseAlarmThreshold != null && falseAlarmThreshold != "") ? falseAlarmThreshold * 60 : 10 * 60 
        runIn(delay, "setAway")
      }
      
      else {
-      log.info("Home is Occupied Setting New Home Mode")
+      log.debug("Home is Occupied Setting New Home Mode")
      setHome()
    
    
@@ -152,7 +152,7 @@
        log.debug("Checking if everyone is away")
    
        if(everyoneIsAway()) {
-          log.info("Nobody is home, running away sequence")
+          log.debug("Nobody is home, running away sequence")
          def delay = (falseAlarmThreshold != null && falseAlarmThreshold != "") ? falseAlarmThreshold * 60 : 10 * 60 
          runIn(delay, "setAway")
        }
@@ -161,7 +161,7 @@
    else {
    	def lastTime = state[evt.deviceId]
        if (lastTime == null || now() - lastTime >= 1 * 60000) {
-      		log.info("Someone is home, running home sequence")
+      		log.debug("Someone is home, running home sequence")
      		setHome()
        }    
    	state[evt.deviceId] = now()
@@ -175,14 +175,14 @@
      if(everyoneIsAway()) {
        if(state.sunMode == "sunset") {
          def message = "Performing \"${awayNight}\" for you as requested."
-          log.info(message)
+          log.debug(message)
          sendAway(message)
          location.helloHome.execute(settings.awayNight)
        }
        
        else if(state.sunMode == "sunrise") {
          def message = "Performing \"${awayDay}\" for you as requested."
-          log.info(message)
+          log.debug(message)
          sendAway(message)
          location.helloHome.execute(settings.awayDay)
          }
@@ -192,19 +192,19 @@
      }
    
      else {
-        log.info("Somebody returned home before we set to '${newAwayMode}'")
+        log.debug("Somebody returned home before we set to '${newAwayMode}'")
      }
    }
    
    //set home mode when house is occupied
    def setHome() {
    sendOutOfDateNotification()
-    log.info("Setting Home Mode!!")
+    log.debug("Setting Home Mode!!")
    if(anyoneIsHome()) {
          if(state.sunMode == "sunset"){
          if (location.mode != "${homeModeNight}"){
          def message = "Performing \"${homeNight}\" for you as requested."
-            log.info(message)
+            log.debug(message)
            sendHome(message)
            location.helloHome.execute(settings.homeNight)
            }
@@ -213,7 +213,7 @@
          if(state.sunMode == "sunrise"){
          if (location.mode != "${homeModeDay}"){
          def message = "Performing \"${homeDay}\" for you as requested."
-            log.info(message)
+            log.debug(message)
            sendHome(message)
            location.helloHome.execute(settings.homeDay)
                }
@@ -329,4 +329,4 @@
        	sendNotification("Your version of Hello, Home Phrase Director is currently out of date. Please look for the new version of Hello, Home Phrase Director now called 'Routine Director' in the marketplace.")
        	state.lastTime = (new Date() + 31).getTime()
        }
-    }
+    }
Author	SHA1	Message	Date
ADAM ESTABROOK	42da9e9433	MSA-1998: ZWave Thermostat Manager	2017-05-22 19:34:20 -07:00
Vinay Rao	21f7a00cc9	Merge pull request #2026 from unixbeast/DVCSMP-2672 DVCSMP-2672 updating read attribute for valve capability	2017-05-22 17:59:00 -07:00
Dave Hastings	06faa988c8	DVCSMP-2672 updating read attribute for valve capability updating tile for fortrezz	2017-05-22 17:57:54 -07:00
Vinay Rao	fe5f5c35b2	Merge pull request #2025 from SmartThingsCommunity/staging Rolling down staging to master	2017-05-22 17:44:28 -07:00
Vinay Rao	2c4cd8d922	Merge pull request #2003 from unixbeast/icp_781 ICP-781 Fixing DTH for valve capability	2017-05-22 15:23:57 -07:00
Dave Hastings	772cd7005a	ICP-781 Fixing DTH for valve capability Making suggested fixes making fixes fixing to correctly use createEvent fixing DTH Also adding the fortrezz water valve refactoring a bit adding back in debug messages updating ocf device type adding zigbee water valve refactor	2017-05-22 15:22:18 -07:00
Vinay Rao	afb4755447	Merge pull request #2022 from dkirker/ICP-951 ICP-951 Add deviceJoinName for Aeon Panic Button	2017-05-22 11:53:42 -07:00
Vinay Rao	49f35e48da	Merge pull request #2018 from jackchi/zwave-lock-wwst-naming [ICP-975] Proper WWST Z-Wave Lock names	2017-05-22 11:50:33 -07:00
Donald Kirker	93d8e96efc	ICP-951 Add deviceJoinName for Aeon Panic Button Also properly report 1 button for Aeon Panic Button	2017-05-22 11:45:27 -07:00
jackchi	6fbaf15f42	[CP-975] Proper WWST Z-Wave Lock names	2017-05-22 11:41:54 -07:00
Aaron Miller	d7b448b699	Merge pull request #2016 from aaron-miller/DVCSMP-2665 DVCSMP-2665 Prevent 'Smart Nightlight' from over scheduling	2017-05-22 09:24:22 -05:00
Aaron Miller	9285536f73	Merge pull request #2013 from aaron-miller/DVCSMP-2659 DVCSMP-2659 Reduce Hello Home Phrase Detector Logs	2017-05-22 09:23:22 -05:00
Aaron Miller	e7713caec9	DVCSMP-2665 Prevent 'Smart Nightlight' from over scheduling	2017-05-19 14:09:08 -05:00
Vinay Rao	5b2a46300d	Merge pull request #1539 from skt123/ct100 [CHF-481] Health Check Implementation for CT100 Programmable Thermostat.	2017-05-18 23:49:06 -07:00
Vinay Rao	c8b4b7be1c	Merge pull request #2014 from jackchi/wwst-proper-names [DVCSMP-2664] WWST Proper Naming	2017-05-18 16:00:39 -07:00
jackchi	20f1493788	[DVCSMP-2664] WWST Proper Naming	2017-05-18 14:47:46 -07:00
Aaron Miller	f0de2f1a19	DVCSMP-2659 Reduce Hello Home Phrase Detector Logs	2017-05-18 09:56:17 -05:00
sushant.k1	d41162afe4	[CHF-481] Added Health Check Implementation for CT100 Programmable Thermostat.	2017-05-18 18:36:57 +05:30
Vinay Rao	19d9406b6a	Merge pull request #2010 from parijatdas/aeon-multisensor-6 [CHF-610] Health Check Aeon MultiSensor 6	2017-05-17 22:54:30 -07:00
Vinay Rao	a6d52ab9ac	Merge pull request #1996 from SmartThingsCommunity/dth-ux-remaining-staging [DVCSMP-2607] Standardize remaining SmartThingsPublic ON/CLOSED/TAMPERED & ACTIVE/INACTIVE state colors	2017-05-17 22:54:07 -07:00
Jack Chi	01c2968f91	Merge pull request #1834 from parijatdas/zwave_water_valve [CHF-569] Health Check zwave-water-valve	2017-05-17 17:05:10 -07:00
jackchi	483a25e900	[DVCSMP-2607] Standardize remaining SmartThingsPublic ON/CLOSED/TAMPERED & OPEN state colors	2017-05-17 16:19:40 -07:00
Vinay Rao	0d9a08e922	Merge pull request #2007 from SmartThingsCommunity/master Rolling up master to staging	2017-05-16 15:47:08 -07:00
Vinay Rao	40b75ce665	Merge pull request #2006 from SmartThingsCommunity/staging Rolling down staging to master	2017-05-16 15:37:10 -07:00
Vinay Rao	9b01a7d8be	Merge pull request #2004 from SmartThingsCommunity/production Rolling down production to staging	2017-05-16 14:37:15 -07:00
Parijat Das	12bb6c0492	Added health-check for Z-wave Water Valve	2017-05-16 12:26:48 +05:30
Parijat Das	9e3a6e830f	Added health-check for Aeon Labs Multisensor 6	2017-05-16 12:16:01 +05:30
Vinay Rao	7cf8bb1917	Merge pull request #1998 from larsfinander/DVCSMP-2656_OpenT2T_Update_to_5_5_submission_staging DVCSMP-2656 OpenT2T: Update to 5/15 submission	2017-05-15 12:31:34 -07:00
Lars Finander	d4fd778a64	DVCSMP-2656 OpenT2T: Update to 5/15 submission	2017-05-15 13:25:44 -06:00
Jack Chi	eb870e5f31	Merge pull request #1943 from parijatdas/smartalert_siren [CHF-590] Fixed typo error	2017-05-15 10:47:25 -07:00
Vinay Rao	d60657e466	Merge pull request #1992 from dkirker/production PROB-1615: Add SYLVANIA Smart 10-Year A19 bulb fingerprint	2017-05-11 15:08:13 -07:00
Donald Kirker	d8dc70ae9e	PROB-1615 Add SYLVANIA Smart 10-Year A19 bulb fingerprint	2017-05-11 14:03:24 -07:00
Vinay Rao	3457bbad42	Merge pull request #1991 from tslagle13/gideon-change [MSA-1968] - Publish gideon smarthome changes	2017-05-11 11:12:30 -07:00
tslagle13	c6c4b09fbb	[MSA-1968] - Publish gideon smarthome changes small change to sensor readings	2017-05-11 11:06:44 -07:00
Vinay Rao	7e25d32c70	Merge pull request #1990 from SmartThingsCommunity/master Rolling up master to staging	2017-05-09 16:04:19 -05:00
Vinay Rao	abc5683ed3	Merge pull request #1988 from SmartThingsCommunity/staging Rolling up staging to production	2017-05-09 13:46:13 -05:00
Parijat Das	1d629cfc9a	Fixed typo in README url	2017-04-25 11:50:10 +05:30