MSA-1998: ZWave Thermostat Manager

2026-03-09 13:21:53 +00:00 · 2017-05-22 19:34:20 -07:00
51 changed files with 950 additions and 1937 deletions
--- a/build.gradle
+++ b/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-zigbee:0.1.12'
+    devicetypesCompile 'smartthings:appengine-z-wave:0.1.2'
+    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.'
--- a/devicetypes/erocm123/inovelli-2-channel-smart-plug.src/inovelli-2-channel-smart-plug.groovy
+++ b/devicetypes/erocm123/inovelli-2-channel-smart-plug.src/inovelli-2-channel-smart-plug.groovy
@@ -1,268 +0,0 @@
-/**
- *
- *  Inovelli 2-Channel Smart Plug
- *
- *  github: Eric Maycock (erocm123)
- *  Date: 2017-04-27
- *  Copyright Eric Maycock
- *
- *  Includes all configuration parameters and ease of advanced configuration.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-metadata {
-	definition(name: "Inovelli 2-Channel Smart Plug", namespace: "erocm123", author: "Eric Maycock") {
-		capability "Actuator"
-		capability "Sensor"
-		capability "Switch"
-		capability "Polling"
-		capability "Refresh"
-		capability "Health Check"
-
-		fingerprint manufacturer: "015D", prod: "0221", model: "251C", deviceJoinName: "Show Home 2-Channel Smart Plug"
-		fingerprint manufacturer: "0312", prod: "B221", model: "251C", deviceJoinName: "Inovelli 2-Channel Smart Plug"
-	}
-	simulator {}
-	preferences {}
-	tiles {
-		multiAttributeTile(name: "switch", type: "lighting", width: 6, height: 4, canChangeIcon: true) {
-			tileAttribute("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "turningOn"
-				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00a0dc", nextState: "turningOff"
-				attributeState "turningOff", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "turningOn"
-				attributeState "turningOn", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00a0dc", nextState: "turningOff"
-			}
-		}
-		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", label: "", action: "refresh.refresh", icon: "st.secondary.refresh"
-		}
-		main(["switch"])
-		details(["switch",
-				 childDeviceTiles("all"), "refresh"
-		])
-	}
-}
-def parse(String description) {
-	def result = []
-	def cmd = zwave.parse(description)
-	if (cmd) {
-		result += zwaveEvent(cmd)
-		logging("Parsed ${cmd} to ${result.inspect()}", 1)
-	} else {
-		logging("Non-parsed event: ${description}", 2)
-	}
-	return result
-}
-def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd, ep = null) {
-	logging("BasicReport ${cmd} - ep ${ep}", 2)
-	if (ep) {
-		def event
-		childDevices.each {
-			childDevice ->
-				if (childDevice.deviceNetworkId == "$device.deviceNetworkId-ep$ep") {
-					childDevice.sendEvent(name: "switch", value: cmd.value ? "on" : "off")
-				}
-		}
-		if (cmd.value) {
-			event = [createEvent([name: "switch", value: "on"])]
-		} else {
-			def allOff = true
-			childDevices.each {
-				n ->
-					if (n.currentState("switch").value != "off") allOff = false
-			}
-			if (allOff) {
-				event = [createEvent([name: "switch", value: "off"])]
-			} else {
-				event = [createEvent([name: "switch", value: "on"])]
-			}
-		}
-		return event
-	}
-}
-def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd) {
-	logging("BasicSet ${cmd}", 2)
-	def result = createEvent(name: "switch", value: cmd.value ? "on" : "off", type: "digital")
-	def cmds = []
-	cmds << encap(zwave.switchBinaryV1.switchBinaryGet(), 1)
-	cmds << encap(zwave.switchBinaryV1.switchBinaryGet(), 2)
-	return [result, response(commands(cmds))] // returns the result of reponse()
-}
-def zwaveEvent(physicalgraph.zwave.commands.switchbinaryv1.SwitchBinaryReport cmd, ep = null) {
-	logging("SwitchBinaryReport ${cmd} - ep ${ep}", 2)
-	if (ep) {
-		def event
-		def childDevice = childDevices.find {
-			it.deviceNetworkId == "$device.deviceNetworkId-ep$ep"
-		}
-		if (childDevice) childDevice.sendEvent(name: "switch", value: cmd.value ? "on" : "off")
-		if (cmd.value) {
-			event = [createEvent([name: "switch", value: "on"])]
-		} else {
-			def allOff = true
-			childDevices.each {
-				n->
-					if (n.currentState("switch").value != "off") allOff = false
-			}
-			if (allOff) {
-				event = [createEvent([name: "switch", value: "off"])]
-			} else {
-				event = [createEvent([name: "switch", value: "on"])]
-			}
-		}
-		return event
-	} else {
-		def result = createEvent(name: "switch", value: cmd.value ? "on" : "off", type: "digital")
-		def cmds = []
-		cmds << encap(zwave.switchBinaryV1.switchBinaryGet(), 1)
-		cmds << encap(zwave.switchBinaryV1.switchBinaryGet(), 2)
-		return [result, response(commands(cmds))] // returns the result of reponse()
-	}
-}
-def zwaveEvent(physicalgraph.zwave.commands.multichannelv3.MultiChannelCmdEncap cmd) {
-	logging("MultiChannelCmdEncap ${cmd}", 2)
-	def encapsulatedCommand = cmd.encapsulatedCommand([0x32: 3, 0x25: 1, 0x20: 1])
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand, cmd.sourceEndPoint as Integer)
-	}
-}
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
-	logging("ManufacturerSpecificReport ${cmd}", 2)
-	def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId)
-	logging("msr: $msr", 2)
-	updateDataValue("MSR", msr)
-}
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	// This will capture any commands not handled by other instances of zwaveEvent
-	// and is recommended for development so you can see every command the device sends
-	logging("Unhandled Event: ${cmd}", 2)
-}
-def on() {
-	logging("on()", 1)
-	commands([
-			zwave.switchAllV1.switchAllOn(),
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 1),
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 2)
-	])
-}
-def off() {
-	logging("off()", 1)
-	commands([
-			zwave.switchAllV1.switchAllOff(),
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 1),
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 2)
-	])
-}
-void childOn(String dni) {
-	logging("childOn($dni)", 1)
-	def cmds = []
-	cmds << new physicalgraph.device.HubAction(command(encap(zwave.basicV1.basicSet(value: 0xFF), channelNumber(dni))))
-	cmds << new physicalgraph.device.HubAction(command(encap(zwave.switchBinaryV1.switchBinaryGet(), channelNumber(dni))))
-	sendHubCommand(cmds, 1000)
-}
-void childOff(String dni) {
-	logging("childOff($dni)", 1)
-	def cmds = []
-	cmds << new physicalgraph.device.HubAction(command(encap(zwave.basicV1.basicSet(value: 0x00), channelNumber(dni))))
-	cmds << new physicalgraph.device.HubAction(command(encap(zwave.switchBinaryV1.switchBinaryGet(), channelNumber(dni))))
-	sendHubCommand(cmds, 1000)
-}
-void childRefresh(String dni) {
-	logging("childRefresh($dni)", 1)
-	def cmds = []
-	cmds << new physicalgraph.device.HubAction(command(encap(zwave.switchBinaryV1.switchBinaryGet(), channelNumber(dni))))
-	sendHubCommand(cmds, 1000)
-}
-def poll() {
-	logging("poll()", 1)
-	commands([
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 1),
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 2),
-	])
-}
-def refresh() {
-	logging("refresh()", 1)
-	commands([
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 1),
-			encap(zwave.switchBinaryV1.switchBinaryGet(), 2),
-	])
-}
-def ping() {
-	logging("ping()", 1)
-	refresh()
-}
-def installed() {
-	logging("installed()", 1)
-	command(zwave.manufacturerSpecificV1.manufacturerSpecificGet())
-	createChildDevices()
-}
-def updated() {
-	logging("updated()", 1)
-	if (!childDevices) {
-		createChildDevices()
-	} else if (device.label != state.oldLabel) {
-		childDevices.each {
-			if (it.label == "${state.oldLabel} (CH${channelNumber(it.deviceNetworkId)})") {
-				def newLabel = "${device.displayName} (CH${channelNumber(it.deviceNetworkId)})"
-				it.setLabel(newLabel)
-			}
-		}
-		state.oldLabel = device.label
-	}
-	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-	sendEvent(name: "needUpdate", value: device.currentValue("needUpdate"), displayed: false, isStateChange: true)
-}
-def zwaveEvent(physicalgraph.zwave.commands.configurationv2.ConfigurationReport cmd) {
-	logging("${device.displayName} parameter '${cmd.parameterNumber}' with a byte size of '${cmd.size}' is set to '${cmd2Integer(cmd.configurationValue)}'", 2)
-}
-private encap(cmd, endpoint) {
-	if (endpoint) {
-		zwave.multiChannelV3.multiChannelCmdEncap(destinationEndPoint: endpoint).encapsulate(cmd)
-	} else {
-		cmd
-	}
-}
-private command(physicalgraph.zwave.Command cmd) {
-	if (state.sec) {
-		zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
-	} else {
-		cmd.format()
-	}
-}
-private commands(commands, delay = 1000) {
-	delayBetween(commands.collect {
-		command(it)
-	}, delay)
-}
-private channelNumber(String dni) {
-	dni.split("-ep")[-1] as Integer
-}
-private void createChildDevices() {
-	state.oldLabel = device.label
-	for (i in 1..2) {
-		addChildDevice("Switch Child Device", "${device.deviceNetworkId}-ep${i}", null, [completedSetup: true, label: "${device.displayName} (CH${i})",
-																						 isComponent: true, componentName: "ep$i", componentLabel: "Channel $i"
-		])
-	}
-}
-
-private def logging(message, level) {
-	if (logLevel != "0") {
-		switch (logLevel) {
-			case "1":
-				if (level > 1) log.debug "$message"
-				break
-			case "99":
-				log.debug "$message"
-				break
-		}
-	}
-}
--- a/devicetypes/erocm123/switch-child-device.src/switch-child-device.groovy
+++ b/devicetypes/erocm123/switch-child-device.src/switch-child-device.groovy
@@ -1,49 +0,0 @@
-/**
- *  Switch Child Device
- *
- *  Copyright 2017 Eric Maycock
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-metadata {
-	definition (name: "Switch Child Device", namespace: "erocm123", author: "Eric Maycock") {
-		capability "Switch"
-		capability "Actuator"
-		capability "Sensor"
-		capability "Refresh"
-	}
-
-	tiles {
-		multiAttributeTile(name:"switch", type: "lighting", width: 3, height: 4, canChangeIcon: true){
-			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState:"turningOn"
-				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC", nextState:"turningOff"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff"
-				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
-			}
-		}
-		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
-	}
-}
-
-void on() {
-	parent.childOn(device.deviceNetworkId)
-}
-
-void off() {
-	parent.childOff(device.deviceNetworkId)
-}
-
-void refresh() {
-	parent.childRefresh(device.deviceNetworkId)
-}
--- a/devicetypes/krlaframboise/zooz-smart-chime.src/zooz-smart-chime.groovy
+++ b/devicetypes/krlaframboise/zooz-smart-chime.src/zooz-smart-chime.groovy
@@ -1,813 +0,0 @@
-/**
- *  Zooz Smart Chime v1.2.1
- *  (Model: ZSE33)
- *
- *  Author: 
- *    Kevin LaFramboise (krlaframboise)
- *
- *  URL to documentation:  https://community.smartthings.com/t/release-zooz-smart-chime/77152?u=krlaframboise
- *    
- *
- *  Changelog:
- *
- *    1.2.1 (04/23/2017)
- *    	- SmartThings broke parse method response handling so switched to sendhubaction.
- *    	- Bug fix for location timezone issue.
- *
- *    1.2 (04/14/2017)
- *      - Added Switch Level capability
- *
- *    1.1 (02/19/2017)
- *      - Added Health Check and self polling.
- *
- *    1.0 (01/16/2017)
- *      - Initial Release
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-metadata {
-	definition (
-		name: "Zooz Smart Chime", 
-		namespace: "krlaframboise", 
-		author: "Kevin LaFramboise"
-	) {
-		capability "Actuator"
-		capability "Alarm"
-		capability "Battery"
-		capability "Configuration"
-		capability "Refresh"
-		capability "Switch"
-		capability "Tone"
-		capability "Health Check"
-		capability "Polling"
-		capability "Switch Level"
-		
-		attribute "lastCheckin", "string"
-		
-		attribute "status", "enum", ["alarm", "beep", "off", "on", "custom"]
-		
-		command "customChime"
-		
-		fingerprint deviceId: "0x1005", inClusters: "0x25, 0x59, 0x5A, 0x5E, 0x70, 0x71, 0x72, 0x73, 0x80, 0x85, 0x86, 0x87"
-		
-		fingerprint mfr:"027A", prod:"0003", model:"0088"
-	}
-	
-	simulator { }
-	
-	preferences {
-		input "sirenSound", "number",
-			title: "Siren Sound [1-10]:",
-			range: "1..10",
-			displayDuringSetup: true,
-			defaultValue: sirenSoundSetting
-		input "sirenVolume", "number",
-			title: "Siren Volume [1-3]:${getNameValueSettingDesc(volumeOptions)}",
-			range: "1..3",
-			required: false,
-			defaultValue: sirenVolumeSetting,			
-			displayDuringSetup: true
-		input "sirenLength", "number",
-			title: "Siren Length [0-4]:${getNameValueSettingDesc(sirenLengthOptions)}",
-			range: "0..4",
-			defaultValue: sirenLengthSetting,
-			required: false,
-			displayDuringSetup: true
-		input "sirenLED", "number",
-			title: "Siren LED [0-1]:${getNameValueSettingDesc(ledOptions)}",
-			range: "0..1",
-			defaultValue: sirenLEDSetting,
-			required: false,
-			displayDuringSetup: true		
-		input "onChimeSound", "number",
-			title: "Switch On Chime Sound [1-10]:",
-			range: "1..10",
-			required: false,
-			displayDuringSetup: true,
-			defaultValue: onChimeSoundSetting
-		input "beepChimeSound", "number",
-			title: "Beep Chime Sound [1-10]:",
-			range: "1..10",
-			required: false,
-			displayDuringSetup: true,
-			defaultValue: beepChimeSoundSetting
-		input "chimeVolume", "number",
-			title: "Chime Volume [1-3]:${getNameValueSettingDesc(volumeOptions)}",
-			range: "1..3",
-			required: false,
-			defaultValue: chimeVolumeSetting,
-			displayDuringSetup: true
-		input "chimeRepeat", "number",
-			title: "Chime Repeat [1-255]:\n(1-254 = # of Cycles)\n(255 = ${noLengthMsg})",
-			range: "1..255",
-			required: false,
-			displayDuringSetup: true,
-			defaultValue: chimeRepeatSetting
-		input "chimeLED", "number",
-			title: "Chime LED [0-1]:${getNameValueSettingDesc(ledOptions)}",
-			range: "0..1",
-			defaultValue: chimeLEDSetting,
-			required: false,
-			displayDuringSetup: true
-		input "checkinInterval", "enum",
-			title: "Checkin Interval:",
-			defaultValue: checkinIntervalSetting,
-			required: false,
-			displayDuringSetup: true,
-			options: checkinIntervalOptions.collect { it.name }
-		input "debugOutput", "bool", 
-			title: "Enable debug logging?", 
-			defaultValue: true, 
-			required: false
-	}
-
-	tiles(scale: 2) {
-		multiAttributeTile(name:"status", type: "generic", width: 6, height: 4, canChangeIcon: true){
-			tileAttribute ("device.status", key: "PRIMARY_CONTROL") {
-				attributeState "off", 
-					label:'Off', 
-					action: "off", 
-					icon: "st.Entertainment.entertainment2",
-					backgroundColor:"#ffffff"
-				attributeState "on", 
-					label:'Chime (On)!', 
-					action: "off", 
-					icon:"st.Entertainment.entertainment2", 					
-					backgroundColor: "#99c2ff"					
-				attributeState "alarm", 
-					label:'Siren!', 
-					action: "off", 
-					icon:"st.alarm.alarm.alarm", 
-					backgroundColor:"#ff9999"
-				attributeState "beep", 
-					label:'Chime (Beep)!', 
-					action: "off", 
-					icon:"st.Entertainment.entertainment2", 
-					backgroundColor:"#99ff99"
-				attributeState "custom", 
-					label:'Chime (Custom)!', 
-					action: "off", 
-					icon:"st.Entertainment.entertainment2", 
-					backgroundColor:"#cc99cc"				
-			}
-		}
-		
-		standardTile("playAlarm", "device.alarm", width: 2, height: 2) {
-			state "default", 
-				label:'Alarm', 
-				action:"alarm.both", 
-				icon:"st.security.alarm.clear", 
-				backgroundColor:"#ff9999"
-			state "both",
-				label:'Turn Off',
-				action:"alarm.off",
-				icon:"st.alarm.alarm.alarm", 
-				background: "#ffffff"	
-		}
-				
-		standardTile("playOn", "device.switch", width: 2, height: 2) {
-			state "default", 
-				label:'Turn On', 
-				action:"switch.on", 
-				icon:"st.Entertainment.entertainment2", 
-				backgroundColor:"#99c2ff"
-			state "on",
-				label:'Turn Off',
-				action:"switch.off",
-				icon:"st.Entertainment.entertainment2", 
-				background: "#ffffff"	
-		}
-		
-		standardTile("playBeep", "device.status", width: 2, height: 2) {
-			state "default", 
-				label:'Beep', 
-				action:"tone.beep", 
-				icon:"st.Entertainment.entertainment2", 
-				backgroundColor: "#99FF99"
-			state "beep",
-				label:'Stop',
-				action:"off",
-				icon:"st.Entertainment.entertainment2", 
-				background: "#ffffff"	
-		}
-		
-		standardTile("turnOff", "device.off", width: 2, height: 2) {
-			state "default", 
-				label:'Off', 
-				action:"switch.off", 
-				backgroundColor: "#ffffff"			
-		}
-		
-		standardTile("refresh", "device.refresh", width: 2, height: 2) {
-			state "refresh", label:'Refresh', action: "refresh", icon:"st.secondary.refresh-icon"
-		}
-		
-		valueTile("battery", "device.battery", decoration: "flat", width: 2, height: 2){
-			state "battery", label:'${currentValue}% battery', unit:""
-		}		
-				
-		main "status"
-		details(["status", "playOn", "playBeep", "playAlarm", "turnOff", "refresh", "battery"])
-	}
-}
-
-def updated() {	
-	// This method always gets called twice when preferences are saved.
-	if (!isDuplicateCommand(state.lastUpdated, 3000)) {		
-		state.lastUpdated = new Date().time
-		state.activeEvents = []
-		logTrace "updated()"
-		
-		initializeCheckin()
-		
-		if (state.firstUpdate == false) {
-			def result = []
-			result += configure()
-			if (result) {
-				return sendResponse(result)
-			}
-		}
-		else {
-			// Skip first time updating because it calls the configure method while it's already running.
-			state.firstUpdate = false
-		}
-	}	
-}
-
-private sendResponse(cmds) {
-	def actions = []
-	cmds?.each { cmd ->
-		actions << new physicalgraph.device.HubAction(cmd)
-	}	
-	sendHubCommand(actions)
-	return []
-}
-
-private initializeCheckin() {
-// Set the Health Check interval so that it pings the device if it's 1 minute past the scheduled checkin.
-	def checkInterval = ((checkinIntervalSettingMinutes * 60) + 60)
-	
-	sendEvent(name: "checkInterval", value: checkInterval, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-	
-	unschedule(healthPoll)
-	switch (checkinIntervalSettingMinutes) {
-		case 5:
-			runEvery5Minutes(healthPoll)
-			break
-		case 10:
-			runEvery10Minutes(healthPoll)
-			break
-		case 15:
-			runEvery15Minutes(healthPoll)
-			break
-		case 30:
-			runEvery30Minutes(healthPoll)
-			break
-		case [60, 120]:
-			runEvery1Hour(healthPoll)
-			break
-		default:
-			runEvery3Hours(healthPoll)			
-	}
-}
-
-def healthPoll() {
-	logTrace "healthPoll()"
-	sendHubCommand([new physicalgraph.device.HubAction(batteryGetCmd())], 100)
-}
-
-def ping() {
-	logTrace "ping()"
-	if (canCheckin()) {
-		logDebug "Attempting to ping device."
-		// Restart the polling schedule in case that's the reason why it's gone too long without checking in.
-		initializeCheckin()
-		
-		return poll()	
-	}	
-}
-
-def poll() {
-	if (canCheckin()) {
-		logTrace "Polling Device"
-		return batteryGetCmd()
-	}
-	else {
-		logTrace "Skipped Poll"
-	}
-}
-
-def configure() {
-	logTrace "configure()"
-	def cmds = []
-	def refreshAll = (!state.isConfigured || state.pendingRefresh || !settings?.sirenSound)
-	
-	if (!state.isConfigured) {
-		logTrace "Waiting 1 second because this is the first time being configured"		
-		cmds << "delay 1000"			
-	}
-	
-	configData.each { 
-		cmds += updateConfigVal(it.paramNum, it.value, refreshAll)	
-	}
-	
-	if (refreshAll) {
-		cmds << switchBinaryGetCmd()
-		cmds << batteryGetCmd()
-	}
-		
-	if (cmds) {
-		logDebug "Sending configuration to device."
-		return delayBetween(cmds, 250)
-	}
-	else {
-		return cmds
-	}	
-}
-
-private updateConfigVal(paramNum, val, refreshAll) {
-	def result = []
-	def configVal = state["configVal${paramNum}"]
-	
-	if (refreshAll || (configVal != val)) {
-		result << configSetCmd(paramNum, val)
-		result << configGetCmd(paramNum)
-	}
-	
-	return result
-}
-
-def off() {
-	logDebug "Turning Off()"
-	return sirenToggleCmds(0x00)	
-}
-
-def on() {	
-	logDebug "Playing On Chime (#${onChimeSoundSetting})"	
-	addPendingSound("switch", "on")
-	return chimePlayCmds(onChimeSoundSetting)
-}
-
-def setLevel(level, rate=null) {
-	logTrace "Executing setLevel($level)"
-	if (!device.currentValue("level")) {
-		sendEvent(name:"level", value:0, displayed:false)
-	}
-	return customChime(extractSoundFromLevel(level))	
-}
-
-private extractSoundFromLevel(level) {
-	def sound = safeToInt(level, 1)
-	if (sound <= 10) {
-		return 1
-	}
-	else {
-		if ((sound % 10) != 0) {
-			sound = (sound - (sound % 10))
-		}
-		return (sound / 10)
-	}
-}
-
-def beep() {
-	logDebug "Playing Beep Chime (#${beepChimeSoundSetting})"	
-	addPendingSound("status", "beep")
-	return chimePlayCmds(beepChimeSoundSetting)
-}
-
-def customChime(sound) {	
-	def val = validateSound(sound, beepChimeSoundSetting)
-	if ("${sound}" != "${val}") {
-		logDebug "Playing Custom Chime (#${val}) - (${sound} is not a valid sound number)"
-	}
-	else {
-		logDebug "Playing Custom Chime (#${val})"	
-	}	
-	addPendingSound("status", "custom")	
-	return chimePlayCmds(val)
-}
-
-def siren() { return both() }
-def strobe() { return both() }
-def both() {
-	logDebug "Playing Siren (#${sirenSoundSetting})"
-	addPendingSound("alarm", "both")
-
-	if (sirenLengthSetting == 0) {
-		// Siren Length is set to chime.
-		return chimePlayCmds(sirenSoundSetting)
-	}
-	else {
-		def result = []		
-		result += sirenToggleCmds(0xFF)
-		return result
-	}
-}
-
-private addPendingSound(name, value) {
-	state.pendingSound = [name: "$name", value: "$value", time: new Date().time]
-}
-
-def refresh() {	
-	logTrace "refresh()"
-	
-	state.pendingRefresh = true
-	return configure()
-}
-
-	
-def parse(String description) {
-	def result = []
-	
-	if (description.startsWith("Err")) {
-		log.warn "Parse Error: $description"
-		result << createEvent(descriptionText: "$device.displayName $description", isStateChange: true)
-	}
-	else {
-		def cmd = zwave.parse(description, getCommandClassVersions())
-		if (cmd) {
-			result += zwaveEvent(cmd)
-		}
-		else {
-			logDebug "Unable to parse description: $description"
-		}
-	}	
-	if (canCheckin()) {
-		result << createLastCheckinEvent()
-	}	
-	return result
-}
-
-private getCommandClassVersions() {
-	[
-		0x59: 1,  // AssociationGrpInfo
-		0x5A: 1,  // DeviceResetLocally
-		0x5E: 2,  // ZwaveplusInfo
-		0x70: 1,  // Configuration
-		0x71: 3,  // Notification v4
-		0x72: 2,  // ManufacturerSpecific
-		0x73: 1,  // Powerlevel
-		0x80: 1,  // Battery
-		0x85: 2,  // Association
-		0x86: 1,  // Version (2)
-		0x87: 1,  // Indicator
-		0x25: 1,  // Switch Binary
-	]
-}
-
-private canCheckin() {
-	def minimumCheckinInterval = ((checkinIntervalSettingMinutes * 60 * 1000) - 5000)
-	return (!state.lastCheckinTime || ((new Date().time - state.lastCheckinTime) >= minimumCheckinInterval))
-}
-
-private createLastCheckinEvent() {
-	logDebug "Device Checked In"
-	state.lastCheckinTime = new Date().time
-	return createEvent(name: "lastCheckin", value: convertToLocalTimeString(new Date()), displayed: false)
-}
-
-private convertToLocalTimeString(dt) {
-	def timeZoneId = location?.timeZone?.ID
-	if (timeZoneId) {
-		return dt.format("MM/dd/yyyy hh:mm:ss a", TimeZone.getTimeZone(timeZoneId))
-	}
-	else {
-		return "$dt"
-	}	
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
-	logTrace "BatteryReport: $cmd"
-	def isNew = (device.currentValue("battery") != cmd.batteryLevel)
-	
-	def val = (cmd.batteryLevel == 0xFF ? 1 : cmd.batteryLevel)
-		
-	def result = []
-	result << createEvent(name: "battery", value: val, unit: "%", displayed: isNew, isStateChange: true)
-	return result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.configurationv1.ConfigurationReport cmd) {	
-	def name = configData.find { it.paramNum == cmd.parameterNumber }?.name
-	if (name) {	
-		def val = cmd.configurationValue[0]
-	
-		logDebug "${name} = ${val}"
-	
-		state."configVal${cmd.parameterNumber}" = val
-	}
-	else {
-		logDebug "Parameter ${cmd.parameterNumber}: ${cmd.configurationValue}"
-	}
-	state.isConfigured = true
-	state.pendingRefresh = false	
-	return []
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
-	def result = []
-	logTrace "BasicReport: ${cmd}"
-	if (cmd.value == 0x00) {
-		result += handleDeviceOff()
-	}
-	else {
-		result += sendResponse(["delay 3000", basicGetCmd()])
-	}	
-	return result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.switchbinaryv1.SwitchBinaryReport cmd) {
-	def result = []
-	logTrace "SwitchBinaryReport: ${cmd}"	
-	return result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cmd) {
-	def result = []	
-	logTrace "NotificationReport: ${cmd}"
-	
-	if (cmd.notificationType == 14) {
-		if (cmd.event == 0) {
-			result += handleDeviceOff()
-		}
-		else if (cmd.event == 1) {
-			result += handleDeviceOn(state.activeSound, state.pendingSound)
-		}
-	}
-	return result
-}
-
-private handleDeviceOn(activeSound, pendingSound) {
-	def result = []
-	def activeSoundName = activeSound?.name
-	
-	state.activeSound = pendingSound
-	
-	if (pendingSound) {
-		result << createEvent(getEventMap(pendingSound, true))
-		
-		def statusVal = ""
-		if (pendingSound.name == "alarm") {
-			statusVal = "alarm"
-		}
-		else if (pendingSound.name == "switch") {
-			statusVal = "on"
-		}
-		if (statusVal) {
-			result << createEvent(getStatusEventMap(statusVal))
-		}
-	}
-	else {
-		logTrace "Unable to create event on because the pending sound has not been set."
-	}		
-	return result
-}
-
-private handleDeviceOff() {
-	def result = []
-	["alarm", "switch", "status"].each { n ->			
-		def displayed = false
-		if ("${n}" == "${state.activeSound?.name}") {
-			// Only the active event was initially displayed so it's the only off event that gets displayed.
-			displayed = true
-			state.activeSound = null
-		}
-		
-		result << createEvent(getEventMap([name: "$n", value: "off"], displayed))
-	}
-
-	return result
-}
-
-private getStatusEventMap(val) {
-	return getEventMap([name: "status", value: val], false)
-}
-
-private getEventMap(event, displayed=false) {	
-	def isStateChange = (device.currentValue(event.name) != event.value)
-	def eventMap = [
-		name: event.name,
-		value: event.value,
-		displayed: displayed,
-		isStateChange: true
-	]
-	logTrace "Creating Event: ${eventMap}"
-	return eventMap
-}
-
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	logDebug "Unhandled Command: $cmd"
-	return []
-}
-
-private chimePlayCmds(sound) {
-	def cmds = []
-	
-	cmds << indicatorSetCmd(sound)
-		
-	if ((sound in [1, 9, 10]) && chimeRepeatSetting == 1) {
-		// Fixes problem where these sounds stop playing before the start events are created causing the off events to never get created.
-		cmds << basicGetCmd()
-		cmds << "delay 3000"		
-	}	
-	return cmds	
-}
-
-private indicatorSetCmd(val) {
-	return zwave.indicatorV1.indicatorSet(value: val).format()
-}
-
-private sirenToggleCmds(val) {
-	return [
-		switchBinarySetCmd(val),
-		switchBinaryGetCmd()
-	]
-}
-private switchBinaryGetCmd() {
-	return zwave.switchBinaryV1.switchBinaryGet().format()
-}
-private switchBinarySetCmd(val) {
-	return zwave.switchBinaryV1.switchBinarySet(switchValue: val).format()
-}
-
-private basicGetCmd() {
-	return zwave.basicV1.basicGet().format()
-}
-
-private batteryGetCmd() {
-	return zwave.batteryV1.batteryGet().format()
-}
-
-private configGetCmd(paramNum) {
-	return zwave.configurationV1.configurationGet(parameterNumber: paramNum).format()
-}
-
-private configSetCmd(paramNum, val) {		
-	return zwave.configurationV1.configurationSet(parameterNumber: paramNum, size: 1, scaledConfigurationValue: val).format()
-}
-
-// Configuration Parameters
-private getConfigData() {
-	// [paramNum: 6, name: "Chime Sound"]
-	return [		
-		[paramNum: 5, name: "Siren Sound", value: sirenSoundSetting],
-		[paramNum: 1, name: "Siren Volume", value: sirenVolumeSetting],
-		[paramNum: 2, name: "Siren Length", value: (sirenLengthSetting == 4 ? 255 : sirenLengthSetting)],
-		[paramNum: 8, name: "Siren LED", value: sirenLEDSetting],
-		[paramNum: 4, name: "Chime Volume", value: chimeVolumeSetting],
-		[paramNum: 3, name: "Chime Repeat", value: chimeRepeatSetting],
-		[paramNum: 9, name: "Chime LED", value: chimeLEDSetting],
-		[paramNum: 7, name: "Chime Mode", value: chimeModeSetting]
-	]	
-}
-
-// Settings
-private getDebugOutputSetting() {
-	return (settings?.debugOutput != false)
-}
-private getSirenSoundSetting() {
-	return validateSound(settings?.sirenSound, 9)
-}
-private getSirenVolumeSetting() {
-	return safeToInt(settings?.sirenVolume, 3)
-}
-private getSirenLengthSetting() {
-	return safeToInt(settings?.sirenLength, 0)
-}
-private getSirenLEDSetting() {
-	return safeToInt(settings?.sirenLED, 1)
-}
-private getOnChimeSoundSetting() {
-	return validateSound(settings?.onChimeSound, 1)
-}
-private getBeepChimeSoundSetting() {
-	 return validateSound(settings?.beepChimeSound, 3)
-}
-private getChimeVolumeSetting() {
-	return safeToInt(settings?.chimeVolume, 3)
-}
-private getChimeRepeatSetting() {
-	return safeToInt(settings?.chimeRepeat, 1)
-}
-private getChimeLEDSetting() {
-	return safeToInt(settings?.chimeLED, 0)
-}
-private getChimeModeSetting() {
-	return 1 // Chime Mode should always be disabled.
-}
-
-private getCheckinIntervalSettingMinutes() {
-	return convertOptionSettingToInt(checkinIntervalOptions, checkinIntervalSetting)
-}
-
-private getCheckinIntervalSetting() {
-	return settings?.checkinInterval ?: findDefaultOptionName(checkinIntervalOptions)
-}
-
-private validateSound(sound, defaultVal) {
-	def val = safeToInt(sound, defaultVal)
-	if (val > 10) {
-		val = 10
-	}
-	else if (val < 1) {
-		val = 1
-	}
-	return val
-}
-
-private getVolumeOptions() { 
-	[
-		[name: "Low", value: 1],
-		[name: "Medium", value: 2],
-		[name: "High", value: 3]
-	]
-}
-
-private getLedOptions() { 
-	[
-		[name: "Off", value: 0],
-		[name: "On", value: 1]
-	]
-}
-
-private getSirenLengthOptions() {
-	[
-		[name: "Chime", value: 0],
-		[name: "30 Seconds", value: 1],
-		[name: "1 Minute", value: 2],
-		[name: "5 Minutes", value: 3],
-		[name: "${noLengthMsg}", value: 4] // config value is 255
-	]
-}
-
-private getNoLengthMsg() { 
-	return "Play until battery is depleted" 
-}
-
-private getNameValueSettingDesc(nameValueMap) {
-	def desc = ""
-	nameValueMap?.sort { it.value }.each { 
-		desc = "${desc}\n(${it.value} - ${it.name})"
-	}
-	return desc
-}
-
-private getCheckinIntervalOptions() {
-	[
-		[name: "5 Minutes", value: 5],
-		[name: "10 Minutes", value: 10],
-		[name: "15 Minutes", value: 15],
-		[name: "30 Minutes", value: 30],
-		[name: "1 Hour", value: 60],
-		[name: "2 Hours", value: 120],
-		[name: "3 Hours", value: 180],
-		[name: "6 Hours", value: 360],
-		[name: "9 Hours", value: 540],
-		[name: formatDefaultOptionName("12 Hours"), value: 720],
-		[name: "18 Hours", value: 1080],
-		[name: "24 Hours", value: 1440]
-	]
-}
-
-private convertOptionSettingToInt(options, settingVal) {
-	return safeToInt(options?.find { "${settingVal}" == it.name }?.value, 0)
-}
-
-private formatDefaultOptionName(val) {
-	return "${val}${defaultOptionSuffix}"
-}
-
-private findDefaultOptionName(options) {
-	def option = options?.find { it.name?.contains("${defaultOptionSuffix}") }
-	return option?.name ?: ""
-}
-
-private getDefaultOptionSuffix() {
-	return "   (Default)"
-}
-
-private safeToInt(val, defaultVal=-1) {
-	return "${val}"?.isInteger() ? "${val}".toInteger() : defaultVal
-}
-
-private isDuplicateCommand(lastExecuted, allowedMil) {
-	!lastExecuted ? false : (lastExecuted + allowedMil > new Date().time) 
-}
-
-private logDebug(msg) {
-	if (debugOutputSetting) {
-		log.debug "$msg"
-	}
-}
-
-private logTrace(msg) {
-	// log.trace "$msg"
-}
--- a/devicetypes/smartthings/aeon-key-fob.src/.st-ignore
+++ b/devicetypes/smartthings/aeon-key-fob.src/.st-ignore
@@ -1,2 +0,0 @@
-.st-ignore
-README.md
--- a/devicetypes/smartthings/aeon-key-fob.src/README.md
+++ b/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)
--- a/devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy
+++ b/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

--- a/devicetypes/smartthings/aeon-minimote.src/.st-ignore
+++ b/devicetypes/smartthings/aeon-minimote.src/.st-ignore
@@ -1,2 +0,0 @@
-.st-ignore
-README.md
--- a/devicetypes/smartthings/aeon-minimote.src/README.md
+++ b/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)
--- a/devicetypes/smartthings/aeon-minimote.src/aeon-minimote.groovy
+++ b/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)
 }
--- a/devicetypes/smartthings/aeon-multisensor-gen5.src/aeon-multisensor-gen5.groovy
+++ b/devicetypes/smartthings/aeon-multisensor-gen5.src/aeon-multisensor-gen5.groovy
@@ -22,6 +22,8 @@ metadata {
 		capability "Battery"
 		capability "Health Check"

+		command "configureAfterSecure"
+
 		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x98,0x7A", outClusters:"0x5A"
 		fingerprint mfr:"0086", prod:"0102", model:"004A", deviceJoinName: "Aeon Labs MultiSensor (Gen 5)"
 	}
@@ -89,12 +91,12 @@ metadata {
 		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
 			state "battery", label:'${currentValue}% battery', unit:""
 		}
-		standardTile("configure", "device.configure", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "configure", label:'', action:"configure", icon:"st.secondary.configure"
+        standardTile("configureAfterSecure", "device.configure", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+			state "configure", label:'', action:"configureAfterSecure", icon:"st.secondary.configure"
 		}

 		main(["motion", "temperature", "humidity", "illuminance"])
-		details(["motion", "temperature", "humidity", "illuminance", "battery", "configure"])
+		details(["motion", "temperature", "humidity", "illuminance", "battery", "configureAfterSecure"])
 	}
 }

@@ -129,8 +131,8 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd)

 	if (!isConfigured()) {
 		// we're still in the process of configuring a newly joined device
-		log.debug("not sending wakeUpNoMoreInformation yet: late configure")
-		result += response(configure())
+		log.debug("not sending wakeUpNoMoreInformation yet")
+        result += response(configureAfterSecure())
 	} else {
 		result += response(zwave.wakeUpV1.wakeUpNoMoreInformation())
 	}
@@ -148,6 +150,11 @@ def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulat
 	}
 }

+def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityCommandsSupportedReport cmd) {
+    // log.debug "Received SecurityCommandsSupportedReport"
+	response(configureAfterSecure())
+}
+
 def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
 	def map = [ name: "battery", unit: "%" ]
 	if (cmd.batteryLevel == 0xFF) {
@@ -219,6 +226,36 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	createEvent(descriptionText: cmd.toString(), isStateChange: false)
 }

+def configureAfterSecure() {
+    // log.debug "configureAfterSecure()"
+
+    def request = [
+		// send temperature, humidity, and illuminance every 8 minutes
+		zwave.configurationV1.configurationSet(parameterNumber: 101, size: 4, scaledConfigurationValue: 128|64|32),
+		zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: 8*60),
+
+		// send battery every 20 hours
+		zwave.configurationV1.configurationSet(parameterNumber: 102, size: 4, scaledConfigurationValue: 1),
+		zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 20*60*60),
+
+		// send no-motion report 60 seconds after motion stops
+		zwave.configurationV1.configurationSet(parameterNumber: 3, size: 2, scaledConfigurationValue: 60),
+
+		// send binary sensor report instead of basic set for motion
+		zwave.configurationV1.configurationSet(parameterNumber: 5, size: 1, scaledConfigurationValue: 2),
+
+		// disable notification-style motion events
+		zwave.notificationV3.notificationSet(notificationType: 7, notificationStatus: 0),
+
+		zwave.batteryV1.batteryGet(),
+		zwave.sensorBinaryV2.sensorBinaryGet(sensorType:0x0C)
+    ]
+	
+    setConfigured()
+	
+    secureSequence(request) + ["delay 20000", zwave.wakeUpV1.wakeUpNoMoreInformation().format()]
+}
+
 /**
 * PING is used by Device-Watch in attempt to reach the Device
 * */
@@ -228,36 +265,7 @@ def ping() {

 def configure() {
 	// log.debug "configure()"
-	def request = []
-	// send temperature, humidity, and illuminance every 8 minutes
-	request << zwave.configurationV1.configurationSet(parameterNumber: 101, size: 4, scaledConfigurationValue: 128|64|32)
-	request << zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: 8*60)
-
-	// send battery every 20 hours
-	request << zwave.configurationV1.configurationSet(parameterNumber: 102, size: 4, scaledConfigurationValue: 1)
-	request << zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 20*60*60)
-
-	// send no-motion report 60 seconds after motion stops
-	request << zwave.configurationV1.configurationSet(parameterNumber: 3, size: 2, scaledConfigurationValue: 60)
-
-	// send binary sensor report instead of basic set for motion
-	request << zwave.configurationV1.configurationSet(parameterNumber: 5, size: 1, scaledConfigurationValue: 2)
-
-	// Turn on the Multisensor Gen5 PIR sensor
-	request << zwave.configurationV1.configurationSet(parameterNumber: 4, size: 1, scaledConfigurationValue: 1)
-
-	// disable notification-style motion events
-	request << zwave.notificationV3.notificationSet(notificationType: 7, notificationStatus: 0)
-
-	request << zwave.batteryV1.batteryGet()
-	request << zwave.sensorBinaryV2.sensorBinaryGet(sensorType: 0x0C) //motion
-	request << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 0x01) //temperature
-	request << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 0x03) //illuminance
-	request << zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 0x05) //humidity
-
-	setConfigured()
-
-	secureSequence(request) + ["delay 20000", zwave.wakeUpV1.wakeUpNoMoreInformation().format()]
+    //["delay 30000"] + secure(zwave.securityV1.securityCommandsSupportedGet())
 }

 private setConfigured() {
--- a/devicetypes/smartthings/aeon-multisensor.src/.st-ignore
+++ b/devicetypes/smartthings/aeon-multisensor.src/.st-ignore
@@ -1,2 +0,0 @@
-.st-ignore
-README.md
--- a/devicetypes/smartthings/aeon-multisensor.src/README.md
+++ b/devicetypes/smartthings/aeon-multisensor.src/README.md
@@ -1,48 +0,0 @@
-# Aeon Multisensor
-
-Cloud Execution
-
-Works with: 
-
-* [Aeotec MultiSensor (DSB05-ZWUS)](https://www.smartthings.com/products/aeotec-multisensor-5)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Battery](#battery-specification)
-* [Troubleshooting](#troubleshooting)
-
-## Capabilities
-
-* **Motion Sensor** - can detect motion
-* **Temperature Measurement** - defines device measures current temperature
-* **Relative Humidity Measurement** - allow reading the relative humidity from devices that support it
-* **Illuminance Measurement** - gives the illuminance reading from devices that support it
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated
-* **Sensor** - detects sensor events
-* **Battery** - defines device uses a battery
-* **Health Check** - indicates ability to get device health notifications
-
-
-## Device Health
-
-Aeon Labs MultiSensor is polled by the hub.
-As of hubCore version 0.14.38 the hub sends up reports every 15 minutes regardless of whether the state changed.
-Device-Watch allows 2 check-in misses from device plus some lag time. So Check-in interval = (2*15 + 2)mins = 32 mins.
-Not to mention after going OFFLINE when the device is plugged back in, it might take a considerable amount of time for
-the device to appear as ONLINE again. This is because if this listening device does not respond to two poll requests in a row,
-it is not polled for 5 minutes by the hub. This can delay up the process of being marked ONLINE by quite some time.
-
-* __32min__ checkInterval
-
-## Battery Specification
-
-Four AAA batteries are required.
-
-## 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.
-Instructions related to pairing, resetting and removing the device from SmartThings can be found in the following link:
-* [Aeon MultiSensor Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206157226-How-to-connect-Aeon-Labs-MultiSensors)
--- a/devicetypes/smartthings/aeon-multisensor.src/aeon-multisensor.groovy
+++ b/devicetypes/smartthings/aeon-multisensor.src/aeon-multisensor.groovy
@@ -20,7 +20,6 @@ metadata {
 		capability "Illuminance Measurement"
 		capability "Sensor"
 		capability "Battery"
-		capability "Health Check"

 		fingerprint deviceId: "0x2001", inClusters: "0x30,0x31,0x80,0x84,0x70,0x85,0x72,0x86"
 	}
@@ -94,16 +93,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])
-}
-
-def updated(){
-// Device-Watch simply pings if no device events received for 32min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-}
-
 // Parse incoming device messages to generate events
 def parse(String description)
 {
@@ -190,13 +179,6 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	[:]
 }

-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	secure(zwave.batteryV1.batteryGet())
-}
-
 def configure() {
 	delayBetween([
 		// send binary sensor report instead of basic set for motion
--- a/devicetypes/smartthings/aeon-siren.src/aeon-siren.groovy
+++ b/devicetypes/smartthings/aeon-siren.src/aeon-siren.groovy
@@ -16,7 +16,7 @@
 *	Date: 2014-07-15
 */
 metadata {
- definition (name: "Aeon Siren", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.smoke") {
+ definition (name: "Aeon Siren", namespace: "smartthings", author: "SmartThings") {
 	capability "Actuator"
 	capability "Alarm"
 	capability "Switch"
@@ -61,8 +61,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(secure(zwave.basicV1.basicGet()))
 }

 def updated() {
@@ -165,4 +163,4 @@ private secure(physicalgraph.zwave.Command cmd) {
 * */
 def ping() {
 	secure(zwave.basicV1.basicGet())
-}
+}
--- a/devicetypes/smartthings/bose-soundtouch.src/bose-soundtouch.groovy
+++ b/devicetypes/smartthings/bose-soundtouch.src/bose-soundtouch.groovy
@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
 *  Bose SoundTouch
 *
--- a/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy
+++ b/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy
@@ -108,20 +108,11 @@ def updated(){
    }
 }

-def getCommandClassVersions() {
-	[
-		0x20: 1,  // Basic
-		0x26: 1,  // SwitchMultilevel
-		0x56: 1,  // Crc16Encap
-		0x70: 1,  // Configuration
-	]
-}
-
 def parse(String description) {
 	def result = null
 	if (description != "updated") {
 		log.debug "parse() >> zwave.parse($description)"
-		def cmd = zwave.parse(description, commandClassVersions)
+		def cmd = zwave.parse(description, [0x20: 1, 0x26: 1, 0x70: 1])
 		if (cmd) {
 			result = zwaveEvent(cmd)
 		}
@@ -188,16 +179,6 @@ def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv1.SwitchMultilevelS
 	[createEvent(name:"switch", value:"on"), response(zwave.switchMultilevelV1.switchMultilevelGet().format())]
 }

-def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
-	def versions = commandClassVersions
-	def version = versions[cmd.commandClass as Integer]
-	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
-	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand)
-	}
-}
-
 def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	// Handles all Z-Wave commands we aren't interested in
 	[:]
--- a/devicetypes/smartthings/everspring-illuminance-sensor.src/everspring-illuminance-sensor.groovy
+++ b/devicetypes/smartthings/everspring-illuminance-sensor.src/everspring-illuminance-sensor.groovy
@@ -1,163 +0,0 @@
-/**
- *  Copyright 2017 SmartThings
- *
- *  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.
- *
- *  Everspring ST815 Illuminance Sensor
- *
- *  Author: SmartThings
- *  Date: 2017-3-4
- */
-
-metadata {
-	definition (name: "Everspring Illuminance Sensor", namespace: "smartthings", author: "SmartThings") {
-		capability "Illuminance Measurement"
-		capability "Battery"
-		capability "Configuration"
-		capability "Sensor"
-		capability "Health Check"
-
-		fingerprint mfr:"0060", prod:"0007", model:"0001"
-	}
-
-	simulator {
-		for( int i = 0; i <= 100; i += 20 ) {
-			status "illuminace ${i} lux": new physicalgraph.zwave.Zwave().sensorMultilevelV2.sensorMultilevelReport(
-				scaledSensorValue: i, precision: 0, sensorType: 3, scale: 1).incomingMessage()
-		}
-
-		for( int i = 0; i <= 100; i += 20 ) {
-			status "battery ${i}%": new physicalgraph.zwave.Zwave().batteryV1.batteryReport(
-				batteryLevel: i).incomingMessage()
-		}
-
-		status "wakeup":  "command: 8407, payload: "
-	}
-
-	tiles(scale: 2) {
-		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
-			state "temperature", label:'${currentValue}°',
-			backgroundColors:[
-				[value: 32, color: "#153591"],
-				[value: 44, color: "#1e9cbb"],
-				[value: 59, color: "#90d2a7"],
-				[value: 74, color: "#44b621"],
-				[value: 84, color: "#f1d801"],
-				[value: 92, color: "#d04e00"],
-				[value: 98, color: "#bc2323"]
-			]
-		}
-		valueTile("humidity", "device.humidity", inactiveLabel: false, width: 2, height: 2) {
-			state "humidity", label:'${currentValue}% humidity', unit:""
-		}
-		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "battery", label:'${currentValue}% battery', unit:""
-		}
-
-		main( ["temperature", "humidity"] )
-		details( ["temperature", "humidity", "battery"] )
-	}
-}
-
-def updated() {
-	state.configured = false
-}
-
-def parse(String description) {
-	def result = []
-
-	def cmd = zwave.parse(description, [0x20: 1, 0x31: 2, 0x70: 1, 0x71: 1, 0x80: 1, 0x84: 2, 0x85: 2])
-
-	if (cmd) {
-		result = zwaveEvent(cmd)
-	}
-
-	if (result instanceof List) {
-		log.debug "Parsed '$description' to ${result.collect { it.respondsTo("toHubAction") ? it.toHubAction() : it }}"
-	} else {
-		log.debug "Parsed '$description' to ${result}"
-	}
-	return result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd) {
-	def result = [
-		createEvent(descriptionText: "${device.displayName} woke up", isStateChange: false)
-	]
-	if (state.configured) {
-		result << response(zwave.batteryV1.batteryGet())
-	} else {
-		result << response(configure())
-	}
-	return result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.alarmv1.AlarmReport cmd) {
-	if (cmd.alarmType == 1 && cmd.alarmType == 0xFF) {
-		return createEvent(descriptionText: "${device.displayName} battery is low", isStateChange: true)
-	} else if (cmd.alarmType == 2 && cmd.alarmLevel == 1) {
-		return createEvent(descriptionText: "${device.displayName} powered up", isStateChange: false)
-	}
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv2.SensorMultilevelReport cmd) {
-
-	def map = [:]
-	switch( cmd.sensorType ) {
-		case 3:
-			// luminance
-			map.value = cmd.scaledSensorValue.toInteger().toString()
-			map.unit = "lux"
-			map.name = "illuminance"
-			break;
-	}
-	
-	return createEvent(map)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
-	def map = [ name: "battery", unit: "%" ]
-	if (cmd.batteryLevel == 0xFF) {
-		map.value = 1
-		map.descriptionText = "${device.displayName} has a low battery"
-		map.isStateChange = true
-	} else {
-		map.value = cmd.batteryLevel
-	}
-
-	def response_cmds  = []
-	if (!currentTemperature) {
-		response_cmds << zwave.sensorMultilevelV2.sensorMultilevelGet().format()
-		response_cmds << "delay 1000"
-	}
-	response_cmds << zwave.wakeUpV1.wakeUpNoMoreInformation().format()
-
-	return [createEvent(map), response(response_cmds)]
-}
-
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	log.debug "Unhandled: ${cmd.toString()}"
-	return [:]
-}
-
-def configure() {
-	state.configured = true
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-	delayBetween([
-		// Auto report time interval in minutes
-		zwave.configurationV1.configurationSet(parameterNumber: 5, size: 2, scaledConfigurationValue: 20).format(),
-
-		// Auto report lux change threshold
-		zwave.configurationV1.configurationSet(parameterNumber: 6, size: 2, scaledConfigurationValue: 30).format(),
-
-		// Get battery – report triggers WakeUpNMI
-		zwave.batteryV1.batteryGet().format()
-	]) 
-}
--- a/devicetypes/smartthings/everspring-st814.src/everspring-st814.groovy
+++ b/devicetypes/smartthings/everspring-st814.src/everspring-st814.groovy
@@ -1,188 +0,0 @@
-/**
- *  Copyright 2017 SmartThings
- *
- *  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.
- *
- *  Everspring ST814 Temperature/Humidity Sensor
- *
- *  Author: SmartThings
- *  Date: 2017-3-4
- */
-
-metadata {
-	definition (name: "Everspring ST814", namespace: "smartthings", author: "SmartThings") {
-		capability "Temperature Measurement"
-		capability "Relative Humidity Measurement"
-		capability "Battery"
-		capability "Configuration"
-		capability "Sensor"
-		capability "Health Check"
-
-		fingerprint mfr:"0060", prod:"0006", model:"0001"
-	}
-
-	simulator {
-		for( int i = 0; i <= 100; i += 20 ) {
-			status "temperature ${i}F": new physicalgraph.zwave.Zwave().sensorMultilevelV2.sensorMultilevelReport(
-				scaledSensorValue: i, precision: 1, sensorType: 1, scale: 1).incomingMessage()
-		}
-
-		for( int i = 0; i <= 100; i += 20 ) {
-			status "humidity ${i}%": new physicalgraph.zwave.Zwave().sensorMultilevelV2.sensorMultilevelReport(
-				scaledSensorValue: i, precision: 0, sensorType: 5).incomingMessage()
-		}
-
-		for( int i = 0; i <= 100; i += 20 ) {
-			status "battery ${i}%": new physicalgraph.zwave.Zwave().batteryV1.batteryReport(
-				batteryLevel: i).incomingMessage()
-		}
-		status "wakeup":  "command: 8407, payload: "
-	}
-
-	tiles(scale: 2) {
-		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
-			state "temperature", label:'${currentValue}°',
-			backgroundColors:[
-				[value: 32, color: "#153591"],
-				[value: 44, color: "#1e9cbb"],
-				[value: 59, color: "#90d2a7"],
-				[value: 74, color: "#44b621"],
-				[value: 84, color: "#f1d801"],
-				[value: 92, color: "#d04e00"],
-				[value: 98, color: "#bc2323"]
-			]
-		}
-		valueTile("humidity", "device.humidity", inactiveLabel: false, width: 2, height: 2) {
-			state "humidity", label:'${currentValue}% humidity', unit:""
-		}
-		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "battery", label:'${currentValue}% battery', unit:""
-		}
-
-		main( ["temperature", "humidity"] )
-		details( ["temperature", "humidity", "battery"] )
-	}
-}
-
-def updated() {
-	state.configured = false
-}
-
-def parse(String description) {
-	def result = []
-
-	def cmd = zwave.parse(description, [0x20: 1, 0x31: 2, 0x70: 1, 0x71: 1, 0x80: 1, 0x84: 2, 0x85: 2])
-
-	if (cmd) {
-		result = zwaveEvent(cmd)
-	}
-
-	if (result instanceof List) {
-		log.debug "Parsed '$description' to ${result.collect { it.respondsTo("toHubAction") ? it.toHubAction() : it }}"
-	} else {
-		log.debug "Parsed '$description' to ${result}"
-	}
-	return result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd) {
-	def result = [
-		createEvent(descriptionText: "${device.displayName} woke up", isStateChange: false)
-	]
-	if (state.configured) {
-		result << response(zwave.batteryV1.batteryGet())
-	} else {
-		result << response(configure())
-	}
-	return result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.alarmv1.AlarmReport cmd) {
-	if (cmd.alarmType == 1 && cmd.alarmType == 0xFF) {
-		return createEvent(descriptionText: "${device.displayName} battery is low", isStateChange: true)
-	} else if (cmd.alarmType == 2 && cmd.alarmLevel == 1) {
-		return createEvent(descriptionText: "${device.displayName} powered up", isStateChange: false)
-	}
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv2.SensorMultilevelReport cmd) {
-
-	def map = [:]
-	switch( cmd.sensorType ) {
-		case 1:
-			/* temperature */
-			def cmdScale = cmd.scale == 1 ? "F" : "C"
-			map.value = convertTemperatureIfNeeded(cmd.scaledSensorValue, cmdScale, cmd.precision)
-			map.unit = getTemperatureScale()
-			map.name = "temperature"
-			break
-		case 5:
-			/* humidity */
-			map.value = cmd.scaledSensorValue.toInteger().toString()
-			map.unit = "%"
-			map.name = "humidity"
-			break
-	}
-	
-	return createEvent(map)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
-	def map = [ name: "battery", unit: "%" ]
-	if (cmd.batteryLevel == 0xFF) {
-		map.value = 1
-		map.descriptionText = "${device.displayName} has a low battery"
-		map.isStateChange = true
-	} else {
-		map.value = cmd.batteryLevel
-	}
-
-	def response_cmds  = []
-	if (!currentTemperature) {
-		response_cmds << zwave.sensorMultilevelV2.sensorMultilevelGet().format()
-		response_cmds << "delay 1000"
-	}
-	response_cmds << zwave.wakeUpV1.wakeUpNoMoreInformation().format()
-
-	return [createEvent(map), response(response_cmds)]
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.multichannelv3.MultiChannelCmdEncap cmd) {
-	def result = null
-	def encapsulatedCommand = cmd.encapsulatedCommand([0x20: 1, 0x31: 2, 0x70: 1, 0x71: 1, 0x80: 1, 0x84: 2, 0x85: 2])
-	log.debug ("Command from endpoint ${cmd.sourceEndPoint}: ${encapsulatedCommand}")
-	if (encapsulatedCommand) {
-		result = zwaveEvent(encapsulatedCommand)
-	}
-	result
-}
-
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	log.debug "Unhandled: ${cmd.toString()}"
-	return [:]
-}
-
-def configure() {
-	state.configured = true
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-	delayBetween([
-		// Auto report time interval in minutes
-		zwave.configurationV1.configurationSet(parameterNumber: 6, size: 2, scaledConfigurationValue: 20).format(),
-
-		// Auto report temperature change threshold
-		zwave.configurationV1.configurationSet(parameterNumber: 7, size: 1, scaledConfigurationValue: 2).format(),
-
-		// Auto report humidity change threshold
-		zwave.configurationV1.configurationSet(parameterNumber: 8, size: 1, scaledConfigurationValue: 5).format(),
-
-		// Get battery – report triggers WakeUpNMI
-		zwave.batteryV1.batteryGet().format()
-	]) 
-}
--- a/devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy
+++ b/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)
-    }
-    if(value.saturation) {
-        sendEvent(name: "saturation", value: value.saturation, displayed: false)
-    }
-    if(value.hex?.trim()) {
-        sendEvent(name: "color", value: value.hex, displayed: false)
-    }
-    if (value.level) {
-        sendEvent(name: "level", value: value.level)
-    }
-    if (value.switch?.trim()) {
-        sendEvent(name: "switch", value: value.switch)
-    }
+	sendEvent(name: "hue", value: value.hue, displayed: false)
+	sendEvent(name: "saturation", value: value.saturation, displayed: false)
+	sendEvent(name: "color", value: value.hex, displayed: false)
+	if (value.level) {
+		sendEvent(name: "level", value: value.level)
+	}
+	if (value.switch) {
+		sendEvent(name: "switch", value: value.switch)
+	}

    sendRGB(value.rh, value.gh, value.bh)
 }
--- a/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy
+++ b/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){
-			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
+		multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){
+			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"
-		details(["contact","refresh"])
+		main "valve"
+		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.switchBinaryGet().format()
-	], 500)
+	zwave.switchBinaryV1.switchBinarySet(switchValue: 0x00).format()
 }

 def close() {
-	delayBetween([
-		zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF).format(),
-		zwave.switchBinaryV1.switchBinaryGet().format()
-	], 500)
+	zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF).format()
 }

 /**
@@ -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
 }
--- a/devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy
+++ b/devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy
@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
 *  Hue Bloom
 *
--- a/devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy
+++ b/devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy
@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
 *  Hue Bridge
 *
--- a/devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy
+++ b/devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy
@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
 *  Hue Bulb
 *
--- a/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy
+++ b/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy
@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
 *  Hue Lux Bulb
 *
--- a/devicetypes/smartthings/hue-white-ambiance-bulb.src/hue-white-ambiance-bulb.groovy
+++ b/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
 *
--- a/devicetypes/smartthings/smartalert-siren.src/smartalert-siren.groovy
+++ b/devicetypes/smartthings/smartalert-siren.src/smartalert-siren.groovy
@@ -16,7 +16,7 @@
 *  Date: 2013-03-05
 */
 metadata {
-	definition (name: "SmartAlert Siren", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.smoke") {
+	definition (name: "SmartAlert Siren", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.smokedetector") {
 		capability "Actuator"
 		capability "Switch"
 		capability "Sensor"
--- a/devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy
+++ b/devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy
@@ -29,7 +29,6 @@ metadata {
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3200", deviceJoinName: "Outlet"
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3200-Sgb", deviceJoinName: "Outlet"
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "4257050-RZHAC", deviceJoinName: "Outlet"
-		fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 000F, 0B04", outClusters: "0019", manufacturer: "SmartThings", model: "outletv4", deviceJoinName: "Outlet"
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019"
 	}

--- a/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
@@ -178,7 +178,7 @@ private List<Map> handleAcceleration(descMap) {
 			result += parseAxis(descMap.additionalAttrs)
 		}
 	} else if (descMap.clusterInt == 0xFC02 && descMap.attrInt == 0x0012) {
-		def addAttrs = descMap.additionalAttrs ?: []
+		def addAttrs = descMap.additionalAttrs
 		addAttrs << ["attrInt": descMap.attrInt, "value": descMap.value]
 		result += parseAxis(addAttrs)
 	}
--- a/devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy
+++ b/devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy
@@ -49,6 +49,6 @@ def arrived() {


 def departed() {
-	log.trace "Executing 'departed'"
+	log.trace "Executing 'arrived'"
 	sendEvent(name: "presence", value: "not present")
 }
--- a/devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy
+++ b/devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy
@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
 *  Copyright 2015 SmartThings
 *
--- a/devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy
+++ b/devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy
@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
 *  Copyright 2015 SmartThings
 *
--- a/devicetypes/smartthings/wemo-switch.src/wemo-switch.groovy
+++ b/devicetypes/smartthings/wemo-switch.src/wemo-switch.groovy
@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
 *  Copyright 2015 SmartThings
 *
--- a/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
+++ b/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)
-        if (descMap && descMap.clusterInt == 0x0006 && descMap.commandInt == 0x07) {
-            if (descMap.data[0] == "00") {
+    }
+    else {
+        def cluster = zigbee.parse(description)
+
+        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.
-            // 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 {
+        }
+        else {
            log.warn "DID NOT PARSE MESSAGE for description : $description"
-            log.debug "${descMap}"
+            log.debug "${cluster}"
        }
    }
 }
--- a/devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy
+++ b/devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy
@@ -103,12 +103,12 @@ def parse(String description) {

        if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
            if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
-                state.hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
-                runIn(5, updateColor, [overwrite: true])
+                def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
+                sendEvent(name: "hue", value: hueValue, descriptionText: "Color has changed")
            }
            else if(zigbeeMap.attrInt == ATTRIBUTE_SATURATION){ //Saturation Attribute
-                state.saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
-                runIn(5, updateColor, [overwrite: true])
+                def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
+                sendEvent(name: "saturation", value: saturationValue, descriptionText: "Color has changed", displayed: false)
            }
        }
        else if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
@@ -127,11 +127,6 @@ def parse(String description) {
    }
 }

-def updateColor() {
-	sendEvent(name: "hue", value: state.hueValue, descriptionText: "Color has changed")
-	sendEvent(name: "saturation", value: state.saturationValue, descriptionText: "Color has changed", displayed: false)
-}
-
 def on() {
    zigbee.on()
 }
@@ -209,9 +204,9 @@ def setColor(value){
    log.trace "setColor($value)"
    zigbee.on() +
    zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_HUE_AND_SATURATION_COMMAND,
-    getScaledHue(value.hue), getScaledSaturation(value.saturation), "0000") +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE)
+        getScaledHue(value.hue), getScaledSaturation(value.saturation), "0000") +
+    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
+    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }

 def setHue(value) {
--- a/devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy
+++ b/devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy
@@ -27,6 +27,7 @@ metadata {
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702, 0B05", outClusters: "0003, 000A, 0019", manufacturer: "Jasco Products", model: "45853", deviceJoinName: "GE ZigBee Plug-In Switch"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702, 0B05", outClusters: "000A, 0019", manufacturer: "Jasco Products", model: "45856", deviceJoinName: "GE ZigBee In-Wall Switch"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 000F, 0B04", outClusters: "0019", manufacturer: "SmartThings", model: "outletv4", deviceJoinName: "Outlet"
    }

    tiles(scale: 2) {
--- a/devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy
+++ b/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){
-            tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
+        multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){
+            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"])
-        details(["contact", "battery", "refresh"])
+        main(["valve"])
+        details(["valve", "battery", "refresh"])
    }
 }

--- a/devicetypes/smartthings/zwave-device-multichannel.src/zwave-device-multichannel.groovy
+++ b/devicetypes/smartthings/zwave-device-multichannel.src/zwave-device-multichannel.groovy
@@ -75,10 +75,6 @@ def parse(String description) {
 	return result
 }

-def uninstalled() {
-	sendEvent(name: "epEvent", value: "delete all", isStateChange: true, displayed: false, descriptionText: "Delete endpoint devices")
-}
-
 def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd) {
 	[ createEvent(descriptionText: "${device.displayName} woke up", isStateChange:true),
 	  response(["delay 2000", zwave.wakeUpV1.wakeUpNoMoreInformation().format()]) ]
--- a/devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy
+++ b/devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy
@@ -88,20 +88,11 @@ def updated(){
 	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 }

-def getCommandClassVersions() {
-	[
-		0x20: 1,  // Basic
-		0x26: 1,  // SwitchMultilevel
-		0x56: 1,  // Crc16Encap
-		0x70: 1,  // Configuration
-	]
-}
-
 def parse(String description) {
 	def result = null
 	if (description != "updated") {
 		log.debug "parse() >> zwave.parse($description)"
-		def cmd = zwave.parse(description, commandClassVersions)
+		def cmd = zwave.parse(description, [0x20: 1, 0x26: 1, 0x70: 1])
 		if (cmd) {
 			result = zwaveEvent(cmd)
 		}
@@ -168,16 +159,6 @@ def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv1.SwitchMultilevelS
 	[createEvent(name:"switch", value:"on"), response(zwave.switchMultilevelV1.switchMultilevelGet().format())]
 }

-def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
-	def versions = commandClassVersions
-	def version = versions[cmd.commandClass as Integer]
-	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
-	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand)
-	}
-}
-
 def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	// Handles all Z-Wave commands we aren't interested in
 	[:]
--- a/devicetypes/smartthings/zwave-door-window-sensor.src/zwave-door-window-sensor.groovy
+++ b/devicetypes/smartthings/zwave-door-window-sensor.src/zwave-door-window-sensor.groovy
@@ -113,9 +113,9 @@ def updated() {

 def configure() {
 	commands([
-		zwave.sensorBinaryV2.sensorBinaryGet(sensorType: zwave.sensorBinaryV2.SENSOR_TYPE_DOOR_WINDOW),
-		zwave.manufacturerSpecificV2.manufacturerSpecificGet()
-	], 1000)
+		zwave.manufacturerSpecificV2.manufacturerSpecificGet(),
+		zwave.batteryV1.batteryGet()
+	], 6000)
 }

 def sensorValueEvent(value) {
@@ -190,17 +190,11 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd)
 		cmds << command(zwave.manufacturerSpecificV2.manufacturerSpecificGet())
 		cmds << "delay 1200"
 	}
-
-	if (device.currentValue("contact") == null) { // Incase our initial request didn't make it
-		cmds << command(zwave.sensorBinaryV2.sensorBinaryGet(sensorType: zwave.sensorBinaryV2.SENSOR_TYPE_DOOR_WINDOW))
-	}
-
 	if (!state.lastbat || now() - state.lastbat > 53*60*60*1000) {
 		cmds << command(zwave.batteryV1.batteryGet())
-	} else { // If we check the battery state we will send NoMoreInfo in the handler for BatteryReport so that we definitely get the report
+	} else {
 		cmds << zwave.wakeUpV1.wakeUpNoMoreInformation().format()
 	}
-
 	[event, response(cmds)]
 }

--- a/devicetypes/smartthings/zwave-lock.src/zwave-lock.groovy
+++ b/devicetypes/smartthings/zwave-lock.src/zwave-lock.groovy
@@ -86,13 +86,13 @@ import physicalgraph.zwave.commands.doorlockv1.*
 import physicalgraph.zwave.commands.usercodev1.*

 def installed() {
-	// Device-Watch pings if no device events received for 1 hour (checkInterval)
-	sendEvent(name: "checkInterval", value: 1 * 60 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	// Device-Watch simply pings if no device events received for 32min(checkInterval)
+	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 }

 def updated() {
-	// Device-Watch pings if no device events received for 1 hour (checkInterval)
-	sendEvent(name: "checkInterval", value: 1 * 60 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	// Device-Watch simply pings if no device events received for 32min(checkInterval)
+	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 	try {
 		if (!state.init) {
 			state.init = true
@@ -152,10 +152,6 @@ def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityCommandsSupported

 def zwaveEvent(DoorLockOperationReport cmd) {
 	def result = []
-
-	unschedule("followupStateCheck")
-	unschedule("stateCheck")
-
 	def map = [ name: "lock" ]
 	if (cmd.doorLockMode == 0xFF) {
 		map.value = "locked"
@@ -369,7 +365,7 @@ def zwaveEvent(UserCodeReport cmd) {
 			code = state["set$name"] ?: decrypt(state[name]) ?: "****"
 			state.remove("set$name".toString())
 		} else {
-			map = [ name: "codeReport", value: cmd.userIdentifier, data: [ code: code ], isStateChange: true ]
+			map = [ name: "codeReport", value: cmd.userIdentifier, data: [ code: code ] ]
 			map.descriptionText = "$device.displayName code $cmd.userIdentifier is set"
 			map.displayed = (cmd.userIdentifier != state.requestCode && cmd.userIdentifier != state.pollCode)
 			map.isStateChange = true
@@ -460,12 +456,11 @@ def zwaveEvent(physicalgraph.zwave.commands.timev1.TimeGet cmd) {
 def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd) {
 	// The old Schlage locks use group 1 for basic control - we don't want that, so unsubscribe from group 1
 	def result = [ createEvent(name: "lock", value: cmd.value ? "unlocked" : "locked") ]
-	def cmds = [
-			zwave.associationV1.associationRemove(groupingIdentifier:1, nodeId:zwaveHubNodeId).format(),
-			"delay 1200",
-			zwave.associationV1.associationGet(groupingIdentifier:2).format()
-	]
-	[result, response(cmds)]
+	result << response(zwave.associationV1.associationRemove(groupingIdentifier:1, nodeId:zwaveHubNodeId))
+	if (state.assoc != zwaveHubNodeId) {
+		result << response(zwave.associationV1.associationGet(groupingIdentifier:2))
+	}
+	result
 }

 def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
@@ -535,18 +530,11 @@ def unlockwtimeout() {
 	lockAndCheck(DoorLockOperationSet.DOOR_LOCK_MODE_DOOR_UNSECURED_WITH_TIMEOUT)
 }

+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
 def ping() {
-	runIn(30, followupStateCheck)
-	secure(zwave.doorLockV1.doorLockOperationGet())
-}
-
-def followupStateCheck() {
-	runEvery1Hour(stateCheck)
-	stateCheck()
-}
-
-def stateCheck() {
-	sendHubCommand(new physicalgraph.device.HubAction(secure(zwave.doorLockV1.doorLockOperationGet())))
+	refresh()
 }

 def refresh() {
--- a/devicetypes/smartthings/zwave-metering-dimmer.src/zwave-metering-dimmer.groovy
+++ b/devicetypes/smartthings/zwave-metering-dimmer.src/zwave-metering-dimmer.groovy
@@ -85,21 +85,11 @@ metadata {
 	details(["switch", "power", "energy", "levelSliderControl", "refresh", "reset"])
 }

-def getCommandClassVersions() {
-	[
-		0x20: 1,  // Basic
-		0x26: 3,  // SwitchMultilevel
-		0x56: 1,  // Crc16Encap
-		0x70: 1,  // Configuration
-		0x32: 3,  // Meter
-	]
-}
-
 // parse events into attributes
 def parse(String description) {
 	def result = null
 	if (description != "updated") {
-		def cmd = zwave.parse(description, commandClassVersions)
+		def cmd = zwave.parse(description, [0x20: 1, 0x26: 3, 0x70: 1, 0x32:3])
 		if (cmd) {
 			result = zwaveEvent(cmd)
 	        log.debug("'$description' parsed to $result")
@@ -134,21 +124,6 @@ def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv3.SwitchMultilevelR
 	dimmerEvents(cmd)
 }

-def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
-	def versions = commandClassVersions
-	def version = versions[cmd.commandClass as Integer]
-	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
-	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand)
-	}
-}
-
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	// Handles all Z-Wave commands we aren't interested in
-	[:]
-}
-
 def dimmerEvents(physicalgraph.zwave.Command cmd) {
 	def result = []
 	def value = (cmd.value ? "on" : "off")
--- a/devicetypes/smartthings/zwave-metering-switch.src/zwave-metering-switch.groovy
+++ b/devicetypes/smartthings/zwave-metering-switch.src/zwave-metering-switch.groovy
@@ -89,19 +89,10 @@ def updated() {
 	} catch (e) { log.debug e }
 }

-def getCommandClassVersions() {
-	[
-		0x20: 1,  // Basic
-		0x32: 1,  // SwitchMultilevel
-		0x56: 1,  // Crc16Encap
-		0x72: 2,  // ManufacturerSpecific
-	]
-}
-
 def parse(String description) {
 	def result = null
 	if(description == "updated") return
-	def cmd = zwave.parse(description, commandClassVersions)
+	def cmd = zwave.parse(description, [0x20: 1, 0x32: 1, 0x72: 2])
 	if (cmd) {
 		result = zwaveEvent(cmd)
 	}
@@ -166,16 +157,6 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
 	result
 }

-def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
-	def versions = commandClassVersions
-	def version = versions[cmd.commandClass as Integer]
-	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
-	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand)
-	}
-}
-
 def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	log.debug "$device.displayName: Unhandled: $cmd"
 	[:]
--- a/devicetypes/smartthings/zwave-siren.src/zwave-siren.groovy
+++ b/devicetypes/smartthings/zwave-siren.src/zwave-siren.groovy
@@ -16,7 +16,7 @@
 *  Date: 2014-07-15
 */
 metadata {
-	definition (name: "Z-Wave Siren", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.smoke") {
+	definition (name: "Z-Wave Siren", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
        capability "Alarm"
        capability "Battery"
--- a/devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy
+++ b/devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy
@@ -71,17 +71,9 @@ def updated(){
 	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 }

-def getCommandClassVersions() {
-	[
-		0x20: 1,  // Basic
-		0x56: 1,  // Crc16Encap
-		0x70: 1,  // Configuration
-	]
-}
-
 def parse(String description) {
 	def result = null
-	def cmd = zwave.parse(description, commandClassVersions)
+	def cmd = zwave.parse(description, [0x20: 1, 0x70: 1])
 	if (cmd) {
 		result = createEvent(zwaveEvent(cmd))
 	}
@@ -128,15 +120,6 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
 	createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
 }

-def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
-	def versions = commandClassVersions
-	def version = versions[cmd.commandClass as Integer]
-	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
-	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand)
-	}
-}

 def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	// Handles all Z-Wave commands we aren't interested in
--- a/devicetypes/smartthings/zwave-switch.src/zwave-switch.groovy
+++ b/devicetypes/smartthings/zwave-switch.src/zwave-switch.groovy
@@ -89,17 +89,9 @@ def updated(){
    }
 }

-def getCommandClassVersions() {
-	[
-		0x20: 1,  // Basic
-		0x56: 1,  // Crc16Encap
-		0x70: 1,  // Configuration
-	]
-}
-
 def parse(String description) {
 	def result = null
-	def cmd = zwave.parse(description, commandClassVersions)
+	def cmd = zwave.parse(description, [0x20: 1, 0x70: 1])
 	if (cmd) {
 		result = createEvent(zwaveEvent(cmd))
 	}
@@ -146,16 +138,6 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
 	createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
 }

-def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
-	def versions = commandClassVersions
-	def version = versions[cmd.commandClass as Integer]
-	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
-	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand)
-	}
-}
-

 def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	// Handles all Z-Wave commands we aren't interested in
--- a/smartapps/bd/zwave-thermostat-manager.src/zwave-thermostat-manager.groovy
+++ b/smartapps/bd/zwave-thermostat-manager.src/zwave-thermostat-manager.groovy
@@ -0,0 +1,794 @@
+/**
+ *  Zwave Thermostat Manager
+ * 
+ * Credits and Kudos: 	this app is largely based on the more popular Thermostat Director SA by Tim Slagle - 
+ * 						many thanks to @slagle for his continued support. 
+ * 						Without his brilliance, this app would not exist!
+ * 
+ * 
+ *  Copyright 2015 SmartThings
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ */
+ 
+definition(
+	name: "ZWave Thermostat Manager",
+	namespace: "BD",
+	author: "Bobby Dobrescu",
+	description: "Adjust zwave thermostats based on a temperature range of a specific temperature sensor",
+	category: "My apps",
+	iconUrl: "http://icons.iconarchive.com/icons/icons8/windows-8/512/Science-Temperature-icon.png",
+	iconX2Url: "http://icons.iconarchive.com/icons/icons8/windows-8/512/Science-Temperature-icon.png"
+)
+
+preferences {
+    page name:"pageSetup"
+    page name:"TemperatureSettings"
+    page name:"ThermostatandDoors"
+    page name:"ThermostatAway"
+    page name:"Settings"
+
+}
+
+// Show setup page
+def pageSetup() {
+
+    def pageProperties = [
+        name:       "pageSetup",
+        title:      "",
+        nextPage:   null,
+        install:    true,
+        uninstall:  true
+    ]
+
+	return dynamicPage(pageProperties) {
+        section("General Settings") {
+            href "TemperatureSettings", title: "Ambiance", description: "", state:greyedOut()
+            href "ThermostatandDoors", title: "Disabled Mode", description: "", state: greyedOutTherm()
+            href "ThermostatAway", title: "Away Mode", description: "", state: greyedOutTherm2()
+			href "Settings", title: "Other Settings", description: "", state: greyedOutSettings()
+         }
+        section([title:"Options", mobileOnly:true]) {
+            label title:"Assign a name", required:false       
+        }
+    }
+}
+
+// Page - Temperature Settings	
+def TemperatureSettings() {
+
+    def sensor = [
+        name:       "sensor",
+        type:       "capability.temperatureMeasurement",
+        title:      "Which Temperature Sensor(s)?",
+        multiple:   true,
+        required:   false
+    ]
+    def thermostat = [
+        name:       "thermostat",
+        type:       "capability.thermostat",
+        title:      "Which Thermostat?",
+        multiple:   false,
+        required:   true
+    ]
+    def setLow = [
+        name:       "setLow",
+        type:       "number",
+        title:      "Low temp?",
+        required:   true
+    ]
+    
+    def cold = [
+        name:       "cold",
+        type:       "enum",
+        title:		"Mode?",
+    	required:   false,
+		metadata:   [values:["auto", "heat", "cool", "off"]]
+
+    ]
+
+    def SetHeatingLow = [
+        name:       "SetHeatingLow",
+        type:       "number",
+        title:		"Heating Temperature (degrees)",
+        required:   true
+    ]
+    
+     def SetCoolingLow = [
+        name:       "SetCoolingLow",
+        type:       "number",
+        title:		"Cooling Temperature (degrees)",
+        required:   false
+    ]   
+    
+    def setHigh = [
+        name:       "setHigh",
+        type:       "number",
+        title:      "High temp?",
+        required:   true
+    ]
+    
+    def hot = [
+        name:       "hot",
+        type:       "enum",
+        title:		"Mode?",
+        required:   false,
+        metadata:   [values:["auto", "heat", "cool", "off"]]
+    ]
+    
+    def SetHeatingHigh = [
+        name:       "SetHeatingHigh",
+        type:       "number",
+        title:		"Heating Temperature (degrees)",
+        required:   false
+    ]
+    
+     def SetCoolingHigh = [
+        name:       "SetCoolingHigh",
+        type:       "number",
+        title:		"Cooling Temperature (degrees)",
+        required:   true
+    ] 
+  
+    def pageName = "Ambiance"
+    
+    def pageProperties = [
+        name:       "TemperatureSettings",
+        title:      "",
+        //nextPage:   "ThermostatandDoors"
+    ]
+    
+    return dynamicPage(pageProperties) {
+        section("Select the main thermostat") {
+			input thermostat
+		}
+        section("Use remote sensors to adjust the thermostat (by default the app is using the internal sensor of the thermostat)") {
+			input "remoteSensors", "bool", title: "Enable remote sensor(s)", required: false, defaultValue: false, submitOnChange: true
+			if (remoteSensors) {
+            	input sensor 
+            	paragraph "If multiple sensors are selected, the average temperature is automatically calculated"	
+			}
+        }
+		section("When the temperature falls below this temperature (Low Temperature)..."){
+			input setLow
+		}
+        section("Adjust the thermostat to the following settings:"){
+			input cold
+            input SetHeatingLow
+            input SetCoolingLow
+		}
+        section("When the temperature raises above this temperature (High Temperature)..."){
+			input setHigh
+		}
+        section("Adjust the thermostat to the following settings:"){
+			input hot
+            input SetCoolingHigh
+            input SetHeatingHigh
+		}
+        section("When temperature is neutral (between above Low and High Temperatures..."){
+			input "neutral", "bool", title: "Turn off the thermostat", required: false, defaultValue: false
+		}
+    }  
+}
+
+// Page - Disabled Mode
+def ThermostatandDoors() {
+  
+    def doors = [
+        name:       "doors",
+        type:       "capability.contactSensor",
+        title:      "Which Sensor(s)?",
+        multiple:	true,
+        required:   false
+    ]
+    
+    def turnOffDelay = [
+        name:       "turnOffDelay",
+        type:       "decimal",
+        title:		"Number of minutes",
+        required:	false
+    ]
+    
+    def resetOff = [
+        name:       "resetOff",
+        type:       "bool",
+        title:		"Reset Thermostat Settings when all Sensor(s) are closed",
+        required:	false,
+        defaultValue: false
+    ]
+       
+    def pageName = "Thermostat and Doors"
+    
+    def pageProperties = [
+        name:       "ThermostatandDoors",
+        title:      "",
+        //nextPage:   "ThermostatAway"
+    ]
+
+    return dynamicPage(pageProperties) {
+        section("When one or more contact sensors open, then turn off the thermostat") {
+			input doors
+		}
+		section("Wait this long before turning the thermostat off (defaults to 1 minute)") {
+			input turnOffDelay
+            input resetOff 
+		}
+    }
+    
+}
+
+// Page - Thermostat Away
+def ThermostatAway() {
+
+    def modes2 = [
+        name:		"modes2", 
+        type:		"mode", 
+        title: 		"Which Location Mode(s)?", 
+        multiple: 	true, 
+        required: 	false
+    ]
+    
+    def away = [
+        name:       "away",
+        type:       "enum",
+        title:		"Mode?",
+        metadata:   [values:["auto", "heat", "cool", "off"]], 
+        required: 	false
+    ]
+
+    def setAwayLow = [
+        name:       "setAwayLow",
+        type:       "decimal",
+        title:      "Low temp?",
+        required:   false
+    ]
+    
+    def AwayCold = [
+        name:       "AwayCold",
+        type:       "enum",
+        title:		"Mode?",
+        metadata:   [values:["auto", "heat", "cool", "off"]],
+        required: 	false,
+    ]
+    
+    def setAwayHigh = [
+        name:       "setAwayHigh",
+        type:       "decimal",
+        title:      "High temp?",
+		required:   false
+    ]
+    
+    def AwayHot = [
+        name:       "AwayHot",
+        type:       "enum",
+        title:		"Mode?",
+        required: 	false,
+metadata:   [values:["auto", "heat", "cool", "off"]]
+    ]
+    
+    def SetHeatingAway = [
+        name:       "SetHeatingAway",
+        type:       "number",
+        title:		"Heating Temperature (degrees)",
+        required: 	false
+    ]   
+    
+    def SetCoolingAway = [
+        name:       "SetCoolingAway",
+        type:       "number",
+        title:		"Cooling Temperature (degrees)",
+        required: 	false
+    ]     
+    
+    def fanAway = [
+        name:       "fanAway",
+        type:       "enum",
+        title:		"Fan Mode?",
+        metadata:   [values:["fanAuto", "fanOn", "fanCirculate"]],
+        required: 	false
+    ]
+
+    def pageName = "Thermostat Away"
+    
+    def pageProperties = [
+        name:       "ThermostatAway",
+        title:      "",
+        //nextPage:   "Settings"
+    ]
+
+    return dynamicPage(pageProperties) {
+		
+        section("When the Location Mode changes to 'Away'") {
+   			input modes2
+        }
+           
+        section("Adjust the thermostat to the following settings:") {
+    		input away
+            input fanAway                        
+            input SetHeatingAway
+			input SetCoolingAway
+  		}	
+        section("If the temperature falls below this temperature while away..."){
+			input setAwayLow
+		}
+        
+        section("Automatically adjust the thermostat to the following operating mode..."){
+			input AwayCold
+		}
+        
+        section("If the temperature raises above this temperature while away..."){
+			input setAwayHigh
+    	}
+        section("Automatically adjust the thermostat to the following operating mode..."){
+			input AwayHot
+    	} 
+	 }
+}
+
+// Show "Setup" page
+def Settings() {
+ 
+    def days = [
+        name:       "days",
+        type:       "enum",
+        title:      "Only on certain days of the week",
+        multiple:   true,
+        required:   false,
+        options: 	["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
+    ]
+    
+    def modes = [
+        name:		"modes", 
+        type:		"mode", 
+        title: 		"Only when mode is", 
+        multiple: 	true, 
+        required: 	false
+    ]
+    
+    def pageName = ""
+    
+    def pageProperties = [
+        name:       "Settings",
+        title:      "",
+        //nextPage:   "pageSetup"
+    ]
+
+    return dynamicPage(pageProperties) {    
+        
+        section("Notifications") {
+            input("recipients", "contact", title: "Send notifications to", multiple: true, required: false) {
+            paragraph 	"You may enter multiple phone numbers separated by semicolon."+
+           				"E.G. 8045551122;8046663344"
+            input "sms", "phone", title: "To this phone", multiple: false, required: false
+            input "push", "bool", title: "Send Push Notification (optional)", required: false, defaultValue: false
+            }
+ }       
+        section(title: "Restrictions", hideable: true) {
+			href "timeIntervalInput", title: "Only during a certain time", description: getTimeLabel(starting, ending), state: greyedOutTime(starting, ending), refreshAfterSelection:true
+			input days
+			input modes
+        }
+		section(title: "Debug") {     
+        	input "debug", "bool", title: "Enable debug messages in IDE for troubleshooting purposes", required: false, defaultValue: false, refreshAfterSelection:true
+        	input "info", "bool", title: "Enable info messages in IDE to display actions in Live Logging", required: false, defaultValue: false, refreshAfterSelection:true
+        }    
+    }
+    
+}
+
+def installed(){
+	if (debug) log.debug "Installed called with $settings"
+	init()
+}
+
+def updated(){
+		if (debug) log.debug "Updated called with $settings"
+	unsubscribe()
+	init()
+}
+
+def init(){
+	state.lastStatus = null
+    runIn(60, "temperatureHandler")
+    	if (debug) log.debug "Temperature will be evaluated in one minute"
+     	if(sensor) {
+        	subscribe(sensor, "temperature", temperatureHandler)
+        }
+        else {
+        	subscribe(thermostat, "temperature", temperatureHandler)
+    	}
+    if(modes2){
+    	subscribe(location, modeAwayChange)
+        	if(sensor) {
+            	subscribe(sensor, "temperature", modeAwayTempHandler)
+            }
+            else {
+        		subscribe(thermostat, "temperature", modeAwayTempHandler)
+           	}
+    
+    }
+    if(doors){
+            subscribe(doors, "contact.open", temperatureHandler)
+            subscribe(doors, "contact.closed", doorCheck)
+            state.disabledTemp = null
+    		state.disabledMode = null
+    		state.disableHSP = null 
+    		state.disableCSP = null
+	}
+}
+
+def temperatureHandler(evt) {
+    
+    def currentTemp
+    if(modeOk && daysOk && timeOk && modeNotAwayOk)  {
+    		
+            if(sensor){
+            	//def sensors = sensor.size()
+            	//def tempAVG = sensor ? getAverage(sensor, "temperature") : "undefined device"
+            	//currentTemp = tempAVG
+            	currentTemp = sensor.latestValue("temperature")
+		 if (debug) log.debug "Data check (avg temp: ${currentTemp}, num of sensors:${sensors}, app status: ${lastStatus})"
+            }
+            else {
+            	currentTemp = thermostat.latestValue("temperature")
+                 if (debug) log.debug "Thermostat data (curr temp: ${currentTemp},status: ${lastStatus}"
+            }        
+            if(setLow > setHigh){
+                def temp = setLow
+                	setLow = setHigh
+                	setHigh = temp
+                if(info) log.info "Detected ${setLow} >  ${setHigh}. Auto-adjusting setting to  ${temp}"
+            }         
+            if (doorsOk) {
+           		def currentMode = thermostat.latestValue("thermostatMode")
+                def currentHSP = thermostat.latestValue("heatingSetpoint") 
+                def currentCSP = thermostat.latestValue("coolingSetpoint") 	
+                	if (debug) log.debug "App data (curr temp: ${currentTemp},curr mode: ${currentMode}, currentHSP: ${currentHSP},"+
+                    						" currentCSP: ${currentCSP}, last status: ${lastStatus}"
+                
+                if (currentTemp < setLow) {
+                    if (state.lastStatus == "one" || state.lastStatus == "two" || state.lastStatus == "three" || state.lastStatus == null){
+                        state.lastStatus = "one" 
+                         if (currentMode == "cool" || currentMode == "off") {
+                     		def msg = "Adjusting ${thermostat} operating mode and setpoints because temperature is below ${setLow}"
+                           	if (cold) thermostat?."${cold}"()
+                           	thermostat?.setHeatingSetpoint(SetHeatingLow)
+                           	if (SetCoolingLow) thermostat?.setCoolingSetpoint(SetCoolingLow)
+                           	thermostat?.poll()
+                           	sendMessage(msg)
+                         		if (info) log.info msg
+                        }
+                     	else if  (currentHSP < SetHeatingLow) {
+                            def msg = "Adjusting ${thermostat} setpoints because temperature is below ${setLow}"
+                     		thermostat?.setHeatingSetpoint(SetHeatingLow)
+                     		if (SetCoolingLow) thermostat?.setCoolingSetpoint(SetCoolingLow)
+                            thermostat?.poll()
+                            sendMessage(msg)
+                        		if (info) log.info msg
+                        }
+                    }
+                }                                     
+                if (currentTemp > setHigh) {
+                    if (state.lastStatus == "one" || state.lastStatus == "two" || state.lastStatus == "three" || state.lastStatus == null){
+                        state.lastStatus = "two"
+						if (currentMode == "heat" || currentMode == "off") {
+                            def msg = "Adjusting ${thermostat} operating mode and setpoints because temperature is above ${setHigh}"
+                        	if (hot) thermostat?."${hot}"()
+                        	if (SetHeatingHigh) thermostat?.setHeatingSetpoint(SetHeatingHigh)
+                        	thermostat?.setCoolingSetpoint(SetCoolingHigh)
+                        	thermostat?.poll()
+                        	sendMessage(msg)
+                            	if (info) log.info msg
+                        }
+                        else if (currentCSP > SetCoolingHigh) {
+                            def msg = "Adjusting ${thermostat} setpoints because temperature is above ${setHigh}"
+                    		thermostat?.setCoolingSetpoint(SetCoolingHigh)
+                     		if (SetHeatingHigh) thermostat?.setHeatingSetpoint(SetHeatingHigh)
+                            thermostat?.poll()
+                            sendMessage(msg)   
+                            	if (info) log.info msg
+                       	}
+                   }     
+                }    
+                if (currentTemp > setLow && currentTemp < setHigh) {
+                        if (neutral == true) {
+                            if (debug) log.debug "Neutral is ${neutral}, current temp is: ${currentTemp}"
+                            if (state.lastStatus == "two" || state.lastStatus == "one" || state.lastStatus == null){
+                                def msg = "Adjusting ${thermostat} mode to off because temperature is neutral"
+                                    thermostat?.off()
+                                    thermostat?.poll()
+									sendMessage(msg)
+                                    state.lastStatus = "three"
+                                        if (info) log.info msg
+                                        if (debug) log.debug "Data check neutral(neutral is:${neutral}, currTemp: ${currentTemp}, setLow: ${setLow}, setHigh: ${setHigh})"
+                            }
+                       }
+                						if (info) log.info "Temperature is neutral not taking action because neutral mode is: ${neutral}"      
+                }
+            }
+            else{
+                def delay = (turnOffDelay != null && turnOffDelay != "") ? turnOffDelay * 60 : 60
+               		if(info) log.info ("Detected open doors.  Checking door states again in ${delay} seconds")
+                runIn(delay, "doorCheck")
+            }
+	}
+    	if (debug) log.debug "Temperature handler called: modeOk = $modeOk, daysOk = $daysOk, timeOk = $timeOk, modeNotAwayOk = $modeNotAwayOk "
+}
+
+def modeAwayChange(evt){ 
+	if(modeOk && daysOk && timeOk){
+    	if (modes2){
+            if(modes2.contains(location.mode)){
+                    state.lastStatus = "away"
+                    if (away) thermostat."${away}"()             
+                    if(SetHeatingAway) thermostat.setHeatingSetpoint(SetHeatingAway)
+                    if(SetCoolingAway) thermostat.setCoolingSetpoint(SetCoolingAway)
+                    if(fanAway) thermostat.setThermostatFanMode(fanAway)
+                    def msg = "Adjusting ${thermostat} mode and setpoints because Location Mode is set to Away"   
+                    sendMessage(msg) 
+                    if(info) log.info "Running AwayChange because mode is now ${away} and last staus is ${lastStatus}"
+            }
+            else  {
+        			state.lastStatus = null
+                    temperatureHandler()
+                    if(info) log.info "Running Temperature Handler because Home Mode is no longer in away, and the last staus is ${lastStatus}"
+			}
+     	}
+					if(info) log.info ("Detected temperature change while away but all settings are ok, not taking any actions.")
+    }
+}
+
+def modeAwayTempHandler(evt) {
+	def tempAVGaway = sensor ? getAverage(sensor, "temperature") : "undefined device"
+	def currentAwayTemp = thermostat.latestValue("temperature")
+	
+    	if(info) log.info "Away: your average room temperature is:  ${tempAVGaway}, current temp is  ${currentAwayTemp}"
+		if (sensor) currentAwayTemp = tempAVGaway		
+        if(lastStatus == "away"){
+        	if(modes2.contains(location.mode)){
+           		if (currentAwayTemp < setAwayLow) {
+					if(Awaycold) thermostat?."${Awaycold}"()
+                    thermostat?.poll()
+                    def msg = "I changed your ${thermostat} mode to ${Awaycold} because temperature is below ${setAwayLow}"
+                    sendMessage(msg)
+                    	if (info) log.info msg
+  				}
+				if (currentAwayTemp > setHigh) {
+					if(Awayhot) thermostat?."${Awayhot}"()
+                    thermostat?.poll()
+					def msg = "I changed your ${thermostat} mode to ${Awayhot} because temperature is above ${setAwayHigh}"
+                    sendMessage(msg)
+                    	if (info) log.info msg
+  				}
+             }
+			else {
+        			state.lastStatus = null
+            		temperatureHandler()
+            		if(info) log.info "Temp changed while staus is ${lastStatus} but the Location Mode is no longer in away. Resetting lastStatus"
+        	}
+	}
+}
+
+def doorCheck(evt){	
+        state.disabledTemp = sensor.latestValue("temperature")
+       	state.disabledMode = thermostat.latestValue("thermostatMode")
+       	state.disableHSP = thermostat.latestValue("heatingSetpoint") 
+        state.disableCSP = thermostat.latestValue("coolingSetpoint") 
+		if (debug) log.debug "Disable settings: ${state.disabledMode} mode, ${state.disableHSP} HSP, ${state.disableCSP} CSP"
+    if (!doorsOk){
+		if(info) log.info ("doors still open turning off ${thermostat}")
+		def msg = "I changed your ${thermostat} mode to off because some doors are open"
+        if (state.lastStatus != "off"){
+        	thermostat?.off()
+			sendMessage(msg)
+            	if (info) log.info msg
+		}
+		state.lastStatus = "off"
+        		if (info) log.info "Changing status to off"
+	}
+	else {
+    	if (state.lastStatus == "off"){
+			state.lastStatus = null
+		    if (resetOff){
+               if(debug) log.debug "Contact sensor(s) are now closed restoring ${thermostat} with settings: ${state.disabledMode} mode"+
+               ", ${state.disableHSP} HSP, ${state.disableCSP} CSP"
+                thermostat."${state.disabledMode}"()             
+                thermostat.setHeatingSetpoint(state.disableHSP)
+                thermostat.setCoolingSetpoint(state.disableCSP) 		    
+	    	}
+        }
+        temperatureHandler()
+        	if(debug) "Calling Temperature Handler"
+	}
+}
+
+private getAverage(device,type){
+	def total = 0
+		if(debug) log.debug "calculating average temperature"  
+    device.each {total += it.latestValue(type)}
+    return Math.round(total/device.size())
+}
+
+private void sendText(number, message) {
+    if (sms) {
+        def phones = sms.split("\\;")
+        for (phone in phones) {
+            sendSms(phone, message)
+            
+        }
+    }
+}
+
+private void sendMessage(message) {
+    if(info) log.info "sending notification:  ${message}"
+    if (recipients) { 
+        sendNotificationToContacts(message, recipients)
+    if(debug) log.debug "sending notification:  ${recipients}"    
+    }
+    if (push) {
+        sendPush message
+            if(info) log.info "sending push notification"
+    } else {
+            sendNotificationEvent(message)
+             if(info) log.info "sending notification"
+    }
+    if (sms) {
+        sendText(sms, message)
+        if(debug) "Calling process to send text"
+    }
+}
+            
+
+private getAllOk() {
+	modeOk && daysOk && timeOk && doorsOk && modeNotAwayOk
+}
+
+private getModeOk() {
+	def result = !modes || modes.contains(location.mode)
+		if(debug) log.debug "modeOk = $result"
+	result
+}
+
+private getModeNotAwayOk() {
+	def result = !modes2 || !modes2.contains(location.mode)
+		if(debug) log.debug "modeNotAwayOk = $result"
+	result
+}
+
+private getDoorsOk() {
+	def result = !doors || !doors.latestValue("contact").contains("open")
+		if(debug) log.debug "doorsOk = $result"
+	result
+}
+
+
+private getDaysOk() {
+	def result = true
+	if (days) {
+		def df = new java.text.SimpleDateFormat("EEEE")
+		if (location.timeZone) {
+			df.setTimeZone(location.timeZone)
+		}
+		else {
+			df.setTimeZone(TimeZone.getTimeZone("America/New_York"))
+		}
+		def day = df.format(new Date())
+		result = days.contains(day)
+	}
+	if(debug) log.debug "daysOk = $result"
+	result
+}
+
+private getTimeOk() {
+	def result = true
+	if (starting && ending) {
+		def currTime = now()
+		def start = timeToday(starting).time
+		def stop = timeToday(ending).time
+		result = start < stop ? currTime >= start && currTime <= stop : currTime <= stop || currTime >= start
+	}
+    
+    else if (starting){
+    	result = currTime >= start
+    }
+    else if (ending){
+    	result = currTime <= stop
+    }
+    
+		if(debug) log.debug "timeOk = $result"
+	result
+}
+
+def getTimeLabel(starting, ending){
+
+	def timeLabel = "Tap to set"
+	
+    if(starting && ending){
+    	timeLabel = "Between" + " " + hhmm(starting) + " "  + "and" + " " +  hhmm(ending)
+    }
+    else if (starting) {
+		timeLabel = "Start at" + " " + hhmm(starting)
+    }
+    else if(ending){
+    timeLabel = "End at" + hhmm(ending)
+    }
+	timeLabel
+}
+
+private hhmm(time, fmt = "h:mm a")
+{
+	def t = timeToday(time, location.timeZone)
+	def f = new java.text.SimpleDateFormat(fmt)
+	f.setTimeZone(location.timeZone ?: timeZone(time))
+	f.format(t)
+}
+def greyedOut(){
+	def result = ""
+    if (sensor) {
+    	result = "complete"	
+    }
+    result
+}
+
+def greyedOutTherm(){
+	def result = ""
+    if (thermostat) {
+    	result = "complete"	
+    }
+    result
+}
+
+
+def greyedOutTherm2(){
+	def result = ""
+    if (modes2) {
+    	result = "complete"	
+    }
+    result
+}
+
+def greyedOutSettings(){
+	def result = ""
+    if (starting || ending || days || modes || push) {
+    	result = "complete"	
+    }
+    result
+}
+
+def greyedOutTime(starting, ending){
+	def result = ""
+    if (starting || ending) {
+    	result = "complete"	
+    }
+    result
+}
+
+private anyoneIsHome() {
+  def result = false
+
+  if(people.findAll { it?.currentPresence == "present" }) {
+    result = true
+  }
+
+	 if(debug) log.debug("anyoneIsHome: ${result}")
+
+  return result
+}
+
+
+
+
+page(name: "timeIntervalInput", title: "Only during a certain time", refreshAfterSelection:true) {
+		section {
+			input "starting", "time", title: "Starting (both are required)", required: false 
+			input "ending", "time", title: "Ending (both are required)", required: false 
+		}
+        }
--- a/smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy
+++ b/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
-				// For now, we will only have one subscription endpoint per device
-				state.deviceSubscriptionMap.remove(deviceId)
-				state.deviceSubscriptionMap.put(deviceId, [subscriptionEndpt])
+				state.deviceSubscriptionMap[deviceId] << subscriptionEndpt
 				log.info "Added subscription URL: ${subscriptionEndpt} for ${myDevice.displayName}"
 			}

--- a/smartapps/smartthings/bose-soundtouch-connect.src/bose-soundtouch-connect.groovy
+++ b/smartapps/smartthings/bose-soundtouch-connect.src/bose-soundtouch-connect.groovy
@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
 *  Bose SoundTouch (Connect)
 *
--- a/smartapps/smartthings/hue-connect.src/hue-connect.groovy
+++ b/smartapps/smartthings/hue-connect.src/hue-connect.groovy
@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
 *  Hue Service Manager
 *
@@ -1085,6 +1083,7 @@ def on(childDevice) {
 	log.debug "Executing 'on'"
 	def id = getId(childDevice)
 	updateInProgress()
+	createSwitchEvent(childDevice, "on")
 	put("lights/$id/state", [on: true])
 	return "Bulb is turning On"
 }
@@ -1093,6 +1092,7 @@ def off(childDevice) {
 	log.debug "Executing 'off'"
 	def id = getId(childDevice)
 	updateInProgress()
+	createSwitchEvent(childDevice, "off")
 	put("lights/$id/state", [on: false])
 	return "Bulb is turning Off"
 }
@@ -1108,6 +1108,8 @@ def setLevel(childDevice, percent) {
 	else
 		level = Math.min(Math.round(percent * 254 / 100), 254)

+	createSwitchEvent(childDevice, level > 0, percent)
+
 	// For Zigbee lights, if level is set to 0 ST just turns them off without changing level
 	// that means that the light will still be on when on is called next time
 	// Lets emulate that here
@@ -1126,6 +1128,7 @@ def setSaturation(childDevice, percent) {
 	// 0 - 254
 	def level = Math.min(Math.round(percent * 254 / 100), 254)
 	// TODO should this be done by app only or should we default to on?
+	createSwitchEvent(childDevice, "on")
 	put("lights/$id/state", [sat: level, on: true])
 	return "Setting saturation to $percent"
 }
@@ -1137,6 +1140,7 @@ def setHue(childDevice, percent) {
 	// 0 - 65535
 	def level = Math.min(Math.round(percent * 65535 / 100), 65535)
 	// TODO should this be done by app only or should we default to on?
+	createSwitchEvent(childDevice, "on")
 	put("lights/$id/state", [hue: level, on: true])
 	return "Setting hue to $percent"
 }
@@ -1147,6 +1151,7 @@ def setColorTemperature(childDevice, huesettings) {
 	updateInProgress()
 	// 153 (6500K) to 500 (2000K)
 	def ct = hueSettings == 6500 ? 153 : Math.round(1000000 / huesettings)
+	createSwitchEvent(childDevice, "on")
 	put("lights/$id/state", [ct: ct, on: true])
 	return "Setting color temperature to $ct"
 }
@@ -1205,6 +1210,7 @@ def setColor(childDevice, huesettings) {
 	if (huesettings.switch == "off")
 		value.on = false

+	createSwitchEvent(childDevice, value.on ? "on" : "off")
 	put("lights/$id/state", value)
 	return "Setting color to $value"
 }
@@ -1316,6 +1322,32 @@ private List getRealHubFirmwareVersions() {
 	return location.hubs*.firmwareVersionString.findAll { it }
 }

+/**
+ * Sends appropriate turningOn/turningOff state events depending on switch or level changes.
+ *
+ * @param childDevice device to send event for
+ * @param setSwitch The new switch state, "on" or "off"
+ * @param setLevel Optional, switchLevel between 0-100, used if you set level to 0 for example since
+ * 				  that should generate "off" instead of level change
+ */
+private void createSwitchEvent(childDevice, setSwitch, setLevel = null) {
+
+	if (setLevel == null) {
+		setLevel = childDevice.device?.currentValue("level")
+	}
+	// Create on, off, turningOn or turningOff event as necessary
+	def currentState = childDevice.device?.currentValue("switch")
+	if ((currentState == "off" || currentState == "turningOff")) {
+		if (setSwitch == "on" || setLevel > 0) {
+			childDevice.sendEvent(name: "switch", value: "turningOn", displayed: false)
+		}
+	} else if ((currentState == "on" || currentState == "turningOn")) {
+		if (setSwitch == "off" || setLevel == 0) {
+			childDevice.sendEvent(name: "switch", value: "turningOff", displayed: false)
+		}
+	}
+}
+
 /**
 * Return the supported color range for different Hue lights. If model is not specified
 * it defaults to the smallest Gamut (B) to ensure that colors set on a mix of devices
--- a/smartapps/smartthings/wemo-connect.src/wemo-connect.groovy
+++ b/smartapps/smartthings/wemo-connect.src/wemo-connect.groovy
@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
 *  Copyright 2015 SmartThings
 *