MSA-2127: Fibaro Door/ Window 2 is a new contact sensor that was released in Europe in June 2017 and will be released in the USA on August 1st.

D/W 2 has integrated temperature sensor and we revised how parameters are adjusted.

devicetypes/fibargroup/fibaro-door-window-sensor-2.src/fibaro-door-window-sensor-2.groovy

@@ -0,0 +1,462 @@
+/**
+ *  Fibaro Door/Window Sensor 2
+ *
+ *  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 Door/Window Sensor 2", namespace: "Fibargroup", author: "Fibar Group S.A.") {	
+		capability "Contact Sensor"
+		capability "Tamper Alert"
+		capability "Temperature Measurement"
+		capability "Configuration"
+		capability "Battery"
+		capability "Sensor"
+		capability "Health Check"
+	
+		attribute "temperatureAlarm", "string"
+	
+		fingerprint mfr: "010F", prod: "0702"
+		fingerprint deviceId: "0x0701", inClusters:"0x5E,0x59,0x22,0x80,0x56,0x7A,0x73,0x98,0x31,0x85,0x70,0x5A,0x72,0x8E,0x71,0x86,0x84"
+		fingerprint deviceId: "0x0701", inClusters:"0x5E,0x59,0x22,0x80,0x56,0x7A,0x73,0x31,0x85,0x70,0x5A,0x72,0x8E,0x71,0x86,0x84"
+	}
+
+	tiles (scale: 2) {
+		multiAttributeTile(name:"FGDW", type:"lighting", width:6, height:4) {
+			tileAttribute("device.contact", key:"PRIMARY_CONTROL") {
+				attributeState("open", label:"open", icon:"st.contact.contact.open", backgroundColor:"#e86d13")
+				attributeState("closed", label:"closed", icon:"st.contact.contact.closed", backgroundColor:"#00a0dc")
+			}
+			tileAttribute("device.multiStatus", key:"SECONDARY_CONTROL") {
+				attributeState("multiStatus", label:'${currentValue}')
+			}
+		}
+		
+		valueTile("tamper", "device.tamper", inactiveLabel: false, width: 2, height: 2, decoration: "flat") {
+			state "tamper", label:'Tamper:\n ${currentValue}'
+		}
+		
+		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
+			state "temperature", label:'${currentValue}°',
+			backgroundColors:[
+				[value: 31, color: "#153591"],
+				[value: 44, color: "#1e9cbb"],
+				[value: 59, color: "#90d2a7"],
+				[value: 74, color: "#44b621"],
+				[value: 84, color: "#f1d801"],
+				[value: 95, color: "#d04e00"],
+				[value: 96, color: "#bc2323"]
+			]
+		}
+		
+		valueTile("battery", "device.battery", inactiveLabel: false, width: 2, height: 2, decoration: "flat") {
+			state "battery", label:'${currentValue}%\n battery', unit:"%"
+		}	
+		
+		standardTile("temperatureAlarm", "device.temperatureAlarm", inactiveLabel: false, width: 2, height: 2, decoration: "flat") {
+			state "default", label: "No temp. alarm", backgroundColor:"#ffffff"
+			state "clear", label:'', backgroundColor:"#ffffff", icon: "st.alarm.temperature.normal"
+			state "underheat", label:'underheat', backgroundColor:"#1e9cbb", icon: "st.alarm.temperature.freeze"
+			state "overheat", label:'overheat', backgroundColor:"#d04e00", icon: "st.alarm.temperature.overheat"
+		}
+
+		main "FGDW"
+		details(["FGDW","tamper","temperature","battery","temperatureAlarm"])
+	}
+		
+	preferences {
+		
+ 		input (
+			title: "Fibaro Door/Window Sensor 2",
+			description: "Tap to view the manual.",
+			image: "http://manuals.fibaro.com/wp-content/uploads/2017/05/dws2.jpg",
+			url: "http://manuals.fibaro.com/content/manuals/en/FGDW-002/FGDW-002-EN-T-v1.0.pdf",
+			type: "href",
+			element: "href"
+		)
+		
+		input (
+			title: "Wake up interval",
+			description: "How often should your device automatically sync with the HUB. The lower the value, the shorter the battery life.\n0 or 1-18 (in hours)",
+			type: "paragraph",
+			element: "paragraph"
+		)
+		
+		input ( 
+			name: "wakeUpInterval", 
+			title: null, 
+			type: "number", 
+			range: "0..18", 
+			defaultValue: 6, 
+			required: false 
+		)
+		
+		parameterMap().findAll{(it.num as Integer) != 54}.each {
+			input (
+				title: "${it.num}. ${it.title}",
+				description: it.descr,
+				type: "paragraph",
+				element: "paragraph"
+			)
+			
+			input (
+				name: it.key,
+				title: null,
+				description: "Default: $it.def" ,
+				type: it.type,
+				options: it.options,
+				range: (it.min != null && it.max != null) ? "${it.min}..${it.max}" : null,
+				defaultValue: it.def,
+				required: false
+			)
+		}
+		
+		input ( name: "logging", title: "Logging", type: "boolean", required: false )
+	}
+}
+
+def updated() {
+	if ( state.lastUpdated && (now() - state.lastUpdated) < 500 ) return
+	logging("${device.displayName} - Executing updated()","info")
+
+	if ( settings.temperatureHigh as Integer == 0 && settings.temperatureLow as Integer == 0 ) { 
+		sendEvent(name: "temperatureAlarm", value: null, displayed: false) 
+	} else if ( settings.temperatureHigh != null || settings.temperatureHigh != null ) {
+		sendEvent(name: "temperatureAlarm", value: "clear", displayed: false) 
+	}
+	
+	syncStart()
+	state.lastUpdated = now()
+}
+
+def configure() {
+	def cmds = []
+	cmds << zwave.batteryV1.batteryGet()
+	cmds << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 1)
+	encapSequence(cmds,1000)
+}
+
+private syncStart() {
+	boolean syncNeeded = false
+	Integer settingValue = null
+	parameterMap().each {
+		if(settings."$it.key" != null || it.num == 54) {
+			if (state."$it.key" == null) { state."$it.key" = [value: null, state: "synced"] } 
+			if ( (it.num as Integer) == 54 ) { 
+				settingValue = (((settings."temperatureHigh" as Integer) == 0) ? 0 : 1) + (((settings."temperatureLow" as Integer) == 0) ? 0 : 2)
+			} else if ( (it.num as Integer) in [55,56] ) { 
+				settingValue = (((settings."$it.key" as Integer) == 0) ? state."$it.key".value : settings."$it.key") as Integer
+			} else {
+				settingValue = settings."$it.key" as Integer
+			}
+			if (state."$it.key".value != settingValue || state."$it.key".state != "synced" ) {
+				state."$it.key".value = settingValue
+				state."$it.key".state = "notSynced"
+				syncNeeded = true
+			}
+		}
+	}
+	
+	if(settings.wakeUpInterval != null) {
+		if (state.wakeUpInterval == null) { state.wakeUpInterval = [value: null, state: "synced"] } 
+		if (state.wakeUpInterval.value != ((settings.wakeUpInterval as Integer) * 3600)) { 
+			sendEvent(name: "checkInterval", value: (settings.wakeUpInterval as Integer) * 3600 * 4 + 120, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+			state.wakeUpInterval.value = ((settings.wakeUpInterval as Integer) * 3600)
+			state.wakeUpInterval.state = "notSynced"
+			syncNeeded = true
+		}
+	} else {
+		sendEvent(name: "checkInterval", value: 21600 * 4 + 120, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	}
+	
+	if ( syncNeeded ) { 
+		logging("${device.displayName} - sync needed.", "info")
+		multiStatusEvent("Sync pending. Please wake up the device by pressing the tamper button.", true)
+	}
+}
+
+private syncNext() {
+	logging("${device.displayName} - Executing syncNext()","info")
+	def cmds = []
+	for ( param in parameterMap() ) {
+		if ( state."$param.key"?.value != null && state."$param.key"?.state in ["notSynced","inProgress"] ) {
+			multiStatusEvent("Sync in progress. (param: ${param.num})", true)
+			state."$param.key"?.state = "inProgress"
+			cmds << response(encap(zwave.configurationV2.configurationSet(configurationValue: intToParam(state."$param.key".value, param.size), parameterNumber: param.num, size: param.size)))
+			cmds << response(encap(zwave.configurationV2.configurationGet(parameterNumber: param.num)))
+			break
+		} 
+	}
+	if (cmds) { 
+		runIn(10, "syncCheck")
+		sendHubCommand(cmds,1000)
+	} else {
+		runIn(1, "syncCheck")
+	}
+}
+
+private syncCheck() {
+	logging("${device.displayName} - Executing syncCheck()","info")
+	def failed = []
+	def incorrect = []
+	def notSynced = []
+	parameterMap().each {
+		if (state."$it.key"?.state == "incorrect" ) {
+			incorrect << it
+		} else if ( state."$it.key"?.state == "failed" ) {
+			failed << it
+		} else if ( state."$it.key"?.state in ["inProgress","notSynced"] ) {
+			notSynced << it
+		}
+	}
+	
+	if (failed) {
+		multiStatusEvent("Sync failed! Verify parameter: ${failed[0].num}", true, true)
+	} else if (incorrect) {
+		multiStatusEvent("Sync mismatch! Verify parameter: ${incorrect[0].num}", true, true)
+	} else if (notSynced) {
+		multiStatusEvent("Sync incomplete! Wake up the device again by pressing the tamper button.", true, true)
+	} else {
+		sendHubCommand(response(encap(zwave.wakeUpV1.wakeUpNoMoreInformation())))
+		if (device.currentValue("multiStatus")?.contains("Sync")) { multiStatusEvent("Sync OK.", true, true) }
+	}
+}
+
+private multiStatusEvent(String statusValue, boolean force = false, boolean display = false) {
+	if (!device.currentValue("multiStatus")?.contains("Sync") || device.currentValue("multiStatus") == "Sync OK." || force) {
+		sendEvent(name: "multiStatus", value: statusValue, descriptionText: statusValue, displayed: display)
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd) {
+	logging("${device.displayName} woke up", "info")
+	def cmds = []
+	sendEvent(descriptionText: "$device.displayName woke up", isStateChange: true)
+	if ( state.wakeUpInterval?.state == "notSynced" && state.wakeUpInterval?.value != null ) {
+		cmds << zwave.wakeUpV2.wakeUpIntervalSet(seconds: state.wakeUpInterval.value as Integer, nodeid: zwaveHubNodeId)
+		state.wakeUpInterval.state = "synced"
+	}
+	cmds << zwave.batteryV1.batteryGet()
+	cmds << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 1)
+	runIn(1,"syncNext")
+	[response(encapSequence(cmds,1000))]
+}
+
+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")
+	state."$paramKey".state = (state."$paramKey".value == cmd.scaledConfigurationValue) ? "synced" : "incorrect"
+	syncNext()
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.applicationstatusv1.ApplicationRejectedRequest cmd) {
+	logging("${device.displayName} - rejected request!","warn")
+	for ( param in parameterMap() ) {
+		if ( state."$param.key"?.state == "inProgress" ) {
+			state."$param.key"?.state = "failed"
+			break
+		} 
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd) {
+	logging("${device.displayName} - AlarmReport received, zwaveAlarmType: ${cmd.zwaveAlarmType}, zwaveAlarmEvent: ${cmd.zwaveAlarmEvent}", "info")
+	def lastTime = new Date().format("yyyy MMM dd EEE h:mm:ss a", location.timeZone)
+	switch (cmd.zwaveAlarmType) {
+		case 6: 
+			sendEvent(name: "contact", value: (cmd.zwaveAlarmEvent == 22)? "open":"closed"); 
+			if (cmd.zwaveAlarmEvent == 22) { multiStatusEvent("Contact Open - $lastTime") }
+			break;
+		case 7: 
+			sendEvent(name: "tamper", value: (cmd.zwaveAlarmEvent == 3)? "detected":"clear"); 
+			if (cmd.zwaveAlarmEvent == 3) { multiStatusEvent("Tamper - $lastTime") }
+			break;
+		case 4:
+			if (device.currentValue("temperatureAlarm")?.value != null) {
+				switch (cmd.zwaveAlarmEvent) {
+					case 0: sendEvent(name: "temperatureAlarm", value: "clear"); break;
+					case 2: sendEvent(name: "temperatureAlarm", value: "overheat"); break;
+					case 6: sendEvent(name: "temperatureAlarm", value: "underheat"); break;
+				}; 
+			};
+			break;
+		default: logging("${device.displayName} - Unknown zwaveAlarmType: ${cmd.zwaveAlarmType}","warn");
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelReport cmd) {
+	logging("${device.displayName} - SensorMultilevelReport received, sensorType: ${cmd.sensorType}, scaledSensorValue: ${cmd.scaledSensorValue}", "info")
+	switch (cmd.sensorType) {
+		case 1:
+			def cmdScale = cmd.scale == 1 ? "F" : "C"
+			sendEvent(name: "temperature", unit: getTemperatureScale(), value: convertTemperatureIfNeeded(cmd.scaledSensorValue, cmdScale, cmd.precision), displayed: true)
+			break
+		default: 
+			logging("${device.displayName} - Unknown sensorType: ${cmd.sensorType}","warn")
+			break
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
+	logging("${device.displayName} - BatteryReport received, value: ${cmd.batteryLevel}", "info")
+	sendEvent(name: "battery", value: cmd.batteryLevel.toString(), unit: "%", displayed: true)
+}
+
+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"
+	}
+}
+
+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) {
+		logging("${device.displayName} - Parsed Crc16Encap into: ${encapsulatedCommand}")
+		zwaveEvent(encapsulatedCommand)
+	} else {
+		log.warn "Could not extract crc16 command from $cmd"
+	}
+}
+
+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() 
+}
+
+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 encapSequence(cmds, Integer delay=250) {
+	delayBetween(cmds.collect{ encap(it) }, 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
+}
+
+private Map cmdVersions() {
+	[0x5E: 2, 0x59: 1, 0x22: 1, 0x80: 1, 0x56: 1, 0x7A: 3, 0x73: 1, 0x98: 1, 0x31: 5, 0x85: 2, 0x70: 2, 0x5A: 1, 0x72: 2, 0x8E: 2, 0x71: 2, 0x86: 1, 0x84: 2]
+}
+
+private parameterMap() {[
+	[key: "doorState", num: 1, size: 1, type: "enum", options: [0: "Closed when magnet near", 1: "Opened when magnet near"], def: "0", title: "Door/window state", 
+		descr: "Defines the state of door/window depending on the magnet position."],
+	[key: "ledIndications", num: 2, size: 1, type: "enum", options: [
+		1: "Indication of opening/closing",
+		2: "Indication of wake up",
+		4: "Indication of device tampering",
+		6: "Indication of wake up & tampering",
+		], 
+		def: "6", title: "Visual LED indications", 
+		descr: "Defines events indicated by the visual LED indicator. Disabling events might extend battery life."],
+	[key: "tamperDelay", num: 30, size: 2, type: "number", def: 5, min: 0, max: 32400, title: "Tamper - alarm cancellation delay", 
+		descr: "Time period after which a tamper alarm will be cancelled.\n0-32400 - time in seconds"], 
+	[key: "tamperCancelation", num: 31, size: 1, type: "enum", options: [0: "Do not send tamper cancellation report", 1: "Send tamper cancellation report"], def: "1", title: "Tamper – reporting alarm cancellation", 
+		descr: "Reporting cancellation of tamper alarm to the controller and 3rd association group."],
+	[key: "temperatureMeasurement", num: 50, size: 2, type: "number", def: 300, min: 0, max: 32400, title: "Interval of temperature measurements", 
+		descr: "This parameter defines how often the temperature will be measured (specific time).\n0 - temperature measurements disabled\n5-32400 - time in seconds"], 
+	[key: "temperatureThreshold", num: 51, size: 2, type: "enum", options: [
+		0: "disabled", 
+		3: "0.5°F/0.3°C", 
+		6: "1°F/0.6°C",
+		11: "2°F/1.1°C",
+		17: "3°F/1.7°C",
+		22: "4°F/2.2°C",
+		28: "5°F/2.8°C"],
+		def: 11, title: "Temperature reports threshold", 
+		descr: "Change of temperature resulting in temperature report being sent to the HUB."],
+	[key: "temperatureAlarm", num: 54, size: 1, type: "enum", options: [
+		0: "Temperature alarms disabled", 
+		1: "High temperature alarm",
+		2: "Low temperature alarm",
+		3: "High and low temperature alarms"], 
+		def: "0", title: "Temperature alarm reports", 
+		descr: "Temperature alarms reported to the Z-Wave controller. Thresholds are set in parameters 55 and 56"],
+	[key: "temperatureHigh", num: 55, size: 2, type: "enum", options: [
+		0: "disabled",
+		200: "68°F/20°C",
+		250: "77°F/25°C",
+		300: "86°F/30°C",
+		350: "95°F/35°C",
+		400: "104°F/40°C",
+		450: "113°F/45°C",
+		500: "122°F/50°C",
+		550: "131°F/55°C",
+		600: "140°F/60°C"],
+		def: 350, title: "High temperature alarm threshold", 
+		descr: "If temperature is higher than set value, overheat high temperature alarm will be triggered."], 
+	[key: "temperatureLow", num: 56, size: 2, type: "enum", options: [
+		0: "disabled",
+		6: "33°F/0.6°C",
+		10: "34°F/1°C",
+		22: "36°F/2.2°C",
+		33: "38°F/3.3°C",
+		44: "40°F/4.4°C",
+		50: "41°F/5°C",
+		100: "50°F/10°C",
+		150: "59°F/15°C",
+		200: "68°F/20°C",
+		250: "77°F/25°C"],
+		def: 100, title: "Low temperature alarm threshold", 
+		descr: "If temperature is lower than set value, low temperature alarm will be triggered."]
+	]
+}

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

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

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

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

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

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

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

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

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

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

smartapps/rboy/5-2-day-thermostat.src/5-2-day-thermostat.groovy

@@ -1,470 +0,0 @@
-/* **DISCLAIMER**
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * Without limitation of the foregoing, Contributors/Regents expressly does not warrant that:
- * 1. the software will meet your requirements or expectations;
- * 2. the software or the software content will be free of bugs, errors, viruses or other defects;
- * 3. any results, output, or data provided through or generated by the software will be accurate, up-to-date, complete or reliable;
- * 4. the software will be compatible with third party software;
- * 5. any errors in the software will be corrected.
- * The user assumes all responsibility for selecting the software and for the results obtained from the use of the software. The user shall bear the entire risk as to the quality and the performance of the software.
- */ 
- 
-/**
- *  5-2 Day Thermostat
- *
- * Base code from mwoodengr@hotmail.com, bugfixed and enhanced by RBoy
- * Changes Copyright RBoy, redistribution of any changes or modified code is not allowed without permission
- * Version 2.1.0
- * 2015-10-3 - Fixed an issue with selecting multiple thermostats and for recent platform changes
- * 2015-5-17 - Added ability to select mutiple thermostats simultaneously
- * 2015-2-11 - Fixed issue with fan mode
- *
- */
-definition(
-		name: "5-2 Day Thermostat",
-		namespace: "rboy",
-		author: "RBoy",
-		description: "Weekday and Weekend Thermostat",
-    	category: "Green Living",
-    	iconUrl: "https://s3.amazonaws.com/smartapp-icons/GreenLiving/Cat-GreenLiving.png",
-    	iconX2Url: "https://s3.amazonaws.com/smartapp-icons/GreenLiving/Cat-GreenLiving@2x.png",
-    	iconX3Url: "https://s3.amazonaws.com/smartapp-icons/GreenLiving/Cat-GreenLiving@3x.png")
-
-preferences {
-	section("Choose thermostat (s)") {
-		input "thermostats", "capability.thermostat", required: true, multiple:true
-	}
-
-    section("Switch HVAC mode (auto to cool/heat) based on the outside temperature (optional)") {
-		input "temperatureSensor", "capability.temperatureMeasurement", required: false
-		input "temperatureH", "number", title: "Switch to heating temperature", required: false, description: "Temperature below which switch to heat mode"
-		input "temperatureC", "number", title: "Switch to cooling temperature", required: false, description: "Temperature above which switch to cool mode"
-	}
-
-	section("Monday to Friday Schedule") {
-		input "time1", "time", title: "Wake Time", required: true
-		input "tempSetpoint1", "number", title: "Wake Heat Temp", required: true
-		input "tempSetpointA", "number", title: "Wake Cool Temp", required: true
-		input "time2", "time", title: "Leave Time", required: true
-		input "tempSetpoint2", "number", title: "Leave Heat Temp", required: true
-		input "tempSetpointB", "number", title: "Leave Cool Temp", required: true
-		input "time3", "time", title: "Return Time", required: true
-		input "tempSetpoint3", "number", title: "Return Heat Temp", required: true
-		input "tempSetpointC", "number", title: "Return Cool Temp", required: true
-		input "time4", "time", title: "Sleep Time", required: true
-		input "tempSetpoint4", "number", title: "Sleep Heat Temp", required: true
-		input "tempSetpointD", "number", title: "Sleep Cool Temp", required: true
-	}
-	section("Saturday and Sunday Schedule") {
-		input "time11", "time", title: "Wake Time", required: true
-		input "tempSetpoint11", "number", title: "Wake Heat Temp", required: true
-		input "tempSetpointAA", "number", title: "Wake Cool Temp", required: true
-		input "time21", "time", title: "Leave Time", required: true
-		input "tempSetpoint21", "number", title: "Leave Heat Temp", required: true
-		input "tempSetpointBB", "number", title: "Leave Cool Temp", required: true
-		input "time31", "time", title: "Return Time", required: true
-		input "tempSetpoint31", "number", title: "Return Heat Temp", required: true
-		input "tempSetpointCC", "number", title: "Return Cool Temp", required: true
-		input "time41", "time", title: "Sleep Time", required: true
-		input "tempSetpoint41", "number", title: "Sleep Heat Temp", required: true
-		input "tempSetpointDD", "number", title: "Sleep Cool Temp", required: true
-	}
-}
-
-def installed()
-{
-	subscribeToEvents()
-}
-
-def updated()
-{
-    unsubscribe()
-	subscribeToEvents()
-}
-
-def subscribeToEvents() {
-	subscribe(temperatureSensor, "temperature", temperatureHandler)
-    subscribe(location, modeChangeHandler)
-
-    initialize()
-}
-
-// Handle mode changes, reinitialize the current temperature and timers after a mode change, this is to workaround the issue of the last timer firing while in a non running mode, resume operations when supported modes are set
-def modeChangeHandler(evt) {
-	log.debug "Reinitializing thermostats on mode change notification, new mode $evt.value"
-	//sendNotificationEvent("$thermostats Reinitializing on mode change notification, new mode $evt.value")
-    initialize()
-}
-
-// This section sets the HVAC mode based outside temperature. HVAC fan mode is set to "auto".
-def temperatureHandler(evt) {
-	log.debug "Heat mode switch temperature $temperatureH, cool mode switch temperature $temperatureC"
-    
-	if (temperatureH == null || temperatureC == null) { // We are in Auto mode or user doesn't want us to switch modes
-		return
-	}
-	
-    thermostats.each { thermostat ->
-        def extTemp = temperatureSensor.currentTemperature
-        log.debug "External temperature is: $extTemp"
-        def thermostatState = thermostat.currentThermostatMode
-        def thermostatFan = thermostat.currentThermostatFanMode
-        log.debug "HVAC current mode $thermostatState"
-        log.debug "HVAC Fan current mode $thermostatFan"
-        if (extTemp < temperatureH) {
-            if (thermostatState == "cool") {
-                def hvacmode = "heat"
-                thermostat.setThermostatMode(hvacmode)
-                log.debug "HVAC mode set to $hvacmode"
-            }
-        }
-        else if (extTemp > temperatureC) {
-            if (thermostatState == "heat") {
-                def hvacmode = "cool"
-                thermostat.setThermostatMode(hvacmode)
-                log.debug "HVAC mode set to $hvacmode"
-            }
-        }
-
-        if (thermostatFan != "fanAuto") {
-            thermostat.setThermostatFanMode("auto")
-            log.debug "HVAC fan mode set to auto"
-        }
-    }
-}
-
-// This section determines which day it is.
-def initialize() {
-	log.trace "Initialized with $settings"
-
-	unschedule()
-	def calendar = Calendar.getInstance()
-	calendar.setTimeZone(location.timeZone)
-	def today = calendar.get(Calendar.DAY_OF_WEEK)
-   	def timeNow = now()
-	def midnightToday = timeToday("2000-01-01T23:59:59.999-0000", location.timeZone)
-   	log.debug("Current time is ${(new Date(timeNow)).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-	log.debug("Midnight today is ${midnightToday.format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-   	log.trace("Weekday schedule1 ${timeToday(time1, location.timeZone).format("HH:mm z", location.timeZone)}")
-   	log.trace("Weekday schedule2 ${timeToday(time2, location.timeZone).format("HH:mm z", location.timeZone)}")
-   	log.trace("Weekday schedule3 ${timeToday(time3, location.timeZone).format("HH:mm z", location.timeZone)}")
-   	log.trace("Weekday schedule4 ${timeToday(time4, location.timeZone).format("HH:mm z", location.timeZone)}")
-   	log.trace("Weekend schedule1 ${timeToday(time11, location.timeZone).format("HH:mm z", location.timeZone)}")
-   	log.trace("Weekend schedule2 ${timeToday(time21, location.timeZone).format("HH:mm z", location.timeZone)}")
-   	log.trace("Weekend schedule3 ${timeToday(time31, location.timeZone).format("HH:mm z", location.timeZone)}")
-   	log.trace("Weekend schedule4 ${timeToday(time41, location.timeZone).format("HH:mm z", location.timeZone)}")
-
-	// This section is where the time/temperature schedule is set
-	switch (today) {
-		case Calendar.MONDAY:
-		case Calendar.TUESDAY:
-		case Calendar.WEDNESDAY:
-		case Calendar.THURSDAY:
-        	if (timeNow >= timeToday(time1, location.timeZone).time && timeNow < timeToday(time2, location.timeZone).time) { // Are we between 1st time and 2nd time
-        		changeTemp1()
-            	schedule(timeToday(time2, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time2, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time2, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-        	}
-        	else if (timeNow >= timeToday(time2, location.timeZone).time && timeNow < timeToday(time3, location.timeZone).time) { // Are we between 2nd time and 3rd time
-            	changeTemp2()
-				schedule(timeToday(time3, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time3, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time3, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-            else if (timeNow >= timeToday(time3, location.timeZone).time && timeNow < timeToday(time4, location.timeZone).time) { // Are we between 3rd time and 4th time
-            	changeTemp3()
-				schedule(timeToday(time4, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time4, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time4, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-            else if (timeNow >= timeToday(time4, location.timeZone).time && timeNow < midnightToday.time) { // Are we between 4th time and midnight, schedule next day
-            	changeTemp4()
-				schedule(timeToday(time1, location.timeZone) + 1, initialize)
-                log.info("$thermostats Scheduled next adjustment for ${(timeToday(time1, location.timeZone) + 1).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${(timeToday(time1, location.timeZone) + 1).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-            else if (timeNow >= (midnightToday - 1).time && timeNow < timeToday(time1, location.timeZone).time) { // Are we between midnight yesterday and 1st time, schedule today
-            	changeTemp4()
-				schedule(timeToday(time1, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time1, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time1, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-			break
-			
-		case Calendar.FRIDAY:
-        	if (timeNow >= timeToday(time1, location.timeZone).time && timeNow < timeToday(time2, location.timeZone).time) { // Are we between 1st time and 2nd time
-        		changeTemp1()
-            	schedule(timeToday(time2, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time2, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time2, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-        	}
-        	else if (timeNow >= timeToday(time2, location.timeZone).time && timeNow < timeToday(time3, location.timeZone).time) { // Are we between 2nd time and 3rd time
-            	changeTemp2()
-				schedule(timeToday(time3, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time3, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time3, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-            else if (timeNow >= timeToday(time3, location.timeZone).time && timeNow < timeToday(time4, location.timeZone).time) { // Are we between 3rd time and 4th time
-            	changeTemp3()
-				schedule(timeToday(time4, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time4, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time4, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-            else if (timeNow >= timeToday(time4, location.timeZone).time && timeNow < midnightToday.time) { // Are we between 4th time Friday and midnight, we schedule Saturday
-            	changeTemp4()
-				schedule(timeToday(time11, location.timeZone) + 1, initialize)
-                log.info("$thermostats Scheduled next adjustment for ${(timeToday(time11, location.timeZone) + 1).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${(timeToday(time11, location.timeZone) + 1).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-            else if (timeNow >= (midnightToday - 1).time && timeNow < timeToday(time11, location.timeZone).time) { // Are we between midnight Friday and 1st time on Saturday, we schedule Saturday
-            	changeTemp4()
-				schedule(timeToday(time11, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time11, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time11, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-			break
-
-		case Calendar.SATURDAY:
-            if (timeNow >= timeToday(time11, location.timeZone).time && timeNow < timeToday(time21, location.timeZone).time) { // Are we between 1st time and 2nd time
-        		changeTemp11()
-            	schedule(timeToday(time21, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time21, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time21, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-        	}
-        	else if (timeNow >= timeToday(time21, location.timeZone).time && timeNow < timeToday(time31, location.timeZone).time) { // Are we between 2nd time and 3rd time
-            	changeTemp21()
-				schedule(timeToday(time31, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time31, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time31, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-            else if (timeNow >= timeToday(time31, location.timeZone).time && timeNow < timeToday(time41, location.timeZone).time) { // Are we between 3rd time and 4th time
-            	changeTemp31()
-				schedule(timeToday(time41, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time41, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time41, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-            else if (timeNow >= timeToday(time41, location.timeZone).time && timeNow < midnightToday.time) { // Are we between 4th time and midnight, schedule the next day
-            	changeTemp41()
-				schedule(timeToday(time11, location.timeZone) + 1, initialize)
-                log.info("$thermostats Scheduled next adjustment for ${(timeToday(time11, location.timeZone) + 1).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${(timeToday(time11, location.timeZone) + 1).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-            else if (timeNow >= (midnightToday - 1).time && timeNow < timeToday(time11, location.timeZone).time) { // Are we between midnight yesterday and 1st time, schedule today
-            	changeTemp41()
-				schedule(timeToday(time11, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time11, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time11, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-			break
-            
-		case Calendar.SUNDAY:
-            if (timeNow >= timeToday(time11, location.timeZone).time && timeNow < timeToday(time21, location.timeZone).time) { // Are we between 1st time and 2nd time
-        		changeTemp11()
-            	schedule(timeToday(time21, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time21, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time21, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-        	}
-        	else if (timeNow >= timeToday(time21, location.timeZone).time && timeNow < timeToday(time31, location.timeZone).time) { // Are we between 2nd time and 3rd time
-            	changeTemp21()
-				schedule(timeToday(time31, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time31, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time31, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-            else if (timeNow >= timeToday(time31, location.timeZone).time && timeNow < timeToday(time41, location.timeZone).time) { // Are we between 3rd time and 4th time
-            	changeTemp31()
-				schedule(timeToday(time41, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time41, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time41, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-            else if (timeNow >= timeToday(time41, location.timeZone).time && timeNow < midnightToday.time) { // Are we between 4th time Sunday and midnight, we schedule Monday
-            	changeTemp41()
-				schedule(timeToday(time1, location.timeZone) + 1, initialize)
-                log.info("$thermostats Scheduled next adjustment for ${(timeToday(time1, location.timeZone) + 1).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${(timeToday(time1, location.timeZone) + 1).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-            else if (timeNow >= (midnightToday - 1).time && timeNow < timeToday(time1, location.timeZone).time) { // Are we between midnight Sunday and 1st time on Monday, we schedule Monday
-            	changeTemp41()
-				schedule(timeToday(time1, location.timeZone), initialize)
-                log.info("$thermostats Scheduled next adjustment for ${timeToday(time1, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-                //sendNotificationEvent("$thermostats Scheduled next adjustment for ${timeToday(time1, location.timeZone).format("EEE MMM dd yyyy HH:mm z", location.timeZone)}")
-            }
-			break
-	}
-}
-
-// This section is where the thermostat temperature settings are set. 
-def changeTemp1() {
-	thermostats.each { thermostat ->
-        def thermostatState = thermostat.currentThermostatMode
-        log.debug "Thermostat mode = $thermostatState"
-        def thermostatFan = thermostat.currentThermostatFanMode
-        log.debug "Thermostat fan = $thermostatFan"
-        if (thermostatState == "auto") {
-            thermostat.setHeatingSetpoint(tempSetpoint1)
-            thermostat.setCoolingSetpoint(tempSetpointA)
-            log.info "Set $thermostat Heat $tempSetpoint1°, Cool $tempSetpointA°"
-        }
-        else if (thermostatState == "heat") {
-            thermostat.setHeatingSetpoint(tempSetpoint1)
-            log.info "Set $thermostat Heat $tempSetpoint1°"
-        }
-        else {
-            thermostat.setCoolingSetpoint(tempSetpointA)
-            log.info "Set $thermostat Cool $tempSetpointA°"
-        }
-    }
-}
-
-def changeTemp2() {
-	thermostats.each { thermostat ->
-        def thermostatState = thermostat.currentThermostatMode
-        log.debug "Thermostat mode = $thermostatState"
-        def thermostatFan = thermostat.currentThermostatFanMode
-        log.debug "Thermostat fan = $thermostatFan"
-        if (thermostatState == "auto") {
-            thermostat.setHeatingSetpoint(tempSetpoint2)
-            thermostat.setCoolingSetpoint(tempSetpointB)
-            log.info "Set $thermostat Heat $tempSetpoint2°, Cool $tempSetpointB°"
-        }
-        else if (thermostatState == "heat") {
-            thermostat.setHeatingSetpoint(tempSetpoint2)
-        }
-        else {
-            thermostat.setCoolingSetpoint(tempSetpointB)
-        }
-    }
-}
-
-def changeTemp3() {
-    thermostats.each { thermostat ->
-        def thermostatState = thermostat.currentThermostatMode
-        log.debug "Thermostat mode = $thermostatState"
-        def thermostatFan = thermostat.currentThermostatFanMode
-        log.debug "Thermostat fan = $thermostatFan"
-        if (thermostatState == "auto") {
-            thermostat.setHeatingSetpoint(tempSetpoint3)
-            thermostat.setCoolingSetpoint(tempSetpointC)
-            log.info "Set $thermostat Heat $tempSetpoint3°, Cool $tempSetpointC°"
-        }
-        else if (thermostatState == "heat") {
-            thermostat.setHeatingSetpoint(tempSetpoint3)
-            log.info "Set $thermostat Heat $tempSetpoint3°"
-        }
-        else {
-            thermostat.setCoolingSetpoint(tempSetpointC)
-            log.info "Set $thermostat Cool $tempSetpointC°"
-        }
-    }
-}
-
-def changeTemp4() {
-	thermostats.each { thermostat ->
-        def thermostatState = thermostat.currentThermostatMode
-        log.debug "Thermostat mode = $thermostatState"
-        def thermostatFan = thermostat.currentThermostatFanMode
-        log.debug "Thermostat fan = $thermostatFan"
-        if (thermostatState == "auto") {
-            thermostat.setHeatingSetpoint(tempSetpoint4)
-            thermostat.setCoolingSetpoint(tempSetpointD)
-            log.info "Set $thermostat Heat $tempSetpoint4°, Cool $tempSetpointD°"
-        }
-        else if (thermostatState == "heat") {
-            thermostat.setHeatingSetpoint(tempSetpoint4)
-            log.info "Set $thermostat Heat $tempSetpoint4°"
-        }
-        else {
-            thermostat.setCoolingSetpoint(tempSetpointD)
-            log.info "Set $thermostat Cool $tempSetpointD°"
-        }
-    }
-}
-
-def changeTemp11() {
-	thermostats.each { thermostat ->
-        def thermostatState = thermostat.currentThermostatMode
-        log.debug "Thermostat mode = $thermostatState"
-        def thermostatFan = thermostat.currentThermostatFanMode
-        log.debug "Thermostat fan = $thermostatFan"
-        if (thermostatState == "auto") {
-            thermostat.setHeatingSetpoint(tempSetpoint11)
-            thermostat.setCoolingSetpoint(tempSetpointAA)
-            log.info "Set $thermostat Heat $tempSetpoint11°, Cool $tempSetpointAA°"
-        }
-        else if (thermostatState == "heat") {
-            thermostat.setHeatingSetpoint(tempSetpoint11)
-            log.info "Set $thermostat Heat $tempSetpoint11°"
-        }
-        else {
-            thermostat.setCoolingSetpoint(tempSetpointAA)
-            log.info "Set $thermostat Cool $tempSetpointAA°"
-        }
-    }
-}
-
-def changeTemp21() {
-	thermostats.each { thermostat ->
-        def thermostatState = thermostat.currentThermostatMode
-        log.debug "Thermostat mode = $thermostatState"
-        def thermostatFan = thermostat.currentThermostatFanMode
-        log.debug "Thermostat fan = $thermostatFan"
-        if (thermostatState == "auto") {
-            thermostat.setHeatingSetpoint(tempSetpoint21)
-            thermostat.setCoolingSetpoint(tempSetpointBB)
-            log.info "Set $thermostat Heat $tempSetpoint21°, Cool $tempSetpointBB°"
-        }
-        else if (thermostatState == "heat") {
-            thermostat.setHeatingSetpoint(tempSetpoint21)
-            log.info "Set $thermostat Heat $tempSetpoint21°"
-        }
-        else {
-            thermostat.setCoolingSetpoint(tempSetpointBB)
-            log.info "Set $thermostat Cool $tempSetpointBB°"
-        }
-    }
-}
-
-def changeTemp31() {
-	thermostats.each { thermostat ->
-        def thermostatState = thermostat.currentThermostatMode
-        log.debug "Thermostat mode = $thermostatState"
-        def thermostatFan = thermostat.currentThermostatFanMode
-        log.debug "Thermostat fan = $thermostatFan"
-        if (thermostatState == "auto") {
-            thermostat.setHeatingSetpoint(tempSetpoint31)
-            thermostat.setCoolingSetpoint(tempSetpointCC)
-            log.info "Set $thermostat Heat $tempSetpoint31°, Cool $tempSetpointCC°"
-        }
-        else if (thermostatState == "heat") {
-            thermostat.setHeatingSetpoint(tempSetpoint31)
-            log.info "Set $thermostat Heat $tempSetpoint31°"
-        }
-        else {
-            thermostat.setCoolingSetpoint(tempSetpointCC)
-            log.info "Set $thermostat Cool $tempSetpointCC°"
-        }
-    }
-}
-
-def changeTemp41() {
-	thermostats.each { thermostat ->
-        def thermostatState = thermostat.currentThermostatMode
-        log.debug "Thermostat mode = $thermostatState"
-        def thermostatFan = thermostat.currentThermostatFanMode
-        log.debug "Thermostat fan = $thermostatFan"
-        if (thermostatState == "auto") {
-            thermostat.setHeatingSetpoint(tempSetpoint41)
-            thermostat.setCoolingSetpoint(tempSetpointDD)
-            log.info "Set $thermostat Heat $tempSetpoint41°, Cool $tempSetpointDD°"
-        }
-        else if (thermostatState == "heat") {
-            thermostat.setHeatingSetpoint(tempSetpoint41)
-            log.info "Set $thermostat Heat $tempSetpoint41°"
-        }
-        else {
-            thermostat.setCoolingSetpoint(tempSetpointDD)
-            log.info "Set $thermostat Cool $tempSetpointDD°"
-        }
-    }
-}