MSA-2027: Removed setpoint value tile since the tile does not support text on multiple lines anymore

build.gradle

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

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
+ -remove polling and/or refresh(?)
- 
- -------5/2017 Updates--------
- -Add fingerprints for SLP
- -add device health, check every 60mins + 2mins
  */
- 
 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-01"
-        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0402,0405", outClusters: "0003, 0019", manufacturer: "PLAID SYSTEMS", model: "PS-SPRZMS-SLP1", deviceJoinName: "Spruce Sensor"
 	}
 
 	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/.st-ignore

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

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

@@ -1,34 +0,0 @@
-# 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,4 +1,3 @@
-import groovy.json.JsonOutput
 /**
  *  Copyright 2015 SmartThings
  *
@@ -20,7 +19,6 @@ 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"
@@ -133,9 +131,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)
-
 	def zwMap = getZwaveInfo()
 	def buttons = 4 // Default for Key Fob
 

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

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

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

@@ -1,33 +0,0 @@
-# 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,4 +1,3 @@
-import groovy.json.JsonOutput
 /**
  *  Copyright 2015 SmartThings
  *
@@ -19,7 +18,6 @@ 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
@@ -121,7 +119,5 @@ 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/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)
+// Device-Watch simply pings if no device events received for 32min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	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)
+// Device-Watch simply pings if no device events received for 32min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	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/bose-soundtouch.src/bose-soundtouch.groovy

@@ -1,5 +1,3 @@
-//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 "auxheatonly", action:"switchMode", icon: "st.thermostat.emergency-heat"
+			state "emergency heat", action:"switchMode", icon: "st.thermostat.emergency-heat" // emergency heat = auxHeatOnly
 			state "updating", label:"Working", icon: "st.secondary.secondary"
 		}
 		standardTile("fanMode", "device.thermostatFanMode", inactiveLabel: false, decoration: "flat") {
@@ -156,49 +156,47 @@ void poll() {
 def generateEvent(Map results) {
 	log.debug "parsing data $results"
 	if(results) {
+		results.each { name, value ->
 
 			def linkText = getLinkText(device)
-		def supportedThermostatModes = ["off"]
+			def isChange = false
-		def thermostatMode = null
+			def isDisplayed = true
-
-		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()
-				event << [value: sendValue, unit: temperatureScale]
+				isChange = isTemperatureStateChange(device, name, value.toString())
+				isDisplayed = isChange
+				event << [value: sendValue, unit: temperatureScale, isStateChange: isChange, displayed: isDisplayed]
 			}  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"){
-				if (value == true) {
+				isChange = isStateChange(device, name, value.toString())
-					supportedThermostatModes << ((name == "auxHeatMode") ? "auxheatonly" : name - "Mode")
+				event << [value: value.toString(), isStateChange: isChange, displayed: false]
-				}
-				return // as we don't want to send this event here, proceed to next name/value pair
 			}  else if (name=="thermostatFanMode"){
-				sendEvent(name: "supportedThermostatFanModes", value: fanModes(), displayed: false)
+				isChange = isStateChange(device, name, value.toString())
-				event << [value: value.toString(), data:[supportedThermostatFanModes: fanModes()]]
+				event << [value: value.toString(), isStateChange: isChange, displayed: false]
 			}  else if (name=="humidity") {
-				event << [value: value.toString(), displayed: false, unit: "%"]
+				isChange = isStateChange(device, name, value.toString())
+				event << [value: value.toString(), isStateChange: isChange, displayed: false, unit: "%"]
 			} else if (name == "deviceAlive") {
+				isChange = isStateChange(device, name, value.toString())
+				event['isStateChange'] = isChange
 				event['displayed'] = false
 			} else if (name == "thermostatMode") {
-				thermostatMode = value.toLowerCase()
+				def mode = value.toString()
-				return // as we don't want to send this event here, proceed to next name/value pair
+				mode = (mode == "auxHeatOnly") ? "emergency heat" : mode
+				isChange = isStateChange(device, name, mode)
+				event << [value: mode, isStateChange: isChange, displayed: isDisplayed]
 			} else {
-				event << [value: value.toString()]
+				isChange = isStateChange(device, name, value.toString())
+				isDisplayed = isChange
+				event << [value: value.toString(), isStateChange: isChange, displayed: isDisplayed]
 			}
 			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 ()
 	}
@@ -324,7 +322,15 @@ void resumeProgram() {
 }
 
 def modes() {
-	return state.supportedThermostatModes
+	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
+	}
 }
 
 def fanModes() {
@@ -407,13 +413,11 @@ def setThermostatFanMode(String mode) {
 }
 
 def generateModeEvent(mode) {
-	sendEvent(name: "thermostatMode", value: mode, data:[supportedThermostatModes: state.supportedThermostatModes],
+	sendEvent(name: "thermostatMode", value: mode, descriptionText: "$device.displayName is in ${mode} mode", displayed: true)
-			descriptionText: "$device.displayName is in ${mode} mode")
 }
 
 def generateFanModeEvent(fanMode) {
-	sendEvent(name: "thermostatFanMode", value: fanMode, data:[supportedThermostatFanModes: fanModes()],
+	sendEvent(name: "thermostatFanMode", value: fanMode, descriptionText: "$device.displayName fan is in ${fanMode} mode", displayed: true)
-			descriptionText: "$device.displayName fan is in ${fanMode} mode")
 }
 
 def generateOperatingStateEvent(operatingState) {
@@ -449,14 +453,14 @@ def heat() {
 }
 
 def emergencyHeat() {
-	auxheatonly()
+	auxHeatOnly()
 }
 
-def auxheatonly() {
+def auxHeatOnly() {
-	log.debug "auxheatonly()"
+	log.debug "auxHeatOnly = emergency heat"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
 	if (parent.setMode ("auxHeatOnly", deviceId))
-		generateModeEvent("auxheatonly")
+		generateModeEvent("emergency heat") // emergency heat = auxHeatOnly
 	else {
 		log.debug "Error setting new mode."
 		def currentMode = device.currentState("thermostatMode")?.value
@@ -589,7 +593,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 == "auxheatonly") {
+	} else if (mode == "emergency heat") { // emergency heat = auxHeatOnly
 		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
 		sendEvent("name":"displayThermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale, displayed: false)
 	}
@@ -628,7 +632,7 @@ void raiseSetpoint() {
 		targetvalue = thermostatSetpoint ? thermostatSetpoint : 0
 		targetvalue = location.temperatureScale == "F"? targetvalue + 1 : targetvalue + 0.5
 
-		if ((mode == "heat" || mode == "auxheatonly") && targetvalue > maxHeatingSetpoint) {
+		if ((mode == "heat" || mode == "emergency heat") && targetvalue > maxHeatingSetpoint) { // emergency heat = auxHeatOnly
 			targetvalue = maxHeatingSetpoint
 		} else if (mode == "cool" && targetvalue > maxCoolingSetpoint) {
 			targetvalue = maxCoolingSetpoint
@@ -674,7 +678,7 @@ void lowerSetpoint() {
 		targetvalue = thermostatSetpoint ? thermostatSetpoint : 0
 		targetvalue = location.temperatureScale == "F"? targetvalue - 1 : targetvalue - 0.5
 
-		if ((mode == "heat" || mode == "auxheatonly") && targetvalue < minHeatingSetpoint) {
+		if ((mode == "heat" || mode == "emergency heat") && targetvalue < minHeatingSetpoint) { // emergency heat = auxHeatOnly
 			targetvalue = minHeatingSetpoint
 		} else if (mode == "cool" && targetvalue < minCoolingSetpoint) {
 			targetvalue = minCoolingSetpoint
@@ -715,7 +719,7 @@ void alterSetpoint(temp) {
 		}
 
 		//step1: check thermostatMode, enforce limits before sending request to cloud
-		if (mode == "heat" || mode == "auxheatonly"){
+		if (mode == "heat" || mode == "emergency heat"){ // emergency heat = auxHeatOnly
 			if (temp.value > coolingSetpoint){
 				targetHeatingSetpoint = temp.value
 				targetCoolingSetpoint = temp.value
@@ -750,7 +754,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 == "auxheatonly"){
+			if (mode == "heat" || mode == "emergency heat"){ // emergency heat = auxHeatOnly
 				sendEvent("name": "thermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
 				sendEvent("name": "displayThermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
 			} else if (mode == "cool") {
@@ -779,7 +783,7 @@ def generateStatusEvent() {
 	log.debug "Cooling set point = ${coolingSetpoint}"
 	log.debug "HVAC Mode = ${mode}"
 
-	if (mode == "heat" || mode == "auxheatonly") {
+	if (mode == "heat") {
 		if (temperature >= heatingSetpoint) {
 			statusText = "Right Now: Idle"
 		} else {
@@ -802,6 +806,8 @@ 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,21 +300,15 @@ def setColor(value) {
         value.hex = "#${hex(value.red)}${hex(value.green)}${hex(value.blue)}"
     }
 
-    if(value.hue) {
+	sendEvent(name: "hue", value: value.hue, displayed: false)
-        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.saturation) {
+	if (value.level) {
-        sendEvent(name: "saturation", value: value.saturation, displayed: false)
+		sendEvent(name: "level", value: value.level)
-    }
+	}
-    if(value.hex?.trim()) {
+	if (value.switch) {
-        sendEvent(name: "color", value: value.hex, displayed: false)
+		sendEvent(name: "switch", value: value.switch)
-    }
+	}
-    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:"contact", type: "generic", width: 6, height: 4, canChangeIcon: true){
+		multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){
-			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
+			tileAttribute ("device.valve", 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,16 +48,14 @@ metadata {
 			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 
-		main "contact"
+		main "valve"
-		details(["contact","refresh"])
+		details(["valve","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(){
@@ -87,17 +85,11 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 def open() {
-	delayBetween([
+	zwave.switchBinaryV1.switchBinarySet(switchValue: 0x00).format()
-		zwave.switchBinaryV1.switchBinarySet(switchValue: 0x00).format(),
-		zwave.switchBinaryV1.switchBinaryGet().format()
-	], 500)
 }
 
 def close() {
-	delayBetween([
+	zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF).format()
-		zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF).format(),
-		zwave.switchBinaryV1.switchBinaryGet().format()
-	], 500)
 }
 
 /**
@@ -113,6 +105,6 @@ def refresh() {
 
 def createEventWithDebug(eventMap) {
 	def event = createEvent(eventMap)
-	log.debug "Event created with ${event?.name}:${event?.value} - ${event?.descriptionText}"
+	log.debug "Event created with ${event?.descriptionText}"
 	return event
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -23,6 +23,7 @@ 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/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.POWER_CONFIGURATION_CLUSTER, 0x0020)
-			zigbee.readAttribute(zigbee.IAS_ZONE_CLUSTER, zigbee.ATTRIBUTE_IAS_ZONE_STATUS)
 
 	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 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)
@@ -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.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000)
-			zigbee.readAttribute(zigbee.IAS_ZONE_CLUSTER, zigbee.ATTRIBUTE_IAS_ZONE_STATUS)
 
 	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/wemo-light-switch.src/wemo-light-switch.groovy

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

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

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

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

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

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

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

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

@@ -1,42 +0,0 @@
-# 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
-
-ZigBee Button 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 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

@@ -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 {
@@ -26,7 +24,6 @@ metadata {
         capability "Configuration"
         capability "Refresh"
         capability "Sensor"
-        capability "Health Check"
 
         command "enrollResponse"
 
@@ -252,8 +249,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/zigbee-dimmer.src/zigbee-dimmer.groovy

@@ -66,29 +66,22 @@ def parse(String description) {
         else {
             sendEvent(event)
         }
-    } else {
+    }
-        def descMap = zigbee.parseDescriptionAsMap(description)
+    else {
-        if (descMap && descMap.clusterInt == 0x0006 && descMap.commandInt == 0x07) {
+        def cluster = zigbee.parse(description)
-            if (descMap.data[0] == "00") {
+
+        if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
+            if (cluster.data[0] == 0x00) {
                 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 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.
+        else {
-            // 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 "${descMap}"
+            log.debug "${cluster}"
         }
     }
 }

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

@@ -38,8 +38,8 @@ metadata {
     }
 
     tiles(scale: 2) {
-        multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4, canChangeIcon: true){
+        multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){
-            tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
+            tileAttribute ("device.valve", 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(["contact"])
+        main(["valve"])
-        details(["contact", "battery", "refresh"])
+        details(["valve", "battery", "refresh"])
     }
 }
 

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()))
+	// Device-Watch simply pings if no device events received for 32min(checkInterval)
-	initialize()
+	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 = []
+	def supportedModes = ""
-	if(cmd.off) { supportedModes << "off" }
+	if(cmd.off) { supportedModes += "off " }
-	if(cmd.heat) { supportedModes << "heat" }
+	if(cmd.heat) { supportedModes += "heat " }
-	if(cmd.cool) { supportedModes << "cool" }
+	if(cmd.auxiliaryemergencyHeat) { supportedModes += "emergency heat " }
-	if(cmd.auto) { supportedModes << "auto" }
+	if(cmd.cool) { supportedModes += "cool " }
-	if(cmd.auxiliaryemergencyHeat) { supportedModes << "emergency heat" }
+	if(cmd.auto) { supportedModes += "auto " }
 
-	state.supportedThermostatModes = supportedModes
+	state.supportedModes = supportedModes
-	sendEvent(name: "supportedThermostatModes", value: supportedModes, displayed: false)
+	// No events to be generated, return empty map
 	return [:]
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeSupportedReport cmd) {
-	def supportedFanModes = []
+	def supportedFanModes = ""
-	if(cmd.auto) { supportedFanModes << "auto" } // "fanAuto "
+	if(cmd.auto) { supportedFanModes += "auto " } // "fanAuto "
-	if(cmd.circulation) { supportedFanModes << "circulate" } // "fanCirculate"
+	if(cmd.low) { supportedFanModes += "on " } // "fanOn"
-	if(cmd.low) { supportedFanModes << "on" } // "fanOn"
+	if(cmd.circulation) { supportedFanModes += "circulate " } // "fanCirculate"
 
-	state.supportedThermostatFanModes = supportedFanModes
+	state.supportedFanModes = supportedFanModes
-	sendEvent(name: "supportedThermostatFanModes", value: supportedFanModes, displayed: false)
+	// No events to be generated, return empty map
 	return [:]
 }
 
@@ -345,17 +337,15 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 // Command Implementations
-def refresh() {
+def poll() {
-	def cmds = []
+	delayBetween([
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeSupportedGet().format())
+		zwave.sensorMultilevelV3.sensorMultilevelGet().format(), // current temperature
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeSupportedGet().format())
+		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format(),
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatModeV2.thermostatModeGet().format())
+		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format(),
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatFanModeV3.thermostatFanModeGet().format())
+		zwave.thermostatModeV2.thermostatModeGet().format(),
-	cmds << new physicalgraph.device.HubAction(zwave.sensorMultilevelV2.sensorMultilevelGet().format()) // current temperature
+		zwave.thermostatFanModeV3.thermostatFanModeGet().format(),
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format())
+		zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format()
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format())
+	], 2300)
-	cmds << new physicalgraph.device.HubAction(zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format())
-	sendHubCommand(cmds)
 }
 
 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 lastTriedMode = state.lastTriedMode ?: currentMode ?: "off"
-	def supportedModes = getDataByName("supportedThermostatModes")
+	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 lastTriedMode = state.lastTriedFanMode ?: currentMode ?: "off"
-	def supportedModes = getDataByName("supportedThermostatFanModes") ?: ["auto", "on"]
+	def supportedModes = getDataByName("supportedFanModes") ?: "auto on" // "fanAuto fanOn"
-	def modeOrder = state.supportedThermostatFanModes
+	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() {

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

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

@@ -0,0 +1,651 @@
+/**
+ *  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,10 +195,7 @@ 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,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
  *  Bose SoundTouch (Connect)
  *

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: "configureButton1")
-		page(name: "configureButton$i")
+	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
+	dynamicPage(name: "configureButton1", title: "Now let's decide how to use the first button",
-	log.debug "state variable numButton: ${state.numButton}"
+		nextPage: "configureButton2", uninstall: configured(), getButtonSections(1))
-	state.installCondition = false
-	createPage(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)
+	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 configureButton5() {
-	createPage(5)
-}
-
-def configureButton6() {
-	createPage(6)
-}
-
-def configureButton7() {
-	createPage(7)
-}
-
-def configureButton8() {
-	createPage(8)
 }
 
 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: "selectionSimple", title: "Simple options", description: "no separators in the selectable options", groupedOptions: addGroup(englishOptions + spanishOptions))
-            input(type: "enum", name: "selectionSimpleGrouped", title: "Simple (Grouped) 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: "selectionSegmented1", style: "segmented", title: "1 option", groupedOptions: addGroup(["One"]))
-            input(type: "enum", name: "selectionSegmented4", style: "segmented", title: "4 options", options: ["One", "Two", "Three", "Four"])
+            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/hue-connect.src/hue-connect.groovy

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

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") {

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

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