MSA-2073: Multifunction pool control

devicetypes/bigpunk6/intermatic-pe653-pool-control-system.src/intermatic-pe653-pool-control-system.groovy

@@ -0,0 +1,464 @@
+/**
+ *  Intermatic PE653 Pool Control System
+ *
+ *  Copyright 2014 bigpunk6
+ *
+ *  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.
+ *
+ *  Don't use Cooper Lee's code (vTile_ms, ms_w_vts) he was working on a different implementation than me.
+ *
+ *  Install my device type then use the Multi-Channel Controll App by SmartThings from the Marketplace under the More section.
+ *
+ */
+metadata {
+	definition (name: "Intermatic PE653 Pool Control System", author: "bigpunk6", namespace:  "bigpunk6") {
+        capability "Actuator"
+		capability "Switch"
+		capability "Polling"
+		capability "Configuration"
+		capability "Refresh"
+		capability "Temperature Measurement"
+		capability "Sensor"
+		capability "Zw Multichannel"
+        capability "Thermostat"
+        
+        attribute "operationMode", "string"
+        attribute "firemanTimeout", "string"
+        attribute "temperatureOffsets", "string"
+        attribute "poolspaConfig", "string"
+        attribute "poolSetpoint", "string"
+        attribute "spaSetpoint", "string"
+        attribute "setPoolSetpoint", "string"
+        attribute "pool", "string"
+        attribute "setSpaSetpoint", "string"
+        attribute "spa", "string"
+        
+        command "quickSetPool"
+        command "quickSetSpa"
+		
+		fingerprint deviceId: "0x1001", inClusters: "0x91,0x73,0x72,0x86,0x81,0x60,0x70,0x85,0x25,0x27,0x43,0x31", outClusters: "0x82"
+	}
+    
+    preferences {
+        input "operationMode1", "enum", title: "Boster/Cleaner Pump",
+            options:[1:"No",
+                     2:"Uses Circuit-1",
+                     3:"Variable Speed pump Speed-1",
+                     4:"Variable Speed pump Speed-2",
+                     5:"Variable Speed pump Speed-3",
+                     6:"Variable Speed pump Speed-4"]
+        input "operationMode2", "enum", title: "Pump Type", 
+            options:[0:"1 Speed Pump without Booster/Cleaner",
+                     1:"1 Speed Pump with Booster/Cleaner",
+                     2:"2 Speed Pump without Booster/Cleaner",
+                     3:"2 Speed Pump with Booster/Cleaner"]
+        input "poolSpa1", "enum", title: "Pool or Spa", options:[0:"Pool",1:"Spa",2:"Both"]
+	    input "fireman", "enum", title: "Fireman Timeout",
+            options:["255":"No heater installed",
+                     "0":"No cool down period",
+                     "1":"1 minute",
+                     "2":"2 minute",
+                     "3":"3 minute",
+                     "4":"4 minute",
+                     "5":"5 minute",
+                     "6":"6 minute",
+                     "7":"7 minute",
+                     "8":"8 minute",
+                     "9":"9 minute",
+                     "10":"10 minute",
+                     "11":"11 minute",
+                     "12":"12 minute",
+                     "13":"13 minute",
+                     "14":"14 minute",
+                     "15":"15 minute"]
+        input "tempOffsetwater", "number", title: "Water temperature offset", defaultValue: 0, required: true
+        input "tempOffsetair", "number",
+            title: "Air temperature offset - Sets the Offset of the air temerature for the add-on Thermometer in degrees Fahrenheit -20F to +20F", defaultValue: 0, required: true
+    }
+
+	simulator {
+		status "on":  "command: 2003, payload: FF"
+		status "off": "command: 2003, payload: 00"
+		reply "8E010101,delay 800,6007": "command: 6008, payload: 4004"
+		reply "8505": "command: 8506, payload: 02"
+		reply "59034002": "command: 5904, payload: 8102003101000000"
+		reply "6007":  "command: 6008, payload: 0002"
+		reply "600901": "command: 600A, payload: 10002532"
+		reply "600902": "command: 600A, payload: 210031"
+	}
+    
+	// tile definitions
+	tiles(scale: 2) {
+        multiAttributeTile(name:"temperature", type: "thermostat", width: 6, height: 4){
+			tileAttribute ("device.temperature", key: "PRIMARY_CONTROL") {
+				attributeState "temperature", label:'${currentValue}°',
+					backgroundColors:[
+						[value: 32, color: "#153591"],
+					    [value: 54, color: "#1e9cbb"],
+				    	[value: 64, color: "#90d2a7"],
+				    	[value: 74, color: "#44b621"],
+				    	[value: 90, color: "#f1d801"],
+				    	[value: 98, color: "#d04e00"],
+				    	[value: 110, color: "#bc2323"]
+					]
+			}
+            tileAttribute ("device.poolSetpoint", key: "VALUE_CONTROL") {
+				attributeState "poolSetpoint", action:"quickSetPool"
+			}
+			tileAttribute ("device.spaSetpoint", key: "SECONDARY_CONTROL") {
+				attributeState "spaSetpoint", label:'Spa set to ${currentValue}°F'
+			}
+            
+		}
+        controlTile("poolSliderControl", "device.poolSetpoint", "slider", height: 2, width: 4, inactiveLabel: false, range:"(40..104)") {
+			state "setPoolSetpoint", action:"quickSetPool", backgroundColor:"#d04e00"
+		}
+		valueTile("poolSetpoint", "device.poolSetpoint", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
+			state "pool", label:'${currentValue}° pool', backgroundColor:"#ffffff"
+		}
+		controlTile("spaSliderControl", "device.spaSetpoint", "slider", height: 2, width: 4, inactiveLabel: false, range:"(40..104)") {
+			state "setSpaSetpoint", action:"quickSetSpa", backgroundColor: "#1e9cbb"
+		}
+		valueTile("spaSetpoint", "device.spaSetpoint", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
+			state "spa", label:'${currentValue}° spa', backgroundColor:"#ffffff"
+		}
+        /*valueTile("temperature", "device.temperature") {
+			state("temperature", label:'${currentValue}°', unit:"F",
+				backgroundColors:[
+					[value: 32, color: "#153591"],
+					[value: 54, color: "#1e9cbb"],
+					[value: 64, color: "#90d2a7"],
+					[value: 74, color: "#44b621"],
+					[value: 90, color: "#f1d801"],
+					[value: 98, color: "#d04e00"],
+					[value: 110, color: "#bc2323"]
+				]
+			)
+		}*/
+        standardTile("refresh", "device.switch", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
+			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+        standardTile("configure", "device.configure", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
+			state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
+		}
+        
+		main "temperature"
+        details(["temperature", "poolSliderControl", "poolSetpoint", "spaSliderControl", "spaSetpoint", "configure", "refresh"])
+	}
+}
+
+def parse(String description) {
+	def result = null
+	if (description.startsWith("Err")) {
+        log.warn "Error in Parse"
+	    result = createEvent(descriptionText:description, isStateChange:true)
+	} else {
+		def cmd = zwave.parse(description, [0x20: 1, 0x25:1, 0x27:1, 0x31:1, 0x43:1, 0x60:3, 0x70:2, 0x81:1, 0x85:1, 0x86: 1, 0x73:1])
+		if (cmd) {
+			result = zwaveEvent(cmd)
+		}
+	}
+	log.debug("'$description' parsed to $result")
+	return result
+}
+
+    //Thermostat
+def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport cmd) {
+	log.debug "ThermostatModeReport $cmd"
+    def map = [:]
+	switch (cmd.mode) {
+		case physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport.MODE_HEAT:
+			map.value = "pool"
+			break
+		case physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport.MODE_FURNACE:
+			map.value = "spa"
+			break
+	}
+	map.name = "thermostatMode"
+	map
+}
+
+def quickSetPool(degrees) {
+    log.debug "quickSetPool $degrees"
+	setPoolSetpoint(degrees, 1000)
+}
+
+def setPoolSetpoint(degrees, delay = 30000) {
+	setPoolSetpoint(degrees.toDouble(), delay)
+}
+
+def setPoolSetpoint(Double degrees, Integer delay = 30000) {
+	log.trace "setPoolSetpoint($degrees, $delay)"
+	def deviceScale = state.scale ?: 1
+	def deviceScaleString = deviceScale == 2 ? "C" : "F"
+    def locationScale = getTemperatureScale()
+	def p = (state.precision == null) ? 1 : state.precision
+
+    def convertedDegrees
+    if (locationScale == "C" && deviceScaleString == "F") {
+    	convertedDegrees = celsiusToFahrenheit(degrees)
+    } else if (locationScale == "F" && deviceScaleString == "C") {
+    	convertedDegrees = fahrenheitToCelsius(degrees)
+    } else {
+    	convertedDegrees = degrees
+    }
+
+	delayBetween([
+		zwave.thermostatSetpointV1.thermostatSetpointSet(setpointType: 1, scale: deviceScale, precision: p, scaledValue: convertedDegrees).format(),
+		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format()
+	], delay)
+}
+
+def quickSetSpa(degrees) {
+	setSpaSetpoint(degrees, 1000)
+}
+
+def setSpaSetpoint(degrees, delay = 30000) {
+	setSpaSetpoint(degrees.toDouble(), delay)
+}
+
+def setSpaSetpoint(Double degrees, Integer delay = 30000) {
+    log.trace "setSpaSetpoint($degrees, $delay)"
+	def deviceScale = state.scale ?: 1
+	def deviceScaleString = deviceScale == 2 ? "C" : "F"
+    def locationScale = getTemperatureScale()
+	def p = (state.precision == null) ? 1 : state.precision
+
+    def convertedDegrees
+    if (locationScale == "C" && deviceScaleString == "F") {
+    	convertedDegrees = celsiusToFahrenheit(degrees)
+    } else if (locationScale == "F" && deviceScaleString == "C") {
+    	convertedDegrees = fahrenheitToCelsius(degrees)
+    } else {
+    	convertedDegrees = degrees
+    }
+
+	delayBetween([
+		zwave.thermostatSetpointV1.thermostatSetpointSet(setpointType: 7, scale: deviceScale, precision: p,  scaledValue: convertedDegrees).format(),
+		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 7).format()
+	], delay)
+}
+
+//Reports
+
+def zwaveEvent(physicalgraph.zwave.commands.configurationv2.ConfigurationReport cmd) {
+    log.debug "configuration: $cmd"
+    def map = [:]
+	map.value = cmd.configurationValue
+	map.displayed = false
+    switch (cmd.parameterNumber) {
+        case 1:
+			map.name = "operationMode"
+			break;
+        case 2:
+			map.name = "firemanTimeout"
+			break;
+        case 3:
+			map.name = "temperatureOffsets"
+			break;
+        case 19:
+			map.name = "poolspaConfig"
+			break;
+		default:
+			return [:]
+	}
+    createEvent(map)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv1.SensorMultilevelReport cmd) {
+    log.debug "Sensor: $cmd"
+    def map = [:]
+    map.value = cmd.scaledSensorValue.toString()
+    map.unit = cmd.scale == 1 ? "F" : "C"
+    map.name = "temperature"
+    createEvent(map)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.thermostatsetpointv1.ThermostatSetpointReport cmd) {
+	def map = [:]
+	map.value = cmd.scaledValue.toString()
+	map.unit = cmd.scale == 1 ? "F" : "C"
+	map.displayed = false
+	switch (cmd.setpointType) {
+		case 1:
+			map.name = "poolSetpoint"
+			break;
+		case 7:
+			map.name = "spaSetpoint"
+			break;
+		default:
+			return [:]
+	}
+	// So we can respond with same format
+	state.size = cmd.size
+	state.scale = cmd.scale
+	state.precision = cmd.precision
+	createEvent(map)
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
+	log.debug "$cmd"
+    if (cmd.value == 0) {
+		createEvent(name: "switch", value: "off")
+	} else if (cmd.value == 255) {
+		createEvent(name: "switch", value: "on")
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.multichannelv3.MultiInstanceReport cmd) {
+    log.debug "MultiInstanceReport $cmd"
+}
+
+private List loadEndpointInfo() {
+	if (state.endpointInfo) {
+		state.endpointInfo
+	} else if (device.currentValue("epInfo")) {
+		fromJson(device.currentValue("epInfo"))
+	} else {
+		[]
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.multichannelv3.MultiChannelEndPointReport cmd) {
+	log.debug "$cmd"
+    updateDataValue("endpoints", cmd.endPoints.toString())
+	if (!state.endpointInfo) {
+		state.endpointInfo = loadEndpointInfo()
+	}
+	if (state.endpointInfo.size() > cmd.endPoints) {
+		cmd.endpointInfo
+	}
+	state.endpointInfo = [null] * cmd.endPoints
+	//response(zwave.associationV2.associationGroupingsGet())
+	[ createEvent(name: "epInfo", value: util.toJson(state.endpointInfo), displayed: false, descriptionText:""),
+	  response(zwave.multiChannelV3.multiChannelCapabilityGet(endPoint: 1)) ]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.multichannelv3.MultiChannelCapabilityReport cmd) {
+	log.debug "$cmd"
+    def result = []
+	def cmds = []
+	if(!state.endpointInfo) state.endpointInfo = []
+	state.endpointInfo[cmd.endPoint - 1] = cmd.format()[6..-1]
+	if (cmd.endPoint < getDataValue("endpoints").toInteger()) {
+		cmds = zwave.multiChannelV3.multiChannelCapabilityGet(endPoint: cmd.endPoint + 1).format()
+	} else {
+		log.debug "endpointInfo: ${state.endpointInfo.inspect()}"
+	}
+	result << createEvent(name: "epInfo", value: util.toJson(state.endpointInfo), displayed: false, descriptionText:"")
+	if(cmds) result << response(cmds)
+	result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.associationv2.AssociationGroupingsReport cmd) {
+	log.debug "$cmd"
+    state.groups = cmd.supportedGroupings
+	if (cmd.supportedGroupings > 1) {
+		[response(zwave.associationGrpInfoV1.associationGroupInfoGet(groupingIdentifier:2, listMode:1))]
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.associationgrpinfov1.AssociationGroupInfoReport cmd) {
+	log.debug "$cmd"
+    def cmds = []
+	for (def i = 2; i <= state.groups; i++) {
+		cmds << response(zwave.multiChannelAssociationV2.multiChannelAssociationSet(groupingIdentifier:i, nodeId:zwaveHubNodeId))
+	}
+	cmds
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.multichannelv3.MultiChannelCmdEncap cmd) {
+	log.debug "$cmd"
+    def encapsulatedCommand = cmd.encapsulatedCommand([0x32: 3, 0x25: 1, 0x20: 1])
+	if (encapsulatedCommand) {
+		if (state.enabledEndpoints.find { it == cmd.sourceEndPoint }) {
+			def formatCmd = ([cmd.commandClass, cmd.command] + cmd.parameter).collect{ String.format("%02X", it) }.join()
+            createEvent(name: "epEvent", value: "$cmd.sourceEndPoint:$formatCmd", isStateChange: true, displayed: false, descriptionText: "(fwd to ep $cmd.sourceEndPoint)")
+        } else {
+			zwaveEvent(encapsulatedCommand, cmd.sourceEndPoint as Integer)
+		}
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.Command cmd) {
+    log.warn "Captured zwave command $cmd"
+	createEvent(descriptionText: "$device.displayName: $cmd", isStateChange: true)
+}
+
+//Commands
+
+def epCmd(Integer ep, String cmds) {
+    log.debug "epCmd: $ep $cmds"
+    if (cmds.contains('2001FF')){
+        log.debug "contained 2001FF"
+        delayBetween([
+            encap(zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF), ep),
+            encap(zwave.switchBinaryV1.switchBinaryGet(), ep)
+	    ], 2300)
+    } else if (cmds.contains('200100')) {
+        log.debug "contained 2001FF"
+        delayBetween([
+            encap(zwave.switchBinaryV1.switchBinarySet(switchValue: 0), ep),
+            encap(zwave.switchBinaryV1.switchBinaryGet(), ep)
+	    ], 2300)
+    } else if (cmds.contains('2002')) {
+        encap(zwave.switchBinaryV1.switchBinaryGet(), ep)
+    } else {
+        log.warn "No CMD found"
+    }
+}
+
+def enableEpEvents(enabledEndpoints) {
+	state.enabledEndpoints = enabledEndpoints.split(",").findAll()*.toInteger()
+	null
+}
+
+private command(physicalgraph.zwave.Command cmd) {
+	log.debug "command: $cmd"
+    cmd.format()
+}
+
+private encap(cmd, endpoint) {
+	if (endpoint) {
+        command(zwave.multiChannelV3.multiChannelCmdEncap(destinationEndPoint:endpoint, sourceEndPoint: endpoint).encapsulate(cmd))
+	} else {
+		command(cmd)
+	}
+}
+
+def poll() {
+    zwave.sensorMultilevelV1.sensorMultilevelGet().format()
+}
+
+def refresh() {
+	delayBetween([
+    zwave.multiChannelV3.multiChannelCmdEncap(sourceEndPoint:1, destinationEndPoint:1, commandClass:37, command:2).format(),
+    zwave.multiChannelV3.multiChannelCmdEncap(sourceEndPoint:2, destinationEndPoint:2, commandClass:37, command:2).format(),
+    zwave.multiChannelV3.multiChannelCmdEncap(sourceEndPoint:3, destinationEndPoint:3, commandClass:37, command:2).format(),
+    zwave.multiChannelV3.multiChannelCmdEncap(sourceEndPoint:4, destinationEndPoint:4, commandClass:37, command:2).format(),
+    zwave.multiChannelV3.multiChannelCmdEncap(sourceEndPoint:5, destinationEndPoint:5, commandClass:37, command:2).format(),
+    zwave.sensorMultilevelV1.sensorMultilevelGet().format(),
+    zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format(),
+    zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 7).format(),
+    zwave.configurationV2.configurationGet(parameterNumber: 1).format(),
+    zwave.configurationV2.configurationGet(parameterNumber: 2).format(),
+    zwave.configurationV2.configurationGet(parameterNumber: 3).format(),
+    zwave.configurationV2.configurationGet(parameterNumber: 19).format()
+    ], 3000)
+}
+
+def configure() {
+    def cmds = []
+        cmds << zwave.configurationV2.configurationSet(configurationValue: [operationMode1.toInteger(), operationMode2.toInteger()], parameterNumber: 1, size: 2).format()
+        cmds << zwave.configurationV2.configurationSet(configurationValue: [tempOffsetwater.toInteger(), tempOffsetair.toInteger(), 0, 0], parameterNumber: 3, size: 4).format()
+        cmds << zwave.configurationV2.configurationSet(configurationValue: [poolSpa1.toInteger()], parameterNumber: 19, size: 1).format()
+        cmds << zwave.configurationV2.configurationSet(configurationValue: [fireman.toInteger()], parameterNumber: 2, size: 1).format()
+	delayBetween(cmds, 2500)
+}

devicetypes/garth/devolo-humidity-sensor.src/devolo-humidity-sensor.groovy

@@ -1,188 +0,0 @@
-/**
- *  Devolo Humidity Sensor
- *
- *  Copyright 2017 Garth Williams
- *
- *  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.
- *
- *
- *  Based on definition (name: "Aeon Multisensor 6", namespace: "smartthings", author: "SmartThings")
- *
- */
-metadata {
-	definition (name: "Devolo Humidity Sensor", namespace: "garth", author: "Garth Williams") {
-		capability "Temperature Measurement"
-		capability "Relative Humidity Measurement"
-		capability "Configuration"
-		capability "Sensor"
-		capability "Battery"
-		capability "Health Check"
-        
-        attribute "batteryStatus", "string"
-        
-        fingerprint mfr: "0175", prod: "0002", model: "0020"
-	}
-
-	simulator {
-		for (int i = 0; i <= 100; i += 20) {
-			status "temperature ${i}F": new physicalgraph.zwave.Zwave().securityV1.securityMessageEncapsulation().encapsulate(
-				new physicalgraph.zwave.Zwave().sensorMultilevelV2.sensorMultilevelReport(
-					scaledSensorValue: i, precision: 1, sensorType: 1, scale: 1)
-				).incomingMessage()
-		}
-
-		for (int i = 0; i <= 100; i += 20) {
-			status "humidity ${i}%":  new physicalgraph.zwave.Zwave().securityV1.securityMessageEncapsulation().encapsulate(
-				new physicalgraph.zwave.Zwave().sensorMultilevelV2.sensorMultilevelReport(scaledSensorValue: i, sensorType: 5)
-			).incomingMessage()
-		}
-
-		for (int i in [0, 5, 10, 15, 50, 99, 100]) {
-			status "battery ${i}%":  new physicalgraph.zwave.Zwave().securityV1.securityMessageEncapsulation().encapsulate(
-				new physicalgraph.zwave.Zwave().batteryV1.batteryReport(batteryLevel: i)
-			).incomingMessage()
-		}
-		status "low battery alert":  new physicalgraph.zwave.Zwave().securityV1.securityMessageEncapsulation().encapsulate(
-			new physicalgraph.zwave.Zwave().batteryV1.batteryReport(batteryLevel: 255)
-		).incomingMessage()
-
-		status "wake up" : "command: 8407, payload: "
-	}
-
-	preferences {
-	}
-
-	tiles(scale: 2) {
-		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
-			state "temperature", label:'${currentValue}°',
-			backgroundColors:[
-				[value: 32, color: "#153591"],
-				[value: 44, color: "#1e9cbb"],
-				[value: 59, color: "#90d2a7"],
-				[value: 74, color: "#44b621"],
-				[value: 84, color: "#f1d801"],
-				[value: 92, color: "#d04e00"],
-				[value: 98, color: "#bc2323"]
-			]
-		}
-		valueTile("humidity", "device.humidity", inactiveLabel: false, width: 2, height: 2) {
-			state "humidity", label:'${currentValue}% humidity', unit:""
-		}
-
-		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "battery", label:'${currentValue}% battery', unit:""
-		}
-
-		valueTile("batteryStatus", "device.batteryStatus", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "batteryStatus", label:'${currentValue}', unit:""
-		}
-
-		main(["temperature", "humidity"])
-		details(["temperature", "humidity", "batteryStatus"])
-	}
-}
-
-def parse(String description) {
-	log.debug "parse() >> description: $description"
-	def result = null
-	if (description.startsWith("Err 106")) {
-		log.debug "parse() >> Err 106"
-		result = createEvent( name: "secureInclusion", value: "failed", isStateChange: true,
-				descriptionText: "This sensor failed to complete the network security key exchange. If you are unable to control it via SmartThings, you must remove it from your network and add it again.")
-	} else if (description != "updated") {
-		log.debug "parse() >> zwave.parse(description)"
-		def cmd = zwave.parse(description, [0x31: 5, 0x30: 2, 0x84: 1])
-		if (cmd) {
-			result = zwaveEvent(cmd)
-		}
-	}
-	log.debug "After zwaveEvent(cmd) >> Parsed '${description}' to ${result.inspect()}"
-	return result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulation cmd) {
-	def encapsulatedCommand = cmd.encapsulatedCommand([0x31: 5, 0x30: 2, 0x84: 1])
-	state.sec = 1
-	log.debug "encapsulated: ${encapsulatedCommand}"
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand)
-	} else {
-		log.warn "Unable to extract encapsulated cmd from $cmd"
-		createEvent(descriptionText: cmd.toString())
-	}
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityCommandsSupportedReport cmd) {
-	log.info "Executing zwaveEvent 98 (SecurityV1): 03 (SecurityCommandsSupportedReport) with cmd: $cmd"
-	state.sec = 1
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.securityv1.NetworkKeyVerify cmd) {
-	state.sec = 1
-	log.info "Executing zwaveEvent 98 (SecurityV1): 07 (NetworkKeyVerify) with cmd: $cmd (node is securely included)"
-	def result = [createEvent(name:"secureInclusion", value:"success", descriptionText:"Secure inclusion was successful", isStateChange: true)]
-	result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
-	def result = []
-	def map = [ name: "battery", unit: "%" ]
-	if (cmd.batteryLevel == 0xFF) {
-		map.value = 1
-		map.descriptionText = "${device.displayName} battery is low"
-		map.isStateChange = true
-	} else {
-		map.value = cmd.batteryLevel
-	}
-	state.lastbatt = now()
-	result << createEvent(map)
-	if (device.latestValue("powerSupply") != "USB Cable"){
-		result << createEvent(name: "batteryStatus", value: "${map.value} % battery", displayed: false)
-	}
-	result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelReport cmd){
-	def map = [:]
-	switch (cmd.sensorType) {
-		case 1:
-			map.name = "temperature"
-			def cmdScale = cmd.scale == 1 ? "F" : "C"
-			map.value = convertTemperatureIfNeeded(cmd.scaledSensorValue, cmdScale, cmd.precision)
-			map.unit = getTemperatureScale()
-			break
-		case 5:
-			map.name = "humidity"
-			map.value = cmd.scaledSensorValue.toInteger()
-			map.unit = "%"
-			break
-		default:
-			map.descriptionText = cmd.toString()
-	}
-	createEvent(map)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.configurationv2.ConfigurationReport cmd) {
-	log.debug "ConfigurationReport: $cmd"
-	def result = []
-	def value
-	if (cmd.parameterNumber == 9 && cmd.configurationValue[0] == 1) {
-		value = "Battery"
-		result << createEvent(name: "powerSupply", value: value, displayed: false)
-	} else if (cmd.parameterNumber == 101){
-		result << response(configure())
-	}
-	result
-}
-
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	log.debug "General zwaveEvent cmd: ${cmd}"
-	createEvent(descriptionText: cmd.toString(), isStateChange: false)
-}

devicetypes/plaidsystems/spruce-sensor.src/spruce-sensor.groovy

@@ -1,5 +1,5 @@
 /**
- *  Spruce Sensor -updated with SLP model number 5/2017
+ *  Spruce Sensor -Pre-release V2 10/8/2015
  *
  *  Copyright 2014 Plaid Systems
  *
@@ -14,33 +14,25 @@
  *
  -------10/20/2015 Updates--------
  -Fix/add battery reporting interval to update
- -remove polling and/or refresh
- 
- -------5/2017 Updates--------
- -Add fingerprints for SLP
- -add device health, check every 60mins + 2mins
+ -remove polling and/or refresh(?)
  */
- 
 metadata {
-	definition (name: "Spruce Sensor", namespace: "plaidsystems", author: "Plaid Systems") {
+	definition (name: "Spruce Sensor", namespace: "plaidsystems", author: "NCauffman") {
 		
 		capability "Configuration"
 		capability "Battery"
         capability "Relative Humidity Measurement"
         capability "Temperature Measurement"
         capability "Sensor"
-        capability "Health Check"
         //capability "Polling"
 		
         attribute "maxHum", "string"
         attribute "minHum", "string"        
         
-        
         command "resetHumidity"
         command "refresh"
         
-        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0402,0405", outClusters: "0003, 0019", manufacturer: "PLAID SYSTEMS", model: "PS-SPRZMS-01", deviceJoinName: "Spruce Sensor"
-        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0402,0405", outClusters: "0003, 0019", manufacturer: "PLAID SYSTEMS", model: "PS-SPRZMS-SLP1", deviceJoinName: "Spruce Sensor"
+        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0402,0405", outClusters: "0003, 0019", manufacturer: "PLAID SYSTEMS", model: "PS-SPRZMS-01"
 	}
 
 	preferences {
@@ -301,11 +293,6 @@ def setConfig(){
     sendEvent(name: 'configuration',value: configInterval, descriptionText: "Configuration initialized")
 }
 
-def installed(){
-	//check every 1 hour + 2mins
-    sendEvent(name: "checkInterval", value: 1 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-}
-
 //when device preferences are changed
 def updated(){	
     log.debug "device updated"
@@ -316,8 +303,6 @@ def updated(){
             sendEvent(name: 'configuration',value: 0, descriptionText: "Settings changed and will update at next report. Measure interval set to ${interval} mins")
     	}
     }
-    //check every 1 hour + 2mins
-    sendEvent(name: "checkInterval", value: 1 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 }
 
 //poll
@@ -410,4 +395,4 @@ private byte[] reverseArray(byte[] array) {
         i++;
     }
     return array
-}
+}

devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy

@@ -133,8 +133,8 @@ def updated() {
 }
 
 def initialize() {
-	// Device only goes OFFLINE when Hub is off
-	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zwave", scheme:"untracked"]), displayed: false)
+	// Arrival sensors only goes OFFLINE when Hub is off
+	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zigbee", scheme:"untracked"]), displayed: false)
 
 	def zwMap = getZwaveInfo()
 	def buttons = 4 // Default for Key Fob

devicetypes/smartthings/aeon-minimote.src/aeon-minimote.groovy

@@ -111,6 +111,7 @@ def configure() {
 	return cmds
 }
 
+
 def installed() {
 	initialize()
 }
@@ -120,7 +121,7 @@ def updated() {
 }
 
 def initialize() {
-	// Device only goes OFFLINE when Hub is off
-	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zwave", scheme:"untracked"]), displayed: false)
+	// Arrival sensors only goes OFFLINE when Hub is off
+	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zigbee", scheme:"untracked"]), displayed: false)
 	sendEvent(name: "numberOfButtons", value: 4)
 }

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

@@ -27,9 +27,13 @@ Works with:
 ## Device Health
 
 Aeon Labs MultiSensor 6 is polled by the hub.
-Aeon MultiSensor reports in once every hour.
+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.
 
-* __122min__ checkInterval
+* __32min__ 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 122min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+// Device-Watch simply pings if no device events received for 32min(checkInterval)
+	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 }
 
 def updated() {
-// Device-Watch simply pings if no device events received for 122min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+// Device-Watch simply pings if no device events received for 32min(checkInterval)
+	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 	log.debug "Updated with settings: ${settings}"
 	log.debug "${device.displayName} is now ${device.latestValue("powerSupply")}"
 

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

@@ -158,7 +158,7 @@ def generateEvent(Map results) {
 	if(results) {
 
 			def linkText = getLinkText(device)
-		def supportedThermostatModes = ["off"]
+		def supportedThermostatModes = []
 		def thermostatMode = null
 
 		results.each { name, value ->

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

@@ -105,8 +105,6 @@ def parse(String description) {
 				} else {
 					log.warn "TEMP REPORTING CONFIG FAILED- error code: ${descMap.data[0]}"
 				}
-			} else if (descMap?.clusterInt == zigbee.IAS_ZONE_CLUSTER && descMap.attrInt == zigbee.ATTRIBUTE_IAS_ZONE_STATUS && descMap?.value) {
-				map = translateZoneStatus(new ZoneStatus(zigbee.convertToInt(descMap?.value)))
 			}
 		}
 	} else if (map.name == "temperature") {
@@ -131,10 +129,6 @@ def parse(String description) {
 private Map parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)
 
-	translateZoneStatus(zs)
-}
-
-private Map translateZoneStatus(ZoneStatus zs) {
 	return zs.isAlarm1Set() ? getMoistureResult('wet') : getMoistureResult('dry')
 }
 
@@ -203,8 +197,7 @@ def ping() {
 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
 	def refreshCmds = zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000) +
-			zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020) +
-			zigbee.readAttribute(zigbee.IAS_ZONE_CLUSTER, zigbee.ATTRIBUTE_IAS_ZONE_STATUS)
+			zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020)
 
 	return refreshCmds + zigbee.enrollResponse()
 }

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

@@ -111,8 +111,6 @@ def parse(String description) {
 				def value = descMap.value.endsWith("01") ? "active" : "inactive"
 				log.debug "Doing a read attr motion event"
 				map = getMotionResult(value)
-			} else if (descMap?.clusterInt == zigbee.IAS_ZONE_CLUSTER && descMap.attrInt == zigbee.ATTRIBUTE_IAS_ZONE_STATUS && descMap?.value) {
-				map = translateZoneStatus(new ZoneStatus(zigbee.convertToInt(descMap?.value)))
 			}
 		}
 	} else if (map.name == "temperature") {
@@ -137,10 +135,6 @@ def parse(String description) {
 private Map parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)
 
-	translateZoneStatus(zs)
-}
-
-private Map translateZoneStatus(ZoneStatus zs) {
 	// Some sensor models that use this DTH use alarm1 and some use alarm2 to signify motion
 	return (zs.isAlarm1Set() || zs.isAlarm2Set()) ? getMotionResult('active') : getMotionResult('inactive')
 }
@@ -171,8 +165,8 @@ private Map getBatteryResult(rawValue) {
 			def pct = batteryMap[volts]
 			result.value = pct
 		} else {
-			def minVolts = 2.4
-			def maxVolts = 2.7
+			def minVolts = 2.1
+			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
 			def roundedPct = Math.round(pct * 100)
 			if (roundedPct <= 0)
@@ -206,8 +200,7 @@ def refresh() {
 	log.debug "refresh called"
 
 	def refreshCmds = zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020) +
-			zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000) +
-			zigbee.readAttribute(zigbee.IAS_ZONE_CLUSTER, zigbee.ATTRIBUTE_IAS_ZONE_STATUS)
+			zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000)
 
 	return refreshCmds + zigbee.enrollResponse()
 }

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

@@ -134,9 +134,8 @@ def parse(String description) {
 				} else {
 					log.warn "TEMP REPORTING CONFIG FAILED- error code: ${descMap.data[0]}"
 				}
-			} else if (descMap?.clusterInt == zigbee.IAS_ZONE_CLUSTER && descMap.attrInt == zigbee.ATTRIBUTE_IAS_ZONE_STATUS && descMap?.value) {
-				maps += translateZoneStatus(new ZoneStatus(zigbee.convertToInt(descMap?.value)))
 			} else {
+
 				maps += handleAcceleration(descMap)
 			}
 		}
@@ -230,11 +229,6 @@ private List<Map> parseAxis(List<Map> attrData) {
 
 private List<Map> parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)
-
-	translateZoneStatus(zs)
-}
-
-private List<Map> translateZoneStatus(ZoneStatus zs) {
 	List<Map> results = []
 
 	if (garageSensor != "Yes") {
@@ -274,7 +268,7 @@ private Map getBatteryResult(rawValue) {
 			result.value = pct
 		} else {
 			def minVolts = 2.1
-			def maxVolts = 2.7
+			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
 			def roundedPct = Math.round(pct * 100)
 			if (roundedPct <= 0)
@@ -319,7 +313,7 @@ def refresh() {
 	def refreshCmds = zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000) +
 			zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020) +
 			zigbee.readAttribute(0xFC02, 0x0010, [mfgCode: manufacturerCode]) +
-			zigbee.readAttribute(zigbee.IAS_ZONE_CLUSTER, zigbee.ATTRIBUTE_IAS_ZONE_STATUS) + zigbee.enrollResponse()
+			zigbee.enrollResponse()
 
 	return refreshCmds
 }

devicetypes/smartthings/zigbee-button.src/README.md

@@ -28,8 +28,9 @@ Works with:
 
 ## Device Health
 
-ZigBee Button is marked offline only in the case when Hub is offline.
+SmartThings platform will ping the device after `checkInterval` seconds of inactivity in last attempt to reach the device before marking it `OFFLINE` 
 
+* __722min__ checkInterval
 
 ## Troubleshooting
 

devicetypes/smartthings/zigbee-button.src/zigbee-button.groovy

@@ -13,8 +13,6 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
-
-import groovy.json.JsonOutput
 import physicalgraph.zigbee.zcl.DataType
 
 metadata {
@@ -185,6 +183,13 @@ private Map parseNonIasButtonMessage(Map descMap){
     }
 }
 
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+    refresh()
+}
+
 def refresh() {
     log.debug "Refreshing Battery"
 
@@ -193,6 +198,8 @@ def refresh() {
 }
 
 def configure() {
+    // Device-Watch allows 2 check-in misses from device (plus 2 mins lag time)
+    sendEvent(name: "checkInterval", value: 2 * 6 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
     log.debug "Configuring Reporting, IAS CIE, and Bindings."
     def cmds = []
     if (device.getDataValue("model") == "3450-L") {
@@ -252,8 +259,6 @@ def updated() {
 }
 
 def initialize() {
-    // Arrival sensors only goes OFFLINE when Hub is off
-    sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zigbee", scheme:"untracked"]), displayed: false)
     if ((device.getDataValue("manufacturer") == "OSRAM") && (device.getDataValue("model") == "LIGHTIFY Dimming Switch")) {
         sendEvent(name: "numberOfButtons", value: 2)
     }

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

@@ -72,7 +72,7 @@ def createEvents(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
 
 def poll() {
 	if (secondsPast(state.lastbatt, 36*60*60)) {
-		return zwave.batteryV1.batteryGet().format()
+		return zwave.batteryV1.batteryGet().format
 	} else {
 		return null
 	}

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

@@ -15,9 +15,10 @@ metadata {
 	definition (name: "Z-Wave Thermostat", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Temperature Measurement"
+		capability "Relative Humidity Measurement"
 		capability "Thermostat"
 		capability "Configuration"
-		capability "Refresh"
+		capability "Polling"
 		capability "Sensor"
 		capability "Health Check"
 		
@@ -116,7 +117,7 @@ metadata {
 			state "cool", label:'${currentValue}° cool', backgroundColor:"#ffffff"
 		}
 		standardTile("refresh", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
-			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
+			state "default", action:"polling.poll", icon:"st.secondary.refresh"
 		}
 		main "temperature"
 		details(["temperature", "mode", "fanMode", "heatSliderControl", "heatingSetpoint", "coolSliderControl", "coolingSetpoint", "refresh"])
@@ -124,20 +125,13 @@ metadata {
 }
 
 def installed(){
-	sendHubCommand(new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSupportedGet().format()))
-	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])
 }
 
 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)
@@ -155,7 +149,6 @@ 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}"
@@ -179,7 +172,6 @@ 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
@@ -313,26 +305,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.cool) { supportedModes << "cool" }
-	if(cmd.auto) { supportedModes << "auto" }
-	if(cmd.auxiliaryemergencyHeat) { supportedModes << "emergency heat" }
+	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 " }
 
-	state.supportedThermostatModes = supportedModes
-	sendEvent(name: "supportedThermostatModes", value: supportedModes, displayed: false)
+	state.supportedModes = supportedModes
+	// No events to be generated, return empty map
 	return [:]
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeSupportedReport cmd) {
-	def supportedFanModes = []
-	if(cmd.auto) { supportedFanModes << "auto" } // "fanAuto "
-	if(cmd.circulation) { supportedFanModes << "circulate" } // "fanCirculate"
-	if(cmd.low) { supportedFanModes << "on" } // "fanOn"
+	def supportedFanModes = ""
+	if(cmd.auto) { supportedFanModes += "auto " } // "fanAuto "
+	if(cmd.low) { supportedFanModes += "on " } // "fanOn"
+	if(cmd.circulation) { supportedFanModes += "circulate " } // "fanCirculate"
 
-	state.supportedThermostatFanModes = supportedFanModes
-	sendEvent(name: "supportedThermostatFanModes", value: supportedFanModes, displayed: false)
+	state.supportedFanModes = supportedFanModes
+	// No events to be generated, return empty map
 	return [:]
 }
 
@@ -345,17 +337,15 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 // Command Implementations
-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 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 quickSetHeat(degrees) {
@@ -426,14 +416,28 @@ 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() {
-	return state.supportedThermostatModes
+	["off", "heat", "cool", "auto", "emergency heat"]
 }
 
 def switchMode() {
 	def currentMode = device.currentState("thermostatMode")?.value
-	def lastTriedMode = state.lastTriedMode ?: currentMode ?: ["off"]
-	def supportedModes = getDataByName("supportedThermostatModes")
+	def lastTriedMode = state.lastTriedMode ?: currentMode ?: "off"
+	def supportedModes = getDataByName("supportedModes")
 	def modeOrder = modes()
 	def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
 	def nextMode = next(lastTriedMode)
@@ -450,7 +454,7 @@ def switchMode() {
 }
 
 def switchToMode(nextMode) {
-	def supportedModes = getDataByName("supportedThermostatModes")
+	def supportedModes = getDataByName("supportedModes")
 	if(supportedModes && !supportedModes.contains(nextMode)) log.warn "thermostat mode '$nextMode' is not supported"
 	if (nextMode in modes()) {
 		state.lastTriedMode = nextMode
@@ -462,9 +466,9 @@ def switchToMode(nextMode) {
 
 def switchFanMode() {
 	def currentMode = device.currentState("thermostatFanMode")?.value
-	def lastTriedMode = state.lastTriedFanMode ?: currentMode ?: ["off"]
-	def supportedModes = getDataByName("supportedThermostatFanModes") ?: ["auto", "on"]
-	def modeOrder = state.supportedThermostatFanModes
+	def lastTriedMode = state.lastTriedFanMode ?: currentMode ?: "off"
+	def supportedModes = getDataByName("supportedFanModes") ?: "auto on" // "fanAuto fanOn"
+	def modeOrder = ["auto", "circulate", "on"]                 // "fanAuto", "fanCirculate", "fanOn"
 	def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
 	def nextMode = next(lastTriedMode)
 	while (!supportedModes?.contains(nextMode) && nextMode != "auto") { // "fanAuto"
@@ -474,7 +478,7 @@ def switchFanMode() {
 }
 
 def switchToFanMode(nextMode) {
-	def supportedFanModes = getDataByName("supportedThermostatFanModes")
+	def supportedFanModes = getDataByName("supportedFanModes")
 	if(supportedFanModes && !supportedFanModes.contains(nextMode)) log.warn "thermostat mode '$nextMode' is not supported"
 
 	def returnCommand

devicetypes/smartthings/zwave-water-valve.src/zwave-water-valve.groovy

@@ -58,7 +58,6 @@ 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])
-	response(refresh())
 }
 
 def updated() {

smartapps/smartthings/button-controller.src/button-controller.groovy

@@ -27,9 +27,10 @@ definition(
 
 preferences {
 	page(name: "selectButton")
-	for (def i=1; i<=8; i++) {
-		page(name: "configureButton$i")
-	}
+	page(name: "configureButton1")
+	page(name: "configureButton2")
+	page(name: "configureButton3")
+	page(name: "configureButton4")
 
 	page(name: "timeIntervalInput", title: "Only during a certain time") {
 		section {
@@ -59,45 +60,22 @@ def selectButton() {
 	}
 }
 
-def createPage(pageNum) {
-	if ((state.numButton == pageNum) || (pageNum == 8))
-		state.installCondition = true
-	dynamicPage(name: "configureButton$pageNum", title: "Set up button $pageNum here",
-			nextPage: "configureButton${pageNum+1}", install: state.installCondition, uninstall: configured(), getButtonSections(pageNum))
-}
-
 def configureButton1() {
-	state.numButton = buttonDevice.currentState("numberOfButtons")?.longValue ?: 4
-	log.debug "state variable numButton: ${state.numButton}"
-	state.installCondition = false
-	createPage(1)
+	dynamicPage(name: "configureButton1", title: "Now let's decide how to use the first button",
+		nextPage: "configureButton2", uninstall: configured(), getButtonSections(1))
 }
 def configureButton2() {
-	createPage(2)
+	dynamicPage(name: "configureButton2", title: "If you have a second button, set it up here",
+		nextPage: "configureButton3", uninstall: configured(), getButtonSections(2))
 }
 
 def configureButton3() {
-	createPage(3)
+	dynamicPage(name: "configureButton3", title: "If you have a third button, you can do even more here",
+		nextPage: "configureButton4", uninstall: configured(), getButtonSections(3))
 }
-
 def configureButton4() {
-	createPage(4)
-}
-
-def configureButton5() {
-	createPage(5)
-}
-
-def configureButton6() {
-	createPage(6)
-}
-
-def configureButton7() {
-	createPage(7)
-}
-
-def configureButton8() {
-	createPage(8)
+	dynamicPage(name: "configureButton4", title: "If you have a fourth button, you rule, and can set it up here",
+		install: true, uninstall: true, getButtonSections(4))
 }
 
 def getButtonSections(buttonNumber) {

smartapps/smartthings/examples/every-element.src/every-element.groovy

@@ -202,8 +202,7 @@ def inputSelectionPage() {
 
         section("options variations") {
             paragraph "tap these elements and look at the differences when selecting an option"
-            input(type: "enum", name: "selectionSimple", title: "Simple options", description: "no separators in the selectable options", options: ["Thing 1", "Thing 2", "(Complicated) Thing 3"])
-            input(type: "enum", name: "selectionSimpleGrouped", title: "Simple (Grouped) options", description: "no separators in the selectable options", groupedOptions: addGroup(englishOptions + spanishOptions))
+            input(type: "enum", name: "selectionSimple", title: "Simple options", description: "no separators in the selectable options", groupedOptions: addGroup(englishOptions + spanishOptions))
             input(type: "enum", name: "selectionGrouped", title: "Grouped options", description: "separate groups of options with headers", groupedOptions: groupedOptions)
         }
 
@@ -215,15 +214,15 @@ def inputSelectionPage() {
 
         section("segmented") {
             paragraph "segmented should only work if there are either 2 or 3 options to choose from"
-            input(type: "enum", name: "selectionSegmented1", style: "segmented", title: "1 option", options: ["One"])
-            input(type: "enum", name: "selectionSegmented4", style: "segmented", title: "4 options", options: ["One", "Two", "Three", "Four"])
+            input(type: "enum", name: "selectionSegmented1", style: "segmented", title: "1 option", groupedOptions: addGroup(["One"]))
+            input(type: "enum", name: "selectionSegmented4", style: "segmented", title: "4 options", groupedOptions: addGroup(["One", "Two", "Three", "Four"]))
 
             paragraph "multiple and required will have no effect on segmented selection elements. There will always be exactly 1 option selected"
             input(type: "enum", name: "selectionSegmented2", style: "segmented", title: "2 options", options: ["One", "Two"])
             input(type: "enum", name: "selectionSegmented3", style: "segmented", title: "3 options", options: ["One", "Two", "Three"])
 
             paragraph "specifying defaultValue still works with segmented selection elements"
-            input(type: "enum", name: "selectionSegmentedWithDefault", style: "segmented", title: "defaulted to 'two'", options: ["One", "Two", "Three"], defaultValue: "Two")
+            input(type: "enum", name: "selectionSegmentedWithDefault", title: "defaulted to 'two'", groupedOptions: addGroup(["One", "Two", "Three"]), defaultValue: "Two")
         }
 
         section("required: true") {
@@ -232,8 +231,6 @@ def inputSelectionPage() {
 
         section("multiple: true") {
             input(type: "enum", name: "selectionMultiple", title: "This allows multiple selections", description: "It should look different when nothing is selected", groupedOptions: addGroup(["an option", "another option", "no way, one more?"]), multiple: true)
-            input(type: "enum", name: "selectionMultipleDefault1", title: "This allows multiple selections with a single default", description: "It should look different when nothing is selected", groupedOptions: addGroup(["an option", "another option", "no way, one more?"]), multiple: true, defaultValue: "an option")
-            input(type: "enum", name: "selectionMultipleDefault2", title: "This allows multiple selections with multiple defaults", description: "It should look different when nothing is selected", groupedOptions: addGroup(["an option", "another option", "no way, one more?"]), multiple: true, defaultValue: ["an option", "another option"])
         }
 
         section("with image") {

smartapps/smartthings/lifx-connect.src/lifx-connect.groovy

@@ -72,7 +72,7 @@ def authPage() {
 		log.debug "have LIFX access token"
 
 		def options = locationOptions() ?: []
-		def count = options.size().toString()
+		def count = options.size()
 
 		return dynamicPage(name:"Credentials", title:"", nextPage:"", install:true, uninstall: true) {
 			section("Select your location") {