MSA-1898: I need test for other people, thanks.

DVCSMP-2570 Adding centralite zigbee button fingerprint

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.") {
+	definition (name: "Fibaro Door/Window Sensor ZW5 with Temperature", namespace: "fibargroup", author: "Fibar Group S.A.", ocfDeviceType: "x.com.st.d.sensor.contact") {
 		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/fibaro-door-window-sensor-zw5.groovy

@@ -14,7 +14,7 @@
  *
  */
 metadata {
-	definition (name: "Fibaro Door/Window Sensor ZW5", namespace: "fibargroup", author: "Fibar Group S.A.") {
+	definition (name: "Fibaro Door/Window Sensor ZW5", namespace: "fibargroup", author: "Fibar Group S.A.", ocfDeviceType: "x.com.st.d.sensor.contact") {
 		capability "Battery"
 		capability "Contact Sensor"
 		capability "Sensor"
@@ -26,26 +26,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:""
         }
-        
+
         main "FGK"
         details(["FGK","battery"])
     }
@@ -53,9 +53,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 +72,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 +110,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 +130,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 +138,7 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm
             	break
         }
     }
-    
+
     createEvent(map)
 }
 
@@ -151,7 +151,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 +160,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}"
@@ -204,7 +204,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:21600, nodeid: zwaveHubNodeId)//FGK's default wake up interval
     cmds += zwave.manufacturerSpecificV2.manufacturerSpecificGet()
     cmds += zwave.manufacturerSpecificV2.deviceSpecificGet()
@@ -212,7 +212,7 @@ def configure() {
     cmds += zwave.batteryV1.batteryGet()
     cmds += zwave.associationV2.associationSet(groupingIdentifier:1, nodeId: [zwaveHubNodeId])
     cmds += zwave.wakeUpV2.wakeUpNoMoreInformation()
-    
+
     encapSequence(cmds, 500)
 }
 
@@ -231,7 +231,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 +239,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.") {
+	definition (name: "Fibaro Flood Sensor ZW5", namespace: "fibargroup", author: "Fibar Group S.A.", ocfDeviceType: "x.com.st.d.sensor.moisture") {
 		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.") {
+	definition (name: "Fibaro Motion Sensor ZW5", namespace: "fibargroup", author: "Fibar Group S.A.", ocfDeviceType: "x.com.st.d.sensor.motion") {
 		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,6 +100,11 @@ 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,6 +58,11 @@ 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") {
+    definition (name: "Cree Bulb", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
 
         capability "Actuator"
         capability "Configuration"

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

@@ -84,6 +84,11 @@ 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/econet-vent.src/econet-vent.groovy

@@ -85,6 +85,11 @@ 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/everspring-flood-sensor.groovy

@@ -12,7 +12,7 @@
  *
  */
 metadata {
-	definition (name: "Everspring Flood Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "Everspring Flood Sensor", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.moisture") {
 		capability "Water Sensor"
 		capability "Configuration"
 		capability "Sensor"
@@ -29,7 +29,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") {

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") {
+	definition (name: "Fibaro Motion Sensor", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.motion") {
 		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,7 +433,6 @@ 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,6 +50,11 @@ 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") {
+    definition (name: "GE Link Bulb", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
 
         capability "Actuator"
         capability "Configuration"

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

@@ -57,10 +57,20 @@ metadata {
 	}
 }
 
-void installed() {
+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()
+}
+
 // parse events into attributes
 def parse(description) {
 	log.debug "parse() - $description"

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

@@ -45,10 +45,20 @@ metadata {
 	}
 }
 
-void installed() {
+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()
+}
+
 // parse events into attributes
 def parse(description) {
 	log.debug "Parsing '${description}'"

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

@@ -66,10 +66,20 @@ metadata {
 	}
 }
 
-void installed() {
+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()
+}
+
 // parse events into attributes
 def parse(description) {
 	log.debug "parse() - $description"

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

@@ -50,10 +50,19 @@ metadata {
     }
 }
 
-void installed() {
+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()
+}
+
 // parse events into attributes
 def parse(description) {
 	log.debug "parse() - $description"

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

@@ -55,10 +55,20 @@ metadata {
     }
 }
 
-void installed() {
+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()
+}
+
 // parse events into attributes
 def parse(description) {
     log.debug "parse() - $description"

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

@@ -5,7 +5,7 @@
  *
  */
 metadata {
-	definition (name: "LIFX Color Bulb", namespace: "smartthings", author: "LIFX") {
+	definition (name: "LIFX Color Bulb", namespace: "smartthings", author: "LIFX", ocfDeviceType: "oic.d.light") {
 		capability "Actuator"
 		capability "Color Control"
 		capability "Color Temperature"
@@ -64,8 +64,18 @@ metadata {
 	}
 }
 
+def initialize() {
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"cloud\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device?.hub?.hardwareID}\"}", displayed: false)
+}
+
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"cloud\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device?.hub?.hardwareID}\"}")
+	log.debug "installed()"
+	initialize()
+}
+
+def updated() {
+	log.debug "updated()"
+	initialize()
 }
 
 // handle commands
@@ -190,7 +200,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") {
+	definition (name: "LIFX White Bulb", namespace: "smartthings", author: "LIFX", ocfDeviceType: "oic.d.light") {
 		capability "Actuator"
 		capability "Color Temperature"
 		capability "Switch"
@@ -55,8 +55,18 @@ metadata {
 	}
 }
 
+def initialize() {
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"cloud\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device?.hub?.hardwareID}\"}", displayed: false)
+}
+
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"cloud\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device?.hub?.hardwareID}\"}")
+	log.debug "installed()"
+	initialize()
+}
+
+def updated() {
+	log.debug "updated()"
+	initialize()
 }
 
 // handle commands
@@ -119,7 +129,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,3 +1,4 @@
+import groovy.json.JsonOutput
 /**
  *  Logitech Harmony Hub
  *
@@ -39,14 +40,18 @@ metadata {
 	}
 }
 
+def initialize() {
+	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "cloud", scheme:"untracked"]), displayed: false)
+}
+
 def installed() {
 	log.debug "installed()"
-	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "cloud", scheme:"untracked"]), displayed: false)
+	initialize()
 }
 
 def updated() {
 	log.debug "updated()"
-	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "cloud", scheme:"untracked"]), displayed: false)
+	initialize()
 }
 
 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") {
+	definition (name: "Open/Closed Sensor", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.contact") {
 		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") {
+	definition (name: "RGBW Light", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
 		capability "Switch Level"
 		capability "Color Control"
 		capability "Color Temperature"

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

@@ -91,6 +91,11 @@ 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") {
+	definition (name: "Sylvania Ultra iQ", namespace:"smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
 		capability "Switch Level"
 		capability "Configuration"
 		capability "Switch"

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") {
-	
+	definition (name: "WeMo Bulb", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
+
     	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/zigbee-button.src/zigbee-button.groovy

@@ -28,6 +28,7 @@ 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"
@@ -251,12 +252,19 @@ def initialize() {
     if ((device.getDataValue("manufacturer") == "OSRAM") && (device.getDataValue("model") == "LIGHTIFY Dimming Switch")) {
         sendEvent(name: "numberOfButtons", value: 2)
     }
-    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 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 {
         //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.switch") {
+    definition (name: "ZigBee Dimmer Power", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
         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.switch") {
+    definition (name: "ZigBee Dimmer", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
         capability "Actuator"
         capability "Configuration"
         capability "Refresh"

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") {
+    definition (name: "ZLL Dimmer Bulb", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
 
         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") {
+	definition (name: "ZLL RGB Bulb", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
 
 		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") {
+    definition (name: "ZLL RGBW Bulb", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
 
         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") {
+    definition (name: "ZLL White Color Temperature Bulb 5000K", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
 
         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") {
+    definition (name: "ZLL White Color Temperature Bulb", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
 
         capability "Actuator"
         capability "Color Temperature"

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.switch") {
+	definition (name: "Z-Wave Dimmer Switch Generic", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "oic.d.light") {
 		capability "Switch Level"
 		capability "Actuator"
 		capability "Health Check"
@@ -78,6 +78,11 @@ 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") {
+	definition (name: "Z-Wave Door/Window Sensor", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.contact") {
 		capability "Contact Sensor"
 		capability "Sensor"
 		capability "Battery"
@@ -79,6 +79,11 @@ 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,6 +65,11 @@ 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,6 +68,11 @@ 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

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

@@ -74,6 +74,11 @@ 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-motion-sensor.src/zwave-motion-sensor.groovy

@@ -17,7 +17,7 @@
  */
 
 metadata {
-	definition (name: "Z-Wave Motion Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "Z-Wave Motion Sensor", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.motion") {
 		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,7 +51,12 @@ metadata {
 	}
 }
 
-def updated(){
+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() {
 // 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])
 }
@@ -197,4 +202,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") {
+	definition (name: "Z-Wave Plus Door/Window Sensor", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.contact") {
 		capability "Contact Sensor"
 		capability "Configuration"
 		capability "Battery"

devicetypes/smartthings/zwave-siren.src/.st-ignore

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

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

@@ -1,42 +0,0 @@
-# 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,7 +20,6 @@ metadata {
 		capability "Actuator"
         capability "Alarm"
         capability "Battery"
-		capability "Health Check"
         capability "Polling"
         capability "Refresh"
         capability "Sensor"
@@ -28,7 +27,6 @@ metadata {
 
 
 		fingerprint inClusters: "0x20,0x25,0x86,0x80,0x85,0x72,0x71"
-		fingerprint mfr:"0084", prod:"0313", model:"010B", deviceJoinName: "FortrezZ Siren Strobe Alarm"
 	}
 
 	simulator {
@@ -60,11 +58,6 @@ 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) {
@@ -126,13 +119,6 @@ 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,7 +53,12 @@ metadata {
 	}
 }
 
-def updated(){
+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() {
 // 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

@@ -61,6 +61,11 @@ 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.src/zwave-switch.groovy

@@ -65,6 +65,11 @@ 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

@@ -124,6 +124,11 @@ 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-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") {
+	definition (name: "Z-Wave Virtual Momentary Contact Switch", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.contact") {
 		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") {
+	definition (name: "Z-Wave Water Sensor", namespace: "smartthings", author: "SmartThings", ocfDeviceType: "x.com.st.d.sensor.moisture") {
 		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"

smartapps/blingswitch/bling-smartapps.src/bling-smartapps.groovy

@@ -0,0 +1,51 @@
+import grails.converters.JSON
+
+/**
+*  JSON API Access App
+*/
+
+definition(
+  name: "Bling_SmartApps",
+  namespace: "BlingSwitch",
+  author: "Bling",
+  description: "Return things as JSON",
+  category: "My Apps",
+  iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
+  iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
+  oauth: [displayName: "JSON API", displayLink: ""]
+)
+
+
+preferences {
+  section("Allow these things to be exposed via JSON...") {
+    input "switches", "capability.switch", title: "Switches", multiple: true, required: true, hideWhenEmpty: true
+  }
+}
+
+mappings {
+  path("/things") {
+    action: [
+      GET: "listThings"
+    ]
+  }
+}
+
+def listThings() {
+  [
+    switches: switches.collect{device(it, "switch")}
+  ]
+}
+
+private device(it, type) {
+  def device_state = [label: it.label, type: type, id: it.id, devtest: it]
+
+  for (attribute in it.supportedAttributes) {
+    device_state."${attribute}" = it.currentValue("${attribute}")
+  }
+
+  device_state ? device_state : null
+}
+
+def installed() {}
+
+def updated() {}