DHF-7 Z-Wave Lock: Add scheduled checks in case ping() is missed

NVS-6

devicetypes/fibargroup/fibaro-motion-sensor-zw5.src/fibaro-motion-sensor-zw5.groovy

@@ -24,7 +24,10 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Health Check"
 
-        fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x20, 0x86, 0x72, 0x5A, 0x59, 0x85, 0x73, 0x84, 0x80, 0x71, 0x56, 0x70, 0x31, 0x8E, 0x22, 0x30, 0x9C, 0x98, 0x7A", outClusters: ""
+		fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x20, 0x86, 0x72, 0x5A, 0x59, 0x85, 0x73, 0x84, 0x80, 0x71, 0x56, 0x70, 0x31, 0x8E, 0x22, 0x30, 0x9C, 0x98, 0x7A", outClusters: ""
+
+		fingerprint mfr:"010F", prod:"0801", model:"2001"
+		fingerprint mfr:"010F", prod:"0801", model:"1001"
 	}
 
 	simulator {

devicetypes/smartthings/everspring-illuminance-sensor.src/everspring-illuminance-sensor.groovy

@@ -0,0 +1,163 @@
+/**
+ *  Copyright 2017 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.
+ *
+ *  Everspring ST815 Illuminance Sensor
+ *
+ *  Author: SmartThings
+ *  Date: 2017-3-4
+ */
+
+metadata {
+	definition (name: "Everspring Illuminance Sensor", namespace: "smartthings", author: "SmartThings") {
+		capability "Illuminance Measurement"
+		capability "Battery"
+		capability "Configuration"
+		capability "Sensor"
+		capability "Health Check"
+
+		fingerprint mfr:"0060", prod:"0007", model:"0001"
+	}
+
+	simulator {
+		for( int i = 0; i <= 100; i += 20 ) {
+			status "illuminace ${i} lux": new physicalgraph.zwave.Zwave().sensorMultilevelV2.sensorMultilevelReport(
+				scaledSensorValue: i, precision: 0, sensorType: 3, scale: 1).incomingMessage()
+		}
+
+		for( int i = 0; i <= 100; i += 20 ) {
+			status "battery ${i}%": new physicalgraph.zwave.Zwave().batteryV1.batteryReport(
+				batteryLevel: i).incomingMessage()
+		}
+
+		status "wakeup":  "command: 8407, payload: "
+	}
+
+	tiles(scale: 2) {
+		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
+			state "temperature", label:'${currentValue}°',
+			backgroundColors:[
+				[value: 32, color: "#153591"],
+				[value: 44, color: "#1e9cbb"],
+				[value: 59, color: "#90d2a7"],
+				[value: 74, color: "#44b621"],
+				[value: 84, color: "#f1d801"],
+				[value: 92, color: "#d04e00"],
+				[value: 98, color: "#bc2323"]
+			]
+		}
+		valueTile("humidity", "device.humidity", inactiveLabel: false, width: 2, height: 2) {
+			state "humidity", label:'${currentValue}% humidity', unit:""
+		}
+		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+			state "battery", label:'${currentValue}% battery', unit:""
+		}
+
+		main( ["temperature", "humidity"] )
+		details( ["temperature", "humidity", "battery"] )
+	}
+}
+
+def updated() {
+	state.configured = false
+}
+
+def parse(String description) {
+	def result = []
+
+	def cmd = zwave.parse(description, [0x20: 1, 0x31: 2, 0x70: 1, 0x71: 1, 0x80: 1, 0x84: 2, 0x85: 2])
+
+	if (cmd) {
+		result = zwaveEvent(cmd)
+	}
+
+	if (result instanceof List) {
+		log.debug "Parsed '$description' to ${result.collect { it.respondsTo("toHubAction") ? it.toHubAction() : it }}"
+	} else {
+		log.debug "Parsed '$description' to ${result}"
+	}
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd) {
+	def result = [
+		createEvent(descriptionText: "${device.displayName} woke up", isStateChange: false)
+	]
+	if (state.configured) {
+		result << response(zwave.batteryV1.batteryGet())
+	} else {
+		result << response(configure())
+	}
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.alarmv1.AlarmReport cmd) {
+	if (cmd.alarmType == 1 && cmd.alarmType == 0xFF) {
+		return createEvent(descriptionText: "${device.displayName} battery is low", isStateChange: true)
+	} else if (cmd.alarmType == 2 && cmd.alarmLevel == 1) {
+		return createEvent(descriptionText: "${device.displayName} powered up", isStateChange: false)
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv2.SensorMultilevelReport cmd) {
+
+	def map = [:]
+	switch( cmd.sensorType ) {
+		case 3:
+			// luminance
+			map.value = cmd.scaledSensorValue.toInteger().toString()
+			map.unit = "lux"
+			map.name = "illuminance"
+			break;
+	}
+	
+	return createEvent(map)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
+	def map = [ name: "battery", unit: "%" ]
+	if (cmd.batteryLevel == 0xFF) {
+		map.value = 1
+		map.descriptionText = "${device.displayName} has a low battery"
+		map.isStateChange = true
+	} else {
+		map.value = cmd.batteryLevel
+	}
+
+	def response_cmds  = []
+	if (!currentTemperature) {
+		response_cmds << zwave.sensorMultilevelV2.sensorMultilevelGet().format()
+		response_cmds << "delay 1000"
+	}
+	response_cmds << zwave.wakeUpV1.wakeUpNoMoreInformation().format()
+
+	return [createEvent(map), response(response_cmds)]
+}
+
+def zwaveEvent(physicalgraph.zwave.Command cmd) {
+	log.debug "Unhandled: ${cmd.toString()}"
+	return [:]
+}
+
+def configure() {
+	state.configured = true
+	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	delayBetween([
+		// Auto report time interval in minutes
+		zwave.configurationV1.configurationSet(parameterNumber: 5, size: 2, scaledConfigurationValue: 20).format(),
+
+		// Auto report lux change threshold
+		zwave.configurationV1.configurationSet(parameterNumber: 6, size: 2, scaledConfigurationValue: 30).format(),
+
+		// Get battery – report triggers WakeUpNMI
+		zwave.batteryV1.batteryGet().format()
+	]) 
+}

devicetypes/smartthings/everspring-st814.src/everspring-st814.groovy

@@ -0,0 +1,188 @@
+/**
+ *  Copyright 2017 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.
+ *
+ *  Everspring ST814 Temperature/Humidity Sensor
+ *
+ *  Author: SmartThings
+ *  Date: 2017-3-4
+ */
+
+metadata {
+	definition (name: "Everspring ST814", namespace: "smartthings", author: "SmartThings") {
+		capability "Temperature Measurement"
+		capability "Relative Humidity Measurement"
+		capability "Battery"
+		capability "Configuration"
+		capability "Sensor"
+		capability "Health Check"
+
+		fingerprint mfr:"0060", prod:"0006", model:"0001"
+	}
+
+	simulator {
+		for( int i = 0; i <= 100; i += 20 ) {
+			status "temperature ${i}F": new physicalgraph.zwave.Zwave().sensorMultilevelV2.sensorMultilevelReport(
+				scaledSensorValue: i, precision: 1, sensorType: 1, scale: 1).incomingMessage()
+		}
+
+		for( int i = 0; i <= 100; i += 20 ) {
+			status "humidity ${i}%": new physicalgraph.zwave.Zwave().sensorMultilevelV2.sensorMultilevelReport(
+				scaledSensorValue: i, precision: 0, sensorType: 5).incomingMessage()
+		}
+
+		for( int i = 0; i <= 100; i += 20 ) {
+			status "battery ${i}%": new physicalgraph.zwave.Zwave().batteryV1.batteryReport(
+				batteryLevel: i).incomingMessage()
+		}
+		status "wakeup":  "command: 8407, payload: "
+	}
+
+	tiles(scale: 2) {
+		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
+			state "temperature", label:'${currentValue}°',
+			backgroundColors:[
+				[value: 32, color: "#153591"],
+				[value: 44, color: "#1e9cbb"],
+				[value: 59, color: "#90d2a7"],
+				[value: 74, color: "#44b621"],
+				[value: 84, color: "#f1d801"],
+				[value: 92, color: "#d04e00"],
+				[value: 98, color: "#bc2323"]
+			]
+		}
+		valueTile("humidity", "device.humidity", inactiveLabel: false, width: 2, height: 2) {
+			state "humidity", label:'${currentValue}% humidity', unit:""
+		}
+		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+			state "battery", label:'${currentValue}% battery', unit:""
+		}
+
+		main( ["temperature", "humidity"] )
+		details( ["temperature", "humidity", "battery"] )
+	}
+}
+
+def updated() {
+	state.configured = false
+}
+
+def parse(String description) {
+	def result = []
+
+	def cmd = zwave.parse(description, [0x20: 1, 0x31: 2, 0x70: 1, 0x71: 1, 0x80: 1, 0x84: 2, 0x85: 2])
+
+	if (cmd) {
+		result = zwaveEvent(cmd)
+	}
+
+	if (result instanceof List) {
+		log.debug "Parsed '$description' to ${result.collect { it.respondsTo("toHubAction") ? it.toHubAction() : it }}"
+	} else {
+		log.debug "Parsed '$description' to ${result}"
+	}
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd) {
+	def result = [
+		createEvent(descriptionText: "${device.displayName} woke up", isStateChange: false)
+	]
+	if (state.configured) {
+		result << response(zwave.batteryV1.batteryGet())
+	} else {
+		result << response(configure())
+	}
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.alarmv1.AlarmReport cmd) {
+	if (cmd.alarmType == 1 && cmd.alarmType == 0xFF) {
+		return createEvent(descriptionText: "${device.displayName} battery is low", isStateChange: true)
+	} else if (cmd.alarmType == 2 && cmd.alarmLevel == 1) {
+		return createEvent(descriptionText: "${device.displayName} powered up", isStateChange: false)
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv2.SensorMultilevelReport cmd) {
+
+	def map = [:]
+	switch( cmd.sensorType ) {
+		case 1:
+			/* temperature */
+			def cmdScale = cmd.scale == 1 ? "F" : "C"
+			map.value = convertTemperatureIfNeeded(cmd.scaledSensorValue, cmdScale, cmd.precision)
+			map.unit = getTemperatureScale()
+			map.name = "temperature"
+			break
+		case 5:
+			/* humidity */
+			map.value = cmd.scaledSensorValue.toInteger().toString()
+			map.unit = "%"
+			map.name = "humidity"
+			break
+	}
+	
+	return createEvent(map)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
+	def map = [ name: "battery", unit: "%" ]
+	if (cmd.batteryLevel == 0xFF) {
+		map.value = 1
+		map.descriptionText = "${device.displayName} has a low battery"
+		map.isStateChange = true
+	} else {
+		map.value = cmd.batteryLevel
+	}
+
+	def response_cmds  = []
+	if (!currentTemperature) {
+		response_cmds << zwave.sensorMultilevelV2.sensorMultilevelGet().format()
+		response_cmds << "delay 1000"
+	}
+	response_cmds << zwave.wakeUpV1.wakeUpNoMoreInformation().format()
+
+	return [createEvent(map), response(response_cmds)]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.multichannelv3.MultiChannelCmdEncap cmd) {
+	def result = null
+	def encapsulatedCommand = cmd.encapsulatedCommand([0x20: 1, 0x31: 2, 0x70: 1, 0x71: 1, 0x80: 1, 0x84: 2, 0x85: 2])
+	log.debug ("Command from endpoint ${cmd.sourceEndPoint}: ${encapsulatedCommand}")
+	if (encapsulatedCommand) {
+		result = zwaveEvent(encapsulatedCommand)
+	}
+	result
+}
+
+def zwaveEvent(physicalgraph.zwave.Command cmd) {
+	log.debug "Unhandled: ${cmd.toString()}"
+	return [:]
+}
+
+def configure() {
+	state.configured = true
+	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	delayBetween([
+		// Auto report time interval in minutes
+		zwave.configurationV1.configurationSet(parameterNumber: 6, size: 2, scaledConfigurationValue: 20).format(),
+
+		// Auto report temperature change threshold
+		zwave.configurationV1.configurationSet(parameterNumber: 7, size: 1, scaledConfigurationValue: 2).format(),
+
+		// Auto report humidity change threshold
+		zwave.configurationV1.configurationSet(parameterNumber: 8, size: 1, scaledConfigurationValue: 5).format(),
+
+		// Get battery – report triggers WakeUpNMI
+		zwave.batteryV1.batteryGet().format()
+	]) 
+}

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

@@ -47,14 +47,14 @@
 		capability 	"Sensor"
 		capability 	"Battery"
 		capability  "Health Check"
+		command "resetParams2StDefaults"
+		command "listCurrentParams"
+		command "updateZwaveParam"
+		command "test"
+		command "configure"
 
-        command		"resetParams2StDefaults"
+		fingerprint mfr:"010F", prod:"0800", model:"2001"
-        command		"listCurrentParams"
+		fingerprint mfr:"010F", prod:"0800", model:"1001"
-        command		"updateZwaveParam"
-        command		"test"
-        command		"configure"
-
-		fingerprint deviceId: "0x2001", inClusters: "0x30,0x84,0x85,0x80,0x8F,0x56,0x72,0x86,0x70,0x8E,0x31,0x9C,0xEF,0x30,0x31,0x9C"
 	}
 
 	simulator {

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

@@ -178,7 +178,7 @@ private List<Map> handleAcceleration(descMap) {
 			result += parseAxis(descMap.additionalAttrs)
 		}
 	} else if (descMap.clusterInt == 0xFC02 && descMap.attrInt == 0x0012) {
-		def addAttrs = descMap.additionalAttrs
+		def addAttrs = descMap.additionalAttrs ?: []
 		addAttrs << ["attrInt": descMap.attrInt, "value": descMap.value]
 		result += parseAxis(addAttrs)
 	}

devicetypes/smartthings/zwave-device-multichannel.src/zwave-device-multichannel.groovy

@@ -75,6 +75,10 @@ def parse(String description) {
 	return result
 }
 
+def uninstalled() {
+	sendEvent(name: "epEvent", value: "delete all", isStateChange: true, displayed: false, descriptionText: "Delete endpoint devices")
+}
+
 def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd) {
 	[ createEvent(descriptionText: "${device.displayName} woke up", isStateChange:true),
 	  response(["delay 2000", zwave.wakeUpV1.wakeUpNoMoreInformation().format()]) ]

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

@@ -152,6 +152,10 @@ def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityCommandsSupported
 
 def zwaveEvent(DoorLockOperationReport cmd) {
 	def result = []
+
+	unschedule(followupStateCheck)
+	unschedule(stateCheck)
+
 	def map = [ name: "lock" ]
 	if (cmd.doorLockMode == 0xFF) {
 		map.value = "locked"
@@ -365,7 +369,7 @@ def zwaveEvent(UserCodeReport cmd) {
 			code = state["set$name"] ?: decrypt(state[name]) ?: "****"
 			state.remove("set$name".toString())
 		} else {
-			map = [ name: "codeReport", value: cmd.userIdentifier, data: [ code: code ] ]
+			map = [ name: "codeReport", value: cmd.userIdentifier, data: [ code: code ], isStateChange: true ]
 			map.descriptionText = "$device.displayName code $cmd.userIdentifier is set"
 			map.displayed = (cmd.userIdentifier != state.requestCode && cmd.userIdentifier != state.pollCode)
 			map.isStateChange = true
@@ -456,11 +460,12 @@ def zwaveEvent(physicalgraph.zwave.commands.timev1.TimeGet cmd) {
 def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd) {
 	// The old Schlage locks use group 1 for basic control - we don't want that, so unsubscribe from group 1
 	def result = [ createEvent(name: "lock", value: cmd.value ? "unlocked" : "locked") ]
-	result << response(zwave.associationV1.associationRemove(groupingIdentifier:1, nodeId:zwaveHubNodeId))
+	def cmds = [
-	if (state.assoc != zwaveHubNodeId) {
+			zwave.associationV1.associationRemove(groupingIdentifier:1, nodeId:zwaveHubNodeId).format(),
-		result << response(zwave.associationV1.associationGet(groupingIdentifier:2))
+			"delay 1200",
-	}
+			zwave.associationV1.associationGet(groupingIdentifier:2).format()
-	result
+		]
+	[result, response(cmds)]
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
@@ -530,11 +535,18 @@ def unlockwtimeout() {
 	lockAndCheck(DoorLockOperationSet.DOOR_LOCK_MODE_DOOR_UNSECURED_WITH_TIMEOUT)
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
 def ping() {
-	refresh()
+	runIn(30, followupStateCheck)
+	secure(zwave.doorLockV1.doorLockOperationGet())
+}
+
+def followupStateCheck() {
+	runEvery1Hour(stateCheck)
+	stateCheck()
+}
+
+def stateCheck() {
+	sendHubCommand(new physicalgraph.device.HubAction(secure(zwave.doorLockV1.doorLockOperationGet())))
 }
 
 def refresh() {

smartapps/bd/zwave-thermostat-manager.src/zwave-thermostat-manager.groovy

@@ -1,794 +0,0 @@
-/**
- *  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 
-		}
-        }