MSA-2122: Logs SmartThings data to an InfluxDB for graphing via grafana

Rolling down staging to master

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/codersaur/influxdb-logger.src/influxdb-logger.groovy

@@ -0,0 +1,797 @@
+/*****************************************************************************************************************
+ *  Copyright David Lomas (codersaur)
+ *
+ *  Name: InfluxDB Logger
+ *
+ *  Date: 2017-04-03
+ *
+ *  Version: 1.11
+ *
+ *  Source: https://github.com/codersaur/SmartThings/tree/master/smartapps/influxdb-logger
+ *
+ *  Author: David Lomas (codersaur)
+ *
+ *  Description: A SmartApp to log SmartThings device states to an InfluxDB database.
+ *
+ *  For full information, including installation instructions, exmples, and version history, see:
+ *   https://github.com/codersaur/SmartThings/tree/master/smartapps/influxdb-logger
+ *
+ *  IMPORTANT - To enable the resolution of groupNames (i.e. room names), you must manually insert the group IDs
+ *   into the getGroupName() command code at the end of this file.
+ *
+ *  License:
+ *   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: "InfluxDB Logger",
+    namespace: "codersaur",
+    author: "David Lomas (codersaur)",
+    description: "Log SmartThings device states to InfluxDB",
+    category: "My Apps",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
+    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
+
+preferences {
+
+    section("General:") {
+        //input "prefDebugMode", "bool", title: "Enable debug logging?", defaultValue: true, displayDuringSetup: true
+        input (
+        	name: "configLoggingLevelIDE",
+        	title: "IDE Live Logging Level:\nMessages with this level and higher will be logged to the IDE.",
+        	type: "enum",
+        	options: [
+        	    "0" : "None",
+        	    "1" : "Error",
+        	    "2" : "Warning",
+        	    "3" : "Info",
+        	    "4" : "Debug",
+        	    "5" : "Trace"
+        	],
+        	defaultValue: "3",
+            displayDuringSetup: true,
+        	required: false
+        )
+    }
+
+    section ("InfluxDB Database:") {
+        input "prefDatabaseHost", "text", title: "Host", defaultValue: "10.10.10.10", required: true
+        input "prefDatabasePort", "text", title: "Port", defaultValue: "8086", required: true
+        input "prefDatabaseName", "text", title: "Database Name", defaultValue: "", required: true
+        input "prefDatabaseUser", "text", title: "Username", required: false
+        input "prefDatabasePass", "text", title: "Password", required: false
+    }
+    
+    section("Polling:") {
+        input "prefSoftPollingInterval", "number", title:"Soft-Polling interval (minutes)", defaultValue: 10, required: true
+    }
+    
+    section("System Monitoring:") {
+        input "prefLogModeEvents", "bool", title:"Log Mode Events?", defaultValue: true, required: true
+        input "prefLogHubProperties", "bool", title:"Log Hub Properties?", defaultValue: true, required: true
+        input "prefLogLocationProperties", "bool", title:"Log Location Properties?", defaultValue: true, required: true
+    }
+    
+    section("Devices To Monitor:") {
+        input "accelerometers", "capability.accelerationSensor", title: "Accelerometers", multiple: true, required: false
+        input "alarms", "capability.alarm", title: "Alarms", multiple: true, required: false
+        input "batteries", "capability.battery", title: "Batteries", multiple: true, required: false
+        input "beacons", "capability.beacon", title: "Beacons", multiple: true, required: false
+        input "buttons", "capability.button", title: "Buttons", multiple: true, required: false
+        input "cos", "capability.carbonMonoxideDetector", title: "Carbon Monoxide Detectors", multiple: true, required: false
+        input "co2s", "capability.carbonDioxideMeasurement", title: "Carbon Dioxide Detectors", multiple: true, required: false
+        input "colors", "capability.colorControl", title: "Color Controllers", multiple: true, required: false
+        input "consumables", "capability.consumable", title: "Consumables", multiple: true, required: false
+        input "contacts", "capability.contactSensor", title: "Contact Sensors", multiple: true, required: false
+        input "doorsControllers", "capability.doorControl", title: "Door Controllers", multiple: true, required: false
+        input "energyMeters", "capability.energyMeter", title: "Energy Meters", multiple: true, required: false
+        input "humidities", "capability.relativeHumidityMeasurement", title: "Humidity Meters", multiple: true, required: false
+        input "illuminances", "capability.illuminanceMeasurement", title: "Illuminance Meters", multiple: true, required: false
+        input "locks", "capability.lock", title: "Locks", multiple: true, required: false
+        input "motions", "capability.motionSensor", title: "Motion Sensors", multiple: true, required: false
+        input "musicPlayers", "capability.musicPlayer", title: "Music Players", multiple: true, required: false
+        input "peds", "capability.stepSensor", title: "Pedometers", multiple: true, required: false
+        input "phMeters", "capability.pHMeasurement", title: "pH Meters", multiple: true, required: false
+        input "powerMeters", "capability.powerMeter", title: "Power Meters", multiple: true, required: false
+        input "presences", "capability.presenceSensor", title: "Presence Sensors", multiple: true, required: false
+        input "pressures", "capability.sensor", title: "Pressure Sensors", multiple: true, required: false
+        input "shockSensors", "capability.shockSensor", title: "Shock Sensors", multiple: true, required: false
+        input "signalStrengthMeters", "capability.signalStrength", title: "Signal Strength Meters", multiple: true, required: false
+        input "sleepSensors", "capability.sleepSensor", title: "Sleep Sensors", multiple: true, required: false
+        input "smokeDetectors", "capability.smokeDetector", title: "Smoke Detectors", multiple: true, required: false
+        input "soundSensors", "capability.soundSensor", title: "Sound Sensors", multiple: true, required: false
+		input "spls", "capability.soundPressureLevel", title: "Sound Pressure Level Sensors", multiple: true, required: false
+		input "switches", "capability.switch", title: "Switches", multiple: true, required: false
+        input "switchLevels", "capability.switchLevel", title: "Switch Levels", multiple: true, required: false
+        input "tamperAlerts", "capability.tamperAlert", title: "Tamper Alerts", multiple: true, required: false
+        input "temperatures", "capability.temperatureMeasurement", title: "Temperature Sensors", multiple: true, required: false
+        input "thermostats", "capability.thermostat", title: "Thermostats", multiple: true, required: false
+        input "threeAxis", "capability.threeAxis", title: "Three-axis (Orientation) Sensors", multiple: true, required: false
+        input "touchs", "capability.touchSensor", title: "Touch Sensors", multiple: true, required: false
+        input "uvs", "capability.ultravioletIndex", title: "UV Sensors", multiple: true, required: false
+        input "valves", "capability.valve", title: "Valves", multiple: true, required: false
+        input "volts", "capability.voltageMeasurement", title: "Voltage Meters", multiple: true, required: false
+        input "waterSensors", "capability.waterSensor", title: "Water Sensors", multiple: true, required: false
+        input "windowShades", "capability.windowShade", title: "Window Shades", multiple: true, required: false
+    }
+
+}
+
+
+/*****************************************************************************************************************
+ *  SmartThings System Commands:
+ *****************************************************************************************************************/
+
+/**
+ *  installed()
+ *
+ *  Runs when the app is first installed.
+ **/
+def installed() {
+    state.installedAt = now()
+    state.loggingLevelIDE = 5
+    log.debug "${app.label}: Installed with settings: ${settings}" 
+}
+
+/**
+ *  uninstalled()
+ *
+ *  Runs when the app is uninstalled.
+ **/
+def uninstalled() {
+    logger("uninstalled()","trace")
+}
+
+/**
+ *  updated()
+ * 
+ *  Runs when app settings are changed.
+ * 
+ *  Updates device.state with input values and other hard-coded values.
+ *  Builds state.deviceAttributes which describes the attributes that will be monitored for each device collection 
+ *  (used by manageSubscriptions() and softPoll()).
+ *  Refreshes scheduling and subscriptions.
+ **/
+def updated() {
+    logger("updated()","trace")
+
+    // Update internal state:
+    state.loggingLevelIDE = (settings.configLoggingLevelIDE) ? settings.configLoggingLevelIDE.toInteger() : 3
+    
+    // Database config:
+    state.databaseHost = settings.prefDatabaseHost
+    state.databasePort = settings.prefDatabasePort
+    state.databaseName = settings.prefDatabaseName
+    state.databaseUser = settings.prefDatabaseUser
+    state.databasePass = settings.prefDatabasePass 
+    
+    state.path = "/write?db=${state.databaseName}"
+    state.headers = [:] 
+    state.headers.put("HOST", "${state.databaseHost}:${state.databasePort}")
+    state.headers.put("Content-Type", "application/x-www-form-urlencoded")
+    if (state.databaseUser && state.databasePass) {
+        state.headers.put("Authorization", encodeCredentialsBasic(state.databaseUser, state.databasePass))
+    }
+
+    // Build array of device collections and the attributes we want to report on for that collection:
+    //  Note, the collection names are stored as strings. Adding references to the actual collection 
+    //  objects causes major issues (possibly memory issues?).
+    state.deviceAttributes = []
+    state.deviceAttributes << [ devices: 'accelerometers', attributes: ['acceleration']]
+    state.deviceAttributes << [ devices: 'alarms', attributes: ['alarm']]
+    state.deviceAttributes << [ devices: 'batteries', attributes: ['battery']]
+    state.deviceAttributes << [ devices: 'beacons', attributes: ['presence']]
+    state.deviceAttributes << [ devices: 'buttons', attributes: ['button']]
+    state.deviceAttributes << [ devices: 'cos', attributes: ['carbonMonoxide']]
+    state.deviceAttributes << [ devices: 'co2s', attributes: ['carbonDioxide']]
+    state.deviceAttributes << [ devices: 'colors', attributes: ['hue','saturation','color']]
+    state.deviceAttributes << [ devices: 'consumables', attributes: ['consumableStatus']]
+    state.deviceAttributes << [ devices: 'contacts', attributes: ['contact']]
+    state.deviceAttributes << [ devices: 'doorsControllers', attributes: ['door']]
+    state.deviceAttributes << [ devices: 'energyMeters', attributes: ['energy']]
+    state.deviceAttributes << [ devices: 'humidities', attributes: ['humidity']]
+    state.deviceAttributes << [ devices: 'illuminances', attributes: ['illuminance']]
+    state.deviceAttributes << [ devices: 'locks', attributes: ['lock']]
+    state.deviceAttributes << [ devices: 'motions', attributes: ['motion']]
+    state.deviceAttributes << [ devices: 'musicPlayers', attributes: ['status','level','trackDescription','trackData','mute']]
+    state.deviceAttributes << [ devices: 'peds', attributes: ['steps','goal']]
+    state.deviceAttributes << [ devices: 'phMeters', attributes: ['pH']]
+    state.deviceAttributes << [ devices: 'powerMeters', attributes: ['power','voltage','current','powerFactor']]
+    state.deviceAttributes << [ devices: 'presences', attributes: ['presence']]
+    state.deviceAttributes << [ devices: 'pressures', attributes: ['pressure']]
+    state.deviceAttributes << [ devices: 'shockSensors', attributes: ['shock']]
+    state.deviceAttributes << [ devices: 'signalStrengthMeters', attributes: ['lqi','rssi']]
+    state.deviceAttributes << [ devices: 'sleepSensors', attributes: ['sleeping']]
+    state.deviceAttributes << [ devices: 'smokeDetectors', attributes: ['smoke']]
+    state.deviceAttributes << [ devices: 'soundSensors', attributes: ['sound']]
+	state.deviceAttributes << [ devices: 'spls', attributes: ['soundPressureLevel']]
+	state.deviceAttributes << [ devices: 'switches', attributes: ['switch']]
+    state.deviceAttributes << [ devices: 'switchLevels', attributes: ['level']]
+    state.deviceAttributes << [ devices: 'tamperAlerts', attributes: ['tamper']]
+    state.deviceAttributes << [ devices: 'temperatures', attributes: ['temperature']]
+    state.deviceAttributes << [ devices: 'thermostats', attributes: ['temperature','heatingSetpoint','coolingSetpoint','thermostatSetpoint','thermostatMode','thermostatFanMode','thermostatOperatingState','thermostatSetpointMode','scheduledSetpoint','optimisation','windowFunction']]
+    state.deviceAttributes << [ devices: 'threeAxis', attributes: ['threeAxis']]
+    state.deviceAttributes << [ devices: 'touchs', attributes: ['touch']]
+    state.deviceAttributes << [ devices: 'uvs', attributes: ['ultravioletIndex']]
+    state.deviceAttributes << [ devices: 'valves', attributes: ['contact']]
+    state.deviceAttributes << [ devices: 'volts', attributes: ['voltage']]
+    state.deviceAttributes << [ devices: 'waterSensors', attributes: ['water']]
+    state.deviceAttributes << [ devices: 'windowShades', attributes: ['windowShade']]
+
+    // Configure Scheduling:
+    state.softPollingInterval = settings.prefSoftPollingInterval.toInteger()
+    manageSchedules()
+    
+    // Configure Subscriptions:
+    manageSubscriptions()
+}
+
+/*****************************************************************************************************************
+ *  Event Handlers:
+ *****************************************************************************************************************/
+
+/**
+ *  handleAppTouch(evt)
+ * 
+ *  Used for testing.
+ **/
+def handleAppTouch(evt) {
+    logger("handleAppTouch()","trace")
+    
+    softPoll()
+}
+
+/**
+ *  handleModeEvent(evt)
+ * 
+ *  Log Mode changes.
+ **/
+def handleModeEvent(evt) {
+    logger("handleModeEvent(): Mode changed to: ${evt.value}","info")
+
+    def locationId = escapeStringForInfluxDB(location.id)
+    def locationName = escapeStringForInfluxDB(location.name)
+    def mode = '"' + escapeStringForInfluxDB(evt.value) + '"'
+	def data = "_stMode,locationId=${locationId},locationName=${locationName} mode=${mode}"
+    postToInfluxDB(data)
+}
+
+/**
+ *  handleEvent(evt)
+ *
+ *  Builds data to send to InfluxDB.
+ *   - Escapes and quotes string values.
+ *   - Calculates logical binary values where string values can be 
+ *     represented as binary values (e.g. contact: closed = 1, open = 0)
+ * 
+ *  Useful references: 
+ *   - http://docs.smartthings.com/en/latest/capabilities-reference.html
+ *   - https://docs.influxdata.com/influxdb/v0.10/guides/writing_data/
+ **/
+def handleEvent(evt) {
+    logger("handleEvent(): $evt.displayName($evt.name:$evt.unit) $evt.value","info")
+    
+    // Build data string to send to InfluxDB:
+    //  Format: <measurement>[,<tag_name>=<tag_value>] field=<field_value>
+    //    If value is an integer, it must have a trailing "i"
+    //    If value is a string, it must be enclosed in double quotes.
+    def measurement = evt.name
+    // tags:
+    def deviceId = escapeStringForInfluxDB(evt.deviceId)
+    def deviceName = escapeStringForInfluxDB(evt.displayName)
+    def groupId = escapeStringForInfluxDB(evt?.device.device.groupId)
+    def groupName = escapeStringForInfluxDB(getGroupName(evt?.device.device.groupId))
+    def hubId = escapeStringForInfluxDB(evt?.device.device.hubId)
+    def hubName = escapeStringForInfluxDB(evt?.device.device.hub.toString())
+    // Don't pull these from the evt.device as the app itself will be associated with one location.
+    def locationId = escapeStringForInfluxDB(location.id)
+    def locationName = escapeStringForInfluxDB(location.name)
+
+    def unit = escapeStringForInfluxDB(evt.unit)
+    def value = escapeStringForInfluxDB(evt.value)
+    def valueBinary = ''
+    
+    def data = "${measurement},deviceId=${deviceId},deviceName=${deviceName},groupId=${groupId},groupName=${groupName},hubId=${hubId},hubName=${hubName},locationId=${locationId},locationName=${locationName}"
+    
+    // Unit tag and fields depend on the event type:
+    //  Most string-valued attributes can be translated to a binary value too.
+    if ('acceleration' == evt.name) { // acceleration: Calculate a binary value (active = 1, inactive = 0)
+        unit = 'acceleration'
+        value = '"' + value + '"'
+        valueBinary = ('active' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('alarm' == evt.name) { // alarm: Calculate a binary value (strobe/siren/both = 1, off = 0)
+        unit = 'alarm'
+        value = '"' + value + '"'
+        valueBinary = ('off' == evt.value) ? '0i' : '1i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('button' == evt.name) { // button: Calculate a binary value (held = 1, pushed = 0)
+        unit = 'button'
+        value = '"' + value + '"'
+        valueBinary = ('pushed' == evt.value) ? '0i' : '1i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('carbonMonoxide' == evt.name) { // carbonMonoxide: Calculate a binary value (detected = 1, clear/tested = 0)
+        unit = 'carbonMonoxide'
+        value = '"' + value + '"'
+        valueBinary = ('detected' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('consumableStatus' == evt.name) { // consumableStatus: Calculate a binary value ("good" = 1, "missing"/"replace"/"maintenance_required"/"order" = 0)
+        unit = 'consumableStatus'
+        value = '"' + value + '"'
+        valueBinary = ('good' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('contact' == evt.name) { // contact: Calculate a binary value (closed = 1, open = 0)
+        unit = 'contact'
+        value = '"' + value + '"'
+        valueBinary = ('closed' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('door' == evt.name) { // door: Calculate a binary value (closed = 1, open/opening/closing/unknown = 0)
+        unit = 'door'
+        value = '"' + value + '"'
+        valueBinary = ('closed' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('lock' == evt.name) { // door: Calculate a binary value (locked = 1, unlocked = 0)
+        unit = 'lock'
+        value = '"' + value + '"'
+        valueBinary = ('locked' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('motion' == evt.name) { // Motion: Calculate a binary value (active = 1, inactive = 0)
+        unit = 'motion'
+        value = '"' + value + '"'
+        valueBinary = ('active' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('mute' == evt.name) { // mute: Calculate a binary value (muted = 1, unmuted = 0)
+        unit = 'mute'
+        value = '"' + value + '"'
+        valueBinary = ('muted' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('presence' == evt.name) { // presence: Calculate a binary value (present = 1, not present = 0)
+        unit = 'presence'
+        value = '"' + value + '"'
+        valueBinary = ('present' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('shock' == evt.name) { // shock: Calculate a binary value (detected = 1, clear = 0)
+        unit = 'shock'
+        value = '"' + value + '"'
+        valueBinary = ('detected' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('sleeping' == evt.name) { // sleeping: Calculate a binary value (sleeping = 1, not sleeping = 0)
+        unit = 'sleeping'
+        value = '"' + value + '"'
+        valueBinary = ('sleeping' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('smoke' == evt.name) { // smoke: Calculate a binary value (detected = 1, clear/tested = 0)
+        unit = 'smoke'
+        value = '"' + value + '"'
+        valueBinary = ('detected' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('sound' == evt.name) { // sound: Calculate a binary value (detected = 1, not detected = 0)
+        unit = 'sound'
+        value = '"' + value + '"'
+        valueBinary = ('detected' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('switch' == evt.name) { // switch: Calculate a binary value (on = 1, off = 0)
+        unit = 'switch'
+        value = '"' + value + '"'
+        valueBinary = ('on' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('tamper' == evt.name) { // tamper: Calculate a binary value (detected = 1, clear = 0)
+        unit = 'tamper'
+        value = '"' + value + '"'
+        valueBinary = ('detected' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('thermostatMode' == evt.name) { // thermostatMode: Calculate a binary value (<any other value> = 1, off = 0)
+        unit = 'thermostatMode'
+        value = '"' + value + '"'
+        valueBinary = ('off' == evt.value) ? '0i' : '1i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('thermostatFanMode' == evt.name) { // thermostatFanMode: Calculate a binary value (<any other value> = 1, off = 0)
+        unit = 'thermostatFanMode'
+        value = '"' + value + '"'
+        valueBinary = ('off' == evt.value) ? '0i' : '1i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('thermostatOperatingState' == evt.name) { // thermostatOperatingState: Calculate a binary value (heating = 1, <any other value> = 0)
+        unit = 'thermostatOperatingState'
+        value = '"' + value + '"'
+        valueBinary = ('heating' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('thermostatSetpointMode' == evt.name) { // thermostatSetpointMode: Calculate a binary value (followSchedule = 0, <any other value> = 1)
+        unit = 'thermostatSetpointMode'
+        value = '"' + value + '"'
+        valueBinary = ('followSchedule' == evt.value) ? '0i' : '1i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('threeAxis' == evt.name) { // threeAxis: Format to x,y,z values.
+        unit = 'threeAxis'
+        def valueXYZ = evt.value.split(",")
+        def valueX = valueXYZ[0]
+        def valueY = valueXYZ[1]
+        def valueZ = valueXYZ[2]
+        data += ",unit=${unit} valueX=${valueX}i,valueY=${valueY}i,valueZ=${valueZ}i" // values are integers.
+    }
+    else if ('touch' == evt.name) { // touch: Calculate a binary value (touched = 1, "" = 0)
+        unit = 'touch'
+        value = '"' + value + '"'
+        valueBinary = ('touched' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('optimisation' == evt.name) { // optimisation: Calculate a binary value (active = 1, inactive = 0)
+        unit = 'optimisation'
+        value = '"' + value + '"'
+        valueBinary = ('active' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('windowFunction' == evt.name) { // windowFunction: Calculate a binary value (active = 1, inactive = 0)
+        unit = 'windowFunction'
+        value = '"' + value + '"'
+        valueBinary = ('active' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('touch' == evt.name) { // touch: Calculate a binary value (touched = 1, <any other value> = 0)
+        unit = 'touch'
+        value = '"' + value + '"'
+        valueBinary = ('touched' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('water' == evt.name) { // water: Calculate a binary value (wet = 1, dry = 0)
+        unit = 'water'
+        value = '"' + value + '"'
+        valueBinary = ('wet' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    else if ('windowShade' == evt.name) { // windowShade: Calculate a binary value (closed = 1, <any other value> = 0)
+        unit = 'windowShade'
+        value = '"' + value + '"'
+        valueBinary = ('closed' == evt.value) ? '1i' : '0i'
+        data += ",unit=${unit} value=${value},valueBinary=${valueBinary}"
+    }
+    // Catch any other event with a string value that hasn't been handled:
+    else if (evt.value ==~ /.*[^0-9\.,-].*/) { // match if any characters are not digits, period, comma, or hyphen.
+		logger("handleEvent(): Found a string value that's not explicitly handled: Device Name: ${deviceName}, Event Name: ${evt.name}, Value: ${evt.value}","warn")
+        value = '"' + value + '"'
+        data += ",unit=${unit} value=${value}"
+    }
+    // Catch any other general numerical event (carbonDioxide, power, energy, humidity, level, temperature, ultravioletIndex, voltage, etc).
+    else {
+        data += ",unit=${unit} value=${value}"
+    }
+    
+    // Post data to InfluxDB:
+    postToInfluxDB(data)
+
+}
+
+
+/*****************************************************************************************************************
+ *  Main Commands:
+ *****************************************************************************************************************/
+
+/**
+ *  softPoll()
+ *
+ *  Executed by schedule.
+ * 
+ *  Forces data to be posted to InfluxDB (even if an event has not been triggered).
+ *  Doesn't poll devices, just builds a fake event to pass to handleEvent().
+ *
+ *  Also calls LogSystemProperties().
+ **/
+def softPoll() {
+    logger("softPoll()","trace")
+    
+    logSystemProperties()
+    
+    // Iterate over each attribute for each device, in each device collection in deviceAttributes:
+    def devs // temp variable to hold device collection.
+    state.deviceAttributes.each { da ->
+        devs = settings."${da.devices}"
+        if (devs && (da.attributes)) {
+            devs.each { d ->
+                da.attributes.each { attr ->
+                    if (d.hasAttribute(attr) && d.latestState(attr)?.value != null) {
+                        logger("softPoll(): Softpolling device ${d} for attribute: ${attr}","info")
+                        // Send fake event to handleEvent():
+                        handleEvent([
+                            name: attr, 
+                            value: d.latestState(attr)?.value,
+                            unit: d.latestState(attr)?.unit,
+                            device: d,
+                            deviceId: d.id,
+                            displayName: d.displayName
+                        ])
+                    }
+                }
+            }
+        }
+    }
+
+}
+
+/**
+ *  logSystemProperties()
+ *
+ *  Generates measurements for SmartThings system (hubs and locations) properties.
+ **/
+def logSystemProperties() {
+    logger("logSystemProperties()","trace")
+
+    def locationId = '"' + escapeStringForInfluxDB(location.id) + '"'
+    def locationName = '"' + escapeStringForInfluxDB(location.name) + '"'
+
+	// Location Properties:
+    if (prefLogLocationProperties) {
+        try {
+            def tz = '"' + escapeStringForInfluxDB(location.timeZone.ID) + '"'
+            def mode = '"' + escapeStringForInfluxDB(location.mode) + '"'
+            def hubCount = location.hubs.size()
+            def times = getSunriseAndSunset()
+            def srt = '"' + times.sunrise.format("HH:mm", location.timeZone) + '"'
+            def sst = '"' + times.sunset.format("HH:mm", location.timeZone) + '"'
+
+            def data = "_stLocation,locationId=${locationId},locationName=${locationName},latitude=${location.latitude},longitude=${location.longitude},timeZone=${tz} mode=${mode},hubCount=${hubCount}i,sunriseTime=${srt},sunsetTime=${sst}"
+            postToInfluxDB(data)
+        } catch (e) {
+		    logger("logSystemProperties(): Unable to log Location properties: ${e}","error")
+        }
+	}
+
+	// Hub Properties:
+    if (prefLogHubProperties) {
+       	location.hubs.each { h ->
+        	try {
+                def hubId = '"' + escapeStringForInfluxDB(h.id) + '"'
+                def hubName = '"' + escapeStringForInfluxDB(h.name) + '"'
+                def hubIP = '"' + escapeStringForInfluxDB(h.localIP) + '"'
+                def hubStatus = '"' + escapeStringForInfluxDB(h.status) + '"'
+                def batteryInUse = ("false" == h.hub.getDataValue("batteryInUse")) ? "0i" : "1i"
+                def hubUptime = h.hub.getDataValue("uptime") + 'i'
+                def zigbeePowerLevel = h.hub.getDataValue("zigbeePowerLevel") + 'i'
+                def zwavePowerLevel =  '"' + escapeStringForInfluxDB(h.hub.getDataValue("zwavePowerLevel")) + '"'
+                def firmwareVersion =  '"' + escapeStringForInfluxDB(h.firmwareVersionString) + '"'
+
+                def data = "_stHub,locationId=${locationId},locationName=${locationName},hubId=${hubId},hubName=${hubName},hubIP=${hubIP} "
+                data += "status=${hubStatus},batteryInUse=${batteryInUse},uptime=${hubUptime},zigbeePowerLevel=${zigbeePowerLevel},zwavePowerLevel=${zwavePowerLevel},firmwareVersion=${firmwareVersion}"
+                postToInfluxDB(data)
+            } catch (e) {
+				logger("logSystemProperties(): Unable to log Hub properties: ${e}","error")
+        	}
+       	}
+
+	}
+
+}
+
+/**
+ *  postToInfluxDB()
+ *
+ *  Posts data to InfluxDB.
+ *
+ *  Uses hubAction instead of httpPost() in case InfluxDB server is on the same LAN as the Smartthings Hub.
+ **/
+def postToInfluxDB(data) {
+    logger("postToInfluxDB(): Posting data to InfluxDB: Host: ${state.databaseHost}, Port: ${state.databasePort}, Database: ${state.databaseName}, Data: [${data}]","debug")
+    
+    try {
+        def hubAction = new physicalgraph.device.HubAction(
+        	[
+                method: "POST",
+                path: state.path,
+                body: data,
+                headers: state.headers
+            ],
+            null,
+            [ callback: handleInfluxResponse ]
+        )
+		
+        sendHubCommand(hubAction)
+    }
+    catch (Exception e) {
+		logger("postToInfluxDB(): Exception ${e} on ${hubAction}","error")
+    }
+
+    // For reference, code that could be used for WAN hosts:
+    // def url = "http://${state.databaseHost}:${state.databasePort}/write?db=${state.databaseName}" 
+    //    try {
+    //      httpPost(url, data) { response ->
+    //          if (response.status != 999 ) {
+    //              log.debug "Response Status: ${response.status}"
+    //              log.debug "Response data: ${response.data}"
+    //              log.debug "Response contentType: ${response.contentType}"
+    //            }
+    //      }
+    //  } catch (e) {	
+    //      logger("postToInfluxDB(): Something went wrong when posting: ${e}","error")
+    //  }
+}
+
+/**
+ *  handleInfluxResponse()
+ *
+ *  Handles response from post made in postToInfluxDB().
+ **/
+def handleInfluxResponse(physicalgraph.device.HubResponse hubResponse) {
+    if(hubResponse.status >= 400) {
+		logger("postToInfluxDB(): Something went wrong! Response from InfluxDB: Headers: ${hubResponse.headers}, Body: ${hubResponse.body}","error")
+    }
+}
+
+
+/*****************************************************************************************************************
+ *  Private Helper Functions:
+ *****************************************************************************************************************/
+
+/**
+ *  manageSchedules()
+ * 
+ *  Configures/restarts scheduled tasks: 
+ *   softPoll() - Run every {state.softPollingInterval} minutes.
+ **/
+private manageSchedules() {
+	logger("manageSchedules()","trace")
+
+    // Generate a random offset (1-60):
+    Random rand = new Random(now())
+    def randomOffset = 0
+    
+    // softPoll:
+    try {
+        unschedule(softPoll)
+    }
+    catch(e) {
+        // logger("manageSchedules(): Unschedule failed!","error")
+    }
+
+    if (state.softPollingInterval > 0) {
+        randomOffset = rand.nextInt(60)
+        logger("manageSchedules(): Scheduling softpoll to run every ${state.softPollingInterval} minutes (offset of ${randomOffset} seconds).","trace")
+        schedule("${randomOffset} 0/${state.softPollingInterval} * * * ?", "softPoll")
+    }
+    
+}
+
+/**
+ *  manageSubscriptions()
+ * 
+ *  Configures subscriptions.
+ **/
+private manageSubscriptions() {
+	logger("manageSubscriptions()","trace")
+
+    // Unsubscribe:
+    unsubscribe()
+    
+    // Subscribe to App Touch events:
+    subscribe(app,handleAppTouch)
+    
+    // Subscribe to mode events:
+    if (prefLogModeEvents) subscribe(location, "mode", handleModeEvent)
+    
+    // Subscribe to device attributes (iterate over each attribute for each device collection in state.deviceAttributes):
+    def devs // dynamic variable holding device collection.
+    state.deviceAttributes.each { da ->
+        devs = settings."${da.devices}"
+        if (devs && (da.attributes)) {
+            da.attributes.each { attr ->
+                logger("manageSubscriptions(): Subscribing to attribute: ${attr}, for devices: ${da.devices}","info")
+                // There is no need to check if all devices in the collection have the attribute.
+                subscribe(devs, attr, handleEvent)
+            }
+        }
+    }
+}
+
+/**
+ *  logger()
+ *
+ *  Wrapper function for all logging.
+ **/
+private logger(msg, level = "debug") {
+
+    switch(level) {
+        case "error":
+            if (state.loggingLevelIDE >= 1) log.error msg
+            break
+
+        case "warn":
+            if (state.loggingLevelIDE >= 2) log.warn msg
+            break
+
+        case "info":
+            if (state.loggingLevelIDE >= 3) log.info msg
+            break
+
+        case "debug":
+            if (state.loggingLevelIDE >= 4) log.debug msg
+            break
+
+        case "trace":
+            if (state.loggingLevelIDE >= 5) log.trace msg
+            break
+
+        default:
+            log.debug msg
+            break
+    }
+}
+
+/**
+ *  encodeCredentialsBasic()
+ *
+ *  Encode credentials for HTTP Basic authentication.
+ **/
+private encodeCredentialsBasic(username, password) {
+    return "Basic " + "${username}:${password}".encodeAsBase64().toString()
+}
+
+/**
+ *  escapeStringForInfluxDB()
+ *
+ *  Escape values to InfluxDB.
+ *  
+ *  If a tag key, tag value, or field key contains a space, comma, or an equals sign = it must 
+ *  be escaped using the backslash character \. Backslash characters do not need to be escaped. 
+ *  Commas and spaces will also need to be escaped for measurements, though equals signs = do not.
+ *
+ *  Further info: https://docs.influxdata.com/influxdb/v0.10/write_protocols/write_syntax/
+ **/
+private escapeStringForInfluxDB(str) {
+    if (str) {
+        str = str.replaceAll(" ", "\\\\ ") // Escape spaces.
+        str = str.replaceAll(",", "\\\\,") // Escape commas.
+        str = str.replaceAll("=", "\\\\=") // Escape equal signs.
+        str = str.replaceAll("\"", "\\\\\"") // Escape double quotes.
+        //str = str.replaceAll("'", "_")  // Replace apostrophes with underscores.
+    }
+    else {
+        str = 'null'
+    }
+    return str
+}
+
+/**
+ *  getGroupName()
+ *
+ *  Get the name of a 'Group' (i.e. Room) from its ID.
+ *  
+ *  This is done manually as there does not appear to be a way to enumerate
+ *  groups from a SmartApp currently.
+ * 
+ *  GroupIds can be obtained from the SmartThings IDE under 'My Locations'.
+ *
+ *  See: https://community.smartthings.com/t/accessing-group-within-a-smartapp/6830
+ **/
+private getGroupName(id) {
+
+    if (id == null) {return 'Home'}
+    else if (id == 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX') {return 'Kitchen'}
+    else if (id == 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX') {return 'Lounge'}
+    else if (id == 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX') {return 'Office'}
+    else {return 'Unknown'}    
+}

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°"
-        }
-    }
-}