DEVTOOLS-162: This is a capability / simulator device type for Beacon.

[CHF-204] Implementation of PING in SmartPower Outlet

devicetypes/capabilities/beacon-capability.src/beacon-capability.groovy

@@ -0,0 +1,37 @@
+/**
+ *  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.
+ *
+ */
+metadata {
+	definition (name: "Beacon Capability", namespace: "capabilities", author: "SmartThings") {
+		capability "Beacon"
+	}
+
+	simulator {
+		status "present": "beacon: present"
+		status "not present": "beacon: not present"
+	}
+
+	tiles {
+		standardTile("beacon", "device.beacon", width: 2, height: 2) {
+			state("not present", label:'not present', icon:"st.presence.tile.not-present", backgroundColor:"#ffffff")
+			state("present", label:'present', icon:"st.presence.tile.present", backgroundColor:"#53a7c0")
+		}
+		main "beacon"
+		details "beacon"
+	}
+}
+
+def parse(String description) {
+	def pair = description.split(":")
+	createEvent(name: pair[0].trim(), value: pair[1].trim())
+}

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

@@ -64,8 +64,10 @@ metadata {
     }
 
     standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
-        state "off", label: '${name}', action: "switch.on", icon: "st.Electronics.electronics16", backgroundColor: "#ffffff"
-        state "on", label: '${name}', action: "switch.off", icon: "st.Electronics.electronics16", backgroundColor: "#79b821"
+        state "on", label: '${name}', action: "switch.off", icon: "st.Electronics.electronics16", backgroundColor: "#79b821", nextState:"turningOff"
+        state "turningOff", label:'TURNING OFF', icon:"st.Electronics.electronics16", backgroundColor:"#ffffff"
+        state "off", label: '${name}', action: "switch.on", icon: "st.Electronics.electronics16", backgroundColor: "#ffffff", nextState:"turningOn"
+        state "turningOn", label:'TURNING ON', icon:"st.Electronics.electronics16", backgroundColor:"#79b821"
     }
     valueTile("1", "device.station1", decoration: "flat", canChangeIcon: false) {
         state "station1", label:'${currentValue}', action:"preset1"
@@ -747,8 +749,16 @@ def cb_boseSetInput(xml, input) {
  */
 def boseSetPowerState(boolean enable) {
     log.info "boseSetPowerState(${enable})"
-    queueCallback('nowPlaying', "cb_boseSetPowerState", enable ? "POWERON" : "POWEROFF")
-    return boseRefreshNowPlaying()
+    // Fix to get faster update of power status back from speaker after sending on/off
+    // Instead of queuing the command to be sent after the refresh send it directly via sendHubCommand
+    // Note: This is a temporary hack that should be replaced by a re-design of the
+    // DTH to use sendHubCommand for all commands
+    sendHubCommand(bosePOST("/key", "<key state=\"press\" sender=\"Gabbo\">POWER</key>")) 
+    sendHubCommand(bosePOST("/key", "<key state=\"release\" sender=\"Gabbo\">POWER</key>"))
+    sendHubCommand(boseGET("/now_playing"))
+    if (enable) {
+        queueCallback('nowPlaying', "cb_boseConfirmPowerOn", 5)
+    }
 }
 
 /**
@@ -787,10 +797,11 @@ def cb_boseSetPowerState(xml, state) {
  */
 def cb_boseConfirmPowerOn(xml, tries) {
     def result = []
-    log.warn "boseConfirmPowerOn() attempt #" + tries
-    if (xml.attributes()['source'] == "STANDBY" && tries > 0) {
+    def attempt = tries as Integer
+    log.warn "boseConfirmPowerOn() attempt #$attempt"
+    if (xml.attributes()['source'] == "STANDBY" && attempt > 0) {
         result << boseRefreshNowPlaying()
-        queueCallback('nowPlaying', "cb_boseConfirmPowerOn", tries-1)
+        queueCallback('nowPlaying', "cb_boseConfirmPowerOn", attempt-1)
     }
     return result
 }

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

@@ -13,6 +13,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 metadata {
 	definition (name: "NYCE Motion Sensor", namespace: "smartthings", author: "SmartThings") {
@@ -143,51 +144,14 @@ private Map parseReportAttributeMessage(String description) {
  
 
 private Map parseIasMessage(String description) {
-    List parsedMsg = description.split(' ')
-    String msgCode = parsedMsg[2]
-    
-    Map resultMap = [:]
-    switch(msgCode) {
-        case '0x0030': // Closed/No Motion/Dry
-            log.debug 'no motion'
-            resultMap.name = 'motion'
-            resultMap.value = 'inactive'
-            break
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
+	Map resultMap = [:]
 
-        case '0x0032': // Open/Motion/Wet
-            log.debug 'motion'
-            resultMap.name = 'motion'
-            resultMap.value = 'active'
-            break
+	result.name = 'motion'
+	result.value = zs.isAlarm2Set() ? 'active' : 'inactive'
+	log.debug(zs.isAlarm2Set() ? 'motion' : 'no motion')
 
-        case '0x0032': // Tamper Alarm
-        	log.debug 'motion with tamper alarm'
-            resultMap.name = 'motion'
-            resultMap.value = 'active'
-            break
-
-        case '0x0033': // Battery Alarm
-            break
-
-        case '0x0034': // Supervision Report
-        	log.debug 'no motion with tamper alarm'
-            resultMap.name = 'motion'
-            resultMap.value = 'inactive'
-            break
-
-        case '0x0035': // Restore Report
-            break
-
-        case '0x0036': // Trouble/Failure
-        	log.debug 'motion with failure alarm'
-            resultMap.name = 'motion'
-            resultMap.value = 'active'
-            break
-
-        case '0x0038': // Test Mode
-            break
-    }
-    return resultMap
+	return resultMap
 }
 
 def refresh()

devicetypes/smartthings/nyce-open-closed-sensor.src/nyce-open-closed-sensor.groovy

@@ -13,7 +13,10 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
- 
+
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
+
+
 metadata {
 	definition (name: "NYCE Open/Closed Sensor", namespace: "smartthings", author: "NYCE") {
     	capability "Battery"
@@ -219,40 +222,33 @@ private Map parseReportAttributeMessage(String description) {
 }
 
 private List parseIasMessage(String description) {
-	List parsedMsg = description.split(" ")
-	String msgCode = parsedMsg[2]
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
+	log.debug "parseIasMessage: $description"
 
 	List resultListMap = []
 	Map resultMap_battery = [:]
 	Map resultMap_battery_state = [:]
 	Map resultMap_sensor = [:]
 
-	// Relevant bit field definitions from ZigBee spec
-	def BATTERY_BIT = ( 1 << 3 )
-	def TROUBLE_BIT = ( 1 << 6 )
-	def SENSOR_BIT = ( 1 << 0 )		// it's ALARM1 bit from the ZCL spec
-
-	// Convert hex string to integer
-	def zoneStatus = Integer.parseInt(msgCode[-4..-1],16)
-
-	log.debug "parseIasMessage: zoneStatus: ${zoneStatus}"
+	resultMap_sensor.name = "contact"
+	resultMap_sensor.value = zs.isAlarm1Set() ? "open" : "closed"
 
 	// Check each relevant bit, create map for it, and add to list
-	log.debug "parseIasMessage: Battery Status ${zoneStatus & BATTERY_BIT}"
-	log.debug "parseIasMessage: Trouble Status ${zoneStatus & TROUBLE_BIT}"
-	log.debug "parseIasMessage: Sensor Status ${zoneStatus & SENSOR_BIT}"
+	log.debug "parseIasMessage: Battery Status ${zs.battery}"
+	log.debug "parseIasMessage: Trouble Status ${zs.trouble}"
+	log.debug "parseIasMessage: Sensor Status ${zs.alarm1}"
 
 	/* 	Comment out this path to check the battery state to avoid overwriting the
 		battery value (Change log #2), but keep these conditions for later use
 	 resultMap_battery_state.name = "battery_state"
-	 if (zoneStatus & TROUBLE_BIT) {
+	 if (zs.isTroubleSet()) {
 		 resultMap_battery_state.value = "failed"
 
 		 resultMap_battery.name = "battery"
 		 resultMap_battery.value = 0
 	 }
 	 else {
-		 if (zoneStatus & BATTERY_BIT) {
+		 if (zs.isBatterySet()) {
 			 resultMap_battery_state.value = "low"
 
 			 // to generate low battery notification by the platform
@@ -270,9 +266,6 @@ private List parseIasMessage(String description) {
 	 }
 	*/
 
-	resultMap_sensor.name = "contact"
-	resultMap_sensor.value = (zoneStatus & SENSOR_BIT) ? "open" : "closed"
-
 	resultListMap << resultMap_battery_state
 	resultListMap << resultMap_battery
 	resultListMap << resultMap_sensor

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

@@ -101,6 +101,12 @@ def parse(String description) {
 		else {
 			def descriptionText = finalResult.value == "on" ? '{{ device.displayName }} is On' : '{{ device.displayName }} is Off'
 			sendEvent(name: finalResult.type, value: finalResult.value, descriptionText: descriptionText, translatable: true)
+			// Temporary fix for the case when Device is OFFLINE and is connected again
+			if (state.lastOnOff == null){
+				state.lastOnOff = now()
+				sendEvent(name: "deviceWatch-lastActivity", value: state.lastOnOff, description: "Last Activity is on ${new Date(state.lastOnOff)}", displayed: false, isStateChange: true)
+			}
+			state.lastOnOff = now()
 		}
 	}
 	else {
@@ -116,9 +122,24 @@ def off() {
 def on() {
 	zigbee.on()
 }
+/**
+ * PING is used by Device-Watch in attempt to reach the Outlet
+ * */
+def ping() {
+
+	// send read attribute onOFF if the last time we heard from the outlet is outside of the checkInterval
+	if (state.lastOnOff < (now() - (1000 * device.currentValue("checkInterval"))) ){
+		log.info "ping, alive=no, lastOnOff=${new Date(state.lastOnOff)}"
+		state.lastOnOff = null
+		return zigbee.onOffRefresh()
+	} else { // if the last onOff activity is within the checkInterval we artificially create a Device-Watch event
+		log.info "ping, alive=yes, lastOnOff=${new Date(state.lastOnOff)}"
+		sendEvent(name: "deviceWatch-lastActivity", value: state.lastOnOff, description: "Last Activity is on ${new Date(state.lastOnOff)}", displayed: false, isStateChange: true)
+	}
+}
 
 def refresh() {
-	zigbee.onOffRefresh() + zigbee.refreshData("0x0B04", "0x050B")
+	zigbee.onOffRefresh() + zigbee.electricMeasurementPowerRefresh()
 }
 
 def configure() {

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

@@ -13,6 +13,8 @@
  *  License for the specific language governing permissions and limitations
  *  under the License.
  */
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
+
 
 metadata {
 	definition (name: "SmartSense Moisture Sensor",namespace: "smartthings", author: "SmartThings", category: "C2") {
@@ -22,6 +24,7 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Water Sensor"
 		capability "Health Check"
+		capability "Sensor"		
 
 		command "enrollResponse"
 
@@ -169,42 +172,9 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-	List parsedMsg = description.split(' ')
-	String msgCode = parsedMsg[2]
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
 
-	Map resultMap = [:]
-	switch(msgCode) {
-		case '0x0020': // Closed/No Motion/Dry
-			resultMap = getMoistureResult('dry')
-			break
-
-		case '0x0021': // Open/Motion/Wet
-			resultMap = getMoistureResult('wet')
-			break
-
-		case '0x0022': // Tamper Alarm
-			break
-
-		case '0x0023': // Battery Alarm
-			break
-
-		case '0x0024': // Supervision Report
-			 log.debug 'dry with tamper alarm'
-			resultMap = getMoistureResult('dry')
-			break
-
-		case '0x0025': // Restore Report
-			log.debug 'water with tamper alarm'
-			resultMap = getMoistureResult('wet')
-			break
-
-		case '0x0026': // Trouble/Failure
-			break
-
-		case '0x0028': // Test Mode
-			break
-	}
-	return resultMap
+	return zs.isAlarm1Set() ? getMoistureResult('wet') : getMoistureResult('dry')
 }
 
 def getTemperature(value) {

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

@@ -13,6 +13,8 @@
  *  License for the specific language governing permissions and limitations
  *  under the License.
  */
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
+
 
 metadata {
 	definition (name: "SmartSense Motion Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
@@ -22,6 +24,7 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Refresh"
 		capability "Health Check"
+		capability "Sensor"		
 
 		command "enrollResponse"
 
@@ -182,44 +185,10 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-	List parsedMsg = description.split(' ')
-	String msgCode = parsedMsg[2]
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
 
-	Map resultMap = [:]
-	switch(msgCode) {
-		case '0x0020': // Closed/No Motion/Dry
-			resultMap = getMotionResult('inactive')
-			break
-
-		case '0x0021': // Open/Motion/Wet
-			resultMap = getMotionResult('active')
-			break
-
-		case '0x0022': // Tamper Alarm
-			log.debug 'motion with tamper alarm'
-			resultMap = getMotionResult('active')
-			break
-
-		case '0x0023': // Battery Alarm
-			break
-
-		case '0x0024': // Supervision Report
-			log.debug 'no motion with tamper alarm'
-			resultMap = getMotionResult('inactive')
-			break
-
-		case '0x0025': // Restore Report
-			break
-
-		case '0x0026': // Trouble/Failure
-			log.debug 'motion with failure alarm'
-			resultMap = getMotionResult('active')
-			break
-
-		case '0x0028': // Test Mode
-			break
-	}
-	return resultMap
+	// Some sensor models that use this DTH use alarm1 and some use alarm2 to signify motion
+	return (zs.isAlarm1Set() || zs.isAlarm2Set()) ? getMotionResult('active') : getMotionResult('inactive')
 }
 
 def getTemperature(value) {

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

@@ -15,6 +15,7 @@
  */
 
 //DEPRECATED - Using the smartsense-motion-sensor.groovy DTH for this device. Users need to be moved before deleting this DTH
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 metadata {
 	definition (name: "SmartSense Motion/Temp Sensor", namespace: "smartthings", author: "SmartThings") {
@@ -168,44 +169,8 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-    List parsedMsg = description.split(' ')
-    String msgCode = parsedMsg[2]
-
-    Map resultMap = [:]
-    switch(msgCode) {
-        case '0x0020': // Closed/No Motion/Dry
-        	resultMap = getMotionResult('inactive')
-            break
-
-        case '0x0021': // Open/Motion/Wet
-        	resultMap = getMotionResult('active')
-            break
-
-        case '0x0022': // Tamper Alarm
-        	log.debug 'motion with tamper alarm'
-        	resultMap = getMotionResult('active')
-            break
-
-        case '0x0023': // Battery Alarm
-            break
-
-        case '0x0024': // Supervision Report
-        	log.debug 'no motion with tamper alarm'
-        	resultMap = getMotionResult('inactive')
-            break
-
-        case '0x0025': // Restore Report
-            break
-
-        case '0x0026': // Trouble/Failure
-        	log.debug 'motion with failure alarm'
-        	resultMap = getMotionResult('active')
-            break
-
-        case '0x0028': // Test Mode
-            break
-    }
-    return resultMap
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
+	return zs.isAlarm1Set() ? getMotionResult('active') : getMotionResult('inactive')
 }
 
 def getTemperature(value) {

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

@@ -13,6 +13,7 @@
  *  License for the specific language governing permissions and limitations
  *  under the License.
  */
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 metadata {
 	definition (name: "SmartSense Multi Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
@@ -224,47 +225,13 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-	List parsedMsg = description.split(' ')
-	String msgCode = parsedMsg[2]
-
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
 	Map resultMap = [:]
-	switch(msgCode) {
-		case '0x0020': // Closed/No Motion/Dry
-			if (garageSensor != "Yes"){
-				resultMap = getContactResult('closed')
-			}
-		break
 
-		case '0x0021': // Open/Motion/Wet
-			if (garageSensor != "Yes"){
-				resultMap = getContactResult('open')
-			}
-		break
-
-		case '0x0022': // Tamper Alarm
-		break
-
-		case '0x0023': // Battery Alarm
-		break
-
-		case '0x0024': // Supervision Report
-			if (garageSensor != "Yes"){
-				resultMap = getContactResult('closed')
-			}
-		break
-
-		case '0x0025': // Restore Report
-			if (garageSensor != "Yes"){
-				resultMap = getContactResult('open')
-			}
-		break
-
-		case '0x0026': // Trouble/Failure
-		break
-
-		case '0x0028': // Test Mode
-		break
+	if(garageSensor !=  "Yes") {
+		resultMap = zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
 	}
+
 	return resultMap
 }
 

devicetypes/smartthings/smartsense-open-closed-accelerometer-sensor.src/smartsense-open-closed-accelerometer-sensor.groovy

@@ -14,6 +14,7 @@
  *
  */
 //DEPRECATED - Using the smartsense-multi-sensor.groovy DTH for this device. Users need to be moved before deleting this DTH
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
  metadata {
  	definition (name: "SmartSense Open/Closed Accelerometer Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
@@ -24,6 +25,7 @@
  		capability "Refresh"
  		capability "Temperature Measurement"
 		capability "Health Check"
+		capability "Sensor"
 
 		command "enrollResponse"
  	}
@@ -171,40 +173,9 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-	List parsedMsg = description.split(' ')
-	String msgCode = parsedMsg[2]
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
 
-	Map resultMap = [:]
-	switch(msgCode) {
-        case '0x0020': // Closed/No Motion/Dry
-        resultMap = getContactResult('closed')
-        break
-
-        case '0x0021': // Open/Motion/Wet
-        resultMap = getContactResult('open')
-        break
-
-        case '0x0022': // Tamper Alarm
-        break
-
-        case '0x0023': // Battery Alarm
-        break
-
-        case '0x0024': // Supervision Report
-        resultMap = getContactResult('closed')
-        break
-
-        case '0x0025': // Restore Report
-        resultMap = getContactResult('open')
-        break
-
-        case '0x0026': // Trouble/Failure
-        break
-
-        case '0x0028': // Test Mode
-        break
-    }
-    return resultMap
+	return zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
 }
 
 def getTemperature(value) {

devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy

@@ -13,6 +13,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 metadata {
 	definition (name: "SmartSense Open/Closed Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
@@ -167,40 +168,8 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-    List parsedMsg = description.split(' ')
-    String msgCode = parsedMsg[2]
-
-    Map resultMap = [:]
-    switch(msgCode) {
-        case '0x0020': // Closed/No Motion/Dry
-        	resultMap = getContactResult('closed')
-            break
-
-        case '0x0021': // Open/Motion/Wet
-        	resultMap = getContactResult('open')
-            break
-
-        case '0x0022': // Tamper Alarm
-            break
-
-        case '0x0023': // Battery Alarm
-            break
-
-        case '0x0024': // Supervision Report
-        	resultMap = getContactResult('closed')
-            break
-
-        case '0x0025': // Restore Report
-        	resultMap = getContactResult('open')
-            break
-
-        case '0x0026': // Trouble/Failure
-            break
-
-        case '0x0028': // Test Mode
-            break
-    }
-    return resultMap
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
+	return zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
 }
 
 def getTemperature(value) {

devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy

@@ -21,6 +21,7 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Relative Humidity Measurement"
 		capability "Health Check"
+		capability "Sensor"
 
 		fingerprint endpointId: "01", inClusters: "0001,0003,0020,0402,0B05,FC45", outClusters: "0019,0003"
 	}

devicetypes/smartthings/testing/simulated-alarm.src/simulated-alarm.groovy

@@ -16,6 +16,8 @@
 metadata {
 	definition (name: "Simulated Alarm", namespace: "smartthings/testing", author: "SmartThings") {
 		capability "Alarm"
+		capability "Sensor"
+		capability "Actuator"
 	}
 
 	simulator {

devicetypes/smartthings/testing/simulated-color-control.src/simulated-color-control.groovy

@@ -1,6 +1,8 @@
 metadata {
 	definition (name: "Simulated Color Control", namespace: "smartthings/testing", author: "SmartThings") {
     	capability "Color Control"
+		capability "Sensor"
+		capability "Actuator"
 	}
 
 	simulator {

devicetypes/smartthings/testing/simulated-contact-sensor.src/simulated-contact-sensor.groovy

@@ -15,6 +15,7 @@ metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Simulated Contact Sensor", namespace: "smartthings/testing", author: "bob") {
 		capability "Contact Sensor"
+		capability "Sensor"
 
 		command "open"
 		command "close"

devicetypes/smartthings/testing/simulated-lock.src/simulated-lock.groovy

@@ -15,6 +15,8 @@ metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Simulated Lock", namespace: "smartthings/testing", author: "bob") {
 		capability "Lock"
+		capability "Sensor"
+		capability "Actuator"
 	}
 
 	// Simulated lock

devicetypes/smartthings/testing/simulated-motion-sensor.src/simulated-motion-sensor.groovy

@@ -15,6 +15,7 @@ metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Simulated Motion Sensor", namespace: "smartthings/testing", author: "bob") {
 		capability "Motion Sensor"
+		capability "Sensor"
 
 		command "active"
 		command "inactive"

devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy

@@ -15,6 +15,7 @@ metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Simulated Presence Sensor", namespace: "smartthings/testing", author: "bob") {
 		capability "Presence Sensor"
+		capability "Sensor"
 
 		command "arrived"
 		command "departed"

devicetypes/smartthings/testing/simulated-switch.src/simulated-switch.groovy

@@ -16,6 +16,8 @@ metadata {
     definition (name: "Simulated Switch", namespace: "smartthings/testing", author: "bob") {
 		capability "Switch"
         capability "Relay Switch"
+		capability "Sensor"
+		capability "Actuator"
 
 		command "onPhysical"
 		command "offPhysical"

devicetypes/smartthings/testing/simulated-temperature-sensor.src/simulated-temperature-sensor.groovy

@@ -16,6 +16,7 @@ metadata {
 	definition (name: "Simulated Temperature Sensor", namespace: "smartthings/testing", author: "SmartThings") {
 		capability "Temperature Measurement"
 		capability "Switch Level"
+		capability "Sensor"
 
 		command "up"
 		command "down"

devicetypes/smartthings/testing/simulated-thermostat.src/simulated-thermostat.groovy

@@ -16,6 +16,8 @@ metadata {
 	definition (name: "Simulated Thermostat", namespace: "smartthings/testing", author: "SmartThings") {
 		capability "Thermostat"
 		capability "Relative Humidity Measurement"
+		capability "Sensor"
+		capability "Actuator"
 
 		command "tempUp"
 		command "tempDown"

devicetypes/smartthings/testing/simulated-water-sensor.src/simulated-water-sensor.groovy

@@ -15,6 +15,7 @@ metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Simulated Water Sensor", namespace: "smartthings/testing", author: "SmartThings") {
 		capability "Water Sensor"
+		capability "Sensor"
         
         command "wet"
         command "dry"

devicetypes/smartthings/tyco-door-window-sensor.src/tyco-door-window-sensor.groovy

@@ -13,6 +13,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 metadata {
 	definition (name: "Tyco Door/Window Sensor", namespace: "smartthings", author: "SmartThings") {
@@ -161,40 +162,9 @@ private Map parseCustomMessage(String description) {
 }
 
 private Map parseIasMessage(String description) {
-    List parsedMsg = description.split(' ')
-    String msgCode = parsedMsg[2]
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
 
-    Map resultMap = [:]
-    switch(msgCode) {
-        case '0x0020': // Closed/No Motion/Dry
-        	resultMap = getContactResult('closed')
-            break
-
-        case '0x0021': // Open/Motion/Wet
-        	resultMap = getContactResult('open')
-            break
-
-        case '0x0022': // Tamper Alarm
-            break
-
-        case '0x0023': // Battery Alarm
-            break
-
-        case '0x0024': // Supervision Report
-        	resultMap = getContactResult('closed')
-            break
-
-        case '0x0025': // Restore Report
-        	resultMap = getContactResult('open')
-            break
-
-        case '0x0026': // Trouble/Failure
-            break
-
-        case '0x0028': // Test Mode
-            break
-    }
-    return resultMap
+	return zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
 }
 
 def getTemperature(value) {

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

@@ -20,6 +20,7 @@ metadata {
         capability "Switch"
 
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0006", outClusters: "0003, 0006, 0019, 0406", manufacturer: "Leviton", model: "ZSS-10", deviceJoinName: "Leviton Switch"
     }
 
     // simulator metadata

devicetypes/smartthings/zwave-lock-reporting.src/zwave-lock-reporting.groovy

@@ -1,683 +0,0 @@
-/**
- *  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.
- *
- */
-metadata {
-	definition (name: "Z-Wave Lock Reporting", namespace: "smartthings", author: "SmartThings") {
-		capability "Actuator"
-		capability "Lock"
-		capability "Polling"
-		capability "Refresh"
-		capability "Sensor"
-		capability "Lock Codes"
-		capability "Battery"
-
-		command "unlockwtimeout"
-
-		fingerprint deviceId: "0x4003", inClusters: "0x98"
-		fingerprint deviceId: "0x4004", inClusters: "0x98"
-	}
-
-	simulator {
-		status "locked": "command: 9881, payload: 00 62 03 FF 00 00 FE FE"
-		status "unlocked": "command: 9881, payload: 00 62 03 00 00 00 FE FE"
-
-		reply "9881006201FF,delay 4200,9881006202": "command: 9881, payload: 00 62 03 FF 00 00 FE FE"
-		reply "988100620100,delay 4200,9881006202": "command: 9881, payload: 00 62 03 00 00 00 FE FE"
-	}
-
-	tiles(scale: 2) {
-		multiAttributeTile(name:"toggle", type: "generic", width: 6, height: 4){
-			tileAttribute ("device.lock", key: "PRIMARY_CONTROL") {
-				attributeState "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#79b821", nextState:"unlocking"
-				attributeState "unlocked", label:'unlocked', action:"lock.lock", icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff", nextState:"locking"
-				attributeState "unknown", label:"unknown", action:"lock.lock", icon:"st.locks.lock.unknown", backgroundColor:"#ffffff", nextState:"locking"
-				attributeState "locking", label:'locking', icon:"st.locks.lock.locked", backgroundColor:"#79b821"
-				attributeState "unlocking", label:'unlocking', icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff"
-			}
-		}
-		standardTile("lock", "device.lock", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", label:'lock', action:"lock.lock", icon:"st.locks.lock.locked", nextState:"locking"
-		}
-		standardTile("unlock", "device.lock", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", label:'unlock', action:"lock.unlock", icon:"st.locks.lock.unlocked", nextState:"unlocking"
-		}
-		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "battery", label:'${currentValue}% battery', unit:""
-		}
-		standardTile("refresh", "device.lock", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
-
-		main "toggle"
-		details(["toggle", "lock", "unlock", "battery", "refresh"])
-	}
-}
-
-import physicalgraph.zwave.commands.doorlockv1.*
-import physicalgraph.zwave.commands.usercodev1.*
-
-def updated() {
-	try {
-		if (!state.init) {
-			state.init = true
-			response(secureSequence([zwave.doorLockV1.doorLockOperationGet(), zwave.batteryV1.batteryGet()]))
-		}
-	} catch (e) {
-		log.warn "updated() threw $e"
-	}
-}
-
-def parse(String description) {
-	def result = null
-	if (description.startsWith("Err 106")) {
-		if (state.sec) {
-			result = createEvent(descriptionText:description, displayed:false)
-		} else {
-			result = createEvent(
-				descriptionText: "This lock failed to complete the network security key exchange. If you are unable to control it via SmartThings, you must remove it from your network and add it again.",
-				eventType: "ALERT",
-				name: "secureInclusion",
-				value: "failed",
-				displayed: true,
-			)
-		}
-	} else if (description == "updated") {
-		return null
-	} else {
-		def cmd = zwave.parse(description, [ 0x98: 1, 0x72: 2, 0x85: 2, 0x86: 1 ])
-		if (cmd) {
-			result = zwaveEvent(cmd)
-		}
-	}
-	log.debug "\"$description\" parsed to ${result.inspect()}"
-	result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulation cmd) {
-	def encapsulatedCommand = cmd.encapsulatedCommand([0x62: 1, 0x71: 2, 0x80: 1, 0x85: 2, 0x63: 1, 0x98: 1, 0x86: 1])
-	// log.debug "encapsulated: $encapsulatedCommand"
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand)
-	}
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.securityv1.NetworkKeyVerify cmd) {
-	createEvent(name:"secureInclusion", value:"success", descriptionText:"Secure inclusion was successful")
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityCommandsSupportedReport cmd) {
-	state.sec = cmd.commandClassSupport.collect { String.format("%02X ", it) }.join()
-	if (cmd.commandClassControl) {
-		state.secCon = cmd.commandClassControl.collect { String.format("%02X ", it) }.join()
-	}
-	log.debug "Security command classes: $state.sec"
-	createEvent(name:"secureInclusion", value:"success", descriptionText:"Lock is securely included")
-}
-
-def zwaveEvent(DoorLockOperationReport cmd) {
-	def result = []
-	def map = [ name: "lock" ]
-	if (cmd.doorLockMode == 0xFF) {
-		map.value = "locked"
-	} else if (cmd.doorLockMode >= 0x40) {
-		map.value = "unknown"
-	} else if (cmd.doorLockMode & 1) {
-		map.value = "unlocked with timeout"
-	} else {
-		map.value = "unlocked"
-		if (state.assoc != zwaveHubNodeId) {
-			log.debug "setting association"
-			result << response(secure(zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:zwaveHubNodeId)))
-			result << response(zwave.associationV1.associationSet(groupingIdentifier:2, nodeId:zwaveHubNodeId))
-			result << response(secure(zwave.associationV1.associationGet(groupingIdentifier:1)))
-		}
-	}
-	result ? [createEvent(map), *result] : createEvent(map)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd) {
-	def result = []
-	def map = null
-	if (cmd.zwaveAlarmType == 6) {
-		if (1 <= cmd.zwaveAlarmEvent && cmd.zwaveAlarmEvent < 10) {
-			map = [ name: "lock", value: (cmd.zwaveAlarmEvent & 1) ? "locked" : "unlocked" ]
-		}
-		switch(cmd.zwaveAlarmEvent) {
-			case 1:
-				map.descriptionText = "$device.displayName was manually locked"
-				break
-			case 2:
-				map.descriptionText = "$device.displayName was manually unlocked"
-				break
-			case 5:
-				if (cmd.eventParameter) {
-					map.descriptionText = "$device.displayName was locked with code ${cmd.eventParameter.first()}"
-					map.data = [ usedCode: cmd.eventParameter[0] ]
-				}
-				break
-			case 6:
-				if (cmd.eventParameter) {
-					map.descriptionText = "$device.displayName was unlocked with code ${cmd.eventParameter.first()}"
-					map.data = [ usedCode: cmd.eventParameter[0] ]
-				}
-				break
-			case 9:
-				map.descriptionText = "$device.displayName was autolocked"
-				break
-			case 7:
-			case 8:
-			case 0xA:
-				map = [ name: "lock", value: "unknown", descriptionText: "$device.displayName was not locked fully" ]
-				break
-			case 0xB:
-				map = [ name: "lock", value: "unknown", descriptionText: "$device.displayName is jammed" ]
-				break
-			case 0xC:
-				map = [ name: "codeChanged", value: "all", descriptionText: "$device.displayName: all user codes deleted", isStateChange: true ]
-				allCodesDeleted()
-				break
-			case 0xD:
-				if (cmd.eventParameter) {
-					map = [ name: "codeReport", value: cmd.eventParameter[0], data: [ code: "" ], isStateChange: true ]
-					map.descriptionText = "$device.displayName code ${map.value} was deleted"
-					map.isStateChange = (state["code$map.value"] != "")
-					state["code$map.value"] = ""
-				} else {
-					map = [ name: "codeChanged", descriptionText: "$device.displayName: user code deleted", isStateChange: true ]
-				}
-				break
-			case 0xE:
-				map = [ name: "codeChanged", value: cmd.alarmLevel,  descriptionText: "$device.displayName: user code added", isStateChange: true ]
-				if (cmd.eventParameter) {
-					map.value = cmd.eventParameter[0]
-					result << response(requestCode(cmd.eventParameter[0]))
-				}
-				break
-			case 0xF:
-				map = [ name: "codeChanged", descriptionText: "$device.displayName: user code not added, duplicate", isStateChange: true ]
-				break
-			case 0x10:
-				map = [ name: "tamper", value: "detected", descriptionText: "$device.displayName: keypad temporarily disabled", displayed: true ]
-				break
-			case 0x11:
-				map = [ descriptionText: "$device.displayName: keypad is busy" ]
-				break
-			case 0x12:
-				map = [ name: "codeChanged", descriptionText: "$device.displayName: program code changed", isStateChange: true ]
-				break
-			case 0x13:
-				map = [ name: "tamper", value: "detected", descriptionText: "$device.displayName: code entry attempt limit exceeded", displayed: true ]
-				break
-			default:
-				map = map ?: [ descriptionText: "$device.displayName: alarm event $cmd.zwaveAlarmEvent", displayed: false ]
-				break
-		}
-	} else if (cmd.zwaveAlarmType == 7) {
-		map = [ name: "tamper", value: "detected", displayed: true ]
-		switch (cmd.zwaveAlarmEvent) {
-			case 0:
-				map.value = "clear"
-				map.descriptionText = "$device.displayName: tamper alert cleared"
-				break
-			case 1:
-			case 2:
-				map.descriptionText = "$device.displayName: intrusion attempt detected"
-				break
-			case 3:
-				map.descriptionText = "$device.displayName: covering removed"
-				break
-			case 4:
-				map.descriptionText = "$device.displayName: invalid code"
-				break
-			default:
-				map.descriptionText = "$device.displayName: tamper alarm $cmd.zwaveAlarmEvent"
-				break
-		}
-	} else switch(cmd.alarmType) {
-		case 21:  // Manually locked
-		case 18:  // Locked with keypad
-		case 24:  // Locked by command (Kwikset 914)
-		case 27:  // Autolocked
-			map = [ name: "lock", value: "locked" ]
-			break
-		case 16:  // Note: for levers this means it's unlocked, for non-motorized deadbolt, it's just unsecured and might not get unlocked
-		case 19:
-			map = [ name: "lock", value: "unlocked" ]
-			if (cmd.alarmLevel) {
-				map.descriptionText = "$device.displayName was unlocked with code $cmd.alarmLevel"
-				map.data = [ usedCode: cmd.alarmLevel ]
-			}
-			break
-		case 22:
-		case 25:  // Kwikset 914 unlocked by command
-			map = [ name: "lock", value: "unlocked" ]
-			break
-		case 9:
-		case 17:
-		case 23:
-		case 26:
-			map = [ name: "lock", value: "unknown", descriptionText: "$device.displayName bolt is jammed" ]
-			break
-		case 13:
-			map = [ name: "codeChanged", value: cmd.alarmLevel, descriptionText: "$device.displayName code $cmd.alarmLevel was added", isStateChange: true ]
-			result << response(requestCode(cmd.alarmLevel))
-			break
-		case 32:
-			map = [ name: "codeChanged", value: "all", descriptionText: "$device.displayName: all user codes deleted", isStateChange: true ]
-			allCodesDeleted()
-			break
-		case 33:
-			map = [ name: "codeReport", value: cmd.alarmLevel, data: [ code: "" ], isStateChange: true ]
-			map.descriptionText = "$device.displayName code $cmd.alarmLevel was deleted"
-			map.isStateChange = (state["code$cmd.alarmLevel"] != "")
-			state["code$cmd.alarmLevel"] = ""
-			break
-		case 112:
-			map = [ name: "codeChanged", value: cmd.alarmLevel, descriptionText: "$device.displayName code $cmd.alarmLevel changed", isStateChange: true ]
-			result << response(requestCode(cmd.alarmLevel))
-			break
-		case 130:  // Yale YRD batteries replaced
-			map = [ descriptionText: "$device.displayName batteries replaced", isStateChange: true ]
-			break
-		case 131:
-			map = [ /*name: "codeChanged", value: cmd.alarmLevel,*/ descriptionText: "$device.displayName code $cmd.alarmLevel is duplicate", isStateChange: false ]
-			break
-		case 161:
-			if (cmd.alarmLevel == 2) {
-				map = [ descriptionText: "$device.displayName front escutcheon removed", isStateChange: true ]
-			} else {
-				map = [ descriptionText: "$device.displayName detected failed user code attempt", isStateChange: true ]
-			}
-			break
-		case 167:
-			if (!state.lastbatt || now() - state.lastbatt > 12*60*60*1000) {
-				map = [ descriptionText: "$device.displayName: battery low", isStateChange: true ]
-				result << response(secure(zwave.batteryV1.batteryGet()))
-			} else {
-				map = [ name: "battery", value: device.currentValue("battery"), descriptionText: "$device.displayName: battery low", displayed: true ]
-			}
-			break
-		case 168:
-			map = [ name: "battery", value: 1, descriptionText: "$device.displayName: battery level critical", displayed: true ]
-			break
-		case 169:
-			map = [ name: "battery", value: 0, descriptionText: "$device.displayName: battery too low to operate lock", isStateChange: true ]
-			break
-		default:
-			map = [ displayed: false, descriptionText: "$device.displayName: alarm event $cmd.alarmType level $cmd.alarmLevel" ]
-			break
-	}
-	result ? [createEvent(map), *result] : createEvent(map)
-}
-
-def zwaveEvent(UserCodeReport cmd) {
-	def result = []
-	def name = "code$cmd.userIdentifier"
-	def code = cmd.code
-	def map = [:]
-	if (cmd.userIdStatus == UserCodeReport.USER_ID_STATUS_OCCUPIED ||
-		(cmd.userIdStatus == UserCodeReport.USER_ID_STATUS_STATUS_NOT_AVAILABLE && cmd.user && code != "**********"))
-	{
-		if (code == "**********") {  // Schlage locks send us this instead of the real code
-			state.blankcodes = true
-			code = state["set$name"] ?: decrypt(state[name]) ?: code
-			state.remove("set$name".toString())
-		}
-		if (!code && cmd.userIdStatus == 1) {  // Schlage touchscreen sends blank code to notify of a changed code
-			map = [ name: "codeChanged", value: cmd.userIdentifier, displayed: true, isStateChange: true ]
-			map.descriptionText = "$device.displayName code $cmd.userIdentifier " + (state[name] ? "changed" : "was added")
-			code = state["set$name"] ?: decrypt(state[name]) ?: "****"
-			state.remove("set$name".toString())
-		} else {
-			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
-		}
-		result << createEvent(map)
-	} else {
-		map = [ name: "codeReport", value: cmd.userIdentifier, data: [ code: "" ] ]
-		if (state.blankcodes && state["reset$name"]) {  // we deleted this code so we can tell that our new code gets set
-			map.descriptionText = "$device.displayName code $cmd.userIdentifier was reset"
-			map.displayed = map.isStateChange = true
-			result << createEvent(map)
-			state["set$name"] = state["reset$name"]
-			result << response(setCode(cmd.userIdentifier, state["reset$name"]))
-			state.remove("reset$name".toString())
-		} else {
-			if (state[name]) {
-				map.descriptionText = "$device.displayName code $cmd.userIdentifier was deleted"
-			} else {
-				map.descriptionText = "$device.displayName code $cmd.userIdentifier is not set"
-			}
-			map.displayed = (cmd.userIdentifier != state.requestCode && cmd.userIdentifier != state.pollCode)
-			map.isStateChange = true
-			result << createEvent(map)
-		}
-		code = ""
-	}
-	state[name] = code ? encrypt(code) : code
-
-	if (cmd.userIdentifier == state.requestCode) {  // reloadCodes() was called, keep requesting the codes in order
-		if (state.requestCode + 1 > state.codes || state.requestCode >= 30) {
-			state.remove("requestCode")  // done
-		} else {
-			state.requestCode = state.requestCode + 1  // get next
-			result << response(requestCode(state.requestCode))
-		}
-	}
-	if (cmd.userIdentifier == state.pollCode) {
-		if (state.pollCode + 1 > state.codes || state.pollCode >= 30) {
-			state.remove("pollCode")  // done
-		} else {
-			state.pollCode = state.pollCode + 1
-		}
-	}
-	log.debug "code report parsed to ${result.inspect()}"
-	result
-}
-
-def zwaveEvent(UsersNumberReport cmd) {
-	def result = []
-	state.codes = cmd.supportedUsers
-	if (state.requestCode && state.requestCode <= cmd.supportedUsers) {
-		result << response(requestCode(state.requestCode))
-	}
-	result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.associationv2.AssociationReport cmd) {
-	def result = []
-	if (cmd.nodeId.any { it == zwaveHubNodeId }) {
-		state.remove("associationQuery")
-		log.debug "$device.displayName is associated to $zwaveHubNodeId"
-		result << createEvent(descriptionText: "$device.displayName is associated")
-		state.assoc = zwaveHubNodeId
-		if (cmd.groupingIdentifier == 2) {
-			result << response(zwave.associationV1.associationRemove(groupingIdentifier:1, nodeId:zwaveHubNodeId))
-		}
-	} else if (cmd.groupingIdentifier == 1) {
-		result << response(secure(zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:zwaveHubNodeId)))
-	} else if (cmd.groupingIdentifier == 2) {
-		result << response(zwave.associationV1.associationSet(groupingIdentifier:2, nodeId:zwaveHubNodeId))
-	}
-	result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.timev1.TimeGet cmd) {
-	def result = []
-	def now = new Date().toCalendar()
-	if(location.timeZone) now.timeZone = location.timeZone
-	result << createEvent(descriptionText: "$device.displayName requested time update", displayed: false)
-	result << response(secure(zwave.timeV1.timeReport(
-		hourLocalTime: now.get(Calendar.HOUR_OF_DAY),
-		minuteLocalTime: now.get(Calendar.MINUTE),
-		secondLocalTime: now.get(Calendar.SECOND)))
-	)
-	result
-}
-
-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") ]
-	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) {
-	def map = [ name: "battery", unit: "%" ]
-	if (cmd.batteryLevel == 0xFF) {
-		map.value = 1
-		map.descriptionText = "$device.displayName has a low battery"
-	} else {
-		map.value = cmd.batteryLevel
-	}
-	state.lastbatt = now()
-	createEvent(map)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
-	def result = []
-
-	def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId)
-	log.debug "msr: $msr"
-	updateDataValue("MSR", msr)
-
-	result << createEvent(descriptionText: "$device.displayName MSR: $msr", isStateChange: false)
-	result
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.versionv1.VersionReport cmd) {
-	def fw = "${cmd.applicationVersion}.${cmd.applicationSubVersion}"
-	updateDataValue("fw", fw)
-	if (state.MSR == "003B-6341-5044") {
-		updateDataValue("ver", "${cmd.applicationVersion >> 4}.${cmd.applicationVersion & 0xF}")
-	}
-	def text = "$device.displayName: firmware version: $fw, Z-Wave version: ${cmd.zWaveProtocolVersion}.${cmd.zWaveProtocolSubVersion}"
-	createEvent(descriptionText: text, isStateChange: false)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.applicationstatusv1.ApplicationBusy cmd) {
-	def msg = cmd.status == 0 ? "try again later" :
-	          cmd.status == 1 ? "try again in $cmd.waitTime seconds" :
-	          cmd.status == 2 ? "request queued" : "sorry"
-	createEvent(displayed: true, descriptionText: "$device.displayName is busy, $msg")
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.applicationstatusv1.ApplicationRejectedRequest cmd) {
-	createEvent(displayed: true, descriptionText: "$device.displayName rejected the last request")
-}
-
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	createEvent(displayed: false, descriptionText: "$device.displayName: $cmd")
-}
-
-def lockAndCheck(doorLockMode) {
-	secureSequence([
-		zwave.doorLockV1.doorLockOperationSet(doorLockMode: doorLockMode),
-		zwave.doorLockV1.doorLockOperationGet()
-	], 4200)
-}
-
-def lock() {
-	lockAndCheck(DoorLockOperationSet.DOOR_LOCK_MODE_DOOR_SECURED)
-}
-
-def unlock() {
-	lockAndCheck(DoorLockOperationSet.DOOR_LOCK_MODE_DOOR_UNSECURED)
-}
-
-def unlockwtimeout() {
-	lockAndCheck(DoorLockOperationSet.DOOR_LOCK_MODE_DOOR_UNSECURED_WITH_TIMEOUT)
-}
-
-def refresh() {
-	def cmds = [secure(zwave.doorLockV1.doorLockOperationGet())]
-	if (state.assoc == zwaveHubNodeId) {
-		log.debug "$device.displayName is associated to ${state.assoc}"
-	} else if (!state.associationQuery) {
-		log.debug "checking association"
-		cmds << "delay 4200"
-		cmds << zwave.associationV1.associationGet(groupingIdentifier:2).format()  // old Schlage locks use group 2 and don't secure the Association CC
-		cmds << secure(zwave.associationV1.associationGet(groupingIdentifier:1))
-		state.associationQuery = now()
-	} else if (secondsPast(state.associationQuery, 9)) {
-		cmds << "delay 6000"
-		cmds << zwave.associationV1.associationSet(groupingIdentifier:2, nodeId:zwaveHubNodeId).format()
-		cmds << secure(zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:zwaveHubNodeId))
-		cmds << zwave.associationV1.associationGet(groupingIdentifier:2).format()
-		cmds << secure(zwave.associationV1.associationGet(groupingIdentifier:1))
-		state.associationQuery = now()
-	}
-	log.debug "refresh sending ${cmds.inspect()}"
-	cmds
-}
-
-def poll() {
-	def cmds = []
-	// Only check lock state if it changed recently or we haven't had an update in an hour
-	def latest = device.currentState("lock")?.date?.time
-	if (!latest || !secondsPast(latest, 6 * 60) || secondsPast(state.lastPoll, 55 * 60)) {
-		cmds << secure(zwave.doorLockV1.doorLockOperationGet())
-		state.lastPoll = now()
-	} else if (!state.lastbatt || now() - state.lastbatt > 53*60*60*1000) {
-		cmds << secure(zwave.batteryV1.batteryGet())
-		state.lastbatt = now()  //inside-214
-	}
-	if (cmds) {
-		log.debug "poll is sending ${cmds.inspect()}"
-		cmds
-	} else {
-		// workaround to keep polling from stopping due to lack of activity
-		sendEvent(descriptionText: "skipping poll", isStateChange: true, displayed: false)
-		null
-	}
-
-    reportAllCodes(state)
-}
-
-def requestCode(codeNumber) {
-	secure(zwave.userCodeV1.userCodeGet(userIdentifier: codeNumber))
-}
-
-def reloadAllCodes() {
-	def cmds = []
-	if (!state.codes) {
-		state.requestCode = 1
-		cmds << secure(zwave.userCodeV1.usersNumberGet())
-	} else {
-		if(!state.requestCode) state.requestCode = 1
-		cmds << requestCode(codeNumber)
-	}
-	cmds
-}
-
-def setCode(codeNumber, code) {
-	def strcode = code
-	log.debug "setting code $codeNumber to $code"
-	if (code instanceof String) {
-		code = code.toList().findResults { if(it > ' ' && it != ',' && it != '-') it.toCharacter() as Short }
-	} else {
-		strcode = code.collect{ it as Character }.join()
-	}
-	if (state.blankcodes) {
-		// Can't just set, we won't be able to tell if it was successful
-		if (state["code$codeNumber"] != "") {
-			if (state["setcode$codeNumber"] != strcode) {
-				state["resetcode$codeNumber"] = strcode
-				return deleteCode(codeNumber)
-			}
-		} else {
-			state["setcode$codeNumber"] = strcode
-		}
-	}
-	secureSequence([
-		zwave.userCodeV1.userCodeSet(userIdentifier:codeNumber, userIdStatus:1, user:code),
-		zwave.userCodeV1.userCodeGet(userIdentifier:codeNumber)
-	], 7000)
-}
-
-def deleteCode(codeNumber) {
-	log.debug "deleting code $codeNumber"
-	secureSequence([
-		zwave.userCodeV1.userCodeSet(userIdentifier:codeNumber, userIdStatus:0),
-		zwave.userCodeV1.userCodeGet(userIdentifier:codeNumber)
-	], 7000)
-}
-
-def updateCodes(codeSettings) {
-	if(codeSettings instanceof String) codeSettings = util.parseJson(codeSettings)
-	def set_cmds = []
-	def get_cmds = []
-	codeSettings.each { name, updated ->
-		def current = decrypt(state[name])
-		if (name.startsWith("code")) {
-			def n = name[4..-1].toInteger()
-			log.debug "$name was $current, set to $updated"
-			if (updated?.size() >= 4 && updated != current) {
-				def cmds = setCode(n, updated)
-				set_cmds << cmds.first()
-				get_cmds << cmds.last()
-			} else if ((current && updated == "") || updated == "0") {
-				def cmds = deleteCode(n)
-				set_cmds << cmds.first()
-				get_cmds << cmds.last()
-			} else if (updated && updated.size() < 4) {
-				// Entered code was too short
-				codeSettings["code$n"] = current
-			}
-		} else log.warn("unexpected entry $name: $updated")
-	}
-	if (set_cmds) {
-		return response(delayBetween(set_cmds, 2200) + ["delay 2200"] + delayBetween(get_cmds, 4200))
-	}
-}
-
-def getCode(codeNumber) {
-	decrypt(state["code$codeNumber"])
-}
-
-def getAllCodes() {
-	state.findAll { it.key.startsWith 'code' }.collectEntries {
-		[it.key, (it.value instanceof String && it.value.startsWith("~")) ? decrypt(it.value) : it.value]
-	}
-}
-
-private secure(physicalgraph.zwave.Command cmd) {
-	zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
-}
-
-private secureSequence(commands, delay=4200) {
-	delayBetween(commands.collect{ secure(it) }, delay)
-}
-
-private Boolean secondsPast(timestamp, seconds) {
-	if (!(timestamp instanceof Number)) {
-		if (timestamp instanceof Date) {
-			timestamp = timestamp.time
-		} else if ((timestamp instanceof String) && timestamp.isNumber()) {
-			timestamp = timestamp.toLong()
-		} else {
-			return true
-		}
-	}
-	return (now() - timestamp) > (seconds * 1000)
-}
-
-private allCodesDeleted() {
-	if (state.codes instanceof Integer) {
-		(1..state.codes).each { n ->
-			if (state["code$n"]) {
-				result << createEvent(name: "codeReport", value: n, data: [ code: "" ], descriptionText: "code $n was deleted",
-					displayed: false, isStateChange: true)
-			}
-			state["code$n"] = ""
-		}
-	}
-}
-
-def reportAllCodes(state) {
-  def map = [ name: "reportAllCodes", data: [:], displayed: false, isStateChange: false, type: "physical" ]
-  state.each { entry ->
-    //iterate through all the state entries and add them to the event data to be handled by application event handlers
-    if ( entry.key ==~ /^code\d{1,}/ && entry.value.startsWith("~") ) {
-      map.data.put(entry.key, decrypt(entry.value))
-    } else {
-      map.data.put(entry.key, entry.value)
-    }
-  }
-  sendEvent(map)
-}