MSA-1867: LINGAN RGBW Buid Device Handlers

devicetypes/fibargroup/fibaro-door-window-sensor-zw5-with-temperature.src/fibaro-door-window-sensor-zw5-with-temperature.groovy

@@ -14,13 +14,13 @@
  *
  */
 metadata {
-	definition (name: "Fibaro Door/Window Sensor ZW5 with Temperature", namespace: "fibargroup", author: "Fibar Group S.A.", ocfDeviceType: "x.com.st.d.sensor.contact") {
+	definition (name: "Fibaro Door/Window Sensor ZW5 with Temperature", namespace: "fibargroup", author: "Fibar Group S.A.") {
 		capability "Battery"
 		capability "Contact Sensor"
 		capability "Sensor"
         capability "Configuration"
         capability "Tamper Alert"
-
+        
         capability "Temperature Measurement"
 
 		fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x85, 0x59, 0x22, 0x20, 0x80, 0x70, 0x56, 0x5A, 0x7A, 0x72, 0x8E, 0x71, 0x73, 0x98, 0x2B, 0x9C, 0x30, 0x31, 0x86", outClusters: ""
@@ -28,26 +28,26 @@ metadata {
 	}
 
 	simulator {
-
+		
 	}
-
+    
     tiles(scale: 2) {
     	multiAttributeTile(name:"FGK", type:"lighting", width:6, height:4) {//with generic type secondary control text is not displayed in Android app
         	tileAttribute("device.contact", key:"PRIMARY_CONTROL") {
             	attributeState("open", icon:"st.contact.contact.open", backgroundColor:"#e86d13")
                 attributeState("closed", icon:"st.contact.contact.closed", backgroundColor:"#00a0dc")
             }
-
+            
             tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
 				attributeState("active", label:'tamper active', backgroundColor:"#53a7c0")
 				attributeState("inactive", label:'tamper inactive', backgroundColor:"#ffffff")
-			}
+			}  
         }
-
+                
         valueTile("battery", "device.battery", inactiveLabel: false, width: 2, height: 2, decoration: "flat") {
             state "battery", label:'${currentValue}% battery', unit:""
         }
-
+        
         valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
 			state "temperature", label:'${currentValue}°',
 			backgroundColors:[
@@ -60,7 +60,7 @@ metadata {
 				[value: 96, color: "#bc2323"]
 			]
 		}
-
+        
         main "FGK"
         details(["FGK","battery", "temperature"])
     }
@@ -68,9 +68,9 @@ metadata {
 
 // parse events into attributes
 def parse(String description) {
-	log.debug "Parsing '${description}'"
+	log.debug "Parsing '${description}'"   
     def result = []
-
+    
     if (description.startsWith("Err 106")) {
 		if (state.sec) {
 			result = createEvent(descriptionText:description, displayed:false)
@@ -87,7 +87,7 @@ def parse(String description) {
 		return null
 	} else {
     	def cmd = zwave.parse(description, [0x31: 5, 0x56: 1, 0x71: 3, 0x72: 2, 0x80: 1, 0x84: 2, 0x85: 2, 0x86: 1, 0x98: 1])
-
+    
     	if (cmd) {
     		log.debug "Parsed '${cmd}'"
         	zwaveEvent(cmd)
@@ -125,13 +125,13 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm
     //(parameter 20 was not changed before device's re-inclusion)
     def map = [:]
     if (cmd.notificationType == 6) {
-    	switch (cmd.event) {
+    	switch (cmd.event) {                
         	case 22:
             	map.name = "contact"
                 map.value = "open"
                 map.descriptionText = "${device.displayName}: is open"
             	break
-
+                
             case 23:
             	map.name = "contact"
                 map.value = "closed"
@@ -145,7 +145,7 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm
                 map.value = "inactive"
                 map.descriptionText = "${device.displayName}: tamper alarm has been deactivated"
 				break
-
+                
         	case 3:
             	map.name = "tamper"
                 map.value = "active"
@@ -153,7 +153,7 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm
             	break
         }
     }
-
+    
     createEvent(map)
 }
 
@@ -166,7 +166,7 @@ def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
 	createEvent(map)
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd) {    
     def event = createEvent(descriptionText: "${device.displayName} woke up", displayed: false)
     def cmds = []
     cmds << encap(zwave.batteryV1.batteryGet())
@@ -177,32 +177,32 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd) {
     [event, response(cmds)]
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) { 
 	log.debug "manufacturerId:   ${cmd.manufacturerId}"
     log.debug "manufacturerName: ${cmd.manufacturerName}"
     log.debug "productId:        ${cmd.productId}"
     log.debug "productTypeId:    ${cmd.productTypeId}"
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.DeviceSpecificReport cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.DeviceSpecificReport cmd) { 
 	log.debug "deviceIdData:                ${cmd.deviceIdData}"
     log.debug "deviceIdDataFormat:          ${cmd.deviceIdDataFormat}"
     log.debug "deviceIdDataLengthIndicator: ${cmd.deviceIdDataLengthIndicator}"
     log.debug "deviceIdType:                ${cmd.deviceIdType}"
-
+    
     if (cmd.deviceIdType == 1 && cmd.deviceIdDataFormat == 1) {//serial number in binary format
 		String serialNumber = "h'"
-
+        
         cmd.deviceIdData.each{ data ->
         	serialNumber += "${String.format("%02X", data)}"
         }
-
+        
         updateDataValue("serialNumber", serialNumber)
         log.debug "${device.displayName} - serial number: ${serialNumber}"
     }
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.versionv1.VersionReport cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.versionv1.VersionReport cmd) {	
     updateDataValue("version", "${cmd.applicationVersion}.${cmd.applicationSubVersion}")
     log.debug "applicationVersion:      ${cmd.applicationVersion}"
     log.debug "applicationSubVersion:   ${cmd.applicationSubVersion}"
@@ -221,7 +221,7 @@ def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelR
         map.name = "temperature"
         map.displayed = true
 	}
-
+	
     createEvent(map)
 }
 
@@ -231,9 +231,9 @@ def zwaveEvent(physicalgraph.zwave.commands.deviceresetlocallyv1.DeviceResetLoca
 
 def configure() {
 	log.debug "Executing 'configure'"
-
+    
     def cmds = []
-
+        
     cmds += zwave.wakeUpV2.wakeUpIntervalSet(seconds:21600, nodeid: zwaveHubNodeId)//FGK's default wake up interval
     cmds += zwave.manufacturerSpecificV2.manufacturerSpecificGet()
     cmds += zwave.manufacturerSpecificV2.deviceSpecificGet()
@@ -242,7 +242,7 @@ def configure() {
     cmds += zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 1, scale: 0)
     cmds += zwave.associationV2.associationSet(groupingIdentifier:1, nodeId: [zwaveHubNodeId])
     cmds += zwave.wakeUpV2.wakeUpNoMoreInformation()
-
+    
     encapSequence(cmds, 500)
 }
 
@@ -261,7 +261,7 @@ private encapSequence(commands, delay=200) {
 
 private encap(physicalgraph.zwave.Command cmd) {
     def secureClasses = [0x20, 0x2B, 0x30, 0x5A, 0x70, 0x71, 0x84, 0x85, 0x8E, 0x9C]
-
+    
     //todo: check if secure inclusion was successful
     //if not do not send security-encapsulated command
 	if (secureClasses.find{ it == cmd.commandClassId }) {
@@ -269,4 +269,4 @@ private encap(physicalgraph.zwave.Command cmd) {
     } else {
     	crc16(cmd)
     }
-}
+}

devicetypes/fibargroup/fibaro-door-window-sensor-zw5.src/.st-ignore

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

devicetypes/fibargroup/fibaro-door-window-sensor-zw5.src/README.md

@@ -1,41 +0,0 @@
-# Fibaro Door Window Sensor ZW5
-
-Cloud Execution
-
-Works with: 
-
-* [Fibaro Door/Window Sensor ZW5](https://www.smartthings.com/works-with-smartthings/sensors/fibaro-doorwindow-sensor)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Battery](#battery-specification)
-* [Troubleshooting](#troubleshooting)
-
-## Capabilities
-
-* **Battery** - defines device uses a battery
-* **Contact Sensor** - can detect contact (possible values: open,closed)
-* **Sensor** - detects sensor events
-* **Tamper Alert** - detects tampers
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated
-* **Health Check** - indicates ability to get device health notifications
-
-## Device Health
-
-Fibaro Door/Window Sensor ZW5 is a Z-wave sleepy device and wakes up every 4 hours.
-Device-Watch allows 2 check-in misses from device plus some lag time. So Check-in interval = (2*4*60 + 2)mins = 482 mins.
-
-* __482min__ checkInterval
-
-## Battery Specification
-
-One 1/2AA 3.6V battery is 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:
-* [Fibaro Door/Window Sensor ZW5 Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/204075194-Fibaro-Door-Window-Sensor)

devicetypes/fibargroup/fibaro-door-window-sensor-zw5.src/fibaro-door-window-sensor-zw5.groovy

@@ -14,38 +14,37 @@
  *
  */
 metadata {
-	definition (name: "Fibaro Door/Window Sensor ZW5", namespace: "fibargroup", author: "Fibar Group S.A.", ocfDeviceType: "x.com.st.d.sensor.contact") {
+	definition (name: "Fibaro Door/Window Sensor ZW5", namespace: "fibargroup", author: "Fibar Group S.A.") {
 		capability "Battery"
 		capability "Contact Sensor"
 		capability "Sensor"
         capability "Configuration"
         capability "Tamper Alert"
-		capability "Health Check"
 
         fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x85, 0x59, 0x22, 0x20, 0x80, 0x70, 0x56, 0x5A, 0x7A, 0x72, 0x8E, 0x71, 0x73, 0x98, 0x2B, 0x9C, 0x30, 0x86, 0x84", outClusters: ""
 	}
 
 	simulator {
-
+		
 	}
-
+        
     tiles(scale: 2) {
     	multiAttributeTile(name:"FGK", type:"lighting", width:6, height:4) {//with generic type secondary control text is not displayed in Android app
         	tileAttribute("device.contact", key:"PRIMARY_CONTROL") {
             	attributeState("open", icon:"st.contact.contact.open", backgroundColor:"#e86d13")
                 attributeState("closed", icon:"st.contact.contact.closed", backgroundColor:"#00a0dc")
             }
-
+            
             tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
 				attributeState("active", label:'tamper active', backgroundColor:"#53a7c0")
 				attributeState("inactive", label:'tamper inactive', backgroundColor:"#ffffff")
-			}
+			}  
         }
-
+                
         valueTile("battery", "device.battery", inactiveLabel: false, width: 2, height: 2, decoration: "flat") {
             state "battery", label:'${currentValue}% battery', unit:""
         }
-
+        
         main "FGK"
         details(["FGK","battery"])
     }
@@ -53,9 +52,9 @@ metadata {
 
 // parse events into attributes
 def parse(String description) {
-	log.debug "Parsing '${description}'"
+	log.debug "Parsing '${description}'"   
     def result = []
-
+    
     if (description.startsWith("Err 106")) {
 		if (state.sec) {
 			result = createEvent(descriptionText:description, displayed:false)
@@ -72,7 +71,7 @@ def parse(String description) {
 		return null
 	} else {
     	def cmd = zwave.parse(description, [0x56: 1, 0x71: 3, 0x72: 2, 0x80: 1, 0x84: 2, 0x85: 2, 0x86: 1, 0x98: 1])
-
+    
     	if (cmd) {
     		log.debug "Parsed '${cmd}'"
         	zwaveEvent(cmd)
@@ -110,13 +109,13 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm
     //(parameter 20 was not changed before device's re-inclusion)
     def map = [:]
     if (cmd.notificationType == 6) {
-    	switch (cmd.event) {
+    	switch (cmd.event) {                
         	case 22:
             	map.name = "contact"
                 map.value = "open"
                 map.descriptionText = "${device.displayName}: is open"
             	break
-
+                
             case 23:
             	map.name = "contact"
                 map.value = "closed"
@@ -130,7 +129,7 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm
                 map.value = "inactive"
                 map.descriptionText = "${device.displayName}: tamper alarm has been deactivated"
 				break
-
+                
         	case 3:
             	map.name = "tamper"
                 map.value = "active"
@@ -138,7 +137,7 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm
             	break
         }
     }
-
+    
     createEvent(map)
 }
 
@@ -151,7 +150,7 @@ def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
 	createEvent(map)
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd) {    
     def event = createEvent(descriptionText: "${device.displayName} woke up", displayed: false)
     def cmds = []
     cmds << encap(zwave.batteryV1.batteryGet())
@@ -160,32 +159,32 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd) {
     [event, response(cmds)]
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) { 
 	log.debug "manufacturerId:   ${cmd.manufacturerId}"
     log.debug "manufacturerName: ${cmd.manufacturerName}"
     log.debug "productId:        ${cmd.productId}"
     log.debug "productTypeId:    ${cmd.productTypeId}"
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.DeviceSpecificReport cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.DeviceSpecificReport cmd) { 
 	log.debug "deviceIdData:                ${cmd.deviceIdData}"
     log.debug "deviceIdDataFormat:          ${cmd.deviceIdDataFormat}"
     log.debug "deviceIdDataLengthIndicator: ${cmd.deviceIdDataLengthIndicator}"
     log.debug "deviceIdType:                ${cmd.deviceIdType}"
-
+    
     if (cmd.deviceIdType == 1 && cmd.deviceIdDataFormat == 1) {//serial number in binary format
 		String serialNumber = "h'"
-
+        
         cmd.deviceIdData.each{ data ->
         	serialNumber += "${String.format("%02X", data)}"
         }
-
+        
         updateDataValue("serialNumber", serialNumber)
         log.debug "${device.displayName} - serial number: ${serialNumber}"
     }
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.versionv1.VersionReport cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.versionv1.VersionReport cmd) {	
     updateDataValue("version", "${cmd.applicationVersion}.${cmd.applicationSubVersion}")
     log.debug "applicationVersion:      ${cmd.applicationVersion}"
     log.debug "applicationSubVersion:   ${cmd.applicationSubVersion}"
@@ -200,11 +199,9 @@ def zwaveEvent(physicalgraph.zwave.commands.deviceresetlocallyv1.DeviceResetLoca
 
 def configure() {
 	log.debug "Executing 'configure'"
-	// Device wakes up every 4 hours, this interval allows us to miss one wakeup notification before marking offline
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-
+    
     def cmds = []
-
+    
     cmds += zwave.wakeUpV2.wakeUpIntervalSet(seconds:21600, nodeid: zwaveHubNodeId)//FGK's default wake up interval
     cmds += zwave.manufacturerSpecificV2.manufacturerSpecificGet()
     cmds += zwave.manufacturerSpecificV2.deviceSpecificGet()
@@ -212,7 +209,7 @@ def configure() {
     cmds += zwave.batteryV1.batteryGet()
     cmds += zwave.associationV2.associationSet(groupingIdentifier:1, nodeId: [zwaveHubNodeId])
     cmds += zwave.wakeUpV2.wakeUpNoMoreInformation()
-
+    
     encapSequence(cmds, 500)
 }
 
@@ -231,7 +228,7 @@ private encapSequence(commands, delay=200) {
 
 private encap(physicalgraph.zwave.Command cmd) {
     def secureClasses = [0x20, 0x2B, 0x30, 0x5A, 0x70, 0x71, 0x84, 0x85, 0x8E, 0x9C]
-
+    
     //todo: check if secure inclusion was successful
     //if not do not send security-encapsulated command
 	if (secureClasses.find{ it == cmd.commandClassId }) {
@@ -239,4 +236,4 @@ private encap(physicalgraph.zwave.Command cmd) {
     } else {
     	crc16(cmd)
     }
-}
+}

devicetypes/fibargroup/fibaro-flood-sensor-zw5.src/fibaro-flood-sensor-zw5.groovy

@@ -14,7 +14,7 @@
  *
  */
 metadata {
-	definition (name: "Fibaro Flood Sensor ZW5", namespace: "fibargroup", author: "Fibar Group S.A.", ocfDeviceType: "x.com.st.d.sensor.moisture") {
+	definition (name: "Fibaro Flood Sensor ZW5", namespace: "fibargroup", author: "Fibar Group S.A.") {
 		capability "Battery"
 		capability "Configuration"
 		capability "Sensor"
@@ -37,13 +37,13 @@ metadata {
 				attributeState("dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff")
 				attributeState("wet", icon:"st.alarm.water.wet", backgroundColor:"#00a0dc")
 			}
-
+			
 			tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
 				attributeState("active", label:'tamper active', backgroundColor:"#cccccc")
 				attributeState("inactive", label:'tamper inactive', backgroundColor:"#00A0DC")
 			}
 		}
-
+		
 		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
 			state "temperature", label:'${currentValue}°',
 			backgroundColors:[
@@ -130,14 +130,14 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd)
 	[event, response(cmds)]
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) { 
 	log.debug "manufacturerId:   ${cmd.manufacturerId}"
 	log.debug "manufacturerName: ${cmd.manufacturerName}"
 	log.debug "productId:        ${cmd.productId}"
 	log.debug "productTypeId:    ${cmd.productTypeId}"
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.DeviceSpecificReport cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.DeviceSpecificReport cmd) { 
 	log.debug "deviceIdData:                ${cmd.deviceIdData}"
 	log.debug "deviceIdDataFormat:          ${cmd.deviceIdDataFormat}"
 	log.debug "deviceIdDataLengthIndicator: ${cmd.deviceIdDataLengthIndicator}"

devicetypes/fibargroup/fibaro-motion-sensor-zw5.src/fibaro-motion-sensor-zw5.groovy

@@ -14,7 +14,7 @@
  *
  */
 metadata {
-	definition (name: "Fibaro Motion Sensor ZW5", namespace: "fibargroup", author: "Fibar Group S.A.", ocfDeviceType: "x.com.st.d.sensor.motion") {
+	definition (name: "Fibaro Motion Sensor ZW5", namespace: "fibargroup", author: "Fibar Group S.A.") {
 		capability "Battery"
 		capability "Configuration"
 		capability "Illuminance Measurement"
@@ -23,27 +23,27 @@ metadata {
 		capability "Tamper Alert"
 		capability "Temperature Measurement"
 		capability "Health Check"
-
+        
         fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x20, 0x86, 0x72, 0x5A, 0x59, 0x85, 0x73, 0x84, 0x80, 0x71, 0x56, 0x70, 0x31, 0x8E, 0x22, 0x30, 0x9C, 0x98, 0x7A", outClusters: ""
 	}
-
+    
 	simulator {
-
+		
     }
-
+    
     tiles(scale: 2) {
     	multiAttributeTile(name:"FGMS", type:"lighting", width:6, height:4) {//with generic type secondary control text is not displayed in Android app
         	tileAttribute("device.motion", key:"PRIMARY_CONTROL") {
             	attributeState("inactive", label:"no motion", icon:"st.motion.motion.inactive", backgroundColor:"#79b821")
-            	attributeState("active", label:"motion", icon:"st.motion.motion.active", backgroundColor:"#ffa81e")
+            	attributeState("active", label:"motion", icon:"st.motion.motion.active", backgroundColor:"#ffa81e")   
             }
-
+            
             tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
 				attributeState("active", label:'tamper active', backgroundColor:"#00a0dc")
 				attributeState("inactive", label:'tamper inactive', backgroundColor:"#cccccc")
-			}
+			}  
         }
-
+        
         valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
 			state "temperature", label:'${currentValue}°',
 			backgroundColors:[
@@ -56,15 +56,15 @@ metadata {
 				[value: 96, color: "#bc2323"]
 			]
 		}
-
+        
         valueTile("illuminance", "device.illuminance", inactiveLabel: false, width: 2, height: 2) {
 			state "luminosity", label:'${currentValue} ${unit}', unit:"lux"
 		}
-
+        
         valueTile("battery", "device.battery", inactiveLabel: false, width: 2, height: 2, decoration: "flat") {
             state "battery", label:'${currentValue}% battery', unit:""
         }
-
+        
         main "FGMS"
         details(["FGMS","battery","temperature","illuminance"])
     }
@@ -72,9 +72,9 @@ metadata {
 
 // parse events into attributes
 def parse(String description) {
-	log.debug "Parsing '${description}'"
+	log.debug "Parsing '${description}'"        
     def result = []
-
+    
     if (description.startsWith("Err 106")) {
 		if (state.sec) {
 			result = createEvent(descriptionText:description, displayed:false)
@@ -91,7 +91,7 @@ def parse(String description) {
 		return null
 	} else {
     	def cmd = zwave.parse(description, [0x31: 5, 0x56: 1, 0x71: 3, 0x72: 2, 0x80: 1, 0x84: 2, 0x85: 2, 0x86: 1, 0x98: 1])
-
+    
     	if (cmd) {
     		log.debug "Parsed '${cmd}'"
         	zwaveEvent(cmd)
@@ -159,13 +159,13 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm
                     map.descriptionText = "${device.displayName}: motion has stopped"
                 }
         		break
-
+                
         	case 3:
             	map.name = "tamper"
                 map.value = "active"
                 map.descriptionText = "${device.displayName}: tamper alarm activated"
             	break
-
+                
             case 8:
                 map.name = "motion"
                 map.value = "active"
@@ -173,7 +173,7 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm
                 break
         }
     }
-
+    
     createEvent(map)
 }
 
@@ -194,39 +194,39 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv2.WakeUpNotification cmd)
     cmds << "delay 500"
     cmds << encap(zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 1, scale: 0))
     cmds << "delay 500"
-    cmds << encap(zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 3, scale: 1))
+    cmds << encap(zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 3, scale: 1))     
     cmds << "delay 1200"
     cmds << encap(zwave.wakeUpV1.wakeUpNoMoreInformation())
     [event, response(cmds)]
-
+    
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) { 
 	log.debug "manufacturerId:   ${cmd.manufacturerId}"
     log.debug "manufacturerName: ${cmd.manufacturerName}"
     log.debug "productId:        ${cmd.productId}"
     log.debug "productTypeId:    ${cmd.productTypeId}"
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.DeviceSpecificReport cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.DeviceSpecificReport cmd) { 
 	log.debug "deviceIdData:                ${cmd.deviceIdData}"
     log.debug "deviceIdDataFormat:          ${cmd.deviceIdDataFormat}"
     log.debug "deviceIdDataLengthIndicator: ${cmd.deviceIdDataLengthIndicator}"
     log.debug "deviceIdType:                ${cmd.deviceIdType}"
-
+    
     if (cmd.deviceIdType == 1 && cmd.deviceIdDataFormat == 1) {//serial number in binary format
 		String serialNumber = "h'"
-
+        
         cmd.deviceIdData.each{ data ->
         	serialNumber += "${String.format("%02X", data)}"
         }
-
+        
         updateDataValue("serialNumber", serialNumber)
         log.debug "${device.displayName} - serial number: ${serialNumber}"
     }
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.versionv1.VersionReport cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.versionv1.VersionReport cmd) {	
     updateDataValue("version", "${cmd.applicationVersion}.${cmd.applicationSubVersion}")
     log.debug "applicationVersion:      ${cmd.applicationVersion}"
     log.debug "applicationSubVersion:   ${cmd.applicationSubVersion}"
@@ -245,7 +245,7 @@ def configure() {
 	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 
     def cmds = []
-
+    
     cmds += zwave.wakeUpV2.wakeUpIntervalSet(seconds: 7200, nodeid: zwaveHubNodeId)//FGMS' default wake up interval
     cmds += zwave.manufacturerSpecificV2.manufacturerSpecificGet()
     cmds += zwave.manufacturerSpecificV2.deviceSpecificGet()
@@ -255,7 +255,7 @@ def configure() {
     cmds += zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 1, scale: 0)
     cmds += zwave.sensorMultilevelV5.sensorMultilevelGet(sensorType: 3, scale: 1)
     cmds += zwave.wakeUpV2.wakeUpNoMoreInformation()
-
+    
     encapSequence(cmds, 500)
 }
 

devicetypes/smartthings/aeon-multisensor-gen5.src/aeon-multisensor-gen5.groovy

@@ -100,11 +100,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])

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

@@ -58,11 +58,6 @@ metadata {
  }
 }
 
-def installed() {
-// Device-Watch simply pings if no device events received for 32min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-}
-
 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])

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

@@ -15,7 +15,7 @@
  */
 
 metadata {
-    definition (name: "Cree Bulb", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
+    definition (name: "Cree Bulb", namespace: "smartthings", author: "SmartThings") {
 
         capability "Actuator"
         capability "Configuration"

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

@@ -12,7 +12,7 @@
  *
  */
 metadata {
-	definition (name: "Dimmer Switch", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.switch") {
+	definition (name: "Dimmer Switch", namespace: "smartthings", author: "SmartThings") {
 		capability "Switch Level"
 		capability "Actuator"
 		capability "Indicator"
@@ -84,11 +84,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])

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

@@ -43,8 +43,8 @@ metadata {
 	}
 
 	tiles {
-		standardTile("temperature", "device.temperature", width: 2, height: 2, decoration: "flat") {
-			state("temperature", label:'${currentValue}°', unit:"F", icon: "st.thermostat.ac.air-conditioning",
+		valueTile("temperature", "device.temperature", width: 2, height: 2) {
+			state("temperature", label:'${currentValue}°', unit:"F",
 					backgroundColors:[
 							// Celsius
 							[value: 0, color: "#153591"],
@@ -70,7 +70,7 @@ metadata {
 			state "heat", action:"switchMode",  nextState: "updating", icon: "st.thermostat.heat"
 			state "cool", action:"switchMode",  nextState: "updating", icon: "st.thermostat.cool"
 			state "auto", action:"switchMode",  nextState: "updating", icon: "st.thermostat.auto"
-			state "emergency heat", action:"switchMode", icon: "st.thermostat.emergency-heat" // emergency heat = auxHeatOnly
+			state "emergency heat", label:"auxHeatOnly", action:"switchMode", icon: "st.thermostat.emergency-heat" // emergency heat = auxHeatOnly
 			state "updating", label:"Working", icon: "st.secondary.secondary"
 		}
 		standardTile("fanMode", "device.thermostatFanMode", inactiveLabel: false, decoration: "flat") {
@@ -185,11 +185,6 @@ def generateEvent(Map results) {
 				isChange = isStateChange(device, name, value.toString())
 				event['isStateChange'] = isChange
 				event['displayed'] = false
-			} else if (name == "thermostatMode") {
-				def mode = value.toString()
-				mode = (mode == "auxHeatOnly") ? "emergency heat" : mode
-				isChange = isStateChange(device, name, mode)
-				event << [value: mode, isStateChange: isChange, displayed: isDisplayed]
 			} else {
 				isChange = isStateChange(device, name, value.toString())
 				isDisplayed = isChange

devicetypes/smartthings/econet-vent.src/econet-vent.groovy

@@ -85,11 +85,6 @@ def parse(String description) {
     result
 }
 
-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])
-}
-
 //send the command to stop polling
 def updated() {
 	// Device-Watch simply pings if no device events received for 32min(checkInterval)

devicetypes/smartthings/everspring-flood-sensor.src/.st-ignore

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

devicetypes/smartthings/everspring-flood-sensor.src/README.md

@@ -1,40 +0,0 @@
-# Everspring Flood Sensor
-
-Cloud Execution
-
-Works with: 
-
-* [Everspring Water Detector](https://www.smartthings.com/works-with-smartthings/sensors/everspring-water-detector)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Battery](#battery-specification)
-* [Troubleshooting](#troubleshooting)
-
-## Capabilities
-
-* **Water Sensor** - can detect presence of water (dry or wet)
-* **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
-
-Everspring Water Detector is a Z-wave sleepy device and wakes up every 4 hours.
-Device-Watch allows 2 check-in misses from device plus some lag time. So Check-in interval = (2*4*60 + 2)mins = 482 mins.
-
-* __482min__ checkInterval
-
-## Battery Specification
-
-Three AA 1.5V 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:
-* [Everspring Water Detector Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202088304-Everspring-Water-Detector)

devicetypes/smartthings/everspring-flood-sensor.src/everspring-flood-sensor.groovy

@@ -12,12 +12,11 @@
  *
  */
 metadata {
-	definition (name: "Everspring Flood Sensor", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.moisture") {
+	definition (name: "Everspring Flood Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Water Sensor"
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
-		capability "Health Check"
 
 		fingerprint deviceId: "0xA102", inClusters: "0x86,0x72,0x85,0x84,0x80,0x70,0x9C,0x20,0x71"
 	}
@@ -29,7 +28,7 @@ metadata {
 			status "battery ${i}%": new physicalgraph.zwave.Zwave().batteryV1.batteryReport(batteryLevel: i).incomingMessage()
 		}
 	}
-
+	
 	tiles(scale: 2) {
 		multiAttributeTile(name:"water", type: "generic", width: 6, height: 4){
 			tileAttribute ("device.water", key: "PRIMARY_CONTROL") {
@@ -139,8 +138,6 @@ def zwaveEvent(physicalgraph.zwave.Command cmd)
 
 def configure()
 {
-	// Device wakes up every 4 hours, this interval allows us to miss one wakeup notification before marking offline
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 	if (!device.currentState("battery")) {
 		sendEvent(name: "battery", value:100, unit:"%", descriptionText:"(Default battery event)", displayed:false)
 	}

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

@@ -29,7 +29,7 @@
  * 2.	20150125	Todd Wackford
  *		Leaned out parse and moved most device info getting into configuration method.
  */
-
+ 
  /**
  * Sets up metadata, simulator info and tile definition.
  *
@@ -38,7 +38,7 @@
  * @return none
  */
  metadata {
-	definition (name: "Fibaro Motion Sensor", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.motion") {
+	definition (name: "Fibaro Motion Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability 	"Motion Sensor"
 		capability 	"Temperature Measurement"
 		capability 	"Acceleration Sensor"
@@ -47,7 +47,7 @@
 		capability 	"Sensor"
 		capability 	"Battery"
 		capability  "Health Check"
-
+        
         command		"resetParams2StDefaults"
         command		"listCurrentParams"
         command		"updateZwaveParam"
@@ -110,7 +110,7 @@
 			state("active", label:'vibration', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
 			state("inactive", label:'still', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff")
 		}
-
+        
 
 		main(["motion", "temperature", "acceleration", "illuminance"])
 		details(["motion", "temperature", "acceleration", "battery", "illuminance", "configure"])
@@ -130,18 +130,18 @@ def configure() {
 	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 
     def cmds = []
-
+    
     // send associate to group 3 to get sensor data reported only to hub
     cmds << zwave.associationV2.associationSet(groupingIdentifier:3, nodeId:[zwaveHubNodeId]).format()
 
 	// turn on tamper sensor with active/inactive reports (use it as an acceleration sensor) default is 0, or off
 	cmds << zwave.configurationV1.configurationSet(configurationValue: [4], parameterNumber: 24, size: 1).format()
     cmds << zwave.configurationV1.configurationGet(parameterNumber: 24).format()
-
+        
     // temperature change report threshold (0-255 = 0.1 to 25.5C) default is 1.0 Celcius, setting to .5 Celcius
     cmds << zwave.configurationV1.configurationSet(configurationValue: [5], parameterNumber: 60, size: 1).format()
-    cmds << zwave.configurationV1.configurationGet(parameterNumber: 60).format()
-
+    cmds << zwave.configurationV1.configurationGet(parameterNumber: 60).format() 
+    
     cmds << response(zwave.batteryV1.batteryGet())
     cmds << response(zwave.versionV1.versionGet().format())
     cmds << response(zwave.manufacturerSpecificV2.manufacturerSpecificGet().format())
@@ -155,20 +155,20 @@ def parse(String description)
 {
 	def result = []
 	def cmd = zwave.parse(description, [0x72: 2, 0x31: 2, 0x30: 1, 0x84: 1, 0x9C: 1, 0x70: 2, 0x80: 1, 0x86: 1, 0x7A: 1, 0x56: 1])
-
+    
     if (description == "updated") {
         result << response(zwave.wakeUpV1.wakeUpIntervalSet(seconds: 7200, nodeid:zwaveHubNodeId))
-		result << response(zwave.manufacturerSpecificV2.manufacturerSpecificGet())
+		result << response(zwave.manufacturerSpecificV2.manufacturerSpecificGet())            
 	}
-
+    
 	if (cmd) {
-		if( cmd.CMD == "8407" ) {
+		if( cmd.CMD == "8407" ) { 
             result << response(zwave.batteryV1.batteryGet().format())
-        	result << new physicalgraph.device.HubAction(zwave.wakeUpV1.wakeUpNoMoreInformation().format())
+        	result << new physicalgraph.device.HubAction(zwave.wakeUpV1.wakeUpNoMoreInformation().format()) 
         }
 		result << createEvent(zwaveEvent(cmd))
 	}
-
+    
     if ( result[0] != null ) {
 		log.debug "Parse returned ${result}"
 		result
@@ -189,14 +189,14 @@ def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd)
 	}
 }
 
-def createEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd, Map item1) {
+def createEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd, Map item1) { 
 	log.debug "manufacturerId:   ${cmd.manufacturerId}"
     log.debug "manufacturerName: ${cmd.manufacturerName}"
     log.debug "productId:        ${cmd.productId}"
     log.debug "productTypeId:    ${cmd.productTypeId}"
 }
 
-def createEvent(physicalgraph.zwave.commands.versionv1.VersionReport cmd, Map item1) {
+def createEvent(physicalgraph.zwave.commands.versionv1.VersionReport cmd, Map item1) {	
     updateDataValue("applicationVersion", "${cmd.applicationVersion}")
     log.debug "applicationVersion:      ${cmd.applicationVersion}"
     log.debug "applicationSubVersion:   ${cmd.applicationSubVersion}"
@@ -205,7 +205,7 @@ def createEvent(physicalgraph.zwave.commands.versionv1.VersionReport cmd, Map it
     log.debug "zWaveProtocolSubVersion: ${cmd.zWaveProtocolSubVersion}"
 }
 
-def createEvent(physicalgraph.zwave.commands.firmwareupdatemdv1.FirmwareMdReport cmd, Map item1) {
+def createEvent(physicalgraph.zwave.commands.firmwareupdatemdv1.FirmwareMdReport cmd, Map item1) { 
     log.debug "checksum:       ${cmd.checksum}"
     log.debug "firmwareId:     ${cmd.firmwareId}"
     log.debug "manufacturerId: ${cmd.manufacturerId}"
@@ -304,7 +304,7 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
 	def msr = String.format("%04X-%04X-%04X", cmd.manufacturerId, cmd.productTypeId, cmd.productId)
 	log.debug "msr: $msr"
     updateDataValue("MSR", msr)
-
+    
     if ( msr == "010F-0800-2001" ) { //this is the msr and device type for the fibaro motion sensor
     	configure()
     }
@@ -334,7 +334,7 @@ def test() {
  * @return none
  */
 def updateZwaveParam(params) {
-	if ( params ) {
+	if ( params ) {   
         def pNumber = params.paramNumber
         def pSize	= params.size
         def pValue	= [params.value]
@@ -344,7 +344,7 @@ def updateZwaveParam(params) {
 		def cmds = []
         cmds << zwave.configurationV1.configurationSet(configurationValue: pValue, parameterNumber: pNumber, size: pSize).format()
         cmds << zwave.configurationV1.configurationGet(parameterNumber: pNumber).format()
-        delayBetween(cmds, 1000)
+        delayBetween(cmds, 1000)        
     }
 }
 
@@ -388,13 +388,13 @@ def resetParams2StDefaults() {
     cmds << zwave.configurationV1.configurationSet(configurationValue: [18], parameterNumber: 86, size: 1).format()
     cmds << zwave.configurationV1.configurationSet(configurationValue: [28], parameterNumber: 87, size: 1).format()
     cmds << zwave.configurationV1.configurationSet(configurationValue: [1], parameterNumber: 89, size: 1).format()
-
+    
     delayBetween(cmds, 500)
 }
 
  /**
- * Lists all of available Fibaro parameters and thier current settings out to the
- * logging window in the IDE This will be called from the "Fibaro Tweaker" or
+ * Lists all of available Fibaro parameters and thier current settings out to the 
+ * logging window in the IDE This will be called from the "Fibaro Tweaker" or 
  * user's own app.
  *
  * <p>THIS IS AN ADVANCED OPERATION. USE AT YOUR OWN RISK! READ OEM DOCUMENTATION!
@@ -433,6 +433,7 @@ def listCurrentParams() {
     cmds << zwave.configurationV1.configurationGet(parameterNumber: 86).format()
     cmds << zwave.configurationV1.configurationGet(parameterNumber: 87).format()
     cmds << zwave.configurationV1.configurationGet(parameterNumber: 89).format()
-
+    
 	delayBetween(cmds, 500)
 }
+

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

@@ -50,11 +50,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])

devicetypes/smartthings/ge-link-bulb.src/ge-link-bulb.groovy

@@ -42,7 +42,7 @@
  */
 
 metadata {
-    definition (name: "GE Link Bulb", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
+    definition (name: "GE Link Bulb", namespace: "smartthings", author: "SmartThings") {
 
         capability "Actuator"
         capability "Configuration"

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

@@ -57,18 +57,8 @@ metadata {
 	}
 }
 
-def initialize() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
-}
-
 void installed() {
-	log.debug "installed()"
-	initialize()
-}
-
-def updated() {
-	log.debug "updated()"
-	initialize()
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
 }
 
 // parse events into attributes

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

@@ -45,18 +45,8 @@ metadata {
 	}
 }
 
-def initialize() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
-}
-
 void installed() {
-	log.debug "installed()"
-	initialize()
-}
-
-def updated() {
-	log.debug "updated()"
-	initialize()
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
 }
 
 // parse events into attributes

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

@@ -66,18 +66,8 @@ metadata {
 	}
 }
 
-def initialize() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
-}
-
 void installed() {
-	log.debug "installed()"
-	initialize()
-}
-
-def updated() {
-	log.debug "updated()"
-	initialize()
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
 }
 
 // parse events into attributes

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

@@ -50,17 +50,8 @@ metadata {
     }
 }
 
-def initialize() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
-}
-
 void installed() {
-	log.debug "installed()"
-	initialize()
-}
-
-def updated() {
-	initialize()
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
 }
 
 // parse events into attributes

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

@@ -55,18 +55,8 @@ metadata {
     }
 }
 
-def initialize() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
-}
-
 void installed() {
-    log.debug "installed()"
-    initialize()
-}
-
-def updated() {
-    log.debug "updated()"
-    initialize()
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
 }
 
 // parse events into attributes

devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy

@@ -5,7 +5,7 @@
  *
  */
 metadata {
-	definition (name: "LIFX Color Bulb", namespace: "smartthings", author: "LIFX", ocfDeviceType: "oic.d.light") {
+	definition (name: "LIFX Color Bulb", namespace: "smartthings", author: "LIFX") {
 		capability "Actuator"
 		capability "Color Control"
 		capability "Color Temperature"
@@ -64,18 +64,8 @@ metadata {
 	}
 }
 
-def initialize() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"cloud\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device?.hub?.hardwareID}\"}", displayed: false)
-}
-
 void installed() {
-	log.debug "installed()"
-	initialize()
-}
-
-def updated() {
-	log.debug "updated()"
-	initialize()
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"cloud\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device?.hub?.hardwareID}\"}")
 }
 
 // handle commands
@@ -200,7 +190,7 @@ def off() {
 
 def refresh() {
 	log.debug "Executing 'refresh'"
-
+	
 	def resp = parent.apiGET("/lights/${selector()}")
 	if (resp.status == 404) {
 		state.online = false

devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy

@@ -5,7 +5,7 @@
  *
  */
 metadata {
-	definition (name: "LIFX White Bulb", namespace: "smartthings", author: "LIFX", ocfDeviceType: "oic.d.light") {
+	definition (name: "LIFX White Bulb", namespace: "smartthings", author: "LIFX") {
 		capability "Actuator"
 		capability "Color Temperature"
 		capability "Switch"
@@ -55,18 +55,8 @@ metadata {
 	}
 }
 
-def initialize() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"cloud\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device?.hub?.hardwareID}\"}", displayed: false)
-}
-
 void installed() {
-	log.debug "installed()"
-	initialize()
-}
-
-def updated() {
-	log.debug "updated()"
-	initialize()
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"cloud\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device?.hub?.hardwareID}\"}")
 }
 
 // handle commands
@@ -129,7 +119,7 @@ def off() {
 
 def refresh() {
 	log.debug "Executing 'refresh'"
-
+	
 	def resp = parent.apiGET("/lights/${selector()}")
 	if (resp.status == 404) {
 		state.online = false

devicetypes/smartthings/logitech-harmony-hub-c2c.src/logitech-harmony-hub-c2c.groovy

@@ -1,4 +1,3 @@
-import groovy.json.JsonOutput
 /**
  *  Logitech Harmony Hub
  *
@@ -40,18 +39,14 @@ metadata {
 	}
 }
 
-def initialize() {
-	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "cloud", scheme:"untracked"]), displayed: false)
-}
-
 def installed() {
 	log.debug "installed()"
-	initialize()
+	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "cloud", scheme:"untracked"]), displayed: false)
 }
 
 def updated() {
 	log.debug "updated()"
-	initialize()
+	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "cloud", scheme:"untracked"]), displayed: false)
 }
 
 def startActivity(String activityId) {

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

@@ -12,7 +12,7 @@
  *
  */
 metadata {
-	definition (name: "Open/Closed Sensor", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.contact") {
+	definition (name: "Open/Closed Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Contact Sensor"
 		capability "Sensor"
 
@@ -44,7 +44,7 @@ def parse(String description) {
 	if (description.startsWith("zone")) {
 		resMap = createEvent(name: "contact", value: zigbee.parseZoneStatus(description).isAlarm1Set() ? "open" : "closed")
 	}
-
+	
 	log.debug "Parse returned $resMap"
 	return resMap
 }

devicetypes/smartthings/rgbw-light.src/rgbw-light.groovy

@@ -17,7 +17,7 @@
  */
 
 metadata {
-	definition (name: "RGBW Light", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
+	definition (name: "RGBW Light", namespace: "smartthings", author: "SmartThings") {
 		capability "Switch Level"
 		capability "Color Control"
 		capability "Color Temperature"

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

@@ -91,11 +91,6 @@ def parse(String description) {
 	return result
 }
 
-def installed() {
-	// Device-Watch simply pings if no device events received for 482min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 4 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-}
-
 def updated() {
 	// Device-Watch simply pings if no device events received for 482min(checkInterval)
 	sendEvent(name: "checkInterval", value: 2 * 4 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])

devicetypes/smartthings/sylvania-ultra-iq.src/sylvania-ultra-iq.groovy

@@ -15,7 +15,7 @@
 //DEPRECATED - Using the generic DTH for this device. Users need to be moved before deleting this DTH
 
 metadata {
-	definition (name: "Sylvania Ultra iQ", namespace:"smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
+	definition (name: "Sylvania Ultra iQ", namespace:"smartthings", author: "SmartThings") {
 		capability "Switch Level"
 		capability "Configuration"
 		capability "Switch"

devicetypes/smartthings/testing/simulated-refrigerator-door.src/simulated-refrigerator-door.groovy

@@ -1,57 +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.
- *
- */
-metadata {
-	definition (name: "Simulated Refrigerator Door", namespace: "smartthings/testing", author: "SmartThings") {
-		capability "Contact Sensor"
-		capability "Sensor"
-
-		command "open"
-		command "close"
-	}
-
-	tiles {
-		standardTile("contact", "device.contact", width: 2, height: 2) {
-			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821", action: "open")
-			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e", action: "close")
-		}
-		standardTile("freezerDoor", "device.contact", width: 2, height: 2, decoration: "flat") {
-			state("closed", label:'Freezer', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
-			state("open", label:'Freezer', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
-		}
-		standardTile("mainDoor", "device.contact", width: 2, height: 2, decoration: "flat") {
-			state("closed", label:'Fridge', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
-			state("open", label:'Fridge', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
-		}
-		standardTile("control", "device.contact", width: 1, height: 1, decoration: "flat") {
-			state("closed", label:'${name}', icon:"st.contact.contact.closed", action: "open")
-			state("open", label:'${name}', icon:"st.contact.contact.open", action: "close")
-		}
-		main "contact"
-		details "contact"
-	}
-}
-
-def installed() {
-	sendEvent(name: "contact", value: "closed")
-}
-
-def open() {
-	sendEvent(name: "contact", value: "open")
-	parent.doorOpen(device.deviceNetworkId)
-}
-
-def close() {
-	sendEvent(name: "contact", value: "closed")
-	parent.doorClosed(device.deviceNetworkId)
-}

devicetypes/smartthings/testing/simulated-refrigerator-temperature-control.src/simulated-refrigerator-temperature-control.groovy

@@ -1,94 +0,0 @@
-/**
- *  Simulated Refrigerator Temperature Control
- *
- *  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.
- *
- */
-metadata {
-	definition (name: "Simulated Refrigerator Temperature Control", namespace: "smartthings/testing", author: "SmartThings") {
-		capability "Temperature Measurement"
-		capability "Thermostat Cooling Setpoint"
-
-		command "tempUp"
-		command "tempDown"
-		command "setpointUp"
-		command "setpointDown"
-	}
-
-	tiles {
-		valueTile("refrigerator", "device.temperature", width: 2, height: 2, canChangeBackground: true) {
-			state("temperature", label:'${currentValue}°', unit:"F",
-					backgroundColors:[
-							[value: 0, color: "#153591"],
-							[value: 40, color: "#1e9cbb"],
-							[value: 45, color: "#f1d801"]
-					]
-			)
-		}
-		valueTile("freezer", "device.temperature", width: 2, height: 2, canChangeBackground: true) {
-			state("temperature", label:'${currentValue}°', unit:"F",
-					backgroundColors:[
-							[value: 0, color: "#153591"],
-							[value: 5, color: "#1e9cbb"],
-							[value: 15, color: "#f1d801"]
-					]
-			)
-		}
-		valueTile("freezerSetpoint", "device.coolingSetpoint", inactiveLabel: false, decoration: "flat") {
-			state "setpoint", label:'Freezer Set: ${currentValue}°', unit:"F"
-		}
-		valueTile("refrigeratorSetpoint", "device.coolingSetpoint", inactiveLabel: false, decoration: "flat") {
-			state "heat", label:'Fridge Set: ${currentValue}°', unit:"F"
-		}
-		standardTile("tempUp", "device.temperature", inactiveLabel: false, decoration: "flat") {
-			state "default", action:"tempUp", icon:"st.thermostat.thermostat-up"
-		}
-		standardTile("tempDown", "device.temperature", inactiveLabel: false, decoration: "flat") {
-			state "default", action:"tempDown", icon:"st.thermostat.thermostat-down"
-		}
-		standardTile("setpointUp", "device.coolingSetpoint", inactiveLabel: false, decoration: "flat") {
-			state "default", action:"setpointUp", icon:"st.thermostat.thermostat-up"
-		}
-		standardTile("setpointDown", "device.coolingSetpoint", inactiveLabel: false, decoration: "flat") {
-			state "default", action:"setpointDown", icon:"st.thermostat.thermostat-down"
-		}
-	}
-}
-
-def installed() {
-	sendEvent(name: "temperature", value: device.componentName == "freezer" ? 2 : 40)
-	sendEvent(name: "coolingSetpoint", value: device.componentName == "freezer" ? 2 : 40)
-}
-
-def updated() {
-	installed()
-}
-
-void tempUp() {
-	def value = device.currentValue("temperature") as Integer
-	sendEvent(name: "temperature", value: value + 1)
-}
-
-void tempDown() {
-	def value = device.currentValue("temperature") as Integer
-	sendEvent(name: "temperature", value: value - 1)
-}
-
-void setpointUp() {
-	def value = device.currentValue("coolingSetpoint") as Integer
-	sendEvent(name: "coolingSetpoint", value: value + 1)
-}
-
-void setpointDown() {
-	def value = device.currentValue("coolingSetpoint") as Integer
-	sendEvent(name: "coolingSetpoint", value: value - 1)
-}

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

@@ -1,91 +0,0 @@
-/**
- *  Simulated Refrigerator
- *
- *  Example composite device handler that simulates a refrigerator with a freezer compartment and a main compartment.
- *  Each of these compartments has its own door, temperature, and temperature setpoint. Each compartment modeled
- *  as a child device of the main refrigerator device so that temperature-based SmartApps can be used with each
- *  compartment
- *
- *  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.
- *
- */
-metadata {
-	definition (name: "Simulated Refrigerator", namespace: "smartthings/testing", author: "SmartThings") {
-		capability "Contact Sensor"
-	}
-
-	tiles(scale: 2) {
-		standardTile("contact", "device.contact", width: 4, height: 4) {
-			state("closed", label:'${name}', icon:"st.fridge.fridge-closed", backgroundColor:"#79b821")
-			state("open", label:'${name}', icon:"st.fridge.fridge-open", backgroundColor:"#ffa81e")
-		}
-		childDeviceTile("freezerDoor", "freezerDoor", height: 2, width: 2, childTileName: "freezerDoor")
-		childDeviceTile("mainDoor", "mainDoor", height: 2, width: 2, childTileName: "mainDoor")
-		childDeviceTile("freezer", "freezer", height: 2, width: 2, childTileName: "freezer")
-		childDeviceTile("refrigerator", "refrigerator", height: 2, width: 2, childTileName: "refrigerator")
-		childDeviceTile("freezerSetpoint", "freezer", height: 1, width: 2, childTileName: "freezerSetpoint")
-		childDeviceTile("refrigeratorSetpoint", "refrigerator", height: 1, width: 2, childTileName: "refrigeratorSetpoint")
-
-		// for simulator
-		childDeviceTile("freezerUp", "freezer", height: 1, width: 1, childTileName: "tempUp")
-		childDeviceTile("freezerDown", "freezer", height: 1, width: 1, childTileName: "tempDown")
-		childDeviceTile("refrigeratorUp", "refrigerator", height: 1, width: 1, childTileName: "tempUp")
-		childDeviceTile("refrigeratorDown", "refrigerator", height: 1, width: 1, childTileName: "tempDown")
-		childDeviceTile("freezerDoorControl", "freezerDoor", height: 1, width: 1, childTileName: "control")
-		childDeviceTile("mainDoorControl", "mainDoor", height: 1, width: 1, childTileName: "control")
-		childDeviceTile("freezerSetpointUp", "freezer", height: 1, width: 1, childTileName: "setpointUp")
-		childDeviceTile("freezerSetpointDown", "freezer", height: 1, width: 1, childTileName: "setpointDown")
-		childDeviceTile("refrigeratorSetpointUp", "refrigerator", height: 1, width: 1, childTileName: "setpointUp")
-		childDeviceTile("refrigeratorSetpointDown", "refrigerator", height: 1, width: 1, childTileName: "setpointDown")
-	}
-}
-
-def installed() {
-	state.counter = state.counter ? state.counter + 1 : 1
-	if (state.counter == 1) {
-		addChildDevice(
-				"Simulated Refrigerator Door",
-				"${device.deviceNetworkId}.1",
-				null,
-				[completedSetup: true, label: "${device.label} (Freezer Door)", componentName: "freezerDoor", componentLabel: "Freezer Door"])
-
-		addChildDevice(
-				"Simulated Refrigerator Door",
-				"${device.deviceNetworkId}.2",
-				null,
-				[completedSetup: true, label: "${device.label} (Main Door)", componentName: "mainDoor", componentLabel: "Main Door"])
-
-		addChildDevice(
-				"Simulated Refrigerator Temperature Control",
-				"${device.deviceNetworkId}.3",
-				null,
-				[completedSetup: true, label: "${device.label} (Freezer)", componentName: "freezer", componentLabel: "Freezer"])
-
-		addChildDevice(
-				"Simulated Refrigerator Temperature Control",
-				"${device.deviceNetworkId}.3",
-				null,
-				[completedSetup: true, label: "${device.label} (Fridge)", componentName: "refrigerator", componentLabel: "Fridge"])
-	}
-}
-
-def doorOpen(dni) {
-	// If any door opens, then the refrigerator is considered to be open
-	sendEvent(name: "contact", value: "open")
-}
-
-def doorClosed(dni) {
-	// Both doors must be closed for the refrigerator to be considered closed
-	if (!childDevices.find{it.deviceNetworkId != dni && it.currentValue("contact") == "open"}) {
-		sendEvent(name: "contact", value: "closed")
-	}
-}

devicetypes/smartthings/wattvision.src/wattvision.groovy

@@ -20,7 +20,6 @@ metadata {
 	definition(name: "Wattvision", namespace: "smartthings", author: "Steve Vlaminck") {
 		capability "Power Meter"
 		capability "Refresh"
-		capability "Sensor"
 		attribute "powerContent", "string"
 	}
 

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

@@ -18,8 +18,8 @@
 //DEPRECATED - Using the generic DTH for this device. Users need to be moved before deleting this DTH
 
 metadata {
-	definition (name: "WeMo Bulb", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
-
+	definition (name: "WeMo Bulb", namespace: "smartthings", author: "SmartThings") {
+	
     	capability "Actuator"
         capability "Configuration"
         capability "Refresh"
@@ -57,7 +57,7 @@ metadata {
 		valueTile("level", "device.level", inactiveLabel: false, decoration: "flat") {
 			state "level", label: 'Level ${currentValue}%'
 		}
-
+		
 
 		main(["switch"])
 		details(["switch", "level", "levelSliderControl", "refresh"])
@@ -87,11 +87,11 @@ def parse(String description) {
     if (description?.startsWith("read attr")) {
     	log.debug description[-2..-1]
         def i = Math.round(convertHexToInt(description[-2..-1]) / 256 * 100 )
-
+        
 		sendEvent( name: "level", value: i )
     }
-
-
+    
+	
 }
 
 def on() {
@@ -136,16 +136,16 @@ def setLevel(value) {
 def configure() {
 
 	log.debug "Configuring Reporting and Bindings."
-	def configCmds = [
-
+	def configCmds = [	
+  
         //Switch Reporting
         "zcl global send-me-a-report 6 0 0x10 0 3600 {01}", "delay 500",
         "send 0x${device.deviceNetworkId} 1 1", "delay 1000",
-
+        
         //Level Control Reporting
         "zcl global send-me-a-report 8 0 0x20 5 3600 {0010}", "delay 200",
         "send 0x${device.deviceNetworkId} 1 1", "delay 1500",
-
+        
         "zdo bind 0x${device.deviceNetworkId} 1 1 6 {${device.zigbeeId}} {}", "delay 1000",
 		"zdo bind 0x${device.deviceNetworkId} 1 1 8 {${device.zigbeeId}} {}", "delay 500",
 	]

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

@@ -18,7 +18,7 @@
 
 
 metadata {
-	definition (name: "Wemo Light Switch", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.switch") {
+	definition (name: "Wemo Light Switch", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Switch"
 		capability "Polling"

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

@@ -16,7 +16,7 @@
  * Date: 2015-10-11
  */
  metadata {
- 	definition (name: "Wemo Switch", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.smartplug") {
+ 	definition (name: "Wemo Switch", namespace: "smartthings", author: "SmartThings") {
         capability "Actuator"
         capability "Switch"
         capability "Polling"

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

@@ -28,7 +28,6 @@ metadata {
         command "enrollResponse"
 
         fingerprint inClusters: "0000, 0001, 0003, 0020, 0402, 0B05", outClusters: "0003, 0006, 0008, 0019", manufacturer: "OSRAM", model: "LIGHTIFY Dimming Switch", deviceJoinName: "OSRAM LIGHTIFY Dimming Switch"
-        fingerprint inClusters: "0000, 0001, 0003, 0020, 0402, 0B05", outClusters: "0003, 0006, 0008, 0019", manufacturer: "CentraLite", model: "3130", deviceJoinName: "Centralite Zigbee Smart Switch"
         //fingerprint inClusters: "0000, 0001, 0003, 0020, 0500", outClusters: "0003,0019", manufacturer: "CentraLite", model: "3455-L", deviceJoinName: "Iris Care Pendant"
         fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0402, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model: "3460-L", deviceJoinName: "Iris Smart Button"
         fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model:"3450-L", deviceJoinName: "Iris KeyFob"
@@ -252,19 +251,12 @@ def initialize() {
     if ((device.getDataValue("manufacturer") == "OSRAM") && (device.getDataValue("model") == "LIGHTIFY Dimming Switch")) {
         sendEvent(name: "numberOfButtons", value: 2)
     }
-    else if (device.getDataValue("manufacturer") == "CentraLite") {
-        if (device.getDataValue("model") == "3130") {
-            sendEvent(name: "numberOfButtons", value: 2)
-        }
-        else if ((device.getDataValue("model") == "3455-L") || (device.getDataValue("model") == "3460-L")) {
-            sendEvent(name: "numberOfButtons", value: 1)
-        }
-        else if (device.getDataValue("model") == "3450-L") {
-            sendEvent(name: "numberOfButtons", value: 4)
-        }
-        else {
-            sendEvent(name: "numberOfButtons", value: 4)    //default case. can be changed later.
-        }
+    else if ((device.getDataValue("manufacturer") == "CentraLite") &&
+            ((device.getDataValue("model") == "3455-L") || (device.getDataValue("model") == "3460-L"))) {
+        sendEvent(name: "numberOfButtons", value: 1)
+    }
+    else if ((device.getDataValue("manufacturer") == "CentraLite") && (device.getDataValue("model") == "3450-L")) {
+        sendEvent(name: "numberOfButtons", value: 4)
     }
     else {
         //default. can be changed

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

@@ -13,7 +13,7 @@
  */
 
 metadata {
-    definition (name: "ZigBee Dimmer Power", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
+    definition (name: "ZigBee Dimmer Power", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.switch") {
         capability "Actuator"
         capability "Configuration"
         capability "Refresh"

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

@@ -13,7 +13,7 @@
  */
 
 metadata {
-    definition (name: "ZigBee Dimmer", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
+    definition (name: "ZigBee Dimmer", namespace: "smartthings", author: "SmartThings") {
         capability "Actuator"
         capability "Configuration"
         capability "Refresh"

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

@@ -1,46 +0,0 @@
-# Zigbee Lock
-
-Cloud Execution
-
-Works with: 
-
-* [Yale Push Button Deadbolt (YRD210-HA)](https://www.smartthings.com/works-with-smartthings/door-locks/yale-push-button-deadbolt-yrd210)
-* [Yale Touchscreen Lever (YRL220-ZB)](https://www.smartthings.com/works-with-smartthings/door-locks/yale-touchscreen-lever-yrl220)
-* [Yale Touchscreen Deadbolt (YRD220-HA))](https://www.smartthings.com/works-with-smartthings/door-locks/yale-touchscreen-deadbolt-yrd220)
-* [Yale Key Free Touchscreen Deadbolt (YRD240-HA)](https://www.smartthings.com/works-with-smartthings/door-locks/yale-key-free-touchscreen-deadbolt-yrd240)
-* [Yale Push Button Lever Lock (YRL210-HA)](https://www.smartthings.com/works-with-smartthings/door-locks/yale-push-button-lever-lock-yrl210)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Battery](#battery-specification)
-* [Troubleshooting](#troubleshooting)
-
-## Capabilities
-
-* **Actuator** - represents that a Device has commands
-* **Lock** - allows for the control of a lock device
-* **Refresh** - _refresh()_ command for status updates
-* **Sensor** - detects sensor events
-* **Battery** - defines device uses a battery
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated
-* **Health Check** - indicates ability to get device health notifications
-
-## Device Health
-
-Yale Push Button Deadbolt (YRD210-HA) is a Zigbee device and checks in every 1 hour.
-Device-Watch allows 2 check-in misses from device plus some lag time. So Check-in interval = (2*60 + 2)mins = 122 mins.
-
- * __122min__ checkInterval
-
-## Battery Specification
-
-Four AA 1.5V 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 sensor from SmartThings can be found in the following link:
-* [Yale Locks Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/205138400)

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

@@ -24,7 +24,6 @@ import physicalgraph.zigbee.zcl.DataType
         capability "Sensor"
         capability "Battery"
         capability "Configuration"
-        capability "Health Check"
 
         fingerprint profileId: "0104", inClusters: "0000,0001,0003,0004,0005,0009,0020,0101,0402,0B05,FDBD", outClusters: "000A,0019", manufacturer: "Kwikset", model: "SMARTCODE_DEADBOLT_5", deviceJoinName: "Kwikset 5-Button Deadbolt"
         fingerprint profileId: "0104", inClusters: "0000,0001,0003,0004,0005,0009,0020,0101,0402,0B05,FDBD", outClusters: "000A,0019", manufacturer: "Kwikset", model: "SMARTCODE_LEVER_5", deviceJoinName: "Kwikset 5-Button Lever"
@@ -84,9 +83,6 @@ def uninstalled() {
 }
 
 def configure() {
-    // Device-Watch allows 2 check-in misses from device + ping (plus 2 min lag time)
-    sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-
     def cmds =
         zigbee.configureReporting(CLUSTER_DOORLOCK, DOORLOCK_ATTR_LOCKSTATE,
                                   DataType.ENUM8, 0, 3600, null) +
@@ -96,13 +92,6 @@ def configure() {
     return refresh() + cmds // send refresh cmds as part of config
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-    zigbee.readAttribute(CLUSTER_DOORLOCK, DOORLOCK_ATTR_LOCKSTATE)
-}
-
 def refresh() {
     def cmds =
         zigbee.readAttribute(CLUSTER_DOORLOCK, DOORLOCK_ATTR_LOCKSTATE) +

devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy

@@ -40,6 +40,7 @@ metadata {
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR RGBW", deviceJoinName: "SYLVANIA Smart BR30 RGBW"
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT RGBW", deviceJoinName: "SYLVANIA Smart RT5/6 RGBW"
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY FLEX OUTDOOR RGBW", deviceJoinName: "SYLVANIA Smart Outdoor RGBW Flex"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300", outClusters: "0000, 0003, 0006", manufacturer: "LINGAN", model: "LIGHTIFY A01 RGBW", deviceJoinName: "LINGAN  LIGHTIFY LED Smart Connected Light"
     }
 
     // UI tile definitions

devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy

@@ -16,7 +16,7 @@ import groovy.transform.Field
 @Field Boolean hasConfiguredHealthCheck = false
 
 metadata {
-    definition (name: "ZLL Dimmer Bulb", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
+    definition (name: "ZLL Dimmer Bulb", namespace: "smartthings", author: "SmartThings") {
 
         capability "Actuator"
         capability "Configuration"

devicetypes/smartthings/zll-rgb-bulb.src/zll-rgb-bulb.groovy

@@ -14,7 +14,7 @@
 import physicalgraph.zigbee.zcl.DataType
 
 metadata {
-	definition (name: "ZLL RGB Bulb", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
+	definition (name: "ZLL RGB Bulb", namespace: "smartthings", author: "SmartThings") {
 
 		capability "Actuator"
 		capability "Color Control"

devicetypes/smartthings/zll-rgbw-bulb.src/zll-rgbw-bulb.groovy

@@ -14,7 +14,7 @@
 import physicalgraph.zigbee.zcl.DataType
 
 metadata {
-    definition (name: "ZLL RGBW Bulb", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
+    definition (name: "ZLL RGBW Bulb", namespace: "smartthings", author: "SmartThings") {
 
         capability "Actuator"
         capability "Color Control"

devicetypes/smartthings/zll-white-color-temperature-bulb-5000k.src/zll-white-color-temperature-bulb-5000k.groovy

@@ -16,7 +16,7 @@ import groovy.transform.Field
 @Field Boolean hasConfiguredHealthCheck = false
 
 metadata {
-    definition (name: "ZLL White Color Temperature Bulb 5000K", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
+    definition (name: "ZLL White Color Temperature Bulb 5000K", namespace: "smartthings", author: "SmartThings") {
 
         capability "Actuator"
         capability "Color Temperature"
@@ -101,7 +101,7 @@ def refresh() {
     if (!((device.getDataValue("manufacturer") == "Eaton") && (device.getDataValue("model") == "Halo_LT01"))) {
         cmds = cmds + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig()
     }
-
+    
 	cmds
 }
 

devicetypes/smartthings/zll-white-color-temperature-bulb.src/zll-white-color-temperature-bulb.groovy

@@ -16,7 +16,7 @@ import groovy.transform.Field
 @Field Boolean hasConfiguredHealthCheck = false
 
 metadata {
-    definition (name: "ZLL White Color Temperature Bulb", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
+    definition (name: "ZLL White Color Temperature Bulb", namespace: "smartthings", author: "SmartThings") {
 
         capability "Actuator"
         capability "Color Temperature"

devicetypes/smartthings/zooz-power-strip.src/zooz-power-strip.groovy

@@ -25,7 +25,6 @@ metadata {
 		capability "Refresh"
 		capability "Actuator"
 		capability "Sensor"
-		capability "Configuration"
 
 		fingerprint manufacturer: "015D", prod: "0651", model: "F51C", deviceJoinName: "Zooz ZEN 20 Power Strip"
 	}
@@ -66,10 +65,6 @@ def updated() {
 	}
 }
 
-def configure() {
-	refresh()
-}
-
 
 //////////////////////
 // Event Generation //
@@ -112,17 +107,15 @@ def zwaveBinaryEvent(cmd, endpoint) {
 	def result = []
 	def children = childDevices
 	def childDevice = children.find{it.deviceNetworkId.endsWith("$endpoint")}
-	if (childDevice) {
-		childDevice.sendEvent(name: "switch", value: cmd.value ? "on" : "off")
+	childDevice.sendEvent(name: "switch", value: cmd.value ? "on" : "off")
 
-		if (cmd.value) {
-			// One on and the strip is on
-			result << createEvent(name: "switch", value: "on")
-		} else {
-			// All off and the strip is off
-			if (!children.any { it.currentValue("switch") == "on" }) {
-				result << createEvent(name: "switch", value: "off")
-			}
+	if (cmd.value) {
+		// One on and the strip is on
+		result << createEvent(name: "switch", value: "on")
+	} else {
+		// All off and the strip is off
+		if (! children.any { it.currentValue("switch") == "on" }) {
+			result  << createEvent(name: "switch", value: "off")
 		}
 	}
 	result

devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy

@@ -12,7 +12,7 @@
  *
  */
 metadata {
-	definition (name: "Z-Wave Dimmer Switch Generic", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
+	definition (name: "Z-Wave Dimmer Switch Generic", namespace: "smartthings", author: "SmartThings") {
 		capability "Switch Level"
 		capability "Actuator"
 		capability "Health Check"
@@ -78,11 +78,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])

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

@@ -17,7 +17,7 @@
  */
 
 metadata {
-	definition (name: "Z-Wave Door/Window Sensor", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.contact") {
+	definition (name: "Z-Wave Door/Window Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Contact Sensor"
 		capability "Sensor"
 		capability "Battery"
@@ -79,11 +79,6 @@ def parse(String description) {
 	return result
 }
 
-def installed() {
-	// Device-Watch simply pings if no device events received for 482min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 4 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-}
-
 def updated() {
 	// Device-Watch simply pings if no device events received for 482min(checkInterval)
 	sendEvent(name: "checkInterval", value: 2 * 4 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])

devicetypes/smartthings/zwave-garage-door-opener.src/zwave-garage-door-opener.groovy

@@ -65,11 +65,6 @@ metadata {
 
 import physicalgraph.zwave.commands.barrieroperatorv1.*
 
-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])

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

@@ -68,11 +68,6 @@ metadata {
 import physicalgraph.zwave.commands.doorlockv1.*
 import physicalgraph.zwave.commands.usercodev1.*
 
-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])

devicetypes/smartthings/zwave-metering-dimmer.src/zwave-metering-dimmer.groovy

@@ -16,7 +16,7 @@
  *
  */
 metadata {
-	definition (name: "Z-Wave Metering Dimmer", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.switch") {
+	definition (name: "Z-Wave Metering Dimmer", namespace: "smartthings", author: "SmartThings") {
 		capability "Switch"
 		capability "Polling"
 		capability "Power Meter"
@@ -100,11 +100,6 @@ def parse(String description) {
     result
 }
 
-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])

devicetypes/smartthings/zwave-metering-switch.src/zwave-metering-switch.groovy

@@ -12,7 +12,7 @@
  *
  */
 metadata {
-	definition (name: "Z-Wave Metering Switch", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.switch") {
+	definition (name: "Z-Wave Metering Switch", namespace: "smartthings", author: "SmartThings") {
 		capability "Energy Meter"
 		capability "Actuator"
 		capability "Switch"
@@ -27,7 +27,7 @@ metadata {
 		command "reset"
 
 		fingerprint inClusters: "0x25,0x32"
-		fingerprint mfr:"0086", prod:"0003", model:"0012", deviceJoinName: "Aeon Labs Micro Smart Switch"
+		fingerprint mfr:"0086", prod:"0003", model:"0012", deviceJoinName: "Aeon Labs Micro Smart Switch 2E"
 	}
 
 	// simulator metadata
@@ -74,11 +74,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])
@@ -91,7 +86,7 @@ def updated() {
 
 def parse(String description) {
 	def result = null
-	if(description == "updated") return
+	if(description == "updated") return 
 	def cmd = zwave.parse(description, [0x20: 1, 0x32: 1, 0x72: 2])
 	if (cmd) {
 		result = zwaveEvent(cmd)

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

@@ -17,7 +17,7 @@
  */
 
 metadata {
-	definition (name: "Z-Wave Motion Sensor", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.motion") {
+	definition (name: "Z-Wave Motion Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Motion Sensor"
 		capability "Sensor"
 		capability "Battery"
@@ -36,7 +36,7 @@ metadata {
 		status "inactive": "command: 3003, payload: 00"
 		status "active": "command: 3003, payload: FF"
 	}
-
+	
 	tiles {
 		standardTile("motion", "device.motion", width: 2, height: 2) {
 			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC")
@@ -51,12 +51,7 @@ metadata {
 	}
 }
 
-def installed() {
-// Device wakes up every 4 hours, this interval allows us to miss one wakeup notification before marking offline
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-}
-
-def updated() {
+def updated(){
 // Device wakes up every 4 hours, this interval allows us to miss one wakeup notification before marking offline
 	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 }
@@ -202,4 +197,4 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
 
 	result << createEvent(descriptionText: "$device.displayName MSR: $msr", isStateChange: false)
 	result
-}
+}

devicetypes/smartthings/zwave-plus-door-window-sensor.src/zwave-plus-door-window-sensor.groovy

@@ -16,7 +16,7 @@
 */
 
 metadata {
-	definition (name: "Z-Wave Plus Door/Window Sensor", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.contact") {
+	definition (name: "Z-Wave Plus Door/Window Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Contact Sensor"
 		capability "Configuration"
 		capability "Battery"

devicetypes/smartthings/zwave-siren.src/README.md

@@ -0,0 +1,42 @@
+# Z-wave Siren
+
+Cloud Execution
+
+Works with: 
+
+* [FortrezZ Siren Strobe Alarm](https://www.smartthings.com/works-with-smartthings/other/fortrezz-water-valve)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+* [Troubleshooting](#troubleshooting)
+
+## Capabilities
+
+* **Actuator** - represents that a Device has commands
+* **Alarm** - allows for interacting with devices that serve as alarms
+* **Battery** - defines device uses a battery
+* **Health Check** - indicates ability to get device health notifications
+* **Polling** - represents that poll() can be implemented for the device
+* **Refresh** - _refresh()_ command for status updates
+* **Sensor** - detects sensor events
+* **Switch** - can detect state (possible values: on/off)
+
+## Device Health
+
+FortrezZ Siren Strobe Alarm 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
+
+## 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:
+* [FortrezZ Siren Strobe Alarm Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202294760-FortrezZ-Siren-Strobe-Alarm)

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

@@ -20,6 +20,7 @@ metadata {
 		capability "Actuator"
         capability "Alarm"
         capability "Battery"
+		capability "Health Check"
         capability "Polling"
         capability "Refresh"
         capability "Sensor"
@@ -27,6 +28,7 @@ metadata {
 
 
 		fingerprint inClusters: "0x20,0x25,0x86,0x80,0x85,0x72,0x71"
+		fingerprint mfr:"0084", prod:"0313", model:"010B", deviceJoinName: "FortrezZ Siren Strobe Alarm"
 	}
 
 	simulator {
@@ -58,6 +60,11 @@ metadata {
 	}
 }
 
+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])
+}
+
 def createEvents(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
 	def map = [ name: "battery", unit: "%" ]
 	if (cmd.batteryLevel == 0xFF) {
@@ -119,6 +126,13 @@ def both() {
 	on()
 }
 
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+	refresh()
+}
+
 def refresh() {
 	log.debug "sending battery refresh command"
 	zwave.batteryV1.batteryGet().format()

devicetypes/smartthings/zwave-smoke-alarm.src/zwave-smoke-alarm.groovy

@@ -53,12 +53,7 @@ metadata {
 	}
 }
 
-def installed() {
-// Device checks in every hour, this interval allows us to miss one check-in notification before marking offline
-	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-}
-
-def updated() {
+def updated(){
 // Device checks in every hour, this interval allows us to miss one check-in notification before marking offline
 	sendEvent(name: "checkInterval", value: 2 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 }

devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy

@@ -12,7 +12,7 @@
  *
  */
 metadata {
-	definition (name: "Z-Wave Switch Generic", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.switch") {
+	definition (name: "Z-Wave Switch Generic", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Health Check"
  		capability "Switch"
@@ -61,11 +61,6 @@ metadata {
 	}
 }
 
-def installed(){
-// Device-Watch simply pings if no device events received for checkInterval duration of 32min = 2 * 15min + 2min lag time
-	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 checkInterval duration of 32min = 2 * 15min + 2min lag time
 	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])

devicetypes/smartthings/zwave-switch-secure.src/zwave-switch-secure.groovy

@@ -12,7 +12,7 @@
  *
  */
 metadata {
-	definition (name: "Z-Wave Switch Secure", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.switch") {
+	definition (name: "Z-Wave Switch Secure", namespace: "smartthings", author: "SmartThings") {
 		capability "Switch"
 		capability "Refresh"
 		capability "Polling"

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

@@ -12,7 +12,7 @@
  *
  */
 metadata {
-	definition (name: "Z-Wave Switch", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.switch") {
+	definition (name: "Z-Wave Switch", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Indicator"
  		capability "Switch"
@@ -65,11 +65,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])

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

@@ -42,9 +42,9 @@ metadata {
 		status "auto"			: "command: 4003, payload: 03"
 		status "emergencyHeat"	: "command: 4003, payload: 04"
 
-		status "auto"			: "command: 4403, payload: 00" // "fanAuto"
-		status "on"				: "command: 4403, payload: 01" // "fanOn"
-		status "circulate"		: "command: 4403, payload: 06" // "fanCirculate
+		status "fanAuto"		: "command: 4403, payload: 00"
+		status "fanOn"			: "command: 4403, payload: 01"
+		status "fanCirculate"	: "command: 4403, payload: 06"
 
 		status "heat 60"        : "command: 4303, payload: 01 09 3C"
 		status "heat 68"        : "command: 4303, payload: 01 09 44"
@@ -74,9 +74,8 @@ metadata {
 	}
 
 	tiles {
-		// Using standardTile instead of valueTile as it renders the icon better
-		standardTile("temperature", "device.temperature", width: 2, height: 2) {
-			state("temperature", label:'${currentValue}°', icon: "st.thermostat.ac.air-conditioning",
+		valueTile("temperature", "device.temperature", width: 2, height: 2) {
+			state("temperature", label:'${currentValue}°',
 				backgroundColors:[
 					[value: 31, color: "#153591"],
 					[value: 44, color: "#1e9cbb"],
@@ -89,20 +88,19 @@ metadata {
 			)
 		}
 		standardTile("mode", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
-			state "off", action:"switchMode", nextState:"to_heat", icon: "st.thermostat.heating-cooling-off"
-			state "heat", action:"switchMode", nextState:"to_cool", icon: "st.thermostat.heat"
-			state "cool", action:"switchMode", nextState:"...", icon: "st.thermostat.cool"
-			state "auto", action:"switchMode", nextState:"...", icon: "st.thermostat.auto"
-			state "emergency heat", action:"switchMode", nextState:"...", icon: "st.thermostat.emergency-heat"
-			state "to_heat", action:"switchMode", nextState:"to_cool", icon: "st.thermostat.heat"
-			state "to_cool", action:"switchMode", nextState:"...", icon: "st.thermostat.cool"
+			state "off", label:'${name}', action:"switchMode", nextState:"to_heat"
+			state "heat", label:'${name}', action:"switchMode", nextState:"to_cool"
+			state "cool", label:'${name}', action:"switchMode", nextState:"..."
+			state "auto", label:'${name}', action:"switchMode", nextState:"..."
+			state "emergency heat", label:'${name}', action:"switchMode", nextState:"..."
+			state "to_heat", label: "heat", action:"switchMode", nextState:"to_cool"
+			state "to_cool", label: "cool", action:"switchMode", nextState:"..."
 			state "...", label: "...", action:"off", nextState:"off"
 		}
 		standardTile("fanMode", "device.thermostatFanMode", inactiveLabel: false, decoration: "flat") {
-			state "auto", action:"switchFanMode", nextState:"...", icon: "st.thermostat.fan-auto" // "fanAuto"
-			state "on", action:"switchFanMode", nextState:"...", icon: "st.thermostat.fan-on" // "fanOn"
-			state "circulate", action:"switchFanMode", nextState:"...", icon: "st.thermostat.fan-circulate" // "fanCirculate"
-			state "...", label: "...", nextState:"..."
+			state "fanAuto", label:'${name}', action:"switchFanMode"
+			state "fanOn", label:'${name}', action:"switchFanMode"
+			state "fanCirculate", label:'${name}', action:"switchFanMode"
 		}
 		controlTile("heatSliderControl", "device.heatingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) {
 			state "setHeatingSetpoint", action:"quickSetHeat", backgroundColor:"#d04e00"
@@ -119,16 +117,14 @@ metadata {
 		standardTile("refresh", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
 			state "default", action:"polling.poll", icon:"st.secondary.refresh"
 		}
+		standardTile("configure", "device.configure", inactiveLabel: false, decoration: "flat") {
+			state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
+		}
 		main "temperature"
-		details(["temperature", "mode", "fanMode", "heatSliderControl", "heatingSetpoint", "coolSliderControl", "coolingSetpoint", "refresh"])
+		details(["temperature", "mode", "fanMode", "heatSliderControl", "heatingSetpoint", "coolSliderControl", "coolingSetpoint", "refresh", "configure"])
 	}
 }
 
-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])
@@ -290,13 +286,13 @@ def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanMod
 	def map = [:]
 	switch (cmd.fanMode) {
 		case physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeReport.FAN_MODE_AUTO_LOW:
-			map.value = "auto" // "fanAuto"
+			map.value = "fanAuto"
 			break
 		case physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeReport.FAN_MODE_LOW:
-			map.value = "on" // "fanOn"
+			map.value = "fanOn"
 			break
 		case physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeReport.FAN_MODE_CIRCULATION:
-			map.value = "circulate" // "fanCirculate"
+			map.value = "fanCirculate"
 			break
 	}
 	map.name = "thermostatFanMode"
@@ -313,19 +309,15 @@ def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeSuppo
 	if(cmd.auto) { supportedModes += "auto " }
 
 	state.supportedModes = supportedModes
-	// No events to be generated, return empty map
-	return [:]
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeSupportedReport cmd) {
 	def supportedFanModes = ""
-	if(cmd.auto) { supportedFanModes += "auto " } // "fanAuto "
-	if(cmd.low) { supportedFanModes += "on " } // "fanOn"
-	if(cmd.circulation) { supportedFanModes += "circulate " } // "fanCirculate"
+	if(cmd.auto) { supportedFanModes += "fanAuto " }
+	if(cmd.low) { supportedFanModes += "fanOn " }
+	if(cmd.circulation) { supportedFanModes += "fanCirculate " }
 
 	state.supportedFanModes = supportedFanModes
-	// No events to be generated, return empty map
-	return [:]
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
@@ -420,13 +412,7 @@ def configure() {
 	delayBetween([
 		zwave.thermostatModeV2.thermostatModeSupportedGet().format(),
 		zwave.thermostatFanModeV3.thermostatFanModeSupportedGet().format(),
-		zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]).format(),
-		zwave.sensorMultilevelV3.sensorMultilevelGet().format(), // current temperature
-		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format(),
-		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format(),
-		zwave.thermostatModeV2.thermostatModeGet().format(),
-		zwave.thermostatFanModeV3.thermostatFanModeGet().format(),
-		zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format()
+		zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]).format()
 	], 2300)
 }
 
@@ -467,11 +453,11 @@ def switchToMode(nextMode) {
 def switchFanMode() {
 	def currentMode = device.currentState("thermostatFanMode")?.value
 	def lastTriedMode = state.lastTriedFanMode ?: currentMode ?: "off"
-	def supportedModes = getDataByName("supportedFanModes") ?: "auto on" // "fanAuto fanOn"
-	def modeOrder = ["auto", "circulate", "on"]                 // "fanAuto", "fanCirculate", "fanOn"
+	def supportedModes = getDataByName("supportedFanModes") ?: "fanAuto fanOn"
+	def modeOrder = ["fanAuto", "fanCirculate", "fanOn"]
 	def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
 	def nextMode = next(lastTriedMode)
-	while (!supportedModes?.contains(nextMode) && nextMode != "auto") { // "fanAuto"
+	while (!supportedModes?.contains(nextMode) && nextMode != "fanAuto") {
 		nextMode = next(nextMode)
 	}
 	switchToFanMode(nextMode)
@@ -482,11 +468,11 @@ def switchToFanMode(nextMode) {
 	if(supportedFanModes && !supportedFanModes.contains(nextMode)) log.warn "thermostat mode '$nextMode' is not supported"
 
 	def returnCommand
-	if (nextMode == "auto") { // "fanAuto"
+	if (nextMode == "fanAuto") {
 		returnCommand = fanAuto()
-	} else if (nextMode == "on") { // "fanOn"
+	} else if (nextMode == "fanOn") {
 		returnCommand = fanOn()
-	} else if (nextMode == "circulate") { // "fanCirculate"
+	} else if (nextMode == "fanCirculate") {
 		returnCommand = fanCirculate()
 	} else {
 		log.debug("no fan mode '$nextMode'")

devicetypes/smartthings/zwave-virtual-momentary-contact-switch.src/zwave-virtual-momentary-contact-switch.groovy

@@ -16,7 +16,7 @@
  *  Date: 2013-03-07
  */
 metadata {
-	definition (name: "Z-Wave Virtual Momentary Contact Switch", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.contact") {
+	definition (name: "Z-Wave Virtual Momentary Contact Switch", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Switch"
 		capability "Refresh"

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

@@ -17,7 +17,7 @@
  */
 
 metadata {
-	definition (name: "Z-Wave Water Sensor", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.moisture") {
+	definition (name: "Z-Wave Water Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Water Sensor"
 		capability "Sensor"
 		capability "Battery"
@@ -29,7 +29,7 @@ metadata {
 		status "dry": "command: 3003, payload: 00"
 		status "wet": "command: 3003, payload: FF"
 	}
-
+	
 	tiles {
 		standardTile("water", "device.water", width: 2, height: 2) {
 			state "dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff"

devicetypes/waymirenet/trane-xl624-thermostat.src/trane-xl624-thermostat.groovy

@@ -1,568 +0,0 @@
-/* TraneXL624.device.groovy
- *
- * Variation of the stock SmartThings "Zwave-Thermostat" & Better-Thermostat by todd@wackford.net
- *
- *
- *
- * Original Modified Code:
- * twack@wackware.net
- * 20140209
- *
- * Modified to add Humidity & Clock Set
- * Justin Waymire
- * justin@waymirenet.com
- * 04-01-15
- *
-*/
-metadata {
-	// Automatically generated. Make future change here.
-	definition (name: "Trane XL624 Thermostat", author: "justin@waymirenet.com") {
-    	capability "Relative Humidity Measurement"
-		capability "Temperature Measurement"
-		capability "Refresh"
-		capability "Thermostat"
-		capability "Configuration"
-		capability "Polling"
-
-		command "heatLevelUp"
-		command "heatLevelDown"
-		command "coolLevelUp"
-		command "coolLevelDown"
-		command "switchMode"
-		command "switchFanMode"
-	}
-
-	// simulator metadata
-	simulator {
-		status "off"			: "command: 4003, payload: 00"
-		status "heat"			: "command: 4003, payload: 01"
-		status "cool"			: "command: 4003, payload: 02"
-		status "auto"			: "command: 4003, payload: 03"
-		status "emergencyHeat"	: "command: 4003, payload: 04"
-
-		status "fanAuto"		: "command: 4403, payload: 00"
-		status "fanOn"			: "command: 4403, payload: 01"
-		status "fanCirculate"	: "command: 4403, payload: 06"
-
-		status "heat 60"        : "command: 4303, payload: 01 01 3C"
-		status "heat 68"        : "command: 4303, payload: 01 01 44"
-		status "heat 72"        : "command: 4303, payload: 01 01 48"
-
-		status "cool 72"        : "command: 4303, payload: 02 01 48"
-		status "cool 76"        : "command: 4303, payload: 02 01 4C"
-		status "cool 80"        : "command: 4303, payload: 02 01 50"
-
-		status "temp 58"        : "command: 3105, payload: 01 22 02 44"
-		status "temp 62"        : "command: 3105, payload: 01 22 02 6C"
-		status "temp 70"        : "command: 3105, payload: 01 22 02 BC"
-		status "temp 74"        : "command: 3105, payload: 01 22 02 E4"
-		status "temp 78"        : "command: 3105, payload: 01 22 03 0C"
-		status "temp 82"        : "command: 3105, payload: 01 22 03 34"
-
-		status "idle"			: "command: 4203, payload: 00"
-		status "heating"		: "command: 4203, payload: 01"
-		status "cooling"		: "command: 4203, payload: 02"
-		status "fan only"		: "command: 4203, payload: 03"
-		status "pending heat"	: "command: 4203, payload: 04"
-		status "pending cool"	: "command: 4203, payload: 05"
-		status "vent economizer": "command: 4203, payload: 06"
-
-		// reply messages
-		reply "2502": "command: 2503, payload: FF"
-	}
-
-	tiles {
-		valueTile("temperature", "device.temperature", width: 2, height: 2) {
-			state("temperature", label:'${currentValue}°', unit:'F',
-				backgroundColors:[
-					[value: 31, color: "#153591"],
-					[value: 44, color: "#1e9cbb"],
-					[value: 59, color: "#90d2a7"],
-					[value: 74, color: "#44b621"],
-					[value: 84, color: "#f1d801"],
-					[value: 95, color: "#d04e00"],
-					[value: 96, color: "#bc2323"]
-				]
-			)
-		}
-        valueTile("humidity", "device.humidity", inactiveLabel: false, decoration: "flat") { 
-			state "humidity", label:'Humidity ${currentValue}%', backgroundColor:"#ffffff"
-		}
-		standardTile("mode", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
-			state "off", label:'', action:"switchMode", icon:"st.thermostat.heating-cooling-off"
-			state "heat", label:'', action:"switchMode", icon:"st.thermostat.heat"
-			state "emergencyHeat", label:'', action:"switchMode", icon:"st.thermostat.emergency-heat"
-			state "cool", label:'', action:"switchMode", icon:"st.thermostat.cool"
-			state "auto", label:'', action:"switchMode", icon:"st.thermostat.auto"
-		}
-		standardTile("fanMode", "device.thermostatFanMode", inactiveLabel: false, decoration: "flat") {
-			state "fanAuto", label:'', action:"switchFanMode", icon:"st.thermostat.fan-auto"
-			state "fanOn", label:'', action:"switchFanMode", icon:"st.thermostat.fan-on"
-			state "fanCirculate", label:'  ', action:"switchFanMode", icon:"st.thermostat.fan-circulate"
-		}
-		valueTile("heatingSetpoint", "device.heatingSetpoint", inactiveLabel: false, decoration: "flat") {
-			state "heat", label:'${currentValue}° heat', unit:"F", backgroundColor:"#ffffff"
-		}
-		valueTile("coolingSetpoint", "device.coolingSetpoint", inactiveLabel: false, decoration: "flat") {
-			state "cool", label:'${currentValue}° cool', unit:"F", backgroundColor:"#ffffff"
-		}
-		standardTile("refresh", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
-			state "default", action:"polling.poll", icon:"st.secondary.refresh"
-		}
-		standardTile("configure", "device.configure", inactiveLabel: false, decoration: "flat") {
-			state "configure", label:'  ', action:"configuration.configure", icon:"st.secondary.configure"
-		}
-        standardTile("heatLevelUp", "device.heatingSetpoint", canChangeIcon: false, inactiveLabel: false, decoration: "flat") {
-                        state "heatLevelUp", label:'  ', action:"heatLevelUp", icon:"st.thermostat.thermostat-up"
-        }
-        standardTile("heatLevelDown", "device.heatingSetpoint", canChangeIcon: false, inactiveLabel: false, decoration: "flat") {
-                        state "heatLevelDown", label:'  ', action:"heatLevelDown", icon:"st.thermostat.thermostat-down"
-        }
-        standardTile("coolLevelUp", "device.heatingSetpoint", canChangeIcon: false, inactiveLabel: false, decoration: "flat") {
-                        state "coolLevelUp", label:'  ', action:"coolLevelUp", icon:"st.thermostat.thermostat-up"
-        }
-        standardTile("coolLevelDown", "device.heatingSetpoint", canChangeIcon: false, inactiveLabel: false, decoration: "flat") {
-                        state "coolLevelDown", label:'  ', action:"coolLevelDown", icon:"st.thermostat.thermostat-down"
-        }
-        
-		main (["temperature", "humidity"])
-		details(["temperature", "humidity", "mode", "heatLevelDown", "heatingSetpoint", "heatLevelUp", "coolLevelDown", "coolingSetpoint", "coolLevelUp", "refresh", "configure"])
-	}
-}
-
-def coolLevelUp(){
-    int nextLevel = device.currentValue("coolingSetpoint") + 1
-    
-    if( nextLevel > 99){
-    	nextLevel = 99
-    }
-    log.debug "Setting cool set point up to: ${nextLevel}"
-    setCoolingSetpoint(nextLevel)
-}
-
-def coolLevelDown(){
-    int nextLevel = device.currentValue("coolingSetpoint") - 1
-    
-    if( nextLevel < 50){
-    	nextLevel = 50
-    }
-    log.debug "Setting cool set point down to: ${nextLevel}"
-    setCoolingSetpoint(nextLevel)
-}
-
-def heatLevelUp(){
-    int nextLevel = device.currentValue("heatingSetpoint") + 1
-    
-    if( nextLevel > 90){
-    	nextLevel = 90
-    }
-    log.debug "Setting heat set point up to: ${nextLevel}"
-    setHeatingSetpoint(nextLevel)
-}
-
-def heatLevelDown(){
-    int nextLevel = device.currentValue("heatingSetpoint") - 1
-    
-    if( nextLevel < 40){
-    	nextLevel = 40
-    }
-    log.debug "Setting heat set point down to: ${nextLevel}"
-    setHeatingSetpoint(nextLevel)
-}
-
-def parse(String description)
-{
-	def map = createEvent(zwaveEvent(zwave.parse(description, [0x42:1, 0x43:2, 0x31: 3])))
-	if (!map) {
-		return null
-	}
-
-	def result = [map]
-	if (map.isStateChange && map.name in ["heatingSetpoint","coolingSetpoint","thermostatMode"]) {
-		def map2 = [
-			name: "thermostatSetpoint",
-			unit: "F"
-		]
-		if (map.name == "thermostatMode") {
-			updateState("lastTriedMode", map.value)
-			if (map.value == "cool") {
-				map2.value = device.latestValue("coolingSetpoint")
-				log.info "THERMOSTAT, latest cooling setpoint = ${map2.value}"
-			}
-			else {
-				map2.value = device.latestValue("heatingSetpoint")
-				log.info "THERMOSTAT, latest heating setpoint = ${map2.value}"
-			}
-		}
-		else {
-			def mode = device.latestValue("thermostatMode")
-			log.info "THERMOSTAT, latest mode = ${mode}"
-			if ((map.name == "heatingSetpoint" && mode == "heat") || (map.name == "coolingSetpoint" && mode == "cool")) {
-				map2.value = map.value
-				map2.unit = map.unit
-			}
-		}
-		if (map2.value != null) {
-			log.debug "THERMOSTAT, adding setpoint event: $map"
-			result << createEvent(map2)
-		}
-	} else if (map.name == "thermostatFanMode" && map.isStateChange) {
-		updateState("lastTriedFanMode", map.value)
-	}
-	log.debug "Parse returned $result"
-	result
-}
-
-// Event Generation
-def zwaveEvent(physicalgraph.zwave.commands.thermostatsetpointv2.ThermostatSetpointReport cmd)
-{
-	def map = [:]
-	map.value = cmd.scaledValue.toString()
-	map.unit = cmd.scale == 1 ? "F" : "C"
-	map.displayed = false
-	switch (cmd.setpointType) {
-		case 1:
-			map.name = "heatingSetpoint"
-			break;
-		case 2:
-			map.name = "coolingSetpoint"
-			break;
-		default:
-			return [:]
-	}
-	// So we can respond with same format
-	state.size = cmd.size
-	state.scale = cmd.scale
-	state.precision = cmd.precision
-	map
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv3.SensorMultilevelReport cmd)
-{
-	def map = [:]
-	switch (cmd.sensorType) {
-		case 1:
-			// temperature
-			map.value = cmd.scaledSensorValue.toString()
-			map.unit = cmd.scale == 1 ? "F" : "C"
-			map.name = "temperature"
-			break;
-		case 5:
-			// humidity
-			map.value = cmd.scaledSensorValue.toInteger().toString()
-			map.unit = "%"
-			map.name = "humidity"
-			break;
-	}
-    map
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport cmd)
-{
-	def map = [:]
-	switch (cmd.operatingState) {
-		case physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport.OPERATING_STATE_IDLE:
-			map.value = "idle"
-			break
-		case physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport.OPERATING_STATE_HEATING:
-			map.value = "heating"
-			break
-		case physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport.OPERATING_STATE_COOLING:
-			map.value = "cooling"
-			break
-		case physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport.OPERATING_STATE_FAN_ONLY:
-			map.value = "fan only"
-			break
-		case physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport.OPERATING_STATE_PENDING_HEAT:
-			map.value = "pending heat"
-			break
-		case physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport.OPERATING_STATE_PENDING_COOL:
-			map.value = "pending cool"
-			break
-		case physicalgraph.zwave.commands.thermostatoperatingstatev1.ThermostatOperatingStateReport.OPERATING_STATE_VENT_ECONOMIZER:
-			map.value = "vent economizer"
-			break
-	}
-	map.name = "thermostatOperatingState"
-	map
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport cmd) {
-	def map = [:]
-	switch (cmd.mode) {
-		case physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport.MODE_OFF:
-			map.value = "off"
-			break
-		case physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport.MODE_HEAT:
-			map.value = "heat"
-			break
-		case physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport.MODE_AUXILIARY_HEAT:
-			map.value = "emergencyHeat"
-			break
-		case physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport.MODE_COOL:
-			map.value = "cool"
-			break
-		case physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeReport.MODE_AUTO:
-			map.value = "auto"
-			break
-	}
-	map.name = "thermostatMode"
-	map
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeReport cmd) {
-	def map = [:]
-	switch (cmd.fanMode) {
-		case physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeReport.FAN_MODE_AUTO_LOW:
-			map.value = "fanAuto"
-			break
-		case physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeReport.FAN_MODE_LOW:
-			map.value = "fanOn"
-			break
-		case physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeReport.FAN_MODE_CIRCULATION:
-			map.value = "fanCirculate"
-			break
-	}
-	map.name = "thermostatFanMode"
-	map.displayed = false
-	map
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.thermostatmodev2.ThermostatModeSupportedReport cmd) {
-	def supportedModes = ""
-	if(cmd.off) { supportedModes += "off " }
-	if(cmd.heat) { supportedModes += "heat " }
-	if(cmd.auxiliaryemergencyHeat) { supportedModes += "emergencyHeat " }
-	if(cmd.cool) { supportedModes += "cool " }
-	if(cmd.auto) { supportedModes += "auto " }
-
-	updateState("supportedModes", supportedModes)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.thermostatfanmodev3.ThermostatFanModeSupportedReport cmd) {
-	def supportedFanModes = ""
-	if(cmd.auto) { supportedFanModes += "fanAuto " }
-	if(cmd.low) { supportedFanModes += "fanOn " }
-	if(cmd.circulation) { supportedFanModes += "fanCirculate " }
-
-	updateState("supportedFanModes", supportedFanModes)
-}
-
-def updateState(String name, String value) {
-	state[name] = value
-	device.updateDataValue(name, value)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) {
-	log.debug "Zwave event received: $cmd"
-}
-
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	log.warn "Unexpected zwave command $cmd"
-}
-
-// Command Implementations
-def poll() {
-	delayBetween([
-		zwave.sensorMultilevelV3.sensorMultilevelGet().format(), // current temperature
-		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format(),
-		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format(),
-		zwave.thermostatModeV2.thermostatModeGet().format(),
-		zwave.thermostatFanModeV3.thermostatFanModeGet().format(),
-		zwave.thermostatOperatingStateV1.thermostatOperatingStateGet().format(),
-        setClock()
-	], 2300)
-}
-
-private setClock() {	//once a day
-	def nowTime = new Date().time
-	def ageInMinutes = state.lastClockSet ? (nowTime - state.lastClockSet)/60000 : 1440
-    log.debug "Clock set age: ${ageInMinutes} minutes"
-    if (ageInMinutes >= 1440) {
-        log.debug "Setting clock"
-		state.lastClockSet = nowTime
-        def nowCal = Calendar.getInstance(TimeZone.getTimeZone("America/Chicago"));
-		zwave.clockV1.clockSet(hour: nowCal.get(Calendar.HOUR_OF_DAY), minute: nowCal.get(Calendar.MINUTE), weekday: nowCal.get(Calendar.DAY_OF_WEEK)).format()
-    } else "delay 87"
-}
-
-def setHeatingSetpoint(degreesF) {
-	setHeatingSetpoint(degreesF.toDouble())
-}
-
-def setHeatingSetpoint(Double degreesF) {
-	def p = (state.precision == null) ? 1 : state.precision
-	delayBetween([
-		zwave.thermostatSetpointV1.thermostatSetpointSet(setpointType: 1, scale: 1, precision: p, scaledValue: degreesF).format(),
-		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 1).format()
-	])
-}
-
-def setCoolingSetpoint(degreesF) {
-	setCoolingSetpoint(degreesF.toDouble())
-}
-
-def setCoolingSetpoint(Double degreesF) {
-	def p = (state.precision == null) ? 1 : state.precision
-	delayBetween([
-		zwave.thermostatSetpointV1.thermostatSetpointSet(setpointType: 2, scale: 1, precision: p,  scaledValue: degreesF).format(),
-		zwave.thermostatSetpointV1.thermostatSetpointGet(setpointType: 2).format()
-	])
-}
-
-def configure() {
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSupportedGet().format(),
-		zwave.thermostatFanModeV3.thermostatFanModeSupportedGet().format(),
-		zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:[zwaveHubNodeId]).format()
-	], 2300)
-}
-
-def modes() {
-	["off", "auto", "emergencyHeat", "heat", "cool"]
-}
-
-def switchMode() {
-	def currentMode = device.currentState("thermostatMode")?.value
-	def lastTriedMode = getDataByName("lastTriedMode") ?: currentMode ?: "off"
-	def supportedModes = getDataByName("supportedModes")
-	def modeOrder = modes()
-	def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
-	def nextMode = next(lastTriedMode)
-	if (supportedModes?.contains(currentMode)) {
-		while (!supportedModes.contains(nextMode) && nextMode != "off") {
-			nextMode = next(nextMode)
-		}
-	}
-    log.debug "Switching to mode: ${nextMode}"
-	switchToMode(nextMode)
-}
-
-def switchToMode(nextMode) {
-	def supportedModes = getDataByName("supportedModes")
-	if(supportedModes && !supportedModes.contains(nextMode)) log.warn "thermostat mode '$nextMode' is not supported"
-	if (nextMode in modes()) {
-		updateState("lastTriedMode", nextMode)
-		return "$nextMode"()
-	} else {
-		log.debug("no mode method '$nextMode'")
-	}
-}
-
-def switchFanMode() {
-	def currentMode = device.currentState("thermostatFanMode")?.value
-	def lastTriedMode = getDataByName("lastTriedFanMode") ?: currentMode ?: "off"
-	def supportedModes = getDataByName("supportedFanModes") ?: "fanAuto fanOn"
-	def modeOrder = ["fanAuto", "fanCirculate", "fanOn"]
-	def next = { modeOrder[modeOrder.indexOf(it) + 1] ?: modeOrder[0] }
-	def nextMode = next(lastTriedMode)
-	while (!supportedModes?.contains(nextMode) && nextMode != "fanAuto") {
-		nextMode = next(nextMode)
-	}
-	switchToFanMode(nextMode)
-}
-
-def switchToFanMode(nextMode) {
-	def supportedFanModes = getDataByName("supportedFanModes")
-	if(supportedFanModes && !supportedFanModes.contains(nextMode)) log.warn "thermostat mode '$nextMode' is not supported"
-
-	def returnCommand
-	if (nextMode == "fanAuto") {
-		returnCommand = fanAuto()
-	} else if (nextMode == "fanOn") {
-		returnCommand = fanOn()
-	} else if (nextMode == "fanCirculate") {
-		returnCommand = fanCirculate()
-	} else {
-		log.debug("no fan mode '$nextMode'")
-	}
-	if(returnCommand) updateState("lastTriedFanMode", nextMode)
-	returnCommand
-}
-
-def getDataByName(String name) {
-	state[name] ?: device.getDataValue(name)
-}
-
-def getModeMap() { [
-	"off": 0,
-	"heat": 1,
-	"cool": 2,
-	"emergency heat": 4
-]}
-
-def setThermostatMode(String value) {
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSet(mode: modeMap[value]).format(),
-		zwave.thermostatModeV2.thermostatModeGet().format()
-	])
-}
-
-def getFanModeMap() { [
-	"auto": 0,
-	"on": 1,
-	"circulate": 6
-]}
-
-def setThermostatFanMode(String value) {
-	delayBetween([
-		zwave.thermostatFanModeV3.thermostatFanModeSet(fanMode: fanModeMap[value]).format(),
-		zwave.thermostatFanModeV3.thermostatFanModeGet().format()
-	])
-}
-
-def off() {
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSet(mode: 0).format(),
-		zwave.thermostatModeV2.thermostatModeGet().format()
-	])
-}
-
-def heat() {
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSet(mode: 1).format(),
-		zwave.thermostatModeV2.thermostatModeGet().format()
-	])
-}
-
-def emergencyHeat() {
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSet(mode: 4).format(),
-		zwave.thermostatModeV2.thermostatModeGet().format()
-	])
-}
-
-def cool() {
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSet(mode: 2).format(),
-		zwave.thermostatModeV2.thermostatModeGet().format()
-	])
-}
-
-def auto() {
-	delayBetween([
-		zwave.thermostatModeV2.thermostatModeSet(mode: 3).format(),
-		zwave.thermostatModeV2.thermostatModeGet().format()
-	])
-}
-
-def fanOn() {
-	delayBetween([
-		zwave.thermostatFanModeV3.thermostatFanModeSet(fanMode: 1).format(),
-		zwave.thermostatFanModeV3.thermostatFanModeGet().format()
-	])
-}
-
-def fanAuto() {
-	delayBetween([
-		zwave.thermostatFanModeV3.thermostatFanModeSet(fanMode: 0).format(),
-		zwave.thermostatFanModeV3.thermostatFanModeGet().format()
-	])
-}
-
-def fanCirculate() {
-	delayBetween([
-		zwave.thermostatFanModeV3.thermostatFanModeSet(fanMode: 6).format(),
-		zwave.thermostatFanModeV3.thermostatFanModeGet().format()
-	])
-}