MSA-2073: Multifunction pool control

Rolling down staging to master

build.gradle

@@ -9,7 +9,7 @@ apply plugin: 'smartthings-slack'
 
 buildscript {
     dependencies {
-        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.11"
+        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.12"
     }
     repositories {
         mavenLocal()
@@ -19,7 +19,7 @@ buildscript {
                 username smartThingsArtifactoryUserName
                 password smartThingsArtifactoryPassword
             }
-            url "https://artifactory.smartthings.com/libs-release-local"
+            url "https://smartthings.jfrog.io/smartthings/libs-release-local"
         }
     }
 }
@@ -32,7 +32,7 @@ repositories {
             username smartThingsArtifactoryUserName
             password smartThingsArtifactoryPassword
         }
-        url "https://artifactory.smartthings.com/libs-release-local"
+        url "https://smartthings.jfrog.io/smartthings/libs-release-local"
     }
 }
 
@@ -51,10 +51,10 @@ sourceSets {
 
 dependencies {
     devicetypesCompile 'org.codehaus.groovy:groovy-all:2.4.7'
-    devicetypesCompile 'smartthings:appengine-z-wave:0.1.2'
-    devicetypesCompile 'smartthings:appengine-zigbee:0.1.11'
+    devicetypesCompile 'smartthings:appengine-z-wave:0.1.3'
+    devicetypesCompile 'smartthings:appengine-zigbee:0.1.12'
     smartappsCompile 'org.codehaus.groovy:groovy-all:2.4.7'
-    smartappsCompile 'smartthings:appengine-common:0.1.8'
+    smartappsCompile 'smartthings:appengine-common:0.1.9'
     smartappsCompile 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'
     smartappsCompile 'org.grails:grails-web:2.3.11'
     smartappsCompile 'org.json:json:20140107'
@@ -74,19 +74,19 @@ slackSendMessage {
     String username
     switch (branch) {
         case 'master':
-            username = 'Hickory'
+            username = 'DEV'
             iconUrl = wolverine
             color = '#35D0F2'
             messageText = 'Began deployment of _SmartThingsPublic[master]_ branch to the _Dev_ environments.'
             break
         case 'staging':
-            username = 'Dickory'
+            username = 'STG'
             iconUrl = beach
             color = '#FFDE20'
             messageText = 'Began deployment of _SmartThingsPublic[staging]_ branch to the _Staging_ environments.'
             break
         case 'production':
-            username = 'Dock'
+            username = 'PRD'
             iconUrl = drinks
             color = '#FF1D23'
             messageText = 'Began deployment of _SmartThingsPublic[production]_ branch to the _Prod_ environments.'

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/smartthings/aeon-key-fob.src/.st-ignore

@@ -0,0 +1,2 @@
+.st-ignore
+README.md

devicetypes/smartthings/aeon-key-fob.src/README.md

@@ -0,0 +1,34 @@
+# Aeon Labs Key Fob
+
+Cloud Execution
+
+Works with:
+
+* [Aeon Labs Key Fob](http://aeotec.com/z-wave-key-fob-remote-control)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+* [Troubleshooting](#troubleshooting)
+
+## Capabilities
+
+* **Actuator** - represents device has commands
+* **Button** - represents a device with one or more buttons
+* **Holdable Button** - represents a device with one or more holdable buttons
+* **Configuration** - allows for configuration of devices
+* **Sensor** - detects sensor events
+* **Battery** - defines device uses a battery
+* **Health Check** - indicates ability to get device health notifications
+
+## Device Health
+
+Aeon Key Fob is a ZWave totally sleepy device and is marked offline only in the case when Hub is offline.
+
+## Troubleshooting
+
+If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
+Pairing needs to be tried again by placing the sensor closer to the hub.
+Instructions related to pairing, resetting and removing the Aeon Labs Key Fob from SmartThings can be found in the following link:
+* [Aeotec Key Fob Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202294120-Aeon-Labs-Key-Fob)

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

@@ -1,3 +1,4 @@
+import groovy.json.JsonOutput
 /**
  *  Copyright 2015 SmartThings
  *
@@ -19,6 +20,7 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
+		capability "Health Check"
 
 		fingerprint deviceId: "0x0101", inClusters: "0x86,0x72,0x70,0x80,0x84,0x85"
 		fingerprint mfr: "0086", prod: "0001", model: "0026", deviceJoinName: "Aeon Panic Button"
@@ -131,6 +133,9 @@ 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)
+
 	def zwMap = getZwaveInfo()
 	def buttons = 4 // Default for Key Fob
 

devicetypes/smartthings/aeon-minimote.src/.st-ignore

@@ -0,0 +1,2 @@
+.st-ignore
+README.md

devicetypes/smartthings/aeon-minimote.src/README.md

@@ -0,0 +1,33 @@
+# Aeon Minimote
+
+Cloud Execution
+
+Works with: 
+
+* [Aeotec Minimote](http://aeotec.com/small-z-wave-remote-control)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+* [Troubleshooting](#troubleshooting)
+
+## Capabilities
+
+* **Actuator** - represents device has commands
+* **Button** - represents a device with one or more buttons
+* **Holdable Button** - represents a device with one or more holdable buttons
+* **Configuration** - allows for configuration of devices
+* **Sensor** - detects sensor events
+* **Health Check** - indicates ability to get device health notifications
+
+## Device Health
+
+Aeon Minimote is a ZWave totally sleepy device and is marked offline only in the case when Hub is offline.
+
+## Troubleshooting
+
+If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
+Pairing needs to be tried again by placing the sensor closer to the hub.
+Instructions related to pairing, resetting and removing the Aeotec Minimote from SmartThings can be found in the following link:
+* [Aeotec Minimote Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202087904-Aeotec-Minimote)

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

@@ -1,3 +1,4 @@
+import groovy.json.JsonOutput
 /**
  *  Copyright 2015 SmartThings
  *
@@ -18,6 +19,7 @@ metadata {
 		capability "Holdable Button"
 		capability "Configuration"
 		capability "Sensor"
+		capability "Health Check"
 
 		fingerprint deviceId: "0x0101", inClusters: "0x86,0x72,0x70,0x9B", outClusters: "0x26,0x2B"
 		fingerprint deviceId: "0x0101", inClusters: "0x86,0x72,0x70,0x9B,0x85,0x84", outClusters: "0x26" // old style with numbered buttons
@@ -119,5 +121,7 @@ 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)
 	sendEvent(name: "numberOfButtons", value: 4)
 }

devicetypes/smartthings/bose-soundtouch.src/bose-soundtouch.groovy

@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
  *  Bose SoundTouch
  *

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

@@ -70,7 +70,7 @@ metadata {
 			state "heat", action:"switchMode",  nextState: "updating", icon: "st.thermostat.heat"
 			state "cool", action:"switchMode",  nextState: "updating", icon: "st.thermostat.cool"
 			state "auto", action:"switchMode",  nextState: "updating", icon: "st.thermostat.auto"
-			state "emergency heat", action:"switchMode", icon: "st.thermostat.emergency-heat" // emergency heat = auxHeatOnly
+			state "auxheatonly", action:"switchMode", icon: "st.thermostat.emergency-heat"
 			state "updating", label:"Working", icon: "st.secondary.secondary"
 		}
 		standardTile("fanMode", "device.thermostatFanMode", inactiveLabel: false, decoration: "flat") {
@@ -156,47 +156,49 @@ void poll() {
 def generateEvent(Map results) {
 	log.debug "parsing data $results"
 	if(results) {
-		results.each { name, value ->
 
 			def linkText = getLinkText(device)
-			def isChange = false
-			def isDisplayed = true
+		def supportedThermostatModes = []
+		def thermostatMode = null
+
+		results.each { name, value ->
 			def event = [name: name, linkText: linkText, descriptionText: getThermostatDescriptionText(name, value, linkText),
 						 handlerName: name]
 
 			if (name=="temperature" || name=="heatingSetpoint" || name=="coolingSetpoint" ) {
 				def sendValue =  location.temperatureScale == "C"? roundC(convertFtoC(value.toDouble())) : value.toInteger()
-				isChange = isTemperatureStateChange(device, name, value.toString())
-				isDisplayed = isChange
-				event << [value: sendValue, unit: temperatureScale, isStateChange: isChange, displayed: isDisplayed]
+				event << [value: sendValue, unit: temperatureScale]
 			}  else if (name=="maxCoolingSetpoint" || name=="minCoolingSetpoint" || name=="maxHeatingSetpoint" || name=="minHeatingSetpoint") {
 				def sendValue =  location.temperatureScale == "C"? roundC(convertFtoC(value.toDouble())) : value.toInteger()
 				event << [value: sendValue, unit: temperatureScale, displayed: false]
 			}  else if (name=="heatMode" || name=="coolMode" || name=="autoMode" || name=="auxHeatMode"){
-				isChange = isStateChange(device, name, value.toString())
-				event << [value: value.toString(), isStateChange: isChange, displayed: false]
+				if (value == true) {
+					supportedThermostatModes << ((name == "auxHeatMode") ? "auxheatonly" : name - "Mode")
+				}
+				return // as we don't want to send this event here, proceed to next name/value pair
 			}  else if (name=="thermostatFanMode"){
-				isChange = isStateChange(device, name, value.toString())
-				event << [value: value.toString(), isStateChange: isChange, displayed: false]
+				sendEvent(name: "supportedThermostatFanModes", value: fanModes(), displayed: false)
+				event << [value: value.toString(), data:[supportedThermostatFanModes: fanModes()]]
 			}  else if (name=="humidity") {
-				isChange = isStateChange(device, name, value.toString())
-				event << [value: value.toString(), isStateChange: isChange, displayed: false, unit: "%"]
+				event << [value: value.toString(), displayed: false, unit: "%"]
 			} else if (name == "deviceAlive") {
-				isChange = isStateChange(device, name, value.toString())
-				event['isStateChange'] = isChange
 				event['displayed'] = false
 			} else if (name == "thermostatMode") {
-				def mode = value.toString()
-				mode = (mode == "auxHeatOnly") ? "emergency heat" : mode
-				isChange = isStateChange(device, name, mode)
-				event << [value: mode, isStateChange: isChange, displayed: isDisplayed]
+				thermostatMode = value.toLowerCase()
+				return // as we don't want to send this event here, proceed to next name/value pair
 			} else {
-				isChange = isStateChange(device, name, value.toString())
-				isDisplayed = isChange
-				event << [value: value.toString(), isStateChange: isChange, displayed: isDisplayed]
+				event << [value: value.toString()]
 			}
 			sendEvent(event)
 		}
+		if (state.supportedThermostatModes != supportedThermostatModes) {
+			state.supportedThermostatModes = supportedThermostatModes
+			sendEvent(name: "supportedThermostatModes", value: supportedThermostatModes, displayed: false)
+		}
+		if (thermostatMode) {
+			sendEvent(name: "thermostatMode", value: thermostatMode, data:[supportedThermostatModes:state.supportedThermostatModes], linkText: linkText,
+					descriptionText: getThermostatDescriptionText("thermostatMode", thermostatMode, linkText), handlerName: "thermostatMode")
+		}
 		generateSetpointEvent ()
 		generateStatusEvent ()
 	}
@@ -322,15 +324,7 @@ void resumeProgram() {
 }
 
 def modes() {
-	if (state.modes) {
-		log.debug "Modes = ${state.modes}"
-		return state.modes
-	}
-	else {
-		state.modes = parent.availableModes(this)
-		log.debug "Modes = ${state.modes}"
-		return state.modes
-	}
+	return state.supportedThermostatModes
 }
 
 def fanModes() {
@@ -413,11 +407,13 @@ def setThermostatFanMode(String mode) {
 }
 
 def generateModeEvent(mode) {
-	sendEvent(name: "thermostatMode", value: mode, descriptionText: "$device.displayName is in ${mode} mode", displayed: true)
+	sendEvent(name: "thermostatMode", value: mode, data:[supportedThermostatModes: state.supportedThermostatModes],
+			descriptionText: "$device.displayName is in ${mode} mode")
 }
 
 def generateFanModeEvent(fanMode) {
-	sendEvent(name: "thermostatFanMode", value: fanMode, descriptionText: "$device.displayName fan is in ${fanMode} mode", displayed: true)
+	sendEvent(name: "thermostatFanMode", value: fanMode, data:[supportedThermostatFanModes: fanModes()],
+			descriptionText: "$device.displayName fan is in ${fanMode} mode")
 }
 
 def generateOperatingStateEvent(operatingState) {
@@ -453,14 +449,14 @@ def heat() {
 }
 
 def emergencyHeat() {
-	auxHeatOnly()
+	auxheatonly()
 }
 
-def auxHeatOnly() {
-	log.debug "auxHeatOnly = emergency heat"
+def auxheatonly() {
+	log.debug "auxheatonly()"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
 	if (parent.setMode ("auxHeatOnly", deviceId))
-		generateModeEvent("emergency heat") // emergency heat = auxHeatOnly
+		generateModeEvent("auxheatonly")
 	else {
 		log.debug "Error setting new mode."
 		def currentMode = device.currentState("thermostatMode")?.value
@@ -593,7 +589,7 @@ def generateSetpointEvent() {
 	} else if (mode == "off") {
 		sendEvent("name":"thermostatSetpoint", "value":averageSetpoint, "unit":location.temperatureScale)
 		sendEvent("name":"displayThermostatSetpoint", "value":"Off", displayed: false)
-	} else if (mode == "emergency heat") { // emergency heat = auxHeatOnly
+	} else if (mode == "auxheatonly") {
 		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
 		sendEvent("name":"displayThermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale, displayed: false)
 	}
@@ -632,7 +628,7 @@ void raiseSetpoint() {
 		targetvalue = thermostatSetpoint ? thermostatSetpoint : 0
 		targetvalue = location.temperatureScale == "F"? targetvalue + 1 : targetvalue + 0.5
 
-		if ((mode == "heat" || mode == "emergency heat") && targetvalue > maxHeatingSetpoint) { // emergency heat = auxHeatOnly
+		if ((mode == "heat" || mode == "auxheatonly") && targetvalue > maxHeatingSetpoint) {
 			targetvalue = maxHeatingSetpoint
 		} else if (mode == "cool" && targetvalue > maxCoolingSetpoint) {
 			targetvalue = maxCoolingSetpoint
@@ -678,7 +674,7 @@ void lowerSetpoint() {
 		targetvalue = thermostatSetpoint ? thermostatSetpoint : 0
 		targetvalue = location.temperatureScale == "F"? targetvalue - 1 : targetvalue - 0.5
 
-		if ((mode == "heat" || mode == "emergency heat") && targetvalue < minHeatingSetpoint) { // emergency heat = auxHeatOnly
+		if ((mode == "heat" || mode == "auxheatonly") && targetvalue < minHeatingSetpoint) {
 			targetvalue = minHeatingSetpoint
 		} else if (mode == "cool" && targetvalue < minCoolingSetpoint) {
 			targetvalue = minCoolingSetpoint
@@ -719,7 +715,7 @@ void alterSetpoint(temp) {
 		}
 
 		//step1: check thermostatMode, enforce limits before sending request to cloud
-		if (mode == "heat" || mode == "emergency heat"){ // emergency heat = auxHeatOnly
+		if (mode == "heat" || mode == "auxheatonly"){
 			if (temp.value > coolingSetpoint){
 				targetHeatingSetpoint = temp.value
 				targetCoolingSetpoint = temp.value
@@ -754,7 +750,7 @@ void alterSetpoint(temp) {
 			log.debug "alterSetpoint in mode $mode succeed change setpoint to= ${temp.value}"
 		} else {
 			log.error "Error alterSetpoint()"
-			if (mode == "heat" || mode == "emergency heat"){ // emergency heat = auxHeatOnly
+			if (mode == "heat" || mode == "auxheatonly"){
 				sendEvent("name": "thermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
 				sendEvent("name": "displayThermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
 			} else if (mode == "cool") {
@@ -783,7 +779,7 @@ def generateStatusEvent() {
 	log.debug "Cooling set point = ${coolingSetpoint}"
 	log.debug "HVAC Mode = ${mode}"
 
-	if (mode == "heat") {
+	if (mode == "heat" || mode == "auxheatonly") {
 		if (temperature >= heatingSetpoint) {
 			statusText = "Right Now: Idle"
 		} else {
@@ -806,8 +802,6 @@ def generateStatusEvent() {
 		}
 	} else if (mode == "off") {
 		statusText = "Right Now: Off"
-	} else if (mode == "emergency heat") { // emergency heat = auxHeatOnly
-		statusText = "Emergency Heat"
 	} else {
 		statusText = "?"
 	}

devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy

@@ -300,15 +300,21 @@ def setColor(value) {
         value.hex = "#${hex(value.red)}${hex(value.green)}${hex(value.blue)}"
     }
 
-	sendEvent(name: "hue", value: value.hue, displayed: false)
-	sendEvent(name: "saturation", value: value.saturation, displayed: false)
-	sendEvent(name: "color", value: value.hex, displayed: false)
-	if (value.level) {
-		sendEvent(name: "level", value: value.level)
-	}
-	if (value.switch) {
-		sendEvent(name: "switch", value: value.switch)
-	}
+    if(value.hue) {
+        sendEvent(name: "hue", value: value.hue, displayed: false)
+    }
+    if(value.saturation) {
+        sendEvent(name: "saturation", value: value.saturation, displayed: false)
+    }
+    if(value.hex?.trim()) {
+        sendEvent(name: "color", value: value.hex, displayed: false)
+    }
+    if (value.level) {
+        sendEvent(name: "level", value: value.level)
+    }
+    if (value.switch?.trim()) {
+        sendEvent(name: "switch", value: value.switch)
+    }
 
     sendRGB(value.rh, value.gh, value.bh)
 }

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

@@ -35,8 +35,8 @@ metadata {
 
 	// tile definitions
 	tiles(scale: 2) {
-		multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){
-			tileAttribute ("device.valve", key: "PRIMARY_CONTROL") {
+		multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4, canChangeIcon: true){
+			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
 				attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
 				attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening"
 				attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
@@ -48,14 +48,16 @@ metadata {
 			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 
-		main "valve"
-		details(["valve","refresh"])
+		main "contact"
+		details(["contact","refresh"])
 	}
 }
 
 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(){
@@ -85,11 +87,17 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 def open() {
-	zwave.switchBinaryV1.switchBinarySet(switchValue: 0x00).format()
+	delayBetween([
+		zwave.switchBinaryV1.switchBinarySet(switchValue: 0x00).format(),
+		zwave.switchBinaryV1.switchBinaryGet().format()
+	], 500)
 }
 
 def close() {
-	zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF).format()
+	delayBetween([
+		zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF).format(),
+		zwave.switchBinaryV1.switchBinaryGet().format()
+	], 500)
 }
 
 /**
@@ -105,6 +113,6 @@ def refresh() {
 
 def createEventWithDebug(eventMap) {
 	def event = createEvent(eventMap)
-	log.debug "Event created with ${event?.descriptionText}"
+	log.debug "Event created with ${event?.name}:${event?.value} - ${event?.descriptionText}"
 	return event
 }

devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy

@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
  *  Hue Bloom
  *

devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy

@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
  *  Hue Bridge
  *

devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy

@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
  *  Hue Bulb
  *

devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy

@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
  *  Hue Lux Bulb
  *

devicetypes/smartthings/hue-white-ambiance-bulb.src/hue-white-ambiance-bulb.groovy

@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
  *  Hue White Ambiance Bulb
  *

devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy

@@ -23,7 +23,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"
 		capability "Outlet"
 
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3200", deviceJoinName: "Outlet"

devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy

@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
  *  Copyright 2015 SmartThings
  *

devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy

@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
  *  Copyright 2015 SmartThings
  *

devicetypes/smartthings/wemo-switch.src/wemo-switch.groovy

@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
  *  Copyright 2015 SmartThings
  *

devicetypes/smartthings/zigbee-button.src/.st-ignore

@@ -0,0 +1,2 @@
+.st-ignore
+README.md

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

@@ -0,0 +1,43 @@
+# ZigBee Button
+
+Cloud Execution
+
+Works with: 
+
+* [OSRAM LIGHTIFY Dimming Switch](https://support.smartthings.com/hc/en-us/articles/115000236823-SYLVANIA-Dimming-Switch)
+* [Iris Smart Button](https://support.smartthings.com/hc/en-us/articles/115000190186-Iris-Smart-Button)
+* [Iris KeyFob](https://support.smartthings.com/hc/en-us/articles/217409686-Iris-Smart-Fob)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+* [Troubleshooting](#troubleshooting)
+
+## Capabilities
+
+* **Actuator** - It represents that a device has commands.
+* **Battery** - It defines that the device has a battery
+* **Button** - It defines that a device has one or more buttons
+* **Holdable Button** - It defines that a device has one or more holdable buttons
+* **Configuration** - _configure()_ command called when device is installed or device preferences updated
+* **Refresh** - _refresh()_ command for status updates
+* **Sensor** - it represents that a Device has attributes.
+* **Health Check** - indicates ability to get device health notifications
+
+
+## Device Health
+
+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
+
+If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the device is out of range.
+Pairing needs to be tried again by placing the device closer to the hub.
+It may also happen that you need to reset the device.
+Instructions related to pairing, resetting and removing the device from SmartThings can be found in the following link:
+* [OSRAM LIGHTIFY Dimming Switch Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/115000236823-SYLVANIA-Dimming-Switch)
+* [Iris Smart Button Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/115000190186-Iris-Smart-Button)
+* [Iris KeyFob Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/217409686-Iris-Smart-Fob)

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

@@ -24,6 +24,7 @@ metadata {
         capability "Configuration"
         capability "Refresh"
         capability "Sensor"
+        capability "Health Check"
 
         command "enrollResponse"
 
@@ -182,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"
 
@@ -190,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") {

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

@@ -66,22 +66,29 @@ def parse(String description) {
         else {
             sendEvent(event)
         }
-    }
-    else {
-        def cluster = zigbee.parse(description)
-
-        if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
-            if (cluster.data[0] == 0x00) {
+    } else {
+        def descMap = zigbee.parseDescriptionAsMap(description)
+        if (descMap && descMap.clusterInt == 0x0006 && descMap.commandInt == 0x07) {
+            if (descMap.data[0] == "00") {
                 log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
                 sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-            }
-            else {
+            } else {
                 log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
             }
-        }
-        else {
+        } else if (device.getDataValue("manufacturer") == "sengled" && descMap && descMap.clusterInt == 0x0008 && descMap.attrInt == 0x0000) {
+            // This is being done because the sengled element touch/classic incorrectly uses the value 0xFF for the max level.
+            // Per the ZCL spec for the UINT8 data type 0xFF is an invalid value, and 0xFE should be the max.  Here we
+            // manually handle the invalid attribute value since it will be ignored by getEvent as an invalid value.
+            // We also set the level of the bulb to 0xFE so future level reports will be 0xFE until it is changed by
+            // something else.
+            if (descMap.value.toUpperCase() == "FF") {
+                descMap.value = "FE"
+            }
+            sendHubCommand(zigbee.command(zigbee.LEVEL_CONTROL_CLUSTER, 0x00, "FE0000").collect { new physicalgraph.device.HubAction(it) }, 0)
+            sendEvent(zigbee.getEventFromAttrData(descMap.clusterInt, descMap.attrInt, descMap.encoding, descMap.value))
+        } else {
             log.warn "DID NOT PARSE MESSAGE for description : $description"
-            log.debug "${cluster}"
+            log.debug "${descMap}"
         }
     }
 }

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

@@ -38,8 +38,8 @@ metadata {
     }
 
     tiles(scale: 2) {
-        multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){
-            tileAttribute ("device.valve", key: "PRIMARY_CONTROL") {
+        multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4, canChangeIcon: true){
+            tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
                 attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
                 attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening"
                 attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
@@ -58,8 +58,8 @@ metadata {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
 
-        main(["valve"])
-        details(["valve", "battery", "refresh"])
+        main(["contact"])
+        details(["contact", "battery", "refresh"])
     }
 }
 

devicetypes/stelpro/stelpro-ki-thermostat.src/stelpro-ki-thermostat.groovy

@@ -1,537 +0,0 @@
-/**
- *  Copyright 2017 Stelpro
- *
- *  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.
- *
- *  Stelpro Ki Thermostat
- *
- *  Author: Stelpro
- *
- *  Date: 2017-06-08
- */
-
-preferences {
-    input("zipcode", "text", title: "ZipCode (Outdoor Temperature)", description: "[Do not use space](Blank = No Forecast)")
-    input("heatdetails", "enum", title: "Do you want a detailed operating state notification?", options: ["No", "Yes"], defaultValue: "No", required: false, displayDuringSetup: true)
-}
-
-metadata {
-    definition (name: "Stelpro Ki Thermostat", namespace: "stelpro", author: "Stelpro") {
-        capability "Thermostat"
-        capability "Temperature Measurement"
-        capability "Actuator"
-        capability "Polling"
-        capability "Refresh"
-        capability "Sensor"
-        capability "Configuration"
-
-        attribute "outsideTemp", "number"
-
-        command "switchMode"
-        command "quickSetHeat"
-        command "quickSetOutTemp"
-        command "increaseHeatSetpoint"
-        command "decreaseHeatSetpoint"
-        command "setCustomThermostatMode"
-        command "eco"
-        command "applyNow"
-
-        fingerprint deviceId: "0x0806", inClusters: "0x5E,0x86,0x72,0x40,0x43,0x31,0x85,0x59,0x5A,0x73,0x20,0x42"
-    }
-
-    // simulator metadata
-    simulator {
-        //Add test code here
-    }
-
-    tiles(scale : 2) {
-		multiAttributeTile(name:"thermostatMulti", type:"thermostat", width:6, height:4) {
-			tileAttribute("device.temperature", key: "PRIMARY_CONTROL") {
-				attributeState("temp", label:'${currentValue}')
-                attributeState("high", label:'HIGH')
-            	attributeState("low", label:'LOW')
-            	attributeState("--", label:'--')
-			}
-            tileAttribute("device.heatingSetpoint", key: "VALUE_CONTROL") {
-				attributeState("VALUE_UP", action: "increaseHeatSetpoint")
-                attributeState("VALUE_DOWN", action: "decreaseHeatSetpoint")
-			}
-			tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") {
-				attributeState("idle", backgroundColor:"#44b621")
-				attributeState("heating", backgroundColor:"#ffa81e")
-			}
-			tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") {
-				attributeState("off", label:'Off')
-				attributeState("comfort", label:'Comfort')
-				attributeState("eco", label:'Eco')
-			}
-            tileAttribute("device.heatingSetpoint", key: "HEATING_SETPOINT")
-            {
-            	attributeState("heatingSetpoint", label:'${currentValue}')
-            }
-		}
-        standardTile("mode", "device.thermostatMode", width: 2, height: 2) {
-        	state "off", label:'${name}', action:"switchMode", nextState:"to_comfort", icon:"st.thermostat.off"
-			state "comfort", label:'${name}', action:"switchMode", nextState:"to_eco", icon:"http://cdn.device-icons.smartthings.com/Home/home29-icn@2x.png"
-			state "eco", label:'${name}', action:"switchMode", nextState:"...", icon:"http://cdn.device-icons.smartthings.com/Outdoor/outdoor3-icn@2x.png"
-			state "to_comfort", label: "comfort", action:"switchMode", nextState:"to_eco"
-			state "to_eco", label: "eco", action:"switchMode", nextState:"..."
-			state "...", label: "...", action:"heat", nextState:"comfort"
-        }
-        standardTile("refresh", "device.refresh", decoration: "flat", width: 2, height: 2) {
-            state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
-        }
-        main ("thermostatMulti")
-        details(["thermostatMulti", "mode", "refresh"])
-    }
-}
-
-def parse(String description)
-{
-	if (description == "updated")
-    	return []
-
-    def unitScale = getTemperatureScale()
-    //Class, version
-    def map = createEvent(zwaveEvent(zwave.parse(description, [0x40:2, 0x43:2, 0x31:3, 0x42:1])))
-    if (!map) {
-        return null
-    }
-
-    def result = [map]
-    if (map.name in ["heatingSetpoint","thermostatMode"]) {
-        def map2 = [
-                name: "thermostatSetpoint",
-                unit: getTemperatureScale()
-        ]
-        if (map.name == "thermostatMode") {
-            state.lastTriedMode = map.value
-        }
-        else {
-            def mode = device.latestValue("thermostatMode")
-            log.info "THERMOSTAT, latest mode = ${mode}"
-            if (map.name == "heatingSetpoint") {
-                map2.value = map.value
-                map2.unit = map.unit
-            }
-        }
-        if (map2.value != null) {
-            log.debug "THERMOSTAT, adding setpoint event: $map"
-            result << createEvent(map2)
-        }
-    }
-    log.debug "Parse returned $result"
-    result
-}
-
-// Event Generation
-def zwaveEvent(physicalgraph.zwave.commands.thermostatsetpointv2.ThermostatSetpointReport cmd)
-{
-    def cmdScale = cmd.scale == 1 ? "F" : "C"
-    def temp;
-    float tempfloat;
-    def map = [:]
-    if (cmd.scaledValue >= 327)
-    {
-    	map.value = "--"
-    }
-    else
-    {
-        temp = convertTemperatureIfNeeded(cmd.scaledValue, cmdScale, cmd.precision)
-        tempfloat = (Math.round(temp.toFloat() * 2)) / 2
-        map.value = tempfloat
-    }
-    map.unit = getTemperatureScale()
-    map.displayed = false
-    switch (cmd.setpointType) {
-        case 1:
-            map.name = "heatingSetpoint"
-            break;
-        default:
-            return [:]
-    }
-    // So we can respond with same format
-    state.size = cmd.size
-    state.scale = cmd.scale
-    state.precision = cmd.precision
-    sendEvent(name:"heatingSetpoint", value:map.value)
-    map
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv3.SensorMultilevelReport cmd)
-{
-    def temp;
-    float tempfloat;
-    def format;
-    def map = [:]
-    if (cmd.sensorType == 1) {
-        map.value = convertTemperatureIfNeeded(cmd.scaledSensorValue, cmd.scale == 1 ? "F" : "C", cmd.precision)
-        map.unit = getTemperatureScale()
-        map.name = "temperature"
-
-        temp = map.value
-        if (temp == "32765")		//0x7FFD
-        {
-            map.value = "low"
-        }
-        else if (temp == "32767")	//0x7FFF
-        {
-            map.value = "high"
-        }
-        else if (temp == "-32768")	//0x8000
-        {
-            map.value = "--"
-        }
-        else
-        {
-    		tempfloat = (Math.round(temp.toFloat() * 2)) / 2
-    		map.value = tempfloat
-        }
-
-    } else if (cmd.sensorType == 5) {
-        map.value = cmd.scaledSensorValue
-        map.unit = "%"
-        map.name = "humidity"
-    }
-    sendEvent(name:"temperature", value:map.value)
-    map
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport cmd)
-{
-    def map = [:]
-    switch (cmd.operatingState) {
-        case physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport.OPERATING_STATE_IDLE:
-        map.value = "idle"
-        break
-        case physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport.OPERATING_STATE_HEATING:
-        map.value = "heating"
-        break
-    }
-    map.name = "thermostatOperatingState"
-    
-    if (settings.heatdetails == "No") {
-    	map.displayed = false
-    }
-    
-    map
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport cmd) {
-    def map = [:]
-    switch (cmd.mode) {
-        case physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport.MODE_HEAT:
-            map.value = "comfort"
-            break
-        case physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport.MODE_OFF:
-            map.value = "off"
-            break
-        default:
-            map.value = "eco"
-            break
-    }
-    map.name = "thermostatMode"
-    sendEvent(name:"thermostatMode", value:map.value)
-    map
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.associationv2.AssociationReport cmd) {
-	delayBetween([
-    	zwave.associationV1.associationRemove(groupingIdentifier:1, nodeId:0).format(),
-        zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]).format(),
-        poll()
-    ], 2300)
-}
-
-
-def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeSupportedReport cmd) {
-    log.debug "Zwave event received: $cmd"
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
-    log.debug "Zwave event received: $cmd"
-}
-
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-    log.warn "Unexpected zwave command $cmd"
-}
-
-// Command Implementations
-def poll() {
-    def weather
-
-    // If there is a zipcode defined, weather forecast will be sent. Otherwise, no weather forecast.
-    if (settings.zipcode) {
-        log.debug "ZipCode: ${settings.zipcode}"
-        weather = getWeatherFeature( "conditions", settings.zipcode )
-
-        // Check if the variable is populated, otherwise return.
-        if (!weather) {
-            log.debug( "Something went wrong, no data found." )
-            return false
-        }
-
-        // Set the tiles
-        def locationScale = getTemperatureScale()
-        def tempToSend
-        if (locationScale == "C")
-        {
-            log.debug( "Outdoor Temperature: ${weather.current_observation.temp_c}ºC" )
-            sendEvent( name: 'outsideTemp', value: weather.current_observation.temp_c )
-            tempToSend = weather.current_observation.temp_c
-        }
-        else
-        {
-            log.debug( "Outdoor Temperature: ${weather.current_observation.temp_f}ºF" )
-            sendEvent( name: 'outsideTemp', value: weather.current_observation.temp_f )
-            tempToSend = weather.current_observation.temp_f
-        }
-
-
-        delayBetween([
-                quickSetOutTemp(tempToSend),
-                zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format(),
-                zwave.thermostatModeV2.thermostatModeGet().format(),
-                zwave.thermostatSetpointV2.thermostatSetpointGet(setpointType: 1).format(),
-                zwave.sensorMultilevelV3.sensorMultilevelGet().format(), // current temperature
-                sendEvent( name: 'change', value: 0 )
-        ], 100)
-    } else {
-        delayBetween([
-                zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format(),
-                zwave.thermostatModeV2.thermostatModeGet().format(),
-                zwave.thermostatSetpointV2.thermostatSetpointGet(setpointType: 1).format(),
-                zwave.sensorMultilevelV3.sensorMultilevelGet().format(), // current temperature
-                sendEvent( name: 'change', value: 0 )
-        ], 100)
-    }
-}
-
-def refresh() {
-	poll()
-}
-
-def configure() {
-	poll()
-}
-
-def applyNow() {
-    float currentHeatSetpoint = device.currentValue("heatingSetpoint")
-    def deviceScale
-    def locationScale = getTemperatureScale()
-
-    sendEvent( name: 'change', value: 0 )
-    log.debug("currentHeatSetpoint $currentHeatSetpoint")
-    if (locationScale == "C")
-    {
-        deviceScale = 0
-    }
-    else
-    {
-        deviceScale = 1
-    }
-
-    delayBetween([
-            zwave.thermostatSetpointV2.thermostatSetpointSet(setpointType: 1, scale: deviceScale, precision: state.precision, scaledValue: currentHeatSetpoint).format(),
-            poll()
-    ], 1000)
-}
-
-def quickSetHeat(degrees) {
-    setHeatingSetpoint(degrees, 0)
-}
-
-def setHeatingSetpoint(degrees, delay = 0) {
-    sendEvent(name:"heatingSetpoint", value:degrees)
-    applyNow()
-}
-
-def quickSetOutTemp(degrees) {
-    setOutdoorTemperature(degrees, 0)
-}
-
-def setOutdoorTemperature(degrees, delay = 0) {
-    setOutdoorTemperature(degrees.toDouble(), delay)
-}
-
-def setOutdoorTemperature(Double degrees, Integer delay = 0) {
-    def deviceScale
-    def locationScale = getTemperatureScale()
-    def p = (state.precision == null) ? 1 : state.precision
-
-    if (locationScale == "C")
-    {
-        deviceScale = 0
-    }
-    else
-    {
-        deviceScale = 1
-    }
-    log.info "setOutdoorTemperature: ${degrees}"
-    zwave.sensorMultilevelV3.sensorMultilevelReport(sensorType: 1, scale: deviceScale, precision: p,  scaledSensorValue: degrees).format()
-}
-
-def increaseHeatSetpoint()
-{
-	def currentMode = device.currentState("thermostatMode")?.value
-    if (currentMode != "off")
-    {
-        float currentSetpoint = device.currentValue("heatingSetpoint")
-        def locationScale = getTemperatureScale()
-        float maxSetpoint
-        float step
-
-        if (locationScale == "C")
-        {
-            maxSetpoint = 30;
-            step = 0.5
-        }
-        else
-        {
-            maxSetpoint = 86
-            step = 1
-        }
-
-        if (currentSetpoint < maxSetpoint)
-        {
-            currentSetpoint = currentSetpoint + step
-            quickSetHeat(currentSetpoint)
-        }
-    }
-}
-
-def decreaseHeatSetpoint()
-{
-	def currentMode = device.currentState("thermostatMode")?.value
-    if (currentMode != "off")
-    {
-        float currentSetpoint = device.currentValue("heatingSetpoint")
-        def locationScale = getTemperatureScale()
-        float minSetpoint
-        float step
-
-        if (locationScale == "C")
-        {
-            minSetpoint = 5;
-            step = 0.5
-        }
-        else
-        {
-            minSetpoint = 41
-            step = 1
-        }
-
-        if (currentSetpoint > minSetpoint)
-        {
-            currentSetpoint = currentSetpoint - step
-            quickSetHeat(currentSetpoint)
-        }
-    }
-}
-
-def switchMode() {
-    def currentMode = device.currentState("thermostatMode")?.value
-    def lastTriedMode = state.lastTriedMode ?: currentMode ?: "comfort"
-    def supportedModes = getDataByName("supportedModes")
-    def modeOrder = modes()
-    def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
-    def nextMode = next(lastTriedMode)
-    if (supportedModes?.contains(currentMode)) {
-        while (!supportedModes.contains(nextMode) && nextMode != "comfort") {
-            nextMode = next(nextMode)
-        }
-    }
-    state.lastTriedMode = nextMode
-    delayBetween([
-            zwave.thermostatModeV2.thermostatModeSet(mode: modeMap[nextMode]).format(),
-            poll()
-    ], 1000)
-}
-
-def modes() {
-    ["comfort", "eco", "off"]
-}
-
-def getModeMap() { [
-		"off": 0,
-        "comfort": 1,
-        "eco": 11,
-]}
-
-def getDataByName(String name) {
-    state[name] ?: device.getDataValue(name)
-}
-
-def setCoolingSetpoint(coolingSetpoint) {
-    log.trace "${device.displayName} does not support cool setpoint"
-}
-
-def off() {
-    log.trace "off mode applied"
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSet(mode: 0).format(),
-		poll()
-	], 1000)
-}
-
-def heat() {
-	log.trace "heat mode applied"
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSet(mode: 1).format(),
-		poll()
-	], 1000)
-}
-
-def eco() {
-	log.trace "eco mode applied"
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSet(mode: 11).format(),
-		poll()
-	], 1000)
-}
-
-def auto() {
-    log.trace "${device.displayName} does not support auto mode"
-}
-
-def emergencyHeat() {
-    log.trace "${device.displayName} does not support emergency heat mode"
-}
-
-def cool() {
-    log.trace "${device.displayName} does not support cool mode"
-}
-
-def setCustomThermostatMode(mode) {
-   setThermostatMode(mode)
-}
-
-def setThermostatMode(String value) {
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSet(mode: modeMap[value]).format(),
-		poll()
-	], 1000)
-}
-
-def fanOn() {
-    log.trace "${device.displayName} does not support fan on"
-}
-
-def fanAuto() {
-    log.trace "${device.displayName} does not support fan auto"
-}
-
-def fanCirculate() {
-    log.trace "${device.displayName} does not support fan circulate"
-}
-
-def setThermostatFanMode() {
-    log.trace "${device.displayName} does not support fan mode"
-}

devicetypes/stelpro/stelpro-ki-zigbee-thermostat.src/stelpro-ki-zigbee-thermostat.groovy

@@ -1,651 +0,0 @@
-/**
- *  Copyright 2017 Stelpro
- *
- *  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.
- *
- *  Stelpro Ki ZigBee Thermostat
- *
- *  Author: Stelpro
- *
- *  Date: 2017-06-08
- */
- 
-preferences {
-	section {
- 			input("unitformat", "enum", title: "What unit format do you want your thermostat to display temperature?", options: ["Celsius", "Fahrenheit"], defaultValue: "Celsius", required: false, displayDuringSetup: false)
-            input("lock", "enum", title: "Do you want to lock your thermostat's physical keypad?", options: ["No", "Yes"], defaultValue: "No", required: false, displayDuringSetup: false)
-            input("heatdetails", "enum", title: "Do you want a detailed operating state notification?", options: ["No", "Yes"], defaultValue: "No", required: false, displayDuringSetup: true)
-    		input("zipcode", "text", title: "ZipCode (Outdoor Temperature)", description: "[Do not use space](Blank = No Forecast)")
-    }
-}
-
-metadata {
-	definition (name: "Stelpro Ki ZigBee Thermostat", namespace: "Stelpro", author: "Stelpro") {
-        capability "Thermostat"
-        capability "Temperature Measurement"
-        capability "Actuator"
-        capability "Polling"
-        capability "Refresh"
-        capability "Sensor"
-        capability "Configuration"
-        
-		command "switchMode"
-        command "quickSetHeat"
-        command "quickSetOutTemp"
-        command "increaseHeatSetpoint"
-        command "decreaseHeatSetpoint"
-        command "parameterSetting"
-
-		fingerprint profileId: "0104", endpointId: "19", inClusters: " 0000,0003,0201,0204", outClusters: "0402"
-	}
-
-	// simulator metadata
-	simulator { }
-
-	tiles(scale: 2) {
-		multiAttributeTile(name:"thermostatMulti", type:"thermostat", width:6, height:4) {
-			tileAttribute("device.temperature", key: "PRIMARY_CONTROL") {
-				attributeState("temp", label:'${currentValue}')
-                attributeState("high", label:'HIGH')
-            	attributeState("low", label:'LOW')
-            	attributeState("--", label:'--')
-			}
-            tileAttribute("device.heatingSetpoint", key: "VALUE_CONTROL") {
-				attributeState("VALUE_UP", action: "increaseHeatSetpoint")
-                attributeState("VALUE_DOWN", action: "decreaseHeatSetpoint")
-			}
-			tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") {
-				attributeState("idle", backgroundColor:"#44b621")
-				attributeState("heating", backgroundColor:"#ffa81e")
-			}
-			tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") {
-				attributeState("off", label:'Off')
-				attributeState("comfort", label:'Comfort')
-				attributeState("eco", label:'Eco')
-			}
-            tileAttribute("device.heatingSetpoint", key: "HEATING_SETPOINT")
-            {
-            	attributeState("heatingSetpoint", label:'${currentValue}')
-            }
-		}
-        standardTile("mode", "device.thermostatMode", width: 2, height: 2) {
-        	state "off", label:'Off', action:"switchMode", nextState:"comfort", icon:"st.thermostat.off"
-			state "comfort", label:'Comfort', action:"switchMode", nextState:"eco", icon:"http://cdn.device-icons.smartthings.com/Home/home29-icn@2x.png"
-			state "eco", label:'Eco', action:"switchMode", nextState:"off", icon:"http://cdn.device-icons.smartthings.com/Outdoor/outdoor3-icn@2x.png"
-        }
-        standardTile("refresh", "device.refresh", decoration: "flat", width: 2, height: 2) {
-            state "default", action:"poll", icon:"st.secondary.refresh"
-        }
-        standardTile("configure", "device.configure", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
-		}
-
-        main ("thermostatMulti")
-        details(["thermostatMulti", "mode", "refresh", "configure"])
-    }
-}
-
-
-// parse events into attributes
-def parse(String description) {
-	log.debug "Parse description $description"
-	def map = [:]
-	if (description?.startsWith("read attr -")) {
-		def descMap = parseDescriptionAsMap(description)
-		log.debug "Desc Map: $descMap"
-		if (descMap.cluster == "0201" && descMap.attrId == "0000")
-        {
-			log.debug "TEMP"
-			map.name = "temperature"
-			map.value = getTemperature(descMap.value)
-            if (descMap.value == "7ffd")		//0x7FFD
-            {
-                map.value = "low"
-            }
-            else if (descMap.value == "7fff")	//0x7FFF
-            {
-                map.value = "high"
-            }
-            else if (descMap.value == "8000")	//0x8000
-            {
-                map.value = "--"
-            }
-            sendEvent(name:"temperature", value:map.value)
-		}
-        else if (descMap.cluster == "0201" && descMap.attrId == "0012")
-        {
-			log.debug "HEATING SETPOINT"
-			map.name = "heatingSetpoint"
-			map.value = getTemperature(descMap.value)
-            if (descMap.value == "8000")		//0x8000
-            {
-                map.value = "--"
-            }
-            sendEvent(name:"heatingSetpoint", value:map.value)
-		}
-        else if (descMap.cluster == "0201" && descMap.attrId == "001c")
-        {
-        	if (descMap.value.size() == 8)
-            {
-				log.debug "MODE"
-				map.name = "thermostatMode"
-				map.value = getModeMap()[descMap.value]
-				sendEvent(name:"thermostatMode", value:map.value)
-            }
-            else if (descMap.value.size() == 10)
-            {
-            	log.debug "MODE & SETPOINT MODE"
-                def twoModesAttributes = descMap.value[0..-9]
-                map.name = "thermostatMode"
-				map.value = getModeMap()[twoModesAttributes]
-				sendEvent(name:"thermostatMode", value:map.value)
-            }
-		}
-        else if (descMap.cluster == "0201" && descMap.attrId == "401c")
-        {
-            log.debug "SETPOINT MODE"
-            log.debug "descMap.value $descMap.value"
-            map.name = "thermostatMode"
-            map.value = getModeMap()[descMap.value]
-            sendEvent(name:"thermostatMode", value:map.value)
-		}
-        else if (descMap.cluster == "0201" && descMap.attrId == "0008")
-        {
-        	log.debug "HEAT DEMAND"
-            map.name = "thermostatOperatingState"
-            map.value = getModeMap()[descMap.value]
-            if (map.value == "off")
-            {
-            	map.value = "idle"
-            }
-            else
-            {
-            	map.value = "heating"
-            }
-            sendEvent(name:"thermostatOperatingState", value:map.value)
-            if (settings.heatdetails == "No")
-            {
-    			map.displayed = false
-    		}
-        }
-	}
-
-	def result = null
-	if (map) {
-		result = createEvent(map)
-	}
-	log.debug "Parse returned $map"
-	return result
-}
-
-def parseDescriptionAsMap(description) {
-	(description - "read attr - ").split(",").inject([:]) { map, param ->
-		def nameAndValue = param.split(":")
-		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-	}
-}
-
-def getModeMap() { [
-	"00":"off",
-    "04":"comfort",
-	"05":"eco"
-]}
-
-def getFanModeMap() { [
-	"04":"fanOn",
-	"05":"fanAuto"
-]}
-
-def poll() {
-    def weather
-    // If there is a zipcode defined, weather forecast will be sent. Otherwise, no weather forecast.
-    if (settings.zipcode) {
-        log.debug "ZipCode: ${settings.zipcode}"
-        weather = getWeatherFeature( "conditions", settings.zipcode )
-
-        // Check if the variable is populated, otherwise return.
-        if (!weather) {
-            log.debug( "Something went wrong, no data found." )
-            return false
-        }
-
-        // Set the tiles
-        def locationScale = getTemperatureScale()
-        def tempToSend
-        log.debug( "Outdoor Temperature: ${weather.current_observation.temp_c}ºC" )
-        sendEvent( name: 'outsideTemp', value: weather.current_observation.temp_c )
-        tempToSend = weather.current_observation.temp_c
-
-		delayBetween([
-                quickSetOutTemp(tempToSend),
-                zigbee.readAttribute(0x201, 0x0000),	//Read Local Temperature
-                zigbee.readAttribute(0x201, 0x0008),	//Read PI Heating State
-    			zigbee.readAttribute(0x201, 0x0012),	//Read Heat Setpoint
-                zigbee.readAttribute(0x201, 0x001C),	//Read System Mode
-                my_readAttribute(0x201, 0x401C, ["mfgCode": "0x1185"]),	//Read Manufacturer Specific Setpoint Mode
-                zigbee.readAttribute(0x204, 0x0000),	//Read Temperature Display Mode
-                zigbee.readAttribute(0x204, 0x0001),	//Read Keypad Lockout
-                sendEvent( name: 'change', value: 0 )
-        ], 200)
-    } else {
-        delayBetween([
-        		zigbee.readAttribute(0x201, 0x0000),	//Read Local Temperature
-                zigbee.readAttribute(0x201, 0x0008),	//Read PI Heating State
-    			zigbee.readAttribute(0x201, 0x0012),	//Read Heat Setpoint
-                zigbee.readAttribute(0x201, 0x001C),	//Read System Mode
-                my_readAttribute(0x201, 0x401C, ["mfgCode": "0x1185"]),	//Read Manufacturer Specific Setpoint Mode
-                zigbee.readAttribute(0x204, 0x0000),	//Read Temperature Display Mode
-                zigbee.readAttribute(0x204, 0x0001),	//Read Keypad Lockout
-                sendEvent( name: 'change', value: 0 )
-        ], 200)
-    }
-}
-
-def getTemperature(value) {
-	if (value != null) {
-    	log.debug("value $value")
-		def celsius = Integer.parseInt(value, 16) / 100
-		if (getTemperatureScale() == "C") {
-			return celsius
-		} else {
-			return Math.round(celsiusToFahrenheit(celsius))
-		}
-	}
-}
-
-def quickSetHeat(degrees) {
-    sendEvent( name: 'change', value: 1 )
-    setHeatingSetpoint(degrees)
-}
-
-def setHeatingSetpoint(degrees) {
-	if (degrees != null) {
-		def temperatureScale = getTemperatureScale()
-		def degreesInteger = Math.round(degrees)
-        float tempfloat;
-	    tempfloat = (Math.round(degrees.toFloat() * 2)) / 2
-
-		log.debug "setHeatingSetpoint({$tempfloat} ${temperatureScale})"
-		sendEvent("name": "heatingSetpoint", "value": tempfloat)
-        def celsius = (getTemperatureScale() == "C") ? tempfloat : (fahrenheitToCelsius(tempfloat) as Float).round(2)
-        delayBetween([
-        	"st wattr 0x${device.deviceNetworkId} 0x19 0x201 0x12 0x29 {" + hex(celsius * 100) + "}",
-        	zigbee.readAttribute(0x201, 0x12),	//Read Heat Setpoint
-    	], 100)
-	}
-}
-
-def setCoolingSetpoint(degrees) {
-	if (degrees != null) {
-		def degreesInteger = Math.round(degrees)
-		log.debug "setCoolingSetpoint({$degreesInteger} ${temperatureScale})"
-		sendEvent("name": "coolingSetpoint", "value": degreesInteger)
-		def celsius = (getTemperatureScale() == "C") ? degreesInteger : (fahrenheitToCelsius(degreesInteger) as Double).round(2)
-		"st wattr 0x${device.deviceNetworkId} 0x19 0x201 0x11 0x29 {" + hex(celsius * 100) + "}"
-	}
-}
-
-def quickSetOutTemp(degrees) {
-    setOutdoorTemperature(degrees, 0)
-}
-
-def setOutdoorTemperature(degrees, delay = 0) {
-    setOutdoorTemperature(degrees.toDouble(), delay)
-}
-
-def setOutdoorTemperature(Double degrees, Integer delay = 0) {
-    def deviceScale
-    def locationScale = getTemperatureScale()
-    def p = (state.precision == null) ? 1 : state.precision
-    Integer tempToSend
-    def tempToSendInString
-
-    if (locationScale == "C")
-    {
-        deviceScale = 0
-    }
-    else
-    {
-        deviceScale = 1
-    }
-
-    if (degrees < 0)
-    {
-    	tempToSend = -degrees*100 - 65536
-    	tempToSend = -tempToSend
-    }
-    else
-    {
-    	tempToSend = (degrees*100)
-    }
-
-    tempToSendInString = zigbee.convertToHexString(tempToSend, 4)
-    my_writeAttribute(0x201, 0x4001, 0x29, tempToSendInString, ["mfgCode": "0x1185"])
-}
-
-def increaseHeatSetpoint()
-{
-    def currentMode = device.currentState("thermostatMode")?.value
-    if (currentMode != "off")
-    {
-		float currentSetpoint = device.currentValue("heatingSetpoint")
-		def locationScale = getTemperatureScale()
-    	float maxSetpoint
-    	float step
-
-    	if (locationScale == "C")
-    	{
-        	maxSetpoint = 30;
-        	step = 0.5
-    	}
-    	else
-    	{
-        	maxSetpoint = 86
-        	step = 1
-    	}
-
-        if (currentSetpoint < maxSetpoint)
-        {
-            currentSetpoint = currentSetpoint + step
-            quickSetHeat(currentSetpoint)
-        }
-    }
-}
-
-def decreaseHeatSetpoint()
-{
-    def currentMode = device.currentState("thermostatMode")?.value
-    if (currentMode != "off")
-    {
-        float currentSetpoint = device.currentValue("heatingSetpoint")
-        def locationScale = getTemperatureScale()
-        float minSetpoint
-        float step
-
-        if (locationScale == "C")
-        {
-            minSetpoint = 5;
-            step = 0.5
-        }
-        else
-        {
-            minSetpoint = 41
-            step = 1
-        }
-
-    	if (currentSetpoint > minSetpoint)
-    	{
-        	currentSetpoint = currentSetpoint - step
-        	quickSetHeat(currentSetpoint)
-    	}
-    }
-}
-
-def modes() {
-	["comfort", "eco", "off"]
-}
-
-def switchMode() {
-    def currentMode = device.currentState("thermostatMode")?.value
-    def lastTriedMode = state.lastTriedMode ?: currentMode ?: "comfort"
-    def modeOrder = modes()
-    def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
-	def nextMode = next(currentMode)
-    def modeNumber;
-    Integer setpointModeNumber;
-    def modeToSendInString;
-
-    if (nextMode == "comfort")
-    {
-    	modeNumber = 04
-        setpointModeNumber = 04
-    }
-    else if (nextMode == "eco")
-    {
-    	modeNumber = 04
-        setpointModeNumber = 05
-    }
-    else
-    {
-    	modeNumber = 00
-        setpointModeNumber = 00
-    }
-    if (supportedModes?.contains(currentMode)) {
-        while (!supportedModes.contains(nextMode) && nextMode != "comfort") {
-            nextMode = next(nextMode)
-        }
-    }
-    state.lastTriedMode = nextMode
-	modeToSendInString = zigbee.convertToHexString(setpointModeNumber, 2)
-    delayBetween([
-    		"st wattr 0x${device.deviceNetworkId} 0x19 0x201 0x001C 0x30 {$modeNumber}",
-            my_writeAttribute(0x201, 0x401C, 0x30, modeToSendInString, ["mfgCode": "0x1185"]),
-            poll()
-    ], 1000)
-}
-
-def setThermostatMode() {
-	log.debug "switching thermostatMode"
-	def currentMode = device.currentState("thermostatMode")?.value
-	def modeOrder = modes()
-	def index = modeOrder.indexOf(currentMode)
-	def next = index >= 0 && index < modeOrder.size() - 1 ? modeOrder[index + 1] : modeOrder[0]
-	log.debug "switching mode from $currentMode to $next"
-	"$next"()
-}
-
-def setThermostatFanMode() {
-	log.debug "Switching fan mode"
-	def currentFanMode = device.currentState("thermostatFanMode")?.value
-	log.debug "switching fan from current mode: $currentFanMode"
-	def returnCommand
-
-	switch (currentFanMode) {
-		case "fanAuto":
-			returnCommand = fanOn()
-			break
-		case "fanOn":
-			returnCommand = fanAuto()
-			break
-	}
-	if(!currentFanMode) { returnCommand = fanAuto() }
-	returnCommand
-}
-
-def setThermostatMode(String value) {
-	log.debug "setThermostatMode({$value})"
-	"$value"()
-}
-
-def setThermostatFanMode(String value) {
-	log.debug "setThermostatFanMode({$value})"
-	"$value"()
-}
-
-def off() {
-	log.debug "off"
-	sendEvent("name":"thermostatMode", "value":"off")
-	"st wattr 0x${device.deviceNetworkId} 0x19 0x201 0x1C 0x30 {00}"
-}
-
-def cool() {
-	log.debug "cool"
-	sendEvent("name":"thermostatMode", "value":"cool")
-	"st wattr 0x${device.deviceNetworkId} 0x19 0x201 0x1C 0x30 {03}"
-}
-
-def heat() {
-	log.debug "heat"
-	sendEvent("name":"thermostatMode", "value":"heat")
-	"st wattr 0x${device.deviceNetworkId} 0x19 0x201 0x1C 0x30 {04}"
-}
-
-def emergencyHeat() {
-	log.debug "emergencyHeat"
-	sendEvent("name":"thermostatMode", "value":"emergency heat")
-	"st wattr 0x${device.deviceNetworkId} 0x19 0x201 0x1C 0x30 {05}"
-}
-
-def on() {
-	fanOn()
-}
-
-def fanOn() {
-	log.debug "fanOn"
-	sendEvent("name":"thermostatFanMode", "value":"fanOn")
-	"st wattr 0x${device.deviceNetworkId} 0x19 0x202 0 0x30 {04}"
-}
-
-def auto() {
-	fanAuto()
-}
-
-def fanAuto() {
-	log.debug "fanAuto"
-	sendEvent("name":"thermostatFanMode", "value":"fanAuto")
-	"st wattr 0x${device.deviceNetworkId} 1 0x202 0 0x30 {05}"
-}
-
-def configure() {
-	log.debug "binding to Thermostat cluster"
-	delayBetween([
-        "zdo bind 0x${device.deviceNetworkId} 1 0x19 0x201 {${device.zigbeeId}} {}",
-        //Cluster ID (0x0201 = Thermostat Cluster), Attribute ID, Data Type, Payload (Min report, Max report, On change trigger)
-        zigbee.configureReporting(0x0201, 0x0000, 0x29, 10, 60, 50), 	//Attribute ID 0x0000 = local temperature, Data Type: S16BIT
-    	zigbee.configureReporting(0x0201, 0x0012, 0x29, 1, 0, 50),  	//Attribute ID 0x0012 = occupied heat setpoint, Data Type: S16BIT
-        zigbee.configureReporting(0x0201, 0x001C, 0x30, 1, 0, 1),   	//Attribute ID 0x001C = system mode, Data Type: 8 bits enum
-        zigbee.configureReporting(0x0201, 0x401C, 0x30, 1, 0, 1),   	//Attribute ID 0x401C = manufacturer specific setpoint mode, Data Type: 8 bits enum
-        zigbee.configureReporting(0x0201, 0x0008, 0x20, 300, 900, 5),   //Attribute ID 0x0008 = pi heating demand, Data Type: U8BIT
-        
-        //Cluster ID (0x0204 = Thermostat Ui Conf Cluster), Attribute ID, Data Type, Payload (Min report, Max report, On change trigger)
-        zigbee.configureReporting(0x0204, 0x0000, 0x30, 1, 0, 1),   //Attribute ID 0x0000 = temperature display mode, Data Type: 8 bits enum
-    	zigbee.configureReporting(0x0204, 0x0001, 0x30, 1, 0, 1),   //Attribute ID 0x0001 = keypad lockout, Data Type: 8 bits enum
-        
-        //Read the configured variables
-        zigbee.readAttribute(0x201, 0x0000),	//Read Local Temperature
-    	zigbee.readAttribute(0x201, 0x0012),	//Read Heat Setpoint
-        zigbee.readAttribute(0x201, 0x001C),	//Read System Mode
-        my_readAttribute(0x201, 0x401C, ["mfgCode": "0x1185"]),	//Read Manufacturer Specific Setpoint Mode
-        zigbee.readAttribute(0x201, 0x0008),	//Read PI Heating State
-        zigbee.readAttribute(0x204, 0x0000),	//Read Temperature Display Mode
-    	zigbee.readAttribute(0x204, 0x0001),	//Read Keypad Lockout
-	], 200)
-}
-
-def updated() {
-	log.debug "updated called"
-    response(parameterSetting())
-}
-
-def parameterSetting() {
-	def format = null
-    def lockmode = null
-    def valid_format = 0
-    def valid_lock = 0
-
-    log.info "unitformat : $settings.unitformat"
-    if (settings.unitformat == "Celsius") {
-        format = 0x00
-        valid_format = 1
-    }
-    else if (settings.unitformat == "Fahrenheit") {
-        format = 0x01
-        valid_format = 1
-    }
-
-    log.info "lock : $settings.lock"
-    if (settings.lock == "Yes") {
-        lockmode = 0x01
-        valid_lock = 1
-    }
-    else if (settings.lock == "No") {
-        lockmode = 0x00
-        valid_lock = 1
-    }
-    if ((valid_format == 1) && (valid_lock == 1))
-    {
-    	log.info "both valid"
-        delayBetween([
-            zigbee.writeAttribute(0x204, 0x00, 0x30, format),	//Write Unit Format Mode
-            zigbee.writeAttribute(0x204, 0x01, 0x30, lockmode),	//Write Lock Mode
-            poll(),
-        ], 200)
-    }
-    else if (valid_format == 1)
-    {
-    	log.info "format valid"
-        delayBetween([
-            zigbee.writeAttribute(0x204, 0x00, 0x30, format),	//Write Unit Format Mode
-            poll(),
-        ], 200)
-    }
-	else if (valid_lock == 1)
-    {
-    	log.info "lock valid"
-        delayBetween([
-            zigbee.writeAttribute(0x204, 0x01, 0x30, lockmode),	//Write Lock Mode
-            poll(),
-        ], 200)
-    }
-    else
-    {
-    	log.info "nothing valid"
-    }
-}
-
-private hex(value) {
-	new BigInteger(Math.round(value).toString()).toString(16)
-}
-
-private getEndpointId() {
-    new BigInteger(device.endpointId, 16).toString()
-}
-
-private String swapEndianHex(String hex) {
-    reverseArray(hex.decodeHex()).encodeHex()
-}
-
-private byte[] reverseArray(byte[] array) {
-    int i = 0;
-    int j = array.length - 1;
-    byte tmp;
-    while (j > i) {
-        tmp = array[j];
-        array[j] = array[i];
-        array[i] = tmp;
-        j--;
-        i++;
-    }
-    return array
-}
-
-def my_readAttribute(cluster, attributeId, Map additional=null)
-{
-    if (additional?.get("mfgCode")) {
-        [ "zcl mfg-code ${additional['mfgCode']}", "delay 200",
-          "zcl global read ${cluster} ${attributeId}", "delay 200",
-          "send 0x${device.deviceNetworkId} 1 ${endpointId}" ] 
-    } else {
-        zigbee.readAttribute(cluster, attributeId)
-    }
-}
-
-def my_writeAttribute(cluster, attributeId, dataType, value, Map additional=null)
-{
-	value = swapEndianHex(value)
-    if (additional ?.get("mfgCode")) {
-        [ "zcl mfg-code ${additional['mfgCode']}", "delay 200",
-          "zcl global write ${cluster} ${attributeId} ${dataType} {${value}}", "delay 200",
-          "send 0x${device.deviceNetworkId} 1 ${endpointId}" ]
-    } else {
-        zigbee.writeAttribute(cluster, attributeId, dataType, value)
-    }
-}
-

smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy

@@ -195,7 +195,10 @@ def registerDeviceChange() {
 				state.deviceSubscriptionMap.put(deviceId, [subscriptionEndpt])
 				log.info "Added subscription URL: ${subscriptionEndpt} for ${myDevice.displayName}"
 			} else if (!state.deviceSubscriptionMap[deviceId].contains(subscriptionEndpt)) {
-				state.deviceSubscriptionMap[deviceId] << subscriptionEndpt
+				// state.deviceSubscriptionMap[deviceId] << subscriptionEndpt
+				// For now, we will only have one subscription endpoint per device
+				state.deviceSubscriptionMap.remove(deviceId)
+				state.deviceSubscriptionMap.put(deviceId, [subscriptionEndpt])
 				log.info "Added subscription URL: ${subscriptionEndpt} for ${myDevice.displayName}"
 			}
 

smartapps/smartthings/bose-soundtouch-connect.src/bose-soundtouch-connect.groovy

@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
  *  Bose SoundTouch (Connect)
  *

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

@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
  *  Hue Service Manager
  *

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

@@ -1,3 +1,5 @@
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+
 /**
  *  Copyright 2015 SmartThings
  *